diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index d24c55b49a..1a76a7f471 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -54,9 +54,9 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest pytest-subtests
+        pip install pytest pytest-subtests pytest-xdist
         python ModuleUpdate.py --yes --force --append "WebHostLib/requirements.txt"
         python Launcher.py --update_settings  # make sure host.yaml exists for tests
     - name: Unittests
       run: |
-        pytest
+        pytest -n auto
diff --git a/.gitignore b/.gitignore
index 8e4cc86657..022abe38fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,12 +9,14 @@
 *.apmc
 *.apz5
 *.aptloz
+*.apemerald
 *.pyc
 *.pyd
 *.sfc
 *.z64
 *.n64
 *.nes
+*.smc
 *.sms
 *.gb
 *.gbc
@@ -27,16 +29,20 @@
 *.archipelago
 *.apsave
 *.BIN
+*.puml
 
 setups
 build
 bundle/components.wxs
 dist
+/prof/
 README.html
 .vs/
 EnemizerCLI/
 /Players/
 /SNI/
+/sni-*/
+/appimagetool*
 /host.yaml
 /options.yaml
 /config.yaml
@@ -139,6 +145,7 @@ ipython_config.py
 .venv*
 env/
 venv/
+/venv*/
 ENV/
 env.bak/
 venv.bak/
diff --git a/AdventureClient.py b/AdventureClient.py
index d2f4e734ac..06e4d60dad 100644
--- a/AdventureClient.py
+++ b/AdventureClient.py
@@ -115,11 +115,12 @@ class AdventureContext(CommonContext):
             msg = f"Received {', '.join([self.item_names[item.item] for item in args['items']])}"
             self._set_message(msg, SYSTEM_MESSAGE_ID)
         elif cmd == "Retrieved":
-            self.freeincarnates_used = args["keys"][f"adventure_{self.auth}_freeincarnates_used"]
-            if self.freeincarnates_used is None:
-                self.freeincarnates_used = 0
-            self.freeincarnates_used += self.freeincarnate_pending
-            self.send_pending_freeincarnates()
+            if f"adventure_{self.auth}_freeincarnates_used" in args["keys"]:
+                self.freeincarnates_used = args["keys"][f"adventure_{self.auth}_freeincarnates_used"]
+                if self.freeincarnates_used is None:
+                    self.freeincarnates_used = 0
+                self.freeincarnates_used += self.freeincarnate_pending
+                self.send_pending_freeincarnates()
         elif cmd == "SetReply":
             if args["key"] == f"adventure_{self.auth}_freeincarnates_used":
                 self.freeincarnates_used = args["value"]
diff --git a/BaseClasses.py b/BaseClasses.py
index 26cdfb5285..855e69c5d4 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1,13 +1,15 @@
 from __future__ import annotations
 
 import copy
+import itertools
 import functools
 import logging
 import random
 import secrets
 import typing  # this can go away when Python 3.8 support is dropped
 from argparse import Namespace
-from collections import ChainMap, Counter, deque
+from collections import Counter, deque
+from collections.abc import Collection, MutableSequence
 from enum import IntEnum, IntFlag
 from typing import Any, Callable, Dict, Iterable, Iterator, List, NamedTuple, Optional, Set, Tuple, TypedDict, Union, \
     Type, ClassVar
@@ -46,7 +48,6 @@ class ThreadBarrierProxy:
 class MultiWorld():
     debug_types = False
     player_name: Dict[int, str]
-    _region_cache: Dict[int, Dict[str, Region]]
     difficulty_requirements: dict
     required_medallions: dict
     dark_room_logic: Dict[int, str]
@@ -56,7 +57,7 @@ class MultiWorld():
     plando_connections: List
     worlds: Dict[int, auto_world]
     groups: Dict[int, Group]
-    regions: List[Region]
+    regions: RegionManager
     itempool: List[Item]
     is_race: bool = False
     precollected_items: Dict[int, List[Item]]
@@ -91,6 +92,39 @@ class MultiWorld():
         def __getitem__(self, player) -> bool:
             return self.rule(player)
 
+    class RegionManager:
+        region_cache: Dict[int, Dict[str, Region]]
+        entrance_cache: Dict[int, Dict[str, Entrance]]
+        location_cache: Dict[int, Dict[str, Location]]
+
+        def __init__(self, players: int):
+            self.region_cache = {player: {} for player in range(1, players+1)}
+            self.entrance_cache = {player: {} for player in range(1, players+1)}
+            self.location_cache = {player: {} for player in range(1, players+1)}
+
+        def __iadd__(self, other: Iterable[Region]):
+            self.extend(other)
+            return self
+
+        def append(self, region: Region):
+            self.region_cache[region.player][region.name] = region
+
+        def extend(self, regions: Iterable[Region]):
+            for region in regions:
+                self.region_cache[region.player][region.name] = region
+
+        def add_group(self, new_id: int):
+            self.region_cache[new_id] = {}
+            self.entrance_cache[new_id] = {}
+            self.location_cache[new_id] = {}
+
+        def __iter__(self) -> Iterator[Region]:
+            for regions in self.region_cache.values():
+                yield from regions.values()
+
+        def __len__(self):
+            return sum(len(regions) for regions in self.region_cache.values())
+
     def __init__(self, players: int):
         # world-local random state is saved for multiple generations running concurrently
         self.random = ThreadBarrierProxy(random.Random())
@@ -99,16 +133,12 @@ class MultiWorld():
         self.glitch_triforce = False
         self.algorithm = 'balanced'
         self.groups = {}
-        self.regions = []
+        self.regions = self.RegionManager(players)
         self.shops = []
         self.itempool = []
         self.seed = None
         self.seed_name: str = "Unavailable"
         self.precollected_items = {player: [] for player in self.player_ids}
-        self._cached_entrances = None
-        self._cached_locations = None
-        self._entrance_cache = {}
-        self._location_cache: Dict[Tuple[str, int], Location] = {}
         self.required_locations = []
         self.light_world_light_cone = False
         self.dark_world_light_cone = False
@@ -136,7 +166,6 @@ class MultiWorld():
             def set_player_attr(attr, val):
                 self.__dict__.setdefault(attr, {})[player] = val
 
-            set_player_attr('_region_cache', {})
             set_player_attr('shuffle', "vanilla")
             set_player_attr('logic', "noglitches")
             set_player_attr('mode', 'open')
@@ -180,7 +209,6 @@ class MultiWorld():
             set_player_attr('plando_connections', [])
             set_player_attr('game', "A Link to the Past")
             set_player_attr('completion_condition', lambda state: True)
-        self.custom_data = {}
         self.worlds = {}
         self.per_slot_randoms = {}
         self.plando_options = PlandoOptions.none
@@ -197,19 +225,11 @@ class MultiWorld():
                 return group_id, group
         new_id: int = self.players + len(self.groups) + 1
 
+        self.regions.add_group(new_id)
         self.game[new_id] = game
-        self.custom_data[new_id] = {}
         self.player_types[new_id] = NetUtils.SlotType.group
-        self._region_cache[new_id] = {}
         world_type = AutoWorld.AutoWorldRegister.world_types[game]
-        for option_key, option in world_type.option_definitions.items():
-            getattr(self, option_key)[new_id] = option(option.default)
-        for option_key, option in Options.common_options.items():
-            getattr(self, option_key)[new_id] = option(option.default)
-        for option_key, option in Options.per_game_common_options.items():
-            getattr(self, option_key)[new_id] = option(option.default)
-
-        self.worlds[new_id] = world_type(self, new_id)
+        self.worlds[new_id] = world_type.create_group(self, new_id, players)
         self.worlds[new_id].collect_item = classmethod(AutoWorld.World.collect_item).__get__(self.worlds[new_id])
         self.player_name[new_id] = name
 
@@ -232,25 +252,28 @@ class MultiWorld():
                                  range(1, self.players + 1)}
 
     def set_options(self, args: Namespace) -> None:
-        for option_key in Options.common_options:
-            setattr(self, option_key, getattr(args, option_key, {}))
-        for option_key in Options.per_game_common_options:
-            setattr(self, option_key, getattr(args, option_key, {}))
+        # TODO - remove this section once all worlds use options dataclasses
+        all_keys: Set[str] = {key for player in self.player_ids for key in
+                              AutoWorld.AutoWorldRegister.world_types[self.game[player]].options_dataclass.type_hints}
+        for option_key in all_keys:
+            option = Utils.DeprecateDict(f"Getting options from multiworld is now deprecated. "
+                                         f"Please use `self.options.{option_key}` instead.")
+            option.update(getattr(args, option_key, {}))
+            setattr(self, option_key, option)
 
         for player in self.player_ids:
-            self.custom_data[player] = {}
             world_type = AutoWorld.AutoWorldRegister.world_types[self.game[player]]
-            for option_key in world_type.option_definitions:
-                setattr(self, option_key, getattr(args, option_key, {}))
-
             self.worlds[player] = world_type(self, player)
             self.worlds[player].random = self.per_slot_randoms[player]
+            options_dataclass: typing.Type[Options.PerGameCommonOptions] = world_type.options_dataclass
+            self.worlds[player].options = options_dataclass(**{option_key: getattr(args, option_key)[player]
+                                                               for option_key in options_dataclass.type_hints})
 
     def set_item_links(self):
         item_links = {}
         replacement_prio = [False, True, None]
         for player in self.player_ids:
-            for item_link in self.item_links[player].value:
+            for item_link in self.worlds[player].options.item_links.value:
                 if item_link["name"] in item_links:
                     if item_links[item_link["name"]]["game"] != self.game[player]:
                         raise Exception(f"Cannot ItemLink across games. Link: {item_link['name']}")
@@ -305,14 +328,6 @@ class MultiWorld():
             group["non_local_items"] = item_link["non_local_items"]
             group["link_replacement"] = replacement_prio[item_link["link_replacement"]]
 
-    # intended for unittests
-    def set_default_common_options(self):
-        for option_key, option in Options.common_options.items():
-            setattr(self, option_key, {player_id: option(option.default) for player_id in self.player_ids})
-        for option_key, option in Options.per_game_common_options.items():
-            setattr(self, option_key, {player_id: option(option.default) for player_id in self.player_ids})
-        self.state = CollectionState(self)
-
     def secure(self):
         self.random = ThreadBarrierProxy(secrets.SystemRandom())
         self.is_race = True
@@ -321,11 +336,15 @@ class MultiWorld():
     def player_ids(self) -> Tuple[int, ...]:
         return tuple(range(1, self.players + 1))
 
-    @functools.lru_cache()
+    @Utils.cache_self1
     def get_game_players(self, game_name: str) -> Tuple[int, ...]:
         return tuple(player for player in self.player_ids if self.game[player] == game_name)
 
-    @functools.lru_cache()
+    @Utils.cache_self1
+    def get_game_groups(self, game_name: str) -> Tuple[int, ...]:
+        return tuple(group_id for group_id in self.groups if self.game[group_id] == game_name)
+
+    @Utils.cache_self1
     def get_game_worlds(self, game_name: str):
         return tuple(world for player, world in self.worlds.items() if
                      player not in self.groups and self.game[player] == game_name)
@@ -343,50 +362,21 @@ class MultiWorld():
         """ the base name (without file extension) for each player's output file for a seed """
         return f"AP_{self.seed_name}_P{player}_{self.get_file_safe_player_name(player).replace(' ', '_')}"
 
-    def initialize_regions(self, regions=None):
-        for region in regions if regions else self.regions:
-            region.multiworld = self
-            self._region_cache[region.player][region.name] = region
-
     @functools.cached_property
     def world_name_lookup(self):
         return {self.player_name[player_id]: player_id for player_id in self.player_ids}
 
-    def _recache(self):
-        """Rebuild world cache"""
-        self._cached_locations = None
-        for region in self.regions:
-            player = region.player
-            self._region_cache[player][region.name] = region
-            for exit in region.exits:
-                self._entrance_cache[exit.name, player] = exit
+    def get_regions(self, player: Optional[int] = None) -> Collection[Region]:
+        return self.regions if player is None else self.regions.region_cache[player].values()
 
-            for r_location in region.locations:
-                self._location_cache[r_location.name, player] = r_location
+    def get_region(self, region_name: str, player: int) -> Region:
+        return self.regions.region_cache[player][region_name]
 
-    def get_regions(self, player=None):
-        return self.regions if player is None else self._region_cache[player].values()
+    def get_entrance(self, entrance_name: str, player: int) -> Entrance:
+        return self.regions.entrance_cache[player][entrance_name]
 
-    def get_region(self, regionname: str, player: int) -> Region:
-        try:
-            return self._region_cache[player][regionname]
-        except KeyError:
-            self._recache()
-            return self._region_cache[player][regionname]
-
-    def get_entrance(self, entrance: str, player: int) -> Entrance:
-        try:
-            return self._entrance_cache[entrance, player]
-        except KeyError:
-            self._recache()
-            return self._entrance_cache[entrance, player]
-
-    def get_location(self, location: str, player: int) -> Location:
-        try:
-            return self._location_cache[location, player]
-        except KeyError:
-            self._recache()
-            return self._location_cache[location, player]
+    def get_location(self, location_name: str, player: int) -> Location:
+        return self.regions.location_cache[player][location_name]
 
     def get_all_state(self, use_cache: bool) -> CollectionState:
         cached = getattr(self, "_all_state", None)
@@ -447,28 +437,22 @@ class MultiWorld():
 
         logging.debug('Placed %s at %s', item, location)
 
-    def get_entrances(self) -> List[Entrance]:
-        if self._cached_entrances is None:
-            self._cached_entrances = [entrance for region in self.regions for entrance in region.entrances]
-        return self._cached_entrances
-
-    def clear_entrance_cache(self):
-        self._cached_entrances = None
+    def get_entrances(self, player: Optional[int] = None) -> Iterable[Entrance]:
+        if player is not None:
+            return self.regions.entrance_cache[player].values()
+        return Utils.RepeatableChain(tuple(self.regions.entrance_cache[player].values()
+                                           for player in self.regions.entrance_cache))
 
     def register_indirect_condition(self, region: Region, entrance: Entrance):
         """Report that access to this Region can result in unlocking this Entrance,
         state.can_reach(Region) in the Entrance's traversal condition, as opposed to pure transition logic."""
         self.indirect_connections.setdefault(region, set()).add(entrance)
 
-    def get_locations(self, player: Optional[int] = None) -> List[Location]:
-        if self._cached_locations is None:
-            self._cached_locations = [location for region in self.regions for location in region.locations]
+    def get_locations(self, player: Optional[int] = None) -> Iterable[Location]:
         if player is not None:
-            return [location for location in self._cached_locations if location.player == player]
-        return self._cached_locations
-
-    def clear_location_cache(self):
-        self._cached_locations = None
+            return self.regions.location_cache[player].values()
+        return Utils.RepeatableChain(tuple(self.regions.location_cache[player].values()
+                                           for player in self.regions.location_cache))
 
     def get_unfilled_locations(self, player: Optional[int] = None) -> List[Location]:
         return [location for location in self.get_locations(player) if location.item is None]
@@ -490,16 +474,17 @@ class MultiWorld():
                 valid_locations = [location.name for location in self.get_unfilled_locations(player)]
             else:
                 valid_locations = location_names
+            relevant_cache = self.regions.location_cache[player]
             for location_name in valid_locations:
-                location = self._location_cache.get((location_name, player), None)
-                if location is not None and location.item is None:
+                location = relevant_cache.get(location_name, None)
+                if location and location.item is None:
                     yield location
 
     def unlocks_new_location(self, item: Item) -> bool:
         temp_state = self.state.copy()
         temp_state.collect(item, True)
 
-        for location in self.get_unfilled_locations():
+        for location in self.get_unfilled_locations(item.player):
             if temp_state.can_reach(location) and not self.state.can_reach(location):
                 return True
 
@@ -511,7 +496,7 @@ class MultiWorld():
         else:
             return all((self.has_beaten_game(state, p) for p in range(1, self.players + 1)))
 
-    def can_beat_game(self, starting_state: Optional[CollectionState] = None):
+    def can_beat_game(self, starting_state: Optional[CollectionState] = None) -> bool:
         if starting_state:
             if self.has_beaten_game(starting_state):
                 return True
@@ -524,7 +509,7 @@ class MultiWorld():
                           and location.item.advancement and location not in state.locations_checked}
 
         while prog_locations:
-            sphere = set()
+            sphere: Set[Location] = set()
             # build up spheres of collection radius.
             # Everything in each sphere is independent from each other in dependencies and only depends on lower spheres
             for location in prog_locations:
@@ -544,12 +529,19 @@ class MultiWorld():
 
         return False
 
-    def get_spheres(self):
+    def get_spheres(self) -> Iterator[Set[Location]]:
+        """
+        yields a set of locations for each logical sphere
+
+        If there are unreachable locations, the last sphere of reachable
+        locations is followed by an empty set, and then a set of all of the
+        unreachable locations.
+        """
         state = CollectionState(self)
         locations = set(self.get_filled_locations())
 
         while locations:
-            sphere = set()
+            sphere: Set[Location] = set()
 
             for location in locations:
                 if location.can_reach(state):
@@ -631,7 +623,7 @@ PathValue = Tuple[str, Optional["PathValue"]]
 
 
 class CollectionState():
-    prog_items: typing.Counter[Tuple[str, int]]
+    prog_items: Dict[int, Counter[str]]
     multiworld: MultiWorld
     reachable_regions: Dict[int, Set[Region]]
     blocked_connections: Dict[int, Set[Entrance]]
@@ -643,7 +635,7 @@ class CollectionState():
     additional_copy_functions: List[Callable[[CollectionState, CollectionState], CollectionState]] = []
 
     def __init__(self, parent: MultiWorld):
-        self.prog_items = Counter()
+        self.prog_items = {player: Counter() for player in parent.get_all_ids()}
         self.multiworld = parent
         self.reachable_regions = {player: set() for player in parent.get_all_ids()}
         self.blocked_connections = {player: set() for player in parent.get_all_ids()}
@@ -659,39 +651,39 @@ class CollectionState():
 
     def update_reachable_regions(self, player: int):
         self.stale[player] = False
-        rrp = self.reachable_regions[player]
-        bc = self.blocked_connections[player]
+        reachable_regions = self.reachable_regions[player]
+        blocked_connections = self.blocked_connections[player]
         queue = deque(self.blocked_connections[player])
-        start = self.multiworld.get_region('Menu', player)
+        start = self.multiworld.get_region("Menu", player)
 
         # init on first call - this can't be done on construction since the regions don't exist yet
-        if start not in rrp:
-            rrp.add(start)
-            bc.update(start.exits)
+        if start not in reachable_regions:
+            reachable_regions.add(start)
+            blocked_connections.update(start.exits)
             queue.extend(start.exits)
 
         # run BFS on all connections, and keep track of those blocked by missing items
         while queue:
             connection = queue.popleft()
             new_region = connection.connected_region
-            if new_region in rrp:
-                bc.remove(connection)
+            if new_region in reachable_regions:
+                blocked_connections.remove(connection)
             elif connection.can_reach(self):
                 assert new_region, f"tried to search through an Entrance \"{connection}\" with no Region"
-                rrp.add(new_region)
-                bc.remove(connection)
-                bc.update(new_region.exits)
+                reachable_regions.add(new_region)
+                blocked_connections.remove(connection)
+                blocked_connections.update(new_region.exits)
                 queue.extend(new_region.exits)
                 self.path[new_region] = (new_region.name, self.path.get(connection, None))
 
                 # 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 bc and new_entrance not in queue:
+                    if new_entrance in blocked_connections and new_entrance not in queue:
                         queue.append(new_entrance)
 
     def copy(self) -> CollectionState:
         ret = CollectionState(self.multiworld)
-        ret.prog_items = self.prog_items.copy()
+        ret.prog_items = copy.deepcopy(self.prog_items)
         ret.reachable_regions = {player: copy.copy(self.reachable_regions[player]) for player in
                                  self.reachable_regions}
         ret.blocked_connections = {player: copy.copy(self.blocked_connections[player]) for player in
@@ -734,37 +726,43 @@ class CollectionState():
                 assert isinstance(event.item, Item), "tried to collect Event with no Item"
                 self.collect(event.item, True, event)
 
+    # item name related
     def has(self, item: str, player: int, count: int = 1) -> bool:
-        return self.prog_items[item, player] >= count
+        return self.prog_items[player][item] >= count
 
-    def has_all(self, items: Set[str], player: int) -> bool:
+    def has_all(self, items: Iterable[str], player: int) -> bool:
         """Returns True if each item name of items is in state at least once."""
-        return all(self.prog_items[item, player] for item in items)
+        return all(self.prog_items[player][item] for item in items)
 
-    def has_any(self, items: Set[str], player: int) -> bool:
+    def has_any(self, items: Iterable[str], player: int) -> bool:
         """Returns True if at least one item name of items is in state at least once."""
-        return any(self.prog_items[item, player] for item in items)
+        return any(self.prog_items[player][item] for item in items)
 
     def count(self, item: str, player: int) -> int:
-        return self.prog_items[item, player]
+        return self.prog_items[player][item]
 
+    def item_count(self, item: str, player: int) -> int:
+        Utils.deprecate("Use count instead.")
+        return self.count(item, player)
+
+    # item name group related
     def has_group(self, item_name_group: str, player: int, count: int = 1) -> bool:
         found: int = 0
+        player_prog_items = self.prog_items[player]
         for item_name in self.multiworld.worlds[player].item_name_groups[item_name_group]:
-            found += self.prog_items[item_name, player]
+            found += player_prog_items[item_name]
             if found >= count:
                 return True
         return False
 
     def count_group(self, item_name_group: str, player: int) -> int:
         found: int = 0
+        player_prog_items = self.prog_items[player]
         for item_name in self.multiworld.worlds[player].item_name_groups[item_name_group]:
-            found += self.prog_items[item_name, player]
+            found += player_prog_items[item_name]
         return found
 
-    def item_count(self, item: str, player: int) -> int:
-        return self.prog_items[item, player]
-
+    # Item related
     def collect(self, item: Item, event: bool = False, location: Optional[Location] = None) -> bool:
         if location:
             self.locations_checked.add(location)
@@ -772,7 +770,7 @@ class CollectionState():
         changed = self.multiworld.worlds[item.player].collect(self, item)
 
         if not changed and event:
-            self.prog_items[item.name, item.player] += 1
+            self.prog_items[item.player][item.name] += 1
             changed = True
 
         self.stale[item.player] = True
@@ -839,15 +837,83 @@ class Region:
     locations: List[Location]
     entrance_type: ClassVar[Type[Entrance]] = Entrance
 
+    class Register(MutableSequence):
+        region_manager: MultiWorld.RegionManager
+
+        def __init__(self, region_manager: MultiWorld.RegionManager):
+            self._list = []
+            self.region_manager = region_manager
+
+        def __getitem__(self, index: int) -> Location:
+            return self._list.__getitem__(index)
+
+        def __setitem__(self, index: int, value: Location) -> None:
+            raise NotImplementedError()
+
+        def __len__(self) -> int:
+            return self._list.__len__()
+
+        # This seems to not be needed, but that's a bit suspicious.
+        # def __del__(self):
+        #     self.clear()
+
+        def copy(self):
+            return self._list.copy()
+
+    class LocationRegister(Register):
+        def __delitem__(self, index: int) -> None:
+            location: Location = self._list.__getitem__(index)
+            self._list.__delitem__(index)
+            del(self.region_manager.location_cache[location.player][location.name])
+
+        def insert(self, index: int, value: Location) -> None:
+            self._list.insert(index, value)
+            self.region_manager.location_cache[value.player][value.name] = value
+
+    class EntranceRegister(Register):
+        def __delitem__(self, index: int) -> None:
+            entrance: Entrance = self._list.__getitem__(index)
+            self._list.__delitem__(index)
+            del(self.region_manager.entrance_cache[entrance.player][entrance.name])
+
+        def insert(self, index: int, value: Entrance) -> None:
+            self._list.insert(index, value)
+            self.region_manager.entrance_cache[value.player][value.name] = value
+
+    _locations: LocationRegister[Location]
+    _exits: EntranceRegister[Entrance]
+
     def __init__(self, name: str, player: int, multiworld: MultiWorld, hint: Optional[str] = None):
         self.name = name
         self.entrances = []
-        self.exits = []
-        self.locations = []
+        self._exits = self.EntranceRegister(multiworld.regions)
+        self._locations = self.LocationRegister(multiworld.regions)
         self.multiworld = multiworld
         self._hint_text = hint
         self.player = player
 
+    def get_locations(self):
+        return self._locations
+
+    def set_locations(self, new):
+        if new is self._locations:
+            return
+        self._locations.clear()
+        self._locations.extend(new)
+
+    locations = property(get_locations, set_locations)
+
+    def get_exits(self):
+        return self._exits
+
+    def set_exits(self, new):
+        if new is self._exits:
+            return
+        self._exits.clear()
+        self._exits.extend(new)
+
+    exits = property(get_exits, set_exits)
+
     def can_reach(self, state: CollectionState) -> bool:
         if state.stale[self.player]:
             state.update_reachable_regions(self.player)
@@ -869,19 +935,19 @@ class Region:
         """
         Adds locations to the Region object, where location_type is your Location class and locations is a dict of
         location names to address.
-        
+
         :param locations: dictionary of locations to be created and added to this Region `{name: ID}`
         :param location_type: Location class to be used to create the locations with"""
         if location_type is None:
             location_type = Location
         for location, address in locations.items():
             self.locations.append(location_type(self.player, location, address, self))
-    
+
     def connect(self, connecting_region: Region, name: Optional[str] = None,
-                rule: Optional[Callable[[CollectionState], bool]] = None) -> None:
+                rule: Optional[Callable[[CollectionState], bool]] = None) -> entrance_type:
         """
         Connects this Region to another Region, placing the provided rule on the connection.
-        
+
         :param connecting_region: Region object to connect to path is `self -> exiting_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"""
@@ -889,11 +955,12 @@ class Region:
         if rule:
             exit_.access_rule = rule
         exit_.connect(connecting_region)
-    
+        return exit_
+
     def create_exit(self, name: str) -> Entrance:
         """
         Creates and returns an Entrance object as an exit of this region.
-        
+
         :param name: name of the Entrance being created
         """
         exit_ = self.entrance_type(self.player, name, self)
@@ -1263,7 +1330,7 @@ class Spoiler:
 
     def to_file(self, filename: str) -> None:
         def write_option(option_key: str, option_obj: Options.AssembleOptions) -> None:
-            res = getattr(self.multiworld, option_key)[player]
+            res = getattr(self.multiworld.worlds[player].options, option_key)
             display_name = getattr(option_obj, "display_name", option_key)
             outfile.write(f"{display_name + ':':33}{res.current_option_name}\n")
 
@@ -1281,8 +1348,7 @@ class Spoiler:
                     outfile.write('\nPlayer %d: %s\n' % (player, self.multiworld.get_player_name(player)))
                 outfile.write('Game:                            %s\n' % self.multiworld.game[player])
 
-                options = ChainMap(Options.per_game_common_options, self.multiworld.worlds[player].option_definitions)
-                for f_option, option in options.items():
+                for f_option, option in self.multiworld.worlds[player].options_dataclass.type_hints.items():
                     write_option(f_option, option)
 
                 AutoWorld.call_single(self.multiworld, "write_spoiler_header", player, outfile)
diff --git a/BizHawkClient.py b/BizHawkClient.py
new file mode 100644
index 0000000000..86c8e5197e
--- /dev/null
+++ b/BizHawkClient.py
@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+import ModuleUpdate
+ModuleUpdate.update()
+
+from worlds._bizhawk.context import launch
+
+if __name__ == "__main__":
+    launch()
diff --git a/CommonClient.py b/CommonClient.py
index 61fad65897..c4d80f3416 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -1,4 +1,6 @@
 from __future__ import annotations
+
+import copy
 import logging
 import asyncio
 import urllib.parse
@@ -242,6 +244,7 @@ class CommonContext:
         self.watcher_event = asyncio.Event()
 
         self.jsontotextparser = JSONtoTextParser(self)
+        self.rawjsontotextparser = RawJSONtoTextParser(self)
         self.update_data_package(network_data_package)
 
         # execution
@@ -377,10 +380,13 @@ class CommonContext:
 
     def on_print_json(self, args: dict):
         if self.ui:
-            self.ui.print_json(args["data"])
-        else:
-            text = self.jsontotextparser(args["data"])
-            logger.info(text)
+            # send copy to UI
+            self.ui.print_json(copy.deepcopy(args["data"]))
+
+        logging.getLogger("FileLog").info(self.rawjsontotextparser(copy.deepcopy(args["data"])),
+                                          extra={"NoStream": True})
+        logging.getLogger("StreamLog").info(self.jsontotextparser(copy.deepcopy(args["data"])),
+                                            extra={"NoFile": True})
 
     def on_package(self, cmd: str, args: dict):
         """For custom package handling in subclasses."""
@@ -731,7 +737,8 @@ async def process_server_cmd(ctx: CommonContext, args: dict):
         elif 'InvalidGame' in errors:
             ctx.event_invalid_game()
         elif 'IncompatibleVersion' in errors:
-            raise Exception('Server reported your client version as incompatible')
+            raise Exception('Server reported your client version as incompatible. '
+                            'This probably means you have to update.')
         elif 'InvalidItemsHandling' in errors:
             raise Exception('The item handling flags requested by the client are not supported')
         # last to check, recoverable problem
@@ -752,6 +759,7 @@ async def process_server_cmd(ctx: CommonContext, args: dict):
         ctx.slot_info = {int(pid): data for pid, data in args["slot_info"].items()}
         ctx.hint_points = args.get("hint_points", 0)
         ctx.consume_players_package(args["players"])
+        ctx.stored_data_notification_keys.add(f"_read_hints_{ctx.team}_{ctx.slot}")
         msgs = []
         if ctx.locations_checked:
             msgs.append({"cmd": "LocationChecks",
@@ -830,10 +838,14 @@ async def process_server_cmd(ctx: CommonContext, args: dict):
 
     elif cmd == "Retrieved":
         ctx.stored_data.update(args["keys"])
+        if ctx.ui and f"_read_hints_{ctx.team}_{ctx.slot}" in args["keys"]:
+            ctx.ui.update_hints()
 
     elif cmd == "SetReply":
         ctx.stored_data[args["key"]] = args["value"]
-        if args["key"].startswith("EnergyLink"):
+        if ctx.ui and f"_read_hints_{ctx.team}_{ctx.slot}" == args["key"]:
+            ctx.ui.update_hints()
+        elif args["key"].startswith("EnergyLink"):
             ctx.current_energy_link_value = args["value"]
             if ctx.ui:
                 ctx.ui.set_new_energy_link_value()
@@ -876,7 +888,7 @@ def get_base_parser(description: typing.Optional[str] = None):
 def run_as_textclient():
     class TextContext(CommonContext):
         # Text Mode to use !hint and such with games that have no text entry
-        tags = {"AP", "TextOnly"}
+        tags = CommonContext.tags | {"TextOnly"}
         game = ""  # empty matches any game since 0.3.2
         items_handling = 0b111  # receive all items for /received
         want_slot_data = False  # Can't use game specific slot_data
diff --git a/Fill.py b/Fill.py
index 21759eefe4..525d27d338 100644
--- a/Fill.py
+++ b/Fill.py
@@ -5,6 +5,8 @@ import typing
 from collections import Counter, deque
 
 from BaseClasses import CollectionState, Item, Location, LocationProgressType, MultiWorld
+from Options import Accessibility
+
 from worlds.AutoWorld import call_all
 from worlds.generic.Rules import add_item_rule
 
@@ -13,6 +15,10 @@ class FillError(RuntimeError):
     pass
 
 
+def _log_fill_progress(name: str, placed: int, total_items: int) -> None:
+    logging.info(f"Current fill step ({name}) at {placed}/{total_items} items placed.")
+
+
 def sweep_from_pool(base_state: CollectionState, itempool: typing.Sequence[Item] = tuple()) -> CollectionState:
     new_state = base_state.copy()
     for item in itempool:
@@ -24,7 +30,7 @@ def sweep_from_pool(base_state: CollectionState, itempool: typing.Sequence[Item]
 def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations: typing.List[Location],
                      item_pool: typing.List[Item], single_player_placement: bool = False, lock: bool = False,
                      swap: bool = True, on_place: typing.Optional[typing.Callable[[Location], None]] = None,
-                     allow_partial: bool = False, allow_excluded: bool = False) -> None:
+                     allow_partial: bool = False, allow_excluded: bool = False, name: str = "Unknown") -> None:
     """
     :param world: Multiworld to be filled.
     :param base_state: State assumed before fill.
@@ -36,16 +42,20 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
     :param on_place: callback that is called when a placement happens
     :param allow_partial: only place what is possible. Remaining items will be in the item_pool list.
     :param allow_excluded: if true and placement fails, it is re-attempted while ignoring excluded on Locations
+    :param name: name of this fill step for progress logging purposes
     """
     unplaced_items: typing.List[Item] = []
     placements: typing.List[Location] = []
     cleanup_required = False
-
     swapped_items: typing.Counter[typing.Tuple[int, str, bool]] = Counter()
     reachable_items: typing.Dict[int, typing.Deque[Item]] = {}
     for item in item_pool:
         reachable_items.setdefault(item.player, deque()).append(item)
 
+    # for progress logging
+    total = min(len(item_pool), len(locations))
+    placed = 0
+
     while any(reachable_items.values()) and locations:
         # grab one item per player
         items_to_place = [items.pop()
@@ -70,7 +80,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
             spot_to_fill: typing.Optional[Location] = None
 
             # if minimal accessibility, only check whether location is reachable if game not beatable
-            if world.accessibility[item_to_place.player] == 'minimal':
+            if world.worlds[item_to_place.player].options.accessibility == Accessibility.option_minimal:
                 perform_access_check = not world.has_beaten_game(maximum_exploration_state,
                                                                  item_to_place.player) \
                     if single_player_placement else not has_beaten_game
@@ -102,7 +112,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
 
                         location.item = None
                         placed_item.location = None
-                        swap_state = sweep_from_pool(base_state, [placed_item] if unsafe else [])
+                        swap_state = sweep_from_pool(base_state, [placed_item, *item_pool] if unsafe else item_pool)
                         # unsafe means swap_state assumes we can somehow collect placed_item before item_to_place
                         # by continuing to swap, which is not guaranteed. This is unsafe because there is no mechanic
                         # to clean that up later, so there is a chance generation fails.
@@ -150,9 +160,15 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
             spot_to_fill.locked = lock
             placements.append(spot_to_fill)
             spot_to_fill.event = item_to_place.advancement
+            placed += 1
+            if not placed % 1000:
+                _log_fill_progress(name, placed, total)
             if on_place:
                 on_place(spot_to_fill)
 
+    if total > 1000:
+        _log_fill_progress(name, placed, total)
+
     if cleanup_required:
         # validate all placements and remove invalid ones
         state = sweep_from_pool(base_state, [])
@@ -196,6 +212,8 @@ def remaining_fill(world: MultiWorld,
     unplaced_items: typing.List[Item] = []
     placements: typing.List[Location] = []
     swapped_items: typing.Counter[typing.Tuple[int, str]] = Counter()
+    total = min(len(itempool),  len(locations))
+    placed = 0
     while locations and itempool:
         item_to_place = itempool.pop()
         spot_to_fill: typing.Optional[Location] = None
@@ -245,6 +263,12 @@ def remaining_fill(world: MultiWorld,
 
         world.push_item(spot_to_fill, item_to_place, False)
         placements.append(spot_to_fill)
+        placed += 1
+        if not placed % 1000:
+            _log_fill_progress("Remaining", placed, total)
+
+    if total > 1000:
+        _log_fill_progress("Remaining", placed, total)
 
     if unplaced_items and locations:
         # There are leftover unplaceable items and locations that won't accept them
@@ -265,7 +289,7 @@ def fast_fill(world: MultiWorld,
 
 def accessibility_corrections(world: MultiWorld, state: CollectionState, locations, pool=[]):
     maximum_exploration_state = sweep_from_pool(state, pool)
-    minimal_players = {player for player in world.player_ids if world.accessibility[player] == "minimal"}
+    minimal_players = {player for player in world.player_ids if world.worlds[player].options.accessibility == "minimal"}
     unreachable_locations = [location for location in world.get_locations() if location.player in minimal_players and
                              not location.can_reach(maximum_exploration_state)]
     for location in unreachable_locations:
@@ -280,7 +304,7 @@ def accessibility_corrections(world: MultiWorld, state: CollectionState, locatio
             locations.append(location)
     if pool and locations:
         locations.sort(key=lambda loc: loc.progress_type != LocationProgressType.PRIORITY)
-        fill_restrictive(world, state, locations, pool)
+        fill_restrictive(world, state, locations, pool, name="Accessibility Corrections")
 
 
 def inaccessible_location_rules(world: MultiWorld, state: CollectionState, locations):
@@ -288,7 +312,7 @@ def inaccessible_location_rules(world: MultiWorld, state: CollectionState, locat
     unreachable_locations = [location for location in locations if not location.can_reach(maximum_exploration_state)]
     if unreachable_locations:
         def forbid_important_item_rule(item: Item):
-            return not ((item.classification & 0b0011) and world.accessibility[item.player] != 'minimal')
+            return not ((item.classification & 0b0011) and world.worlds[item.player].options.accessibility != 'minimal')
 
         for location in unreachable_locations:
             add_item_rule(location, forbid_important_item_rule)
@@ -350,23 +374,25 @@ def distribute_early_items(world: MultiWorld,
             player_local = early_local_rest_items[player]
             fill_restrictive(world, base_state,
                              [loc for loc in early_locations if loc.player == player],
-                             player_local, lock=True, allow_partial=True)
+                             player_local, lock=True, allow_partial=True, name=f"Local Early Items P{player}")
             if player_local:
                 logging.warning(f"Could not fulfill rules of early items: {player_local}")
                 early_rest_items.extend(early_local_rest_items[player])
         early_locations = [loc for loc in early_locations if not loc.item]
-        fill_restrictive(world, base_state, early_locations, early_rest_items, lock=True, allow_partial=True)
+        fill_restrictive(world, base_state, early_locations, early_rest_items, lock=True, allow_partial=True,
+                         name="Early Items")
         early_locations += early_priority_locations
         for player in world.player_ids:
             player_local = early_local_prog_items[player]
             fill_restrictive(world, base_state,
                              [loc for loc in early_locations if loc.player == player],
-                             player_local, lock=True, allow_partial=True)
+                             player_local, lock=True, allow_partial=True, name=f"Local Early Progression P{player}")
             if player_local:
                 logging.warning(f"Could not fulfill rules of early items: {player_local}")
                 early_prog_items.extend(player_local)
         early_locations = [loc for loc in early_locations if not loc.item]
-        fill_restrictive(world, base_state, early_locations, early_prog_items, lock=True, allow_partial=True)
+        fill_restrictive(world, base_state, early_locations, early_prog_items, lock=True, allow_partial=True,
+                         name="Early Progression")
         unplaced_early_items = early_rest_items + early_prog_items
         if unplaced_early_items:
             logging.warning("Ran out of early locations for early items. Failed to place "
@@ -420,13 +446,14 @@ def distribute_items_restrictive(world: MultiWorld) -> None:
 
     if prioritylocations:
         # "priority fill"
-        fill_restrictive(world, world.state, prioritylocations, progitempool, swap=False, on_place=mark_for_locking)
+        fill_restrictive(world, world.state, prioritylocations, progitempool, swap=False, on_place=mark_for_locking,
+                         name="Priority")
         accessibility_corrections(world, world.state, prioritylocations, progitempool)
         defaultlocations = prioritylocations + defaultlocations
 
     if progitempool:
-        # "progression fill"
-        fill_restrictive(world, world.state, defaultlocations, progitempool)
+        # "advancement/progression fill"
+        fill_restrictive(world, world.state, defaultlocations, progitempool, name="Progression")
         if progitempool:
             raise FillError(
                 f'Not enough locations for progress items. There are {len(progitempool)} more items than locations')
@@ -444,7 +471,7 @@ def distribute_items_restrictive(world: MultiWorld) -> None:
         raise FillError(
             f"Not enough filler items for excluded locations. There are {len(excludedlocations)} more locations than items")
 
-    restitempool = usefulitempool + filleritempool
+    restitempool = filleritempool + usefulitempool
 
     remaining_fill(world, defaultlocations, restitempool)
 
@@ -523,7 +550,7 @@ def flood_items(world: MultiWorld) -> None:
                 break
 
 
-def balance_multiworld_progression(world: MultiWorld) -> None:
+def balance_multiworld_progression(multiworld: MultiWorld) -> None:
     # A system to reduce situations where players have no checks remaining, popularly known as "BK mode."
     # Overall progression balancing algorithm:
     # Gather up all locations in a sphere.
@@ -531,28 +558,28 @@ def balance_multiworld_progression(world: MultiWorld) -> None:
     # If other players are below the threshold value, swap progression in this sphere into earlier spheres,
     #   which gives more locations available by this sphere.
     balanceable_players: typing.Dict[int, float] = {
-        player: world.progression_balancing[player] / 100
-        for player in world.player_ids
-        if world.progression_balancing[player] > 0
+        player: multiworld.worlds[player].options.progression_balancing / 100
+        for player in multiworld.player_ids
+        if multiworld.worlds[player].options.progression_balancing > 0
     }
     if not balanceable_players:
         logging.info('Skipping multiworld progression balancing.')
     else:
         logging.info(f'Balancing multiworld progression for {len(balanceable_players)} Players.')
         logging.debug(balanceable_players)
-        state: CollectionState = CollectionState(world)
+        state: CollectionState = CollectionState(multiworld)
         checked_locations: typing.Set[Location] = set()
-        unchecked_locations: typing.Set[Location] = set(world.get_locations())
+        unchecked_locations: typing.Set[Location] = set(multiworld.get_locations())
 
         total_locations_count: typing.Counter[int] = Counter(
             location.player
-            for location in world.get_locations()
+            for location in multiworld.get_locations()
             if not location.locked
         )
         reachable_locations_count: typing.Dict[int, int] = {
             player: 0
-            for player in world.player_ids
-            if total_locations_count[player] and len(world.get_filled_locations(player)) != 0
+            for player in multiworld.player_ids
+            if total_locations_count[player] and len(multiworld.get_filled_locations(player)) != 0
         }
         balanceable_players = {
             player: balanceable_players[player]
@@ -631,7 +658,7 @@ def balance_multiworld_progression(world: MultiWorld) -> None:
                             balancing_unchecked_locations.remove(location)
                             if not location.locked:
                                 balancing_reachables[location.player] += 1
-                        if world.has_beaten_game(balancing_state) or all(
+                        if multiworld.has_beaten_game(balancing_state) or all(
                                 item_percentage(player, reachables) >= threshold_percentages[player]
                                 for player, reachables in balancing_reachables.items()
                                 if player in threshold_percentages):
@@ -648,7 +675,7 @@ def balance_multiworld_progression(world: MultiWorld) -> None:
                         locations_to_test = unlocked_locations[player]
                         items_to_test = list(candidate_items[player])
                         items_to_test.sort()
-                        world.random.shuffle(items_to_test)
+                        multiworld.random.shuffle(items_to_test)
                         while items_to_test:
                             testing = items_to_test.pop()
                             reducing_state = state.copy()
@@ -660,8 +687,8 @@ def balance_multiworld_progression(world: MultiWorld) -> None:
 
                             reducing_state.sweep_for_events(locations=locations_to_test)
 
-                            if world.has_beaten_game(balancing_state):
-                                if not world.has_beaten_game(reducing_state):
+                            if multiworld.has_beaten_game(balancing_state):
+                                if not multiworld.has_beaten_game(reducing_state):
                                     items_to_replace.append(testing)
                             else:
                                 reduced_sphere = get_sphere_locations(reducing_state, locations_to_test)
@@ -669,33 +696,32 @@ def balance_multiworld_progression(world: MultiWorld) -> None:
                                 if p < threshold_percentages[player]:
                                     items_to_replace.append(testing)
 
-                    replaced_items = False
+                    old_moved_item_count = moved_item_count
 
                     # sort then shuffle to maintain deterministic behaviour,
                     # while allowing use of set for better algorithm growth behaviour elsewhere
                     replacement_locations = sorted(l for l in checked_locations if not l.event and not l.locked)
-                    world.random.shuffle(replacement_locations)
+                    multiworld.random.shuffle(replacement_locations)
                     items_to_replace.sort()
-                    world.random.shuffle(items_to_replace)
+                    multiworld.random.shuffle(items_to_replace)
 
                     # Start swapping items. Since we swap into earlier spheres, no need for accessibility checks. 
                     while replacement_locations and items_to_replace:
                         old_location = items_to_replace.pop()
-                        for new_location in replacement_locations:
+                        for i, new_location in enumerate(replacement_locations):
                             if new_location.can_fill(state, old_location.item, False) and \
                                     old_location.can_fill(state, new_location.item, False):
-                                replacement_locations.remove(new_location)
+                                replacement_locations.pop(i)
                                 swap_location_item(old_location, new_location)
                                 logging.debug(f"Progression balancing moved {new_location.item} to {new_location}, "
                                               f"displacing {old_location.item} into {old_location}")
                                 moved_item_count += 1
                                 state.collect(new_location.item, True, new_location)
-                                replaced_items = True
                                 break
                         else:
                             logging.warning(f"Could not Progression Balance {old_location.item}")
 
-                    if replaced_items:
+                    if old_moved_item_count < moved_item_count:
                         logging.debug(f"Moved {moved_item_count} items so far\n")
                         unlocked = {fresh for player in balancing_players for fresh in unlocked_locations[player]}
                         for location in get_sphere_locations(state, unlocked):
@@ -709,7 +735,7 @@ def balance_multiworld_progression(world: MultiWorld) -> None:
                     state.collect(location.item, True, location)
             checked_locations |= sphere_locations
 
-            if world.has_beaten_game(state):
+            if multiworld.has_beaten_game(state):
                 break
             elif not sphere_locations:
                 logging.warning("Progression Balancing ran out of paths.")
@@ -753,8 +779,6 @@ def distribute_planned(world: MultiWorld) -> None:
         else:  # not reachable with swept state
             non_early_locations[loc.player].append(loc.name)
 
-    # TODO: remove. Preferably by implementing key drop
-    from worlds.alttp.Regions import key_drop_data
     world_name_lookup = world.world_name_lookup
 
     block_value = typing.Union[typing.List[str], typing.Dict[str, typing.Any], str]
@@ -767,6 +791,9 @@ def distribute_planned(world: MultiWorld) -> None:
                 block['force'] = 'silent'
             if 'from_pool' not in block:
                 block['from_pool'] = True
+            elif not isinstance(block['from_pool'], bool):
+                from_pool_type = type(block['from_pool'])
+                raise Exception(f'Plando "from_pool" has to be boolean, not {from_pool_type} for player {player}.')
             if 'world' not in block:
                 target_world = False
             else:
@@ -847,7 +874,7 @@ def distribute_planned(world: MultiWorld) -> None:
                 for target_player in worlds:
                     locations += non_early_locations[target_player]
 
-            block['locations'] = locations
+            block['locations'] = list(dict.fromkeys(locations))
 
             if not block['count']:
                 block['count'] = (min(len(block['items']), len(block['locations'])) if
@@ -897,23 +924,22 @@ def distribute_planned(world: MultiWorld) -> None:
             for item_name in items:
                 item = world.worlds[player].create_item(item_name)
                 for location in reversed(candidates):
-                    if location in key_drop_data:
-                        warn(
-                            f"Can't place '{item_name}' at '{placement.location}', as key drop shuffle locations are not supported yet.")
-                        continue
-                    if not location.item:
-                        if location.item_rule(item):
-                            if location.can_fill(world.state, item, False):
-                                successful_pairs.append((item, location))
-                                candidates.remove(location)
-                                count = count + 1
-                                break
+                    if (location.address is None) == (item.code is None):  # either both None or both not None
+                        if not location.item:
+                            if location.item_rule(item):
+                                if location.can_fill(world.state, item, False):
+                                    successful_pairs.append((item, location))
+                                    candidates.remove(location)
+                                    count = count + 1
+                                    break
+                                else:
+                                    err.append(f"Can't place item at {location} due to fill condition not met.")
                             else:
-                                err.append(f"Can't place item at {location} due to fill condition not met.")
+                                err.append(f"{item_name} not allowed at {location}.")
                         else:
-                            err.append(f"{item_name} not allowed at {location}.")
+                            err.append(f"Cannot place {item_name} into already filled location {location}.")
                     else:
-                        err.append(f"Cannot place {item_name} into already filled location {location}.")
+                        err.append(f"Mismatch between {item_name} and {location}, only one is an event.")
                 if count == maxcount:
                     break
             if count < placement['count']['min']:
diff --git a/Generate.py b/Generate.py
index 5d44a1db45..e19a7a973f 100644
--- a/Generate.py
+++ b/Generate.py
@@ -7,8 +7,8 @@ import random
 import string
 import urllib.parse
 import urllib.request
-from collections import ChainMap, Counter
-from typing import Any, Callable, Dict, Tuple, Union
+from collections import Counter
+from typing import Any, Dict, Tuple, Union
 
 import ModuleUpdate
 
@@ -20,7 +20,7 @@ import Options
 from BaseClasses import seeddigits, get_seed, PlandoOptions
 from Main import main as ERmain
 from settings import get_settings
-from Utils import parse_yamls, version_tuple, __version__, tuplize_version, user_path
+from Utils import parse_yamls, version_tuple, __version__, tuplize_version
 from worlds.alttp import Options as LttPOptions
 from worlds.alttp.EntranceRandomizer import parse_arguments
 from worlds.alttp.Text import TextTable
@@ -53,6 +53,9 @@ def mystery_argparse():
                         help='List of options that can be set manually. Can be combined, for example "bosses, items"')
     parser.add_argument("--skip_prog_balancing", action="store_true",
                         help="Skip progression balancing step during generation.")
+    parser.add_argument("--skip_output", action="store_true",
+                        help="Skips generation assertion and output stages and skips multidata and spoiler output. "
+                             "Intended for debugging and testing purposes.")
     args = parser.parse_args()
     if not os.path.isabs(args.weights_file_path):
         args.weights_file_path = os.path.join(args.player_files_path, args.weights_file_path)
@@ -127,6 +130,13 @@ def main(args=None, callback=ERmain):
                 player_id += 1
 
     args.multi = max(player_id - 1, args.multi)
+
+    if args.multi == 0:
+        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."
+        )
+
     logging.info(f"Generating for {args.multi} player{'s' if args.multi > 1 else ''}, "
                  f"{seed_name} Seed {seed} with plando: {args.plando}")
 
@@ -143,6 +153,7 @@ def main(args=None, callback=ERmain):
     erargs.outputname = seed_name
     erargs.outputpath = args.outputpath
     erargs.skip_prog_balancing = args.skip_prog_balancing
+    erargs.skip_output = args.skip_output
 
     settings_cache: Dict[str, Tuple[argparse.Namespace, ...]] = \
         {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.samesettings else None)
@@ -157,7 +168,8 @@ def main(args=None, callback=ERmain):
                         for yaml in weights_cache[path]:
                             if category_name is None:
                                 for category in yaml:
-                                    if category in AutoWorldRegister.world_types and key in Options.common_options:
+                                    if category in AutoWorldRegister.world_types and \
+                                            key in Options.CommonOptions.type_hints:
                                         yaml[category][key] = option
                             elif category_name not in yaml:
                                 logging.warning(f"Meta: Category {category_name} is not present in {path}.")
@@ -168,7 +180,7 @@ def main(args=None, callback=ERmain):
     for player in range(1, args.multi + 1):
         player_path_cache[player] = player_files.get(player, args.weights_file_path)
     name_counter = Counter()
-    erargs.player_settings = {}
+    erargs.player_options = {}
 
     player = 1
     while player <= args.multi:
@@ -224,7 +236,7 @@ def main(args=None, callback=ERmain):
         with open(os.path.join(args.outputpath if args.outputpath else ".", f"generate_{seed_name}.yaml"), "wt") as f:
             yaml.dump(important, f)
 
-    callback(erargs, seed)
+    return callback(erargs, seed)
 
 
 def read_weights_yamls(path) -> Tuple[Any, ...]:
@@ -340,7 +352,7 @@ def roll_meta_option(option_key, game: str, category_dict: Dict) -> Any:
         return get_choice(option_key, category_dict)
     if game in AutoWorldRegister.world_types:
         game_world = AutoWorldRegister.world_types[game]
-        options = ChainMap(game_world.option_definitions, Options.per_game_common_options)
+        options = game_world.options_dataclass.type_hints
         if option_key in options:
             if options[option_key].supports_weighting:
                 return get_choice(option_key, category_dict)
@@ -445,8 +457,8 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
                                 f"which is not enabled.")
 
     ret = argparse.Namespace()
-    for option_key in Options.per_game_common_options:
-        if option_key in weights and option_key not in Options.common_options:
+    for option_key in Options.PerGameCommonOptions.type_hints:
+        if option_key in weights and option_key not in Options.CommonOptions.type_hints:
             raise Exception(f"Option {option_key} has to be in a game's section, not on its own.")
 
     ret.game = get_choice("game", weights)
@@ -466,16 +478,11 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
         game_weights = weights[ret.game]
 
     ret.name = get_choice('name', weights)
-    for option_key, option in Options.common_options.items():
+    for option_key, option in Options.CommonOptions.type_hints.items():
         setattr(ret, option_key, option.from_any(get_choice(option_key, weights, option.default)))
 
-    for option_key, option in world_type.option_definitions.items():
+    for option_key, option in world_type.options_dataclass.type_hints.items():
         handle_option(ret, game_weights, option_key, option, plando_options)
-    for option_key, option in Options.per_game_common_options.items():
-        # skip setting this option if already set from common_options, defaulting to root option
-        if option_key not in world_type.option_definitions and \
-                (option_key not in Options.common_options or option_key in game_weights):
-            handle_option(ret, game_weights, option_key, option, plando_options)
     if PlandoOptions.items in plando_options:
         ret.plando_items = game_weights.get("plando_items", [])
     if ret.game == "Minecraft" or ret.game == "Ocarina of Time":
@@ -643,6 +650,15 @@ def roll_alttp_settings(ret: argparse.Namespace, weights, plando_options):
 if __name__ == '__main__':
     import atexit
     confirmation = atexit.register(input, "Press enter to close.")
-    main()
+    multiworld = main()
+    if __debug__:
+        import gc
+        import sys
+        import weakref
+        weak = weakref.ref(multiworld)
+        del multiworld
+        gc.collect()  # need to collect to deref all hard references
+        assert not weak(), f"MultiWorld object was not de-allocated, it's referenced {sys.getrefcount(weak())} times." \
+                           " This would be a memory leak."
     # in case of error-free exit should not need confirmation
     atexit.unregister(confirmation)
diff --git a/KH2Client.py b/KH2Client.py
index 1134932dc2..69e4adf8bf 100644
--- a/KH2Client.py
+++ b/KH2Client.py
@@ -1,894 +1,8 @@
-import os
-import asyncio
 import ModuleUpdate
-import json
 import Utils
-from pymem import pymem
-from worlds.kh2.Items import exclusionItem_table, CheckDupingItems
-from worlds.kh2 import all_locations, item_dictionary_table, exclusion_table
-
-from worlds.kh2.WorldLocations import *
-
-from worlds import network_data_package
-
-if __name__ == "__main__":
-    Utils.init_logging("KH2Client", exception_logger="Client")
-
-from NetUtils import ClientStatus
-from CommonClient import gui_enabled, logger, get_base_parser, ClientCommandProcessor, \
-    CommonContext, server_loop
-
+from worlds.kh2.Client import launch
 ModuleUpdate.update()
 
-kh2_loc_name_to_id = network_data_package["games"]["Kingdom Hearts 2"]["location_name_to_id"]
-
-
-# class KH2CommandProcessor(ClientCommandProcessor):
-
-
-class KH2Context(CommonContext):
-    # command_processor: int = KH2CommandProcessor
-    game = "Kingdom Hearts 2"
-    items_handling = 0b101  # Indicates you get items sent from other worlds.
-
-    def __init__(self, server_address, password):
-        super(KH2Context, self).__init__(server_address, password)
-        self.kh2LocalItems = None
-        self.ability = None
-        self.growthlevel = None
-        self.KH2_sync_task = None
-        self.syncing = False
-        self.kh2connected = False
-        self.serverconneced = 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.lookup_id_to_item: typing.Dict[int, str] = {data.code: item_name for item_name, data in
-                                                         item_dictionary_table.items() if data.code}
-        self.lookup_id_to_Location: typing.Dict[int, str] = {data.code: item_name for item_name, data in
-                                                             all_locations.items() if data.code}
-        self.location_name_to_worlddata = {name: data for name, data, in all_world_locations.items()}
-
-        self.location_table = {}
-        self.collectible_table = {}
-        self.collectible_override_flags_address = 0
-        self.collectible_offsets = {}
-        self.sending = []
-        # list used to keep track of locations+items player has. Used for disoneccting
-        self.kh2seedsave = None
-        self.slotDataProgressionNames = {}
-        self.kh2seedname = None
-        self.kh2slotdata = None
-        self.itemamount = {}
-        # sora equipped, valor equipped, master equipped, final equipped
-        self.keybladeAnchorList = (0x24F0, 0x32F4, 0x339C, 0x33D4)
-        if "localappdata" in os.environ:
-            self.game_communication_path = os.path.expandvars(r"%localappdata%\KH2AP")
-        self.amountOfPieces = 0
-        # hooked object
-        self.kh2 = None
-        self.ItemIsSafe = False
-        self.game_connected = False
-        self.finalxemnas = False
-        self.worldid = {
-            #  1:   {},  # world of darkness (story cutscenes)
-            2:  TT_Checks,
-            #  3:   {},  # destiny island doesn't have checks to ima put tt checks here
-            4:  HB_Checks,
-            5:  BC_Checks,
-            6:  Oc_Checks,
-            7:  AG_Checks,
-            8:  LoD_Checks,
-            9:  HundredAcreChecks,
-            10: PL_Checks,
-            11: DC_Checks,  # atlantica isn't a supported world. if you go in atlantica it will check dc
-            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
-        }
-        # 0x2A09C00+0x40 is the sve anchor. +1 is the last saved room
-        self.sveroom = 0x2A09C00 + 0x41
-        # 0 not in battle 1 in yellow battle 2 red battle #short
-        self.inBattle = 0x2A0EAC4 + 0x40
-        self.onDeath = 0xAB9078
-        # PC Address anchors
-        self.Now = 0x0714DB8
-        self.Save = 0x09A70B0
-        self.Sys3 = 0x2A59DF0
-        self.Bt10 = 0x2A74880
-        self.BtlEnd = 0x2A0D3E0
-        self.Slot1 = 0x2A20C98
-
-        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.boost_set = set(CheckDupingItems["Boosts"])
-        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": [0x066, 0x069, 0x25E0],
-                                   "Glide":        [0x6A, 0x6D, 0x25E2]}
-        self.boost_to_anchor_dict = {
-            "Power Boost":   0x24F9,
-            "Magic Boost":   0x24FA,
-            "Defense Boost": 0x24FB,
-            "AP Boost":      0x24F8}
-
-        self.AbilityCodeList = [self.item_name_to_data[item].code for item in exclusionItem_table["Ability"]]
-        self.master_growth = {"High Jump", "Quick Run", "Dodge Roll", "Aerial Dodge", "Glide"}
-
-        self.bitmask_item_code = [
-            0x130000, 0x130001, 0x130002, 0x130003, 0x130004, 0x130005, 0x130006, 0x130007
-            , 0x130008, 0x130009, 0x13000A, 0x13000B, 0x13000C
-            , 0x13001F, 0x130020, 0x130021, 0x130022, 0x130023
-            , 0x13002A, 0x13002B, 0x13002C, 0x13002D]
-
-    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()
-        await self.send_connect()
-
-    async def connection_closed(self):
-        self.kh2connected = False
-        self.serverconneced = False
-        if self.kh2seedname is not None and self.auth is not None:
-            with open(os.path.join(self.game_communication_path, f"kh2save{self.kh2seedname}{self.auth}.json"),
-                      'w') as f:
-                f.write(json.dumps(self.kh2seedsave, indent=4))
-        await super(KH2Context, self).connection_closed()
-
-    async def disconnect(self, allow_autoreconnect: bool = False):
-        self.kh2connected = False
-        self.serverconneced = False
-        if self.kh2seedname not in {None} and self.auth not in {None}:
-            with open(os.path.join(self.game_communication_path, f"kh2save{self.kh2seedname}{self.auth}.json"),
-                      'w') as f:
-                f.write(json.dumps(self.kh2seedsave, 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(os.path.join(self.game_communication_path, f"kh2save{self.kh2seedname}{self.auth}.json"),
-                      'w') as f:
-                f.write(json.dumps(self.kh2seedsave, indent=4))
-        await super(KH2Context, self).shutdown()
-
-    def on_package(self, cmd: str, args: dict):
-        if cmd in {"RoomInfo"}:
-            self.kh2seedname = args['seed_name']
-            if not os.path.exists(self.game_communication_path):
-                os.makedirs(self.game_communication_path)
-            if not os.path.exists(self.game_communication_path + f"\kh2save{self.kh2seedname}{self.auth}.json"):
-                self.kh2seedsave = {"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":        [0x280A, 0x276C],
-                                    "AmountInvo":       {
-                                        "ServerItems": {
-                                            "Ability":      {},
-                                            "Amount":       {},
-                                            "Growth":       {"High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
-                                                             "Aerial Dodge": 0,
-                                                             "Glide":        0},
-                                            "Bitmask":      [],
-                                            "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
-                                            "Equipment":    [],
-                                            "Magic":        {},
-                                            "StatIncrease": {},
-                                            "Boost":        {},
-                                        },
-                                        "LocalItems":  {
-                                            "Ability":      {},
-                                            "Amount":       {},
-                                            "Growth":       {"High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
-                                                             "Aerial Dodge": 0, "Glide": 0},
-                                            "Bitmask":      [],
-                                            "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
-                                            "Equipment":    [],
-                                            "Magic":        {},
-                                            "StatIncrease": {},
-                                            "Boost":        {},
-                                        }},
-                                    #  1,3,255 are in this list in case the player gets locations in those "worlds" and I need to still have them checked
-                                    "LocationsChecked": [],
-                                    "Levels":           {
-                                        "SoraLevel":   0,
-                                        "ValorLevel":  0,
-                                        "WisdomLevel": 0,
-                                        "LimitLevel":  0,
-                                        "MasterLevel": 0,
-                                        "FinalLevel":  0,
-                                    },
-                                    "SoldEquipment":    [],
-                                    "SoldBoosts":       {"Power Boost":   0,
-                                                         "Magic Boost":   0,
-                                                         "Defense Boost": 0,
-                                                         "AP Boost":      0}
-                                    }
-                with open(os.path.join(self.game_communication_path, f"kh2save{self.kh2seedname}{self.auth}.json"),
-                          'wt') as f:
-                    pass
-                self.locations_checked = set()
-            elif os.path.exists(self.game_communication_path + f"\kh2save{self.kh2seedname}{self.auth}.json"):
-                with open(self.game_communication_path + f"\kh2save{self.kh2seedname}{self.auth}.json", 'r') as f:
-                    self.kh2seedsave = json.load(f)
-                    self.locations_checked = set(self.kh2seedsave["LocationsChecked"])
-            self.serverconneced = True
-
-        if cmd in {"Connected"}:
-            self.kh2slotdata = args['slot_data']
-            self.kh2LocalItems = {int(location): item for location, item in self.kh2slotdata["LocalItems"].items()}
-            try:
-                self.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
-                logger.info("You are now auto-tracking")
-                self.kh2connected = True
-            except Exception as e:
-                logger.info("Line 247")
-                if self.kh2connected:
-                    logger.info("Connection Lost")
-                    self.kh2connected = False
-                logger.info(e)
-
-        if cmd in {"ReceivedItems"}:
-            start_index = args["index"]
-            if start_index == 0:
-                # resetting everything that were sent from the server
-                self.kh2seedsave["SoraInvo"][0] = 0x25D8
-                self.kh2seedsave["DonaldInvo"][0] = 0x26F4
-                self.kh2seedsave["GoofyInvo"][0] = 0x280A
-                self.kh2seedsave["itemIndex"] = - 1
-                self.kh2seedsave["AmountInvo"]["ServerItems"] = {
-                    "Ability":      {},
-                    "Amount":       {},
-                    "Growth":       {"High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
-                                     "Aerial Dodge": 0,
-                                     "Glide":        0},
-                    "Bitmask":      [],
-                    "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
-                    "Equipment":    [],
-                    "Magic":        {},
-                    "StatIncrease": {},
-                    "Boost":        {},
-                }
-            if start_index > self.kh2seedsave["itemIndex"]:
-                self.kh2seedsave["itemIndex"] = start_index
-                for item in args['items']:
-                    asyncio.create_task(self.give_item(item.item))
-
-        if cmd in {"RoomUpdate"}:
-            if "checked_locations" in args:
-                new_locations = set(args["checked_locations"])
-                # TODO: make this take locations from other players on the same slot so proper coop happens
-                #  items_to_give = [self.kh2slotdata["LocalItems"][str(location_id)] for location_id in new_locations if
-                #                 location_id in self.kh2LocalItems.keys()]
-                self.checked_locations |= new_locations
-
-    async def checkWorldLocations(self):
-        try:
-            currentworldint = int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + 0x0714DB8, 1), "big")
-            if currentworldint in self.worldid:
-                curworldid = self.worldid[currentworldint]
-                for location, data in curworldid.items():
-                    locationId = kh2_loc_name_to_id[location]
-                    if locationId not in self.locations_checked \
-                            and (int.from_bytes(
-                            self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1),
-                            "big") & 0x1 << data.bitIndex) > 0:
-                        self.sending = self.sending + [(int(locationId))]
-        except Exception as e:
-            logger.info("Line 285")
-            if self.kh2connected:
-                logger.info("Connection Lost.")
-                self.kh2connected = False
-            logger.info(e)
-
-    async def checkLevels(self):
-        try:
-            for location, data in SoraLevels.items():
-                currentLevel = int.from_bytes(
-                        self.kh2.read_bytes(self.kh2.base_address + self.Save + 0x24FF, 1), "big")
-                locationId = kh2_loc_name_to_id[location]
-                if locationId not in self.locations_checked \
-                        and currentLevel >= data.bitIndex:
-                    if self.kh2seedsave["Levels"]["SoraLevel"] < currentLevel:
-                        self.kh2seedsave["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]}
-            for i in range(5):
-                for location, data in formDict[i][1].items():
-                    formlevel = int.from_bytes(
-                            self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1), "big")
-                    locationId = kh2_loc_name_to_id[location]
-                    if locationId not in self.locations_checked \
-                            and formlevel >= data.bitIndex:
-                        if formlevel > self.kh2seedsave["Levels"][formDict[i][0]]:
-                            self.kh2seedsave["Levels"][formDict[i][0]] = formlevel
-                        self.sending = self.sending + [(int(locationId))]
-        except Exception as e:
-            logger.info("Line 312")
-            if self.kh2connected:
-                logger.info("Connection Lost.")
-                self.kh2connected = False
-            logger.info(e)
-
-    async def checkSlots(self):
-        try:
-            for location, data in weaponSlots.items():
-                locationId = kh2_loc_name_to_id[location]
-                if locationId not in self.locations_checked:
-                    if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1),
-                                      "big") > 0:
-                        self.sending = self.sending + [(int(locationId))]
-
-            for location, data in formSlots.items():
-                locationId = kh2_loc_name_to_id[location]
-                if locationId not in self.locations_checked:
-                    if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1),
-                                      "big") & 0x1 << data.bitIndex > 0:
-                        # self.locations_checked
-                        self.sending = self.sending + [(int(locationId))]
-
-        except Exception as e:
-            if self.kh2connected:
-                logger.info("Line 333")
-                logger.info("Connection Lost.")
-                self.kh2connected = False
-            logger.info(e)
-
-    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 int.from_bytes(
-                                self.kh2.read_bytes(self.kh2.base_address + self.Save + locationData.addrObtained, 1),
-                                "big") & 0x1 << locationData.bitIndex == 0:
-                            roomData = int.from_bytes(
-                                    self.kh2.read_bytes(self.kh2.base_address + self.Save + locationData.addrObtained,
-                                                        1), "big")
-                            self.kh2.write_bytes(self.kh2.base_address + self.Save + locationData.addrObtained,
-                                                 (roomData | 0x01 << locationData.bitIndex).to_bytes(1, 'big'), 1)
-
-        except Exception as e:
-            if self.kh2connected:
-                logger.info("Line 350")
-                logger.info("Connection Lost.")
-                self.kh2connected = False
-            logger.info(e)
-
-    async def verifyLevel(self):
-        for leveltype, anchor in {"SoraLevel":   0x24FF,
-                                  "ValorLevel":  0x32F6,
-                                  "WisdomLevel": 0x332E,
-                                  "LimitLevel":  0x3366,
-                                  "MasterLevel": 0x339E,
-                                  "FinalLevel":  0x33D6}.items():
-            if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + anchor, 1), "big") < \
-                    self.kh2seedsave["Levels"][leveltype]:
-                self.kh2.write_bytes(self.kh2.base_address + self.Save + anchor,
-                                     (self.kh2seedsave["Levels"][leveltype]).to_bytes(1, 'big'), 1)
-
-    async def give_item(self, item, ItemType="ServerItems"):
-        try:
-            itemname = self.lookup_id_to_item[item]
-            itemcode = self.item_name_to_data[itemname]
-            if itemcode.ability:
-                abilityInvoType = 0
-                TwilightZone = 2
-                if ItemType == "LocalItems":
-                    abilityInvoType = 1
-                    TwilightZone = -2
-                if itemname in {"High Jump", "Quick Run", "Dodge Roll", "Aerial Dodge", "Glide"}:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Growth"][itemname] += 1
-                    return
-
-                if itemname not in self.kh2seedsave["AmountInvo"][ItemType]["Ability"]:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Ability"][itemname] = []
-                    #  appending the slot that the ability should be in
-
-                if len(self.kh2seedsave["AmountInvo"][ItemType]["Ability"][itemname]) < \
-                        self.AbilityQuantityDict[itemname]:
-                    if itemname in self.sora_ability_set:
-                        self.kh2seedsave["AmountInvo"][ItemType]["Ability"][itemname].append(
-                                self.kh2seedsave["SoraInvo"][abilityInvoType])
-                        self.kh2seedsave["SoraInvo"][abilityInvoType] -= TwilightZone
-                    elif itemname in self.donald_ability_set:
-                        self.kh2seedsave["AmountInvo"][ItemType]["Ability"][itemname].append(
-                                self.kh2seedsave["DonaldInvo"][abilityInvoType])
-                        self.kh2seedsave["DonaldInvo"][abilityInvoType] -= TwilightZone
-                    else:
-                        self.kh2seedsave["AmountInvo"][ItemType]["Ability"][itemname].append(
-                                self.kh2seedsave["GoofyInvo"][abilityInvoType])
-                        self.kh2seedsave["GoofyInvo"][abilityInvoType] -= TwilightZone
-
-            elif itemcode.code in self.bitmask_item_code:
-
-                if itemname not in self.kh2seedsave["AmountInvo"][ItemType]["Bitmask"]:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Bitmask"].append(itemname)
-
-            elif itemcode.memaddr in {0x3594, 0x3595, 0x3596, 0x3597, 0x35CF, 0x35D0}:
-
-                if itemname in self.kh2seedsave["AmountInvo"][ItemType]["Magic"]:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Magic"][itemname] += 1
-                else:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Magic"][itemname] = 1
-            elif itemname in self.all_equipment:
-
-                self.kh2seedsave["AmountInvo"][ItemType]["Equipment"].append(itemname)
-
-            elif itemname in self.all_weapons:
-                if itemname in self.keyblade_set:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Weapon"]["Sora"].append(itemname)
-                elif itemname in self.staff_set:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Weapon"]["Donald"].append(itemname)
-                else:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Weapon"]["Goofy"].append(itemname)
-
-            elif itemname in self.boost_set:
-                if itemname in self.kh2seedsave["AmountInvo"][ItemType]["Boost"]:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Boost"][itemname] += 1
-                else:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Boost"][itemname] = 1
-
-            elif itemname in self.stat_increase_set:
-
-                if itemname in self.kh2seedsave["AmountInvo"][ItemType]["StatIncrease"]:
-                    self.kh2seedsave["AmountInvo"][ItemType]["StatIncrease"][itemname] += 1
-                else:
-                    self.kh2seedsave["AmountInvo"][ItemType]["StatIncrease"][itemname] = 1
-
-            else:
-                if itemname in self.kh2seedsave["AmountInvo"][ItemType]["Amount"]:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Amount"][itemname] += 1
-                else:
-                    self.kh2seedsave["AmountInvo"][ItemType]["Amount"][itemname] = 1
-
-        except Exception as e:
-            if self.kh2connected:
-                logger.info("Line 398")
-                logger.info("Connection Lost.")
-                self.kh2connected = False
-            logger.info(e)
-
-    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, master_boost):
-        # journal = 0x741230 shop = 0x741320
-        # if journal=-1 and shop = 5 then in shop
-        # if journam !=-1 and shop = 10 then journal
-        journal = self.kh2.read_short(self.kh2.base_address + 0x741230)
-        shop = self.kh2.read_short(self.kh2.base_address + 0x741320)
-        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 = int.from_bytes(
-                        self.kh2.read_bytes(self.kh2.base_address + self.Save + itemdata.memaddr, 1), "big")
-                sellable_dict[itemName] = amount
-            while (journal == -1 and shop == 5) or (journal != -1 and shop == 10):
-                journal = self.kh2.read_short(self.kh2.base_address + 0x741230)
-                shop = self.kh2.read_short(self.kh2.base_address + 0x741320)
-                await asyncio.sleep(0.5)
-            for item, amount in sellable_dict.items():
-                itemdata = self.item_name_to_data[item]
-                afterShop = int.from_bytes(
-                        self.kh2.read_bytes(self.kh2.base_address + self.Save + itemdata.memaddr, 1), "big")
-                if afterShop < amount:
-                    if item in master_boost:
-                        self.kh2seedsave["SoldBoosts"][item] += (amount - afterShop)
-                    else:
-                        self.kh2seedsave["SoldEquipment"].append(item)
-
-    async def verifyItems(self):
-        try:
-            local_amount = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Amount"].keys())
-            server_amount = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Amount"].keys())
-            master_amount = local_amount | server_amount
-
-            local_ability = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Ability"].keys())
-            server_ability = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Ability"].keys())
-            master_ability = local_ability | server_ability
-
-            local_bitmask = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Bitmask"])
-            server_bitmask = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Bitmask"])
-            master_bitmask = local_bitmask | server_bitmask
-
-            local_keyblade = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Weapon"]["Sora"])
-            local_staff = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Weapon"]["Donald"])
-            local_shield = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Weapon"]["Goofy"])
-
-            server_keyblade = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Weapon"]["Sora"])
-            server_staff = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Weapon"]["Donald"])
-            server_shield = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Weapon"]["Goofy"])
-
-            master_keyblade = local_keyblade | server_keyblade
-            master_staff = local_staff | server_staff
-            master_shield = local_shield | server_shield
-
-            local_equipment = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Equipment"])
-            server_equipment = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Equipment"])
-            master_equipment = local_equipment | server_equipment
-
-            local_magic = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Magic"].keys())
-            server_magic = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Magic"].keys())
-            master_magic = local_magic | server_magic
-
-            local_stat = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["StatIncrease"].keys())
-            server_stat = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["StatIncrease"].keys())
-            master_stat = local_stat | server_stat
-
-            local_boost = set(self.kh2seedsave["AmountInvo"]["LocalItems"]["Boost"].keys())
-            server_boost = set(self.kh2seedsave["AmountInvo"]["ServerItems"]["Boost"].keys())
-            master_boost = local_boost | server_boost
-
-            master_sell = master_equipment | master_staff | master_shield | master_boost
-            await asyncio.create_task(self.IsInShop(master_sell, master_boost))
-            for itemName in master_amount:
-                itemData = self.item_name_to_data[itemName]
-                amountOfItems = 0
-                if itemName in local_amount:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["LocalItems"]["Amount"][itemName]
-                if itemName in server_amount:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["ServerItems"]["Amount"][itemName]
-
-                if itemName == "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 int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1),
-                                          "big") & 0x1 << data.bitIndex > 0:
-                            amountOfItems -= 1
-                if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                  "big") != amountOfItems and amountOfItems >= 0:
-                    self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                         amountOfItems.to_bytes(1, 'big'), 1)
-
-            for itemName in master_keyblade:
-                itemData = self.item_name_to_data[itemName]
-                # if the inventory slot for that keyblade is less than the amount they should have
-                if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                  "big") != 1 and int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + 0x1CFF, 1),
-                                                                 "big") != 13:
-                    # Checking form anchors for the keyblade
-                    if self.kh2.read_short(self.kh2.base_address + self.Save + 0x24F0) == itemData.kh2id \
-                            or self.kh2.read_short(self.kh2.base_address + self.Save + 0x32F4) == itemData.kh2id \
-                            or self.kh2.read_short(self.kh2.base_address + self.Save + 0x339C) == itemData.kh2id \
-                            or self.kh2.read_short(self.kh2.base_address + self.Save + 0x33D4) == itemData.kh2id:
-                        self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                             (0).to_bytes(1, 'big'), 1)
-                    else:
-                        self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                             (1).to_bytes(1, 'big'), 1)
-            for itemName in master_staff:
-                itemData = self.item_name_to_data[itemName]
-                if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                  "big") != 1 \
-                        and self.kh2.read_short(self.kh2.base_address + self.Save + 0x2604) != itemData.kh2id \
-                        and itemName not in self.kh2seedsave["SoldEquipment"]:
-                    self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                         (1).to_bytes(1, 'big'), 1)
-
-            for itemName in master_shield:
-                itemData = self.item_name_to_data[itemName]
-                if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                  "big") != 1 \
-                        and self.kh2.read_short(self.kh2.base_address + self.Save + 0x2718) != itemData.kh2id \
-                        and itemName not in self.kh2seedsave["SoldEquipment"]:
-                    self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                         (1).to_bytes(1, 'big'), 1)
-
-            for itemName in master_ability:
-                itemData = self.item_name_to_data[itemName]
-                ability_slot = []
-                if itemName in local_ability:
-                    ability_slot += self.kh2seedsave["AmountInvo"]["LocalItems"]["Ability"][itemName]
-                if itemName in server_ability:
-                    ability_slot += self.kh2seedsave["AmountInvo"]["ServerItems"]["Ability"][itemName]
-                for slot in ability_slot:
-                    current = self.kh2.read_short(self.kh2.base_address + self.Save + slot)
-                    ability = current & 0x0FFF
-                    if ability | 0x8000 != (0x8000 + itemData.memaddr):
-                        if current - 0x8000 > 0:
-                            self.kh2.write_short(self.kh2.base_address + self.Save + slot, (0x8000 + itemData.memaddr))
-                        else:
-                            self.kh2.write_short(self.kh2.base_address + self.Save + slot, itemData.memaddr)
-            # removes the duped ability if client gave faster than the game.
-            for charInvo in {"SoraInvo", "DonaldInvo", "GoofyInvo"}:
-                if self.kh2.read_short(self.kh2.base_address + self.Save + self.kh2seedsave[charInvo][1]) != 0 and \
-                        self.kh2seedsave[charInvo][1] + 2 < self.kh2seedsave[charInvo][0]:
-                    self.kh2.write_short(self.kh2.base_address + self.Save + self.kh2seedsave[charInvo][1], 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.kh2.base_address + self.Save + inventorySlot)
-                ability = current & 0x0FFF
-                if 0x05E <= ability <= 0x06D:
-                    self.kh2.write_short(self.kh2.base_address + self.Save + inventorySlot, 0)
-
-            for itemName in self.master_growth:
-                growthLevel = self.kh2seedsave["AmountInvo"]["ServerItems"]["Growth"][itemName] \
-                              + self.kh2seedsave["AmountInvo"]["LocalItems"]["Growth"][itemName]
-                if growthLevel > 0:
-                    slot = self.growth_values_dict[itemName][2]
-                    min_growth = self.growth_values_dict[itemName][0]
-                    max_growth = self.growth_values_dict[itemName][1]
-                    if growthLevel > 4:
-                        growthLevel = 4
-                    current_growth_level = self.kh2.read_short(self.kh2.base_address + 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.kh2.base_address + self.Save + slot, min_growth)
-                        # if it is already in the inventory
-                        elif ability | 0x8000 < (0x8000 + max_growth):
-                            self.kh2.write_short(self.kh2.base_address + self.Save + slot, current_growth_level + 1)
-
-            for itemName in master_bitmask:
-                itemData = self.item_name_to_data[itemName]
-                itemMemory = int.from_bytes(
-                        self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1), "big")
-                if (int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                   "big") & 0x1 << itemData.bitmask) == 0:
-                    # when getting a form anti points should be reset to 0 but bit-shift doesn't trigger the game.
-                    if itemName in {"Valor Form", "Wisdom Form", "Limit Form", "Master Form", "Final Form"}:
-                        self.kh2.write_bytes(self.kh2.base_address + self.Save + 0x3410,
-                                             (0).to_bytes(1, 'big'), 1)
-                    self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                         (itemMemory | 0x01 << itemData.bitmask).to_bytes(1, 'big'), 1)
-
-            for itemName in master_equipment:
-                itemData = self.item_name_to_data[itemName]
-                isThere = False
-                if itemName 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.kh2.base_address + self.Save + slot) == itemData.kh2id:
-                        isThere = True
-                        if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                          "big") != 0:
-                            self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                                 (0).to_bytes(1, 'big'), 1)
-                        break
-                if not isThere and itemName not in self.kh2seedsave["SoldEquipment"]:
-                    if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                      "big") != 1:
-                        self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                             (1).to_bytes(1, 'big'), 1)
-
-            for itemName in master_magic:
-                itemData = self.item_name_to_data[itemName]
-                amountOfItems = 0
-                if itemName in local_magic:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["LocalItems"]["Magic"][itemName]
-                if itemName in server_magic:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["ServerItems"]["Magic"][itemName]
-                if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                  "big") != amountOfItems \
-                        and int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + 0x741320, 1), "big") in {10, 8}:
-                    self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                         amountOfItems.to_bytes(1, 'big'), 1)
-
-            for itemName in master_stat:
-                itemData = self.item_name_to_data[itemName]
-                amountOfItems = 0
-                if itemName in local_stat:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["LocalItems"]["StatIncrease"][itemName]
-                if itemName in server_stat:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["ServerItems"]["StatIncrease"][itemName]
-
-                # 0x130293 is Crit_1's location id for touching the computer
-                if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                                  "big") != amountOfItems \
-                        and int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Slot1 + 0x1B2, 1),
-                                           "big") >= 5 and int.from_bytes(
-                        self.kh2.read_bytes(self.kh2.base_address + self.Save + 0x23DF, 1),
-                        "big") > 0:
-                    self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                         amountOfItems.to_bytes(1, 'big'), 1)
-
-            for itemName in master_boost:
-                itemData = self.item_name_to_data[itemName]
-                amountOfItems = 0
-                if itemName in local_boost:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["LocalItems"]["Boost"][itemName]
-                if itemName in server_boost:
-                    amountOfItems += self.kh2seedsave["AmountInvo"]["ServerItems"]["Boost"][itemName]
-                amountOfBoostsInInvo = int.from_bytes(
-                        self.kh2.read_bytes(self.kh2.base_address + self.Save + itemData.memaddr, 1),
-                        "big")
-                amountOfUsedBoosts = int.from_bytes(
-                        self.kh2.read_bytes(self.kh2.base_address + self.Save + self.boost_to_anchor_dict[itemName], 1),
-                        "big")
-                # Ap Boots start at +50 for some reason
-                if itemName == "AP Boost":
-                    amountOfUsedBoosts -= 50
-                totalBoosts = (amountOfBoostsInInvo + amountOfUsedBoosts)
-                if totalBoosts <= amountOfItems - self.kh2seedsave["SoldBoosts"][
-                    itemName] and amountOfBoostsInInvo < 255:
-                    self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
-                                         (amountOfBoostsInInvo + 1).to_bytes(1, 'big'), 1)
-
-        except Exception as e:
-            logger.info("Line 573")
-            if self.kh2connected:
-                logger.info("Connection Lost.")
-                self.kh2connected = False
-            logger.info(e)
-
-
-def finishedGame(ctx: KH2Context, message):
-    if ctx.kh2slotdata['FinalXemnas'] == 1:
-        if 0x1301ED in message[0]["locations"]:
-            ctx.finalxemnas = True
-    # three proofs
-    if ctx.kh2slotdata['Goal'] == 0:
-        if int.from_bytes(ctx.kh2.read_bytes(ctx.kh2.base_address + ctx.Save + 0x36B2, 1), "big") > 0 \
-                and int.from_bytes(ctx.kh2.read_bytes(ctx.kh2.base_address + ctx.Save + 0x36B3, 1), "big") > 0 \
-                and int.from_bytes(ctx.kh2.read_bytes(ctx.kh2.base_address + ctx.Save + 0x36B4, 1), "big") > 0:
-            if ctx.kh2slotdata['FinalXemnas'] == 1:
-                if ctx.finalxemnas:
-                    return True
-                else:
-                    return False
-            else:
-                return True
-        else:
-            return False
-    elif ctx.kh2slotdata['Goal'] == 1:
-        if int.from_bytes(ctx.kh2.read_bytes(ctx.kh2.base_address + ctx.Save + 0x3641, 1), "big") >= \
-                ctx.kh2slotdata['LuckyEmblemsRequired']:
-            ctx.kh2.write_bytes(ctx.kh2.base_address + ctx.Save + 0x36B2, (1).to_bytes(1, 'big'), 1)
-            ctx.kh2.write_bytes(ctx.kh2.base_address + ctx.Save + 0x36B3, (1).to_bytes(1, 'big'), 1)
-            ctx.kh2.write_bytes(ctx.kh2.base_address + ctx.Save + 0x36B4, (1).to_bytes(1, 'big'), 1)
-            if ctx.kh2slotdata['FinalXemnas'] == 1:
-                if ctx.finalxemnas:
-                    return True
-                else:
-                    return False
-            else:
-                return True
-        else:
-            return False
-    elif ctx.kh2slotdata['Goal'] == 2:
-        for boss in ctx.kh2slotdata["hitlist"]:
-            if boss in message[0]["locations"]:
-                ctx.amountOfPieces += 1
-        if ctx.amountOfPieces >= ctx.kh2slotdata["BountyRequired"]:
-            ctx.kh2.write_bytes(ctx.kh2.base_address + ctx.Save + 0x36B2, (1).to_bytes(1, 'big'), 1)
-            ctx.kh2.write_bytes(ctx.kh2.base_address + ctx.Save + 0x36B3, (1).to_bytes(1, 'big'), 1)
-            ctx.kh2.write_bytes(ctx.kh2.base_address + ctx.Save + 0x36B4, (1).to_bytes(1, 'big'), 1)
-            if ctx.kh2slotdata['FinalXemnas'] == 1:
-                if ctx.finalxemnas:
-                    return True
-                else:
-                    return False
-            else:
-                return True
-        else:
-            return False
-
-
-async def kh2_watcher(ctx: KH2Context):
-    while not ctx.exit_event.is_set():
-        try:
-            if ctx.kh2connected and ctx.serverconneced:
-                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())
-                message = [{"cmd": 'LocationChecks', "locations": ctx.sending}]
-                if finishedGame(ctx, message):
-                    await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
-                    ctx.finished_game = True
-                location_ids = []
-                location_ids = [location for location in message[0]["locations"] if location not in location_ids]
-                for location in location_ids:
-                    if location not in ctx.locations_checked:
-                        ctx.locations_checked.add(location)
-                        ctx.kh2seedsave["LocationsChecked"].append(location)
-                        if location in ctx.kh2LocalItems:
-                            item = ctx.kh2slotdata["LocalItems"][str(location)]
-                            await asyncio.create_task(ctx.give_item(item, "LocalItems"))
-                await ctx.send_msgs(message)
-            elif not ctx.kh2connected and ctx.serverconneced:
-                logger.info("Game is not open. Disconnecting from Server.")
-                await ctx.disconnect()
-        except Exception as e:
-            logger.info("Line 661")
-            if ctx.kh2connected:
-                logger.info("Connection Lost.")
-                ctx.kh2connected = False
-            logger.info(e)
-        await asyncio.sleep(0.5)
-
-
 if __name__ == '__main__':
-    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()
+    Utils.init_logging("KH2Client", exception_logger="Client")
+    launch()
diff --git a/Launcher.py b/Launcher.py
index a1548d594c..9e184bf108 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -50,17 +50,22 @@ def open_host_yaml():
 def open_patch():
     suffixes = []
     for c in components:
-        if isfile(get_exe(c)[-1]):
-            suffixes += c.file_identifier.suffixes if c.type == Type.CLIENT and \
-                                                      isinstance(c.file_identifier, SuffixIdentifier) else []
+        if c.type == Type.CLIENT and \
+                isinstance(c.file_identifier, SuffixIdentifier) and \
+                (c.script_name is None or isfile(get_exe(c)[-1])):
+            suffixes += c.file_identifier.suffixes
     try:
-        filename = open_filename('Select patch', (('Patches', suffixes),))
+        filename = open_filename("Select patch", (("Patches", suffixes),))
     except Exception as e:
-        messagebox('Error', str(e), error=True)
+        messagebox("Error", str(e), error=True)
     else:
         file, component = identify(filename)
         if file and component:
-            launch([*get_exe(component), file], component.cli)
+            exe = get_exe(component)
+            if exe is None or not isfile(exe[-1]):
+                exe = get_exe("Launcher")
+
+            launch([*exe, file], component.cli)
 
 
 def generate_yamls():
@@ -107,7 +112,7 @@ def identify(path: Union[None, str]):
         return None, None
     for component in components:
         if component.handles_file(path):
-            return path,  component
+            return path, component
         elif path == component.display_name or path == component.script_name:
             return None, component
     return None, None
@@ -117,25 +122,25 @@ def get_exe(component: Union[str, Component]) -> Optional[Sequence[str]]:
     if isinstance(component, str):
         name = component
         component = None
-        if name.startswith('Archipelago'):
+        if name.startswith("Archipelago"):
             name = name[11:]
-        if name.endswith('.exe'):
+        if name.endswith(".exe"):
             name = name[:-4]
-        if name.endswith('.py'):
+        if name.endswith(".py"):
             name = name[:-3]
         if not name:
             return None
         for c in components:
-            if c.script_name == name or c.frozen_name == f'Archipelago{name}':
+            if c.script_name == name or c.frozen_name == f"Archipelago{name}":
                 component = c
                 break
         if not component:
             return None
     if is_frozen():
-        suffix = '.exe' if is_windows else ''
-        return [local_path(f'{component.frozen_name}{suffix}')]
+        suffix = ".exe" if is_windows else ""
+        return [local_path(f"{component.frozen_name}{suffix}")] if component.frozen_name else None
     else:
-        return [sys.executable, local_path(f'{component.script_name}.py')]
+        return [sys.executable, local_path(f"{component.script_name}.py")] if component.script_name else None
 
 
 def launch(exe, in_terminal=False):
diff --git a/LttPAdjuster.py b/LttPAdjuster.py
index 802ec47dd1..9c5bd10244 100644
--- a/LttPAdjuster.py
+++ b/LttPAdjuster.py
@@ -1004,6 +1004,7 @@ class SpriteSelector():
                 self.add_to_sprite_pool(sprite)
 
     def icon_section(self, frame_label, path, no_results_label):
+        os.makedirs(path, exist_ok=True)
         frame = LabelFrame(self.window, labelwidget=frame_label, padx=5, pady=5)
         frame.pack(side=TOP, fill=X)
 
diff --git a/MMBN3Client.py b/MMBN3Client.py
index 3f7474a6fd..140a98745c 100644
--- a/MMBN3Client.py
+++ b/MMBN3Client.py
@@ -58,7 +58,7 @@ class MMBN3CommandProcessor(ClientCommandProcessor):
 class MMBN3Context(CommonContext):
     command_processor = MMBN3CommandProcessor
     game = "MegaMan Battle Network 3"
-    items_handling = 0b001  # full local
+    items_handling = 0b101  # full local except starting items
 
     def __init__(self, server_address, password):
         super().__init__(server_address, password)
diff --git a/Main.py b/Main.py
index 48b37764a9..8dac8f7d20 100644
--- a/Main.py
+++ b/Main.py
@@ -13,8 +13,8 @@ import worlds
 from BaseClasses import CollectionState, Item, Location, LocationProgressType, MultiWorld, Region
 from Fill import balance_multiworld_progression, distribute_items_restrictive, distribute_planned, flood_items
 from Options import StartInventoryPool
-from settings import get_settings
 from Utils import __version__, output_path, version_tuple
+from settings import get_settings
 from worlds import AutoWorld
 from worlds.generic.Rules import exclusion_rules, locality_rules
 
@@ -101,20 +101,33 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
 
     del item_digits, location_digits, item_count, location_count
 
-    AutoWorld.call_stage(world, "assert_generate")
+    # This assertion method should not be necessary to run if we are not outputting any multidata.
+    if not args.skip_output:
+        AutoWorld.call_stage(world, "assert_generate")
 
     AutoWorld.call_all(world, "generate_early")
 
     logger.info('')
 
     for player in world.player_ids:
-        for item_name, count in world.start_inventory[player].value.items():
+        for item_name, count in world.worlds[player].options.start_inventory.value.items():
             for _ in range(count):
                 world.push_precollected(world.create_item(item_name, player))
 
         for item_name, count in world.start_inventory_from_pool.setdefault(player, StartInventoryPool({})).value.items():
             for _ in range(count):
                 world.push_precollected(world.create_item(item_name, player))
+            # remove from_pool items also from early items handling, as starting is plenty early.
+            early = world.early_items[player].get(item_name, 0)
+            if early:
+                world.early_items[player][item_name] = max(0, early-count)
+                remaining_count = count-early
+                if remaining_count > 0:
+                    local_early = world.early_local_items[player].get(item_name, 0)
+                    if local_early:
+                        world.early_items[player][item_name] = max(0, local_early - remaining_count)
+                    del local_early
+            del early
 
     logger.info('Creating World.')
     AutoWorld.call_all(world, "create_regions")
@@ -122,23 +135,19 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     logger.info('Creating Items.')
     AutoWorld.call_all(world, "create_items")
 
-    # All worlds should have finished creating all regions, locations, and entrances.
-    # Recache to ensure that they are all visible for locality rules.
-    world._recache()
-
     logger.info('Calculating Access Rules.')
 
     for player in world.player_ids:
         # items can't be both local and non-local, prefer local
-        world.non_local_items[player].value -= world.local_items[player].value
-        world.non_local_items[player].value -= set(world.local_early_items[player])
+        world.worlds[player].options.non_local_items.value -= world.worlds[player].options.local_items.value
+        world.worlds[player].options.non_local_items.value -= set(world.local_early_items[player])
 
     AutoWorld.call_all(world, "set_rules")
 
     for player in world.player_ids:
-        exclusion_rules(world, player, world.exclude_locations[player].value)
-        world.priority_locations[player].value -= world.exclude_locations[player].value
-        for location_name in world.priority_locations[player].value:
+        exclusion_rules(world, player, world.worlds[player].options.exclude_locations.value)
+        world.worlds[player].options.priority_locations.value -= world.worlds[player].options.exclude_locations.value
+        for location_name in world.worlds[player].options.priority_locations.value:
             try:
                 location = world.get_location(location_name, player)
             except KeyError as e:  # failed to find the given location. Check if it's a legitimate location
@@ -151,8 +160,8 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     if world.players > 1:
         locality_rules(world)
     else:
-        world.non_local_items[1].value = set()
-        world.local_items[1].value = set()
+        world.worlds[1].options.non_local_items.value = set()
+        world.worlds[1].options.local_items.value = set()
     
     AutoWorld.call_all(world, "generate_basic")
 
@@ -233,7 +242,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
 
         region = Region("Menu", group_id, world, "ItemLink")
         world.regions.append(region)
-        locations = region.locations = []
+        locations = region.locations
         for item in world.itempool:
             count = common_item_count.get(item.player, {}).get(item.name, 0)
             if count:
@@ -267,10 +276,9 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
             world.itempool.extend(items_to_add[:itemcount - len(world.itempool)])
 
     if any(world.item_links.values()):
-        world._recache()
         world._all_state = None
 
-    logger.info("Running Item Plando")
+    logger.info("Running Item Plando.")
 
     distribute_planned(world)
 
@@ -292,24 +300,28 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     else:
         logger.info("Progression balancing skipped.")
 
-    logger.info(f'Beginning output...')
-
     # we're about to output using multithreading, so we're removing the global random state to prevent accidental use
     world.random.passthrough = False
 
+    if args.skip_output:
+        logger.info('Done. Skipped output/spoiler generation. Total Time: %s', time.perf_counter() - start)
+        return world
+
+    logger.info(f'Beginning output...')
     outfilebase = 'AP_' + world.seed_name
 
     output = tempfile.TemporaryDirectory()
     with output as temp_dir:
-        with concurrent.futures.ThreadPoolExecutor(world.players + 2) as pool:
+        output_players = [player for player in world.player_ids if AutoWorld.World.generate_output.__code__
+                          is not world.worlds[player].generate_output.__code__]
+        with concurrent.futures.ThreadPoolExecutor(len(output_players) + 2) as pool:
             check_accessibility_task = pool.submit(world.fulfills_accessibility)
 
             output_file_futures = [pool.submit(AutoWorld.call_stage, world, "generate_output", temp_dir)]
-            for player in world.player_ids:
+            for player in output_players:
                 # skip starting a thread for methods that say "pass".
-                if AutoWorld.World.generate_output.__code__ is not world.worlds[player].generate_output.__code__:
-                    output_file_futures.append(
-                        pool.submit(AutoWorld.call_single, world, "generate_output", player, temp_dir))
+                output_file_futures.append(
+                    pool.submit(AutoWorld.call_single, world, "generate_output", player, temp_dir))
 
             # collect ER hint info
             er_hint_data: Dict[int, Dict[int, str]] = {}
@@ -358,13 +370,16 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
                         assert location.item.code is not None, "item code None should be event, " \
                                                                "location.address should then also be None. Location: " \
                                                                f" {location}"
+                        assert location.address not in locations_data[location.player], (
+                            f"Locations with duplicate address. {location} and "
+                            f"{locations_data[location.player][location.address]}")
                         locations_data[location.player][location.address] = \
                             location.item.code, location.item.player, location.item.flags
-                        if location.name in world.start_location_hints[location.player]:
+                        if location.name in world.worlds[location.player].options.start_location_hints:
                             precollect_hint(location)
-                        elif location.item.name in world.start_hints[location.item.player]:
+                        elif location.item.name in world.worlds[location.item.player].options.start_hints:
                             precollect_hint(location)
-                        elif any([location.item.name in world.start_hints[player]
+                        elif any([location.item.name in world.worlds[player].options.start_hints
                                   for player in world.groups.get(location.item.player, {}).get("players", [])]):
                             precollect_hint(location)
 
diff --git a/ModuleUpdate.py b/ModuleUpdate.py
index 209f2da672..c33e894e8b 100644
--- a/ModuleUpdate.py
+++ b/ModuleUpdate.py
@@ -67,14 +67,23 @@ def update(yes=False, force=False):
         install_pkg_resources(yes=yes)
         import pkg_resources
 
+        prev = ""  # if a line ends in \ we store here and merge later
         for req_file in requirements_files:
             path = os.path.join(os.path.dirname(sys.argv[0]), req_file)
             if not os.path.exists(path):
                 path = os.path.join(os.path.dirname(__file__), req_file)
             with open(path) as requirementsfile:
                 for line in requirementsfile:
-                    if not line or line[0] == "#":
-                        continue  # ignore comments
+                    if not line or line.lstrip(" \t")[0] == "#":
+                        if not prev:
+                            continue  # ignore comments
+                        line = ""
+                    elif line.rstrip("\r\n").endswith("\\"):
+                        prev = prev + line.rstrip("\r\n")[:-1] + " "  # continue on next line
+                        continue
+                    line = prev + line
+                    line = line.split("--hash=")[0]  # remove hashes from requirement for version checking
+                    prev = ""
                     if line.startswith(("https://", "git+https://")):
                         # extract name and version for url
                         rest = line.split('/')[-1]
diff --git a/MultiServer.py b/MultiServer.py
index 8be8d64132..9d2e9b564e 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -2,14 +2,15 @@ from __future__ import annotations
 
 import argparse
 import asyncio
-import copy
 import collections
+import copy
 import datetime
 import functools
 import hashlib
 import inspect
 import itertools
 import logging
+import math
 import operator
 import pickle
 import random
@@ -67,21 +68,25 @@ def update_dict(dictionary, entries):
 
 # functions callable on storable data on the server by clients
 modify_functions = {
-    "add": operator.add,  # add together two objects, using python's "+" operator (works on strings and lists as append)
-    "mul": operator.mul,
-    "mod": operator.mod,
-    "max": max,
-    "min": min,
+    # generic:
     "replace": lambda old, new: new,
     "default": lambda old, new: old,
+    # numeric:
+    "add": operator.add,  # add together two objects, using python's "+" operator (works on strings and lists as append)
+    "mul": operator.mul,
     "pow": operator.pow,
+    "mod": operator.mod,
+    "floor": lambda value, _: math.floor(value),
+    "ceil": lambda value, _: math.ceil(value),
+    "max": max,
+    "min": min,
     # bitwise:
     "xor": operator.xor,
     "or": operator.or_,
     "and": operator.and_,
     "left_shift": operator.lshift,
     "right_shift": operator.rshift,
-    # lists/dicts
+    # lists/dicts:
     "remove": remove_from_list,
     "pop": pop_from_container,
     "update": update_dict,
@@ -412,6 +417,8 @@ class Context:
             self.player_name_lookup[slot_info.name] = 0, slot_id
             self.read_data[f"hints_{0}_{slot_id}"] = lambda local_team=0, local_player=slot_id: \
                 list(self.get_rechecked_hints(local_team, local_player))
+            self.read_data[f"client_status_{0}_{slot_id}"] = lambda local_team=0, local_player=slot_id: \
+                self.client_game_state[local_team, local_player]
 
         self.seed_name = decoded_obj["seed_name"]
         self.random.seed(self.seed_name)
@@ -707,6 +714,12 @@ class Context:
             "hint_points": get_slot_points(self, team, slot)
         }])
 
+    def on_client_status_change(self, team: int, slot: int):
+        key: str = f"_read_client_status_{team}_{slot}"
+        targets: typing.Set[Client] = set(self.stored_data_notification_clients[key])
+        if targets:
+            self.broadcast(targets, [{"cmd": "SetReply", "key": key, "value": self.client_game_state[team, slot]}])
+
 
 def update_aliases(ctx: Context, team: int):
     cmd = ctx.dumper([{"cmd": "RoomUpdate",
@@ -1814,6 +1827,7 @@ def update_client_status(ctx: Context, client: Client, new_status: ClientStatus)
             ctx.on_goal_achieved(client)
 
         ctx.client_game_state[client.team, client.slot] = new_status
+        ctx.on_client_status_change(client.team, client.slot)
         ctx.save()
 
 
diff --git a/Options.py b/Options.py
index 960e6c19d1..2e3927aae3 100644
--- a/Options.py
+++ b/Options.py
@@ -2,6 +2,9 @@ from __future__ import annotations
 
 import abc
 import logging
+from copy import deepcopy
+from dataclasses import dataclass
+import functools
 import math
 import numbers
 import random
@@ -211,6 +214,12 @@ class NumericOption(Option[int], numbers.Integral, abc.ABC):
         else:
             return self.value > other
 
+    def __ge__(self, other: typing.Union[int, NumericOption]) -> bool:
+        if isinstance(other, NumericOption):
+            return self.value >= other.value
+        else:
+            return self.value >= other
+
     def __bool__(self) -> bool:
         return bool(self.value)
 
@@ -687,11 +696,19 @@ class Range(NumericOption):
         return int(round(random.triangular(lower, end, tri), 0))
 
 
-class SpecialRange(Range):
-    special_range_cutoff = 0
+class NamedRange(Range):
     special_range_names: typing.Dict[str, int] = {}
     """Special Range names have to be all lowercase as matching is done with text.lower()"""
 
+    def __init__(self, value: int) -> None:
+        if value < self.range_start and value not in self.special_range_names.values():
+            raise Exception(f"{value} is lower than minimum {self.range_start} for option {self.__class__.__name__} " +
+                            f"and is also not one of the supported named special values: {self.special_range_names}")
+        elif value > self.range_end and value not in self.special_range_names.values():
+            raise Exception(f"{value} is higher than maximum {self.range_end} for option {self.__class__.__name__} " +
+                            f"and is also not one of the supported named special values: {self.special_range_names}")
+        self.value = value
+
     @classmethod
     def from_text(cls, text: str) -> Range:
         text = text.lower()
@@ -699,6 +716,19 @@ class SpecialRange(Range):
             return cls(cls.special_range_names[text])
         return super().from_text(text)
 
+
+class SpecialRange(NamedRange):
+    special_range_cutoff = 0
+
+    # TODO: remove class SpecialRange, earliest 3 releases after 0.4.3
+    def __new__(cls, value: int) -> SpecialRange:
+        from Utils import deprecate
+        deprecate(f"Option type {cls.__name__} is a subclass of SpecialRange, which is deprecated and pending removal. "
+                  "Consider switching to NamedRange, which supports all use-cases of SpecialRange, and more. In "
+                  "NamedRange, range_start specifies the lower end of the regular range, while special values can be "
+                  "placed anywhere (below, inside, or above the regular range).")
+        return super().__new__(cls, value)
+
     @classmethod
     def weighted_range(cls, text) -> Range:
         if text == "random-low":
@@ -882,7 +912,7 @@ class Accessibility(Choice):
     default = 1
 
 
-class ProgressionBalancing(SpecialRange):
+class ProgressionBalancing(NamedRange):
     """A system that can move progression earlier, to try and prevent the player from getting stuck and bored early.
     A lower setting means more getting stuck. A higher setting means less getting stuck."""
     default = 50
@@ -896,10 +926,58 @@ class ProgressionBalancing(SpecialRange):
     }
 
 
-common_options = {
-    "progression_balancing": ProgressionBalancing,
-    "accessibility": Accessibility
-}
+class OptionsMetaProperty(type):
+    def __new__(mcs,
+                name: str,
+                bases: typing.Tuple[type, ...],
+                attrs: typing.Dict[str, typing.Any]) -> "OptionsMetaProperty":
+        for attr_type in attrs.values():
+            assert not isinstance(attr_type, AssembleOptions),\
+                f"Options for {name} should be type hinted on the class, not assigned"
+        return super().__new__(mcs, name, bases, attrs)
+
+    @property
+    @functools.lru_cache(maxsize=None)
+    def type_hints(cls) -> typing.Dict[str, typing.Type[Option[typing.Any]]]:
+        """Returns type hints of the class as a dictionary."""
+        return typing.get_type_hints(cls)
+
+
+@dataclass
+class CommonOptions(metaclass=OptionsMetaProperty):
+    progression_balancing: ProgressionBalancing
+    accessibility: Accessibility
+
+    def as_dict(self, *option_names: str, casing: str = "snake") -> typing.Dict[str, typing.Any]:
+        """
+        Returns a dictionary of [str, Option.value]
+        
+        :param option_names: names of the options to return
+        :param casing: case of the keys to return. Supports `snake`, `camel`, `pascal`, `kebab`
+        """
+        option_results = {}
+        for option_name in option_names:
+            if option_name in type(self).type_hints:
+                if casing == "snake":
+                    display_name = option_name
+                elif casing == "camel":
+                    split_name = [name.title() for name in option_name.split("_")]
+                    split_name[0] = split_name[0].lower()
+                    display_name = "".join(split_name)
+                elif casing == "pascal":
+                    display_name = "".join([name.title() for name in option_name.split("_")])
+                elif casing == "kebab":
+                    display_name = option_name.replace("_", "-")
+                else:
+                    raise ValueError(f"{casing} is invalid casing for as_dict. "
+                                     "Valid names are 'snake', 'camel', 'pascal', 'kebab'.")
+                value = getattr(self, option_name).value
+                if isinstance(value, set):
+                    value = sorted(value)
+                option_results[display_name] = value
+            else:
+                raise ValueError(f"{option_name} not found in {tuple(type(self).type_hints)}")
+        return option_results
 
 
 class LocalItems(ItemSet):
@@ -1020,17 +1098,16 @@ class ItemLinks(OptionList):
             link.setdefault("link_replacement", None)
 
 
-per_game_common_options = {
-    **common_options,  # can be overwritten per-game
-    "local_items": LocalItems,
-    "non_local_items": NonLocalItems,
-    "start_inventory": StartInventory,
-    "start_hints": StartHints,
-    "start_location_hints": StartLocationHints,
-    "exclude_locations": ExcludeLocations,
-    "priority_locations": PriorityLocations,
-    "item_links": ItemLinks
-}
+@dataclass
+class PerGameCommonOptions(CommonOptions):
+    local_items: LocalItems
+    non_local_items: NonLocalItems
+    start_inventory: StartInventory
+    start_hints: StartHints
+    start_location_hints: StartLocationHints
+    exclude_locations: ExcludeLocations
+    priority_locations: PriorityLocations
+    item_links: ItemLinks
 
 
 def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], generate_hidden: bool = True):
@@ -1052,7 +1129,7 @@ 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: typing.Union[Range, SpecialRange]):
+    def dictify_range(option: Range):
         data = {option.default: 50}
         for sub_option in ["random", "random-low", "random-high"]:
             if sub_option != option.default:
@@ -1071,10 +1148,7 @@ 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:
-            all_options: typing.Dict[str, AssembleOptions] = {
-                **per_game_common_options,
-                **world.option_definitions
-            }
+            all_options: typing.Dict[str, AssembleOptions] = world.options_dataclass.type_hints
 
             with open(local_path("data", "options.yaml")) as f:
                 file_data = f.read()
diff --git a/PokemonClient.py b/PokemonClient.py
deleted file mode 100644
index 6b43a53b8f..0000000000
--- a/PokemonClient.py
+++ /dev/null
@@ -1,382 +0,0 @@
-import asyncio
-import json
-import time
-import os
-import bsdiff4
-import subprocess
-import zipfile
-from asyncio import StreamReader, StreamWriter
-from typing import List
-
-
-import Utils
-from Utils import async_start
-from CommonClient import CommonContext, server_loop, gui_enabled, ClientCommandProcessor, logger, \
-    get_base_parser
-
-from worlds.pokemon_rb.locations import location_data
-from worlds.pokemon_rb.rom import RedDeltaPatch, BlueDeltaPatch
-
-location_map = {"Rod": {}, "EventFlag": {}, "Missable": {}, "Hidden": {}, "list": {}, "DexSanityFlag": {}}
-location_bytes_bits = {}
-for location in location_data:
-    if location.ram_address is not None:
-        if type(location.ram_address) == list:
-            location_map[type(location.ram_address).__name__][(location.ram_address[0].flag, location.ram_address[1].flag)] = location.address
-            location_bytes_bits[location.address] = [{'byte': location.ram_address[0].byte, 'bit': location.ram_address[0].bit},
-                                                     {'byte': location.ram_address[1].byte, 'bit': location.ram_address[1].bit}]
-        else:
-            location_map[type(location.ram_address).__name__][location.ram_address.flag] = location.address
-            location_bytes_bits[location.address] = {'byte': location.ram_address.byte, 'bit': location.ram_address.bit}
-
-location_name_to_id = {location.name: location.address for location in location_data if location.type == "Item"
-                           and location.address is not None}
-
-SYSTEM_MESSAGE_ID = 0
-
-CONNECTION_TIMING_OUT_STATUS = "Connection timing out. Please restart your emulator, then restart pkmn_rb.lua"
-CONNECTION_REFUSED_STATUS = "Connection Refused. Please start your emulator and make sure pkmn_rb.lua is running"
-CONNECTION_RESET_STATUS = "Connection was reset. Please restart your emulator, then restart pkmn_rb.lua"
-CONNECTION_TENTATIVE_STATUS = "Initial Connection Made"
-CONNECTION_CONNECTED_STATUS = "Connected"
-CONNECTION_INITIAL_STATUS = "Connection has not been initiated"
-
-DISPLAY_MSGS = True
-
-SCRIPT_VERSION = 3
-
-
-class GBCommandProcessor(ClientCommandProcessor):
-    def __init__(self, ctx: CommonContext):
-        super().__init__(ctx)
-
-    def _cmd_gb(self):
-        """Check Gameboy Connection State"""
-        if isinstance(self.ctx, GBContext):
-            logger.info(f"Gameboy Status: {self.ctx.gb_status}")
-
-
-class GBContext(CommonContext):
-    command_processor = GBCommandProcessor
-    game = 'Pokemon Red and Blue'
-
-    def __init__(self, server_address, password):
-        super().__init__(server_address, password)
-        self.gb_streams: (StreamReader, StreamWriter) = None
-        self.gb_sync_task = None
-        self.messages = {}
-        self.locations_array = None
-        self.gb_status = CONNECTION_INITIAL_STATUS
-        self.awaiting_rom = False
-        self.display_msgs = True
-        self.deathlink_pending = False
-        self.set_deathlink = False
-        self.client_compatibility_mode = 0
-        self.items_handling = 0b001
-        self.sent_release = False
-        self.sent_collect = False
-        self.auto_hints = set()
-
-    async def server_auth(self, password_requested: bool = False):
-        if password_requested and not self.password:
-            await super(GBContext, self).server_auth(password_requested)
-        if not self.auth:
-            self.awaiting_rom = True
-            logger.info('Awaiting connection to EmuHawk to get Player information')
-            return
-
-        await self.send_connect()
-
-    def _set_message(self, msg: str, msg_id: int):
-        if DISPLAY_MSGS:
-            self.messages[(time.time(), msg_id)] = msg
-
-    def on_package(self, cmd: str, args: dict):
-        if cmd == 'Connected':
-            self.locations_array = None
-            if 'death_link' in args['slot_data'] and args['slot_data']['death_link']:
-                self.set_deathlink = True
-        elif cmd == "RoomInfo":
-            self.seed_name = args['seed_name']
-        elif cmd == 'Print':
-            msg = args['text']
-            if ': !' not in msg:
-                self._set_message(msg, SYSTEM_MESSAGE_ID)
-        elif cmd == "ReceivedItems":
-            msg = f"Received {', '.join([self.item_names[item.item] for item in args['items']])}"
-            self._set_message(msg, SYSTEM_MESSAGE_ID)
-
-    def on_deathlink(self, data: dict):
-        self.deathlink_pending = True
-        super().on_deathlink(data)
-
-    def run_gui(self):
-        from kvui import GameManager
-
-        class GBManager(GameManager):
-            logging_pairs = [
-                ("Client", "Archipelago")
-            ]
-            base_title = "Archipelago Pokémon Client"
-
-        self.ui = GBManager(self)
-        self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
-
-
-def get_payload(ctx: GBContext):
-    current_time = time.time()
-    ret = json.dumps(
-        {
-            "items": [item.item for item in ctx.items_received],
-            "messages": {f'{key[0]}:{key[1]}': value for key, value in ctx.messages.items()
-                         if key[0] > current_time - 10},
-            "deathlink": ctx.deathlink_pending,
-            "options": ((ctx.permissions['release'] in ('goal', 'enabled')) * 2) + (ctx.permissions['collect'] in ('goal', 'enabled'))
-        }
-    )
-    ctx.deathlink_pending = False
-    return ret
-
-
-async def parse_locations(data: List, ctx: GBContext):
-    locations = []
-    flags = {"EventFlag": data[:0x140], "Missable": data[0x140:0x140 + 0x20],
-             "Hidden": data[0x140 + 0x20: 0x140 + 0x20 + 0x0E],
-             "Rod": data[0x140 + 0x20 + 0x0E:0x140 + 0x20 + 0x0E + 0x01]}
-
-    if len(data) > 0x140 + 0x20 + 0x0E + 0x01:
-        flags["DexSanityFlag"] = data[0x140 + 0x20 + 0x0E + 0x01:]
-    else:
-        flags["DexSanityFlag"] = [0] * 19
-
-    for flag_type, loc_map in location_map.items():
-        for flag, loc_id in loc_map.items():
-            if flag_type == "list":
-                if (flags["EventFlag"][location_bytes_bits[loc_id][0]['byte']] & 1 << location_bytes_bits[loc_id][0]['bit']
-                        and flags["Missable"][location_bytes_bits[loc_id][1]['byte']] & 1 << location_bytes_bits[loc_id][1]['bit']):
-                    locations.append(loc_id)
-            elif flags[flag_type][location_bytes_bits[loc_id]['byte']] & 1 << location_bytes_bits[loc_id]['bit']:
-                locations.append(loc_id)
-
-    hints = []
-    if flags["EventFlag"][280] & 16:
-        hints.append("Cerulean Bicycle Shop")
-    if flags["EventFlag"][280] & 32:
-        hints.append("Route 2 Gate - Oak's Aide")
-    if flags["EventFlag"][280] & 64:
-        hints.append("Route 11 Gate 2F - Oak's Aide")
-    if flags["EventFlag"][280] & 128:
-        hints.append("Route 15 Gate 2F - Oak's Aide")
-    if flags["EventFlag"][281] & 1:
-        hints += ["Celadon Prize Corner - Item Prize 1", "Celadon Prize Corner - Item Prize 2",
-                  "Celadon Prize Corner - Item Prize 3"]
-    if (location_name_to_id["Fossil - Choice A"] in ctx.checked_locations and location_name_to_id["Fossil - Choice B"]
-            not in ctx.checked_locations):
-        hints.append("Fossil - Choice B")
-    elif (location_name_to_id["Fossil - Choice B"] in ctx.checked_locations and location_name_to_id["Fossil - Choice A"]
-            not in ctx.checked_locations):
-        hints.append("Fossil - Choice A")
-    hints = [
-        location_name_to_id[loc] for loc in hints if location_name_to_id[loc] not in ctx.auto_hints and
-        location_name_to_id[loc] in ctx.missing_locations and location_name_to_id[loc] not in ctx.locations_checked
-    ]
-    if hints:
-        await ctx.send_msgs([{"cmd": "LocationScouts", "locations": hints, "create_as_hint": 2}])
-    ctx.auto_hints.update(hints)
-
-    if flags["EventFlag"][280] & 1 and not ctx.finished_game:
-        await ctx.send_msgs([
-                    {"cmd": "StatusUpdate",
-                     "status": 30}
-                ])
-        ctx.finished_game = True
-    if locations == ctx.locations_array:
-        return
-    ctx.locations_array = locations
-    if locations is not None:
-        await ctx.send_msgs([{"cmd": "LocationChecks", "locations": locations}])
-
-
-async def gb_sync_task(ctx: GBContext):
-    logger.info("Starting GB connector. Use /gb for status information")
-    while not ctx.exit_event.is_set():
-        error_status = None
-        if ctx.gb_streams:
-            (reader, writer) = ctx.gb_streams
-            msg = get_payload(ctx).encode()
-            writer.write(msg)
-            writer.write(b'\n')
-            try:
-                await asyncio.wait_for(writer.drain(), timeout=1.5)
-                try:
-                    # Data will return a dict with up to two fields:
-                    # 1. A keepalive response of the Players Name (always)
-                    # 2. An array representing the memory values of the locations area (if in game)
-                    data = await asyncio.wait_for(reader.readline(), timeout=5)
-                    data_decoded = json.loads(data.decode())
-                    if 'scriptVersion' not in data_decoded or data_decoded['scriptVersion'] != SCRIPT_VERSION:
-                        msg = "You are connecting with an incompatible Lua script version. Ensure your connector Lua " \
-                            "and PokemonClient are from the same Archipelago installation."
-                        logger.info(msg, extra={'compact_gui': True})
-                        ctx.gui_error('Error', msg)
-                        error_status = CONNECTION_RESET_STATUS
-                    ctx.client_compatibility_mode = data_decoded['clientCompatibilityVersion']
-                    if ctx.client_compatibility_mode == 0:
-                        ctx.items_handling = 0b101  # old patches will not have local start inventory, must be requested
-                    if ctx.seed_name and ctx.seed_name != ''.join([chr(i) for i in data_decoded['seedName'] if i != 0]):
-                        msg = "The server is running a different multiworld than your client is. (invalid seed_name)"
-                        logger.info(msg, extra={'compact_gui': True})
-                        ctx.gui_error('Error', msg)
-                        error_status = CONNECTION_RESET_STATUS
-                    ctx.seed_name = ''.join([chr(i) for i in data_decoded['seedName'] if i != 0])
-                    if not ctx.auth:
-                        ctx.auth = ''.join([chr(i) for i in data_decoded['playerName'] if i != 0])
-                        if ctx.auth == '':
-                            msg = "Invalid ROM detected. No player name built into the ROM."
-                            logger.info(msg, extra={'compact_gui': True})
-                            ctx.gui_error('Error', msg)
-                            error_status = CONNECTION_RESET_STATUS
-                        if ctx.awaiting_rom:
-                            await ctx.server_auth(False)
-                    if 'locations' in data_decoded and ctx.game and ctx.gb_status == CONNECTION_CONNECTED_STATUS \
-                            and not error_status and ctx.auth:
-                        # Not just a keep alive ping, parse
-                        async_start(parse_locations(data_decoded['locations'], ctx))
-                    if 'deathLink' in data_decoded and data_decoded['deathLink'] and 'DeathLink' in ctx.tags:
-                        await ctx.send_death(ctx.auth + " is out of usable Pokémon! " + ctx.auth + " blacked out!")
-                    if 'options' in data_decoded:
-                        msgs = []
-                        if data_decoded['options'] & 4 and not ctx.sent_release:
-                            ctx.sent_release = True
-                            msgs.append({"cmd": "Say", "text": "!release"})
-                        if data_decoded['options'] & 8 and not ctx.sent_collect:
-                            ctx.sent_collect = True
-                            msgs.append({"cmd": "Say", "text": "!collect"})
-                        if msgs:
-                            await ctx.send_msgs(msgs)
-                    if ctx.set_deathlink:
-                        await ctx.update_death_link(True)
-                except asyncio.TimeoutError:
-                    logger.debug("Read Timed Out, Reconnecting")
-                    error_status = CONNECTION_TIMING_OUT_STATUS
-                    writer.close()
-                    ctx.gb_streams = None
-                except ConnectionResetError as e:
-                    logger.debug("Read failed due to Connection Lost, Reconnecting")
-                    error_status = CONNECTION_RESET_STATUS
-                    writer.close()
-                    ctx.gb_streams = None
-            except TimeoutError:
-                logger.debug("Connection Timed Out, Reconnecting")
-                error_status = CONNECTION_TIMING_OUT_STATUS
-                writer.close()
-                ctx.gb_streams = None
-            except ConnectionResetError:
-                logger.debug("Connection Lost, Reconnecting")
-                error_status = CONNECTION_RESET_STATUS
-                writer.close()
-                ctx.gb_streams = None
-            if ctx.gb_status == CONNECTION_TENTATIVE_STATUS:
-                if not error_status:
-                    logger.info("Successfully Connected to Gameboy")
-                    ctx.gb_status = CONNECTION_CONNECTED_STATUS
-                else:
-                    ctx.gb_status = f"Was tentatively connected but error occured: {error_status}"
-            elif error_status:
-                ctx.gb_status = error_status
-                logger.info("Lost connection to Gameboy and attempting to reconnect. Use /gb for status updates")
-        else:
-            try:
-                logger.debug("Attempting to connect to Gameboy")
-                ctx.gb_streams = await asyncio.wait_for(asyncio.open_connection("localhost", 17242), timeout=10)
-                ctx.gb_status = CONNECTION_TENTATIVE_STATUS
-            except TimeoutError:
-                logger.debug("Connection Timed Out, Trying Again")
-                ctx.gb_status = CONNECTION_TIMING_OUT_STATUS
-                continue
-            except ConnectionRefusedError:
-                logger.debug("Connection Refused, Trying Again")
-                ctx.gb_status = CONNECTION_REFUSED_STATUS
-                continue
-
-
-async def run_game(romfile):
-    auto_start = Utils.get_options()["pokemon_rb_options"].get("rom_start", True)
-    if auto_start is True:
-        import webbrowser
-        webbrowser.open(romfile)
-    elif os.path.isfile(auto_start):
-        subprocess.Popen([auto_start, romfile],
-                         stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-
-
-async def patch_and_run_game(game_version, patch_file, ctx):
-    base_name = os.path.splitext(patch_file)[0]
-    comp_path = base_name + '.gb'
-    if game_version == "blue":
-        delta_patch = BlueDeltaPatch
-    else:
-        delta_patch = RedDeltaPatch
-
-    try:
-        base_rom = delta_patch.get_source_data()
-    except Exception as msg:
-        logger.info(msg, extra={'compact_gui': True})
-        ctx.gui_error('Error', msg)
-
-    with zipfile.ZipFile(patch_file, 'r') as patch_archive:
-        with patch_archive.open('delta.bsdiff4', 'r') as stream:
-            patch = stream.read()
-    patched_rom_data = bsdiff4.patch(base_rom, patch)
-
-    with open(comp_path, "wb") as patched_rom_file:
-        patched_rom_file.write(patched_rom_data)
-
-    async_start(run_game(comp_path))
-
-
-if __name__ == '__main__':
-
-    Utils.init_logging("PokemonClient")
-
-    options = Utils.get_options()
-
-    async def main():
-        parser = get_base_parser()
-        parser.add_argument('patch_file', default="", type=str, nargs="?",
-                            help='Path to an APRED or APBLUE patch file')
-        args = parser.parse_args()
-
-        ctx = GBContext(args.connect, args.password)
-        ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
-        if gui_enabled:
-            ctx.run_gui()
-        ctx.run_cli()
-        ctx.gb_sync_task = asyncio.create_task(gb_sync_task(ctx), name="GB Sync")
-
-        if args.patch_file:
-            ext = args.patch_file.split(".")[len(args.patch_file.split(".")) - 1].lower()
-            if ext == "apred":
-                logger.info("APRED file supplied, beginning patching process...")
-                async_start(patch_and_run_game("red", args.patch_file, ctx))
-            elif ext == "apblue":
-                logger.info("APBLUE file supplied, beginning patching process...")
-                async_start(patch_and_run_game("blue", args.patch_file, ctx))
-            else:
-                logger.warning(f"Unknown patch file extension {ext}")
-
-        await ctx.exit_event.wait()
-        ctx.server_address = None
-
-        await ctx.shutdown()
-
-        if ctx.gb_sync_task:
-            await ctx.gb_sync_task
-
-
-    import colorama
-
-    colorama.init()
-
-    asyncio.run(main())
-    colorama.deinit()
diff --git a/README.md b/README.md
index 54b659397f..a1e03293d5 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,13 @@ Currently, the following games are supported:
 * Muse Dash
 * DOOM 1993
 * Terraria
+* Lingo
+* Pokémon Emerald
+* DOOM II
+* Shivers
+* Heretic
+* Landstalker: The Treasures of King Nole
+* Final Fantasy Mystic Quest
 
 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/SNIClient.py b/SNIClient.py
index 0909c61382..062d7a7cbe 100644
--- a/SNIClient.py
+++ b/SNIClient.py
@@ -207,12 +207,12 @@ class SNIContext(CommonContext):
             self.killing_player_task = asyncio.create_task(deathlink_kill_player(self))
         super(SNIContext, self).on_deathlink(data)
 
-    async def handle_deathlink_state(self, currently_dead: bool) -> None:
+    async def handle_deathlink_state(self, currently_dead: bool, death_text: str = "") -> None:
         # in this state we only care about triggering a death send
         if self.death_state == DeathState.alive:
             if currently_dead:
                 self.death_state = DeathState.dead
-                await self.send_death()
+                await self.send_death(death_text)
         # in this state we care about confirming a kill, to move state to dead
         elif self.death_state == DeathState.killing_player:
             # this is being handled in deathlink_kill_player(ctx) already
diff --git a/UndertaleClient.py b/UndertaleClient.py
index 62fbe128bd..e1538ce81d 100644
--- a/UndertaleClient.py
+++ b/UndertaleClient.py
@@ -27,14 +27,14 @@ class UndertaleCommandProcessor(ClientCommandProcessor):
             self.ctx.syncing = True
 
     def _cmd_patch(self):
-        """Patch the game."""
+        """Patch the game. Only use this command if /auto_patch fails."""
         if isinstance(self.ctx, UndertaleContext):
             os.makedirs(name=os.path.join(os.getcwd(), "Undertale"), exist_ok=True)
             self.ctx.patch_game()
             self.output("Patched.")
 
     def _cmd_savepath(self, directory: str):
-        """Redirect to proper save data folder. (Use before connecting!)"""
+        """Redirect to proper save data folder. This is necessary for Linux users to use before connecting."""
         if isinstance(self.ctx, UndertaleContext):
             self.ctx.save_game_folder = directory
             self.output("Changed to the following directory: " + self.ctx.save_game_folder)
@@ -67,7 +67,7 @@ class UndertaleCommandProcessor(ClientCommandProcessor):
                 self.output("Patching successful!")
 
     def _cmd_online(self):
-        """Makes you no longer able to see other Undertale players."""
+        """Toggles seeing other Undertale players."""
         if isinstance(self.ctx, UndertaleContext):
             self.ctx.update_online_mode(not ("Online" in self.ctx.tags))
             if "Online" in self.ctx.tags:
diff --git a/Utils.py b/Utils.py
index 9ceba48299..f6e4a9ab60 100644
--- a/Utils.py
+++ b/Utils.py
@@ -5,6 +5,7 @@ import json
 import typing
 import builtins
 import os
+import itertools
 import subprocess
 import sys
 import pickle
@@ -13,6 +14,7 @@ import io
 import collections
 import importlib
 import logging
+import warnings
 
 from argparse import Namespace
 from settings import Settings, get_settings
@@ -29,6 +31,7 @@ except ImportError:
 if typing.TYPE_CHECKING:
     import tkinter
     import pathlib
+    from BaseClasses import Region
 
 
 def tuplize_version(version: str) -> Version:
@@ -44,7 +47,7 @@ class Version(typing.NamedTuple):
         return ".".join(str(item) for item in self)
 
 
-__version__ = "0.4.3"
+__version__ = "0.4.4"
 version_tuple = tuplize_version(__version__)
 
 is_linux = sys.platform.startswith("linux")
@@ -71,6 +74,8 @@ def snes_to_pc(value: int) -> int:
 
 
 RetType = typing.TypeVar("RetType")
+S = typing.TypeVar("S")
+T = typing.TypeVar("T")
 
 
 def cache_argsless(function: typing.Callable[[], RetType]) -> typing.Callable[[], RetType]:
@@ -88,6 +93,31 @@ def cache_argsless(function: typing.Callable[[], RetType]) -> typing.Callable[[]
     return _wrap
 
 
+def cache_self1(function: typing.Callable[[S, T], RetType]) -> typing.Callable[[S, T], RetType]:
+    """Specialized cache for self + 1 arg. Does not keep global ref to self and skips building a dict key tuple."""
+
+    assert function.__code__.co_argcount == 2, "Can only cache 2 argument functions with this cache."
+
+    cache_name = f"__cache_{function.__name__}__"
+
+    @functools.wraps(function)
+    def wrap(self: S, arg: T) -> RetType:
+        cache: Optional[Dict[T, RetType]] = typing.cast(Optional[Dict[T, RetType]],
+                                                        getattr(self, cache_name, None))
+        if cache is None:
+            res = function(self, arg)
+            setattr(self, cache_name, {arg: res})
+            return res
+        try:
+            return cache[arg]
+        except KeyError:
+            res = function(self, arg)
+            cache[arg] = res
+            return res
+
+    return wrap
+
+
 def is_frozen() -> bool:
     return typing.cast(bool, getattr(sys, 'frozen', False))
 
@@ -144,12 +174,16 @@ def user_path(*path: str) -> str:
         if user_path.cached_path != local_path():
             import filecmp
             if not os.path.exists(user_path("manifest.json")) or \
+                    not os.path.exists(local_path("manifest.json")) or \
                     not filecmp.cmp(local_path("manifest.json"), user_path("manifest.json"), shallow=True):
                 import shutil
-                for dn in ("Players", "data/sprites"):
+                for dn in ("Players", "data/sprites", "data/lua"):
                     shutil.copytree(local_path(dn), user_path(dn), dirs_exist_ok=True)
-                for fn in ("manifest.json",):
-                    shutil.copy2(local_path(fn), user_path(fn))
+                if not os.path.exists(local_path("manifest.json")):
+                    warnings.warn(f"Upgrading {user_path()} from something that is not a proper install")
+                else:
+                    shutil.copy2(local_path("manifest.json"), user_path("manifest.json"))
+            os.makedirs(user_path("worlds"), exist_ok=True)
 
     return os.path.join(user_path.cached_path, *path)
 
@@ -215,7 +249,13 @@ def get_cert_none_ssl_context():
 def get_public_ipv4() -> str:
     import socket
     import urllib.request
-    ip = socket.gethostbyname(socket.gethostname())
+    try:
+        ip = socket.gethostbyname(socket.gethostname())
+    except socket.gaierror:
+        # if hostname or resolvconf is not set up properly, this may fail
+        warnings.warn("Could not resolve own hostname, falling back to 127.0.0.1")
+        ip = "127.0.0.1"
+
     ctx = get_cert_none_ssl_context()
     try:
         ip = urllib.request.urlopen("https://checkip.amazonaws.com/", context=ctx, timeout=10).read().decode("utf8").strip()
@@ -233,7 +273,13 @@ def get_public_ipv4() -> str:
 def get_public_ipv6() -> str:
     import socket
     import urllib.request
-    ip = socket.gethostbyname(socket.gethostname())
+    try:
+        ip = socket.gethostbyname(socket.gethostname())
+    except socket.gaierror:
+        # if hostname or resolvconf is not set up properly, this may fail
+        warnings.warn("Could not resolve own hostname, falling back to ::1")
+        ip = "::1"
+
     ctx = get_cert_none_ssl_context()
     try:
         ip = urllib.request.urlopen("https://v6.ident.me", context=ctx, timeout=10).read().decode("utf8").strip()
@@ -243,15 +289,13 @@ def get_public_ipv6() -> str:
     return ip
 
 
-OptionsType = Settings  # TODO: remove ~2 versions after 0.4.1
+OptionsType = Settings  # TODO: remove when removing get_options
 
 
-@cache_argsless
-def get_default_options() -> Settings:  # TODO: remove ~2 versions after 0.4.1
-    return Settings(None)
-
-
-get_options = get_settings  # TODO: add a warning ~2 versions after 0.4.1 and remove once all games are ported
+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)
+    return get_settings()
 
 
 def persistent_store(category: str, key: typing.Any, value: typing.Any):
@@ -445,11 +489,21 @@ def init_logging(name: str, loglevel: typing.Union[str, int] = logging.INFO, wri
         write_mode,
         encoding="utf-8-sig")
     file_handler.setFormatter(logging.Formatter(log_format))
+
+    class Filter(logging.Filter):
+        def __init__(self, filter_name, condition):
+            super().__init__(filter_name)
+            self.condition = condition
+
+        def filter(self, record: logging.LogRecord) -> bool:
+            return self.condition(record)
+
+    file_handler.addFilter(Filter("NoStream", lambda record: not getattr(record,  "NoFile", False)))
     root_logger.addHandler(file_handler)
     if sys.stdout:
-        root_logger.addHandler(
-            logging.StreamHandler(sys.stdout)
-        )
+        stream_handler = logging.StreamHandler(sys.stdout)
+        stream_handler.addFilter(Filter("NoFile", lambda record: not getattr(record, "NoStream", False)))
+        root_logger.addHandler(stream_handler)
 
     # Relay unhandled exceptions to logger.
     if not getattr(sys.excepthook, "_wrapped", False):  # skip if already modified
@@ -656,6 +710,11 @@ def messagebox(title: str, text: str, error: bool = False) -> None:
         if zenity:
             return run(zenity, f"--title={title}", f"--text={text}", "--error" if error else "--info")
 
+    elif is_windows:
+        import ctypes
+        style = 0x10 if error else 0x0
+        return ctypes.windll.user32.MessageBoxW(0, text, title, style)
+    
     # fall back to tk
     try:
         import tkinter
@@ -720,6 +779,25 @@ def deprecate(message: str):
     import warnings
     warnings.warn(message)
 
+
+class DeprecateDict(dict):
+    log_message: str
+    should_error: bool
+
+    def __init__(self, message, error: bool = False) -> None:
+        self.log_message = message
+        self.should_error = error
+        super().__init__()
+
+    def __getitem__(self, item: Any) -> Any:
+        if self.should_error:
+            deprecate(self.log_message)
+        elif __debug__:
+            import warnings
+            warnings.warn(self.log_message)
+        return super().__getitem__(item)
+
+
 def _extend_freeze_support() -> None:
     """Extend multiprocessing.freeze_support() to also work on Non-Windows for spawn."""
     # upstream issue: https://github.com/python/cpython/issues/76327
@@ -766,3 +844,127 @@ def freeze_support() -> None:
     import multiprocessing
     _extend_freeze_support()
     multiprocessing.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) -> 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.)
+    :param file_name: The name of the destination .puml file.
+    :param show_entrance_names: (default False) If enabled, the name of the entrance will be shown near each connection.
+    :param show_locations: (default True) If enabled, the locations will be listed inside each region.
+            Priority locations will be shown in bold.
+            Excluded locations will be stricken out.
+            Locations without ID will be shown in italics.
+            Locked locations will be shown with a padlock icon.
+            For filled locations, the item name will be shown after the location name.
+            Progression items will be shown in bold.
+            Items without ID will be shown in italics.
+    :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.
+
+    Example usage in World code:
+    from Utils import visualize_regions
+    visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
+
+    Example usage in Main code:
+    from Utils import visualize_regions
+    for player in world.player_ids:
+        visualize_regions(world.get_region("Menu", player), f"{world.get_out_file_name_base(player)}.puml")
+    """
+    assert root_region.multiworld, "The multiworld attribute of root_region has to be filled"
+    from BaseClasses import Entrance, Item, Location, LocationProgressType, MultiWorld, Region
+    from collections import deque
+    import re
+
+    uml: typing.List[str] = list()
+    seen: typing.Set[Region] = set()
+    regions: typing.Deque[Region] = deque((root_region,))
+    multiworld: MultiWorld = root_region.multiworld
+
+    def fmt(obj: Union[Entrance, Item, Location, Region]) -> str:
+        name = obj.name
+        if isinstance(obj, Item):
+            name = multiworld.get_name_string_for_object(obj)
+            if obj.advancement:
+                name = f"**{name}**"
+            if obj.code is None:
+                name = f"//{name}//"
+        if isinstance(obj, Location):
+            if obj.progress_type == LocationProgressType.PRIORITY:
+                name = f"**{name}**"
+            elif obj.progress_type == LocationProgressType.EXCLUDED:
+                name = f"--{name}--"
+            if obj.address is None:
+                name = f"//{name}//"
+        return re.sub("[\".:]", "", name)
+
+    def visualize_exits(region: Region) -> None:
+        for exit_ in region.exits:
+            if exit_.connected_region:
+                if show_entrance_names:
+                    uml.append(f"\"{fmt(region)}\" --> \"{fmt(exit_.connected_region)}\" : \"{fmt(exit_)}\"")
+                else:
+                    try:
+                        uml.remove(f"\"{fmt(exit_.connected_region)}\" --> \"{fmt(region)}\"")
+                        uml.append(f"\"{fmt(exit_.connected_region)}\" <--> \"{fmt(region)}\"")
+                    except ValueError:
+                        uml.append(f"\"{fmt(region)}\" --> \"{fmt(exit_.connected_region)}\"")
+            else:
+                uml.append(f"circle \"unconnected exit:\\n{fmt(exit_)}\"")
+                uml.append(f"\"{fmt(region)}\" --> \"unconnected exit:\\n{fmt(exit_)}\"")
+
+    def visualize_locations(region: Region) -> None:
+        any_lock = any(location.locked for location in region.locations)
+        for location in region.locations:
+            lock = "<&lock-locked> " if location.locked else "<&lock-unlocked,color=transparent> " if any_lock else ""
+            if location.item:
+                uml.append(f"\"{fmt(region)}\" : {{method}} {lock}{fmt(location)}: {fmt(location.item)}")
+            else:
+                uml.append(f"\"{fmt(region)}\" : {{field}} {lock}{fmt(location)}")
+
+    def visualize_region(region: Region) -> None:
+        uml.append(f"class \"{fmt(region)}\"")
+        if show_locations:
+            visualize_locations(region)
+        visualize_exits(region)
+
+    def visualize_other_regions() -> None:
+        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)}\"")
+            uml.append("}")
+
+    uml.append("@startuml")
+    uml.append("hide circle")
+    uml.append("hide empty members")
+    if linetype_ortho:
+        uml.append("skinparam linetype ortho")
+    while regions:
+        if (current_region := regions.popleft()) not in seen:
+            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:
+        visualize_other_regions()
+    uml.append("@enduml")
+
+    with open(file_name, "wt", encoding="utf-8") as f:
+        f.write("\n".join(uml))
+
+
+class RepeatableChain:
+    def __init__(self, iterable: typing.Iterable):
+        self.iterable = iterable
+
+    def __iter__(self):
+        return itertools.chain.from_iterable(self.iterable)
+
+    def __bool__(self):
+        return any(sub_iterable for sub_iterable in self.iterable)
+
+    def __len__(self):
+        return sum(len(iterable) for iterable in self.iterable)
diff --git a/WargrooveClient.py b/WargrooveClient.py
index 16bfeb15ab..77180502ce 100644
--- a/WargrooveClient.py
+++ b/WargrooveClient.py
@@ -113,6 +113,9 @@ class WargrooveContext(CommonContext):
     async def connection_closed(self):
         await super(WargrooveContext, self).connection_closed()
         self.remove_communication_files()
+        self.checked_locations.clear()
+        self.server_locations.clear()
+        self.finished_game = False
 
     @property
     def endpoints(self):
@@ -124,6 +127,9 @@ class WargrooveContext(CommonContext):
     async def shutdown(self):
         await super(WargrooveContext, self).shutdown()
         self.remove_communication_files()
+        self.checked_locations.clear()
+        self.server_locations.clear()
+        self.finished_game = False
 
     def remove_communication_files(self):
         for root, dirs, files in os.walk(self.game_communication_path):
@@ -402,8 +408,10 @@ async def game_watcher(ctx: WargrooveContext):
                 if file.find("send") > -1:
                     st = file.split("send", -1)[1]
                     sending = sending+[(int(st))]
+                    os.remove(os.path.join(ctx.game_communication_path, file))
                 if file.find("victory") > -1:
                     victory = True
+                    os.remove(os.path.join(ctx.game_communication_path, file))
         ctx.locations_checked = sending
         message = [{"cmd": 'LocationChecks', "locations": sending}]
         await ctx.send_msgs(message)
diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py
index 49d57c9d9d..8121cbc44b 100644
--- a/WebHostLib/__init__.py
+++ b/WebHostLib/__init__.py
@@ -51,7 +51,6 @@ app.config["PONY"] = {
 }
 app.config["MAX_ROLL"] = 20
 app.config["CACHE_TYPE"] = "SimpleCache"
-app.config["JSON_AS_ASCII"] = False
 app.config["HOST_ADDRESS"] = ""
 
 cache = Cache()
diff --git a/WebHostLib/check.py b/WebHostLib/check.py
index c5dfd9f556..e739dda02d 100644
--- a/WebHostLib/check.py
+++ b/WebHostLib/check.py
@@ -1,17 +1,13 @@
+import os
 import zipfile
-from typing import *
+import base64
+from typing import Union, Dict, Set, Tuple
 
 from flask import request, flash, redirect, url_for, render_template
 from markupsafe import Markup
 
 from WebHostLib import app
-
-banned_zip_contents = (".sfc",)
-
-
-def allowed_file(filename):
-    return filename.endswith(('.txt', ".yaml", ".zip"))
-
+from WebHostLib.upload import allowed_options, allowed_options_extensions, banned_file
 
 from Generate import roll_settings, PlandoOptions
 from Utils import parse_yamls
@@ -30,7 +26,15 @@ def check():
                 flash(options)
             else:
                 results, _ = roll_options(options)
-                return render_template("checkResult.html", results=results)
+                if len(options) > 1:
+                    # offer combined file back
+                    combined_yaml = "---\n".join(f"# original filename: {file_name}\n{file_content.decode('utf-8-sig')}"
+                                                 for file_name, file_content in options.items())
+                    combined_yaml = base64.b64encode(combined_yaml.encode("utf-8-sig")).decode()
+                else:
+                    combined_yaml = ""
+                return render_template("checkResult.html",
+                                       results=results, combined_yaml=combined_yaml)
     return render_template("check.html")
 
 
@@ -41,33 +45,42 @@ def mysterycheck():
 
 def get_yaml_data(files) -> Union[Dict[str, str], str, Markup]:
     options = {}
-    for file in files:
-        # if user does not select file, browser also
-        # submit an empty part without filename
-        if file.filename == '':
-            return 'No selected file'
-        elif file.filename in options:
-            return f'Conflicting files named {file.filename} submitted'
-        elif file and allowed_file(file.filename):
-            if file.filename.endswith(".zip"):
+    for uploaded_file in files:
+        if banned_file(uploaded_file.filename):
+            return ("Uploaded data contained a rom file, which is likely to contain copyrighted material. "
+                    "Your file was deleted.")
+        # If the user does not select file, the browser will still submit an empty string without a file name.
+        elif uploaded_file.filename == "":
+            return "No selected file."
+        elif uploaded_file.filename in options:
+            return f"Conflicting files named {uploaded_file.filename} submitted."
+        elif uploaded_file and allowed_options(uploaded_file.filename):
+            if uploaded_file.filename.endswith(".zip"):
+                if not zipfile.is_zipfile(uploaded_file):
+                    return f"Uploaded file {uploaded_file.filename} is not a valid .zip file and cannot be opened."
 
-                with zipfile.ZipFile(file, 'r') as zfile:
-                    infolist = zfile.infolist()
+                uploaded_file.seek(0)  # offset from is_zipfile check
+                with zipfile.ZipFile(uploaded_file, "r") as zfile:
+                    for file in zfile.infolist():
+                        # Remove folder pathing from str (e.g. "__MACOSX/" folder paths from archives created by macOS).
+                        base_filename = os.path.basename(file.filename)
 
-                    if any(file.filename.endswith(".archipelago") for file in infolist):
-                        return Markup("Error: Your .zip file contains an .archipelago file. "
-                                    'Did you mean to <a href="/uploads">host a game</a>?')
-
-                    for file in infolist:
-                        if file.filename.endswith(banned_zip_contents):
-                            return "Uploaded data contained a rom file, which is likely to contain copyrighted material. " \
-                                "Your file was deleted."
-                        elif file.filename.endswith((".yaml", ".json", ".yml", ".txt")):
+                        if base_filename.endswith(".archipelago"):
+                            return Markup("Error: Your .zip file contains an .archipelago file. "
+                                          'Did you mean to <a href="/uploads">host a game</a>?')
+                        elif base_filename.endswith(".zip"):
+                            return "Nested .zip files inside a .zip are not supported."
+                        elif banned_file(base_filename):
+                            return ("Uploaded data contained a rom file, which is likely to contain copyrighted "
+                                    "material. Your file was deleted.")
+                        # Ignore dot-files.
+                        elif not base_filename.startswith(".") and allowed_options(base_filename):
                             options[file.filename] = zfile.open(file, "r").read()
             else:
-                options[file.filename] = file.read()
+                options[uploaded_file.filename] = uploaded_file.read()
+
     if not options:
-        return "Did not find a .yaml file to process."
+        return f"Did not find any valid files to process. Accepted formats: {allowed_options_extensions}"
     return options
 
 
diff --git a/WebHostLib/customserver.py b/WebHostLib/customserver.py
index fbe7b5f199..9048d51ff7 100644
--- a/WebHostLib/customserver.py
+++ b/WebHostLib/customserver.py
@@ -11,6 +11,7 @@ import socket
 import threading
 import time
 import typing
+import sys
 
 import websockets
 from pony.orm import commit, db_session, select
@@ -28,8 +29,10 @@ from .models import Command, GameDataPackage, Room, db
 class CustomClientMessageProcessor(ClientMessageProcessor):
     ctx: WebHostContext
 
-    def _cmd_video(self, platform, user):
-        """Set a link for your name in the WebHostLib tracker pointing to a video stream"""
+    def _cmd_video(self, platform: str, user: str):
+        """Set a link for your name in the WebHostLib tracker pointing to a video stream.
+        Currently, only YouTube and Twitch platforms are supported.
+        """
         if platform.lower().startswith("t"):  # twitch
             self.ctx.video[self.client.team, self.client.slot] = "Twitch", user
             self.ctx.save()
@@ -203,8 +206,10 @@ def run_server_process(room_id, ponyconfig: dict, static_server_data: dict,
     db.generate_mapping(check_tables=False)
 
     async def main():
-        import gc
+        if "worlds" in sys.modules:
+            raise Exception("Worlds system should not be loaded in the custom server.")
 
+        import gc
         Utils.init_logging(str(room_id), write_mode="a")
         ctx = WebHostContext(static_server_data)
         ctx.load(room_id, game_ports)
@@ -239,6 +244,12 @@ def run_server_process(room_id, ponyconfig: dict, static_server_data: dict,
             ctx.auto_shutdown = Room.get(id=room_id).timeout
         ctx.shutdown_task = asyncio.create_task(auto_shutdown(ctx, []))
         await ctx.shutdown_task
+
+        # ensure auto launch is on the same page in regard to room activity.
+        with db_session:
+            room: Room = Room.get(id=ctx.room_id)
+            room.last_activity = datetime.datetime.utcnow() - datetime.timedelta(seconds=room.timeout + 60)
+
         logging.info("Shutting down")
 
     with Locker(room_id):
diff --git a/WebHostLib/downloads.py b/WebHostLib/downloads.py
index 5cf503be1b..a09ca70171 100644
--- a/WebHostLib/downloads.py
+++ b/WebHostLib/downloads.py
@@ -90,6 +90,8 @@ def download_slot_file(room_id, player_id: int):
             fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}.json"
         elif slot_data.game == "Kingdom Hearts 2":
             fname = f"AP_{app.jinja_env.filters['suuid'](room_id)}_P{slot_data.player_id}_{slot_data.player_name}.zip"
+        elif slot_data.game == "Final Fantasy Mystic Quest":
+            fname = f"AP+{app.jinja_env.filters['suuid'](room_id)}_P{slot_data.player_id}_{slot_data.player_name}.apmq"
         else:
             return "Game download not supported."
         return send_file(io.BytesIO(slot_data.data), as_attachment=True, download_name=fname)
diff --git a/WebHostLib/generate.py b/WebHostLib/generate.py
index ddcc5ffb6c..ee1ce591ee 100644
--- a/WebHostLib/generate.py
+++ b/WebHostLib/generate.py
@@ -1,18 +1,18 @@
+import concurrent.futures
 import json
 import os
 import pickle
 import random
 import tempfile
 import zipfile
-import concurrent.futures
 from collections import Counter
-from typing import Dict, Optional, Any, Union, List
+from typing import Any, Dict, List, Optional, Union
 
-from flask import request, flash, redirect, url_for, session, render_template
+from flask import flash, redirect, render_template, request, session, url_for
 from pony.orm import commit, db_session
 
-from BaseClasses import seeddigits, get_seed
-from Generate import handle_name, PlandoOptions
+from BaseClasses import get_seed, seeddigits
+from Generate import PlandoOptions, handle_name
 from Main import main as ERmain
 from Utils import __version__
 from WebHostLib import app
@@ -131,6 +131,7 @@ def gen_game(gen_options: dict, meta: Optional[Dict[str, Any]] = None, owner=Non
         erargs.plando_options = PlandoOptions.from_set(meta.setdefault("plando_options",
                                                                        {"bosses", "items", "connections", "texts"}))
         erargs.skip_prog_balancing = False
+        erargs.skip_output = False
 
         name_counter = Counter()
         for player, (playerfile, settings) in enumerate(gen_options.items(), 1):
diff --git a/WebHostLib/misc.py b/WebHostLib/misc.py
index 6d3e82c00c..ee04e56fd7 100644
--- a/WebHostLib/misc.py
+++ b/WebHostLib/misc.py
@@ -32,29 +32,46 @@ def page_not_found(err):
 
 # Start Playing Page
 @app.route('/start-playing')
+@cache.cached()
 def start_playing():
     return render_template(f"startPlaying.html")
 
 
-@app.route('/weighted-settings')
+# TODO for back compat. remove around 0.4.5
+@app.route("/weighted-settings")
 def weighted_settings():
-    return render_template(f"weighted-settings.html")
+    return redirect("weighted-options", 301)
 
 
-# Player settings pages
-@app.route('/games/<string:game>/player-settings')
-def player_settings(game):
-    return render_template(f"player-settings.html", game=game, theme=get_world_theme(game))
+@app.route("/weighted-options")
+@cache.cached()
+def weighted_options():
+    return render_template("weighted-options.html")
+
+
+# TODO for back compat. remove around 0.4.5
+@app.route("/games/<string:game>/player-settings")
+def player_settings(game: str):
+    return redirect(url_for("player_options", game=game), 301)
+
+
+# Player options pages
+@app.route("/games/<string:game>/player-options")
+@cache.cached()
+def player_options(game: str):
+    return render_template("player-options.html", game=game, theme=get_world_theme(game))
 
 
 # Game Info Pages
 @app.route('/games/<string:game>/info/<string:lang>')
+@cache.cached()
 def game_info(game, lang):
     return render_template('gameInfo.html', game=game, lang=lang, theme=get_world_theme(game))
 
 
 # List of supported games
 @app.route('/games')
+@cache.cached()
 def games():
     worlds = {}
     for game, world in AutoWorldRegister.world_types.items():
@@ -64,21 +81,25 @@ def games():
 
 
 @app.route('/tutorial/<string:game>/<string:file>/<string:lang>')
+@cache.cached()
 def tutorial(game, file, lang):
     return render_template("tutorial.html", game=game, file=file, lang=lang, theme=get_world_theme(game))
 
 
 @app.route('/tutorial/')
+@cache.cached()
 def tutorial_landing():
     return render_template("tutorialLanding.html")
 
 
 @app.route('/faq/<string:lang>/')
+@cache.cached()
 def faq(lang):
     return render_template("faq.html", lang=lang)
 
 
 @app.route('/glossary/<string:lang>/')
+@cache.cached()
 def terms(lang):
     return render_template("glossary.html", lang=lang)
 
@@ -147,7 +168,7 @@ def host_room(room: UUID):
 
 @app.route('/favicon.ico')
 def favicon():
-    return send_from_directory(os.path.join(app.root_path, 'static/static'),
+    return send_from_directory(os.path.join(app.root_path, "static", "static"),
                                'favicon.ico', mimetype='image/vnd.microsoft.icon')
 
 
@@ -167,10 +188,11 @@ def get_datapackage():
 
 @app.route('/index')
 @app.route('/sitemap')
+@cache.cached()
 def get_sitemap():
     available_games: List[Dict[str, Union[str, bool]]] = []
     for game, world in AutoWorldRegister.world_types.items():
         if not world.hidden:
-            has_settings: bool = isinstance(world.web.settings_page, bool) and world.web.settings_page
+            has_settings: bool = isinstance(world.web.options_page, bool) and world.web.options_page
             available_games.append({ 'title': game, 'has_settings': has_settings })
     return render_template("siteMap.html", games=available_games)
diff --git a/WebHostLib/options.py b/WebHostLib/options.py
index fca01407e0..0158de7e24 100644
--- a/WebHostLib/options.py
+++ b/WebHostLib/options.py
@@ -3,11 +3,8 @@ import logging
 import os
 import typing
 
-import yaml
-from jinja2 import Template
-
 import Options
-from Utils import __version__, local_path
+from Utils import local_path
 from worlds.AutoWorld import AutoWorldRegister
 
 handled_in_js = {"start_inventory", "local_items", "non_local_items", "start_hints", "start_location_hints",
@@ -25,10 +22,10 @@ def create():
             return "Please document me!"
         return "\n".join(line.strip() for line in option_type.__doc__.split("\n")).strip()
 
-    weighted_settings = {
+    weighted_options = {
         "baseOptions": {
             "description": "Generated by https://archipelago.gg/",
-            "name": "Player",
+            "name": "",
             "game": {},
         },
         "games": {},
@@ -36,17 +33,14 @@ def create():
 
     for game_name, world in AutoWorldRegister.world_types.items():
 
-        all_options: typing.Dict[str, Options.AssembleOptions] = {
-            **Options.per_game_common_options,
-            **world.option_definitions
-        }
+        all_options: typing.Dict[str, Options.AssembleOptions] = world.options_dataclass.type_hints
 
-        # Generate JSON files for player-settings pages
-        player_settings = {
+        # Generate JSON files for player-options pages
+        player_options = {
             "baseOptions": {
                 "description": f"Generated by https://archipelago.gg/ for {game_name}",
                 "game": game_name,
-                "name": "Player",
+                "name": "",
             },
         }
 
@@ -87,8 +81,8 @@ def create():
                     "max": option.range_end,
                 }
 
-                if issubclass(option, Options.SpecialRange):
-                    game_options[option_name]["type"] = 'special_range'
+                if issubclass(option, Options.NamedRange):
+                    game_options[option_name]["type"] = 'named_range'
                     game_options[option_name]["value_names"] = {}
                     for key, val in option.special_range_names.items():
                         game_options[option_name]["value_names"][key] = val
@@ -120,17 +114,53 @@ def create():
                     }
 
             else:
-                logging.debug(f"{option} not exported to Web Settings.")
+                logging.debug(f"{option} not exported to Web Options.")
 
-        player_settings["gameOptions"] = game_options
+        player_options["gameOptions"] = game_options
 
-        os.makedirs(os.path.join(target_folder, 'player-settings'), exist_ok=True)
+        player_options["presetOptions"] = {}
+        for preset_name, preset in world.web.options_presets.items():
+            player_options["presetOptions"][preset_name] = {}
+            for option_name, option_value in preset.items():
+                # Random range type settings are not valid.
+                assert (not str(option_value).startswith("random-")), \
+                    f"Invalid preset value '{option_value}' for '{option_name}' in '{preset_name}'. Special random " \
+                    f"values are not supported for presets."
 
-        with open(os.path.join(target_folder, 'player-settings', game_name + ".json"), "w") as f:
-            json.dump(player_settings, f, indent=2, separators=(',', ': '))
+                # Normal random is supported, but needs to be handled explicitly.
+                if option_value == "random":
+                    player_options["presetOptions"][preset_name][option_name] = option_value
+                    continue
 
-        if not world.hidden and world.web.settings_page is True:
-            # Add the random option to Choice, TextChoice, and Toggle settings
+                option = world.options_dataclass.type_hints[option_name].from_any(option_value)
+                if isinstance(option, Options.NamedRange) and isinstance(option_value, str):
+                    assert option_value in option.special_range_names, \
+                        f"Invalid preset value '{option_value}' for '{option_name}' in '{preset_name}'. " \
+                        f"Expected {option.special_range_names.keys()} or {option.range_start}-{option.range_end}."
+
+                    # Still use the true value for the option, not the name.
+                    player_options["presetOptions"][preset_name][option_name] = option.value
+                elif isinstance(option, Options.Range):
+                    player_options["presetOptions"][preset_name][option_name] = option.value
+                elif isinstance(option_value, str):
+                    # For Choice and Toggle options, the value should be the name of the option. This is to prevent
+                    # setting a preset for an option with an overridden from_text method that would normally be okay,
+                    # but would not be okay for the webhost's current implementation of player options UI.
+                    assert option.name_lookup[option.value] == option_value, \
+                        f"Invalid option value '{option_value}' for '{option_name}' in preset '{preset_name}'. " \
+                        f"Values must not be resolved to a different option via option.from_text (or an alias)."
+                    player_options["presetOptions"][preset_name][option_name] = option.current_key
+                else:
+                    # int and bool values are fine, just resolve them to the current key for webhost.
+                    player_options["presetOptions"][preset_name][option_name] = option.current_key
+
+        os.makedirs(os.path.join(target_folder, 'player-options'), exist_ok=True)
+
+        with open(os.path.join(target_folder, 'player-options', game_name + ".json"), "w") as f:
+            json.dump(player_options, f, indent=2, separators=(',', ': '))
+
+        if not world.hidden and world.web.options_page is True:
+            # Add the random option to Choice, TextChoice, and Toggle options
             for option in game_options.values():
                 if option["type"] == "select":
                     option["options"].append({"name": "Random", "value": "random"})
@@ -138,11 +168,21 @@ def create():
                     if not option["defaultValue"]:
                         option["defaultValue"] = "random"
 
-            weighted_settings["baseOptions"]["game"][game_name] = 0
-            weighted_settings["games"][game_name] = {}
-            weighted_settings["games"][game_name]["gameSettings"] = game_options
-            weighted_settings["games"][game_name]["gameItems"] = tuple(world.item_names)
-            weighted_settings["games"][game_name]["gameLocations"] = tuple(world.location_names)
+            weighted_options["baseOptions"]["game"][game_name] = 0
+            weighted_options["games"][game_name] = {
+                "gameSettings": game_options,
+                "gameItems": tuple(world.item_names),
+                "gameItemGroups": [
+                    group for group in world.item_name_groups.keys() if group != "Everything"
+                ],
+                "gameItemDescriptions": world.item_descriptions,
+                "gameLocations": tuple(world.location_names),
+                "gameLocationGroups": [
+                    group for group in world.location_name_groups.keys() if group != "Everywhere"
+                ],
+                "gameLocationDescriptions": world.location_descriptions,
+            }
+
+    with open(os.path.join(target_folder, 'weighted-options.json'), "w") as f:
+        json.dump(weighted_options, f, indent=2, separators=(',', ': '))
 
-    with open(os.path.join(target_folder, 'weighted-settings.json'), "w") as f:
-        json.dump(weighted_settings, f, indent=2, separators=(',', ': '))
diff --git a/WebHostLib/requirements.txt b/WebHostLib/requirements.txt
index a3695e3383..62707d78cf 100644
--- a/WebHostLib/requirements.txt
+++ b/WebHostLib/requirements.txt
@@ -1,10 +1,9 @@
-flask>=2.2.3
-pony>=0.7.16; python_version <= '3.10'
-pony @ https://github.com/Berserker66/pony/releases/download/v0.7.16/pony-0.7.16-py3-none-any.whl#0.7.16 ; python_version >= '3.11'
+flask>=3.0.0
+pony>=0.7.17
 waitress>=2.1.2
-Flask-Caching>=2.0.2
+Flask-Caching>=2.1.0
 Flask-Compress>=1.14
 Flask-Limiter>=3.5.0
 bokeh>=3.1.1; python_version <= '3.8'
-bokeh>=3.2.2; python_version >= '3.9'
+bokeh>=3.3.2; python_version >= '3.9'
 markupsafe>=2.1.3
diff --git a/WebHostLib/static/assets/faq/faq_en.md b/WebHostLib/static/assets/faq/faq_en.md
index 74f423df1f..fb1ccd2d6f 100644
--- a/WebHostLib/static/assets/faq/faq_en.md
+++ b/WebHostLib/static/assets/faq/faq_en.md
@@ -2,13 +2,62 @@
 
 ## What is a randomizer?
 
-A randomizer is a modification of a video game which reorganizes the items required to progress through the game. A
-normal play-through of a game might require you to use item A to unlock item B, then C, and so forth. In a randomized
+A randomizer is a modification of a game which reorganizes the items required to progress through that game. A
+normal play-through might require you to use item A to unlock item B, then C, and so forth. In a randomized
 game, you might first find item C, then A, then B.
 
-This transforms games from a linear experience into a puzzle, presenting players with a new challenge each time they
-play a randomized game. Putting items in non-standard locations can require the player to think about the game world and
-the items they encounter in new and interesting ways.
+This transforms the game from a linear experience into a puzzle, presenting players with a new challenge each time they
+play. Putting items in non-standard locations can require the player to think about the game world and the items they
+encounter in new and interesting ways.
+
+## What is a multiworld?
+
+While a randomizer shuffles a game, a multiworld randomizer shuffles that game for multiple players. For example, in a
+two player multiworld, players A and B each get their own randomized version of a game, called a world. In each
+player's game, they may find items which belong to the other player. If player A finds an item which belongs to
+player B, the item will be sent to player B's world over the internet. This creates a cooperative experience, requiring
+players to rely upon each other to complete their game.
+
+## What does multi-game mean?
+
+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 multiworld.
+Here is a list of our [Supported Games](https://archipelago.gg/games).
+
+## Can I generate a single-player game with Archipelago?
+
+Yes. All of our supported games can be generated as single-player experiences both on the website and by installing 
+the Archipelago generator software. The fastest way to do this is on the website. Find the Supported Game you wish to
+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
+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.
+
+If you are ready to start randomizing games, or want to start playing your favorite randomizer with others, please join
+our discord server at the [Archipelago Discord](https://discord.gg/8Z65BR2). There are always people ready to answer
+any questions you might have.
+
+## What are some common terms I should know?
+
+As randomizers and multiworld randomizers have been around for a while now, there are quite a few common terms used
+by the communities surrounding them. A list of Archipelago jargon and terms commonly used by the community can be
+found in the [Glossary](/glossary/en).
+
+## Does everyone need to be connected at the same time?
+
+There are two different play-styles that are common for Archipelago multiworld sessions. These sessions can either
+be considered synchronous (or "sync"), where everyone connects and plays at the same time, or asynchronous (or "async"),
+where players connect and play at their own pace. The setup for both is identical. The difference in play-style is how
+you and your friends choose to organize and play your multiworld. Most groups decide on the format before creating
+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).
 
 ## What happens if an item is placed somewhere it is impossible to get?
 
@@ -17,53 +66,15 @@ is to ensure items necessary to complete the game will be accessible to the play
 rules allowing certain items to be placed in normally unreachable locations, provided the player has indicated they are
 comfortable exploiting certain glitches in the game.
 
-## What is a multi-world?
-
-While a randomizer shuffles a game, a multi-world randomizer shuffles that game for multiple players. For example, in a
-two player multi-world, players A and B each get their own randomized version of a game, called a world. In each player's
-game, they may find items which belong to the other player. If player A finds an item which belongs to player B, the
-item will be sent to player B's world over the internet.
-
-This creates a cooperative experience during multi-world games, requiring players to rely upon each other to complete
-their game.
-
-## What happens if a person has to leave early?
-
-If a player must leave early, they can use Archipelago's release system. When a player releases their game, all the
-items in that game which belong to other players are sent out automatically, so other players can continue to play.
-
-## What does multi-game mean?
-
-While a multi-world game traditionally requires all players to be playing the same game, a multi-game multi-world allows
-players to randomize any of a number of supported games, and send items between them. This allows players of different
-games to interact with one another in a single multiplayer environment.
-
-## Can I generate a single-player game with Archipelago?
-
-Yes. All our supported games can be generated as single-player experiences, and so long as you download the software,
-the website is not required to generate them.
-
-## How do I get started?
-
-If you are ready to start randomizing games, or want to start playing your favorite randomizer with others, please join
-our discord server at the [Archipelago Discord](https://discord.gg/8Z65BR2). There are always people ready to answer
-any questions you might have.
-
-## What are some common terms I should know?
-
-As randomizers and multiworld randomizers have been around for a while now there are quite a lot of common terms
-and jargon that is used in conjunction by the communities surrounding them. For a lot of the terms that are more common
-to Archipelago and its specific systems please see the [Glossary](/glossary/en).
-
 ## I want to add a game to the Archipelago randomizer. How do I do that?
 
-The best way to get started is to take a look at our code on GitHub
-at [Archipelago GitHub Page](https://github.com/ArchipelagoMW/Archipelago).
+The best way to get started is to take a look at our code on GitHub:  
+[Archipelago GitHub Page](https://github.com/ArchipelagoMW/Archipelago).
 
-There you will find examples of games in the worlds folder
-at [/worlds Folder in Archipelago Code](https://github.com/ArchipelagoMW/Archipelago/tree/main/worlds).
+There, you will find examples of games in the `worlds` folder:  
+[/worlds Folder in Archipelago Code](https://github.com/ArchipelagoMW/Archipelago/tree/main/worlds).
 
-You may also find developer documentation in the docs folder
-at [/docs Folder in Archipelago Code](https://github.com/ArchipelagoMW/Archipelago/tree/main/docs).
+You may also find developer documentation in the `docs` folder:  
+[/docs Folder in Archipelago Code](https://github.com/ArchipelagoMW/Archipelago/tree/main/docs).
 
 If you have more questions, feel free to ask in the **#archipelago-dev** channel on our Discord.
diff --git a/WebHostLib/static/assets/player-options.js b/WebHostLib/static/assets/player-options.js
new file mode 100644
index 0000000000..92cd6c43f3
--- /dev/null
+++ b/WebHostLib/static/assets/player-options.js
@@ -0,0 +1,523 @@
+let gameName = null;
+
+window.addEventListener('load', () => {
+  gameName = document.getElementById('player-options').getAttribute('data-game');
+
+  // Update game name on page
+  document.getElementById('game-name').innerText = gameName;
+
+  fetchOptionData().then((results) => {
+    let optionHash = localStorage.getItem(`${gameName}-hash`);
+    if (!optionHash) {
+      // If no hash data has been set before, set it now
+      optionHash = md5(JSON.stringify(results));
+      localStorage.setItem(`${gameName}-hash`, optionHash);
+      localStorage.removeItem(gameName);
+    }
+
+    if (optionHash !== md5(JSON.stringify(results))) {
+      showUserMessage(
+          'Your options are out of date! Click here to update them! Be aware this will reset them all to default.'
+      );
+      document.getElementById('user-message').addEventListener('click', resetOptions);
+    }
+
+    // Page setup
+    createDefaultOptions(results);
+    buildUI(results);
+    adjustHeaderWidth();
+
+    // Event listeners
+    document.getElementById('export-options').addEventListener('click', () => exportOptions());
+    document.getElementById('generate-race').addEventListener('click', () => generateGame(true));
+    document.getElementById('generate-game').addEventListener('click', () => generateGame());
+
+    // Name input field
+    const playerOptions = JSON.parse(localStorage.getItem(gameName));
+    const nameInput = document.getElementById('player-name');
+    nameInput.addEventListener('keyup', (event) => updateBaseOption(event));
+    nameInput.value = playerOptions.name;
+
+    // Presets
+    const presetSelect = document.getElementById('game-options-preset');
+    presetSelect.addEventListener('change', (event) => setPresets(results, event.target.value));
+    for (const preset in results['presetOptions']) {
+      const presetOption = document.createElement('option');
+      presetOption.innerText = preset;
+      presetSelect.appendChild(presetOption);
+    }
+    presetSelect.value = localStorage.getItem(`${gameName}-preset`);
+    results['presetOptions']['__default'] = {};
+  }).catch((e) => {
+    console.error(e);
+    const url = new URL(window.location.href);
+    window.location.replace(`${url.protocol}//${url.hostname}/page-not-found`);
+  })
+});
+
+const resetOptions = () => {
+  localStorage.removeItem(gameName);
+  localStorage.removeItem(`${gameName}-hash`);
+  localStorage.removeItem(`${gameName}-preset`);
+  window.location.reload();
+};
+
+const fetchOptionData = () => new Promise((resolve, reject) => {
+  const ajax = new XMLHttpRequest();
+  ajax.onreadystatechange = () => {
+    if (ajax.readyState !== 4) { return; }
+    if (ajax.status !== 200) {
+      reject(ajax.responseText);
+      return;
+    }
+    try{ resolve(JSON.parse(ajax.responseText)); }
+    catch(error){ reject(error); }
+  };
+  ajax.open('GET', `${window.location.origin}/static/generated/player-options/${gameName}.json`, true);
+  ajax.send();
+});
+
+const createDefaultOptions = (optionData) => {
+  if (!localStorage.getItem(gameName)) {
+    const newOptions = {
+      [gameName]: {},
+    };
+    for (let baseOption of Object.keys(optionData.baseOptions)){
+      newOptions[baseOption] = optionData.baseOptions[baseOption];
+    }
+    for (let gameOption of Object.keys(optionData.gameOptions)){
+      newOptions[gameName][gameOption] = optionData.gameOptions[gameOption].defaultValue;
+    }
+    localStorage.setItem(gameName, JSON.stringify(newOptions));
+  }
+
+  if (!localStorage.getItem(`${gameName}-preset`)) {
+    localStorage.setItem(`${gameName}-preset`, '__default');
+  }
+};
+
+const buildUI = (optionData) => {
+  // Game Options
+  const leftGameOpts = {};
+  const rightGameOpts = {};
+  Object.keys(optionData.gameOptions).forEach((key, index) => {
+    if (index < Object.keys(optionData.gameOptions).length / 2) {
+      leftGameOpts[key] = optionData.gameOptions[key];
+    } else {
+      rightGameOpts[key] = optionData.gameOptions[key];
+    }
+  });
+  document.getElementById('game-options-left').appendChild(buildOptionsTable(leftGameOpts));
+  document.getElementById('game-options-right').appendChild(buildOptionsTable(rightGameOpts));
+};
+
+const buildOptionsTable = (options, romOpts = false) => {
+  const currentOptions = JSON.parse(localStorage.getItem(gameName));
+  const table = document.createElement('table');
+  const tbody = document.createElement('tbody');
+
+  Object.keys(options).forEach((option) => {
+    const tr = document.createElement('tr');
+
+    // td Left
+    const tdl = document.createElement('td');
+    const label = document.createElement('label');
+    label.textContent = `${options[option].displayName}: `;
+    label.setAttribute('for', option);
+
+    const questionSpan = document.createElement('span');
+    questionSpan.classList.add('interactive');
+    questionSpan.setAttribute('data-tooltip', options[option].description);
+    questionSpan.innerText = '(?)';
+
+    label.appendChild(questionSpan);
+    tdl.appendChild(label);
+    tr.appendChild(tdl);
+
+    // td Right
+    const tdr = document.createElement('td');
+    let element = null;
+
+    const randomButton = document.createElement('button');
+
+    switch(options[option].type) {
+      case 'select':
+        element = document.createElement('div');
+        element.classList.add('select-container');
+        let select = document.createElement('select');
+        select.setAttribute('id', option);
+        select.setAttribute('data-key', option);
+        if (romOpts) { select.setAttribute('data-romOpt', '1'); }
+        options[option].options.forEach((opt) => {
+          const optionElement = document.createElement('option');
+          optionElement.setAttribute('value', opt.value);
+          optionElement.innerText = opt.name;
+
+          if ((isNaN(currentOptions[gameName][option]) &&
+            (parseInt(opt.value, 10) === parseInt(currentOptions[gameName][option]))) ||
+            (opt.value === currentOptions[gameName][option]))
+          {
+            optionElement.selected = true;
+          }
+          select.appendChild(optionElement);
+        });
+        select.addEventListener('change', (event) => updateGameOption(event.target));
+        element.appendChild(select);
+
+        // Randomize button
+        randomButton.innerText = '🎲';
+        randomButton.classList.add('randomize-button');
+        randomButton.setAttribute('data-key', option);
+        randomButton.setAttribute('data-tooltip', 'Toggle randomization for this option!');
+        randomButton.addEventListener('click', (event) => toggleRandomize(event, select));
+        if (currentOptions[gameName][option] === 'random') {
+          randomButton.classList.add('active');
+          select.disabled = true;
+        }
+
+        element.appendChild(randomButton);
+        break;
+
+      case 'range':
+        element = document.createElement('div');
+        element.classList.add('range-container');
+
+        let range = document.createElement('input');
+        range.setAttribute('id', option);
+        range.setAttribute('type', 'range');
+        range.setAttribute('data-key', option);
+        range.setAttribute('min', options[option].min);
+        range.setAttribute('max', options[option].max);
+        range.value = currentOptions[gameName][option];
+        range.addEventListener('change', (event) => {
+          document.getElementById(`${option}-value`).innerText = event.target.value;
+          updateGameOption(event.target);
+        });
+        element.appendChild(range);
+
+        let rangeVal = document.createElement('span');
+        rangeVal.classList.add('range-value');
+        rangeVal.setAttribute('id', `${option}-value`);
+        rangeVal.innerText = currentOptions[gameName][option] !== 'random' ?
+          currentOptions[gameName][option] : options[option].defaultValue;
+        element.appendChild(rangeVal);
+
+        // Randomize button
+        randomButton.innerText = '🎲';
+        randomButton.classList.add('randomize-button');
+        randomButton.setAttribute('data-key', option);
+        randomButton.setAttribute('data-tooltip', 'Toggle randomization for this option!');
+        randomButton.addEventListener('click', (event) => toggleRandomize(event, range));
+        if (currentOptions[gameName][option] === 'random') {
+          randomButton.classList.add('active');
+          range.disabled = true;
+        }
+
+        element.appendChild(randomButton);
+        break;
+
+      case 'named_range':
+        element = document.createElement('div');
+        element.classList.add('named-range-container');
+
+        // Build the select element
+        let namedRangeSelect = document.createElement('select');
+        namedRangeSelect.setAttribute('data-key', option);
+        Object.keys(options[option].value_names).forEach((presetName) => {
+          let presetOption = document.createElement('option');
+          presetOption.innerText = presetName;
+          presetOption.value = options[option].value_names[presetName];
+          const words = presetOption.innerText.split('_');
+          for (let i = 0; i < words.length; i++) {
+            words[i] = words[i][0].toUpperCase() + words[i].substring(1);
+          }
+          presetOption.innerText = words.join(' ');
+          namedRangeSelect.appendChild(presetOption);
+        });
+        let customOption = document.createElement('option');
+        customOption.innerText = 'Custom';
+        customOption.value = 'custom';
+        customOption.selected = true;
+        namedRangeSelect.appendChild(customOption);
+        if (Object.values(options[option].value_names).includes(Number(currentOptions[gameName][option]))) {
+          namedRangeSelect.value = Number(currentOptions[gameName][option]);
+        }
+
+        // Build range element
+        let namedRangeWrapper = document.createElement('div');
+        namedRangeWrapper.classList.add('named-range-wrapper');
+        let namedRange = document.createElement('input');
+        namedRange.setAttribute('type', 'range');
+        namedRange.setAttribute('data-key', option);
+        namedRange.setAttribute('min', options[option].min);
+        namedRange.setAttribute('max', options[option].max);
+        namedRange.value = currentOptions[gameName][option];
+
+        // Build rage value element
+        let namedRangeVal = document.createElement('span');
+        namedRangeVal.classList.add('range-value');
+        namedRangeVal.setAttribute('id', `${option}-value`);
+        namedRangeVal.innerText = currentOptions[gameName][option] !== 'random' ?
+          currentOptions[gameName][option] : options[option].defaultValue;
+
+        // Configure select event listener
+        namedRangeSelect.addEventListener('change', (event) => {
+          if (event.target.value === 'custom') { return; }
+
+          // Update range slider
+          namedRange.value = event.target.value;
+          document.getElementById(`${option}-value`).innerText = event.target.value;
+          updateGameOption(event.target);
+        });
+
+        // Configure range event handler
+        namedRange.addEventListener('change', (event) => {
+          // Update select element
+          namedRangeSelect.value =
+            (Object.values(options[option].value_names).includes(parseInt(event.target.value))) ?
+            parseInt(event.target.value) : 'custom';
+          document.getElementById(`${option}-value`).innerText = event.target.value;
+          updateGameOption(event.target);
+        });
+
+        element.appendChild(namedRangeSelect);
+        namedRangeWrapper.appendChild(namedRange);
+        namedRangeWrapper.appendChild(namedRangeVal);
+        element.appendChild(namedRangeWrapper);
+
+        // Randomize button
+        randomButton.innerText = '🎲';
+        randomButton.classList.add('randomize-button');
+        randomButton.setAttribute('data-key', option);
+        randomButton.setAttribute('data-tooltip', 'Toggle randomization for this option!');
+        randomButton.addEventListener('click', (event) => toggleRandomize(
+            event, namedRange, namedRangeSelect)
+        );
+        if (currentOptions[gameName][option] === 'random') {
+          randomButton.classList.add('active');
+          namedRange.disabled = true;
+          namedRangeSelect.disabled = true;
+        }
+
+        namedRangeWrapper.appendChild(randomButton);
+        break;
+
+      default:
+        console.error(`Ignoring unknown option type: ${options[option].type} with name ${option}`);
+        return;
+    }
+
+    tdr.appendChild(element);
+    tr.appendChild(tdr);
+    tbody.appendChild(tr);
+  });
+
+  table.appendChild(tbody);
+  return table;
+};
+
+const setPresets = (optionsData, presetName) => {
+  const defaults = optionsData['gameOptions'];
+  const preset = optionsData['presetOptions'][presetName];
+
+  localStorage.setItem(`${gameName}-preset`, presetName);
+
+  if (!preset) {
+    console.error(`No presets defined for preset name: '${presetName}'`);
+    return;
+  }
+
+  const updateOptionElement = (option, presetValue) => {
+    const optionElement = document.querySelector(`#${option}[data-key='${option}']`);
+    const randomElement = document.querySelector(`.randomize-button[data-key='${option}']`);
+
+    if (presetValue === 'random') {
+      randomElement.classList.add('active');
+      optionElement.disabled = true;
+      updateGameOption(randomElement, false);
+    } else {
+      optionElement.value = presetValue;
+      randomElement.classList.remove('active');
+      optionElement.disabled = undefined;
+      updateGameOption(optionElement, false);
+    }
+  };
+
+  for (const option in defaults) {
+    let presetValue = preset[option];
+    if (presetValue === undefined) {
+      // Using the default value if not set in presets.
+      presetValue = defaults[option]['defaultValue'];
+    }
+
+    switch (defaults[option].type) {
+      case 'range':
+        const numberElement = document.querySelector(`#${option}-value`);
+        if (presetValue === 'random') {
+          numberElement.innerText = defaults[option]['defaultValue'] === 'random'
+              ? defaults[option]['min'] // A fallback so we don't print 'random' in the UI.
+              : defaults[option]['defaultValue'];
+        } else {
+          numberElement.innerText = presetValue;
+        }
+
+        updateOptionElement(option, presetValue);
+        break;
+
+      case 'select': {
+        updateOptionElement(option, presetValue);
+        break;
+      }
+
+      case 'named_range': {
+        const selectElement = document.querySelector(`select[data-key='${option}']`);
+        const rangeElement = document.querySelector(`input[data-key='${option}']`);
+        const randomElement = document.querySelector(`.randomize-button[data-key='${option}']`);
+
+        if (presetValue === 'random') {
+          randomElement.classList.add('active');
+          selectElement.disabled = true;
+          rangeElement.disabled = true;
+          updateGameOption(randomElement, false);
+        } else {
+          rangeElement.value = presetValue;
+          selectElement.value = Object.values(defaults[option]['value_names']).includes(parseInt(presetValue)) ?
+              parseInt(presetValue) : 'custom';
+          document.getElementById(`${option}-value`).innerText = presetValue;
+
+          randomElement.classList.remove('active');
+          selectElement.disabled = undefined;
+          rangeElement.disabled = undefined;
+          updateGameOption(rangeElement, false);
+        }
+        break;
+      }
+
+      default:
+        console.warn(`Ignoring preset value for unknown option type: ${defaults[option].type} with name ${option}`);
+        break;
+    }
+  }
+};
+
+const toggleRandomize = (event, inputElement, optionalSelectElement = null) => {
+  const active = event.target.classList.contains('active');
+  const randomButton = event.target;
+
+  if (active) {
+    randomButton.classList.remove('active');
+    inputElement.disabled = undefined;
+    if (optionalSelectElement) {
+      optionalSelectElement.disabled = undefined;
+    }
+  } else {
+    randomButton.classList.add('active');
+    inputElement.disabled = true;
+    if (optionalSelectElement) {
+      optionalSelectElement.disabled = true;
+    }
+  }
+    updateGameOption(active ? inputElement : randomButton);
+};
+
+const updateBaseOption = (event) => {
+  const options = JSON.parse(localStorage.getItem(gameName));
+  options[event.target.getAttribute('data-key')] = isNaN(event.target.value) ?
+    event.target.value : parseInt(event.target.value);
+  localStorage.setItem(gameName, JSON.stringify(options));
+};
+
+const updateGameOption = (optionElement, toggleCustomPreset = true) => {
+  const options = JSON.parse(localStorage.getItem(gameName));
+
+  if (toggleCustomPreset) {
+    localStorage.setItem(`${gameName}-preset`, '__custom');
+    const presetElement = document.getElementById('game-options-preset');
+    presetElement.value = '__custom';
+  }
+
+  if (optionElement.classList.contains('randomize-button')) {
+    // If the event passed in is the randomize button, then we know what we must do.
+    options[gameName][optionElement.getAttribute('data-key')] = 'random';
+  } else {
+    options[gameName][optionElement.getAttribute('data-key')] = isNaN(optionElement.value) ?
+      optionElement.value : parseInt(optionElement.value, 10);
+  }
+
+  localStorage.setItem(gameName, JSON.stringify(options));
+};
+
+const exportOptions = () => {
+  const options = JSON.parse(localStorage.getItem(gameName));
+  const preset = localStorage.getItem(`${gameName}-preset`);
+  switch (preset) {
+    case '__default':
+      options['description'] = `Generated by https://archipelago.gg with the default preset.`;
+      break;
+
+    case '__custom':
+      options['description'] = `Generated by https://archipelago.gg.`;
+      break;
+
+    default:
+      options['description'] = `Generated by https://archipelago.gg with the ${preset} preset.`;
+  }
+
+  if (!options.name || options.name.toString().trim().length === 0) {
+    return showUserMessage('You must enter a player name!');
+  }
+  const yamlText = jsyaml.safeDump(options, { noCompatMode: true }).replaceAll(/'(\d+)':/g, (x, y) => `${y}:`);
+  download(`${document.getElementById('player-name').value}.yaml`, yamlText);
+};
+
+/** Create an anchor and trigger a download of a text file. */
+const download = (filename, text) => {
+  const downloadLink = document.createElement('a');
+  downloadLink.setAttribute('href','data:text/yaml;charset=utf-8,'+ encodeURIComponent(text))
+  downloadLink.setAttribute('download', filename);
+  downloadLink.style.display = 'none';
+  document.body.appendChild(downloadLink);
+  downloadLink.click();
+  document.body.removeChild(downloadLink);
+};
+
+const generateGame = (raceMode = false) => {
+  const options = JSON.parse(localStorage.getItem(gameName));
+  if (!options.name || options.name.toLowerCase() === 'player' || options.name.trim().length === 0) {
+    return showUserMessage('You must enter a player name!');
+  }
+
+  axios.post('/api/generate', {
+    weights: { player: options },
+    presetData: { player: options },
+    playerCount: 1,
+    spoiler: 3,
+    race: raceMode ? '1' : '0',
+  }).then((response) => {
+    window.location.href = response.data.url;
+  }).catch((error) => {
+    let userMessage = 'Something went wrong and your game could not be generated.';
+    if (error.response.data.text) {
+      userMessage += ' ' + error.response.data.text;
+    }
+    showUserMessage(userMessage);
+    console.error(error);
+  });
+};
+
+const showUserMessage = (message) => {
+  const userMessage = document.getElementById('user-message');
+    userMessage.innerText = message;
+    userMessage.classList.add('visible');
+    window.scrollTo(0, 0);
+    userMessage.addEventListener('click', () => {
+      userMessage.classList.remove('visible');
+      userMessage.addEventListener('click', hideUserMessage);
+    });
+};
+
+const hideUserMessage = () => {
+  const userMessage = document.getElementById('user-message');
+  userMessage.classList.remove('visible');
+  userMessage.removeEventListener('click', hideUserMessage);
+};
diff --git a/WebHostLib/static/assets/player-settings.js b/WebHostLib/static/assets/player-settings.js
deleted file mode 100644
index f75ba90603..0000000000
--- a/WebHostLib/static/assets/player-settings.js
+++ /dev/null
@@ -1,398 +0,0 @@
-let gameName = null;
-
-window.addEventListener('load', () => {
-  gameName = document.getElementById('player-settings').getAttribute('data-game');
-
-  // Update game name on page
-  document.getElementById('game-name').innerText = gameName;
-
-  fetchSettingData().then((results) => {
-    let settingHash = localStorage.getItem(`${gameName}-hash`);
-    if (!settingHash) {
-      // If no hash data has been set before, set it now
-      settingHash = md5(JSON.stringify(results));
-      localStorage.setItem(`${gameName}-hash`, settingHash);
-      localStorage.removeItem(gameName);
-    }
-
-    if (settingHash !== md5(JSON.stringify(results))) {
-      showUserMessage("Your settings are out of date! Click here to update them! Be aware this will reset " +
-        "them all to default.");
-      document.getElementById('user-message').addEventListener('click', resetSettings);
-    }
-
-    // Page setup
-    createDefaultSettings(results);
-    buildUI(results);
-    adjustHeaderWidth();
-
-    // Event listeners
-    document.getElementById('export-settings').addEventListener('click', () => exportSettings());
-    document.getElementById('generate-race').addEventListener('click', () => generateGame(true));
-    document.getElementById('generate-game').addEventListener('click', () => generateGame());
-
-    // Name input field
-    const playerSettings = JSON.parse(localStorage.getItem(gameName));
-    const nameInput = document.getElementById('player-name');
-    nameInput.addEventListener('keyup', (event) => updateBaseSetting(event));
-    nameInput.value = playerSettings.name;
-  }).catch((e) => {
-    console.error(e);
-    const url = new URL(window.location.href);
-    window.location.replace(`${url.protocol}//${url.hostname}/page-not-found`);
-  })
-});
-
-const resetSettings = () => {
-  localStorage.removeItem(gameName);
-  localStorage.removeItem(`${gameName}-hash`)
-  window.location.reload();
-};
-
-const fetchSettingData = () => new Promise((resolve, reject) => {
-  const ajax = new XMLHttpRequest();
-  ajax.onreadystatechange = () => {
-    if (ajax.readyState !== 4) { return; }
-    if (ajax.status !== 200) {
-      reject(ajax.responseText);
-      return;
-    }
-    try{ resolve(JSON.parse(ajax.responseText)); }
-    catch(error){ reject(error); }
-  };
-  ajax.open('GET', `${window.location.origin}/static/generated/player-settings/${gameName}.json`, true);
-  ajax.send();
-});
-
-const createDefaultSettings = (settingData) => {
-  if (!localStorage.getItem(gameName)) {
-    const newSettings = {
-      [gameName]: {},
-    };
-    for (let baseOption of Object.keys(settingData.baseOptions)){
-      newSettings[baseOption] = settingData.baseOptions[baseOption];
-    }
-    for (let gameOption of Object.keys(settingData.gameOptions)){
-      newSettings[gameName][gameOption] = settingData.gameOptions[gameOption].defaultValue;
-    }
-    localStorage.setItem(gameName, JSON.stringify(newSettings));
-  }
-};
-
-const buildUI = (settingData) => {
-  // Game Options
-  const leftGameOpts = {};
-  const rightGameOpts = {};
-  Object.keys(settingData.gameOptions).forEach((key, index) => {
-    if (index < Object.keys(settingData.gameOptions).length / 2) { leftGameOpts[key] = settingData.gameOptions[key]; }
-    else { rightGameOpts[key] = settingData.gameOptions[key]; }
-  });
-  document.getElementById('game-options-left').appendChild(buildOptionsTable(leftGameOpts));
-  document.getElementById('game-options-right').appendChild(buildOptionsTable(rightGameOpts));
-};
-
-const buildOptionsTable = (settings, romOpts = false) => {
-  const currentSettings = JSON.parse(localStorage.getItem(gameName));
-  const table = document.createElement('table');
-  const tbody = document.createElement('tbody');
-
-  Object.keys(settings).forEach((setting) => {
-    const tr = document.createElement('tr');
-
-    // td Left
-    const tdl = document.createElement('td');
-    const label = document.createElement('label');
-    label.textContent = `${settings[setting].displayName}: `;
-    label.setAttribute('for', setting);
-
-    const questionSpan = document.createElement('span');
-    questionSpan.classList.add('interactive');
-    questionSpan.setAttribute('data-tooltip', settings[setting].description);
-    questionSpan.innerText = '(?)';
-
-    label.appendChild(questionSpan);
-    tdl.appendChild(label);
-    tr.appendChild(tdl);
-
-    // td Right
-    const tdr = document.createElement('td');
-    let element = null;
-
-    const randomButton = document.createElement('button');
-
-    switch(settings[setting].type){
-      case 'select':
-        element = document.createElement('div');
-        element.classList.add('select-container');
-        let select = document.createElement('select');
-        select.setAttribute('id', setting);
-        select.setAttribute('data-key', setting);
-        if (romOpts) { select.setAttribute('data-romOpt', '1'); }
-        settings[setting].options.forEach((opt) => {
-          const option = document.createElement('option');
-          option.setAttribute('value', opt.value);
-          option.innerText = opt.name;
-          if ((isNaN(currentSettings[gameName][setting]) &&
-            (parseInt(opt.value, 10) === parseInt(currentSettings[gameName][setting]))) ||
-            (opt.value === currentSettings[gameName][setting]))
-          {
-            option.selected = true;
-          }
-          select.appendChild(option);
-        });
-        select.addEventListener('change', (event) => updateGameSetting(event.target));
-        element.appendChild(select);
-
-        // Randomize button
-        randomButton.innerText = '🎲';
-        randomButton.classList.add('randomize-button');
-        randomButton.setAttribute('data-key', setting);
-        randomButton.setAttribute('data-tooltip', 'Toggle randomization for this option!');
-        randomButton.addEventListener('click', (event) => toggleRandomize(event, select));
-        if (currentSettings[gameName][setting] === 'random') {
-          randomButton.classList.add('active');
-          select.disabled = true;
-        }
-
-        element.appendChild(randomButton);
-        break;
-
-      case 'range':
-        element = document.createElement('div');
-        element.classList.add('range-container');
-
-        let range = document.createElement('input');
-        range.setAttribute('type', 'range');
-        range.setAttribute('data-key', setting);
-        range.setAttribute('min', settings[setting].min);
-        range.setAttribute('max', settings[setting].max);
-        range.value = currentSettings[gameName][setting];
-        range.addEventListener('change', (event) => {
-          document.getElementById(`${setting}-value`).innerText = event.target.value;
-          updateGameSetting(event.target);
-        });
-        element.appendChild(range);
-
-        let rangeVal = document.createElement('span');
-        rangeVal.classList.add('range-value');
-        rangeVal.setAttribute('id', `${setting}-value`);
-        rangeVal.innerText = currentSettings[gameName][setting] !== 'random' ?
-          currentSettings[gameName][setting] : settings[setting].defaultValue;
-        element.appendChild(rangeVal);
-
-        // Randomize button
-        randomButton.innerText = '🎲';
-        randomButton.classList.add('randomize-button');
-        randomButton.setAttribute('data-key', setting);
-        randomButton.setAttribute('data-tooltip', 'Toggle randomization for this option!');
-        randomButton.addEventListener('click', (event) => toggleRandomize(event, range));
-        if (currentSettings[gameName][setting] === 'random') {
-          randomButton.classList.add('active');
-          range.disabled = true;
-        }
-
-        element.appendChild(randomButton);
-        break;
-
-      case 'special_range':
-        element = document.createElement('div');
-        element.classList.add('special-range-container');
-
-        // Build the select element
-        let specialRangeSelect = document.createElement('select');
-        specialRangeSelect.setAttribute('data-key', setting);
-        Object.keys(settings[setting].value_names).forEach((presetName) => {
-          let presetOption = document.createElement('option');
-          presetOption.innerText = presetName;
-          presetOption.value = settings[setting].value_names[presetName];
-          const words = presetOption.innerText.split("_");
-          for (let i = 0; i < words.length; i++) {
-            words[i] = words[i][0].toUpperCase() + words[i].substring(1);
-          }
-          presetOption.innerText = words.join(" ");
-          specialRangeSelect.appendChild(presetOption);
-        });
-        let customOption = document.createElement('option');
-        customOption.innerText = 'Custom';
-        customOption.value = 'custom';
-        customOption.selected = true;
-        specialRangeSelect.appendChild(customOption);
-        if (Object.values(settings[setting].value_names).includes(Number(currentSettings[gameName][setting]))) {
-          specialRangeSelect.value = Number(currentSettings[gameName][setting]);
-        }
-
-        // Build range element
-        let specialRangeWrapper = document.createElement('div');
-        specialRangeWrapper.classList.add('special-range-wrapper');
-        let specialRange = document.createElement('input');
-        specialRange.setAttribute('type', 'range');
-        specialRange.setAttribute('data-key', setting);
-        specialRange.setAttribute('min', settings[setting].min);
-        specialRange.setAttribute('max', settings[setting].max);
-        specialRange.value = currentSettings[gameName][setting];
-
-        // Build rage value element
-        let specialRangeVal = document.createElement('span');
-        specialRangeVal.classList.add('range-value');
-        specialRangeVal.setAttribute('id', `${setting}-value`);
-        specialRangeVal.innerText = currentSettings[gameName][setting] !== 'random' ?
-          currentSettings[gameName][setting] : settings[setting].defaultValue;
-
-        // Configure select event listener
-        specialRangeSelect.addEventListener('change', (event) => {
-          if (event.target.value === 'custom') { return; }
-
-          // Update range slider
-          specialRange.value = event.target.value;
-          document.getElementById(`${setting}-value`).innerText = event.target.value;
-          updateGameSetting(event.target);
-        });
-
-        // Configure range event handler
-        specialRange.addEventListener('change', (event) => {
-          // Update select element
-          specialRangeSelect.value =
-            (Object.values(settings[setting].value_names).includes(parseInt(event.target.value))) ?
-            parseInt(event.target.value) : 'custom';
-          document.getElementById(`${setting}-value`).innerText = event.target.value;
-          updateGameSetting(event.target);
-        });
-
-        element.appendChild(specialRangeSelect);
-        specialRangeWrapper.appendChild(specialRange);
-        specialRangeWrapper.appendChild(specialRangeVal);
-        element.appendChild(specialRangeWrapper);
-
-        // Randomize button
-        randomButton.innerText = '🎲';
-        randomButton.classList.add('randomize-button');
-        randomButton.setAttribute('data-key', setting);
-        randomButton.setAttribute('data-tooltip', 'Toggle randomization for this option!');
-        randomButton.addEventListener('click', (event) => toggleRandomize(
-            event, specialRange, specialRangeSelect)
-        );
-        if (currentSettings[gameName][setting] === 'random') {
-          randomButton.classList.add('active');
-          specialRange.disabled = true;
-          specialRangeSelect.disabled = true;
-        }
-
-        specialRangeWrapper.appendChild(randomButton);
-        break;
-
-      default:
-        console.error(`Ignoring unknown setting type: ${settings[setting].type} with name ${setting}`);
-        return;
-    }
-
-    tdr.appendChild(element);
-    tr.appendChild(tdr);
-    tbody.appendChild(tr);
-  });
-
-  table.appendChild(tbody);
-  return table;
-};
-
-const toggleRandomize = (event, inputElement, optionalSelectElement = null) => {
-  const active = event.target.classList.contains('active');
-  const randomButton = event.target;
-
-  if (active) {
-    randomButton.classList.remove('active');
-    inputElement.disabled = undefined;
-    if (optionalSelectElement) {
-      optionalSelectElement.disabled = undefined;
-    }
-  } else {
-    randomButton.classList.add('active');
-    inputElement.disabled = true;
-    if (optionalSelectElement) {
-      optionalSelectElement.disabled = true;
-    }
-  }
-
-  updateGameSetting(randomButton);
-};
-
-const updateBaseSetting = (event) => {
-  const options = JSON.parse(localStorage.getItem(gameName));
-  options[event.target.getAttribute('data-key')] = isNaN(event.target.value) ?
-    event.target.value : parseInt(event.target.value);
-  localStorage.setItem(gameName, JSON.stringify(options));
-};
-
-const updateGameSetting = (settingElement) => {
-  const options = JSON.parse(localStorage.getItem(gameName));
-
-  if (settingElement.classList.contains('randomize-button')) {
-    // If the event passed in is the randomize button, then we know what we must do.
-    options[gameName][settingElement.getAttribute('data-key')] = 'random';
-  } else {
-    options[gameName][settingElement.getAttribute('data-key')] = isNaN(settingElement.value) ?
-      settingElement.value : parseInt(settingElement.value, 10);
-  }
-
-  localStorage.setItem(gameName, JSON.stringify(options));
-};
-
-const exportSettings = () => {
-  const settings = JSON.parse(localStorage.getItem(gameName));
-  if (!settings.name || settings.name.toLowerCase() === 'player' || settings.name.trim().length === 0) {
-    return showUserMessage('You must enter a player name!');
-  }
-  const yamlText = jsyaml.safeDump(settings, { noCompatMode: true }).replaceAll(/'(\d+)':/g, (x, y) => `${y}:`);
-  download(`${document.getElementById('player-name').value}.yaml`, yamlText);
-};
-
-/** Create an anchor and trigger a download of a text file. */
-const download = (filename, text) => {
-  const downloadLink = document.createElement('a');
-  downloadLink.setAttribute('href','data:text/yaml;charset=utf-8,'+ encodeURIComponent(text))
-  downloadLink.setAttribute('download', filename);
-  downloadLink.style.display = 'none';
-  document.body.appendChild(downloadLink);
-  downloadLink.click();
-  document.body.removeChild(downloadLink);
-};
-
-const generateGame = (raceMode = false) => {
-  const settings = JSON.parse(localStorage.getItem(gameName));
-  if (!settings.name || settings.name.toLowerCase() === 'player' || settings.name.trim().length === 0) {
-    return showUserMessage('You must enter a player name!');
-  }
-
-  axios.post('/api/generate', {
-    weights: { player: settings },
-    presetData: { player: settings },
-    playerCount: 1,
-    spoiler: 3,
-    race: raceMode ? '1' : '0',
-  }).then((response) => {
-    window.location.href = response.data.url;
-  }).catch((error) => {
-    let userMessage = 'Something went wrong and your game could not be generated.';
-    if (error.response.data.text) {
-      userMessage += ' ' + error.response.data.text;
-    }
-    showUserMessage(userMessage);
-    console.error(error);
-  });
-};
-
-const showUserMessage = (message) => {
-  const userMessage = document.getElementById('user-message');
-    userMessage.innerText = message;
-    userMessage.classList.add('visible');
-    window.scrollTo(0, 0);
-    userMessage.addEventListener('click', () => {
-      userMessage.classList.remove('visible');
-      userMessage.addEventListener('click', hideUserMessage);
-    });
-};
-
-const hideUserMessage = () => {
-  const userMessage = document.getElementById('user-message');
-  userMessage.classList.remove('visible');
-  userMessage.removeEventListener('click', hideUserMessage);
-};
diff --git a/WebHostLib/static/assets/supportedGames.js b/WebHostLib/static/assets/supportedGames.js
index 1acf0e0cc5..56eb15b5e5 100644
--- a/WebHostLib/static/assets/supportedGames.js
+++ b/WebHostLib/static/assets/supportedGames.js
@@ -1,51 +1,32 @@
 window.addEventListener('load', () => {
-  const gameHeaders = document.getElementsByClassName('collapse-toggle');
-  Array.from(gameHeaders).forEach((header) => {
-    const gameName = header.getAttribute('data-game');
-    header.addEventListener('click', () => {
-      const gameArrow = document.getElementById(`${gameName}-arrow`);
-      const gameInfo = document.getElementById(gameName);
-      if (gameInfo.classList.contains('collapsed')) {
-        gameArrow.innerText = '▼';
-        gameInfo.classList.remove('collapsed');
-      } else {
-        gameArrow.innerText = '▶';
-        gameInfo.classList.add('collapsed');
-      }
-    });
-  });
+  // Add toggle listener to all elements with .collapse-toggle
+  const toggleButtons = document.querySelectorAll('.collapse-toggle');
+  toggleButtons.forEach((e) => e.addEventListener('click', toggleCollapse));
 
   // Handle game filter input
   const gameSearch = document.getElementById('game-search');
   gameSearch.value = '';
-
   gameSearch.addEventListener('input', (evt) => {
     if (!evt.target.value.trim()) {
       // If input is empty, display all collapsed games
-      return Array.from(gameHeaders).forEach((header) => {
+      return toggleButtons.forEach((header) => {
         header.style.display = null;
-        const gameName = header.getAttribute('data-game');
-        document.getElementById(`${gameName}-arrow`).innerText = '▶';
-        document.getElementById(gameName).classList.add('collapsed');
+        header.firstElementChild.innerText = '▶';
+        header.nextElementSibling.classList.add('collapsed');
       });
     }
 
     // Loop over all the games
-    Array.from(gameHeaders).forEach((header) => {
-      const gameName = header.getAttribute('data-game');
-      const gameArrow = document.getElementById(`${gameName}-arrow`);
-      const gameInfo = document.getElementById(gameName);
-
+    toggleButtons.forEach((header) => {
       // If the game name includes the search string, display the game. If not, hide it
-      if (gameName.toLowerCase().includes(evt.target.value.toLowerCase())) {
+      if (header.getAttribute('data-game').toLowerCase().includes(evt.target.value.toLowerCase())) {
         header.style.display = null;
-        gameArrow.innerText = '▼';
-        gameInfo.classList.remove('collapsed');
+        header.firstElementChild.innerText = '▼';
+        header.nextElementSibling.classList.remove('collapsed');
       } else {
-        console.log(header);
         header.style.display = 'none';
-        gameArrow.innerText = '▶';
-        gameInfo.classList.add('collapsed');
+        header.firstElementChild.innerText = '▶';
+        header.nextElementSibling.classList.add('collapsed');
       }
     });
   });
@@ -54,30 +35,30 @@ window.addEventListener('load', () => {
   document.getElementById('collapse-all').addEventListener('click', collapseAll);
 });
 
-const expandAll = () => {
-  const gameHeaders = document.getElementsByClassName('collapse-toggle');
-  // Loop over all the games
-    Array.from(gameHeaders).forEach((header) => {
-      const gameName = header.getAttribute('data-game');
-      const gameArrow = document.getElementById(`${gameName}-arrow`);
-      const gameInfo = document.getElementById(gameName);
+const toggleCollapse = (evt) => {
+  const gameArrow = evt.target.firstElementChild;
+  const gameInfo = evt.target.nextElementSibling;
+  if (gameInfo.classList.contains('collapsed')) {
+    gameArrow.innerText = '▼';
+    gameInfo.classList.remove('collapsed');
+  } else {
+    gameArrow.innerText = '▶';
+    gameInfo.classList.add('collapsed');
+  }
+};
 
-      if (header.style.display === 'none') { return; }
-      gameArrow.innerText = '▼';
-      gameInfo.classList.remove('collapsed');
-    });
+const expandAll = () => {
+  document.querySelectorAll('.collapse-toggle').forEach((header) => {
+    if (header.style.display === 'none') { return; }
+    header.firstElementChild.innerText = '▼';
+    header.nextElementSibling.classList.remove('collapsed');
+  });
 };
 
 const collapseAll = () => {
-  const gameHeaders = document.getElementsByClassName('collapse-toggle');
-  // Loop over all the games
-    Array.from(gameHeaders).forEach((header) => {
-      const gameName = header.getAttribute('data-game');
-      const gameArrow = document.getElementById(`${gameName}-arrow`);
-      const gameInfo = document.getElementById(gameName);
-
-      if (header.style.display === 'none') { return; }
-      gameArrow.innerText = '▶';
-      gameInfo.classList.add('collapsed');
-    });
+  document.querySelectorAll('.collapse-toggle').forEach((header) => {
+    if (header.style.display === 'none') { return; }
+    header.firstElementChild.innerText = '▶';
+    header.nextElementSibling.classList.add('collapsed');
+  });
 };
diff --git a/WebHostLib/static/assets/trackerCommon.js b/WebHostLib/static/assets/trackerCommon.js
index 41c4020dac..b8e089ece5 100644
--- a/WebHostLib/static/assets/trackerCommon.js
+++ b/WebHostLib/static/assets/trackerCommon.js
@@ -4,13 +4,20 @@ const adjustTableHeight = () => {
         return;
     const upperDistance = tablesContainer.getBoundingClientRect().top;
 
-    const containerHeight = window.innerHeight - upperDistance;
-    tablesContainer.style.maxHeight = `calc(${containerHeight}px - 1rem)`;
-
     const tableWrappers = document.getElementsByClassName('table-wrapper');
-    for(let i=0; i < tableWrappers.length; i++){
-        const maxHeight = (window.innerHeight - upperDistance) / 2;
-        tableWrappers[i].style.maxHeight = `calc(${maxHeight}px - 1rem)`;
+    for (let i = 0; i < tableWrappers.length; i++) {
+        // Ensure we are starting from maximum size prior to calculation.
+        tableWrappers[i].style.height = null;
+        tableWrappers[i].style.maxHeight = null;
+
+        // Set as a reasonable height, but still allows the user to resize element if they desire.
+        const currentHeight = tableWrappers[i].offsetHeight;
+        const maxHeight = (window.innerHeight - upperDistance) / Math.min(tableWrappers.length, 4);
+        if (currentHeight > maxHeight) {
+            tableWrappers[i].style.height = `calc(${maxHeight}px - 1rem)`;
+        }
+
+        tableWrappers[i].style.maxHeight = `${currentHeight}px`;
     }
 };
 
@@ -55,7 +62,7 @@ window.addEventListener('load', () => {
                 render: function (data, type, row) {
                     if (type === "sort" || type === 'type') {
                         if (data === "None")
-                            return -1;
+                            return Number.MAX_VALUE;
 
                         return parseInt(data);
                     }
diff --git a/WebHostLib/static/assets/weighted-options.js b/WebHostLib/static/assets/weighted-options.js
new file mode 100644
index 0000000000..80f8efd1d7
--- /dev/null
+++ b/WebHostLib/static/assets/weighted-options.js
@@ -0,0 +1,1190 @@
+window.addEventListener('load', () => {
+  fetchSettingData().then((data) => {
+    let settingHash = localStorage.getItem('weighted-settings-hash');
+    if (!settingHash) {
+      // If no hash data has been set before, set it now
+      settingHash = md5(JSON.stringify(data));
+      localStorage.setItem('weighted-settings-hash', settingHash);
+      localStorage.removeItem('weighted-settings');
+    }
+
+    if (settingHash !== md5(JSON.stringify(data))) {
+      const userMessage = document.getElementById('user-message');
+      userMessage.innerText = "Your settings are out of date! Click here to update them! Be aware this will reset " +
+        "them all to default.";
+      userMessage.classList.add('visible');
+      userMessage.addEventListener('click', resetSettings);
+    }
+
+    // Page setup
+    const settings = new WeightedSettings(data);
+    settings.buildUI();
+    settings.updateVisibleGames();
+    adjustHeaderWidth();
+
+    // Event listeners
+    document.getElementById('export-options').addEventListener('click', () => settings.export());
+    document.getElementById('generate-race').addEventListener('click', () => settings.generateGame(true));
+    document.getElementById('generate-game').addEventListener('click', () => settings.generateGame());
+
+    // Name input field
+    const nameInput = document.getElementById('player-name');
+    nameInput.setAttribute('data-type', 'data');
+    nameInput.setAttribute('data-setting', 'name');
+    nameInput.addEventListener('keyup', (evt) => settings.updateBaseSetting(evt));
+    nameInput.value = settings.current.name;
+  });
+});
+
+const resetSettings = () => {
+  localStorage.removeItem('weighted-settings');
+  localStorage.removeItem('weighted-settings-hash')
+  window.location.reload();
+};
+
+const fetchSettingData = () => new Promise((resolve, reject) => {
+  fetch(new Request(`${window.location.origin}/static/generated/weighted-options.json`)).then((response) => {
+    try{ response.json().then((jsonObj) => resolve(jsonObj)); }
+    catch(error){ reject(error); }
+  });
+});
+
+/// The weighted settings across all games.
+class WeightedSettings {
+  // The data from the server describing the types of settings available for
+  // each game, as a JSON-safe blob.
+  data;
+
+  // The settings chosen by the user as they'd appear in the YAML file, stored
+  // to and retrieved from local storage.
+  current;
+
+  // A record mapping game names to the associated GameSettings.
+  games;
+
+  constructor(data) {
+    this.data = data;
+    this.current = JSON.parse(localStorage.getItem('weighted-settings'));
+    this.games = Object.keys(this.data.games).map((game) => new GameSettings(this, game));
+    if (this.current) { return; }
+
+    this.current = {};
+
+    // Transfer base options directly
+    for (let baseOption of Object.keys(this.data.baseOptions)){
+      this.current[baseOption] = this.data.baseOptions[baseOption];
+    }
+
+    // Set options per game
+    for (let game of Object.keys(this.data.games)) {
+      // Initialize game object
+      this.current[game] = {};
+
+      // Transfer game settings
+      for (let gameSetting of Object.keys(this.data.games[game].gameSettings)){
+        this.current[game][gameSetting] = {};
+
+        const setting = this.data.games[game].gameSettings[gameSetting];
+        switch(setting.type){
+          case 'select':
+            setting.options.forEach((option) => {
+              this.current[game][gameSetting][option.value] =
+                (setting.hasOwnProperty('defaultValue') && setting.defaultValue === option.value) ? 25 : 0;
+            });
+            break;
+          case 'range':
+          case 'named_range':
+            this.current[game][gameSetting]['random'] = 0;
+            this.current[game][gameSetting]['random-low'] = 0;
+            this.current[game][gameSetting]['random-middle'] = 0;
+            this.current[game][gameSetting]['random-high'] = 0;
+            if (setting.hasOwnProperty('defaultValue')) {
+              this.current[game][gameSetting][setting.defaultValue] = 25;
+            } else {
+              this.current[game][gameSetting][setting.min] = 25;
+            }
+            break;
+
+          case 'items-list':
+          case 'locations-list':
+          case 'custom-list':
+            this.current[game][gameSetting] = setting.defaultValue;
+            break;
+
+          default:
+            console.error(`Unknown setting type for ${game} setting ${gameSetting}: ${setting.type}`);
+        }
+      }
+
+      this.current[game].start_inventory = {};
+      this.current[game].exclude_locations = [];
+      this.current[game].priority_locations = [];
+      this.current[game].local_items = [];
+      this.current[game].non_local_items = [];
+      this.current[game].start_hints = [];
+      this.current[game].start_location_hints = [];
+    }
+
+    this.save();
+  }
+
+  // Saves the current settings to local storage.
+  save() {
+    localStorage.setItem('weighted-settings', JSON.stringify(this.current));
+  }
+
+  buildUI() {
+    // Build the game-choice div
+    this.#buildGameChoice();
+
+    const gamesWrapper = document.getElementById('games-wrapper');
+    this.games.forEach((game) => {
+      gamesWrapper.appendChild(game.buildUI());
+    });
+  }
+
+  #buildGameChoice() {
+    const gameChoiceDiv = document.getElementById('game-choice');
+    const h2 = document.createElement('h2');
+    h2.innerText = 'Game Select';
+    gameChoiceDiv.appendChild(h2);
+
+    const gameSelectDescription = document.createElement('p');
+    gameSelectDescription.classList.add('setting-description');
+    gameSelectDescription.innerText = 'Choose which games you might be required to play.';
+    gameChoiceDiv.appendChild(gameSelectDescription);
+
+    const hintText = document.createElement('p');
+    hintText.classList.add('hint-text');
+    hintText.innerText = 'If a game\'s value is greater than zero, you can click it\'s name to jump ' +
+      'to that section.'
+    gameChoiceDiv.appendChild(hintText);
+
+    // Build the game choice table
+    const table = document.createElement('table');
+    const tbody = document.createElement('tbody');
+
+    Object.keys(this.data.games).forEach((game) => {
+      const tr = document.createElement('tr');
+      const tdLeft = document.createElement('td');
+      tdLeft.classList.add('td-left');
+      const span = document.createElement('span');
+      span.innerText = game;
+      span.setAttribute('id', `${game}-game-option`)
+      tdLeft.appendChild(span);
+      tr.appendChild(tdLeft);
+
+      const tdMiddle = document.createElement('td');
+      tdMiddle.classList.add('td-middle');
+      const range = document.createElement('input');
+      range.setAttribute('type', 'range');
+      range.setAttribute('min', 0);
+      range.setAttribute('max', 50);
+      range.setAttribute('data-type', 'weight');
+      range.setAttribute('data-setting', 'game');
+      range.setAttribute('data-option', game);
+      range.value = this.current.game[game];
+      range.addEventListener('change', (evt) => {
+        this.updateBaseSetting(evt);
+        this.updateVisibleGames(); // Show or hide games based on the new settings
+      });
+      tdMiddle.appendChild(range);
+      tr.appendChild(tdMiddle);
+
+      const tdRight = document.createElement('td');
+      tdRight.setAttribute('id', `game-${game}`)
+      tdRight.classList.add('td-right');
+      tdRight.innerText = range.value;
+      tr.appendChild(tdRight);
+      tbody.appendChild(tr);
+    });
+
+    table.appendChild(tbody);
+    gameChoiceDiv.appendChild(table);
+  }
+
+  // Verifies that `this.settings` meets all the requirements for world
+  // generation, normalizes it for serialization, and returns the result.
+  #validateSettings() {
+    const settings = structuredClone(this.current);
+    const userMessage = document.getElementById('user-message');
+    let errorMessage = null;
+
+    // User must choose a name for their file
+    if (
+      !settings.name ||
+      settings.name.toString().trim().length === 0 ||
+      settings.name.toString().toLowerCase().trim() === 'player'
+    ) {
+      userMessage.innerText = 'You forgot to set your player name at the top of the page!';
+      userMessage.classList.add('visible');
+      userMessage.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start',
+      });
+      return;
+    }
+
+    // Clean up the settings output
+    Object.keys(settings.game).forEach((game) => {
+      // Remove any disabled games
+      if (settings.game[game] === 0) {
+        delete settings.game[game];
+        delete settings[game];
+        return;
+      }
+
+      Object.keys(settings[game]).forEach((setting) => {
+        // Remove any disabled options
+        Object.keys(settings[game][setting]).forEach((option) => {
+          if (settings[game][setting][option] === 0) {
+            delete settings[game][setting][option];
+          }
+        });
+
+        if (
+          Object.keys(settings[game][setting]).length === 0 &&
+          !Array.isArray(settings[game][setting]) &&
+          setting !== 'start_inventory'
+        ) {
+          errorMessage = `${game} // ${setting} has no values above zero!`;
+        }
+
+        // Remove weights from options with only one possibility
+        if (
+          Object.keys(settings[game][setting]).length === 1 &&
+          !Array.isArray(settings[game][setting]) &&
+          setting !== 'start_inventory'
+        ) {
+          settings[game][setting] = Object.keys(settings[game][setting])[0];
+        }
+
+        // Remove empty arrays
+        else if (
+          ['exclude_locations', 'priority_locations', 'local_items',
+          'non_local_items', 'start_hints', 'start_location_hints'].includes(setting) &&
+          settings[game][setting].length === 0
+        ) {
+          delete settings[game][setting];
+        }
+
+        // Remove empty start inventory
+        else if (
+          setting === 'start_inventory' &&
+          Object.keys(settings[game]['start_inventory']).length === 0
+        ) {
+          delete settings[game]['start_inventory'];
+        }
+      });
+    });
+
+    if (Object.keys(settings.game).length === 0) {
+      errorMessage = 'You have not chosen a game to play!';
+    }
+
+    // Remove weights if there is only one game
+    else if (Object.keys(settings.game).length === 1) {
+      settings.game = Object.keys(settings.game)[0];
+    }
+
+    // If an error occurred, alert the user and do not export the file
+    if (errorMessage) {
+      userMessage.innerText = errorMessage;
+      userMessage.classList.add('visible');
+      userMessage.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start',
+      });
+      return;
+    }
+
+    // If no error occurred, hide the user message if it is visible
+    userMessage.classList.remove('visible');
+    return settings;
+  }
+
+  updateVisibleGames() {
+    Object.entries(this.current.game).forEach(([game, weight]) => {
+      const gameDiv = document.getElementById(`${game}-div`);
+      const gameOption = document.getElementById(`${game}-game-option`);
+      if (parseInt(weight, 10) > 0) {
+        gameDiv.classList.remove('invisible');
+        gameOption.classList.add('jump-link');
+        gameOption.addEventListener('click', () => {
+          const gameDiv = document.getElementById(`${game}-div`);
+          if (gameDiv.classList.contains('invisible')) { return; }
+          gameDiv.scrollIntoView({
+            behavior: 'smooth',
+            block: 'start',
+          });
+        });
+      } else {
+        gameDiv.classList.add('invisible');
+        gameOption.classList.remove('jump-link');
+      }
+    });
+  }
+
+  updateBaseSetting(event) {
+    const setting = event.target.getAttribute('data-setting');
+    const option = event.target.getAttribute('data-option');
+    const type = event.target.getAttribute('data-type');
+
+    switch(type){
+      case 'weight':
+        this.current[setting][option] = isNaN(event.target.value) ? event.target.value : parseInt(event.target.value, 10);
+        document.getElementById(`${setting}-${option}`).innerText = event.target.value;
+        break;
+      case 'data':
+        this.current[setting] = isNaN(event.target.value) ? event.target.value : parseInt(event.target.value, 10);
+        break;
+    }
+
+    this.save();
+  }
+
+  export() {
+    const settings = this.#validateSettings();
+    if (!settings) { return; }
+
+    const yamlText = jsyaml.safeDump(settings, { noCompatMode: true }).replaceAll(/'(\d+)':/g, (x, y) => `${y}:`);
+    download(`${document.getElementById('player-name').value}.yaml`, yamlText);
+  }
+
+  generateGame(raceMode = false) {
+    const settings = this.#validateSettings();
+    if (!settings) { return; }
+
+    axios.post('/api/generate', {
+      weights: { player: JSON.stringify(settings) },
+      presetData: { player: JSON.stringify(settings) },
+      playerCount: 1,
+      spoiler: 3,
+      race: raceMode ? '1' : '0',
+    }).then((response) => {
+      window.location.href = response.data.url;
+    }).catch((error) => {
+      const userMessage = document.getElementById('user-message');
+      userMessage.innerText = 'Something went wrong and your game could not be generated.';
+      if (error.response.data.text) {
+        userMessage.innerText += ' ' + error.response.data.text;
+      }
+      userMessage.classList.add('visible');
+      userMessage.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start',
+      });
+      console.error(error);
+    });
+  }
+}
+
+// Settings for an individual game.
+class GameSettings {
+  // The WeightedSettings that contains this game's settings. Used to save
+  // settings after editing.
+  #allSettings;
+
+  // The name of this game.
+  name;
+
+  // The data from the server describing the types of settings available for
+  // this game, as a JSON-safe blob.
+  get data() {
+    return this.#allSettings.data.games[this.name];
+  }
+
+  // The settings chosen by the user as they'd appear in the YAML file, stored
+  // to and retrieved from local storage.
+  get current() {
+    return this.#allSettings.current[this.name];
+  }
+
+  constructor(allSettings, name) {
+    this.#allSettings = allSettings;
+    this.name = name;
+  }
+
+  // Builds and returns the settings UI for this game.
+  buildUI() {
+    // Create game div, invisible by default
+    const gameDiv = document.createElement('div');
+    gameDiv.setAttribute('id', `${this.name}-div`);
+    gameDiv.classList.add('game-div');
+    gameDiv.classList.add('invisible');
+
+    const gameHeader = document.createElement('h2');
+    gameHeader.innerText = this.name;
+    gameDiv.appendChild(gameHeader);
+
+    const collapseButton = document.createElement('a');
+    collapseButton.innerText = '(Collapse)';
+    gameDiv.appendChild(collapseButton);
+
+    const expandButton = document.createElement('a');
+    expandButton.innerText = '(Expand)';
+    expandButton.classList.add('invisible');
+    gameDiv.appendChild(expandButton);
+
+    // Sort items and locations alphabetically.
+    this.data.gameItems.sort();
+    this.data.gameLocations.sort();
+
+    const weightedSettingsDiv = this.#buildWeightedSettingsDiv();
+    gameDiv.appendChild(weightedSettingsDiv);
+
+    const itemPoolDiv = this.#buildItemPoolDiv();
+    gameDiv.appendChild(itemPoolDiv);
+
+    const hintsDiv = this.#buildHintsDiv();
+    gameDiv.appendChild(hintsDiv);
+
+    const locationsDiv = this.#buildPriorityExclusionDiv();
+    gameDiv.appendChild(locationsDiv);
+
+    collapseButton.addEventListener('click', () => {
+      collapseButton.classList.add('invisible');
+      weightedSettingsDiv.classList.add('invisible');
+      itemPoolDiv.classList.add('invisible');
+      hintsDiv.classList.add('invisible');
+      locationsDiv.classList.add('invisible');
+      expandButton.classList.remove('invisible');
+    });
+
+    expandButton.addEventListener('click', () => {
+      collapseButton.classList.remove('invisible');
+      weightedSettingsDiv.classList.remove('invisible');
+      itemPoolDiv.classList.remove('invisible');
+      hintsDiv.classList.remove('invisible');
+      locationsDiv.classList.remove('invisible');
+      expandButton.classList.add('invisible');
+    });
+
+    return gameDiv;
+  }
+
+  #buildWeightedSettingsDiv() {
+    const settingsWrapper = document.createElement('div');
+    settingsWrapper.classList.add('settings-wrapper');
+
+    Object.keys(this.data.gameSettings).forEach((settingName) => {
+      const setting = this.data.gameSettings[settingName];
+      const settingWrapper = document.createElement('div');
+      settingWrapper.classList.add('setting-wrapper');
+
+      const settingNameHeader = document.createElement('h4');
+      settingNameHeader.innerText = setting.displayName;
+      settingWrapper.appendChild(settingNameHeader);
+
+      const settingDescription = document.createElement('p');
+      settingDescription.classList.add('setting-description');
+      settingDescription.innerText = setting.description.replace(/(\n)/g, ' ');
+      settingWrapper.appendChild(settingDescription);
+
+      switch(setting.type){
+        case 'select':
+          const optionTable = document.createElement('table');
+          const tbody = document.createElement('tbody');
+
+          // Add a weight range for each option
+          setting.options.forEach((option) => {
+            const tr = document.createElement('tr');
+            const tdLeft = document.createElement('td');
+            tdLeft.classList.add('td-left');
+            tdLeft.innerText = option.name;
+            tr.appendChild(tdLeft);
+
+            const tdMiddle = document.createElement('td');
+            tdMiddle.classList.add('td-middle');
+            const range = document.createElement('input');
+            range.setAttribute('type', 'range');
+            range.setAttribute('data-game', this.name);
+            range.setAttribute('data-setting', settingName);
+            range.setAttribute('data-option', option.value);
+            range.setAttribute('data-type', setting.type);
+            range.setAttribute('min', 0);
+            range.setAttribute('max', 50);
+            range.addEventListener('change', (evt) => this.#updateRangeSetting(evt));
+            range.value = this.current[settingName][option.value];
+            tdMiddle.appendChild(range);
+            tr.appendChild(tdMiddle);
+
+            const tdRight = document.createElement('td');
+            tdRight.setAttribute('id', `${this.name}-${settingName}-${option.value}`);
+            tdRight.classList.add('td-right');
+            tdRight.innerText = range.value;
+            tr.appendChild(tdRight);
+
+            tbody.appendChild(tr);
+          });
+
+          optionTable.appendChild(tbody);
+          settingWrapper.appendChild(optionTable);
+          break;
+
+        case 'range':
+        case 'named_range':
+          const rangeTable = document.createElement('table');
+          const rangeTbody = document.createElement('tbody');
+
+          const hintText = document.createElement('p');
+          hintText.classList.add('hint-text');
+          hintText.innerHTML = 'This is a range option. You may enter a valid numerical value in the text box ' +
+            `below, then press the "Add" button to add a weight for it.<br /><br />Accepted values:<br />` +
+            `Normal range: ${setting.min} - ${setting.max}`;
+
+          const acceptedValuesOutsideRange = [];
+          if (setting.hasOwnProperty('value_names')) {
+            Object.keys(setting.value_names).forEach((specialName) => {
+              if (
+                (setting.value_names[specialName] < setting.min) ||
+                (setting.value_names[specialName] > setting.max)
+              ) {
+                hintText.innerHTML += `<br />${specialName}: ${setting.value_names[specialName]}`;
+                acceptedValuesOutsideRange.push(setting.value_names[specialName]);
+              }
+            });
+
+            hintText.innerHTML += '<br /><br />Certain values have special meaning:';
+            Object.keys(setting.value_names).forEach((specialName) => {
+              hintText.innerHTML += `<br />${specialName}: ${setting.value_names[specialName]}`;
+            });
+          }
+
+          settingWrapper.appendChild(hintText);
+
+          const addOptionDiv = document.createElement('div');
+          addOptionDiv.classList.add('add-option-div');
+          const optionInput = document.createElement('input');
+          optionInput.setAttribute('id', `${this.name}-${settingName}-option`);
+          let placeholderText = `${setting.min} - ${setting.max}`;
+          acceptedValuesOutsideRange.forEach((aVal) => placeholderText += `, ${aVal}`);
+          optionInput.setAttribute('placeholder', placeholderText);
+          addOptionDiv.appendChild(optionInput);
+          const addOptionButton = document.createElement('button');
+          addOptionButton.innerText = 'Add';
+          addOptionDiv.appendChild(addOptionButton);
+          settingWrapper.appendChild(addOptionDiv);
+          optionInput.addEventListener('keydown', (evt) => {
+            if (evt.key === 'Enter') { addOptionButton.dispatchEvent(new Event('click')); }
+          });
+
+          addOptionButton.addEventListener('click', () => {
+            const optionInput = document.getElementById(`${this.name}-${settingName}-option`);
+            let option = optionInput.value;
+            if (!option || !option.trim()) { return; }
+            option = parseInt(option, 10);
+
+            let optionAcceptable = false;
+            if ((option >= setting.min) && (option <= setting.max)) {
+              optionAcceptable = true;
+            }
+            if (setting.hasOwnProperty('value_names') && Object.values(setting.value_names).includes(option)){
+              optionAcceptable = true;
+            }
+            if (!optionAcceptable) { return; }
+
+            optionInput.value = '';
+            if (document.getElementById(`${this.name}-${settingName}-${option}-range`)) { return; }
+
+            const tr = document.createElement('tr');
+            const tdLeft = document.createElement('td');
+            tdLeft.classList.add('td-left');
+            tdLeft.innerText = option;
+            if (
+              setting.hasOwnProperty('value_names') &&
+              Object.values(setting.value_names).includes(parseInt(option, 10))
+            ) {
+              const optionName = Object.keys(setting.value_names).find(
+                (key) => setting.value_names[key] === parseInt(option, 10)
+              );
+              tdLeft.innerText += ` [${optionName}]`;
+            }
+            tr.appendChild(tdLeft);
+
+            const tdMiddle = document.createElement('td');
+            tdMiddle.classList.add('td-middle');
+            const range = document.createElement('input');
+            range.setAttribute('type', 'range');
+            range.setAttribute('id', `${this.name}-${settingName}-${option}-range`);
+            range.setAttribute('data-game', this.name);
+            range.setAttribute('data-setting', settingName);
+            range.setAttribute('data-option', option);
+            range.setAttribute('min', 0);
+            range.setAttribute('max', 50);
+            range.addEventListener('change', (evt) => this.#updateRangeSetting(evt));
+            range.value = this.current[settingName][parseInt(option, 10)];
+            tdMiddle.appendChild(range);
+            tr.appendChild(tdMiddle);
+
+            const tdRight = document.createElement('td');
+            tdRight.setAttribute('id', `${this.name}-${settingName}-${option}`)
+            tdRight.classList.add('td-right');
+            tdRight.innerText = range.value;
+            tr.appendChild(tdRight);
+
+            const tdDelete = document.createElement('td');
+            tdDelete.classList.add('td-delete');
+            const deleteButton = document.createElement('span');
+            deleteButton.classList.add('range-option-delete');
+            deleteButton.innerText = '❌';
+            deleteButton.addEventListener('click', () => {
+              range.value = 0;
+              range.dispatchEvent(new Event('change'));
+              rangeTbody.removeChild(tr);
+            });
+            tdDelete.appendChild(deleteButton);
+            tr.appendChild(tdDelete);
+
+            rangeTbody.appendChild(tr);
+
+            // Save new option to settings
+            range.dispatchEvent(new Event('change'));
+          });
+
+          Object.keys(this.current[settingName]).forEach((option) => {
+            // These options are statically generated below, and should always appear even if they are deleted
+            // from localStorage
+            if (['random', 'random-low', 'random-middle', 'random-high'].includes(option)) { return; }
+
+            const tr = document.createElement('tr');
+            const tdLeft = document.createElement('td');
+            tdLeft.classList.add('td-left');
+            tdLeft.innerText = option;
+            if (
+              setting.hasOwnProperty('value_names') &&
+              Object.values(setting.value_names).includes(parseInt(option, 10))
+            ) {
+              const optionName = Object.keys(setting.value_names).find(
+                (key) => setting.value_names[key] === parseInt(option, 10)
+              );
+              tdLeft.innerText += ` [${optionName}]`;
+            }
+            tr.appendChild(tdLeft);
+
+            const tdMiddle = document.createElement('td');
+            tdMiddle.classList.add('td-middle');
+            const range = document.createElement('input');
+            range.setAttribute('type', 'range');
+            range.setAttribute('id', `${this.name}-${settingName}-${option}-range`);
+            range.setAttribute('data-game', this.name);
+            range.setAttribute('data-setting', settingName);
+            range.setAttribute('data-option', option);
+            range.setAttribute('min', 0);
+            range.setAttribute('max', 50);
+            range.addEventListener('change', (evt) => this.#updateRangeSetting(evt));
+            range.value = this.current[settingName][parseInt(option, 10)];
+            tdMiddle.appendChild(range);
+            tr.appendChild(tdMiddle);
+
+            const tdRight = document.createElement('td');
+            tdRight.setAttribute('id', `${this.name}-${settingName}-${option}`)
+            tdRight.classList.add('td-right');
+            tdRight.innerText = range.value;
+            tr.appendChild(tdRight);
+
+            const tdDelete = document.createElement('td');
+            tdDelete.classList.add('td-delete');
+            const deleteButton = document.createElement('span');
+            deleteButton.classList.add('range-option-delete');
+            deleteButton.innerText = '❌';
+            deleteButton.addEventListener('click', () => {
+              range.value = 0;
+              const changeEvent = new Event('change');
+              changeEvent.action = 'rangeDelete';
+              range.dispatchEvent(changeEvent);
+              rangeTbody.removeChild(tr);
+            });
+            tdDelete.appendChild(deleteButton);
+            tr.appendChild(tdDelete);
+
+            rangeTbody.appendChild(tr);
+          });
+
+          ['random', 'random-low', 'random-middle', 'random-high'].forEach((option) => {
+            const tr = document.createElement('tr');
+              const tdLeft = document.createElement('td');
+              tdLeft.classList.add('td-left');
+              switch(option){
+                case 'random':
+                  tdLeft.innerText = 'Random';
+                  break;
+                case 'random-low':
+                  tdLeft.innerText = "Random (Low)";
+                  break;
+                case 'random-middle':
+                  tdLeft.innerText = 'Random (Middle)';
+                  break;
+                case 'random-high':
+                  tdLeft.innerText = "Random (High)";
+                  break;
+              }
+              tr.appendChild(tdLeft);
+
+              const tdMiddle = document.createElement('td');
+              tdMiddle.classList.add('td-middle');
+              const range = document.createElement('input');
+              range.setAttribute('type', 'range');
+              range.setAttribute('id', `${this.name}-${settingName}-${option}-range`);
+              range.setAttribute('data-game', this.name);
+              range.setAttribute('data-setting', settingName);
+              range.setAttribute('data-option', option);
+              range.setAttribute('min', 0);
+              range.setAttribute('max', 50);
+              range.addEventListener('change', (evt) => this.#updateRangeSetting(evt));
+              range.value = this.current[settingName][option];
+              tdMiddle.appendChild(range);
+              tr.appendChild(tdMiddle);
+
+              const tdRight = document.createElement('td');
+              tdRight.setAttribute('id', `${this.name}-${settingName}-${option}`)
+              tdRight.classList.add('td-right');
+              tdRight.innerText = range.value;
+              tr.appendChild(tdRight);
+              rangeTbody.appendChild(tr);
+          });
+
+          rangeTable.appendChild(rangeTbody);
+          settingWrapper.appendChild(rangeTable);
+          break;
+
+        case 'items-list':
+          const itemsList = this.#buildItemsDiv(settingName);
+          settingWrapper.appendChild(itemsList);
+          break;
+
+        case 'locations-list':
+          const locationsList = this.#buildLocationsDiv(settingName);
+          settingWrapper.appendChild(locationsList);
+          break;
+
+        case 'custom-list':
+          const customList = this.#buildListDiv(settingName, this.data.gameSettings[settingName].options);
+          settingWrapper.appendChild(customList);
+          break;
+
+        default:
+          console.error(`Unknown setting type for ${this.name} setting ${settingName}: ${setting.type}`);
+          return;
+      }
+
+      settingsWrapper.appendChild(settingWrapper);
+    });
+
+    return settingsWrapper;
+  }
+
+  #buildItemPoolDiv() {
+    const itemsDiv = document.createElement('div');
+    itemsDiv.classList.add('items-div');
+
+    const itemsDivHeader = document.createElement('h3');
+    itemsDivHeader.innerText = 'Item Pool';
+    itemsDiv.appendChild(itemsDivHeader);
+
+    const itemsDescription = document.createElement('p');
+    itemsDescription.classList.add('setting-description');
+    itemsDescription.innerText = 'Choose if you would like to start with items, or control if they are placed in ' +
+      'your seed or someone else\'s.';
+    itemsDiv.appendChild(itemsDescription);
+
+    const itemsHint = document.createElement('p');
+    itemsHint.classList.add('hint-text');
+    itemsHint.innerText = 'Drag and drop items from one box to another.';
+    itemsDiv.appendChild(itemsHint);
+
+    const itemsWrapper = document.createElement('div');
+    itemsWrapper.classList.add('items-wrapper');
+
+    const itemDragoverHandler = (evt) => evt.preventDefault();
+    const itemDropHandler = (evt) => this.#itemDropHandler(evt);
+
+    // Create container divs for each category
+    const availableItemsWrapper = document.createElement('div');
+    availableItemsWrapper.classList.add('item-set-wrapper');
+    availableItemsWrapper.innerText = 'Available Items';
+    const availableItems = document.createElement('div');
+    availableItems.classList.add('item-container');
+    availableItems.setAttribute('id', `${this.name}-available_items`);
+    availableItems.addEventListener('dragover', itemDragoverHandler);
+    availableItems.addEventListener('drop', itemDropHandler);
+
+    const startInventoryWrapper = document.createElement('div');
+    startInventoryWrapper.classList.add('item-set-wrapper');
+    startInventoryWrapper.innerText = 'Start Inventory';
+    const startInventory = document.createElement('div');
+    startInventory.classList.add('item-container');
+    startInventory.setAttribute('id', `${this.name}-start_inventory`);
+    startInventory.setAttribute('data-setting', 'start_inventory');
+    startInventory.addEventListener('dragover', itemDragoverHandler);
+    startInventory.addEventListener('drop', itemDropHandler);
+
+    const localItemsWrapper = document.createElement('div');
+    localItemsWrapper.classList.add('item-set-wrapper');
+    localItemsWrapper.innerText = 'Local Items';
+    const localItems = document.createElement('div');
+    localItems.classList.add('item-container');
+    localItems.setAttribute('id', `${this.name}-local_items`);
+    localItems.setAttribute('data-setting', 'local_items')
+    localItems.addEventListener('dragover', itemDragoverHandler);
+    localItems.addEventListener('drop', itemDropHandler);
+
+    const nonLocalItemsWrapper = document.createElement('div');
+    nonLocalItemsWrapper.classList.add('item-set-wrapper');
+    nonLocalItemsWrapper.innerText = 'Non-Local Items';
+    const nonLocalItems = document.createElement('div');
+    nonLocalItems.classList.add('item-container');
+    nonLocalItems.setAttribute('id', `${this.name}-non_local_items`);
+    nonLocalItems.setAttribute('data-setting', 'non_local_items');
+    nonLocalItems.addEventListener('dragover', itemDragoverHandler);
+    nonLocalItems.addEventListener('drop', itemDropHandler);
+
+    // Populate the divs
+    this.data.gameItems.forEach((item) => {
+      if (Object.keys(this.current.start_inventory).includes(item)){
+        const itemDiv = this.#buildItemQtyDiv(item);
+        itemDiv.setAttribute('data-setting', 'start_inventory');
+        startInventory.appendChild(itemDiv);
+      } else if (this.current.local_items.includes(item)) {
+        const itemDiv = this.#buildItemDiv(item);
+        itemDiv.setAttribute('data-setting', 'local_items');
+        localItems.appendChild(itemDiv);
+      } else if (this.current.non_local_items.includes(item)) {
+        const itemDiv = this.#buildItemDiv(item);
+        itemDiv.setAttribute('data-setting', 'non_local_items');
+        nonLocalItems.appendChild(itemDiv);
+      } else {
+        const itemDiv = this.#buildItemDiv(item);
+        availableItems.appendChild(itemDiv);
+      }
+    });
+
+    availableItemsWrapper.appendChild(availableItems);
+    startInventoryWrapper.appendChild(startInventory);
+    localItemsWrapper.appendChild(localItems);
+    nonLocalItemsWrapper.appendChild(nonLocalItems);
+    itemsWrapper.appendChild(availableItemsWrapper);
+    itemsWrapper.appendChild(startInventoryWrapper);
+    itemsWrapper.appendChild(localItemsWrapper);
+    itemsWrapper.appendChild(nonLocalItemsWrapper);
+    itemsDiv.appendChild(itemsWrapper);
+    return itemsDiv;
+  }
+
+  #buildItemDiv(item) {
+    const itemDiv = document.createElement('div');
+    itemDiv.classList.add('item-div');
+    itemDiv.setAttribute('id', `${this.name}-${item}`);
+    itemDiv.setAttribute('data-game', this.name);
+    itemDiv.setAttribute('data-item', item);
+    itemDiv.setAttribute('draggable', 'true');
+    itemDiv.innerText = item;
+    itemDiv.addEventListener('dragstart', (evt) => {
+      evt.dataTransfer.setData('text/plain', itemDiv.getAttribute('id'));
+    });
+    return itemDiv;
+  }
+
+  #buildItemQtyDiv(item) {
+    const itemQtyDiv = document.createElement('div');
+    itemQtyDiv.classList.add('item-qty-div');
+    itemQtyDiv.setAttribute('id', `${this.name}-${item}`);
+    itemQtyDiv.setAttribute('data-game', this.name);
+    itemQtyDiv.setAttribute('data-item', item);
+    itemQtyDiv.setAttribute('draggable', 'true');
+    itemQtyDiv.innerText = item;
+
+    const inputWrapper = document.createElement('div');
+    inputWrapper.classList.add('item-qty-input-wrapper')
+
+    const itemQty = document.createElement('input');
+    itemQty.setAttribute('value', this.current.start_inventory.hasOwnProperty(item) ?
+      this.current.start_inventory[item] : '1');
+    itemQty.setAttribute('data-game', this.name);
+    itemQty.setAttribute('data-setting', 'start_inventory');
+    itemQty.setAttribute('data-option', item);
+    itemQty.setAttribute('maxlength', '3');
+    itemQty.addEventListener('keyup', (evt) => {
+      evt.target.value = isNaN(parseInt(evt.target.value)) ? 0 : parseInt(evt.target.value);
+      this.#updateItemSetting(evt);
+    });
+    inputWrapper.appendChild(itemQty);
+    itemQtyDiv.appendChild(inputWrapper);
+
+    itemQtyDiv.addEventListener('dragstart', (evt) => {
+      evt.dataTransfer.setData('text/plain', itemQtyDiv.getAttribute('id'));
+    });
+    return itemQtyDiv;
+  }
+
+  #itemDropHandler(evt) {
+    evt.preventDefault();
+    const sourceId = evt.dataTransfer.getData('text/plain');
+    const sourceDiv = document.getElementById(sourceId);
+
+    const item = sourceDiv.getAttribute('data-item');
+
+    const oldSetting = sourceDiv.hasAttribute('data-setting') ? sourceDiv.getAttribute('data-setting') : null;
+    const newSetting = evt.target.hasAttribute('data-setting') ? evt.target.getAttribute('data-setting') : null;
+
+    const itemDiv = newSetting === 'start_inventory' ? this.#buildItemQtyDiv(item) : this.#buildItemDiv(item);
+
+    if (oldSetting) {
+      if (oldSetting === 'start_inventory') {
+        if (this.current[oldSetting].hasOwnProperty(item)) {
+          delete this.current[oldSetting][item];
+        }
+      } else {
+        if (this.current[oldSetting].includes(item)) {
+          this.current[oldSetting].splice(this.current[oldSetting].indexOf(item), 1);
+        }
+      }
+    }
+
+    if (newSetting) {
+      itemDiv.setAttribute('data-setting', newSetting);
+      document.getElementById(`${this.name}-${newSetting}`).appendChild(itemDiv);
+      if (newSetting === 'start_inventory') {
+        this.current[newSetting][item] = 1;
+      } else {
+        if (!this.current[newSetting].includes(item)){
+          this.current[newSetting].push(item);
+        }
+      }
+    } else {
+      // No setting was assigned, this item has been removed from the settings
+      document.getElementById(`${this.name}-available_items`).appendChild(itemDiv);
+    }
+
+    // Remove the source drag object
+    sourceDiv.parentElement.removeChild(sourceDiv);
+
+    // Save the updated settings
+    this.save();
+  }
+
+  #buildHintsDiv() {
+    const hintsDiv = document.createElement('div');
+    hintsDiv.classList.add('hints-div');
+    const hintsHeader = document.createElement('h3');
+    hintsHeader.innerText = 'Item & Location Hints';
+    hintsDiv.appendChild(hintsHeader);
+    const hintsDescription = document.createElement('p');
+    hintsDescription.classList.add('setting-description');
+    hintsDescription.innerText = 'Choose any items or locations to begin the game with the knowledge of where those ' +
+      ' items are, or what those locations contain.';
+    hintsDiv.appendChild(hintsDescription);
+
+    const itemHintsContainer = document.createElement('div');
+    itemHintsContainer.classList.add('hints-container');
+
+    // Item Hints
+    const itemHintsWrapper = document.createElement('div');
+    itemHintsWrapper.classList.add('hints-wrapper');
+    itemHintsWrapper.innerText = 'Starting Item Hints';
+
+    const itemHintsDiv = this.#buildItemsDiv('start_hints');
+    itemHintsWrapper.appendChild(itemHintsDiv);
+    itemHintsContainer.appendChild(itemHintsWrapper);
+
+    // Starting Location Hints
+    const locationHintsWrapper = document.createElement('div');
+    locationHintsWrapper.classList.add('hints-wrapper');
+    locationHintsWrapper.innerText = 'Starting Location Hints';
+
+    const locationHintsDiv = this.#buildLocationsDiv('start_location_hints');
+    locationHintsWrapper.appendChild(locationHintsDiv);
+    itemHintsContainer.appendChild(locationHintsWrapper);
+
+    hintsDiv.appendChild(itemHintsContainer);
+    return hintsDiv;
+  }
+
+  #buildPriorityExclusionDiv() {
+    const locationsDiv = document.createElement('div');
+    locationsDiv.classList.add('locations-div');
+    const locationsHeader = document.createElement('h3');
+    locationsHeader.innerText = 'Priority & Exclusion Locations';
+    locationsDiv.appendChild(locationsHeader);
+    const locationsDescription = document.createElement('p');
+    locationsDescription.classList.add('setting-description');
+    locationsDescription.innerText = 'Priority locations guarantee a progression item will be placed there while ' +
+      'excluded locations will not contain progression or useful items.';
+    locationsDiv.appendChild(locationsDescription);
+
+    const locationsContainer = document.createElement('div');
+    locationsContainer.classList.add('locations-container');
+
+    // Priority Locations
+    const priorityLocationsWrapper = document.createElement('div');
+    priorityLocationsWrapper.classList.add('locations-wrapper');
+    priorityLocationsWrapper.innerText = 'Priority Locations';
+
+    const priorityLocationsDiv = this.#buildLocationsDiv('priority_locations');
+    priorityLocationsWrapper.appendChild(priorityLocationsDiv);
+    locationsContainer.appendChild(priorityLocationsWrapper);
+
+    // Exclude Locations
+    const excludeLocationsWrapper = document.createElement('div');
+    excludeLocationsWrapper.classList.add('locations-wrapper');
+    excludeLocationsWrapper.innerText = 'Exclude Locations';
+
+    const excludeLocationsDiv = this.#buildLocationsDiv('exclude_locations');
+    excludeLocationsWrapper.appendChild(excludeLocationsDiv);
+    locationsContainer.appendChild(excludeLocationsWrapper);
+
+    locationsDiv.appendChild(locationsContainer);
+    return locationsDiv;
+  }
+
+  // Builds a div for a setting whose value is a list of locations.
+  #buildLocationsDiv(setting) {
+    return this.#buildListDiv(setting, this.data.gameLocations, {
+      groups: this.data.gameLocationGroups,
+      descriptions: this.data.gameLocationDescriptions,
+    });
+  }
+
+  // Builds a div for a setting whose value is a list of items.
+  #buildItemsDiv(setting) {
+    return this.#buildListDiv(setting, this.data.gameItems, {
+      groups: this.data.gameItemGroups,
+      descriptions: this.data.gameItemDescriptions
+    });
+  }
+
+  // Builds a div for a setting named `setting` with a list value that can
+  // contain `items`.
+  //
+  // The `groups` option can be a list of additional options for this list
+  // (usually `item_name_groups` or `location_name_groups`) that are displayed
+  // in a special section at the top of the list.
+  //
+  // The `descriptions` option can be a map from item names or group names to
+  // descriptions for the user's benefit.
+  #buildListDiv(setting, items, {groups = [], descriptions = {}} = {}) {
+    const div = document.createElement('div');
+    div.classList.add('simple-list');
+
+    groups.forEach((group) => {
+      const row = this.#addListRow(setting, group, descriptions[group]);
+      div.appendChild(row);
+    });
+
+    if (groups.length > 0) {
+      div.appendChild(document.createElement('hr'));
+    }
+
+    items.forEach((item) => {
+      const row = this.#addListRow(setting, item, descriptions[item]);
+      div.appendChild(row);
+    });
+
+    return div;
+  }
+
+  // Builds and returns a row for a list of checkboxes.
+  //
+  // If `help` is passed, it's displayed as a help tooltip for this list item.
+  #addListRow(setting, item, help = undefined) {
+    const row = document.createElement('div');
+    row.classList.add('list-row');
+
+    const label = document.createElement('label');
+    label.setAttribute('for', `${this.name}-${setting}-${item}`);
+
+    const checkbox = document.createElement('input');
+    checkbox.setAttribute('type', 'checkbox');
+    checkbox.setAttribute('id', `${this.name}-${setting}-${item}`);
+    checkbox.setAttribute('data-game', this.name);
+    checkbox.setAttribute('data-setting', setting);
+    checkbox.setAttribute('data-option', item);
+    if (this.current[setting].includes(item)) {
+      checkbox.setAttribute('checked', '1');
+    }
+    checkbox.addEventListener('change', (evt) => this.#updateListSetting(evt));
+    label.appendChild(checkbox);
+
+    const name = document.createElement('span');
+    name.innerText = item;
+
+    if (help) {
+      const helpSpan = document.createElement('span');
+      helpSpan.classList.add('interactive');
+      helpSpan.setAttribute('data-tooltip', help);
+      helpSpan.innerText = '(?)';
+      name.innerText += ' ';
+      name.appendChild(helpSpan);
+
+      // Put the first 7 tooltips below their rows. CSS tooltips in scrolling
+      // containers can't be visible outside those containers, so this helps
+      // ensure they won't be pushed out the top.
+      if (helpSpan.parentNode.childNodes.length < 7) {
+        helpSpan.classList.add('tooltip-bottom');
+      }
+    }
+
+    label.appendChild(name);
+
+    row.appendChild(label);
+    return row;
+  }
+
+  #updateRangeSetting(evt) {
+    const setting = evt.target.getAttribute('data-setting');
+    const option = evt.target.getAttribute('data-option');
+    document.getElementById(`${this.name}-${setting}-${option}`).innerText = evt.target.value;
+    if (evt.action && evt.action === 'rangeDelete') {
+      delete this.current[setting][option];
+    } else {
+      this.current[setting][option] = parseInt(evt.target.value, 10);
+    }
+    this.save();
+  }
+
+  #updateListSetting(evt) {
+    const setting = evt.target.getAttribute('data-setting');
+    const option = evt.target.getAttribute('data-option');
+
+    if (evt.target.checked) {
+      // If the option is to be enabled and it is already enabled, do nothing
+      if (this.current[setting].includes(option)) { return; }
+
+      this.current[setting].push(option);
+    } else {
+      // If the option is to be disabled and it is already disabled, do nothing
+      if (!this.current[setting].includes(option)) { return; }
+
+      this.current[setting].splice(this.current[setting].indexOf(option), 1);
+    }
+    this.save();
+  }
+
+  #updateItemSetting(evt) {
+    const setting = evt.target.getAttribute('data-setting');
+    const option = evt.target.getAttribute('data-option');
+    if (setting === 'start_inventory') {
+      this.current[setting][option] = evt.target.value.trim() ? parseInt(evt.target.value) : 0;
+    } else {
+      this.current[setting][option] = isNaN(evt.target.value) ?
+        evt.target.value : parseInt(evt.target.value, 10);
+    }
+    this.save();
+  }
+
+  // Saves the current settings to local storage.
+  save() {
+    this.#allSettings.save();
+  }
+}
+
+/** Create an anchor and trigger a download of a text file. */
+const download = (filename, text) => {
+  const downloadLink = document.createElement('a');
+  downloadLink.setAttribute('href','data:text/yaml;charset=utf-8,'+ encodeURIComponent(text))
+  downloadLink.setAttribute('download', filename);
+  downloadLink.style.display = 'none';
+  document.body.appendChild(downloadLink);
+  downloadLink.click();
+  document.body.removeChild(downloadLink);
+};
diff --git a/WebHostLib/static/assets/weighted-settings.js b/WebHostLib/static/assets/weighted-settings.js
deleted file mode 100644
index fb7d3a349b..0000000000
--- a/WebHostLib/static/assets/weighted-settings.js
+++ /dev/null
@@ -1,1252 +0,0 @@
-window.addEventListener('load', () => {
-  fetchSettingData().then((results) => {
-    let settingHash = localStorage.getItem('weighted-settings-hash');
-    if (!settingHash) {
-      // If no hash data has been set before, set it now
-      settingHash = md5(JSON.stringify(results));
-      localStorage.setItem('weighted-settings-hash', settingHash);
-      localStorage.removeItem('weighted-settings');
-    }
-
-    if (settingHash !== md5(JSON.stringify(results))) {
-      const userMessage = document.getElementById('user-message');
-      userMessage.innerText = "Your settings are out of date! Click here to update them! Be aware this will reset " +
-        "them all to default.";
-      userMessage.classList.add('visible');
-      userMessage.addEventListener('click', resetSettings);
-    }
-
-    // Page setup
-    createDefaultSettings(results);
-    buildUI(results);
-    updateVisibleGames();
-    adjustHeaderWidth();
-
-    // Event listeners
-    document.getElementById('export-settings').addEventListener('click', () => exportSettings());
-    document.getElementById('generate-race').addEventListener('click', () => generateGame(true));
-    document.getElementById('generate-game').addEventListener('click', () => generateGame());
-
-    // Name input field
-    const weightedSettings = JSON.parse(localStorage.getItem('weighted-settings'));
-    const nameInput = document.getElementById('player-name');
-    nameInput.setAttribute('data-type', 'data');
-    nameInput.setAttribute('data-setting', 'name');
-    nameInput.addEventListener('keyup', updateBaseSetting);
-    nameInput.value = weightedSettings.name;
-  });
-});
-
-const resetSettings = () => {
-  localStorage.removeItem('weighted-settings');
-  localStorage.removeItem('weighted-settings-hash')
-  window.location.reload();
-};
-
-const fetchSettingData = () => new Promise((resolve, reject) => {
-  fetch(new Request(`${window.location.origin}/static/generated/weighted-settings.json`)).then((response) => {
-    try{ response.json().then((jsonObj) => resolve(jsonObj)); }
-    catch(error){ reject(error); }
-  });
-});
-
-const createDefaultSettings = (settingData) => {
-  if (!localStorage.getItem('weighted-settings')) {
-    const newSettings = {};
-
-    // Transfer base options directly
-    for (let baseOption of Object.keys(settingData.baseOptions)){
-      newSettings[baseOption] = settingData.baseOptions[baseOption];
-    }
-
-    // Set options per game
-    for (let game of Object.keys(settingData.games)) {
-      // Initialize game object
-      newSettings[game] = {};
-
-      // Transfer game settings
-      for (let gameSetting of Object.keys(settingData.games[game].gameSettings)){
-        newSettings[game][gameSetting] = {};
-
-        const setting = settingData.games[game].gameSettings[gameSetting];
-        switch(setting.type){
-          case 'select':
-            setting.options.forEach((option) => {
-              newSettings[game][gameSetting][option.value] =
-                (setting.hasOwnProperty('defaultValue') && setting.defaultValue === option.value) ? 25 : 0;
-            });
-            break;
-          case 'range':
-          case 'special_range':
-            newSettings[game][gameSetting]['random'] = 0;
-            newSettings[game][gameSetting]['random-low'] = 0;
-            newSettings[game][gameSetting]['random-high'] = 0;
-            if (setting.hasOwnProperty('defaultValue')) {
-              newSettings[game][gameSetting][setting.defaultValue] = 25;
-            } else {
-              newSettings[game][gameSetting][setting.min] = 25;
-            }
-            break;
-
-          case 'items-list':
-          case 'locations-list':
-          case 'custom-list':
-            newSettings[game][gameSetting] = setting.defaultValue;
-            break;
-
-          default:
-            console.error(`Unknown setting type for ${game} setting ${gameSetting}: ${setting.type}`);
-        }
-      }
-
-      newSettings[game].start_inventory = {};
-      newSettings[game].exclude_locations = [];
-      newSettings[game].priority_locations = [];
-      newSettings[game].local_items = [];
-      newSettings[game].non_local_items = [];
-      newSettings[game].start_hints = [];
-      newSettings[game].start_location_hints = [];
-    }
-
-    localStorage.setItem('weighted-settings', JSON.stringify(newSettings));
-  }
-};
-
-const buildUI = (settingData) => {
-  // Build the game-choice div
-  buildGameChoice(settingData.games);
-
-  const gamesWrapper = document.getElementById('games-wrapper');
-  Object.keys(settingData.games).forEach((game) => {
-    // Create game div, invisible by default
-    const gameDiv = document.createElement('div');
-    gameDiv.setAttribute('id', `${game}-div`);
-    gameDiv.classList.add('game-div');
-    gameDiv.classList.add('invisible');
-
-    const gameHeader = document.createElement('h2');
-    gameHeader.innerText = game;
-    gameDiv.appendChild(gameHeader);
-
-    const collapseButton = document.createElement('a');
-    collapseButton.innerText = '(Collapse)';
-    gameDiv.appendChild(collapseButton);
-
-    const expandButton = document.createElement('a');
-    expandButton.innerText = '(Expand)';
-    expandButton.classList.add('invisible');
-    gameDiv.appendChild(expandButton);
-
-    settingData.games[game].gameItems.sort((a, b) => (a > b ? 1 : (a < b ? -1 : 0)));
-    settingData.games[game].gameLocations.sort((a, b) => (a > b ? 1 : (a < b ? -1 : 0)));
-
-    const weightedSettingsDiv = buildWeightedSettingsDiv(game, settingData.games[game].gameSettings,
-      settingData.games[game].gameItems, settingData.games[game].gameLocations);
-    gameDiv.appendChild(weightedSettingsDiv);
-
-    const itemPoolDiv = buildItemsDiv(game, settingData.games[game].gameItems);
-    gameDiv.appendChild(itemPoolDiv);
-
-    const hintsDiv = buildHintsDiv(game, settingData.games[game].gameItems, settingData.games[game].gameLocations);
-    gameDiv.appendChild(hintsDiv);
-
-    const locationsDiv = buildLocationsDiv(game, settingData.games[game].gameLocations);
-    gameDiv.appendChild(locationsDiv);
-
-    gamesWrapper.appendChild(gameDiv);
-
-    collapseButton.addEventListener('click', () => {
-      collapseButton.classList.add('invisible');
-      weightedSettingsDiv.classList.add('invisible');
-      itemPoolDiv.classList.add('invisible');
-      hintsDiv.classList.add('invisible');
-      locationsDiv.classList.add('invisible');
-      expandButton.classList.remove('invisible');
-    });
-
-    expandButton.addEventListener('click', () => {
-      collapseButton.classList.remove('invisible');
-      weightedSettingsDiv.classList.remove('invisible');
-      itemPoolDiv.classList.remove('invisible');
-      hintsDiv.classList.remove('invisible');
-      locationsDiv.classList.remove('invisible');
-      expandButton.classList.add('invisible');
-    });
-  });
-};
-
-const buildGameChoice = (games) => {
-  const settings = JSON.parse(localStorage.getItem('weighted-settings'));
-  const gameChoiceDiv = document.getElementById('game-choice');
-  const h2 = document.createElement('h2');
-  h2.innerText = 'Game Select';
-  gameChoiceDiv.appendChild(h2);
-
-  const gameSelectDescription = document.createElement('p');
-  gameSelectDescription.classList.add('setting-description');
-  gameSelectDescription.innerText = 'Choose which games you might be required to play.';
-  gameChoiceDiv.appendChild(gameSelectDescription);
-
-  const hintText = document.createElement('p');
-  hintText.classList.add('hint-text');
-  hintText.innerText = 'If a game\'s value is greater than zero, you can click it\'s name to jump ' +
-    'to that section.'
-  gameChoiceDiv.appendChild(hintText);
-
-  // Build the game choice table
-  const table = document.createElement('table');
-  const tbody = document.createElement('tbody');
-
-  Object.keys(games).forEach((game) => {
-    const tr = document.createElement('tr');
-    const tdLeft = document.createElement('td');
-    tdLeft.classList.add('td-left');
-    const span = document.createElement('span');
-    span.innerText = game;
-    span.setAttribute('id', `${game}-game-option`)
-    tdLeft.appendChild(span);
-    tr.appendChild(tdLeft);
-
-    const tdMiddle = document.createElement('td');
-    tdMiddle.classList.add('td-middle');
-    const range = document.createElement('input');
-    range.setAttribute('type', 'range');
-    range.setAttribute('min', 0);
-    range.setAttribute('max', 50);
-    range.setAttribute('data-type', 'weight');
-    range.setAttribute('data-setting', 'game');
-    range.setAttribute('data-option', game);
-    range.value = settings.game[game];
-    range.addEventListener('change', (evt) => {
-      updateBaseSetting(evt);
-      updateVisibleGames(); // Show or hide games based on the new settings
-    });
-    tdMiddle.appendChild(range);
-    tr.appendChild(tdMiddle);
-
-    const tdRight = document.createElement('td');
-    tdRight.setAttribute('id', `game-${game}`)
-    tdRight.classList.add('td-right');
-    tdRight.innerText = range.value;
-    tr.appendChild(tdRight);
-    tbody.appendChild(tr);
-  });
-
-  table.appendChild(tbody);
-  gameChoiceDiv.appendChild(table);
-};
-
-const buildWeightedSettingsDiv = (game, settings, gameItems, gameLocations) => {
-  const currentSettings = JSON.parse(localStorage.getItem('weighted-settings'));
-  const settingsWrapper = document.createElement('div');
-  settingsWrapper.classList.add('settings-wrapper');
-
-  Object.keys(settings).forEach((settingName) => {
-    const setting = settings[settingName];
-    const settingWrapper = document.createElement('div');
-    settingWrapper.classList.add('setting-wrapper');
-
-    const settingNameHeader = document.createElement('h4');
-    settingNameHeader.innerText = setting.displayName;
-    settingWrapper.appendChild(settingNameHeader);
-
-    const settingDescription = document.createElement('p');
-    settingDescription.classList.add('setting-description');
-    settingDescription.innerText = setting.description.replace(/(\n)/g, ' ');
-    settingWrapper.appendChild(settingDescription);
-
-    switch(setting.type){
-      case 'select':
-        const optionTable = document.createElement('table');
-        const tbody = document.createElement('tbody');
-
-        // Add a weight range for each option
-        setting.options.forEach((option) => {
-          const tr = document.createElement('tr');
-          const tdLeft = document.createElement('td');
-          tdLeft.classList.add('td-left');
-          tdLeft.innerText = option.name;
-          tr.appendChild(tdLeft);
-
-          const tdMiddle = document.createElement('td');
-          tdMiddle.classList.add('td-middle');
-          const range = document.createElement('input');
-          range.setAttribute('type', 'range');
-          range.setAttribute('data-game', game);
-          range.setAttribute('data-setting', settingName);
-          range.setAttribute('data-option', option.value);
-          range.setAttribute('data-type', setting.type);
-          range.setAttribute('min', 0);
-          range.setAttribute('max', 50);
-          range.addEventListener('change', updateRangeSetting);
-          range.value = currentSettings[game][settingName][option.value];
-          tdMiddle.appendChild(range);
-          tr.appendChild(tdMiddle);
-
-          const tdRight = document.createElement('td');
-          tdRight.setAttribute('id', `${game}-${settingName}-${option.value}`)
-          tdRight.classList.add('td-right');
-          tdRight.innerText = range.value;
-          tr.appendChild(tdRight);
-
-          tbody.appendChild(tr);
-        });
-
-        optionTable.appendChild(tbody);
-        settingWrapper.appendChild(optionTable);
-        break;
-
-      case 'range':
-      case 'special_range':
-        const rangeTable = document.createElement('table');
-        const rangeTbody = document.createElement('tbody');
-
-        if (((setting.max - setting.min) + 1) < 11) {
-          for (let i=setting.min; i <= setting.max; ++i) {
-            const tr = document.createElement('tr');
-            const tdLeft = document.createElement('td');
-            tdLeft.classList.add('td-left');
-            tdLeft.innerText = i;
-            tr.appendChild(tdLeft);
-
-            const tdMiddle = document.createElement('td');
-            tdMiddle.classList.add('td-middle');
-            const range = document.createElement('input');
-            range.setAttribute('type', 'range');
-            range.setAttribute('id', `${game}-${settingName}-${i}-range`);
-            range.setAttribute('data-game', game);
-            range.setAttribute('data-setting', settingName);
-            range.setAttribute('data-option', i);
-            range.setAttribute('min', 0);
-            range.setAttribute('max', 50);
-            range.addEventListener('change', updateRangeSetting);
-            range.value = currentSettings[game][settingName][i] || 0;
-            tdMiddle.appendChild(range);
-            tr.appendChild(tdMiddle);
-
-            const tdRight = document.createElement('td');
-            tdRight.setAttribute('id', `${game}-${settingName}-${i}`)
-            tdRight.classList.add('td-right');
-            tdRight.innerText = range.value;
-            tr.appendChild(tdRight);
-
-            rangeTbody.appendChild(tr);
-          }
-        } else {
-          const hintText = document.createElement('p');
-          hintText.classList.add('hint-text');
-          hintText.innerHTML = 'This is a range option. You may enter a valid numerical value in the text box ' +
-            `below, then press the "Add" button to add a weight for it.<br />Minimum value: ${setting.min}<br />` +
-            `Maximum value: ${setting.max}`;
-
-          if (setting.hasOwnProperty('value_names')) {
-            hintText.innerHTML += '<br /><br />Certain values have special meaning:';
-            Object.keys(setting.value_names).forEach((specialName) => {
-              hintText.innerHTML += `<br />${specialName}: ${setting.value_names[specialName]}`;
-            });
-          }
-
-          settingWrapper.appendChild(hintText);
-
-          const addOptionDiv = document.createElement('div');
-          addOptionDiv.classList.add('add-option-div');
-          const optionInput = document.createElement('input');
-          optionInput.setAttribute('id', `${game}-${settingName}-option`);
-          optionInput.setAttribute('placeholder', `${setting.min} - ${setting.max}`);
-          addOptionDiv.appendChild(optionInput);
-          const addOptionButton = document.createElement('button');
-          addOptionButton.innerText = 'Add';
-          addOptionDiv.appendChild(addOptionButton);
-          settingWrapper.appendChild(addOptionDiv);
-          optionInput.addEventListener('keydown', (evt) => {
-            if (evt.key === 'Enter') { addOptionButton.dispatchEvent(new Event('click')); }
-          });
-
-          addOptionButton.addEventListener('click', () => {
-            const optionInput = document.getElementById(`${game}-${settingName}-option`);
-            let option = optionInput.value;
-            if (!option || !option.trim()) { return; }
-            option = parseInt(option, 10);
-            if ((option < setting.min) || (option > setting.max)) { return; }
-            optionInput.value = '';
-            if (document.getElementById(`${game}-${settingName}-${option}-range`)) { return; }
-
-            const tr = document.createElement('tr');
-            const tdLeft = document.createElement('td');
-            tdLeft.classList.add('td-left');
-            tdLeft.innerText = option;
-            tr.appendChild(tdLeft);
-
-            const tdMiddle = document.createElement('td');
-            tdMiddle.classList.add('td-middle');
-            const range = document.createElement('input');
-            range.setAttribute('type', 'range');
-            range.setAttribute('id', `${game}-${settingName}-${option}-range`);
-            range.setAttribute('data-game', game);
-            range.setAttribute('data-setting', settingName);
-            range.setAttribute('data-option', option);
-            range.setAttribute('min', 0);
-            range.setAttribute('max', 50);
-            range.addEventListener('change', updateRangeSetting);
-            range.value = currentSettings[game][settingName][parseInt(option, 10)];
-            tdMiddle.appendChild(range);
-            tr.appendChild(tdMiddle);
-
-            const tdRight = document.createElement('td');
-            tdRight.setAttribute('id', `${game}-${settingName}-${option}`)
-            tdRight.classList.add('td-right');
-            tdRight.innerText = range.value;
-            tr.appendChild(tdRight);
-
-            const tdDelete = document.createElement('td');
-            tdDelete.classList.add('td-delete');
-            const deleteButton = document.createElement('span');
-            deleteButton.classList.add('range-option-delete');
-            deleteButton.innerText = '❌';
-            deleteButton.addEventListener('click', () => {
-              range.value = 0;
-              range.dispatchEvent(new Event('change'));
-              rangeTbody.removeChild(tr);
-            });
-            tdDelete.appendChild(deleteButton);
-            tr.appendChild(tdDelete);
-
-            rangeTbody.appendChild(tr);
-
-            // Save new option to settings
-            range.dispatchEvent(new Event('change'));
-          });
-
-          Object.keys(currentSettings[game][settingName]).forEach((option) => {
-            // These options are statically generated below, and should always appear even if they are deleted
-            // from localStorage
-            if (['random-low', 'random', 'random-high'].includes(option)) { return; }
-
-            const tr = document.createElement('tr');
-              const tdLeft = document.createElement('td');
-              tdLeft.classList.add('td-left');
-              tdLeft.innerText = option;
-              tr.appendChild(tdLeft);
-
-              const tdMiddle = document.createElement('td');
-              tdMiddle.classList.add('td-middle');
-              const range = document.createElement('input');
-              range.setAttribute('type', 'range');
-              range.setAttribute('id', `${game}-${settingName}-${option}-range`);
-              range.setAttribute('data-game', game);
-              range.setAttribute('data-setting', settingName);
-              range.setAttribute('data-option', option);
-              range.setAttribute('min', 0);
-              range.setAttribute('max', 50);
-              range.addEventListener('change', updateRangeSetting);
-              range.value = currentSettings[game][settingName][parseInt(option, 10)];
-              tdMiddle.appendChild(range);
-              tr.appendChild(tdMiddle);
-
-              const tdRight = document.createElement('td');
-              tdRight.setAttribute('id', `${game}-${settingName}-${option}`)
-              tdRight.classList.add('td-right');
-              tdRight.innerText = range.value;
-              tr.appendChild(tdRight);
-
-              const tdDelete = document.createElement('td');
-              tdDelete.classList.add('td-delete');
-              const deleteButton = document.createElement('span');
-              deleteButton.classList.add('range-option-delete');
-              deleteButton.innerText = '❌';
-              deleteButton.addEventListener('click', () => {
-                range.value = 0;
-                const changeEvent = new Event('change');
-                changeEvent.action = 'rangeDelete';
-                range.dispatchEvent(changeEvent);
-                rangeTbody.removeChild(tr);
-              });
-              tdDelete.appendChild(deleteButton);
-              tr.appendChild(tdDelete);
-
-              rangeTbody.appendChild(tr);
-          });
-        }
-
-        ['random', 'random-low', 'random-high'].forEach((option) => {
-          const tr = document.createElement('tr');
-            const tdLeft = document.createElement('td');
-            tdLeft.classList.add('td-left');
-            switch(option){
-              case 'random':
-                tdLeft.innerText = 'Random';
-                break;
-              case 'random-low':
-                tdLeft.innerText = "Random (Low)";
-                break;
-              case 'random-high':
-                tdLeft.innerText = "Random (High)";
-                break;
-            }
-            tr.appendChild(tdLeft);
-
-            const tdMiddle = document.createElement('td');
-            tdMiddle.classList.add('td-middle');
-            const range = document.createElement('input');
-            range.setAttribute('type', 'range');
-            range.setAttribute('id', `${game}-${settingName}-${option}-range`);
-            range.setAttribute('data-game', game);
-            range.setAttribute('data-setting', settingName);
-            range.setAttribute('data-option', option);
-            range.setAttribute('min', 0);
-            range.setAttribute('max', 50);
-            range.addEventListener('change', updateRangeSetting);
-            range.value = currentSettings[game][settingName][option];
-            tdMiddle.appendChild(range);
-            tr.appendChild(tdMiddle);
-
-            const tdRight = document.createElement('td');
-            tdRight.setAttribute('id', `${game}-${settingName}-${option}`)
-            tdRight.classList.add('td-right');
-            tdRight.innerText = range.value;
-            tr.appendChild(tdRight);
-            rangeTbody.appendChild(tr);
-        });
-
-        rangeTable.appendChild(rangeTbody);
-        settingWrapper.appendChild(rangeTable);
-        break;
-
-      case 'items-list':
-        const itemsList = document.createElement('div');
-        itemsList.classList.add('simple-list');
-
-        Object.values(gameItems).forEach((item) => {
-          const itemRow = document.createElement('div');
-          itemRow.classList.add('list-row');
-
-          const itemLabel = document.createElement('label');
-          itemLabel.setAttribute('for', `${game}-${settingName}-${item}`)
-
-          const itemCheckbox = document.createElement('input');
-          itemCheckbox.setAttribute('id', `${game}-${settingName}-${item}`);
-          itemCheckbox.setAttribute('type', 'checkbox');
-          itemCheckbox.setAttribute('data-game', game);
-          itemCheckbox.setAttribute('data-setting', settingName);
-          itemCheckbox.setAttribute('data-option', item.toString());
-          itemCheckbox.addEventListener('change', updateListSetting);
-          if (currentSettings[game][settingName].includes(item)) {
-            itemCheckbox.setAttribute('checked', '1');
-          }
-
-          const itemName = document.createElement('span');
-          itemName.innerText = item.toString();
-
-          itemLabel.appendChild(itemCheckbox);
-          itemLabel.appendChild(itemName);
-
-          itemRow.appendChild(itemLabel);
-          itemsList.appendChild((itemRow));
-        });
-
-        settingWrapper.appendChild(itemsList);
-        break;
-
-      case 'locations-list':
-        const locationsList = document.createElement('div');
-        locationsList.classList.add('simple-list');
-
-        Object.values(gameLocations).forEach((location) => {
-          const locationRow = document.createElement('div');
-          locationRow.classList.add('list-row');
-
-          const locationLabel = document.createElement('label');
-          locationLabel.setAttribute('for', `${game}-${settingName}-${location}`)
-
-          const locationCheckbox = document.createElement('input');
-          locationCheckbox.setAttribute('id', `${game}-${settingName}-${location}`);
-          locationCheckbox.setAttribute('type', 'checkbox');
-          locationCheckbox.setAttribute('data-game', game);
-          locationCheckbox.setAttribute('data-setting', settingName);
-          locationCheckbox.setAttribute('data-option', location.toString());
-          locationCheckbox.addEventListener('change', updateListSetting);
-          if (currentSettings[game][settingName].includes(location)) {
-            locationCheckbox.setAttribute('checked', '1');
-          }
-
-          const locationName = document.createElement('span');
-          locationName.innerText = location.toString();
-
-          locationLabel.appendChild(locationCheckbox);
-          locationLabel.appendChild(locationName);
-
-          locationRow.appendChild(locationLabel);
-          locationsList.appendChild((locationRow));
-        });
-
-        settingWrapper.appendChild(locationsList);
-        break;
-
-      case 'custom-list':
-        const customList = document.createElement('div');
-        customList.classList.add('simple-list');
-
-        Object.values(settings[settingName].options).forEach((listItem) => {
-          const customListRow = document.createElement('div');
-          customListRow.classList.add('list-row');
-
-          const customItemLabel = document.createElement('label');
-          customItemLabel.setAttribute('for', `${game}-${settingName}-${listItem}`)
-
-          const customItemCheckbox = document.createElement('input');
-          customItemCheckbox.setAttribute('id', `${game}-${settingName}-${listItem}`);
-          customItemCheckbox.setAttribute('type', 'checkbox');
-          customItemCheckbox.setAttribute('data-game', game);
-          customItemCheckbox.setAttribute('data-setting', settingName);
-          customItemCheckbox.setAttribute('data-option', listItem.toString());
-          customItemCheckbox.addEventListener('change', updateListSetting);
-          if (currentSettings[game][settingName].includes(listItem)) {
-            customItemCheckbox.setAttribute('checked', '1');
-          }
-
-          const customItemName = document.createElement('span');
-          customItemName.innerText = listItem.toString();
-
-          customItemLabel.appendChild(customItemCheckbox);
-          customItemLabel.appendChild(customItemName);
-
-          customListRow.appendChild(customItemLabel);
-          customList.appendChild((customListRow));
-        });
-
-        settingWrapper.appendChild(customList);
-        break;
-
-      default:
-        console.error(`Unknown setting type for ${game} setting ${settingName}: ${setting.type}`);
-        return;
-    }
-
-    settingsWrapper.appendChild(settingWrapper);
-  });
-
-  return settingsWrapper;
-};
-
-const buildItemsDiv = (game, items) => {
-  // Sort alphabetical, in pace
-  items.sort();
-
-  const currentSettings = JSON.parse(localStorage.getItem('weighted-settings'));
-  const itemsDiv = document.createElement('div');
-  itemsDiv.classList.add('items-div');
-
-  const itemsDivHeader = document.createElement('h3');
-  itemsDivHeader.innerText = 'Item Pool';
-  itemsDiv.appendChild(itemsDivHeader);
-
-  const itemsDescription = document.createElement('p');
-  itemsDescription.classList.add('setting-description');
-  itemsDescription.innerText = 'Choose if you would like to start with items, or control if they are placed in ' +
-    'your seed or someone else\'s.';
-  itemsDiv.appendChild(itemsDescription);
-
-  const itemsHint = document.createElement('p');
-  itemsHint.classList.add('hint-text');
-  itemsHint.innerText = 'Drag and drop items from one box to another.';
-  itemsDiv.appendChild(itemsHint);
-
-  const itemsWrapper = document.createElement('div');
-  itemsWrapper.classList.add('items-wrapper');
-
-  // Create container divs for each category
-  const availableItemsWrapper = document.createElement('div');
-  availableItemsWrapper.classList.add('item-set-wrapper');
-  availableItemsWrapper.innerText = 'Available Items';
-  const availableItems = document.createElement('div');
-  availableItems.classList.add('item-container');
-  availableItems.setAttribute('id', `${game}-available_items`);
-  availableItems.addEventListener('dragover', itemDragoverHandler);
-  availableItems.addEventListener('drop', itemDropHandler);
-
-  const startInventoryWrapper = document.createElement('div');
-  startInventoryWrapper.classList.add('item-set-wrapper');
-  startInventoryWrapper.innerText = 'Start Inventory';
-  const startInventory = document.createElement('div');
-  startInventory.classList.add('item-container');
-  startInventory.setAttribute('id', `${game}-start_inventory`);
-  startInventory.setAttribute('data-setting', 'start_inventory');
-  startInventory.addEventListener('dragover', itemDragoverHandler);
-  startInventory.addEventListener('drop', itemDropHandler);
-
-  const localItemsWrapper = document.createElement('div');
-  localItemsWrapper.classList.add('item-set-wrapper');
-  localItemsWrapper.innerText = 'Local Items';
-  const localItems = document.createElement('div');
-  localItems.classList.add('item-container');
-  localItems.setAttribute('id', `${game}-local_items`);
-  localItems.setAttribute('data-setting', 'local_items')
-  localItems.addEventListener('dragover', itemDragoverHandler);
-  localItems.addEventListener('drop', itemDropHandler);
-
-  const nonLocalItemsWrapper = document.createElement('div');
-  nonLocalItemsWrapper.classList.add('item-set-wrapper');
-  nonLocalItemsWrapper.innerText = 'Non-Local Items';
-  const nonLocalItems = document.createElement('div');
-  nonLocalItems.classList.add('item-container');
-  nonLocalItems.setAttribute('id', `${game}-non_local_items`);
-  nonLocalItems.setAttribute('data-setting', 'non_local_items');
-  nonLocalItems.addEventListener('dragover', itemDragoverHandler);
-  nonLocalItems.addEventListener('drop', itemDropHandler);
-
-  // Populate the divs
-  items.forEach((item) => {
-    if (Object.keys(currentSettings[game].start_inventory).includes(item)){
-      const itemDiv = buildItemQtyDiv(game, item);
-      itemDiv.setAttribute('data-setting', 'start_inventory');
-      startInventory.appendChild(itemDiv);
-    } else if (currentSettings[game].local_items.includes(item)) {
-      const itemDiv = buildItemDiv(game, item);
-      itemDiv.setAttribute('data-setting', 'local_items');
-      localItems.appendChild(itemDiv);
-    } else if (currentSettings[game].non_local_items.includes(item)) {
-      const itemDiv = buildItemDiv(game, item);
-      itemDiv.setAttribute('data-setting', 'non_local_items');
-      nonLocalItems.appendChild(itemDiv);
-    } else {
-      const itemDiv = buildItemDiv(game, item);
-      availableItems.appendChild(itemDiv);
-    }
-  });
-
-  availableItemsWrapper.appendChild(availableItems);
-  startInventoryWrapper.appendChild(startInventory);
-  localItemsWrapper.appendChild(localItems);
-  nonLocalItemsWrapper.appendChild(nonLocalItems);
-  itemsWrapper.appendChild(availableItemsWrapper);
-  itemsWrapper.appendChild(startInventoryWrapper);
-  itemsWrapper.appendChild(localItemsWrapper);
-  itemsWrapper.appendChild(nonLocalItemsWrapper);
-  itemsDiv.appendChild(itemsWrapper);
-  return itemsDiv;
-};
-
-const buildItemDiv = (game, item) => {
-  const itemDiv = document.createElement('div');
-  itemDiv.classList.add('item-div');
-  itemDiv.setAttribute('id', `${game}-${item}`);
-  itemDiv.setAttribute('data-game', game);
-  itemDiv.setAttribute('data-item', item);
-  itemDiv.setAttribute('draggable', 'true');
-  itemDiv.innerText = item;
-  itemDiv.addEventListener('dragstart', (evt) => {
-    evt.dataTransfer.setData('text/plain', itemDiv.getAttribute('id'));
-  });
-  return itemDiv;
-};
-
-const buildItemQtyDiv = (game, item) => {
-  const currentSettings = JSON.parse(localStorage.getItem('weighted-settings'));
-  const itemQtyDiv = document.createElement('div');
-  itemQtyDiv.classList.add('item-qty-div');
-  itemQtyDiv.setAttribute('id', `${game}-${item}`);
-  itemQtyDiv.setAttribute('data-game', game);
-  itemQtyDiv.setAttribute('data-item', item);
-  itemQtyDiv.setAttribute('draggable', 'true');
-  itemQtyDiv.innerText = item;
-
-  const inputWrapper = document.createElement('div');
-  inputWrapper.classList.add('item-qty-input-wrapper')
-
-  const itemQty = document.createElement('input');
-  itemQty.setAttribute('value', currentSettings[game].start_inventory.hasOwnProperty(item) ?
-    currentSettings[game].start_inventory[item] : '1');
-  itemQty.setAttribute('data-game', game);
-  itemQty.setAttribute('data-setting', 'start_inventory');
-  itemQty.setAttribute('data-option', item);
-  itemQty.setAttribute('maxlength', '3');
-  itemQty.addEventListener('keyup', (evt) => {
-    evt.target.value = isNaN(parseInt(evt.target.value)) ? 0 : parseInt(evt.target.value);
-    updateItemSetting(evt);
-  });
-  inputWrapper.appendChild(itemQty);
-  itemQtyDiv.appendChild(inputWrapper);
-
-  itemQtyDiv.addEventListener('dragstart', (evt) => {
-    evt.dataTransfer.setData('text/plain', itemQtyDiv.getAttribute('id'));
-  });
-  return itemQtyDiv;
-};
-
-const itemDragoverHandler = (evt) => {
-  evt.preventDefault();
-};
-
-const itemDropHandler = (evt) => {
-  evt.preventDefault();
-  const sourceId = evt.dataTransfer.getData('text/plain');
-  const sourceDiv = document.getElementById(sourceId);
-
-  const currentSettings = JSON.parse(localStorage.getItem('weighted-settings'));
-  const game = sourceDiv.getAttribute('data-game');
-  const item = sourceDiv.getAttribute('data-item');
-
-  const oldSetting = sourceDiv.hasAttribute('data-setting') ? sourceDiv.getAttribute('data-setting') : null;
-  const newSetting = evt.target.hasAttribute('data-setting') ? evt.target.getAttribute('data-setting') : null;
-
-  const itemDiv = newSetting === 'start_inventory' ? buildItemQtyDiv(game, item) : buildItemDiv(game, item);
-
-  if (oldSetting) {
-    if (oldSetting === 'start_inventory') {
-      if (currentSettings[game][oldSetting].hasOwnProperty(item)) {
-        delete currentSettings[game][oldSetting][item];
-      }
-    } else {
-      if (currentSettings[game][oldSetting].includes(item)) {
-        currentSettings[game][oldSetting].splice(currentSettings[game][oldSetting].indexOf(item), 1);
-      }
-    }
-  }
-
-  if (newSetting) {
-    itemDiv.setAttribute('data-setting', newSetting);
-    document.getElementById(`${game}-${newSetting}`).appendChild(itemDiv);
-    if (newSetting === 'start_inventory') {
-      currentSettings[game][newSetting][item] = 1;
-    } else {
-      if (!currentSettings[game][newSetting].includes(item)){
-        currentSettings[game][newSetting].push(item);
-      }
-    }
-  } else {
-    // No setting was assigned, this item has been removed from the settings
-    document.getElementById(`${game}-available_items`).appendChild(itemDiv);
-  }
-
-  // Remove the source drag object
-  sourceDiv.parentElement.removeChild(sourceDiv);
-
-  // Save the updated settings
-  localStorage.setItem('weighted-settings', JSON.stringify(currentSettings));
-};
-
-const buildHintsDiv = (game, items, locations) => {
-  const currentSettings = JSON.parse(localStorage.getItem('weighted-settings'));
-
-  // Sort alphabetical, in place
-  items.sort();
-  locations.sort();
-
-  const hintsDiv = document.createElement('div');
-  hintsDiv.classList.add('hints-div');
-  const hintsHeader = document.createElement('h3');
-  hintsHeader.innerText = 'Item & Location Hints';
-  hintsDiv.appendChild(hintsHeader);
-  const hintsDescription = document.createElement('p');
-  hintsDescription.classList.add('setting-description');
-  hintsDescription.innerText = 'Choose any items or locations to begin the game with the knowledge of where those ' +
-    ' items are, or what those locations contain.';
-  hintsDiv.appendChild(hintsDescription);
-
-  const itemHintsContainer = document.createElement('div');
-  itemHintsContainer.classList.add('hints-container');
-
-  // Item Hints
-  const itemHintsWrapper = document.createElement('div');
-  itemHintsWrapper.classList.add('hints-wrapper');
-  itemHintsWrapper.innerText = 'Starting Item Hints';
-
-  const itemHintsDiv = document.createElement('div');
-  itemHintsDiv.classList.add('simple-list');
-  items.forEach((item) => {
-    const itemRow = document.createElement('div');
-    itemRow.classList.add('list-row');
-
-    const itemLabel = document.createElement('label');
-    itemLabel.setAttribute('for', `${game}-start_hints-${item}`);
-
-    const itemCheckbox = document.createElement('input');
-    itemCheckbox.setAttribute('type', 'checkbox');
-    itemCheckbox.setAttribute('id', `${game}-start_hints-${item}`);
-    itemCheckbox.setAttribute('data-game', game);
-    itemCheckbox.setAttribute('data-setting', 'start_hints');
-    itemCheckbox.setAttribute('data-option', item);
-    if (currentSettings[game].start_hints.includes(item)) {
-      itemCheckbox.setAttribute('checked', 'true');
-    }
-    itemCheckbox.addEventListener('change', updateListSetting);
-    itemLabel.appendChild(itemCheckbox);
-
-    const itemName = document.createElement('span');
-    itemName.innerText = item;
-    itemLabel.appendChild(itemName);
-
-    itemRow.appendChild(itemLabel);
-    itemHintsDiv.appendChild(itemRow);
-  });
-
-  itemHintsWrapper.appendChild(itemHintsDiv);
-  itemHintsContainer.appendChild(itemHintsWrapper);
-
-  // Starting Location Hints
-  const locationHintsWrapper = document.createElement('div');
-  locationHintsWrapper.classList.add('hints-wrapper');
-  locationHintsWrapper.innerText = 'Starting Location Hints';
-
-  const locationHintsDiv = document.createElement('div');
-  locationHintsDiv.classList.add('simple-list');
-  locations.forEach((location) => {
-    const locationRow = document.createElement('div');
-    locationRow.classList.add('list-row');
-
-    const locationLabel = document.createElement('label');
-    locationLabel.setAttribute('for', `${game}-start_location_hints-${location}`);
-
-    const locationCheckbox = document.createElement('input');
-    locationCheckbox.setAttribute('type', 'checkbox');
-    locationCheckbox.setAttribute('id', `${game}-start_location_hints-${location}`);
-    locationCheckbox.setAttribute('data-game', game);
-    locationCheckbox.setAttribute('data-setting', 'start_location_hints');
-    locationCheckbox.setAttribute('data-option', location);
-    if (currentSettings[game].start_location_hints.includes(location)) {
-      locationCheckbox.setAttribute('checked', '1');
-    }
-    locationCheckbox.addEventListener('change', updateListSetting);
-    locationLabel.appendChild(locationCheckbox);
-
-    const locationName = document.createElement('span');
-    locationName.innerText = location;
-    locationLabel.appendChild(locationName);
-
-    locationRow.appendChild(locationLabel);
-    locationHintsDiv.appendChild(locationRow);
-  });
-
-  locationHintsWrapper.appendChild(locationHintsDiv);
-  itemHintsContainer.appendChild(locationHintsWrapper);
-
-  hintsDiv.appendChild(itemHintsContainer);
-  return hintsDiv;
-};
-
-const buildLocationsDiv = (game, locations) => {
-  const currentSettings = JSON.parse(localStorage.getItem('weighted-settings'));
-  locations.sort(); // Sort alphabetical, in-place
-
-  const locationsDiv = document.createElement('div');
-  locationsDiv.classList.add('locations-div');
-  const locationsHeader = document.createElement('h3');
-  locationsHeader.innerText = 'Priority & Exclusion Locations';
-  locationsDiv.appendChild(locationsHeader);
-  const locationsDescription = document.createElement('p');
-  locationsDescription.classList.add('setting-description');
-  locationsDescription.innerText = 'Priority locations guarantee a progression item will be placed there while ' +
-    'excluded locations will not contain progression or useful items.';
-  locationsDiv.appendChild(locationsDescription);
-
-  const locationsContainer = document.createElement('div');
-  locationsContainer.classList.add('locations-container');
-
-  // Priority Locations
-  const priorityLocationsWrapper = document.createElement('div');
-  priorityLocationsWrapper.classList.add('locations-wrapper');
-  priorityLocationsWrapper.innerText = 'Priority Locations';
-
-  const priorityLocationsDiv = document.createElement('div');
-  priorityLocationsDiv.classList.add('simple-list');
-  locations.forEach((location) => {
-    const locationRow = document.createElement('div');
-    locationRow.classList.add('list-row');
-
-    const locationLabel = document.createElement('label');
-    locationLabel.setAttribute('for', `${game}-priority_locations-${location}`);
-
-    const locationCheckbox = document.createElement('input');
-    locationCheckbox.setAttribute('type', 'checkbox');
-    locationCheckbox.setAttribute('id', `${game}-priority_locations-${location}`);
-    locationCheckbox.setAttribute('data-game', game);
-    locationCheckbox.setAttribute('data-setting', 'priority_locations');
-    locationCheckbox.setAttribute('data-option', location);
-    if (currentSettings[game].priority_locations.includes(location)) {
-      locationCheckbox.setAttribute('checked', '1');
-    }
-    locationCheckbox.addEventListener('change', updateListSetting);
-    locationLabel.appendChild(locationCheckbox);
-
-    const locationName = document.createElement('span');
-    locationName.innerText = location;
-    locationLabel.appendChild(locationName);
-
-    locationRow.appendChild(locationLabel);
-    priorityLocationsDiv.appendChild(locationRow);
-  });
-
-  priorityLocationsWrapper.appendChild(priorityLocationsDiv);
-  locationsContainer.appendChild(priorityLocationsWrapper);
-
-  // Exclude Locations
-  const excludeLocationsWrapper = document.createElement('div');
-  excludeLocationsWrapper.classList.add('locations-wrapper');
-  excludeLocationsWrapper.innerText = 'Exclude Locations';
-
-  const excludeLocationsDiv = document.createElement('div');
-  excludeLocationsDiv.classList.add('simple-list');
-  locations.forEach((location) => {
-    const locationRow = document.createElement('div');
-    locationRow.classList.add('list-row');
-
-    const locationLabel = document.createElement('label');
-    locationLabel.setAttribute('for', `${game}-exclude_locations-${location}`);
-
-    const locationCheckbox = document.createElement('input');
-    locationCheckbox.setAttribute('type', 'checkbox');
-    locationCheckbox.setAttribute('id', `${game}-exclude_locations-${location}`);
-    locationCheckbox.setAttribute('data-game', game);
-    locationCheckbox.setAttribute('data-setting', 'exclude_locations');
-    locationCheckbox.setAttribute('data-option', location);
-    if (currentSettings[game].exclude_locations.includes(location)) {
-      locationCheckbox.setAttribute('checked', '1');
-    }
-    locationCheckbox.addEventListener('change', updateListSetting);
-    locationLabel.appendChild(locationCheckbox);
-
-    const locationName = document.createElement('span');
-    locationName.innerText = location;
-    locationLabel.appendChild(locationName);
-
-    locationRow.appendChild(locationLabel);
-    excludeLocationsDiv.appendChild(locationRow);
-  });
-
-  excludeLocationsWrapper.appendChild(excludeLocationsDiv);
-  locationsContainer.appendChild(excludeLocationsWrapper);
-
-  locationsDiv.appendChild(locationsContainer);
-  return locationsDiv;
-};
-
-const updateVisibleGames = () => {
-  const settings = JSON.parse(localStorage.getItem('weighted-settings'));
-  Object.keys(settings.game).forEach((game) => {
-    const gameDiv = document.getElementById(`${game}-div`);
-    const gameOption = document.getElementById(`${game}-game-option`);
-    if (parseInt(settings.game[game], 10) > 0) {
-      gameDiv.classList.remove('invisible');
-      gameOption.classList.add('jump-link');
-      gameOption.addEventListener('click', () => {
-        const gameDiv = document.getElementById(`${game}-div`);
-        if (gameDiv.classList.contains('invisible')) { return; }
-        gameDiv.scrollIntoView({
-          behavior: 'smooth',
-          block: 'start',
-        });
-      });
-    } else {
-      gameDiv.classList.add('invisible');
-      gameOption.classList.remove('jump-link');
-
-    }
-  });
-};
-
-const updateBaseSetting = (event) => {
-  const settings = JSON.parse(localStorage.getItem('weighted-settings'));
-  const setting = event.target.getAttribute('data-setting');
-  const option = event.target.getAttribute('data-option');
-  const type = event.target.getAttribute('data-type');
-
-  switch(type){
-    case 'weight':
-      settings[setting][option] = isNaN(event.target.value) ? event.target.value : parseInt(event.target.value, 10);
-      document.getElementById(`${setting}-${option}`).innerText = event.target.value;
-      break;
-    case 'data':
-      settings[setting] = isNaN(event.target.value) ? event.target.value : parseInt(event.target.value, 10);
-      break;
-  }
-
-  localStorage.setItem('weighted-settings', JSON.stringify(settings));
-};
-
-const updateRangeSetting = (evt) => {
-  const options = JSON.parse(localStorage.getItem('weighted-settings'));
-  const game = evt.target.getAttribute('data-game');
-  const setting = evt.target.getAttribute('data-setting');
-  const option = evt.target.getAttribute('data-option');
-  document.getElementById(`${game}-${setting}-${option}`).innerText = evt.target.value;
-  if (evt.action && evt.action === 'rangeDelete') {
-    delete options[game][setting][option];
-  } else {
-    options[game][setting][option] = parseInt(evt.target.value, 10);
-  }
-  localStorage.setItem('weighted-settings', JSON.stringify(options));
-};
-
-const updateListSetting = (evt) => {
-  const options = JSON.parse(localStorage.getItem('weighted-settings'));
-  const game = evt.target.getAttribute('data-game');
-  const setting = evt.target.getAttribute('data-setting');
-  const option = evt.target.getAttribute('data-option');
-
-  if (evt.target.checked) {
-    // If the option is to be enabled and it is already enabled, do nothing
-    if (options[game][setting].includes(option)) { return; }
-
-    options[game][setting].push(option);
-  } else {
-    // If the option is to be disabled and it is already disabled, do nothing
-    if (!options[game][setting].includes(option)) { return; }
-
-    options[game][setting].splice(options[game][setting].indexOf(option), 1);
-  }
-  localStorage.setItem('weighted-settings', JSON.stringify(options));
-};
-
-const updateItemSetting = (evt) => {
-  const options = JSON.parse(localStorage.getItem('weighted-settings'));
-  const game = evt.target.getAttribute('data-game');
-  const setting = evt.target.getAttribute('data-setting');
-  const option = evt.target.getAttribute('data-option');
-  if (setting === 'start_inventory') {
-    options[game][setting][option] = evt.target.value.trim() ? parseInt(evt.target.value) : 0;
-  } else {
-    options[game][setting][option] = isNaN(evt.target.value) ?
-      evt.target.value : parseInt(evt.target.value, 10);
-  }
-  localStorage.setItem('weighted-settings', JSON.stringify(options));
-};
-
-const validateSettings = () => {
-  const settings = JSON.parse(localStorage.getItem('weighted-settings'));
-  const userMessage = document.getElementById('user-message');
-  let errorMessage = null;
-
-  // User must choose a name for their file
-  if (!settings.name || settings.name.trim().length === 0 || settings.name.toLowerCase().trim() === 'player') {
-    userMessage.innerText = 'You forgot to set your player name at the top of the page!';
-    userMessage.classList.add('visible');
-    userMessage.scrollIntoView({
-      behavior: 'smooth',
-      block: 'start',
-    });
-    return;
-  }
-
-  // Clean up the settings output
-  Object.keys(settings.game).forEach((game) => {
-    // Remove any disabled games
-    if (settings.game[game] === 0) {
-      delete settings.game[game];
-      delete settings[game];
-      return;
-    }
-
-    Object.keys(settings[game]).forEach((setting) => {
-      // Remove any disabled options
-      Object.keys(settings[game][setting]).forEach((option) => {
-        if (settings[game][setting][option] === 0) {
-          delete settings[game][setting][option];
-        }
-      });
-
-      if (
-        Object.keys(settings[game][setting]).length === 0 &&
-        !Array.isArray(settings[game][setting]) &&
-        setting !== 'start_inventory'
-      ) {
-        errorMessage = `${game} // ${setting} has no values above zero!`;
-      }
-
-      // Remove weights from options with only one possibility
-      if (
-        Object.keys(settings[game][setting]).length === 1 &&
-        !Array.isArray(settings[game][setting]) &&
-        setting !== 'start_inventory'
-      ) {
-        settings[game][setting] = Object.keys(settings[game][setting])[0];
-      }
-
-      // Remove empty arrays
-      else if (
-        ['exclude_locations', 'priority_locations', 'local_items', 
-        'non_local_items', 'start_hints', 'start_location_hints'].includes(setting) &&
-        settings[game][setting].length === 0
-      ) {
-        delete settings[game][setting];
-      }
-
-      // Remove empty start inventory
-      else if (
-        setting === 'start_inventory' &&
-        Object.keys(settings[game]['start_inventory']).length === 0
-      ) {
-        delete settings[game]['start_inventory'];
-      }
-    });
-  });
-
-  if (Object.keys(settings.game).length === 0) {
-    errorMessage = 'You have not chosen a game to play!';
-  }
-
-  // Remove weights if there is only one game
-  else if (Object.keys(settings.game).length === 1) {
-    settings.game = Object.keys(settings.game)[0];
-  }
-
-  // If an error occurred, alert the user and do not export the file
-  if (errorMessage) {
-    userMessage.innerText = errorMessage;
-    userMessage.classList.add('visible');
-    userMessage.scrollIntoView({
-      behavior: 'smooth',
-      block: 'start',
-    });
-    return;
-  }
-
-  // If no error occurred, hide the user message if it is visible
-  userMessage.classList.remove('visible');
-  return settings;
-};
-
-const exportSettings = () => {
-  const settings = validateSettings();
-  if (!settings) { return; }
-
-  const yamlText = jsyaml.safeDump(settings, { noCompatMode: true }).replaceAll(/'(\d+)':/g, (x, y) => `${y}:`);
-  download(`${document.getElementById('player-name').value}.yaml`, yamlText);
-};
-
-/** Create an anchor and trigger a download of a text file. */
-const download = (filename, text) => {
-  const downloadLink = document.createElement('a');
-  downloadLink.setAttribute('href','data:text/yaml;charset=utf-8,'+ encodeURIComponent(text))
-  downloadLink.setAttribute('download', filename);
-  downloadLink.style.display = 'none';
-  document.body.appendChild(downloadLink);
-  downloadLink.click();
-  document.body.removeChild(downloadLink);
-};
-
-const generateGame = (raceMode = false) => {
-  const settings = validateSettings();
-  if (!settings) { return; }
-
-  axios.post('/api/generate', {
-    weights: { player: JSON.stringify(settings) },
-    presetData: { player: JSON.stringify(settings) },
-    playerCount: 1,
-    spoiler: 3,
-    race: raceMode ? '1' : '0',
-  }).then((response) => {
-    window.location.href = response.data.url;
-  }).catch((error) => {
-    const userMessage = document.getElementById('user-message');
-    userMessage.innerText = 'Something went wrong and your game could not be generated.';
-    if (error.response.data.text) {
-      userMessage.innerText += ' ' + error.response.data.text;
-    }
-    userMessage.classList.add('visible');
-    userMessage.scrollIntoView({
-      behavior: 'smooth',
-      block: 'start',
-    });
-    console.error(error);
-  });
-};
diff --git a/WebHostLib/static/styles/landing.css b/WebHostLib/static/styles/landing.css
index 202c43badd..96975553c1 100644
--- a/WebHostLib/static/styles/landing.css
+++ b/WebHostLib/static/styles/landing.css
@@ -235,9 +235,6 @@ html{
     line-height: 30px;
 }
 
-#landing .variable{
-    color: #ffff00;
-}
 
 .landing-deco{
     position: absolute;
diff --git a/WebHostLib/static/styles/player-settings.css b/WebHostLib/static/styles/player-options.css
similarity index 59%
rename from WebHostLib/static/styles/player-settings.css
rename to WebHostLib/static/styles/player-options.css
index e6e0c29292..cc2d5e2de5 100644
--- a/WebHostLib/static/styles/player-settings.css
+++ b/WebHostLib/static/styles/player-options.css
@@ -4,7 +4,7 @@ html{
     background-size: 650px 650px;
 }
 
-#player-settings{
+#player-options{
     box-sizing: border-box;
     max-width: 1024px;
     margin-left: auto;
@@ -15,14 +15,14 @@ html{
     color: #eeffeb;
 }
 
-#player-settings #player-settings-button-row{
+#player-options #player-options-button-row{
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     margin-top: 15px;
 }
 
-#player-settings code{
+#player-options code{
     background-color: #d9cd8e;
     border-radius: 4px;
     padding-left: 0.25rem;
@@ -30,7 +30,7 @@ html{
     color: #000000;
 }
 
-#player-settings #user-message{
+#player-options #user-message{
     display: none;
     width: calc(100% - 8px);
     background-color: #ffe86b;
@@ -40,12 +40,12 @@ html{
     text-align: center;
 }
 
-#player-settings #user-message.visible{
+#player-options #user-message.visible{
     display: block;
     cursor: pointer;
 }
 
-#player-settings h1{
+#player-options h1{
     font-size: 2.5rem;
     font-weight: normal;
     width: 100%;
@@ -53,7 +53,7 @@ html{
     text-shadow: 1px 1px 4px #000000;
 }
 
-#player-settings h2{
+#player-options h2{
     font-size: 40px;
     font-weight: normal;
     width: 100%;
@@ -62,22 +62,22 @@ html{
     text-shadow: 1px 1px 2px #000000;
 }
 
-#player-settings h3, #player-settings h4, #player-settings h5, #player-settings h6{
+#player-options h3, #player-options h4, #player-options h5, #player-options h6{
     text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
-#player-settings input:not([type]){
+#player-options input:not([type]){
     border: 1px solid #000000;
     padding: 3px;
     border-radius: 3px;
     min-width: 150px;
 }
 
-#player-settings input:not([type]):focus{
+#player-options input:not([type]):focus{
     border: 1px solid #ffffff;
 }
 
-#player-settings select{
+#player-options select{
     border: 1px solid #000000;
     padding: 3px;
     border-radius: 3px;
@@ -85,72 +85,97 @@ html{
     background-color: #ffffff;
 }
 
-#player-settings #game-options, #player-settings #rom-options{
+#player-options #game-options, #player-options #rom-options{
     display: flex;
     flex-direction: row;
 }
 
-#player-settings .left, #player-settings .right{
+#player-options #meta-options {
+    display: flex;
+    justify-content: space-between;
+    gap: 20px;
+    padding: 3px;
+}
+
+#player-options div {
+    display: flex;
     flex-grow: 1;
 }
 
-#player-settings .left{
+#player-options #meta-options label {
+    display: inline-block;
+    min-width: 180px;
+    flex-grow: 1;
+}
+
+#player-options #meta-options input,
+#player-options #meta-options select {
+    box-sizing: border-box;
+    min-width: 150px;
+    width: 50%;
+}
+
+#player-options .left, #player-options .right{
+    flex-grow: 1;
+}
+
+#player-options .left{
     margin-right: 10px;
 }
 
-#player-settings .right{
+#player-options .right{
     margin-left: 10px;
 }
 
-#player-settings table{
+#player-options table{
     margin-bottom: 30px;
     width: 100%;
 }
 
-#player-settings table .select-container{
+#player-options table .select-container{
     display: flex;
     flex-direction: row;
 }
 
-#player-settings table .select-container select{
+#player-options table .select-container select{
     min-width: 200px;
     flex-grow: 1;
 }
 
-#player-settings table select:disabled{
+#player-options table select:disabled{
     background-color: lightgray;
 }
 
-#player-settings table .range-container{
+#player-options table .range-container{
     display: flex;
     flex-direction: row;
 }
 
-#player-settings table .range-container input[type=range]{
+#player-options table .range-container input[type=range]{
     flex-grow: 1;
 }
 
-#player-settings table .range-value{
+#player-options table .range-value{
     min-width: 20px;
     margin-left: 0.25rem;
 }
 
-#player-settings table .special-range-container{
+#player-options table .named-range-container{
     display: flex;
     flex-direction: column;
 }
 
-#player-settings table .special-range-wrapper{
+#player-options table .named-range-wrapper{
     display: flex;
     flex-direction: row;
     margin-top: 0.25rem;
 }
 
-#player-settings table .special-range-wrapper input[type=range]{
+#player-options table .named-range-wrapper input[type=range]{
     flex-grow: 1;
 }
 
-#player-settings table .randomize-button {
+#player-options table .randomize-button {
     max-height: 24px;
     line-height: 16px;
     padding: 2px 8px;
@@ -160,23 +185,23 @@ html{
     border-radius: 3px;
 }
 
-#player-settings table .randomize-button.active {
+#player-options table .randomize-button.active {
     background-color: #ffef00; /* Same as .interactive in globalStyles.css */
 }
 
-#player-settings table .randomize-button[data-tooltip]::after {
+#player-options table .randomize-button[data-tooltip]::after {
     left: unset;
     right: 0;
 }
 
-#player-settings table label{
+#player-options table label{
     display: block;
     min-width: 200px;
     margin-right: 4px;
     cursor: default;
 }
 
-#player-settings th, #player-settings td{
+#player-options th, #player-options td{
     border: none;
     padding: 3px;
     font-size: 17px;
@@ -184,17 +209,23 @@ html{
 }
 
 @media all and (max-width: 1024px) {
-    #player-settings {
+    #player-options {
         border-radius: 0;
     }
 
-    #player-settings #game-options{
+    #player-options #meta-options {
+        flex-direction: column;
+        justify-content: flex-start;
+        gap: 6px;
+    }
+
+    #player-options #game-options{
         justify-content: flex-start;
         flex-wrap: wrap;
     }
 
-    #player-settings .left,
-    #player-settings .right {
+    #player-options .left,
+    #player-options .right {
         margin: 0;
     }
 
diff --git a/WebHostLib/static/styles/supportedGames.css b/WebHostLib/static/styles/supportedGames.css
index 1e9a98c17a..7396daa954 100644
--- a/WebHostLib/static/styles/supportedGames.css
+++ b/WebHostLib/static/styles/supportedGames.css
@@ -18,10 +18,16 @@
     margin-bottom: 2px;
 }
 
+#games .collapse-toggle{
+    cursor: pointer;
+}
+
 #games h2 .collapse-arrow{
     font-size: 20px;
+    display: inline-block; /* make vertical-align work */
+    padding-bottom: 9px;
     vertical-align: middle;
-    cursor: pointer;
+    padding-right: 8px;
 }
 
 #games p.collapsed{
@@ -42,12 +48,12 @@
     margin-bottom: 7px;
 }
 
-#games #page-controls{
+#games .page-controls{
     display: flex;
     flex-direction: row;
     margin-top: 0.25rem;
 }
 
-#games #page-controls button{
+#games .page-controls button{
     margin-left: 0.5rem;
 }
diff --git a/WebHostLib/static/styles/tracker.css b/WebHostLib/static/styles/tracker.css
index 0cc2ede59f..8fcb0c9230 100644
--- a/WebHostLib/static/styles/tracker.css
+++ b/WebHostLib/static/styles/tracker.css
@@ -7,138 +7,55 @@
     width: calc(100% - 1rem);
 }
 
-#tracker-wrapper a{
+#tracker-wrapper a {
     color: #234ae4;
     text-decoration: none;
     cursor: pointer;
 }
 
-.table-wrapper{
-    overflow-y: auto;
-    overflow-x: auto;
-    margin-bottom: 1rem;
-}
-
-#tracker-header-bar{
+#tracker-header-bar {
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
+    align-content: center;
     line-height: 20px;
+    gap: 0.5rem;
+    margin-bottom: 1rem;
 }
 
-#tracker-header-bar .info{
+#tracker-header-bar .info {
     color: #ffffff;
-}
-
-#search{
-    border: 1px solid #000000;
-    border-radius: 3px;
-    padding: 3px;
-    width: 200px;
-    margin-bottom: 0.5rem;
-    margin-right: 1rem;
-}
-
-#multi-stream-link{
-    margin-right: 1rem;
-}
-
-div.dataTables_wrapper.no-footer .dataTables_scrollBody{
-    border: none;
-}
-
-table.dataTable{
-    color: #000000;
-}
-
-table.dataTable thead{
-    font-family: LexendDeca-Regular, sans-serif;
-}
-
-table.dataTable tbody, table.dataTable tfoot{
-    background-color: #dce2bd;
-    font-family: LexendDeca-Light, sans-serif;
-}
-
-table.dataTable tbody tr:hover, table.dataTable tfoot tr:hover{
-    background-color: #e2eabb;
-}
-
-table.dataTable tbody td, table.dataTable tfoot td{
-    padding: 4px 6px;
-}
-
-table.dataTable, table.dataTable.no-footer{
-    border-left: 1px solid #bba967;
-    width: calc(100% - 2px) !important;
-    font-size: 1rem;
-}
-
-table.dataTable thead th{
-    position: -webkit-sticky;
-    position: sticky;
-    background-color: #b0a77d;
-    top: 0;
-}
-
-table.dataTable thead th.upper-row{
-    position: -webkit-sticky;
-    position: sticky;
-    background-color: #b0a77d;
-    height: 36px;
-    top: 0;
-}
-
-table.dataTable thead th.lower-row{
-    position: -webkit-sticky;
-    position: sticky;
-    background-color: #b0a77d;
-    height: 22px;
-    top: 46px;
-}
-
-table.dataTable tbody td, table.dataTable tfoot td{
-    border: 1px solid #bba967;
-}
-
-table.dataTable tfoot td{
-    font-weight: bold;
-}
-
-div.dataTables_scrollBody{
-    background-color: inherit !important;
-}
-
-table.dataTable .center-column{
-    text-align: center;
-}
-
-img.alttp-sprite {
-    height: auto;
-    max-height: 32px;
-    min-height: 14px;
-}
-
-.item-acquired{
-    background-color: #d3c97d;
+    padding: 2px;
+    flex-grow: 1;
+    align-self: center;
+    text-align: justify;
 }
 
 #tracker-navigation {
-    display: inline-flex;
+    display: flex;
+    flex-wrap: wrap;
+    margin: 0 0.5rem 0.5rem 0.5rem;
+    user-select: none;
+    height: 2rem;
+}
+
+.tracker-navigation-bar {
+    display: flex;
     background-color: #b0a77d;
-    margin: 0.5rem;
     border-radius: 4px;
 }
 
 .tracker-navigation-button {
-    display: block;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     margin: 4px;
     padding-left: 12px;
     padding-right: 12px;
     border-radius: 4px;
     text-align: center;
     font-size: 14px;
-    color: #000;
+    color: black !important;
     font-weight: lighter;
 }
 
@@ -150,6 +67,100 @@ img.alttp-sprite {
     background-color: rgb(220, 226, 189);
 }
 
+.table-wrapper {
+    overflow-y: auto;
+    overflow-x: auto;
+    margin-bottom: 1rem;
+    resize: vertical;
+}
+
+#search {
+    border: 1px solid #000000;
+    border-radius: 3px;
+    padding: 3px;
+    width: 200px;
+}
+
+div.dataTables_wrapper.no-footer .dataTables_scrollBody {
+    border: none;
+}
+
+table.dataTable {
+    color: #000000;
+}
+
+table.dataTable thead {
+    font-family: LexendDeca-Regular, sans-serif;
+}
+
+table.dataTable tbody, table.dataTable tfoot {
+    background-color: #dce2bd;
+    font-family: LexendDeca-Light, sans-serif;
+}
+
+table.dataTable tbody tr:hover, table.dataTable tfoot tr:hover {
+    background-color: #e2eabb;
+}
+
+table.dataTable tbody td, table.dataTable tfoot td {
+    padding: 4px 6px;
+}
+
+table.dataTable, table.dataTable.no-footer {
+    border-left: 1px solid #bba967;
+    width: calc(100% - 2px) !important;
+    font-size: 1rem;
+}
+
+table.dataTable thead th {
+    position: -webkit-sticky;
+    position: sticky;
+    background-color: #b0a77d;
+    top: 0;
+}
+
+table.dataTable thead th.upper-row {
+    position: -webkit-sticky;
+    position: sticky;
+    background-color: #b0a77d;
+    height: 36px;
+    top: 0;
+}
+
+table.dataTable thead th.lower-row {
+    position: -webkit-sticky;
+    position: sticky;
+    background-color: #b0a77d;
+    height: 22px;
+    top: 46px;
+}
+
+table.dataTable tbody td, table.dataTable tfoot td {
+    border: 1px solid #bba967;
+}
+
+table.dataTable tfoot td {
+    font-weight: bold;
+}
+
+div.dataTables_scrollBody {
+    background-color: inherit !important;
+}
+
+table.dataTable .center-column {
+    text-align: center;
+}
+
+img.icon-sprite {
+    height: auto;
+    max-height: 32px;
+    min-height: 14px;
+}
+
+.item-acquired {
+    background-color: #d3c97d;
+}
+
 @media all and (max-width: 1700px) {
     table.dataTable thead th.upper-row{
         position: -webkit-sticky;
@@ -159,7 +170,7 @@ img.alttp-sprite {
         top: 0;
     }
 
-    table.dataTable thead th.lower-row{
+    table.dataTable thead th.lower-row {
         position: -webkit-sticky;
         position: sticky;
         background-color: #b0a77d;
@@ -167,11 +178,11 @@ img.alttp-sprite {
         top: 37px;
     }
 
-    table.dataTable, table.dataTable.no-footer{
+    table.dataTable, table.dataTable.no-footer {
         font-size: 0.8rem;
     }
 
-    img.alttp-sprite {
+    img.icon-sprite {
         height: auto;
         max-height: 24px;
         min-height: 10px;
@@ -187,7 +198,7 @@ img.alttp-sprite {
         top: 0;
     }
 
-    table.dataTable thead th.lower-row{
+    table.dataTable thead th.lower-row {
         position: -webkit-sticky;
         position: sticky;
         background-color: #b0a77d;
@@ -195,11 +206,11 @@ img.alttp-sprite {
         top: 32px;
     }
 
-    table.dataTable, table.dataTable.no-footer{
+    table.dataTable, table.dataTable.no-footer {
         font-size: 0.6rem;
     }
 
-    img.alttp-sprite {
+    img.icon-sprite {
         height: auto;
         max-height: 20px;
         min-height: 10px;
diff --git a/WebHostLib/static/styles/weighted-settings.css b/WebHostLib/static/styles/weighted-options.css
similarity index 97%
rename from WebHostLib/static/styles/weighted-settings.css
rename to WebHostLib/static/styles/weighted-options.css
index cc5231634e..8a66ca2370 100644
--- a/WebHostLib/static/styles/weighted-settings.css
+++ b/WebHostLib/static/styles/weighted-options.css
@@ -292,6 +292,12 @@ html{
     margin-right: 0.5rem;
 }
 
+#weighted-settings .simple-list hr{
+    width: calc(100% - 2px);
+    margin: 2px auto;
+    border-bottom: 1px solid rgb(255 255 255 / 0.6);
+}
+
 #weighted-settings .invisible{
     display: none;
 }
diff --git a/WebHostLib/templates/checkResult.html b/WebHostLib/templates/checkResult.html
index c245d7381a..75ae7479f5 100644
--- a/WebHostLib/templates/checkResult.html
+++ b/WebHostLib/templates/checkResult.html
@@ -28,6 +28,10 @@
                     {% endfor %}
                 </tbody>
             </table>
+        {% if combined_yaml %}
+            <h1>Combined File Download</h1>
+            <p><a href="data:text/yaml;base64,{{ combined_yaml }}" download="combined.yaml">Download</a></p>
+        {% endif %}
         </div>
     </div>
 {% endblock %}
diff --git a/WebHostLib/templates/genericTracker.html b/WebHostLib/templates/genericTracker.html
index 1c2fcd44c0..5a53320408 100644
--- a/WebHostLib/templates/genericTracker.html
+++ b/WebHostLib/templates/genericTracker.html
@@ -1,36 +1,57 @@
-{% extends 'tablepage.html' %}
+{% extends "tablepage.html" %}
 {% block head %}
     {{ super() }}
     <title>{{ player_name }}&apos;s Tracker</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/tracker.css") }}"/>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/jquery.scrollsync.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/trackerCommon.js") }}"></script>
+    <link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="styles/tracker.css") }}"/>
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/jquery.scrollsync.js") }}"></script>
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/trackerCommon.js") }}"></script>
 {% endblock %}
 
 {% block body %}
-    {% include 'header/dirtHeader.html' %}
-    <div id="tracker-wrapper" data-tracker="{{ room.tracker|suuid }}/{{ team }}/{{ player }}" data-second="{{ saving_second }}">
-        <div id="tracker-header-bar">
-            <input placeholder="Search" id="search"/>
-            <span class="info">This tracker will automatically update itself periodically.</span>
+    {% include "header/dirtHeader.html" %}
+
+    <div id="tracker-navigation">
+        <div class="tracker-navigation-bar">
+            <a
+                class="tracker-navigation-button"
+                href="{{ url_for("get_multiworld_tracker", tracker=room.tracker) }}"
+            >
+                 🡸 Return to Multiworld Tracker
+            </a>
+            {% if game_specific_tracker %}
+            <a
+                class="tracker-navigation-button"
+                href="{{ url_for("get_player_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}"
+            >
+                Game-Specific Tracker
+            </a>
+            {% endif %}
         </div>
+    </div>
+
+    <div id="tracker-wrapper" data-tracker="{{ room.tracker | suuid }}/{{ team }}/{{ player }}" data-second="{{ saving_second }}">
+        <div id="tracker-header-bar">
+            <input placeholder="Search" id="search" />
+            <div class="info">This tracker will automatically update itself periodically.</div>
+        </div>
+        <div id="tables-container">
             <div class="table-wrapper">
                 <table id="received-table" class="table non-unique-item-table">
                     <thead>
                         <tr>
                             <th>Item</th>
                             <th>Amount</th>
-                            <th>Order Received</th>
+                            <th>Last Order Received</th>
                         </tr>
                     </thead>
                     <tbody>
 
-                    {% for id, count in inventory.items() %}
-                    <tr>
-                        <td>{{ id | item_name }}</td>
-                        <td>{{ count }}</td>
-                        <td>{{received_items[id]}}</td>
-                    </tr>
+                    {% for id, count in inventory.items() if count > 0 %}
+                        <tr>
+                            <td>{{ item_id_to_name[game][id] }}</td>
+                            <td>{{ count }}</td>
+                            <td>{{ received_items[id] }}</td>
+                        </tr>
                     {%- endfor -%}
 
                     </tbody>
@@ -39,24 +60,62 @@
             <div class="table-wrapper">
                 <table id="locations-table" class="table non-unique-item-table">
                     <thead>
-                    <tr>
-                        <th>Location</th>
-                        <th>Checked</th>
-                    </tr>
+                        <tr>
+                            <th>Location</th>
+                            <th class="center-column">Checked</th>
+                        </tr>
                     </thead>
                     <tbody>
-                        {% for name in checked_locations %}
+
+                    {%- for location in locations -%}
                         <tr>
-                            <td>{{ name | location_name}}</td>
-                            <td>✔</td>
+                            <td>{{ location_id_to_name[game][location] }}</td>
+                            <td class="center-column">
+                                {% if location in checked_locations %}✔{% endif %}
+                            </td>
                         </tr>
-                        {%- endfor -%}
-                        {% for name in not_checked_locations %}
+                    {%- endfor -%}
+
+                    </tbody>
+                </table>
+            </div>
+            <div class="table-wrapper">
+                <table id="hints-table" class="table non-unique-item-table">
+                    <thead>
                         <tr>
-                            <td>{{ name | location_name}}</td>
-                            <td></td>
+                            <th>Finder</th>
+                            <th>Receiver</th>
+                            <th>Item</th>
+                            <th>Location</th>
+                            <th>Game</th>
+                            <th>Entrance</th>
+                            <th class="center-column">Found</th>
                         </tr>
-                        {%- endfor -%}
+                    </thead>
+                    <tbody>
+                    {%- for hint in hints -%}
+                        <tr>
+                            <td>
+                                {% if hint.finding_player == player %}
+                                    <b>{{ player_names_with_alias[(team, hint.finding_player)] }}</b>
+                                {% else %}
+                                    {{ player_names_with_alias[(team, hint.finding_player)] }}
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if hint.receiving_player == player %}
+                                    <b>{{ player_names_with_alias[(team, hint.receiving_player)] }}</b>
+                                {% else %}
+                                    {{ player_names_with_alias[(team, hint.receiving_player)] }}
+                                {% endif %}
+                            </td>
+                            <td>{{ item_id_to_name[games[(team, hint.receiving_player)]][hint.item] }}</td>
+                            <td>{{ location_id_to_name[games[(team, hint.finding_player)]][hint.location] }}</td>
+                            <td>{{ games[(team, hint.finding_player)] }}</td>
+                            <td>{% if hint.entrance %}{{ hint.entrance }}{% else %}Vanilla{% endif %}</td>
+                            <td class="center-column">{% if hint.found %}✔{% endif %}</td>
+                        </tr>
+                    {%- endfor -%}
                     </tbody>
                 </table>
             </div>
diff --git a/WebHostLib/templates/hintTable.html b/WebHostLib/templates/hintTable.html
deleted file mode 100644
index 00b74111ea..0000000000
--- a/WebHostLib/templates/hintTable.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% for team, hints in hints.items() %}
-    <div class="table-wrapper">
-        <table id="hints-table" class="table non-unique-item-table" data-order='[[5, "asc"], [0, "asc"]]'>
-            <thead>
-            <tr>
-                <th>Finder</th>
-                <th>Receiver</th>
-                <th>Item</th>
-                <th>Location</th>
-                <th>Entrance</th>
-                <th>Found</th>
-            </tr>
-            </thead>
-            <tbody>
-            {%- for hint in hints -%}
-                <tr>
-                    <td>{{ long_player_names[team, hint.finding_player] }}</td>
-                    <td>{{ long_player_names[team, hint.receiving_player] }}</td>
-                    <td>{{ hint.item|item_name }}</td>
-                    <td>{{ hint.location|location_name }}</td>
-                    <td>{% if hint.entrance %}{{ hint.entrance }}{% else %}Vanilla{% endif %}</td>
-                    <td>{% if hint.found %}✔{% endif %}</td>
-                </tr>
-            {%- endfor -%}
-            </tbody>
-        </table>
-    </div>
-{% endfor %}
\ No newline at end of file
diff --git a/WebHostLib/templates/hostRoom.html b/WebHostLib/templates/hostRoom.html
index ba15d64aca..2981c41452 100644
--- a/WebHostLib/templates/hostRoom.html
+++ b/WebHostLib/templates/hostRoom.html
@@ -3,6 +3,16 @@
 {% block head %}
     <title>Multiworld {{ room.id|suuid }}</title>
     {% if should_refresh %}<meta http-equiv="refresh" content="2">{% endif %}
+    <meta name="og:site_name" content="Archipelago">
+    <meta property="og:title" content="Multiworld {{ room.id|suuid }}">
+    <meta property="og:type" content="website" />
+    {% if room.seed.slots|length < 2 %}
+    <meta property="og:description" content="{{ room.seed.slots|length }} Player World
+    {% if room.last_port != -1 %}running on {{ config['HOST_ADDRESS'] }} with port {{ room.last_port }}{% endif %}">
+    {% else %}
+    <meta property="og:description" content="{{ room.seed.slots|length }} Players Multiworld
+    {% if room.last_port != -1 %}running on {{ config['HOST_ADDRESS'] }} with port {{ room.last_port }}{% endif %}">
+    {% endif %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/hostRoom.css") }}"/>
 {% endblock %}
 
diff --git a/WebHostLib/templates/landing.html b/WebHostLib/templates/landing.html
index fd45b78cfb..b489ef18ac 100644
--- a/WebHostLib/templates/landing.html
+++ b/WebHostLib/templates/landing.html
@@ -49,9 +49,9 @@
                     our crazy idea into a reality.
                 </p>
                 <p>
-                    <span class="variable">{{ seeds }}</span>
+                    <a href="{{ url_for("stats") }}">{{ seeds }}</a>
                     games were generated and
-                    <span class="variable">{{ rooms }}</span>
+                    <a href="{{ url_for("stats") }}">{{ rooms }}</a>
                     were hosted in the last 7 days.
                 </p>
             </div>
diff --git a/WebHostLib/templates/lttpMultiTracker.html b/WebHostLib/templates/lttpMultiTracker.html
deleted file mode 100644
index 2b943a22b0..0000000000
--- a/WebHostLib/templates/lttpMultiTracker.html
+++ /dev/null
@@ -1,171 +0,0 @@
-{% extends 'tablepage.html' %}
-{% block head %}
-    {{ super() }}
-    <title>ALttP Multiworld Tracker</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/tracker.css") }}"/>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/jquery.scrollsync.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/lttpMultiTracker.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/trackerCommon.js") }}"></script>
-{% endblock %}
-
-{% block body %}
-    {% include 'header/dirtHeader.html' %}
-    {% include 'multiTrackerNavigation.html' %}
-    <div id="tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
-        <div id="tracker-header-bar">
-            <input placeholder="Search" id="search"/>
-            <span{% if not video %} hidden{% endif %} id="multi-stream-link">
-                <a target="_blank" href="https://multistream.me/
-                    {%- for platform, link in video.values()|unique(False, 1)-%}
-                        {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
-                    {%- endfor -%}">
-                    Multistream
-                </a>
-            </span>
-            <span class="info">Clicking on a slot's number will bring up a slot-specific auto-tracker. This tracker will automatically update itself periodically.</span>
-        </div>
-        <div id="tables-container">
-            {% for team, players in inventory.items() %}
-                <div class="table-wrapper">
-                    <table id="inventory-table" class="table unique-item-table">
-                        <thead>
-                        <tr>
-                            <th>#</th>
-                            <th>Name</th>
-                            {%- for name in tracking_names -%}
-                                {%- if name in icons -%}
-                                    <th class="center-column">
-                                            <img class="alttp-sprite" src="{{ icons[name] }}" alt="{{ name|e }}">
-                                        </th>
-                                {%- else -%}
-                                    <th class="center-column">{{ name|e }}</th>
-                                {%- endif -%}
-                            {%- endfor -%}
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {%- for player, items in players.items() -%}
-                                <tr>
-                                    <td><a href="{{ url_for("get_player_tracker", tracker=room.tracker,
-                                    tracked_team=team, tracked_player=player)}}">{{ loop.index }}</a></td>
-                                    {%- if (team, loop.index) in video -%}
-                                        {%- if video[(team, loop.index)][0] == "Twitch" -%}
-                                        <td>
-                                            <a target="_blank" href="https://www.twitch.tv/{{ video[(team, loop.index)][1] }}">
-                                                {{ player_names[(team, loop.index)] }}
-                                                ▶️</a></td>
-                                        {%- elif video[(team, loop.index)][0] == "Youtube" -%}
-                                        <td>
-                                            <a target="_blank" href="youtube.com/c/{{ video[(team, loop.index)][1] }}/live">
-                                                {{ player_names[(team, loop.index)] }}
-                                                ▶️</a></td>
-                                        {%- endif -%}
-                                    {%- else -%}
-                                        <td>{{ player_names[(team, loop.index)] }}</td>
-                                    {%- endif -%}
-                                    {%- for id in tracking_ids -%}
-                                        {%- if items[id] -%}
-                                            <td class="center-column item-acquired">
-                                                {% if id in multi_items %}{{ items[id] }}{% else %}✔️{% endif %}</td>
-                                        {%- else -%}
-                                            <td></td>
-                                        {%- endif -%}
-                                    {% endfor %}
-                                </tr>
-                            {%- endfor -%}
-                        </tbody>
-                    </table>
-                </div>
-            {% endfor %}
-
-            {% for team, players in checks_done.items() %}
-                <div class="table-wrapper">
-                    <table id="checks-table" class="table non-unique-item-table">
-                        <thead>
-                            <tr>
-                                <th rowspan="2">#</th>
-                                <th rowspan="2">Name</th>
-                                {% for area in ordered_areas %}
-                                    {% set colspan = 1 %}
-                                    {% if area in key_locations %}
-                                    {% set colspan = colspan + 1 %}
-                                    {% endif %}
-                                    {% if area in big_key_locations %}
-                                    {% set colspan = colspan + 1 %}
-                                    {% endif %}
-                                    {% if area in icons %}
-                                        <th colspan="{{ colspan }}" class="center-column upper-row">
-                                            <img class="alttp-sprite" src="{{ icons[area] }}" alt="{{ area }}"></th>
-                                    {%- else -%}
-                                        <th colspan="{{ colspan }}" class="center-column">{{ area }}</th>
-                                    {%- endif -%}
-                                {%- endfor -%}
-                                <th rowspan="2" class="center-column">&percnt;</th>
-                                <th rowspan="2" class="center-column hours">Last<br>Activity</th>
-                            </tr>
-                            <tr>
-                                {% for area in ordered_areas %}
-                                    <th class="center-column lower-row fraction">
-                                        <img class="alttp-sprite" src="{{ icons["Chest"] }}" alt="Checks">
-                                    </th>
-                                    {% if area in key_locations %}
-                                        <th class="center-column lower-row number">
-                                            <img class="alttp-sprite" src="{{ icons["Small Key"] }}" alt="Small Key">
-                                        </th>
-                                    {% endif %}
-                                    {% if area in big_key_locations %}
-                                        <th class="center-column lower-row number">
-                                            <img class="alttp-sprite" src="{{ icons["Big Key"] }}" alt="Big Key">
-                                        </th>
-                                    {%- endif -%}
-                                {%- endfor -%}
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {%- for player, checks in players.items() -%}
-                                <tr>
-                                    <td><a href="{{ url_for("get_player_tracker", tracker=room.tracker,
-                                    tracked_team=team, tracked_player=player)}}">{{ loop.index }}</a></td>
-                                    <td>{{ player_names[(team, loop.index)]|e }}</td>
-                                    {%- for area in ordered_areas -%}
-                                        {% if player in checks_in_area and area in checks_in_area[player] %}
-                                            {%- set checks_done = checks[area] -%}
-                                            {%- set checks_total = checks_in_area[player][area] -%}
-                                            {%- if checks_done == checks_total -%}
-                                                <td class="item-acquired center-column">
-                                                    {{ checks_done }}/{{ checks_total }}</td>
-                                            {%- else -%}
-                                                <td class="center-column">{{ checks_done }}/{{ checks_total }}</td>
-                                            {%- endif -%}
-                                            {%- if area in key_locations -%}
-                                                <td class="center-column">{{ inventory[team][player][small_key_ids[area]] }}</td>
-                                            {%- endif -%}
-                                            {%- if area in big_key_locations -%}
-                                                <td class="center-column">{% if inventory[team][player][big_key_ids[area]] %}✔️{% endif %}</td>
-                                            {%- endif -%}
-                                        {% else %}
-                                            <td class="center-column"></td>
-                                            {%- if area in key_locations -%}
-                                                <td class="center-column"></td>
-                                            {%- endif -%}
-                                            {%- if area in big_key_locations -%}
-                                                <td class="center-column"></td>
-                                            {%- endif -%}
-                                        {% endif %}
-                                    {%- endfor -%}
-                                    <td class="center-column">{{ percent_total_checks_done[team][player] }}</td>
-                                    {%- if activity_timers[(team, player)] -%}
-                                        <td class="center-column">{{ activity_timers[(team, player)].total_seconds() }}</td>
-                                    {%- else -%}
-                                        <td class="center-column">None</td>
-                                    {%- endif -%}
-                                </tr>
-                            {%- endfor -%}
-                        </tbody>
-                    </table>
-                </div>
-            {% endfor %}
-            {% include "hintTable.html" with context %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/WebHostLib/templates/macros.html b/WebHostLib/templates/macros.html
index 746399da74..0722ee3174 100644
--- a/WebHostLib/templates/macros.html
+++ b/WebHostLib/templates/macros.html
@@ -50,6 +50,9 @@
                             {% elif patch.game == "Dark Souls III" %}
                             <a href="{{ url_for("download_slot_file", room_id=room.id, player_id=patch.player_id) }}" download>
                                 Download JSON File...</a>
+                            {% elif patch.game == "Final Fantasy Mystic Quest" %}
+                            <a href="{{ url_for("download_slot_file", room_id=room.id, player_id=patch.player_id) }}" download>
+                                Download APMQ File...</a>
                             {% else %}
                                 No file to download for this game.
                             {% endif %}
diff --git a/WebHostLib/templates/multiFactorioTracker.html b/WebHostLib/templates/multiFactorioTracker.html
deleted file mode 100644
index faca756ee9..0000000000
--- a/WebHostLib/templates/multiFactorioTracker.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "multiTracker.html" %}
-{% block custom_table_headers %}
-<th class="center-column">
-    <img src="https://wiki.factorio.com/images/thumb/Logistic_science_pack.png/32px-Logistic_science_pack.png"
-         alt="Logistic Science Pack">
-</th>
-<th class="center-column">
-    <img src="https://wiki.factorio.com/images/thumb/Military_science_pack.png/32px-Military_science_pack.png"
-         alt="Military Science Pack">
-</th>
-<th class="center-column">
-    <img src="https://wiki.factorio.com/images/thumb/Chemical_science_pack.png/32px-Chemical_science_pack.png"
-         alt="Chemical Science Pack">
-</th>
-<th class="center-column">
-    <img src="https://wiki.factorio.com/images/thumb/Production_science_pack.png/32px-Production_science_pack.png"
-         alt="Production Science Pack">
-</th>
-<th class="center-column">
-    <img src="https://wiki.factorio.com/images/thumb/Utility_science_pack.png/32px-Utility_science_pack.png"
-         alt="Utility Science Pack">
-</th>
-<th class="center-column">
-    <img src="https://wiki.factorio.com/images/thumb/Space_science_pack.png/32px-Space_science_pack.png"
-         alt="Space Science Pack">
-</th>
-{% endblock %}
-{% block custom_table_row scoped  %}
-{% if games[player] == "Factorio" %}
-{% set player_inventory = named_inventory[team][player] %}
-{% set prog_science = player_inventory["progressive-science-pack"] %}
-<td class="center-column">{% if player_inventory["logistic-science-pack"] or prog_science %}✔{% endif %}</td>
-<td class="center-column">{% if player_inventory["military-science-pack"] or prog_science > 1%}✔{% endif %}</td>
-<td class="center-column">{% if player_inventory["chemical-science-pack"] or prog_science > 2%}✔{% endif %}</td>
-<td class="center-column">{% if player_inventory["production-science-pack"] or prog_science > 3%}✔{% endif %}</td>
-<td class="center-column">{% if player_inventory["utility-science-pack"] or prog_science > 4%}✔{% endif %}</td>
-<td class="center-column">{% if player_inventory["space-science-pack"] or prog_science > 5%}✔{% endif %}</td>
-{% else %}
-<td class="center-column">❌</td>
-<td class="center-column">❌</td>
-<td class="center-column">❌</td>
-<td class="center-column">❌</td>
-<td class="center-column">❌</td>
-<td class="center-column">❌</td>
-{% endif %}
-{% endblock%}
diff --git a/WebHostLib/templates/multiTracker.html b/WebHostLib/templates/multiTracker.html
deleted file mode 100644
index 40d89eb4c6..0000000000
--- a/WebHostLib/templates/multiTracker.html
+++ /dev/null
@@ -1,86 +0,0 @@
-{% extends 'tablepage.html' %}
-{% block head %}
-    {{ super() }}
-    <title>Multiworld Tracker</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/tracker.css") }}"/>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/trackerCommon.js") }}"></script>
-{% endblock %}
-
-{% block body %}
-    {% include 'header/dirtHeader.html' %}
-    {% include 'multiTrackerNavigation.html' %}
-    <div id="tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
-        <div id="tracker-header-bar">
-            <input placeholder="Search" id="search"/>
-            <span{% if not video %} hidden{% endif %} id="multi-stream-link">
-                <a target="_blank" href="https://multistream.me/
-                    {%- for platform, link in video.values()|unique(False, 1)-%}
-                        {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
-                    {%- endfor -%}">
-                    Multistream
-                </a>
-            </span>
-            <span class="info">Clicking on a slot's number will bring up a slot-specific auto-tracker. This tracker will automatically update itself periodically.</span>
-        </div>
-        <div id="tables-container">
-            {% for team, players in checks_done.items() %}
-                <div class="table-wrapper">
-                    <table id="checks-table" class="table non-unique-item-table">
-                        <thead>
-                            <tr>
-                                <th>#</th>
-                                <th>Name</th>
-                                <th>Game</th>
-                                <th>Status</th>
-                                {% block custom_table_headers %}
-                                {# implement this block in game-specific multi trackers #}
-                                {% endblock %}
-                                <th class="center-column">Checks</th>
-                                <th class="center-column">&percnt;</th>
-                                <th class="center-column hours last-activity">Last<br>Activity</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {%- for player, checks in players.items() -%}
-                                <tr>
-                                    <td><a href="{{ url_for("get_player_tracker", tracker=room.tracker,
-                                    tracked_team=team, tracked_player=player)}}">{{ loop.index }}</a></td>
-                                    <td>{{ player_names[(team, loop.index)]|e }}</td>
-                                    <td>{{ games[player] }}</td>
-                                    <td>{{ {0: "Disconnected", 5: "Connected", 10: "Ready", 20: "Playing",
-                                            30: "Goal Completed"}.get(states[team, player], "Unknown State") }}</td>
-                                    {% block custom_table_row scoped %}
-                                    {# implement this block in game-specific multi trackers #}
-                                    {% endblock %}
-                                    <td class="center-column" data-sort="{{ checks["Total"] }}">
-                                      {{ checks["Total"] }}/{{ locations[player] | length }}
-                                    </td>
-                                    <td class="center-column">{{ percent_total_checks_done[team][player] }}</td>
-                                    {%- if activity_timers[team, player] -%}
-                                        <td class="center-column">{{ activity_timers[team, player].total_seconds() }}</td>
-                                    {%- else -%}
-                                        <td class="center-column">None</td>
-                                    {%- endif -%}
-                                </tr>
-                            {%- endfor -%}
-                        </tbody>
-                        {% if not self.custom_table_headers() | trim %}
-                            <tfoot>
-                                <tr>
-                                    <td></td>
-                                    <td>Total</td>
-                                    <td>All Games</td>
-                                    <td>{{ completed_worlds }}/{{ players|length }} Complete</td>
-                                    <td class="center-column">{{ players.values()|sum(attribute='Total') }}/{{ total_locations[team] }}</td>
-                                    <td class="center-column">{{ (players.values()|sum(attribute='Total') / total_locations[team] * 100) | int }}</td>
-                                    <td class="center-column last-activity"></td>
-                                </tr>
-                            </tfoot>
-                        {% endif %}
-                    </table>
-                </div>
-            {% endfor %}
-            {% include "hintTable.html" with context %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/WebHostLib/templates/multiTrackerNavigation.html b/WebHostLib/templates/multiTrackerNavigation.html
deleted file mode 100644
index 7fc405b6fb..0000000000
--- a/WebHostLib/templates/multiTrackerNavigation.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{%- if enabled_multiworld_trackers|length > 1 -%}
-    <div id="tracker-navigation">
-        {% for enabled_tracker in enabled_multiworld_trackers %}
-            {% set tracker_url = url_for(enabled_tracker.endpoint, tracker=room.tracker) %}
-            <a class="tracker-navigation-button{% if enabled_tracker.current %} selected{% endif %}"
-               href="{{ tracker_url }}">{{ enabled_tracker.name }}</a>
-        {% endfor %}
-    </div>
-{%- endif -%}
diff --git a/WebHostLib/templates/multitracker.html b/WebHostLib/templates/multitracker.html
new file mode 100644
index 0000000000..b16d4714ec
--- /dev/null
+++ b/WebHostLib/templates/multitracker.html
@@ -0,0 +1,144 @@
+{% extends "tablepage.html" %}
+{% block head %}
+    {{ super() }}
+    <title>Multiworld Tracker</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="styles/tracker.css") }}" />
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/trackerCommon.js") }}"></script>
+{% endblock %}
+
+{% block body %}
+    {% include "header/dirtHeader.html" %}
+    {% include "multitrackerNavigation.html" %}
+
+    <div id="tracker-wrapper" data-tracker="{{ room.tracker | suuid }}">
+        <div id="tracker-header-bar">
+            <input placeholder="Search" id="search" />
+
+            <div
+                id="multi-stream-link"
+                class="tracker-navigation-bar"
+                {% if not videos %}style="display: none"{% endif %}
+            >
+
+                <a
+                    class="tracker-navigation-button"
+                    href="https://multistream.me/
+                        {%- for platform, link in videos.values() | unique(False, 1) -%}
+                            {%- if platform == "Twitch" -%}t{%- else -%}yt{%- endif -%}:{{- link -}}/
+                        {%- endfor -%}"
+                    target="_blank"
+                >
+                    ► Multistream
+                </a>
+            </div>
+
+            <div class="info">
+                Clicking on a slot&apos;s number will bring up the slot-specific tracker.
+                This tracker will automatically update itself periodically.
+            </div>
+        </div>
+
+        <div id="tables-container">
+        {%- for team, players in room_players.items() -%}
+            <div class="table-wrapper">
+                <table id="checks-table" class="table non-unique-item-table">
+                    <thead>
+                        <tr>
+                            <th>#</th>
+                            <th>Name</th>
+                            {% if current_tracker == "Generic" %}<th>Game</th>{% endif %}
+                            <th>Status</th>
+                            {% block custom_table_headers %}
+                            {# Implement this block in game-specific multi-trackers. #}
+                            {% endblock %}
+                            <th class="center-column">Checks</th>
+                            <th class="center-column">&percnt;</th>
+                            <th class="center-column hours last-activity">Last<br>Activity</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    {%- for player in players -%}
+                        {%- if current_tracker == "Generic" or games[(team, player)] == current_tracker -%}
+                            <tr>
+                                <td>
+                                    <a href="{{ url_for("get_player_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">
+                                        {{ player }}
+                                    </a>
+                                </td>
+                                <td>{{ player_names_with_alias[(team, player)] | e }}</td>
+                                {%- if current_tracker == "Generic" -%}
+                                    <td>{{ games[(team, player)] }}</td>
+                                {%- endif -%}
+                                <td>
+                                    {{
+                                        {
+                                            0: "Disconnected",
+                                            5: "Connected",
+                                            10: "Ready",
+                                            20: "Playing",
+                                            30: "Goal Completed"
+                                        }.get(states[(team, player)], "Unknown State")
+                                    }}
+                                </td>
+
+                                {% block custom_table_row scoped %}
+                                {# Implement this block in game-specific multi-trackers. #}
+                                {% endblock %}
+
+                                {% set location_count = locations[(team, player)] | length %}
+                                <td class="center-column" data-sort="{{ locations_complete[(team, player)] }}">
+                                    {{ locations_complete[(team, player)] }}/{{ location_count }}
+                                </td>
+
+                                <td class="center-column">
+                                {%- if locations[(team, player)] | length > 0 -%}
+                                    {% set percentage_of_completion = locations_complete[(team, player)] / location_count * 100 %}
+                                    {{ "{0:.2f}".format(percentage_of_completion) }}
+                                {%- else -%}
+                                    100.00
+                                {%- endif -%}
+                                </td>
+
+                                {%- if activity_timers[(team, player)] -%}
+                                    <td class="center-column">{{ activity_timers[(team, player)].total_seconds() }}</td>
+                                {%- else -%}
+                                    <td class="center-column">None</td>
+                                {%- endif -%}
+                            </tr>
+                        {%- endif -%}
+                    {%- endfor -%}
+                    </tbody>
+
+                    {%- if not self.custom_table_headers() | trim -%}
+                        <tfoot>
+                            <tr>
+                                <td colspan="2" style="text-align: right">Total</td>
+                                <td>All Games</td>
+                                <td>{{ completed_worlds[team] }}/{{ players | length }} Complete</td>
+                                <td class="center-column">
+                                    {{ total_team_locations_complete[team] }}/{{ total_team_locations[team] }}
+                                </td>
+                                <td class="center-column">
+                                    {%- if total_team_locations[team] == 0 -%}
+                                        100
+                                    {%- else -%}
+                                        {{ "{0:.2f}".format(total_team_locations_complete[team] / total_team_locations[team] * 100) }}
+                                    {%- endif -%}
+                                </td>
+                                <td class="center-column last-activity"></td>
+                            </tr>
+                        </tfoot>
+                    {%- endif -%}
+                </table>
+            </div>
+
+        {%- endfor -%}
+
+        {% block custom_tables %}
+        {# Implement this block to create custom tables in game-specific multi-trackers. #}
+        {% endblock %}
+
+        {% include "multitrackerHintTable.html" with context %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/WebHostLib/templates/multitrackerHintTable.html b/WebHostLib/templates/multitrackerHintTable.html
new file mode 100644
index 0000000000..a931e9b048
--- /dev/null
+++ b/WebHostLib/templates/multitrackerHintTable.html
@@ -0,0 +1,37 @@
+{% for team, hints in hints.items() %}
+    <div class="table-wrapper">
+        <table id="hints-table" class="table non-unique-item-table" data-order='[[5, "asc"], [0, "asc"]]'>
+            <thead>
+            <tr>
+                <th>Finder</th>
+                <th>Receiver</th>
+                <th>Item</th>
+                <th>Location</th>
+                <th>Game</th>
+                <th>Entrance</th>
+                <th class="center-column">Found</th>
+            </tr>
+            </thead>
+            <tbody>
+            {%- for hint in hints -%}
+                {%-
+                    if current_tracker == "Generic" or (
+                        games[(team, hint.finding_player)] == current_tracker or
+                        games[(team, hint.receiving_player)] == current_tracker
+                    )
+                -%}
+                    <tr>
+                        <td>{{ player_names_with_alias[(team, hint.finding_player)] }}</td>
+                        <td>{{ player_names_with_alias[(team, hint.receiving_player)] }}</td>
+                        <td>{{ item_id_to_name[games[(team, hint.receiving_player)]][hint.item] }}</td>
+                        <td>{{ location_id_to_name[games[(team, hint.finding_player)]][hint.location] }}</td>
+                        <td>{{ games[(team, hint.finding_player)] }}</td>
+                        <td>{% if hint.entrance %}{{ hint.entrance }}{% else %}Vanilla{% endif %}</td>
+                        <td class="center-column">{% if hint.found %}✔{% endif %}</td>
+                    </tr>
+                {% endif %}
+            {%- endfor -%}
+            </tbody>
+        </table>
+    </div>
+{% endfor %}
diff --git a/WebHostLib/templates/multitrackerNavigation.html b/WebHostLib/templates/multitrackerNavigation.html
new file mode 100644
index 0000000000..1256181b27
--- /dev/null
+++ b/WebHostLib/templates/multitrackerNavigation.html
@@ -0,0 +1,16 @@
+{% if enabled_trackers | length > 1 %}
+<div id="tracker-navigation">
+    {# Multitracker game navigation. #}
+    <div class="tracker-navigation-bar">
+    {%- for game_tracker in enabled_trackers -%}
+        {%- set tracker_url = url_for("get_multiworld_tracker", tracker=room.tracker, game=game_tracker) -%}
+        <a
+            class="tracker-navigation-button{% if current_tracker == game_tracker %} selected{% endif %}"
+            href="{{ tracker_url }}"
+        >
+            {{ game_tracker }}
+        </a>
+    {%- endfor -%}
+    </div>
+</div>
+{% endif %}
diff --git a/WebHostLib/templates/multitracker__ALinkToThePast.html b/WebHostLib/templates/multitracker__ALinkToThePast.html
new file mode 100644
index 0000000000..8cea5ba057
--- /dev/null
+++ b/WebHostLib/templates/multitracker__ALinkToThePast.html
@@ -0,0 +1,205 @@
+{% extends "multitracker.html" %}
+{% block head %}
+    {{ super() }}
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/jquery.scrollsync.js") }}"></script>
+    <script type="application/ecmascript" src="{{ url_for("static", filename="assets/lttpMultiTracker.js") }}"></script>
+{% endblock %}
+
+{# List all tracker-relevant icons. Format: (Name, Image URL) #}
+{%- set icons = {
+    "Blue Shield": "https://www.zeldadungeon.net/wiki/images/8/85/Fighters-Shield.png",
+    "Red Shield": "https://www.zeldadungeon.net/wiki/images/5/55/Fire-Shield.png",
+    "Mirror Shield": "https://www.zeldadungeon.net/wiki/images/8/84/Mirror-Shield.png",
+    "Fighter Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/40/SFighterSword.png?width=1920",
+    "Master Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/SMasterSword.png?width=1920",
+    "Tempered Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/92/STemperedSword.png?width=1920",
+    "Golden Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/2/28/SGoldenSword.png?width=1920",
+    "Bow": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=5f85a70e6366bf473544ef93b274f74c",
+    "Silver Bow": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/Bow.png?width=1920",
+    "Green Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c9/SGreenTunic.png?width=1920",
+    "Blue Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/98/SBlueTunic.png?width=1920",
+    "Red Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/7/74/SRedTunic.png?width=1920",
+    "Power Glove": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/f/f5/SPowerGlove.png?width=1920",
+    "Titan Mitts": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
+    "Progressive Sword": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/cc/ALttP_Master_Sword_Sprite.png?version=55869db2a20e157cd3b5c8f556097725",
+    "Pegasus Boots": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Pegasus_Shoes_Sprite.png?version=405f42f97240c9dcd2b71ffc4bebc7f9",
+    "Progressive Glove": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
+    "Flippers": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/4c/ZoraFlippers.png?width=1920",
+    "Moon Pearl": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Moon_Pearl_Sprite.png?version=d601542d5abcc3e006ee163254bea77e",
+    "Progressive Bow": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=cfb7648b3714cccc80e2b17b2adf00ed",
+    "Blue Boomerang": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c3/ALttP_Boomerang_Sprite.png?version=96127d163759395eb510b81a556d500e",
+    "Red Boomerang": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Magical_Boomerang_Sprite.png?version=47cddce7a07bc3e4c2c10727b491f400",
+    "Hookshot": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/24/Hookshot.png?version=c90bc8e07a52e8090377bd6ef854c18b",
+    "Mushroom": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/35/ALttP_Mushroom_Sprite.png?version=1f1acb30d71bd96b60a3491e54bbfe59",
+    "Magic Powder": "https://www.zeldadungeon.net/wiki/images/thumb/6/62/MagicPowder-ALttP-Sprite.png/86px-MagicPowder-ALttP-Sprite.png",
+    "Fire Rod": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d6/FireRod.png?version=6eabc9f24d25697e2c4cd43ddc8207c0",
+    "Ice Rod": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d7/ALttP_Ice_Rod_Sprite.png?version=1f944148223d91cfc6a615c92286c3bc",
+    "Bombos": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/8c/ALttP_Bombos_Medallion_Sprite.png?version=f4d6aba47fb69375e090178f0fc33b26",
+    "Ether": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/Ether.png?version=34027651a5565fcc5a83189178ab17b5",
+    "Quake": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/56/ALttP_Quake_Medallion_Sprite.png?version=efd64d451b1831bd59f7b7d6b61b5879",
+    "Lamp": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Lantern_Sprite.png?version=e76eaa1ec509c9a5efb2916698d5a4ce",
+    "Hammer": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d1/ALttP_Hammer_Sprite.png?version=e0adec227193818dcaedf587eba34500",
+    "Shovel": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c4/ALttP_Shovel_Sprite.png?version=e73d1ce0115c2c70eaca15b014bd6f05",
+    "Flute": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/db/Flute.png?version=ec4982b31c56da2c0c010905c5c60390",
+    "Bug Catching Net": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/54/Bug-CatchingNet.png?version=4d40e0ee015b687ff75b333b968d8be6",
+    "Book of Mudora": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/22/ALttP_Book_of_Mudora_Sprite.png?version=11e4632bba54f6b9bf921df06ac93744",
+    "Bottle": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ef/ALttP_Magic_Bottle_Sprite.png?version=fd98ab04db775270cbe79fce0235777b",
+    "Cane of Somaria": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e1/ALttP_Cane_of_Somaria_Sprite.png?version=8cc1900dfd887890badffc903bb87943",
+    "Cane of Byrna": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Cane_of_Byrna_Sprite.png?version=758b607c8cbe2cf1900d42a0b3d0fb54",
+    "Cape": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1c/ALttP_Magic_Cape_Sprite.png?version=6b77f0d609aab0c751307fc124736832",
+    "Magic Mirror": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Mirror_Sprite.png?version=e035dbc9cbe2a3bd44aa6d047762b0cc",
+    "Triforce": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/4/4e/TriforceALttPTitle.png?version=dc398e1293177581c16303e4f9d12a48",
+    "Triforce Piece": "https://www.zeldadungeon.net/wiki/images/thumb/5/54/Triforce_Fragment_-_BS_Zelda.png/62px-Triforce_Fragment_-_BS_Zelda.png",
+    "Small Key": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/f/f1/ALttP_Small_Key_Sprite.png?version=4f35d92842f0de39d969181eea03774e",
+    "Big Key": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Big_Key_Sprite.png?version=136dfa418ba76c8b4e270f466fc12f4d",
+    "Chest": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Treasure_Chest_Sprite.png?version=5f530ecd98dcb22251e146e8049c0dda",
+    "Light World": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e7/ALttP_Soldier_Green_Sprite.png?version=d650d417934cd707a47e496489c268a6",
+    "Dark World": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/94/ALttP_Moblin_Sprite.png?version=ebf50e33f4657c377d1606bcc0886ddc",
+    "Hyrule Castle": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d3/ALttP_Ball_and_Chain_Trooper_Sprite.png?version=1768a87c06d29cc8e7ddd80b9fa516be",
+    "Agahnims Tower": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1e/ALttP_Agahnim_Sprite.png?version=365956e61b0c2191eae4eddbe591dab5",
+    "Desert Palace": "https://www.zeldadungeon.net/wiki/images/2/25/Lanmola-ALTTP-Sprite.png",
+    "Eastern Palace": "https://www.zeldadungeon.net/wiki/images/d/dc/RedArmosKnight.png",
+    "Tower of Hera": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/ALttP_Moldorm_Sprite.png?version=c588257bdc2543468e008a6b30f262a7",
+    "Palace of Darkness": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Helmasaur_King_Sprite.png?version=ab8a4a1cfd91d4fc43466c56cba30022",
+    "Swamp Palace": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Arrghus_Sprite.png?version=b098be3122e53f751b74f4a5ef9184b5",
+    "Skull Woods": "https://alttp-wiki.net/images/6/6a/Mothula.png",
+    "Thieves Town": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/86/ALttP_Blind_the_Thief_Sprite.png?version=3833021bfcd112be54e7390679047222",
+    "Ice Palace": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Kholdstare_Sprite.png?version=e5a1b0e8b2298e550d85f90bf97045c0",
+    "Misery Mire": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/85/ALttP_Vitreous_Sprite.png?version=92b2e9cb0aa63f831760f08041d8d8d8",
+    "Turtle Rock": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/91/ALttP_Trinexx_Sprite.png?version=0cc867d513952aa03edd155597a0c0be",
+    "Ganons Tower": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Ganon_Sprite.png?version=956f51f054954dfff53c1a9d4f929c74",
+} -%}
+
+{%- block custom_table_headers %}
+{#- macro that creates a table header with display name and image -#}
+{%- macro make_header(name, img_src) %}
+    <th class="center-column">
+        <img height="24" src="{{ img_src }}" title="{{ name }}" alt="{{ name }}" />
+    </th>
+{% endmacro -%}
+
+{#- call the macro to build the table header -#}
+{%- for name in tracking_names %}
+    {%- if name in icons -%}
+        <th class="center-column">
+            <img class="icon-sprite" src="{{ icons[name] }}" alt="{{ name | e }}" title="{{ name | e }}" />
+        </th>
+    {%- endif %}
+{% endfor -%}
+{% endblock %}
+
+{# build each row of custom entries #}
+{% block custom_table_row scoped %}
+    {%- for id in tracking_ids -%}
+{#        {{ checks }}#}
+        {%- if inventories[(team, player)][id] -%}
+            <td class="center-column item-acquired">
+                {% if id in multi_items %}{{ inventories[(team, player)][id] }}{% else %}✔️{% endif %}
+            </td>
+        {%- else -%}
+            <td></td>
+        {%- endif -%}
+    {% endfor %}
+{% endblock %}
+
+{% block custom_tables %}
+
+{% for team, _ in total_team_locations.items() %}
+<div class="table-wrapper">
+    <table id="area-table" class="table non-unique-item-table">
+        <thead>
+            <tr>
+                <th rowspan="2">#</th>
+                <th rowspan="2">Name</th>
+                {% for area in ordered_areas %}
+                    {% set colspan = 1 %}
+                    {% if area in key_locations %}
+                    {% set colspan = colspan + 1 %}
+                    {% endif %}
+                    {% if area in big_key_locations %}
+                    {% set colspan = colspan + 1 %}
+                    {% endif %}
+                    {% if area in icons %}
+                        <th colspan="{{ colspan }}" class="center-column upper-row">
+                            <img class="icon-sprite" src="{{ icons[area] }}" alt="{{ area }}" title="{{ area }}"></th>
+                    {%- else -%}
+                        <th colspan="{{ colspan }}" class="center-column">{{ area }}</th>
+                    {%- endif -%}
+                {%- endfor -%}
+                <th rowspan="2" class="center-column">&percnt;</th>
+                <th rowspan="2" class="center-column hours">Last<br>Activity</th>
+            </tr>
+            <tr>
+                {% for area in ordered_areas %}
+                    <th class="center-column lower-row fraction">
+                        <img class="icon-sprite" src="{{ icons["Chest"] }}" alt="Checks" title="Checks Complete">
+                    </th>
+                    {% if area in key_locations %}
+                        <th class="center-column lower-row number">
+                            <img class="icon-sprite" src="{{ icons["Small Key"] }}" alt="Small Key" title="Small Keys">
+                        </th>
+                    {% endif %}
+                    {% if area in big_key_locations %}
+                        <th class="center-column lower-row number">
+                            <img class="icon-sprite" src="{{ icons["Big Key"] }}" alt="Big Key" title="Big Keys">
+                        </th>
+                    {%- endif -%}
+                {%- endfor -%}
+            </tr>
+        </thead>
+        <tbody>
+        {%- for (checks_team, player), area_checks in checks_done.items() if games[(team, player)] == current_tracker and team == checks_team -%}
+            <tr>
+                <td><a href="{{ url_for("get_player_tracker", tracker=room.tracker,
+                tracked_team=team, tracked_player=player)}}">{{ player }}</a></td>
+                <td>{{ player_names_with_alias[(team, player)] | e }}</td>
+                {%- for area in ordered_areas -%}
+                    {% if (team, player) in checks_in_area and area in checks_in_area[(team, player)] %}
+                        {%- set checks_done = area_checks[area] -%}
+                        {%- set checks_total = checks_in_area[(team, player)][area] -%}
+                        {%- if checks_done == checks_total -%}
+                            <td class="item-acquired center-column">
+                                {{ checks_done }}/{{ checks_total }}</td>
+                        {%- else -%}
+                            <td class="center-column">{{ checks_done }}/{{ checks_total }}</td>
+                        {%- endif -%}
+                        {%- if area in key_locations -%}
+                            <td class="center-column">{{ inventories[(team, player)][small_key_ids[area]] }}</td>
+                        {%- endif -%}
+                        {%- if area in big_key_locations -%}
+                            <td class="center-column">{% if inventories[(team, player)][big_key_ids[area]] %}✔️{% endif %}</td>
+                        {%- endif -%}
+                    {% else %}
+                        <td class="center-column"></td>
+                        {%- if area in key_locations -%}
+                            <td class="center-column"></td>
+                        {%- endif -%}
+                        {%- if area in big_key_locations -%}
+                            <td class="center-column"></td>
+                        {%- endif -%}
+                    {% endif %}
+                {%- endfor -%}
+
+                <td class="center-column">
+                {% set location_count = locations[(team, player)] | length %}
+                {%- if locations[(team, player)] | length > 0 -%}
+                    {% set percentage_of_completion = locations_complete[(team, player)] / location_count * 100 %}
+                    {{ "{0:.2f}".format(percentage_of_completion) }}
+                {%- else -%}
+                    100.00
+                {%- endif -%}
+                </td>
+
+                {%- if activity_timers[(team, player)] -%}
+                    <td class="center-column">{{ activity_timers[(team, player)].total_seconds() }}</td>
+                {%- else -%}
+                    <td class="center-column">None</td>
+                {%- endif -%}
+            </tr>
+        {%- endfor -%}
+        </tbody>
+    </table>
+</div>
+{% endfor %}
+
+{% endblock %}
diff --git a/WebHostLib/templates/multitracker__Factorio.html b/WebHostLib/templates/multitracker__Factorio.html
new file mode 100644
index 0000000000..a7ad824db4
--- /dev/null
+++ b/WebHostLib/templates/multitracker__Factorio.html
@@ -0,0 +1,41 @@
+{% extends "multitracker.html" %}
+{# establish the to be tracked data. Display Name, factorio/AP internal name, display image #}
+{%- set science_packs = [
+    ("Logistic Science Pack", "logistic-science-pack",
+    "https://wiki.factorio.com/images/thumb/Logistic_science_pack.png/32px-Logistic_science_pack.png"),
+    ("Military Science Pack", "military-science-pack",
+    "https://wiki.factorio.com/images/thumb/Military_science_pack.png/32px-Military_science_pack.png"),
+    ("Chemical Science Pack", "chemical-science-pack",
+    "https://wiki.factorio.com/images/thumb/Chemical_science_pack.png/32px-Chemical_science_pack.png"),
+    ("Production Science Pack", "production-science-pack",
+    "https://wiki.factorio.com/images/thumb/Production_science_pack.png/32px-Production_science_pack.png"),
+    ("Utility Science Pack", "utility-science-pack",
+    "https://wiki.factorio.com/images/thumb/Utility_science_pack.png/32px-Utility_science_pack.png"),
+    ("Space Science Pack", "space-science-pack",
+    "https://wiki.factorio.com/images/thumb/Space_science_pack.png/32px-Space_science_pack.png"),
+] -%}
+
+{%- block custom_table_headers %}
+{#- macro that creates a table header with display name and image -#}
+{%- macro make_header(name, img_src) %}
+<th class="center-column">
+    <img class="icon-sprite" src="{{ img_src }}" alt="{{ name }}" title="{{ name }}" />
+</th>
+{% endmacro -%}
+{#- call the macro to build the table header -#}
+{%- for name, internal_name, img_src in science_packs %}
+    {{ make_header(name, img_src) }}
+{% endfor -%}
+{% endblock %}
+
+{% block custom_table_row scoped  %}
+    {%- set player_inventory = inventories[(team, player)] -%}
+    {%- set prog_science = player_inventory["progressive-science-pack"] -%}
+    {%- for name, internal_name, img_src in science_packs %}
+        {% if player_inventory[internal_name] or prog_science > loop.index0 %}
+            <td class="center-column item-acquired">✔️</td>
+        {% else %}
+            <td class="center-column"></td>
+        {% endif %}
+    {% endfor -%}
+{% endblock%}
diff --git a/WebHostLib/templates/pageWrapper.html b/WebHostLib/templates/pageWrapper.html
index ec7888ac73..c7dda523ef 100644
--- a/WebHostLib/templates/pageWrapper.html
+++ b/WebHostLib/templates/pageWrapper.html
@@ -16,7 +16,7 @@
 {% with messages = get_flashed_messages() %}
     {% if messages %}
         <div>
-            {% for message in messages %}
+            {% for message in messages | unique %}
                 <div class="user-message">{{ message }}</div>
             {% endfor %}
         </div>
diff --git a/WebHostLib/templates/player-settings.html b/WebHostLib/templates/player-options.html
similarity index 50%
rename from WebHostLib/templates/player-settings.html
rename to WebHostLib/templates/player-options.html
index 50b9e3cbb1..4c74975288 100644
--- a/WebHostLib/templates/player-settings.html
+++ b/WebHostLib/templates/player-options.html
@@ -1,26 +1,26 @@
 {% extends 'pageWrapper.html' %}
 
 {% block head %}
-    <title>{{ game }} Settings</title>
+    <title>{{ game }} Options</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/markdown.css") }}" />
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/player-settings.css") }}" />
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/player-options.css") }}" />
     <script type="application/ecmascript" src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
     <script type="application/ecmascript" src="{{ url_for('static', filename="assets/md5.min.js") }}"></script>
     <script type="application/ecmascript" src="{{ url_for('static', filename="assets/js-yaml.min.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/player-settings.js") }}"></script>
+    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/player-options.js") }}"></script>
 {% endblock %}
 
 {% block body %}
     {% include 'header/'+theme+'Header.html' %}
-    <div id="player-settings" class="markdown" data-game="{{ game }}">
+    <div id="player-options" class="markdown" data-game="{{ game }}">
         <div id="user-message"></div>
-        <h1><span id="game-name">Player</span> Settings</h1>
+        <h1><span id="game-name">Player</span> Options</h1>
         <p>Choose the options you would like to play with! You may generate a single-player game from this page,
-            or download a settings file you can use to participate in a MultiWorld.</p>
+            or download an options file you can use to participate in a MultiWorld.</p>
 
         <p>
-            A more advanced settings configuration for all games can be found on the
-            <a href="/weighted-settings">Weighted Settings</a> page.
+            A more advanced options configuration for all games can be found on the
+            <a href="/weighted-options">Weighted options</a> page.
             <br />
             A list of all games you have generated can be found on the <a href="/user-content">User Content Page</a>.
             <br />
@@ -28,10 +28,24 @@
             <a href="/static/generated/configs/{{ game }}.yaml">template file for this game</a>.
         </p>
 
-        <p><label for="player-name">Please enter your player name. This will appear in-game as you send and receive
-            items if you are playing in a MultiWorld.</label><br />
-            <input id="player-name" placeholder="Player Name" data-key="name" maxlength="16" />
-        </p>
+        <div id="meta-options">
+            <div>
+                <label for="player-name">
+                    Player Name: <span class="interactive" data-tooltip="This is the name you use to connect with your game. This is also known as your 'slot name'.">(?)</span>
+                </label>
+                <input id="player-name" placeholder="Player" data-key="name" maxlength="16" />
+            </div>
+            <div>
+                <label for="game-options-preset">
+                    Options Preset: <span class="interactive" data-tooltip="Select from a list of developer-curated presets (if any) or reset all options to their defaults.">(?)</span>
+                </label>
+                <select id="game-options-preset">
+                    <option value="__default">Defaults</option>
+                    <option value="__custom" hidden>Custom</option>
+                </select>
+            </div>
+
+        </div>
 
         <h2>Game Options</h2>
         <div id="game-options">
@@ -39,8 +53,8 @@
             <div id="game-options-right" class="right"></div>
         </div>
 
-        <div id="player-settings-button-row">
-            <button id="export-settings">Export Settings</button>
+        <div id="player-options-button-row">
+            <button id="export-options">Export Options</button>
             <button id="generate-game">Generate Game</button>
             <button id="generate-race">Generate Race</button>
         </div>
diff --git a/WebHostLib/templates/siteMap.html b/WebHostLib/templates/siteMap.html
index 562dd3b71b..231ec83e24 100644
--- a/WebHostLib/templates/siteMap.html
+++ b/WebHostLib/templates/siteMap.html
@@ -24,7 +24,7 @@
             <li><a href="/games">Supported Games Page</a></li>
             <li><a href="/tutorial">Tutorials Page</a></li>
             <li><a href="/user-content">User Content</a></li>
-            <li><a href="/weighted-settings">Weighted Settings Page</a></li>
+            <li><a href="/weighted-options">Weighted Options Page</a></li>
             <li><a href="{{url_for('stats')}}">Game Statistics</a></li>
             <li><a href="/glossary/en">Glossary</a></li>
         </ul>
@@ -46,11 +46,11 @@
             {% endfor %}
         </ul>
 
-        <h2>Game Settings Pages</h2>
+        <h2>Game Options Pages</h2>
         <ul>
             {% for game in games | title_sorted %}
                 {% if game['has_settings'] %}
-                    <li><a href="{{ url_for('player_settings', game=game['title']) }}">{{ game['title'] }}</a></li>
+                    <li><a href="{{ url_for('player_options', game=game['title']) }}">{{ game['title'] }}</a></li>
                 {% endif %} 
             {% endfor %}
         </ul>
diff --git a/WebHostLib/templates/supportedGames.html b/WebHostLib/templates/supportedGames.html
index 63b70216d7..6666323c93 100644
--- a/WebHostLib/templates/supportedGames.html
+++ b/WebHostLib/templates/supportedGames.html
@@ -5,15 +5,35 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/markdown.css") }}" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/supportedGames.css") }}" />
     <script type="application/ecmascript" src="{{ url_for('static', filename="assets/supportedGames.js") }}"></script>
+    <noscript>
+    <style>
+        /* always un-collapse all and hide arrow and search bar */
+        .js-only{
+          display: none;
+        }
+
+        #games p.collapsed{
+          display: block;
+        }
+
+        #games h2 .collapse-arrow{
+          display: none;
+        }
+
+        #games .collapse-toggle{
+          cursor: unset;
+        }
+    </style>
+    </noscript>
 {% endblock %}
 
 {% block body %}
     {% include 'header/oceanHeader.html' %}
     <div id="games" class="markdown">
         <h1>Currently Supported Games</h1>
-        <div>
+        <div class="js-only">
             <label for="game-search">Search for your game below!</label><br />
-            <div id="page-controls">
+            <div class="page-controls">
                 <input id="game-search" placeholder="Search by title..." autofocus />
                 <button id="expand-all">Expand All</button>
                 <button id="collapse-all">Collapse All</button>
@@ -22,21 +42,21 @@
         {% for game_name in worlds | title_sorted %}
         {% set world = worlds[game_name] %}
         <h2 class="collapse-toggle" data-game="{{ game_name }}">
-            <span id="{{ game_name }}-arrow" class="collapse-arrow">▶</span>&nbsp;{{ game_name }}
+            <span class="collapse-arrow">▶</span>{{ game_name }}
         </h2>
-        <p id="{{ game_name }}" class="collapsed">
+        <p class="collapsed">
             {{ world.__doc__ | default("No description provided.", true) }}<br />
             <a href="{{ url_for("game_info", game=game_name, lang="en") }}">Game Page</a>
             {% if world.web.tutorials %}
             <span class="link-spacer">|</span>
             <a href="{{ url_for("tutorial_landing") }}#{{ game_name }}">Setup Guides</a>
             {% endif %}
-            {% if world.web.settings_page is string %}
+            {% if world.web.options_page is string %}
             <span class="link-spacer">|</span>
-            <a href="{{ world.web.settings_page }}">Settings Page</a>
-            {% elif world.web.settings_page %}
+            <a href="{{ world.web.options_page }}">Options Page</a>
+            {% elif world.web.options_page %}
             <span class="link-spacer">|</span>
-            <a href="{{ url_for("player_settings", game=game_name) }}">Settings Page</a>
+            <a href="{{ url_for("player_options", game=game_name) }}">Options Page</a>
             {% endif %}
             {% if world.web.bug_report_page %}
             <span class="link-spacer">|</span>
diff --git a/WebHostLib/templates/tracker__ALinkToThePast.html b/WebHostLib/templates/tracker__ALinkToThePast.html
new file mode 100644
index 0000000000..b7bae26fd3
--- /dev/null
+++ b/WebHostLib/templates/tracker__ALinkToThePast.html
@@ -0,0 +1,154 @@
+{%- set icons = {
+    "Blue Shield": "https://www.zeldadungeon.net/wiki/images/8/85/Fighters-Shield.png",
+    "Red Shield": "https://www.zeldadungeon.net/wiki/images/5/55/Fire-Shield.png",
+    "Mirror Shield": "https://www.zeldadungeon.net/wiki/images/8/84/Mirror-Shield.png",
+    "Fighter Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/40/SFighterSword.png?width=1920",
+    "Master Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/SMasterSword.png?width=1920",
+    "Tempered Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/92/STemperedSword.png?width=1920",
+    "Golden Sword": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/2/28/SGoldenSword.png?width=1920",
+    "Bow": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=5f85a70e6366bf473544ef93b274f74c",
+    "Silver Bow": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/Bow.png?width=1920",
+    "Green Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c9/SGreenTunic.png?width=1920",
+    "Blue Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/98/SBlueTunic.png?width=1920",
+    "Red Mail": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/7/74/SRedTunic.png?width=1920",
+    "Power Glove": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/f/f5/SPowerGlove.png?width=1920",
+    "Titan Mitts": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
+    "Progressive Sword": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/cc/ALttP_Master_Sword_Sprite.png?version=55869db2a20e157cd3b5c8f556097725",
+    "Pegasus Boots": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Pegasus_Shoes_Sprite.png?version=405f42f97240c9dcd2b71ffc4bebc7f9",
+    "Progressive Glove": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
+    "Flippers": "https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/4c/ZoraFlippers.png?width=1920",
+    "Moon Pearl": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Moon_Pearl_Sprite.png?version=d601542d5abcc3e006ee163254bea77e",
+    "Progressive Bow": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=cfb7648b3714cccc80e2b17b2adf00ed",
+    "Blue Boomerang": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c3/ALttP_Boomerang_Sprite.png?version=96127d163759395eb510b81a556d500e",
+    "Red Boomerang": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Magical_Boomerang_Sprite.png?version=47cddce7a07bc3e4c2c10727b491f400",
+    "Hookshot": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/24/Hookshot.png?version=c90bc8e07a52e8090377bd6ef854c18b",
+    "Mushroom": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/35/ALttP_Mushroom_Sprite.png?version=1f1acb30d71bd96b60a3491e54bbfe59",
+    "Magic Powder": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Powder_Sprite.png?version=c24e38effbd4f80496d35830ce8ff4ec",
+    "Fire Rod": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d6/FireRod.png?version=6eabc9f24d25697e2c4cd43ddc8207c0",
+    "Ice Rod": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d7/ALttP_Ice_Rod_Sprite.png?version=1f944148223d91cfc6a615c92286c3bc",
+    "Bombos": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/8c/ALttP_Bombos_Medallion_Sprite.png?version=f4d6aba47fb69375e090178f0fc33b26",
+    "Ether": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/Ether.png?version=34027651a5565fcc5a83189178ab17b5",
+    "Quake": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/56/ALttP_Quake_Medallion_Sprite.png?version=efd64d451b1831bd59f7b7d6b61b5879",
+    "Lamp": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Lantern_Sprite.png?version=e76eaa1ec509c9a5efb2916698d5a4ce",
+    "Hammer": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d1/ALttP_Hammer_Sprite.png?version=e0adec227193818dcaedf587eba34500",
+    "Shovel": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c4/ALttP_Shovel_Sprite.png?version=e73d1ce0115c2c70eaca15b014bd6f05",
+    "Flute": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/db/Flute.png?version=ec4982b31c56da2c0c010905c5c60390",
+    "Bug Catching Net": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/54/Bug-CatchingNet.png?version=4d40e0ee015b687ff75b333b968d8be6",
+    "Book of Mudora": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/22/ALttP_Book_of_Mudora_Sprite.png?version=11e4632bba54f6b9bf921df06ac93744",
+    "Bottle": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ef/ALttP_Magic_Bottle_Sprite.png?version=fd98ab04db775270cbe79fce0235777b",
+    "Cane of Somaria": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e1/ALttP_Cane_of_Somaria_Sprite.png?version=8cc1900dfd887890badffc903bb87943",
+    "Cane of Byrna": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Cane_of_Byrna_Sprite.png?version=758b607c8cbe2cf1900d42a0b3d0fb54",
+    "Cape": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1c/ALttP_Magic_Cape_Sprite.png?version=6b77f0d609aab0c751307fc124736832",
+    "Magic Mirror": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Mirror_Sprite.png?version=e035dbc9cbe2a3bd44aa6d047762b0cc",
+    "Triforce": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/4/4e/TriforceALttPTitle.png?version=dc398e1293177581c16303e4f9d12a48",
+    "Triforce Piece": "https://www.zeldadungeon.net/wiki/images/thumb/5/54/Triforce_Fragment_-_BS_Zelda.png/62px-Triforce_Fragment_-_BS_Zelda.png",
+    "Small Key": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/f/f1/ALttP_Small_Key_Sprite.png?version=4f35d92842f0de39d969181eea03774e",
+    "Big Key": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Big_Key_Sprite.png?version=136dfa418ba76c8b4e270f466fc12f4d",
+    "Chest": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Treasure_Chest_Sprite.png?version=5f530ecd98dcb22251e146e8049c0dda",
+    "Light World": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e7/ALttP_Soldier_Green_Sprite.png?version=d650d417934cd707a47e496489c268a6",
+    "Dark World": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/94/ALttP_Moblin_Sprite.png?version=ebf50e33f4657c377d1606bcc0886ddc",
+    "Hyrule Castle": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d3/ALttP_Ball_and_Chain_Trooper_Sprite.png?version=1768a87c06d29cc8e7ddd80b9fa516be",
+    "Agahnims Tower": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1e/ALttP_Agahnim_Sprite.png?version=365956e61b0c2191eae4eddbe591dab5",
+    "Desert Palace": "https://www.zeldadungeon.net/wiki/images/2/25/Lanmola-ALTTP-Sprite.png",
+    "Eastern Palace": "https://www.zeldadungeon.net/wiki/images/d/dc/RedArmosKnight.png",
+    "Tower of Hera": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/ALttP_Moldorm_Sprite.png?version=c588257bdc2543468e008a6b30f262a7",
+    "Palace of Darkness": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Helmasaur_King_Sprite.png?version=ab8a4a1cfd91d4fc43466c56cba30022",
+    "Swamp Palace": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Arrghus_Sprite.png?version=b098be3122e53f751b74f4a5ef9184b5",
+    "Skull Woods": "https://alttp-wiki.net/images/6/6a/Mothula.png",
+    "Thieves Town": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/86/ALttP_Blind_the_Thief_Sprite.png?version=3833021bfcd112be54e7390679047222",
+    "Ice Palace": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Kholdstare_Sprite.png?version=e5a1b0e8b2298e550d85f90bf97045c0",
+    "Misery Mire": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/85/ALttP_Vitreous_Sprite.png?version=92b2e9cb0aa63f831760f08041d8d8d8",
+    "Turtle Rock": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/91/ALttP_Trinexx_Sprite.png?version=0cc867d513952aa03edd155597a0c0be",
+    "Ganons Tower": "https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Ganon_Sprite.png?version=956f51f054954dfff53c1a9d4f929c74",
+} -%}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>{{ player_name }}&apos;s Tracker</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/lttp-tracker.css") }}"/>
+    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/lttp-tracker.js") }}"></script>
+</head>
+
+<body>
+    {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #}
+    <div style="margin-bottom: 0.5rem">
+        <a href="{{ url_for("get_generic_game_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">Switch To Generic Tracker</a>
+    </div>
+
+    <div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
+        <table id="inventory-table">
+            <tr>
+                <td><img src="{{ icons[bow_icon] }}" class="{{ 'acquired' if bow_acquired }}" /></td>
+                <td><img src="{{ icons["Blue Boomerang"] }}" class="{{ 'acquired' if 'Blue Boomerang' in acquired_items }}" /></td>
+                <td><img src="{{ icons["Red Boomerang"] }}" class="{{ 'acquired' if 'Red Boomerang' in acquired_items }}" /></td>
+                <td><img src="{{ icons["Hookshot"] }}" class="{{ 'acquired' if 'Hookshot' in acquired_items }}" /></td>
+                <td><img src="{{ icons["Magic Powder"] }}" class="powder-fix {{ 'acquired' if 'Magic Powder' in acquired_items }}" /></td>
+            </tr>
+            <tr>
+                <td><img src="{{ icons["Fire Rod"] }}" class="{{ 'acquired' if "Fire Rod" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Ice Rod"] }}" class="{{ 'acquired' if "Ice Rod" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Bombos"] }}" class="{{ 'acquired' if "Bombos" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Ether"] }}" class="{{ 'acquired' if "Ether" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Quake"] }}" class="{{ 'acquired' if "Quake" in acquired_items }}" /></td>
+            </tr>
+            <tr>
+                <td><img src="{{ icons["Lamp"] }}" class="{{ 'acquired' if "Lamp" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Hammer"] }}" class="{{ 'acquired' if "Hammer" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Flute"] }}" class="{{ 'acquired' if "Flute" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Bug Catching Net"] }}" class="{{ 'acquired' if "Bug Catching Net" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Book of Mudora"] }}" class="{{ 'acquired' if "Book of Mudora" in acquired_items }}" /></td>
+            </tr>
+            <tr>
+                <td><img src="{{ icons["Bottle"] }}" class="{{ 'acquired' if "Bottle" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Cane of Somaria"] }}" class="{{ 'acquired' if "Cane of Somaria" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Cane of Byrna"] }}" class="{{ 'acquired' if "Cane of Byrna" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Cape"] }}" class="{{ 'acquired' if "Cape" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Magic Mirror"] }}" class="{{ 'acquired' if "Magic Mirror" in acquired_items }}" /></td>
+            </tr>
+            <tr>
+                <td><img src="{{ icons["Pegasus Boots"] }}" class="{{ 'acquired' if "Pegasus Boots" in acquired_items }}" /></td>
+                <td><img src="{{ icons[glove_icon] }}" class="{{ 'acquired' if glove_acquired }}" /></td>
+                <td><img src="{{ icons["Flippers"] }}" class="{{ 'acquired' if "Flippers" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Moon Pearl"] }}" class="{{ 'acquired' if "Moon Pearl" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Mushroom"] }}" class="{{ 'acquired' if "Mushroom" in acquired_items }}" /></td>
+            </tr>
+            <tr>
+                <td><img src="{{ icons[sword_icon] }}" class="{{ 'acquired' if sword_acquired }}" /></td>
+                <td><img src="{{ icons[shield_icon] }}" class="{{ 'acquired' if shield_acquired }}" /></td>
+                <td><img src="{{ icons[mail_icon] }}" class="acquired" /></td>
+                <td><img src="{{ icons["Shovel"] }}" class="{{ 'acquired' if "Shovel" in acquired_items }}" /></td>
+                <td><img src="{{ icons["Triforce"] }}" class="{{ 'acquired' if "Triforce" in acquired_items }}" /></td>
+            </tr>
+        </table>
+        <table id="location-table">
+            <tr>
+                <th></th>
+                <th class="counter"><img src="{{ icons["Chest"] }}" /></th>
+                {% if key_locations and "Universal" not in key_locations %}
+                    <th class="counter"><img src="{{ icons["Small Key"] }}" /></th>
+                {% endif %}
+                {% if big_key_locations %}
+                    <th><img src="{{ icons["Big Key"] }}" /></th>
+                {% endif %}
+            </tr>
+            {% for area in sp_areas %}
+                <tr>
+                    <td>{{ area }}</td>
+                    <td class="counter">{{ checks_done[area] }} / {{ checks_in_area[area] }}</td>
+                    {% if key_locations and "Universal" not in key_locations %}
+                        <td class="counter">
+                            {{ inventory[small_key_ids[area]] if area in key_locations else '—' }}
+                        </td>
+                    {% endif %}
+                    {% if big_key_locations %}
+                        <td>
+                            {{ '✔' if area in big_key_locations and inventory[big_key_ids[area]] else ('—' if area not in big_key_locations else '') }}
+                        </td>
+                    {% endif %}
+                </tr>
+            {% endfor %}
+        </table>
+    </div>
+</body>
+</html>
diff --git a/WebHostLib/templates/checksfinderTracker.html b/WebHostLib/templates/tracker__ChecksFinder.html
similarity index 82%
rename from WebHostLib/templates/checksfinderTracker.html
rename to WebHostLib/templates/tracker__ChecksFinder.html
index 5df77f5e74..f0995c8548 100644
--- a/WebHostLib/templates/checksfinderTracker.html
+++ b/WebHostLib/templates/tracker__ChecksFinder.html
@@ -7,6 +7,11 @@
 </head>
 
 <body>
+    {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #}
+    <div style="margin-bottom: 0.5rem">
+        <a href="{{ url_for("get_generic_game_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">Switch To Generic Tracker</a>
+    </div>
+
     <div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
         <table id="inventory-table">
             <tr class="column-headers">
diff --git a/WebHostLib/templates/minecraftTracker.html b/WebHostLib/templates/tracker__Minecraft.html
similarity index 94%
rename from WebHostLib/templates/minecraftTracker.html
rename to WebHostLib/templates/tracker__Minecraft.html
index 9f5022b4cc..248f2778bd 100644
--- a/WebHostLib/templates/minecraftTracker.html
+++ b/WebHostLib/templates/tracker__Minecraft.html
@@ -8,13 +8,18 @@
 </head>
 
 <body>
+    {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #}
+    <div style="margin-bottom: 0.5rem">
+        <a href="{{ url_for("get_generic_game_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">Switch To Generic Tracker</a>
+    </div>
+
     <div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
         <table id="inventory-table">
             <tr>
                 <td><img src="{{ tools_url }}" class="{{ 'acquired' }}" title="Progressive Tools" /></td>
                 <td><img src="{{ weapons_url }}" class="{{ 'acquired' }}" title="Progressive Weapons" /></td>
                 <td><img src="{{ armor_url }}" class="{{ 'acquired' }}" title="Progressive Armor" /></td>
-                <td><img src="{{ resource_crafting_url }}" class="{{ 'acquired' if 'Progressive Resource Crafting' in acquired_items }}" 
+                <td><img src="{{ resource_crafting_url }}" class="{{ 'acquired' if 'Progressive Resource Crafting' in acquired_items }}"
                     title="Progressive Resource Crafting" /></td>
                 <td><img src="{{ icons['Brewing Stand'] }}" class="{{ 'acquired' if 'Brewing' in acquired_items }}" title="Brewing" /></td>
                 <td>
diff --git a/WebHostLib/templates/tracker__OcarinaOfTime.html b/WebHostLib/templates/tracker__OcarinaOfTime.html
new file mode 100644
index 0000000000..41b76816cf
--- /dev/null
+++ b/WebHostLib/templates/tracker__OcarinaOfTime.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>{{ player_name }}&apos;s Tracker</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/ootTracker.css') }}"/>
+    <script type="application/ecmascript" src="{{ url_for('static', filename='assets/ootTracker.js') }}"></script>
+</head>
+
+<body>
+    {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #}
+    <div style="margin-bottom: 0.5rem">
+        <a href="{{ url_for("get_generic_game_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">Switch To Generic Tracker</a>
+    </div>
+
+    <div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
+        <table id="inventory-table">
+            <tr>
+                <td><img src="{{ ocarina_url }}" class="{{ 'acquired' if 'Ocarina' in acquired_items }}" title="Ocarina" /></td>
+                <td><img src="{{ icons['Bombs'] }}" class="{{ 'acquired' if 'Bomb Bag' in acquired_items }}" title="Bombs" /></td>
+                <td><img src="{{ icons['Bow'] }}" class="{{ 'acquired' if 'Bow' in acquired_items }}" title="Fairy Bow" /></td>
+                <td><img src="{{ icons['Fire Arrows'] }}" class="{{ 'acquired' if 'Fire Arrows' in acquired_items }}" title="Fire Arrows" /></td>
+                <td><img src="{{ icons['Kokiri Sword'] }}" class="{{ 'acquired' if 'Kokiri Sword' in acquired_items }}" title="Kokiri Sword" /></td>
+                <td><img src="{{ icons['Biggoron Sword'] }}" class="{{ 'acquired' if 'Biggoron Sword' in acquired_items }}" title="Biggoron's Sword" /></td>
+                <td><img src="{{ icons['Mirror Shield'] }}" class="{{ 'acquired' if 'Mirror Shield' in acquired_items }}" title="Mirror Shield" /></td>
+            </tr>
+            <tr>
+                <td><img src="{{ icons['Slingshot'] }}" class="{{ 'acquired' if 'Slingshot' in acquired_items }}" title="Slingshot" /></td>
+                <td><img src="{{ icons['Bombchus'] }}" class="{{ 'acquired' if has_bombchus }}" title="Bombchus" /></td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ hookshot_url }}" class="{{ 'acquired' if 'Progressive Hookshot' in acquired_items }}" title="Progressive Hookshot" />
+                        <div class="item-count">{{ hookshot_length }}</div>
+                    </div>
+                </td>
+                <td><img src="{{ icons['Ice Arrows'] }}" class="{{ 'acquired' if 'Ice Arrows' in acquired_items }}" title="Ice Arrows" /></td>
+                <td><img src="{{ strength_upgrade_url }}" class="{{ 'acquired' if 'Progressive Strength Upgrade' in acquired_items }}" title="Progressive Strength Upgrade" /></td>
+                <td><img src="{{ icons['Goron Tunic'] }}" class="{{ 'acquired' if 'Goron Tunic' in acquired_items }}" title="Goron Tunic" /></td>
+                <td><img src="{{ icons['Zora Tunic'] }}" class="{{ 'acquired' if 'Zora Tunic' in acquired_items }}" title="Zora Tunic" /></td>
+            </tr>
+            <tr>
+                <td><img src="{{ icons['Boomerang'] }}" class="{{ 'acquired' if 'Boomerang' in acquired_items }}" title="Boomerang" /></td>
+                <td><img src="{{ icons['Lens of Truth'] }}" class="{{ 'acquired' if 'Lens of Truth' in acquired_items }}" title="Lens of Truth" /></td>
+                <td><img src="{{ icons['Megaton Hammer'] }}" class="{{ 'acquired' if 'Megaton Hammer' in acquired_items }}" title="Megaton Hammer" /></td>
+                <td><img src="{{ icons['Light Arrows'] }}" class="{{ 'acquired' if 'Light Arrows' in acquired_items }}" title="Light Arrows" /></td>
+                <td><img src="{{ scale_url }}" class="{{ 'acquired' if 'Progressive Scale' in acquired_items }}" title="Progressive Scale" /></td>
+                <td><img src="{{ icons['Iron Boots'] }}" class="{{ 'acquired' if 'Iron Boots' in acquired_items }}" title="Iron Boots" /></td>
+                <td><img src="{{ icons['Hover Boots'] }}" class="{{ 'acquired' if 'Hover Boots' in acquired_items }}" title="Hover Boots" /></td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ bottle_url }}" class="{{ 'acquired' if bottle_count > 0 }}" title="Bottles" />
+                        <div class="item-count">{{ bottle_count if bottle_count > 0 else '' }}</div>
+                    </div>
+                </td>
+                <td><img src="{{ icons['Dins Fire'] }}" class="{{ 'acquired' if 'Dins Fire' in acquired_items }}" title="Din's Fire" /></td>
+                <td><img src="{{ icons['Farores Wind'] }}" class="{{ 'acquired' if 'Farores Wind' in acquired_items }}" title="Farore's Wind" /></td>
+                <td><img src="{{ icons['Nayrus Love'] }}" class="{{ 'acquired' if 'Nayrus Love' in acquired_items }}" title="Nayru's Love" /></td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ wallet_url }}" class="{{ 'acquired' if 'Progressive Wallet' in acquired_items }}" title="Progressive Wallet" />
+                        <div class="item-count">{{ wallet_size }}</div>
+                    </div>
+                </td>
+                <td><img src="{{ magic_meter_url }}" class="{{ 'acquired' if 'Magic Meter' in acquired_items }}" title="Magic Meter" /></td>
+                <td><img src="{{ icons['Gerudo Membership Card'] }}" class="{{ 'acquired' if 'Gerudo Membership Card' in acquired_items }}" title="Gerudo Membership Card" /></td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Zeldas Lullaby'] }}" class="{{ 'acquired' if 'Zeldas Lullaby' in acquired_items }}" title="Zelda's Lullaby" id="lullaby"/>
+                        <div class="item-count">Zelda</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Eponas Song'] }}" class="{{ 'acquired' if 'Eponas Song' in acquired_items }}" title="Epona's Song" id="epona" />
+                        <div class="item-count">Epona</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Sarias Song'] }}" class="{{ 'acquired' if 'Sarias Song' in acquired_items }}" title="Saria's Song" id="saria"/>
+                        <div class="item-count">Saria</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Suns Song'] }}" class="{{ 'acquired' if 'Suns Song' in acquired_items }}" title="Sun's Song" id="sun"/>
+                        <div class="item-count">Sun</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Song of Time'] }}" class="{{ 'acquired' if 'Song of Time' in acquired_items }}" title="Song of Time" id="time"/>
+                        <div class="item-count">Time</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Song of Storms'] }}" class="{{ 'acquired' if 'Song of Storms' in acquired_items }}" title="Song of Storms" />
+                        <div class="item-count">Storms</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Gold Skulltula Token'] }}" class="{{ 'acquired' if token_count > 0 }}" title="Gold Skulltula Tokens" />
+                        <div class="item-count">{{ token_count }}</div>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Minuet of Forest'] }}" class="{{ 'acquired' if 'Minuet of Forest' in acquired_items }}" title="Minuet of Forest" />
+                        <div class="item-count">Min</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Bolero of Fire'] }}" class="{{ 'acquired' if 'Bolero of Fire' in acquired_items }}" title="Bolero of Fire" />
+                        <div class="item-count">Bol</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Serenade of Water'] }}" class="{{ 'acquired' if 'Serenade of Water' in acquired_items }}" title="Serenade of Water" />
+                        <div class="item-count">Ser</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Requiem of Spirit'] }}" class="{{ 'acquired' if 'Requiem of Spirit' in acquired_items }}" title="Requiem of Spirit" />
+                        <div class="item-count">Req</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Nocturne of Shadow'] }}" class="{{ 'acquired' if 'Nocturne of Shadow' in acquired_items }}" title="Nocturne of Shadow" />
+                        <div class="item-count">Noc</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Prelude of Light'] }}" class="{{ 'acquired' if 'Prelude of Light' in acquired_items }}" title="Prelude of Light" />
+                        <div class="item-count">Pre</div>
+                    </div>
+                </td>
+                <td>
+                    <div class="counted-item">
+                        <img src="{{ icons['Triforce'] if game_finished else icons['Triforce Piece'] }}" class="{{ 'acquired' if game_finished or piece_count > 0 }}" title="{{ 'Triforce' if game_finished else 'Triforce Pieces' }}" id=triforce />
+                        <div class="item-count">{{ piece_count if piece_count > 0 else '' }}</div>
+                    </div>
+                </td>
+            </tr>
+        </table>
+        <table id="location-table">
+            <tr>
+                <td></td>
+                <td><img src="{{ icons['Small Key'] }}" title="Small Keys" /></td>
+                <td><img src="{{ icons['Boss Key'] }}" title="Boss Key" /></td>
+                <td class="right-align">Items</td>
+            </tr>
+            {% for area in checks_done %}
+            <tr class="location-category" id="{{area}}-header">
+                <td>{{ area }} {{'▼' if area != 'Total'}}</td>
+                <td class="smallkeys">{{ small_key_counts.get(area, '-') }}</td>
+                <td class="bosskeys">{{ boss_key_counts.get(area, '-') }}</td>
+                <td class="counter">{{ checks_done[area] }} / {{ checks_in_area[area] }}</td>
+            </tr>
+            <tbody class="locations hide" id="{{area}}">
+                {% for location in location_info[area] %}
+                <tr>
+                    <td class="location-name">{{ location }}</td>
+                    <td></td>
+                    <td></td>
+                    <td class="counter">{{ '✔' if location_info[area][location] else '' }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+            {% endfor %}
+        </table>
+    </div>
+</body>
+</html>
diff --git a/WebHostLib/templates/sc2wolTracker.html b/WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html
similarity index 99%
rename from WebHostLib/templates/sc2wolTracker.html
rename to WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html
index 49c31a5795..c27f690dfd 100644
--- a/WebHostLib/templates/sc2wolTracker.html
+++ b/WebHostLib/templates/tracker__Starcraft2WingsOfLiberty.html
@@ -8,6 +8,11 @@
 </head>
 
 <body>
+    {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #}
+    <div style="margin-bottom: 0.5rem">
+        <a href="{{ url_for("get_generic_game_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">Switch To Generic Tracker</a>
+    </div>
+
     <div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
         <table id="inventory-table">
             <tr>
diff --git a/WebHostLib/templates/supermetroidTracker.html b/WebHostLib/templates/tracker__SuperMetroid.html
similarity index 94%
rename from WebHostLib/templates/supermetroidTracker.html
rename to WebHostLib/templates/tracker__SuperMetroid.html
index 342f75642f..0c64817651 100644
--- a/WebHostLib/templates/supermetroidTracker.html
+++ b/WebHostLib/templates/tracker__SuperMetroid.html
@@ -7,6 +7,11 @@
 </head>
 
 <body>
+    {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #}
+    <div style="margin-bottom: 0.5rem">
+        <a href="{{ url_for("get_generic_game_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">Switch To Generic Tracker</a>
+    </div>
+
     <div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
         <table id="inventory-table">
             <tr>
diff --git a/WebHostLib/templates/timespinnerTracker.html b/WebHostLib/templates/tracker__Timespinner.html
similarity index 95%
rename from WebHostLib/templates/timespinnerTracker.html
rename to WebHostLib/templates/tracker__Timespinner.html
index f02ec6daab..b118c33833 100644
--- a/WebHostLib/templates/timespinnerTracker.html
+++ b/WebHostLib/templates/tracker__Timespinner.html
@@ -7,6 +7,11 @@
 </head>
 
 <body>
+    {# TODO: Replace this with a proper wrapper for each tracker when developing TrackerAPI. #}
+    <div style="margin-bottom: 0.5rem">
+        <a href="{{ url_for("get_generic_game_tracker", tracker=room.tracker, tracked_team=team, tracked_player=player) }}">Switch To Generic Tracker</a>
+    </div>
+
     <div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
         <div id="inventory-table">
             <div class="table-row">
@@ -51,16 +56,16 @@
                 <div class="C4"><img src="{{ icons['Security Keycard D'] }}" class="{{ 'acquired' if 'Security Keycard D' in acquired_items }}" title="Security Keycard D" /></div>
             {% if 'DownloadableItems' in options %}
                 <div class="C5"><img src="{{ icons['Library Keycard V'] }}" class="{{ 'acquired' if 'Library Keycard V' in acquired_items }}" title="Library Keycard V" /></div>
-            {% endif %}   
+            {% endif %}
             </div>
             <div class="table-row">
             {% if 'DownloadableItems' in options %}
                 <div class="C1"><img src="{{ icons['Tablet'] }}" class="{{ 'acquired' if 'Tablet' in acquired_items }}" title="Tablet" /></div>
-            {% endif %}    
+            {% endif %}
                 <div class="C2"><img src="{{ icons['Elevator Keycard'] }}" class="{{ 'acquired' if 'Elevator Keycard' in acquired_items }}" title="Elevator Keycard" /></div>
             {% if 'EyeSpy' in options %}
                 <div class="C3"><img src="{{ icons['Oculus Ring'] }}" class="{{ 'acquired' if 'Oculus Ring' in acquired_items }}" title="Oculus Ring" /></div>
-            {% endif %}   
+            {% endif %}
                 <div class="C4"><img src="{{ icons['Water Mask'] }}" class="{{ 'acquired' if 'Water Mask' in acquired_items }}" title="Water Mask" /></div>
                 <div class="C5"><img src="{{ icons['Gas Mask'] }}" class="{{ 'acquired' if 'Gas Mask' in acquired_items }}" title="Gas Mask" /></div>
             </div>
diff --git a/WebHostLib/templates/viewSeed.html b/WebHostLib/templates/viewSeed.html
index e252fb06a2..a8478c95c3 100644
--- a/WebHostLib/templates/viewSeed.html
+++ b/WebHostLib/templates/viewSeed.html
@@ -34,7 +34,7 @@
                 {% endif %}
                 <tr>
                     <td>Rooms:&nbsp;</td>
-                <td>
+                    <td>
                         {% call macros.list_rooms(seed.rooms | selectattr("owner", "eq", session["_id"])) %}
                             <li>
                                 <a href="{{ url_for("new_room", seed=seed.id) }}">Create New Room</a>
diff --git a/WebHostLib/templates/weighted-settings.html b/WebHostLib/templates/weighted-options.html
similarity index 82%
rename from WebHostLib/templates/weighted-settings.html
rename to WebHostLib/templates/weighted-options.html
index 9ce097c37f..032a4eeb90 100644
--- a/WebHostLib/templates/weighted-settings.html
+++ b/WebHostLib/templates/weighted-options.html
@@ -1,26 +1,26 @@
 {% extends 'pageWrapper.html' %}
 
 {% block head %}
-    <title>{{ game }} Settings</title>
+    <title>{{ game }} Options</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/markdown.css") }}" />
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/weighted-settings.css") }}" />
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/weighted-options.css") }}" />
     <script type="application/ecmascript" src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
     <script type="application/ecmascript" src="{{ url_for('static', filename="assets/md5.min.js") }}"></script>
     <script type="application/ecmascript" src="{{ url_for('static', filename="assets/js-yaml.min.js") }}"></script>
-    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/weighted-settings.js") }}"></script>
+    <script type="application/ecmascript" src="{{ url_for('static', filename="assets/weighted-options.js") }}"></script>
 {% endblock %}
 
 {% block body %}
     {% include 'header/grassHeader.html' %}
     <div id="weighted-settings" class="markdown" data-game="{{ game }}">
         <div id="user-message"></div>
-        <h1>Weighted Settings</h1>
-        <p>Weighted Settings allows you to choose how likely a particular option is to be used in game generation.
+        <h1>Weighted Options</h1>
+        <p>Weighted options allow you to choose how likely a particular option is to be used in game generation.
             The higher an option is weighted, the more likely the option will be chosen. Think of them like
             entries in a raffle.</p>
 
         <p>Choose the games and options you would like to play with! You may generate a single-player game from
-            this page, or download a settings file you can use to participate in a MultiWorld.</p>
+            this page, or download an options file you can use to participate in a MultiWorld.</p>
 
         <p>A list of all games you have generated can be found on the <a href="/user-content">User Content</a>
             page.</p>
@@ -40,7 +40,7 @@
         </div>
 
         <div id="weighted-settings-button-row">
-            <button id="export-settings">Export Settings</button>
+            <button id="export-options">Export Options</button>
             <button id="generate-game">Generate Game</button>
             <button id="generate-race">Generate Race</button>
         </div>
diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
index 0d9ead7951..8a7155afec 100644
--- a/WebHostLib/tracker.py
+++ b/WebHostLib/tracker.py
@@ -1,1768 +1,1960 @@
-import collections
 import datetime
-import typing
-from typing import Counter, Optional, Dict, Any, Tuple, List
+from dataclasses import dataclass
+from typing import Any, Callable, Dict, List, Optional, Set, Tuple
 from uuid import UUID
 
 from flask import render_template
-from jinja2 import pass_context, runtime
 from werkzeug.exceptions import abort
 
 from MultiServer import Context, get_saving_second
-from NetUtils import ClientStatus, SlotType, NetworkSlot
+from NetUtils import ClientStatus, Hint, NetworkItem, NetworkSlot, SlotType
 from Utils import restricted_loads
-from worlds import lookup_any_item_id_to_name, lookup_any_location_id_to_name, network_data_package, games
-from worlds.alttp import Items
 from . import app, cache
 from .models import GameDataPackage, Room
 
-alttp_icons = {
-    "Blue Shield": r"https://www.zeldadungeon.net/wiki/images/8/85/Fighters-Shield.png",
-    "Red Shield": r"https://www.zeldadungeon.net/wiki/images/5/55/Fire-Shield.png",
-    "Mirror Shield": r"https://www.zeldadungeon.net/wiki/images/8/84/Mirror-Shield.png",
-    "Fighter Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/40/SFighterSword.png?width=1920",
-    "Master Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/SMasterSword.png?width=1920",
-    "Tempered Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/92/STemperedSword.png?width=1920",
-    "Golden Sword": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/2/28/SGoldenSword.png?width=1920",
-    "Bow": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=5f85a70e6366bf473544ef93b274f74c",
-    "Silver Bow": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/6/65/Bow.png?width=1920",
-    "Green Mail": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c9/SGreenTunic.png?width=1920",
-    "Blue Mail": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/9/98/SBlueTunic.png?width=1920",
-    "Red Mail": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/7/74/SRedTunic.png?width=1920",
-    "Power Glove": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/f/f5/SPowerGlove.png?width=1920",
-    "Titan Mitts": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
-    "Progressive Sword": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/cc/ALttP_Master_Sword_Sprite.png?version=55869db2a20e157cd3b5c8f556097725",
-    "Pegasus Boots": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Pegasus_Shoes_Sprite.png?version=405f42f97240c9dcd2b71ffc4bebc7f9",
-    "Progressive Glove": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/c/c1/STitanMitt.png?width=1920",
-    "Flippers": r"https://oyster.ignimgs.com/mediawiki/apis.ign.com/the-legend-of-zelda-a-link-to-the-past/4/4c/ZoraFlippers.png?width=1920",
-    "Moon Pearl": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Moon_Pearl_Sprite.png?version=d601542d5abcc3e006ee163254bea77e",
-    "Progressive Bow": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Bow_%26_Arrows_Sprite.png?version=cfb7648b3714cccc80e2b17b2adf00ed",
-    "Blue Boomerang": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c3/ALttP_Boomerang_Sprite.png?version=96127d163759395eb510b81a556d500e",
-    "Red Boomerang": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Magical_Boomerang_Sprite.png?version=47cddce7a07bc3e4c2c10727b491f400",
-    "Hookshot": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/24/Hookshot.png?version=c90bc8e07a52e8090377bd6ef854c18b",
-    "Mushroom": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/35/ALttP_Mushroom_Sprite.png?version=1f1acb30d71bd96b60a3491e54bbfe59",
-    "Magic Powder": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Powder_Sprite.png?version=c24e38effbd4f80496d35830ce8ff4ec",
-    "Fire Rod": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d6/FireRod.png?version=6eabc9f24d25697e2c4cd43ddc8207c0",
-    "Ice Rod": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d7/ALttP_Ice_Rod_Sprite.png?version=1f944148223d91cfc6a615c92286c3bc",
-    "Bombos": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/8c/ALttP_Bombos_Medallion_Sprite.png?version=f4d6aba47fb69375e090178f0fc33b26",
-    "Ether": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/Ether.png?version=34027651a5565fcc5a83189178ab17b5",
-    "Quake": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/56/ALttP_Quake_Medallion_Sprite.png?version=efd64d451b1831bd59f7b7d6b61b5879",
-    "Lamp": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/6/63/ALttP_Lantern_Sprite.png?version=e76eaa1ec509c9a5efb2916698d5a4ce",
-    "Hammer": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d1/ALttP_Hammer_Sprite.png?version=e0adec227193818dcaedf587eba34500",
-    "Shovel": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/c/c4/ALttP_Shovel_Sprite.png?version=e73d1ce0115c2c70eaca15b014bd6f05",
-    "Flute": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/db/Flute.png?version=ec4982b31c56da2c0c010905c5c60390",
-    "Bug Catching Net": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/5/54/Bug-CatchingNet.png?version=4d40e0ee015b687ff75b333b968d8be6",
-    "Book of Mudora": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/2/22/ALttP_Book_of_Mudora_Sprite.png?version=11e4632bba54f6b9bf921df06ac93744",
-    "Bottle": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ef/ALttP_Magic_Bottle_Sprite.png?version=fd98ab04db775270cbe79fce0235777b",
-    "Cane of Somaria": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e1/ALttP_Cane_of_Somaria_Sprite.png?version=8cc1900dfd887890badffc903bb87943",
-    "Cane of Byrna": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/bc/ALttP_Cane_of_Byrna_Sprite.png?version=758b607c8cbe2cf1900d42a0b3d0fb54",
-    "Cape": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1c/ALttP_Magic_Cape_Sprite.png?version=6b77f0d609aab0c751307fc124736832",
-    "Magic Mirror": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e5/ALttP_Magic_Mirror_Sprite.png?version=e035dbc9cbe2a3bd44aa6d047762b0cc",
-    "Triforce": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/4/4e/TriforceALttPTitle.png?version=dc398e1293177581c16303e4f9d12a48",
-    "Small Key": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/f/f1/ALttP_Small_Key_Sprite.png?version=4f35d92842f0de39d969181eea03774e",
-    "Big Key": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Big_Key_Sprite.png?version=136dfa418ba76c8b4e270f466fc12f4d",
-    "Chest": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Treasure_Chest_Sprite.png?version=5f530ecd98dcb22251e146e8049c0dda",
-    "Light World": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/e7/ALttP_Soldier_Green_Sprite.png?version=d650d417934cd707a47e496489c268a6",
-    "Dark World": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/94/ALttP_Moblin_Sprite.png?version=ebf50e33f4657c377d1606bcc0886ddc",
-    "Hyrule Castle": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/d/d3/ALttP_Ball_and_Chain_Trooper_Sprite.png?version=1768a87c06d29cc8e7ddd80b9fa516be",
-    "Agahnims Tower": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/1/1e/ALttP_Agahnim_Sprite.png?version=365956e61b0c2191eae4eddbe591dab5",
-    "Desert Palace": r"https://www.zeldadungeon.net/wiki/images/2/25/Lanmola-ALTTP-Sprite.png",
-    "Eastern Palace": r"https://www.zeldadungeon.net/wiki/images/d/dc/RedArmosKnight.png",
-    "Tower of Hera": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/3c/ALttP_Moldorm_Sprite.png?version=c588257bdc2543468e008a6b30f262a7",
-    "Palace of Darkness": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/e/ed/ALttP_Helmasaur_King_Sprite.png?version=ab8a4a1cfd91d4fc43466c56cba30022",
-    "Swamp Palace": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/7/73/ALttP_Arrghus_Sprite.png?version=b098be3122e53f751b74f4a5ef9184b5",
-    "Skull Woods": r"https://alttp-wiki.net/images/6/6a/Mothula.png",
-    "Thieves Town": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/86/ALttP_Blind_the_Thief_Sprite.png?version=3833021bfcd112be54e7390679047222",
-    "Ice Palace": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/3/33/ALttP_Kholdstare_Sprite.png?version=e5a1b0e8b2298e550d85f90bf97045c0",
-    "Misery Mire": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/8/85/ALttP_Vitreous_Sprite.png?version=92b2e9cb0aa63f831760f08041d8d8d8",
-    "Turtle Rock": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/9/91/ALttP_Trinexx_Sprite.png?version=0cc867d513952aa03edd155597a0c0be",
-    "Ganons Tower": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/b/b9/ALttP_Ganon_Sprite.png?version=956f51f054954dfff53c1a9d4f929c74"
-}
-
-
-def get_alttp_id(item_name):
-    return Items.item_table[item_name][2]
-
-
-links = {"Bow": "Progressive Bow",
-         "Silver Arrows": "Progressive Bow",
-         "Silver Bow": "Progressive Bow",
-         "Progressive Bow (Alt)": "Progressive Bow",
-         "Bottle (Red Potion)": "Bottle",
-         "Bottle (Green Potion)": "Bottle",
-         "Bottle (Blue Potion)": "Bottle",
-         "Bottle (Fairy)": "Bottle",
-         "Bottle (Bee)": "Bottle",
-         "Bottle (Good Bee)": "Bottle",
-         "Fighter Sword": "Progressive Sword",
-         "Master Sword": "Progressive Sword",
-         "Tempered Sword": "Progressive Sword",
-         "Golden Sword": "Progressive Sword",
-         "Power Glove": "Progressive Glove",
-         "Titans Mitts": "Progressive Glove"
-         }
-
-levels = {"Fighter Sword": 1,
-          "Master Sword": 2,
-          "Tempered Sword": 3,
-          "Golden Sword": 4,
-          "Power Glove": 1,
-          "Titans Mitts": 2,
-          "Bow": 1,
-          "Silver Bow": 2}
-
-multi_items = {get_alttp_id(name) for name in ("Progressive Sword", "Progressive Bow", "Bottle", "Progressive Glove")}
-links = {get_alttp_id(key): get_alttp_id(value) for key, value in links.items()}
-levels = {get_alttp_id(key): value for key, value in levels.items()}
-
-tracking_names = ["Progressive Sword", "Progressive Bow", "Book of Mudora", "Hammer",
-                  "Hookshot", "Magic Mirror", "Flute",
-                  "Pegasus Boots", "Progressive Glove", "Flippers", "Moon Pearl", "Blue Boomerang",
-                  "Red Boomerang", "Bug Catching Net", "Cape", "Shovel", "Lamp",
-                  "Mushroom", "Magic Powder",
-                  "Cane of Somaria", "Cane of Byrna", "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake",
-                  "Bottle", "Triforce"]
-
-default_locations = {
-    'Light World': {1572864, 1572865, 60034, 1572867, 1572868, 60037, 1572869, 1572866, 60040, 59788, 60046, 60175,
-                    1572880, 60049, 60178, 1572883, 60052, 60181, 1572885, 60055, 60184, 191256, 60058, 60187, 1572884,
-                    1572886, 1572887, 1572906, 60202, 60205, 59824, 166320, 1010170, 60208, 60211, 60214, 60217, 59836,
-                    60220, 60223, 59839, 1573184, 60226, 975299, 1573188, 1573189, 188229, 60229, 60232, 1573193,
-                    1573194, 60235, 1573187, 59845, 59854, 211407, 60238, 59857, 1573185, 1573186, 1572882, 212328,
-                    59881, 59761, 59890, 59770, 193020, 212605},
-    'Dark World': {59776, 59779, 975237, 1572870, 60043, 1572881, 60190, 60193, 60196, 60199, 60840, 1573190, 209095,
-                   1573192, 1573191, 60241, 60244, 60247, 60250, 59884, 59887, 60019, 60022, 60028, 60031},
-    'Desert Palace': {1573216, 59842, 59851, 59791, 1573201, 59830},
-    'Eastern Palace': {1573200, 59827, 59893, 59767, 59833, 59773},
-    'Hyrule Castle': {60256, 60259, 60169, 60172, 59758, 59764, 60025, 60253},
-    'Agahnims Tower': {60082, 60085},
-    'Tower of Hera': {1573218, 59878, 59821, 1573202, 59896, 59899},
-    'Swamp Palace': {60064, 60067, 60070, 59782, 59785, 60073, 60076, 60079, 1573204, 60061},
-    'Thieves Town': {59905, 59908, 59911, 59914, 59917, 59920, 59923, 1573206},
-    'Skull Woods': {59809, 59902, 59848, 59794, 1573205, 59800, 59803, 59806},
-    'Ice Palace': {59872, 59875, 59812, 59818, 59860, 59797, 1573207, 59869},
-    'Misery Mire': {60001, 60004, 60007, 60010, 60013, 1573208, 59866, 59998},
-    'Turtle Rock': {59938, 59941, 59944, 1573209, 59947, 59950, 59953, 59956, 59926, 59929, 59932, 59935},
-    'Palace of Darkness': {59968, 59971, 59974, 59977, 59980, 59983, 59986, 1573203, 59989, 59959, 59992, 59962, 59995,
-                           59965},
-    'Ganons Tower': {60160, 60163, 60166, 60088, 60091, 60094, 60097, 60100, 60103, 60106, 60109, 60112, 60115, 60118,
-                     60121, 60124, 60127, 1573217, 60130, 60133, 60136, 60139, 60142, 60145, 60148, 60151, 60157},
-    'Total': set()}
-
-key_only_locations = {
-    'Light World': set(),
-    'Dark World': set(),
-    'Desert Palace': {0x140031, 0x14002b, 0x140061, 0x140028},
-    'Eastern Palace': {0x14005b, 0x140049},
-    'Hyrule Castle': {0x140037, 0x140034, 0x14000d, 0x14003d},
-    'Agahnims Tower': {0x140061, 0x140052},
-    'Tower of Hera': set(),
-    'Swamp Palace': {0x140019, 0x140016, 0x140013, 0x140010, 0x14000a},
-    'Thieves Town': {0x14005e, 0x14004f},
-    'Skull Woods': {0x14002e, 0x14001c},
-    'Ice Palace': {0x140004, 0x140022, 0x140025, 0x140046},
-    'Misery Mire': {0x140055, 0x14004c, 0x140064},
-    'Turtle Rock': {0x140058, 0x140007},
-    'Palace of Darkness': set(),
-    'Ganons Tower': {0x140040, 0x140043, 0x14003a, 0x14001f},
-    'Total': set()
-}
-
-location_to_area = {}
-for area, locations in default_locations.items():
-    for location in locations:
-        location_to_area[location] = area
-
-for area, locations in key_only_locations.items():
-    for location in locations:
-        location_to_area[location] = area
-
-checks_in_area = {area: len(checks) for area, checks in default_locations.items()}
-checks_in_area["Total"] = 216
-
-ordered_areas = ('Light World', 'Dark World', 'Hyrule Castle', 'Agahnims Tower', 'Eastern Palace', 'Desert Palace',
-                 'Tower of Hera', 'Palace of Darkness', 'Swamp Palace', 'Skull Woods', 'Thieves Town', 'Ice Palace',
-                 'Misery Mire', 'Turtle Rock', 'Ganons Tower', "Total")
-
-tracking_ids = []
-
-for item in tracking_names:
-    tracking_ids.append(get_alttp_id(item))
-
-small_key_ids = {}
-big_key_ids = {}
-ids_small_key = {}
-ids_big_key = {}
-
-for item_name, data in Items.item_table.items():
-    if "Key" in item_name:
-        area = item_name.split("(")[1][:-1]
-        if "Small" in item_name:
-            small_key_ids[area] = data[2]
-            ids_small_key[data[2]] = area
-        else:
-            big_key_ids[area] = data[2]
-            ids_big_key[data[2]] = area
-
-# cleanup global namespace
-del item_name
-del data
-del item
-
-
-def attribute_item_solo(inventory, item):
-    """Adds item to inventory counter, converts everything to progressive."""
-    target_item = links.get(item, item)
-    if item in levels:  # non-progressive
-        inventory[target_item] = max(inventory[target_item], levels[item])
-    else:
-        inventory[target_item] += 1
-
-
-@app.template_filter()
-def render_timedelta(delta: datetime.timedelta):
-    hours, minutes = divmod(delta.total_seconds() / 60, 60)
-    hours = str(int(hours))
-    minutes = str(int(minutes)).zfill(2)
-    return f"{hours}:{minutes}"
-
-
-@pass_context
-def get_location_name(context: runtime.Context, loc: int) -> str:
-    # once all rooms embed data package, the chain lookup can be dropped
-    context_locations = context.get("custom_locations", {})
-    return collections.ChainMap(context_locations, lookup_any_location_id_to_name).get(loc, loc)
-
-
-@pass_context
-def get_item_name(context: runtime.Context, item: int) -> str:
-    context_items = context.get("custom_items", {})
-    return collections.ChainMap(context_items, lookup_any_item_id_to_name).get(item, item)
-
-
-app.jinja_env.filters["location_name"] = get_location_name
-app.jinja_env.filters["item_name"] = get_item_name
-
+# Multisave is currently updated, at most, every minute.
+TRACKER_CACHE_TIMEOUT_IN_SECONDS = 60
 
 _multidata_cache = {}
+_multiworld_trackers: Dict[str, Callable] = {}
+_player_trackers: Dict[str, Callable] = {}
+
+TeamPlayer = Tuple[int, int]
+ItemMetadata = Tuple[int, int, int]
 
 
-def get_location_table(checks_table: dict) -> dict:
-    loc_to_area = {}
-    for area, locations in checks_table.items():
-        if area == "Total":
-            continue
-        for location in locations:
-            loc_to_area[location] = area
-    return loc_to_area
+def _cache_results(func: Callable) -> Callable:
+    """Stores the results of any computationally expensive methods after the initial call in TrackerData.
+    If called again, returns the cached result instead, as results will not change for the lifetime of TrackerData.
+    """
+    def method_wrapper(self: "TrackerData", *args):
+        cache_key = f"{func.__name__}{''.join(f'_[{arg.__repr__()}]' for arg in args)}"
+        if cache_key in self._tracker_cache:
+            return self._tracker_cache[cache_key]
 
-
-def get_static_room_data(room: Room):
-    result = _multidata_cache.get(room.seed.id, None)
-    if result:
+        result = func(self, *args)
+        self._tracker_cache[cache_key] = result
         return result
-    multidata = Context.decompress(room.seed.multidata)
-    # in > 100 players this can take a bit of time and is the main reason for the cache
-    locations: Dict[int, Dict[int, Tuple[int, int, int]]] = multidata['locations']
-    names: List[List[str]] = multidata.get("names", [])
-    games = multidata.get("games", {})
-    groups = {}
-    custom_locations = {}
-    custom_items = {}
-    if "slot_info" in multidata:
-        slot_info_dict: Dict[int, NetworkSlot] = multidata["slot_info"]
-        games = {slot: slot_info.game for slot, slot_info in slot_info_dict.items()}
-        groups = {slot: slot_info.group_members for slot, slot_info in slot_info_dict.items()
-                  if slot_info.type == SlotType.group}
-        names = [[slot_info.name for slot, slot_info in sorted(slot_info_dict.items())]]
-        for game in games.values():
-            if game not in multidata["datapackage"]:
-                continue
-            game_data = multidata["datapackage"][game]
-            if "checksum" in game_data:
-                if network_data_package["games"].get(game, {}).get("checksum") == game_data["checksum"]:
-                    # non-custom. remove from multidata
-                    # network_data_package import could be skipped once all rooms embed data package
-                    del multidata["datapackage"][game]
-                    continue
-                else:
-                    game_data = restricted_loads(GameDataPackage.get(checksum=game_data["checksum"]).data)
-            custom_locations.update(
-                {id_: name for name, id_ in game_data["location_name_to_id"].items()})
-            custom_items.update(
-                {id_: name for name, id_ in game_data["item_name_to_id"].items()})
 
-    seed_checks_in_area = checks_in_area.copy()
+    return method_wrapper
 
-    use_door_tracker = False
-    if "tags" in multidata:
-        use_door_tracker = "DR" in multidata["tags"]
-    if use_door_tracker:
-        for area, checks in key_only_locations.items():
-            seed_checks_in_area[area] += len(checks)
-        seed_checks_in_area["Total"] = 249
 
-    player_checks_in_area = {
-        playernumber: {
-            areaname: len(multidata["checks_in_area"][playernumber][areaname]) if areaname != "Total" else
-            multidata["checks_in_area"][playernumber]["Total"]
-            for areaname in ordered_areas
+@dataclass
+class TrackerData:
+    """A helper dataclass that is instantiated each time an HTTP request comes in for tracker data.
+
+    Provides helper methods to lazily load necessary data that each tracker require and caches any results so any
+    subsequent helper method calls do not need to recompute results during the lifetime of this instance.
+    """
+    room: Room
+    _multidata: Dict[str, Any]
+    _multisave: Dict[str, Any]
+    _tracker_cache: Dict[str, Any]
+
+    def __init__(self, room: Room):
+        """Initialize a new RoomMultidata object for the current room."""
+        self.room = room
+        self._multidata = Context.decompress(room.seed.multidata)
+        self._multisave = restricted_loads(room.multisave) if room.multisave else {}
+        self._tracker_cache = {}
+
+        self.item_name_to_id: Dict[str, Dict[str, int]] = {}
+        self.location_name_to_id: Dict[str, Dict[str, int]] = {}
+
+        # Generate inverse lookup tables from data package, useful for trackers.
+        self.item_id_to_name: Dict[str, Dict[int, str]] = {}
+        self.location_id_to_name: Dict[str, Dict[int, str]] = {}
+        for game, game_package in self._multidata["datapackage"].items():
+            game_package = restricted_loads(GameDataPackage.get(checksum=game_package["checksum"]).data)
+            self.item_id_to_name[game] = {id: name for name, id in game_package["item_name_to_id"].items()}
+            self.location_id_to_name[game] = {id: name for name, id in game_package["location_name_to_id"].items()}
+
+            # Normal lookup tables as well.
+            self.item_name_to_id[game] = game_package["item_name_to_id"]
+            self.location_name_to_id[game] = game_package["item_name_to_id"]
+
+    def get_seed_name(self) -> str:
+        """Retrieves the seed name."""
+        return self._multidata["seed_name"]
+
+    def get_slot_data(self, team: int, player: int) -> Dict[str, Any]:
+        """Retrieves the slot data for a given player."""
+        return self._multidata["slot_data"][player]
+
+    def get_slot_info(self, team: int, player: int) -> NetworkSlot:
+        """Retrieves the NetworkSlot data for a given player."""
+        return self._multidata["slot_info"][player]
+
+    def get_player_name(self, team: int, player: int) -> str:
+        """Retrieves the slot name for a given player."""
+        return self.get_slot_info(team, player).name
+
+    def get_player_game(self, team: int, player: int) -> str:
+        """Retrieves the game for a given player."""
+        return self.get_slot_info(team, player).game
+
+    def get_player_locations(self, team: int, player: int) -> Dict[int, ItemMetadata]:
+        """Retrieves all locations with their containing item's metadata for a given player."""
+        return self._multidata["locations"][player]
+
+    def get_player_starting_inventory(self, team: int, player: int) -> List[int]:
+        """Retrieves a list of all item codes a given slot starts with."""
+        return self._multidata["precollected_items"][player]
+
+    def get_player_checked_locations(self, team: int, player: int) -> Set[int]:
+        """Retrieves the set of all locations marked complete by this player."""
+        return self._multisave.get("location_checks", {}).get((team, player), set())
+
+    @_cache_results
+    def get_player_missing_locations(self, team: int, player: int) -> Set[int]:
+        """Retrieves the set of all locations not marked complete by this player."""
+        return set(self.get_player_locations(team, player)) - self.get_player_checked_locations(team, player)
+
+    def get_player_received_items(self, team: int, player: int) -> List[NetworkItem]:
+        """Returns all items received to this player in order of received."""
+        return self._multisave.get("received_items", {}).get((team, player, True), [])
+
+    @_cache_results
+    def get_player_inventory_counts(self, team: int, player: int) -> Dict[int, int]:
+        """Retrieves a dictionary of all items received by their id and their received count."""
+        items = self.get_player_received_items(team, player)
+        inventory = {item: 0 for item in self.item_id_to_name[self.get_player_game(team, player)]}
+        for item in items:
+            inventory[item.item] += 1
+
+        return inventory
+
+    @_cache_results
+    def get_player_hints(self, team: int, player: int) -> Set[Hint]:
+        """Retrieves a set of all hints relevant for a particular player."""
+        return self._multisave.get("hints", {}).get((team, player), set())
+
+    @_cache_results
+    def get_player_last_activity(self, team: int, player: int) -> Optional[datetime.timedelta]:
+        """Retrieves the relative timedelta for when a particular player was last active.
+        Returns None if no activity was ever recorded.
+        """
+        return self.get_room_last_activity().get((team, player), None)
+
+    def get_player_client_status(self, team: int, player: int) -> ClientStatus:
+        """Retrieves the ClientStatus of a particular player."""
+        return self._multisave.get("client_game_state", {}).get((team, player), ClientStatus.CLIENT_UNKNOWN)
+
+    def get_player_alias(self, team: int, player: int) -> Optional[str]:
+        """Returns the alias of a particular player, if any."""
+        return self._multisave.get("name_aliases", {}).get((team, player), None)
+
+    @_cache_results
+    def get_team_completed_worlds_count(self) -> Dict[int, int]:
+        """Retrieves a dictionary of number of completed worlds per team."""
+        return {
+            team: sum(
+                self.get_player_client_status(team, player) == ClientStatus.CLIENT_GOAL
+                for player in players if self.get_slot_info(team, player).type == SlotType.player
+            ) for team, players in self.get_team_players().items()
         }
-        for playernumber in multidata["checks_in_area"]
-    }
 
-    player_location_to_area = {playernumber: get_location_table(multidata["checks_in_area"][playernumber])
-                               for playernumber in multidata["checks_in_area"]}
-    saving_second = get_saving_second(multidata["seed_name"])
-    result = locations, names, use_door_tracker, player_checks_in_area, player_location_to_area, \
-             multidata["precollected_items"], games, multidata["slot_data"], groups, saving_second, \
-             custom_locations, custom_items
-    _multidata_cache[room.seed.id] = result
-    return result
+    @_cache_results
+    def get_team_hints(self) -> Dict[int, Set[Hint]]:
+        """Retrieves a dictionary of all hints per team."""
+        hints = {}
+        for team, players in self.get_team_players().items():
+            hints[team] = set()
+            for player in players:
+                hints[team] |= self.get_player_hints(team, player)
+
+        return hints
+
+    @_cache_results
+    def get_team_locations_total_count(self) -> Dict[int, int]:
+        """Retrieves a dictionary of total player locations each team has."""
+        return {
+            team: sum(len(self.get_player_locations(team, player)) for player in players)
+            for team, players in self.get_team_players().items()
+        }
+
+    @_cache_results
+    def get_team_locations_checked_count(self) -> Dict[int, int]:
+        """Retrieves a dictionary of checked player locations each team has."""
+        return {
+            team: sum(len(self.get_player_checked_locations(team, player)) for player in players)
+            for team, players in self.get_team_players().items()
+        }
+
+    # TODO: Change this method to properly build for each team once teams are properly implemented, as they don't
+    #       currently exist in multidata to easily look up, so these are all assuming only 1 team: Team #0
+    @_cache_results
+    def get_team_players(self) -> Dict[int, List[int]]:
+        """Retrieves a dictionary of all players ids on each team."""
+        return {
+            0: [player for player, slot_info in self._multidata["slot_info"].items()]
+        }
+
+    @_cache_results
+    def get_room_saving_second(self) -> int:
+        """Retrieves the saving second value for this seed.
+
+        Useful for knowing when the multisave gets updated so trackers can attempt to update.
+        """
+        return get_saving_second(self.get_seed_name())
+
+    @_cache_results
+    def get_room_locations(self) -> Dict[TeamPlayer, Dict[int, ItemMetadata]]:
+        """Retrieves a dictionary of all locations and their associated item metadata per player."""
+        return {
+            (team, player): self.get_player_locations(team, player)
+            for team, players in self.get_team_players().items() for player in players
+        }
+
+    @_cache_results
+    def get_room_games(self) -> Dict[TeamPlayer, str]:
+        """Retrieves a dictionary of games for each player."""
+        return {
+            (team, player): self.get_player_game(team, player)
+            for team, players in self.get_team_players().items() for player in players
+        }
+
+    @_cache_results
+    def get_room_locations_complete(self) -> Dict[TeamPlayer, int]:
+        """Retrieves a dictionary of all locations complete per player."""
+        return {
+            (team, player): len(self.get_player_checked_locations(team, player))
+            for team, players in self.get_team_players().items() for player in players
+        }
+
+    @_cache_results
+    def get_room_client_statuses(self) -> Dict[TeamPlayer, ClientStatus]:
+        """Retrieves a dictionary of all ClientStatus values per player."""
+        return {
+            (team, player): self.get_player_client_status(team, player)
+            for team, players in self.get_team_players().items() for player in players
+        }
+
+    @_cache_results
+    def get_room_long_player_names(self) -> Dict[TeamPlayer, str]:
+        """Retrieves a dictionary of names with aliases for each player."""
+        long_player_names = {}
+        for team, players in self.get_team_players().items():
+            for player in players:
+                alias = self.get_player_alias(team, player)
+                if alias:
+                    long_player_names[team, player] = f"{alias} ({self.get_player_name(team, player)})"
+                else:
+                    long_player_names[team, player] = self.get_player_name(team, player)
+
+        return long_player_names
+
+    @_cache_results
+    def get_room_last_activity(self) -> Dict[TeamPlayer, datetime.timedelta]:
+        """Retrieves a dictionary of all players and the timedelta from now to their last activity.
+        Does not include players who have no activity recorded.
+        """
+        last_activity: Dict[TeamPlayer, datetime.timedelta] = {}
+        now = datetime.datetime.utcnow()
+        for (team, player), timestamp in self._multisave.get("client_activity_timers", []):
+            last_activity[team, player] = now - datetime.datetime.utcfromtimestamp(timestamp)
+
+        return last_activity
+
+    @_cache_results
+    def get_room_videos(self) -> Dict[TeamPlayer, Tuple[str, str]]:
+        """Retrieves a dictionary of any players who have video streaming enabled and their feeds.
+
+        Only supported platforms are Twitch and YouTube.
+        """
+        video_feeds = {}
+        for (team, player), video_data in self._multisave.get("video", []):
+            video_feeds[team, player] = video_data
+
+        return video_feeds
 
 
-@app.route('/tracker/<suuid:tracker>/<int:tracked_team>/<int:tracked_player>')
-def get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, want_generic: bool = False):
-    key = f"{tracker}_{tracked_team}_{tracked_player}_{want_generic}"
+@app.route("/tracker/<suuid:tracker>/<int:tracked_team>/<int:tracked_player>")
+def get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, generic: bool = False) -> str:
+    key = f"{tracker}_{tracked_team}_{tracked_player}_{generic}"
     tracker_page = cache.get(key)
     if tracker_page:
         return tracker_page
-    timeout, tracker_page = _get_player_tracker(tracker, tracked_team, tracked_player, want_generic)
+
+    timeout, tracker_page = get_timeout_and_tracker(tracker, tracked_team, tracked_player, generic)
     cache.set(key, tracker_page, timeout)
     return tracker_page
 
 
-def _get_player_tracker(tracker: UUID, tracked_team: int, tracked_player: int, want_generic: bool):
-    # Team and player must be positive and greater than zero
-    if tracked_team < 0 or tracked_player < 1:
-        abort(404)
-
-    room: Optional[Room] = Room.get(tracker=tracker)
-    if not room:
-        abort(404)
-
-    # Collect seed information and pare it down to a single player
-    locations, names, use_door_tracker, seed_checks_in_area, player_location_to_area, \
-        precollected_items, games, slot_data, groups, saving_second, custom_locations, custom_items = \
-        get_static_room_data(room)
-    player_name = names[tracked_team][tracked_player - 1]
-    location_to_area = player_location_to_area.get(tracked_player, {})
-    inventory = collections.Counter()
-    checks_done = {loc_name: 0 for loc_name in default_locations}
-
-    # Add starting items to inventory
-    starting_items = precollected_items[tracked_player]
-    if starting_items:
-        for item_id in starting_items:
-            attribute_item_solo(inventory, item_id)
-
-    if room.multisave:
-        multisave: Dict[str, Any] = restricted_loads(room.multisave)
-    else:
-        multisave: Dict[str, Any] = {}
-
-    slots_aimed_at_player = {tracked_player}
-    for group_id, group_members in groups.items():
-        if tracked_player in group_members:
-            slots_aimed_at_player.add(group_id)
-
-    # Add items to player inventory
-    for (ms_team, ms_player), locations_checked in multisave.get("location_checks", {}).items():
-        # Skip teams and players not matching the request
-        player_locations = locations[ms_player]
-        if ms_team == tracked_team:
-            # If the player does not have the item, do nothing
-            for location in locations_checked:
-                if location in player_locations:
-                    item, recipient, flags = player_locations[location]
-                    if recipient in slots_aimed_at_player:  # a check done for the tracked player
-                        attribute_item_solo(inventory, item)
-                    if ms_player == tracked_player:  # a check done by the tracked player
-                        area_name = location_to_area.get(location, None)
-                        if area_name:
-                            checks_done[area_name] += 1
-                        checks_done["Total"] += 1
-    specific_tracker = game_specific_trackers.get(games[tracked_player], None)
-    if specific_tracker and not want_generic:
-        tracker =  specific_tracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name,
-                                    seed_checks_in_area, checks_done, slot_data[tracked_player], saving_second)
-    else:
-        tracker =  __renderGenericTracker(multisave, room, locations, inventory, tracked_team, tracked_player,
-                                          player_name, seed_checks_in_area, checks_done, saving_second,
-                                          custom_locations, custom_items)
-
-    return (saving_second - datetime.datetime.now().second) % 60 or 60, tracker
-
-
-@app.route('/generic_tracker/<suuid:tracker>/<int:tracked_team>/<int:tracked_player>')
-def get_generic_tracker(tracker: UUID, tracked_team: int, tracked_player: int):
+@app.route("/generic_tracker/<suuid:tracker>/<int:tracked_team>/<int:tracked_player>")
+def get_generic_game_tracker(tracker: UUID, tracked_team: int, tracked_player: int) -> str:
     return get_player_tracker(tracker, tracked_team, tracked_player, True)
 
 
-def __renderAlttpTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                         inventory: Counter, team: int, player: int, player_name: str,
-                         seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                         saving_second: int) -> str:
-
-    # Note the presence of the triforce item
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    if game_state == 30:
-        inventory[106] = 1  # Triforce
-
-    # Progressive items need special handling for icons and class
-    progressive_items = {
-        "Progressive Sword": 94,
-        "Progressive Glove": 97,
-        "Progressive Bow": 100,
-        "Progressive Mail": 96,
-        "Progressive Shield": 95,
-    }
-    progressive_names = {
-        "Progressive Sword": [None, 'Fighter Sword', 'Master Sword', 'Tempered Sword', 'Golden Sword'],
-        "Progressive Glove": [None, 'Power Glove', 'Titan Mitts'],
-        "Progressive Bow": [None, "Bow", "Silver Bow"],
-        "Progressive Mail": ["Green Mail", "Blue Mail", "Red Mail"],
-        "Progressive Shield": [None, "Blue Shield", "Red Shield", "Mirror Shield"]
-    }
-
-    # Determine which icon to use
-    display_data = {}
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
-        display_name = progressive_names[item_name][level]
-        acquired = True
-        if not display_name:
-            acquired = False
-            display_name = progressive_names[item_name][level + 1]
-        base_name = item_name.split(maxsplit=1)[1].lower()
-        display_data[base_name + "_acquired"] = acquired
-        display_data[base_name + "_url"] = alttp_icons[display_name]
-
-    # The single player tracker doesn't care about overworld, underworld, and total checks. Maybe it should?
-    sp_areas = ordered_areas[2:15]
-
-    player_big_key_locations = set()
-    player_small_key_locations = set()
-    for loc_data in locations.values():
-        for values in loc_data.values():
-            item_id, item_player, flags = values
-            if item_player == player:
-                if item_id in ids_big_key:
-                    player_big_key_locations.add(ids_big_key[item_id])
-                elif item_id in ids_small_key:
-                    player_small_key_locations.add(ids_small_key[item_id])
-
-    return render_template("lttpTracker.html", inventory=inventory,
-                            player_name=player_name, room=room, icons=alttp_icons, checks_done=checks_done,
-                            checks_in_area=seed_checks_in_area[player],
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory},
-                            small_key_ids=small_key_ids, big_key_ids=big_key_ids, sp_areas=sp_areas,
-                            key_locations=player_small_key_locations,
-                            big_key_locations=player_big_key_locations,
-                            **display_data)
-
-
-def __renderMinecraftTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                             inventory: Counter, team: int, player: int, playerName: str,
-                             seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                             saving_second: int) -> str:
-
-    icons = {
-        "Wooden Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d2/Wooden_Pickaxe_JE3_BE3.png",
-        "Stone Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c4/Stone_Pickaxe_JE2_BE2.png",
-        "Iron Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d1/Iron_Pickaxe_JE3_BE2.png",
-        "Diamond Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/e/e7/Diamond_Pickaxe_JE3_BE3.png",
-        "Wooden Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d5/Wooden_Sword_JE2_BE2.png",
-        "Stone Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b1/Stone_Sword_JE2_BE2.png",
-        "Iron Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/8/8e/Iron_Sword_JE2_BE2.png",
-        "Diamond Sword": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/4/44/Diamond_Sword_JE3_BE3.png",
-        "Leather Tunic": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b7/Leather_Tunic_JE4_BE2.png",
-        "Iron Chestplate": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/31/Iron_Chestplate_JE2_BE2.png",
-        "Diamond Chestplate": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/e/e0/Diamond_Chestplate_JE3_BE2.png",
-        "Iron Ingot": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/fc/Iron_Ingot_JE3_BE2.png",
-        "Block of Iron": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/7e/Block_of_Iron_JE4_BE3.png",
-        "Brewing Stand": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b3/Brewing_Stand_%28empty%29_JE10.png",
-        "Ender Pearl": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/f6/Ender_Pearl_JE3_BE2.png",
-        "Bucket": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/fc/Bucket_JE2_BE2.png",
-        "Bow": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/a/ab/Bow_%28Pull_2%29_JE1_BE1.png",
-        "Shield": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c6/Shield_JE2_BE1.png",
-        "Red Bed": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/6/6a/Red_Bed_%28N%29.png",
-        "Netherite Scrap": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/33/Netherite_Scrap_JE2_BE1.png",
-        "Flint and Steel": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/9/94/Flint_and_Steel_JE4_BE2.png",
-        "Enchanting Table": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/31/Enchanting_Table.gif",
-        "Fishing Rod": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/7f/Fishing_Rod_JE2_BE2.png",
-        "Campfire": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/9/91/Campfire_JE2_BE2.gif",
-        "Water Bottle": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/75/Water_Bottle_JE2_BE2.png",
-        "Spyglass": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c1/Spyglass_JE2_BE1.png",
-        "Dragon Egg Shard": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/38/Dragon_Egg_JE4.png",
-        "Lead": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/1/1f/Lead_JE2_BE2.png",
-        "Saddle": "https://i.imgur.com/2QtDyR0.png",
-        "Channeling Book": "https://i.imgur.com/J3WsYZw.png",
-        "Silk Touch Book": "https://i.imgur.com/iqERxHQ.png",
-        "Piercing IV Book": "https://i.imgur.com/OzJptGz.png",
-    }
-
-    minecraft_location_ids = {
-        "Story": [42073, 42023, 42027, 42039, 42002, 42009, 42010, 42070,
-                  42041, 42049, 42004, 42031, 42025, 42029, 42051, 42077],
-        "Nether": [42017, 42044, 42069, 42058, 42034, 42060, 42066, 42076, 42064, 42071, 42021,
-                   42062, 42008, 42061, 42033, 42011, 42006, 42019, 42000, 42040, 42001, 42015, 42104, 42014],
-        "The End": [42052, 42005, 42012, 42032, 42030, 42042, 42018, 42038, 42046],
-        "Adventure": [42047, 42050, 42096, 42097, 42098, 42059, 42055, 42072, 42003, 42109, 42035, 42016, 42020,
-                      42048, 42054, 42068, 42043, 42106, 42074, 42075, 42024, 42026, 42037, 42045, 42056, 42105, 42099, 42103, 42110, 42100],
-        "Husbandry": [42065, 42067, 42078, 42022, 42113, 42107, 42007, 42079, 42013, 42028, 42036, 42108, 42111, 42112,
-                      42057, 42063, 42053, 42102, 42101, 42092, 42093, 42094, 42095],
-        "Archipelago": [42080, 42081, 42082, 42083, 42084, 42085, 42086, 42087, 42088, 42089, 42090, 42091],
-    }
-
-    display_data = {}
-
-    # Determine display for progressive items
-    progressive_items = {
-        "Progressive Tools": 45013,
-        "Progressive Weapons": 45012,
-        "Progressive Armor": 45014,
-        "Progressive Resource Crafting": 45001
-    }
-    progressive_names = {
-        "Progressive Tools": ["Wooden Pickaxe", "Stone Pickaxe", "Iron Pickaxe", "Diamond Pickaxe"],
-        "Progressive Weapons": ["Wooden Sword", "Stone Sword", "Iron Sword", "Diamond Sword"],
-        "Progressive Armor": ["Leather Tunic", "Iron Chestplate", "Diamond Chestplate"],
-        "Progressive Resource Crafting": ["Iron Ingot", "Iron Ingot", "Block of Iron"]
-    }
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
-        display_name = progressive_names[item_name][level]
-        base_name = item_name.split(maxsplit=1)[1].lower().replace(' ', '_')
-        display_data[base_name + "_url"] = icons[display_name]
-
-    # Multi-items
-    multi_items = {
-        "3 Ender Pearls": 45029,
-        "8 Netherite Scrap": 45015,
-        "Dragon Egg Shard": 45043
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        count = inventory[item_id]
-        if count >= 0:
-            display_data[base_name + "_count"] = count
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into advancement tab counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
-                        for tab_name, tab_locations in minecraft_location_ids.items()}
-    checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
-                    for tab_name, tab_locations in minecraft_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in minecraft_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    return render_template("minecraftTracker.html",
-                            inventory=inventory, icons=icons,
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                            id in lookup_any_item_id_to_name},
-                            player=player, team=team, room=room, player_name=playerName, saving_second = saving_second,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            **display_data)
-
-
-def __renderOoTTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                       inventory: Counter, team: int, player: int, playerName: str,
-                       seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                       saving_second: int) -> str:
-
-    icons = {
-        "Fairy Ocarina":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/97/OoT_Fairy_Ocarina_Icon.png",
-        "Ocarina of Time":          "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Ocarina_of_Time_Icon.png",
-        "Slingshot":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/32/OoT_Fairy_Slingshot_Icon.png",
-        "Boomerang":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/d/d5/OoT_Boomerang_Icon.png",
-        "Bottle":                   "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/fc/OoT_Bottle_Icon.png",
-        "Rutos Letter":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/OoT_Letter_Icon.png",
-        "Bombs":                    "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/11/OoT_Bomb_Icon.png",
-        "Bombchus":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/36/OoT_Bombchu_Icon.png",
-        "Lens of Truth":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/05/OoT_Lens_of_Truth_Icon.png",
-        "Bow":                      "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/9a/OoT_Fairy_Bow_Icon.png",
-        "Hookshot":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/77/OoT_Hookshot_Icon.png",
-        "Longshot":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/a/a4/OoT_Longshot_Icon.png",
-        "Megaton Hammer":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/93/OoT_Megaton_Hammer_Icon.png",
-        "Fire Arrows":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/1e/OoT_Fire_Arrow_Icon.png",
-        "Ice Arrows":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/3c/OoT_Ice_Arrow_Icon.png",
-        "Light Arrows":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/76/OoT_Light_Arrow_Icon.png",
-        "Dins Fire":                r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/d/da/OoT_Din%27s_Fire_Icon.png",
-        "Farores Wind":             r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/7a/OoT_Farore%27s_Wind_Icon.png",
-        "Nayrus Love":              r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/be/OoT_Nayru%27s_Love_Icon.png",
-        "Kokiri Sword":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/5/53/OoT_Kokiri_Sword_Icon.png",
-        "Biggoron Sword":           r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/2e/OoT_Giant%27s_Knife_Icon.png",
-        "Mirror Shield":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b0/OoT_Mirror_Shield_Icon_2.png",
-        "Goron Bracelet":           r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b7/OoT_Goron%27s_Bracelet_Icon.png",
-        "Silver Gauntlets":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b9/OoT_Silver_Gauntlets_Icon.png",
-        "Golden Gauntlets":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/6/6a/OoT_Golden_Gauntlets_Icon.png",
-        "Goron Tunic":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/1c/OoT_Goron_Tunic_Icon.png",
-        "Zora Tunic":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/2c/OoT_Zora_Tunic_Icon.png",
-        "Silver Scale":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Silver_Scale_Icon.png",
-        "Gold Scale":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/95/OoT_Golden_Scale_Icon.png",
-        "Iron Boots":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/34/OoT_Iron_Boots_Icon.png",
-        "Hover Boots":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/22/OoT_Hover_Boots_Icon.png",
-        "Adults Wallet":            r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/f9/OoT_Adult%27s_Wallet_Icon.png",
-        "Giants Wallet":            r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/8/87/OoT_Giant%27s_Wallet_Icon.png",
-        "Small Magic":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/9f/OoT3D_Magic_Jar_Icon.png",
-        "Large Magic":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/3e/OoT3D_Large_Magic_Jar_Icon.png",
-        "Gerudo Membership Card":   "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Gerudo_Token_Icon.png",
-        "Gold Skulltula Token":     "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/47/OoT_Token_Icon.png",
-        "Triforce Piece":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/0b/SS_Triforce_Piece_Icon.png",
-        "Triforce":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/6/68/ALttP_Triforce_Title_Sprite.png",
-        "Zeldas Lullaby":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Eponas Song":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Sarias Song":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Suns Song":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Song of Time":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Song of Storms":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
-        "Minuet of Forest":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/e/e4/Green_Note.png",
-        "Bolero of Fire":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/f0/Red_Note.png",
-        "Serenade of Water":        "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/0f/Blue_Note.png",
-        "Requiem of Spirit":        "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/a/a4/Orange_Note.png",
-        "Nocturne of Shadow":       "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/97/Purple_Note.png",
-        "Prelude of Light":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/90/Yellow_Note.png",
-        "Small Key":                "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/e/e5/OoT_Small_Key_Icon.png",
-        "Boss Key":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/40/OoT_Boss_Key_Icon.png",
-    }
-
-    display_data = {}
-
-    # Determine display for progressive items
-    progressive_items = {
-        "Progressive Hookshot": 66128,
-        "Progressive Strength Upgrade": 66129,
-        "Progressive Wallet": 66133,
-        "Progressive Scale": 66134,
-        "Magic Meter": 66138,
-        "Ocarina": 66139,
-    }
-
-    progressive_names = {
-        "Progressive Hookshot": ["Hookshot", "Hookshot", "Longshot"],
-        "Progressive Strength Upgrade": ["Goron Bracelet", "Goron Bracelet", "Silver Gauntlets", "Golden Gauntlets"],
-        "Progressive Wallet": ["Adults Wallet", "Adults Wallet", "Giants Wallet", "Giants Wallet"],
-        "Progressive Scale": ["Silver Scale", "Silver Scale", "Gold Scale"],
-        "Magic Meter": ["Small Magic", "Small Magic", "Large Magic"],
-        "Ocarina": ["Fairy Ocarina", "Fairy Ocarina", "Ocarina of Time"]
-    }
-
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name])-1)
-        display_name = progressive_names[item_name][level]
-        if item_name.startswith("Progressive"):
-            base_name = item_name.split(maxsplit=1)[1].lower().replace(' ', '_')
-        else:
-            base_name = item_name.lower().replace(' ', '_')
-        display_data[base_name+"_url"] = icons[display_name]
-
-        if base_name == "hookshot":
-            display_data['hookshot_length'] = {0: '', 1: 'H', 2: 'L'}.get(level)
-        if base_name == "wallet":
-            display_data['wallet_size'] = {0: '99', 1: '200', 2: '500', 3: '999'}.get(level)
-
-    # Determine display for bottles. Show letter if it's obtained, determine bottle count
-    bottle_ids = [66015, 66020, 66021, 66140, 66141, 66142, 66143, 66144, 66145, 66146, 66147, 66148]
-    display_data['bottle_count'] = min(sum(map(lambda item_id: inventory[item_id], bottle_ids)), 4)
-    display_data['bottle_url'] = icons['Rutos Letter'] if inventory[66021] > 0 else icons['Bottle']
-
-    # Determine bombchu display
-    display_data['has_bombchus'] = any(map(lambda item_id: inventory[item_id] > 0, [66003, 66106, 66107, 66137]))
-
-    # Multi-items
-    multi_items = {
-        "Gold Skulltula Token": 66091,
-        "Triforce Piece": 66202,
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        display_data[base_name+"_count"] = inventory[item_id]
-
-    # Gather dungeon locations
-    area_id_ranges = {
-        "Overworld":                ((67000, 67263), (67269, 67280), (67747, 68024), (68054, 68062)),
-        "Deku Tree":                ((67281, 67303), (68063, 68077)),
-        "Dodongo's Cavern":         ((67304, 67334), (68078, 68160)),
-        "Jabu Jabu's Belly":        ((67335, 67359), (68161, 68188)),
-        "Bottom of the Well":       ((67360, 67384), (68189, 68230)),
-        "Forest Temple":            ((67385, 67420), (68231, 68281)),
-        "Fire Temple":              ((67421, 67457), (68282, 68350)),
-        "Water Temple":             ((67458, 67484), (68351, 68483)),
-        "Shadow Temple":            ((67485, 67532), (68484, 68565)),
-        "Spirit Temple":            ((67533, 67582), (68566, 68625)),
-        "Ice Cavern":               ((67583, 67596), (68626, 68649)),
-        "Gerudo Training Ground":   ((67597, 67635), (68650, 68656)),
-        "Thieves' Hideout":         ((67264, 67268), (68025, 68053)),
-        "Ganon's Castle":           ((67636, 67673), (68657, 68705)),
-    }
-
-    def lookup_and_trim(id, area):
-        full_name = lookup_any_location_id_to_name[id]
-        if 'Ganons Tower' in full_name:
-            return full_name
-        if area not in ["Overworld", "Thieves' Hideout"]:
-            # trim dungeon name. leaves an extra space that doesn't display, or trims fully for DC/Jabu/GC
-            return full_name[len(area):]
-        return full_name
-
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set()).intersection(set(locations[player]))
-    location_info = {}
-    checks_done = {}
-    checks_in_area = {}
-    for area, ranges in area_id_ranges.items():
-        location_info[area] = {}
-        checks_done[area] = 0
-        checks_in_area[area] = 0
-        for r in ranges:
-            min_id, max_id = r
-            for id in range(min_id, max_id+1):
-                if id in locations[player]:
-                    checked = id in checked_locations
-                    location_info[area][lookup_and_trim(id, area)] = checked
-                    checks_in_area[area] += 1
-                    checks_done[area] += checked
-
-    checks_done['Total'] = sum(checks_done.values())
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    # Give skulltulas on non-tracked locations
-    non_tracked_locations = multisave.get("location_checks", {}).get((team, player), set()).difference(set(locations[player]))
-    for id in non_tracked_locations:
-        if "GS" in lookup_and_trim(id, ''):
-            display_data["token_count"] += 1
-
-    oot_y = '✔'
-    oot_x = '✕'
-
-    # Gather small and boss key info
-    small_key_counts = {
-        "Forest Temple":            oot_y if inventory[66203] else inventory[66175],
-        "Fire Temple":              oot_y if inventory[66204] else inventory[66176],
-        "Water Temple":             oot_y if inventory[66205] else inventory[66177],
-        "Spirit Temple":            oot_y if inventory[66206] else inventory[66178],
-        "Shadow Temple":            oot_y if inventory[66207] else inventory[66179],
-        "Bottom of the Well":       oot_y if inventory[66208] else inventory[66180],
-        "Gerudo Training Ground":   oot_y if inventory[66209] else inventory[66181],
-        "Thieves' Hideout":         oot_y if inventory[66210] else inventory[66182],
-        "Ganon's Castle":           oot_y if inventory[66211] else inventory[66183],
-    }
-    boss_key_counts = {
-        "Forest Temple":            oot_y if inventory[66149] else oot_x,
-        "Fire Temple":              oot_y if inventory[66150] else oot_x,
-        "Water Temple":             oot_y if inventory[66151] else oot_x,
-        "Spirit Temple":            oot_y if inventory[66152] else oot_x,
-        "Shadow Temple":            oot_y if inventory[66153] else oot_x,
-        "Ganon's Castle":           oot_y if inventory[66154] else oot_x,
-    }
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    return render_template("ootTracker.html",
-                           inventory=inventory, player=player, team=team, room=room, player_name=playerName,
-                           icons=icons, acquired_items={lookup_any_item_id_to_name[id] for id in inventory},
-                           checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                           small_key_counts=small_key_counts, boss_key_counts=boss_key_counts,
-                           **display_data)
-
-
-def __renderTimespinnerTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                               inventory: Counter, team: int, player: int, playerName: str,
-                               seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int],
-                               slot_data: Dict[str, Any], saving_second: int) -> str:
-
-    icons = {
-        "Timespinner Wheel":    "https://timespinnerwiki.com/mediawiki/images/7/76/Timespinner_Wheel.png",
-        "Timespinner Spindle":  "https://timespinnerwiki.com/mediawiki/images/1/1a/Timespinner_Spindle.png",
-        "Timespinner Gear 1":   "https://timespinnerwiki.com/mediawiki/images/3/3c/Timespinner_Gear_1.png",
-        "Timespinner Gear 2":   "https://timespinnerwiki.com/mediawiki/images/e/e9/Timespinner_Gear_2.png",
-        "Timespinner Gear 3":   "https://timespinnerwiki.com/mediawiki/images/2/22/Timespinner_Gear_3.png",
-        "Talaria Attachment":   "https://timespinnerwiki.com/mediawiki/images/6/61/Talaria_Attachment.png",
-        "Succubus Hairpin":     "https://timespinnerwiki.com/mediawiki/images/4/49/Succubus_Hairpin.png",
-        "Lightwall":            "https://timespinnerwiki.com/mediawiki/images/0/03/Lightwall.png",
-        "Celestial Sash":       "https://timespinnerwiki.com/mediawiki/images/f/f1/Celestial_Sash.png",
-        "Twin Pyramid Key":     "https://timespinnerwiki.com/mediawiki/images/4/49/Twin_Pyramid_Key.png",
-        "Security Keycard D":   "https://timespinnerwiki.com/mediawiki/images/1/1b/Security_Keycard_D.png",
-        "Security Keycard C":   "https://timespinnerwiki.com/mediawiki/images/e/e5/Security_Keycard_C.png",
-        "Security Keycard B":   "https://timespinnerwiki.com/mediawiki/images/f/f6/Security_Keycard_B.png",
-        "Security Keycard A":   "https://timespinnerwiki.com/mediawiki/images/b/b9/Security_Keycard_A.png",
-        "Library Keycard V":    "https://timespinnerwiki.com/mediawiki/images/5/50/Library_Keycard_V.png",
-        "Tablet":               "https://timespinnerwiki.com/mediawiki/images/a/a0/Tablet.png",
-        "Elevator Keycard":     "https://timespinnerwiki.com/mediawiki/images/5/55/Elevator_Keycard.png",
-        "Oculus Ring":          "https://timespinnerwiki.com/mediawiki/images/8/8d/Oculus_Ring.png",
-        "Water Mask":           "https://timespinnerwiki.com/mediawiki/images/0/04/Water_Mask.png",
-        "Gas Mask":             "https://timespinnerwiki.com/mediawiki/images/2/2e/Gas_Mask.png",
-        "Djinn Inferno":        "https://timespinnerwiki.com/mediawiki/images/f/f6/Djinn_Inferno.png",
-        "Pyro Ring":            "https://timespinnerwiki.com/mediawiki/images/2/2c/Pyro_Ring.png",
-        "Infernal Flames":      "https://timespinnerwiki.com/mediawiki/images/1/1f/Infernal_Flames.png",
-        "Fire Orb":             "https://timespinnerwiki.com/mediawiki/images/3/3e/Fire_Orb.png",
-        "Royal Ring":           "https://timespinnerwiki.com/mediawiki/images/f/f3/Royal_Ring.png",
-        "Plasma Geyser":        "https://timespinnerwiki.com/mediawiki/images/1/12/Plasma_Geyser.png",
-        "Plasma Orb":           "https://timespinnerwiki.com/mediawiki/images/4/44/Plasma_Orb.png",
-        "Kobo":                 "https://timespinnerwiki.com/mediawiki/images/c/c6/Familiar_Kobo.png",
-        "Merchant Crow":        "https://timespinnerwiki.com/mediawiki/images/4/4e/Familiar_Crow.png",
-    }
-
-    timespinner_location_ids = {
-        "Present": [
-            1337000, 1337001, 1337002, 1337003, 1337004, 1337005, 1337006, 1337007, 1337008, 1337009,
-            1337010, 1337011, 1337012, 1337013, 1337014, 1337015, 1337016, 1337017, 1337018, 1337019,
-            1337020, 1337021, 1337022, 1337023, 1337024, 1337025, 1337026, 1337027, 1337028, 1337029,
-            1337030, 1337031, 1337032, 1337033, 1337034, 1337035, 1337036, 1337037, 1337038, 1337039,
-            1337040, 1337041, 1337042, 1337043, 1337044, 1337045, 1337046, 1337047, 1337048, 1337049,
-            1337050, 1337051, 1337052, 1337053, 1337054, 1337055, 1337056, 1337057, 1337058, 1337059,
-            1337060, 1337061, 1337062, 1337063, 1337064, 1337065, 1337066, 1337067, 1337068, 1337069,
-            1337070, 1337071, 1337072, 1337073, 1337074, 1337075, 1337076, 1337077, 1337078, 1337079,
-            1337080, 1337081, 1337082, 1337083, 1337084, 1337085],
-        "Past": [
-                                                                  1337086, 1337087, 1337088, 1337089,
-            1337090, 1337091, 1337092, 1337093, 1337094, 1337095, 1337096, 1337097, 1337098, 1337099,
-            1337100, 1337101, 1337102, 1337103, 1337104, 1337105, 1337106, 1337107, 1337108, 1337109,
-            1337110, 1337111, 1337112, 1337113, 1337114, 1337115, 1337116, 1337117, 1337118, 1337119,
-            1337120, 1337121, 1337122, 1337123, 1337124, 1337125, 1337126, 1337127, 1337128, 1337129,
-            1337130, 1337131, 1337132, 1337133, 1337134, 1337135, 1337136, 1337137, 1337138, 1337139,
-            1337140, 1337141, 1337142, 1337143, 1337144, 1337145, 1337146, 1337147, 1337148, 1337149,
-            1337150, 1337151, 1337152, 1337153, 1337154, 1337155,
-                     1337171, 1337172, 1337173, 1337174, 1337175],
-        "Ancient Pyramid": [
-                                                                  1337236,
-                                                                  1337246, 1337247, 1337248, 1337249]
-    }
-
-    if(slot_data["DownloadableItems"]):
-        timespinner_location_ids["Present"] += [
-                                                                  1337156, 1337157,          1337159,
-            1337160, 1337161, 1337162, 1337163, 1337164, 1337165, 1337166, 1337167, 1337168, 1337169,
-            1337170]
-    if(slot_data["Cantoran"]):
-        timespinner_location_ids["Past"].append(1337176)
-    if(slot_data["LoreChecks"]):
-        timespinner_location_ids["Present"] += [
-                                                                           1337177, 1337178, 1337179,
-            1337180, 1337181, 1337182, 1337183, 1337184, 1337185, 1337186, 1337187]
-        timespinner_location_ids["Past"] += [
-                                                                                    1337188, 1337189,
-            1337190, 1337191, 1337192, 1337193, 1337194, 1337195, 1337196, 1337197, 1337198]
-    if(slot_data["GyreArchives"]):
-        timespinner_location_ids["Ancient Pyramid"] += [
-                                                                           1337237, 1337238, 1337239,
-            1337240, 1337241, 1337242, 1337243, 1337244, 1337245]
-
-    display_data = {}
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into advancement tab counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
-                        for tab_name, tab_locations in timespinner_location_ids.items()}
-    checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
-                    for tab_name, tab_locations in timespinner_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in timespinner_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-    acquired_items = {lookup_any_item_id_to_name[id] for id in inventory if id in lookup_any_item_id_to_name}
-    options = {k for k, v in slot_data.items() if v}
-
-    return render_template("timespinnerTracker.html",
-                            inventory=inventory, icons=icons, acquired_items=acquired_items,
-                            player=player, team=team, room=room, player_name=playerName,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            options=options, **display_data)
-
-def __renderSuperMetroidTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                                inventory: Counter, team: int, player: int, playerName: str,
-                                seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict,
-                                saving_second: int) -> str:
-
-    icons = {
-        "Energy Tank":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/ETank.png",
-        "Missile":          "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Missile.png",
-        "Super Missile":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Super.png",
-        "Power Bomb":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/PowerBomb.png",
-        "Bomb":             "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Bomb.png",
-        "Charge Beam":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Charge.png",
-        "Ice Beam":         "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Ice.png",
-        "Hi-Jump Boots":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/HiJump.png",
-        "Speed Booster":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpeedBooster.png",
-        "Wave Beam":        "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Wave.png",
-        "Spazer":           "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Spazer.png",
-        "Spring Ball":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpringBall.png",
-        "Varia Suit":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Varia.png",
-        "Plasma Beam":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Plasma.png",
-        "Grappling Beam":   "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Grapple.png",
-        "Morph Ball":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Morph.png",
-        "Reserve Tank":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Reserve.png",
-        "Gravity Suit":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Gravity.png",
-        "X-Ray Scope":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/XRayScope.png",
-        "Space Jump":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpaceJump.png",
-        "Screw Attack":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/ScrewAttack.png",
-        "Nothing":          "",
-        "No Energy":        "",
-        "Kraid":            "",
-        "Phantoon":         "",
-        "Draygon":          "",
-        "Ridley":           "",
-        "Mother Brain":     "",
-    }
-
-    multi_items = {
-        "Energy Tank": 83000,
-        "Missile": 83001,
-        "Super Missile": 83002,
-        "Power Bomb": 83003,
-        "Reserve Tank": 83020,
-    }
-
-    supermetroid_location_ids = {
-        'Crateria/Blue Brinstar': [82005, 82007, 82008, 82026, 82029,
-                     82000, 82004, 82006, 82009, 82010,
-                     82011, 82012, 82027, 82028, 82034,
-                     82036, 82037],
-        'Green/Pink Brinstar': [82017, 82023, 82030, 82033, 82035,
-                              82013, 82014, 82015, 82016, 82018,
-                              82019, 82021, 82022, 82024, 82025,
-                              82031],
-        'Red Brinstar': [82038, 82042, 82039, 82040, 82041],
-        'Kraid': [82043, 82048, 82044],
-        'Norfair': [82050, 82053, 82061, 82066, 82068,
-                    82049, 82051, 82054, 82055, 82056,
-                    82062, 82063, 82064, 82065, 82067],
-        'Lower Norfair': [82078, 82079, 82080, 82070, 82071,
-                         82073, 82074, 82075, 82076, 82077],
-        'Crocomire': [82052, 82060, 82057, 82058, 82059],
-        'Wrecked Ship': [82129, 82132, 82134, 82135, 82001,
-                        82002, 82003, 82128, 82130, 82131,
-                        82133],
-        'West Maridia': [82138, 82136, 82137, 82139, 82140,
-                        82141, 82142],
-        'East Maridia': [82143, 82145, 82150, 82152, 82154,
-                        82144, 82146, 82147, 82148, 82149,
-                        82151],
-    }
-
-    display_data = {}
-
-
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[0].lower()
-        display_data[base_name+"_count"] = inventory[item_id]
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into advancement tab counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
-                     for tab_name, tab_locations in supermetroid_location_ids.items()}
-    checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
-                   for tab_name, tab_locations in supermetroid_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in supermetroid_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    return render_template("supermetroidTracker.html",
-                            inventory=inventory, icons=icons,
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                            id in lookup_any_item_id_to_name},
-                            player=player, team=team, room=room, player_name=playerName,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            **display_data)
-
-def __renderSC2WoLTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                          inventory: Counter, team: int, player: int, playerName: str,
-                          seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int],
-                          slot_data: Dict, saving_second: int) -> str:
-
-    SC2WOL_LOC_ID_OFFSET = 1000
-    SC2WOL_ITEM_ID_OFFSET = 1000
-
-
-    icons = {
-        "Starting Minerals": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-mineral-protoss.png",
-        "Starting Vespene": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-gas-terran.png",
-        "Starting Supply": "https://static.wikia.nocookie.net/starcraft/images/d/d3/TerranSupply_SC2_Icon1.gif",
-
-        "Infantry Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel1.png",
-        "Infantry Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel2.png",
-        "Infantry Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel3.png",
-        "Infantry Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel1.png",
-        "Infantry Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel2.png",
-        "Infantry Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel3.png",
-        "Vehicle Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel1.png",
-        "Vehicle Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel2.png",
-        "Vehicle Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel3.png",
-        "Vehicle Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel1.png",
-        "Vehicle Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel2.png",
-        "Vehicle Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel3.png",
-        "Ship Weapons Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel1.png",
-        "Ship Weapons Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel2.png",
-        "Ship Weapons Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel3.png",
-        "Ship Armor Level 1": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel1.png",
-        "Ship Armor Level 2": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel2.png",
-        "Ship Armor Level 3": "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel3.png",
-
-        "Bunker": "https://static.wikia.nocookie.net/starcraft/images/c/c5/Bunker_SC2_Icon1.jpg",
-        "Missile Turret": "https://static.wikia.nocookie.net/starcraft/images/5/5f/MissileTurret_SC2_Icon1.jpg",
-        "Sensor Tower": "https://static.wikia.nocookie.net/starcraft/images/d/d2/SensorTower_SC2_Icon1.jpg",
-
-        "Projectile Accelerator (Bunker)": "https://0rganics.org/archipelago/sc2wol/ProjectileAccelerator.png",
-        "Neosteel Bunker (Bunker)": "https://0rganics.org/archipelago/sc2wol/NeosteelBunker.png",
-        "Titanium Housing (Missile Turret)": "https://0rganics.org/archipelago/sc2wol/TitaniumHousing.png",
-        "Hellstorm Batteries (Missile Turret)": "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png",
-        "Advanced Construction (SCV)": "https://0rganics.org/archipelago/sc2wol/AdvancedConstruction.png",
-        "Dual-Fusion Welders (SCV)": "https://0rganics.org/archipelago/sc2wol/Dual-FusionWelders.png",
-        "Fire-Suppression System (Building)": "https://0rganics.org/archipelago/sc2wol/Fire-SuppressionSystem.png",
-        "Orbital Command (Building)": "https://0rganics.org/archipelago/sc2wol/OrbitalCommandCampaign.png",
-
-        "Marine": "https://static.wikia.nocookie.net/starcraft/images/4/47/Marine_SC2_Icon1.jpg",
-        "Medic": "https://static.wikia.nocookie.net/starcraft/images/7/74/Medic_SC2_Rend1.jpg",
-        "Firebat": "https://static.wikia.nocookie.net/starcraft/images/3/3c/Firebat_SC2_Rend1.jpg",
-        "Marauder": "https://static.wikia.nocookie.net/starcraft/images/b/ba/Marauder_SC2_Icon1.jpg",
-        "Reaper": "https://static.wikia.nocookie.net/starcraft/images/7/7d/Reaper_SC2_Icon1.jpg",
-
-        "Stimpack (Marine)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Marine)": "/static/static/icons/sc2/superstimpack.png",
-        "Combat Shield (Marine)": "https://0rganics.org/archipelago/sc2wol/CombatShieldCampaign.png",
-        "Laser Targeting System (Marine)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Magrail Munitions (Marine)": "/static/static/icons/sc2/magrailmunitions.png",
-        "Optimized Logistics (Marine)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Advanced Medic Facilities (Medic)": "https://0rganics.org/archipelago/sc2wol/AdvancedMedicFacilities.png",
-        "Stabilizer Medpacks (Medic)": "https://0rganics.org/archipelago/sc2wol/StabilizerMedpacks.png",
-        "Restoration (Medic)": "/static/static/icons/sc2/restoration.png",
-        "Optical Flare (Medic)": "/static/static/icons/sc2/opticalflare.png",
-        "Optimized Logistics (Medic)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Incinerator Gauntlets (Firebat)": "https://0rganics.org/archipelago/sc2wol/IncineratorGauntlets.png",
-        "Juggernaut Plating (Firebat)": "https://0rganics.org/archipelago/sc2wol/JuggernautPlating.png",
-        "Stimpack (Firebat)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Firebat)": "/static/static/icons/sc2/superstimpack.png",
-        "Optimized Logistics (Firebat)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Concussive Shells (Marauder)": "https://0rganics.org/archipelago/sc2wol/ConcussiveShellsCampaign.png",
-        "Kinetic Foam (Marauder)": "https://0rganics.org/archipelago/sc2wol/KineticFoam.png",
-        "Stimpack (Marauder)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Marauder)": "/static/static/icons/sc2/superstimpack.png",
-        "Laser Targeting System (Marauder)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Magrail Munitions (Marauder)": "/static/static/icons/sc2/magrailmunitions.png",
-        "Internal Tech Module (Marauder)": "/static/static/icons/sc2/internalizedtechmodule.png",
-        "U-238 Rounds (Reaper)": "https://0rganics.org/archipelago/sc2wol/U-238Rounds.png",
-        "G-4 Clusterbomb (Reaper)": "https://0rganics.org/archipelago/sc2wol/G-4Clusterbomb.png",
-        "Stimpack (Reaper)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Reaper)": "/static/static/icons/sc2/superstimpack.png",
-        "Laser Targeting System (Reaper)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Advanced Cloaking Field (Reaper)": "/static/static/icons/sc2/terran-cloak-color.png",
-        "Spider Mines (Reaper)": "/static/static/icons/sc2/spidermine.png",
-        "Combat Drugs (Reaper)": "/static/static/icons/sc2/reapercombatdrugs.png",
-
-        "Hellion": "https://static.wikia.nocookie.net/starcraft/images/5/56/Hellion_SC2_Icon1.jpg",
-        "Vulture": "https://static.wikia.nocookie.net/starcraft/images/d/da/Vulture_WoL.jpg",
-        "Goliath": "https://static.wikia.nocookie.net/starcraft/images/e/eb/Goliath_WoL.jpg",
-        "Diamondback": "https://static.wikia.nocookie.net/starcraft/images/a/a6/Diamondback_WoL.jpg",
-        "Siege Tank": "https://static.wikia.nocookie.net/starcraft/images/5/57/SiegeTank_SC2_Icon1.jpg",
-
-        "Twin-Linked Flamethrower (Hellion)": "https://0rganics.org/archipelago/sc2wol/Twin-LinkedFlamethrower.png",
-        "Thermite Filaments (Hellion)": "https://0rganics.org/archipelago/sc2wol/ThermiteFilaments.png",
-        "Hellbat Aspect (Hellion)": "/static/static/icons/sc2/hellionbattlemode.png",
-        "Smart Servos (Hellion)": "/static/static/icons/sc2/transformationservos.png",
-        "Optimized Logistics (Hellion)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Jump Jets (Hellion)": "/static/static/icons/sc2/jumpjets.png",
-        "Stimpack (Hellion)": "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
-        "Super Stimpack (Hellion)": "/static/static/icons/sc2/superstimpack.png",
-        "Cerberus Mine (Spider Mine)": "https://0rganics.org/archipelago/sc2wol/CerberusMine.png",
-        "High Explosive Munition (Spider Mine)": "/static/static/icons/sc2/high-explosive-spidermine.png",
-        "Replenishable Magazine (Vulture)": "https://0rganics.org/archipelago/sc2wol/ReplenishableMagazine.png",
-        "Ion Thrusters (Vulture)": "/static/static/icons/sc2/emergencythrusters.png",
-        "Auto Launchers (Vulture)": "/static/static/icons/sc2/jotunboosters.png",
-        "Multi-Lock Weapons System (Goliath)": "https://0rganics.org/archipelago/sc2wol/Multi-LockWeaponsSystem.png",
-        "Ares-Class Targeting System (Goliath)": "https://0rganics.org/archipelago/sc2wol/Ares-ClassTargetingSystem.png",
-        "Jump Jets (Goliath)": "/static/static/icons/sc2/jumpjets.png",
-        "Optimized Logistics (Goliath)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Tri-Lithium Power Cell (Diamondback)": "https://0rganics.org/archipelago/sc2wol/Tri-LithiumPowerCell.png",
-        "Shaped Hull (Diamondback)": "https://0rganics.org/archipelago/sc2wol/ShapedHull.png",
-        "Hyperfluxor (Diamondback)": "/static/static/icons/sc2/hyperfluxor.png",
-        "Burst Capacitors (Diamondback)": "/static/static/icons/sc2/burstcapacitors.png",
-        "Optimized Logistics (Diamondback)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Maelstrom Rounds (Siege Tank)": "https://0rganics.org/archipelago/sc2wol/MaelstromRounds.png",
-        "Shaped Blast (Siege Tank)": "https://0rganics.org/archipelago/sc2wol/ShapedBlast.png",
-        "Jump Jets (Siege Tank)": "/static/static/icons/sc2/jumpjets.png",
-        "Spider Mines (Siege Tank)": "/static/static/icons/sc2/siegetank-spidermines.png",
-        "Smart Servos (Siege Tank)": "/static/static/icons/sc2/transformationservos.png",
-        "Graduating Range (Siege Tank)": "/static/static/icons/sc2/siegetankrange.png",
-        "Laser Targeting System (Siege Tank)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Advanced Siege Tech (Siege Tank)": "/static/static/icons/sc2/improvedsiegemode.png",
-        "Internal Tech Module (Siege Tank)": "/static/static/icons/sc2/internalizedtechmodule.png",
-
-        "Medivac": "https://static.wikia.nocookie.net/starcraft/images/d/db/Medivac_SC2_Icon1.jpg",
-        "Wraith": "https://static.wikia.nocookie.net/starcraft/images/7/75/Wraith_WoL.jpg",
-        "Viking": "https://static.wikia.nocookie.net/starcraft/images/2/2a/Viking_SC2_Icon1.jpg",
-        "Banshee": "https://static.wikia.nocookie.net/starcraft/images/3/32/Banshee_SC2_Icon1.jpg",
-        "Battlecruiser": "https://static.wikia.nocookie.net/starcraft/images/f/f5/Battlecruiser_SC2_Icon1.jpg",
-
-        "Rapid Deployment Tube (Medivac)": "https://0rganics.org/archipelago/sc2wol/RapidDeploymentTube.png",
-        "Advanced Healing AI (Medivac)": "https://0rganics.org/archipelago/sc2wol/AdvancedHealingAI.png",
-        "Expanded Hull (Medivac)": "/static/static/icons/sc2/neosteelfortifiedarmor.png",
-        "Afterburners (Medivac)": "/static/static/icons/sc2/medivacemergencythrusters.png",
-        "Tomahawk Power Cells (Wraith)": "https://0rganics.org/archipelago/sc2wol/TomahawkPowerCells.png",
-        "Displacement Field (Wraith)": "https://0rganics.org/archipelago/sc2wol/DisplacementField.png",
-        "Advanced Laser Technology (Wraith)": "/static/static/icons/sc2/improvedburstlaser.png",
-        "Ripwave Missiles (Viking)": "https://0rganics.org/archipelago/sc2wol/RipwaveMissiles.png",
-        "Phobos-Class Weapons System (Viking)": "https://0rganics.org/archipelago/sc2wol/Phobos-ClassWeaponsSystem.png",
-        "Smart Servos (Viking)": "/static/static/icons/sc2/transformationservos.png",
-        "Magrail Munitions (Viking)": "/static/static/icons/sc2/magrailmunitions.png",
-        "Cross-Spectrum Dampeners (Banshee)": "/static/static/icons/sc2/crossspectrumdampeners.png",
-        "Advanced Cross-Spectrum Dampeners (Banshee)": "https://0rganics.org/archipelago/sc2wol/Cross-SpectrumDampeners.png",
-        "Shockwave Missile Battery (Banshee)": "https://0rganics.org/archipelago/sc2wol/ShockwaveMissileBattery.png",
-        "Hyperflight Rotors (Banshee)": "/static/static/icons/sc2/hyperflightrotors.png",
-        "Laser Targeting System (Banshee)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Internal Tech Module (Banshee)": "/static/static/icons/sc2/internalizedtechmodule.png",
-        "Missile Pods (Battlecruiser)": "https://0rganics.org/archipelago/sc2wol/MissilePods.png",
-        "Defensive Matrix (Battlecruiser)": "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png",
-        "Tactical Jump (Battlecruiser)": "/static/static/icons/sc2/warpjump.png",
-        "Cloak (Battlecruiser)": "/static/static/icons/sc2/terran-cloak-color.png",
-        "ATX Laser Battery (Battlecruiser)": "/static/static/icons/sc2/specialordance.png",
-        "Optimized Logistics (Battlecruiser)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Internal Tech Module (Battlecruiser)": "/static/static/icons/sc2/internalizedtechmodule.png",
-
-        "Ghost": "https://static.wikia.nocookie.net/starcraft/images/6/6e/Ghost_SC2_Icon1.jpg",
-        "Spectre": "https://static.wikia.nocookie.net/starcraft/images/0/0d/Spectre_WoL.jpg",
-        "Thor": "https://static.wikia.nocookie.net/starcraft/images/e/ef/Thor_SC2_Icon1.jpg",
-
-        "Widow Mine": "/static/static/icons/sc2/widowmine.png",
-        "Cyclone": "/static/static/icons/sc2/cyclone.png",
-        "Liberator": "/static/static/icons/sc2/liberator.png",
-        "Valkyrie": "/static/static/icons/sc2/valkyrie.png",
-
-        "Ocular Implants (Ghost)": "https://0rganics.org/archipelago/sc2wol/OcularImplants.png",
-        "Crius Suit (Ghost)": "https://0rganics.org/archipelago/sc2wol/CriusSuit.png",
-        "EMP Rounds (Ghost)": "/static/static/icons/sc2/terran-emp-color.png",
-        "Lockdown (Ghost)": "/static/static/icons/sc2/lockdown.png",
-        "Psionic Lash (Spectre)": "https://0rganics.org/archipelago/sc2wol/PsionicLash.png",
-        "Nyx-Class Cloaking Module (Spectre)": "https://0rganics.org/archipelago/sc2wol/Nyx-ClassCloakingModule.png",
-        "Impaler Rounds (Spectre)": "/static/static/icons/sc2/impalerrounds.png",
-        "330mm Barrage Cannon (Thor)": "https://0rganics.org/archipelago/sc2wol/330mmBarrageCannon.png",
-        "Immortality Protocol (Thor)": "https://0rganics.org/archipelago/sc2wol/ImmortalityProtocol.png",
-        "High Impact Payload (Thor)": "/static/static/icons/sc2/thorsiegemode.png",
-        "Smart Servos (Thor)": "/static/static/icons/sc2/transformationservos.png",
-
-        "Optimized Logistics (Predator)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Drilling Claws (Widow Mine)": "/static/static/icons/sc2/drillingclaws.png",
-        "Concealment (Widow Mine)": "/static/static/icons/sc2/widowminehidden.png",
-        "Black Market Launchers (Widow Mine)": "/static/static/icons/sc2/widowmine-attackrange.png",
-        "Executioner Missiles (Widow Mine)": "/static/static/icons/sc2/widowmine-deathblossom.png",
-        "Mag-Field Accelerators (Cyclone)": "/static/static/icons/sc2/magfieldaccelerator.png",
-        "Mag-Field Launchers (Cyclone)": "/static/static/icons/sc2/cyclonerangeupgrade.png",
-        "Targeting Optics (Cyclone)": "/static/static/icons/sc2/targetingoptics.png",
-        "Rapid Fire Launchers (Cyclone)": "/static/static/icons/sc2/ripwavemissiles.png",
-        "Bio Mechanical Repair Drone (Raven)": "/static/static/icons/sc2/biomechanicaldrone.png",
-        "Spider Mines (Raven)": "/static/static/icons/sc2/siegetank-spidermines.png",
-        "Railgun Turret (Raven)": "/static/static/icons/sc2/autoturretblackops.png",
-        "Hunter-Seeker Weapon (Raven)": "/static/static/icons/sc2/specialordance.png",
-        "Interference Matrix (Raven)": "/static/static/icons/sc2/interferencematrix.png",
-        "Anti-Armor Missile (Raven)": "/static/static/icons/sc2/shreddermissile.png",
-        "Internal Tech Module (Raven)": "/static/static/icons/sc2/internalizedtechmodule.png",
-        "EMP Shockwave (Science Vessel)": "/static/static/icons/sc2/staticempblast.png",
-        "Defensive Matrix (Science Vessel)": "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png",
-        "Advanced Ballistics (Liberator)": "/static/static/icons/sc2/advanceballistics.png",
-        "Raid Artillery (Liberator)": "/static/static/icons/sc2/terrandefendermodestructureattack.png",
-        "Cloak (Liberator)": "/static/static/icons/sc2/terran-cloak-color.png",
-        "Laser Targeting System (Liberator)": "/static/static/icons/sc2/lasertargetingsystem.png",
-        "Optimized Logistics (Liberator)": "/static/static/icons/sc2/optimizedlogistics.png",
-        "Enhanced Cluster Launchers (Valkyrie)": "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png",
-        "Shaped Hull (Valkyrie)": "https://0rganics.org/archipelago/sc2wol/ShapedHull.png",
-        "Burst Lasers (Valkyrie)": "/static/static/icons/sc2/improvedburstlaser.png",
-        "Afterburners (Valkyrie)": "/static/static/icons/sc2/medivacemergencythrusters.png",
-
-        "War Pigs": "https://static.wikia.nocookie.net/starcraft/images/e/ed/WarPigs_SC2_Icon1.jpg",
-        "Devil Dogs": "https://static.wikia.nocookie.net/starcraft/images/3/33/DevilDogs_SC2_Icon1.jpg",
-        "Hammer Securities": "https://static.wikia.nocookie.net/starcraft/images/3/3b/HammerSecurity_SC2_Icon1.jpg",
-        "Spartan Company": "https://static.wikia.nocookie.net/starcraft/images/b/be/SpartanCompany_SC2_Icon1.jpg",
-        "Siege Breakers": "https://static.wikia.nocookie.net/starcraft/images/3/31/SiegeBreakers_SC2_Icon1.jpg",
-        "Hel's Angel": "https://static.wikia.nocookie.net/starcraft/images/6/63/HelsAngels_SC2_Icon1.jpg",
-        "Dusk Wings": "https://static.wikia.nocookie.net/starcraft/images/5/52/DuskWings_SC2_Icon1.jpg",
-        "Jackson's Revenge": "https://static.wikia.nocookie.net/starcraft/images/9/95/JacksonsRevenge_SC2_Icon1.jpg",
-
-        "Ultra-Capacitors": "https://static.wikia.nocookie.net/starcraft/images/2/23/SC2_Lab_Ultra_Capacitors_Icon.png",
-        "Vanadium Plating": "https://static.wikia.nocookie.net/starcraft/images/6/67/SC2_Lab_VanPlating_Icon.png",
-        "Orbital Depots": "https://static.wikia.nocookie.net/starcraft/images/0/01/SC2_Lab_Orbital_Depot_Icon.png",
-        "Micro-Filtering": "https://static.wikia.nocookie.net/starcraft/images/2/20/SC2_Lab_MicroFilter_Icon.png",
-        "Automated Refinery": "https://static.wikia.nocookie.net/starcraft/images/7/71/SC2_Lab_Auto_Refinery_Icon.png",
-        "Command Center Reactor": "https://static.wikia.nocookie.net/starcraft/images/e/ef/SC2_Lab_CC_Reactor_Icon.png",
-        "Raven": "https://static.wikia.nocookie.net/starcraft/images/1/19/SC2_Lab_Raven_Icon.png",
-        "Science Vessel": "https://static.wikia.nocookie.net/starcraft/images/c/c3/SC2_Lab_SciVes_Icon.png",
-        "Tech Reactor": "https://static.wikia.nocookie.net/starcraft/images/c/c5/SC2_Lab_Tech_Reactor_Icon.png",
-        "Orbital Strike": "https://static.wikia.nocookie.net/starcraft/images/d/df/SC2_Lab_Orb_Strike_Icon.png",
-
-        "Shrike Turret (Bunker)": "https://static.wikia.nocookie.net/starcraft/images/4/44/SC2_Lab_Shrike_Turret_Icon.png",
-        "Fortified Bunker (Bunker)": "https://static.wikia.nocookie.net/starcraft/images/4/4f/SC2_Lab_FortBunker_Icon.png",
-        "Planetary Fortress": "https://static.wikia.nocookie.net/starcraft/images/0/0b/SC2_Lab_PlanetFortress_Icon.png",
-        "Perdition Turret": "https://static.wikia.nocookie.net/starcraft/images/a/af/SC2_Lab_PerdTurret_Icon.png",
-        "Predator": "https://static.wikia.nocookie.net/starcraft/images/8/83/SC2_Lab_Predator_Icon.png",
-        "Hercules": "https://static.wikia.nocookie.net/starcraft/images/4/40/SC2_Lab_Hercules_Icon.png",
-        "Cellular Reactor": "https://static.wikia.nocookie.net/starcraft/images/d/d8/SC2_Lab_CellReactor_Icon.png",
-        "Regenerative Bio-Steel Level 1": "/static/static/icons/sc2/SC2_Lab_BioSteel_L1.png",
-        "Regenerative Bio-Steel Level 2": "/static/static/icons/sc2/SC2_Lab_BioSteel_L2.png",
-        "Hive Mind Emulator": "https://static.wikia.nocookie.net/starcraft/images/b/bc/SC2_Lab_Hive_Emulator_Icon.png",
-        "Psi Disrupter": "https://static.wikia.nocookie.net/starcraft/images/c/cf/SC2_Lab_Psi_Disruptor_Icon.png",
-
-        "Zealot": "https://static.wikia.nocookie.net/starcraft/images/6/6e/Icon_Protoss_Zealot.jpg",
-        "Stalker": "https://static.wikia.nocookie.net/starcraft/images/0/0d/Icon_Protoss_Stalker.jpg",
-        "High Templar": "https://static.wikia.nocookie.net/starcraft/images/a/a0/Icon_Protoss_High_Templar.jpg",
-        "Dark Templar": "https://static.wikia.nocookie.net/starcraft/images/9/90/Icon_Protoss_Dark_Templar.jpg",
-        "Immortal": "https://static.wikia.nocookie.net/starcraft/images/c/c1/Icon_Protoss_Immortal.jpg",
-        "Colossus": "https://static.wikia.nocookie.net/starcraft/images/4/40/Icon_Protoss_Colossus.jpg",
-        "Phoenix": "https://static.wikia.nocookie.net/starcraft/images/b/b1/Icon_Protoss_Phoenix.jpg",
-        "Void Ray": "https://static.wikia.nocookie.net/starcraft/images/1/1d/VoidRay_SC2_Rend1.jpg",
-        "Carrier": "https://static.wikia.nocookie.net/starcraft/images/2/2c/Icon_Protoss_Carrier.jpg",
-
-        "Nothing": "",
-    }
-    sc2wol_location_ids = {
-        "Liberation Day": range(SC2WOL_LOC_ID_OFFSET + 100, SC2WOL_LOC_ID_OFFSET + 200),
-        "The Outlaws": range(SC2WOL_LOC_ID_OFFSET + 200, SC2WOL_LOC_ID_OFFSET + 300),
-        "Zero Hour": range(SC2WOL_LOC_ID_OFFSET + 300, SC2WOL_LOC_ID_OFFSET + 400),
-        "Evacuation": range(SC2WOL_LOC_ID_OFFSET + 400, SC2WOL_LOC_ID_OFFSET + 500),
-        "Outbreak": range(SC2WOL_LOC_ID_OFFSET + 500, SC2WOL_LOC_ID_OFFSET + 600),
-        "Safe Haven": range(SC2WOL_LOC_ID_OFFSET + 600, SC2WOL_LOC_ID_OFFSET + 700),
-        "Haven's Fall": range(SC2WOL_LOC_ID_OFFSET + 700, SC2WOL_LOC_ID_OFFSET + 800),
-        "Smash and Grab": range(SC2WOL_LOC_ID_OFFSET + 800, SC2WOL_LOC_ID_OFFSET + 900),
-        "The Dig": range(SC2WOL_LOC_ID_OFFSET + 900, SC2WOL_LOC_ID_OFFSET + 1000),
-        "The Moebius Factor": range(SC2WOL_LOC_ID_OFFSET + 1000, SC2WOL_LOC_ID_OFFSET + 1100),
-        "Supernova": range(SC2WOL_LOC_ID_OFFSET + 1100, SC2WOL_LOC_ID_OFFSET + 1200),
-        "Maw of the Void": range(SC2WOL_LOC_ID_OFFSET + 1200, SC2WOL_LOC_ID_OFFSET + 1300),
-        "Devil's Playground": range(SC2WOL_LOC_ID_OFFSET + 1300, SC2WOL_LOC_ID_OFFSET + 1400),
-        "Welcome to the Jungle": range(SC2WOL_LOC_ID_OFFSET + 1400, SC2WOL_LOC_ID_OFFSET + 1500),
-        "Breakout": range(SC2WOL_LOC_ID_OFFSET + 1500, SC2WOL_LOC_ID_OFFSET + 1600),
-        "Ghost of a Chance": range(SC2WOL_LOC_ID_OFFSET + 1600, SC2WOL_LOC_ID_OFFSET + 1700),
-        "The Great Train Robbery": range(SC2WOL_LOC_ID_OFFSET + 1700, SC2WOL_LOC_ID_OFFSET + 1800),
-        "Cutthroat": range(SC2WOL_LOC_ID_OFFSET + 1800, SC2WOL_LOC_ID_OFFSET + 1900),
-        "Engine of Destruction": range(SC2WOL_LOC_ID_OFFSET + 1900, SC2WOL_LOC_ID_OFFSET + 2000),
-        "Media Blitz": range(SC2WOL_LOC_ID_OFFSET + 2000, SC2WOL_LOC_ID_OFFSET + 2100),
-        "Piercing the Shroud": range(SC2WOL_LOC_ID_OFFSET + 2100, SC2WOL_LOC_ID_OFFSET + 2200),
-        "Whispers of Doom": range(SC2WOL_LOC_ID_OFFSET + 2200, SC2WOL_LOC_ID_OFFSET + 2300),
-        "A Sinister Turn": range(SC2WOL_LOC_ID_OFFSET + 2300, SC2WOL_LOC_ID_OFFSET + 2400),
-        "Echoes of the Future": range(SC2WOL_LOC_ID_OFFSET + 2400, SC2WOL_LOC_ID_OFFSET + 2500),
-        "In Utter Darkness": range(SC2WOL_LOC_ID_OFFSET + 2500, SC2WOL_LOC_ID_OFFSET + 2600),
-        "Gates of Hell": range(SC2WOL_LOC_ID_OFFSET + 2600, SC2WOL_LOC_ID_OFFSET + 2700),
-        "Belly of the Beast": range(SC2WOL_LOC_ID_OFFSET + 2700, SC2WOL_LOC_ID_OFFSET + 2800),
-        "Shatter the Sky": range(SC2WOL_LOC_ID_OFFSET + 2800, SC2WOL_LOC_ID_OFFSET + 2900),
-    }
-
-    display_data = {}
-
-    # Grouped Items
-    grouped_item_ids = {
-        "Progressive Weapon Upgrade": 107 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Armor Upgrade": 108 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Infantry Upgrade": 109 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Upgrade": 110 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Upgrade": 111 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Weapon/Armor Upgrade": 112 + SC2WOL_ITEM_ID_OFFSET
-    }
-    grouped_item_replacements = {
-        "Progressive Weapon Upgrade": ["Progressive Infantry Weapon", "Progressive Vehicle Weapon", "Progressive Ship Weapon"],
-        "Progressive Armor Upgrade": ["Progressive Infantry Armor", "Progressive Vehicle Armor", "Progressive Ship Armor"],
-        "Progressive Infantry Upgrade": ["Progressive Infantry Weapon", "Progressive Infantry Armor"],
-        "Progressive Vehicle Upgrade": ["Progressive Vehicle Weapon", "Progressive Vehicle Armor"],
-        "Progressive Ship Upgrade": ["Progressive Ship Weapon", "Progressive Ship Armor"]
-    }
-    grouped_item_replacements["Progressive Weapon/Armor Upgrade"] = grouped_item_replacements["Progressive Weapon Upgrade"] + grouped_item_replacements["Progressive Armor Upgrade"]
-    replacement_item_ids = {
-        "Progressive Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET,
-    }
-    for grouped_item_name, grouped_item_id in grouped_item_ids.items():
-        count: int = inventory[grouped_item_id]
-        if count > 0:
-            for replacement_item in grouped_item_replacements[grouped_item_name]:
-                replacement_id: int = replacement_item_ids[replacement_item]
-                inventory[replacement_id] = count
-
-    # Determine display for progressive items
-    progressive_items = {
-        "Progressive Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Infantry Armor": 102 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Weapon": 103 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Vehicle Armor": 104 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Weapon": 105 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Ship Armor": 106 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Marine)": 208 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Firebat)": 226 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Marauder)": 228 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Reaper)": 250 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Stimpack (Hellion)": 259 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive High Impact Payload (Thor)": 361 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Cross-Spectrum Dampeners (Banshee)": 316 + SC2WOL_ITEM_ID_OFFSET,
-        "Progressive Regenerative Bio-Steel": 617 + SC2WOL_ITEM_ID_OFFSET
-    }
-    progressive_names = {
-        "Progressive Infantry Weapon": ["Infantry Weapons Level 1", "Infantry Weapons Level 1", "Infantry Weapons Level 2", "Infantry Weapons Level 3"],
-        "Progressive Infantry Armor": ["Infantry Armor Level 1", "Infantry Armor Level 1", "Infantry Armor Level 2", "Infantry Armor Level 3"],
-        "Progressive Vehicle Weapon": ["Vehicle Weapons Level 1", "Vehicle Weapons Level 1", "Vehicle Weapons Level 2", "Vehicle Weapons Level 3"],
-        "Progressive Vehicle Armor": ["Vehicle Armor Level 1", "Vehicle Armor Level 1", "Vehicle Armor Level 2", "Vehicle Armor Level 3"],
-        "Progressive Ship Weapon": ["Ship Weapons Level 1", "Ship Weapons Level 1", "Ship Weapons Level 2", "Ship Weapons Level 3"],
-        "Progressive Ship Armor": ["Ship Armor Level 1", "Ship Armor Level 1", "Ship Armor Level 2", "Ship Armor Level 3"],
-        "Progressive Stimpack (Marine)": ["Stimpack (Marine)", "Stimpack (Marine)", "Super Stimpack (Marine)"],
-        "Progressive Stimpack (Firebat)": ["Stimpack (Firebat)", "Stimpack (Firebat)", "Super Stimpack (Firebat)"],
-        "Progressive Stimpack (Marauder)": ["Stimpack (Marauder)", "Stimpack (Marauder)", "Super Stimpack (Marauder)"],
-        "Progressive Stimpack (Reaper)": ["Stimpack (Reaper)", "Stimpack (Reaper)", "Super Stimpack (Reaper)"],
-        "Progressive Stimpack (Hellion)": ["Stimpack (Hellion)", "Stimpack (Hellion)", "Super Stimpack (Hellion)"],
-        "Progressive High Impact Payload (Thor)": ["High Impact Payload (Thor)", "High Impact Payload (Thor)", "Smart Servos (Thor)"],
-        "Progressive Cross-Spectrum Dampeners (Banshee)": ["Cross-Spectrum Dampeners (Banshee)", "Cross-Spectrum Dampeners (Banshee)", "Advanced Cross-Spectrum Dampeners (Banshee)"],
-        "Progressive Regenerative Bio-Steel": ["Regenerative Bio-Steel Level 1", "Regenerative Bio-Steel Level 1", "Regenerative Bio-Steel Level 2"]
-    }
-    for item_name, item_id in progressive_items.items():
-        level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
-        display_name = progressive_names[item_name][level]
-        base_name = (item_name.split(maxsplit=1)[1].lower()
-                     .replace(' ', '_')
-                     .replace("-", "")
-                     .replace("(", "")
-                     .replace(")", ""))
-        display_data[base_name + "_level"] = level
-        display_data[base_name + "_url"] = icons[display_name]
-        display_data[base_name + "_name"] = display_name
-
-    # Multi-items
-    multi_items = {
-        "+15 Starting Minerals": 800 + SC2WOL_ITEM_ID_OFFSET,
-        "+15 Starting Vespene": 801 + SC2WOL_ITEM_ID_OFFSET,
-        "+2 Starting Supply": 802 + SC2WOL_ITEM_ID_OFFSET
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        count = inventory[item_id]
-        if base_name == "supply":
-            count = count * 2
-            display_data[base_name + "_count"] = count
-        else:
-            count = count * 15
-            display_data[base_name + "_count"] = count
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    # Turn location IDs into mission objective counts
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {mission_name: {lookup_name(id): (id in checked_locations) for id in mission_locations if id in set(locations[player])} for mission_name, mission_locations in sc2wol_location_ids.items()}
-    checks_done = {mission_name: len([id for id in mission_locations if id in checked_locations and id in set(locations[player])]) for mission_name, mission_locations in sc2wol_location_ids.items()}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = {mission_name: len([id for id in mission_locations if id in set(locations[player])]) for mission_name, mission_locations in sc2wol_location_ids.items()}
-    checks_in_area['Total'] = sum(checks_in_area.values())
-
-    return render_template("sc2wolTracker.html",
-                           inventory=inventory, icons=icons,
-                           acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                           id in lookup_any_item_id_to_name},
-                           player=player, team=team, room=room, player_name=playerName,
-                           checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                           **display_data)
-
-def __renderChecksfinder(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                             inventory: Counter, team: int, player: int, playerName: str,
-                             seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int], slot_data: Dict, saving_second: int) -> str:
-
-    icons = {
-        "Checks Available": "https://0rganics.org/archipelago/cf/spr_tiles_3.png",
-        "Map Width": "https://0rganics.org/archipelago/cf/spr_tiles_4.png",
-        "Map Height": "https://0rganics.org/archipelago/cf/spr_tiles_5.png",
-        "Map Bombs": "https://0rganics.org/archipelago/cf/spr_tiles_6.png",
-
-        "Nothing": "",
-    }
-
-    checksfinder_location_ids = {
-        "Tile 1": 81000,
-        "Tile 2": 81001,
-        "Tile 3": 81002,
-        "Tile 4": 81003,
-        "Tile 5": 81004,
-        "Tile 6": 81005,
-        "Tile 7": 81006,
-        "Tile 8": 81007,
-        "Tile 9": 81008,
-        "Tile 10": 81009,
-        "Tile 11": 81010,
-        "Tile 12": 81011,
-        "Tile 13": 81012,
-        "Tile 14": 81013,
-        "Tile 15": 81014,
-        "Tile 16": 81015,
-        "Tile 17": 81016,
-        "Tile 18": 81017,
-        "Tile 19": 81018,
-        "Tile 20": 81019,
-        "Tile 21": 81020,
-        "Tile 22": 81021,
-        "Tile 23": 81022,
-        "Tile 24": 81023,
-        "Tile 25": 81024,
-    }
-
-    display_data = {}
-
-    # Multi-items
-    multi_items = {
-        "Map Width": 80000,
-        "Map Height": 80001,
-        "Map Bombs": 80002
-    }
-    for item_name, item_id in multi_items.items():
-        base_name = item_name.split()[-1].lower()
-        count = inventory[item_id]
-        display_data[base_name + "_count"] = count
-        display_data[base_name + "_display"] = count + 5
-
-    # Get location info
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    lookup_name = lambda id: lookup_any_location_id_to_name[id]
-    location_info = {tile_name: {lookup_name(tile_location): (tile_location in checked_locations)} for tile_name, tile_location in checksfinder_location_ids.items() if tile_location in set(locations[player])}
-    checks_done = {tile_name: len([tile_location]) for tile_name, tile_location in checksfinder_location_ids.items() if tile_location in checked_locations and tile_location in set(locations[player])}
-    checks_done['Total'] = len(checked_locations)
-    checks_in_area = checks_done
-
-    # Calculate checks available
-    display_data["checks_unlocked"] = min(display_data["width_count"] + display_data["height_count"] + display_data["bombs_count"] + 5, 25)
-    display_data["checks_available"] = max(display_data["checks_unlocked"] - len(checked_locations), 0)
-
-    # Victory condition
-    game_state = multisave.get("client_game_state", {}).get((team, player), 0)
-    display_data['game_finished'] = game_state == 30
-
-    return render_template("checksfinderTracker.html",
-                            inventory=inventory, icons=icons,
-                            acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
-                                            id in lookup_any_item_id_to_name},
-                            player=player, team=team, room=room, player_name=playerName,
-                            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
-                            **display_data)
-
-def __renderGenericTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int, int]]],
-                           inventory: Counter, team: int, player: int, playerName: str,
-                           seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int],
-                           saving_second: int, custom_locations: Dict[int, str], custom_items: Dict[int, str]) -> str:
-
-    checked_locations = multisave.get("location_checks", {}).get((team, player), set())
-    player_received_items = {}
-    if multisave.get('version', 0) > 0:
-        ordered_items = multisave.get('received_items', {}).get((team, player, True), [])
-    else:
-        ordered_items = multisave.get('received_items', {}).get((team, player), [])
-
-    # add numbering to all items but starter_inventory
-    for order_index, networkItem in enumerate(ordered_items, start=1):
-        player_received_items[networkItem.item] = order_index
-
-    return render_template("genericTracker.html",
-                           inventory=inventory,
-                           player=player, team=team, room=room, player_name=playerName,
-                           checked_locations=checked_locations,
-                           not_checked_locations=set(locations[player]) - checked_locations,
-                           received_items=player_received_items, saving_second=saving_second,
-                           custom_items=custom_items, custom_locations=custom_locations)
-
-
-def get_enabled_multiworld_trackers(room: Room, current: str):
-    enabled = [
-        {
-            "name": "Generic",
-            "endpoint": "get_multiworld_tracker",
-            "current": current == "Generic"
-         }
-    ]
-    for game_name, endpoint in multi_trackers.items():
-        if any(slot.game == game_name for slot in room.seed.slots) or current == game_name:
-            enabled.append({
-                "name": game_name,
-                "endpoint": endpoint.__name__,
-                "current": current == game_name}
-            )
-    return enabled
-
-
-def _get_multiworld_tracker_data(tracker: UUID) -> typing.Optional[typing.Dict[str, typing.Any]]:
-    room: Room = Room.get(tracker=tracker)
+@app.route("/tracker/<suuid:tracker>", defaults={"game": "Generic"})
+@app.route("/tracker/<suuid:tracker>/<game>")
+@cache.memoize(timeout=TRACKER_CACHE_TIMEOUT_IN_SECONDS)
+def get_multiworld_tracker(tracker: UUID, game: str):
+    # Room must exist.
+    room = Room.get(tracker=tracker)
     if not room:
-        return None
+        abort(404)
 
-    locations, names, use_door_tracker, checks_in_area, player_location_to_area, \
-        precollected_items, games, slot_data, groups, saving_second, custom_locations, custom_items = \
-        get_static_room_data(room)
+    tracker_data = TrackerData(room)
+    enabled_trackers = list(get_enabled_multiworld_trackers(room).keys())
+    if game not in _multiworld_trackers:
+        return render_generic_multiworld_tracker(tracker_data, enabled_trackers)
 
-    checks_done = {teamnumber: {playernumber: {loc_name: 0 for loc_name in default_locations}
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                   for teamnumber, team in enumerate(names)}
+    return _multiworld_trackers[game](tracker_data, enabled_trackers)
 
-    percent_total_checks_done = {teamnumber: {playernumber: 0
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                    for teamnumber, team in enumerate(names)}
 
-    total_locations = {teamnumber: sum(len(locations[playernumber])
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups)
-                    for teamnumber, team in enumerate(names)}
+def get_timeout_and_tracker(tracker: UUID, tracked_team: int, tracked_player: int, generic: bool) -> Tuple[int, str]:
+    # Room must exist.
+    room = Room.get(tracker=tracker)
+    if not room:
+        abort(404)
 
-    hints = {team: set() for team in range(len(names))}
-    if room.multisave:
-        multisave = restricted_loads(room.multisave)
+    tracker_data = TrackerData(room)
+
+    # Load and render the game-specific player tracker, or fallback to generic tracker if none exists.
+    game_specific_tracker = _player_trackers.get(tracker_data.get_player_game(tracked_team, tracked_player), None)
+    if game_specific_tracker and not generic:
+        tracker = game_specific_tracker(tracker_data, tracked_team, tracked_player)
     else:
-        multisave = {}
-    if "hints" in multisave:
-        for (team, slot), slot_hints in multisave["hints"].items():
-            hints[team] |= set(slot_hints)
+        tracker = render_generic_tracker(tracker_data, tracked_team, tracked_player)
 
-    for (team, player), locations_checked in multisave.get("location_checks", {}).items():
-        if player in groups:
-            continue
-        player_locations = locations[player]
-        checks_done[team][player]["Total"] = len(locations_checked)
-        percent_total_checks_done[team][player] = int(checks_done[team][player]["Total"] /
-                                                      len(player_locations) * 100) \
-            if player_locations else 100
+    return (tracker_data.get_room_saving_second() - datetime.datetime.now().second) % 60 or 60, tracker
 
-    activity_timers = {}
-    now = datetime.datetime.utcnow()
-    for (team, player), timestamp in multisave.get("client_activity_timers", []):
-        activity_timers[team, player] = now - datetime.datetime.utcfromtimestamp(timestamp)
 
-    player_names = {}
-    completed_worlds = 0
-    states: typing.Dict[typing.Tuple[int, int], int] = {}
-    for team, names in enumerate(names):
-        for player, name in enumerate(names, 1):
-            player_names[team, player] = name
-            states[team, player] = multisave.get("client_game_state", {}).get((team, player), 0)
-            if states[team, player] == ClientStatus.CLIENT_GOAL and player not in groups:
-                completed_worlds += 1
-    long_player_names = player_names.copy()
-    for (team, player), alias in multisave.get("name_aliases", {}).items():
-        player_names[team, player] = alias
-        long_player_names[(team, player)] = f"{alias} ({long_player_names[team, player]})"
+def get_enabled_multiworld_trackers(room: Room) -> Dict[str, Callable]:
+    # Render the multitracker for any games that exist in the current room if they are defined.
+    enabled_trackers = {}
+    for game_name, endpoint in _multiworld_trackers.items():
+        if any(slot.game == game_name for slot in room.seed.slots):
+            enabled_trackers[game_name] = endpoint
 
-    video = {}
-    for (team, player), data in multisave.get("video", []):
-        video[team, player] = data
+    # We resort the tracker to have Generic first, then lexicographically each enabled game.
+    return {
+        "Generic": render_generic_multiworld_tracker,
+        **{key: enabled_trackers[key] for key in sorted(enabled_trackers.keys())},
+    }
 
-    return dict(
-        player_names=player_names, room=room, checks_done=checks_done,
-        percent_total_checks_done=percent_total_checks_done, checks_in_area=checks_in_area,
-        activity_timers=activity_timers, video=video, hints=hints,
-        long_player_names=long_player_names,
-        multisave=multisave, precollected_items=precollected_items, groups=groups,
-        locations=locations, total_locations=total_locations, games=games, states=states,
-        completed_worlds=completed_worlds,
-        custom_locations=custom_locations, custom_items=custom_items,
+
+def render_generic_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+    game = tracker_data.get_player_game(team, player)
+
+    # Add received index to all received items, excluding starting inventory.
+    received_items_in_order = {}
+    for received_index, network_item in enumerate(tracker_data.get_player_received_items(team, player), start=1):
+        received_items_in_order[network_item.item] = received_index
+
+    return render_template(
+        template_name_or_list="genericTracker.html",
+        game_specific_tracker=game in _player_trackers,
+        room=tracker_data.room,
+        team=team,
+        player=player,
+        player_name=tracker_data.get_room_long_player_names()[team, player],
+        inventory=tracker_data.get_player_inventory_counts(team, player),
+        locations=tracker_data.get_player_locations(team, player),
+        checked_locations=tracker_data.get_player_checked_locations(team, player),
+        received_items=received_items_in_order,
+        saving_second=tracker_data.get_room_saving_second(),
+        game=game,
+        games=tracker_data.get_room_games(),
+        player_names_with_alias=tracker_data.get_room_long_player_names(),
+        location_id_to_name=tracker_data.location_id_to_name,
+        item_id_to_name=tracker_data.item_id_to_name,
+        hints=tracker_data.get_player_hints(team, player),
     )
 
 
-def _get_inventory_data(data: typing.Dict[str, typing.Any]) \
-        -> typing.Dict[int, typing.Dict[int, typing.Dict[int, int]]]:
-    inventory: typing.Dict[int, typing.Dict[int, typing.Dict[int, int]]] = {
-        teamnumber: {playernumber: collections.Counter() for playernumber in team_data}
-        for teamnumber, team_data in data["checks_done"].items()
-    }
-
-    groups = data["groups"]
-
-    for (team, player), locations_checked in data["multisave"].get("location_checks", {}).items():
-        if player in data["groups"]:
-            continue
-        player_locations = data["locations"][player]
-        precollected = data["precollected_items"][player]
-        for item_id in precollected:
-            inventory[team][player][item_id] += 1
-        for location in locations_checked:
-            item_id, recipient, flags = player_locations[location]
-            recipients = groups.get(recipient, [recipient])
-            for recipient in recipients:
-                inventory[team][recipient][item_id] += 1
-    return inventory
+def render_generic_multiworld_tracker(tracker_data: TrackerData, enabled_trackers: List[str]) -> str:
+    return render_template(
+        "multitracker.html",
+        enabled_trackers=enabled_trackers,
+        current_tracker="Generic",
+        room=tracker_data.room,
+        room_players=tracker_data.get_team_players(),
+        locations=tracker_data.get_room_locations(),
+        locations_complete=tracker_data.get_room_locations_complete(),
+        total_team_locations=tracker_data.get_team_locations_total_count(),
+        total_team_locations_complete=tracker_data.get_team_locations_checked_count(),
+        player_names_with_alias=tracker_data.get_room_long_player_names(),
+        completed_worlds=tracker_data.get_team_completed_worlds_count(),
+        games=tracker_data.get_room_games(),
+        states=tracker_data.get_room_client_statuses(),
+        hints=tracker_data.get_team_hints(),
+        activity_timers=tracker_data.get_room_last_activity(),
+        videos=tracker_data.get_room_videos(),
+        item_id_to_name=tracker_data.item_id_to_name,
+        location_id_to_name=tracker_data.location_id_to_name,
+    )
 
 
-def _get_named_inventory(inventory: typing.Dict[int, int], custom_items: typing.Dict[int, str] = None) \
-        -> typing.Dict[str, int]:
-    """slow"""
-    if custom_items:
-        mapping = collections.ChainMap(custom_items, lookup_any_item_id_to_name)
-    else:
-        mapping = lookup_any_item_id_to_name
+# TODO: This is a temporary solution until a proper Tracker API can be implemented for tracker templates and data to
+#       live in their respective world folders.
+import collections
 
-    return collections.Counter({mapping.get(item_id, None): count for item_id, count in inventory.items()})
+from worlds import network_data_package
 
 
-@app.route('/tracker/<suuid:tracker>')
-@cache.memoize(timeout=60)  # multisave is currently created at most every minute
-def get_multiworld_tracker(tracker: UUID):
-    data = _get_multiworld_tracker_data(tracker)
-    if not data:
-        abort(404)
+if "Factorio" in network_data_package["games"]:
+    def render_Factorio_multiworld_tracker(tracker_data: TrackerData, enabled_trackers: List[str]):
+        inventories: Dict[TeamPlayer, Dict[int, int]] = {
+            (team, player): {
+                tracker_data.item_id_to_name["Factorio"][item_id]: count
+                for item_id, count in tracker_data.get_player_inventory_counts(team, player).items()
+            } for team, players in tracker_data.get_team_players().items() for player in players
+            if tracker_data.get_player_game(team, player) == "Factorio"
+        }
 
-    data["enabled_multiworld_trackers"] = get_enabled_multiworld_trackers(data["room"], "Generic")
+        return render_template(
+            "multitracker__Factorio.html",
+            enabled_trackers=enabled_trackers,
+            current_tracker="Factorio",
+            room=tracker_data.room,
+            room_players=tracker_data.get_team_players(),
+            locations=tracker_data.get_room_locations(),
+            locations_complete=tracker_data.get_room_locations_complete(),
+            total_team_locations=tracker_data.get_team_locations_total_count(),
+            total_team_locations_complete=tracker_data.get_team_locations_checked_count(),
+            player_names_with_alias=tracker_data.get_room_long_player_names(),
+            completed_worlds=tracker_data.get_team_completed_worlds_count(),
+            games=tracker_data.get_room_games(),
+            states=tracker_data.get_room_client_statuses(),
+            hints=tracker_data.get_team_hints(),
+            activity_timers=tracker_data.get_room_last_activity(),
+            videos=tracker_data.get_room_videos(),
+            item_id_to_name=tracker_data.item_id_to_name,
+            location_id_to_name=tracker_data.location_id_to_name,
+            inventories=inventories,
+        )
 
-    return render_template("multiTracker.html", **data)
+    _multiworld_trackers["Factorio"] = render_Factorio_multiworld_tracker
 
-if "Factorio" in games:
-    @app.route('/tracker/<suuid:tracker>/Factorio')
-    @cache.memoize(timeout=60)  # multisave is currently created at most every minute
-    def get_Factorio_multiworld_tracker(tracker: UUID):
-        data = _get_multiworld_tracker_data(tracker)
-        if not data:
-            abort(404)
+if "A Link to the Past" in network_data_package["games"]:
+    def render_ALinkToThePast_multiworld_tracker(tracker_data: TrackerData, enabled_trackers: List[str]):
+        # Helper objects.
+        alttp_id_lookup = tracker_data.item_name_to_id["A Link to the Past"]
 
-        data["inventory"] = _get_inventory_data(data)
-        data["named_inventory"] = {team_id : {
-            player_id: _get_named_inventory(inventory, data["custom_items"])
-            for player_id, inventory in team_inventory.items()
-        } for team_id, team_inventory in data["inventory"].items()}
-        data["enabled_multiworld_trackers"] = get_enabled_multiworld_trackers(data["room"], "Factorio")
+        multi_items = {
+            alttp_id_lookup[name]
+            for name in ("Progressive Sword", "Progressive Bow", "Bottle", "Progressive Glove", "Triforce Piece")
+        }
+        links = {
+            "Bow":                   "Progressive Bow",
+            "Silver Arrows":         "Progressive Bow",
+            "Silver Bow":            "Progressive Bow",
+            "Progressive Bow (Alt)": "Progressive Bow",
+            "Bottle (Red Potion)":   "Bottle",
+            "Bottle (Green Potion)": "Bottle",
+            "Bottle (Blue Potion)":  "Bottle",
+            "Bottle (Fairy)":        "Bottle",
+            "Bottle (Bee)":          "Bottle",
+            "Bottle (Good Bee)":     "Bottle",
+            "Fighter Sword":         "Progressive Sword",
+            "Master Sword":          "Progressive Sword",
+            "Tempered Sword":        "Progressive Sword",
+            "Golden Sword":          "Progressive Sword",
+            "Power Glove":           "Progressive Glove",
+            "Titans Mitts":          "Progressive Glove",
+        }
+        links = {alttp_id_lookup[key]: alttp_id_lookup[value] for key, value in links.items()}
+        levels = {
+            "Fighter Sword":   1,
+            "Master Sword":    2,
+            "Tempered Sword":  3,
+            "Golden Sword":    4,
+            "Power Glove":     1,
+            "Titans Mitts":    2,
+            "Bow":             1,
+            "Silver Bow":      2,
+            "Triforce Piece": 90,
+        }
+        tracking_names = [
+            "Progressive Sword", "Progressive Bow", "Book of Mudora", "Hammer", "Hookshot", "Magic Mirror", "Flute",
+            "Pegasus Boots", "Progressive Glove", "Flippers", "Moon Pearl", "Blue Boomerang", "Red Boomerang",
+            "Bug Catching Net", "Cape", "Shovel", "Lamp", "Mushroom", "Magic Powder", "Cane of Somaria",
+            "Cane of Byrna", "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake", "Bottle", "Triforce Piece", "Triforce",
+        ]
+        default_locations = {
+            "Light World": {
+                1572864, 1572865, 60034, 1572867, 1572868, 60037, 1572869, 1572866, 60040, 59788, 60046, 60175,
+                1572880, 60049, 60178, 1572883, 60052, 60181, 1572885, 60055, 60184, 191256, 60058, 60187, 1572884,
+                1572886, 1572887, 1572906, 60202, 60205, 59824, 166320, 1010170, 60208, 60211, 60214, 60217, 59836,
+                60220, 60223, 59839, 1573184, 60226, 975299, 1573188, 1573189, 188229, 60229, 60232, 1573193,
+                1573194, 60235, 1573187, 59845, 59854, 211407, 60238, 59857, 1573185, 1573186, 1572882, 212328,
+                59881, 59761, 59890, 59770, 193020, 212605
+            },
+            "Dark World": {
+                59776, 59779, 975237, 1572870, 60043, 1572881, 60190, 60193, 60196, 60199, 60840, 1573190, 209095,
+                1573192, 1573191, 60241, 60244, 60247, 60250, 59884, 59887, 60019, 60022, 60028, 60031
+            },
+            "Desert Palace": {1573216, 59842, 59851, 59791, 1573201, 59830},
+            "Eastern Palace": {1573200, 59827, 59893, 59767, 59833, 59773},
+            "Hyrule Castle": {60256, 60259, 60169, 60172, 59758, 59764, 60025, 60253},
+            "Agahnims Tower": {60082, 60085},
+            "Tower of Hera": {1573218, 59878, 59821, 1573202, 59896, 59899},
+            "Swamp Palace": {60064, 60067, 60070, 59782, 59785, 60073, 60076, 60079, 1573204, 60061},
+            "Thieves Town": {59905, 59908, 59911, 59914, 59917, 59920, 59923, 1573206},
+            "Skull Woods": {59809, 59902, 59848, 59794, 1573205, 59800, 59803, 59806},
+            "Ice Palace": {59872, 59875, 59812, 59818, 59860, 59797, 1573207, 59869},
+            "Misery Mire": {60001, 60004, 60007, 60010, 60013, 1573208, 59866, 59998},
+            "Turtle Rock": {59938, 59941, 59944, 1573209, 59947, 59950, 59953, 59956, 59926, 59929, 59932, 59935},
+            "Palace of Darkness": {
+                59968, 59971, 59974, 59977, 59980, 59983, 59986, 1573203, 59989, 59959, 59992, 59962, 59995,
+                59965
+            },
+            "Ganons Tower": {
+                60160, 60163, 60166, 60088, 60091, 60094, 60097, 60100, 60103, 60106, 60109, 60112, 60115, 60118,
+                60121, 60124, 60127, 1573217, 60130, 60133, 60136, 60139, 60142, 60145, 60148, 60151, 60157
+            },
+            "Total": set()
+        }
+        key_only_locations = {
+            "Light World": set(),
+            "Dark World": set(),
+            "Desert Palace": {0x140031, 0x14002b, 0x140061, 0x140028},
+            "Eastern Palace": {0x14005b, 0x140049},
+            "Hyrule Castle": {0x140037, 0x140034, 0x14000d, 0x14003d},
+            "Agahnims Tower": {0x140061, 0x140052},
+            "Tower of Hera": set(),
+            "Swamp Palace": {0x140019, 0x140016, 0x140013, 0x140010, 0x14000a},
+            "Thieves Town": {0x14005e, 0x14004f},
+            "Skull Woods": {0x14002e, 0x14001c},
+            "Ice Palace": {0x140004, 0x140022, 0x140025, 0x140046},
+            "Misery Mire": {0x140055, 0x14004c, 0x140064},
+            "Turtle Rock": {0x140058, 0x140007},
+            "Palace of Darkness": set(),
+            "Ganons Tower": {0x140040, 0x140043, 0x14003a, 0x14001f},
+            "Total": set()
+        }
+        location_to_area = {}
+        for area, locations in default_locations.items():
+            for location in locations:
+                location_to_area[location] = area
+        for area, locations in key_only_locations.items():
+            for location in locations:
+                location_to_area[location] = area
 
-        return render_template("multiFactorioTracker.html", **data)
+        checks_in_area = {area: len(checks) for area, checks in default_locations.items()}
+        checks_in_area["Total"] = 216
+        ordered_areas = (
+            "Light World", "Dark World", "Hyrule Castle", "Agahnims Tower", "Eastern Palace", "Desert Palace",
+            "Tower of Hera", "Palace of Darkness", "Swamp Palace", "Skull Woods", "Thieves Town", "Ice Palace",
+            "Misery Mire", "Turtle Rock", "Ganons Tower", "Total"
+        )
 
+        player_checks_in_area = {
+            (team, player): {
+                area_name: len(tracker_data._multidata["checks_in_area"][player][area_name])
+                if area_name != "Total" else tracker_data._multidata["checks_in_area"][player]["Total"]
+                for area_name in ordered_areas
+            }
+            for team, players in tracker_data.get_team_players().items()
+            for player in players
+            if tracker_data.get_slot_info(team, player).type != SlotType.group and
+            tracker_data.get_slot_info(team, player).game == "A Link to the Past"
+        }
 
-@app.route('/tracker/<suuid:tracker>/A Link to the Past')
-@cache.memoize(timeout=60)  # multisave is currently created at most every minute
-def get_LttP_multiworld_tracker(tracker: UUID):
-    room: Room = Room.get(tracker=tracker)
-    if not room:
-        abort(404)
-    locations, names, use_door_tracker, seed_checks_in_area, player_location_to_area, \
-        precollected_items, games, slot_data, groups, saving_second, custom_locations, custom_items = \
-        get_static_room_data(room)
+        tracking_ids = []
+        for item in tracking_names:
+            tracking_ids.append(alttp_id_lookup[item])
 
-    inventory = {teamnumber: {playernumber: collections.Counter() for playernumber in range(1, len(team) + 1) if
-                              playernumber not in groups}
-                 for teamnumber, team in enumerate(names)}
+        # Can't wait to get this into the apworld. Oof.
+        from worlds.alttp import Items
 
-    checks_done = {teamnumber: {playernumber: {loc_name: 0 for loc_name in default_locations}
-                                for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                   for teamnumber, team in enumerate(names)}
+        small_key_ids = {}
+        big_key_ids = {}
+        ids_small_key = {}
+        ids_big_key = {}
+        for item_name, data in Items.item_table.items():
+            if "Key" in item_name:
+                area = item_name.split("(")[1][:-1]
+                if "Small" in item_name:
+                    small_key_ids[area] = data[2]
+                    ids_small_key[data[2]] = area
+                else:
+                    big_key_ids[area] = data[2]
+                    ids_big_key[data[2]] = area
 
-    percent_total_checks_done = {teamnumber: {playernumber: 0
-                                              for playernumber in range(1, len(team) + 1) if playernumber not in groups}
-                                 for teamnumber, team in enumerate(names)}
+        def _get_location_table(checks_table: dict) -> dict:
+            loc_to_area = {}
+            for area, locations in checks_table.items():
+                if area == "Total":
+                    continue
+                for location in locations:
+                    loc_to_area[location] = area
+            return loc_to_area
 
-    hints = {team: set() for team in range(len(names))}
-    if room.multisave:
-        multisave = restricted_loads(room.multisave)
-    else:
-        multisave = {}
-    if "hints" in multisave:
-        for (team, slot), slot_hints in multisave["hints"].items():
-            hints[team] |= set(slot_hints)
+        player_location_to_area = {
+            (team, player): _get_location_table(tracker_data._multidata["checks_in_area"][player])
+            for team, players in tracker_data.get_team_players().items()
+            for player in players
+            if tracker_data.get_slot_info(team, player).type != SlotType.group and
+            tracker_data.get_slot_info(team, player).game == "A Link to the Past"
+        }
 
-    def attribute_item(team: int, recipient: int, item: int):
-        nonlocal inventory
-        target_item = links.get(item, item)
-        if item in levels:  # non-progressive
-            inventory[team][recipient][target_item] = max(inventory[team][recipient][target_item], levels[item])
-        else:
-            inventory[team][recipient][target_item] += 1
+        checks_done: Dict[TeamPlayer, Dict[str: int]] = {
+            (team, player): {location_name: 0 for location_name in default_locations}
+            for team, players in tracker_data.get_team_players().items()
+            for player in players
+            if tracker_data.get_slot_info(team, player).type != SlotType.group and
+            tracker_data.get_slot_info(team, player).game == "A Link to the Past"
+        }
 
-    for (team, player), locations_checked in multisave.get("location_checks", {}).items():
-        if player in groups:
-            continue
-        player_locations = locations[player]
-        if precollected_items:
-            precollected = precollected_items[player]
-            for item_id in precollected:
-                attribute_item(team, player, item_id)
-        for location in locations_checked:
-            if location not in player_locations or location not in player_location_to_area.get(player, {}):
-                continue
-            item, recipient, flags = player_locations[location]
-            recipients = groups.get(recipient, [recipient])
-            for recipient in recipients:
-                attribute_item(team, recipient, item)
-                checks_done[team][player][player_location_to_area[player][location]] += 1
-                checks_done[team][player]["Total"] += 1
-        percent_total_checks_done[team][player] = int(
-            checks_done[team][player]["Total"] / len(player_locations) * 100) if \
-        player_locations else 100
+        inventories: Dict[TeamPlayer, Dict[int, int]] = {}
+        player_big_key_locations = {(player): set() for player in tracker_data.get_team_players()[0]}
+        player_small_key_locations = {player: set() for player in tracker_data.get_team_players()[0]}
+        group_big_key_locations = set()
+        group_key_locations = set()
 
-    for (team, player), game_state in multisave.get("client_game_state", {}).items():
-        if player in groups:
-            continue
-        if game_state == 30:
-            inventory[team][player][106] = 1  # Triforce
+        for (team, player), locations in checks_done.items():
+            # Check if game complete.
+            if tracker_data.get_player_client_status(team, player) == ClientStatus.CLIENT_GOAL:
+                inventories[team, player][106] = 1  # Triforce
 
-    player_big_key_locations = {playernumber: set() for playernumber in range(1, len(names[0]) + 1)}
-    player_small_key_locations = {playernumber: set() for playernumber in range(1, len(names[0]) + 1)}
-    for loc_data in locations.values():
-        for values in loc_data.values():
-            item_id, item_player, flags = values
+            # Count number of locations checked.
+            for location in tracker_data.get_player_checked_locations(team, player):
+                checks_done[team, player][player_location_to_area[team, player][location]] += 1
+                checks_done[team, player]["Total"] += 1
 
+            # Count keys.
+            for location, (item, receiving, _) in tracker_data.get_player_locations(team, player).items():
+                if item in ids_big_key:
+                    player_big_key_locations[receiving].add(ids_big_key[item])
+                elif item in ids_small_key:
+                    player_small_key_locations[receiving].add(ids_small_key[item])
+
+            # Iterate over received items and build inventory/key counts.
+            inventories[team, player] = collections.Counter()
+            for network_item in tracker_data.get_player_received_items(team, player):
+                target_item = links.get(network_item.item, network_item.item)
+                if network_item.item in levels:  # non-progressive
+                    inventories[team, player][target_item] = (max(inventories[team, player][target_item], levels[network_item.item]))
+                else:
+                    inventories[team, player][target_item] += 1
+
+            group_key_locations |= player_small_key_locations[player]
+            group_big_key_locations |= player_big_key_locations[player]
+
+        return render_template(
+            "multitracker__ALinkToThePast.html",
+            enabled_trackers=enabled_trackers,
+            current_tracker="A Link to the Past",
+            room=tracker_data.room,
+            room_players=tracker_data.get_team_players(),
+            locations=tracker_data.get_room_locations(),
+            locations_complete=tracker_data.get_room_locations_complete(),
+            total_team_locations=tracker_data.get_team_locations_total_count(),
+            total_team_locations_complete=tracker_data.get_team_locations_checked_count(),
+            player_names_with_alias=tracker_data.get_room_long_player_names(),
+            completed_worlds=tracker_data.get_team_completed_worlds_count(),
+            games=tracker_data.get_room_games(),
+            states=tracker_data.get_room_client_statuses(),
+            hints=tracker_data.get_team_hints(),
+            activity_timers=tracker_data.get_room_last_activity(),
+            videos=tracker_data.get_room_videos(),
+            item_id_to_name=tracker_data.item_id_to_name,
+            location_id_to_name=tracker_data.location_id_to_name,
+            inventories=inventories,
+            tracking_names=tracking_names,
+            tracking_ids=tracking_ids,
+            multi_items=multi_items,
+            checks_done=checks_done,
+            ordered_areas=ordered_areas,
+            checks_in_area=player_checks_in_area,
+            key_locations=group_key_locations,
+            big_key_locations=group_big_key_locations,
+            small_key_ids=small_key_ids,
+            big_key_ids=big_key_ids,
+        )
+
+    def render_ALinkToThePast_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+        # Helper objects.
+        alttp_id_lookup = tracker_data.item_name_to_id["A Link to the Past"]
+
+        links = {
+            "Bow":                   "Progressive Bow",
+            "Silver Arrows":         "Progressive Bow",
+            "Silver Bow":            "Progressive Bow",
+            "Progressive Bow (Alt)": "Progressive Bow",
+            "Bottle (Red Potion)":   "Bottle",
+            "Bottle (Green Potion)": "Bottle",
+            "Bottle (Blue Potion)":  "Bottle",
+            "Bottle (Fairy)":        "Bottle",
+            "Bottle (Bee)":          "Bottle",
+            "Bottle (Good Bee)":     "Bottle",
+            "Fighter Sword":         "Progressive Sword",
+            "Master Sword":          "Progressive Sword",
+            "Tempered Sword":        "Progressive Sword",
+            "Golden Sword":          "Progressive Sword",
+            "Power Glove":           "Progressive Glove",
+            "Titans Mitts":          "Progressive Glove",
+        }
+        links = {alttp_id_lookup[key]: alttp_id_lookup[value] for key, value in links.items()}
+        levels = {
+            "Fighter Sword":   1,
+            "Master Sword":    2,
+            "Tempered Sword":  3,
+            "Golden Sword":    4,
+            "Power Glove":     1,
+            "Titans Mitts":    2,
+            "Bow":             1,
+            "Silver Bow":      2,
+            "Triforce Piece": 90,
+        }
+        tracking_names = [
+            "Progressive Sword", "Progressive Bow", "Book of Mudora", "Hammer", "Hookshot", "Magic Mirror", "Flute",
+            "Pegasus Boots", "Progressive Glove", "Flippers", "Moon Pearl", "Blue Boomerang", "Red Boomerang",
+            "Bug Catching Net", "Cape", "Shovel", "Lamp", "Mushroom", "Magic Powder", "Cane of Somaria",
+            "Cane of Byrna", "Fire Rod", "Ice Rod", "Bombos", "Ether", "Quake", "Bottle", "Triforce Piece", "Triforce",
+        ]
+        default_locations = {
+            "Light World": {
+                1572864, 1572865, 60034, 1572867, 1572868, 60037, 1572869, 1572866, 60040, 59788, 60046, 60175,
+                1572880, 60049, 60178, 1572883, 60052, 60181, 1572885, 60055, 60184, 191256, 60058, 60187, 1572884,
+                1572886, 1572887, 1572906, 60202, 60205, 59824, 166320, 1010170, 60208, 60211, 60214, 60217, 59836,
+                60220, 60223, 59839, 1573184, 60226, 975299, 1573188, 1573189, 188229, 60229, 60232, 1573193,
+                1573194, 60235, 1573187, 59845, 59854, 211407, 60238, 59857, 1573185, 1573186, 1572882, 212328,
+                59881, 59761, 59890, 59770, 193020, 212605
+            },
+            "Dark World": {
+                59776, 59779, 975237, 1572870, 60043, 1572881, 60190, 60193, 60196, 60199, 60840, 1573190, 209095,
+                1573192, 1573191, 60241, 60244, 60247, 60250, 59884, 59887, 60019, 60022, 60028, 60031
+            },
+            "Desert Palace": {1573216, 59842, 59851, 59791, 1573201, 59830},
+            "Eastern Palace": {1573200, 59827, 59893, 59767, 59833, 59773},
+            "Hyrule Castle": {60256, 60259, 60169, 60172, 59758, 59764, 60025, 60253},
+            "Agahnims Tower": {60082, 60085},
+            "Tower of Hera": {1573218, 59878, 59821, 1573202, 59896, 59899},
+            "Swamp Palace": {60064, 60067, 60070, 59782, 59785, 60073, 60076, 60079, 1573204, 60061},
+            "Thieves Town": {59905, 59908, 59911, 59914, 59917, 59920, 59923, 1573206},
+            "Skull Woods": {59809, 59902, 59848, 59794, 1573205, 59800, 59803, 59806},
+            "Ice Palace": {59872, 59875, 59812, 59818, 59860, 59797, 1573207, 59869},
+            "Misery Mire": {60001, 60004, 60007, 60010, 60013, 1573208, 59866, 59998},
+            "Turtle Rock": {59938, 59941, 59944, 1573209, 59947, 59950, 59953, 59956, 59926, 59929, 59932, 59935},
+            "Palace of Darkness": {
+                59968, 59971, 59974, 59977, 59980, 59983, 59986, 1573203, 59989, 59959, 59992, 59962, 59995,
+                59965
+            },
+            "Ganons Tower": {
+                60160, 60163, 60166, 60088, 60091, 60094, 60097, 60100, 60103, 60106, 60109, 60112, 60115, 60118,
+                60121, 60124, 60127, 1573217, 60130, 60133, 60136, 60139, 60142, 60145, 60148, 60151, 60157
+            },
+            "Total": set()
+        }
+        key_only_locations = {
+            "Light World": set(),
+            "Dark World": set(),
+            "Desert Palace": {0x140031, 0x14002b, 0x140061, 0x140028},
+            "Eastern Palace": {0x14005b, 0x140049},
+            "Hyrule Castle": {0x140037, 0x140034, 0x14000d, 0x14003d},
+            "Agahnims Tower": {0x140061, 0x140052},
+            "Tower of Hera": set(),
+            "Swamp Palace": {0x140019, 0x140016, 0x140013, 0x140010, 0x14000a},
+            "Thieves Town": {0x14005e, 0x14004f},
+            "Skull Woods": {0x14002e, 0x14001c},
+            "Ice Palace": {0x140004, 0x140022, 0x140025, 0x140046},
+            "Misery Mire": {0x140055, 0x14004c, 0x140064},
+            "Turtle Rock": {0x140058, 0x140007},
+            "Palace of Darkness": set(),
+            "Ganons Tower": {0x140040, 0x140043, 0x14003a, 0x14001f},
+            "Total": set()
+        }
+        location_to_area = {}
+        for area, locations in default_locations.items():
+            for checked_location in locations:
+                location_to_area[checked_location] = area
+        for area, locations in key_only_locations.items():
+            for checked_location in locations:
+                location_to_area[checked_location] = area
+
+        checks_in_area = {area: len(checks) for area, checks in default_locations.items()}
+        checks_in_area["Total"] = 216
+        ordered_areas = (
+            "Light World", "Dark World", "Hyrule Castle", "Agahnims Tower", "Eastern Palace", "Desert Palace",
+            "Tower of Hera", "Palace of Darkness", "Swamp Palace", "Skull Woods", "Thieves Town", "Ice Palace",
+            "Misery Mire", "Turtle Rock", "Ganons Tower", "Total"
+        )
+
+        tracking_ids = []
+        for item in tracking_names:
+            tracking_ids.append(alttp_id_lookup[item])
+
+        # Can't wait to get this into the apworld. Oof.
+        from worlds.alttp import Items
+
+        small_key_ids = {}
+        big_key_ids = {}
+        ids_small_key = {}
+        ids_big_key = {}
+        for item_name, data in Items.item_table.items():
+            if "Key" in item_name:
+                area = item_name.split("(")[1][:-1]
+                if "Small" in item_name:
+                    small_key_ids[area] = data[2]
+                    ids_small_key[data[2]] = area
+                else:
+                    big_key_ids[area] = data[2]
+                    ids_big_key[data[2]] = area
+
+        inventory = collections.Counter()
+        checks_done = {loc_name: 0 for loc_name in default_locations}
+        player_big_key_locations = set()
+        player_small_key_locations = set()
+
+        player_locations = tracker_data.get_player_locations(team, player)
+        for checked_location in tracker_data.get_player_checked_locations(team, player):
+            if checked_location in player_locations:
+                area_name = location_to_area.get(checked_location, None)
+                if area_name:
+                    checks_done[area_name] += 1
+
+                checks_done["Total"] += 1
+
+        for received_item in tracker_data.get_player_received_items(team, player):
+            target_item = links.get(received_item.item, received_item.item)
+            if received_item.item in levels:  # non-progressive
+                inventory[target_item] = max(inventory[target_item], levels[received_item.item])
+            else:
+                inventory[target_item] += 1
+
+        for location, (item_id, _, _) in player_locations.items():
             if item_id in ids_big_key:
-                player_big_key_locations[item_player].add(ids_big_key[item_id])
+                player_big_key_locations.add(ids_big_key[item_id])
             elif item_id in ids_small_key:
-                player_small_key_locations[item_player].add(ids_small_key[item_id])
-    group_big_key_locations = set()
-    group_key_locations = set()
-    for player in [player for player in range(1, len(names[0]) + 1) if player not in groups]:
-        group_key_locations |= player_small_key_locations[player]
-        group_big_key_locations |= player_big_key_locations[player]
+                player_small_key_locations.add(ids_small_key[item_id])
 
-    activity_timers = {}
-    now = datetime.datetime.utcnow()
-    for (team, player), timestamp in multisave.get("client_activity_timers", []):
-        activity_timers[team, player] = now - datetime.datetime.utcfromtimestamp(timestamp)
+        # Note the presence of the triforce item
+        if tracker_data.get_player_client_status(team, player) == ClientStatus.CLIENT_GOAL:
+            inventory[106] = 1  # Triforce
 
-    player_names = {}
-    for team, names in enumerate(names):
-        for player, name in enumerate(names, 1):
-            player_names[(team, player)] = name
-    long_player_names = player_names.copy()
-    for (team, player), alias in multisave.get("name_aliases", {}).items():
-        player_names[(team, player)] = alias
-        long_player_names[(team, player)] = f"{alias} ({long_player_names[(team, player)]})"
+        # Progressive items need special handling for icons and class
+        progressive_items = {
+            "Progressive Sword":  94,
+            "Progressive Glove":  97,
+            "Progressive Bow":    100,
+            "Progressive Mail":   96,
+            "Progressive Shield": 95,
+        }
+        progressive_names = {
+            "Progressive Sword":  [None, "Fighter Sword", "Master Sword", "Tempered Sword", "Golden Sword"],
+            "Progressive Glove":  [None, "Power Glove", "Titan Mitts"],
+            "Progressive Bow":    [None, "Bow", "Silver Bow"],
+            "Progressive Mail":   ["Green Mail", "Blue Mail", "Red Mail"],
+            "Progressive Shield": [None, "Blue Shield", "Red Shield", "Mirror Shield"]
+        }
 
-    video = {}
-    for (team, player), data in multisave.get("video", []):
-        video[(team, player)] = data
+        # Determine which icon to use
+        display_data = {}
+        for item_name, item_id in progressive_items.items():
+            level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
+            display_name = progressive_names[item_name][level]
+            acquired = True
+            if not display_name:
+                acquired = False
+                display_name = progressive_names[item_name][level + 1]
+            base_name = item_name.split(maxsplit=1)[1].lower()
+            display_data[base_name + "_acquired"] = acquired
+            display_data[base_name + "_icon"] = display_name
 
-    enabled_multiworld_trackers = get_enabled_multiworld_trackers(room, "A Link to the Past")
+        # The single player tracker doesn't care about overworld, underworld, and total checks. Maybe it should?
+        sp_areas = ordered_areas[2:15]
 
-    return render_template("lttpMultiTracker.html", inventory=inventory, get_item_name_from_id=lookup_any_item_id_to_name,
-                           lookup_id_to_name=Items.lookup_id_to_name, player_names=player_names,
-                           tracking_names=tracking_names, tracking_ids=tracking_ids, room=room, icons=alttp_icons,
-                           multi_items=multi_items, checks_done=checks_done,
-                           percent_total_checks_done=percent_total_checks_done,
-                           ordered_areas=ordered_areas, checks_in_area=seed_checks_in_area,
-                           activity_timers=activity_timers,
-                           key_locations=group_key_locations, small_key_ids=small_key_ids, big_key_ids=big_key_ids,
-                           video=video, big_key_locations=group_big_key_locations,
-                           hints=hints, long_player_names=long_player_names,
-                           enabled_multiworld_trackers=enabled_multiworld_trackers)
+        return render_template(
+            template_name_or_list="tracker__ALinkToThePast.html",
+            room=tracker_data.room,
+            team=team,
+            player=player,
+            inventory=inventory,
+            player_name=tracker_data.get_player_name(team, player),
+            checks_done=checks_done,
+            checks_in_area=checks_in_area,
+            acquired_items={tracker_data.item_id_to_name["A Link to the Past"][id] for id in inventory},
+            sp_areas=sp_areas,
+            small_key_ids=small_key_ids,
+            key_locations=player_small_key_locations,
+            big_key_ids=big_key_ids,
+            big_key_locations=player_big_key_locations,
+            **display_data,
+        )
 
+    _multiworld_trackers["A Link to the Past"] = render_ALinkToThePast_multiworld_tracker
+    _player_trackers["A Link to the Past"] = render_ALinkToThePast_tracker
 
-game_specific_trackers: typing.Dict[str, typing.Callable] = {
-    "Minecraft": __renderMinecraftTracker,
-    "Ocarina of Time": __renderOoTTracker,
-    "Timespinner": __renderTimespinnerTracker,
-    "A Link to the Past": __renderAlttpTracker,
-    "ChecksFinder": __renderChecksfinder,
-    "Super Metroid": __renderSuperMetroidTracker,
-    "Starcraft 2 Wings of Liberty": __renderSC2WoLTracker
-}
+if "Minecraft" in network_data_package["games"]:
+    def render_Minecraft_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+        icons = {
+            "Wooden Pickaxe":     "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d2/Wooden_Pickaxe_JE3_BE3.png",
+            "Stone Pickaxe":      "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c4/Stone_Pickaxe_JE2_BE2.png",
+            "Iron Pickaxe":       "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d1/Iron_Pickaxe_JE3_BE2.png",
+            "Diamond Pickaxe":    "https://static.wikia.nocookie.net/minecraft_gamepedia/images/e/e7/Diamond_Pickaxe_JE3_BE3.png",
+            "Wooden Sword":       "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d5/Wooden_Sword_JE2_BE2.png",
+            "Stone Sword":        "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b1/Stone_Sword_JE2_BE2.png",
+            "Iron Sword":         "https://static.wikia.nocookie.net/minecraft_gamepedia/images/8/8e/Iron_Sword_JE2_BE2.png",
+            "Diamond Sword":      "https://static.wikia.nocookie.net/minecraft_gamepedia/images/4/44/Diamond_Sword_JE3_BE3.png",
+            "Leather Tunic":      "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b7/Leather_Tunic_JE4_BE2.png",
+            "Iron Chestplate":    "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/31/Iron_Chestplate_JE2_BE2.png",
+            "Diamond Chestplate": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/e/e0/Diamond_Chestplate_JE3_BE2.png",
+            "Iron Ingot":         "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/fc/Iron_Ingot_JE3_BE2.png",
+            "Block of Iron":      "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/7e/Block_of_Iron_JE4_BE3.png",
+            "Brewing Stand":      "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b3/Brewing_Stand_%28empty%29_JE10.png",
+            "Ender Pearl":        "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/f6/Ender_Pearl_JE3_BE2.png",
+            "Bucket":             "https://static.wikia.nocookie.net/minecraft_gamepedia/images/f/fc/Bucket_JE2_BE2.png",
+            "Bow":                "https://static.wikia.nocookie.net/minecraft_gamepedia/images/a/ab/Bow_%28Pull_2%29_JE1_BE1.png",
+            "Shield":             "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c6/Shield_JE2_BE1.png",
+            "Red Bed":            "https://static.wikia.nocookie.net/minecraft_gamepedia/images/6/6a/Red_Bed_%28N%29.png",
+            "Netherite Scrap":    "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/33/Netherite_Scrap_JE2_BE1.png",
+            "Flint and Steel":    "https://static.wikia.nocookie.net/minecraft_gamepedia/images/9/94/Flint_and_Steel_JE4_BE2.png",
+            "Enchanting Table":   "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/31/Enchanting_Table.gif",
+            "Fishing Rod":        "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/7f/Fishing_Rod_JE2_BE2.png",
+            "Campfire":           "https://static.wikia.nocookie.net/minecraft_gamepedia/images/9/91/Campfire_JE2_BE2.gif",
+            "Water Bottle":       "https://static.wikia.nocookie.net/minecraft_gamepedia/images/7/75/Water_Bottle_JE2_BE2.png",
+            "Spyglass":           "https://static.wikia.nocookie.net/minecraft_gamepedia/images/c/c1/Spyglass_JE2_BE1.png",
+            "Dragon Egg Shard":   "https://static.wikia.nocookie.net/minecraft_gamepedia/images/3/38/Dragon_Egg_JE4.png",
+            "Lead":               "https://static.wikia.nocookie.net/minecraft_gamepedia/images/1/1f/Lead_JE2_BE2.png",
+            "Saddle":             "https://i.imgur.com/2QtDyR0.png",
+            "Channeling Book":    "https://i.imgur.com/J3WsYZw.png",
+            "Silk Touch Book":    "https://i.imgur.com/iqERxHQ.png",
+            "Piercing IV Book":   "https://i.imgur.com/OzJptGz.png",
+        }
 
-multi_trackers: typing.Dict[str, typing.Callable] = {
-    "A Link to the Past": get_LttP_multiworld_tracker,
-}
+        minecraft_location_ids = {
+            "Story":       [42073, 42023, 42027, 42039, 42002, 42009, 42010, 42070,
+                            42041, 42049, 42004, 42031, 42025, 42029, 42051, 42077],
+            "Nether":      [42017, 42044, 42069, 42058, 42034, 42060, 42066, 42076, 42064, 42071, 42021,
+                            42062, 42008, 42061, 42033, 42011, 42006, 42019, 42000, 42040, 42001, 42015, 42104, 42014],
+            "The End":     [42052, 42005, 42012, 42032, 42030, 42042, 42018, 42038, 42046],
+            "Adventure":   [42047, 42050, 42096, 42097, 42098, 42059, 42055, 42072, 42003, 42109, 42035, 42016, 42020,
+                            42048, 42054, 42068, 42043, 42106, 42074, 42075, 42024, 42026, 42037, 42045, 42056, 42105,
+                            42099, 42103, 42110, 42100],
+            "Husbandry":   [42065, 42067, 42078, 42022, 42113, 42107, 42007, 42079, 42013, 42028, 42036, 42108, 42111,
+                            42112,
+                            42057, 42063, 42053, 42102, 42101, 42092, 42093, 42094, 42095],
+            "Archipelago": [42080, 42081, 42082, 42083, 42084, 42085, 42086, 42087, 42088, 42089, 42090, 42091],
+        }
 
-if "Factorio" in games:
-    multi_trackers["Factorio"] = get_Factorio_multiworld_tracker
+        display_data = {}
+
+        # Determine display for progressive items
+        progressive_items = {
+            "Progressive Tools":             45013,
+            "Progressive Weapons":           45012,
+            "Progressive Armor":             45014,
+            "Progressive Resource Crafting": 45001
+        }
+        progressive_names = {
+            "Progressive Tools":             ["Wooden Pickaxe", "Stone Pickaxe", "Iron Pickaxe", "Diamond Pickaxe"],
+            "Progressive Weapons":           ["Wooden Sword", "Stone Sword", "Iron Sword", "Diamond Sword"],
+            "Progressive Armor":             ["Leather Tunic", "Iron Chestplate", "Diamond Chestplate"],
+            "Progressive Resource Crafting": ["Iron Ingot", "Iron Ingot", "Block of Iron"]
+        }
+
+        inventory = tracker_data.get_player_inventory_counts(team, player)
+        for item_name, item_id in progressive_items.items():
+            level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
+            display_name = progressive_names[item_name][level]
+            base_name = item_name.split(maxsplit=1)[1].lower().replace(" ", "_")
+            display_data[base_name + "_url"] = icons[display_name]
+
+        # Multi-items
+        multi_items = {
+            "3 Ender Pearls":    45029,
+            "8 Netherite Scrap": 45015,
+            "Dragon Egg Shard":  45043
+        }
+        for item_name, item_id in multi_items.items():
+            base_name = item_name.split()[-1].lower()
+            count = inventory[item_id]
+            if count >= 0:
+                display_data[base_name + "_count"] = count
+
+        # Victory condition
+        game_state = tracker_data.get_player_client_status(team, player)
+        display_data["game_finished"] = game_state == 30
+
+        # Turn location IDs into advancement tab counts
+        checked_locations = tracker_data.get_player_checked_locations(team, player)
+        lookup_name = lambda id: tracker_data.location_id_to_name["Minecraft"][id]
+        location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
+                         for tab_name, tab_locations in minecraft_location_ids.items()}
+        checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
+                       for tab_name, tab_locations in minecraft_location_ids.items()}
+        checks_done["Total"] = len(checked_locations)
+        checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in minecraft_location_ids.items()}
+        checks_in_area["Total"] = sum(checks_in_area.values())
+
+        lookup_any_item_id_to_name = tracker_data.item_id_to_name["Minecraft"]
+        return render_template(
+            "tracker__Minecraft.html",
+            inventory=inventory,
+            icons=icons,
+            acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0},
+            player=player,
+            team=team,
+            room=tracker_data.room,
+            player_name=tracker_data.get_player_name(team, player),
+            saving_second=tracker_data.get_room_saving_second(),
+            checks_done=checks_done,
+            checks_in_area=checks_in_area,
+            location_info=location_info,
+            **display_data,
+        )
+
+    _player_trackers["Minecraft"] = render_Minecraft_tracker
+
+if "Ocarina of Time" in network_data_package["games"]:
+    def render_OcarinaOfTime_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+        icons = {
+            "Fairy Ocarina":          "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/97/OoT_Fairy_Ocarina_Icon.png",
+            "Ocarina of Time":        "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Ocarina_of_Time_Icon.png",
+            "Slingshot":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/32/OoT_Fairy_Slingshot_Icon.png",
+            "Boomerang":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/d/d5/OoT_Boomerang_Icon.png",
+            "Bottle":                 "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/fc/OoT_Bottle_Icon.png",
+            "Rutos Letter":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/OoT_Letter_Icon.png",
+            "Bombs":                  "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/11/OoT_Bomb_Icon.png",
+            "Bombchus":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/36/OoT_Bombchu_Icon.png",
+            "Lens of Truth":          "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/05/OoT_Lens_of_Truth_Icon.png",
+            "Bow":                    "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/9a/OoT_Fairy_Bow_Icon.png",
+            "Hookshot":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/77/OoT_Hookshot_Icon.png",
+            "Longshot":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/a/a4/OoT_Longshot_Icon.png",
+            "Megaton Hammer":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/93/OoT_Megaton_Hammer_Icon.png",
+            "Fire Arrows":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/1e/OoT_Fire_Arrow_Icon.png",
+            "Ice Arrows":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/3c/OoT_Ice_Arrow_Icon.png",
+            "Light Arrows":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/76/OoT_Light_Arrow_Icon.png",
+            "Dins Fire":              r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/d/da/OoT_Din%27s_Fire_Icon.png",
+            "Farores Wind":           r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/7/7a/OoT_Farore%27s_Wind_Icon.png",
+            "Nayrus Love":            r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/be/OoT_Nayru%27s_Love_Icon.png",
+            "Kokiri Sword":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/5/53/OoT_Kokiri_Sword_Icon.png",
+            "Biggoron Sword":         r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/2e/OoT_Giant%27s_Knife_Icon.png",
+            "Mirror Shield":          "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b0/OoT_Mirror_Shield_Icon_2.png",
+            "Goron Bracelet":         r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b7/OoT_Goron%27s_Bracelet_Icon.png",
+            "Silver Gauntlets":       "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/b/b9/OoT_Silver_Gauntlets_Icon.png",
+            "Golden Gauntlets":       "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/6/6a/OoT_Golden_Gauntlets_Icon.png",
+            "Goron Tunic":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/1/1c/OoT_Goron_Tunic_Icon.png",
+            "Zora Tunic":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/2c/OoT_Zora_Tunic_Icon.png",
+            "Silver Scale":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Silver_Scale_Icon.png",
+            "Gold Scale":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/95/OoT_Golden_Scale_Icon.png",
+            "Iron Boots":             "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/34/OoT_Iron_Boots_Icon.png",
+            "Hover Boots":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/22/OoT_Hover_Boots_Icon.png",
+            "Adults Wallet":          r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/f9/OoT_Adult%27s_Wallet_Icon.png",
+            "Giants Wallet":          r"https://static.wikia.nocookie.net/zelda_gamepedia_en/images/8/87/OoT_Giant%27s_Wallet_Icon.png",
+            "Small Magic":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/9f/OoT3D_Magic_Jar_Icon.png",
+            "Large Magic":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/3/3e/OoT3D_Large_Magic_Jar_Icon.png",
+            "Gerudo Membership Card": "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/4e/OoT_Gerudo_Token_Icon.png",
+            "Gold Skulltula Token":   "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/47/OoT_Token_Icon.png",
+            "Triforce Piece":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/0b/SS_Triforce_Piece_Icon.png",
+            "Triforce":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/6/68/ALttP_Triforce_Title_Sprite.png",
+            "Zeldas Lullaby":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
+            "Eponas Song":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
+            "Sarias Song":            "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
+            "Suns Song":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
+            "Song of Time":           "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
+            "Song of Storms":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/2/21/Grey_Note.png",
+            "Minuet of Forest":       "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/e/e4/Green_Note.png",
+            "Bolero of Fire":         "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/f/f0/Red_Note.png",
+            "Serenade of Water":      "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/0/0f/Blue_Note.png",
+            "Requiem of Spirit":      "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/a/a4/Orange_Note.png",
+            "Nocturne of Shadow":     "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/97/Purple_Note.png",
+            "Prelude of Light":       "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/90/Yellow_Note.png",
+            "Small Key":              "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/e/e5/OoT_Small_Key_Icon.png",
+            "Boss Key":               "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/4/40/OoT_Boss_Key_Icon.png",
+        }
+
+        display_data = {}
+
+        # Determine display for progressive items
+        progressive_items = {
+            "Progressive Hookshot":         66128,
+            "Progressive Strength Upgrade": 66129,
+            "Progressive Wallet":           66133,
+            "Progressive Scale":            66134,
+            "Magic Meter":                  66138,
+            "Ocarina":                      66139,
+        }
+
+        progressive_names = {
+            "Progressive Hookshot":         ["Hookshot", "Hookshot", "Longshot"],
+            "Progressive Strength Upgrade": ["Goron Bracelet", "Goron Bracelet", "Silver Gauntlets",
+                                             "Golden Gauntlets"],
+            "Progressive Wallet":           ["Adults Wallet", "Adults Wallet", "Giants Wallet", "Giants Wallet"],
+            "Progressive Scale":            ["Silver Scale", "Silver Scale", "Gold Scale"],
+            "Magic Meter":                  ["Small Magic", "Small Magic", "Large Magic"],
+            "Ocarina":                      ["Fairy Ocarina", "Fairy Ocarina", "Ocarina of Time"]
+        }
+
+        inventory = tracker_data.get_player_inventory_counts(team, player)
+        for item_name, item_id in progressive_items.items():
+            level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
+            display_name = progressive_names[item_name][level]
+            if item_name.startswith("Progressive"):
+                base_name = item_name.split(maxsplit=1)[1].lower().replace(" ", "_")
+            else:
+                base_name = item_name.lower().replace(" ", "_")
+            display_data[base_name + "_url"] = icons[display_name]
+
+            if base_name == "hookshot":
+                display_data["hookshot_length"] = {0: "", 1: "H", 2: "L"}.get(level)
+            if base_name == "wallet":
+                display_data["wallet_size"] = {0: "99", 1: "200", 2: "500", 3: "999"}.get(level)
+
+        # Determine display for bottles. Show letter if it's obtained, determine bottle count
+        bottle_ids = [66015, 66020, 66021, 66140, 66141, 66142, 66143, 66144, 66145, 66146, 66147, 66148]
+        display_data["bottle_count"] = min(sum(map(lambda item_id: inventory[item_id], bottle_ids)), 4)
+        display_data["bottle_url"] = icons["Rutos Letter"] if inventory[66021] > 0 else icons["Bottle"]
+
+        # Determine bombchu display
+        display_data["has_bombchus"] = any(map(lambda item_id: inventory[item_id] > 0, [66003, 66106, 66107, 66137]))
+
+        # Multi-items
+        multi_items = {
+            "Gold Skulltula Token": 66091,
+            "Triforce Piece":       66202,
+        }
+        for item_name, item_id in multi_items.items():
+            base_name = item_name.split()[-1].lower()
+            display_data[base_name + "_count"] = inventory[item_id]
+
+        # Gather dungeon locations
+        area_id_ranges = {
+            "Overworld":              ((67000, 67263), (67269, 67280), (67747, 68024), (68054, 68062)),
+            "Deku Tree":              ((67281, 67303), (68063, 68077)),
+            "Dodongo's Cavern":       ((67304, 67334), (68078, 68160)),
+            "Jabu Jabu's Belly":      ((67335, 67359), (68161, 68188)),
+            "Bottom of the Well":     ((67360, 67384), (68189, 68230)),
+            "Forest Temple":          ((67385, 67420), (68231, 68281)),
+            "Fire Temple":            ((67421, 67457), (68282, 68350)),
+            "Water Temple":           ((67458, 67484), (68351, 68483)),
+            "Shadow Temple":          ((67485, 67532), (68484, 68565)),
+            "Spirit Temple":          ((67533, 67582), (68566, 68625)),
+            "Ice Cavern":             ((67583, 67596), (68626, 68649)),
+            "Gerudo Training Ground": ((67597, 67635), (68650, 68656)),
+            "Thieves' Hideout":       ((67264, 67268), (68025, 68053)),
+            "Ganon's Castle":         ((67636, 67673), (68657, 68705)),
+        }
+
+        def lookup_and_trim(id, area):
+            full_name = tracker_data.location_id_to_name["Ocarina of Time"][id]
+            if "Ganons Tower" in full_name:
+                return full_name
+            if area not in ["Overworld", "Thieves' Hideout"]:
+                # trim dungeon name. leaves an extra space that doesn't display, or trims fully for DC/Jabu/GC
+                return full_name[len(area):]
+            return full_name
+
+        locations = tracker_data.get_player_locations(team, player)
+        checked_locations = tracker_data.get_player_checked_locations(team, player).intersection(set(locations))
+        location_info = {}
+        checks_done = {}
+        checks_in_area = {}
+        for area, ranges in area_id_ranges.items():
+            location_info[area] = {}
+            checks_done[area] = 0
+            checks_in_area[area] = 0
+            for r in ranges:
+                min_id, max_id = r
+                for id in range(min_id, max_id + 1):
+                    if id in locations:
+                        checked = id in checked_locations
+                        location_info[area][lookup_and_trim(id, area)] = checked
+                        checks_in_area[area] += 1
+                        checks_done[area] += checked
+
+        checks_done["Total"] = sum(checks_done.values())
+        checks_in_area["Total"] = sum(checks_in_area.values())
+
+        # Give skulltulas on non-tracked locations
+        non_tracked_locations = tracker_data.get_player_checked_locations(team, player).difference(set(locations))
+        for id in non_tracked_locations:
+            if "GS" in lookup_and_trim(id, ""):
+                display_data["token_count"] += 1
+
+        oot_y = "✔"
+        oot_x = "✕"
+
+        # Gather small and boss key info
+        small_key_counts = {
+            "Forest Temple":          oot_y if inventory[66203] else inventory[66175],
+            "Fire Temple":            oot_y if inventory[66204] else inventory[66176],
+            "Water Temple":           oot_y if inventory[66205] else inventory[66177],
+            "Spirit Temple":          oot_y if inventory[66206] else inventory[66178],
+            "Shadow Temple":          oot_y if inventory[66207] else inventory[66179],
+            "Bottom of the Well":     oot_y if inventory[66208] else inventory[66180],
+            "Gerudo Training Ground": oot_y if inventory[66209] else inventory[66181],
+            "Thieves' Hideout":       oot_y if inventory[66210] else inventory[66182],
+            "Ganon's Castle":         oot_y if inventory[66211] else inventory[66183],
+        }
+        boss_key_counts = {
+            "Forest Temple":  oot_y if inventory[66149] else oot_x,
+            "Fire Temple":    oot_y if inventory[66150] else oot_x,
+            "Water Temple":   oot_y if inventory[66151] else oot_x,
+            "Spirit Temple":  oot_y if inventory[66152] else oot_x,
+            "Shadow Temple":  oot_y if inventory[66153] else oot_x,
+            "Ganon's Castle": oot_y if inventory[66154] else oot_x,
+        }
+
+        # Victory condition
+        game_state = tracker_data.get_player_client_status(team, player)
+        display_data["game_finished"] = game_state == 30
+
+        lookup_any_item_id_to_name = tracker_data.item_id_to_name["Ocarina of Time"]
+        return render_template(
+            "tracker__OcarinaOfTime.html",
+            inventory=inventory,
+            player=player,
+            team=team,
+            room=tracker_data.room,
+            player_name=tracker_data.get_player_name(team, player),
+            icons=icons,
+            acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0},
+            checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
+            small_key_counts=small_key_counts,
+            boss_key_counts=boss_key_counts,
+            **display_data,
+        )
+
+    _player_trackers["Ocarina of Time"] = render_OcarinaOfTime_tracker
+
+if "Timespinner" in network_data_package["games"]:
+    def render_Timespinner_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+        icons = {
+            "Timespinner Wheel":   "https://timespinnerwiki.com/mediawiki/images/7/76/Timespinner_Wheel.png",
+            "Timespinner Spindle": "https://timespinnerwiki.com/mediawiki/images/1/1a/Timespinner_Spindle.png",
+            "Timespinner Gear 1":  "https://timespinnerwiki.com/mediawiki/images/3/3c/Timespinner_Gear_1.png",
+            "Timespinner Gear 2":  "https://timespinnerwiki.com/mediawiki/images/e/e9/Timespinner_Gear_2.png",
+            "Timespinner Gear 3":  "https://timespinnerwiki.com/mediawiki/images/2/22/Timespinner_Gear_3.png",
+            "Talaria Attachment":  "https://timespinnerwiki.com/mediawiki/images/6/61/Talaria_Attachment.png",
+            "Succubus Hairpin":    "https://timespinnerwiki.com/mediawiki/images/4/49/Succubus_Hairpin.png",
+            "Lightwall":           "https://timespinnerwiki.com/mediawiki/images/0/03/Lightwall.png",
+            "Celestial Sash":      "https://timespinnerwiki.com/mediawiki/images/f/f1/Celestial_Sash.png",
+            "Twin Pyramid Key":    "https://timespinnerwiki.com/mediawiki/images/4/49/Twin_Pyramid_Key.png",
+            "Security Keycard D":  "https://timespinnerwiki.com/mediawiki/images/1/1b/Security_Keycard_D.png",
+            "Security Keycard C":  "https://timespinnerwiki.com/mediawiki/images/e/e5/Security_Keycard_C.png",
+            "Security Keycard B":  "https://timespinnerwiki.com/mediawiki/images/f/f6/Security_Keycard_B.png",
+            "Security Keycard A":  "https://timespinnerwiki.com/mediawiki/images/b/b9/Security_Keycard_A.png",
+            "Library Keycard V":   "https://timespinnerwiki.com/mediawiki/images/5/50/Library_Keycard_V.png",
+            "Tablet":              "https://timespinnerwiki.com/mediawiki/images/a/a0/Tablet.png",
+            "Elevator Keycard":    "https://timespinnerwiki.com/mediawiki/images/5/55/Elevator_Keycard.png",
+            "Oculus Ring":         "https://timespinnerwiki.com/mediawiki/images/8/8d/Oculus_Ring.png",
+            "Water Mask":          "https://timespinnerwiki.com/mediawiki/images/0/04/Water_Mask.png",
+            "Gas Mask":            "https://timespinnerwiki.com/mediawiki/images/2/2e/Gas_Mask.png",
+            "Djinn Inferno":       "https://timespinnerwiki.com/mediawiki/images/f/f6/Djinn_Inferno.png",
+            "Pyro Ring":           "https://timespinnerwiki.com/mediawiki/images/2/2c/Pyro_Ring.png",
+            "Infernal Flames":     "https://timespinnerwiki.com/mediawiki/images/1/1f/Infernal_Flames.png",
+            "Fire Orb":            "https://timespinnerwiki.com/mediawiki/images/3/3e/Fire_Orb.png",
+            "Royal Ring":          "https://timespinnerwiki.com/mediawiki/images/f/f3/Royal_Ring.png",
+            "Plasma Geyser":       "https://timespinnerwiki.com/mediawiki/images/1/12/Plasma_Geyser.png",
+            "Plasma Orb":          "https://timespinnerwiki.com/mediawiki/images/4/44/Plasma_Orb.png",
+            "Kobo":                "https://timespinnerwiki.com/mediawiki/images/c/c6/Familiar_Kobo.png",
+            "Merchant Crow":       "https://timespinnerwiki.com/mediawiki/images/4/4e/Familiar_Crow.png",
+        }
+
+        timespinner_location_ids = {
+            "Present":         [
+                1337000, 1337001, 1337002, 1337003, 1337004, 1337005, 1337006, 1337007, 1337008, 1337009,
+                1337010, 1337011, 1337012, 1337013, 1337014, 1337015, 1337016, 1337017, 1337018, 1337019,
+                1337020, 1337021, 1337022, 1337023, 1337024, 1337025, 1337026, 1337027, 1337028, 1337029,
+                1337030, 1337031, 1337032, 1337033, 1337034, 1337035, 1337036, 1337037, 1337038, 1337039,
+                1337040, 1337041, 1337042, 1337043, 1337044, 1337045, 1337046, 1337047, 1337048, 1337049,
+                1337050, 1337051, 1337052, 1337053, 1337054, 1337055, 1337056, 1337057, 1337058, 1337059,
+                1337060, 1337061, 1337062, 1337063, 1337064, 1337065, 1337066, 1337067, 1337068, 1337069,
+                1337070, 1337071, 1337072, 1337073, 1337074, 1337075, 1337076, 1337077, 1337078, 1337079,
+                1337080, 1337081, 1337082, 1337083, 1337084, 1337085],
+            "Past":            [
+                1337086, 1337087, 1337088, 1337089,
+                1337090, 1337091, 1337092, 1337093, 1337094, 1337095, 1337096, 1337097, 1337098, 1337099,
+                1337100, 1337101, 1337102, 1337103, 1337104, 1337105, 1337106, 1337107, 1337108, 1337109,
+                1337110, 1337111, 1337112, 1337113, 1337114, 1337115, 1337116, 1337117, 1337118, 1337119,
+                1337120, 1337121, 1337122, 1337123, 1337124, 1337125, 1337126, 1337127, 1337128, 1337129,
+                1337130, 1337131, 1337132, 1337133, 1337134, 1337135, 1337136, 1337137, 1337138, 1337139,
+                1337140, 1337141, 1337142, 1337143, 1337144, 1337145, 1337146, 1337147, 1337148, 1337149,
+                1337150, 1337151, 1337152, 1337153, 1337154, 1337155,
+                1337171, 1337172, 1337173, 1337174, 1337175],
+            "Ancient Pyramid": [
+                1337236,
+                1337246, 1337247, 1337248, 1337249]
+        }
+
+        slot_data = tracker_data.get_slot_data(team, player)
+        if (slot_data["DownloadableItems"]):
+            timespinner_location_ids["Present"] += [
+                1337156, 1337157, 1337159,
+                1337160, 1337161, 1337162, 1337163, 1337164, 1337165, 1337166, 1337167, 1337168, 1337169,
+                1337170]
+        if (slot_data["Cantoran"]):
+            timespinner_location_ids["Past"].append(1337176)
+        if (slot_data["LoreChecks"]):
+            timespinner_location_ids["Present"] += [
+                1337177, 1337178, 1337179,
+                1337180, 1337181, 1337182, 1337183, 1337184, 1337185, 1337186, 1337187]
+            timespinner_location_ids["Past"] += [
+                1337188, 1337189,
+                1337190, 1337191, 1337192, 1337193, 1337194, 1337195, 1337196, 1337197, 1337198]
+        if (slot_data["GyreArchives"]):
+            timespinner_location_ids["Ancient Pyramid"] += [
+                1337237, 1337238, 1337239,
+                1337240, 1337241, 1337242, 1337243, 1337244, 1337245]
+
+        display_data = {}
+
+        # Victory condition
+        game_state = tracker_data.get_player_client_status(team, player)
+        display_data["game_finished"] = game_state == 30
+
+        inventory = tracker_data.get_player_inventory_counts(team, player)
+
+        # Turn location IDs into advancement tab counts
+        checked_locations = tracker_data.get_player_checked_locations(team, player)
+        lookup_name = lambda id: tracker_data.location_id_to_name["Timespinner"][id]
+        location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
+                         for tab_name, tab_locations in timespinner_location_ids.items()}
+        checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
+                       for tab_name, tab_locations in timespinner_location_ids.items()}
+        checks_done["Total"] = len(checked_locations)
+        checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in timespinner_location_ids.items()}
+        checks_in_area["Total"] = sum(checks_in_area.values())
+        options = {k for k, v in slot_data.items() if v}
+
+        lookup_any_item_id_to_name = tracker_data.item_id_to_name["Timespinner"]
+        return render_template(
+            "tracker__Timespinner.html",
+            inventory=inventory,
+            icons=icons,
+            acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0},
+            player=player,
+            team=team,
+            room=tracker_data.room,
+            player_name=tracker_data.get_player_name(team, player),
+            checks_done=checks_done,
+            checks_in_area=checks_in_area,
+            location_info=location_info,
+            options=options,
+            **display_data,
+        )
+
+    _player_trackers["Timespinner"] = render_Timespinner_tracker
+
+if "Super Metroid" in network_data_package["games"]:
+    def render_SuperMetroid_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+        icons = {
+            "Energy Tank":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/ETank.png",
+            "Missile":        "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Missile.png",
+            "Super Missile":  "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Super.png",
+            "Power Bomb":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/PowerBomb.png",
+            "Bomb":           "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Bomb.png",
+            "Charge Beam":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Charge.png",
+            "Ice Beam":       "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Ice.png",
+            "Hi-Jump Boots":  "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/HiJump.png",
+            "Speed Booster":  "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpeedBooster.png",
+            "Wave Beam":      "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Wave.png",
+            "Spazer":         "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Spazer.png",
+            "Spring Ball":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpringBall.png",
+            "Varia Suit":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Varia.png",
+            "Plasma Beam":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Plasma.png",
+            "Grappling Beam": "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Grapple.png",
+            "Morph Ball":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Morph.png",
+            "Reserve Tank":   "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Reserve.png",
+            "Gravity Suit":   "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/Gravity.png",
+            "X-Ray Scope":    "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/XRayScope.png",
+            "Space Jump":     "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/SpaceJump.png",
+            "Screw Attack":   "https://randommetroidsolver.pythonanywhere.com/solver/static/images/tracker/inventory/ScrewAttack.png",
+            "Nothing":        "",
+            "No Energy":      "",
+            "Kraid":          "",
+            "Phantoon":       "",
+            "Draygon":        "",
+            "Ridley":         "",
+            "Mother Brain":   "",
+        }
+
+        multi_items = {
+            "Energy Tank":   83000,
+            "Missile":       83001,
+            "Super Missile": 83002,
+            "Power Bomb":    83003,
+            "Reserve Tank":  83020,
+        }
+
+        supermetroid_location_ids = {
+            'Crateria/Blue Brinstar': [82005, 82007, 82008, 82026, 82029,
+                                       82000, 82004, 82006, 82009, 82010,
+                                       82011, 82012, 82027, 82028, 82034,
+                                       82036, 82037],
+            'Green/Pink Brinstar':    [82017, 82023, 82030, 82033, 82035,
+                                       82013, 82014, 82015, 82016, 82018,
+                                       82019, 82021, 82022, 82024, 82025,
+                                       82031],
+            'Red Brinstar':           [82038, 82042, 82039, 82040, 82041],
+            'Kraid':                  [82043, 82048, 82044],
+            'Norfair':                [82050, 82053, 82061, 82066, 82068,
+                                       82049, 82051, 82054, 82055, 82056,
+                                       82062, 82063, 82064, 82065, 82067],
+            'Lower Norfair':          [82078, 82079, 82080, 82070, 82071,
+                                       82073, 82074, 82075, 82076, 82077],
+            'Crocomire':              [82052, 82060, 82057, 82058, 82059],
+            'Wrecked Ship':           [82129, 82132, 82134, 82135, 82001,
+                                       82002, 82003, 82128, 82130, 82131,
+                                       82133],
+            'West Maridia':           [82138, 82136, 82137, 82139, 82140,
+                                       82141, 82142],
+            'East Maridia':           [82143, 82145, 82150, 82152, 82154,
+                                       82144, 82146, 82147, 82148, 82149,
+                                       82151],
+        }
+
+        display_data = {}
+        inventory = tracker_data.get_player_inventory_counts(team, player)
+
+        for item_name, item_id in multi_items.items():
+            base_name = item_name.split()[0].lower()
+            display_data[base_name + "_count"] = inventory[item_id]
+
+        # Victory condition
+        game_state = tracker_data.get_player_client_status(team, player)
+        display_data["game_finished"] = game_state == 30
+
+        # Turn location IDs into advancement tab counts
+        checked_locations = tracker_data.get_player_checked_locations(team, player)
+        lookup_name = lambda id: tracker_data.location_id_to_name["Super Metroid"][id]
+        location_info = {tab_name: {lookup_name(id): (id in checked_locations) for id in tab_locations}
+                         for tab_name, tab_locations in supermetroid_location_ids.items()}
+        checks_done = {tab_name: len([id for id in tab_locations if id in checked_locations])
+                       for tab_name, tab_locations in supermetroid_location_ids.items()}
+        checks_done['Total'] = len(checked_locations)
+        checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in supermetroid_location_ids.items()}
+        checks_in_area['Total'] = sum(checks_in_area.values())
+
+        lookup_any_item_id_to_name = tracker_data.item_id_to_name["Super Metroid"]
+        return render_template(
+            "tracker__SuperMetroid.html",
+            inventory=inventory,
+            icons=icons,
+            acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0},
+            player=player,
+            team=team,
+            room=tracker_data.room,
+            player_name=tracker_data.get_player_name(team, player),
+            checks_done=checks_done,
+            checks_in_area=checks_in_area,
+            location_info=location_info,
+            **display_data,
+        )
+
+    _player_trackers["Super Metroid"] = render_SuperMetroid_tracker
+
+if "ChecksFinder" in network_data_package["games"]:
+    def render_ChecksFinder_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+        icons = {
+            "Checks Available": "https://0rganics.org/archipelago/cf/spr_tiles_3.png",
+            "Map Width":        "https://0rganics.org/archipelago/cf/spr_tiles_4.png",
+            "Map Height":       "https://0rganics.org/archipelago/cf/spr_tiles_5.png",
+            "Map Bombs":        "https://0rganics.org/archipelago/cf/spr_tiles_6.png",
+
+            "Nothing":          "",
+        }
+
+        checksfinder_location_ids = {
+            "Tile 1":  81000,
+            "Tile 2":  81001,
+            "Tile 3":  81002,
+            "Tile 4":  81003,
+            "Tile 5":  81004,
+            "Tile 6":  81005,
+            "Tile 7":  81006,
+            "Tile 8":  81007,
+            "Tile 9":  81008,
+            "Tile 10": 81009,
+            "Tile 11": 81010,
+            "Tile 12": 81011,
+            "Tile 13": 81012,
+            "Tile 14": 81013,
+            "Tile 15": 81014,
+            "Tile 16": 81015,
+            "Tile 17": 81016,
+            "Tile 18": 81017,
+            "Tile 19": 81018,
+            "Tile 20": 81019,
+            "Tile 21": 81020,
+            "Tile 22": 81021,
+            "Tile 23": 81022,
+            "Tile 24": 81023,
+            "Tile 25": 81024,
+        }
+
+        display_data = {}
+        inventory = tracker_data.get_player_inventory_counts(team, player)
+        locations = tracker_data.get_player_locations(team, player)
+
+        # Multi-items
+        multi_items = {
+            "Map Width":  80000,
+            "Map Height": 80001,
+            "Map Bombs":  80002
+        }
+        for item_name, item_id in multi_items.items():
+            base_name = item_name.split()[-1].lower()
+            count = inventory[item_id]
+            display_data[base_name + "_count"] = count
+            display_data[base_name + "_display"] = count + 5
+
+        # Get location info
+        checked_locations = tracker_data.get_player_checked_locations(team, player)
+        lookup_name = lambda id: tracker_data.location_id_to_name["ChecksFinder"][id]
+        location_info = {tile_name: {lookup_name(tile_location): (tile_location in checked_locations)} for
+                         tile_name, tile_location in checksfinder_location_ids.items() if
+                         tile_location in set(locations)}
+        checks_done = {tile_name: len([tile_location]) for tile_name, tile_location in checksfinder_location_ids.items()
+                       if tile_location in checked_locations and tile_location in set(locations)}
+        checks_done['Total'] = len(checked_locations)
+        checks_in_area = checks_done
+
+        # Calculate checks available
+        display_data["checks_unlocked"] = min(
+            display_data["width_count"] + display_data["height_count"] + display_data["bombs_count"] + 5, 25)
+        display_data["checks_available"] = max(display_data["checks_unlocked"] - len(checked_locations), 0)
+
+        # Victory condition
+        game_state = tracker_data.get_player_client_status(team, player)
+        display_data["game_finished"] = game_state == 30
+
+        lookup_any_item_id_to_name = tracker_data.item_id_to_name["ChecksFinder"]
+        return render_template(
+            "tracker__ChecksFinder.html",
+            inventory=inventory, icons=icons,
+            acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0},
+            player=player,
+            team=team,
+            room=tracker_data.room,
+            player_name=tracker_data.get_player_name(team, player),
+            checks_done=checks_done,
+            checks_in_area=checks_in_area,
+            location_info=location_info,
+            **display_data,
+        )
+
+    _player_trackers["ChecksFinder"] = render_ChecksFinder_tracker
+
+if "Starcraft 2 Wings of Liberty" in network_data_package["games"]:
+    def render_Starcraft2WingsOfLiberty_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
+        SC2WOL_LOC_ID_OFFSET = 1000
+        SC2WOL_ITEM_ID_OFFSET = 1000
+
+        icons = {
+            "Starting Minerals":                           "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-mineral-protoss.png",
+            "Starting Vespene":                            "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/icons/icon-gas-terran.png",
+            "Starting Supply":                             "https://static.wikia.nocookie.net/starcraft/images/d/d3/TerranSupply_SC2_Icon1.gif",
+
+            "Infantry Weapons Level 1":                    "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel1.png",
+            "Infantry Weapons Level 2":                    "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel2.png",
+            "Infantry Weapons Level 3":                    "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryweaponslevel3.png",
+            "Infantry Armor Level 1":                      "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel1.png",
+            "Infantry Armor Level 2":                      "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel2.png",
+            "Infantry Armor Level 3":                      "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-infantryarmorlevel3.png",
+            "Vehicle Weapons Level 1":                     "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel1.png",
+            "Vehicle Weapons Level 2":                     "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel2.png",
+            "Vehicle Weapons Level 3":                     "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleweaponslevel3.png",
+            "Vehicle Armor Level 1":                       "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel1.png",
+            "Vehicle Armor Level 2":                       "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel2.png",
+            "Vehicle Armor Level 3":                       "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-vehicleplatinglevel3.png",
+            "Ship Weapons Level 1":                        "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel1.png",
+            "Ship Weapons Level 2":                        "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel2.png",
+            "Ship Weapons Level 3":                        "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipweaponslevel3.png",
+            "Ship Armor Level 1":                          "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel1.png",
+            "Ship Armor Level 2":                          "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel2.png",
+            "Ship Armor Level 3":                          "https://sclegacy.com/images/uploaded/starcraftii_beta/gamefiles/upgrades/btn-upgrade-terran-shipplatinglevel3.png",
+
+            "Bunker":                                      "https://static.wikia.nocookie.net/starcraft/images/c/c5/Bunker_SC2_Icon1.jpg",
+            "Missile Turret":                              "https://static.wikia.nocookie.net/starcraft/images/5/5f/MissileTurret_SC2_Icon1.jpg",
+            "Sensor Tower":                                "https://static.wikia.nocookie.net/starcraft/images/d/d2/SensorTower_SC2_Icon1.jpg",
+
+            "Projectile Accelerator (Bunker)":             "https://0rganics.org/archipelago/sc2wol/ProjectileAccelerator.png",
+            "Neosteel Bunker (Bunker)":                    "https://0rganics.org/archipelago/sc2wol/NeosteelBunker.png",
+            "Titanium Housing (Missile Turret)":           "https://0rganics.org/archipelago/sc2wol/TitaniumHousing.png",
+            "Hellstorm Batteries (Missile Turret)":        "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png",
+            "Advanced Construction (SCV)":                 "https://0rganics.org/archipelago/sc2wol/AdvancedConstruction.png",
+            "Dual-Fusion Welders (SCV)":                   "https://0rganics.org/archipelago/sc2wol/Dual-FusionWelders.png",
+            "Fire-Suppression System (Building)":          "https://0rganics.org/archipelago/sc2wol/Fire-SuppressionSystem.png",
+            "Orbital Command (Building)":                  "https://0rganics.org/archipelago/sc2wol/OrbitalCommandCampaign.png",
+
+            "Marine":                                      "https://static.wikia.nocookie.net/starcraft/images/4/47/Marine_SC2_Icon1.jpg",
+            "Medic":                                       "https://static.wikia.nocookie.net/starcraft/images/7/74/Medic_SC2_Rend1.jpg",
+            "Firebat":                                     "https://static.wikia.nocookie.net/starcraft/images/3/3c/Firebat_SC2_Rend1.jpg",
+            "Marauder":                                    "https://static.wikia.nocookie.net/starcraft/images/b/ba/Marauder_SC2_Icon1.jpg",
+            "Reaper":                                      "https://static.wikia.nocookie.net/starcraft/images/7/7d/Reaper_SC2_Icon1.jpg",
+
+            "Stimpack (Marine)":                           "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
+            "Super Stimpack (Marine)":                     "/static/static/icons/sc2/superstimpack.png",
+            "Combat Shield (Marine)":                      "https://0rganics.org/archipelago/sc2wol/CombatShieldCampaign.png",
+            "Laser Targeting System (Marine)":             "/static/static/icons/sc2/lasertargetingsystem.png",
+            "Magrail Munitions (Marine)":                  "/static/static/icons/sc2/magrailmunitions.png",
+            "Optimized Logistics (Marine)":                "/static/static/icons/sc2/optimizedlogistics.png",
+            "Advanced Medic Facilities (Medic)":           "https://0rganics.org/archipelago/sc2wol/AdvancedMedicFacilities.png",
+            "Stabilizer Medpacks (Medic)":                 "https://0rganics.org/archipelago/sc2wol/StabilizerMedpacks.png",
+            "Restoration (Medic)":                         "/static/static/icons/sc2/restoration.png",
+            "Optical Flare (Medic)":                       "/static/static/icons/sc2/opticalflare.png",
+            "Optimized Logistics (Medic)":                 "/static/static/icons/sc2/optimizedlogistics.png",
+            "Incinerator Gauntlets (Firebat)":             "https://0rganics.org/archipelago/sc2wol/IncineratorGauntlets.png",
+            "Juggernaut Plating (Firebat)":                "https://0rganics.org/archipelago/sc2wol/JuggernautPlating.png",
+            "Stimpack (Firebat)":                          "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
+            "Super Stimpack (Firebat)":                    "/static/static/icons/sc2/superstimpack.png",
+            "Optimized Logistics (Firebat)":               "/static/static/icons/sc2/optimizedlogistics.png",
+            "Concussive Shells (Marauder)":                "https://0rganics.org/archipelago/sc2wol/ConcussiveShellsCampaign.png",
+            "Kinetic Foam (Marauder)":                     "https://0rganics.org/archipelago/sc2wol/KineticFoam.png",
+            "Stimpack (Marauder)":                         "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
+            "Super Stimpack (Marauder)":                   "/static/static/icons/sc2/superstimpack.png",
+            "Laser Targeting System (Marauder)":           "/static/static/icons/sc2/lasertargetingsystem.png",
+            "Magrail Munitions (Marauder)":                "/static/static/icons/sc2/magrailmunitions.png",
+            "Internal Tech Module (Marauder)":             "/static/static/icons/sc2/internalizedtechmodule.png",
+            "U-238 Rounds (Reaper)":                       "https://0rganics.org/archipelago/sc2wol/U-238Rounds.png",
+            "G-4 Clusterbomb (Reaper)":                    "https://0rganics.org/archipelago/sc2wol/G-4Clusterbomb.png",
+            "Stimpack (Reaper)":                           "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
+            "Super Stimpack (Reaper)":                     "/static/static/icons/sc2/superstimpack.png",
+            "Laser Targeting System (Reaper)":             "/static/static/icons/sc2/lasertargetingsystem.png",
+            "Advanced Cloaking Field (Reaper)":            "/static/static/icons/sc2/terran-cloak-color.png",
+            "Spider Mines (Reaper)":                       "/static/static/icons/sc2/spidermine.png",
+            "Combat Drugs (Reaper)":                       "/static/static/icons/sc2/reapercombatdrugs.png",
+
+            "Hellion":                                     "https://static.wikia.nocookie.net/starcraft/images/5/56/Hellion_SC2_Icon1.jpg",
+            "Vulture":                                     "https://static.wikia.nocookie.net/starcraft/images/d/da/Vulture_WoL.jpg",
+            "Goliath":                                     "https://static.wikia.nocookie.net/starcraft/images/e/eb/Goliath_WoL.jpg",
+            "Diamondback":                                 "https://static.wikia.nocookie.net/starcraft/images/a/a6/Diamondback_WoL.jpg",
+            "Siege Tank":                                  "https://static.wikia.nocookie.net/starcraft/images/5/57/SiegeTank_SC2_Icon1.jpg",
+
+            "Twin-Linked Flamethrower (Hellion)":          "https://0rganics.org/archipelago/sc2wol/Twin-LinkedFlamethrower.png",
+            "Thermite Filaments (Hellion)":                "https://0rganics.org/archipelago/sc2wol/ThermiteFilaments.png",
+            "Hellbat Aspect (Hellion)":                    "/static/static/icons/sc2/hellionbattlemode.png",
+            "Smart Servos (Hellion)":                      "/static/static/icons/sc2/transformationservos.png",
+            "Optimized Logistics (Hellion)":               "/static/static/icons/sc2/optimizedlogistics.png",
+            "Jump Jets (Hellion)":                         "/static/static/icons/sc2/jumpjets.png",
+            "Stimpack (Hellion)":                          "https://0rganics.org/archipelago/sc2wol/StimpacksCampaign.png",
+            "Super Stimpack (Hellion)":                    "/static/static/icons/sc2/superstimpack.png",
+            "Cerberus Mine (Spider Mine)":                 "https://0rganics.org/archipelago/sc2wol/CerberusMine.png",
+            "High Explosive Munition (Spider Mine)":       "/static/static/icons/sc2/high-explosive-spidermine.png",
+            "Replenishable Magazine (Vulture)":            "https://0rganics.org/archipelago/sc2wol/ReplenishableMagazine.png",
+            "Ion Thrusters (Vulture)":                     "/static/static/icons/sc2/emergencythrusters.png",
+            "Auto Launchers (Vulture)":                    "/static/static/icons/sc2/jotunboosters.png",
+            "Multi-Lock Weapons System (Goliath)":         "https://0rganics.org/archipelago/sc2wol/Multi-LockWeaponsSystem.png",
+            "Ares-Class Targeting System (Goliath)":       "https://0rganics.org/archipelago/sc2wol/Ares-ClassTargetingSystem.png",
+            "Jump Jets (Goliath)":                         "/static/static/icons/sc2/jumpjets.png",
+            "Optimized Logistics (Goliath)":               "/static/static/icons/sc2/optimizedlogistics.png",
+            "Tri-Lithium Power Cell (Diamondback)":        "https://0rganics.org/archipelago/sc2wol/Tri-LithiumPowerCell.png",
+            "Shaped Hull (Diamondback)":                   "https://0rganics.org/archipelago/sc2wol/ShapedHull.png",
+            "Hyperfluxor (Diamondback)":                   "/static/static/icons/sc2/hyperfluxor.png",
+            "Burst Capacitors (Diamondback)":              "/static/static/icons/sc2/burstcapacitors.png",
+            "Optimized Logistics (Diamondback)":           "/static/static/icons/sc2/optimizedlogistics.png",
+            "Maelstrom Rounds (Siege Tank)":               "https://0rganics.org/archipelago/sc2wol/MaelstromRounds.png",
+            "Shaped Blast (Siege Tank)":                   "https://0rganics.org/archipelago/sc2wol/ShapedBlast.png",
+            "Jump Jets (Siege Tank)":                      "/static/static/icons/sc2/jumpjets.png",
+            "Spider Mines (Siege Tank)":                   "/static/static/icons/sc2/siegetank-spidermines.png",
+            "Smart Servos (Siege Tank)":                   "/static/static/icons/sc2/transformationservos.png",
+            "Graduating Range (Siege Tank)":               "/static/static/icons/sc2/siegetankrange.png",
+            "Laser Targeting System (Siege Tank)":         "/static/static/icons/sc2/lasertargetingsystem.png",
+            "Advanced Siege Tech (Siege Tank)":            "/static/static/icons/sc2/improvedsiegemode.png",
+            "Internal Tech Module (Siege Tank)":           "/static/static/icons/sc2/internalizedtechmodule.png",
+
+            "Medivac":                                     "https://static.wikia.nocookie.net/starcraft/images/d/db/Medivac_SC2_Icon1.jpg",
+            "Wraith":                                      "https://static.wikia.nocookie.net/starcraft/images/7/75/Wraith_WoL.jpg",
+            "Viking":                                      "https://static.wikia.nocookie.net/starcraft/images/2/2a/Viking_SC2_Icon1.jpg",
+            "Banshee":                                     "https://static.wikia.nocookie.net/starcraft/images/3/32/Banshee_SC2_Icon1.jpg",
+            "Battlecruiser":                               "https://static.wikia.nocookie.net/starcraft/images/f/f5/Battlecruiser_SC2_Icon1.jpg",
+
+            "Rapid Deployment Tube (Medivac)":             "https://0rganics.org/archipelago/sc2wol/RapidDeploymentTube.png",
+            "Advanced Healing AI (Medivac)":               "https://0rganics.org/archipelago/sc2wol/AdvancedHealingAI.png",
+            "Expanded Hull (Medivac)":                     "/static/static/icons/sc2/neosteelfortifiedarmor.png",
+            "Afterburners (Medivac)":                      "/static/static/icons/sc2/medivacemergencythrusters.png",
+            "Tomahawk Power Cells (Wraith)":               "https://0rganics.org/archipelago/sc2wol/TomahawkPowerCells.png",
+            "Displacement Field (Wraith)":                 "https://0rganics.org/archipelago/sc2wol/DisplacementField.png",
+            "Advanced Laser Technology (Wraith)":          "/static/static/icons/sc2/improvedburstlaser.png",
+            "Ripwave Missiles (Viking)":                   "https://0rganics.org/archipelago/sc2wol/RipwaveMissiles.png",
+            "Phobos-Class Weapons System (Viking)":        "https://0rganics.org/archipelago/sc2wol/Phobos-ClassWeaponsSystem.png",
+            "Smart Servos (Viking)":                       "/static/static/icons/sc2/transformationservos.png",
+            "Magrail Munitions (Viking)":                  "/static/static/icons/sc2/magrailmunitions.png",
+            "Cross-Spectrum Dampeners (Banshee)":          "/static/static/icons/sc2/crossspectrumdampeners.png",
+            "Advanced Cross-Spectrum Dampeners (Banshee)": "https://0rganics.org/archipelago/sc2wol/Cross-SpectrumDampeners.png",
+            "Shockwave Missile Battery (Banshee)":         "https://0rganics.org/archipelago/sc2wol/ShockwaveMissileBattery.png",
+            "Hyperflight Rotors (Banshee)":                "/static/static/icons/sc2/hyperflightrotors.png",
+            "Laser Targeting System (Banshee)":            "/static/static/icons/sc2/lasertargetingsystem.png",
+            "Internal Tech Module (Banshee)":              "/static/static/icons/sc2/internalizedtechmodule.png",
+            "Missile Pods (Battlecruiser)":                "https://0rganics.org/archipelago/sc2wol/MissilePods.png",
+            "Defensive Matrix (Battlecruiser)":            "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png",
+            "Tactical Jump (Battlecruiser)":               "/static/static/icons/sc2/warpjump.png",
+            "Cloak (Battlecruiser)":                       "/static/static/icons/sc2/terran-cloak-color.png",
+            "ATX Laser Battery (Battlecruiser)":           "/static/static/icons/sc2/specialordance.png",
+            "Optimized Logistics (Battlecruiser)":         "/static/static/icons/sc2/optimizedlogistics.png",
+            "Internal Tech Module (Battlecruiser)":        "/static/static/icons/sc2/internalizedtechmodule.png",
+
+            "Ghost":                                       "https://static.wikia.nocookie.net/starcraft/images/6/6e/Ghost_SC2_Icon1.jpg",
+            "Spectre":                                     "https://static.wikia.nocookie.net/starcraft/images/0/0d/Spectre_WoL.jpg",
+            "Thor":                                        "https://static.wikia.nocookie.net/starcraft/images/e/ef/Thor_SC2_Icon1.jpg",
+
+            "Widow Mine":                                  "/static/static/icons/sc2/widowmine.png",
+            "Cyclone":                                     "/static/static/icons/sc2/cyclone.png",
+            "Liberator":                                   "/static/static/icons/sc2/liberator.png",
+            "Valkyrie":                                    "/static/static/icons/sc2/valkyrie.png",
+
+            "Ocular Implants (Ghost)":                     "https://0rganics.org/archipelago/sc2wol/OcularImplants.png",
+            "Crius Suit (Ghost)":                          "https://0rganics.org/archipelago/sc2wol/CriusSuit.png",
+            "EMP Rounds (Ghost)":                          "/static/static/icons/sc2/terran-emp-color.png",
+            "Lockdown (Ghost)":                            "/static/static/icons/sc2/lockdown.png",
+            "Psionic Lash (Spectre)":                      "https://0rganics.org/archipelago/sc2wol/PsionicLash.png",
+            "Nyx-Class Cloaking Module (Spectre)":         "https://0rganics.org/archipelago/sc2wol/Nyx-ClassCloakingModule.png",
+            "Impaler Rounds (Spectre)":                    "/static/static/icons/sc2/impalerrounds.png",
+            "330mm Barrage Cannon (Thor)":                 "https://0rganics.org/archipelago/sc2wol/330mmBarrageCannon.png",
+            "Immortality Protocol (Thor)":                 "https://0rganics.org/archipelago/sc2wol/ImmortalityProtocol.png",
+            "High Impact Payload (Thor)":                  "/static/static/icons/sc2/thorsiegemode.png",
+            "Smart Servos (Thor)":                         "/static/static/icons/sc2/transformationservos.png",
+
+            "Optimized Logistics (Predator)":              "/static/static/icons/sc2/optimizedlogistics.png",
+            "Drilling Claws (Widow Mine)":                 "/static/static/icons/sc2/drillingclaws.png",
+            "Concealment (Widow Mine)":                    "/static/static/icons/sc2/widowminehidden.png",
+            "Black Market Launchers (Widow Mine)":         "/static/static/icons/sc2/widowmine-attackrange.png",
+            "Executioner Missiles (Widow Mine)":           "/static/static/icons/sc2/widowmine-deathblossom.png",
+            "Mag-Field Accelerators (Cyclone)":            "/static/static/icons/sc2/magfieldaccelerator.png",
+            "Mag-Field Launchers (Cyclone)":               "/static/static/icons/sc2/cyclonerangeupgrade.png",
+            "Targeting Optics (Cyclone)":                  "/static/static/icons/sc2/targetingoptics.png",
+            "Rapid Fire Launchers (Cyclone)":              "/static/static/icons/sc2/ripwavemissiles.png",
+            "Bio Mechanical Repair Drone (Raven)":         "/static/static/icons/sc2/biomechanicaldrone.png",
+            "Spider Mines (Raven)":                        "/static/static/icons/sc2/siegetank-spidermines.png",
+            "Railgun Turret (Raven)":                      "/static/static/icons/sc2/autoturretblackops.png",
+            "Hunter-Seeker Weapon (Raven)":                "/static/static/icons/sc2/specialordance.png",
+            "Interference Matrix (Raven)":                 "/static/static/icons/sc2/interferencematrix.png",
+            "Anti-Armor Missile (Raven)":                  "/static/static/icons/sc2/shreddermissile.png",
+            "Internal Tech Module (Raven)":                "/static/static/icons/sc2/internalizedtechmodule.png",
+            "EMP Shockwave (Science Vessel)":              "/static/static/icons/sc2/staticempblast.png",
+            "Defensive Matrix (Science Vessel)":           "https://0rganics.org/archipelago/sc2wol/DefensiveMatrix.png",
+            "Advanced Ballistics (Liberator)":             "/static/static/icons/sc2/advanceballistics.png",
+            "Raid Artillery (Liberator)":                  "/static/static/icons/sc2/terrandefendermodestructureattack.png",
+            "Cloak (Liberator)":                           "/static/static/icons/sc2/terran-cloak-color.png",
+            "Laser Targeting System (Liberator)":          "/static/static/icons/sc2/lasertargetingsystem.png",
+            "Optimized Logistics (Liberator)":             "/static/static/icons/sc2/optimizedlogistics.png",
+            "Enhanced Cluster Launchers (Valkyrie)":       "https://0rganics.org/archipelago/sc2wol/HellstormBatteries.png",
+            "Shaped Hull (Valkyrie)":                      "https://0rganics.org/archipelago/sc2wol/ShapedHull.png",
+            "Burst Lasers (Valkyrie)":                     "/static/static/icons/sc2/improvedburstlaser.png",
+            "Afterburners (Valkyrie)":                     "/static/static/icons/sc2/medivacemergencythrusters.png",
+
+            "War Pigs":                                    "https://static.wikia.nocookie.net/starcraft/images/e/ed/WarPigs_SC2_Icon1.jpg",
+            "Devil Dogs":                                  "https://static.wikia.nocookie.net/starcraft/images/3/33/DevilDogs_SC2_Icon1.jpg",
+            "Hammer Securities":                           "https://static.wikia.nocookie.net/starcraft/images/3/3b/HammerSecurity_SC2_Icon1.jpg",
+            "Spartan Company":                             "https://static.wikia.nocookie.net/starcraft/images/b/be/SpartanCompany_SC2_Icon1.jpg",
+            "Siege Breakers":                              "https://static.wikia.nocookie.net/starcraft/images/3/31/SiegeBreakers_SC2_Icon1.jpg",
+            "Hel's Angel":                                 "https://static.wikia.nocookie.net/starcraft/images/6/63/HelsAngels_SC2_Icon1.jpg",
+            "Dusk Wings":                                  "https://static.wikia.nocookie.net/starcraft/images/5/52/DuskWings_SC2_Icon1.jpg",
+            "Jackson's Revenge":                           "https://static.wikia.nocookie.net/starcraft/images/9/95/JacksonsRevenge_SC2_Icon1.jpg",
+
+            "Ultra-Capacitors":                            "https://static.wikia.nocookie.net/starcraft/images/2/23/SC2_Lab_Ultra_Capacitors_Icon.png",
+            "Vanadium Plating":                            "https://static.wikia.nocookie.net/starcraft/images/6/67/SC2_Lab_VanPlating_Icon.png",
+            "Orbital Depots":                              "https://static.wikia.nocookie.net/starcraft/images/0/01/SC2_Lab_Orbital_Depot_Icon.png",
+            "Micro-Filtering":                             "https://static.wikia.nocookie.net/starcraft/images/2/20/SC2_Lab_MicroFilter_Icon.png",
+            "Automated Refinery":                          "https://static.wikia.nocookie.net/starcraft/images/7/71/SC2_Lab_Auto_Refinery_Icon.png",
+            "Command Center Reactor":                      "https://static.wikia.nocookie.net/starcraft/images/e/ef/SC2_Lab_CC_Reactor_Icon.png",
+            "Raven":                                       "https://static.wikia.nocookie.net/starcraft/images/1/19/SC2_Lab_Raven_Icon.png",
+            "Science Vessel":                              "https://static.wikia.nocookie.net/starcraft/images/c/c3/SC2_Lab_SciVes_Icon.png",
+            "Tech Reactor":                                "https://static.wikia.nocookie.net/starcraft/images/c/c5/SC2_Lab_Tech_Reactor_Icon.png",
+            "Orbital Strike":                              "https://static.wikia.nocookie.net/starcraft/images/d/df/SC2_Lab_Orb_Strike_Icon.png",
+
+            "Shrike Turret (Bunker)":                      "https://static.wikia.nocookie.net/starcraft/images/4/44/SC2_Lab_Shrike_Turret_Icon.png",
+            "Fortified Bunker (Bunker)":                   "https://static.wikia.nocookie.net/starcraft/images/4/4f/SC2_Lab_FortBunker_Icon.png",
+            "Planetary Fortress":                          "https://static.wikia.nocookie.net/starcraft/images/0/0b/SC2_Lab_PlanetFortress_Icon.png",
+            "Perdition Turret":                            "https://static.wikia.nocookie.net/starcraft/images/a/af/SC2_Lab_PerdTurret_Icon.png",
+            "Predator":                                    "https://static.wikia.nocookie.net/starcraft/images/8/83/SC2_Lab_Predator_Icon.png",
+            "Hercules":                                    "https://static.wikia.nocookie.net/starcraft/images/4/40/SC2_Lab_Hercules_Icon.png",
+            "Cellular Reactor":                            "https://static.wikia.nocookie.net/starcraft/images/d/d8/SC2_Lab_CellReactor_Icon.png",
+            "Regenerative Bio-Steel Level 1":              "/static/static/icons/sc2/SC2_Lab_BioSteel_L1.png",
+            "Regenerative Bio-Steel Level 2":              "/static/static/icons/sc2/SC2_Lab_BioSteel_L2.png",
+            "Hive Mind Emulator":                          "https://static.wikia.nocookie.net/starcraft/images/b/bc/SC2_Lab_Hive_Emulator_Icon.png",
+            "Psi Disrupter":                               "https://static.wikia.nocookie.net/starcraft/images/c/cf/SC2_Lab_Psi_Disruptor_Icon.png",
+
+            "Zealot":                                      "https://static.wikia.nocookie.net/starcraft/images/6/6e/Icon_Protoss_Zealot.jpg",
+            "Stalker":                                     "https://static.wikia.nocookie.net/starcraft/images/0/0d/Icon_Protoss_Stalker.jpg",
+            "High Templar":                                "https://static.wikia.nocookie.net/starcraft/images/a/a0/Icon_Protoss_High_Templar.jpg",
+            "Dark Templar":                                "https://static.wikia.nocookie.net/starcraft/images/9/90/Icon_Protoss_Dark_Templar.jpg",
+            "Immortal":                                    "https://static.wikia.nocookie.net/starcraft/images/c/c1/Icon_Protoss_Immortal.jpg",
+            "Colossus":                                    "https://static.wikia.nocookie.net/starcraft/images/4/40/Icon_Protoss_Colossus.jpg",
+            "Phoenix":                                     "https://static.wikia.nocookie.net/starcraft/images/b/b1/Icon_Protoss_Phoenix.jpg",
+            "Void Ray":                                    "https://static.wikia.nocookie.net/starcraft/images/1/1d/VoidRay_SC2_Rend1.jpg",
+            "Carrier":                                     "https://static.wikia.nocookie.net/starcraft/images/2/2c/Icon_Protoss_Carrier.jpg",
+
+            "Nothing":                                     "",
+        }
+        sc2wol_location_ids = {
+            "Liberation Day":          range(SC2WOL_LOC_ID_OFFSET + 100, SC2WOL_LOC_ID_OFFSET + 200),
+            "The Outlaws":             range(SC2WOL_LOC_ID_OFFSET + 200, SC2WOL_LOC_ID_OFFSET + 300),
+            "Zero Hour":               range(SC2WOL_LOC_ID_OFFSET + 300, SC2WOL_LOC_ID_OFFSET + 400),
+            "Evacuation":              range(SC2WOL_LOC_ID_OFFSET + 400, SC2WOL_LOC_ID_OFFSET + 500),
+            "Outbreak":                range(SC2WOL_LOC_ID_OFFSET + 500, SC2WOL_LOC_ID_OFFSET + 600),
+            "Safe Haven":              range(SC2WOL_LOC_ID_OFFSET + 600, SC2WOL_LOC_ID_OFFSET + 700),
+            "Haven's Fall":            range(SC2WOL_LOC_ID_OFFSET + 700, SC2WOL_LOC_ID_OFFSET + 800),
+            "Smash and Grab":          range(SC2WOL_LOC_ID_OFFSET + 800, SC2WOL_LOC_ID_OFFSET + 900),
+            "The Dig":                 range(SC2WOL_LOC_ID_OFFSET + 900, SC2WOL_LOC_ID_OFFSET + 1000),
+            "The Moebius Factor":      range(SC2WOL_LOC_ID_OFFSET + 1000, SC2WOL_LOC_ID_OFFSET + 1100),
+            "Supernova":               range(SC2WOL_LOC_ID_OFFSET + 1100, SC2WOL_LOC_ID_OFFSET + 1200),
+            "Maw of the Void":         range(SC2WOL_LOC_ID_OFFSET + 1200, SC2WOL_LOC_ID_OFFSET + 1300),
+            "Devil's Playground":      range(SC2WOL_LOC_ID_OFFSET + 1300, SC2WOL_LOC_ID_OFFSET + 1400),
+            "Welcome to the Jungle":   range(SC2WOL_LOC_ID_OFFSET + 1400, SC2WOL_LOC_ID_OFFSET + 1500),
+            "Breakout":                range(SC2WOL_LOC_ID_OFFSET + 1500, SC2WOL_LOC_ID_OFFSET + 1600),
+            "Ghost of a Chance":       range(SC2WOL_LOC_ID_OFFSET + 1600, SC2WOL_LOC_ID_OFFSET + 1700),
+            "The Great Train Robbery": range(SC2WOL_LOC_ID_OFFSET + 1700, SC2WOL_LOC_ID_OFFSET + 1800),
+            "Cutthroat":               range(SC2WOL_LOC_ID_OFFSET + 1800, SC2WOL_LOC_ID_OFFSET + 1900),
+            "Engine of Destruction":   range(SC2WOL_LOC_ID_OFFSET + 1900, SC2WOL_LOC_ID_OFFSET + 2000),
+            "Media Blitz":             range(SC2WOL_LOC_ID_OFFSET + 2000, SC2WOL_LOC_ID_OFFSET + 2100),
+            "Piercing the Shroud":     range(SC2WOL_LOC_ID_OFFSET + 2100, SC2WOL_LOC_ID_OFFSET + 2200),
+            "Whispers of Doom":        range(SC2WOL_LOC_ID_OFFSET + 2200, SC2WOL_LOC_ID_OFFSET + 2300),
+            "A Sinister Turn":         range(SC2WOL_LOC_ID_OFFSET + 2300, SC2WOL_LOC_ID_OFFSET + 2400),
+            "Echoes of the Future":    range(SC2WOL_LOC_ID_OFFSET + 2400, SC2WOL_LOC_ID_OFFSET + 2500),
+            "In Utter Darkness":       range(SC2WOL_LOC_ID_OFFSET + 2500, SC2WOL_LOC_ID_OFFSET + 2600),
+            "Gates of Hell":           range(SC2WOL_LOC_ID_OFFSET + 2600, SC2WOL_LOC_ID_OFFSET + 2700),
+            "Belly of the Beast":      range(SC2WOL_LOC_ID_OFFSET + 2700, SC2WOL_LOC_ID_OFFSET + 2800),
+            "Shatter the Sky":         range(SC2WOL_LOC_ID_OFFSET + 2800, SC2WOL_LOC_ID_OFFSET + 2900),
+        }
+
+        display_data = {}
+
+        # Grouped Items
+        grouped_item_ids = {
+            "Progressive Weapon Upgrade":       107 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Armor Upgrade":        108 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Infantry Upgrade":     109 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Vehicle Upgrade":      110 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Ship Upgrade":         111 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Weapon/Armor Upgrade": 112 + SC2WOL_ITEM_ID_OFFSET
+        }
+        grouped_item_replacements = {
+            "Progressive Weapon Upgrade":   ["Progressive Infantry Weapon", "Progressive Vehicle Weapon",
+                                             "Progressive Ship Weapon"],
+            "Progressive Armor Upgrade":    ["Progressive Infantry Armor", "Progressive Vehicle Armor",
+                                             "Progressive Ship Armor"],
+            "Progressive Infantry Upgrade": ["Progressive Infantry Weapon", "Progressive Infantry Armor"],
+            "Progressive Vehicle Upgrade":  ["Progressive Vehicle Weapon", "Progressive Vehicle Armor"],
+            "Progressive Ship Upgrade":     ["Progressive Ship Weapon", "Progressive Ship Armor"]
+        }
+        grouped_item_replacements["Progressive Weapon/Armor Upgrade"] = grouped_item_replacements[
+                                                                            "Progressive Weapon Upgrade"] + \
+                                                                        grouped_item_replacements[
+                                                                            "Progressive Armor Upgrade"]
+        replacement_item_ids = {
+            "Progressive Infantry Weapon": 100 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Infantry Armor":  102 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Vehicle Weapon":  103 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Vehicle Armor":   104 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Ship Weapon":     105 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Ship Armor":      106 + SC2WOL_ITEM_ID_OFFSET,
+        }
+
+        inventory = tracker_data.get_player_inventory_counts(team, player)
+        for grouped_item_name, grouped_item_id in grouped_item_ids.items():
+            count: int = inventory[grouped_item_id]
+            if count > 0:
+                for replacement_item in grouped_item_replacements[grouped_item_name]:
+                    replacement_id: int = replacement_item_ids[replacement_item]
+                    inventory[replacement_id] = count
+
+        # Determine display for progressive items
+        progressive_items = {
+            "Progressive Infantry Weapon":                    100 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Infantry Armor":                     102 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Vehicle Weapon":                     103 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Vehicle Armor":                      104 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Ship Weapon":                        105 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Ship Armor":                         106 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Stimpack (Marine)":                  208 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Stimpack (Firebat)":                 226 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Stimpack (Marauder)":                228 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Stimpack (Reaper)":                  250 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Stimpack (Hellion)":                 259 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive High Impact Payload (Thor)":         361 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Cross-Spectrum Dampeners (Banshee)": 316 + SC2WOL_ITEM_ID_OFFSET,
+            "Progressive Regenerative Bio-Steel":             617 + SC2WOL_ITEM_ID_OFFSET
+        }
+        progressive_names = {
+            "Progressive Infantry Weapon":                    ["Infantry Weapons Level 1", "Infantry Weapons Level 1",
+                                                               "Infantry Weapons Level 2", "Infantry Weapons Level 3"],
+            "Progressive Infantry Armor":                     ["Infantry Armor Level 1", "Infantry Armor Level 1",
+                                                               "Infantry Armor Level 2", "Infantry Armor Level 3"],
+            "Progressive Vehicle Weapon":                     ["Vehicle Weapons Level 1", "Vehicle Weapons Level 1",
+                                                               "Vehicle Weapons Level 2", "Vehicle Weapons Level 3"],
+            "Progressive Vehicle Armor":                      ["Vehicle Armor Level 1", "Vehicle Armor Level 1",
+                                                               "Vehicle Armor Level 2", "Vehicle Armor Level 3"],
+            "Progressive Ship Weapon":                        ["Ship Weapons Level 1", "Ship Weapons Level 1",
+                                                               "Ship Weapons Level 2", "Ship Weapons Level 3"],
+            "Progressive Ship Armor":                         ["Ship Armor Level 1", "Ship Armor Level 1",
+                                                               "Ship Armor Level 2", "Ship Armor Level 3"],
+            "Progressive Stimpack (Marine)":                  ["Stimpack (Marine)", "Stimpack (Marine)",
+                                                               "Super Stimpack (Marine)"],
+            "Progressive Stimpack (Firebat)":                 ["Stimpack (Firebat)", "Stimpack (Firebat)",
+                                                               "Super Stimpack (Firebat)"],
+            "Progressive Stimpack (Marauder)":                ["Stimpack (Marauder)", "Stimpack (Marauder)",
+                                                               "Super Stimpack (Marauder)"],
+            "Progressive Stimpack (Reaper)":                  ["Stimpack (Reaper)", "Stimpack (Reaper)",
+                                                               "Super Stimpack (Reaper)"],
+            "Progressive Stimpack (Hellion)":                 ["Stimpack (Hellion)", "Stimpack (Hellion)",
+                                                               "Super Stimpack (Hellion)"],
+            "Progressive High Impact Payload (Thor)":         ["High Impact Payload (Thor)",
+                                                               "High Impact Payload (Thor)", "Smart Servos (Thor)"],
+            "Progressive Cross-Spectrum Dampeners (Banshee)": ["Cross-Spectrum Dampeners (Banshee)",
+                                                               "Cross-Spectrum Dampeners (Banshee)",
+                                                               "Advanced Cross-Spectrum Dampeners (Banshee)"],
+            "Progressive Regenerative Bio-Steel":             ["Regenerative Bio-Steel Level 1",
+                                                               "Regenerative Bio-Steel Level 1",
+                                                               "Regenerative Bio-Steel Level 2"]
+        }
+        for item_name, item_id in progressive_items.items():
+            level = min(inventory[item_id], len(progressive_names[item_name]) - 1)
+            display_name = progressive_names[item_name][level]
+            base_name = (item_name.split(maxsplit=1)[1].lower()
+                         .replace(' ', '_')
+                         .replace("-", "")
+                         .replace("(", "")
+                         .replace(")", ""))
+            display_data[base_name + "_level"] = level
+            display_data[base_name + "_url"] = icons[display_name]
+            display_data[base_name + "_name"] = display_name
+
+        # Multi-items
+        multi_items = {
+            "+15 Starting Minerals": 800 + SC2WOL_ITEM_ID_OFFSET,
+            "+15 Starting Vespene":  801 + SC2WOL_ITEM_ID_OFFSET,
+            "+2 Starting Supply":    802 + SC2WOL_ITEM_ID_OFFSET
+        }
+        for item_name, item_id in multi_items.items():
+            base_name = item_name.split()[-1].lower()
+            count = inventory[item_id]
+            if base_name == "supply":
+                count = count * 2
+                display_data[base_name + "_count"] = count
+            else:
+                count = count * 15
+                display_data[base_name + "_count"] = count
+
+        # Victory condition
+        game_state = tracker_data.get_player_client_status(team, player)
+        display_data["game_finished"] = game_state == 30
+
+        # Turn location IDs into mission objective counts
+        locations = tracker_data.get_player_locations(team, player)
+        checked_locations = tracker_data.get_player_checked_locations(team, player)
+        lookup_name = lambda id: tracker_data.location_id_to_name["Starcraft 2 Wings of Liberty"][id]
+        location_info = {mission_name: {lookup_name(id): (id in checked_locations) for id in mission_locations if
+                                        id in set(locations)} for mission_name, mission_locations in
+                         sc2wol_location_ids.items()}
+        checks_done = {mission_name: len(
+            [id for id in mission_locations if id in checked_locations and id in set(locations)]) for
+                       mission_name, mission_locations in sc2wol_location_ids.items()}
+        checks_done['Total'] = len(checked_locations)
+        checks_in_area = {mission_name: len([id for id in mission_locations if id in set(locations)]) for
+                          mission_name, mission_locations in sc2wol_location_ids.items()}
+        checks_in_area['Total'] = sum(checks_in_area.values())
+
+        lookup_any_item_id_to_name = tracker_data.item_id_to_name["Starcraft 2 Wings of Liberty"]
+        return render_template(
+            "tracker__Starcraft2WingsOfLiberty.html",
+            inventory=inventory,
+            icons=icons,
+            acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0},
+            player=player,
+            team=team,
+            room=tracker_data.room,
+            player_name=tracker_data.get_player_name(team, player),
+            checks_done=checks_done,
+            checks_in_area=checks_in_area,
+            location_info=location_info,
+            **display_data,
+        )
+
+    _player_trackers["Starcraft 2 Wings of Liberty"] = render_Starcraft2WingsOfLiberty_tracker
diff --git a/WebHostLib/upload.py b/WebHostLib/upload.py
index 89a839cfa3..af4ed264aa 100644
--- a/WebHostLib/upload.py
+++ b/WebHostLib/upload.py
@@ -11,17 +11,46 @@ from flask import request, flash, redirect, url_for, session, render_template
 from markupsafe import Markup
 from pony.orm import commit, flush, select, rollback
 from pony.orm.core import TransactionIntegrityError
+import schema
 
 import MultiServer
 from NetUtils import SlotType
 from Utils import VersionException, __version__
+from worlds import GamesPackage
 from worlds.Files import AutoPatchRegister
+from worlds.AutoWorld import data_package_checksum
 from . import app
 from .models import Seed, Room, Slot, GameDataPackage
 
-banned_zip_contents = (".sfc", ".z64", ".n64", ".sms", ".gb")
+banned_extensions = (".sfc", ".z64", ".n64", ".nes", ".smc", ".sms", ".gb", ".gbc", ".gba")
+allowed_options_extensions = (".yaml", ".json", ".yml", ".txt", ".zip")
+allowed_generation_extensions = (".archipelago", ".zip")
+
+games_package_schema = schema.Schema({
+    "item_name_groups": {str: [str]},
+    "item_name_to_id": {str: int},
+    "location_name_groups": {str: [str]},
+    "location_name_to_id": {str: int},
+    schema.Optional("checksum"): str,
+    schema.Optional("version"): int,
+})
+
+
+def allowed_options(filename: str) -> bool:
+    return filename.endswith(allowed_options_extensions)
+
+
+def allowed_generation(filename: str) -> bool:
+    return filename.endswith(allowed_generation_extensions)
+
+
+def banned_file(filename: str) -> bool:
+    return filename.endswith(banned_extensions)
+
 
 def process_multidata(compressed_multidata, files={}):
+    game_data: GamesPackage
+
     decompressed_multidata = MultiServer.Context.decompress(compressed_multidata)
 
     slots: typing.Set[Slot] = set()
@@ -30,11 +59,19 @@ def process_multidata(compressed_multidata, files={}):
         game_data_packages: typing.List[GameDataPackage] = []
         for game, game_data in decompressed_multidata["datapackage"].items():
             if game_data.get("checksum"):
+                original_checksum = game_data.pop("checksum")
+                game_data = games_package_schema.validate(game_data)
+                game_data = {key: value for key, value in sorted(game_data.items())}
+                game_data["checksum"] = data_package_checksum(game_data)
                 game_data_package = GameDataPackage(checksum=game_data["checksum"],
                                                     data=pickle.dumps(game_data))
+                if original_checksum != game_data["checksum"]:
+                    raise Exception(f"Original checksum {original_checksum} != "
+                                    f"calculated checksum {game_data['checksum']} "
+                                    f"for game {game}.")
                 decompressed_multidata["datapackage"][game] = {
                     "version": game_data.get("version", 0),
-                    "checksum": game_data["checksum"]
+                    "checksum": game_data["checksum"],
                 }
                 try:
                     commit()  # commit game data package
@@ -49,20 +86,21 @@ def process_multidata(compressed_multidata, files={}):
             if slot_info.type == SlotType.group:
                 continue
             slots.add(Slot(data=files.get(slot, None),
-                            player_name=slot_info.name,
-                            player_id=slot,
-                            game=slot_info.game))
+                           player_name=slot_info.name,
+                           player_id=slot,
+                           game=slot_info.game))
         flush()  # commit slots
 
     compressed_multidata = compressed_multidata[0:1] + zlib.compress(pickle.dumps(decompressed_multidata), 9)
     return slots, compressed_multidata
 
+
 def upload_zip_to_db(zfile: zipfile.ZipFile, owner=None, meta={"race": False}, sid=None):
     if not owner:
         owner = session["_id"]
     infolist = zfile.infolist()
-    if all(file.filename.endswith((".yaml", ".yml")) or file.is_dir() for file in infolist):
-        flash(Markup("Error: Your .zip file only contains .yaml files. "
+    if all(allowed_options(file.filename) or file.is_dir() for file in infolist):
+        flash(Markup("Error: Your .zip file only contains options files. "
                      'Did you mean to <a href="/generate">generate a game</a>?'))
         return
 
@@ -73,7 +111,7 @@ def upload_zip_to_db(zfile: zipfile.ZipFile, owner=None, meta={"race": False}, s
     # Load files.
     for file in infolist:
         handler = AutoPatchRegister.get_handler(file.filename)
-        if file.filename.endswith(banned_zip_contents):
+        if banned_file(file.filename):
             return "Uploaded data contained a rom file, which is likely to contain copyrighted material. " \
                    "Your file was deleted."
 
@@ -104,13 +142,21 @@ def upload_zip_to_db(zfile: zipfile.ZipFile, owner=None, meta={"race": False}, s
 
         # Factorio
         elif file.filename.endswith(".zip"):
-            _, _, slot_id, *_ = file.filename.split('_')[0].split('-', 3)
+            try:
+                _, _, slot_id, *_ = file.filename.split('_')[0].split('-', 3)
+            except ValueError:
+                flash("Error: Unexpected file found in .zip: " + file.filename)
+                return
             data = zfile.open(file, "r").read()
             files[int(slot_id[1:])] = data
 
         # All other files using the standard MultiWorld.get_out_file_name_base method
         else:
-            _, _, slot_id, *_ = file.filename.split('.')[0].split('_', 3)
+            try:
+                _, _, slot_id, *_ = file.filename.split('.')[0].split('_', 3)
+            except ValueError:
+                flash("Error: Unexpected file found in .zip: " + file.filename)
+                return
             data = zfile.open(file, "r").read()
             files[int(slot_id[1:])] = data
 
@@ -128,35 +174,34 @@ def upload_zip_to_db(zfile: zipfile.ZipFile, owner=None, meta={"race": False}, s
         flash("No multidata was found in the zip file, which is required.")
 
 
-@app.route('/uploads', methods=['GET', 'POST'])
+@app.route("/uploads", methods=["GET", "POST"])
 def uploads():
-    if request.method == 'POST':
-        # check if the post request has the file part
-        if 'file' not in request.files:
-            flash('No file part')
+    if request.method == "POST":
+        # check if the POST request has a file part.
+        if "file" not in request.files:
+            flash("No file part in POST request.")
         else:
-            file = request.files['file']
-            # if user does not select file, browser also
-            # submit an empty part without filename
-            if file.filename == '':
-                flash('No selected file')
-            elif file and allowed_file(file.filename):
-                if zipfile.is_zipfile(file):
-                    with zipfile.ZipFile(file, 'r') as zfile:
+            uploaded_file = request.files["file"]
+            # If the user does not select file, the browser will still submit an empty string without a file name.
+            if uploaded_file.filename == "":
+                flash("No selected file.")
+            elif uploaded_file and allowed_generation(uploaded_file.filename):
+                if zipfile.is_zipfile(uploaded_file):
+                    with zipfile.ZipFile(uploaded_file, "r") as zfile:
                         try:
                             res = upload_zip_to_db(zfile)
                         except VersionException:
                             flash(f"Could not load multidata. Wrong Version detected.")
                         else:
-                            if type(res) == str:
+                            if res is str:
                                 return res
                             elif res:
                                 return redirect(url_for("view_seed", seed=res.id))
                 else:
-                    file.seek(0)  # offset from is_zipfile check
+                    uploaded_file.seek(0)  # offset from is_zipfile check
                     # noinspection PyBroadException
                     try:
-                        multidata = file.read()
+                        multidata = uploaded_file.read()
                         slots, multidata = process_multidata(multidata)
                     except Exception as e:
                         flash(f"Could not load multidata. File may be corrupted or incompatible. ({e})")
@@ -174,7 +219,3 @@ def user_content():
     rooms = select(room for room in Room if room.owner == session["_id"])
     seeds = select(seed for seed in Seed if seed.owner == session["_id"])
     return render_template("userContent.html", rooms=rooms, seeds=seeds)
-
-
-def allowed_file(filename):
-    return filename.endswith(('.archipelago', ".zip"))
diff --git a/Zelda1Client.py b/Zelda1Client.py
index db3d3519aa..cd76a0a5ca 100644
--- a/Zelda1Client.py
+++ b/Zelda1Client.py
@@ -13,7 +13,6 @@ from typing import List
 
 import Utils
 from Utils import async_start
-from worlds import lookup_any_location_id_to_name
 from CommonClient import CommonContext, server_loop, gui_enabled, console_loop, ClientCommandProcessor, logger, \
     get_base_parser
 
@@ -153,7 +152,7 @@ def get_payload(ctx: ZeldaContext):
 
 
 def reconcile_shops(ctx: ZeldaContext):
-    checked_location_names = [lookup_any_location_id_to_name[location] for location in ctx.checked_locations]
+    checked_location_names = [ctx.location_names[location] for location in ctx.checked_locations]
     shops = [location for location in checked_location_names if "Shop" in location]
     left_slots = [shop for shop in shops if "Left" in shop]
     middle_slots = [shop for shop in shops if "Middle" in shop]
@@ -191,7 +190,7 @@ async def parse_locations(locations_array, ctx: ZeldaContext, force: bool, zone=
         locations_checked = []
         location = None
         for location in ctx.missing_locations:
-            location_name = lookup_any_location_id_to_name[location]
+            location_name = ctx.location_names[location]
 
             if location_name in Locations.overworld_locations and zone == "overworld":
                 status = locations_array[Locations.major_location_offsets[location_name]]
diff --git a/ZillionClient.py b/ZillionClient.py
index 7d32a72261..ef96edab04 100644
--- a/ZillionClient.py
+++ b/ZillionClient.py
@@ -1,505 +1,10 @@
-import asyncio
-import base64
-import platform
-from typing import Any, ClassVar, Coroutine, Dict, List, Optional, Protocol, Tuple, Type, cast
+import ModuleUpdate
+ModuleUpdate.update()
 
-# CommonClient import first to trigger ModuleUpdater
-from CommonClient import CommonContext, server_loop, gui_enabled, \
-    ClientCommandProcessor, logger, get_base_parser
-from NetUtils import ClientStatus
-import Utils
-from Utils import async_start
-
-import colorama  # type: ignore
-
-from zilliandomizer.zri.memory import Memory
-from zilliandomizer.zri import events
-from zilliandomizer.utils.loc_name_maps import id_to_loc
-from zilliandomizer.options import Chars
-from zilliandomizer.patch import RescueInfo
-
-from worlds.zillion.id_maps import make_id_to_others
-from worlds.zillion.config import base_id, zillion_map
-
-
-class ZillionCommandProcessor(ClientCommandProcessor):
-    ctx: "ZillionContext"
-
-    def _cmd_sms(self) -> None:
-        """ Tell the client that Zillion is running in RetroArch. """
-        logger.info("ready to look for game")
-        self.ctx.look_for_retroarch.set()
-
-    def _cmd_map(self) -> None:
-        """ Toggle view of the map tracker. """
-        self.ctx.ui_toggle_map()
-
-
-class ToggleCallback(Protocol):
-    def __call__(self) -> None: ...
-
-
-class SetRoomCallback(Protocol):
-    def __call__(self, rooms: List[List[int]]) -> None: ...
-
-
-class ZillionContext(CommonContext):
-    game = "Zillion"
-    command_processor: Type[ClientCommandProcessor] = ZillionCommandProcessor
-    items_handling = 1  # receive items from other players
-
-    known_name: Optional[str]
-    """ This is almost the same as `auth` except `auth` is reset to `None` when server disconnects, and this isn't. """
-
-    from_game: "asyncio.Queue[events.EventFromGame]"
-    to_game: "asyncio.Queue[events.EventToGame]"
-    ap_local_count: int
-    """ local checks watched by server """
-    next_item: int
-    """ index in `items_received` """
-    ap_id_to_name: Dict[int, str]
-    ap_id_to_zz_id: Dict[int, int]
-    start_char: Chars = "JJ"
-    rescues: Dict[int, RescueInfo] = {}
-    loc_mem_to_id: Dict[int, int] = {}
-    got_room_info: asyncio.Event
-    """ flag for connected to server """
-    got_slot_data: asyncio.Event
-    """ serves as a flag for whether I am logged in to the server """
-
-    look_for_retroarch: asyncio.Event
-    """
-    There is a bug in Python in Windows
-    https://github.com/python/cpython/issues/91227
-    that makes it so if I look for RetroArch before it's ready,
-    it breaks the asyncio udp transport system.
-
-    As a workaround, we don't look for RetroArch until this event is set.
-    """
-
-    ui_toggle_map: ToggleCallback
-    ui_set_rooms: SetRoomCallback
-    """ parameter is y 16 x 8 numbers to show in each room """
-
-    def __init__(self,
-                 server_address: str,
-                 password: str) -> None:
-        super().__init__(server_address, password)
-        self.known_name = None
-        self.from_game = asyncio.Queue()
-        self.to_game = asyncio.Queue()
-        self.got_room_info = asyncio.Event()
-        self.got_slot_data = asyncio.Event()
-        self.ui_toggle_map = lambda: None
-        self.ui_set_rooms = lambda rooms: None
-
-        self.look_for_retroarch = asyncio.Event()
-        if platform.system() != "Windows":
-            # asyncio udp bug is only on Windows
-            self.look_for_retroarch.set()
-
-        self.reset_game_state()
-
-    def reset_game_state(self) -> None:
-        for _ in range(self.from_game.qsize()):
-            self.from_game.get_nowait()
-        for _ in range(self.to_game.qsize()):
-            self.to_game.get_nowait()
-        self.got_slot_data.clear()
-
-        self.ap_local_count = 0
-        self.next_item = 0
-        self.ap_id_to_name = {}
-        self.ap_id_to_zz_id = {}
-        self.rescues = {}
-        self.loc_mem_to_id = {}
-
-        self.locations_checked.clear()
-        self.missing_locations.clear()
-        self.checked_locations.clear()
-        self.finished_game = False
-        self.items_received.clear()
-
-    # override
-    def on_deathlink(self, data: Dict[str, Any]) -> None:
-        self.to_game.put_nowait(events.DeathEventToGame())
-        return super().on_deathlink(data)
-
-    # override
-    async def server_auth(self, password_requested: bool = False) -> None:
-        if password_requested and not self.password:
-            await super().server_auth(password_requested)
-        if not self.auth:
-            logger.info('waiting for connection to game...')
-            return
-        logger.info("logging in to server...")
-        await self.send_connect()
-
-    # override
-    def run_gui(self) -> None:
-        from kvui import GameManager
-        from kivy.core.text import Label as CoreLabel
-        from kivy.graphics import Ellipse, Color, Rectangle
-        from kivy.uix.layout import Layout
-        from kivy.uix.widget import Widget
-
-        class ZillionManager(GameManager):
-            logging_pairs = [
-                ("Client", "Archipelago")
-            ]
-            base_title = "Archipelago Zillion Client"
-
-            class MapPanel(Widget):
-                MAP_WIDTH: ClassVar[int] = 281
-
-                _number_textures: List[Any] = []
-                rooms: List[List[int]] = []
-
-                def __init__(self, **kwargs: Any) -> None:
-                    super().__init__(**kwargs)
-
-                    self.rooms = [[0 for _ in range(8)] for _ in range(16)]
-
-                    self._make_numbers()
-                    self.update_map()
-
-                    self.bind(pos=self.update_map)
-                    # self.bind(size=self.update_bg)
-
-                def _make_numbers(self) -> None:
-                    self._number_textures = []
-                    for n in range(10):
-                        label = CoreLabel(text=str(n), font_size=22, color=(0.1, 0.9, 0, 1))
-                        label.refresh()
-                        self._number_textures.append(label.texture)
-
-                def update_map(self, *args: Any) -> None:
-                    self.canvas.clear()
-
-                    with self.canvas:
-                        Color(1, 1, 1, 1)
-                        Rectangle(source=zillion_map,
-                                  pos=self.pos,
-                                  size=(ZillionManager.MapPanel.MAP_WIDTH,
-                                        int(ZillionManager.MapPanel.MAP_WIDTH * 1.456)))  # aspect ratio of that image
-                        for y in range(16):
-                            for x in range(8):
-                                num = self.rooms[15 - y][x]
-                                if num > 0:
-                                    Color(0, 0, 0, 0.4)
-                                    pos = [self.pos[0] + 17 + x * 32, self.pos[1] + 14 + y * 24]
-                                    Ellipse(size=[22, 22], pos=pos)
-                                    Color(1, 1, 1, 1)
-                                    pos = [self.pos[0] + 22 + x * 32, self.pos[1] + 12 + y * 24]
-                                    num_texture = self._number_textures[num]
-                                    Rectangle(texture=num_texture, size=num_texture.size, pos=pos)
-
-            def build(self) -> Layout:
-                container = super().build()
-                self.map_widget = ZillionManager.MapPanel(size_hint_x=None, width=0)
-                self.main_area_container.add_widget(self.map_widget)
-                return container
-
-            def toggle_map_width(self) -> None:
-                if self.map_widget.width == 0:
-                    self.map_widget.width = ZillionManager.MapPanel.MAP_WIDTH
-                else:
-                    self.map_widget.width = 0
-                self.container.do_layout()
-
-            def set_rooms(self, rooms: List[List[int]]) -> None:
-                self.map_widget.rooms = rooms
-                self.map_widget.update_map()
-
-        self.ui = ZillionManager(self)
-        self.ui_toggle_map = lambda: self.ui.toggle_map_width()
-        self.ui_set_rooms = lambda rooms: self.ui.set_rooms(rooms)
-        run_co: Coroutine[Any, Any, None] = self.ui.async_run()
-        self.ui_task = asyncio.create_task(run_co, name="UI")
-
-    def on_package(self, cmd: str, args: Dict[str, Any]) -> None:
-        self.room_item_numbers_to_ui()
-        if cmd == "Connected":
-            logger.info("logged in to Archipelago server")
-            if "slot_data" not in args:
-                logger.warn("`Connected` packet missing `slot_data`")
-                return
-            slot_data = args["slot_data"]
-
-            if "start_char" not in slot_data:
-                logger.warn("invalid Zillion `Connected` packet, `slot_data` missing `start_char`")
-                return
-            self.start_char = slot_data['start_char']
-            if self.start_char not in {"Apple", "Champ", "JJ"}:
-                logger.warn("invalid Zillion `Connected` packet, "
-                            f"`slot_data` `start_char` has invalid value: {self.start_char}")
-
-            if "rescues" not in slot_data:
-                logger.warn("invalid Zillion `Connected` packet, `slot_data` missing `rescues`")
-                return
-            rescues = slot_data["rescues"]
-            self.rescues = {}
-            for rescue_id, json_info in rescues.items():
-                assert rescue_id in ("0", "1"), f"invalid rescue_id in Zillion slot_data: {rescue_id}"
-                # TODO: just take start_char out of the RescueInfo so there's no opportunity for a mismatch?
-                assert json_info["start_char"] == self.start_char, \
-                    f'mismatch in Zillion slot data: {json_info["start_char"]} {self.start_char}'
-                ri = RescueInfo(json_info["start_char"],
-                                json_info["room_code"],
-                                json_info["mask"])
-                self.rescues[0 if rescue_id == "0" else 1] = ri
-
-            if "loc_mem_to_id" not in slot_data:
-                logger.warn("invalid Zillion `Connected` packet, `slot_data` missing `loc_mem_to_id`")
-                return
-            loc_mem_to_id = slot_data["loc_mem_to_id"]
-            self.loc_mem_to_id = {}
-            for mem_str, id_str in loc_mem_to_id.items():
-                mem = int(mem_str)
-                id_ = int(id_str)
-                room_i = mem // 256
-                assert 0 <= room_i < 74
-                assert id_ in id_to_loc
-                self.loc_mem_to_id[mem] = id_
-
-            if len(self.loc_mem_to_id) != 394:
-                logger.warn("invalid Zillion `Connected` packet, "
-                            f"`slot_data` missing locations in `loc_mem_to_id` - len {len(self.loc_mem_to_id)}")
-
-            self.got_slot_data.set()
-
-            payload = {
-                "cmd": "Get",
-                "keys": [f"zillion-{self.auth}-doors"]
-            }
-            async_start(self.send_msgs([payload]))
-        elif cmd == "Retrieved":
-            if "keys" not in args:
-                logger.warning(f"invalid Retrieved packet to ZillionClient: {args}")
-                return
-            keys = cast(Dict[str, Optional[str]], args["keys"])
-            doors_b64 = keys[f"zillion-{self.auth}-doors"]
-            if doors_b64:
-                logger.info("received door data from server")
-                doors = base64.b64decode(doors_b64)
-                self.to_game.put_nowait(events.DoorEventToGame(doors))
-        elif cmd == "RoomInfo":
-            self.seed_name = args["seed_name"]
-            self.got_room_info.set()
-
-    def room_item_numbers_to_ui(self) -> None:
-        rooms = [[0 for _ in range(8)] for _ in range(16)]
-        for loc_id in self.missing_locations:
-            loc_id_small = loc_id - base_id
-            loc_name = id_to_loc[loc_id_small]
-            y = ord(loc_name[0]) - 65
-            x = ord(loc_name[2]) - 49
-            if y == 9 and x == 5:
-                # don't show main computer in numbers
-                continue
-            assert (0 <= y < 16) and (0 <= x < 8), f"invalid index from location name {loc_name}"
-            rooms[y][x] += 1
-        # TODO: also add locations with locals lost from loading save state or reset
-        self.ui_set_rooms(rooms)
-
-    def process_from_game_queue(self) -> None:
-        if self.from_game.qsize():
-            event_from_game = self.from_game.get_nowait()
-            if isinstance(event_from_game, events.AcquireLocationEventFromGame):
-                server_id = event_from_game.id + base_id
-                loc_name = id_to_loc[event_from_game.id]
-                self.locations_checked.add(server_id)
-                if server_id in self.missing_locations:
-                    self.ap_local_count += 1
-                    n_locations = len(self.missing_locations) + len(self.checked_locations) - 1  # -1 to ignore win
-                    logger.info(f'New Check: {loc_name} ({self.ap_local_count}/{n_locations})')
-                    async_start(self.send_msgs([
-                        {"cmd": 'LocationChecks', "locations": [server_id]}
-                    ]))
-                else:
-                    # This will happen a lot in Zillion,
-                    # because all the key words are local and unwatched by the server.
-                    logger.debug(f"DEBUG: {loc_name} not in missing")
-            elif isinstance(event_from_game, events.DeathEventFromGame):
-                async_start(self.send_death())
-            elif isinstance(event_from_game, events.WinEventFromGame):
-                if not self.finished_game:
-                    async_start(self.send_msgs([
-                        {"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}
-                    ]))
-                    self.finished_game = True
-            elif isinstance(event_from_game, events.DoorEventFromGame):
-                if self.auth:
-                    doors_b64 = base64.b64encode(event_from_game.doors).decode()
-                    payload = {
-                        "cmd": "Set",
-                        "key": f"zillion-{self.auth}-doors",
-                        "operations": [{"operation": "replace", "value": doors_b64}]
-                    }
-                    async_start(self.send_msgs([payload]))
-            else:
-                logger.warning(f"WARNING: unhandled event from game {event_from_game}")
-
-    def process_items_received(self) -> None:
-        if len(self.items_received) > self.next_item:
-            zz_item_ids = [self.ap_id_to_zz_id[item.item] for item in self.items_received]
-            for index in range(self.next_item, len(self.items_received)):
-                ap_id = self.items_received[index].item
-                from_name = self.player_names[self.items_received[index].player]
-                # TODO: colors in this text, like sni client?
-                logger.info(f'received {self.ap_id_to_name[ap_id]} from {from_name}')
-            self.to_game.put_nowait(
-                events.ItemEventToGame(zz_item_ids)
-            )
-            self.next_item = len(self.items_received)
-
-
-def name_seed_from_ram(data: bytes) -> Tuple[str, str]:
-    """ returns player name, and end of seed string """
-    if len(data) == 0:
-        # no connection to game
-        return "", "xxx"
-    null_index = data.find(b'\x00')
-    if null_index == -1:
-        logger.warning(f"invalid game id in rom {repr(data)}")
-        null_index = len(data)
-    name = data[:null_index].decode()
-    null_index_2 = data.find(b'\x00', null_index + 1)
-    if null_index_2 == -1:
-        null_index_2 = len(data)
-    seed_name = data[null_index + 1:null_index_2].decode()
-
-    return name, seed_name
-
-
-async def zillion_sync_task(ctx: ZillionContext) -> None:
-    logger.info("started zillion sync task")
-
-    # to work around the Python bug where we can't check for RetroArch
-    if not ctx.look_for_retroarch.is_set():
-        logger.info("Start Zillion in RetroArch, then use the /sms command to connect to it.")
-    await asyncio.wait((
-        asyncio.create_task(ctx.look_for_retroarch.wait()),
-        asyncio.create_task(ctx.exit_event.wait())
-    ), return_when=asyncio.FIRST_COMPLETED)
-
-    last_log = ""
-
-    def log_no_spam(msg: str) -> None:
-        nonlocal last_log
-        if msg != last_log:
-            last_log = msg
-            logger.info(msg)
-
-    # to only show this message once per client run
-    help_message_shown = False
-
-    with Memory(ctx.from_game, ctx.to_game) as memory:
-        while not ctx.exit_event.is_set():
-            ram = await memory.read()
-            game_id = memory.get_rom_to_ram_data(ram)
-            name, seed_end = name_seed_from_ram(game_id)
-            if len(name):
-                if name == ctx.known_name:
-                    ctx.auth = name
-                    # this is the name we know
-                    if ctx.server and ctx.server.socket:  # type: ignore
-                        if ctx.got_room_info.is_set():
-                            if ctx.seed_name and ctx.seed_name.endswith(seed_end):
-                                # correct seed
-                                if memory.have_generation_info():
-                                    log_no_spam("everything connected")
-                                    await memory.process_ram(ram)
-                                    ctx.process_from_game_queue()
-                                    ctx.process_items_received()
-                                else:  # no generation info
-                                    if ctx.got_slot_data.is_set():
-                                        memory.set_generation_info(ctx.rescues, ctx.loc_mem_to_id)
-                                        ctx.ap_id_to_name, ctx.ap_id_to_zz_id, _ap_id_to_zz_item = \
-                                            make_id_to_others(ctx.start_char)
-                                        ctx.next_item = 0
-                                        ctx.ap_local_count = len(ctx.checked_locations)
-                                    else:  # no slot data yet
-                                        async_start(ctx.send_connect())
-                                        log_no_spam("logging in to server...")
-                                        await asyncio.wait((
-                                            asyncio.create_task(ctx.got_slot_data.wait()),
-                                            asyncio.create_task(ctx.exit_event.wait()),
-                                            asyncio.create_task(asyncio.sleep(6))
-                                        ), return_when=asyncio.FIRST_COMPLETED)  # to not spam connect packets
-                            else:  # not correct seed name
-                                log_no_spam("incorrect seed - did you mix up roms?")
-                        else:  # no room info
-                            # If we get here, it looks like `RoomInfo` packet got lost
-                            log_no_spam("waiting for room info from server...")
-                    else:  # server not connected
-                        log_no_spam("waiting for server connection...")
-                else:  # new game
-                    log_no_spam("connected to new game")
-                    await ctx.disconnect()
-                    ctx.reset_server_state()
-                    ctx.seed_name = None
-                    ctx.got_room_info.clear()
-                    ctx.reset_game_state()
-                    memory.reset_game_state()
-
-                    ctx.auth = name
-                    ctx.known_name = name
-                    async_start(ctx.connect())
-                    await asyncio.wait((
-                        asyncio.create_task(ctx.got_room_info.wait()),
-                        asyncio.create_task(ctx.exit_event.wait()),
-                        asyncio.create_task(asyncio.sleep(6))
-                    ), return_when=asyncio.FIRST_COMPLETED)
-            else:  # no name found in game
-                if not help_message_shown:
-                    logger.info('In RetroArch, make sure "Settings > Network > Network Commands" is on.')
-                    help_message_shown = True
-                log_no_spam("looking for connection to game...")
-                await asyncio.sleep(0.3)
-
-            await asyncio.sleep(0.09375)
-        logger.info("zillion sync task ending")
-
-
-async def main() -> None:
-    parser = get_base_parser()
-    parser.add_argument('diff_file', default="", type=str, nargs="?",
-                        help='Path to a .apzl Archipelago Binary Patch file')
-    # SNI parser.add_argument('--loglevel', default='info', choices=['debug', 'info', 'warning', 'error', 'critical'])
-    args = parser.parse_args()
-    print(args)
-
-    if args.diff_file:
-        import Patch
-        logger.info("patch file was supplied - creating sms rom...")
-        meta, rom_file = Patch.create_rom_file(args.diff_file)
-        if "server" in meta:
-            args.connect = meta["server"]
-        logger.info(f"wrote rom file to {rom_file}")
-
-    ctx = ZillionContext(args.connect, args.password)
-    if ctx.server_task is None:
-        ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
-
-    if gui_enabled:
-        ctx.run_gui()
-    ctx.run_cli()
-
-    sync_task = asyncio.create_task(zillion_sync_task(ctx))
-
-    await ctx.exit_event.wait()
-
-    ctx.server_address = None
-    logger.debug("waiting for sync task to end")
-    await sync_task
-    logger.debug("sync task ended")
-    await ctx.shutdown()
+import Utils  # noqa: E402
 
+from worlds.zillion.client import launch  # noqa: E402
 
 if __name__ == "__main__":
     Utils.init_logging("ZillionClient", exception_logger="Client")
-
-    colorama.init()
-    asyncio.run(main())
-    colorama.deinit()
+    launch()
diff --git a/data/client.kv b/data/client.kv
index f0e3616900..3b48d216dd 100644
--- a/data/client.kv
+++ b/data/client.kv
@@ -17,6 +17,12 @@
     color: "FFFFFF"
 <TabbedPanel>:
     tab_width: root.width / app.tab_count
+<TooltipLabel>:
+    text_size: self.width, None
+    size_hint_y: None
+    height: self.texture_size[1]
+    font_size: dp(20)
+    markup: True
 <SelectableLabel>:
     canvas.before:
         Color:
@@ -24,11 +30,6 @@
         Rectangle:
             size: self.size
             pos: self.pos
-    text_size: self.width, None
-    size_hint_y: None
-    height: self.texture_size[1]
-    font_size: dp(20)
-    markup: True
 <UILog>:
     messages: 1000 # amount of messages stored in client logs.
     cols: 1
@@ -44,6 +45,70 @@
         height: self.minimum_height
         orientation: 'vertical'
         spacing: dp(3)
+<HintLabel>:
+    canvas.before:
+        Color:
+            rgba: (.0, 0.9, .1, .3) if self.selected else (0.2, 0.2, 0.2, 1) if self.striped else (0.18, 0.18, 0.18, 1)
+        Rectangle:
+            size: self.size
+            pos: self.pos
+    height: self.minimum_height
+    receiving_text: "Receiving Player"
+    item_text: "Item"
+    finding_text: "Finding Player"
+    location_text: "Location"
+    entrance_text: "Entrance"
+    found_text: "Found?"
+    TooltipLabel:
+        id: receiving
+        text: root.receiving_text
+        halign: 'center'
+        valign: 'center'
+        pos_hint: {"center_y": 0.5}
+    TooltipLabel:
+        id: item
+        text: root.item_text
+        halign: 'center'
+        valign: 'center'
+        pos_hint: {"center_y": 0.5}
+    TooltipLabel:
+        id: finding
+        text: root.finding_text
+        halign: 'center'
+        valign: 'center'
+        pos_hint: {"center_y": 0.5}
+    TooltipLabel:
+        id: location
+        text: root.location_text
+        halign: 'center'
+        valign: 'center'
+        pos_hint: {"center_y": 0.5}
+    TooltipLabel:
+        id: entrance
+        text: root.entrance_text
+        halign: 'center'
+        valign: 'center'
+        pos_hint: {"center_y": 0.5}
+    TooltipLabel:
+        id: found
+        text: root.found_text
+        halign: 'center'
+        valign: 'center'
+        pos_hint: {"center_y": 0.5}
+<HintLog>:
+    cols: 1
+    viewclass: 'HintLabel'
+    scroll_y: self.height
+    scroll_type: ["content", "bars"]
+    bar_width: dp(12)
+    effect_cls: "ScrollEffect"
+    SelectableRecycleBoxLayout:
+        default_size: None, dp(20)
+        default_size_hint: 1, None
+        size_hint_y: None
+        height: self.minimum_height
+        orientation: 'vertical'
+        spacing: dp(3)
 <ServerLabel>:
     text: "Server:"
     size_hint_x: None
diff --git a/data/lua/base64.lua b/data/lua/base64.lua
new file mode 100644
index 0000000000..ebe8064353
--- /dev/null
+++ b/data/lua/base64.lua
@@ -0,0 +1,119 @@
+-- This file originates from this repository: https://github.com/iskolbin/lbase64
+-- It was modified to translate between base64 strings and lists of bytes instead of base64 strings and strings.
+
+local base64 = {}
+
+local extract = _G.bit32 and _G.bit32.extract -- Lua 5.2/Lua 5.3 in compatibility mode
+if not extract then
+    if _G._VERSION == "Lua 5.4" then
+        extract = load[[return function( v, from, width )
+            return ( v >> from ) & ((1 << width) - 1)
+        end]]()
+    elseif _G.bit then -- LuaJIT
+        local shl, shr, band = _G.bit.lshift, _G.bit.rshift, _G.bit.band
+        extract = function( v, from, width )
+            return band( shr( v, from ), shl( 1, width ) - 1 )
+        end
+    elseif _G._VERSION == "Lua 5.1" then
+        extract = function( v, from, width )
+            local w = 0
+            local flag = 2^from
+            for i = 0, width-1 do
+                local flag2 = flag + flag
+                if v % flag2 >= flag then
+                    w = w + 2^i
+                end
+                flag = flag2
+            end
+            return w
+        end
+    end
+end
+
+
+function base64.makeencoder( s62, s63, spad )
+    local encoder = {}
+    for b64code, char in pairs{[0]='A','B','C','D','E','F','G','H','I','J',
+        'K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y',
+        'Z','a','b','c','d','e','f','g','h','i','j','k','l','m','n',
+        'o','p','q','r','s','t','u','v','w','x','y','z','0','1','2',
+        '3','4','5','6','7','8','9',s62 or '+',s63 or'/',spad or'='} do
+        encoder[b64code] = char:byte()
+    end
+    return encoder
+end
+
+function base64.makedecoder( s62, s63, spad )
+    local decoder = {}
+    for b64code, charcode in pairs( base64.makeencoder( s62, s63, spad )) do
+        decoder[charcode] = b64code
+    end
+    return decoder
+end
+
+local DEFAULT_ENCODER = base64.makeencoder()
+local DEFAULT_DECODER = base64.makedecoder()
+
+local char, concat = string.char, table.concat
+
+function base64.encode( arr, encoder )
+    encoder = encoder or DEFAULT_ENCODER
+    local t, k, n = {}, 1, #arr
+    local lastn = n % 3
+    for i = 1, n-lastn, 3 do
+        local a, b, c = arr[i], arr[i + 1], arr[i + 2]
+        local v = a*0x10000 + b*0x100 + c
+        local s
+        s = char(encoder[extract(v,18,6)], encoder[extract(v,12,6)], encoder[extract(v,6,6)], encoder[extract(v,0,6)])
+        t[k] = s
+        k = k + 1
+    end
+    if lastn == 2 then
+        local a, b = arr[n-1], arr[n]
+        local v = a*0x10000 + b*0x100
+        t[k] = char(encoder[extract(v,18,6)], encoder[extract(v,12,6)], encoder[extract(v,6,6)], encoder[64])
+    elseif lastn == 1 then
+        local v = arr[n]*0x10000
+        t[k] = char(encoder[extract(v,18,6)], encoder[extract(v,12,6)], encoder[64], encoder[64])
+    end
+    return concat( t )
+end
+
+function base64.decode( b64, decoder )
+    decoder = decoder or DEFAULT_DECODER
+    local pattern = '[^%w%+%/%=]'
+    if decoder then
+        local s62, s63
+        for charcode, b64code in pairs( decoder ) do
+            if b64code == 62 then s62 = charcode
+            elseif b64code == 63 then s63 = charcode
+            end
+        end
+        pattern = ('[^%%w%%%s%%%s%%=]'):format( char(s62), char(s63) )
+    end
+    b64 = b64:gsub( pattern, '' )
+    local t, k = {}, 1
+    local n = #b64
+    local padding = b64:sub(-2) == '==' and 2 or b64:sub(-1) == '=' and 1 or 0
+    for i = 1, padding > 0 and n-4 or n, 4 do
+        local a, b, c, d = b64:byte( i, i+3 )
+        local s
+        local v = decoder[a]*0x40000 + decoder[b]*0x1000 + decoder[c]*0x40 + decoder[d]
+        table.insert(t,extract(v,16,8))
+        table.insert(t,extract(v,8,8))
+        table.insert(t,extract(v,0,8))
+    end
+    if padding == 1 then
+        local a, b, c = b64:byte( n-3, n-1 )
+        local v = decoder[a]*0x40000 + decoder[b]*0x1000 + decoder[c]*0x40
+        table.insert(t,extract(v,16,8))
+        table.insert(t,extract(v,8,8))
+    elseif padding == 2 then
+        local a, b = b64:byte( n-3, n-2 )
+        local v = decoder[a]*0x40000 + decoder[b]*0x1000
+        table.insert(t,extract(v,16,8))
+    end
+    return t
+end
+
+return base64
diff --git a/data/lua/connector_bizhawk_generic.lua b/data/lua/connector_bizhawk_generic.lua
new file mode 100644
index 0000000000..47af6e003d
--- /dev/null
+++ b/data/lua/connector_bizhawk_generic.lua
@@ -0,0 +1,598 @@
+--[[
+Copyright (c) 2023 Zunawe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+
+local SCRIPT_VERSION = 1
+
+--[[
+This script expects to receive JSON and will send JSON back. A message should
+be a list of 1 or more requests which will be executed in order. Each request
+will have a corresponding response in the same order.
+
+Every individual request and response is a JSON object with at minimum one
+field `type`. The value of `type` determines what other fields may exist.
+
+To get the script version, instead of JSON, send "VERSION" to get the script
+version directly (e.g. "2").
+
+#### Ex. 1
+
+Request: `[{"type": "PING"}]`
+
+Response: `[{"type": "PONG"}]`
+
+---
+
+#### Ex. 2
+
+Request: `[{"type": "LOCK"}, {"type": "HASH"}]`
+
+Response: `[{"type": "LOCKED"}, {"type": "HASH_RESPONSE", "value": "F7D18982"}]`
+
+---
+
+#### Ex. 3
+
+Request:
+
+```json
+[
+    {"type": "GUARD", "address": 100, "expected_data": "aGVsbG8=", "domain": "System Bus"},
+    {"type": "READ", "address": 500, "size": 4, "domain": "ROM"}
+]
+```
+
+Response:
+
+```json
+[
+    {"type": "GUARD_RESPONSE", "address": 100, "value": true},
+    {"type": "READ_RESPONSE", "value": "dGVzdA=="}
+]
+```
+
+---
+
+#### Ex. 4
+
+Request:
+
+```json
+[
+    {"type": "GUARD", "address": 100, "expected_data": "aGVsbG8=", "domain": "System Bus"},
+    {"type": "READ", "address": 500, "size": 4, "domain": "ROM"}
+]
+```
+
+Response:
+
+```json
+[
+    {"type": "GUARD_RESPONSE", "address": 100, "value": false},
+    {"type": "GUARD_RESPONSE", "address": 100, "value": false}
+]
+```
+
+---
+
+### Supported Request Types
+
+- `PING`  
+    Does nothing; resets timeout.
+
+    Expected Response Type: `PONG`
+
+- `SYSTEM`  
+    Returns the system of the currently loaded ROM (N64, GBA, etc...).
+
+    Expected Response Type: `SYSTEM_RESPONSE`
+
+- `PREFERRED_CORES`  
+    Returns the user's default cores for systems with multiple cores. If the
+    current ROM's system has multiple cores, the one that is currently
+    running is very probably the preferred core.
+
+    Expected Response Type: `PREFERRED_CORES_RESPONSE`
+
+- `HASH`  
+    Returns the hash of the currently loaded ROM calculated by BizHawk.
+
+    Expected Response Type: `HASH_RESPONSE`
+
+- `GUARD`  
+    Checks a section of memory against `expected_data`. If the bytes starting
+    at `address` do not match `expected_data`, the response will have `value`
+    set to `false`, and all subsequent requests will not be executed and
+    receive the same `GUARD_RESPONSE`.
+
+    Expected Response Type: `GUARD_RESPONSE`
+
+    Additional Fields:
+    - `address` (`int`): The address of the memory to check
+    - `expected_data` (string): A base64 string of contiguous data
+    - `domain` (`string`): The name of the memory domain the address
+    corresponds to
+
+- `LOCK`  
+    Halts emulation and blocks on incoming requests until an `UNLOCK` request
+    is received or the client times out. All requests processed while locked
+    will happen on the same frame.
+
+    Expected Response Type: `LOCKED`
+
+- `UNLOCK`  
+    Resumes emulation after the current list of requests is done being
+    executed.
+
+    Expected Response Type: `UNLOCKED`
+
+- `READ`  
+    Reads an array of bytes at the provided address.
+
+    Expected Response Type: `READ_RESPONSE`
+
+    Additional Fields:
+    - `address` (`int`): The address of the memory to read
+    - `size` (`int`): The number of bytes to read
+    - `domain` (`string`): The name of the memory domain the address
+    corresponds to
+
+- `WRITE`  
+    Writes an array of bytes to the provided address.
+
+    Expected Response Type: `WRITE_RESPONSE`
+
+    Additional Fields:
+    - `address` (`int`): The address of the memory to write to
+    - `value` (`string`): A base64 string representing the data to write
+    - `domain` (`string`): The name of the memory domain the address
+    corresponds to
+
+- `DISPLAY_MESSAGE`  
+    Adds a message to the message queue which will be displayed using
+    `gui.addmessage` according to the message interval.
+
+    Expected Response Type: `DISPLAY_MESSAGE_RESPONSE`
+
+    Additional Fields:
+    - `message` (`string`): The string to display
+
+- `SET_MESSAGE_INTERVAL`  
+    Sets the minimum amount of time to wait between displaying messages.
+    Potentially useful if you add many messages quickly but want players
+    to be able to read each of them.
+
+    Expected Response Type: `SET_MESSAGE_INTERVAL_RESPONSE`
+
+    Additional Fields:
+    - `value` (`number`): The number of seconds to set the interval to
+
+
+### Response Types
+
+- `PONG`  
+    Acknowledges `PING`.
+
+- `SYSTEM_RESPONSE`  
+    Contains the name of the system for currently running ROM.
+
+    Additional Fields:
+    - `value` (`string`): The returned system name
+
+- `PREFERRED_CORES_RESPONSE`  
+    Contains the user's preferred cores for systems with multiple supported
+    cores. Currently includes NES, SNES, GB, GBC, DGB, SGB, PCE, PCECD, and
+    SGX.
+
+    Additional Fields:
+    - `value` (`{[string]: [string]}`): A dictionary map from system name to
+    core name
+
+- `HASH_RESPONSE`  
+    Contains the hash of the currently loaded ROM calculated by BizHawk.
+
+    Additional Fields:
+    - `value` (`string`): The returned hash
+
+- `GUARD_RESPONSE`  
+    The result of an attempted `GUARD` request.
+
+    Additional Fields:
+    - `value` (`boolean`): true if the memory was validated, false if not
+    - `address` (`int`): The address of the memory that was invalid (the same
+    address provided by the `GUARD`, not the address of the individual invalid
+    byte)
+
+- `LOCKED`  
+    Acknowledges `LOCK`.
+
+- `UNLOCKED`  
+    Acknowledges `UNLOCK`.
+
+- `READ_RESPONSE`  
+    Contains the result of a `READ` request.
+
+    Additional Fields:
+    - `value` (`string`): A base64 string representing the read data
+
+- `WRITE_RESPONSE`  
+    Acknowledges `WRITE`.
+
+- `DISPLAY_MESSAGE_RESPONSE`  
+    Acknowledges `DISPLAY_MESSAGE`.
+
+- `SET_MESSAGE_INTERVAL_RESPONSE`  
+    Acknowledges `SET_MESSAGE_INTERVAL`.
+
+- `ERROR`  
+    Signifies that something has gone wrong while processing a request.
+
+    Additional Fields:
+    - `err` (`string`): A description of the problem
+]]
+
+local bizhawk_version = client.getversion()
+local bizhawk_major, bizhawk_minor, bizhawk_patch = bizhawk_version:match("(%d+)%.(%d+)%.?(%d*)")
+bizhawk_major = tonumber(bizhawk_major)
+bizhawk_minor = tonumber(bizhawk_minor)
+if bizhawk_patch == "" then
+    bizhawk_patch = 0
+else
+    bizhawk_patch = tonumber(bizhawk_patch)
+end
+
+local lua_major, lua_minor = _VERSION:match("Lua (%d+)%.(%d+)")
+lua_major = tonumber(lua_major)
+lua_minor = tonumber(lua_minor)
+
+if lua_major > 5 or (lua_major == 5 and lua_minor >= 3) then
+    require("lua_5_3_compat")
+end
+
+local base64 = require("base64")
+local socket = require("socket")
+local json = require("json")
+
+-- Set to log incoming requests
+-- Will cause lag due to large console output
+local DEBUG = false
+
+local SOCKET_PORT_FIRST = 43055
+local SOCKET_PORT_RANGE_SIZE = 5
+local SOCKET_PORT_LAST = SOCKET_PORT_FIRST + SOCKET_PORT_RANGE_SIZE
+
+local STATE_NOT_CONNECTED = 0
+local STATE_CONNECTED = 1
+
+local server = nil
+local client_socket = nil
+
+local current_state = STATE_NOT_CONNECTED
+
+local timeout_timer = 0
+local message_timer = 0
+local message_interval = 0
+local prev_time = 0
+local current_time = 0
+
+local locked = false
+
+local rom_hash = nil
+
+function queue_push (self, value)
+    self[self.right] = value
+    self.right = self.right + 1
+end
+
+function queue_is_empty (self)
+    return self.right == self.left
+end
+
+function queue_shift (self)
+    value = self[self.left]
+    self[self.left] = nil
+    self.left = self.left + 1
+    return value
+end
+
+function new_queue ()
+    local queue = {left = 1, right = 1}
+    return setmetatable(queue, {__index = {is_empty = queue_is_empty, push = queue_push, shift = queue_shift}})
+end
+
+local message_queue = new_queue()
+
+function lock ()
+    locked = true
+    client_socket:settimeout(2)
+end
+
+function unlock ()
+    locked = false
+    client_socket:settimeout(0)
+end
+
+function process_request (req)
+    local res = {}
+
+    if req["type"] == "PING" then
+        res["type"] = "PONG"
+
+    elseif req["type"] == "SYSTEM" then
+        res["type"] = "SYSTEM_RESPONSE"
+        res["value"] = emu.getsystemid()
+
+    elseif req["type"] == "PREFERRED_CORES" then
+        local preferred_cores = client.getconfig().PreferredCores
+        res["type"] = "PREFERRED_CORES_RESPONSE"
+        res["value"] = {}
+        res["value"]["NES"] = preferred_cores.NES
+        res["value"]["SNES"] = preferred_cores.SNES
+        res["value"]["GB"] = preferred_cores.GB
+        res["value"]["GBC"] = preferred_cores.GBC
+        res["value"]["DGB"] = preferred_cores.DGB
+        res["value"]["SGB"] = preferred_cores.SGB
+        res["value"]["PCE"] = preferred_cores.PCE
+        res["value"]["PCECD"] = preferred_cores.PCECD
+        res["value"]["SGX"] = preferred_cores.SGX
+
+    elseif req["type"] == "HASH" then
+        res["type"] = "HASH_RESPONSE"
+        res["value"] = rom_hash
+
+    elseif req["type"] == "GUARD" then
+        res["type"] = "GUARD_RESPONSE"
+        local expected_data = base64.decode(req["expected_data"])
+
+        local actual_data = memory.read_bytes_as_array(req["address"], #expected_data, req["domain"])
+
+        local data_is_validated = true
+        for i, byte in ipairs(actual_data) do
+            if byte ~= expected_data[i] then
+                data_is_validated = false
+                break
+            end
+        end
+
+        res["value"] = data_is_validated
+        res["address"] = req["address"]
+
+    elseif req["type"] == "LOCK" then
+        res["type"] = "LOCKED"
+        lock()
+
+    elseif req["type"] == "UNLOCK" then
+        res["type"] = "UNLOCKED"
+        unlock()
+
+    elseif req["type"] == "READ" then
+        res["type"] = "READ_RESPONSE"
+        res["value"] = base64.encode(memory.read_bytes_as_array(req["address"], req["size"], req["domain"]))
+
+    elseif req["type"] == "WRITE" then
+        res["type"] = "WRITE_RESPONSE"
+        memory.write_bytes_as_array(req["address"], base64.decode(req["value"]), req["domain"])
+
+    elseif req["type"] == "DISPLAY_MESSAGE" then
+        res["type"] = "DISPLAY_MESSAGE_RESPONSE"
+        message_queue:push(req["message"])
+
+    elseif req["type"] == "SET_MESSAGE_INTERVAL" then
+        res["type"] = "SET_MESSAGE_INTERVAL_RESPONSE"
+        message_interval = req["value"]
+
+    else
+        res["type"] = "ERROR"
+        res["err"] = "Unknown command: "..req["type"]
+    end
+
+    return res
+end
+
+-- Receive data from AP client and send message back
+function send_receive ()
+    local message, err = client_socket:receive()
+
+    -- Handle errors
+    if err == "closed" then
+        if current_state == STATE_CONNECTED then
+            print("Connection to client closed")
+        end
+        current_state = STATE_NOT_CONNECTED
+        return
+    elseif err == "timeout" then
+        unlock()
+        return
+    elseif err ~= nil then
+        print(err)
+        current_state = STATE_NOT_CONNECTED
+        unlock()
+        return
+    end
+
+    -- Reset timeout timer
+    timeout_timer = 5
+
+    -- Process received data
+    if DEBUG then
+        print("Received Message ["..emu.framecount().."]: "..'"'..message..'"')
+    end
+
+    if message == "VERSION" then
+        client_socket:send(tostring(SCRIPT_VERSION).."\n")
+    else
+        local res = {}
+        local data = json.decode(message)
+        local failed_guard_response = nil
+        for i, req in ipairs(data) do
+            if failed_guard_response ~= nil then
+                res[i] = failed_guard_response
+            else
+                -- An error is more likely to cause an NLua exception than to return an error here
+                local status, response = pcall(process_request, req)
+                if status then
+                    res[i] = response
+
+                    -- If the GUARD validation failed, skip the remaining commands
+                    if response["type"] == "GUARD_RESPONSE" and not response["value"] then
+                        failed_guard_response = response
+                    end
+                else
+                    if type(response) ~= "string" then response = "Unknown error" end
+                    res[i] = {type = "ERROR", err = response}
+                end
+            end
+        end
+
+        client_socket:send(json.encode(res).."\n")
+    end
+end
+
+function initialize_server ()
+    local err
+    local port = SOCKET_PORT_FIRST
+    local res = nil
+
+    server, err = socket.socket.tcp4()
+    while res == nil and port <= SOCKET_PORT_LAST do
+        res, err = server:bind("localhost", port)
+        if res == nil and err ~= "address already in use" then
+            print(err)
+            return
+        end
+
+        if res == nil then
+            port = port + 1
+        end
+    end
+
+    if port > SOCKET_PORT_LAST then
+        print("Too many instances of connector script already running. Exiting.")
+        return
+    end
+
+    res, err = server:listen(0)
+
+    if err ~= nil then
+        print(err)
+        return
+    end
+
+    server:settimeout(0)
+end
+
+function main ()
+    while true do
+        if server == nil then
+            initialize_server()
+        end
+
+        current_time = socket.socket.gettime()
+        timeout_timer = timeout_timer - (current_time - prev_time)
+        message_timer = message_timer - (current_time - prev_time)
+        prev_time = current_time
+
+        if message_timer <= 0 and not message_queue:is_empty() then
+            gui.addmessage(message_queue:shift())
+            message_timer = message_interval
+        end
+
+        if current_state == STATE_NOT_CONNECTED then
+            if emu.framecount() % 30 == 0 then
+                print("Looking for client...")
+                local client, timeout = server:accept()
+                if timeout == nil then
+                    print("Client connected")
+                    current_state = STATE_CONNECTED
+                    client_socket = client
+                    server:close()
+                    server = nil
+                    client_socket:settimeout(0)
+                end
+            end
+        else
+            repeat
+                send_receive()
+            until not locked
+
+            if timeout_timer <= 0 then
+                print("Client timed out")
+                current_state = STATE_NOT_CONNECTED
+            end
+        end
+
+        coroutine.yield()
+    end
+end
+
+event.onexit(function ()
+    print("\n-- Restarting Script --\n")
+    if server ~= nil then
+        server:close()
+    end
+end)
+
+if bizhawk_major < 2 or (bizhawk_major == 2 and bizhawk_minor < 7) then
+    print("Must use BizHawk 2.7.0 or newer")
+elseif bizhawk_major > 2 or (bizhawk_major == 2 and bizhawk_minor > 9) then
+    print("Warning: This version of BizHawk is newer than this script. If it doesn't work, consider downgrading to 2.9.")
+else
+    if emu.getsystemid() == "NULL" then
+        print("No ROM is loaded. Please load a ROM.")
+        while emu.getsystemid() == "NULL" do
+            emu.frameadvance()
+        end
+    end
+
+    rom_hash = gameinfo.getromhash()
+
+    print("Waiting for client to connect. This may take longer the more instances of this script you have open at once.\n")
+
+    local co = coroutine.create(main)
+    function tick ()
+        local status, err = coroutine.resume(co)
+
+        if not status and err ~= "cannot resume dead coroutine" then
+            print("\nERROR: "..err)
+            print("Consider reporting this crash.\n")
+    
+            if server ~= nil then
+                server:close()
+            end
+
+            co = coroutine.create(main)
+        end
+    end
+
+    -- Gambatte has a setting which can cause script execution to become
+    -- misaligned, so for GB and GBC we explicitly set the callback on
+    -- vblank instead.
+    -- https://github.com/TASEmulators/BizHawk/issues/3711
+    if emu.getsystemid() == "GB" or emu.getsystemid() == "GBC" or emu.getsystemid() == "SGB" then
+        event.onmemoryexecute(tick, 0x40, "tick", "System Bus")
+    else
+        event.onframeend(tick)
+    end
+
+    while true do
+        emu.frameadvance()
+    end
+end
diff --git a/data/lua/connector_pkmn_rb.lua b/data/lua/connector_pkmn_rb.lua
deleted file mode 100644
index 3f56435bdb..0000000000
--- a/data/lua/connector_pkmn_rb.lua
+++ /dev/null
@@ -1,224 +0,0 @@
-local socket = require("socket")
-local json = require('json')
-local math = require('math')
-require("common")
-local STATE_OK = "Ok"
-local STATE_TENTATIVELY_CONNECTED = "Tentatively Connected"
-local STATE_INITIAL_CONNECTION_MADE = "Initial Connection Made"
-local STATE_UNINITIALIZED = "Uninitialized"
-
-local SCRIPT_VERSION = 3
-
-local APIndex = 0x1A6E
-local APDeathLinkAddress = 0x00FD
-local APItemAddress = 0x00FF
-local EventFlagAddress = 0x1735
-local MissableAddress = 0x161A
-local HiddenItemsAddress = 0x16DE
-local RodAddress = 0x1716
-local DexSanityAddress = 0x1A71
-local InGameAddress = 0x1A84
-local ClientCompatibilityAddress = 0xFF00
-
-local ItemsReceived = nil
-local playerName = nil
-local seedName = nil
-
-local deathlink_rec = nil
-local deathlink_send = false
-
-local prevstate = ""
-local curstate =  STATE_UNINITIALIZED
-local gbSocket = nil
-local frame = 0
-
-local compat = nil
-
-local function defineMemoryFunctions()
-	local memDomain = {}
-	local domains = memory.getmemorydomainlist()
-	memDomain["rom"] = function() memory.usememorydomain("ROM") end
-	memDomain["wram"] = function() memory.usememorydomain("WRAM") end
-	return memDomain
-end
-
-local memDomain = defineMemoryFunctions()
-u8 = memory.read_u8
-wU8 = memory.write_u8
-u16 = memory.read_u16_le
-function uRange(address, bytes)
-	data = memory.readbyterange(address - 1, bytes + 1)
-	data[0] = nil
-	return data
-end
-
-function generateLocationsChecked()
-	memDomain.wram()
-	events = uRange(EventFlagAddress, 0x140)
-	missables = uRange(MissableAddress, 0x20)
-	hiddenitems = uRange(HiddenItemsAddress, 0x0E)
-	rod = {u8(RodAddress)}
-	dexsanity = uRange(DexSanityAddress, 19)
-	
-
-	data = {}
-
-    categories = {events, missables, hiddenitems, rod}
-    if compat > 1 then
-        table.insert(categories, dexsanity)
-    end
-    for _, category in ipairs(categories) do
-        for _, v in ipairs(category) do 
-            table.insert(data, v) 
-        end
-    end
-
-    return data
-end
-
-local function arrayEqual(a1, a2)
-    if #a1 ~= #a2 then
-      return false
-    end
-  
-    for i, v in ipairs(a1) do
-      if v ~= a2[i] then
-        return false
-      end
-    end
-  
-    return true
-end
-
-function receive()
-    l, e = gbSocket:receive()
-    if e == 'closed' then
-        if curstate == STATE_OK then
-            print("Connection closed")
-        end
-        curstate = STATE_UNINITIALIZED
-        return
-    elseif e == 'timeout' then
-        return
-    elseif e ~= nil then
-        print(e)
-        curstate = STATE_UNINITIALIZED
-        return
-    end
-    if l ~= nil then
-        block = json.decode(l)
-        if block ~= nil then
-            local itemsBlock = block["items"]
-            if itemsBlock ~= nil then
-                ItemsReceived = itemsBlock
-            end
-            deathlink_rec = block["deathlink"]
-
-        end
-    end
-    -- Determine Message to send back
-    memDomain.rom()
-    newPlayerName = uRange(0xFFF0, 0x10)
-    newSeedName = uRange(0xFFDB, 21)
-    if (playerName ~= nil and not arrayEqual(playerName, newPlayerName)) or (seedName ~= nil and not arrayEqual(seedName, newSeedName)) then
-        print("ROM changed, quitting")
-        curstate = STATE_UNINITIALIZED
-        return
-    end
-    playerName = newPlayerName
-    seedName = newSeedName
-    local retTable = {}
-    retTable["scriptVersion"] = SCRIPT_VERSION
-
-    if compat == nil then
-        compat = u8(ClientCompatibilityAddress)
-        if compat < 2 then
-            InGameAddress = 0x1A71
-        end
-    end
-
-    retTable["clientCompatibilityVersion"] = compat
-    retTable["playerName"] = playerName
-    retTable["seedName"] = seedName
-    memDomain.wram()
-
-    in_game = u8(InGameAddress)
-    if in_game == 0x2A or in_game == 0xAC then
-        retTable["locations"] = generateLocationsChecked()
-    elseif in_game ~= 0 then
-        print("Game may have crashed")
-        curstate = STATE_UNINITIALIZED
-        return
-    end
-
-    retTable["deathLink"] = deathlink_send
-    deathlink_send = false
-
-    msg = json.encode(retTable).."\n"
-    local ret, error = gbSocket:send(msg)
-    if ret == nil then
-        print(error)
-    elseif curstate == STATE_INITIAL_CONNECTION_MADE then
-        curstate = STATE_TENTATIVELY_CONNECTED
-    elseif curstate == STATE_TENTATIVELY_CONNECTED then
-        print("Connected!")
-        curstate = STATE_OK
-    end
-end
-
-function main()
-    if not checkBizHawkVersion() then
-        return
-    end
-    server, error = socket.bind('localhost', 17242)
-
-    while true do
-        frame = frame + 1
-        if not (curstate == prevstate) then
-            print("Current state: "..curstate)
-            prevstate = curstate
-        end
-        if (curstate == STATE_OK) or (curstate == STATE_INITIAL_CONNECTION_MADE) or (curstate == STATE_TENTATIVELY_CONNECTED) then
-            if (frame % 5 == 0) then
-                receive()
-                in_game = u8(InGameAddress)
-                if in_game == 0x2A or in_game == 0xAC then
-                    if u8(APItemAddress) == 0x00 then
-                        ItemIndex = u16(APIndex)
-                        if deathlink_rec == true then
-                            wU8(APDeathLinkAddress, 1)
-                        elseif u8(APDeathLinkAddress) == 3 then
-                            wU8(APDeathLinkAddress, 0)
-                            deathlink_send = true
-                        end
-                        if ItemsReceived[ItemIndex + 1] ~= nil then
-                            item_id = ItemsReceived[ItemIndex + 1] - 172000000
-                            if item_id > 255 then
-                                item_id = item_id - 256
-                            end
-                            wU8(APItemAddress, item_id)
-                        end
-                    end
-                end
-            end
-        elseif (curstate == STATE_UNINITIALIZED) then
-            if  (frame % 60 == 0) then
-
-                print("Waiting for client.")
-
-                emu.frameadvance()
-                server:settimeout(2)
-                print("Attempting to connect")
-                local client, timeout = server:accept()
-                if timeout == nil then
-                    curstate = STATE_INITIAL_CONNECTION_MADE
-                    gbSocket = client
-                    gbSocket:settimeout(0)
-                end
-            end
-        end
-        emu.frameadvance()
-    end
-end
-
-main()
diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index e92bfa42b6..e221371b24 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -46,12 +46,21 @@
 # DOOM 1993
 /worlds/doom_1993/ @Daivuk
 
+# DOOM II
+/worlds/doom_ii/ @Daivuk
+
 # Factorio
 /worlds/factorio/ @Berserker66
 
 # Final Fantasy
 /worlds/ff1/ @jtoyoda
 
+# Final Fantasy Mystic Quest
+/worlds/ffmq/ @Alchav @wildham0
+
+# Heretic
+/worlds/heretic/ @Daivuk
+
 # Hollow Knight
 /worlds/hk/ @BadMagic100 @ThePhar
 
@@ -61,6 +70,12 @@
 # Kingdom Hearts 2
 /worlds/kh2/ @JaredWeakStrike
 
+# Landstalker: The Treasures of King Nole
+/worlds/landstalker/ @Dinopony
+
+# Lingo
+/worlds/lingo/ @hatkirby
+
 # Links Awakening DX
 /worlds/ladx/ @zig-for
 
@@ -92,6 +107,9 @@
 # Overcooked! 2
 /worlds/overcooked2/ @toasterparty
 
+# Pokemon Emerald
+/worlds/pokemon_emerald/ @Zunawe
+
 # Pokemon Red and Blue
 /worlds/pokemon_rb/ @Alchav
 
@@ -104,6 +122,9 @@
 # Risk of Rain 2
 /worlds/ror2/ @kindasneaki
 
+# Shivers
+/worlds/shivers/ @GodlFire
+
 # Sonic Adventure 2 Battle
 /worlds/sa2b/ @PoryGone @RaspberrySpace
 
diff --git a/docs/adding games.md b/docs/adding games.md
index 24d9e499cd..e9f7860fc6 100644
--- a/docs/adding games.md	
+++ b/docs/adding games.md	
@@ -1,214 +1,206 @@
+# How do I add a game to Archipelago?
 
-
-# How do I add a game to Archipelago?  
 This guide is going to try and be a broad summary of how you can do just that.  
-There are two key steps to incorporating a game into Archipelago:  
-- Game Modification 
+There are two key steps to incorporating a game into Archipelago:
+
+- Game Modification
 - Archipelago Server Integration
 
 Refer to the following documents as well:
-- [network protocol.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/network%20protocol.md) for network communication between client and server.
-- [world api.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/world%20api.md) for documentation on server side code and creating a world package.
 
+- [network protocol.md](/docs/network%20protocol.md) for network communication between client and server.
+- [world api.md](/docs/world%20api.md) for documentation on server side code and creating a world package.
 
-# Game Modification  
-One half of the work required to integrate a game into Archipelago is the development of the game client. This is 
+# Game Modification
+
+One half of the work required to integrate a game into Archipelago is the development of the game client. This is
 typically done through a modding API or other modification process, described further down.
 
 As an example, modifications to a game typically include (more on this later):
+
 - Hooking into when a 'location check' is completed.
 - Networking with the Archipelago server.
 - Optionally, UI or HUD updates to show status of the multiworld session or Archipelago server connection.
 
 In order to determine how to modify a game, refer to the following sections.
-  
-## Engine Identification  
-This is a good way to make the modding process much easier. Being able to identify what engine a game was made in is critical. The first step is to look at a game's files. Let's go over what some game files might look like. It’s important that you be able to see file extensions, so be sure to enable that feature in your file viewer of choice.  
+
+## Engine Identification
+
+This is a good way to make the modding process much easier. Being able to identify what engine a game was made in is
+critical. The first step is to look at a game's files. Let's go over what some game files might look like. It’s
+important that you be able to see file extensions, so be sure to enable that feature in your file viewer of choice.  
 Examples are provided below.
-  
+
 ### Creepy Castle
-![Creepy Castle Root Directory in Window's Explorer](./img/creepy-castle-directory.png)  
-  
+
+![Creepy Castle Root Directory in Windows Explorer](/docs/img/creepy-castle-directory.png)
+
 This is the delightful title Creepy Castle, which is a fantastic game that I highly recommend. It’s also your worst-case
-scenario as a modder. All that’s present here is an executable file and some meta-information that Steam uses. You have 
-basically nothing here to work with. If you want to change this game, the only option you have is to do some pretty nasty 
-disassembly and reverse engineering work, which is outside the scope of this tutorial. Let’s look at some other examples 
-of game releases.  
+scenario as a modder. All that’s present here is an executable file and some meta-information that Steam uses. You have
+basically nothing here to work with. If you want to change this game, the only option you have is to do some pretty
+nasty disassembly and reverse engineering work, which is outside the scope of this tutorial. Let’s look at some other
+examples of game releases.
 
 ### Heavy Bullets
-![Heavy Bullets Root Directory in Window's Explorer](./img/heavy-bullets-directory.png)  
-  
-Here’s the release files for another game, Heavy Bullets. We see a .exe file, like expected, and a few more files. 
-“hello.txt” is a text file, which we can quickly skim in any text editor. Many games have them in some form, usually 
-with a name like README.txt, and they may contain information about a game, such as a EULA, terms of service, licensing 
-information, credits, and general info about the game. You usually won’t find anything too helpful here, but it never 
-hurts to check. In this case, it contains some credits and a changelog for the game, so nothing too important. 
-“steam_api.dll” is a file you can safely ignore, it’s just some code used to interface with Steam. 
-The directory “HEAVY_BULLETS_Data”, however, has some good news.  
-  
-![Heavy Bullets Data Directory in Window's Explorer](./img/heavy-bullets-data-directory.png)  
-  
-Jackpot! It might not be obvious what you’re looking at here, but I can instantly tell from this folder’s contents that 
-what we have is a game made in the Unity Engine. If you look in the sub-folders, you’ll seem some .dll files which affirm 
-our suspicions. Telltale signs for this are directories titled “Managed” and “Mono”, as well as the numbered, extension-less 
-level files and the sharedassets files. We’ll tell you a bit about why seeing a Unity game is such good news later, 
-but for now, this is what one looks like. Also keep your eyes out for an executable with a name like UnityCrashHandler, 
-that’s another dead giveaway.  
+
+![Heavy Bullets Root Directory in Window's Explorer](/docs/img/heavy-bullets-directory.png)
+
+Here’s the release files for another game, Heavy Bullets. We see a .exe file, like expected, and a few more files.
+“hello.txt” is a text file, which we can quickly skim in any text editor. Many games have them in some form, usually
+with a name like README.txt, and they may contain information about a game, such as a EULA, terms of service, licensing
+information, credits, and general info about the game. You usually won’t find anything too helpful here, but it never
+hurts to check. In this case, it contains some credits and a changelog for the game, so nothing too important.
+“steam_api.dll” is a file you can safely ignore, it’s just some code used to interface with Steam.
+The directory “HEAVY_BULLETS_Data”, however, has some good news.
+
+![Heavy Bullets Data Directory in Window's Explorer](/docs/img/heavy-bullets-data-directory.png)
+
+Jackpot! It might not be obvious what you’re looking at here, but I can instantly tell from this folder’s contents that
+what we have is a game made in the Unity Engine. If you look in the sub-folders, you’ll seem some .dll files which
+affirm our suspicions. Telltale signs for this are directories titled “Managed” and “Mono”, as well as the numbered,
+extension-less level files and the sharedassets files. If you've identified the game as a Unity game, some useful tools
+and information to help you on your journey can be found at this
+[Unity Game Hacking guide.](https://github.com/imadr/Unity-game-hacking)
 
 ### Stardew Valley
-![Stardew Valley Root Directory in Window's Explorer](./img/stardew-valley-directory.png)  
-  
-This is the game contents of Stardew Valley. A lot more to look at here, but some key takeaways. 
-Notice the .dll files which include “CSharp” in their name. This tells us that the game was made in C#, which is good news. 
-More on that later.  
+
+![Stardew Valley Root Directory in Window's Explorer](/docs/img/stardew-valley-directory.png)
+
+This is the game contents of Stardew Valley. A lot more to look at here, but some key takeaways.
+Notice the .dll files which include “CSharp” in their name. This tells us that the game was made in C#, which is good
+news. Many games made in C# can be modified using the same tools found in our Unity game hacking toolset; namely BepInEx
+and MonoMod.
 
 ### Gato Roboto
-![Gato Roboto Root Directory in Window's Explorer](./img/gato-roboto-directory.png)  
-  
-Our last example is the game Gato Roboto. This game is made in GameMaker, which is another green flag to look out for. 
-The giveaway is the file titled "data.win". This immediately tips us off that this game was made in GameMaker.  
-  
-This isn't all you'll ever see looking at game files, but it's a good place to start. 
-As a general rule, the more files a game has out in plain sight, the more you'll be able to change. 
-This especially applies in the case of code or script files - always keep a lookout for anything you can use to your 
-advantage!  
-  
+
+![Gato Roboto Root Directory in Window's Explorer](/docs/img/gato-roboto-directory.png)
+
+Our last example is the game Gato Roboto. This game is made in GameMaker, which is another green flag to look out for.
+The giveaway is the file titled "data.win". This immediately tips us off that this game was made in GameMaker. For
+modifying GameMaker games the [Undertale Mod Tool](https://github.com/krzys-h/UndertaleModTool) is incredibly helpful.
+
+This isn't all you'll ever see looking at game files, but it's a good place to start.
+As a general rule, the more files a game has out in plain sight, the more you'll be able to change.
+This especially applies in the case of code or script files - always keep a lookout for anything you can use to your
+advantage!
+
 ## Open or Leaked Source Games
-As a side note, many games have either been made open source, or have had source files leaked at some point. 
-This can be a boon to any would-be modder, for obvious reasons. 
-Always be sure to check - a quick internet search for "(Game) Source Code" might not give results often, but when it 
-does you're going to have a much better time.  
-  
+
+As a side note, many games have either been made open source, or have had source files leaked at some point.
+This can be a boon to any would-be modder, for obvious reasons. Always be sure to check - a quick internet search for
+"(Game) Source Code" might not give results often, but when it does, you're going to have a much better time.
+
 Be sure never to distribute source code for games that you decompile or find if you do not have express permission to do
 so, or to redistribute any materials obtained through similar methods, as this is illegal and unethical.
-  
-## Modifying Release Versions of Games  
-However, for now we'll assume you haven't been so lucky, and have to work with only what’s sitting in your install directory.
-Some developers are kind enough to deliberately leave you ways to alter their games, like modding tools, 
-but these are often not geared to the kind of work you'll be doing and may not help much. 
 
-As a general rule, any modding tool that lets you write actual code is something worth using.  
-  
+## Modifying Release Versions of Games
+
+However, for now we'll assume you haven't been so lucky, and have to work with only what’s sitting in your install
+directory. Some developers are kind enough to deliberately leave you ways to alter their games, like modding tools,
+but these are often not geared to the kind of work you'll be doing and may not help much.
+
+As a general rule, any modding tool that lets you write actual code is something worth using.
+
 ### Research
-The first step is to research your game. Even if you've been dealt the worst hand in terms of engine modification, 
-it's possible other motivated parties have concocted useful tools for your game already. 
-Always be sure to search the Internet for the efforts of other modders.  
-  
-### Analysis Tools
-Depending on the game’s underlying engine, there may be some tools you can use either in lieu of or in addition to existing game tools.  
-  
-#### [dnSpy](https://github.com/dnSpy/dnSpy/releases)  
-The first tool in your toolbox is dnSpy. 
-dnSpy is useful for opening and modifying code files, like .exe and .dll files, that were made in C#. 
-This won't work for executable files made by other means, and obfuscated code (code which was deliberately made 
-difficult to reverse engineer) will thwart it, but 9 times out of 10 this is exactly what you need. 
-You'll want to avoid opening common library files in dnSpy, as these are unlikely to contain the data you're looking to 
-modify. 
 
-For Unity games, the file you’ll want to open will be the file (Data Folder)/Managed/Assembly-CSharp.dll, as pictured below:  
-  
-![Heavy Bullets Managed Directory in Window's Explorer](./img/heavy-bullets-managed-directory.png)  
-  
-This file will contain the data of the actual game. 
-For other C# games, the file you want is usually just the executable itself.  
-  
-With dnSpy, you can view the game’s C# code, but the tool isn’t perfect. 
-Although the names of classes, methods, variables, and more will be preserved, code structures may not remain entirely intact. This is because compilers will often subtly rewrite code to be more optimal, so that it works the same as the original code but uses fewer resources. Compiled C# files also lose comments and other documentation.  
-  
-#### [UndertaleModTool](https://github.com/krzys-h/UndertaleModTool/releases)  
-This is currently the best tool for modifying games made in GameMaker, and supports games made in both GMS 1 and 2. 
-It allows you to modify code in GML, if the game wasn't made with the wrong compiler (usually something you don't have 
-to worry about). 
+The first step is to research your game. Even if you've been dealt the worst hand in terms of engine modification,
+it's possible other motivated parties have concocted useful tools for your game already.
+Always be sure to search the Internet for the efforts of other modders.
 
-You'll want to open the data.win file, as this is where all the goods are kept. 
-Like dnSpy, you won’t be able to see comments. 
-In addition, you will be able to see and modify many hidden fields on items that GameMaker itself will often hide from 
-creators. 
+### Other helpful tools
 
-Fonts in particular are notoriously complex, and to add new sprites you may need to modify existing sprite sheets.  
-  
-#### [CheatEngine](https://cheatengine.org/)  
-CheatEngine is a tool with a very long and storied history. 
-Be warned that because it performs live modifications to the memory of other processes, it will likely be flagged as 
-malware (because this behavior is most commonly found in malware and rarely used by other programs). 
-If you use CheatEngine, you need to have a deep understanding of how computers work at the nuts and bolts level, 
-including binary data formats, addressing, and assembly language programming. 
+Depending on the game’s underlying engine, there may be some tools you can use either in lieu of or in addition to
+existing game tools.
 
-The tool itself is highly complex and even I have not yet charted its expanses. 
+#### [CheatEngine](https://cheatengine.org/)
+
+CheatEngine is a tool with a very long and storied history.
+Be warned that because it performs live modifications to the memory of other processes, it will likely be flagged as
+malware (because this behavior is most commonly found in malware and rarely used by other programs).
+If you use CheatEngine, you need to have a deep understanding of how computers work at the nuts and bolts level,
+including binary data formats, addressing, and assembly language programming.
+
+The tool itself is highly complex and even I have not yet charted its expanses.
 However, it can also be a very powerful tool in the right hands, allowing you to query and modify gamestate without ever
-modifying the actual game itself. 
-In theory it is compatible with any piece of software you can run on your computer, but there is no "easy way" to do 
-anything with it.  
-  
-### What Modifications You Should Make to the Game
-We talked about this briefly in [Game Modification](#game-modification) section.
-The next step is to know what you need to make the game do now that you can modify it. Here are your key goals:  
-- Modify the game so that checks are shuffled  
-- Know when the player has completed a check, and react accordingly  
-- Listen for messages from the Archipelago server  
-- Modify the game to display messages from the Archipelago server  
-- Add interface for connecting to the Archipelago server with passwords and sessions  
-- Add commands for manually rewarding, re-syncing, releasing, and other actions  
-  
-To elaborate, you need to be able to inform the server whenever you check locations, print out messages that you receive
-from the server in-game so players can read them, award items when the server tells you to, sync and re-sync when necessary,
-avoid double-awarding items while still maintaining game file integrity, and allow players to manually enter commands in
-case the client or server make mistakes. 
+modifying the actual game itself.
+In theory it is compatible with any piece of software you can run on your computer, but there is no "easy way" to do
+anything with it.
+
+### What Modifications You Should Make to the Game
+
+We talked about this briefly in [Game Modification](#game-modification) section.
+The next step is to know what you need to make the game do now that you can modify it. Here are your key goals:
+
+- Know when the player has checked a location, and react accordingly
+- Be able to receive items from the server on the fly
+- Keep an index for items received in order to resync from disconnections
+- Add interface for connecting to the Archipelago server with passwords and sessions
+- Add commands for manually rewarding, re-syncing, releasing, and other actions
+
+Refer to the [Network Protocol documentation](/docs/network%20protocol.md) for how to communicate with Archipelago's
+servers.
+
+## But my Game is a console game. Can I still add it?
+
+That depends – what console?
+
+### My Game is a recent game for the PS4/Xbox-One/Nintendo Switch/etc
 
-Refer to the [Network Protocol documentation](./network%20protocol.md) for how to communicate with Archipelago's servers.  
-  
-## But my Game is a console game. Can I still add it?  
-That depends – what console?  
-  
-### My Game is a recent game for the PS4/Xbox-One/Nintendo Switch/etc  
 Most games for recent generations of console platforms are inaccessible to the typical modder. It is generally advised
 that you do not attempt to work with these games as they are difficult to modify and are protected by their copyright
-holders. Most modern AAA game studios will provide a modding interface or otherwise deny modifications for their console games.
-  
-### My Game isn’t that old, it’s for the Wii/PS2/360/etc  
-This is very complex, but doable. 
-If you don't have good knowledge of stuff like Assembly programming, this is not where you want to learn it. 
+holders. Most modern AAA game studios will provide a modding interface or otherwise deny modifications for their console
+games.
+
+### My Game isn’t that old, it’s for the Wii/PS2/360/etc
+
+This is very complex, but doable.
+If you don't have good knowledge of stuff like Assembly programming, this is not where you want to learn it.
 There exist many disassembly and debugging tools, but more recent content may have lackluster support.
-  
-### My Game is a classic for the SNES/Sega Genesis/etc  
-That’s a lot more feasible. 
-There are many good tools available for understanding and modifying games on these older consoles, and the emulation 
-community will have figured out the bulk of the console’s secrets. 
-Look for debugging tools, but be ready to learn assembly. 
-Old consoles usually have their own unique dialects of ASM you’ll need to get used to. 
+
+### My Game is a classic for the SNES/Sega Genesis/etc
+
+That’s a lot more feasible.
+There are many good tools available for understanding and modifying games on these older consoles, and the emulation
+community will have figured out the bulk of the console’s secrets.
+Look for debugging tools, but be ready to learn assembly.
+Old consoles usually have their own unique dialects of ASM you’ll need to get used to.
 
 Also make sure there’s a good way to interface with a running emulator, since that’s the only way you can connect these
 older consoles to the Internet.
-There are also hardware mods and flash carts, which can do the same things an emulator would when connected to a computer,
-but these will require the same sort of interface software to be written in order to work properly - from your perspective
-the two won't really look any different.  
-  
-### My Game is an exclusive for the Super Baby Magic Dream Boy. It’s this console from the Soviet Union that-  
-Unless you have a circuit schematic for the Super Baby Magic Dream Boy sitting on your desk, no. 
+There are also hardware mods and flash carts, which can do the same things an emulator would when connected to a
+computer, but these will require the same sort of interface software to be written in order to work properly; from your
+perspective the two won't really look any different.
+
+### My Game is an exclusive for the Super Baby Magic Dream Boy. It’s this console from the Soviet Union that-
+
+Unless you have a circuit schematic for the Super Baby Magic Dream Boy sitting on your desk, no.
 Obscurity is your enemy – there will likely be little to no emulator or modding information, and you’d essentially be
-working from scratch.  
-  
+working from scratch.
+
 ## How to Distribute Game Modifications
+
 **NEVER EVER distribute anyone else's copyrighted work UNLESS THEY EXPLICITLY GIVE YOU PERMISSION TO DO SO!!!**
 
 This is a good way to get any project you're working on sued out from under you.
 The right way to distribute modified versions of a game's binaries, assuming that the licensing terms do not allow you
-to copy them wholesale, is as patches. 
+to copy them wholesale, is as patches.
 
 There are many patch formats, which I'll cover in brief. The common theme is that you can’t distribute anything that
 wasn't made by you. Patches are files that describe how your modified file differs from the original one, thus avoiding
 the issue of distributing someone else’s original work.
 
-Users who have a copy of the game just need to apply the patch, and those who don’t are unable to play.  
+Users who have a copy of the game just need to apply the patch, and those who don’t are unable to play.
 
 ### Patches
 
 #### IPS
+
 IPS patches are a simple list of chunks to replace in the original to generate the output. It is not possible to encode
 moving of a chunk, so they may inadvertently contain copyrighted material and should be avoided unless you know it's
 fine.
 
 #### UPS, BPS, VCDIFF (xdelta), bsdiff
+
 Other patch formats generate the difference between two streams (delta patches) with varying complexity. This way it is
 possible to insert bytes or move chunks without including any original data. Bsdiff is highly optimized and includes
 compression, so this format is used by APBP.
@@ -217,6 +209,7 @@ Only a bsdiff module is integrated into AP. If the final patch requires or is ba
 bsdiff or APBP before adding it to the AP source code as "basepatch.bsdiff4" or "basepatch.apbp".
 
 #### APBP Archipelago Binary Patch
+
 Starting with version 4 of the APBP format, this is a ZIP file containing metadata in `archipelago.json` and additional
 files required by the game / patching process. For ROM-based games the ZIP will include a `delta.bsdiff4` which is the
 bsdiff between the original and the randomized ROM.
@@ -224,121 +217,53 @@ bsdiff between the original and the randomized ROM.
 To make using APBP easy, they can be generated by inheriting from `worlds.Files.APDeltaPatch`.
 
 ### Mod files
+
 Games which support modding will usually just let you drag and drop the mod’s files into a folder somewhere.
 Mod files come in many forms, but the rules about not distributing other people's content remain the same.
 They can either be generic and modify the game using a seed or `slot_data` from the AP websocket, or they can be
-generated per seed.
+generated per seed. If at all possible, it's generally best practice to collect your world information from `slot_data`
+so that the users don't have to move files around in order to play.
 
 If the mod is generated by AP and is installed from a ZIP file, it may be possible to include APBP metadata for easy
 integration into the Webhost by inheriting from `worlds.Files.APContainer`.
 
-
 ## Archipelago Integration
-Integrating a randomizer into Archipelago involves a few steps.
-There are several things that may need to be done, but the most important is to create an implementation of the 
-`World` class specific to your game. This implementation should exist as a Python module within the `worlds` folder
-in the Archipelago file structure.
 
-This encompasses most of the data for your game – the items available, what checks you have, the logic for reaching those
-checks, what options to offer for the player’s yaml file, and the code to initialize all this data.
+In order for your game to communicate with the Archipelago server and generate the necessary randomized information,
+you must create a world package in the main Archipelago repo. This section will cover the requisites and expectations
+and show the basics of a world. More in depth documentation on the available API can be read in
+the [world api doc.](/docs/world%20api.md)
+For setting up your working environment with Archipelago refer
+to [running from source](/docs/running%20from%20source.md) and the [style guide](/docs/style.md).
 
-Here’s an example of what your world module can look like:  
-  
-![Example world module directory open in Window's Explorer](./img/archipelago-world-directory-example.png)
+### Requirements
 
-The minimum requirements for a new archipelago world are the package itself (the world folder containing a file named `__init__.py`),
-which must define a `World` class object for the game with a game name, create an equal number of items and locations with rules,
-a win condition, and at least one `Region` object.
-  
-Let's give a quick breakdown of what the contents for these files look like.
-This is just one example of an Archipelago world - the way things are done below is not an immutable property of Archipelago.  
-  
-### Items.py  
-This file is used to define the items which exist in a given game.  
-  
-![Example Items.py file open in Notepad++](./img/example-items-py-file.png)  
-  
-Some important things to note here. The center of our Items.py file is the item_table, which individually lists every
-item in the game and associates them with an ItemData.
+A world implementation requires a few key things from its implementation
 
-This file is rather skeletal - most of the actual data has been stripped out for simplicity.
-Each ItemData gives a numeric ID to associate with the item and a boolean telling us whether the item might allow the
-player to do more than they would have been able to before.  
-  
-Next there's the item_frequencies. This simply tells Archipelago how many times each item appears in the pool.
-Items that appear exactly once need not be listed - Archipelago will interpret absence from this dictionary as meaning
-that the item appears once.
-  
-Lastly, note the `lookup_id_to_name` dictionary, which is typically imported and used in your Archipelago `World`
-implementation. This is how Archipelago is told about the items in your world. 
-
-### Locations.py
-This file lists all locations in the game.  
-  
-![Example Locations.py file open in Notepad++](./img/example-locations-py-file.png)  
-  
-First is the achievement_table. It lists each location, the region that it can be found in (more on regions later),
-and a numeric ID to associate with each location.
-
-The exclusion table is a series of dictionaries which are used to exclude certain checks from the pool of progression
-locations based on user settings, and the events table associates certain specific checks with specific items.
-
-`lookup_id_to_name` is also present for locations, though this is a separate dictionary, to be clear.  
-  
-### Options.py  
-This file details options to be searched for in a player's YAML settings file.  
-  
-![Example Options.py file open in Notepad++](./img/example-options-py-file.png)  
-  
-There are several types of option Archipelago has support for.
-In our case, we have three separate choices a player can toggle, either On or Off.
-You can also have players choose between a number of predefined values, or have them provide a numeric value within a
-specified range. 
-  
-### Regions.py  
-This file contains data which defines the world's topology.
-In other words, it details how different regions of the game connect to each other.  
-  
-![Example Regions.py file open in Notepad++](./img/example-regions-py-file.png)  
-  
-`terraria_regions` contains a list of tuples.
-The first element of the tuple is the name of the region, and the second is a list of connections that lead out of the region.
-
-`mandatory_connections` describe where the connection leads.
-
-Above this data is a function called `link_terraria_structures` which uses our defined regions and connections to create
-something more usable for Archipelago, but this has been left out for clarity.  
-  
-### Rules.py  
-This is the file that details rules for what players can and cannot logically be required to do, based on items and settings.  
-  
-![Example Rules.py file open in Notepad++](./img/example-rules-py-file.png)  
-  
-This is the most complicated part of the job, and is one part of Archipelago that is likely to see some changes in the future.
-The first class, called `TerrariaLogic`, is an extension of the `LogicMixin` class.
-This is where you would want to define methods for evaluating certain conditions, which would then return a boolean to
-indicate whether conditions have been met. Your rule definitions should start with some sort of identifier to delineate it
-from other games, as all rules are mixed together due to `LogicMixin`. In our case, `_terraria_rule` would be a better name.
-
-The method below, `set_rules()`, is where you would assign these functions as "rules", using lambdas to associate these
-functions or combinations of them (or any other code that evaluates to a boolean, in my case just the placeholder `True`)
-to certain tasks, like checking locations or using entrances.  
-  
-### \_\_init\_\_.py  
-This is the file that actually extends the `World` class, and is where you expose functionality and data to Archipelago.  
-  
-![Example \_\_init\_\_.py file open in Notepad++](./img/example-init-py-file.png)  
-  
-This is the most important file for the implementation, and technically the only one you need, but it's best to keep this
-file as short as possible and use other script files to do most of the heavy lifting.
-If you've done things well, this will just be where you assign everything you set up in the other files to their associated
-fields in the class being extended.
-
-This is also a good place to put game-specific quirky behavior that needs to be managed, as it tends to make things a bit
-cluttered if you put these things elsewhere.  
-  
-The various methods and attributes are documented in `/worlds/AutoWorld.py[World]` and
-[world api.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/world%20api.md),
-though it is also recommended to look at existing implementations to see how all this works first-hand. 
-Once you get all that, all that remains to do is test the game and publish your work.
-Make sure to check out [world maintainer.md](./world%20maintainer.md) before publishing.
+- A folder within `worlds` that contains an `__init__.py`
+    - This is what defines it as a Python package and how it's able to be imported
+      into Archipelago's generation system. During generation time only code that is
+      defined within this file will be run. It's suggested to split up your information
+      into more files to improve readability, but all of that information can be
+      imported at its base level within your world.
+- A `World` subclass where you create your world and define all of its rules
+  and the following requirements:
+    - Your items and locations need a `item_name_to_id` and `location_name_to_id`,
+      respectively, mapping.
+    - An `option_definitions` mapping of your game options with the format
+      `{name: Class}`, where `name` uses Python snake_case.
+    - You must define your world's `create_item` method, because this may be called
+      by the generator in certain circumstances
+    - When creating your world you submit items and regions to the Multiworld.
+        - These are lists of said objects which you can access at
+          `self.multiworld.itempool` and `self.multiworld.regions`. Best practice for
+          adding to these lists is with either `append` or `extend`, where `append` is a
+          single object and `extend` is a list.
+        - Do not use `=` as this will delete other worlds' items and regions.
+        - Regions are containers for holding your world's Locations.
+        - Locations are where players will "check" for items and must exist within
+          a region. It's also important for your world's submitted items to be the same as
+          its submitted locations count.
+        - You must always have a "Menu" Region from which the generation algorithm
+          uses to enter the game and access locations.
+- Make sure to check out [world maintainer.md](/docs/world%20maintainer.md) before publishing.
\ No newline at end of file
diff --git a/docs/apworld specification.md b/docs/apworld specification.md
index 98cd25a730..ed2e8b1c8e 100644
--- a/docs/apworld specification.md	
+++ b/docs/apworld specification.md	
@@ -29,6 +29,7 @@ The zip can contain arbitrary files in addition what was specified above.
 
 ## Caveats
 
-Imports from other files inside the apworld have to use relative imports.
+Imports from other files inside the apworld have to use relative imports. e.g. `from .options import MyGameOptions`
 
-Imports from AP base have to use absolute imports, e.g. Options.py and worlds/AutoWorld.py.
+Imports from AP base have to use absolute imports, e.g. `from Options import Toggle` or
+`from worlds.AutoWorld import World`
diff --git a/docs/contributing.md b/docs/contributing.md
index 899c06b922..9b5f93e198 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -1,14 +1,33 @@
 # Contributing
-Contributions are welcome. We have a few requests of any new contributors.
+Contributions are welcome. We have a few requests for new contributors:
 
-* Ensure that all changes which affect logic are covered by unit tests. 
-* Do not introduce any unit test failures/regressions.
-* Follow styling as designated in our [styling documentation](/docs/style.md).
+* **Follow styling guidelines.**
+  Please take a look at the [code style documentation](/docs/style.md)
+  to ensure ease of communication and uniformity.
 
-Otherwise, we tend to judge code on a case to case basis.
+* **Ensure that critical changes are covered by tests.** 
+It is strongly recommended that unit tests are used to avoid regression and to ensure everything is still working.
+If you wish to contribute by adding a new game, please take a look at the [logic unit test documentation](/docs/tests.md).
+If you wish to contribute to the website, please take a look at [these tests](/test/webhost).
 
-For adding a new game to Archipelago and other documentation on how Archipelago functions, please see 
-[the docs folder](/docs/) for the relevant information and feel free to ask any questions in the #archipelago-dev 
-channel in our [Discord](https://archipelago.gg/discord).
-If you want to merge a new game, please make sure to read the responsibilities as
-[world maintainer](/docs/world%20maintainer.md).
+* **Do not introduce unit test failures/regressions.**
+Archipelago supports multiple versions of Python. You may need to download older Python versions to fully test
+your changes. Currently, the oldest supported version is [Python 3.8](https://www.python.org/downloads/release/python-380/). 
+It is recommended that automated github actions are turned on in your fork to have github run all of the unit tests after pushing.
+You can turn them on here:  
+![Github actions example](./img/github-actions-example.png)
+
+Other than these requests, we tend to judge code on a case by case basis. 
+
+For contribution to the website, please refer to the [WebHost README](/WebHostLib/README.md).
+
+If you want to contribute to the core, you will be subject to stricter review on your pull requests. It is recommended
+that you get in touch with other core maintainers via the [Discord](https://archipelago.gg/discord).
+
+If you want to add Archipelago support for a new game, please take a look at the [adding games documentation](/docs/adding%20games.md), which details what is required 
+to implement support for a game, as well as tips for how to get started.
+If you want to merge a new game into the main Archipelago repo, please make sure to read the responsibilities as a 
+[world maintainer](/docs/world%20maintainer.md).  
+
+For other questions, feel free to explore the [main documentation folder](/docs/) and ask us questions in the #archipelago-dev channel 
+of the [Discord](https://archipelago.gg/discord).
diff --git a/docs/img/archipelago-world-directory-example.png b/docs/img/archipelago-world-directory-example.png
deleted file mode 100644
index ba720f3319..0000000000
Binary files a/docs/img/archipelago-world-directory-example.png and /dev/null differ
diff --git a/docs/img/example-init-py-file.png b/docs/img/example-init-py-file.png
deleted file mode 100644
index 6dd5c3c938..0000000000
Binary files a/docs/img/example-init-py-file.png and /dev/null differ
diff --git a/docs/img/example-items-py-file.png b/docs/img/example-items-py-file.png
deleted file mode 100644
index e114a78d21..0000000000
Binary files a/docs/img/example-items-py-file.png and /dev/null differ
diff --git a/docs/img/example-locations-py-file.png b/docs/img/example-locations-py-file.png
deleted file mode 100644
index 53c4bc1e29..0000000000
Binary files a/docs/img/example-locations-py-file.png and /dev/null differ
diff --git a/docs/img/example-options-py-file.png b/docs/img/example-options-py-file.png
deleted file mode 100644
index 5811f54000..0000000000
Binary files a/docs/img/example-options-py-file.png and /dev/null differ
diff --git a/docs/img/example-regions-py-file.png b/docs/img/example-regions-py-file.png
deleted file mode 100644
index a9d05c53fc..0000000000
Binary files a/docs/img/example-regions-py-file.png and /dev/null differ
diff --git a/docs/img/example-rules-py-file.png b/docs/img/example-rules-py-file.png
deleted file mode 100644
index b76e78b406..0000000000
Binary files a/docs/img/example-rules-py-file.png and /dev/null differ
diff --git a/docs/img/github-actions-example.png b/docs/img/github-actions-example.png
new file mode 100644
index 0000000000..2363a3ed4c
Binary files /dev/null and b/docs/img/github-actions-example.png differ
diff --git a/docs/img/heavy-bullets-managed-directory.png b/docs/img/heavy-bullets-managed-directory.png
deleted file mode 100644
index 73017f6dc9..0000000000
Binary files a/docs/img/heavy-bullets-managed-directory.png and /dev/null differ
diff --git a/docs/network protocol.md b/docs/network protocol.md
index d461cebce1..274b6e3716 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -380,11 +380,13 @@ Additional arguments sent in this package will also be added to the [Retrieved](
 
 Some special keys exist with specific return data, all of them have the prefix `_read_`, so `hints_{team}_{slot}` is `_read_hints_{team}_{slot}`.
 
-| Name                          | Type                     | Notes                                             |
-|-------------------------------|--------------------------|---------------------------------------------------|
-| hints_{team}_{slot}           | list\[[Hint](#Hint)\]    | All Hints belonging to the requested Player.      |
-| slot_data_{slot}              | dict\[str, any\]         | slot_data belonging to the requested slot.        |
-| item_name_groups_{game_name}  | dict\[str, list\[str\]\] | item_name_groups belonging to the requested game. |
+| Name                             | Type                          | Notes                                                 |
+|----------------------------------|-------------------------------|-------------------------------------------------------|
+| hints_{team}_{slot}              | list\[[Hint](#Hint)\]         | All Hints belonging to the requested Player.          |
+| slot_data_{slot}                 | dict\[str, any\]              | slot_data belonging to the requested slot.            |
+| item_name_groups_{game_name}     | dict\[str, list\[str\]\]      | item_name_groups belonging to the requested game.     |
+| location_name_groups_{game_name} | dict\[str, list\[str\]\]      | location_name_groups belonging to the requested game. |
+| client_status_{team}_{slot}      | [ClientStatus](#ClientStatus) | The current game status of the requested player.      |
 
 ### Set
 Used to write data to the server's data storage, that data can then be shared across worlds or just saved for later. Values for keys in the data storage can be retrieved with a [Get](#Get) package, or monitored with a [SetNotify](#SetNotify) package.
@@ -415,6 +417,8 @@ The following operations can be applied to a datastorage key
 | mul | Multiplies the current value of the key by `value`. |
 | pow | Multiplies the current value of the key to the power of `value`. |
 | mod | Sets the current value of the key to the remainder after division by `value`. |
+| floor | Floors the current value (`value` is ignored). |
+| ceil | Ceils the current value (`value` is ignored). |
 | max | Sets the current value of the key to `value` if `value` is bigger. |
 | min | Sets the current value of the key to `value` if `value` is lower. |
 | and | Applies a bitwise AND to the current value of the key with `value`. |
@@ -556,7 +560,7 @@ Color options:
 `player` marks owning player id for location/item, 
 `flags` contains the [NetworkItem](#NetworkItem) flags that belong to the item
 
-### Client States
+### ClientStatus
 An enumeration containing the possible client states that may be used to inform
 the server in [StatusUpdate](#StatusUpdate). The MultiServer automatically sets
 the client state to `ClientStatus.CLIENT_CONNECTED` on the first active connection
diff --git a/docs/options api.md b/docs/options api.md
index fdabd9facd..48a3f763fa 100644
--- a/docs/options api.md	
+++ b/docs/options api.md	
@@ -28,19 +28,23 @@ Choice, and defining `alias_true = option_full`.
 and is reserved by AP. You can set this as your default value, but you cannot define your own `option_random`.
 
 As an example, suppose we want an option that lets the user start their game with a sword in their inventory. Let's
-create our option class (with a docstring), give it a `display_name`, and add it to a dictionary that keeps track of our
-options:
+create our option class (with a docstring), give it a `display_name`, and add it to our game's options dataclass:
 
 ```python
-# Options.py
+# options.py
+from dataclasses import dataclass
+
+from Options import Toggle, PerGameCommonOptions
+
+
 class StartingSword(Toggle):
     """Adds a sword to your starting inventory."""
     display_name = "Start With Sword"
 
 
-example_options = {
-    "starting_sword": StartingSword
-}
+@dataclass
+class ExampleGameOptions(PerGameCommonOptions):
+    starting_sword: StartingSword
 ```
 
 This will create a `Toggle` option, internally called `starting_sword`. To then submit this to the multiworld, we add it
@@ -48,29 +52,58 @@ to our world's `__init__.py`:
 
 ```python
 from worlds.AutoWorld import World
-from .Options import options
+from .Options import ExampleGameOptions
 
 
 class ExampleWorld(World):
-    option_definitions = options
+    # this gives the generator all the definitions for our options
+    options_dataclass = ExampleGameOptions
+    # this gives us typing hints for all the options we defined
+    options: ExampleGameOptions
 ```
 
 ### Option Checking
 Options are parsed by `Generate.py` before the worlds are created, and then the option classes are created shortly after
 world instantiation. These are created as attributes on the MultiWorld and can be accessed with
-`self.multiworld.my_option_name[self.player]`. This is the option class, which supports direct comparison methods to
+`self.options.my_option_name`. This is an instance of the option class, which supports direct comparison methods to
 relevant objects (like comparing a Toggle class to a `bool`). If you need to access the option result directly, this is
 the option class's `value` attribute. For our example above we can do a simple check:
 ```python
-if self.multiworld.starting_sword[self.player]:
+if self.options.starting_sword:
     do_some_things()
 ```
 
 or if I need a boolean object, such as in my slot_data I can access it as:
 ```python
-start_with_sword = bool(self.multiworld.starting_sword[self.player].value)
+start_with_sword = bool(self.options.starting_sword.value)
 ```
+All numeric options (i.e. Toggle, Choice, Range) can be compared to integers, strings that match their attributes,
+strings that match the option attributes after "option_" is stripped, and the attributes themselves.
+```python
+# options.py
+class Logic(Choice):
+    option_normal = 0
+    option_hard = 1
+    option_challenging = 2
+    option_extreme = 3
+    option_insane = 4
+    alias_extra_hard = 2
+    crazy = 4  # won't be listed as an option and only exists as an attribute on the class
 
+# __init__.py
+from .options import Logic
+
+if self.options.logic:
+    do_things_for_all_non_normal_logic()
+if self.options.logic == 1:
+    do_hard_things()
+elif self.options.logic == "challenging":
+    do_challenging_things()
+elif self.options.logic == Logic.option_extreme:
+    do_extreme_things()
+elif self.options.logic == "crazy":
+    do_insane_things()
+```
 ## Generic Option Classes
 These options are generically available to every game automatically, but can be overridden for slightly different
 behavior, if desired. See `worlds/soe/Options.py` for an example.
@@ -120,7 +153,7 @@ Like Toggle, but 1 (true) is the default value.
 A numeric option allowing you to define different sub options. Values are stored as integers, but you can also do
 comparison methods with the class and strings, so if you have an `option_early_sword`, this can be compared with:
 ```python
-if self.multiworld.sword_availability[self.player] == "early_sword":
+if self.options.sword_availability == "early_sword":
     do_early_sword_things()
 ```
 
@@ -128,7 +161,7 @@ or:
 ```python
 from .Options import SwordAvailability
 
-if self.multiworld.sword_availability[self.player] == SwordAvailability.option_early_sword:
+if self.options.sword_availability == SwordAvailability.option_early_sword:
     do_early_sword_things()
 ```
 
@@ -137,13 +170,20 @@ A numeric option allowing a variety of integers including the endpoints. Has a d
 `range_end` of 1. Allows for negative values as well. This will always be an integer and has no methods for string
 comparisons.
 
-### SpecialRange
+### NamedRange
 Like range but also allows you to define a dictionary of special names the user can use to equate to a specific value.
+`special_range_names` can be used to
+- give descriptive names to certain values from within the range 
+- add option values above or below the regular range, to be associated with a special meaning 
+
 For example:
 ```python
+range_start = 1
+range_end = 99
 special_range_names: {
     "normal": 20,
     "extreme": 99,
+    "unlimited": -1,
 }
 ```
 
@@ -160,7 +200,7 @@ within the world.
 Like choice allows you to predetermine options and has all of the same comparison methods and handling. Also accepts any
 user defined string as a valid option, so will either need to be validated by adding a validation step to the option
 class or within world, if necessary. Value for this class is `Union[str, int]` so if you need the value at a specified
-point, `self.multiworld.my_option[self.player].current_key` will always return a string.
+point, `self.options.my_option.current_key` will always return a string.
 
 ### PlandoBosses
 An option specifically built for handling boss rando, if your game can use it. Is a subclass of TextChoice so supports
diff --git a/docs/running from source.md b/docs/running from source.md
index c0f4bf5802..b7367308d8 100644
--- a/docs/running from source.md	
+++ b/docs/running from source.md	
@@ -8,7 +8,7 @@ use that version. These steps are for developers or platforms without compiled r
 
 What you'll need:
  * [Python 3.8.7 or newer](https://www.python.org/downloads/), not the Windows Store version
-   * **Python 3.11 does not work currently**
+   * **Python 3.12 is currently unsupported**
  * pip: included in downloads from python.org, separate in many Linux distributions
  * Matching C compiler
    * possibly optional, read operating system specific sections
@@ -30,7 +30,7 @@ After this, you should be able to run the programs.
 
 Recommended steps
  * Download and install a "Windows installer (64-bit)" from the [Python download page](https://www.python.org/downloads)
-   * **Python 3.11 does not work currently**
+   * **Python 3.12 is currently unsupported**
 
  * **Optional**: Download and install Visual Studio Build Tools from
    [Visual Studio Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/).
diff --git a/docs/tests.md b/docs/tests.md
new file mode 100644
index 0000000000..7a3531f0f8
--- /dev/null
+++ b/docs/tests.md
@@ -0,0 +1,90 @@
+# Archipelago Unit Testing API
+
+This document covers some of the generic tests available using Archipelago's unit testing system, as well as some basic
+steps on how to write your own.
+
+## Generic Tests
+
+Some generic tests are run on every World to ensure basic functionality with default options. These basic tests can be
+found in the [general test directory](/test/general).
+
+## Defining World Tests
+
+In order to run tests from your world, you will need to create a `test` package within your world package. This can be
+done by creating a `test` directory with a file named `__init__.py` inside it inside your world. By convention, a base
+for your world tests can be created in this file that you can then import into other modules.
+
+### WorldTestBase
+
+In order to test basic functionality of varying options, as well as to test specific edge cases or that certain
+interactions in the world interact as expected, you will want to use the [WorldTestBase](/test/bases.py). This class
+comes with the basics for test setup as well as a few preloaded tests that most worlds might want to check on varying
+options combinations.
+
+Example `/worlds/<my_game>/test/__init__.py`:
+
+```python
+from test.bases import WorldTestBase
+
+
+class MyGameTestBase(WorldTestBase):
+    game = "My Game"
+```
+
+The basic tests that WorldTestBase comes with include `test_all_state_can_reach_everything`,
+`test_empty_state_can_reach_something`, and `test_fill`. These test that with all collected items everything is
+reachable, with no collected items at least something is reachable, and that a valid multiworld can be completed with
+all steps being called, respectively.
+
+### Writing Tests
+
+#### Using WorldTestBase
+
+Adding runs for the basic tests for a different option combination is as easy as making a new module in the test
+package, creating a class that inherits from your game's TestBase, and defining the options in a dict as a field on the
+class. The new module should be named `test_<something>.py` and have at least one class inheriting from the base, or
+define its own testing methods. Newly defined test methods should follow standard PEP8 snake_case format and also start
+with `test_`.
+
+Example `/worlds/<my_game>/test/test_chest_access.py`:
+
+```python
+from . import MyGameTestBase
+
+
+class TestChestAccess(MyGameTestBase):
+    options = {
+        "difficulty": "easy",
+        "final_boss_hp": 4000,
+    }
+
+    def test_sword_chests(self) -> None:
+        """Test locations that require a sword"""
+        locations = ["Chest1", "Chest2"]
+        items = [["Sword"]]
+        # This tests that the provided locations aren't accessible without the provided items, but can be accessed once
+        # the items are obtained.
+        # This will also check that any locations not provided don't have the same dependency requirement.
+        # Optionally, passing only_check_listed=True to the method will only check the locations provided.
+        self.assertAccessDependency(locations, items)
+```
+
+When tests are run, this class will create a multiworld with a single player having the provided options, and run the
+generic tests, as well as the new custom test. Each test method definition will create its own separate solo multiworld
+that will be cleaned up after. If you don't want to run the generic tests on a base, `run_default_tests` can be
+overridden. For more information on what methods are available to your class, check the
+[WorldTestBase definition](/test/bases.py#L104).
+
+#### Alternatives to WorldTestBase
+
+Unit tests can also be created using [TestBase](/test/bases.py#L14) or
+[unittest.TestCase](https://docs.python.org/3/library/unittest.html#unittest.TestCase) depending on your use case. These
+may be useful for generating a multiworld under very specific constraints without using the generic world setup, or for
+testing portions of your code that can be tested without relying on a multiworld to be created first.
+
+## Running Tests
+
+In PyCharm, running all tests can be done by right-clicking the root `test` directory and selecting `run Python tests`.
+If you do not have pytest installed, you may get import failures. To solve this, edit the run configuration, and set the
+working directory of the run to the Archipelago directory. If you only want to run your world's defined tests, repeat
+the steps for the test directory within your world.
diff --git a/docs/triage role expectations.md b/docs/triage role expectations.md
new file mode 100644
index 0000000000..5b4cab2275
--- /dev/null
+++ b/docs/triage role expectations.md	
@@ -0,0 +1,100 @@
+# Triage Role Expectations
+
+Users with Triage-level access are selected contributors who can and wish to proactively label/triage issues and pull 
+requests without being granted write access to the Archipelago repository.
+
+Triage users are not necessarily official members of the Archipelago organization, for the list of core maintainers,
+please reference [ArchipelagoMW Members](https://github.com/orgs/ArchipelagoMW/people) page.
+
+## Access Permissions
+
+Triage users have the following permissions:
+
+* Apply/dismiss labels on all issues and pull requests.
+* Close, reopen, and assign all issues and pull requests.
+* Mark issues and pull requests as duplicate.
+* Request pull request reviews from repository members.
+* Hide comments in issues or pull requests from public view.
+    * Hidden comments are not deleted and can be reversed by another triage user or repository member with write access.
+* And all other standard permissions granted to regular GitHub users.
+
+For more details on permissions granted by the Triage role, see 
+[GitHub's Role Documentation](https://docs.github.com/en/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization).
+
+## Expectations
+
+Users with triage-level permissions have no expectation to review code, but, if desired, to review pull requests/issues 
+and apply the relevant labels and ping/request reviews from any relevant [code owners](./CODEOWNERS) for review. Triage 
+users are also expected not to close others' issues or pull requests without strong reason to do so (with exception of 
+`meta: invalid` or `meta: duplicate` scenarios, which are listed below). When in doubt, defer to a core maintainer.
+
+Triage users are not "moderators" for others' issues or pull requests. However, they may voice their opinions/feedback 
+on issues or pull requests, just the same as any other GitHub user contributing to Archipelago.
+
+## Labeling
+
+As of the time of writing this document, there are 15 distinct labels that can be applied to issues and pull requests.
+
+### Affects
+
+These labels notate if certain issues or pull requests affect critical aspects of Archipelago that may require specific 
+review. More than one of these labels can be used on a issue or pull request, if relevant.
+
+* `affects: core` is to be applied to issues/PRs that may affect core Archipelago functionality and should be reviewed 
+with additional scrutiny.
+    * Core is defined as any files not contained in the `WebHostLib` directory or individual world implementations 
+    directories inside the `worlds` directory, not including `worlds/generic`.
+* `affects: webhost` is to be applied to issues/PRs that may affect the core WebHost portion of Archipelago. In 
+general, this is anything being modified inside the `WebHostLib` directory or `WebHost.py` file.
+* `affects: release/blocker` is to be applied for any issues/PRs that may either negatively impact (issues) or propose 
+to resolve critical issues (pull requests) that affect the current or next official release of Archipelago and should be
+given top priority for review.
+
+### Is
+
+These labels notate what kinds of changes are being made or proposed in issues or pull requests. More than one of these 
+labels can be used on a issue or pull request, if relevant, but at least one of these labels should be applied to every 
+pull request and issue.
+
+* `is: bug/fix` is to be applied to issues/PRs that report or resolve an issue in core, web, or individual world 
+implementations.
+* `is: documentation` is to be applied to issues/PRs that relate to adding, updating, or removing documentation in 
+core, web, or individual world implementations without modifying actual code.
+* `is: enhancement` is to be applied to issues/PRs that relate to adding, modifying, or removing functionality in 
+core, web, or individual world implementations.
+* `is: refactor/cleanup` is to be applied to issues/PRs that relate to reorganizing existing code to improve 
+readability or performance without adding, modifying, or removing functionality or fixing known regressions.
+* `is: maintenance` is to be applied to issues/PRs that don't modify logic, refactor existing code, change features.
+This is typically reserved for pull requests that need to update dependencies or increment version numbers without 
+resolving existing issues.
+* `is: new game` is to be applied to any pull requests that introduce a new game for the first time to the `worlds` 
+directory. 
+    * Issues should not be opened and classified with `is: new game`, and instead should be directed to the 
+    #future-game-design channel in Archipelago for opening suggestions. If they are opened, they should be labeled 
+    with `meta: invalid` and closed.
+    * Pull requests for new games should only have this label, as enhancement, documentation, bug/fix, refactor, and 
+    possibly maintenance is implied.
+
+### Meta
+
+These labels allow additional quick meta information for contributors or reviewers for issues and pull requests. They 
+have specific situations where they should be applied.
+
+* `meta: duplicate` is to be applied to any issues/PRs that are duplicate of another issue/PR that was already opened. 
+    * These should be immediately closed after leaving a comment, directing to the original issue or pull request.
+* `meta: invalid` is to be applied to any issues/PRs that do not relate to Archipelago or are inappropriate for 
+discussion on GitHub.
+    * These should be immediately closed afterwards.
+* `meta: help wanted` is to be applied to any issues/PRs that require additional attention for whatever reason.
+    * These should include a comment describing what kind of help is requested when the label is added.
+    * Some common reasons include, but are not limited to: Breaking API changes that require developer input/testing or 
+    pull requests with large line changes that need additional reviewers to be reviewed effectively.
+    * This label may require some programming experience and familiarity with Archipelago source to determine if 
+    requesting additional attention for help is warranted.
+* `meta: good first issue` is to be applied to any issues that may be a good starting ground for new contributors to try 
+and tackle.
+    * This label may require some programming experience and familiarity with Archipelago source to determine if an 
+    issue is a "good first issue".
+* `meta: wontfix` is to be applied for any issues/PRs that are opened that will not be actioned because it's out of 
+scope or determined to not be an issue. 
+    * This should be reserved for use by a world's code owner(s) on their relevant world or by core maintainers.
diff --git a/docs/world api.md b/docs/world api.md
index 7a7f37b17c..0ab06da656 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -73,6 +73,53 @@ for your world specifically on the webhost:
 `game_info_languages` (optional) List of strings for defining the existing gameinfo pages your game supports. The documents must be
 prefixed with the same string as defined here. Default already has 'en'.
 
+`options_presets` (optional) A `Dict[str, Dict[str, Any]]` where the keys are the names of the presets and the values 
+are the options to be set for that preset. The options are defined as a `Dict[str, Any]` where the keys are the names of
+the options and the values are the values to be set for that option. These presets will be available for users to select from on the game's options page.
+
+Note: The values must be a non-aliased value for the option type and can only include the following option types:
+
+  - If you have a `Range`/`NamedRange` option, the value should be an `int` between the `range_start` and `range_end`
+    values.
+    - If you have a `NamedRange` option, the value can alternatively be a `str` that is one of the 
+      `special_range_names` keys.
+  - If you have a `Choice` option, the value should be a `str` that is one of the `option_<name>` values. 
+  - If you have a `Toggle`/`DefaultOnToggle` option, the value should be a `bool`.
+  - `random` is also a valid value for any of these option types.
+
+`OptionDict`, `OptionList`, `OptionSet`, `FreeText`, or custom `Option`-derived classes are not supported for presets on the webhost at this time.
+
+Here is an example of a defined preset:
+```python
+# presets.py
+options_presets = {
+    "Limited Potential": {
+        "progression_balancing":    0,
+        "fairy_chests_per_zone":    2,
+        "starting_class":           "random",
+        "chests_per_zone":          30,
+        "vendors":                  "normal",
+        "architect":                "disabled",
+        "gold_gain_multiplier":     "half",
+        "number_of_children":       2,
+        "free_diary_on_generation": False,
+        "health_pool":              10,
+        "mana_pool":                10,
+        "attack_pool":              10,
+        "magic_damage_pool":        10,
+        "armor_pool":               5,
+        "equip_pool":               10,
+        "crit_chance_pool":         5,
+        "crit_damage_pool":         5,
+    }
+}
+
+# __init__.py
+class RLWeb(WebWorld):
+    options_presets = options_presets
+    # ...
+```
+
 ### MultiWorld Object
 
 The `MultiWorld` object references the whole multiworld (all items and locations
@@ -86,9 +133,11 @@ inside a `World` object.
 ### Player Options
 
 Players provide customized settings for their World in the form of yamls.
-Those are accessible through `self.multiworld.<option_name>[self.player]`. A dict
-of valid options has to be provided in `self.option_definitions`. Options are automatically
-added to the `World` object for easy access.
+A `dataclass` of valid options definitions has to be provided in `self.options_dataclass`.
+(It must be a subclass of `PerGameCommonOptions`.)
+Option results are automatically added to the `World` object for easy access.
+Those are accessible through `self.options.<option_name>`, and you can get a dictionary of the option values via
+`self.options.as_dict(<option_names>)`, passing the desired options as strings. 
 
 ### World Settings
 
@@ -119,6 +168,38 @@ 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
 required, and will prevent progression and useful items from being placed at excluded locations.
 
+#### Documenting Locations
+
+Worlds can optionally provide a `location_descriptions` map which contains
+human-friendly descriptions of locations or location groups. These descriptions
+will show up in location-selection options in the Weighted Options page. Extra
+indentation and single newlines will be collapsed into spaces.
+
+```python
+# Locations.py
+
+location_descriptions = {
+    "Red Potion #6": "In a secret destructible block under the second stairway",
+    "L2 Spaceship": """
+      The group of all items in the spaceship in Level 2.
+
+      This doesn't include the item on the spaceship door, since it can be
+      accessed without the Spaeship Key.
+    """
+}
+```
+
+```python
+# __init__.py
+
+from worlds.AutoWorld import World
+from .Locations import location_descriptions
+
+
+class MyGameWorld(World):
+    location_descriptions = location_descriptions
+```
+
 ### Items
 
 Items are all things that can "drop" for your game. This may be RPG items like
@@ -145,6 +226,37 @@ Other classifications include
 * `progression_skip_balancing`: the combination of `progression` and `skip_balancing`, i.e., a progression item that
   will not be moved around by progression balancing; used, e.g., for currency or tokens
 
+#### Documenting Items
+
+Worlds can optionally provide an `item_descriptions` map which contains
+human-friendly descriptions of items or item groups. These descriptions will
+show up in item-selection options in the Weighted Options page. Extra
+indentation and single newlines will be collapsed into spaces.
+
+```python
+# Items.py
+
+item_descriptions = {
+    "Red Potion": "A standard health potion",
+    "Spaceship Key": """
+      The key to the spaceship in Level 2.
+
+      This is necessary to get to the Star Realm.
+    """
+}
+```
+
+```python
+# __init__.py
+
+from worlds.AutoWorld import World
+from .Items import item_descriptions
+
+
+class MyGameWorld(World):
+    item_descriptions = item_descriptions
+```
+
 ### Events
 
 Events will mark some progress. You define an event location, an
@@ -221,11 +333,11 @@ See [pip documentation](https://pip.pypa.io/en/stable/cli/pip_install/#requireme
 AP will only import the `__init__.py`. Depending on code size it makes sense to
 use multiple files and use relative imports to access them.
 
-e.g. `from .Options import mygame_options` from your `__init__.py` will load
-`worlds/<world_name>/Options.py` and make its `mygame_options` accessible.
+e.g. `from .options import MyGameOptions` from your `__init__.py` will load
+`world/[world_name]/options.py` and make its `MyGameOptions` accessible.
 
-When imported names pile up it may be easier to use `from . import Options`
-and access the variable as `Options.mygame_options`.
+When imported names pile up it may be easier to use `from . import options`
+and access the variable as `options.MyGameOptions`.
 
 Imports from directories outside your world should use absolute imports.
 Correct use of relative / absolute imports is required for zipped worlds to
@@ -246,7 +358,7 @@ class MyGameItem(Item):
     game: str = "My Game"
 ```
 By convention this class definition will either be placed in your `__init__.py`
-or your `Items.py`. For a more elaborate example see `worlds/oot/Items.py`.
+or your `items.py`. For a more elaborate example see `worlds/oot/Items.py`.
 
 ### Your location type
 
@@ -258,30 +370,31 @@ class MyGameLocation(Location):
     game: str = "My Game"
 
     # override constructor to automatically mark event locations as such
-    def __init__(self, player: int, name = "", code = None, parent = None):
+    def __init__(self, player: int, name = "", code = None, parent = None) -> None:
         super(MyGameLocation, self).__init__(player, name, code, parent)
         self.event = code is None
 ```
-in your `__init__.py` or your `Locations.py`.
+in your `__init__.py` or your `locations.py`.
 
 ### Options
 
-By convention options are defined in `Options.py` and will be used when parsing
+By convention options are defined in `options.py` and will be used when parsing
 the players' yaml files.
 
 Each option has its own class, inherits from a base option type, has a docstring 
 to describe it and a `display_name` property for display on the website and in
 spoiler logs.
 
-The actual name as used in the yaml is defined in a `Dict[str, AssembleOptions]`, that is
-assigned to the world under `self.option_definitions`.
+The actual name as used in the yaml is defined via the field names of a `dataclass` that is
+assigned to the world under `self.options_dataclass`. By convention, the strings
+that define your option names should be in `snake_case`.
 
 Common option types are `Toggle`, `DefaultOnToggle`, `Choice`, `Range`.
 For more see `Options.py` in AP's base directory.
 
 #### Toggle, DefaultOnToggle
 
-Those don't need any additional properties defined. After parsing the option,
+These don't need any additional properties defined. After parsing the option,
 its `value` will either be True or False.
 
 #### Range
@@ -307,10 +420,10 @@ default = 0
 
 #### Sample
 ```python
-# Options.py
+# options.py
 
-from Options import Toggle, Range, Choice, Option
-import typing
+from dataclasses import dataclass
+from Options import Toggle, Range, Choice, PerGameCommonOptions
 
 class Difficulty(Choice):
     """Sets overall game difficulty."""
@@ -333,23 +446,27 @@ class FixXYZGlitch(Toggle):
     """Fixes ABC when you do XYZ"""
     display_name = "Fix XYZ Glitch"
 
-# By convention we call the options dict variable `<world>_options`.
-mygame_options: typing.Dict[str, AssembleOptions] = {
-    "difficulty": Difficulty,
-    "final_boss_hp": FinalBossHP,
-    "fix_xyz_glitch": FixXYZGlitch,
-}
+# By convention, we call the options dataclass `<world>Options`.
+# It has to be derived from 'PerGameCommonOptions'.
+@dataclass
+class MyGameOptions(PerGameCommonOptions):
+    difficulty: Difficulty
+    final_boss_hp: FinalBossHP
+    fix_xyz_glitch: FixXYZGlitch
 ```
+
 ```python
 # __init__.py
 
 from worlds.AutoWorld import World
-from .Options import mygame_options  # import the options dict
+from .options import MyGameOptions  # import the options dataclass
+
 
 class MyGameWorld(World):
-    #...
-    option_definitions = mygame_options  # assign the options dict to the world
-    #...
+    # ...
+    options_dataclass = MyGameOptions  # assign the options dataclass to the world
+    options: MyGameOptions  # typing for option results
+    # ...
 ```
 
 ### A World Class Skeleton
@@ -359,13 +476,14 @@ class MyGameWorld(World):
 
 import settings
 import typing
-from .Options import mygame_options  # the options we defined earlier
-from .Items import mygame_items  # data used below to add items to the World
-from .Locations import mygame_locations  # same as above
+from .options import MyGameOptions  # the options we defined earlier
+from .items import mygame_items  # data used below to add items to the World
+from .locations import mygame_locations  # same as above
 from worlds.AutoWorld import World
 from BaseClasses import Region, Location, Entrance, Item, RegionType, ItemClassification
 
 
+
 class MyGameItem(Item):  # or from Items import MyGameItem
     game = "My Game"  # name of the game/world this item is from
 
@@ -374,6 +492,7 @@ class MyGameLocation(Location):  # or from Locations import MyGameLocation
     game = "My Game"  # name of the game/world this location is in
 
 
+
 class MyGameSettings(settings.Group):
     class RomFile(settings.SNESRomPath):
         """Insert help text for host.yaml here."""
@@ -384,7 +503,8 @@ class MyGameSettings(settings.Group):
 class MyGameWorld(World):
     """Insert description of the world/game here."""
     game = "My Game"  # name of the game/world
-    option_definitions = mygame_options  # options the player can set
+    options_dataclass = MyGameOptions  # options the player can set
+    options: MyGameOptions  # typing hints for option results
     settings: typing.ClassVar[MyGameSettings]  # will be automatically assigned from type hint
     topology_present = True  # show path to required location checks in spoiler
 
@@ -417,7 +537,7 @@ The world has to provide the following things for generation
 * additions to the regions list: at least one called "Menu"
 * locations placed inside those regions
 * a `def create_item(self, item: str) -> MyGameItem` to create any item on demand
-* applying `self.multiworld.push_precollected` for start inventory
+* applying `self.multiworld.push_precollected` for world defined start inventory
 * `required_client_version: Tuple[int, int, int]`
   Optional client version as tuple of 3 ints to make sure the client is compatible to
   this world (e.g. implements all required features) when connecting.
@@ -427,31 +547,32 @@ In addition, the following methods can be implemented and are called in this ord
 * `stage_assert_generate(cls, multiworld)` is a class method called at the start of
   generation to check the existence of prerequisite files, usually a ROM for
   games which require one.
-* `def generate_early(self)`
-  called per player before any items or locations are created. You can set
-  properties on your world here. Already has access to player options and RNG.
-* `def create_regions(self)`
+* `generate_early(self)`
+  called per player before any items or locations are created. You can set properties on your world here. Already has
+  access to player options and RNG. This is the earliest step where the world should start setting up for the current
+  multiworld as any steps before this, the multiworld itself is still getting set up
+* `create_regions(self)`
   called to place player's regions and their locations into the MultiWorld's regions list. If it's
   hard to separate, this can be done during `generate_early` or `create_items` as well.
-* `def create_items(self)`
+* `create_items(self)`
   called to place player's items into the MultiWorld's itempool. After this step all regions and items have to be in
   the MultiWorld's regions and itempool, and these lists should not be modified afterwards.
-* `def set_rules(self)`
+* `set_rules(self)`
   called to set access and item rules on locations and entrances. 
   Locations have to be defined before this, or rule application can miss them.
-* `def generate_basic(self)`
+* `generate_basic(self)`
   called after the previous steps. Some placement and player specific
   randomizations can be done here.
-* `pre_fill`, `fill_hook` and `post_fill` are called to modify item placement
+* `pre_fill(self)`, `fill_hook(self)` and `post_fill(self)` are called to modify item placement
   before, during and after the regular fill process, before `generate_output`.
   If items need to be placed during pre_fill, these items can be determined
   and created using `get_prefill_items`
-* `def generate_output(self, output_directory: str)` that creates the output
+* `generate_output(self, output_directory: str)` that creates the output
   files if there is output to be generated. When this is
   called, `self.multiworld.get_locations(self.player)` has all locations for the player, with
   attribute `item` pointing to the item.
   `location.item.player` can be used to see if it's a local item.
-* `fill_slot_data` and `modify_multidata` can be used to modify the data that
+* `fill_slot_data(self)` and `modify_multidata(self, multidata: Dict[str, Any])` can be used to modify the data that
   will be used by the server to host the MultiWorld.
 
 
@@ -460,7 +581,7 @@ In addition, the following methods can be implemented and are called in this ord
 ```python
 def generate_early(self) -> None:
     # read player settings to world instance
-    self.final_boss_hp = self.multiworld.final_boss_hp[self.player].value
+    self.final_boss_hp = self.options.final_boss_hp.value
 ```
 
 #### create_item
@@ -468,9 +589,9 @@ def generate_early(self) -> None:
 ```python
 # we need a way to know if an item provides progress in the game ("key item")
 # this can be part of the items definition, or depend on recipe randomization
-from .Items import is_progression  # this is just a dummy
+from .items import is_progression  # this is just a dummy
 
-def create_item(self, item: str):
+def create_item(self, item: str) -> MyGameItem:
     # This is called when AP wants to create an item by name (for plando) or
     # when you call it from your own code.
     classification = ItemClassification.progression if is_progression(item) else \
@@ -478,7 +599,7 @@ def create_item(self, item: str):
     return MyGameItem(item, classification, self.item_name_to_id[item],
                       self.player)
 
-def create_event(self, event: str):
+def create_event(self, event: str) -> MyGameItem:
     # while we are at it, we can also add a helper to create events
     return MyGameItem(event, True, None, self.player)
 ```
@@ -559,13 +680,19 @@ def generate_basic(self) -> None:
     # in most cases it's better to do this at the same time the itempool is
     # filled to avoid accidental duplicates:
     # manually placed and still in the itempool
+    
+    # for debugging purposes, you may want to visualize the layout of your world. Uncomment the following code to
+    # write a PlantUML diagram to the file "my_world.puml" that can help you see whether your regions and locations
+    # are connected and placed as desired
+    # from Utils import visualize_regions
+    # visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
 ```
 
 ### Setting Rules
 
 ```python
-from worlds.generic.Rules import add_rule, set_rule, forbid_item
-from Items import get_item_type
+from worlds.generic.Rules import add_rule, set_rule, forbid_item, add_item_rule
+from .items import get_item_type
 
 
 def set_rules(self) -> None:
@@ -591,7 +718,7 @@ def set_rules(self) -> None:
     # require one item from an item group
     add_rule(self.multiworld.get_location("Chest3", self.player),
              lambda state: state.has_group("weapons", self.player))
-    # state also has .item_count() for items, .has_any() and .has_all() for sets
+    # state also has .count() for items, .has_any() and .has_all() for multiple
     # and .count_group() for groups
     # set_rule is likely to be a bit faster than add_rule
 
@@ -634,12 +761,12 @@ Please do this with caution and only when necessary.
 #### Sample
 
 ```python
-# Logic.py
+# logic.py
 
 from worlds.AutoWorld import LogicMixin
 
 class MyGameLogic(LogicMixin):
-    def mygame_has_key(self, player: int):
+    def mygame_has_key(self, player: int) -> bool:
         # Arguments above are free to choose
         # MultiWorld can be accessed through self.multiworld, explicitly passing in
         # MyGameWorld instance for easy options access is also a valid approach
@@ -649,11 +776,11 @@ class MyGameLogic(LogicMixin):
 # __init__.py
 
 from worlds.generic.Rules import set_rule
-import .Logic  # apply the mixin by importing its file
+import .logic  # apply the mixin by importing its file
 
 class MyGameWorld(World):
     # ...
-    def set_rules(self):
+    def set_rules(self) -> None:
         set_rule(self.multiworld.get_location("A Door", self.player),
                  lambda state: state.mygame_has_key(self.player))
 ```
@@ -661,10 +788,10 @@ class MyGameWorld(World):
 ### Generate Output
 
 ```python
-from .Mod import generate_mod
+from .mod import generate_mod
 
 
-def generate_output(self, output_directory: str):
+def generate_output(self, output_directory: str) -> None:
     # How to generate the mod or ROM highly depends on the game
     # if the mod is written in Lua, Jinja can be used to fill a template
     # if the mod reads a json file, `json.dump()` can be used to generate that
@@ -679,12 +806,10 @@ def generate_output(self, output_directory: str):
         # make sure to mark as not remote_start_inventory when connecting if stored in rom/mod
         "starter_items": [item.name for item
                           in self.multiworld.precollected_items[self.player]],
-        "final_boss_hp": self.final_boss_hp,
-        # store option name "easy", "normal" or "hard" for difficuly
-        "difficulty": self.multiworld.difficulty[self.player].current_key,
-        # store option value True or False for fixing a glitch
-        "fix_xyz_glitch": self.multiworld.fix_xyz_glitch[self.player].value,
     }
+
+    # add needed option results to the dictionary
+    data.update(self.options.as_dict("final_boss_hp", "difficulty", "fix_xyz_glitch"))
     # point to a ROM specified by the installation
     src = self.settings.rom_file
     # or point to worlds/mygame/data/mod_template
@@ -696,6 +821,26 @@ def generate_output(self, output_directory: str):
     generate_mod(src, out_file, data)
 ```
 
+### Slot Data
+
+If the game client needs to know information about the generated seed, a preferred method of transferring the data
+is through the slot data. This can be filled from the `fill_slot_data` method of your world by returning a `Dict[str, Any]`,
+but should be limited to data that is absolutely necessary to not waste resources. Slot data is sent to your client once
+it has successfully [connected](network%20protocol.md#connected).
+If you need to know information about locations in your world, instead
+of propagating the slot data, it is preferable to use [LocationScouts](network%20protocol.md#locationscouts) since that
+data already exists on the server. The most common usage of slot data is to send option results that the client needs
+to be aware of.
+
+```python
+def fill_slot_data(self) -> Dict[str, Any]:
+    # in order for our game client to handle the generated seed correctly we need to know what the user selected
+    # for their difficulty and final boss HP
+    # a dictionary returned from this method gets set as the slot_data and will be sent to the client after connecting
+    # the options dataclass has a method to return a `Dict[str, Any]` of each option name provided and the option's value
+    return self.options.as_dict("difficulty", "final_boss_hp")
+```
+
 ### Documentation
 
 Each world implementation should have a tutorial and a game info page. These are both rendered on the website by reading
@@ -723,8 +868,9 @@ multiworld for each test written using it. Within subsequent modules, classes sh
 TestBase, and can then define options to test in the class body, and run tests in each test method.
 
 Example `__init__.py`
+
 ```python
-from test.TestBase import WorldTestBase
+from test.bases import WorldTestBase
 
 
 class MyGameTestBase(WorldTestBase):
@@ -733,23 +879,25 @@ class MyGameTestBase(WorldTestBase):
 
 Next using the rules defined in the above `set_rules` we can test that the chests have the correct access rules.
 
-Example `testChestAccess.py`
+Example `test_chest_access.py`
 ```python
 from . import MyGameTestBase
 
 
 class TestChestAccess(MyGameTestBase):
-    def test_sword_chests(self):
+    def test_sword_chests(self) -> None:
         """Test locations that require a sword"""
         locations = ["Chest1", "Chest2"]
         items = [["Sword"]]
         # this will test that each location can't be accessed without the "Sword", but can be accessed once obtained.
         self.assertAccessDependency(locations, items)
 
-    def test_any_weapon_chests(self):
+    def test_any_weapon_chests(self) -> None:
         """Test locations that require any weapon"""
         locations = [f"Chest{i}" for i in range(3, 6)]
         items = [["Sword"], ["Axe"], ["Spear"]]
         # this will test that chests 3-5 can't be accessed without any weapon, but can be with just one of them.
         self.assertAccessDependency(locations, items)
 ```
+
+For more information on tests check the [tests doc](tests.md).
diff --git a/inno_setup.iss b/inno_setup.iss
index 147cd74dca..be5de320a1 100644
--- a/inno_setup.iss
+++ b/inno_setup.iss
@@ -46,147 +46,33 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Types]
 Name: "full"; Description: "Full installation"
-Name: "hosting"; Description: "Installation for hosting purposes"
-Name: "playing"; Description: "Installation for playing purposes"
+Name: "minimal"; Description: "Minimal installation"
 Name: "custom"; Description: "Custom installation"; Flags: iscustom
 
 [Components]
-Name: "core";             Description: "Core Files"; Types: full hosting playing custom; Flags: fixed
-Name: "generator";        Description: "Generator"; Types: full hosting
-Name: "generator/sm";     Description: "Super Metroid ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 3145728; Flags: disablenouninstallwarning
-Name: "generator/dkc3";   Description: "Donkey Kong Country 3 ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 3145728; Flags: disablenouninstallwarning
-Name: "generator/smw";    Description: "Super Mario World ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 3145728; Flags: disablenouninstallwarning
-Name: "generator/soe";    Description: "Secret of Evermore ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 3145728; Flags: disablenouninstallwarning
-Name: "generator/l2ac";   Description: "Lufia II Ancient Cave ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 2621440; Flags: disablenouninstallwarning
-Name: "generator/lttp";   Description: "A Link to the Past ROM Setup and Enemizer"; Types: full hosting; ExtraDiskSpaceRequired: 5191680
-Name: "generator/oot";    Description: "Ocarina of Time ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 100663296; Flags: disablenouninstallwarning
-Name: "generator/zl";     Description: "Zillion ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 150000; Flags: disablenouninstallwarning
-Name: "generator/pkmn_r"; Description: "Pokemon Red ROM Setup"; Types: full hosting
-Name: "generator/pkmn_b"; Description: "Pokemon Blue ROM Setup"; Types: full hosting
-Name: "generator/mmbn3";  Description: "MegaMan Battle Network 3"; Types: full hosting; ExtraDiskSpaceRequired: 8388608; Flags: disablenouninstallwarning
-Name: "generator/ladx";   Description: "Link's Awakening DX ROM Setup"; Types: full hosting
-Name: "generator/tloz";   Description: "The Legend of Zelda ROM Setup"; Types: full hosting; ExtraDiskSpaceRequired: 135168; Flags: disablenouninstallwarning
-Name: "server";           Description: "Server"; Types: full hosting
-Name: "client";           Description: "Clients"; Types: full playing
-Name: "client/sni";       Description: "SNI Client"; Types: full playing
-Name: "client/sni/lttp";  Description: "SNI Client - A Link to the Past Patch Setup"; Types: full playing; Flags: disablenouninstallwarning
-Name: "client/sni/sm";    Description: "SNI Client - Super Metroid Patch Setup"; Types: full playing; Flags: disablenouninstallwarning
-Name: "client/sni/dkc3";  Description: "SNI Client - Donkey Kong Country 3 Patch Setup"; Types: full playing; Flags: disablenouninstallwarning
-Name: "client/sni/smw";   Description: "SNI Client - Super Mario World Patch Setup"; Types: full playing; Flags: disablenouninstallwarning
-Name: "client/sni/l2ac";  Description: "SNI Client - Lufia II Ancient Cave Patch Setup"; Types: full playing; Flags: disablenouninstallwarning
-Name: "client/factorio";  Description: "Factorio"; Types: full playing
-Name: "client/kh2";       Description: "Kingdom Hearts 2"; Types: full playing
-Name: "client/minecraft"; Description: "Minecraft"; Types: full playing; ExtraDiskSpaceRequired: 226894278
-Name: "client/oot";       Description: "Ocarina of Time"; Types: full playing
-Name: "client/ff1";       Description: "Final Fantasy 1"; Types: full playing
-Name: "client/pkmn";      Description: "Pokemon Client"
-Name: "client/pkmn/red";  Description: "Pokemon Client - Pokemon Red Setup"; Types: full playing; ExtraDiskSpaceRequired: 1048576
-Name: "client/pkmn/blue"; Description: "Pokemon Client - Pokemon Blue Setup"; Types: full playing; ExtraDiskSpaceRequired: 1048576
-Name: "client/mmbn3";     Description: "MegaMan Battle Network 3 Client"; Types: full playing;
-Name: "client/ladx";      Description: "Link's Awakening Client"; Types: full playing; ExtraDiskSpaceRequired: 1048576
-Name: "client/cf";        Description: "ChecksFinder"; Types: full playing
-Name: "client/sc2";       Description: "Starcraft 2"; Types: full playing
-Name: "client/wargroove"; Description: "Wargroove"; Types: full playing
-Name: "client/zl";        Description: "Zillion"; Types: full playing
-Name: "client/tloz";      Description: "The Legend of Zelda"; Types: full playing
-Name: "client/advn";      Description: "Adventure"; Types: full playing
-Name: "client/ut";        Description: "Undertale"; Types: full playing
-Name: "client/text";      Description: "Text, to !command and chat"; Types: full playing
+Name: "core";             Description: "Archipelago"; Types: full minimal custom; Flags: fixed
+Name: "lttp_sprites";     Description: "Download ""A Link to the Past"" player sprites"; Types: full;
 
 [Dirs]
 NAME: "{app}"; Flags: setntfscompression; Permissions: everyone-modify users-modify authusers-modify;
 
 [Files]
-Source: "{code:GetROMPath}"; DestDir: "{app}"; DestName: "Zelda no Densetsu - Kamigami no Triforce (Japan).sfc"; Flags: external; Components: client/sni/lttp or generator/lttp
-Source: "{code:GetSMROMPath}"; DestDir: "{app}"; DestName: "Super Metroid (JU).sfc"; Flags: external; Components: client/sni/sm or generator/sm
-Source: "{code:GetDKC3ROMPath}"; DestDir: "{app}"; DestName: "Donkey Kong Country 3 - Dixie Kong's Double Trouble! (USA) (En,Fr).sfc"; Flags: external; Components: client/sni/dkc3 or generator/dkc3
-Source: "{code:GetSMWROMPath}"; DestDir: "{app}"; DestName: "Super Mario World (USA).sfc"; Flags: external; Components: client/sni/smw or generator/smw
-Source: "{code:GetSoEROMPath}"; DestDir: "{app}"; DestName: "Secret of Evermore (USA).sfc"; Flags: external; Components: generator/soe
-Source: "{code:GetL2ACROMPath}"; DestDir: "{app}"; DestName: "Lufia II - Rise of the Sinistrals (USA).sfc"; Flags: external; Components: generator/l2ac
-Source: "{code:GetOoTROMPath}"; DestDir: "{app}"; DestName: "The Legend of Zelda - Ocarina of Time.z64"; Flags: external; Components: client/oot or generator/oot
-Source: "{code:GetZlROMPath}"; DestDir: "{app}"; DestName: "Zillion (UE) [!].sms"; Flags: external; Components: client/zl or generator/zl
-Source: "{code:GetRedROMPath}"; DestDir: "{app}"; DestName: "Pokemon Red (UE) [S][!].gb"; Flags: external; Components: client/pkmn/red or generator/pkmn_r
-Source: "{code:GetBlueROMPath}"; DestDir: "{app}"; DestName: "Pokemon Blue (UE) [S][!].gb"; Flags: external; Components: client/pkmn/blue or generator/pkmn_b
-Source: "{code:GetBN3ROMPath}"; DestDir: "{app}"; DestName: "Mega Man Battle Network 3 - Blue Version (USA).gba"; Flags: external; Components: client/mmbn3
-Source: "{code:GetLADXROMPath}"; DestDir: "{app}"; DestName: "Legend of Zelda, The - Link's Awakening DX (USA, Europe) (SGB Enhanced).gbc"; Flags: external; Components: client/ladx or generator/ladx
-Source: "{code:GetTLoZROMPath}"; DestDir: "{app}"; DestName: "Legend of Zelda, The (U) (PRG0) [!].nes"; Flags: external; Components: client/tloz or generator/tloz
-Source: "{code:GetAdvnROMPath}"; DestDir: "{app}"; DestName: "ADVNTURE.BIN"; Flags: external; Components: client/advn
-Source: "{#source_path}\*"; Excludes: "*.sfc, *.log, data\sprites\alttpr, SNI, EnemizerCLI, Archipelago*.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#source_path}\SNI\*"; Excludes: "*.sfc, *.log"; DestDir: "{app}\SNI"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: client/sni
-Source: "{#source_path}\EnemizerCLI\*"; Excludes: "*.sfc, *.log"; DestDir: "{app}\EnemizerCLI"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: generator/lttp
-
-Source: "{#source_path}\ArchipelagoLauncher.exe"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "{#source_path}\ArchipelagoLauncher(DEBUG).exe"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "{#source_path}\ArchipelagoGenerate.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: generator
-Source: "{#source_path}\ArchipelagoServer.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: server
-Source: "{#source_path}\ArchipelagoFactorioClient.exe";  DestDir: "{app}"; Flags: ignoreversion; Components: client/factorio
-Source: "{#source_path}\ArchipelagoTextClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/text
-Source: "{#source_path}\ArchipelagoSNIClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/sni
-Source: "{#source_path}\ArchipelagoLinksAwakeningClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/ladx
-Source: "{#source_path}\ArchipelagoLttPAdjuster.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/sni/lttp or generator/lttp
-Source: "{#source_path}\ArchipelagoMinecraftClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/minecraft
-Source: "{#source_path}\ArchipelagoOoTClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/oot
-Source: "{#source_path}\ArchipelagoOoTAdjuster.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/oot
-Source: "{#source_path}\ArchipelagoZillionClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/zl
-Source: "{#source_path}\ArchipelagoFF1Client.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/ff1
-Source: "{#source_path}\ArchipelagoPokemonClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/pkmn
-Source: "{#source_path}\ArchipelagoChecksFinderClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/cf
-Source: "{#source_path}\ArchipelagoStarcraft2Client.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/sc2
-Source: "{#source_path}\ArchipelagoMMBN3Client.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/mmbn3
-Source: "{#source_path}\ArchipelagoZelda1Client.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/tloz
-Source: "{#source_path}\ArchipelagoWargrooveClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/wargroove
-Source: "{#source_path}\ArchipelagoKH2Client.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/kh2
-Source: "{#source_path}\ArchipelagoAdventureClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/advn
-Source: "{#source_path}\ArchipelagoUndertaleClient.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: client/ut
+Source: "{#source_path}\*"; Excludes: "*.sfc, *.log, data\sprites\alttpr, SNI, EnemizerCLI"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#source_path}\SNI\*"; Excludes: "*.sfc, *.log"; DestDir: "{app}\SNI"; Flags: ignoreversion recursesubdirs createallsubdirs;
+Source: "{#source_path}\EnemizerCLI\*"; Excludes: "*.sfc, *.log"; DestDir: "{app}\EnemizerCLI"; Flags: ignoreversion recursesubdirs createallsubdirs;
 Source: "vc_redist.x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 
 [Icons]
 Name: "{group}\{#MyAppName} Folder"; Filename: "{app}";
 Name: "{group}\{#MyAppName} Launcher"; Filename: "{app}\ArchipelagoLauncher.exe"
-Name: "{group}\{#MyAppName} Server"; Filename: "{app}\ArchipelagoServer"; Components: server
-Name: "{group}\{#MyAppName} Text Client"; Filename: "{app}\ArchipelagoTextClient.exe"; Components: client/text
-Name: "{group}\{#MyAppName} SNI Client"; Filename: "{app}\ArchipelagoSNIClient.exe"; Components: client/sni
-Name: "{group}\{#MyAppName} Factorio Client"; Filename: "{app}\ArchipelagoFactorioClient.exe"; Components: client/factorio
-Name: "{group}\{#MyAppName} Minecraft Client"; Filename: "{app}\ArchipelagoMinecraftClient.exe"; Components: client/minecraft
-Name: "{group}\{#MyAppName} Ocarina of Time Client"; Filename: "{app}\ArchipelagoOoTClient.exe"; Components: client/oot
-Name: "{group}\{#MyAppName} Zillion Client"; Filename: "{app}\ArchipelagoZillionClient.exe"; Components: client/zl
-Name: "{group}\{#MyAppName} Final Fantasy 1 Client"; Filename: "{app}\ArchipelagoFF1Client.exe"; Components: client/ff1
-Name: "{group}\{#MyAppName} Pokemon Client"; Filename: "{app}\ArchipelagoPokemonClient.exe"; Components: client/pkmn
-Name: "{group}\{#MyAppName} ChecksFinder Client"; Filename: "{app}\ArchipelagoChecksFinderClient.exe"; Components: client/cf
-Name: "{group}\{#MyAppName} Starcraft 2 Client"; Filename: "{app}\ArchipelagoStarcraft2Client.exe"; Components: client/sc2
-Name: "{group}\{#MyAppName} MegaMan Battle Network 3 Client"; Filename: "{app}\ArchipelagoMMBN3Client.exe"; Components: client/mmbn3
-Name: "{group}\{#MyAppName} The Legend of Zelda Client"; Filename: "{app}\ArchipelagoZelda1Client.exe"; Components: client/tloz
-Name: "{group}\{#MyAppName} Kingdom Hearts 2 Client"; Filename: "{app}\ArchipelagoKH2Client.exe"; Components: client/kh2
-Name: "{group}\{#MyAppName} Link's Awakening Client"; Filename: "{app}\ArchipelagoLinksAwakeningClient.exe"; Components: client/ladx
-Name: "{group}\{#MyAppName} Adventure Client"; Filename: "{app}\ArchipelagoAdventureClient.exe"; Components: client/advn
-Name: "{group}\{#MyAppName} Wargroove Client"; Filename: "{app}\ArchipelagoWargrooveClient.exe"; Components: client/wargroove
-Name: "{group}\{#MyAppName} Undertale Client"; Filename: "{app}\ArchipelagoUndertaleClient.exe"; Components: client/ut
 
 Name: "{commondesktop}\{#MyAppName} Folder"; Filename: "{app}"; Tasks: desktopicon
 Name: "{commondesktop}\{#MyAppName} Launcher"; Filename: "{app}\ArchipelagoLauncher.exe"; Tasks: desktopicon
-Name: "{commondesktop}\{#MyAppName} Server"; Filename: "{app}\ArchipelagoServer"; Tasks: desktopicon; Components: server
-Name: "{commondesktop}\{#MyAppName} SNI Client"; Filename: "{app}\ArchipelagoSNIClient.exe"; Tasks: desktopicon; Components: client/sni
-Name: "{commondesktop}\{#MyAppName} Factorio Client"; Filename: "{app}\ArchipelagoFactorioClient.exe"; Tasks: desktopicon; Components: client/factorio
-Name: "{commondesktop}\{#MyAppName} Minecraft Client"; Filename: "{app}\ArchipelagoMinecraftClient.exe"; Tasks: desktopicon; Components: client/minecraft
-Name: "{commondesktop}\{#MyAppName} Ocarina of Time Client"; Filename: "{app}\ArchipelagoOoTClient.exe"; Tasks: desktopicon; Components: client/oot
-Name: "{commondesktop}\{#MyAppName} Zillion Client"; Filename: "{app}\ArchipelagoZillionClient.exe"; Tasks: desktopicon; Components: client/zl
-Name: "{commondesktop}\{#MyAppName} Final Fantasy 1 Client"; Filename: "{app}\ArchipelagoFF1Client.exe"; Tasks: desktopicon; Components: client/ff1
-Name: "{commondesktop}\{#MyAppName} Pokemon Client"; Filename: "{app}\ArchipelagoPokemonClient.exe"; Tasks: desktopicon; Components: client/pkmn
-Name: "{commondesktop}\{#MyAppName} ChecksFinder Client"; Filename: "{app}\ArchipelagoChecksFinderClient.exe"; Tasks: desktopicon; Components: client/cf
-Name: "{commondesktop}\{#MyAppName} Starcraft 2 Client"; Filename: "{app}\ArchipelagoStarcraft2Client.exe"; Tasks: desktopicon; Components: client/sc2
-Name: "{commondesktop}\{#MyAppName} MegaMan Battle Network 3 Client"; Filename: "{app}\ArchipelagoMMBN3Client.exe"; Tasks: desktopicon; Components: client/mmbn3
-Name: "{commondesktop}\{#MyAppName} The Legend of Zelda Client"; Filename: "{app}\ArchipelagoZelda1Client.exe"; Tasks: desktopicon; Components: client/tloz
-Name: "{commondesktop}\{#MyAppName} Wargroove Client"; Filename: "{app}\ArchipelagoWargrooveClient.exe"; Tasks: desktopicon; Components: client/wargroove
-Name: "{commondesktop}\{#MyAppName} Kingdom Hearts 2 Client"; Filename: "{app}\ArchipelagoKH2Client.exe"; Tasks: desktopicon; Components: client/kh2
-Name: "{commondesktop}\{#MyAppName} Link's Awakening Client"; Filename: "{app}\ArchipelagoLinksAwakeningClient.exe"; Tasks: desktopicon; Components: client/ladx
-Name: "{commondesktop}\{#MyAppName} Adventure Client"; Filename: "{app}\ArchipelagoAdventureClient.exe"; Tasks: desktopicon; Components: client/advn
-Name: "{commondesktop}\{#MyAppName} Undertale Client"; Filename: "{app}\ArchipelagoUndertaleClient.exe"; Tasks: desktopicon; Components: client/ut
 
 [Run]
 
 Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/passive /norestart"; Check: IsVCRedist64BitNeeded; StatusMsg: "Installing VC++ redistributable..."
-Filename: "{app}\ArchipelagoLttPAdjuster"; Parameters: "--update_sprites"; StatusMsg: "Updating Sprite Library..."; Components: client/sni/lttp or generator/lttp
-Filename: "{app}\ArchipelagoMinecraftClient.exe"; Parameters: "--install"; StatusMsg: "Installing Forge Server..."; Components: client/minecraft
+Filename: "{app}\ArchipelagoLttPAdjuster"; Parameters: "--update_sprites"; StatusMsg: "Updating Sprite Library..."; Flags: nowait; Components: lttp_sprites
 Filename: "{app}\ArchipelagoLauncher"; Parameters: "--update_settings"; StatusMsg: "Updating host.yaml..."; Flags: runasoriginaluser runhidden
 Filename: "{app}\ArchipelagoLauncher"; Description: "{cm:LaunchProgram,{#StringChange('Launcher', '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
@@ -194,7 +80,10 @@ Filename: "{app}\ArchipelagoLauncher"; Description: "{cm:LaunchProgram,{#StringC
 Type: dirifempty; Name: "{app}"
 
 [InstallDelete]
+Type: files; Name: "{app}\lib\worlds\_bizhawk.apworld"
 Type: files; Name: "{app}\ArchipelagoLttPClient.exe"
+Type: files; Name: "{app}\ArchipelagoPokemonClient.exe"
+Type: files; Name: "{app}\data\lua\connector_pkmn_rb.lua"
 Type: filesandordirs; Name: "{app}\lib\worlds\rogue-legacy*"
 Type: filesandordirs; Name: "{app}\SNI\lua*"
 Type: filesandordirs; Name: "{app}\EnemizerCLI*"
@@ -202,101 +91,102 @@ Type: filesandordirs; Name: "{app}\EnemizerCLI*"
 
 [Registry]
 
-Root: HKCR; Subkey: ".aplttp";                                 ValueData: "{#MyAppName}patch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}patch";                     ValueData: "Archipelago Binary Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}patch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}patch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/sni
+Root: HKCR; Subkey: ".aplttp";                                   ValueData: "{#MyAppName}patch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}patch";                         ValueData: "Archipelago Binary Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}patch\DefaultIcon";             ValueData: "{app}\ArchipelagoSNIClient.exe,0";                  ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}patch\shell\open\command";      ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";         ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apsm";                                 ValueData: "{#MyAppName}smpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smpatch";                     ValueData: "Archipelago Super Metroid Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smpatch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/sni
+Root: HKCR; Subkey: ".apsm";                                     ValueData: "{#MyAppName}smpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smpatch";                       ValueData: "Archipelago Super Metroid Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smpatch\DefaultIcon";           ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smpatch\shell\open\command";    ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apdkc3";                                 ValueData: "{#MyAppName}dkc3patch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}dkc3patch";                     ValueData: "Archipelago Donkey Kong Country 3 Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}dkc3patch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}dkc3patch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/sni
+Root: HKCR; Subkey: ".apdkc3";                                   ValueData: "{#MyAppName}dkc3patch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}dkc3patch";                     ValueData: "Archipelago Donkey Kong Country 3 Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}dkc3patch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}dkc3patch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apsmw";                                    ValueData: "{#MyAppName}smwpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smwpatch";                     ValueData: "Archipelago Super Mario World Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smwpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smwpatch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/sni
+Root: HKCR; Subkey: ".apsmw";                                    ValueData: "{#MyAppName}smwpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smwpatch";                      ValueData: "Archipelago Super Mario World Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smwpatch\DefaultIcon";          ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smwpatch\shell\open\command";   ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apzl";                                   ValueData: "{#MyAppName}zlpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/zl
-Root: HKCR; Subkey: "{#MyAppName}zlpatch";                     ValueData: "Archipelago Zillion Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/zl
-Root: HKCR; Subkey: "{#MyAppName}zlpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoZillionClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/zl
-Root: HKCR; Subkey: "{#MyAppName}zlpatch\shell\open\command";  ValueData: """{app}\ArchipelagoZillionClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/zl
+Root: HKCR; Subkey: ".apzl";                                     ValueData: "{#MyAppName}zlpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}zlpatch";                       ValueData: "Archipelago Zillion Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}zlpatch\DefaultIcon";           ValueData: "{app}\ArchipelagoZillionClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}zlpatch\shell\open\command";    ValueData: """{app}\ArchipelagoZillionClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apsmz3";                                 ValueData: "{#MyAppName}smz3patch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smz3patch";                     ValueData: "Archipelago SMZ3 Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smz3patch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}smz3patch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/sni
+Root: HKCR; Subkey: ".apsmz3";                                   ValueData: "{#MyAppName}smz3patch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smz3patch";                     ValueData: "Archipelago SMZ3 Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smz3patch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}smz3patch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apsoe";                                 ValueData: "{#MyAppName}soepatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}soepatch";                     ValueData: "Archipelago Secret of Evermore Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}soepatch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}soepatch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/sni
+Root: HKCR; Subkey: ".apsoe";                                    ValueData: "{#MyAppName}soepatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}soepatch";                      ValueData: "Archipelago Secret of Evermore Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}soepatch\DefaultIcon";          ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}soepatch\shell\open\command";   ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apl2ac";                                 ValueData: "{#MyAppName}l2acpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}l2acpatch";                     ValueData: "Archipelago Lufia II Ancient Cave Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}l2acpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/sni
-Root: HKCR; Subkey: "{#MyAppName}l2acpatch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/sni
+Root: HKCR; Subkey: ".apl2ac";                                   ValueData: "{#MyAppName}l2acpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}l2acpatch";                     ValueData: "Archipelago Lufia II Ancient Cave Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}l2acpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoSNIClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}l2acpatch\shell\open\command";  ValueData: """{app}\ArchipelagoSNIClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apmc";                                  ValueData: "{#MyAppName}mcdata";         Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/minecraft
-Root: HKCR; Subkey: "{#MyAppName}mcdata";                     ValueData: "Archipelago Minecraft Data"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/minecraft
-Root: HKCR; Subkey: "{#MyAppName}mcdata\DefaultIcon";         ValueData: "{app}\ArchipelagoMinecraftClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/minecraft
-Root: HKCR; Subkey: "{#MyAppName}mcdata\shell\open\command";  ValueData: """{app}\ArchipelagoMinecraftClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/minecraft
+Root: HKCR; Subkey: ".apmc";                                     ValueData: "{#MyAppName}mcdata";         Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}mcdata";                        ValueData: "Archipelago Minecraft Data"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}mcdata\DefaultIcon";            ValueData: "{app}\ArchipelagoMinecraftClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}mcdata\shell\open\command";     ValueData: """{app}\ArchipelagoMinecraftClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apz5";                                  ValueData: "{#MyAppName}n64zpf";         Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/oot
-Root: HKCR; Subkey: "{#MyAppName}n64zpf";                     ValueData: "Archipelago Ocarina of Time Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/oot
-Root: HKCR; Subkey: "{#MyAppName}n64zpf\DefaultIcon";         ValueData: "{app}\ArchipelagoOoTClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/oot
-Root: HKCR; Subkey: "{#MyAppName}n64zpf\shell\open\command";  ValueData: """{app}\ArchipelagoOoTClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/oot
+Root: HKCR; Subkey: ".apz5";                                     ValueData: "{#MyAppName}n64zpf";         Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}n64zpf";                        ValueData: "Archipelago Ocarina of Time Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}n64zpf\DefaultIcon";            ValueData: "{app}\ArchipelagoOoTClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}n64zpf\shell\open\command";     ValueData: """{app}\ArchipelagoOoTClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apred";                                    ValueData: "{#MyAppName}pkmnrpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/pkmn
-Root: HKCR; Subkey: "{#MyAppName}pkmnrpatch";                     ValueData: "Archipelago Pokemon Red Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/pkmn
-Root: HKCR; Subkey: "{#MyAppName}pkmnrpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoPokemonClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/pkmn
-Root: HKCR; Subkey: "{#MyAppName}pkmnrpatch\shell\open\command";  ValueData: """{app}\ArchipelagoPokemonClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/pkmn
+Root: HKCR; Subkey: ".apred";                                    ValueData: "{#MyAppName}pkmnrpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnrpatch";                    ValueData: "Archipelago Pokemon Red Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnrpatch\DefaultIcon";        ValueData: "{app}\ArchipelagoBizHawkClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnrpatch\shell\open\command"; ValueData: """{app}\ArchipelagoBizHawkClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apblue";                                    ValueData: "{#MyAppName}pkmnbpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/pkmn
-Root: HKCR; Subkey: "{#MyAppName}pkmnbpatch";                     ValueData: "Archipelago Pokemon Blue Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/pkmn
-Root: HKCR; Subkey: "{#MyAppName}pkmnbpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoPokemonClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/pkmn
-Root: HKCR; Subkey: "{#MyAppName}pkmnbpatch\shell\open\command";  ValueData: """{app}\ArchipelagoPokemonClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/pkmn
+Root: HKCR; Subkey: ".apblue";                                   ValueData: "{#MyAppName}pkmnbpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnbpatch";                    ValueData: "Archipelago Pokemon Blue Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnbpatch\DefaultIcon";        ValueData: "{app}\ArchipelagoBizHawkClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnbpatch\shell\open\command"; ValueData: """{app}\ArchipelagoBizHawkClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apbn3";                                     ValueData: "{#MyAppName}bn3bpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/mmbn3
-Root: HKCR; Subkey: "{#MyAppName}bn3bpatch";                      ValueData: "Archipelago MegaMan Battle Network 3 Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/mmbn3
-Root: HKCR; Subkey: "{#MyAppName}bn3bpatch\DefaultIcon";          ValueData: "{app}\ArchipelagoMMBN3Client.exe,0";                           ValueType: string;  ValueName: ""; Components: client/mmbn3
-Root: HKCR; Subkey: "{#MyAppName}bn3bpatch\shell\open\command";   ValueData: """{app}\ArchipelagoMMBN3Client.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/mmbn3
+Root: HKCR; Subkey: ".apbn3";                                    ValueData: "{#MyAppName}bn3bpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}bn3bpatch";                     ValueData: "Archipelago MegaMan Battle Network 3 Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}bn3bpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoMMBN3Client.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}bn3bpatch\shell\open\command";  ValueData: """{app}\ArchipelagoMMBN3Client.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apladx";                                    ValueData: "{#MyAppName}ladxpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/ladx
-Root: HKCR; Subkey: "{#MyAppName}ladxpatch";                     ValueData: "Archipelago Links Awakening DX Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/ladx
-Root: HKCR; Subkey: "{#MyAppName}ladxpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoLinksAwakeningClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/ladx
-Root: HKCR; Subkey: "{#MyAppName}ladxpatch\shell\open\command";  ValueData: """{app}\ArchipelagoLinksAwakeningClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/ladx
+Root: HKCR; Subkey: ".apemerald";                                 ValueData: "{#MyAppName}pkmnepatch";                               Flags: uninsdeletevalue; ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnepatch";                     ValueData: "Archipelago Pokemon Emerald Patch";                    Flags: uninsdeletekey;   ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnepatch\DefaultIcon";         ValueData: "{app}\ArchipelagoBizHawkClient.exe,0";                                          ValueType: string; ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}pkmnepatch\shell\open\command";  ValueData: """{app}\ArchipelagoBizHawkClient.exe"" ""%1""";                                 ValueType: string; ValueName: "";
 
-Root: HKCR; Subkey: ".aptloz";                                    ValueData: "{#MyAppName}tlozpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/tloz
-Root: HKCR; Subkey: "{#MyAppName}tlozpatch";                     ValueData: "Archipelago The Legend of Zelda Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/tloz
-Root: HKCR; Subkey: "{#MyAppName}tlozpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoZelda1Client.exe,0";                           ValueType: string;  ValueName: ""; Components: client/tloz
-Root: HKCR; Subkey: "{#MyAppName}tlozpatch\shell\open\command";  ValueData: """{app}\ArchipelagoZelda1Client.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/tloz
+Root: HKCR; Subkey: ".apladx";                                   ValueData: "{#MyAppName}ladxpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}ladxpatch";                     ValueData: "Archipelago Links Awakening DX Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}ladxpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoLinksAwakeningClient.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}ladxpatch\shell\open\command";  ValueData: """{app}\ArchipelagoLinksAwakeningClient.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".apadvn";                                   ValueData: "{#MyAppName}advnpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: client/advn
-Root: HKCR; Subkey: "{#MyAppName}advnpatch";                     ValueData: "Archipelago Adventure Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: ""; Components: client/advn
-Root: HKCR; Subkey: "{#MyAppName}advnpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoAdventureClient.exe,0";                           ValueType: string;  ValueName: ""; Components: client/advn
-Root: HKCR; Subkey: "{#MyAppName}advnpatch\shell\open\command";  ValueData: """{app}\ArchipelagoAdventureClient.exe"" ""%1""";                  ValueType: string;  ValueName: ""; Components: client/advn
+Root: HKCR; Subkey: ".aptloz";                                   ValueData: "{#MyAppName}tlozpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}tlozpatch";                     ValueData: "Archipelago The Legend of Zelda Patch"; Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}tlozpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoZelda1Client.exe,0";                           ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}tlozpatch\shell\open\command";  ValueData: """{app}\ArchipelagoZelda1Client.exe"" ""%1""";                  ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: ".archipelago";                              ValueData: "{#MyAppName}multidata";        Flags: uninsdeletevalue; ValueType: string;  ValueName: ""; Components: server
-Root: HKCR; Subkey: "{#MyAppName}multidata";                     ValueData: "Archipelago Server Data";       Flags: uninsdeletekey;  ValueType: string;  ValueName: ""; Components: server
-Root: HKCR; Subkey: "{#MyAppName}multidata\DefaultIcon";         ValueData: "{app}\ArchipelagoServer.exe,0";                         ValueType: string;  ValueName: ""; Components: server
-Root: HKCR; Subkey: "{#MyAppName}multidata\shell\open\command";  ValueData: """{app}\ArchipelagoServer.exe"" ""%1""";                ValueType: string;  ValueName: ""; Components: server
+Root: HKCR; Subkey: ".apadvn";                                   ValueData: "{#MyAppName}advnpatch";        Flags: uninsdeletevalue; ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}advnpatch";                     ValueData: "Archipelago Adventure Patch";  Flags: uninsdeletekey;   ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}advnpatch\DefaultIcon";         ValueData: "{app}\ArchipelagoAdventureClient.exe,0";                ValueType: string;  ValueName: "";
+Root: HKCR; Subkey: "{#MyAppName}advnpatch\shell\open\command";  ValueData: """{app}\ArchipelagoAdventureClient.exe"" ""%1""";       ValueType: string;  ValueName: "";
 
-Root: HKCR; Subkey: "archipelago"; ValueType: "string"; ValueData: "Archipegalo Protocol"; Flags: uninsdeletekey; Components: client/text
-Root: HKCR; Subkey: "archipelago"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: ""; Components: client/text
-Root: HKCR; Subkey: "archipelago\DefaultIcon"; ValueType: "string"; ValueData: "{app}\ArchipelagoTextClient.exe,0"; Components: client/text
-Root: HKCR; Subkey: "archipelago\shell\open\command"; ValueType: "string"; ValueData: """{app}\ArchipelagoTextClient.exe"" ""%1"""; Components: client/text
+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: "";
+Root: HKCR; Subkey: "{#MyAppName}multidata\shell\open\command";  ValueData: """{app}\ArchipelagoServer.exe"" ""%1""";                ValueType: string;  ValueName: "";
+
+Root: HKCR; Subkey: "archipelago"; ValueType: "string"; ValueData: "Archipegalo Protocol"; Flags: uninsdeletekey;
+Root: HKCR; Subkey: "archipelago"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "";
+Root: HKCR; Subkey: "archipelago\DefaultIcon"; ValueType: "string"; ValueData: "{app}\ArchipelagoTextClient.exe,0";
+Root: HKCR; Subkey: "archipelago\shell\open\command"; ValueType: "string"; ValueData: """{app}\ArchipelagoTextClient.exe"" ""%1""";
 
 [Code]
-const
-  SHCONTCH_NOPROGRESSBOX = 4;
-  SHCONTCH_RESPONDYESTOALL = 16;
-
 // See: https://stackoverflow.com/a/51614652/2287576
 function IsVCRedist64BitNeeded(): boolean;
 var
@@ -316,594 +206,3 @@ begin
     Result := True;
   end;
 end;
-
-var R : longint;
-
-var lttprom: string;
-var LttPROMFilePage: TInputFileWizardPage;
-
-var smrom: string;
-var SMRomFilePage: TInputFileWizardPage;
-
-var dkc3rom: string;
-var DKC3RomFilePage: TInputFileWizardPage;
-
-var smwrom: string;
-var SMWRomFilePage: TInputFileWizardPage;
-
-var soerom: string;
-var SoERomFilePage: TInputFileWizardPage;
-
-var l2acrom: string;
-var L2ACROMFilePage: TInputFileWizardPage;
-
-var ootrom: string;
-var OoTROMFilePage: TInputFileWizardPage;
-
-var zlrom: string;
-var ZlROMFilePage: TInputFileWizardPage;
-
-var redrom: string;
-var RedROMFilePage:  TInputFileWizardPage;
-
-var bluerom: string;
-var BlueROMFilePage:  TInputFileWizardPage;
-
-var bn3rom: string;
-var BN3ROMFilePage: TInputFileWizardPage;
-
-var ladxrom: string;
-var LADXROMFilePage:  TInputFileWizardPage;
-
-var tlozrom: string;
-var TLoZROMFilePage:  TInputFileWizardPage;
-
-var advnrom: string;
-var AdvnROMFilePage:  TInputFileWizardPage;
-
-function GetSNESMD5OfFile(const rom: string): string;
-var data: AnsiString;
-begin
-  if LoadStringFromFile(rom, data) then
-  begin
-      if Length(data) mod 1024 = 512 then
-      begin
-        data := copy(data, 513, Length(data)-512);
-      end;
-      Result := GetMD5OfString(data);
-  end;
-end;
-
-function GetSMSMD5OfFile(const rom: string): string;
-var data: AnsiString;
-begin
-  if LoadStringFromFile(rom, data) then
-  begin
-      Result := GetMD5OfString(data);
-  end;
-end;
-
-function CheckRom(name: string; hash: string): string;
-var rom: string;
-begin
-  log('Handling ' + name)
-  rom := FileSearch(name, WizardDirValue());
-  if Length(rom) > 0 then
-    begin
-      log('existing ROM found');
-      log(IntToStr(CompareStr(GetSNESMD5OfFile(rom), hash)));
-      if CompareStr(GetSNESMD5OfFile(rom), hash) = 0 then
-        begin
-        log('existing ROM verified');
-        Result := rom;
-        exit;
-        end;
-      log('existing ROM failed verification');
-    end;
-end;
-
-function CheckSMSRom(name: string; hash: string): string;
-var rom: string;
-begin
-  log('Handling ' + name)
-  rom := FileSearch(name, WizardDirValue());
-  if Length(rom) > 0 then
-    begin
-      log('existing ROM found');
-      log(IntToStr(CompareStr(GetSMSMD5OfFile(rom), hash)));
-      if CompareStr(GetSMSMD5OfFile(rom), hash) = 0 then
-        begin
-        log('existing ROM verified');
-        Result := rom;
-        exit;
-        end;
-      log('existing ROM failed verification');
-    end;
-end;
-
-function CheckNESRom(name: string; hash: string): string;
-var rom: string;
-begin
-  log('Handling ' + name)
-  rom := FileSearch(name, WizardDirValue());
-  if Length(rom) > 0 then
-    begin
-      log('existing ROM found');
-      log(IntToStr(CompareStr(GetSMSMD5OfFile(rom), hash)));
-      if CompareStr(GetSMSMD5OfFile(rom), hash) = 0 then
-        begin
-        log('existing ROM verified');
-        Result := rom;
-        exit;
-        end;
-      log('existing ROM failed verification');
-    end;
-end;
-
-function AddRomPage(name: string): TInputFileWizardPage;
-begin
-  Result :=
-    CreateInputFilePage(
-      wpSelectComponents,
-      'Select ROM File',
-      'Where is your ' + name + ' located?',
-      'Select the file, then click Next.');
-
-  Result.Add(
-    'Location of ROM file:',
-    'SNES ROM files|*.sfc;*.smc|All files|*.*',
-    '.sfc');
-end;
-
-
-function AddGBRomPage(name: string): TInputFileWizardPage;
-begin
-  Result :=
-    CreateInputFilePage(
-      wpSelectComponents,
-      'Select ROM File',
-      'Where is your ' + name + ' located?',
-      'Select the file, then click Next.');
-
-  Result.Add(
-    'Location of ROM file:',
-    'GB ROM files|*.gb;*.gbc|All files|*.*',
-    '.gb');
-end;
-
-function AddGBARomPage(name: string): TInputFileWizardPage;
-begin
-  Result :=
-    CreateInputFilePage(
-      wpSelectComponents,
-      'Select ROM File',
-      'Where is your ' + name + ' located?',
-      'Select the file, then click Next.');
-  Result.Add(
-    'Location of ROM file:',
-    'GBA ROM files|*.gba|All files|*.*',
-    '.gba');
-end;
-
-function AddSMSRomPage(name: string): TInputFileWizardPage;
-begin
-  Result :=
-    CreateInputFilePage(
-      wpSelectComponents,
-      'Select ROM File',
-      'Where is your ' + name + ' located?',
-      'Select the file, then click Next.');
-  Result.Add(
-    'Location of ROM file:',
-    'SMS ROM files|*.sms|All files|*.*',
-    '.sms');
-end;
-
-function AddNESRomPage(name: string): TInputFileWizardPage;
-begin
-  Result :=
-    CreateInputFilePage(
-      wpSelectComponents,
-      'Select ROM File',
-      'Where is your ' + name + ' located?',
-      'Select the file, then click Next.');
-
-  Result.Add(
-    'Location of ROM file:',
-    'NES ROM files|*.nes|All files|*.*',
-    '.nes');
-end;
-
-procedure AddOoTRomPage();
-begin
-  ootrom := FileSearch('The Legend of Zelda - Ocarina of Time.z64', WizardDirValue());
-  if Length(ootrom) > 0 then
-    begin
-      log('existing ROM found');
-      log(IntToStr(CompareStr(GetMD5OfFile(ootrom), '5bd1fe107bf8106b2ab6650abecd54d6'))); // normal
-      log(IntToStr(CompareStr(GetMD5OfFile(ootrom), '6697768a7a7df2dd27a692a2638ea90b'))); // byteswapped
-      log(IntToStr(CompareStr(GetMD5OfFile(ootrom), '05f0f3ebacbc8df9243b6148ffe4792f'))); // decompressed
-      if (CompareStr(GetMD5OfFile(ootrom), '5bd1fe107bf8106b2ab6650abecd54d6') = 0) or (CompareStr(GetMD5OfFile(ootrom), '6697768a7a7df2dd27a692a2638ea90b') = 0) or (CompareStr(GetMD5OfFile(ootrom), '05f0f3ebacbc8df9243b6148ffe4792f') = 0) then
-        begin
-        log('existing ROM verified');
-        exit;
-        end;
-      log('existing ROM failed verification');
-    end;
-  ootrom := ''
-  OoTROMFilePage :=
-    CreateInputFilePage(
-      wpSelectComponents,
-      'Select ROM File',
-      'Where is your OoT 1.0 ROM located?',
-      'Select the file, then click Next.');
-
-  OoTROMFilePage.Add(
-    'Location of ROM file:',
-    'N64 ROM files (*.z64, *.n64)|*.z64;*.n64|All files|*.*',
-    '.z64');
-end;
-
-function AddA26Page(name: string): TInputFileWizardPage;
-begin
-  Result :=
-    CreateInputFilePage(
-      wpSelectComponents,
-      'Select ROM File',
-      'Where is your ' + name + ' located?',
-      'Select the file, then click Next.');
-
-  Result.Add(
-    'Location of ROM file:',
-    'A2600 ROM files|*.BIN;*.a26|All files|*.*',
-    '.BIN');
-end;
-
-function NextButtonClick(CurPageID: Integer): Boolean;
-begin
-  if (assigned(LttPROMFilePage)) and (CurPageID = LttPROMFilePage.ID) then
-    Result := not (LttPROMFilePage.Values[0] = '')
-  else if (assigned(SMROMFilePage)) and (CurPageID = SMROMFilePage.ID) then
-    Result := not (SMROMFilePage.Values[0] = '')
-  else if (assigned(DKC3ROMFilePage)) and (CurPageID = DKC3ROMFilePage.ID) then
-    Result := not (DKC3ROMFilePage.Values[0] = '')
-  else if (assigned(SMWROMFilePage)) and (CurPageID = SMWROMFilePage.ID) then
-    Result := not (SMWROMFilePage.Values[0] = '')
-  else if (assigned(SoEROMFilePage)) and (CurPageID = SoEROMFilePage.ID) then
-    Result := not (SoEROMFilePage.Values[0] = '')
-  else if (assigned(L2ACROMFilePage)) and (CurPageID = L2ACROMFilePage.ID) then
-    Result := not (L2ACROMFilePage.Values[0] = '')
-  else if (assigned(OoTROMFilePage)) and (CurPageID = OoTROMFilePage.ID) then
-    Result := not (OoTROMFilePage.Values[0] = '')
-  else if (assigned(BN3ROMFilePage)) and (CurPageID = BN3ROMFilePage.ID) then
-    Result := not (BN3ROMFilePage.Values[0] = '')
-  else if (assigned(ZlROMFilePage)) and (CurPageID = ZlROMFilePage.ID) then
-    Result := not (ZlROMFilePage.Values[0] = '')
-  else if (assigned(RedROMFilePage)) and (CurPageID = RedROMFilePage.ID) then
-    Result := not (RedROMFilePage.Values[0] = '')
-  else if (assigned(BlueROMFilePage)) and (CurPageID = BlueROMFilePage.ID) then
-    Result := not (BlueROMFilePage.Values[0] = '')
-  else if (assigned(LADXROMFilePage)) and (CurPageID = LADXROMFilePage.ID) then
-    Result := not (LADXROMFilePage.Values[0] = '')
-  else if (assigned(TLoZROMFilePage)) and (CurPageID = TLoZROMFilePage.ID) then
-    Result := not (TLoZROMFilePage.Values[0] = '')
-  else if (assigned(AdvnROMFilePage)) and (CurPageID = AdvnROMFilePage.ID) then
-    Result := not (AdvnROMFilePage.Values[0] = '')
-  else
-    Result := True;
-end;
-
-function GetROMPath(Param: string): string;
-begin
-  if Length(lttprom) > 0 then
-    Result := lttprom
-  else if Assigned(LttPRomFilePage) then
-    begin
-      R := CompareStr(GetSNESMD5OfFile(LttPROMFilePage.Values[0]), '03a63945398191337e896e5771f77173')
-      if R <> 0 then
-        MsgBox('ALttP ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := LttPROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-function GetSMROMPath(Param: string): string;
-begin
-  if Length(smrom) > 0 then
-    Result := smrom
-  else if Assigned(SMRomFilePage) then
-    begin
-      R := CompareStr(GetSNESMD5OfFile(SMROMFilePage.Values[0]), '21f3e98df4780ee1c667b84e57d88675')
-      if R <> 0 then
-        MsgBox('Super Metroid ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := SMROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-function GetDKC3ROMPath(Param: string): string;
-begin
-  if Length(dkc3rom) > 0 then
-    Result := dkc3rom
-  else if Assigned(DKC3RomFilePage) then
-    begin
-      R := CompareStr(GetSNESMD5OfFile(DKC3ROMFilePage.Values[0]), '120abf304f0c40fe059f6a192ed4f947')
-      if R <> 0 then
-        MsgBox('Donkey Kong Country 3 ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := DKC3ROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-function GetSMWROMPath(Param: string): string;
-begin
-  if Length(smwrom) > 0 then
-    Result := smwrom
-  else if Assigned(SMWRomFilePage) then
-    begin
-      R := CompareStr(GetSNESMD5OfFile(SMWROMFilePage.Values[0]), 'cdd3c8c37322978ca8669b34bc89c804')
-      if R <> 0 then
-        MsgBox('Super Mario World ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := SMWROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-function GetSoEROMPath(Param: string): string;
-begin
-  if Length(soerom) > 0 then
-    Result := soerom
-  else if Assigned(SoERomFilePage) then
-    begin
-      R := CompareStr(GetSNESMD5OfFile(SoEROMFilePage.Values[0]), '6e9c94511d04fac6e0a1e582c170be3a')
-      if R <> 0 then
-        MsgBox('Secret of Evermore ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := SoEROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-function GetOoTROMPath(Param: string): string;
-begin
-  if Length(ootrom) > 0 then
-    Result := ootrom
-  else if Assigned(OoTROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(OoTROMFilePage.Values[0]), '5bd1fe107bf8106b2ab6650abecd54d6') * CompareStr(GetMD5OfFile(OoTROMFilePage.Values[0]), '6697768a7a7df2dd27a692a2638ea90b') * CompareStr(GetMD5OfFile(OoTROMFilePage.Values[0]), '05f0f3ebacbc8df9243b6148ffe4792f');
-      if R <> 0 then
-        MsgBox('OoT ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := OoTROMFilePage.Values[0]
-    end
-  else
-    Result := '';
-end;
-
-function GetL2ACROMPath(Param: string): string;
-begin
-  if Length(l2acrom) > 0 then
-    Result := l2acrom
-  else if Assigned(L2ACROMFilePage) then
-    begin
-      R := CompareStr(GetSNESMD5OfFile(L2ACROMFilePage.Values[0]), '6efc477d6203ed2b3b9133c1cd9e9c5d')
-      if R <> 0 then
-        MsgBox('Lufia II ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := L2ACROMFilePage.Values[0]
-    end
-  else
-    Result := '';
-end;
-
-function GetZlROMPath(Param: string): string;
-begin
-  if Length(zlrom) > 0 then
-    Result := zlrom
-  else if Assigned(ZlROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(ZlROMFilePage.Values[0]), 'd4bf9e7bcf9a48da53785d2ae7bc4270');
-      if R <> 0 then
-        MsgBox('Zillion ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := ZlROMFilePage.Values[0]
-    end
-  else
-    Result := '';
-end;
-
-function GetRedROMPath(Param: string): string;
-begin
-  if Length(redrom) > 0 then
-    Result := redrom
-  else if Assigned(RedROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(RedROMFilePage.Values[0]), '3d45c1ee9abd5738df46d2bdda8b57dc')
-      if R <> 0 then
-        MsgBox('Pokemon Red ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := RedROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-function GetBlueROMPath(Param: string): string;
-begin
-  if Length(bluerom) > 0 then
-    Result := bluerom
-  else if Assigned(BlueROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(BlueROMFilePage.Values[0]), '50927e843568814f7ed45ec4f944bd8b')
-      if R <> 0 then
-        MsgBox('Pokemon Blue ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := BlueROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
- 
-function GetTLoZROMPath(Param: string): string;
-begin
-  if Length(tlozrom) > 0 then
-    Result := tlozrom
-  else if Assigned(TLoZROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(TLoZROMFilePage.Values[0]), '337bd6f1a1163df31bf2633665589ab0');
-      if R <> 0 then
-        MsgBox('The Legend of Zelda ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := TLoZROMFilePage.Values[0]
-    end
-  else
-    Result := '';
-end;
-
-function GetLADXROMPath(Param: string): string;
-begin
-  if Length(ladxrom) > 0 then
-    Result := ladxrom
-  else if Assigned(LADXROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(LADXROMFilePage.Values[0]), '07c211479386825042efb4ad31bb525f')
-      if R <> 0 then
-        MsgBox('Link''s Awakening DX ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := LADXROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-function GetAdvnROMPath(Param: string): string;
-begin
-  if Length(advnrom) > 0 then
-    Result := advnrom
-  else if Assigned(AdvnROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(AdvnROMFilePage.Values[0]), '157bddb7192754a45372be196797f284');
-      if R <> 0 then
-        MsgBox('Adventure ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := AdvnROMFilePage.Values[0]
-    end
-  else
-    Result := '';
-end;
-
-function GetBN3ROMPath(Param: string): string;
-begin
-  if Length(bn3rom) > 0 then
-    Result := bn3rom
-  else if Assigned(BN3ROMFilePage) then
-    begin
-      R := CompareStr(GetMD5OfFile(BN3ROMFilePage.Values[0]), '6fe31df0144759b34ad666badaacc442')
-      if R <> 0 then
-        MsgBox('MegaMan Battle Network 3 Blue ROM validation failed. Very likely wrong file.', mbInformation, MB_OK);
-
-      Result := BN3ROMFilePage.Values[0]
-    end
-  else
-    Result := '';
- end;
-
-procedure InitializeWizard();
-begin
-  AddOoTRomPage();
-
-  lttprom := CheckRom('Zelda no Densetsu - Kamigami no Triforce (Japan).sfc', '03a63945398191337e896e5771f77173');
-  if Length(lttprom) = 0 then
-    LttPROMFilePage:= AddRomPage('Zelda no Densetsu - Kamigami no Triforce (Japan).sfc');
-
-  smrom := CheckRom('Super Metroid (JU).sfc', '21f3e98df4780ee1c667b84e57d88675');
-  if Length(smrom) = 0 then
-    SMRomFilePage:= AddRomPage('Super Metroid (JU).sfc');
-
-  dkc3rom := CheckRom('Donkey Kong Country 3 - Dixie Kong''s Double Trouble! (USA) (En,Fr).sfc', '120abf304f0c40fe059f6a192ed4f947');
-  if Length(dkc3rom) = 0 then
-    DKC3RomFilePage:= AddRomPage('Donkey Kong Country 3 - Dixie Kong''s Double Trouble! (USA) (En,Fr).sfc');
-
-  smwrom := CheckRom('Super Mario World (USA).sfc', 'cdd3c8c37322978ca8669b34bc89c804');
-  if Length(smwrom) = 0 then
-    SMWRomFilePage:= AddRomPage('Super Mario World (USA).sfc');
-
-  soerom := CheckRom('Secret of Evermore (USA).sfc', '6e9c94511d04fac6e0a1e582c170be3a');
-  if Length(soerom) = 0 then
-    SoEROMFilePage:= AddRomPage('Secret of Evermore (USA).sfc');
-
-  zlrom := CheckSMSRom('Zillion (UE) [!].sms', 'd4bf9e7bcf9a48da53785d2ae7bc4270');
-  if Length(zlrom) = 0 then
-    ZlROMFilePage:= AddSMSRomPage('Zillion (UE) [!].sms');
-
-  redrom := CheckRom('Pokemon Red (UE) [S][!].gb','3d45c1ee9abd5738df46d2bdda8b57dc');
-  if Length(redrom) = 0 then
-    RedROMFilePage:= AddGBRomPage('Pokemon Red (UE) [S][!].gb');
-
-  bluerom := CheckRom('Pokemon Blue (UE) [S][!].gb','50927e843568814f7ed45ec4f944bd8b');
-  if Length(bluerom) = 0 then
-    BlueROMFilePage:= AddGBRomPage('Pokemon Blue (UE) [S][!].gb');
-
-  bn3rom := CheckRom('Mega Man Battle Network 3 - Blue Version (USA).gba','6fe31df0144759b34ad666badaacc442');
-  if Length(bn3rom) = 0 then
-    BN3ROMFilePage:= AddGBARomPage('Mega Man Battle Network 3 - Blue Version (USA).gba');
-  
-  ladxrom := CheckRom('Legend of Zelda, The - Link''s Awakening DX (USA, Europe) (SGB Enhanced).gbc','07c211479386825042efb4ad31bb525f');
-  if Length(ladxrom) = 0 then
-    LADXROMFilePage:= AddGBRomPage('Legend of Zelda, The - Link''s Awakening DX (USA, Europe) (SGB Enhanced).gbc');
-
-  l2acrom := CheckRom('Lufia II - Rise of the Sinistrals (USA).sfc', '6efc477d6203ed2b3b9133c1cd9e9c5d');
-  if Length(l2acrom) = 0 then
-    L2ACROMFilePage:= AddRomPage('Lufia II - Rise of the Sinistrals (USA).sfc');
-
-  tlozrom := CheckNESROM('Legend of Zelda, The (U) (PRG0) [!].nes', '337bd6f1a1163df31bf2633665589ab0');
-  if Length(tlozrom) = 0 then
-    TLoZROMFilePage:= AddNESRomPage('Legend of Zelda, The (U) (PRG0) [!].nes');
-
-  advnrom := CheckSMSRom('ADVNTURE.BIN', '157bddb7192754a45372be196797f284');
-  if Length(advnrom) = 0 then
-    AdvnROMFilePage:= AddA26Page('ADVNTURE.BIN');
-end;
-
-
-function ShouldSkipPage(PageID: Integer): Boolean;
-begin
-  Result := False;
-  if (assigned(LttPROMFilePage)) and (PageID = LttPROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('client/sni/lttp') or WizardIsComponentSelected('generator/lttp'));
-  if (assigned(SMROMFilePage)) and (PageID = SMROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('client/sni/sm') or WizardIsComponentSelected('generator/sm'));
-  if (assigned(DKC3ROMFilePage)) and (PageID = DKC3ROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('client/sni/dkc3') or WizardIsComponentSelected('generator/dkc3'));
-  if (assigned(SMWROMFilePage)) and (PageID = SMWROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('client/sni/smw') or WizardIsComponentSelected('generator/smw'));
-  if (assigned(L2ACROMFilePage)) and (PageID = L2ACROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('client/sni/l2ac') or WizardIsComponentSelected('generator/l2ac'));
-  if (assigned(SoEROMFilePage)) and (PageID = SoEROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/soe'));
-  if (assigned(OoTROMFilePage)) and (PageID = OoTROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/oot') or WizardIsComponentSelected('client/oot'));
-  if (assigned(ZlROMFilePage)) and (PageID = ZlROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/zl') or WizardIsComponentSelected('client/zl'));
-  if (assigned(RedROMFilePage)) and (PageID = RedROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/pkmn_r') or WizardIsComponentSelected('client/pkmn/red'));
-  if (assigned(BlueROMFilePage)) and (PageID = BlueROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/pkmn_b') or WizardIsComponentSelected('client/pkmn/blue'));
-  if (assigned(BN3ROMFilePage)) and (PageID = BN3ROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/mmbn3') or WizardIsComponentSelected('client/mmbn3'));
-  if (assigned(LADXROMFilePage)) and (PageID = LADXROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/ladx') or WizardIsComponentSelected('client/ladx'));
-  if (assigned(TLoZROMFilePage)) and (PageID = TLoZROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('generator/tloz') or WizardIsComponentSelected('client/tloz'));
-  if (assigned(AdvnROMFilePage)) and (PageID = AdvnROMFilePage.ID) then
-    Result := not (WizardIsComponentSelected('client/advn'));
-end;
diff --git a/kvui.py b/kvui.py
index 835f0dad45..22e179d5be 100644
--- a/kvui.py
+++ b/kvui.py
@@ -5,9 +5,13 @@ import typing
 
 if sys.platform == "win32":
     import ctypes
+
     # kivy 2.2.0 introduced DPI awareness on Windows, but it makes the UI enter an infinitely recursive re-layout
     # by setting the application to not DPI Aware, Windows handles scaling the entire window on its own, ignoring kivy's
-    ctypes.windll.shcore.SetProcessDpiAwareness(0)
+    try:
+        ctypes.windll.shcore.SetProcessDpiAwareness(0)
+    except FileNotFoundError:  # shcore may not be found on <= Windows 7
+        pass  # TODO: remove silent except when Python 3.8 is phased out.
 
 os.environ["KIVY_NO_CONSOLELOG"] = "1"
 os.environ["KIVY_NO_FILELOG"] = "1"
@@ -15,14 +19,15 @@ os.environ["KIVY_NO_ARGS"] = "1"
 os.environ["KIVY_LOG_ENABLE"] = "0"
 
 import Utils
+
 if Utils.is_frozen():
     os.environ["KIVY_DATA_DIR"] = Utils.local_path("data")
 
 from kivy.config import Config
 
 Config.set("input", "mouse", "mouse,disable_multitouch")
-Config.set('kivy', 'exit_on_escape', '0')
-Config.set('graphics', 'multisamples', '0')  # multisamples crash old intel drivers
+Config.set("kivy", "exit_on_escape", "0")
+Config.set("graphics", "multisamples", "0")  # multisamples crash old intel drivers
 
 from kivy.app import App
 from kivy.core.window import Window
@@ -55,7 +60,6 @@ from kivy.uix.popup import Popup
 
 fade_in_animation = Animation(opacity=0, duration=0) + Animation(opacity=1, duration=0.25)
 
-
 from NetUtils import JSONtoTextParser, JSONMessagePart, SlotType
 from Utils import async_start
 
@@ -74,8 +78,8 @@ class HoverBehavior(object):
     border_point = ObjectProperty(None)
 
     def __init__(self, **kwargs):
-        self.register_event_type('on_enter')
-        self.register_event_type('on_leave')
+        self.register_event_type("on_enter")
+        self.register_event_type("on_leave")
         Window.bind(mouse_pos=self.on_mouse_pos)
         Window.bind(on_cursor_leave=self.on_cursor_leave)
         super(HoverBehavior, self).__init__(**kwargs)
@@ -103,7 +107,7 @@ class HoverBehavior(object):
         self.dispatch("on_leave")
 
 
-Factory.register('HoverBehavior', HoverBehavior)
+Factory.register("HoverBehavior", HoverBehavior)
 
 
 class ToolTip(Label):
@@ -118,6 +122,60 @@ class HovererableLabel(HoverBehavior, Label):
     pass
 
 
+class TooltipLabel(HovererableLabel):
+    tooltip = None
+
+    def create_tooltip(self, text, x, y):
+        text = text.replace("<br>", "\n").replace("&amp;", "&").replace("&bl;", "[").replace("&br;", "]")
+        if self.tooltip:
+            # update
+            self.tooltip.children[0].text = text
+        else:
+            self.tooltip = FloatLayout()
+            tooltip_label = ToolTip(text=text)
+            self.tooltip.add_widget(tooltip_label)
+            fade_in_animation.start(self.tooltip)
+            App.get_running_app().root.add_widget(self.tooltip)
+
+        # handle left-side boundary to not render off-screen
+        x = max(x, 3 + self.tooltip.children[0].texture_size[0] / 2)
+
+        # position float layout
+        self.tooltip.x = x - self.tooltip.width / 2
+        self.tooltip.y = y - self.tooltip.height / 2 + 48
+
+    def remove_tooltip(self):
+        if self.tooltip:
+            App.get_running_app().root.remove_widget(self.tooltip)
+            self.tooltip = None
+
+    def on_mouse_pos(self, window, pos):
+        if not self.get_root_window():
+            return  # Abort if not displayed
+        super().on_mouse_pos(window, pos)
+        if self.refs and self.hovered:
+
+            tx, ty = self.to_widget(*pos, relative=True)
+            # Why TF is Y flipped *within* the texture?
+            ty = self.texture_size[1] - ty
+            hit = False
+            for uid, zones in self.refs.items():
+                for zone in zones:
+                    x, y, w, h = zone
+                    if x <= tx <= w and y <= ty <= h:
+                        self.create_tooltip(uid.split("|", 1)[1], *pos)
+                        hit = True
+                        break
+            if not hit:
+                self.remove_tooltip()
+
+    def on_enter(self):
+        pass
+
+    def on_leave(self):
+        self.remove_tooltip()
+
+
 class ServerLabel(HovererableLabel):
     def __init__(self, *args, **kwargs):
         super(HovererableLabel, self).__init__(*args, **kwargs)
@@ -186,11 +244,10 @@ class SelectableRecycleBoxLayout(FocusBehavior, LayoutSelectionBehavior,
     """ Adds selection and focus behaviour to the view. """
 
 
-class SelectableLabel(RecycleDataViewBehavior, HovererableLabel):
+class SelectableLabel(RecycleDataViewBehavior, TooltipLabel):
     """ Add selection support to the Label """
     index = None
     selected = BooleanProperty(False)
-    tooltip = None
 
     def refresh_view_attrs(self, rv, index, data):
         """ Catch and handle the view changes """
@@ -198,56 +255,6 @@ class SelectableLabel(RecycleDataViewBehavior, HovererableLabel):
         return super(SelectableLabel, self).refresh_view_attrs(
             rv, index, data)
 
-    def create_tooltip(self, text, x, y):
-        text = text.replace("<br>", "\n").replace('&amp;', '&').replace('&bl;', '[').replace('&br;', ']')
-        if self.tooltip:
-            # update
-            self.tooltip.children[0].text = text
-        else:
-            self.tooltip = FloatLayout()
-            tooltip_label = ToolTip(text=text)
-            self.tooltip.add_widget(tooltip_label)
-            fade_in_animation.start(self.tooltip)
-            App.get_running_app().root.add_widget(self.tooltip)
-
-        # handle left-side boundary to not render off-screen
-        x = max(x, 3+self.tooltip.children[0].texture_size[0] / 2)
-
-        # position float layout
-        self.tooltip.x = x - self.tooltip.width / 2
-        self.tooltip.y = y - self.tooltip.height / 2 + 48
-
-    def remove_tooltip(self):
-        if self.tooltip:
-            App.get_running_app().root.remove_widget(self.tooltip)
-            self.tooltip = None
-
-    def on_mouse_pos(self, window, pos):
-        if not self.get_root_window():
-            return  # Abort if not displayed
-        super().on_mouse_pos(window, pos)
-        if self.refs and self.hovered:
-
-            tx, ty = self.to_widget(*pos, relative=True)
-            # Why TF is Y flipped *within* the texture?
-            ty = self.texture_size[1] - ty
-            hit = False
-            for uid, zones in self.refs.items():
-                for zone in zones:
-                    x, y, w, h = zone
-                    if x <= tx <= w and y <= ty <= h:
-                        self.create_tooltip(uid.split("|", 1)[1], *pos)
-                        hit = True
-                        break
-            if not hit:
-                self.remove_tooltip()
-
-    def on_enter(self):
-        pass
-
-    def on_leave(self):
-        self.remove_tooltip()
-
     def on_touch_down(self, touch):
         """ Add selection on touch down """
         if super(SelectableLabel, self).on_touch_down(touch):
@@ -271,7 +278,7 @@ class SelectableLabel(RecycleDataViewBehavior, HovererableLabel):
                 elif not cmdinput.text and text.startswith("Missing: "):
                     cmdinput.text = text.replace("Missing: ", "!hint_location ")
 
-                Clipboard.copy(text.replace('&amp;', '&').replace('&bl;', '[').replace('&br;', ']'))
+                Clipboard.copy(text.replace("&amp;", "&").replace("&bl;", "[").replace("&br;", "]"))
                 return self.parent.select_with_touch(self.index, touch)
 
     def apply_selection(self, rv, index, is_selected):
@@ -279,9 +286,68 @@ class SelectableLabel(RecycleDataViewBehavior, HovererableLabel):
         self.selected = is_selected
 
 
+class HintLabel(RecycleDataViewBehavior, BoxLayout):
+    selected = BooleanProperty(False)
+    striped = BooleanProperty(False)
+    index = None
+    no_select = []
+
+    def __init__(self):
+        super(HintLabel, self).__init__()
+        self.receiving_text = ""
+        self.item_text = ""
+        self.finding_text = ""
+        self.location_text = ""
+        self.entrance_text = ""
+        self.found_text = ""
+        for child in self.children:
+            child.bind(texture_size=self.set_height)
+
+    def set_height(self, instance, value):
+        self.height = max([child.texture_size[1] for child in self.children])
+
+    def refresh_view_attrs(self, rv, index, data):
+        self.index = index
+        if "select" in data and not data["select"] and index not in self.no_select:
+            self.no_select.append(index)
+        self.striped = data["striped"]
+        self.receiving_text = data["receiving"]["text"]
+        self.item_text = data["item"]["text"]
+        self.finding_text = data["finding"]["text"]
+        self.location_text = data["location"]["text"]
+        self.entrance_text = data["entrance"]["text"]
+        self.found_text = data["found"]["text"]
+        self.height = self.minimum_height
+        return super(HintLabel, self).refresh_view_attrs(rv, index, data)
+
+    def on_touch_down(self, touch):
+        """ Add selection on touch down """
+        if super(HintLabel, self).on_touch_down(touch):
+            return True
+        if self.index not in self.no_select:
+            if self.collide_point(*touch.pos):
+                if self.selected:
+                    self.parent.clear_selection()
+                else:
+                    text = "".join([self.receiving_text, "\'s ", self.item_text, " is at ", self.location_text, " in ",
+                                    self.finding_text, "\'s World", (" at " + self.entrance_text)
+                                    if self.entrance_text != "Vanilla"
+                                    else "", ". (", self.found_text.lower(), ")"])
+                    temp = MarkupLabel(text).markup
+                    text = "".join(
+                        part for part in temp if not part.startswith(("[color", "[/color]", "[ref=", "[/ref]")))
+                    Clipboard.copy(escape_markup(text).replace("&amp;", "&").replace("&bl;", "[").replace("&br;", "]"))
+                    return self.parent.select_with_touch(self.index, touch)
+
+    def apply_selection(self, rv, index, is_selected):
+        """ Respond to the selection of items in the view. """
+        if self.index not in self.no_select:
+            self.selected = is_selected
+
+
 class ConnectBarTextInput(TextInput):
     def insert_text(self, substring, from_undo=False):
-        s = substring.replace('\n', '').replace('\r', '')
+        s = substring.replace("\n", "").replace("\r", "")
         return super(ConnectBarTextInput, self).insert_text(s, from_undo=from_undo)
 
 
@@ -299,7 +365,7 @@ class MessageBox(Popup):
     def __init__(self, title, text, error=False, **kwargs):
         label = MessageBox.MessageBoxLabel(text=text)
         separator_color = [217 / 255, 129 / 255, 122 / 255, 1.] if error else [47 / 255., 167 / 255., 212 / 255, 1.]
-        super().__init__(title=title, content=label, size_hint=(None, None), width=max(100, int(label.width)+40),
+        super().__init__(title=title, content=label, size_hint=(None, None), width=max(100, int(label.width) + 40),
                          separator_color=separator_color, **kwargs)
         self.height += max(0, label.height - 18)
 
@@ -355,11 +421,14 @@ class GameManager(App):
         # top part
         server_label = ServerLabel()
         self.connect_layout.add_widget(server_label)
-        self.server_connect_bar = ConnectBarTextInput(text=self.ctx.suggested_address or "archipelago.gg:", size_hint_y=None,
+        self.server_connect_bar = ConnectBarTextInput(text=self.ctx.suggested_address or "archipelago.gg:",
+                                                      size_hint_y=None,
                                                       height=dp(30), multiline=False, write_tab=False)
+
         def connect_bar_validate(sender):
             if not self.ctx.server:
                 self.connect_button_action(sender)
+
         self.server_connect_bar.bind(on_text_validate=connect_bar_validate)
         self.connect_layout.add_widget(self.server_connect_bar)
         self.server_connect_button = Button(text="Connect", size=(dp(100), dp(30)), size_hint_y=None, size_hint_x=None)
@@ -380,20 +449,22 @@ class GameManager(App):
             bridge_logger = logging.getLogger(logger_name)
             panel = TabbedPanelItem(text=display_name)
             self.log_panels[display_name] = panel.content = UILog(bridge_logger)
-            self.tabs.add_widget(panel)
+            if len(self.logging_pairs) > 1:
+                # show Archipelago tab if other logging is present
+                self.tabs.add_widget(panel)
+
+        hint_panel = TabbedPanelItem(text="Hints")
+        self.log_panels["Hints"] = hint_panel.content = HintLog(self.json_to_kivy_parser)
+        self.tabs.add_widget(hint_panel)
+
+        if len(self.logging_pairs) == 1:
+            self.tabs.default_tab_text = "Archipelago"
 
         self.main_area_container = GridLayout(size_hint_y=1, rows=1)
         self.main_area_container.add_widget(self.tabs)
 
         self.grid.add_widget(self.main_area_container)
 
-        if len(self.logging_pairs) == 1:
-            # Hide Tab selection if only one tab
-            self.tabs.clear_tabs()
-            self.tabs.do_default_tab = False
-            self.tabs.current_tab.height = 0
-            self.tabs.tab_height = 0
-
         # bottom part
         bottom_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
         info_button = Button(size=(dp(100), dp(30)), text="Command:", size_hint_x=None)
@@ -419,7 +490,7 @@ class GameManager(App):
         return self.container
 
     def update_texts(self, dt):
-        if hasattr(self.tabs.content.children[0], 'fix_heights'):
+        if hasattr(self.tabs.content.children[0], "fix_heights"):
             self.tabs.content.children[0].fix_heights()  # TODO: remove this when Kivy fixes this upstream
         if self.ctx.server:
             self.title = self.base_title + " " + Utils.__version__ + \
@@ -496,6 +567,10 @@ class GameManager(App):
         if hasattr(self, "energy_link_label"):
             self.energy_link_label.text = f"EL: {Utils.format_SI_prefix(self.ctx.current_energy_link_value)}J"
 
+    def update_hints(self):
+        hints = self.ctx.stored_data[f"_read_hints_{self.ctx.team}_{self.ctx.slot}"]
+        self.log_panels["Hints"].refresh_hints(hints)
+
     # default F1 keybind, opens a settings menu, that seems to break the layout engine once closed
     def open_settings(self, *largs):
         pass
@@ -510,12 +585,12 @@ class LogtoUI(logging.Handler):
     def format_compact(record: logging.LogRecord) -> str:
         if isinstance(record.msg, Exception):
             return str(record.msg)
-        return (f'{record.exc_info[1]}\n' if record.exc_info else '') + str(record.msg).split("\n")[0]
+        return (f"{record.exc_info[1]}\n" if record.exc_info else "") + str(record.msg).split("\n")[0]
 
     def handle(self, record: logging.LogRecord) -> None:
-        if getattr(record, 'skip_gui', False):
+        if getattr(record, "skip_gui", False):
             pass  # skip output
-        elif getattr(record, 'compact_gui', False):
+        elif getattr(record, "compact_gui", False):
             self.on_log(self.format_compact(record))
         else:
             self.on_log(self.format(record))
@@ -549,6 +624,44 @@ class UILog(RecycleView):
                 element.height = element.texture_size[1]
 
 
+class HintLog(RecycleView):
+    header = {
+        "receiving": {"text": "[u]Receiving Player[/u]"},
+        "item": {"text": "[u]Item[/u]"},
+        "finding": {"text": "[u]Finding Player[/u]"},
+        "location": {"text": "[u]Location[/u]"},
+        "entrance": {"text": "[u]Entrance[/u]"},
+        "found": {"text": "[u]Status[/u]"},
+        "striped": True,
+        "select": False,
+    }
+
+    def __init__(self, parser):
+        super(HintLog, self).__init__()
+        self.data = [self.header]
+        self.parser = parser
+
+    def refresh_hints(self, hints):
+        self.data = [self.header]
+        striped = False
+        for hint in hints:
+            self.data.append({
+                "striped": striped,
+                "receiving": {"text": self.parser.handle_node({"type": "player_id", "text": hint["receiving_player"]})},
+                "item": {"text": self.parser.handle_node(
+                    {"type": "item_id", "text": hint["item"], "flags": hint["item_flags"]})},
+                "finding": {"text": self.parser.handle_node({"type": "player_id", "text": hint["finding_player"]})},
+                "location": {"text": self.parser.handle_node({"type": "location_id", "text": hint["location"]})},
+                "entrance": {"text": self.parser.handle_node({"type": "color" if hint["entrance"] else "text",
+                                                              "color": "blue", "text": hint["entrance"]
+                                                              if hint["entrance"] else "Vanilla"})},
+                "found": {
+                    "text": self.parser.handle_node({"type": "color", "color": "green" if hint["found"] else "red",
+                                                     "text": "Found" if hint["found"] else "Not Found"})},
+            })
+            striped = not striped
+
+
 class E(ExceptionHandler):
     logger = logging.getLogger("Client")
 
@@ -596,7 +709,7 @@ class KivyJSONtoTextParser(JSONtoTextParser):
                    f"Type: {SlotType(slot_info.type).name}"
             if slot_info.group_members:
                 text += f"<br>Members:<br> " + \
-                        '<br> '.join(self.ctx.player_names[player] for player in slot_info.group_members)
+                        "<br> ".join(self.ctx.player_names[player] for player in slot_info.group_members)
             node.setdefault("refs", []).append(text)
         return super(KivyJSONtoTextParser, self)._handle_player_id(node)
 
@@ -624,4 +737,3 @@ user_file = Utils.user_path("data", "user.kv")
 if os.path.exists(user_file):
     logging.info("Loading user.kv into builder.")
     Builder.load_file(user_file)
-
diff --git a/playerSettings.yaml b/playerSettings.yaml
index e28963ddb3..f9585da246 100644
--- a/playerSettings.yaml
+++ b/playerSettings.yaml
@@ -26,7 +26,7 @@ name: YourName{number} # Your name in-game. Spaces will be replaced with undersc
 game: # Pick a game to play
   A Link to the Past: 1
 requires:
-  version: 0.3.3 # Version of Archipelago required for this yaml to work as expected.
+  version: 0.4.3 # Version of Archipelago required for this yaml to work as expected.
 A Link to the Past:
   progression_balancing:
     # A system that can move progression earlier, to try and prevent the player from getting stuck and bored early.
@@ -114,6 +114,9 @@ A Link to the Past:
     different_world: 0
     universal: 0
     start_with: 0
+  key_drop_shuffle: # Shuffle keys found in pots or dropped from killed enemies
+    off: 50
+    on: 0
   compass_shuffle: # Compass Placement
     original_dungeon: 50
     own_dungeons: 0
diff --git a/pytest.ini b/pytest.ini
index 5599a3c90f..33e0bab8a9 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
-python_files = Test*.py
+python_files = test_*.py Test*.py  # TODO: remove Test* once all worlds have been ported
 python_classes = Test
-python_functions = test
\ No newline at end of file
+python_functions = test
diff --git a/requirements.txt b/requirements.txt
index bfc637a80a..0db55a8035 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,13 @@
 colorama>=0.4.5
-websockets>=11.0.3
+websockets>=12.0
 PyYAML>=6.0.1
-jellyfish>=1.0.1
+jellyfish>=1.0.3
 jinja2>=3.1.2
 schema>=0.7.5
-kivy>=2.2.0
-bsdiff4>=1.2.3
-platformdirs>=3.9.1
-certifi>=2023.7.22
-cython>=0.29.35
+kivy>=2.2.1
+bsdiff4>=1.2.4
+platformdirs>=4.0.0
+certifi>=2023.11.17
+cython>=3.0.6
 cymem>=2.0.8
+orjson>=3.9.10
\ No newline at end of file
diff --git a/settings.py b/settings.py
index a7dcbbf8dd..acae86095c 100644
--- a/settings.py
+++ b/settings.py
@@ -694,6 +694,25 @@ does nothing if not found
     snes_rom_start: Union[SnesRomStart, bool] = True
 
 
+class BizHawkClientOptions(Group):
+    class EmuHawkPath(UserFilePath):
+        """
+        The location of the EmuHawk you want to auto launch patched ROMs with
+        """
+        is_exe = True
+        description = "EmuHawk Executable"
+
+    class RomStart(str):
+        """
+        Set this to true to autostart a patched ROM in BizHawk with the connector script,
+        to false to never open the patched rom automatically,
+        or to a path to an external program to open the ROM file with that instead.
+        """
+
+    emuhawk_path: EmuHawkPath = EmuHawkPath(None)
+    rom_start: Union[RomStart, bool] = True
+
+
 # Top-level group with lazy loading of worlds
 
 class Settings(Group):
@@ -701,6 +720,7 @@ class Settings(Group):
     server_options: ServerOptions = ServerOptions()
     generator: GeneratorOptions = GeneratorOptions()
     sni_options: SNIOptions = SNIOptions()
+    bizhawkclient_options: BizHawkClientOptions = BizHawkClientOptions()
 
     _filename: Optional[str] = None
 
diff --git a/setup.py b/setup.py
index ce35c0f1cc..c864a8cc9d 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ from pathlib import Path
 
 # This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
 try:
-    requirement = 'cx-Freeze>=6.15.2'
+    requirement = 'cx-Freeze>=6.15.10'
     import pkg_resources
     try:
         pkg_resources.require(requirement)
@@ -71,8 +71,6 @@ non_apworlds: set = {
     "Clique",
     "DLCQuest",
     "Final Fantasy",
-    "Hylics 2",
-    "Kingdom Hearts 2",
     "Lufia II Ancient Cave",
     "Meritous",
     "Ocarina of Time",
@@ -370,6 +368,10 @@ class BuildExeCommand(cx_Freeze.command.build_exe.BuildEXE):
         assert not non_apworlds - set(AutoWorldRegister.world_types), \
             f"Unknown world {non_apworlds - set(AutoWorldRegister.world_types)} designated for .apworld"
         folders_to_remove: typing.List[str] = []
+        disabled_worlds_folder = "worlds_disabled"
+        for entry in os.listdir(disabled_worlds_folder):
+            if os.path.isdir(os.path.join(disabled_worlds_folder, entry)):
+                folders_to_remove.append(entry)
         generate_yaml_templates(self.buildfolder / "Players" / "Templates", False)
         for worldname, worldtype in AutoWorldRegister.world_types.items():
             if worldname not in non_apworlds:
@@ -617,7 +619,7 @@ cx_Freeze.setup(
             "excludes": ["numpy", "Cython", "PySide2", "PIL",
                          "pandas"],
             "zip_include_packages": ["*"],
-            "zip_exclude_packages": ["worlds", "sc2"],
+            "zip_exclude_packages": ["worlds", "sc2", "orjson"],  # TODO: remove orjson here once we drop py3.8 support
             "include_files": [],  # broken in cx 6.14.0, we use more special sauce now
             "include_msvcr": False,
             "replace_paths": ["*."],
diff --git a/test/TestBase.py b/test/TestBase.py
index dc79ad2855..bfd92346d3 100644
--- a/test/TestBase.py
+++ b/test/TestBase.py
@@ -1,254 +1,3 @@
-import pathlib
-import typing
-import unittest
-from argparse import Namespace
-
-import Utils
-from test.general import gen_steps
-from worlds import AutoWorld
-from worlds.AutoWorld import call_all
-
-file_path = pathlib.Path(__file__).parent.parent
-Utils.local_path.cached_path = file_path
-
-from BaseClasses import MultiWorld, CollectionState, ItemClassification, Item
-from worlds.alttp.Items import ItemFactory
-
-
-class TestBase(unittest.TestCase):
-    multiworld: MultiWorld
-    _state_cache = {}
-
-    def get_state(self, items):
-        if (self.multiworld, tuple(items)) in self._state_cache:
-            return self._state_cache[self.multiworld, tuple(items)]
-        state = CollectionState(self.multiworld)
-        for item in items:
-            item.classification = ItemClassification.progression
-            state.collect(item)
-        state.sweep_for_events()
-        self._state_cache[self.multiworld, tuple(items)] = state
-        return state
-
-    def get_path(self, state, region):
-        def flist_to_iter(node):
-            while node:
-                value, node = node
-                yield value
-
-        from itertools import zip_longest
-        reversed_path_as_flist = state.path.get(region, (region, None))
-        string_path_flat = reversed(list(map(str, flist_to_iter(reversed_path_as_flist))))
-        # Now we combine the flat string list into (region, exit) pairs
-        pathsiter = iter(string_path_flat)
-        pathpairs = zip_longest(pathsiter, pathsiter)
-        return list(pathpairs)
-
-    def run_location_tests(self, access_pool):
-        for i, (location, access, *item_pool) in enumerate(access_pool):
-            items = item_pool[0]
-            all_except = item_pool[1] if len(item_pool) > 1 else None
-            state = self._get_items(item_pool, all_except)
-            path = self.get_path(state, self.multiworld.get_location(location, 1).parent_region)
-            with self.subTest(msg="Reach Location", location=location, access=access, items=items,
-                              all_except=all_except, path=path, entry=i):
-
-                self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access)
-
-            # check for partial solution
-            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
-                for missing_item in item_pool[0]:
-                    with self.subTest(msg="Location reachable without required item", location=location,
-                                      items=item_pool[0], missing_item=missing_item, entry=i):
-                        state = self._get_items_partial(item_pool, missing_item)
-                        self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), False)
-
-    def run_entrance_tests(self, access_pool):
-        for i, (entrance, access, *item_pool) in enumerate(access_pool):
-            items = item_pool[0]
-            all_except = item_pool[1] if len(item_pool) > 1 else None
-            state = self._get_items(item_pool, all_except)
-            path = self.get_path(state, self.multiworld.get_entrance(entrance, 1).parent_region)
-            with self.subTest(msg="Reach Entrance", entrance=entrance, access=access, items=items,
-                              all_except=all_except, path=path, entry=i):
-
-                self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), access)
-
-            # check for partial solution
-            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
-                for missing_item in item_pool[0]:
-                    with self.subTest(msg="Entrance reachable without required item", entrance=entrance,
-                                      items=item_pool[0], missing_item=missing_item, entry=i):
-                        state = self._get_items_partial(item_pool, missing_item)
-                        self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), False)
-
-    def _get_items(self, item_pool, all_except):
-        if all_except and len(all_except) > 0:
-            items = self.multiworld.itempool[:]
-            items = [item for item in items if
-                     item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
-            items.extend(ItemFactory(item_pool[0], 1))
-        else:
-            items = ItemFactory(item_pool[0], 1)
-        return self.get_state(items)
-
-    def _get_items_partial(self, item_pool, missing_item):
-        new_items = item_pool[0].copy()
-        new_items.remove(missing_item)
-        items = ItemFactory(new_items, 1)
-        return self.get_state(items)
-
-
-class WorldTestBase(unittest.TestCase):
-    options: typing.Dict[str, typing.Any] = {}
-    multiworld: MultiWorld
-
-    game: typing.ClassVar[str]  # define game name in subclass, example "Secret of Evermore"
-    auto_construct: typing.ClassVar[bool] = True
-    """ automatically set up a world for each test in this class """
-
-    def setUp(self) -> None:
-        if self.auto_construct:
-            self.world_setup()
-
-    def world_setup(self, seed: typing.Optional[int] = None) -> None:
-        if type(self) is WorldTestBase or \
-                (hasattr(WorldTestBase, self._testMethodName)
-                 and not self.run_default_tests and
-                 getattr(self, self._testMethodName).__code__ is
-                 getattr(WorldTestBase, self._testMethodName, None).__code__):
-            return  # setUp gets called for tests defined in the base class. We skip world_setup here.
-        if not hasattr(self, "game"):
-            raise NotImplementedError("didn't define game name")
-        self.multiworld = MultiWorld(1)
-        self.multiworld.game[1] = self.game
-        self.multiworld.player_name = {1: "Tester"}
-        self.multiworld.set_seed(seed)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types[self.game].option_definitions.items():
-            setattr(args, name, {
-                1: option.from_any(self.options.get(name, getattr(option, "default")))
-            })
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
-        for step in gen_steps:
-            call_all(self.multiworld, step)
-
-    # methods that can be called within tests
-    def collect_all_but(self, item_names: typing.Union[str, typing.Iterable[str]]) -> None:
-        """Collects all pre-placed items and items in the multiworld itempool except those provided"""
-        if isinstance(item_names, str):
-            item_names = (item_names,)
-        for item in self.multiworld.get_items():
-            if item.name not in item_names:
-                self.multiworld.state.collect(item)
-
-    def get_item_by_name(self, item_name: str) -> Item:
-        """Returns the first item found in placed items, or in the itempool with the matching name"""
-        for item in self.multiworld.get_items():
-            if item.name == item_name:
-                return item
-        raise ValueError("No such item")
-
-    def get_items_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
-        """Returns actual items from the itempool that match the provided name(s)"""
-        if isinstance(item_names, str):
-            item_names = (item_names,)
-        return [item for item in self.multiworld.itempool if item.name in item_names]
-
-    def collect_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
-        """ collect all of the items in the item pool that have the given names """
-        items = self.get_items_by_name(item_names)
-        self.collect(items)
-        return items
-
-    def collect(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
-        """Collects the provided item(s) into state"""
-        if isinstance(items, Item):
-            items = (items,)
-        for item in items:
-            self.multiworld.state.collect(item)
-
-    def remove(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
-        """Removes the provided item(s) from state"""
-        if isinstance(items, Item):
-            items = (items,)
-        for item in items:
-            if item.location and item.location.event and item.location in self.multiworld.state.events:
-                self.multiworld.state.events.remove(item.location)
-            self.multiworld.state.remove(item)
-
-    def can_reach_location(self, location: str) -> bool:
-        """Determines if the current state can reach the provide location name"""
-        return self.multiworld.state.can_reach(location, "Location", 1)
-
-    def can_reach_entrance(self, entrance: str) -> bool:
-        """Determines if the current state can reach the provided entrance name"""
-        return self.multiworld.state.can_reach(entrance, "Entrance", 1)
-
-    def count(self, item_name: str) -> int:
-        """Returns the amount of an item currently in state"""
-        return self.multiworld.state.count(item_name, 1)
-
-    def assertAccessDependency(self,
-                               locations: typing.List[str],
-                               possible_items: typing.Iterable[typing.Iterable[str]]) -> None:
-        """Asserts that the provided locations can't be reached without the listed items but can be reached with any
-         one of the provided combinations"""
-        all_items = [item_name for item_names in possible_items for item_name in item_names]
-
-        self.collect_all_but(all_items)
-        for location in self.multiworld.get_locations():
-            loc_reachable = self.multiworld.state.can_reach(location)
-            self.assertEqual(loc_reachable, location.name not in locations,
-                             f"{location.name} is reachable without {all_items}" if loc_reachable
-                             else f"{location.name} is not reachable without {all_items}")
-        for item_names in possible_items:
-            items = self.collect_by_name(item_names)
-            for location in locations:
-                self.assertTrue(self.can_reach_location(location),
-                                f"{location} not reachable with {item_names}")
-            self.remove(items)
-
-    def assertBeatable(self, beatable: bool):
-        """Asserts that the game can be beaten with the current state"""
-        self.assertEqual(self.multiworld.can_beat_game(self.multiworld.state), beatable)
-
-    # following tests are automatically run
-    @property
-    def run_default_tests(self) -> bool:
-        """Not possible or identical to the base test that's always being run already"""
-        return (self.options
-                or self.setUp.__code__ is not WorldTestBase.setUp.__code__
-                or self.world_setup.__code__ is not WorldTestBase.world_setup.__code__)
-
-    @property
-    def constructed(self) -> bool:
-        """A multiworld has been constructed by this point"""
-        return hasattr(self, "game") and hasattr(self, "multiworld")
-
-    def testAllStateCanReachEverything(self):
-        """Ensure all state can reach everything and complete the game with the defined options"""
-        if not (self.run_default_tests and self.constructed):
-            return
-        with self.subTest("Game", game=self.game):
-            excluded = self.multiworld.exclude_locations[1].value
-            state = self.multiworld.get_all_state(False)
-            for location in self.multiworld.get_locations():
-                if location.name not in excluded:
-                    with self.subTest("Location should be reached", location=location):
-                        reachable = location.can_reach(state)
-                        self.assertTrue(reachable, f"{location.name} unreachable")
-            with self.subTest("Beatable"):
-                self.multiworld.state = state
-                self.assertBeatable(True)
-
-    def testEmptyStateCanReachSomething(self):
-        """Ensure empty state can reach at least one location with the defined options"""
-        if not (self.run_default_tests and self.constructed):
-            return
-        with self.subTest("Game", game=self.game):
-            state = CollectionState(self.multiworld)
-            locations = self.multiworld.get_reachable_locations(state, 1)
-            self.assertGreater(len(locations), 0,
-                               "Need to be able to reach at least one location to get started.")
+from .bases import TestBase, WorldTestBase
+from warnings import warn
+warn("TestBase was renamed to bases", DeprecationWarning)
diff --git a/test/__init__.py b/test/__init__.py
index 32622f65a9..37ebe3f627 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,3 +1,4 @@
+import pathlib
 import warnings
 
 import settings
@@ -5,3 +6,13 @@ import settings
 warnings.simplefilter("always")
 settings.no_gui = True
 settings.skip_autosave = True
+
+import ModuleUpdate
+
+ModuleUpdate.update_ran = True  # don't upgrade
+
+import Utils
+
+file_path = pathlib.Path(__file__).parent.parent
+Utils.local_path.cached_path = file_path
+Utils.user_path()  # initialize cached_path
diff --git a/test/bases.py b/test/bases.py
new file mode 100644
index 0000000000..d6a43c598f
--- /dev/null
+++ b/test/bases.py
@@ -0,0 +1,339 @@
+import random
+import sys
+import typing
+import unittest
+from argparse import Namespace
+
+from Generate import get_seed_name
+from test.general import gen_steps
+from worlds import AutoWorld
+from worlds.AutoWorld import call_all
+
+from BaseClasses import Location, MultiWorld, CollectionState, ItemClassification, Item
+from worlds.alttp.Items import ItemFactory
+
+
+class TestBase(unittest.TestCase):
+    multiworld: MultiWorld
+    _state_cache = {}
+
+    def get_state(self, items):
+        if (self.multiworld, tuple(items)) in self._state_cache:
+            return self._state_cache[self.multiworld, tuple(items)]
+        state = CollectionState(self.multiworld)
+        for item in items:
+            item.classification = ItemClassification.progression
+            state.collect(item, event=True)
+        state.sweep_for_events()
+        state.update_reachable_regions(1)
+        self._state_cache[self.multiworld, tuple(items)] = state
+        return state
+
+    def get_path(self, state, region):
+        def flist_to_iter(node):
+            while node:
+                value, node = node
+                yield value
+
+        from itertools import zip_longest
+        reversed_path_as_flist = state.path.get(region, (region, None))
+        string_path_flat = reversed(list(map(str, flist_to_iter(reversed_path_as_flist))))
+        # Now we combine the flat string list into (region, exit) pairs
+        pathsiter = iter(string_path_flat)
+        pathpairs = zip_longest(pathsiter, pathsiter)
+        return list(pathpairs)
+
+    def run_location_tests(self, access_pool):
+        for i, (location, access, *item_pool) in enumerate(access_pool):
+            items = item_pool[0]
+            all_except = item_pool[1] if len(item_pool) > 1 else None
+            state = self._get_items(item_pool, all_except)
+            path = self.get_path(state, self.multiworld.get_location(location, 1).parent_region)
+            with self.subTest(msg="Reach Location", location=location, access=access, items=items,
+                              all_except=all_except, path=path, entry=i):
+
+                self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access,
+                                 f"failed {self.multiworld.get_location(location, 1)} with: {item_pool}")
+
+            # check for partial solution
+            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
+                for missing_item in item_pool[0]:
+                    with self.subTest(msg="Location reachable without required item", location=location,
+                                      items=item_pool[0], missing_item=missing_item, entry=i):
+                        state = self._get_items_partial(item_pool, missing_item)
+
+                        self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), False,
+                                         f"failed {self.multiworld.get_location(location, 1)}: succeeded with "
+                                         f"{missing_item} removed from: {item_pool}")
+
+    def run_entrance_tests(self, access_pool):
+        for i, (entrance, access, *item_pool) in enumerate(access_pool):
+            items = item_pool[0]
+            all_except = item_pool[1] if len(item_pool) > 1 else None
+            state = self._get_items(item_pool, all_except)
+            path = self.get_path(state, self.multiworld.get_entrance(entrance, 1).parent_region)
+            with self.subTest(msg="Reach Entrance", entrance=entrance, access=access, items=items,
+                              all_except=all_except, path=path, entry=i):
+
+                self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), access)
+
+            # check for partial solution
+            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
+                for missing_item in item_pool[0]:
+                    with self.subTest(msg="Entrance reachable without required item", entrance=entrance,
+                                      items=item_pool[0], missing_item=missing_item, entry=i):
+                        state = self._get_items_partial(item_pool, missing_item)
+                        self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), False,
+                                         f"failed {self.multiworld.get_entrance(entrance, 1)} with: {item_pool}")
+
+    def _get_items(self, item_pool, all_except):
+        if all_except and len(all_except) > 0:
+            items = self.multiworld.itempool[:]
+            items = [item for item in items if
+                     item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
+            items.extend(ItemFactory(item_pool[0], 1))
+        else:
+            items = ItemFactory(item_pool[0], 1)
+        return self.get_state(items)
+
+    def _get_items_partial(self, item_pool, missing_item):
+        new_items = item_pool[0].copy()
+        new_items.remove(missing_item)
+        items = ItemFactory(new_items, 1)
+        return self.get_state(items)
+
+
+class WorldTestBase(unittest.TestCase):
+    options: typing.Dict[str, typing.Any] = {}
+    multiworld: MultiWorld
+
+    game: typing.ClassVar[str]  # define game name in subclass, example "Secret of Evermore"
+    auto_construct: typing.ClassVar[bool] = True
+    """ automatically set up a world for each test in this class """
+    memory_leak_tested: typing.ClassVar[bool] = False
+    """ remember if memory leak test was already done for this class """
+
+    def setUp(self) -> None:
+        if self.auto_construct:
+            self.world_setup()
+
+    def tearDown(self) -> None:
+        if self.__class__.memory_leak_tested or not self.options or not self.constructed or \
+                sys.version_info < (3, 11, 0):  # the leak check in tearDown fails in py<3.11 for an unknown reason
+            # only run memory leak test once per class, only for constructed with non-default options
+            # default options will be tested in test/general
+            super().tearDown()
+            return
+
+        import gc
+        import weakref
+        weak = weakref.ref(self.multiworld)
+        for attr_name in dir(self):  # delete all direct references to MultiWorld and World
+            attr: object = typing.cast(object, getattr(self, attr_name))
+            if type(attr) is MultiWorld or isinstance(attr, AutoWorld.World):
+                delattr(self, attr_name)
+        state_cache: typing.Optional[typing.Dict[typing.Any, typing.Any]] = getattr(self, "_state_cache", None)
+        if state_cache is not None:  # in case of multiple inheritance with TestBase, we need to clear its cache
+            state_cache.clear()
+        gc.collect()
+        self.__class__.memory_leak_tested = True
+        self.assertFalse(weak(), f"World {getattr(self, 'game', '')} leaked MultiWorld object")
+        super().tearDown()
+
+    def world_setup(self, seed: typing.Optional[int] = None) -> None:
+        if type(self) is WorldTestBase or \
+                (hasattr(WorldTestBase, self._testMethodName)
+                 and not self.run_default_tests and
+                 getattr(self, self._testMethodName).__code__ is
+                 getattr(WorldTestBase, self._testMethodName, None).__code__):
+            return  # setUp gets called for tests defined in the base class. We skip world_setup here.
+        if not hasattr(self, "game"):
+            raise NotImplementedError("didn't define game name")
+        self.multiworld = MultiWorld(1)
+        self.multiworld.game[1] = self.game
+        self.multiworld.player_name = {1: "Tester"}
+        self.multiworld.set_seed(seed)
+        self.multiworld.state = CollectionState(self.multiworld)
+        random.seed(self.multiworld.seed)
+        self.multiworld.seed_name = get_seed_name(random)  # only called to get same RNG progression as Generate.py
+        args = Namespace()
+        for name, option in AutoWorld.AutoWorldRegister.world_types[self.game].options_dataclass.type_hints.items():
+            setattr(args, name, {
+                1: option.from_any(self.options.get(name, getattr(option, "default")))
+            })
+        self.multiworld.set_options(args)
+        for step in gen_steps:
+            call_all(self.multiworld, step)
+
+    # methods that can be called within tests
+    def collect_all_but(self, item_names: typing.Union[str, typing.Iterable[str]],
+                        state: typing.Optional[CollectionState] = None) -> None:
+        """Collects all pre-placed items and items in the multiworld itempool except those provided"""
+        if isinstance(item_names, str):
+            item_names = (item_names,)
+        if not state:
+            state = self.multiworld.state
+        for item in self.multiworld.get_items():
+            if item.name not in item_names:
+                state.collect(item)
+
+    def get_item_by_name(self, item_name: str) -> Item:
+        """Returns the first item found in placed items, or in the itempool with the matching name"""
+        for item in self.multiworld.get_items():
+            if item.name == item_name:
+                return item
+        raise ValueError("No such item")
+
+    def get_items_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
+        """Returns actual items from the itempool that match the provided name(s)"""
+        if isinstance(item_names, str):
+            item_names = (item_names,)
+        return [item for item in self.multiworld.itempool if item.name in item_names]
+
+    def collect_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
+        """ collect all of the items in the item pool that have the given names """
+        items = self.get_items_by_name(item_names)
+        self.collect(items)
+        return items
+
+    def collect(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
+        """Collects the provided item(s) into state"""
+        if isinstance(items, Item):
+            items = (items,)
+        for item in items:
+            self.multiworld.state.collect(item)
+    
+    def remove_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
+        """Remove all of the items in the item pool with the given names from state"""
+        items = self.get_items_by_name(item_names)
+        self.remove(items)
+        return items
+
+    def remove(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
+        """Removes the provided item(s) from state"""
+        if isinstance(items, Item):
+            items = (items,)
+        for item in items:
+            if item.location and item.location.event and item.location in self.multiworld.state.events:
+                self.multiworld.state.events.remove(item.location)
+            self.multiworld.state.remove(item)
+
+    def can_reach_location(self, location: str) -> bool:
+        """Determines if the current state can reach the provided location name"""
+        return self.multiworld.state.can_reach(location, "Location", 1)
+
+    def can_reach_entrance(self, entrance: str) -> bool:
+        """Determines if the current state can reach the provided entrance name"""
+        return self.multiworld.state.can_reach(entrance, "Entrance", 1)
+    
+    def can_reach_region(self, region: str) -> bool:
+        """Determines if the current state can reach the provided region name"""
+        return self.multiworld.state.can_reach(region, "Region", 1)
+
+    def count(self, item_name: str) -> int:
+        """Returns the amount of an item currently in state"""
+        return self.multiworld.state.count(item_name, 1)
+
+    def assertAccessDependency(self,
+                               locations: typing.List[str],
+                               possible_items: typing.Iterable[typing.Iterable[str]],
+                               only_check_listed: bool = False) -> None:
+        """Asserts that the provided locations can't be reached without the listed items but can be reached with any
+         one of the provided combinations"""
+        all_items = [item_name for item_names in possible_items for item_name in item_names]
+
+        state = CollectionState(self.multiworld)
+        self.collect_all_but(all_items, state)
+        if only_check_listed:
+            for location in locations:
+                self.assertFalse(state.can_reach(location, "Location", 1), f"{location} is reachable without {all_items}")
+        else:
+            for location in self.multiworld.get_locations():
+                loc_reachable = state.can_reach(location, "Location", 1)
+                self.assertEqual(loc_reachable, location.name not in locations,
+                                 f"{location.name} is reachable without {all_items}" if loc_reachable
+                                 else f"{location.name} is not reachable without {all_items}")
+        for item_names in possible_items:
+            items = self.get_items_by_name(item_names)
+            for item in items:
+                state.collect(item)
+            for location in locations:
+                self.assertTrue(state.can_reach(location, "Location", 1),
+                                f"{location} not reachable with {item_names}")
+            for item in items:
+                state.remove(item)
+
+    def assertBeatable(self, beatable: bool):
+        """Asserts that the game can be beaten with the current state"""
+        self.assertEqual(self.multiworld.can_beat_game(self.multiworld.state), beatable)
+
+    # following tests are automatically run
+    @property
+    def run_default_tests(self) -> bool:
+        """Not possible or identical to the base test that's always being run already"""
+        return (self.options
+                or self.setUp.__code__ is not WorldTestBase.setUp.__code__
+                or self.world_setup.__code__ is not WorldTestBase.world_setup.__code__)
+
+    @property
+    def constructed(self) -> bool:
+        """A multiworld has been constructed by this point"""
+        return hasattr(self, "game") and hasattr(self, "multiworld")
+
+    def test_all_state_can_reach_everything(self):
+        """Ensure all state can reach everything and complete the game with the defined options"""
+        if not (self.run_default_tests and self.constructed):
+            return
+        with self.subTest("Game", game=self.game):
+            excluded = self.multiworld.exclude_locations[1].value
+            state = self.multiworld.get_all_state(False)
+            for location in self.multiworld.get_locations():
+                if location.name not in excluded:
+                    with self.subTest("Location should be reached", location=location):
+                        reachable = location.can_reach(state)
+                        self.assertTrue(reachable, f"{location.name} unreachable")
+            with self.subTest("Beatable"):
+                self.multiworld.state = state
+                self.assertBeatable(True)
+
+    def test_empty_state_can_reach_something(self):
+        """Ensure empty state can reach at least one location with the defined options"""
+        if not (self.run_default_tests and self.constructed):
+            return
+        with self.subTest("Game", game=self.game):
+            state = CollectionState(self.multiworld)
+            locations = self.multiworld.get_reachable_locations(state, 1)
+            self.assertGreater(len(locations), 0,
+                               "Need to be able to reach at least one location to get started.")
+
+    def test_fill(self):
+        """Generates a multiworld and validates placements with the defined options"""
+        if not (self.run_default_tests and self.constructed):
+            return
+        from Fill import distribute_items_restrictive
+
+        # basically a shortened reimplementation of this method from core, in order to force the check is done
+        def fulfills_accessibility() -> bool:
+            locations = list(self.multiworld.get_locations(1))
+            state = CollectionState(self.multiworld)
+            while locations:
+                sphere: typing.List[Location] = []
+                for n in range(len(locations) - 1, -1, -1):
+                    if locations[n].can_reach(state):
+                        sphere.append(locations.pop(n))
+                self.assertTrue(sphere or self.multiworld.accessibility[1] == "minimal",
+                                f"Unreachable locations: {locations}")
+                if not sphere:
+                    break
+                for location in sphere:
+                    if location.item:
+                        state.collect(location.item, True, location)
+            return self.multiworld.has_beaten_game(state, 1)
+
+        with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
+            distribute_items_restrictive(self.multiworld)
+            call_all(self.multiworld, "post_fill")
+            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),
+                                 "Unplaced Items remaining in itempool")
diff --git a/test/general/TestIDs.py b/test/general/TestIDs.py
deleted file mode 100644
index db1c9461b9..0000000000
--- a/test/general/TestIDs.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import unittest
-from worlds.AutoWorld import AutoWorldRegister
-
-
-class TestIDs(unittest.TestCase):
-    def testUniqueItems(self):
-        known_item_ids = set()
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            current = len(known_item_ids)
-            known_item_ids |= set(world_type.item_id_to_name)
-            self.assertEqual(len(known_item_ids) - len(world_type.item_id_to_name), current)
-
-    def testUniqueLocations(self):
-        known_location_ids = set()
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            current = len(known_location_ids)
-            known_location_ids |= set(world_type.location_id_to_name)
-            self.assertEqual(len(known_location_ids) - len(world_type.location_id_to_name), current)
-
-    def testRangeItems(self):
-        """There are Javascript clients, which are limited to Number.MAX_SAFE_INTEGER due to 64bit float precision."""
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            with self.subTest(game=gamename):
-                for item_id in world_type.item_id_to_name:
-                    self.assertLess(item_id, 2**53)
-
-    def testRangeLocations(self):
-        """There are Javascript clients, which are limited to Number.MAX_SAFE_INTEGER due to 64bit float precision."""
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            with self.subTest(game=gamename):
-                for location_id in world_type.location_id_to_name:
-                    self.assertLess(location_id, 2**53)
-
-    def testReservedItems(self):
-        """negative item IDs are reserved to the special "Archipelago" world."""
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            with self.subTest(game=gamename):
-                if gamename == "Archipelago":
-                    for item_id in world_type.item_id_to_name:
-                        self.assertLess(item_id, 0)
-                else:
-                    for item_id in world_type.item_id_to_name:
-                        self.assertGreater(item_id, 0)
-
-    def testReservedLocations(self):
-        """negative location IDs are reserved to the special "Archipelago" world."""
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            with self.subTest(game=gamename):
-                if gamename == "Archipelago":
-                    for location_id in world_type.location_id_to_name:
-                        self.assertLess(location_id, 0)
-                else:
-                    for location_id in world_type.location_id_to_name:
-                        self.assertGreater(location_id, 0)
-
-    def testDuplicateItemIDs(self):
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            with self.subTest(game=gamename):
-                self.assertEqual(len(world_type.item_id_to_name), len(world_type.item_name_to_id))
-
-    def testDuplicateLocationIDs(self):
-        for gamename, world_type in AutoWorldRegister.world_types.items():
-            with self.subTest(game=gamename):
-                self.assertEqual(len(world_type.location_id_to_name), len(world_type.location_name_to_id))
diff --git a/test/general/__init__.py b/test/general/__init__.py
index b0fb7ca32e..5e0f22f4ec 100644
--- a/test/general/__init__.py
+++ b/test/general/__init__.py
@@ -1,22 +1,29 @@
 from argparse import Namespace
 from typing import Type, Tuple
 
-from BaseClasses import MultiWorld
+from BaseClasses import MultiWorld, CollectionState
 from worlds.AutoWorld import call_all, World
 
 gen_steps = ("generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill")
 
 
 def setup_solo_multiworld(world_type: Type[World], steps: Tuple[str, ...] = gen_steps) -> MultiWorld:
+    """
+    Creates a multiworld with a single player of `world_type`, sets default options, and calls provided gen steps.
+    
+    :param world_type: Type of the world to generate a multiworld for
+    :param steps: The gen steps that should be called on the generated multiworld before returning. Default calls
+    steps through pre_fill
+    """
     multiworld = MultiWorld(1)
     multiworld.game[1] = world_type.game
     multiworld.player_name = {1: "Tester"}
     multiworld.set_seed()
+    multiworld.state = CollectionState(multiworld)
     args = Namespace()
-    for name, option in world_type.option_definitions.items():
+    for name, option in world_type.options_dataclass.type_hints.items():
         setattr(args, name, {1: option.from_any(option.default)})
     multiworld.set_options(args)
-    multiworld.set_default_common_options()
     for step in steps:
         call_all(multiworld, step)
     return multiworld
diff --git a/test/general/TestFill.py b/test/general/test_fill.py
similarity index 83%
rename from test/general/TestFill.py
rename to test/general/test_fill.py
index 99f48cd0c7..e454b3e61d 100644
--- a/test/general/TestFill.py
+++ b/test/general/test_fill.py
@@ -1,16 +1,20 @@
 from typing import List, Iterable
 import unittest
+
+import Options
+from Options import Accessibility
 from worlds.AutoWorld import World
 from Fill import FillError, balance_multiworld_progression, fill_restrictive, \
     distribute_early_items, distribute_items_restrictive
 from BaseClasses import Entrance, LocationProgressType, MultiWorld, Region, Item, Location, \
-    ItemClassification
+    ItemClassification, CollectionState
 from worlds.generic.Rules import CollectionRule, add_item_rule, locality_rules, set_rule
 
 
 def generate_multi_world(players: int = 1) -> MultiWorld:
     multi_world = MultiWorld(players)
     multi_world.player_name = {}
+    multi_world.state = CollectionState(multi_world)
     for i in range(players):
         player_id = i+1
         world = World(multi_world, player_id)
@@ -19,9 +23,16 @@ def generate_multi_world(players: int = 1) -> MultiWorld:
         multi_world.player_name[player_id] = "Test Player " + str(player_id)
         region = Region("Menu", player_id, multi_world, "Menu Region Hint")
         multi_world.regions.append(region)
+        for option_key, option in Options.PerGameCommonOptions.type_hints.items():
+            if hasattr(multi_world, option_key):
+                getattr(multi_world, option_key).setdefault(player_id, option.from_any(getattr(option, "default")))
+            else:
+                setattr(multi_world, option_key, {player_id: option.from_any(getattr(option, "default"))})
+        # TODO - remove this loop once all worlds use options dataclasses
+        world.options = world.options_dataclass(**{option_key: getattr(multi_world, option_key)[player_id]
+                                                   for option_key in world.options_dataclass.type_hints})
 
     multi_world.set_seed(0)
-    multi_world.set_default_common_options()
 
     return multi_world
 
@@ -61,7 +72,7 @@ class PlayerDefinition(object):
         return region
 
 
-def fillRegion(world: MultiWorld, region: Region, items: List[Item]) -> List[Item]:
+def fill_region(world: MultiWorld, region: Region, items: List[Item]) -> List[Item]:
     items = items.copy()
     while len(items) > 0:
         location = region.locations.pop(0)
@@ -75,7 +86,7 @@ def fillRegion(world: MultiWorld, region: Region, items: List[Item]) -> List[Ite
     return items
 
 
-def regionContains(region: Region, item: Item) -> bool:
+def region_contains(region: Region, item: Item) -> bool:
     for location in region.locations:
         if location.item == item:
             return True
@@ -122,6 +133,7 @@ def names(objs: list) -> Iterable[str]:
 
 class TestFillRestrictive(unittest.TestCase):
     def test_basic_fill(self):
+        """Tests `fill_restrictive` fills and removes the locations and items from their respective lists"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 2, 2)
 
@@ -139,6 +151,7 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertEqual([], player1.prog_items)
 
     def test_ordered_fill(self):
+        """Tests `fill_restrictive` fulfills set rules"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 2, 2)
         items = player1.prog_items
@@ -155,6 +168,7 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertEqual(locations[1].item, items[1])
 
     def test_partial_fill(self):
+        """Tests that `fill_restrictive` returns unfilled locations"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 3, 2)
 
@@ -180,13 +194,14 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertEqual(player1.locations[0], loc2)
 
     def test_minimal_fill(self):
+        """Test that fill for minimal player can have unreachable items"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 2, 2)
 
         items = player1.prog_items
         locations = player1.locations
 
-        multi_world.accessibility[player1.id].value = multi_world.accessibility[player1.id].option_minimal
+        multi_world.worlds[player1.id].options.accessibility = Accessibility.from_any(Accessibility.option_minimal)
         multi_world.completion_condition[player1.id] = lambda state: state.has(
             items[1].name, player1.id)
         set_rule(locations[1], lambda state: state.has(
@@ -235,6 +250,7 @@ class TestFillRestrictive(unittest.TestCase):
                             f'{item} is unreachable in {item.location}')
 
     def test_reversed_fill(self):
+        """Test a different set of rules can be satisfied"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 2, 2)
 
@@ -253,6 +269,7 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertEqual(loc1.item, item0)
 
     def test_multi_step_fill(self):
+        """Test that fill is able to satisfy multiple spheres"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 4, 4)
 
@@ -277,6 +294,7 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertEqual(locations[3].item, items[3])
 
     def test_impossible_fill(self):
+        """Test that fill raises an error when it can't place any items"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 2, 2)
         items = player1.prog_items
@@ -293,6 +311,7 @@ class TestFillRestrictive(unittest.TestCase):
                           player1.locations.copy(), player1.prog_items.copy())
 
     def test_circular_fill(self):
+        """Test that fill raises an error when it can't place all items"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 3, 3)
 
@@ -313,6 +332,7 @@ class TestFillRestrictive(unittest.TestCase):
                           player1.locations.copy(), player1.prog_items.copy())
 
     def test_competing_fill(self):
+        """Test that fill raises an error when it can't place items in a way to satisfy the conditions"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 2, 2)
 
@@ -329,6 +349,7 @@ class TestFillRestrictive(unittest.TestCase):
                           player1.locations.copy(), player1.prog_items.copy())
 
     def test_multiplayer_fill(self):
+        """Test that items can be placed across worlds"""
         multi_world = generate_multi_world(2)
         player1 = generate_player_data(multi_world, 1, 2, 2)
         player2 = generate_player_data(multi_world, 2, 2, 2)
@@ -349,6 +370,7 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertEqual(player2.locations[1].item, player2.prog_items[0])
 
     def test_multiplayer_rules_fill(self):
+        """Test that fill across worlds satisfies the rules"""
         multi_world = generate_multi_world(2)
         player1 = generate_player_data(multi_world, 1, 2, 2)
         player2 = generate_player_data(multi_world, 2, 2, 2)
@@ -372,6 +394,7 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertEqual(player2.locations[1].item, player1.prog_items[1])
 
     def test_restrictive_progress(self):
+        """Test that various spheres with different requirements can be filled"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, prog_item_count=25)
         items = player1.prog_items.copy()
@@ -394,6 +417,7 @@ class TestFillRestrictive(unittest.TestCase):
                          locations, player1.prog_items)
 
     def test_swap_to_earlier_location_with_item_rule(self):
+        """Test that item swap happens and works as intended"""
         # test for PR#1109
         multi_world = generate_multi_world(1)
         player1 = generate_player_data(multi_world, 1, 4, 4)
@@ -418,7 +442,49 @@ class TestFillRestrictive(unittest.TestCase):
         self.assertTrue(sphere1_loc.item, "Did not swap required item into Sphere 1")
         self.assertEqual(sphere1_loc.item, allowed_item, "Wrong item in Sphere 1")
 
+    def test_swap_to_earlier_location_with_item_rule2(self):
+        """Test that swap works before all items are placed"""
+        multi_world = generate_multi_world(1)
+        player1 = generate_player_data(multi_world, 1, 5, 5)
+        locations = player1.locations[:]  # copy required
+        items = player1.prog_items[:]  # copy required
+        # Two items provide access to sphere 2.
+        # One of them is forbidden in sphere 1, the other is first placed in sphere 4 because of placement order,
+        # requiring a swap.
+        # There are spheres in between, so for the swap to work, it'll have to assume all other items are collected.
+        one_to_two1 = items[4].name
+        one_to_two2 = items[3].name
+        three_to_four = items[2].name
+        two_to_three1 = items[1].name
+        two_to_three2 = items[0].name
+        # Sphere 4
+        set_rule(locations[0], lambda state: ((state.has(one_to_two1, player1.id) or state.has(one_to_two2, player1.id))
+                                              and state.has(two_to_three1, player1.id)
+                                              and state.has(two_to_three2, player1.id)
+                                              and state.has(three_to_four, player1.id)))
+        # Sphere 3
+        set_rule(locations[1], lambda state: ((state.has(one_to_two1, player1.id) or state.has(one_to_two2, player1.id))
+                                              and state.has(two_to_three1, player1.id)
+                                              and state.has(two_to_three2, player1.id)))
+        # Sphere 2
+        set_rule(locations[2], lambda state: state.has(one_to_two1, player1.id) or state.has(one_to_two2, player1.id))
+        # Sphere 1
+        sphere1_loc1 = locations[3]
+        sphere1_loc2 = locations[4]
+        # forbid one_to_two2 in sphere 1 to make the swap happen as described above
+        add_item_rule(sphere1_loc1, lambda item_to_place: item_to_place.name != one_to_two2)
+        add_item_rule(sphere1_loc2, lambda item_to_place: item_to_place.name != one_to_two2)
+
+        # Now fill should place one_to_two1 in sphere1_loc1 or sphere1_loc2 via swap,
+        # which it will attempt before two_to_three and three_to_four are placed, testing the behavior.
+        fill_restrictive(multi_world, multi_world.state, player1.locations, player1.prog_items)
+        # assert swap happened
+        self.assertTrue(sphere1_loc1.item and sphere1_loc2.item, "Did not swap required item into Sphere 1")
+        self.assertTrue(sphere1_loc1.item.name == one_to_two1 or
+                        sphere1_loc2.item.name == one_to_two1, "Wrong item in Sphere 1")
+
     def test_double_sweep(self):
+        """Test that sweep doesn't duplicate Event items when sweeping"""
         # test for PR1114
         multi_world = generate_multi_world(1)
         player1 = generate_player_data(multi_world, 1, 1, 1)
@@ -430,10 +496,11 @@ class TestFillRestrictive(unittest.TestCase):
         location.place_locked_item(item)
         multi_world.state.sweep_for_events()
         multi_world.state.sweep_for_events()
-        self.assertTrue(multi_world.state.prog_items[item.name, item.player], "Sweep did not collect - Test flawed")
-        self.assertEqual(multi_world.state.prog_items[item.name, item.player], 1, "Sweep collected multiple times")
+        self.assertTrue(multi_world.state.prog_items[item.player][item.name], "Sweep did not collect - Test flawed")
+        self.assertEqual(multi_world.state.prog_items[item.player][item.name], 1, "Sweep collected multiple times")
 
     def test_correct_item_instance_removed_from_pool(self):
+        """Test that a placed item gets removed from the submitted pool"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(multi_world, 1, 2, 2)
 
@@ -450,6 +517,7 @@ class TestFillRestrictive(unittest.TestCase):
 
 class TestDistributeItemsRestrictive(unittest.TestCase):
     def test_basic_distribute(self):
+        """Test that distribute_items_restrictive is deterministic"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -469,6 +537,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertFalse(locations[3].event)
 
     def test_excluded_distribute(self):
+        """Test that distribute_items_restrictive doesn't put advancement items on excluded locations"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -483,6 +552,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertFalse(locations[2].item.advancement)
 
     def test_non_excluded_item_distribute(self):
+        """Test that useful items aren't placed on excluded locations"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -497,6 +567,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertEqual(locations[1].item, basic_items[0])
 
     def test_too_many_excluded_distribute(self):
+        """Test that fill fails if it can't place all progression items due to too many excluded locations"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -509,6 +580,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertRaises(FillError, distribute_items_restrictive, multi_world)
 
     def test_non_excluded_item_must_distribute(self):
+        """Test that fill fails if it can't place useful items due to too many excluded locations"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -523,6 +595,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertRaises(FillError, distribute_items_restrictive, multi_world)
 
     def test_priority_distribute(self):
+        """Test that priority locations receive advancement items"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -537,6 +610,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertTrue(locations[3].item.advancement)
 
     def test_excess_priority_distribute(self):
+        """Test that if there's more priority locations than advancement items, they can still fill"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -551,6 +625,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertFalse(locations[3].item.advancement)
 
     def test_multiple_world_priority_distribute(self):
+        """Test that priority fill can be satisfied for multiple worlds"""
         multi_world = generate_multi_world(3)
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -580,7 +655,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertTrue(player3.locations[3].item.advancement)
 
     def test_can_remove_locations_in_fill_hook(self):
-
+        """Test that distribute_items_restrictive calls the fill hook and allows for item and location removal"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -600,6 +675,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertIsNone(removed_location[0].item)
 
     def test_seed_robust_to_item_order(self):
+        """Test deterministic fill"""
         mw1 = generate_multi_world()
         gen1 = generate_player_data(
             mw1, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -617,6 +693,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertEqual(gen1.locations[3].item, gen2.locations[3].item)
 
     def test_seed_robust_to_location_order(self):
+        """Test deterministic fill even if locations in a region are reordered"""
         mw1 = generate_multi_world()
         gen1 = generate_player_data(
             mw1, 1, 4, prog_item_count=2, basic_item_count=2)
@@ -635,6 +712,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
         self.assertEqual(gen1.locations[3].item, gen2.locations[3].item)
 
     def test_can_reserve_advancement_items_for_general_fill(self):
+        """Test that priority locations fill still satisfies item rules"""
         multi_world = generate_multi_world()
         player1 = generate_player_data(
             multi_world, 1, location_count=5, prog_item_count=5)
@@ -644,14 +722,14 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
 
         location = player1.locations[0]
         location.progress_type = LocationProgressType.PRIORITY
-        location.item_rule = lambda item: item != items[
-            0] and item != items[1] and item != items[2] and item != items[3]
+        location.item_rule = lambda item: item not in items[:4]
 
         distribute_items_restrictive(multi_world)
 
         self.assertEqual(location.item, items[4])
 
     def test_non_excluded_local_items(self):
+        """Test that local items get placed locally in a multiworld"""
         multi_world = generate_multi_world(2)
         player1 = generate_player_data(
             multi_world, 1, location_count=5, basic_item_count=5)
@@ -672,6 +750,7 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
             self.assertFalse(item.location.event, False)
 
     def test_early_items(self) -> None:
+        """Test that the early items API successfully places items early"""
         mw = generate_multi_world(2)
         player1 = generate_player_data(mw, 1, location_count=5, basic_item_count=5)
         player2 = generate_player_data(mw, 2, location_count=5, basic_item_count=5)
@@ -751,21 +830,22 @@ class TestBalanceMultiworldProgression(unittest.TestCase):
 
         # Sphere 1
         region = player1.generate_region(player1.menu, 20)
-        items = fillRegion(multi_world, region, [
+        items = fill_region(multi_world, region, [
             player1.prog_items[0]] + items)
 
         # Sphere 2
         region = player1.generate_region(
             player1.regions[1], 20, lambda state: state.has(player1.prog_items[0].name, player1.id))
-        items = fillRegion(
+        items = fill_region(
             multi_world, region, [player1.prog_items[1], player2.prog_items[0]] + items)
 
         # Sphere 3
         region = player2.generate_region(
             player2.menu, 20, lambda state: state.has(player2.prog_items[0].name, player2.id))
-        fillRegion(multi_world, region, [player2.prog_items[1]] + items)
+        fill_region(multi_world, region, [player2.prog_items[1]] + items)
 
     def test_balances_progression(self) -> None:
+        """Tests that progression balancing moves progression items earlier"""
         self.multi_world.progression_balancing[self.player1.id].value = 50
         self.multi_world.progression_balancing[self.player2.id].value = 50
 
@@ -778,6 +858,7 @@ class TestBalanceMultiworldProgression(unittest.TestCase):
             self.player1.regions[1], self.player2.prog_items[0])
 
     def test_balances_progression_light(self) -> None:
+        """Test that progression balancing still moves items earlier on minimum value"""
         self.multi_world.progression_balancing[self.player1.id].value = 1
         self.multi_world.progression_balancing[self.player2.id].value = 1
 
@@ -791,6 +872,7 @@ class TestBalanceMultiworldProgression(unittest.TestCase):
             self.player1.regions[1], self.player2.prog_items[0])
 
     def test_balances_progression_heavy(self) -> None:
+        """Test that progression balancing moves items earlier on maximum value"""
         self.multi_world.progression_balancing[self.player1.id].value = 99
         self.multi_world.progression_balancing[self.player2.id].value = 99
 
@@ -804,6 +886,7 @@ class TestBalanceMultiworldProgression(unittest.TestCase):
             self.player1.regions[1], self.player2.prog_items[0])
 
     def test_skips_balancing_progression(self) -> None:
+        """Test that progression balancing is skipped when players have it disabled"""
         self.multi_world.progression_balancing[self.player1.id].value = 0
         self.multi_world.progression_balancing[self.player2.id].value = 0
 
@@ -816,6 +899,7 @@ class TestBalanceMultiworldProgression(unittest.TestCase):
             self.player1.regions[2], self.player2.prog_items[0])
 
     def test_ignores_priority_locations(self) -> None:
+        """Test that progression items on priority locations don't get moved by balancing"""
         self.multi_world.progression_balancing[self.player1.id].value = 50
         self.multi_world.progression_balancing[self.player2.id].value = 50
 
diff --git a/test/general/TestHelpers.py b/test/general/test_helpers.py
similarity index 90%
rename from test/general/TestHelpers.py
rename to test/general/test_helpers.py
index c0b560c7e4..83b56b3438 100644
--- a/test/general/TestHelpers.py
+++ b/test/general/test_helpers.py
@@ -1,7 +1,7 @@
-from typing import Dict, Optional, Callable
-
-from BaseClasses import MultiWorld, CollectionState, Region
 import unittest
+from typing import Callable, Dict, Optional
+
+from BaseClasses import CollectionState, MultiWorld, Region
 
 
 class TestHelpers(unittest.TestCase):
@@ -13,9 +13,9 @@ class TestHelpers(unittest.TestCase):
         self.multiworld.game[self.player] = "helper_test_game"
         self.multiworld.player_name = {1: "Tester"}
         self.multiworld.set_seed()
-        self.multiworld.set_default_common_options()
 
-    def testRegionHelpers(self) -> None:
+    def test_region_helpers(self) -> None:
+        """Tests `Region.add_locations()` and `Region.add_exits()` have correct behavior"""
         regions: Dict[str, str] = {
             "TestRegion1": "I'm an apple",
             "TestRegion2": "I'm a banana",
@@ -79,4 +79,5 @@ class TestHelpers(unittest.TestCase):
                 current_region.add_exits(reg_exit_set[region])
                 exit_names = {_exit.name for _exit in current_region.exits}
                 for reg_exit in reg_exit_set[region]:
-                    self.assertTrue(f"{region} -> {reg_exit}" in exit_names, f"{region} -> {reg_exit} not in {exit_names}")
+                    self.assertTrue(f"{region} -> {reg_exit}" in exit_names,
+                                    f"{region} -> {reg_exit} not in {exit_names}")
diff --git a/test/general/TestHostYAML.py b/test/general/test_host_yaml.py
similarity index 78%
rename from test/general/TestHostYAML.py
rename to test/general/test_host_yaml.py
index f5fd406cac..79285d3a63 100644
--- a/test/general/TestHostYAML.py
+++ b/test/general/test_host_yaml.py
@@ -15,14 +15,16 @@ class TestIDs(unittest.TestCase):
             cls.yaml_options = Utils.parse_yaml(f.read())
 
     def test_utils_in_yaml(self) -> None:
-        for option_key, option_set in Utils.get_default_options().items():
+        """Tests that the auto generated host.yaml has default settings in it"""
+        for option_key, option_set in Settings(None).items():
             with self.subTest(option_key):
                 self.assertIn(option_key, self.yaml_options)
                 for sub_option_key in option_set:
                     self.assertIn(sub_option_key, self.yaml_options[option_key])
 
     def test_yaml_in_utils(self) -> None:
-        utils_options = Utils.get_default_options()
+        """Tests that the auto generated host.yaml shows up in reference calls"""
+        utils_options = Settings(None)
         for option_key, option_set in self.yaml_options.items():
             with self.subTest(option_key):
                 self.assertIn(option_key, utils_options)
diff --git a/test/general/test_ids.py b/test/general/test_ids.py
new file mode 100644
index 0000000000..98c41b67b1
--- /dev/null
+++ b/test/general/test_ids.py
@@ -0,0 +1,102 @@
+import unittest
+
+from Fill import distribute_items_restrictive
+from worlds.AutoWorld import AutoWorldRegister, call_all
+from . import setup_solo_multiworld
+
+
+class TestIDs(unittest.TestCase):
+    def test_unique_items(self):
+        """Tests that every game has a unique ID per item in the datapackage"""
+        known_item_ids = set()
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            current = len(known_item_ids)
+            known_item_ids |= set(world_type.item_id_to_name)
+            self.assertEqual(len(known_item_ids) - len(world_type.item_id_to_name), current)
+
+    def test_unique_locations(self):
+        """Tests that every game has a unique ID per location in the datapackage"""
+        known_location_ids = set()
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            current = len(known_location_ids)
+            known_location_ids |= set(world_type.location_id_to_name)
+            self.assertEqual(len(known_location_ids) - len(world_type.location_id_to_name), current)
+
+    def test_range_items(self):
+        """There are Javascript clients, which are limited to Number.MAX_SAFE_INTEGER due to 64bit float precision."""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                for item_id in world_type.item_id_to_name:
+                    self.assertLess(item_id, 2**53)
+
+    def test_range_locations(self):
+        """There are Javascript clients, which are limited to Number.MAX_SAFE_INTEGER due to 64bit float precision."""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                for location_id in world_type.location_id_to_name:
+                    self.assertLess(location_id, 2**53)
+
+    def test_reserved_items(self):
+        """negative item IDs are reserved to the special "Archipelago" world."""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                if gamename == "Archipelago":
+                    for item_id in world_type.item_id_to_name:
+                        self.assertLess(item_id, 0)
+                else:
+                    for item_id in world_type.item_id_to_name:
+                        self.assertGreater(item_id, 0)
+
+    def test_reserved_locations(self):
+        """negative location IDs are reserved to the special "Archipelago" world."""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                if gamename == "Archipelago":
+                    for location_id in world_type.location_id_to_name:
+                        self.assertLess(location_id, 0)
+                else:
+                    for location_id in world_type.location_id_to_name:
+                        self.assertGreater(location_id, 0)
+
+    def test_duplicate_item_ids(self):
+        """Test that a game doesn't have item id overlap within its own datapackage"""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                self.assertEqual(len(world_type.item_id_to_name), len(world_type.item_name_to_id))
+
+    def test_duplicate_location_ids(self):
+        """Test that a game doesn't have location id overlap within its own datapackage"""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                self.assertEqual(len(world_type.location_id_to_name), len(world_type.location_name_to_id))
+
+    def test_postgen_datapackage(self):
+        """Generates a solo multiworld and checks that the datapackage is still valid"""
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                multiworld = setup_solo_multiworld(world_type)
+                distribute_items_restrictive(multiworld)
+                call_all(multiworld, "post_fill")
+                datapackage = world_type.get_data_package_data()
+                for item_group, item_names in datapackage["item_name_groups"].items():
+                    self.assertIsInstance(item_group, str,
+                                          f"item_name_group names should be strings: {item_group}")
+                    for item_name in item_names:
+                        self.assertIsInstance(item_name, str,
+                                              f"{item_name}, in group {item_group} is not a string")
+                for loc_group, loc_names in datapackage["location_name_groups"].items():
+                    self.assertIsInstance(loc_group, str,
+                                          f"location_name_group names should be strings: {loc_group}")
+                    for loc_name in loc_names:
+                        self.assertIsInstance(loc_name, str,
+                                              f"{loc_name}, in group {loc_group} is not a string")
+                for item_name, item_id in datapackage["item_name_to_id"].items():
+                    self.assertIsInstance(item_name, str,
+                                          f"{item_name} is not a valid item name for item_name_to_id")
+                    self.assertIsInstance(item_id, int,
+                                          f"{item_id} for {item_name} should be an int")
+                for loc_name, loc_id in datapackage["location_name_to_id"].items():
+                    self.assertIsInstance(loc_name, str,
+                                          f"{loc_name} is not a valid item name for location_name_to_id")
+                    self.assertIsInstance(loc_id, int,
+                                          f"{loc_id} for {loc_name} should be an int")
diff --git a/test/general/TestImplemented.py b/test/general/test_implemented.py
similarity index 57%
rename from test/general/TestImplemented.py
rename to test/general/test_implemented.py
index 22c546eff1..624be71018 100644
--- a/test/general/TestImplemented.py
+++ b/test/general/test_implemented.py
@@ -1,11 +1,13 @@
 import unittest
-from worlds.AutoWorld import AutoWorldRegister
 
+from Fill import distribute_items_restrictive
+from NetUtils import encode
+from worlds.AutoWorld import AutoWorldRegister, call_all
 from . import setup_solo_multiworld
 
 
 class TestImplemented(unittest.TestCase):
-    def testCompletionCondition(self):
+    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"}:
@@ -13,7 +15,7 @@ class TestImplemented(unittest.TestCase):
                     multiworld = setup_solo_multiworld(world_type)
                     self.assertFalse(multiworld.completion_condition[1](multiworld.state))
 
-    def testEntranceParents(self):
+    def test_entrance_parents(self):
         """Tests that the parents of created Entrances match the exiting Region."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             if not world_type.hidden:
@@ -23,7 +25,7 @@ class TestImplemented(unittest.TestCase):
                         for exit in region.exits:
                             self.assertEqual(exit.parent_region, region)
 
-    def testStageMethods(self):
+    def test_stage_methods(self):
         """Tests that worlds don't try to implement certain steps that are only ever called as stage."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             if not world_type.hidden:
@@ -31,3 +33,17 @@ class TestImplemented(unittest.TestCase):
                     for method in ("assert_generate",):
                         self.assertFalse(hasattr(world_type, method),
                                          f"{method} must be implemented as a @classmethod named stage_{method}.")
+
+    def test_slot_data(self):
+        """Tests that if a world creates slot data, it's json serializable."""
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            # has an await for generate_output which isn't being called
+            if game_name in {"Ocarina of Time", "Zillion"}:
+                continue
+            multiworld = setup_solo_multiworld(world_type)
+            with self.subTest(game=game_name, seed=multiworld.seed):
+                distribute_items_restrictive(multiworld)
+                call_all(multiworld, "post_fill")
+                for key, data in multiworld.worlds[1].fill_slot_data().items():
+                    self.assertIsInstance(key, str, "keys in slot data must be a string")
+                    self.assertIsInstance(encode(data), str, f"object {type(data).__name__} not serializable.")
diff --git a/test/general/TestItems.py b/test/general/test_items.py
similarity index 75%
rename from test/general/TestItems.py
rename to test/general/test_items.py
index 95eb8d28d9..2d8775d535 100644
--- a/test/general/TestItems.py
+++ b/test/general/test_items.py
@@ -4,7 +4,8 @@ from . import setup_solo_multiworld
 
 
 class TestBase(unittest.TestCase):
-    def testCreateItem(self):
+    def test_create_item(self):
+        """Test that a world can successfully create all items in its datapackage"""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             proxy_world = world_type(None, 0)  # this is identical to MultiServer.py creating worlds
             for item_name in world_type.item_name_to_id:
@@ -12,7 +13,7 @@ class TestBase(unittest.TestCase):
                     item = proxy_world.create_item(item_name)
                     self.assertEqual(item.name, item_name)
 
-    def testItemNameGroupHasValidItem(self):
+    def test_item_name_group_has_valid_item(self):
         """Test that all item name groups contain valid items. """
         # This cannot test for Event names that you may have declared for logic, only sendable Items.
         # In such a case, you can add your entries to this Exclusion dict. Game Name -> Group Names
@@ -33,7 +34,7 @@ class TestBase(unittest.TestCase):
                             for item in items:
                                 self.assertIn(item, world_type.item_name_to_id)
 
-    def testItemNameGroupConflict(self):
+    def test_item_name_group_conflict(self):
         """Test that all item name groups aren't also item names."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest(game_name, game_name=game_name):
@@ -41,7 +42,8 @@ class TestBase(unittest.TestCase):
                     with self.subTest(group_name, group_name=group_name):
                         self.assertNotIn(group_name, world_type.item_name_to_id)
 
-    def testItemCountGreaterEqualLocations(self):
+    def test_item_count_greater_equal_locations(self):
+        """Test that by the pre_fill step under default settings, each game submits items >= locations"""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game=game_name):
                 multiworld = setup_solo_multiworld(world_type)
@@ -58,3 +60,12 @@ class TestBase(unittest.TestCase):
                 multiworld = setup_solo_multiworld(world_type)
                 for item in multiworld.itempool:
                     self.assertIn(item.name, world_type.item_name_to_id)
+
+    def test_item_descriptions_have_valid_names(self):
+        """Ensure all item descriptions match an item name or item group name"""
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            valid_names = world_type.item_names.union(world_type.item_name_groups)
+            for name in world_type.item_descriptions:
+                with self.subTest("Name should be valid", game=game_name, item=name):
+                    self.assertIn(name, valid_names,
+                                  "All item descriptions must match defined item names")
diff --git a/test/general/TestLocations.py b/test/general/test_locations.py
similarity index 83%
rename from test/general/TestLocations.py
rename to test/general/test_locations.py
index e77e7a6332..725b48e62f 100644
--- a/test/general/TestLocations.py
+++ b/test/general/test_locations.py
@@ -5,7 +5,7 @@ from . import setup_solo_multiworld
 
 
 class TestBase(unittest.TestCase):
-    def testCreateDuplicateLocations(self):
+    def test_create_duplicate_locations(self):
         """Tests that no two Locations share a name or ID."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             multiworld = setup_solo_multiworld(world_type)
@@ -20,7 +20,7 @@ class TestBase(unittest.TestCase):
                 self.assertLessEqual(locations.most_common(1)[0][1], 1,
                                      f"{world_type.game} has duplicate of location ID {locations.most_common(1)}")
 
-    def testLocationsInDatapackage(self):
+    def test_locations_in_datapackage(self):
         """Tests that created locations not filled before fill starts exist in the datapackage."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game_name=game_name):
@@ -30,13 +30,12 @@ class TestBase(unittest.TestCase):
                     self.assertIn(location.name, world_type.location_name_to_id)
                     self.assertEqual(location.address, world_type.location_name_to_id[location.name])
 
-    def testLocationCreationSteps(self):
+    def test_location_creation_steps(self):
         """Tests that Regions and Locations aren't created after `create_items`."""
         gen_steps = ("generate_early", "create_regions", "create_items")
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game_name=game_name):
                 multiworld = setup_solo_multiworld(world_type, gen_steps)
-                multiworld._recache()
                 region_count = len(multiworld.get_regions())
                 location_count = len(multiworld.get_locations())
 
@@ -46,21 +45,19 @@ class TestBase(unittest.TestCase):
                 self.assertEqual(location_count, len(multiworld.get_locations()),
                                  f"{game_name} modified locations count during rule creation")
 
-                multiworld._recache()
                 call_all(multiworld, "generate_basic")
                 self.assertEqual(region_count, len(multiworld.get_regions()),
                                  f"{game_name} modified region count during generate_basic")
                 self.assertGreaterEqual(location_count, len(multiworld.get_locations()),
                                         f"{game_name} modified locations count during generate_basic")
 
-                multiworld._recache()
                 call_all(multiworld, "pre_fill")
                 self.assertEqual(region_count, len(multiworld.get_regions()),
                                  f"{game_name} modified region count during pre_fill")
                 self.assertGreaterEqual(location_count, len(multiworld.get_locations()),
                                         f"{game_name} modified locations count during pre_fill")
     
-    def testLocationGroup(self):
+    def test_location_group(self):
         """Test that all location name groups contain valid locations and don't share names."""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest(game_name, game_name=game_name):
@@ -69,3 +66,12 @@ class TestBase(unittest.TestCase):
                         for location in locations:
                             self.assertIn(location, world_type.location_name_to_id)
                         self.assertNotIn(group_name, world_type.location_name_to_id)
+
+    def test_location_descriptions_have_valid_names(self):
+        """Ensure all location descriptions match a location name or location group name"""
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            valid_names = world_type.location_names.union(world_type.location_name_groups)
+            for name in world_type.location_descriptions:
+                with self.subTest("Name should be valid", game=game_name, location=name):
+                    self.assertIn(name, valid_names,
+                                  "All location descriptions must match defined location names")
diff --git a/test/general/test_memory.py b/test/general/test_memory.py
new file mode 100644
index 0000000000..e352b9e875
--- /dev/null
+++ b/test/general/test_memory.py
@@ -0,0 +1,16 @@
+import unittest
+
+from worlds.AutoWorld import AutoWorldRegister
+from . import setup_solo_multiworld
+
+
+class TestWorldMemory(unittest.TestCase):
+    def test_leak(self):
+        """Tests that worlds don't leak references to MultiWorld or themselves with default options."""
+        import gc
+        import weakref
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest("Game", game_name=game_name):
+                weak = weakref.ref(setup_solo_multiworld(world_type))
+                gc.collect()
+                self.assertFalse(weak(), "World leaked a reference")
diff --git a/test/general/TestNames.py b/test/general/test_names.py
similarity index 92%
rename from test/general/TestNames.py
rename to test/general/test_names.py
index 6dae53240d..7be76eed4b 100644
--- a/test/general/TestNames.py
+++ b/test/general/test_names.py
@@ -3,7 +3,7 @@ from worlds.AutoWorld import AutoWorldRegister
 
 
 class TestNames(unittest.TestCase):
-    def testItemNamesFormat(self):
+    def test_item_names_format(self):
         """Item names must not be all numeric in order to differentiate between ID and name in !hint"""
         for gamename, world_type in AutoWorldRegister.world_types.items():
             with self.subTest(game=gamename):
@@ -11,7 +11,7 @@ class TestNames(unittest.TestCase):
                     self.assertFalse(item_name.isnumeric(),
                                      f"Item name \"{item_name}\" is invalid. It must not be numeric.")
 
-    def testLocationNameFormat(self):
+    def test_location_name_format(self):
         """Location names must not be all numeric in order to differentiate between ID and name in !hint_location"""
         for gamename, world_type in AutoWorldRegister.world_types.items():
             with self.subTest(game=gamename):
diff --git a/test/general/TestOptions.py b/test/general/test_options.py
similarity index 61%
rename from test/general/TestOptions.py
rename to test/general/test_options.py
index b7058183e0..e1136f93c9 100644
--- a/test/general/TestOptions.py
+++ b/test/general/test_options.py
@@ -3,9 +3,10 @@ from worlds.AutoWorld import AutoWorldRegister
 
 
 class TestOptions(unittest.TestCase):
-    def testOptionsHaveDocString(self):
+    def test_options_have_doc_string(self):
+        """Test that submitted options have their own specified docstring"""
         for gamename, world_type in AutoWorldRegister.world_types.items():
             if not world_type.hidden:
-                for option_key, option in world_type.option_definitions.items():
+                for option_key, option in world_type.options_dataclass.type_hints.items():
                     with self.subTest(game=gamename, option=option_key):
                         self.assertTrue(option.__doc__)
diff --git a/test/general/TestReachability.py b/test/general/test_reachability.py
similarity index 91%
rename from test/general/TestReachability.py
rename to test/general/test_reachability.py
index dd786b8352..828912ee35 100644
--- a/test/general/TestReachability.py
+++ b/test/general/test_reachability.py
@@ -31,7 +31,8 @@ class TestBase(unittest.TestCase):
         }
     }
 
-    def testDefaultAllStateCanReachEverything(self):
+    def test_default_all_state_can_reach_everything(self):
+        """Ensure all state can reach everything and complete the game with the defined options"""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             unreachable_regions = self.default_settings_unreachable_regions.get(game_name, set())
             with self.subTest("Game", game=game_name):
@@ -54,7 +55,8 @@ class TestBase(unittest.TestCase):
                 with self.subTest("Completion Condition"):
                     self.assertTrue(world.can_beat_game(state))
 
-    def testDefaultEmptyStateCanReachSomething(self):
+    def test_default_empty_state_can_reach_something(self):
+        """Ensure empty state can reach at least one location with the defined options"""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game=game_name):
                 world = setup_solo_multiworld(world_type)
diff --git a/test/netutils/TestLocationStore.py b/test/netutils/test_location_store.py
similarity index 100%
rename from test/netutils/TestLocationStore.py
rename to test/netutils/test_location_store.py
diff --git a/test/programs/data/OnePlayer/test.yaml b/test/programs/data/one_player/test.yaml
similarity index 100%
rename from test/programs/data/OnePlayer/test.yaml
rename to test/programs/data/one_player/test.yaml
diff --git a/test/programs/TestGenerate.py b/test/programs/test_generate.py
similarity index 96%
rename from test/programs/TestGenerate.py
rename to test/programs/test_generate.py
index d04e1f2c5b..887a417ec9 100644
--- a/test/programs/TestGenerate.py
+++ b/test/programs/test_generate.py
@@ -1,13 +1,13 @@
 # Tests for Generate.py (ArchipelagoGenerate.exe)
 
 import unittest
+import os
+import os.path
 import sys
+
 from pathlib import Path
 from tempfile import TemporaryDirectory
-import os.path
-import os
-import ModuleUpdate
-ModuleUpdate.update_ran = True  # don't upgrade
+
 import Generate
 
 
@@ -16,7 +16,7 @@ class TestGenerateMain(unittest.TestCase):
 
     generate_dir = Path(Generate.__file__).parent
     run_dir = generate_dir / "test"  # reproducible cwd that's neither __file__ nor Generate.__file__
-    abs_input_dir = Path(__file__).parent / 'data' / 'OnePlayer'
+    abs_input_dir = Path(__file__).parent / 'data' / 'one_player'
     rel_input_dir = abs_input_dir.relative_to(run_dir)  # directly supplied relative paths are relative to cwd
     yaml_input_dir = abs_input_dir.relative_to(generate_dir)  # yaml paths are relative to user_path
 
diff --git a/test/programs/TestMultiServer.py b/test/programs/test_multi_server.py
similarity index 100%
rename from test/programs/TestMultiServer.py
rename to test/programs/test_multi_server.py
diff --git a/test/utils/test_caches.py b/test/utils/test_caches.py
new file mode 100644
index 0000000000..fc681611f0
--- /dev/null
+++ b/test/utils/test_caches.py
@@ -0,0 +1,66 @@
+# Tests for caches in Utils.py
+
+import unittest
+from typing import Any
+
+from Utils import cache_argsless, cache_self1
+
+
+class TestCacheArgless(unittest.TestCase):
+    def test_cache(self) -> None:
+        @cache_argsless
+        def func_argless() -> object:
+            return object()
+
+        self.assertTrue(func_argless() is func_argless())
+
+    if __debug__:  # assert only available with __debug__
+        def test_invalid_decorator(self) -> None:
+            with self.assertRaises(Exception):
+                @cache_argsless  # type: ignore[arg-type]
+                def func_with_arg(_: Any) -> None:
+                    pass
+
+
+class TestCacheSelf1(unittest.TestCase):
+    def test_cache(self) -> None:
+        class Cls:
+            @cache_self1
+            def func(self, _: Any) -> object:
+                return object()
+
+        o1 = Cls()
+        o2 = Cls()
+        self.assertTrue(o1.func(1) is o1.func(1))
+        self.assertFalse(o1.func(1) is o1.func(2))
+        self.assertFalse(o1.func(1) is o2.func(1))
+
+    def test_gc(self) -> None:
+        # verify that we don't keep a global reference
+        import gc
+        import weakref
+
+        class Cls:
+            @cache_self1
+            def func(self, _: Any) -> object:
+                return object()
+
+        o = Cls()
+        _ = o.func(o)  # keep a hard ref to the result
+        r = weakref.ref(o)  # keep weak ref to the cache
+        del o  # remove hard ref to the cache
+        gc.collect()
+        self.assertFalse(r())  # weak ref should be dead now
+
+    if __debug__:  # assert only available with __debug__
+        def test_no_self(self) -> None:
+            with self.assertRaises(Exception):
+                @cache_self1  # type: ignore[arg-type]
+                def func() -> Any:
+                    pass
+
+        def test_too_many_args(self) -> None:
+            with self.assertRaises(Exception):
+                @cache_self1  # type: ignore[arg-type]
+                def func(_1: Any, _2: Any, _3: Any) -> Any:
+                    pass
diff --git a/test/utils/TestSIPrefix.py b/test/utils/test_si_prefix.py
similarity index 100%
rename from test/utils/TestSIPrefix.py
rename to test/utils/test_si_prefix.py
diff --git a/test/webhost/TestAPIGenerate.py b/test/webhost/test_api_generate.py
similarity index 93%
rename from test/webhost/TestAPIGenerate.py
rename to test/webhost/test_api_generate.py
index 8ea78f27f9..b8bdcb38c7 100644
--- a/test/webhost/TestAPIGenerate.py
+++ b/test/webhost/test_api_generate.py
@@ -19,11 +19,11 @@ class TestDocs(unittest.TestCase):
 
         cls.client = app.test_client()
 
-    def testCorrectErrorEmptyRequest(self):
+    def test_correct_error_empty_request(self):
         response = self.client.post("/api/generate")
         self.assertIn("No options found. Expected file attachment or json weights.", response.text)
 
-    def testGenerationQueued(self):
+    def test_generation_queued(self):
         options = {
             "Tester1":
                 {
diff --git a/test/webhost/TestDocs.py b/test/webhost/test_docs.py
similarity index 96%
rename from test/webhost/TestDocs.py
rename to test/webhost/test_docs.py
index f6ede1543e..68aba05f9d 100644
--- a/test/webhost/TestDocs.py
+++ b/test/webhost/test_docs.py
@@ -11,7 +11,7 @@ class TestDocs(unittest.TestCase):
     def setUpClass(cls) -> None:
         cls.tutorials_data = WebHost.create_ordered_tutorials_file()
 
-    def testHasTutorial(self):
+    def test_has_tutorial(self):
         games_with_tutorial = set(entry["gameTitle"] for entry in self.tutorials_data)
         for game_name, world_type in AutoWorldRegister.world_types.items():
             if not world_type.hidden:
@@ -27,7 +27,7 @@ class TestDocs(unittest.TestCase):
                             self.fail(f"{game_name} has no setup tutorial. "
                                       f"Games with Tutorial: {games_with_tutorial}")
 
-    def testHasGameInfo(self):
+    def test_has_game_info(self):
         for game_name, world_type in AutoWorldRegister.world_types.items():
             if not world_type.hidden:
                 target_path = Utils.local_path("WebHostLib", "static", "generated", "docs", game_name)
diff --git a/test/webhost/TestFileGeneration.py b/test/webhost/test_file_generation.py
similarity index 96%
rename from test/webhost/TestFileGeneration.py
rename to test/webhost/test_file_generation.py
index f01b70e14f..059f6b49a1 100644
--- a/test/webhost/TestFileGeneration.py
+++ b/test/webhost/test_file_generation.py
@@ -13,7 +13,7 @@ class TestFileGeneration(unittest.TestCase):
         # should not create the folder *here*
         cls.incorrect_path = os.path.join(os.path.split(os.path.dirname(__file__))[0], "WebHostLib")
 
-    def testOptions(self):
+    def test_options(self):
         from WebHostLib.options import create as create_options_files
         create_options_files()
         target = os.path.join(self.correct_path, "static", "generated", "configs")
@@ -30,7 +30,7 @@ class TestFileGeneration(unittest.TestCase):
                         for value in roll_options({file.name: f.read()})[0].values():
                             self.assertTrue(value is True, f"Default Options for template {file.name} cannot be run.")
 
-    def testTutorial(self):
+    def test_tutorial(self):
         WebHost.create_ordered_tutorials_file()
         self.assertTrue(os.path.exists(os.path.join(self.correct_path, "static", "generated", "tutorials.json")))
         self.assertFalse(os.path.exists(os.path.join(self.incorrect_path, "static", "generated", "tutorials.json")))
diff --git a/test/webhost/test_option_presets.py b/test/webhost/test_option_presets.py
new file mode 100644
index 0000000000..0c88b6c2ee
--- /dev/null
+++ b/test/webhost/test_option_presets.py
@@ -0,0 +1,63 @@
+import unittest
+
+from worlds import AutoWorldRegister
+from Options import Choice, NamedRange, Toggle, Range
+
+
+class TestOptionPresets(unittest.TestCase):
+    def test_option_presets_have_valid_options(self):
+        """Test that all predefined option presets are valid options."""
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            presets = world_type.web.options_presets
+            for preset_name, preset in presets.items():
+                for option_name, option_value in preset.items():
+                    with self.subTest(game=game_name, preset=preset_name, option=option_name):
+                        try:
+                            option = world_type.options_dataclass.type_hints[option_name].from_any(option_value)
+                            supported_types = [Choice, Toggle, Range, NamedRange]
+                            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}' "
+                                          f"is not a supported type for webhost. "
+                                          f"Supported types: {', '.join([t.__name__ for t in supported_types])}")
+                        except AssertionError as ex:
+                            self.fail(f"Option '{option_name}': '{option_value}' in preset '{preset_name}' for game "
+                                      f"'{game_name}' is not valid. Error: {ex}")
+                        except KeyError as ex:
+                            self.fail(f"Option '{option_name}' in preset '{preset_name}' for game '{game_name}' is "
+                                      f"not a defined option. Error: {ex}")
+
+    def test_option_preset_values_are_explicitly_defined(self):
+        """Test that option preset values are not a special flavor of 'random' or use from_text to resolve another
+        value.
+        """
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            presets = world_type.web.options_presets
+            for preset_name, preset in presets.items():
+                for option_name, option_value in preset.items():
+                    with self.subTest(game=game_name, preset=preset_name, option=option_name):
+                        # Check for non-standard random values.
+                        self.assertFalse(
+                            str(option_value).startswith("random-"),
+                            f"'{option_name}': '{option_value}' in preset '{preset_name}' for game '{game_name}' "
+                            f"is not supported for webhost. Special random values are not supported for presets."
+                        )
+
+                        option = world_type.options_dataclass.type_hints[option_name].from_any(option_value)
+
+                        # Check for from_text resolving to a different value. ("random" is allowed though.)
+                        if option_value != "random" and isinstance(option_value, str):
+                            # Allow special named values for NamedRange option presets.
+                            if isinstance(option, NamedRange):
+                                self.assertTrue(
+                                    option_value in option.special_range_names,
+                                    f"Invalid preset '{option_name}': '{option_value}' in preset '{preset_name}' "
+                                    f"for game '{game_name}'. Expected {option.special_range_names.keys()} or "
+                                    f"{option.range_start}-{option.range_end}."
+                                )
+                            else:
+                                self.assertTrue(
+                                    option.name_lookup.get(option.value, None) == option_value,
+                                    f"'{option_name}': '{option_value}' in preset '{preset_name}' for game "
+                                    f"'{game_name}' is not supported for webhost. Values must not be resolved to a "
+                                    f"different option via option.from_text (or an alias)."
+                                )
diff --git a/test/worlds/__init__.py b/test/worlds/__init__.py
index d1817cc674..cf396111bf 100644
--- a/test/worlds/__init__.py
+++ b/test/worlds/__init__.py
@@ -1,7 +1,7 @@
 def load_tests(loader, standard_tests, pattern):
     import os
     import unittest
-    from ..TestBase import file_path
+    from .. import file_path
     from worlds.AutoWorld import AutoWorldRegister
 
     suite = unittest.TestSuite()
diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py
index 217269aa99..f56c39f690 100644
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -3,12 +3,15 @@ from __future__ import annotations
 import hashlib
 import logging
 import pathlib
+import re
 import sys
-from typing import Any, Callable, ClassVar, Dict, FrozenSet, List, Optional, Set, TYPE_CHECKING, TextIO, Tuple, Type, \
+import time
+from dataclasses import make_dataclass
+from typing import Any, Callable, ClassVar, Dict, Set, Tuple, FrozenSet, List, Optional, TYPE_CHECKING, TextIO, Type, \
     Union
 
+from Options import PerGameCommonOptions
 from BaseClasses import CollectionState
-from Options import AssembleOptions
 
 if TYPE_CHECKING:
     import random
@@ -16,6 +19,8 @@ if TYPE_CHECKING:
     from . import GamesPackage
     from settings import Group
 
+perf_logger = logging.getLogger("performance")
+
 
 class AutoWorldRegister(type):
     world_types: Dict[str, Type[World]] = {}
@@ -47,11 +52,17 @@ class AutoWorldRegister(type):
         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["item_descriptions"] = {name: _normalize_description(description) for name, description
+                                    in dct.get("item_descriptions", {}).items()}
+        dct["item_descriptions"]["Everything"] = "All items in the entire game."
         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", {})))
+        dct["location_descriptions"] = {name: _normalize_description(description) for name, description
+                                    in dct.get("location_descriptions", {}).items()}
+        dct["location_descriptions"]["Everywhere"] = "All locations in the entire game."
 
         # move away from get_required_client_version function
         if "game" in dct:
@@ -63,6 +74,16 @@ class AutoWorldRegister(type):
                     dct["required_client_version"] = max(dct["required_client_version"],
                                                          base.__dict__["required_client_version"])
 
+        # create missing options_dataclass from legacy option_definitions
+        # TODO - remove this once all worlds use options dataclasses
+        if "options_dataclass" not in dct and "option_definitions" in dct:
+            # TODO - switch to deprecate after a version
+            if __debug__:
+                from warnings import warn
+                warn("Assigning options through option_definitions is now deprecated. Use options_dataclass instead.")
+            dct["options_dataclass"] = make_dataclass(f"{name}Options", dct["option_definitions"].items(),
+                                                      bases=(PerGameCommonOptions,))
+
         # construct class
         new_class = super().__new__(mcs, name, bases, dct)
         if "game" in dct:
@@ -96,10 +117,24 @@ class AutoLogicRegister(type):
         return new_class
 
 
+def _timed_call(method: Callable[..., Any], *args: Any,
+                multiworld: Optional["MultiWorld"] = None, player: Optional[int] = None) -> Any:
+    start = time.perf_counter()
+    ret = method(*args)
+    taken = time.perf_counter() - start
+    if taken > 1.0:
+        if player and multiworld:
+            perf_logger.info(f"Took {taken:.4f} seconds in {method.__qualname__} for player {player}, "
+                             f"named {multiworld.player_name[player]}.")
+        else:
+            perf_logger.info(f"Took {taken:.4f} seconds in {method.__qualname__}.")
+    return ret
+
+
 def call_single(multiworld: "MultiWorld", method_name: str, player: int, *args: Any) -> Any:
     method = getattr(multiworld.worlds[player], method_name)
     try:
-        ret = method(*args)
+        ret = _timed_call(method, *args, multiworld=multiworld, player=player)
     except Exception as e:
         message = f"Exception in {method} for player {player}, named {multiworld.player_name[player]}."
         if sys.version_info >= (3, 11, 0):
@@ -125,24 +160,21 @@ def call_all(multiworld: "MultiWorld", method_name: str, *args: Any) -> None:
                         f"Duplicate item reference of \"{item.name}\" in \"{multiworld.worlds[player].game}\" "
                         f"of player \"{multiworld.player_name[player]}\". Please make a copy instead.")
 
-    for world_type in sorted(world_types, key=lambda world: world.__name__):
-        stage_callable = getattr(world_type, f"stage_{method_name}", None)
-        if stage_callable:
-            stage_callable(multiworld, *args)
+    call_stage(multiworld, method_name, *args)
 
 
 def call_stage(multiworld: "MultiWorld", method_name: str, *args: Any) -> None:
     world_types = {multiworld.worlds[player].__class__ for player in multiworld.player_ids}
-    for world_type in world_types:
+    for world_type in sorted(world_types, key=lambda world: world.__name__):
         stage_callable = getattr(world_type, f"stage_{method_name}", None)
         if stage_callable:
-            stage_callable(multiworld, *args)
+            _timed_call(stage_callable, multiworld, *args)
 
 
 class WebWorld:
     """Webhost integration"""
 
-    settings_page: Union[bool, str] = True
+    options_page: Union[bool, str] = True
     """display a settings page. Can be a link to a specific page or external tool."""
 
     game_info_languages: List[str] = ['en']
@@ -158,13 +190,19 @@ class WebWorld:
     bug_report_page: Optional[str]
     """display a link to a bug report page, most likely a link to a GitHub issue page."""
 
+    options_presets: Dict[str, Dict[str, Any]] = {}
+    """A dictionary containing a collection of developer-defined game option presets."""
+
 
 class World(metaclass=AutoWorldRegister):
     """A World object encompasses a game's Items, Locations, Rules and additional data or functionality required.
     A Game should have its own subclass of World in which it defines the required data structures."""
 
-    option_definitions: ClassVar[Dict[str, AssembleOptions]] = {}
+    options_dataclass: ClassVar[Type[PerGameCommonOptions]] = PerGameCommonOptions
     """link your Options mapping"""
+    options: PerGameCommonOptions
+    """resulting options for the player of this world"""
+
     game: ClassVar[str]
     """name the game"""
     topology_present: ClassVar[bool] = False
@@ -181,9 +219,23 @@ class World(metaclass=AutoWorldRegister):
     item_name_groups: ClassVar[Dict[str, Set[str]]] = {}
     """maps item group names to sets of items. Example: {"Weapons": {"Sword", "Bow"}}"""
 
+    item_descriptions: ClassVar[Dict[str, str]] = {}
+    """An optional map from item names (or item group names) to brief descriptions for users.
+
+    Individual newlines and indentation will be collapsed into spaces before these descriptions are
+    displayed. This may cover only a subset of items.
+    """
+
     location_name_groups: ClassVar[Dict[str, Set[str]]] = {}
     """maps location group names to sets of locations. Example: {"Sewer": {"Sewer Key Drop 1", "Sewer Key Drop 2"}}"""
 
+    location_descriptions: ClassVar[Dict[str, str]] = {}
+    """An optional map from location names (or location group names) to brief descriptions for users.
+
+    Individual newlines and indentation will be collapsed into spaces before these descriptions are
+    displayed. This may cover only a subset of locations.
+    """
+
     data_version: ClassVar[int] = 0
     """
     Increment this every time something in your world's names/id mappings changes.
@@ -358,6 +410,19 @@ class World(metaclass=AutoWorldRegister):
         logging.warning(f"World {self} is generating a filler item without custom filler pool.")
         return self.multiworld.random.choice(tuple(self.item_name_to_id.keys()))
 
+    @classmethod
+    def create_group(cls, multiworld: "MultiWorld", new_player_id: int, players: Set[int]) -> World:
+        """Creates a group, which is an instance of World that is responsible for multiple others.
+        An example case is ItemLinks creating these."""
+        # TODO remove loop when worlds use options dataclass
+        for option_key, option in cls.options_dataclass.type_hints.items():
+            getattr(multiworld, option_key)[new_player_id] = option(option.default)
+        group = cls(multiworld, new_player_id)
+        group.options = cls.options_dataclass(**{option_key: option(option.default)
+                                                 for option_key, option in cls.options_dataclass.type_hints.items()})
+
+        return group
+
     # decent place to implement progressive items, in most cases can stay as-is
     def collect_item(self, state: "CollectionState", item: "Item", remove: bool = False) -> Optional[str]:
         """Collect an item name into state. For speed reasons items that aren't logically useful get skipped.
@@ -377,16 +442,16 @@ class World(metaclass=AutoWorldRegister):
     def collect(self, state: "CollectionState", item: "Item") -> bool:
         name = self.collect_item(state, item)
         if name:
-            state.prog_items[name, self.player] += 1
+            state.prog_items[self.player][name] += 1
             return True
         return False
 
     def remove(self, state: "CollectionState", item: "Item") -> bool:
         name = self.collect_item(state, item, True)
         if name:
-            state.prog_items[name, self.player] -= 1
-            if state.prog_items[name, self.player] < 1:
-                del (state.prog_items[name, self.player])
+            state.prog_items[self.player][name] -= 1
+            if state.prog_items[self.player][name] < 1:
+                del (state.prog_items[self.player][name])
             return True
         return False
 
@@ -425,3 +490,17 @@ def data_package_checksum(data: "GamesPackage") -> str:
     assert sorted(data) == list(data), "Data not ordered"
     from NetUtils import encode
     return hashlib.sha1(encode(data).encode()).hexdigest()
+
+
+def _normalize_description(description):
+    """Normalizes a description in item_descriptions or location_descriptions.
+
+    This allows authors to write descritions with nice indentation and line lengths in their world
+    definitions without having it affect the rendered format.
+    """
+    # First, collapse the whitespace around newlines and the ends of the description.
+    description = re.sub(r' *\n *', '\n', description.strip())
+    # Next, condense individual newlines into spaces.
+    description = re.sub(r'(?<!\n)\n(?!\n)', ' ', description)
+    return description
+
diff --git a/worlds/Files.py b/worlds/Files.py
index ac1acbf322..52d3c7da1d 100644
--- a/worlds/Files.py
+++ b/worlds/Files.py
@@ -2,11 +2,18 @@ from __future__ import annotations
 
 import json
 import zipfile
+import os
+import threading
 
 from typing import ClassVar, Dict, Tuple, Any, Optional, Union, BinaryIO
 
 import bsdiff4
 
+semaphore = threading.Semaphore(os.cpu_count() or 4)
+
+del threading
+del os
+
 
 class AutoPatchRegister(type):
     patch_types: ClassVar[Dict[str, AutoPatchRegister]] = {}
@@ -57,11 +64,12 @@ class APContainer:
         zip_file = file if file else self.path
         if not zip_file:
             raise FileNotFoundError(f"Cannot write {self.__class__.__name__} due to no path provided.")
-        with zipfile.ZipFile(zip_file, "w", self.compression_method, True, self.compression_level) \
-                as zf:
-            if file:
-                self.path = zf.filename
-            self.write_contents(zf)
+        with semaphore:  # TODO: remove semaphore once generate_output has a thread limit
+            with zipfile.ZipFile(
+                    zip_file, "w", self.compression_method, True, self.compression_level) as zf:
+                if file:
+                    self.path = zf.filename
+                self.write_contents(zf)
 
     def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
         manifest = self.get_manifest()
diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index c3ae2b0495..03c89b75ff 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -101,8 +101,6 @@ components: List[Component] = [
     Component('OoT Adjuster', 'OoTAdjuster'),
     # FF1
     Component('FF1 Client', 'FF1Client'),
-    # Pokémon
-    Component('Pokemon Client', 'PokemonClient', file_identifier=SuffixIdentifier('.apred', '.apblue')),
     # TLoZ
     Component('Zelda 1 Client', 'Zelda1Client', file_identifier=SuffixIdentifier('.aptloz')),
     # ChecksFinder
@@ -114,8 +112,6 @@ components: List[Component] = [
     # Zillion
     Component('Zillion Client', 'ZillionClient',
               file_identifier=SuffixIdentifier('.apzl')),
-    # Kingdom Hearts 2
-    Component('KH2 Client', "KH2Client"),
 
     #MegaMan Battle Network 3
     Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3'))
diff --git a/worlds/__init__.py b/worlds/__init__.py
index c6208fa9a1..66c91639b9 100644
--- a/worlds/__init__.py
+++ b/worlds/__init__.py
@@ -1,53 +1,51 @@
 import importlib
 import os
 import sys
-import typing
 import warnings
 import zipimport
+from typing import Dict, List, NamedTuple, TypedDict
 
-folder = os.path.dirname(__file__)
+from Utils import local_path, user_path
+
+local_folder = os.path.dirname(__file__)
+user_folder = user_path("worlds") if user_path() != local_path() else None
 
 __all__ = {
-    "lookup_any_item_id_to_name",
-    "lookup_any_location_id_to_name",
     "network_data_package",
     "AutoWorldRegister",
     "world_sources",
-    "folder",
+    "local_folder",
+    "user_folder",
+    "GamesPackage",
+    "DataPackage",
 }
 
-if typing.TYPE_CHECKING:
-    from .AutoWorld import World
 
-
-class GamesData(typing.TypedDict):
-    item_name_groups: typing.Dict[str, typing.List[str]]
-    item_name_to_id: typing.Dict[str, int]
-    location_name_groups: typing.Dict[str, typing.List[str]]
-    location_name_to_id: typing.Dict[str, int]
-    version: int
-
-
-class GamesPackage(GamesData, total=False):
+class GamesPackage(TypedDict, total=False):
+    item_name_groups: Dict[str, List[str]]
+    item_name_to_id: Dict[str, int]
+    location_name_groups: Dict[str, List[str]]
+    location_name_to_id: Dict[str, int]
     checksum: str
+    version: int  # TODO: Remove support after per game data packages API change.
 
 
-class DataPackage(typing.TypedDict):
-    games: typing.Dict[str, GamesPackage]
+class DataPackage(TypedDict):
+    games: Dict[str, GamesPackage]
 
 
-class WorldSource(typing.NamedTuple):
+class WorldSource(NamedTuple):
     path: str  # typically relative path from this module
     is_zip: bool = False
     relative: bool = True  # relative to regular world import folder
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.path}, is_zip={self.is_zip}, relative={self.relative})"
 
     @property
     def resolved_path(self) -> str:
         if self.relative:
-            return os.path.join(folder, self.path)
+            return os.path.join(local_folder, self.path)
         return self.path
 
     def load(self) -> bool:
@@ -56,6 +54,7 @@ class WorldSource(typing.NamedTuple):
                 importer = zipimport.zipimporter(self.resolved_path)
                 if hasattr(importer, "find_spec"):  # new in Python 3.10
                     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)
                 else:  # TODO: remove with 3.8 support
                     mod = importer.load_module(os.path.basename(self.path).rsplit(".", 1)[0])
@@ -72,7 +71,7 @@ class WorldSource(typing.NamedTuple):
                 importlib.import_module(f".{self.path}", "worlds")
             return True
 
-        except Exception as e:
+        except Exception:
             # A single world failing can still mean enough is working for the user, log and carry on
             import traceback
             import io
@@ -86,40 +85,26 @@ class WorldSource(typing.NamedTuple):
 
 
 # find potential world containers, currently folders and zip-importable .apworld's
-world_sources: typing.List[WorldSource] = []
-file: os.DirEntry  # for me (Berserker) at least, PyCharm doesn't seem to infer the type correctly
-for file in os.scandir(folder):
-    # prevent loading of __pycache__ and allow _* for non-world folders, disable files/folders starting with "."
-    if not file.name.startswith(("_", ".")):
-        if file.is_dir():
-            world_sources.append(WorldSource(file.name))
-        elif file.is_file() and file.name.endswith(".apworld"):
-            world_sources.append(WorldSource(file.name, is_zip=True))
+world_sources: List[WorldSource] = []
+for folder in (folder for folder in (user_folder, local_folder) if folder):
+    relative = folder == local_folder
+    for entry in os.scandir(folder):
+        # prevent loading of __pycache__ and allow _* for non-world folders, disable files/folders starting with "."
+        if not entry.name.startswith(("_", ".")):
+            file_name = entry.name if relative else os.path.join(folder, entry.name)
+            if entry.is_dir():
+                world_sources.append(WorldSource(file_name, relative=relative))
+            elif entry.is_file() and entry.name.endswith(".apworld"):
+                world_sources.append(WorldSource(file_name, is_zip=True, relative=relative))
 
 # import all submodules to trigger AutoWorldRegister
 world_sources.sort()
 for world_source in world_sources:
     world_source.load()
 
-lookup_any_item_id_to_name = {}
-lookup_any_location_id_to_name = {}
-games: typing.Dict[str, GamesPackage] = {}
-
+# Build the data package for each game.
 from .AutoWorld import AutoWorldRegister
 
-# Build the data package for each game.
-for world_name, world in AutoWorldRegister.world_types.items():
-    games[world_name] = world.get_data_package_data()
-    lookup_any_item_id_to_name.update(world.item_id_to_name)
-    lookup_any_location_id_to_name.update(world.location_id_to_name)
-
 network_data_package: DataPackage = {
-    "games": games,
+    "games": {world_name: world.get_data_package_data() for world_name, world in AutoWorldRegister.world_types.items()},
 }
-
-# Set entire datapackage to version 0 if any of them are set to 0
-if any(not world.data_version for world in AutoWorldRegister.world_types.values()):
-    import logging
-
-    logging.warning(f"Datapackage is in custom mode. Custom Worlds: "
-                    f"{[world for world in AutoWorldRegister.world_types.values() if not world.data_version]}")
diff --git a/worlds/_bizhawk/__init__.py b/worlds/_bizhawk/__init__.py
new file mode 100644
index 0000000000..94a9ce1ddf
--- /dev/null
+++ b/worlds/_bizhawk/__init__.py
@@ -0,0 +1,326 @@
+"""
+A module for interacting with BizHawk through `connector_bizhawk_generic.lua`.
+
+Any mention of `domain` in this module refers to the names BizHawk gives to memory domains in its own lua api. They are
+naively passed to BizHawk without validation or modification.
+"""
+
+import asyncio
+import base64
+import enum
+import json
+import sys
+import typing
+
+
+BIZHAWK_SOCKET_PORT_RANGE_START = 43055
+BIZHAWK_SOCKET_PORT_RANGE_SIZE = 5
+
+
+class ConnectionStatus(enum.IntEnum):
+    NOT_CONNECTED = 1
+    TENTATIVE = 2
+    CONNECTED = 3
+
+
+class NotConnectedError(Exception):
+    """Raised when something tries to make a request to the connector script before a connection has been established"""
+    pass
+
+
+class RequestFailedError(Exception):
+    """Raised when the connector script did not respond to a request"""
+    pass
+
+
+class ConnectorError(Exception):
+    """Raised when the connector script encounters an error while processing a request"""
+    pass
+
+
+class SyncError(Exception):
+    """Raised when the connector script responded with a mismatched response type"""
+    pass
+
+
+class BizHawkContext:
+    streams: typing.Optional[typing.Tuple[asyncio.StreamReader, asyncio.StreamWriter]]
+    connection_status: ConnectionStatus
+    _lock: asyncio.Lock
+    _port: typing.Optional[int]
+
+    def __init__(self) -> None:
+        self.streams = None
+        self.connection_status = ConnectionStatus.NOT_CONNECTED
+        self._lock = asyncio.Lock()
+        self._port = None
+
+    async def _send_message(self, message: str):
+        async with self._lock:
+            if self.streams is None:
+                raise NotConnectedError("You tried to send a request before a connection to BizHawk was made")
+
+            try:
+                reader, writer = self.streams
+                writer.write(message.encode("utf-8") + b"\n")
+                await asyncio.wait_for(writer.drain(), timeout=5)
+
+                res = await asyncio.wait_for(reader.readline(), timeout=5)
+
+                if res == b"":
+                    writer.close()
+                    self.streams = None
+                    self.connection_status = ConnectionStatus.NOT_CONNECTED
+                    raise RequestFailedError("Connection closed")
+
+                if self.connection_status == ConnectionStatus.TENTATIVE:
+                    self.connection_status = ConnectionStatus.CONNECTED
+
+                return res.decode("utf-8")
+            except asyncio.TimeoutError as exc:
+                writer.close()
+                self.streams = None
+                self.connection_status = ConnectionStatus.NOT_CONNECTED
+                raise RequestFailedError("Connection timed out") from exc
+            except ConnectionResetError as exc:
+                writer.close()
+                self.streams = None
+                self.connection_status = ConnectionStatus.NOT_CONNECTED
+                raise RequestFailedError("Connection reset") from exc
+
+
+async def connect(ctx: BizHawkContext) -> bool:
+    """Attempts to establish a connection with a connector script. Returns True if successful."""
+    rotation_steps = 0 if ctx._port is None else ctx._port - BIZHAWK_SOCKET_PORT_RANGE_START
+    ports = [*range(BIZHAWK_SOCKET_PORT_RANGE_START, BIZHAWK_SOCKET_PORT_RANGE_START + BIZHAWK_SOCKET_PORT_RANGE_SIZE)]
+    ports = ports[rotation_steps:] + ports[:rotation_steps]
+
+    for port in ports:
+        try:
+            ctx.streams = await asyncio.open_connection("127.0.0.1", port)
+            ctx.connection_status = ConnectionStatus.TENTATIVE
+            ctx._port = port
+            return True
+        except (TimeoutError, ConnectionRefusedError):
+            continue
+    
+    # No ports worked
+    ctx.streams = None
+    ctx.connection_status = ConnectionStatus.NOT_CONNECTED
+    return False
+
+
+def disconnect(ctx: BizHawkContext) -> None:
+    """Closes the connection to the connector script."""
+    if ctx.streams is not None:
+        ctx.streams[1].close()
+        ctx.streams = None
+    ctx.connection_status = ConnectionStatus.NOT_CONNECTED
+
+
+async def get_script_version(ctx: BizHawkContext) -> int:
+    return int(await ctx._send_message("VERSION"))
+
+
+async def send_requests(ctx: BizHawkContext, req_list: typing.List[typing.Dict[str, typing.Any]]) -> typing.List[typing.Dict[str, typing.Any]]:
+    """Sends a list of requests to the BizHawk connector and returns their responses.
+
+    It's likely you want to use the wrapper functions instead of this."""
+    responses = json.loads(await ctx._send_message(json.dumps(req_list)))
+    errors: typing.List[ConnectorError] = []
+
+    for response in responses:
+        if response["type"] == "ERROR":
+            errors.append(ConnectorError(response["err"]))
+
+    if errors:
+        if sys.version_info >= (3, 11, 0):
+            raise ExceptionGroup("Connector script returned errors", errors)  # noqa
+        else:
+            raise errors[0]
+
+    return responses
+
+
+async def ping(ctx: BizHawkContext) -> None:
+    """Sends a PING request and receives a PONG response."""
+    res = (await send_requests(ctx, [{"type": "PING"}]))[0]
+
+    if res["type"] != "PONG":
+        raise SyncError(f"Expected response of type PONG but got {res['type']}")
+
+
+async def get_hash(ctx: BizHawkContext) -> str:
+    """Gets the system name for the currently loaded ROM"""
+    res = (await send_requests(ctx, [{"type": "HASH"}]))[0]
+
+    if res["type"] != "HASH_RESPONSE":
+        raise SyncError(f"Expected response of type HASH_RESPONSE but got {res['type']}")
+
+    return res["value"]
+
+
+async def get_system(ctx: BizHawkContext) -> str:
+    """Gets the system name for the currently loaded ROM"""
+    res = (await send_requests(ctx, [{"type": "SYSTEM"}]))[0]
+
+    if res["type"] != "SYSTEM_RESPONSE":
+        raise SyncError(f"Expected response of type SYSTEM_RESPONSE but got {res['type']}")
+
+    return res["value"]
+
+
+async def get_cores(ctx: BizHawkContext) -> typing.Dict[str, str]:
+    """Gets the preferred cores for systems with multiple cores. Only systems with multiple available cores have
+    entries."""
+    res = (await send_requests(ctx, [{"type": "PREFERRED_CORES"}]))[0]
+
+    if res["type"] != "PREFERRED_CORES_RESPONSE":
+        raise SyncError(f"Expected response of type PREFERRED_CORES_RESPONSE but got {res['type']}")
+
+    return res["value"]
+
+
+async def lock(ctx: BizHawkContext) -> None:
+    """Locks BizHawk in anticipation of receiving more requests this frame.
+
+    Consider using guarded reads and writes instead of locks if possible.
+
+    While locked, emulation will halt and the connector will block on incoming requests until an `UNLOCK` request is
+    sent. Remember to unlock when you're done, or the emulator will appear to freeze.
+
+    Sending multiple lock commands is the same as sending one."""
+    res = (await send_requests(ctx, [{"type": "LOCK"}]))[0]
+
+    if res["type"] != "LOCKED":
+        raise SyncError(f"Expected response of type LOCKED but got {res['type']}")
+
+
+async def unlock(ctx: BizHawkContext) -> None:
+    """Unlocks BizHawk to allow it to resume emulation. See `lock` for more info.
+
+    Sending multiple unlock commands is the same as sending one."""
+    res = (await send_requests(ctx, [{"type": "UNLOCK"}]))[0]
+
+    if res["type"] != "UNLOCKED":
+        raise SyncError(f"Expected response of type UNLOCKED but got {res['type']}")
+
+
+async def display_message(ctx: BizHawkContext, message: str) -> None:
+    """Displays the provided message in BizHawk's message queue."""
+    res = (await send_requests(ctx, [{"type": "DISPLAY_MESSAGE", "message": message}]))[0]
+
+    if res["type"] != "DISPLAY_MESSAGE_RESPONSE":
+        raise SyncError(f"Expected response of type DISPLAY_MESSAGE_RESPONSE but got {res['type']}")
+
+
+async def set_message_interval(ctx: BizHawkContext, value: float) -> None:
+    """Sets the minimum amount of time in seconds to wait between queued messages. The default value of 0 will allow one
+    new message to display per frame."""
+    res = (await send_requests(ctx, [{"type": "SET_MESSAGE_INTERVAL", "value": value}]))[0]
+
+    if res["type"] != "SET_MESSAGE_INTERVAL_RESPONSE":
+        raise SyncError(f"Expected response of type SET_MESSAGE_INTERVAL_RESPONSE but got {res['type']}")
+
+
+async def guarded_read(ctx: BizHawkContext, read_list: typing.List[typing.Tuple[int, int, str]],
+                       guard_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]]) -> typing.Optional[typing.List[bytes]]:
+    """Reads an array of bytes at 1 or more addresses if and only if every byte in guard_list matches its expected
+    value.
+
+    Items in read_list should be organized (address, size, domain) where
+    - `address` is the address of the first byte of data
+    - `size` is the number of bytes to read
+    - `domain` is the name of the region of memory the address corresponds to
+
+    Items in `guard_list` should be organized `(address, expected_data, domain)` where
+    - `address` is the address of the first byte of data
+    - `expected_data` is the bytes that the data starting at this address is expected to match
+    - `domain` is the name of the region of memory the address corresponds to
+
+    Returns None if any item in guard_list failed to validate. Otherwise returns a list of bytes in the order they
+    were requested."""
+    res = await send_requests(ctx, [{
+        "type": "GUARD",
+        "address": address,
+        "expected_data": base64.b64encode(bytes(expected_data)).decode("ascii"),
+        "domain": domain
+    } for address, expected_data, domain in guard_list] + [{
+        "type": "READ",
+        "address": address,
+        "size": size,
+        "domain": domain
+    } for address, size, domain in read_list])
+
+    ret: typing.List[bytes] = []
+    for item in res:
+        if item["type"] == "GUARD_RESPONSE":
+            if not item["value"]:
+                return None
+        else:
+            if item["type"] != "READ_RESPONSE":
+                raise SyncError(f"Expected response of type READ_RESPONSE or GUARD_RESPONSE but got {item['type']}")
+
+            ret.append(base64.b64decode(item["value"]))
+
+    return ret
+
+
+async def read(ctx: BizHawkContext, read_list: typing.List[typing.Tuple[int, int, str]]) -> typing.List[bytes]:
+    """Reads data at 1 or more addresses.
+
+    Items in `read_list` should be organized `(address, size, domain)` where
+    - `address` is the address of the first byte of data
+    - `size` is the number of bytes to read
+    - `domain` is the name of the region of memory the address corresponds to
+
+    Returns a list of bytes in the order they were requested."""
+    return await guarded_read(ctx, read_list, [])
+
+
+async def guarded_write(ctx: BizHawkContext, write_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]],
+                        guard_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]]) -> bool:
+    """Writes data to 1 or more addresses if and only if every byte in guard_list matches its expected value.
+
+    Items in `write_list` should be organized `(address, value, domain)` where
+    - `address` is the address of the first byte of data
+    - `value` is a list of bytes to write, in order, starting at `address`
+    - `domain` is the name of the region of memory the address corresponds to
+
+    Items in `guard_list` should be organized `(address, expected_data, domain)` where
+    - `address` is the address of the first byte of data
+    - `expected_data` is the bytes that the data starting at this address is expected to match
+    - `domain` is the name of the region of memory the address corresponds to
+
+    Returns False if any item in guard_list failed to validate. Otherwise returns True."""
+    res = await send_requests(ctx, [{
+        "type": "GUARD",
+        "address": address,
+        "expected_data": base64.b64encode(bytes(expected_data)).decode("ascii"),
+        "domain": domain
+    } for address, expected_data, domain in guard_list] + [{
+        "type": "WRITE",
+        "address": address,
+        "value": base64.b64encode(bytes(value)).decode("ascii"),
+        "domain": domain
+    } for address, value, domain in write_list])
+
+    for item in res:
+        if item["type"] == "GUARD_RESPONSE":
+            if not item["value"]:
+                return False
+        else:
+            if item["type"] != "WRITE_RESPONSE":
+                raise SyncError(f"Expected response of type WRITE_RESPONSE or GUARD_RESPONSE but got {item['type']}")
+
+    return True
+
+
+async def write(ctx: BizHawkContext, write_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]]) -> None:
+    """Writes data to 1 or more addresses.
+
+    Items in write_list should be organized `(address, value, domain)` where
+    - `address` is the address of the first byte of data
+    - `value` is a list of bytes to write, in order, starting at `address`
+    - `domain` is the name of the region of memory the address corresponds to"""
+    await guarded_write(ctx, write_list, [])
diff --git a/worlds/_bizhawk/client.py b/worlds/_bizhawk/client.py
new file mode 100644
index 0000000000..32a6e3704e
--- /dev/null
+++ b/worlds/_bizhawk/client.py
@@ -0,0 +1,103 @@
+"""
+A module containing the BizHawkClient base class and metaclass
+"""
+
+
+from __future__ import annotations
+
+import abc
+from typing import TYPE_CHECKING, Any, ClassVar, Dict, Optional, Tuple, Union
+
+from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, launch_subprocess
+
+if TYPE_CHECKING:
+    from .context import BizHawkClientContext
+else:
+    BizHawkClientContext = object
+
+
+def launch_client(*args) -> None:
+    from .context import launch
+    launch_subprocess(launch, name="BizHawkClient")
+
+component = Component("BizHawk Client", "BizHawkClient", component_type=Type.CLIENT, func=launch_client,
+                      file_identifier=SuffixIdentifier())
+components.append(component)
+
+
+class AutoBizHawkClientRegister(abc.ABCMeta):
+    game_handlers: ClassVar[Dict[Tuple[str, ...], Dict[str, BizHawkClient]]] = {}
+
+    def __new__(cls, name: str, bases: Tuple[type, ...], namespace: Dict[str, Any]) -> AutoBizHawkClientRegister:
+        new_class = super().__new__(cls, name, bases, namespace)
+
+        # Register handler
+        if "system" in namespace:
+            systems = (namespace["system"],) if type(namespace["system"]) is str else tuple(sorted(namespace["system"]))
+            if systems not in AutoBizHawkClientRegister.game_handlers:
+                AutoBizHawkClientRegister.game_handlers[systems] = {}
+
+            if "game" in namespace:
+                AutoBizHawkClientRegister.game_handlers[systems][namespace["game"]] = new_class()
+
+        # Update launcher component's suffixes
+        if "patch_suffix" in namespace:
+            if namespace["patch_suffix"] is not None:
+                existing_identifier: SuffixIdentifier = component.file_identifier
+                new_suffixes = [*existing_identifier.suffixes]
+
+                if type(namespace["patch_suffix"]) is str:
+                    new_suffixes.append(namespace["patch_suffix"])
+                else:
+                    new_suffixes.extend(namespace["patch_suffix"])
+
+                component.file_identifier = SuffixIdentifier(*new_suffixes)
+
+        return new_class
+
+    @staticmethod
+    async def get_handler(ctx: BizHawkClientContext, system: str) -> Optional[BizHawkClient]:
+        for systems, handlers in AutoBizHawkClientRegister.game_handlers.items():
+            if system in systems:
+                for handler in handlers.values():
+                    if await handler.validate_rom(ctx):
+                        return handler
+
+        return None
+
+
+class BizHawkClient(abc.ABC, metaclass=AutoBizHawkClientRegister):
+    system: ClassVar[Union[str, Tuple[str, ...]]]
+    """The system(s) that the game this client is for runs on"""
+
+    game: ClassVar[str]
+    """The game this client is for"""
+
+    patch_suffix: ClassVar[Optional[Union[str, Tuple[str, ...]]]]
+    """The file extension(s) this client is meant to open and patch (e.g. ".apz3")"""
+
+    @abc.abstractmethod
+    async def validate_rom(self, ctx: BizHawkClientContext) -> bool:
+        """Should return whether the currently loaded ROM should be handled by this client. You might read the game name
+        from the ROM header, for example. This function will only be asked to validate ROMs from the system set by the
+        client class, so you do not need to check the system yourself.
+
+        Once this function has determined that the ROM should be handled by this client, it should also modify `ctx`
+        as necessary (such as setting `ctx.game = self.game`, modifying `ctx.items_handling`, etc...)."""
+        ...
+
+    async def set_auth(self, ctx: BizHawkClientContext) -> None:
+        """Should set ctx.auth in anticipation of sending a `Connected` packet. You may override this if you store slot
+        name in your patched ROM. If ctx.auth is not set after calling, the player will be prompted to enter their
+        username."""
+        pass
+
+    @abc.abstractmethod
+    async def game_watcher(self, ctx: BizHawkClientContext) -> None:
+        """Runs on a loop with the approximate interval `ctx.watcher_timeout`. The currently loaded ROM is guaranteed
+        to have passed your validator when this function is called, and the emulator is very likely to be connected."""
+        ...
+
+    def on_package(self, ctx: BizHawkClientContext, cmd: str, args: dict) -> None:
+        """For handling packages from the server. Called from `BizHawkClientContext.on_package`."""
+        pass
diff --git a/worlds/_bizhawk/context.py b/worlds/_bizhawk/context.py
new file mode 100644
index 0000000000..4ee6e24f59
--- /dev/null
+++ b/worlds/_bizhawk/context.py
@@ -0,0 +1,272 @@
+"""
+A module containing context and functions relevant to running the client. This module should only be imported for type
+checking or launching the client, otherwise it will probably cause circular import issues.
+"""
+
+
+import asyncio
+import enum
+import subprocess
+import traceback
+from typing import Any, Dict, Optional
+
+from CommonClient import CommonContext, ClientCommandProcessor, get_base_parser, server_loop, logger, gui_enabled
+import Patch
+import Utils
+
+from . import BizHawkContext, ConnectionStatus, NotConnectedError, RequestFailedError, connect, disconnect, get_hash, \
+    get_script_version, get_system, ping
+from .client import BizHawkClient, AutoBizHawkClientRegister
+
+
+EXPECTED_SCRIPT_VERSION = 1
+
+
+class AuthStatus(enum.IntEnum):
+    NOT_AUTHENTICATED = 0
+    NEED_INFO = 1
+    PENDING = 2
+    AUTHENTICATED = 3
+
+
+class BizHawkClientCommandProcessor(ClientCommandProcessor):
+    def _cmd_bh(self):
+        """Shows the current status of the client's connection to BizHawk"""
+        if isinstance(self.ctx, BizHawkClientContext):
+            if self.ctx.bizhawk_ctx.connection_status == ConnectionStatus.NOT_CONNECTED:
+                logger.info("BizHawk Connection Status: Not Connected")
+            elif self.ctx.bizhawk_ctx.connection_status == ConnectionStatus.TENTATIVE:
+                logger.info("BizHawk Connection Status: Tentatively Connected")
+            elif self.ctx.bizhawk_ctx.connection_status == ConnectionStatus.CONNECTED:
+                logger.info("BizHawk Connection Status: Connected")
+
+
+class BizHawkClientContext(CommonContext):
+    command_processor = BizHawkClientCommandProcessor
+    auth_status: AuthStatus
+    password_requested: bool
+    client_handler: Optional[BizHawkClient]
+    slot_data: Optional[Dict[str, Any]] = None
+    rom_hash: Optional[str] = None
+    bizhawk_ctx: BizHawkContext
+
+    watcher_timeout: float
+    """The maximum amount of time the game watcher loop will wait for an update from the server before executing"""
+
+    def __init__(self, server_address: Optional[str], password: Optional[str]):
+        super().__init__(server_address, password)
+        self.auth_status = AuthStatus.NOT_AUTHENTICATED
+        self.password_requested = False
+        self.client_handler = None
+        self.bizhawk_ctx = BizHawkContext()
+        self.watcher_timeout = 0.5
+
+    def run_gui(self):
+        from kvui import GameManager
+
+        class BizHawkManager(GameManager):
+            base_title = "Archipelago BizHawk Client"
+
+        self.ui = BizHawkManager(self)
+        self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
+
+    def on_package(self, cmd, args):
+        if cmd == "Connected":
+            self.slot_data = args.get("slot_data", None)
+            self.auth_status = AuthStatus.AUTHENTICATED
+
+        if self.client_handler is not None:
+            self.client_handler.on_package(self, cmd, args)
+
+    async def server_auth(self, password_requested: bool = False):
+        self.password_requested = password_requested
+
+        if self.bizhawk_ctx.connection_status != ConnectionStatus.CONNECTED:
+            logger.info("Awaiting connection to BizHawk before authenticating")
+            return
+
+        if self.client_handler is None:
+            return
+
+        # Ask handler to set auth
+        if self.auth is None:
+            self.auth_status = AuthStatus.NEED_INFO
+            await self.client_handler.set_auth(self)
+
+            # Handler didn't set auth, ask user for slot name
+            if self.auth is None:
+                await self.get_username()
+
+        if password_requested and not self.password:
+            self.auth_status = AuthStatus.NEED_INFO
+            await super(BizHawkClientContext, self).server_auth(password_requested)
+
+        await self.send_connect()
+        self.auth_status = AuthStatus.PENDING
+
+    async def disconnect(self, allow_autoreconnect: bool = False):
+        self.auth_status = AuthStatus.NOT_AUTHENTICATED
+        await super().disconnect(allow_autoreconnect)
+
+
+async def _game_watcher(ctx: BizHawkClientContext):
+    showed_connecting_message = False
+    showed_connected_message = False
+    showed_no_handler_message = False
+
+    while not ctx.exit_event.is_set():
+        try:
+            await asyncio.wait_for(ctx.watcher_event.wait(), ctx.watcher_timeout)
+        except asyncio.TimeoutError:
+            pass
+
+        ctx.watcher_event.clear()
+
+        try:
+            if ctx.bizhawk_ctx.connection_status == ConnectionStatus.NOT_CONNECTED:
+                showed_connected_message = False
+
+                if not showed_connecting_message:
+                    logger.info("Waiting to connect to BizHawk...")
+                    showed_connecting_message = True
+
+                # Since a call to `connect` can take a while to return, this will cancel connecting
+                # if the user has decided to close the client.
+                connect_task = asyncio.create_task(connect(ctx.bizhawk_ctx), name="BizHawkConnect")
+                exit_task = asyncio.create_task(ctx.exit_event.wait(), name="ExitWait")
+                await asyncio.wait([connect_task, exit_task], return_when=asyncio.FIRST_COMPLETED)
+
+                if exit_task.done():
+                    connect_task.cancel()
+                    return
+
+                if not connect_task.result():
+                    # Failed to connect
+                    continue
+
+                showed_no_handler_message = False
+
+                script_version = await get_script_version(ctx.bizhawk_ctx)
+
+                if script_version != EXPECTED_SCRIPT_VERSION:
+                    logger.info(f"Connector script is incompatible. Expected version {EXPECTED_SCRIPT_VERSION} but got {script_version}. Disconnecting.")
+                    disconnect(ctx.bizhawk_ctx)
+                    continue
+
+            showed_connecting_message = False
+
+            await ping(ctx.bizhawk_ctx)
+
+            if not showed_connected_message:
+                showed_connected_message = True
+                logger.info("Connected to BizHawk")
+
+            rom_hash = await get_hash(ctx.bizhawk_ctx)
+            if ctx.rom_hash is not None and ctx.rom_hash != rom_hash:
+                if ctx.server is not None and not ctx.server.socket.closed:
+                    logger.info(f"ROM changed. Disconnecting from server.")
+
+                ctx.auth = None
+                ctx.username = None
+                ctx.client_handler = None
+                await ctx.disconnect(False)
+            ctx.rom_hash = rom_hash
+
+            if ctx.client_handler is None:
+                system = await get_system(ctx.bizhawk_ctx)
+                ctx.client_handler = await AutoBizHawkClientRegister.get_handler(ctx, system)
+
+                if ctx.client_handler is None:
+                    if not showed_no_handler_message:
+                        logger.info("No handler was found for this game")
+                        showed_no_handler_message = True
+                    continue
+                else:
+                    showed_no_handler_message = False
+                    logger.info(f"Running handler for {ctx.client_handler.game}")
+
+        except RequestFailedError as exc:
+            logger.info(f"Lost connection to BizHawk: {exc.args[0]}")
+            continue
+        except NotConnectedError:
+            continue
+
+        # Server auth
+        if ctx.server is not None and not ctx.server.socket.closed:
+            if ctx.auth_status == AuthStatus.NOT_AUTHENTICATED:
+                Utils.async_start(ctx.server_auth(ctx.password_requested))
+        else:
+            ctx.auth_status = AuthStatus.NOT_AUTHENTICATED
+
+        # Call the handler's game watcher
+        await ctx.client_handler.game_watcher(ctx)
+
+
+async def _run_game(rom: str):
+    import os
+    auto_start = Utils.get_settings().bizhawkclient_options.rom_start
+
+    if auto_start is True:
+        emuhawk_path = Utils.get_settings().bizhawkclient_options.emuhawk_path
+        subprocess.Popen(
+            [
+                emuhawk_path,
+                f"--lua={Utils.local_path('data', 'lua', 'connector_bizhawk_generic.lua')}",
+                os.path.realpath(rom),
+            ],
+            cwd=Utils.local_path("."),
+            stdin=subprocess.DEVNULL,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+    elif isinstance(auto_start, str):
+        import shlex
+
+        subprocess.Popen(
+            [
+                *shlex.split(auto_start),
+                os.path.realpath(rom)
+            ],
+            cwd=Utils.local_path("."),
+            stdin=subprocess.DEVNULL,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL
+        )
+
+
+async def _patch_and_run_game(patch_file: str):
+    metadata, output_file = Patch.create_rom_file(patch_file)
+    Utils.async_start(_run_game(output_file))
+
+
+def launch() -> None:
+    async def main():
+        parser = get_base_parser()
+        parser.add_argument("patch_file", default="", type=str, nargs="?", help="Path to an Archipelago patch file")
+        args = parser.parse_args()
+
+        ctx = BizHawkClientContext(args.connect, args.password)
+        ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
+
+        if gui_enabled:
+            ctx.run_gui()
+        ctx.run_cli()
+
+        if args.patch_file != "":
+            Utils.async_start(_patch_and_run_game(args.patch_file))
+
+        watcher_task = asyncio.create_task(_game_watcher(ctx), name="GameWatcher")
+
+        try:
+            await watcher_task
+        except Exception as e:
+            logger.error("".join(traceback.format_exception(e)))
+
+        await ctx.exit_event.wait()
+        await ctx.shutdown()
+
+    Utils.init_logging("BizHawkClient", exception_logger="Client")
+    import colorama
+    colorama.init()
+    asyncio.run(main())
+    colorama.deinit()
diff --git a/worlds/adventure/Rom.py b/worlds/adventure/Rom.py
index 62c4019718..9f1ca3fe5e 100644
--- a/worlds/adventure/Rom.py
+++ b/worlds/adventure/Rom.py
@@ -6,9 +6,8 @@ from typing import Optional, Any
 
 import Utils
 from .Locations import AdventureLocation, LocationData
-from Utils import OptionsType
+from settings import get_settings
 from worlds.Files import APDeltaPatch, AutoPatchRegister, APContainer
-from itertools import chain
 
 import bsdiff4
 
@@ -313,9 +312,8 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
 
 
 def get_base_rom_path(file_name: str = "") -> str:
-    options: OptionsType = Utils.get_options()
     if not file_name:
-        file_name = options["adventure_options"]["rom_file"]
+        file_name = get_settings()["adventure_options"]["rom_file"]
     if not os.path.exists(file_name):
         file_name = Utils.user_path(file_name)
     return file_name
diff --git a/worlds/alttp/Client.py b/worlds/alttp/Client.py
index 7ac24fde9f..edc68473b9 100644
--- a/worlds/alttp/Client.py
+++ b/worlds/alttp/Client.py
@@ -107,7 +107,7 @@ location_table_uw = {"Blind's Hideout - Top": (0x11d, 0x10),
                      "Hyrule Castle - Zelda's Chest": (0x80, 0x10),
                      'Hyrule Castle - Big Key Drop': (0x80, 0x400),
                      'Sewers - Dark Cross': (0x32, 0x10),
-                     'Hyrule Castle - Key Rat Key Drop': (0x21, 0x400),
+                     'Sewers - Key Rat Key Drop': (0x21, 0x400),
                      'Sewers - Secret Room - Left': (0x11, 0x10),
                      'Sewers - Secret Room - Middle': (0x11, 0x20),
                      'Sewers - Secret Room - Right': (0x11, 0x40),
@@ -520,7 +520,8 @@ class ALTTPSNIClient(SNIClient):
         gamemode = await snes_read(ctx, WRAM_START + 0x10, 1)
         if "DeathLink" in ctx.tags and gamemode and ctx.last_death_link + 1 < time.time():
             currently_dead = gamemode[0] in DEATH_MODES
-            await ctx.handle_deathlink_state(currently_dead)
+            await ctx.handle_deathlink_state(currently_dead,
+                                             ctx.player_names[ctx.slot] + " ran out of hearts." if ctx.slot else "")
 
         gameend = await snes_read(ctx, SAVEDATA_START + 0x443, 1)
         game_timer = await snes_read(ctx, SAVEDATA_START + 0x42E, 4)
diff --git a/worlds/alttp/Dungeons.py b/worlds/alttp/Dungeons.py
index b789fd6db6..b456174f39 100644
--- a/worlds/alttp/Dungeons.py
+++ b/worlds/alttp/Dungeons.py
@@ -8,7 +8,7 @@ from Fill import fill_restrictive
 
 from .Bosses import BossFactory, Boss
 from .Items import ItemFactory
-from .Regions import lookup_boss_drops
+from .Regions import lookup_boss_drops, key_drop_data
 from .Options import smallkey_shuffle
 
 if typing.TYPE_CHECKING:
@@ -81,15 +81,17 @@ def create_dungeons(world: "ALTTPWorld"):
         return dungeon
 
     ES = make_dungeon('Hyrule Castle', None, ['Hyrule Castle', 'Sewers', 'Sewer Drop', 'Sewers (Dark)', 'Sanctuary'],
-                      None, [ItemFactory('Small Key (Hyrule Castle)', player)],
+                      ItemFactory('Big Key (Hyrule Castle)', player),
+                      ItemFactory(['Small Key (Hyrule Castle)'] * 4, player),
                       [ItemFactory('Map (Hyrule Castle)', player)])
     EP = make_dungeon('Eastern Palace', 'Armos Knights', ['Eastern Palace'],
-                      ItemFactory('Big Key (Eastern Palace)', player), [],
+                      ItemFactory('Big Key (Eastern Palace)', player),
+                      ItemFactory(['Small Key (Eastern Palace)'] * 2, player),
                       ItemFactory(['Map (Eastern Palace)', 'Compass (Eastern Palace)'], player))
     DP = make_dungeon('Desert Palace', 'Lanmolas',
                       ['Desert Palace North', 'Desert Palace Main (Inner)', 'Desert Palace Main (Outer)',
                        'Desert Palace East'], ItemFactory('Big Key (Desert Palace)', player),
-                      [ItemFactory('Small Key (Desert Palace)', player)],
+                      ItemFactory(['Small Key (Desert Palace)'] * 4, player),
                       ItemFactory(['Map (Desert Palace)', 'Compass (Desert Palace)'], player))
     ToH = make_dungeon('Tower of Hera', 'Moldorm',
                        ['Tower of Hera (Bottom)', 'Tower of Hera (Basement)', 'Tower of Hera (Top)'],
@@ -105,7 +107,8 @@ def create_dungeons(world: "ALTTPWorld"):
                        ItemFactory(['Small Key (Palace of Darkness)'] * 6, player),
                        ItemFactory(['Map (Palace of Darkness)', 'Compass (Palace of Darkness)'], player))
     TT = make_dungeon('Thieves Town', 'Blind', ['Thieves Town (Entrance)', 'Thieves Town (Deep)', 'Blind Fight'],
-                      ItemFactory('Big Key (Thieves Town)', player), [ItemFactory('Small Key (Thieves Town)', player)],
+                      ItemFactory('Big Key (Thieves Town)', player),
+                      ItemFactory(['Small Key (Thieves Town)'] * 3, player),
                       ItemFactory(['Map (Thieves Town)', 'Compass (Thieves Town)'], player))
     SW = make_dungeon('Skull Woods', 'Mothula', ['Skull Woods Final Section (Entrance)', 'Skull Woods First Section',
                                                  'Skull Woods Second Section', 'Skull Woods Second Section (Drop)',
@@ -113,52 +116,54 @@ def create_dungeons(world: "ALTTPWorld"):
                                                  'Skull Woods First Section (Right)',
                                                  'Skull Woods First Section (Left)', 'Skull Woods First Section (Top)'],
                       ItemFactory('Big Key (Skull Woods)', player),
-                      ItemFactory(['Small Key (Skull Woods)'] * 3, player),
+                      ItemFactory(['Small Key (Skull Woods)'] * 5, player),
                       ItemFactory(['Map (Skull Woods)', 'Compass (Skull Woods)'], player))
     SP = make_dungeon('Swamp Palace', 'Arrghus',
                       ['Swamp Palace (Entrance)', 'Swamp Palace (First Room)', 'Swamp Palace (Starting Area)',
-                       'Swamp Palace (Center)', 'Swamp Palace (North)'], ItemFactory('Big Key (Swamp Palace)', player),
-                      [ItemFactory('Small Key (Swamp Palace)', player)],
+                       'Swamp Palace (West)', 'Swamp Palace (Center)', 'Swamp Palace (North)'],
+                      ItemFactory('Big Key (Swamp Palace)', player),
+                      ItemFactory(['Small Key (Swamp Palace)'] * 6, player),
                       ItemFactory(['Map (Swamp Palace)', 'Compass (Swamp Palace)'], player))
     IP = make_dungeon('Ice Palace', 'Kholdstare',
-                      ['Ice Palace (Entrance)', 'Ice Palace (Main)', 'Ice Palace (East)', 'Ice Palace (East Top)',
-                       'Ice Palace (Kholdstare)'], ItemFactory('Big Key (Ice Palace)', player),
-                      ItemFactory(['Small Key (Ice Palace)'] * 2, player),
+                      ['Ice Palace (Entrance)', 'Ice Palace (Second Section)', 'Ice Palace (Main)', 'Ice Palace (East)',
+                       'Ice Palace (East Top)', 'Ice Palace (Kholdstare)'], ItemFactory('Big Key (Ice Palace)', player),
+                      ItemFactory(['Small Key (Ice Palace)'] * 6, player),
                       ItemFactory(['Map (Ice Palace)', 'Compass (Ice Palace)'], player))
     MM = make_dungeon('Misery Mire', 'Vitreous',
                       ['Misery Mire (Entrance)', 'Misery Mire (Main)', 'Misery Mire (West)', 'Misery Mire (Final Area)',
                        'Misery Mire (Vitreous)'], ItemFactory('Big Key (Misery Mire)', player),
-                      ItemFactory(['Small Key (Misery Mire)'] * 3, player),
+                      ItemFactory(['Small Key (Misery Mire)'] * 6, player),
                       ItemFactory(['Map (Misery Mire)', 'Compass (Misery Mire)'], player))
     TR = make_dungeon('Turtle Rock', 'Trinexx',
                       ['Turtle Rock (Entrance)', 'Turtle Rock (First Section)', 'Turtle Rock (Chain Chomp Room)',
+                       'Turtle Rock (Pokey Room)',
                        'Turtle Rock (Second Section)', 'Turtle Rock (Big Chest)', 'Turtle Rock (Crystaroller Room)',
                        'Turtle Rock (Dark Room)', 'Turtle Rock (Eye Bridge)', 'Turtle Rock (Trinexx)'],
                       ItemFactory('Big Key (Turtle Rock)', player),
-                      ItemFactory(['Small Key (Turtle Rock)'] * 4, player),
+                      ItemFactory(['Small Key (Turtle Rock)'] * 6, player),
                       ItemFactory(['Map (Turtle Rock)', 'Compass (Turtle Rock)'], player))
 
     if multiworld.mode[player] != 'inverted':
         AT = make_dungeon('Agahnims Tower', 'Agahnim', ['Agahnims Tower', 'Agahnim 1'], None,
-                          ItemFactory(['Small Key (Agahnims Tower)'] * 2, player), [])
+                          ItemFactory(['Small Key (Agahnims Tower)'] * 4, player), [])
         GT = make_dungeon('Ganons Tower', 'Agahnim2',
                           ['Ganons Tower (Entrance)', 'Ganons Tower (Tile Room)', 'Ganons Tower (Compass Room)',
                            'Ganons Tower (Hookshot Room)', 'Ganons Tower (Map Room)', 'Ganons Tower (Firesnake Room)',
                            'Ganons Tower (Teleport Room)', 'Ganons Tower (Bottom)', 'Ganons Tower (Top)',
                            'Ganons Tower (Before Moldorm)', 'Ganons Tower (Moldorm)', 'Agahnim 2'],
                           ItemFactory('Big Key (Ganons Tower)', player),
-                          ItemFactory(['Small Key (Ganons Tower)'] * 4, player),
+                          ItemFactory(['Small Key (Ganons Tower)'] * 8, player),
                           ItemFactory(['Map (Ganons Tower)', 'Compass (Ganons Tower)'], player))
     else:
         AT = make_dungeon('Inverted Agahnims Tower', 'Agahnim', ['Inverted Agahnims Tower', 'Agahnim 1'], None,
-                          ItemFactory(['Small Key (Agahnims Tower)'] * 2, player), [])
+                          ItemFactory(['Small Key (Agahnims Tower)'] * 4, player), [])
         GT = make_dungeon('Inverted Ganons Tower', 'Agahnim2',
                           ['Inverted Ganons Tower (Entrance)', 'Ganons Tower (Tile Room)',
                            'Ganons Tower (Compass Room)', 'Ganons Tower (Hookshot Room)', 'Ganons Tower (Map Room)',
                            'Ganons Tower (Firesnake Room)', 'Ganons Tower (Teleport Room)', 'Ganons Tower (Bottom)',
                            'Ganons Tower (Top)', 'Ganons Tower (Before Moldorm)', 'Ganons Tower (Moldorm)',
                            'Agahnim 2'], ItemFactory('Big Key (Ganons Tower)', player),
-                          ItemFactory(['Small Key (Ganons Tower)'] * 4, player),
+                          ItemFactory(['Small Key (Ganons Tower)'] * 8, player),
                           ItemFactory(['Map (Ganons Tower)', 'Compass (Ganons Tower)'], player))
 
     GT.bosses['bottom'] = BossFactory('Armos Knights', player)
@@ -195,10 +200,11 @@ def fill_dungeons_restrictive(multiworld: MultiWorld):
     dungeon_specific: set = set()
     for subworld in multiworld.get_game_worlds("A Link to the Past"):
         player = subworld.player
-        localized |= {(player, item_name) for item_name in
-                      subworld.dungeon_local_item_names}
-        dungeon_specific |= {(player, item_name) for item_name in
-                             subworld.dungeon_specific_item_names}
+        if player not in multiworld.groups:
+            localized |= {(player, item_name) for item_name in
+                          subworld.dungeon_local_item_names}
+            dungeon_specific |= {(player, item_name) for item_name in
+                                 subworld.dungeon_specific_item_names}
 
     if localized:
         in_dungeon_items = [item for item in get_dungeon_item_pool(multiworld) if (item.player, item.name) in localized]
@@ -249,7 +255,17 @@ def fill_dungeons_restrictive(multiworld: MultiWorld):
                 if all_state_base.has("Triforce", player):
                     all_state_base.remove(multiworld.worlds[player].create_item("Triforce"))
 
-            fill_restrictive(multiworld, all_state_base, locations, in_dungeon_items, True, True, allow_excluded=True)
+            for (player, key_drop_shuffle) in multiworld.key_drop_shuffle.items():
+                if not key_drop_shuffle and player not in multiworld.groups:
+                    for key_loc in key_drop_data:
+                        key_data = key_drop_data[key_loc]
+                        all_state_base.remove(ItemFactory(key_data[3], player))
+                        loc = multiworld.get_location(key_loc, player)
+
+                        if loc in all_state_base.events:
+                            all_state_base.events.remove(loc)
+            fill_restrictive(multiworld, all_state_base, locations, in_dungeon_items, True, True, allow_excluded=True,
+                             name="LttP Dungeon Items")
 
 
 dungeon_music_addresses = {'Eastern Palace - Prize': [0x1559A],
diff --git a/worlds/alttp/EntranceShuffle.py b/worlds/alttp/EntranceShuffle.py
index b7fe688431..07bb587eeb 100644
--- a/worlds/alttp/EntranceShuffle.py
+++ b/worlds/alttp/EntranceShuffle.py
@@ -3134,6 +3134,7 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
                          ('Swamp Palace Moat', 'Swamp Palace (First Room)'),
                          ('Swamp Palace Small Key Door', 'Swamp Palace (Starting Area)'),
                          ('Swamp Palace (Center)', 'Swamp Palace (Center)'),
+                         ('Swamp Palace (West)', 'Swamp Palace (West)'),
                          ('Swamp Palace (North)', 'Swamp Palace (North)'),
                          ('Thieves Town Big Key Door', 'Thieves Town (Deep)'),
                          ('Skull Woods Torch Room', 'Skull Woods Final Section (Mothula)'),
@@ -3148,7 +3149,8 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
                          ('Blind Fight', 'Blind Fight'),
                          ('Desert Palace Pots (Outer)', 'Desert Palace Main (Inner)'),
                          ('Desert Palace Pots (Inner)', 'Desert Palace Main (Outer)'),
-                         ('Ice Palace Entrance Room', 'Ice Palace (Main)'),
+                         ('Ice Palace (Main)', 'Ice Palace (Main)'),
+                         ('Ice Palace (Second Section)', 'Ice Palace (Second Section)'),
                          ('Ice Palace (East)', 'Ice Palace (East)'),
                          ('Ice Palace (East Top)', 'Ice Palace (East Top)'),
                          ('Ice Palace (Kholdstare)', 'Ice Palace (Kholdstare)'),
@@ -3158,9 +3160,11 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
                          ('Misery Mire (Vitreous)', 'Misery Mire (Vitreous)'),
                          ('Turtle Rock Entrance Gap', 'Turtle Rock (First Section)'),
                          ('Turtle Rock Entrance Gap Reverse', 'Turtle Rock (Entrance)'),
-                         ('Turtle Rock Pokey Room', 'Turtle Rock (Chain Chomp Room)'),
+                         ('Turtle Rock Entrance to Pokey Room', 'Turtle Rock (Pokey Room)'),
+                         ('Turtle Rock (Pokey Room) (South)', 'Turtle Rock (First Section)'),
+                         ('Turtle Rock (Pokey Room) (North)', 'Turtle Rock (Chain Chomp Room)'),
                          ('Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Second Section)'),
-                         ('Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock (First Section)'),
+                         ('Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock (Pokey Room)'),
                          ('Turtle Rock Chain Chomp Staircase', 'Turtle Rock (Chain Chomp Room)'),
                          ('Turtle Rock (Big Chest) (North)', 'Turtle Rock (Second Section)'),
                          ('Turtle Rock Big Key Door', 'Turtle Rock (Crystaroller Room)'),
@@ -3285,6 +3289,7 @@ inverted_mandatory_connections = [('Links House S&Q', 'Inverted Links House'),
                                   ('Swamp Palace Moat', 'Swamp Palace (First Room)'),
                                   ('Swamp Palace Small Key Door', 'Swamp Palace (Starting Area)'),
                                   ('Swamp Palace (Center)', 'Swamp Palace (Center)'),
+                                  ('Swamp Palace (West)', 'Swamp Palace (West)'),
                                   ('Swamp Palace (North)', 'Swamp Palace (North)'),
                                   ('Thieves Town Big Key Door', 'Thieves Town (Deep)'),
                                   ('Skull Woods Torch Room', 'Skull Woods Final Section (Mothula)'),
@@ -3299,7 +3304,8 @@ inverted_mandatory_connections = [('Links House S&Q', 'Inverted Links House'),
                                   ('Blind Fight', 'Blind Fight'),
                                   ('Desert Palace Pots (Outer)', 'Desert Palace Main (Inner)'),
                                   ('Desert Palace Pots (Inner)', 'Desert Palace Main (Outer)'),
-                                  ('Ice Palace Entrance Room', 'Ice Palace (Main)'),
+                                  ('Ice Palace (Main)', 'Ice Palace (Main)'),
+                                  ('Ice Palace (Second Section)', 'Ice Palace (Second Section)'),
                                   ('Ice Palace (East)', 'Ice Palace (East)'),
                                   ('Ice Palace (East Top)', 'Ice Palace (East Top)'),
                                   ('Ice Palace (Kholdstare)', 'Ice Palace (Kholdstare)'),
@@ -3309,9 +3315,11 @@ inverted_mandatory_connections = [('Links House S&Q', 'Inverted Links House'),
                                   ('Misery Mire (Vitreous)', 'Misery Mire (Vitreous)'),
                                   ('Turtle Rock Entrance Gap', 'Turtle Rock (First Section)'),
                                   ('Turtle Rock Entrance Gap Reverse', 'Turtle Rock (Entrance)'),
-                                  ('Turtle Rock Pokey Room', 'Turtle Rock (Chain Chomp Room)'),
+                                  ('Turtle Rock Entrance to Pokey Room', 'Turtle Rock (Pokey Room)'),
+                                  ('Turtle Rock (Pokey Room) (South)', 'Turtle Rock (First Section)'),
+                                  ('Turtle Rock (Pokey Room) (North)', 'Turtle Rock (Chain Chomp Room)'),
                                   ('Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Second Section)'),
-                                  ('Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock (First Section)'),
+                                  ('Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock (Pokey Room)'),
                                   ('Turtle Rock Chain Chomp Staircase', 'Turtle Rock (Chain Chomp Room)'),
                                   ('Turtle Rock (Big Chest) (North)', 'Turtle Rock (Second Section)'),
                                   ('Turtle Rock Big Key Door', 'Turtle Rock (Crystaroller Room)'),
diff --git a/worlds/alttp/InvertedRegions.py b/worlds/alttp/InvertedRegions.py
index acec73bf33..f89eebec33 100644
--- a/worlds/alttp/InvertedRegions.py
+++ b/worlds/alttp/InvertedRegions.py
@@ -149,41 +149,37 @@ def create_inverted_regions(world, player):
         create_lw_region(world, 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'],
-                              ['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 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 - Boss', 'Desert Palace - Prize'], ['Desert Palace Exit (North)']),
+                              ['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',
-                               'Eastern Palace - Big Key Chest', 'Eastern Palace - Map Chest', 'Eastern Palace - Boss',
-                               'Eastern Palace - Prize'], ['Eastern Palace Exit']),
+                               '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_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',
                               ['Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest',
-                               'Hyrule Castle - Zelda\'s 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 Door']),
-        create_dungeon_region(world, player, 'Sewers', 'a drop\'s exit',
-                              ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
-                               'Sewers - Secret Room - Right'], ['Sanctuary Push Door', 'Sewers Back Door']),
+        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', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
+                                         'Sewers - Secret Room - Right'], ['Sanctuary Push Door', 'Sewers Back Door']),
         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'],
-                              ['Agahnim 1', 'Inverted Agahnims Tower 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'],
                            ['Old Man Cave Exit (East)', 'Old Man Cave Exit (West)']),
@@ -253,14 +249,9 @@ def create_inverted_regions(world, player):
                           'Death Mountain (Top) Mirror Spot']),
         create_dw_region(world, 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(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_dw_region(world, player, 'East Dark World', ['Pyramid'],
                          ['Pyramid Fairy', 'South Dark World Bridge', 'Palace of Darkness',
@@ -360,128 +351,82 @@ def create_inverted_regions(world, player):
                          ['Floating Island Drop', 'Hookshot Cave Back Entrance']),
         create_cave_region(world, 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 (Center)']),
-        create_dungeon_region(world, player, 'Swamp Palace (Center)', 'Swamp Palace',
-                              ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest',
-                               'Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest'], ['Swamp Palace (North)']),
-        create_dungeon_region(world, player, 'Swamp Palace (North)', 'Swamp Palace',
-                              ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
-                               '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',
-                               '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, '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',
+                                                                                       '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',
+                                                                                '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',
+                                                                               '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',
+                                                                            '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',
-                                                                                       'Thieves\' Town - Big Chest',
-                                                                                       'Thieves\' Town - Blind\'s Cell'],
+                                                                                '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 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 - Boss', 'Skull Woods - Prize']),
-        create_dungeon_region(world, player, 'Ice Palace (Entrance)', 'Ice Palace', None,
-                              ['Ice Palace Entrance Room', 'Ice Palace Exit']),
-        create_dungeon_region(world, player, 'Ice Palace (Main)', 'Ice Palace',
-                              ['Ice Palace - Compass Chest', 'Ice Palace - Freezor Chest',
-                               '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']),
-        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',
-                               'Misery Mire - Bridge Chest', 'Misery Mire - Spike Chest'],
-                              ['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',
-                               'Turtle Rock - Roller Room - Right'],
-                              ['Turtle Rock Pokey Room', 'Turtle Rock Entrance Gap Reverse']),
-        create_dungeon_region(world, player, 'Turtle Rock (Chain Chomp Room)', 'Turtle Rock',
-                              ['Turtle Rock - Chain Chomps'],
+        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 - Spike Corner Key Drop'], ['Skull Woods Torch Room', 'Skull Woods Final Section Exit']),
+        create_dungeon_region(world, player, 'Skull Woods Final Section (Mothula)', 'Skull Woods', ['Skull Woods - Boss', 'Skull Woods - Prize']),
+        create_dungeon_region(world, player, 'Ice Palace (Entrance)', 'Ice Palace', ['Ice Palace - Jelly Key Drop'], ['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 - Compass Chest'], ['Ice Palace (Main)']),
+        create_dungeon_region(world, 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',
+                                                                    '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',
+                                                                             '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 - Big Key Chest', 'Turtle Rock - Pokey 2 Key Drop'],
                               ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase',
                                'Turtle Rock Big Key Door']),
-        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)', '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 Isolated Ledge Exit']),
-        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'],
-                              ['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(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)', '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 Isolated Ledge Exit']),
+        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'],
+                              ['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'],
                               ['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, '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',
                               ['Ganons Tower - Bob\'s Torch', 'Ganons Tower - Hope Room - Left',
-                               'Ganons Tower - Hope Room - Right'],
+                               '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'],
@@ -489,10 +434,13 @@ def create_inverted_regions(world, player):
         create_dungeon_region(world, 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 (Bottom) (East)']),
+                               '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',
-                               'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom 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',
@@ -501,21 +449,21 @@ def create_inverted_regions(world, player):
                               ['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)']),
+                               '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',
                                '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 (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',
-                               'Ganons Tower - Pre-Moldorm Chest'], ['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),
+                               '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 Drop']),  # houlihan room exits here in inverted
@@ -529,8 +477,6 @@ def create_inverted_regions(world, player):
         create_lw_region(world, player, 'Death Mountain Bunny Descent Area')
     ]
 
-    world.initialize_regions()
-
 
 def mark_dark_world_regions(world, player):
     # cross world caves may have some sections marked as both in_light_world, and in_dark_work.
diff --git a/worlds/alttp/ItemPool.py b/worlds/alttp/ItemPool.py
index 56eb355837..1c3f3e44f7 100644
--- a/worlds/alttp/ItemPool.py
+++ b/worlds/alttp/ItemPool.py
@@ -12,6 +12,7 @@ from .EntranceShuffle import connect_entrance
 from .Items import ItemFactory, GetBeemizerItem
 from .Options import smallkey_shuffle, compass_shuffle, bigkey_shuffle, map_shuffle, LTTPBosses
 from .StateHelpers import has_triforce_pieces, has_melee_weapon
+from .Regions import key_drop_data
 
 # 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.
@@ -80,7 +81,7 @@ difficulties = {
         basicglove=basicgloves,
         alwaysitems=alwaysitems,
         legacyinsanity=legacyinsanity,
-        universal_keys=['Small Key (Universal)'] * 28,
+        universal_keys=['Small Key (Universal)'] * 29,
         extras=[easyfirst15extra, easysecond15extra, easythird10extra, easyfourth5extra, easyfinal25extra],
         progressive_sword_limit=8,
         progressive_shield_limit=6,
@@ -112,7 +113,7 @@ difficulties = {
         basicglove=basicgloves,
         alwaysitems=alwaysitems,
         legacyinsanity=legacyinsanity,
-        universal_keys=['Small Key (Universal)'] * 18 + ['Rupees (20)'] * 10,
+        universal_keys=['Small Key (Universal)'] * 19 + ['Rupees (20)'] * 10,
         extras=[normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
         progressive_sword_limit=4,
         progressive_shield_limit=3,
@@ -144,7 +145,7 @@ difficulties = {
         basicglove=basicgloves,
         alwaysitems=alwaysitems,
         legacyinsanity=legacyinsanity,
-        universal_keys=['Small Key (Universal)'] * 12 + ['Rupees (5)'] * 16,
+        universal_keys=['Small Key (Universal)'] * 13 + ['Rupees (5)'] * 16,
         extras=[normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
         progressive_sword_limit=3,
         progressive_shield_limit=2,
@@ -176,7 +177,7 @@ difficulties = {
         basicglove=basicgloves,
         alwaysitems=alwaysitems,
         legacyinsanity=legacyinsanity,
-        universal_keys=['Small Key (Universal)'] * 12 + ['Rupees (5)'] * 16,
+        universal_keys=['Small Key (Universal)'] * 13 + ['Rupees (5)'] * 16,
         extras=[normalfirst15extra, normalsecond15extra, normalthird10extra, normalfourth5extra, normalfinal25extra],
         progressive_sword_limit=2,
         progressive_shield_limit=1,
@@ -212,7 +213,7 @@ for diff in {'easy', 'normal', 'hard', 'expert'}:
         basicglove=['Nothing'] * 2,
         alwaysitems=['Ice Rod'] + ['Nothing'] * 19,
         legacyinsanity=['Nothing'] * 2,
-        universal_keys=['Nothing'] * 28,
+        universal_keys=['Nothing'] * 29,
         extras=[['Nothing'] * 15, ['Nothing'] * 15, ['Nothing'] * 10, ['Nothing'] * 5, ['Nothing'] * 25],
         progressive_sword_limit=difficulties[diff].progressive_sword_limit,
         progressive_shield_limit=difficulties[diff].progressive_shield_limit,
@@ -281,7 +282,6 @@ def generate_itempool(world):
         itempool.extend(['Arrows (10)'] * 7)
         if multiworld.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
             itempool.extend(itemdiff.universal_keys)
-            itempool.append('Small Key (Universal)')
 
         for item in itempool:
             multiworld.push_precollected(ItemFactory(item, player))
@@ -293,7 +293,6 @@ def generate_itempool(world):
         loc.access_rule = lambda state: has_triforce_pieces(state, player)
 
         region.locations.append(loc)
-        multiworld.clear_location_cache()
 
         multiworld.push_item(loc, ItemFactory('Triforce', player), False)
         loc.event = True
@@ -374,11 +373,38 @@ def generate_itempool(world):
 
     dungeon_items = [item for item in get_dungeon_item_pool_player(world)
                      if item.name not in multiworld.worlds[player].dungeon_local_item_names]
-    dungeon_item_replacements = difficulties[multiworld.difficulty[player]].extras[0]\
-                                + difficulties[multiworld.difficulty[player]].extras[1]\
-                                + difficulties[multiworld.difficulty[player]].extras[2]\
-                                + difficulties[multiworld.difficulty[player]].extras[3]\
-                                + difficulties[multiworld.difficulty[player]].extras[4]
+
+    for key_loc in key_drop_data:
+        key_data = key_drop_data[key_loc]
+        drop_item = ItemFactory(key_data[3], player)
+        if multiworld.goal[player] == 'icerodhunt' or not multiworld.key_drop_shuffle[player]:
+            if drop_item in dungeon_items:
+                dungeon_items.remove(drop_item)
+            else:
+                dungeon = drop_item.name.split("(")[1].split(")")[0]
+                if multiworld.mode[player] == 'inverted':
+                    if dungeon == "Agahnims Tower":
+                        dungeon = "Inverted Agahnims Tower"
+                    if dungeon == "Ganons Tower":
+                        dungeon = "Inverted Ganons Tower"
+                if drop_item in world.dungeons[dungeon].small_keys:
+                    world.dungeons[dungeon].small_keys.remove(drop_item)
+                elif world.dungeons[dungeon].big_key is not None and world.dungeons[dungeon].big_key == drop_item:
+                    world.dungeons[dungeon].big_key = None
+        if not multiworld.key_drop_shuffle[player]:
+            # key drop item was removed from the pool because key drop shuffle is off
+            # and it will now place the removed key into its original location
+            loc = multiworld.get_location(key_loc, player)
+            loc.place_locked_item(drop_item)
+            loc.address = None
+        elif multiworld.goal[player] == 'icerodhunt':
+            # key drop item removed because of icerodhunt
+            multiworld.itempool.append(ItemFactory(GetBeemizerItem(world, player, 'Nothing'), player))
+            multiworld.push_precollected(drop_item)
+        elif "Small" in key_data[3] and multiworld.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
+            # key drop shuffle and universal keys are on. Add universal keys in place of key drop keys.
+            multiworld.itempool.append(ItemFactory(GetBeemizerItem(world, player, 'Small Key (Universal)'), player))
+    dungeon_item_replacements = sum(difficulties[multiworld.difficulty[player]].extras, []) * 2
     multiworld.random.shuffle(dungeon_item_replacements)
     if multiworld.goal[player] == 'icerodhunt':
         for item in dungeon_items:
@@ -391,7 +417,7 @@ def generate_itempool(world):
                     or (multiworld.bigkey_shuffle[player] == bigkey_shuffle.option_start_with and item.type == 'BigKey')
                     or (multiworld.compass_shuffle[player] == compass_shuffle.option_start_with and item.type == 'Compass')
                     or (multiworld.map_shuffle[player] == map_shuffle.option_start_with and item.type == 'Map')):
-                dungeon_items.remove(item)
+                dungeon_items.pop(x)
                 multiworld.push_precollected(item)
                 multiworld.itempool.append(ItemFactory(dungeon_item_replacements.pop(), player))
         multiworld.itempool.extend([item for item in dungeon_items])
@@ -508,8 +534,6 @@ def set_up_take_anys(world, player):
         take_any.shop.add_inventory(0, 'Blue Potion', 0, 0)
         take_any.shop.add_inventory(1, 'Boss Heart Container', 0, 0, create_location=True)
 
-    world.initialize_regions()
-
 
 def get_pool_core(world, player: int):
     shuffle = world.shuffle[player]
@@ -639,14 +663,25 @@ def get_pool_core(world, player: int):
         pool = ['Rupees (5)' if item in replace else item for item in pool]
     if world.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
         pool.extend(diff.universal_keys)
-        item_to_place = 'Small Key (Universal)' if goal != 'icerodhunt' else 'Nothing'
         if mode == 'standard':
-            key_location = world.random.choice(
-                ['Secret Passage', 'Hyrule Castle - Boomerang Chest', 'Hyrule Castle - Map Chest',
-                 'Hyrule Castle - Zelda\'s Chest', 'Sewers - Dark Cross'])
-            place_item(key_location, item_to_place)
-        else:
-            pool.extend([item_to_place])
+            if world.key_drop_shuffle[player] and world.goal[player] != 'icerodhunt':
+                key_locations = ['Secret Passage', 'Hyrule Castle - Map Guard Key Drop']
+                key_location = world.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_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_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)
+                place_item(key_location, "Small Key (Universal)")
+                pool = pool[:-3]
 
     return (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon,
             additional_pieces_to_place)
@@ -799,7 +834,9 @@ def make_custom_item_pool(world, player):
         pool.extend(['Moon Pearl'] * customitemarray[28])
 
     if world.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
-        itemtotal = itemtotal - 28  # Corrects for small keys not being in item pool in universal mode
+        itemtotal = itemtotal - 28  # Corrects for small keys not being in item pool in universal Mode
+        if world.key_drop_shuffle[player]:
+            itemtotal = itemtotal - (len(key_drop_data) - 1)
     if itemtotal < total_items_to_place:
         pool.extend(['Nothing'] * (total_items_to_place - itemtotal))
         logging.warning(f"Pool was filled up with {total_items_to_place - itemtotal} Nothing's for player {player}")
diff --git a/worlds/alttp/Items.py b/worlds/alttp/Items.py
index 40634de8da..18f96b2ddb 100644
--- a/worlds/alttp/Items.py
+++ b/worlds/alttp/Items.py
@@ -102,7 +102,7 @@ item_table = {'Bow': ItemData(IC.progression, None, 0x0B, 'You have\nchosen the\
               'Red Pendant': ItemData(IC.progression, 'Crystal', (0x01, 0x32, 0x60, 0x00, 0x69, 0x03), None, None, None, None, None, None, "the red pendant"),
               'Triforce': ItemData(IC.progression, None, 0x6A, '\n   YOU WIN!', 'and the triforce', 'victorious kid', 'victory for sale', 'fungus for the win', 'greedy boy wins game again', 'the Triforce'),
               'Power Star': ItemData(IC.progression, None, 0x6B, 'a small victory', 'and the power star', 'star-struck kid', 'star for sale', 'see stars with shroom', 'mario powers up again', 'a Power Star'),
-              'Triforce Piece': ItemData(IC.progression, None, 0x6C, 'a small victory', 'and the thirdforce', 'triangular kid', 'triangle for sale', 'fungus for triangle', 'wise boy has triangle again', 'a Triforce Piece'),
+              'Triforce Piece': ItemData(IC.progression_skip_balancing, None, 0x6C, 'a small victory', 'and the thirdforce', 'triangular kid', 'triangle for sale', 'fungus for triangle', 'wise boy has triangle again', 'a Triforce Piece'),
               'Crystal 1': ItemData(IC.progression, 'Crystal', (0x02, 0x34, 0x64, 0x40, 0x7F, 0x06), None, None, None, None, None, None, "a blue crystal"),
               'Crystal 2': ItemData(IC.progression, 'Crystal', (0x10, 0x34, 0x64, 0x40, 0x79, 0x06), None, None, None, None, None, None, "a blue crystal"),
               'Crystal 3': ItemData(IC.progression, 'Crystal', (0x40, 0x34, 0x64, 0x40, 0x6C, 0x06), None, None, None, None, None, None, "a blue crystal"),
diff --git a/worlds/alttp/Options.py b/worlds/alttp/Options.py
index b4b0958ac2..a89a9adb83 100644
--- a/worlds/alttp/Options.py
+++ b/worlds/alttp/Options.py
@@ -101,6 +101,12 @@ class map_shuffle(DungeonItem):
     display_name = "Map Shuffle"
 
 
+class key_drop_shuffle(Toggle):
+    """Shuffle keys found in pots and dropped from killed enemies,
+    respects the small key and big key shuffle options."""
+    display_name = "Key Drop Shuffle"
+
+
 class Crystals(Range):
     range_start = 0
     range_end = 7
@@ -432,6 +438,7 @@ alttp_options: typing.Dict[str, type(Option)] = {
     "open_pyramid": OpenPyramid,
     "bigkey_shuffle": bigkey_shuffle,
     "smallkey_shuffle": smallkey_shuffle,
+    "key_drop_shuffle": key_drop_shuffle,
     "compass_shuffle": compass_shuffle,
     "map_shuffle": map_shuffle,
     "progressive": Progressive,
diff --git a/worlds/alttp/Regions.py b/worlds/alttp/Regions.py
index 9badbd8774..0cc8a3d6a7 100644
--- a/worlds/alttp/Regions.py
+++ b/worlds/alttp/Regions.py
@@ -14,42 +14,26 @@ def create_regions(world, player):
     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',
-                                                        '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',
-                          'Blacksmiths Hut', 'Bat Cave Drop Ledge', 'Bat Cave Cave', 'Sick Kids House', 'Hobo Bridge',
-                          'Lost Woods Hideout Drop', 'Lost Woods Hideout Stump',
-                          'Lumberjack Tree Tree', 'Lumberjack Tree Cave', 'Mini Moldorm Cave', 'Ice Rod Cave',
-                          'Lake Hylia Central Island Pier',
-                          'Bonk Rock Cave', 'Library', 'Potion Shop', 'Two Brothers House (East)',
-                          'Desert Palace Stairs', 'Eastern Palace', 'Master Sword Meadow',
-                          'Sanctuary', 'Sanctuary Grave', 'Death Mountain Entrance Rock', 'Flute Spot 1',
-                          'Dark Desert Teleporter', 'East Hyrule Teleporter', 'South Hyrule Teleporter',
-                          'Kakariko Teleporter',
-                          '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']),
+                                                 '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',
+                          'Blacksmiths Hut', 'Bat Cave Drop Ledge', 'Bat Cave Cave', 'Sick Kids House', 'Hobo Bridge', 'Lost Woods Hideout Drop', 'Lost Woods Hideout Stump',
+                          'Lumberjack Tree Tree', 'Lumberjack Tree Cave', 'Mini Moldorm Cave', 'Ice Rod Cave', 'Lake Hylia Central Island Pier',
+                          'Bonk Rock Cave', 'Library', 'Potion Shop', 'Two Brothers House (East)', 'Desert Palace Stairs', 'Eastern Palace', 'Master Sword Meadow',
+                          'Sanctuary', 'Sanctuary Grave', 'Death Mountain Entrance Rock', 'Flute Spot 1', 'Dark Desert Teleporter', 'East Hyrule Teleporter', 'South Hyrule Teleporter', 'Kakariko Teleporter',
+                          '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",
-                                                                                       "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']),
+                                                                        "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_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']),
@@ -57,8 +41,7 @@ def create_regions(world, player):
         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, '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'),
@@ -79,12 +62,9 @@ def create_regions(world, player):
         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',
-                            'Kakariko Well - Right', 'Kakariko Well - Bottom'], ['Kakariko Well (top to bottom)']),
+        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',
+                                                                     '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']),
@@ -92,12 +72,9 @@ def create_regions(world, player):
         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, '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']),
@@ -105,9 +82,8 @@ def create_regions(world, player):
         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',
-                            'Mini Moldorm Cave - Far Right', 'Mini Moldorm Cave - Generous Guy']),
+        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',
+                                                                           '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'),
@@ -119,91 +95,56 @@ def create_regions(world, player):
         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'),
-        create_cave_region(world, player, 'Two Brothers House', 'a connector', None,
-                           ['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)']),
+        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', ['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'],
-                              ['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 - 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',
-                               'Eastern Palace - Big Key Chest', 'Eastern Palace - Map Chest', 'Eastern Palace - Boss',
-                               'Eastern Palace - Prize'], ['Eastern Palace Exit']),
+        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'],
+                              ['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',
+                                                                               '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',
+                                                                           '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'],
-                              ['Hyrule Castle Exit (East)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (South)',
-                               'Throne Room']),
+        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',
+                                                                         '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 Door']),
-        create_dungeon_region(world, player, 'Sewers', 'a drop\'s exit',
-                              ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
-                               'Sewers - Secret Room - Right'], ['Sanctuary Push Door', 'Sewers Back Door']),
+        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', ['Sewers - Secret Room - Left', 'Sewers - Secret Room - Middle',
+                                         'Sewers - Secret Room - Right'], ['Sanctuary Push Door', 'Sewers Back Door']),
         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'],
-                              ['Agahnim 1', 'Agahnims Tower 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, '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 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',
-                                                                                     'Paradox Cave Lower - Left',
-                                                                                     'Paradox Cave Lower - Right',
-                                                                                     'Paradox Cave Lower - Far Right',
-                                                                                     'Paradox Cave Lower - Middle',
-                                                                                     'Paradox Cave Upper - Left',
-                                                                                     'Paradox Cave Upper - Right'],
+                                                                      'Paradox Cave Lower - Left',
+                                                                      'Paradox Cave Lower - Right',
+                                                                      'Paradox Cave Lower - Far Right',
+                                                                      'Paradox Cave Lower - Middle',
+                                                                      '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,
                            ['Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Paradox Cave Drop']),
@@ -342,162 +283,98 @@ def create_regions(world, player):
         create_lw_region(world, player, 'Mimic Cave Ledge', None, ['Mimic Cave']),
         create_cave_region(world, 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 (Center)']),
-        create_dungeon_region(world, player, 'Swamp Palace (Center)', 'Swamp Palace',
-                              ['Swamp Palace - Big Chest', 'Swamp Palace - Compass Chest',
-                               'Swamp Palace - Big Key Chest', 'Swamp Palace - West Chest'], ['Swamp Palace (North)']),
-        create_dungeon_region(world, player, 'Swamp Palace (North)', 'Swamp Palace',
-                              ['Swamp Palace - Flooded Room - Left', 'Swamp Palace - Flooded Room - Right',
-                               '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',
-                               '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, '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',
+                                                                                       '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',
+                                                                                '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',
+                                                                               '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',
+                                                                            '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',
-                                                                                       'Thieves\' Town - Big Chest',
-                                                                                       '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 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 - Boss', 'Skull Woods - Prize']),
-        create_dungeon_region(world, player, 'Ice Palace (Entrance)', 'Ice Palace', None,
-                              ['Ice Palace Entrance Room', 'Ice Palace Exit']),
-        create_dungeon_region(world, player, 'Ice Palace (Main)', 'Ice Palace',
-                              ['Ice Palace - Compass Chest', 'Ice Palace - Freezor Chest',
-                               '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']),
-        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',
-                               'Misery Mire - Bridge Chest', 'Misery Mire - Spike Chest'],
-                              ['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',
-                               'Turtle Rock - Roller Room - Right'],
-                              ['Turtle Rock Pokey Room', 'Turtle Rock Entrance Gap Reverse']),
-        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 Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase',
-                               'Turtle Rock Big Key Door']),
-        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)', '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 Isolated Ledge Exit']),
-        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'],
-                              ['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'],
+                                                                        '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 (Second Section)', 'Ice Palace Exit']),
+        create_dungeon_region(world, player, 'Ice Palace (Second Section)', 'Ice Palace', ['Ice Palace - Conveyor Key Drop', 'Ice Palace - Compass Chest'], ['Ice Palace (Main)']),
+        create_dungeon_region(world, 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',
+                                                                    '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',
+                                                                             '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 Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door']),
+        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)', '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 Isolated Ledge Exit']),
+        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'],
+                              ['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'],
                               ['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',
-                               'Ganons Tower - Hope Room - Right'],
-                              ['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',
-                               'Ganons Tower - Compass Room - Bottom Left',
-                               'Ganons Tower - Compass Room - Bottom Right'], ['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',
-                               'Ganons Tower - DMs Room - Bottom Left', 'Ganons Tower - DMs Room - Bottom Right'],
+        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',
+                                                                                    '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',
+                                                                                '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',
+                                                                                         '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',
-                               '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',
-                               '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',
-                               'Ganons Tower - Pre-Moldorm Chest'], ['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_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',
+                                                                                 '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',
+                                                                          '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',
+                                                                                  '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']),
@@ -505,8 +382,6 @@ def create_regions(world, player):
         create_dw_region(world, player, 'Dark Death Mountain Bunny Descent Area')
     ]
 
-    world.initialize_regions()
-
 
 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)
@@ -533,8 +408,12 @@ def _create_region(world: MultiWorld, player: int, name: str, type: LTTPRegionTy
             ret.exits.append(Entrance(player, exit, ret))
     if locations:
         for location in locations:
-            address, player_address, crystal, hint_text = location_table[location]
-            ret.locations.append(ALttPLocation(player, location, address, crystal, hint_text, ret, player_address))
+            if location in key_drop_data:
+                ko_hint = key_drop_data[location][2]
+                ret.locations.append(ALttPLocation(player, location, key_drop_data[location][1], False, ko_hint, ret, key_drop_data[location][0]))
+            else:
+                address, player_address, crystal, hint_text = location_table[location]
+                ret.locations.append(ALttPLocation(player, location, address, crystal, hint_text, ret, player_address))
     return ret
 
 
@@ -587,39 +466,39 @@ old_location_address_to_new_location_address = {
 
 
 key_drop_data = {
-    'Hyrule Castle - Map Guard Key Drop': [0x140036, 0x140037],
-    'Hyrule Castle - Boomerang Guard Key Drop': [0x140033, 0x140034],
-    'Hyrule Castle - Key Rat Key Drop': [0x14000c, 0x14000d],
-    'Hyrule Castle - Big Key Drop': [0x14003c, 0x14003d],
-    'Eastern Palace - Dark Square Pot Key': [0x14005a, 0x14005b],
-    'Eastern Palace - Dark Eyegore Key Drop': [0x140048, 0x140049],
-    'Desert Palace - Desert Tiles 1 Pot Key': [0x140030, 0x140031],
-    'Desert Palace - Beamos Hall Pot Key': [0x14002a, 0x14002b],
-    'Desert Palace - Desert Tiles 2 Pot Key': [0x140027, 0x140028],
-    'Castle Tower - Dark Archer Key Drop': [0x140060, 0x140061],
-    'Castle Tower - Circle of Pots Key Drop': [0x140051, 0x140052],
-    'Swamp Palace - Pot Row Pot Key': [0x140018, 0x140019],
-    'Swamp Palace - Trench 1 Pot Key': [0x140015, 0x140016],
-    'Swamp Palace - Hookshot Pot Key': [0x140012, 0x140013],
-    'Swamp Palace - Trench 2 Pot Key': [0x14000f, 0x140010],
-    'Swamp Palace - Waterway Pot Key': [0x140009, 0x14000a],
-    'Skull Woods - West Lobby Pot Key': [0x14002d, 0x14002e],
-    'Skull Woods - Spike Corner Key Drop': [0x14001b, 0x14001c],
-    'Thieves\' Town - Hallway Pot Key': [0x14005d, 0x14005e],
-    'Thieves\' Town - Spike Switch Pot Key': [0x14004e, 0x14004f],
-    'Ice Palace - Jelly Key Drop': [0x140003, 0x140004],
-    'Ice Palace - Conveyor Key Drop': [0x140021, 0x140022],
-    'Ice Palace - Hammer Block Key Drop': [0x140024, 0x140025],
-    'Ice Palace - Many Pots Pot Key': [0x140045, 0x140046],
-    'Misery Mire - Spikes Pot Key': [0x140054, 0x140055],
-    'Misery Mire - Fishbone Pot Key': [0x14004b, 0x14004c],
-    'Misery Mire - Conveyor Crystal Key Drop': [0x140063, 0x140064],
-    'Turtle Rock - Pokey 1 Key Drop': [0x140057, 0x140058],
-    'Turtle Rock - Pokey 2 Key Drop': [0x140006, 0x140007],
-    'Ganons Tower - Conveyor Cross Pot Key': [0x14003f, 0x140040],
-    'Ganons Tower - Double Switch Pot Key': [0x140042, 0x140043],
-    'Ganons Tower - Conveyor Star Pits Pot Key': [0x140039, 0x14003a],
-    'Ganons Tower - Mini Helmasaur Key Drop': [0x14001e, 0x14001f]
+    'Hyrule Castle - Map Guard Key Drop': [0x140036, 0x140037, 'in Hyrule Castle', 'Small Key (Hyrule Castle)'],
+    'Hyrule Castle - Boomerang Guard Key Drop': [0x140033, 0x140034, 'in Hyrule Castle', 'Small Key (Hyrule Castle)'],
+    'Sewers - Key Rat Key Drop': [0x14000c, 0x14000d, 'in the sewers', 'Small Key (Hyrule Castle)'],
+    'Hyrule Castle - Big Key Drop': [0x14003c, 0x14003d, 'in Hyrule Castle', 'Big Key (Hyrule Castle)'],
+    'Eastern Palace - Dark Square Pot Key': [0x14005a, 0x14005b, 'in Eastern Palace', 'Small Key (Eastern Palace)'],
+    'Eastern Palace - Dark Eyegore Key Drop': [0x140048, 0x140049, 'in Eastern Palace', 'Small Key (Eastern Palace)'],
+    'Desert Palace - Desert Tiles 1 Pot Key': [0x140030, 0x140031, 'in Desert Palace', 'Small Key (Desert Palace)'],
+    'Desert Palace - Beamos Hall Pot Key': [0x14002a, 0x14002b, 'in Desert Palace', 'Small Key (Desert Palace)'],
+    'Desert Palace - Desert Tiles 2 Pot Key': [0x140027, 0x140028, 'in Desert Palace', 'Small Key (Desert Palace)'],
+    'Castle Tower - Dark Archer Key Drop': [0x140060, 0x140061, 'in Castle Tower', 'Small Key (Agahnims Tower)'],
+    'Castle Tower - Circle of Pots Key Drop': [0x140051, 0x140052, 'in Castle Tower', 'Small Key (Agahnims Tower)'],
+    'Swamp Palace - Pot Row Pot Key': [0x140018, 0x140019, 'in Swamp Palace', 'Small Key (Swamp Palace)'],
+    'Swamp Palace - Trench 1 Pot Key': [0x140015, 0x140016, 'in Swamp Palace', 'Small Key (Swamp Palace)'],
+    'Swamp Palace - Hookshot Pot Key': [0x140012, 0x140013, 'in Swamp Palace', 'Small Key (Swamp Palace)'],
+    'Swamp Palace - Trench 2 Pot Key': [0x14000f, 0x140010, 'in Swamp Palace', 'Small Key (Swamp Palace)'],
+    'Swamp Palace - Waterway Pot Key': [0x140009, 0x14000a, 'in Swamp Palace', 'Small Key (Swamp Palace)'],
+    'Skull Woods - West Lobby Pot Key': [0x14002d, 0x14002e, 'in Skull Woods', 'Small Key (Skull Woods)'],
+    'Skull Woods - Spike Corner Key Drop': [0x14001b, 0x14001c, 'near Mothula', 'Small Key (Skull Woods)'],
+    "Thieves' Town - Hallway Pot Key": [0x14005d, 0x14005e, "in Thieves' Town", 'Small Key (Thieves Town)'],
+    "Thieves' Town - Spike Switch Pot Key": [0x14004e, 0x14004f, "in Thieves' Town", 'Small Key (Thieves Town)'],
+    'Ice Palace - Jelly Key Drop': [0x140003, 0x140004, 'in Ice Palace', 'Small Key (Ice Palace)'],
+    'Ice Palace - Conveyor Key Drop': [0x140021, 0x140022, 'in Ice Palace', 'Small Key (Ice Palace)'],
+    'Ice Palace - Hammer Block Key Drop': [0x140024, 0x140025, 'in Ice Palace', 'Small Key (Ice Palace)'],
+    'Ice Palace - Many Pots Pot Key': [0x140045, 0x140046, 'in Ice Palace', 'Small Key (Ice Palace)'],
+    'Misery Mire - Spikes Pot Key': [0x140054, 0x140055 , 'in Misery Mire', 'Small Key (Misery Mire)'],
+    'Misery Mire - Fishbone Pot Key': [0x14004b, 0x14004c, 'in forgotten Mire', 'Small Key (Misery Mire)'],
+    'Misery Mire - Conveyor Crystal Key Drop': [0x140063, 0x140064 , 'in Misery Mire', 'Small Key (Misery Mire)'],
+    'Turtle Rock - Pokey 1 Key Drop': [0x140057, 0x140058, 'in Turtle Rock', 'Small Key (Turtle Rock)'],
+    'Turtle Rock - Pokey 2 Key Drop': [0x140006, 0x140007, 'in Turtle Rock', 'Small Key (Turtle Rock)'],
+    'Ganons Tower - Conveyor Cross Pot Key': [0x14003f, 0x140040, "in Ganon's Tower", 'Small Key (Ganons Tower)'],
+    'Ganons Tower - Double Switch Pot Key': [0x140042, 0x140043, "in Ganon's Tower", 'Small Key (Ganons Tower)'],
+    'Ganons Tower - Conveyor Star Pits Pot Key': [0x140039, 0x14003a, "in Ganon's Tower", 'Small Key (Ganons Tower)'],
+    'Ganons Tower - Mini Helmasaur Key Drop': [0x14001e, 0x14001f, "atop Ganon's Tower", 'Small Key (Ganons Tower)']
 }
 
 # tuple contents:
diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py
index ed222b5f5d..b80cec578a 100644
--- a/worlds/alttp/Rom.py
+++ b/worlds/alttp/Rom.py
@@ -25,7 +25,7 @@ from Utils import local_path, user_path, int16_as_bytes, int32_as_bytes, snes_to
 
 from .Shops import ShopType, ShopPriceType
 from .Dungeons import dungeon_music_addresses
-from .Regions import old_location_address_to_new_location_address
+from .Regions import old_location_address_to_new_location_address, key_drop_data
 from .Text import MultiByteTextMapper, text_addresses, Credits, TextTable
 from .Text import Uncle_texts, Ganon1_texts, TavernMan_texts, Sahasrahla2_texts, Triforce_texts, \
     Blind_texts, \
@@ -428,6 +428,18 @@ def patch_enemizer(world, rom: LocalRom, enemizercli, output_directory):
         rom.write_byte(0x04DE81, 6)
         rom.write_byte(0x1B0101, 0)  # Do not close boss room door on entry.
 
+    # Moblins attached to "key drop" locations crash the game when dropping their item when Key Drop Shuffle is on.
+    # Replace them with a Slime enemy if they are placed.
+    if multiworld.key_drop_shuffle[player]:
+        key_drop_enemies = {
+            0x4DA20, 0x4DA5C, 0x4DB7F, 0x4DD73, 0x4DDC3, 0x4DE07, 0x4E201,
+            0x4E20A, 0x4E326, 0x4E4F7, 0x4E686, 0x4E70C, 0x4E7C8, 0x4E7FA
+        }
+        for enemy in key_drop_enemies:
+            if rom.read_byte(enemy) == 0x12:
+                logging.debug(f"Moblin found and replaced at {enemy} in world {player}")
+                rom.write_byte(enemy, 0x8F)
+
     for used in (randopatch_path, options_path):
         try:
             os.remove(used)
@@ -771,11 +783,12 @@ def get_nonnative_item_sprite(code: int) -> int:
 
 def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     local_random = world.per_slot_randoms[player]
+    local_world = world.worlds[player]
 
     # patch items
 
-    for location in world.get_locations():
-        if location.player != player or location.address is None or location.shop_slot is not None:
+    for location in world.get_locations(player):
+        if location.address is None or location.shop_slot is not None:
             continue
 
         itemid = location.item.code if location.item is not None else 0x5A
@@ -897,6 +910,29 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
         credits_total += 30 if 'w' in world.shop_shuffle[player] else 27
 
     rom.write_byte(0x187010, credits_total)  # dynamic credits
+
+    if world.key_drop_shuffle[player]:
+        rom.write_byte(0x140000, 1)  # enable key drop shuffle
+        credits_total += len(key_drop_data)
+        # update dungeon counters
+        rom.write_byte(0x187001, 12)  # Hyrule Castle
+        rom.write_byte(0x187002, 8)  # Eastern Palace
+        rom.write_byte(0x187003, 9)  # Desert Palace
+        rom.write_byte(0x187004, 4)  # Agahnims Tower
+        rom.write_byte(0x187005, 15)  # Swamp Palace
+        rom.write_byte(0x187007, 11)  # Misery Mire
+        rom.write_byte(0x187008, 10)  # Skull Woods
+        rom.write_byte(0x187009, 12)  # Ice Palace
+        rom.write_byte(0x18700B, 10)  # Thieves Town
+        rom.write_byte(0x18700C, 14)  # Turtle Rock
+        rom.write_byte(0x18700D, 31)  # Ganons Tower
+        # update credits GT Big Key counter
+        gt_bigkey_top, gt_bigkey_bottom = credits_digit(5)
+        rom.write_byte(0x118B6A, gt_bigkey_top)
+        rom.write_byte(0x118B88, gt_bigkey_bottom)
+
+
+
     # collection rate address: 238C37
     first_top, first_bot = credits_digit((credits_total / 100) % 10)
     mid_top, mid_bot = credits_digit((credits_total / 10) % 10)
@@ -1155,12 +1191,8 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     ])
 
     # set Fountain bottle exchange items
-    if world.difficulty[player] in ['hard', 'expert']:
-        rom.write_byte(0x348FF, [0x16, 0x2B, 0x2C, 0x2D, 0x3C, 0x48][local_random.randint(0, 5)])
-        rom.write_byte(0x3493B, [0x16, 0x2B, 0x2C, 0x2D, 0x3C, 0x48][local_random.randint(0, 5)])
-    else:
-        rom.write_byte(0x348FF, [0x16, 0x2B, 0x2C, 0x2D, 0x3C, 0x3D, 0x48][local_random.randint(0, 6)])
-        rom.write_byte(0x3493B, [0x16, 0x2B, 0x2C, 0x2D, 0x3C, 0x3D, 0x48][local_random.randint(0, 6)])
+    rom.write_byte(0x348FF, item_table[local_world.waterfall_fairy_bottle_fill].item_code)
+    rom.write_byte(0x3493B, item_table[local_world.pyramid_fairy_bottle_fill].item_code)
 
     # enable Fat Fairy Chests
     rom.write_bytes(0x1FC16, [0xB1, 0xC6, 0xF9, 0xC9, 0xC6, 0xF9])
@@ -1824,10 +1856,10 @@ def apply_oof_sfx(rom, oof: str):
     # (We need to insert the second sigil at the end)
     rom.write_bytes(0x12803A, oof_bytes)
     rom.write_bytes(0x12803A + len(oof_bytes), [0xEB, 0xEB])
-	
+
 	#Enemizer patch: prevent Enemizer from overwriting $3188 in SPC memory with an unused sound effect ("WHAT")
     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,
@@ -2212,7 +2244,7 @@ def write_strings(rom, world, player):
                 tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles can have hints!'
             hint_locations = HintLocations.copy()
             local_random.shuffle(hint_locations)
-            all_entrances = [entrance for entrance in world.get_entrances() if entrance.player == player]
+            all_entrances = list(world.get_entrances(player))
             local_random.shuffle(all_entrances)
 
             # First we take care of the one inconvenient dungeon in the appropriately simple shuffles.
diff --git a/worlds/alttp/Rules.py b/worlds/alttp/Rules.py
index ce4a941ead..8a04f87afa 100644
--- a/worlds/alttp/Rules.py
+++ b/worlds/alttp/Rules.py
@@ -136,7 +136,8 @@ def mirrorless_path_to_castle_courtyard(world, player):
 
 def set_defeat_dungeon_boss_rule(location):
     # Lambda required to defer evaluation of dungeon.boss since it will change later if boss shuffle is used
-    set_rule(location, lambda state: location.parent_region.dungeon.boss.can_defeat(state))
+    add_rule(location, lambda state: location.parent_region.dungeon.boss.can_defeat(state))
+
 
 def set_always_allow(spot, rule):
     spot.always_allow = rule
@@ -197,8 +198,13 @@ def global_rules(world, player):
     # determines which S&Q locations are available - hide from paths since it isn't an in-game location
     for exit in world.get_region('Menu', player).exits:
         exit.hide_path = True
-
-    set_rule(world.get_entrance('Old Man S&Q', player), lambda state: state.can_reach('Old Man', 'Location', player))
+    try:
+        old_man_sq = world.get_entrance('Old Man S&Q', player)
+    except KeyError:
+        pass  # it doesn't exist, should be dungeon-only unittests
+    else:
+        old_man = world.get_location("Old Man", player)
+        set_rule(old_man_sq, lambda state: old_man.can_reach(state))
 
     set_rule(world.get_location('Sunken Treasure', player), lambda state: state.has('Open Floodgate', player))
     set_rule(world.get_location('Dark Blacksmith Ruins', player), lambda state: state.has('Return Smith', player))
@@ -231,26 +237,41 @@ def global_rules(world, player):
     set_rule(world.get_location('Hookshot Cave - Bottom Left', player), lambda state: state.has('Hookshot', player))
 
     set_rule(world.get_entrance('Sewers Door', player),
-             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player) or (
+             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 4) or (
                          world.smallkey_shuffle[player] == smallkey_shuffle.option_universal and world.mode[
                      player] == 'standard'))  # standard universal small keys cannot access the shop
     set_rule(world.get_entrance('Sewers Back Door', player),
-             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player))
+             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 4))
     set_rule(world.get_entrance('Agahnim 1', player),
-             lambda state: has_sword(state, player) and state._lttp_has_key('Small Key (Agahnims Tower)', player, 2))
+             lambda state: has_sword(state, player) and state._lttp_has_key('Small Key (Agahnims Tower)', player, 4))
 
     set_rule(world.get_location('Castle Tower - Room 03', player), lambda state: can_kill_most_things(state, player, 8))
     set_rule(world.get_location('Castle Tower - Dark Maze', player),
              lambda state: can_kill_most_things(state, player, 8) and state._lttp_has_key('Small Key (Agahnims Tower)',
                                                                                    player))
-
+    set_rule(world.get_location('Castle Tower - Dark Archer Key Drop', player),
+             lambda state: can_kill_most_things(state, player, 8) and state._lttp_has_key('Small Key (Agahnims Tower)',
+                                                                                   player, 2))
+    set_rule(world.get_location('Castle Tower - Circle of Pots Key Drop', player),
+             lambda state: can_kill_most_things(state, player, 8) and state._lttp_has_key('Small Key (Agahnims Tower)',
+                                                                                   player, 3))
+    set_always_allow(world.get_location('Eastern Palace - Big Key Chest', player),
+                     lambda state, item: item.name == 'Big Key (Eastern Palace)' and item.player == player)
+    set_rule(world.get_location('Eastern Palace - Big Key Chest', player),
+             lambda state: state._lttp_has_key('Small Key (Eastern Palace)', player, 2) or
+             ((location_item_name(state, 'Eastern Palace - Big Key Chest', player) == ('Big Key (Eastern Palace)', player)
+              and state.has('Small Key (Eastern Palace)', player))))
+    set_rule(world.get_location('Eastern Palace - Dark Eyegore Key Drop', player),
+             lambda state: state.has('Big Key (Eastern Palace)', player))
     set_rule(world.get_location('Eastern Palace - Big Chest', player),
              lambda state: state.has('Big Key (Eastern Palace)', player))
     ep_boss = world.get_location('Eastern Palace - Boss', player)
     set_rule(ep_boss, lambda state: state.has('Big Key (Eastern Palace)', player) and
+                                    state._lttp_has_key('Small Key (Eastern Palace)', player, 2) and
                                     ep_boss.parent_region.dungeon.boss.can_defeat(state))
     ep_prize = world.get_location('Eastern Palace - Prize', player)
     set_rule(ep_prize, lambda state: state.has('Big Key (Eastern Palace)', player) and
+                                     state._lttp_has_key('Small Key (Eastern Palace)', player, 2) and
                                      ep_prize.parent_region.dungeon.boss.can_defeat(state))
     if not world.enemy_shuffle[player]:
         add_rule(ep_boss, lambda state: can_shoot_arrows(state, player))
@@ -258,9 +279,13 @@ def global_rules(world, player):
 
     set_rule(world.get_location('Desert Palace - Big Chest', player), lambda state: state.has('Big Key (Desert Palace)', player))
     set_rule(world.get_location('Desert Palace - Torch', player), lambda state: state.has('Pegasus Boots', player))
-    set_rule(world.get_entrance('Desert Palace East Wing', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player))
-    set_rule(world.get_location('Desert Palace - Prize', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player) and state.has('Big Key (Desert Palace)', player) and has_fire_source(state, player) and state.multiworld.get_location('Desert Palace - Prize', player).parent_region.dungeon.boss.can_defeat(state))
-    set_rule(world.get_location('Desert Palace - Boss', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player) and state.has('Big Key (Desert Palace)', player) and has_fire_source(state, player) and state.multiworld.get_location('Desert Palace - Boss', player).parent_region.dungeon.boss.can_defeat(state))
+
+    set_rule(world.get_entrance('Desert Palace East Wing', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player, 4))
+    set_rule(world.get_location('Desert Palace - Big Key Chest', player), lambda state: can_kill_most_things(state, player))
+    set_rule(world.get_location('Desert Palace - Beamos Hall Pot Key', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player, 2) and can_kill_most_things(state, player))
+    set_rule(world.get_location('Desert Palace - Desert Tiles 2 Pot Key', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player, 3) and can_kill_most_things(state, player))
+    set_rule(world.get_location('Desert Palace - Prize', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player, 4) and state.has('Big Key (Desert Palace)', player) and has_fire_source(state, player) and state.multiworld.get_location('Desert Palace - Prize', player).parent_region.dungeon.boss.can_defeat(state))
+    set_rule(world.get_location('Desert Palace - Boss', player), lambda state: state._lttp_has_key('Small Key (Desert Palace)', player, 4) and state.has('Big Key (Desert Palace)', player) and has_fire_source(state, player) and state.multiworld.get_location('Desert Palace - Boss', player).parent_region.dungeon.boss.can_defeat(state))
 
     # logic patch to prevent placing a crystal in Desert that's required to reach the required keys
     if not (world.smallkey_shuffle[player] and world.bigkey_shuffle[player]):
@@ -275,57 +300,98 @@ def global_rules(world, player):
 
     set_rule(world.get_entrance('Swamp Palace Moat', player), lambda state: state.has('Flippers', player) and state.has('Open Floodgate', player))
     set_rule(world.get_entrance('Swamp Palace Small Key Door', player), lambda state: state._lttp_has_key('Small Key (Swamp Palace)', player))
-    set_rule(world.get_entrance('Swamp Palace (Center)', player), lambda state: state.has('Hammer', player))
+    set_rule(world.get_location('Swamp Palace - Trench 1 Pot Key', player), lambda state: state._lttp_has_key('Small Key (Swamp Palace)', player, 2))
+    set_rule(world.get_entrance('Swamp Palace (Center)', player), lambda state: state.has('Hammer', player) and state._lttp_has_key('Small Key (Swamp Palace)', player, 3))
+    set_rule(world.get_location('Swamp Palace - Hookshot Pot Key', player), lambda state: state.has('Hookshot', player))
+    set_rule(world.get_entrance('Swamp Palace (West)', player), lambda state: state._lttp_has_key('Small Key (Swamp Palace)', player, 6)
+        if state.has('Hookshot', player)
+        else state._lttp_has_key('Small Key (Swamp Palace)', player, 4))
     set_rule(world.get_location('Swamp Palace - Big Chest', player), lambda state: state.has('Big Key (Swamp Palace)', player))
     if world.accessibility[player] != 'locations':
         allow_self_locking_items(world.get_location('Swamp Palace - Big Chest', player), 'Big Key (Swamp Palace)')
-    set_rule(world.get_entrance('Swamp Palace (North)', player), lambda state: state.has('Hookshot', player))
+    set_rule(world.get_entrance('Swamp Palace (North)', player), lambda state: state.has('Hookshot', player) and state._lttp_has_key('Small Key (Swamp Palace)', player, 5))
     if not world.smallkey_shuffle[player] and world.logic[player] not in ['hybridglitches', 'nologic']:
         forbid_item(world.get_location('Swamp Palace - Entrance', player), 'Big Key (Swamp Palace)', player)
+    set_rule(world.get_location('Swamp Palace - Prize', player), lambda state: state._lttp_has_key('Small Key (Swamp Palace)', player, 6))
+    set_rule(world.get_location('Swamp Palace - Boss', player), lambda state: state._lttp_has_key('Small Key (Swamp Palace)', player, 6))
 
     set_rule(world.get_entrance('Thieves Town Big Key Door', player), lambda state: state.has('Big Key (Thieves Town)', player))
-    set_rule(world.get_entrance('Blind Fight', player), lambda state: state._lttp_has_key('Small Key (Thieves Town)', player))
-    set_rule(world.get_location('Thieves\' Town - Big Chest', player), lambda state: (state._lttp_has_key('Small Key (Thieves Town)', player)) and state.has('Hammer', player))
+
+    if world.worlds[player].dungeons["Thieves Town"].boss.enemizer_name == "Blind":
+        set_rule(world.get_entrance('Blind Fight', player), lambda state: state._lttp_has_key('Small Key (Thieves Town)', player, 3))
+
+    set_rule(world.get_location('Thieves\' Town - Big Chest', player),
+             lambda state: (state._lttp_has_key('Small Key (Thieves Town)', player, 3)) and state.has('Hammer', player))
     if world.accessibility[player] != 'locations':
         allow_self_locking_items(world.get_location('Thieves\' Town - Big Chest', player), 'Small Key (Thieves Town)')
-    set_rule(world.get_location('Thieves\' Town - Attic', player), lambda state: state._lttp_has_key('Small Key (Thieves Town)', player))
 
-    set_rule(world.get_entrance('Skull Woods First Section South Door', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player))
-    set_rule(world.get_entrance('Skull Woods First Section (Right) North Door', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player))
-    set_rule(world.get_entrance('Skull Woods First Section West Door', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 2))  # ideally would only be one key, but we may have spent thst key already on escaping the right section
-    set_rule(world.get_entrance('Skull Woods First Section (Left) Door to Exit', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 2))
+    set_rule(world.get_location('Thieves\' Town - Attic', player), lambda state: state._lttp_has_key('Small Key (Thieves Town)', player, 3))
+    set_rule(world.get_location('Thieves\' Town - Spike Switch Pot Key', player),
+             lambda state: state._lttp_has_key('Small Key (Thieves Town)', player))
+
+    # We need so many keys in the SW doors because they are all reachable as the last door (except for the door to mothula)
+    set_rule(world.get_entrance('Skull Woods First Section South Door', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 5))
+    set_rule(world.get_entrance('Skull Woods First Section (Right) North Door', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 5))
+    set_rule(world.get_entrance('Skull Woods First Section West Door', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 5))
+    set_rule(world.get_entrance('Skull Woods First Section (Left) Door to Exit', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 5))
     set_rule(world.get_location('Skull Woods - Big Chest', player), lambda state: state.has('Big Key (Skull Woods)', player))
     if world.accessibility[player] != 'locations':
         allow_self_locking_items(world.get_location('Skull Woods - Big Chest', player), 'Big Key (Skull Woods)')
-    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) and has_sword(state, player))  # sword required for curtain
+    set_rule(world.get_entrance('Skull Woods Torch Room', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 4) and state.has('Fire Rod', player) and has_sword(state, player))  # sword required for curtain
+    add_rule(world.get_location('Skull Woods - Prize', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 5))
+    add_rule(world.get_location('Skull Woods - Boss', player), lambda state: state._lttp_has_key('Small Key (Skull Woods)', player, 5))
 
-    set_rule(world.get_entrance('Ice Palace Entrance Room', player), lambda state: can_melt_things(state, player))
+    set_rule(world.get_location('Ice Palace - Jelly Key Drop', player), lambda state: can_melt_things(state, player))
+    set_rule(world.get_entrance('Ice Palace (Second Section)', player), lambda state: can_melt_things(state, player) and state._lttp_has_key('Small Key (Ice Palace)', player))
+    set_rule(world.get_entrance('Ice Palace (Main)', player), lambda state: state._lttp_has_key('Small Key (Ice Palace)', player, 2))
     set_rule(world.get_location('Ice Palace - Big Chest', player), lambda state: state.has('Big Key (Ice Palace)', player))
-    set_rule(world.get_entrance('Ice Palace (Kholdstare)', player), lambda state: can_lift_rocks(state, player) and state.has('Hammer', player) and state.has('Big Key (Ice Palace)', player) and (state._lttp_has_key('Small Key (Ice Palace)', player, 2) or (state.has('Cane of Somaria', player) and state._lttp_has_key('Small Key (Ice Palace)', player, 1))))
-    set_rule(world.get_entrance('Ice Palace (East)', player), lambda state: (state.has('Hookshot', player) or (
-            item_name_in_location_names(state, 'Big Key (Ice Palace)', player, [('Ice Palace - Spike Room', player), ('Ice Palace - Big Key Chest', player), ('Ice Palace - Map Chest', player)]) and state._lttp_has_key('Small Key (Ice Palace)', player))) and (state.multiworld.can_take_damage[player] or state.has('Hookshot', player) or state.has('Cape', player) or state.has('Cane of Byrna', player)))
+    set_rule(world.get_entrance('Ice Palace (Kholdstare)', player), lambda state: can_lift_rocks(state, player) and state.has('Hammer', player) and state.has('Big Key (Ice Palace)', player) and (state._lttp_has_key('Small Key (Ice Palace)', player, 6) or (state.has('Cane of Somaria', player) and state._lttp_has_key('Small Key (Ice Palace)', player, 5))))
+    # This is a complicated rule, so let's break it down.
+    # Hookshot always suffices to get to the right side.
+    # Also, once you get over there, you have to cross the spikes, so that's the last line.
+    # Alternatively, we could not have hookshot. Then we open the keydoor into right side in order to get there.
+    # This is conditional on whether we have the big key or not, as big key opens the ability to waste more keys.
+    # Specifically, if we have big key we can burn 2 extra keys near the boss and will need +2 keys. That's all of them as this could be the last door.
+    # Hence if big key is available then it's 6 keys, otherwise 4 keys.
+    # If key_drop is off, then we have 3 drop keys available, and can never satisfy the 6 key requirement because one key is on right side,
+    # so this reduces perfectly to original logic.
+    set_rule(world.get_entrance('Ice Palace (East)', player), lambda state: (state.has('Hookshot', player) or
+        (state._lttp_has_key('Small Key (Ice Palace)', player, 4)
+            if item_name_in_location_names(state, 'Big Key (Ice Palace)', player, [('Ice Palace - Spike Room', player),
+                ('Ice Palace - Hammer Block Key Drop', player),
+                ('Ice Palace - Big Key Chest', player),
+                ('Ice Palace - Map Chest', player)])
+            else state._lttp_has_key('Small Key (Ice Palace)', player, 6))) and
+        (state.multiworld.can_take_damage[player] or state.has('Hookshot', player) or state.has('Cape', player) or state.has('Cane of Byrna', player)))
     set_rule(world.get_entrance('Ice Palace (East Top)', player), lambda state: can_lift_rocks(state, player) and state.has('Hammer', player))
 
     set_rule(world.get_entrance('Misery Mire Entrance Gap', player), lambda state: (state.has('Pegasus Boots', player) or state.has('Hookshot', player)) and (has_sword(state, player) or state.has('Fire Rod', player) or state.has('Ice Rod', player) or state.has('Hammer', player) or state.has('Cane of Somaria', player) or can_shoot_arrows(state, player)))  # need to defeat wizzrobes, bombs don't work ...
+    set_rule(world.get_location('Misery Mire - Fishbone Pot Key', player), lambda state: state.has('Big Key (Misery Mire)', player) or state._lttp_has_key('Small Key (Misery Mire)', player, 4))
+
     set_rule(world.get_location('Misery Mire - Big Chest', player), lambda state: state.has('Big Key (Misery Mire)', player))
     set_rule(world.get_location('Misery Mire - Spike Chest', player), lambda state: (state.multiworld.can_take_damage[player] and has_hearts(state, player, 4)) or state.has('Cane of Byrna', player) or state.has('Cape', player))
     set_rule(world.get_entrance('Misery Mire Big Key Door', player), lambda state: state.has('Big Key (Misery Mire)', player))
-    # you can squander the free small key from the pot by opening the south door to the north west switch room, locking you out of accessing a color switch ...
-    # big key gives backdoor access to that from the teleporter in the north west
-    set_rule(world.get_location('Misery Mire - Map Chest', player), lambda state: state._lttp_has_key('Small Key (Misery Mire)', player, 1) or state.has('Big Key (Misery Mire)', player))
-    set_rule(world.get_location('Misery Mire - Main Lobby', player), lambda state: state._lttp_has_key('Small Key (Misery Mire)', player, 1) or state._lttp_has_key('Big Key (Misery Mire)', player))
+    # How to access crystal switch:
+    # If have big key: then you will need 2 small keys to be able to hit switch and return to main area, as you can burn key in dark room
+    # If not big key: cannot burn key in dark room, hence need only 1 key. all doors immediately available lead to a crystal switch.
+    # The listed chests are those which can be reached if you can reach a crystal switch.
+    set_rule(world.get_location('Misery Mire - Map Chest', player), lambda state: state._lttp_has_key('Small Key (Misery Mire)', player, 2))
+    set_rule(world.get_location('Misery Mire - Main Lobby', player), lambda state: state._lttp_has_key('Small Key (Misery Mire)', player, 2))
     # we can place a small key in the West wing iff it also contains/blocks the Big Key, as we cannot reach and softlock with the basement key door yet
-    set_rule(world.get_entrance('Misery Mire (West)', player), lambda state: state._lttp_has_key('Small Key (Misery Mire)', player, 2) if ((
-                                                                                                                                                 location_item_name(state, 'Misery Mire - Compass Chest', player) in [('Big Key (Misery Mire)', player)]) or
-                                                                                                                                     (
-                                                                                                                                                 location_item_name(state, 'Misery Mire - Big Key Chest', player) in [('Big Key (Misery Mire)', player)])) else state._lttp_has_key('Small Key (Misery Mire)', player, 3))
+    set_rule(world.get_location('Misery Mire - Conveyor Crystal Key Drop', player),
+             lambda state: state._lttp_has_key('Small Key (Misery Mire)', player, 4)
+             if location_item_name(state, 'Misery Mire - Compass Chest', player) == ('Big Key (Misery Mire)', player) or location_item_name(state, 'Misery Mire - Big Key Chest', player) == ('Big Key (Misery Mire)', player) or location_item_name(state, 'Misery Mire - Conveyor Crystal Key Drop', player) == ('Big Key (Misery Mire)', player)
+             else state._lttp_has_key('Small Key (Misery Mire)', player, 5))
+    set_rule(world.get_entrance('Misery Mire (West)', player), lambda state: state._lttp_has_key('Small Key (Misery Mire)', player, 5)
+        if ((location_item_name(state, 'Misery Mire - Compass Chest', player) in [('Big Key (Misery Mire)', player)]) or (location_item_name(state, 'Misery Mire - Big Key Chest', player) in [('Big Key (Misery Mire)', player)]))
+        else state._lttp_has_key('Small Key (Misery Mire)', player, 6))
     set_rule(world.get_location('Misery Mire - Compass Chest', player), lambda state: has_fire_source(state, player))
     set_rule(world.get_location('Misery Mire - Big Key Chest', player), lambda state: has_fire_source(state, player))
     set_rule(world.get_entrance('Misery Mire (Vitreous)', player), lambda state: state.has('Cane of Somaria', player))
 
     set_rule(world.get_entrance('Turtle Rock Entrance Gap', player), lambda state: state.has('Cane of Somaria', player))
     set_rule(world.get_entrance('Turtle Rock Entrance Gap Reverse', player), lambda state: state.has('Cane of Somaria', player))
-    set_rule(world.get_location('Turtle Rock - Compass Chest', player), lambda state: state.has('Cane of Somaria', player))  # We could get here from the middle section without Cane as we don't cross the entrance gap!
+    set_rule(world.get_location('Turtle Rock - Compass Chest', player), lambda state: state.has('Cane of Somaria', player))
     set_rule(world.get_location('Turtle Rock - Roller Room - Left', player), lambda state: state.has('Cane of Somaria', player) and state.has('Fire Rod', player))
     set_rule(world.get_location('Turtle Rock - Roller Room - Right', player), lambda state: state.has('Cane of Somaria', player) and state.has('Fire Rod', player))
     set_rule(world.get_location('Turtle Rock - Big Chest', player), lambda state: state.has('Big Key (Turtle Rock)', player) and (state.has('Cane of Somaria', player) or state.has('Hookshot', player)))
@@ -337,7 +403,7 @@ def global_rules(world, player):
     set_rule(world.get_location('Turtle Rock - Eye Bridge - Bottom Right', player), lambda state: state.has('Cane of Byrna', player) or state.has('Cape', player) or state.has('Mirror Shield', player))
     set_rule(world.get_location('Turtle Rock - Eye Bridge - Top Left', player), lambda state: state.has('Cane of Byrna', player) or state.has('Cape', player) or state.has('Mirror Shield', player))
     set_rule(world.get_location('Turtle Rock - Eye Bridge - Top Right', player), lambda state: state.has('Cane of Byrna', player) or state.has('Cape', player) or state.has('Mirror Shield', player))
-    set_rule(world.get_entrance('Turtle Rock (Trinexx)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 4) and state.has('Big Key (Turtle Rock)', player) and state.has('Cane of Somaria', player))
+    set_rule(world.get_entrance('Turtle Rock (Trinexx)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6) and state.has('Big Key (Turtle Rock)', player) and state.has('Cane of Somaria', player))
 
     if not world.enemy_shuffle[player]:
         set_rule(world.get_entrance('Palace of Darkness Bonk Wall', player), lambda state: can_shoot_arrows(state, player))
@@ -361,35 +427,46 @@ def global_rules(world, player):
 
     # these key rules are conservative, you might be able to get away with more lenient rules
     randomizer_room_chests = ['Ganons Tower - Randomizer Room - Top Left', 'Ganons Tower - Randomizer Room - Top Right', 'Ganons Tower - Randomizer Room - Bottom Left', 'Ganons Tower - Randomizer Room - Bottom Right']
-    compass_room_chests = ['Ganons Tower - Compass Room - Top Left', 'Ganons Tower - Compass Room - Top Right', 'Ganons Tower - Compass Room - Bottom Left', 'Ganons Tower - Compass Room - Bottom Right']
+    compass_room_chests = ['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']
+    back_chests = ['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']
+
 
     set_rule(world.get_location('Ganons Tower - Bob\'s Torch', player), lambda state: state.has('Pegasus Boots', player))
     set_rule(world.get_entrance('Ganons Tower (Tile Room)', player), lambda state: state.has('Cane of Somaria', player))
     set_rule(world.get_entrance('Ganons Tower (Hookshot Room)', player), lambda state: state.has('Hammer', player) and (state.has('Hookshot', player) or state.has('Pegasus Boots', player)))
-    set_rule(world.get_entrance('Ganons Tower (Map Room)', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 4) or (
-            location_item_name(state, 'Ganons Tower - Map Chest', player) in [('Big Key (Ganons Tower)', player), ('Small Key (Ganons Tower)', player)] and state._lttp_has_key('Small Key (Ganons Tower)', player, 3)))
-    if world.accessibility[player] != 'locations':
-        set_always_allow(world.get_location('Ganons Tower - Map Chest', player), lambda state, item: item.name == 'Small Key (Ganons Tower)' and item.player == player and state._lttp_has_key('Small Key (Ganons Tower)', player, 3) and state.can_reach('Ganons Tower (Hookshot Room)', 'region', player))
+    if world.pot_shuffle[player]:
+        # Pot Shuffle can move this check into the hookshot room
+        set_rule(world.get_location('Ganons Tower - Conveyor Cross Pot Key', player), lambda state: state.has('Hammer', player) and (state.has('Hookshot', player) or state.has('Pegasus Boots', player)))
+    set_rule(world.get_entrance('Ganons Tower (Map Room)', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 8) or (
+                location_item_name(state, 'Ganons Tower - Map Chest', player) in [('Big Key (Ganons Tower)', player)] and state._lttp_has_key('Small Key (Ganons Tower)', player, 6)))
 
-    # It is possible to need more than 2 keys to get through this entrance if you spend keys elsewhere. We reflect this in the chest requirements.
-    # However we need to leave these at the lower values to derive that with 3 keys it is always possible to reach Bob and Ice Armos.
-    set_rule(world.get_entrance('Ganons Tower (Double Switch Room)', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 2))
-    # It is possible to need more than 3 keys ....
-    set_rule(world.get_entrance('Ganons Tower (Firesnake Room)', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 3))
+    # this seemed to be causing generation failure, disable for now
+    # if world.accessibility[player] != 'locations':
+    #     set_always_allow(world.get_location('Ganons Tower - Map Chest', player), lambda state, item: item.name == 'Small Key (Ganons Tower)' and item.player == player and state._lttp_has_key('Small Key (Ganons Tower)', player, 7) and state.can_reach('Ganons Tower (Hookshot Room)', 'region', player))
 
-    #The actual requirements for these rooms to avoid key-lock
-    set_rule(world.get_location('Ganons Tower - Firesnake Room', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 3) or ((
-                                                                                                                                                               item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests, [player] * len(randomizer_room_chests))) or item_name_in_location_names(state, 'Small Key (Ganons Tower)', player, [('Ganons Tower - Firesnake Room', player)])) and state._lttp_has_key('Small Key (Ganons Tower)', player, 2)))
+    # It is possible to need more than 6 keys to get through this entrance if you spend keys elsewhere. We reflect this in the chest requirements.
+    # However we need to leave these at the lower values to derive that with 7 keys it is always possible to reach Bob and Ice Armos.
+    set_rule(world.get_entrance('Ganons Tower (Double Switch Room)', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 6))
+    # It is possible to need more than 7 keys ....
+    set_rule(world.get_entrance('Ganons Tower (Firesnake Room)', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 7) or (
+                    item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests + back_chests, [player] * len(randomizer_room_chests + back_chests))) and state._lttp_has_key('Small Key (Ganons Tower)', player, 5)))
+
+    # The actual requirements for these rooms to avoid key-lock
+    set_rule(world.get_location('Ganons Tower - Firesnake Room', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 7) or
+        ((item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests, [player] * len(randomizer_room_chests))) or item_name_in_location_names(state, 'Small Key (Ganons Tower)', player, [('Ganons Tower - Firesnake Room', player)])) and state._lttp_has_key('Small Key (Ganons Tower)', player, 5)))
     for location in randomizer_room_chests:
-        set_rule(world.get_location(location, player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 4) or (
-                item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests, [player] * len(randomizer_room_chests))) and state._lttp_has_key('Small Key (Ganons Tower)', player, 3)))
+        set_rule(world.get_location(location, player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 8) or (
+                    item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(randomizer_room_chests, [player] * len(randomizer_room_chests))) and state._lttp_has_key('Small Key (Ganons Tower)', player, 6)))
 
-    # Once again it is possible to need more than 3 keys...
-    set_rule(world.get_entrance('Ganons Tower (Tile Room) Key Door', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 3) and state.has('Fire Rod', player))
+    # Once again it is possible to need more than 7 keys...
+    set_rule(world.get_entrance('Ganons Tower (Tile Room) Key Door', player), lambda state: state.has('Fire Rod', player) and (state._lttp_has_key('Small Key (Ganons Tower)', player, 7) or (
+                    item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(compass_room_chests, [player] * len(compass_room_chests))) and state._lttp_has_key('Small Key (Ganons Tower)', player, 5))))
+    set_rule(world.get_entrance('Ganons Tower (Bottom) (East)', player), lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 7) or (
+                    item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(back_chests, [player] * len(back_chests))) and state._lttp_has_key('Small Key (Ganons Tower)', player, 5)))
     # Actual requirements
     for location in compass_room_chests:
-        set_rule(world.get_location(location, player), lambda state: state.has('Fire Rod', player) and (state._lttp_has_key('Small Key (Ganons Tower)', player, 4) or (
-                item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(compass_room_chests, [player] * len(compass_room_chests))) and state._lttp_has_key('Small Key (Ganons Tower)', player, 3))))
+        set_rule(world.get_location(location, player), lambda state: state.has('Fire Rod', player) and (state._lttp_has_key('Small Key (Ganons Tower)', player, 7) or (
+                    item_name_in_location_names(state, 'Big Key (Ganons Tower)', player, zip(compass_room_chests, [player] * len(compass_room_chests))) and state._lttp_has_key('Small Key (Ganons Tower)', player, 5))))
 
     set_rule(world.get_location('Ganons Tower - Big Chest', player), lambda state: state.has('Big Key (Ganons Tower)', player))
 
@@ -408,9 +485,9 @@ def global_rules(world, player):
     set_rule(world.get_entrance('Ganons Tower Torch Rooms', player),
              lambda state: has_fire_source(state, player) and state.multiworld.get_entrance('Ganons Tower Torch Rooms', player).parent_region.dungeon.bosses['middle'].can_defeat(state))
     set_rule(world.get_location('Ganons Tower - Pre-Moldorm Chest', player),
-             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 3))
+             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 7))
     set_rule(world.get_entrance('Ganons Tower Moldorm Door', player),
-             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 4))
+             lambda state: state._lttp_has_key('Small Key (Ganons Tower)', player, 8))
     set_rule(world.get_entrance('Ganons Tower Moldorm Gap', player),
              lambda state: state.has('Hookshot', player) and state.multiworld.get_entrance('Ganons Tower Moldorm Gap', player).parent_region.dungeon.bosses['top'].can_defeat(state))
     set_defeat_dungeon_boss_rule(world.get_location('Agahnim 2', player))
@@ -797,15 +874,21 @@ def add_conditional_lamps(world, player):
     if world.mode[player] != 'inverted':
         add_conditional_lamp('Agahnim 1', 'Agahnims Tower', 'Entrance')
         add_conditional_lamp('Castle Tower - Dark Maze', 'Agahnims Tower')
+        add_conditional_lamp('Castle Tower - Dark Archer Key Drop', 'Agahnims Tower')
+        add_conditional_lamp('Castle Tower - Circle of Pots Key Drop', 'Agahnims Tower')
     else:
         add_conditional_lamp('Agahnim 1', 'Inverted Agahnims Tower', 'Entrance')
         add_conditional_lamp('Castle Tower - Dark Maze', 'Inverted Agahnims Tower')
+        add_conditional_lamp('Castle Tower - Dark Archer Key Drop', 'Inverted Agahnims Tower')
+        add_conditional_lamp('Castle Tower - Circle of Pots Key Drop', 'Inverted Agahnims Tower')
     add_conditional_lamp('Old Man', 'Old Man Cave')
     add_conditional_lamp('Old Man Cave Exit (East)', 'Old Man Cave', 'Entrance')
     add_conditional_lamp('Death Mountain Return Cave Exit (East)', 'Death Mountain Return Cave', 'Entrance')
     add_conditional_lamp('Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave', 'Entrance')
     add_conditional_lamp('Old Man House Front to Back', 'Old Man House', 'Entrance')
     add_conditional_lamp('Old Man House Back to Front', 'Old Man House', 'Entrance')
+    add_conditional_lamp('Eastern Palace - Dark Square Pot Key', 'Eastern Palace')
+    add_conditional_lamp('Eastern Palace - Dark Eyegore Key Drop', 'Eastern Palace', 'Location', True)
     add_conditional_lamp('Eastern Palace - Big Key Chest', 'Eastern Palace')
     add_conditional_lamp('Eastern Palace - Boss', 'Eastern Palace', 'Location', True)
     add_conditional_lamp('Eastern Palace - Prize', 'Eastern Palace', 'Location', True)
@@ -817,17 +900,32 @@ def add_conditional_lamps(world, player):
 
 
 def open_rules(world, player):
-    # softlock protection as you can reach the sewers small key door with a guard drop key
-    set_rule(world.get_location('Hyrule Castle - Boomerang Chest', player),
-             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player))
+    def basement_key_rule(state):
+        if location_item_name(state, 'Sewers - Key Rat Key Drop', player) == ("Small Key (Hyrule Castle)", player):
+            return state._lttp_has_key("Small Key (Hyrule Castle)", player, 2)
+        else:
+            return state._lttp_has_key("Small Key (Hyrule Castle)", player, 3)
+
+    set_rule(world.get_location('Hyrule Castle - Boomerang Guard Key Drop', player), basement_key_rule)
+    set_rule(world.get_location('Hyrule Castle - Boomerang Chest', player), basement_key_rule)
+
+    set_rule(world.get_location('Sewers - Key Rat Key Drop', player),
+             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 3))
+
+    set_rule(world.get_location('Hyrule Castle - Big Key Drop', player),
+             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 4))
     set_rule(world.get_location('Hyrule Castle - Zelda\'s Chest', player),
-             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player))
+             lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 4) and
+                           state.has('Big Key (Hyrule Castle)', player))
 
 
 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
-    set_rule(world.get_entrance('Ice Palace Entrance Room', player), lambda state: state.has('Fire Rod', player) or state.has('Bombos', player)) #in swordless mode bombos pads are present in the relevant parts of ice palace
+
+    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_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
 
     if world.mode[player] != 'inverted':
@@ -850,11 +948,27 @@ def add_connection(parent_name, target_name, entrance_name, world, 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.smallkey_shuffle[player] != smallkey_shuffle.option_universal:
+        set_rule(world.get_location('Hyrule Castle - Boomerang Guard Key Drop', player),
+                 lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 1))
+        set_rule(world.get_location('Hyrule Castle - Boomerang Chest', player),
+                 lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 1))
+
+        set_rule(world.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),
+                 lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 2) and
+                               state.has('Big Key (Hyrule Castle)', player))
+
+        set_rule(world.get_location('Sewers - Key Rat Key Drop', player),
+                 lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 3))
+
 def toss_junk_item(world, player):
     items = ['Rupees (20)', 'Bombs (3)', 'Arrows (10)', 'Rupees (5)', 'Rupee (1)', 'Bombs (10)',
              'Single Arrow', 'Rupees (50)', 'Rupees (100)', 'Single Bomb', 'Bee', 'Bee Trap',
@@ -869,7 +983,7 @@ def toss_junk_item(world, player):
 
 def set_trock_key_rules(world, player):
     # First set all relevant locked doors to impassible.
-    for entrance in ['Turtle Rock Dark Room Staircase', 'Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock Pokey Room', 'Turtle Rock Big Key Door']:
+    for entrance in ['Turtle Rock Dark Room Staircase', 'Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock Entrance to Pokey Room', 'Turtle Rock (Pokey Room) (South)', 'Turtle Rock (Pokey Room) (North)', 'Turtle Rock Big Key Door']:
         set_rule(world.get_entrance(entrance, player), lambda state: False)
 
     all_state = world.get_all_state(use_cache=False)
@@ -892,6 +1006,7 @@ def set_trock_key_rules(world, player):
     if can_reach_middle and not can_reach_back and not can_reach_front:
         normal_regions = all_state.reachable_regions[player].copy()
         set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: True)
+        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: True)
         all_state.update_reachable_regions(player)
         front_locked_regions = all_state.reachable_regions[player].difference(normal_regions)
         front_locked_locations = set((location.name, player) for region in front_locked_regions for location in region.locations)
@@ -903,26 +1018,33 @@ def set_trock_key_rules(world, player):
     # otherwise crystaroller room might not be properly marked as reachable through the back.
     set_rule(world.get_entrance('Turtle Rock Big Key Door', player), lambda state: state.has('Big Key (Turtle Rock)', player))
 
-    # No matter what, the key requirement for going from the middle to the bottom should be three keys.
-    set_rule(world.get_entrance('Turtle Rock Dark Room Staircase', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3))
+    # No matter what, the key requirement for going from the middle to the bottom should be five keys.
+    set_rule(world.get_entrance('Turtle Rock Dark Room Staircase', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
 
     # Now we need to set rules based on which entrances we have access to. The most important point is whether we have back access. If we have back access, we
-    # might open all the locked doors in any order so we need maximally restrictive rules.
+    # might open all the locked doors in any order, so we need maximally restrictive rules.
     if can_reach_back:
-        set_rule(world.get_location('Turtle Rock - Big Key Chest', player), lambda state: (state._lttp_has_key('Small Key (Turtle Rock)', player, 4) or location_item_name(state, 'Turtle Rock - Big Key Chest', player) == ('Small Key (Turtle Rock)', player)))
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 4))
-        # Only consider wasting the key on the Trinexx door for going from the front entrance to middle section.  If other key doors are accessible, then these doors can be avoided
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3))
-        set_rule(world.get_entrance('Turtle Rock Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 2))
-    else:
-        # Middle to front requires 2 keys if the back is locked, otherwise 4
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 2)
-                if item_name_in_location_names(state, 'Big Key (Turtle Rock)', player, front_locked_locations)
-                else state._lttp_has_key('Small Key (Turtle Rock)', player, 4))
+        set_rule(world.get_location('Turtle Rock - Big Key Chest', player), lambda state: (state._lttp_has_key('Small Key (Turtle Rock)', player, 6) or location_item_name(state, 'Turtle Rock - Big Key Chest', player) == ('Small Key (Turtle Rock)', player)))
+        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
+        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
 
-        # Front to middle requires 2 keys (if the middle is accessible then these doors can be avoided, otherwise no keys can be wasted)
-        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 2))
-        set_rule(world.get_entrance('Turtle Rock Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 1))
+        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
+        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
+        set_rule(world.get_entrance('Turtle Rock Entrance to Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
+    else:
+        # Middle to front requires 3 keys if the back is locked by this door, otherwise 5
+        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3)
+                if item_name_in_location_names(state, 'Big Key (Turtle Rock)', player, front_locked_locations.union({('Turtle Rock - Pokey 1 Key Drop', player)}))
+                else state._lttp_has_key('Small Key (Turtle Rock)', player, 5))
+        # Middle to front requires 4 keys if the back is locked by this door, otherwise 6
+        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (South)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 4)
+                if item_name_in_location_names(state, 'Big Key (Turtle Rock)', player, front_locked_locations)
+                else state._lttp_has_key('Small Key (Turtle Rock)', player, 6))
+
+        # Front to middle requires 3 keys (if the middle is accessible then these doors can be avoided, otherwise no keys can be wasted)
+        set_rule(world.get_entrance('Turtle Rock (Chain Chomp Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 3))
+        set_rule(world.get_entrance('Turtle Rock (Pokey Room) (North)', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 2))
+        set_rule(world.get_entrance('Turtle Rock Entrance to Pokey Room', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, 1))
 
         set_rule(world.get_location('Turtle Rock - Big Key Chest', player), lambda state: state._lttp_has_key('Small Key (Turtle Rock)', player, tr_big_key_chest_keys_needed(state)))
 
@@ -933,8 +1055,8 @@ def set_trock_key_rules(world, player):
             if item in [('Small Key (Turtle Rock)', player)]:
                 return 0
             if item in [('Big Key (Turtle Rock)', player)]:
-                return 2
-            return 4
+                return 4
+            return 6
 
         # If TR is only accessible from the middle, the big key must be further restricted to prevent softlock potential
         if not can_reach_front and not world.smallkey_shuffle[player]:
@@ -943,10 +1065,12 @@ def set_trock_key_rules(world, player):
             if not can_reach_big_chest:
                 # Must not go in the Chain Chomps chest - only 2 other chests available and 3+ keys required for all other chests
                 forbid_item(world.get_location('Turtle Rock - Chain Chomps', player), 'Big Key (Turtle Rock)', player)
+                forbid_item(world.get_location('Turtle Rock - Pokey 2 Key Drop', player), 'Big Key (Turtle Rock)', player)
             if world.accessibility[player] == 'locations' and world.goal[player] != 'icerodhunt':
                 if world.bigkey_shuffle[player] and can_reach_big_chest:
                     # Must not go in the dungeon - all 3 available chests (Chomps, Big Chest, Crystaroller) must be keys to access laser bridge, and the big key is required first
                     for location in ['Turtle Rock - Chain Chomps', 'Turtle Rock - Compass Chest',
+                                     'Turtle Rock - Pokey 1 Key Drop', 'Turtle Rock - Pokey 2 Key Drop',
                                      'Turtle Rock - Roller Room - Left', 'Turtle Rock - Roller Room - Right']:
                         forbid_item(world.get_location(location, player), 'Big Key (Turtle Rock)', player)
                 else:
@@ -1408,16 +1532,16 @@ def set_bunny_rules(world: MultiWorld, player: int, inverted: bool):
     # Helper functions to determine if the moon pearl is required
     if inverted:
         def is_bunny(region):
-            return region.is_light_world
+            return region and region.is_light_world
 
         def is_link(region):
-            return region.is_dark_world
+            return region and region.is_dark_world
     else:
         def is_bunny(region):
-            return region.is_dark_world
+            return region and region.is_dark_world
 
         def is_link(region):
-            return region.is_light_world
+            return region and region.is_light_world
 
     def get_rule_to_add(region, location = None, connecting_entrance = None):
         # In OWG, a location can potentially be superbunny-mirror accessible or
@@ -1485,21 +1609,20 @@ 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 (world.get_region(name, player) for name in bunny_impassable_caves):
         if not is_bunny(region):
             continue
         rule = get_rule_to_add(region)
-        for exit in region.exits:
-            add_rule(exit, rule)
+        for region_exit in region.exits:
+            add_rule(region_exit, rule)
 
     paradox_shop = world.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():
-        if entrance.player == player and is_bunny(entrance.connected_region):
+    for entrance in world.get_entrances(player):
+        if is_bunny(entrance.connected_region):
             if world.logic[player] in ['minorglitches', 'owglitches', 'hybridglitches', 'nologic'] :
                 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():
diff --git a/worlds/alttp/Shops.py b/worlds/alttp/Shops.py
index f17eb1eadb..c0f2e2236e 100644
--- a/worlds/alttp/Shops.py
+++ b/worlds/alttp/Shops.py
@@ -348,7 +348,6 @@ def create_shops(world, player: int):
                     loc.item = ItemFactory(GetBeemizerItem(world, player, 'Nothing'), player)
                     loc.shop_slot_disabled = True
                 shop.region.locations.append(loc)
-                world.clear_location_cache()
 
 
 class ShopData(NamedTuple):
@@ -619,6 +618,4 @@ def create_dynamic_shop_locations(world, player):
                     if shop.type == ShopType.TakeAny:
                         loc.shop_slot_disabled = True
                     shop.region.locations.append(loc)
-                    world.clear_location_cache()
-
                     loc.shop_slot = i
diff --git a/worlds/alttp/StateHelpers.py b/worlds/alttp/StateHelpers.py
index 95e31e5ba3..38ce00ef45 100644
--- a/worlds/alttp/StateHelpers.py
+++ b/worlds/alttp/StateHelpers.py
@@ -31,7 +31,7 @@ def can_shoot_arrows(state: CollectionState, player: int) -> bool:
 
 def has_triforce_pieces(state: CollectionState, player: int) -> bool:
     count = state.multiworld.treasure_hunt_count[player]
-    return state.item_count('Triforce Piece', player) + state.item_count('Power Star', player) >= count
+    return state.count('Triforce Piece', player) + state.count('Power Star', player) >= count
 
 
 def has_crystals(state: CollectionState, count: int, player: int) -> bool:
@@ -60,9 +60,9 @@ 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.difficulty_requirements[player]
-    return min(state.item_count('Boss Heart Container', player), diff.boss_heart_container_limit) \
-            + state.item_count('Sanctuary Heart Container', player) \
-            + min(state.item_count('Piece of Heart', player), diff.heart_piece_limit) // 4 \
+    return min(state.count('Boss Heart Container', player), diff.boss_heart_container_limit) \
+            + state.count('Sanctuary Heart Container', player) \
+        + min(state.count('Piece of Heart', player), diff.heart_piece_limit) // 4 \
             + 3  # starting hearts
 
 
diff --git a/worlds/alttp/UnderworldGlitchRules.py b/worlds/alttp/UnderworldGlitchRules.py
index 11a95bf7cd..a6aefc7412 100644
--- a/worlds/alttp/UnderworldGlitchRules.py
+++ b/worlds/alttp/UnderworldGlitchRules.py
@@ -31,7 +31,7 @@ def fake_pearl_state(state, player):
     if state.has('Moon Pearl', player):
         return state
     fake_state = state.copy()
-    fake_state.prog_items['Moon Pearl', player] += 1
+    fake_state.prog_items[player]['Moon Pearl'] += 1
     return fake_state
 
 
@@ -66,9 +66,12 @@ def underworld_glitches_rules(world, player):
     fix_fake_worlds = world.fix_fake_world[player]
 
     # Ice Palace Entrance Clip
-    # This is the easiest one since it's a simple internal clip. Just need to also add melting to freezor chest since it's otherwise assumed. 
-    add_rule(world.get_entrance('Ice Palace Entrance Room', player), lambda state: can_bomb_clip(state, world.get_region('Ice Palace (Entrance)', player), player), combine='or')
+    # 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')
 
 
     # Kiki Skip
diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py
index 8815fae092..3f380d0037 100644
--- a/worlds/alttp/__init__.py
+++ b/worlds/alttp/__init__.py
@@ -15,7 +15,7 @@ from .ItemPool import generate_itempool, difficulties
 from .Items import item_init_table, item_name_groups, item_table, GetBeemizerItem
 from .Options import alttp_options, smallkey_shuffle
 from .Regions import lookup_name_to_id, create_regions, mark_light_world_regions, lookup_vanilla_location_to_entrance, \
-    is_main_entrance
+    is_main_entrance, key_drop_data
 from .Client import ALTTPSNIClient
 from .Rom import LocalRom, patch_rom, patch_race_rom, check_enemizer, patch_enemizer, apply_rom_settings, \
     get_hash_string, get_base_rom_path, LttPDeltaPatch
@@ -195,7 +195,7 @@ class ALTTPWorld(World):
         "Ganons Tower": {"Ganons Tower - Bob's Torch", "Ganons Tower - Hope Room - Left",
                          "Ganons Tower - Hope Room - Right", "Ganons Tower - Tile Room",
                          "Ganons Tower - Compass Room - Top Left", "Ganons Tower - Compass Room - Top Right",
-                         "Ganons Tower - Compass Room - Bottom Left", "Ganons Tower - Compass Room - Bottom Left",
+                         "Ganons Tower - Compass Room - Bottom Left", "Ganons Tower - Compass Room - Bottom Right",
                          "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 - Map Chest", "Ganons Tower - Firesnake Room",
@@ -249,6 +249,8 @@ class ALTTPWorld(World):
     rom_name_available_event: threading.Event
     has_progressive_bows: bool
     dungeons: typing.Dict[str, Dungeon]
+    waterfall_fairy_bottle_fill: str
+    pyramid_fairy_bottle_fill: str
 
     def __init__(self, *args, **kwargs):
         self.dungeon_local_item_names = set()
@@ -256,6 +258,8 @@ class ALTTPWorld(World):
         self.rom_name_available_event = threading.Event()
         self.has_progressive_bows = False
         self.dungeons = {}
+        self.waterfall_fairy_bottle_fill = "Bottle"
+        self.pyramid_fairy_bottle_fill = "Bottle"
         super(ALTTPWorld, self).__init__(*args, **kwargs)
 
     @classmethod
@@ -273,50 +277,67 @@ class ALTTPWorld(World):
     def generate_early(self):
 
         player = self.player
-        world = self.multiworld
+        multiworld = self.multiworld
 
-        if world.mode[player] == 'standard' \
-                and world.smallkey_shuffle[player] \
-                and world.smallkey_shuffle[player] != smallkey_shuffle.option_universal \
-                and world.smallkey_shuffle[player] != smallkey_shuffle.option_own_dungeons \
-                and world.smallkey_shuffle[player] != smallkey_shuffle.option_start_with:
-            self.multiworld.local_early_items[self.player]["Small Key (Hyrule Castle)"] = 1
+        # fairy bottle fills
+        bottle_options = [
+            "Bottle (Red Potion)", "Bottle (Green Potion)", "Bottle (Blue Potion)",
+            "Bottle (Bee)", "Bottle (Good Bee)"
+        ]
+        if multiworld.difficulty[player] not in ["hard", "expert"]:
+            bottle_options.append("Bottle (Fairy)")
+        self.waterfall_fairy_bottle_fill = self.random.choice(bottle_options)
+        self.pyramid_fairy_bottle_fill = self.random.choice(bottle_options)
+
+        if multiworld.mode[player] == 'standard':
+            if multiworld.smallkey_shuffle[player]:
+                if (multiworld.smallkey_shuffle[player] not in
+                   (smallkey_shuffle.option_universal, smallkey_shuffle.option_own_dungeons,
+                    smallkey_shuffle.option_start_with)):
+                    self.multiworld.local_early_items[self.player]["Small Key (Hyrule Castle)"] = 1
+                self.multiworld.local_items[self.player].value.add("Small Key (Hyrule Castle)")
+                self.multiworld.non_local_items[self.player].value.discard("Small Key (Hyrule Castle)")
+            if multiworld.bigkey_shuffle[player]:
+                self.multiworld.local_items[self.player].value.add("Big Key (Hyrule Castle)")
+                self.multiworld.non_local_items[self.player].value.discard("Big Key (Hyrule Castle)")
 
         # system for sharing ER layouts
-        self.er_seed = str(world.random.randint(0, 2 ** 64))
+        self.er_seed = str(multiworld.random.randint(0, 2 ** 64))
 
-        if "-" in world.shuffle[player]:
-            shuffle, seed = world.shuffle[player].split("-", 1)
-            world.shuffle[player] = shuffle
+        if "-" in multiworld.shuffle[player]:
+            shuffle, seed = multiworld.shuffle[player].split("-", 1)
+            multiworld.shuffle[player] = shuffle
             if shuffle == "vanilla":
                 self.er_seed = "vanilla"
-            elif seed.startswith("group-") or world.is_race:
-                self.er_seed = get_same_seed(world, (
-                    shuffle, seed, world.retro_caves[player], world.mode[player], world.logic[player]))
+            elif seed.startswith("group-") or multiworld.is_race:
+                self.er_seed = get_same_seed(multiworld, (
+                    shuffle, seed, multiworld.retro_caves[player], multiworld.mode[player], multiworld.logic[player]))
             else:  # not a race or group seed, use set seed as is.
                 self.er_seed = seed
-        elif world.shuffle[player] == "vanilla":
+        elif multiworld.shuffle[player] == "vanilla":
             self.er_seed = "vanilla"
         for dungeon_item in ["smallkey_shuffle", "bigkey_shuffle", "compass_shuffle", "map_shuffle"]:
-            option = getattr(world, dungeon_item)[player]
+            option = getattr(multiworld, dungeon_item)[player]
             if option == "own_world":
-                world.local_items[player].value |= self.item_name_groups[option.item_name_group]
+                multiworld.local_items[player].value |= self.item_name_groups[option.item_name_group]
             elif option == "different_world":
-                world.non_local_items[player].value |= self.item_name_groups[option.item_name_group]
+                multiworld.non_local_items[player].value |= self.item_name_groups[option.item_name_group]
+                if multiworld.mode[player] == "standard":
+                    multiworld.non_local_items[player].value -= {"Small Key (Hyrule Castle)"}
             elif option.in_dungeon:
                 self.dungeon_local_item_names |= self.item_name_groups[option.item_name_group]
                 if option == "original_dungeon":
                     self.dungeon_specific_item_names |= self.item_name_groups[option.item_name_group]
 
-        world.difficulty_requirements[player] = difficulties[world.difficulty[player]]
+        multiworld.difficulty_requirements[player] = difficulties[multiworld.difficulty[player]]
 
         # enforce pre-defined local items.
-        if world.goal[player] in ["localtriforcehunt", "localganontriforcehunt"]:
-            world.local_items[player].value.add('Triforce Piece')
+        if multiworld.goal[player] in ["localtriforcehunt", "localganontriforcehunt"]:
+            multiworld.local_items[player].value.add('Triforce Piece')
 
         # Not possible to place crystals outside boss prizes yet (might as well make it consistent with pendants too).
-        world.non_local_items[player].value -= item_name_groups['Pendants']
-        world.non_local_items[player].value -= item_name_groups['Crystals']
+        multiworld.non_local_items[player].value -= item_name_groups['Pendants']
+        multiworld.non_local_items[player].value -= item_name_groups['Crystals']
 
     create_dungeons = create_dungeons
 
@@ -362,7 +383,6 @@ class ALTTPWorld(World):
             world.register_indirect_condition(world.get_region(region_name, player),
                                               world.get_entrance(entrance_name, player))
 
-
     def collect_item(self, state: CollectionState, item: Item, remove=False):
         item_name = item.name
         if item_name.startswith('Progressive '):
@@ -468,7 +488,8 @@ class ALTTPWorld(World):
                 prizepool = unplaced_prizes.copy()
                 prize_locs = empty_crystal_locations.copy()
                 world.random.shuffle(prize_locs)
-                fill_restrictive(world, all_state, prize_locs, prizepool, True, lock=True)
+                fill_restrictive(world, all_state, prize_locs, prizepool, True, lock=True,
+                                 name="LttP Dungeon Prizes")
             except FillError as e:
                 lttp_logger.exception("Failed to place dungeon prizes (%s). Will retry %s more times", e,
                                                 attempts - attempt)
@@ -478,12 +499,17 @@ class ALTTPWorld(World):
             break
         else:
             raise FillError('Unable to place dungeon prizes')
+        if world.mode[player] == 'standard' and world.smallkey_shuffle[player] \
+                and world.smallkey_shuffle[player] != smallkey_shuffle.option_universal and \
+                world.smallkey_shuffle[player] != smallkey_shuffle.option_own_dungeons:
+            world.local_early_items[player]["Small Key (Hyrule Castle)"] = 1
 
     @classmethod
     def stage_pre_fill(cls, world):
         from .Dungeons import fill_dungeons_restrictive
         fill_dungeons_restrictive(world)
 
+
     @classmethod
     def stage_post_fill(cls, world):
         ShopSlotFill(world)
@@ -578,27 +604,26 @@ class ALTTPWorld(World):
 
         for player in checks_in_area:
             checks_in_area[player]["Total"] = 0
-
-        for location in multiworld.get_locations():
-            if location.game == cls.game and type(location.address) is int:
-                main_entrance = location.parent_region.get_connecting_entrance(is_main_entrance)
-                if location.parent_region.dungeon:
-                    dungeonname = {'Inverted Agahnims Tower': 'Agahnims Tower',
-                                   'Inverted Ganons Tower': 'Ganons Tower'} \
-                        .get(location.parent_region.dungeon.name, location.parent_region.dungeon.name)
-                    checks_in_area[location.player][dungeonname].append(location.address)
-                elif location.parent_region.type == LTTPRegionType.LightWorld:
-                    checks_in_area[location.player]["Light World"].append(location.address)
-                elif location.parent_region.type == LTTPRegionType.DarkWorld:
-                    checks_in_area[location.player]["Dark World"].append(location.address)
-                elif main_entrance.parent_region.type == LTTPRegionType.LightWorld:
-                    checks_in_area[location.player]["Light World"].append(location.address)
-                elif main_entrance.parent_region.type == LTTPRegionType.DarkWorld:
-                    checks_in_area[location.player]["Dark World"].append(location.address)
-                else:
-                    assert False, "Unknown Location area."
-                # TODO: remove Total as it's duplicated data and breaks consistent typing
-                checks_in_area[location.player]["Total"] += 1
+            for location in multiworld.get_locations(player):
+                if location.game == cls.game and type(location.address) is int:
+                    main_entrance = location.parent_region.get_connecting_entrance(is_main_entrance)
+                    if location.parent_region.dungeon:
+                        dungeonname = {'Inverted Agahnims Tower': 'Agahnims Tower',
+                                       'Inverted Ganons Tower': 'Ganons Tower'} \
+                            .get(location.parent_region.dungeon.name, location.parent_region.dungeon.name)
+                        checks_in_area[location.player][dungeonname].append(location.address)
+                    elif location.parent_region.type == LTTPRegionType.LightWorld:
+                        checks_in_area[location.player]["Light World"].append(location.address)
+                    elif location.parent_region.type == LTTPRegionType.DarkWorld:
+                        checks_in_area[location.player]["Dark World"].append(location.address)
+                    elif main_entrance.parent_region.type == LTTPRegionType.LightWorld:
+                        checks_in_area[location.player]["Light World"].append(location.address)
+                    elif main_entrance.parent_region.type == LTTPRegionType.DarkWorld:
+                        checks_in_area[location.player]["Dark World"].append(location.address)
+                    else:
+                        assert False, "Unknown Location area."
+                    # TODO: remove Total as it's duplicated data and breaks consistent typing
+                    checks_in_area[location.player]["Total"] += 1
 
         multidata["checks_in_area"].update(checks_in_area)
 
@@ -618,7 +643,6 @@ class ALTTPWorld(World):
     @classmethod
     def stage_fill_hook(cls, world, progitempool, usefulitempool, filleritempool, fill_locations):
         trash_counts = {}
-
         for player in world.get_game_players("A Link to the Past"):
             if not world.ganonstower_vanilla[player] or \
                     world.logic[player] in {'owglitches', 'hybridglitches', "nologic"}:
@@ -687,13 +711,18 @@ class ALTTPWorld(World):
         spoiler_handle.write('Prize shuffle                    %s\n' % self.multiworld.shuffle_prizes[self.player])
 
     def write_spoiler(self, spoiler_handle: typing.TextIO) -> None:
+        player_name = self.multiworld.get_player_name(self.player)
         spoiler_handle.write("\n\nMedallions:\n")
-        spoiler_handle.write(f"\nMisery Mire ({self.multiworld.get_player_name(self.player)}):"
+        spoiler_handle.write(f"\nMisery Mire ({player_name}):"
                              f" {self.multiworld.required_medallions[self.player][0]}")
         spoiler_handle.write(
-            f"\nTurtle Rock ({self.multiworld.get_player_name(self.player)}):"
+            f"\nTurtle Rock ({player_name}):"
             f" {self.multiworld.required_medallions[self.player][1]}")
-
+        spoiler_handle.write("\n\nFairy Fountain Bottle Fill:\n")
+        spoiler_handle.write(f"\nPyramid Fairy ({player_name}):"
+                             f" {self.pyramid_fairy_bottle_fill}")
+        spoiler_handle.write(f"\nWaterfall Fairy ({player_name}):"
+                             f" {self.waterfall_fairy_bottle_fill}")
         if self.multiworld.boss_shuffle[self.player] != "none":
             def create_boss_map() -> typing.Dict:
                 boss_map = {
@@ -792,7 +821,7 @@ class ALTTPWorld(World):
             slot_options = ["crystals_needed_for_gt", "crystals_needed_for_ganon", "open_pyramid",
                             "bigkey_shuffle", "smallkey_shuffle", "compass_shuffle", "map_shuffle",
                             "progressive", "swordless", "retro_bow", "retro_caves", "shop_item_slots",
-                            "boss_shuffle", "pot_shuffle", "enemy_shuffle"]
+                            "boss_shuffle", "pot_shuffle", "enemy_shuffle", "key_drop_shuffle"]
 
             slot_data = {option_name: getattr(self.multiworld, option_name)[self.player].value for option_name in slot_options}
 
@@ -803,11 +832,11 @@ class ALTTPWorld(World):
                 'mm_medalion': self.multiworld.required_medallions[self.player][0],
                 'tr_medalion': self.multiworld.required_medallions[self.player][1],
                 'shop_shuffle': self.multiworld.shop_shuffle[self.player],
-                'entrance_shuffle': self.multiworld.shuffle[self.player]
+                'entrance_shuffle': self.multiworld.shuffle[self.player],
                 }
             )
         return slot_data
-        
+
 
 def get_same_seed(world, seed_def: tuple) -> str:
     seeds: typing.Dict[tuple, str] = getattr(world, "__named_seeds", {})
@@ -824,4 +853,4 @@ class ALttPLogic(LogicMixin):
             return True
         if self.multiworld.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
             return can_buy_unlimited(self, 'Small Key (Universal)', player)
-        return self.prog_items[item, player] >= count
+        return self.prog_items[player][item] >= count
diff --git a/worlds/alttp/docs/multiworld_de.md b/worlds/alttp/docs/multiworld_de.md
index 38009fb58e..8ccd1a87a6 100644
--- a/worlds/alttp/docs/multiworld_de.md
+++ b/worlds/alttp/docs/multiworld_de.md
@@ -67,7 +67,7 @@ Wenn du eine Option nicht gewählt haben möchtest, setze ihren Wert einfach auf
 
 ### Überprüfung deiner YAML-Datei
 
-Wenn man sichergehen will, ob die YAML-Datei funktioniert, kann man dies bei der [YAML Validator](/mysterycheck) Seite
+Wenn man sichergehen will, ob die YAML-Datei funktioniert, kann man dies bei der [YAML Validator](/check) Seite
 tun.
 
 ## ein Einzelspielerspiel erstellen
diff --git a/worlds/alttp/docs/multiworld_es.md b/worlds/alttp/docs/multiworld_es.md
index 8576318bb9..37aeda2a63 100644
--- a/worlds/alttp/docs/multiworld_es.md
+++ b/worlds/alttp/docs/multiworld_es.md
@@ -82,7 +82,7 @@ debe tener al menos un valor mayor que cero, si no la generación fallará.
 ### Verificando tu archivo YAML
 
 Si quieres validar que tu fichero YAML para asegurarte que funciona correctamente, puedes hacerlo en la pagina
-[YAML Validator](/mysterycheck).
+[YAML Validator](/check).
 
 ## Generar una partida para un jugador
 
diff --git a/worlds/alttp/docs/multiworld_fr.md b/worlds/alttp/docs/multiworld_fr.md
index 329ca65375..078a270f08 100644
--- a/worlds/alttp/docs/multiworld_fr.md
+++ b/worlds/alttp/docs/multiworld_fr.md
@@ -83,7 +83,7 @@ chaque paramètre il faut au moins une option qui soit paramétrée sur un nombr
 ### Vérifier son fichier YAML
 
 Si vous voulez valider votre fichier YAML pour être sûr qu'il fonctionne, vous pouvez le vérifier sur la page du
-[Validateur de YAML](/mysterycheck).
+[Validateur de YAML](/check).
 
 ## Générer une partie pour un joueur
 
diff --git a/worlds/alttp/test/__init__.py b/worlds/alttp/test/__init__.py
index e69de29bb2..5baaa7e88e 100644
--- a/worlds/alttp/test/__init__.py
+++ b/worlds/alttp/test/__init__.py
@@ -0,0 +1,16 @@
+import unittest
+from argparse import Namespace
+
+from BaseClasses import MultiWorld, CollectionState
+from worlds import AutoWorldRegister
+
+
+class LTTPTestBase(unittest.TestCase):
+    def world_setup(self):
+        self.multiworld = MultiWorld(1)
+        self.multiworld.state = CollectionState(self.multiworld)
+        self.multiworld.set_seed(None)
+        args = Namespace()
+        for name, option in AutoWorldRegister.world_types["A Link to the Past"].options_dataclass.type_hints.items():
+            setattr(args, name, {1: option.from_any(getattr(option, "default"))})
+        self.multiworld.set_options(args)
diff --git a/worlds/alttp/test/dungeons/TestAgahnimsTower.py b/worlds/alttp/test/dungeons/TestAgahnimsTower.py
index 6d0e1085f5..94e7854858 100644
--- a/worlds/alttp/test/dungeons/TestAgahnimsTower.py
+++ b/worlds/alttp/test/dungeons/TestAgahnimsTower.py
@@ -16,6 +16,18 @@ class TestAgahnimsTower(TestDungeon):
             ["Castle Tower - Dark Maze", False, [], ['Progressive Sword', 'Hammer', 'Progressive Bow', 'Fire Rod', 'Ice Rod', 'Cane of Somaria', 'Cane of Byrna']],
             ["Castle Tower - Dark Maze", True, ['Progressive Sword', 'Small Key (Agahnims Tower)', 'Lamp']],
 
+            ["Castle Tower - Dark Archer Key Drop", False, []],
+            ["Castle Tower - Dark Archer Key Drop", False, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)']],
+            ["Castle Tower - Dark Archer Key Drop", False, [], ['Lamp']],
+            ["Castle Tower - Dark Archer Key Drop", False, [], ['Progressive Sword', 'Hammer', 'Progressive Bow', 'Fire Rod', 'Ice Rod', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Castle Tower - Dark Archer Key Drop", True, ['Progressive Sword', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp']],
+
+            ["Castle Tower - Circle of Pots Key Drop", False, []],
+            ["Castle Tower - Circle of Pots Key Drop", False, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)']],
+            ["Castle Tower - Circle of Pots Key Drop", False, [], ['Lamp']],
+            ["Castle Tower - Circle of Pots Key Drop", False, [], ['Progressive Sword', 'Hammer', 'Progressive Bow', 'Fire Rod', 'Ice Rod', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Castle Tower - Circle of Pots Key Drop", True, ['Progressive Sword', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp']],
+
             ["Agahnim 1", False, []],
             ["Agahnim 1", False, ['Small Key (Agahnims Tower)'], ['Small Key (Agahnims Tower)']],
             ["Agahnim 1", False, [], ['Progressive Sword']],
diff --git a/worlds/alttp/test/dungeons/TestDesertPalace.py b/worlds/alttp/test/dungeons/TestDesertPalace.py
index 8423e681cf..2d19513911 100644
--- a/worlds/alttp/test/dungeons/TestDesertPalace.py
+++ b/worlds/alttp/test/dungeons/TestDesertPalace.py
@@ -18,12 +18,27 @@ class TestDesertPalace(TestDungeon):
 
             ["Desert Palace - Compass Chest", False, []],
             ["Desert Palace - Compass Chest", False, [], ['Small Key (Desert Palace)']],
-            ["Desert Palace - Compass Chest", True, ['Small Key (Desert Palace)']],
+            ["Desert Palace - Compass Chest", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Desert Palace - Compass Chest", False, ['Small Key (Desert Palace)']],
+            ["Desert Palace - Compass Chest", True, ['Progressive Sword', 'Small Key (Desert Palace)']],
 
-            #@todo: Require a real weapon for enemizer?
             ["Desert Palace - Big Key Chest", False, []],
             ["Desert Palace - Big Key Chest", False, [], ['Small Key (Desert Palace)']],
-            ["Desert Palace - Big Key Chest", True, ['Small Key (Desert Palace)']],
+            ["Desert Palace - Big Key Chest", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Desert Palace - Big Key Chest", False, ['Small Key (Desert Palace)']],
+            ["Desert Palace - Big Key Chest", True, ['Progressive Sword', 'Small Key (Desert Palace)']],
+
+            ["Desert Palace - Desert Tiles 1 Pot Key", True, []],
+
+            ["Desert Palace - Beamos Hall Pot Key", False, []],
+            ["Desert Palace - Beamos Hall Pot Key", False, [], ['Small Key (Desert Palace)']],
+            ["Desert Palace - Beamos Hall Pot Key", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Desert Palace - Beamos Hall Pot Key", True, ['Small Key (Desert Palace)', 'Progressive Sword']],
+
+            ["Desert Palace - Desert Tiles 2 Pot Key", False, []],
+            ["Desert Palace - Desert Tiles 2 Pot Key", False, ['Small Key (Desert Palace)']],
+            ["Desert Palace - Desert Tiles 2 Pot Key", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
+            ["Desert Palace - Desert Tiles 2 Pot Key", True, ['Small Key (Desert Palace)', 'Progressive Sword']],
 
             ["Desert Palace - Boss", False, []],
             ["Desert Palace - Boss", False, [], ['Small Key (Desert Palace)']],
@@ -33,7 +48,6 @@ class TestDesertPalace(TestDungeon):
             ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Fire Rod']],
             ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Progressive Sword']],
             ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Hammer']],
-            ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Ice Rod']],
             ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Somaria']],
             ["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Byrna']],
         ])
\ No newline at end of file
diff --git a/worlds/alttp/test/dungeons/TestDungeon.py b/worlds/alttp/test/dungeons/TestDungeon.py
index 73ece15417..8ca2791dcf 100644
--- a/worlds/alttp/test/dungeons/TestDungeon.py
+++ b/worlds/alttp/test/dungeons/TestDungeon.py
@@ -1,25 +1,16 @@
-import unittest
-from argparse import Namespace
-
-from BaseClasses import MultiWorld, CollectionState, ItemClassification
+from BaseClasses import CollectionState, ItemClassification
 from worlds.alttp.Dungeons import get_dungeon_item_pool
 from worlds.alttp.EntranceShuffle import mandatory_connections, connect_simple
 from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
 from worlds.alttp.Regions import create_regions
 from worlds.alttp.Shops import create_shops
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
 
-class TestDungeon(unittest.TestCase):
+class TestDungeon(LTTPTestBase):
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
+        self.world_setup()
         self.starting_regions = []  # Where to start exploring
         self.remove_exits = []      # Block dungeon exits
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
@@ -61,6 +52,7 @@ class TestDungeon(unittest.TestCase):
 
                 for item in items:
                     item.classification = ItemClassification.progression
-                    state.collect(item)
+                    state.collect(item, event=True)  # event=True prevents running sweep_for_events() and picking up
+                state.sweep_for_events()             # key drop keys repeatedly
 
-                self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access)
\ No newline at end of file
+                self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access, f"failed {self.multiworld.get_location(location, 1)} with: {item_pool}")
\ No newline at end of file
diff --git a/worlds/alttp/test/dungeons/TestEasternPalace.py b/worlds/alttp/test/dungeons/TestEasternPalace.py
index 0497a1132e..35c1b99283 100644
--- a/worlds/alttp/test/dungeons/TestEasternPalace.py
+++ b/worlds/alttp/test/dungeons/TestEasternPalace.py
@@ -18,7 +18,8 @@ class TestEasternPalace(TestDungeon):
 
                 ["Eastern Palace - Big Key Chest", False, []],
                 ["Eastern Palace - Big Key Chest", False, [], ['Lamp']],
-                ["Eastern Palace - Big Key Chest", True, ['Lamp']],
+                ["Eastern Palace - Big Key Chest", True, ['Lamp', 'Small Key (Eastern Palace)', 'Small Key (Eastern Palace)']],
+                ["Eastern Palace - Big Key Chest", True, ['Lamp', 'Big Key (Eastern Palace)']],
 
                 #@todo: Advanced?
                 ["Eastern Palace - Boss", False, []],
diff --git a/worlds/alttp/test/dungeons/TestGanonsTower.py b/worlds/alttp/test/dungeons/TestGanonsTower.py
index f81509273f..d22dc92b36 100644
--- a/worlds/alttp/test/dungeons/TestGanonsTower.py
+++ b/worlds/alttp/test/dungeons/TestGanonsTower.py
@@ -33,46 +33,50 @@ class TestGanonsTower(TestDungeon):
             ["Ganons Tower - Randomizer Room - Top Left", False, []],
             ["Ganons Tower - Randomizer Room - Top Left", False, [], ['Hammer']],
             ["Ganons Tower - Randomizer Room - Top Left", False, [], ['Hookshot']],
-            ["Ganons Tower - Randomizer Room - Top Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Randomizer Room - Top Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Randomizer Room - Top Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Randomizer Room - Top Right", False, []],
             ["Ganons Tower - Randomizer Room - Top Right", False, [], ['Hammer']],
             ["Ganons Tower - Randomizer Room - Top Right", False, [], ['Hookshot']],
-            ["Ganons Tower - Randomizer Room - Top Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Randomizer Room - Top Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Randomizer Room - Top Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Randomizer Room - Bottom Left", False, []],
             ["Ganons Tower - Randomizer Room - Bottom Left", False, [], ['Hammer']],
             ["Ganons Tower - Randomizer Room - Bottom Left", False, [], ['Hookshot']],
-            ["Ganons Tower - Randomizer Room - Bottom Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Randomizer Room - Bottom Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Randomizer Room - Bottom Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Randomizer Room - Bottom Right", False, []],
             ["Ganons Tower - Randomizer Room - Bottom Right", False, [], ['Hammer']],
             ["Ganons Tower - Randomizer Room - Bottom Right", False, [], ['Hookshot']],
-            ["Ganons Tower - Randomizer Room - Bottom Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Randomizer Room - Bottom Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Randomizer Room - Bottom Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Firesnake Room", False, []],
             ["Ganons Tower - Firesnake Room", False, [], ['Hammer']],
             ["Ganons Tower - Firesnake Room", False, [], ['Hookshot']],
-            ["Ganons Tower - Firesnake Room", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Firesnake Room", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Map Chest", False, []],
             ["Ganons Tower - Map Chest", False, [], ['Hammer']],
             ["Ganons Tower - Map Chest", False, [], ['Hookshot', 'Pegasus Boots']],
-            ["Ganons Tower - Map Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
-            ["Ganons Tower - Map Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hammer', 'Pegasus Boots']],
+            ["Ganons Tower - Map Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Map Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)',  'Hammer', 'Pegasus Boots']],
 
             ["Ganons Tower - Big Chest", False, []],
             ["Ganons Tower - Big Chest", False, [], ['Big Key (Ganons Tower)']],
-            ["Ganons Tower - Big Chest", True, ['Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
-            ["Ganons Tower - Big Chest", True, ['Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Big Chest", True, ['Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Chest", True, ['Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Hope Room - Left", True, []],
 
             ["Ganons Tower - Hope Room - Right", True, []],
 
             ["Ganons Tower - Bob's Chest", False, []],
-            ["Ganons Tower - Bob's Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
-            ["Ganons Tower - Bob's Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Bob's Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Bob's Chest", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Tile Room", False, []],
             ["Ganons Tower - Tile Room", False, [], ['Cane of Somaria']],
@@ -81,34 +85,34 @@ class TestGanonsTower(TestDungeon):
             ["Ganons Tower - Compass Room - Top Left", False, []],
             ["Ganons Tower - Compass Room - Top Left", False, [], ['Cane of Somaria']],
             ["Ganons Tower - Compass Room - Top Left", False, [], ['Fire Rod']],
-            ["Ganons Tower - Compass Room - Top Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Top Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
 
             ["Ganons Tower - Compass Room - Top Right", False, []],
             ["Ganons Tower - Compass Room - Top Right", False, [], ['Cane of Somaria']],
             ["Ganons Tower - Compass Room - Top Right", False, [], ['Fire Rod']],
-            ["Ganons Tower - Compass Room - Top Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Top Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
 
             ["Ganons Tower - Compass Room - Bottom Left", False, []],
             ["Ganons Tower - Compass Room - Bottom Left", False, [], ['Cane of Somaria']],
             ["Ganons Tower - Compass Room - Bottom Left", False, [], ['Fire Rod']],
-            ["Ganons Tower - Compass Room - Bottom Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Bottom Left", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
 
             ["Ganons Tower - Compass Room - Bottom Right", False, []],
             ["Ganons Tower - Compass Room - Bottom Right", False, [], ['Cane of Somaria']],
             ["Ganons Tower - Compass Room - Bottom Right", False, [], ['Fire Rod']],
-            ["Ganons Tower - Compass Room - Bottom Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
+            ["Ganons Tower - Compass Room - Bottom Right", True, ['Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Cane of Somaria']],
 
             ["Ganons Tower - Big Key Chest", False, []],
-            ["Ganons Tower - Big Key Chest", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
-            ["Ganons Tower - Big Key Chest", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Big Key Chest", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Key Chest", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Big Key Room - Left", False, []],
-            ["Ganons Tower - Big Key Room - Left", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
-            ["Ganons Tower - Big Key Room - Left", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Big Key Room - Left", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Key Room - Left", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Big Key Room - Right", False, []],
-            ["Ganons Tower - Big Key Room - Right", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
-            ["Ganons Tower - Big Key Room - Right", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Big Key Room - Right", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Cane of Somaria', 'Fire Rod']],
+            ["Ganons Tower - Big Key Room - Right", True, ['Progressive Bow', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Hookshot', 'Hammer']],
 
             ["Ganons Tower - Mini Helmasaur Room - Left", False, []],
             ["Ganons Tower - Mini Helmasaur Room - Left", False, [], ['Progressive Bow']],
@@ -128,8 +132,8 @@ class TestGanonsTower(TestDungeon):
             ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Progressive Bow']],
             ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Big Key (Ganons Tower)']],
             ["Ganons Tower - Pre-Moldorm Chest", False, [], ['Lamp', 'Fire Rod']],
-            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp']],
-            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod']],
+            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp']],
+            ["Ganons Tower - Pre-Moldorm Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod']],
 
             ["Ganons Tower - Validation Chest", False, []],
             ["Ganons Tower - Validation Chest", False, [], ['Hookshot']],
@@ -137,8 +141,8 @@ class TestGanonsTower(TestDungeon):
             ["Ganons Tower - Validation Chest", False, [], ['Big Key (Ganons Tower)']],
             ["Ganons Tower - Validation Chest", False, [], ['Lamp', 'Fire Rod']],
             ["Ganons Tower - Validation Chest", False, [], ['Progressive Sword', 'Hammer']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Progressive Sword']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Progressive Sword']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Hammer']],
-            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Progressive Sword']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Progressive Sword']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Lamp', 'Hookshot', 'Hammer']],
+            ["Ganons Tower - Validation Chest", True, ['Progressive Bow', 'Big Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Small Key (Ganons Tower)', 'Fire Rod', 'Hookshot', 'Hammer']],
         ])
\ No newline at end of file
diff --git a/worlds/alttp/test/dungeons/TestIcePalace.py b/worlds/alttp/test/dungeons/TestIcePalace.py
index 3c075fe5ea..edc9f1fbae 100644
--- a/worlds/alttp/test/dungeons/TestIcePalace.py
+++ b/worlds/alttp/test/dungeons/TestIcePalace.py
@@ -72,8 +72,9 @@ class TestIcePalace(TestDungeon):
             ["Ice Palace - Boss", False, [], ['Big Key (Ice Palace)']],
             ["Ice Palace - Boss", False, [], ['Fire Rod', 'Bombos']],
             ["Ice Palace - Boss", False, [], ['Fire Rod', 'Progressive Sword']],
-            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Fire Rod', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
-            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Fire Rod', 'Hammer', 'Cane of Somaria', 'Small Key (Ice Palace)']],
-            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Bombos', 'Progressive Sword', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)']],
-            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Bombos', 'Progressive Sword', 'Hammer', 'Cane of Somaria', 'Small Key (Ice Palace)']],
+            # need hookshot now to reach the right side for the 6th key
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Fire Rod', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)', 'Hookshot']],
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Fire Rod', 'Hammer', 'Cane of Somaria', 'Small Key (Ice Palace)', 'Hookshot']],
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Bombos', 'Progressive Sword', 'Hammer', 'Small Key (Ice Palace)', 'Small Key (Ice Palace)', 'Hookshot']],
+            ["Ice Palace - Boss", True, ['Progressive Glove', 'Big Key (Ice Palace)', 'Bombos', 'Progressive Sword', 'Hammer', 'Cane of Somaria', 'Small Key (Ice Palace)', 'Hookshot']],
         ])
\ No newline at end of file
diff --git a/worlds/alttp/test/dungeons/TestSkullWoods.py b/worlds/alttp/test/dungeons/TestSkullWoods.py
index 2dab840cf4..7f97c4d2f8 100644
--- a/worlds/alttp/test/dungeons/TestSkullWoods.py
+++ b/worlds/alttp/test/dungeons/TestSkullWoods.py
@@ -26,18 +26,18 @@ class TestSkullWoods(TestDungeon):
             ["Skull Woods - Big Chest", False, [], ['Never in logic']],
 
             ["Skull Woods - Compass Chest", False, []],
-            ["Skull Woods - Compass Chest", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Compass Chest", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+            ["Skull Woods - Compass Chest", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Compass Chest", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
 
             ["Skull Woods - Map Chest", True, []],
 
             ["Skull Woods - Pot Prison", False, []],
-            ["Skull Woods - Pot Prison", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Pot Prison", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+            ["Skull Woods - Pot Prison", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pot Prison", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
 
             ["Skull Woods - Pinball Room", False, []],
-            ["Skull Woods - Pinball Room", False, [], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Pinball Room", True, ['Small Key (Skull Woods)']]
+            ["Skull Woods - Pinball Room", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pinball Room", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
         ])
 
     def testSkullWoodsLeftOnly(self):
@@ -50,8 +50,8 @@ class TestSkullWoods(TestDungeon):
             ["Skull Woods - Compass Chest", True, []],
 
             ["Skull Woods - Map Chest", False, []],
-            ["Skull Woods - Map Chest", False, [], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Map Chest", True, ['Small Key (Skull Woods)']],
+            ["Skull Woods - Map Chest", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Map Chest", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
 
             ["Skull Woods - Pot Prison", True, []],
 
@@ -67,18 +67,18 @@ class TestSkullWoods(TestDungeon):
             ["Skull Woods - Big Chest", True, ['Big Key (Skull Woods)']],
 
             ["Skull Woods - Compass Chest", False, []],
-            ["Skull Woods - Compass Chest", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Compass Chest", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+            ["Skull Woods - Compass Chest", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Compass Chest", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
 
             ["Skull Woods - Map Chest", True, []],
 
             ["Skull Woods - Pot Prison", False, []],
-            ["Skull Woods - Pot Prison", False, ['Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Pot Prison", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
+            ["Skull Woods - Pot Prison", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pot Prison", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)']],
 
             ["Skull Woods - Pinball Room", False, []],
-            ["Skull Woods - Pinball Room", False, [], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Pinball Room", True, ['Small Key (Skull Woods)']]
+            ["Skull Woods - Pinball Room", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Pinball Room", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)']]
         ])
 
     def testSkullWoodsMiddle(self):
@@ -94,6 +94,6 @@ class TestSkullWoods(TestDungeon):
             ["Skull Woods - Boss", False, []],
             ["Skull Woods - Boss", False, [], ['Fire Rod']],
             ["Skull Woods - Boss", False, [], ['Progressive Sword']],
-            ["Skull Woods - Boss", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
-            ["Skull Woods - Boss", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Fire Rod', 'Progressive Sword']],
+            ["Skull Woods - Boss", False, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)'], ['Small Key (Skull Woods)']],
+            ["Skull Woods - Boss", True, ['Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Small Key (Skull Woods)', 'Fire Rod', 'Progressive Sword']],
         ])
\ No newline at end of file
diff --git a/worlds/alttp/test/dungeons/TestThievesTown.py b/worlds/alttp/test/dungeons/TestThievesTown.py
index a7e20bc520..01f1570a25 100644
--- a/worlds/alttp/test/dungeons/TestThievesTown.py
+++ b/worlds/alttp/test/dungeons/TestThievesTown.py
@@ -6,10 +6,6 @@ class TestThievesTown(TestDungeon):
     def testThievesTown(self):
         self.starting_regions = ['Thieves Town (Entrance)']
         self.run_tests([
-            ["Thieves' Town - Attic", False, []],
-            ["Thieves' Town - Attic", False, [], ['Big Key (Thieves Town)']],
-            ["Thieves' Town - Attic", False, [], ['Small Key (Thieves Town)']],
-            ["Thieves' Town - Attic", True, ['Big Key (Thieves Town)', 'Small Key (Thieves Town)']],
 
             ["Thieves' Town - Big Key Chest", True, []],
 
@@ -19,6 +15,19 @@ class TestThievesTown(TestDungeon):
 
             ["Thieves' Town - Ambush Chest", True, []],
 
+            ["Thieves' Town - Hallway Pot Key", False, []],
+            ["Thieves' Town - Hallway Pot Key", False, [], ['Big Key (Thieves Town)']],
+            ["Thieves' Town - Hallway Pot Key", True, ['Big Key (Thieves Town)']],
+
+            ["Thieves' Town - Spike Switch Pot Key", False, []],
+            ["Thieves' Town - Spike Switch Pot Key", False, [], ['Big Key (Thieves Town)']],
+            ["Thieves' Town - Spike Switch Pot Key", True, ['Big Key (Thieves Town)']],
+
+            ["Thieves' Town - Attic", False, []],
+            ["Thieves' Town - Attic", False, [], ['Big Key (Thieves Town)']],
+            ["Thieves' Town - Attic", False, [], ['Small Key (Thieves Town)']],
+            ["Thieves' Town - Attic", True, ['Big Key (Thieves Town)', 'Small Key (Thieves Town)']],
+
             ["Thieves' Town - Big Chest", False, []],
             ["Thieves' Town - Big Chest", False, [], ['Big Key (Thieves Town)']],
             ["Thieves' Town - Big Chest", False, [], ['Small Key (Thieves Town)']],
@@ -31,7 +40,6 @@ class TestThievesTown(TestDungeon):
 
             ["Thieves' Town - Boss", False, []],
             ["Thieves' Town - Boss", False, [], ['Big Key (Thieves Town)']],
-            ["Thieves' Town - Boss", False, [], ['Small Key (Thieves Town)']],
             ["Thieves' Town - Boss", False, [], ['Hammer', 'Progressive Sword', 'Cane of Somaria', 'Cane of Byrna']],
             ["Thieves' Town - Boss", True, ['Small Key (Thieves Town)', 'Big Key (Thieves Town)', 'Hammer']],
             ["Thieves' Town - Boss", True, ['Small Key (Thieves Town)', 'Big Key (Thieves Town)', 'Progressive Sword']],
diff --git a/worlds/alttp/test/inverted/TestInverted.py b/worlds/alttp/test/inverted/TestInverted.py
index ad7458202e..f5608ba07b 100644
--- a/worlds/alttp/test/inverted/TestInverted.py
+++ b/worlds/alttp/test/inverted/TestInverted.py
@@ -1,6 +1,3 @@
-from argparse import Namespace
-
-from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
 from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
@@ -10,17 +7,12 @@ from worlds.alttp.Regions import mark_light_world_regions
 from worlds.alttp.Shops import create_shops
 from test.TestBase import TestBase
 
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
-class TestInverted(TestBase):
+
+class TestInverted(TestBase, LTTPTestBase):
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
+        self.world_setup()
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.mode[1] = "inverted"
         create_inverted_regions(self.multiworld, 1)
diff --git a/worlds/alttp/test/inverted/TestInvertedBombRules.py b/worlds/alttp/test/inverted/TestInvertedBombRules.py
index 89c5d78603..d9eacb5ad9 100644
--- a/worlds/alttp/test/inverted/TestInvertedBombRules.py
+++ b/worlds/alttp/test/inverted/TestInvertedBombRules.py
@@ -1,27 +1,17 @@
-import unittest
-from argparse import Namespace
-
-from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import create_dungeons
 from worlds.alttp.EntranceShuffle import connect_entrance, 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, \
     Inverted_LW_Entrances_Must_Exit, Inverted_LW_Dungeon_Entrances_Must_Exit, Inverted_Bomb_Shop_Multi_Cave_Doors, Inverted_Bomb_Shop_Single_Cave_Doors, Blacksmith_Single_Cave_Doors, Inverted_Blacksmith_Multi_Cave_Doors
 from worlds.alttp.InvertedRegions import create_inverted_regions
 from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Rules import set_inverted_big_bomb_rules
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
 
-class TestInvertedBombRules(unittest.TestCase):
+class TestInvertedBombRules(LTTPTestBase):
 
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
+        self.world_setup()
         self.multiworld.mode[1] = "inverted"
-        args = Namespace
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-            self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         create_inverted_regions(self.multiworld, 1)
         self.multiworld.worlds[1].create_dungeons()
diff --git a/worlds/alttp/test/inverted/TestInvertedTurtleRock.py b/worlds/alttp/test/inverted/TestInvertedTurtleRock.py
index 533e3c650f..fe8979c1ef 100644
--- a/worlds/alttp/test/inverted/TestInvertedTurtleRock.py
+++ b/worlds/alttp/test/inverted/TestInvertedTurtleRock.py
@@ -18,10 +18,9 @@ class TestInvertedTurtleRock(TestInverted):
 
             ["Turtle Rock - Chain Chomps", False, []],
             ["Turtle Rock - Chain Chomps", False, [], ['Magic Mirror', 'Cane of Somaria']],
-            # Item rando only needs 1 key.  ER needs to consider the case when the back is accessible, but not the middle (key wasted on Trinexx door)
             ["Turtle Rock - Chain Chomps", False, ['Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Chain Chomps", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Chain Chomps", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
             ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
             ["Turtle Rock - Chain Chomps", True, ['Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
@@ -55,8 +54,8 @@ class TestInvertedTurtleRock(TestInverted):
             ["Turtle Rock - Big Chest", False, [], ['Big Key (Turtle Rock)']],
             ["Turtle Rock - Big Chest", False, [], ['Magic Mirror', 'Cane of Somaria']],
             ["Turtle Rock - Big Chest", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria']],
             ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hookshot']],
             ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
@@ -66,8 +65,8 @@ class TestInvertedTurtleRock(TestInverted):
 
             ["Turtle Rock - Big Key Chest", False, []],
             ["Turtle Rock - Big Key Chest", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Key Chest", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             # Mirror in from ledge, use left side entrance, have enough keys to get to the chest
             ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
@@ -80,8 +79,8 @@ class TestInvertedTurtleRock(TestInverted):
             ["Turtle Rock - Crystaroller Room", False, [], ['Big Key (Turtle Rock)', 'Lamp']],
             ["Turtle Rock - Crystaroller Room", False, [], ['Magic Mirror', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
             ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
             ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
@@ -98,9 +97,9 @@ class TestInvertedTurtleRock(TestInverted):
             ["Turtle Rock - Boss", False, [], ['Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", False, [], ['Magic Mirror', 'Lamp']],
             ["Turtle Rock - Boss", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Flute', 'Magic Mirror', 'Moon Pearl', 'Hookshot', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']]
         ])
@@ -115,12 +114,12 @@ class TestInvertedTurtleRock(TestInverted):
             [location, False, [], ['Magic Mirror', 'Cane of Somaria']],
             [location, False, [], ['Magic Mirror', 'Lamp']],
             [location, False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
 
             # Mirroring into Eye Bridge does not require Cane of Somaria
             [location, True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Byrna']],
diff --git a/worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py
index 72049e1774..33e5822981 100644
--- a/worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py
+++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py
@@ -1,27 +1,18 @@
-from argparse import Namespace
-
-from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
 from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
-from worlds.alttp.ItemPool import generate_itempool, difficulties
+from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
 from worlds.alttp.Regions import mark_light_world_regions
 from worlds.alttp.Shops import create_shops
-from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
-class TestInvertedMinor(TestBase):
+
+class TestInvertedMinor(TestBase, LTTPTestBase):
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
+        self.world_setup()
         self.multiworld.mode[1] = "inverted"
         self.multiworld.logic[1] = "minorglitches"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
diff --git a/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py b/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py
index a25d89a6f4..d7b5c9f797 100644
--- a/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py
+++ b/worlds/alttp/test/inverted_minor_glitches/TestInvertedTurtleRock.py
@@ -20,8 +20,8 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             ["Turtle Rock - Chain Chomps", False, [], ['Magic Mirror', 'Cane of Somaria']],
             # Item rando only needs 1 key.  ER needs to consider the case when the back is accessible, but not the middle (key wasted on Trinexx door)
             ["Turtle Rock - Chain Chomps", False, ['Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Chain Chomps", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Chain Chomps", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
             ["Turtle Rock - Chain Chomps", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
             ["Turtle Rock - Chain Chomps", True, ['Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
@@ -55,8 +55,8 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             ["Turtle Rock - Big Chest", False, [], ['Big Key (Turtle Rock)']],
             ["Turtle Rock - Big Chest", False, [], ['Magic Mirror', 'Cane of Somaria']],
             ["Turtle Rock - Big Chest", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Somaria']],
             ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hookshot']],
             ["Turtle Rock - Big Chest", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
@@ -66,8 +66,8 @@ class TestInvertedTurtleRock(TestInvertedMinor):
 
             ["Turtle Rock - Big Key Chest", False, []],
             ["Turtle Rock - Big Key Chest", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Key Chest", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             # Mirror in from ledge, use left side entrance, have enough keys to get to the chest
             ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Big Key Chest", True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
@@ -80,8 +80,8 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             ["Turtle Rock - Crystaroller Room", False, [], ['Big Key (Turtle Rock)', 'Lamp']],
             ["Turtle Rock - Crystaroller Room", False, [], ['Magic Mirror', 'Cane of Somaria']],
             ["Turtle Rock - Crystaroller Room", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
-            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
+            ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)']],
             ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove']],
             ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Moon Pearl', 'Hookshot']],
             ["Turtle Rock - Crystaroller Room", True, ['Big Key (Turtle Rock)', 'Moon Pearl', 'Flute', 'Magic Mirror', 'Hookshot']],
@@ -98,9 +98,9 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             ["Turtle Rock - Boss", False, [], ['Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", False, [], ['Magic Mirror', 'Lamp']],
             ["Turtle Rock - Boss", False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Small Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
-            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Flute', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Bottle', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
+            ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Progressive Sword', 'Cane of Somaria', 'Magic Upgrade (1/2)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)','Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']],
             ["Turtle Rock - Boss", True, ['Ice Rod', 'Fire Rod', 'Flute', 'Magic Mirror', 'Moon Pearl', 'Hookshot', 'Hammer', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Big Key (Turtle Rock)']]
         ])
@@ -116,12 +116,12 @@ class TestInvertedTurtleRock(TestInvertedMinor):
             [location, False, [], ['Magic Mirror', 'Cane of Somaria']],
             [location, False, [], ['Magic Mirror', 'Lamp']],
             [location, False, ['Small Key (Turtle Rock)', 'Small Key (Turtle Rock)'], ['Magic Mirror', 'Small Key (Turtle Rock)']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
-            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
-            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cane of Byrna']],
+            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Cape']],
+            [location, True, ['Big Key (Turtle Rock)', 'Flute', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Lamp', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
+            [location, True, ['Big Key (Turtle Rock)', 'Lamp', 'Progressive Glove', 'Quake', 'Progressive Sword', 'Cane of Somaria', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Small Key (Turtle Rock)', 'Progressive Shield', 'Progressive Shield', 'Progressive Shield']],
 
             # Mirroring into Eye Bridge does not require Cane of Somaria
             [location, True, ['Lamp', 'Magic Mirror', 'Progressive Glove', 'Progressive Glove', 'Cane of Byrna']],
diff --git a/worlds/alttp/test/inverted_owg/TestInvertedOWG.py b/worlds/alttp/test/inverted_owg/TestInvertedOWG.py
index 77a551db6f..a4e84fce9b 100644
--- a/worlds/alttp/test/inverted_owg/TestInvertedOWG.py
+++ b/worlds/alttp/test/inverted_owg/TestInvertedOWG.py
@@ -1,28 +1,18 @@
-from argparse import Namespace
-
-from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
 from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
-from worlds.alttp.ItemPool import generate_itempool, difficulties
+from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
 from worlds.alttp.Regions import mark_light_world_regions
 from worlds.alttp.Shops import create_shops
-from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
 
-class TestInvertedOWG(TestBase):
+class TestInvertedOWG(TestBase, LTTPTestBase):
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
+        self.world_setup()
         self.multiworld.logic[1] = "owglitches"
         self.multiworld.mode[1] = "inverted"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
diff --git a/worlds/alttp/test/minor_glitches/TestMinor.py b/worlds/alttp/test/minor_glitches/TestMinor.py
index fdf626fe9d..d5cfd3095b 100644
--- a/worlds/alttp/test/minor_glitches/TestMinor.py
+++ b/worlds/alttp/test/minor_glitches/TestMinor.py
@@ -1,27 +1,15 @@
-from argparse import Namespace
-
-from BaseClasses import MultiWorld
-from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
-from worlds.alttp.EntranceShuffle import link_entrances
+from worlds.alttp.Dungeons import get_dungeon_item_pool
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
 from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions
-from worlds.alttp.Shops import create_shops
 from test.TestBase import TestBase
 
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
 
-class TestMinor(TestBase):
+class TestMinor(TestBase, LTTPTestBase):
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
+        self.world_setup()
         self.multiworld.logic[1] = "minorglitches"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.worlds[1].er_seed = 0
diff --git a/worlds/alttp/test/owg/TestDungeons.py b/worlds/alttp/test/owg/TestDungeons.py
index 284b489b16..4f87896967 100644
--- a/worlds/alttp/test/owg/TestDungeons.py
+++ b/worlds/alttp/test/owg/TestDungeons.py
@@ -6,6 +6,7 @@ class TestDungeons(TestVanillaOWG):
     def testFirstDungeonChests(self):
         self.run_location_tests([
             ["Hyrule Castle - Map Chest", True, []],
+            ["Hyrule Castle - Map Guard Key Drop", True, []],
 
             ["Sanctuary", True, []],
 
diff --git a/worlds/alttp/test/owg/TestVanillaOWG.py b/worlds/alttp/test/owg/TestVanillaOWG.py
index c0888aa32f..37b0b6ccb8 100644
--- a/worlds/alttp/test/owg/TestVanillaOWG.py
+++ b/worlds/alttp/test/owg/TestVanillaOWG.py
@@ -1,24 +1,15 @@
-from argparse import Namespace
-
-from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import get_dungeon_item_pool
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
 from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
 from test.TestBase import TestBase
 
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
 
-class TestVanillaOWG(TestBase):
+class TestVanillaOWG(TestBase, LTTPTestBase):
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
+        self.world_setup()
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.logic[1] = "owglitches"
         self.multiworld.worlds[1].er_seed = 0
diff --git a/worlds/alttp/test/vanilla/TestVanilla.py b/worlds/alttp/test/vanilla/TestVanilla.py
index e338410df2..3c983e9850 100644
--- a/worlds/alttp/test/vanilla/TestVanilla.py
+++ b/worlds/alttp/test/vanilla/TestVanilla.py
@@ -1,22 +1,14 @@
-from argparse import Namespace
-
-from BaseClasses import MultiWorld
 from worlds.alttp.Dungeons import get_dungeon_item_pool
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
 from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import ItemFactory
 from test.TestBase import TestBase
-from worlds import AutoWorld
+from worlds.alttp.test import LTTPTestBase
 
-class TestVanilla(TestBase):
+
+class TestVanilla(TestBase, LTTPTestBase):
     def setUp(self):
-        self.multiworld = MultiWorld(1)
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types["A Link to the Past"].option_definitions.items():
-            setattr(args, name, {1: option.from_any(option.default)})
-        self.multiworld.set_options(args)
-        self.multiworld.set_default_common_options()
+        self.world_setup()
         self.multiworld.logic[1] = "noglitches"
         self.multiworld.difficulty_requirements[1] = difficulties['normal']
         self.multiworld.worlds[1].er_seed = 0
diff --git a/worlds/archipidle/Rules.py b/worlds/archipidle/Rules.py
index cdd48e7604..3bf4bad475 100644
--- a/worlds/archipidle/Rules.py
+++ b/worlds/archipidle/Rules.py
@@ -5,12 +5,7 @@ from ..generic.Rules import set_rule
 
 class ArchipIDLELogic(LogicMixin):
     def _archipidle_location_is_accessible(self, player_id, items_required):
-        items_received = 0
-        for item in self.prog_items:
-            if item[1] == player_id:
-                items_received += 1
-
-        return items_received >= items_required
+        return sum(self.prog_items[player_id].values()) >= items_required
 
 
 def set_rules(world: MultiWorld, player: int):
diff --git a/worlds/bk_sudoku/__init__.py b/worlds/bk_sudoku/__init__.py
index f914baf066..36d863bb44 100644
--- a/worlds/bk_sudoku/__init__.py
+++ b/worlds/bk_sudoku/__init__.py
@@ -5,7 +5,7 @@ from ..AutoWorld import WebWorld, World
 
 
 class Bk_SudokuWebWorld(WebWorld):
-    settings_page = "games/Sudoku/info/en"
+    options_page = "games/Sudoku/info/en"
     theme = 'partyTime'
     tutorials = [
         Tutorial(
diff --git a/worlds/blasphemous/Options.py b/worlds/blasphemous/Options.py
index ea304d22ed..127a1dc776 100644
--- a/worlds/blasphemous/Options.py
+++ b/worlds/blasphemous/Options.py
@@ -67,6 +67,7 @@ class StartingLocation(ChoiceIsRandom):
 
 class Ending(Choice):
     """Choose which ending is required to complete the game.
+    Talking to Tirso in Albero will tell you the selected ending for the current game.
     Ending A: Collect all thorn upgrades.
     Ending C: Collect all thorn upgrades and the Holy Wound of Abnegation."""
     display_name = "Ending"
diff --git a/worlds/blasphemous/Rules.py b/worlds/blasphemous/Rules.py
index 248ff645bc..5d88292131 100644
--- a/worlds/blasphemous/Rules.py
+++ b/worlds/blasphemous/Rules.py
@@ -578,11 +578,12 @@ def rules(blasphemousworld):
             or state.has("Purified Hand of the Nun", player)
             or state.has("D01Z02S03[NW]", player) 
             and (
-                can_cross_gap(state, logic, player, 1)
+                can_cross_gap(state, logic, player, 2)
                 or state.has("Lorquiana", player)
                 or aubade(state, player)
                 or state.has("Cantina of the Blue Rose", player)
                 or charge_beam(state, player)
+                or state.has("Ranged Skill", player)
             )
         ))
     set_rule(world.get_location("Albero: Lvdovico's 1st reward", player),
@@ -702,10 +703,11 @@ def rules(blasphemousworld):
     # Items
     set_rule(world.get_location("WotBC: Cliffside Child of Moonlight", player),
         lambda state: (
-            can_cross_gap(state, logic, player, 1)
+            can_cross_gap(state, logic, player, 2)
             or aubade(state, player)
             or charge_beam(state, player)
-            or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Cantina of the Blue Rose", "Cloistered Ruby"}, player)
+            or state.has_any({"Lorquiana", "Cante Jondo of the Three Sisters", "Cantina of the Blue Rose", \
+                              "Cloistered Ruby", "Ranged Skill"}, player)
             or precise_skips_allowed(logic)
         ))
     # Doors
@@ -4193,8 +4195,9 @@ def rules(blasphemousworld):
     # Items
     set_rule(world.get_location("BotSS: Platforming gauntlet", player),
         lambda state: (
-            state.has("D17BZ02S01[FrontR]", player)
-            or state.has_all({"Dash Ability", "Wall Climb Ability"}, player)
+            #state.has("D17BZ02S01[FrontR]", player) or
+            # TODO: actually fix this once door rando is real
+            state.has_all({"Dash Ability", "Wall Climb Ability"}, player) 
         ))
     # Doors
     set_rule(world.get_entrance("D17BZ02S01[FrontR]", player),
diff --git a/worlds/blasphemous/docs/en_Blasphemous.md b/worlds/blasphemous/docs/en_Blasphemous.md
index 15223213ac..1ff7f5a903 100644
--- a/worlds/blasphemous/docs/en_Blasphemous.md
+++ b/worlds/blasphemous/docs/en_Blasphemous.md
@@ -19,6 +19,7 @@ In addition, there are other changes to the game that make it better optimized f
 - The Apodictic Heart of Mea Culpa can be unequipped.
 - Dying with the Immaculate Bead is unnecessary, it is automatically upgraded to the Weight of True Guilt.
 - If the option is enabled, the 34 corpses in game will have their messages changed to give hints about certain items and locations. The Shroud of Dreamt Sins is not required to hear them.
+- Talking to Tirso in Albero will tell you the selected ending for the current game.
 
 ## What has been changed about the side quests?
 
diff --git a/worlds/bumpstik/Regions.py b/worlds/bumpstik/Regions.py
index 247d6d61a3..6cddde882a 100644
--- a/worlds/bumpstik/Regions.py
+++ b/worlds/bumpstik/Regions.py
@@ -23,13 +23,13 @@ def create_regions(world: MultiWorld, player: int):
 
     entrance_map = {
         "Level 1": lambda state:
-        state.has("Booster Bumper", player, 2) and state.has("Treasure Bumper", player, 9),
+        state.has("Booster Bumper", player, 1) and state.has("Treasure Bumper", player, 8),
         "Level 2": lambda state:
-        state.has("Booster Bumper", player, 3) and state.has("Treasure Bumper", player, 17),
+        state.has("Booster Bumper", player, 2) and state.has("Treasure Bumper", player, 16),
         "Level 3": lambda state:
-        state.has("Booster Bumper", player, 4) and state.has("Treasure Bumper", player, 25),
+        state.has("Booster Bumper", player, 3) and state.has("Treasure Bumper", player, 24),
         "Level 4": lambda state:
-        state.has("Booster Bumper", player, 5) and state.has("Treasure Bumper", player, 33)
+        state.has("Booster Bumper", player, 5) and state.has("Treasure Bumper", player, 32)
     }
 
     for x, region_name in enumerate(region_map):
diff --git a/worlds/bumpstik/__init__.py b/worlds/bumpstik/__init__.py
index 9eeb3325e3..c4e65d07b6 100644
--- a/worlds/bumpstik/__init__.py
+++ b/worlds/bumpstik/__init__.py
@@ -108,7 +108,7 @@ class BumpStikWorld(World):
                 item_pool += self._create_item_in_quantities(
                     name, frequencies[i])
 
-        item_delta = len(location_table) - len(item_pool) - 1
+        item_delta = len(location_table) - len(item_pool)
         if item_delta > 0:
             item_pool += self._create_item_in_quantities(
                 "Score Bonus", item_delta)
@@ -116,13 +116,16 @@ class BumpStikWorld(World):
         self.multiworld.itempool += item_pool
 
     def set_rules(self):
-        forbid_item(self.multiworld.get_location("Bonus Booster 5", self.player),
-                    "Booster Bumper", self.player)
-
-    def generate_basic(self):
-        self.multiworld.get_location("Level 5 - Cleared all Hazards", self.player).place_locked_item(
-            self.create_item(self.get_filler_item_name()))
-
+        for x in range(1, 32):
+            self.multiworld.get_location(f"Treasure Bumper {x + 1}", self.player).access_rule = \
+                lambda state, x = x: state.has("Treasure Bumper", self.player, x)
+        for x in range(1, 5):
+            self.multiworld.get_location(f"Bonus Booster {x + 1}", self.player).access_rule = \
+                lambda state, x = x: state.has("Booster Bumper", self.player, x)
+        self.multiworld.get_location("Level 5 - Cleared all Hazards", self.player).access_rule = \
+            lambda state: state.has("Hazard Bumper", self.player, 25)
+            
         self.multiworld.completion_condition[self.player] = \
             lambda state: state.has("Booster Bumper", self.player, 5) and \
             state.has("Treasure Bumper", self.player, 32)
+
diff --git a/worlds/bumpstik/test/TestLogic.py b/worlds/bumpstik/test/TestLogic.py
new file mode 100644
index 0000000000..e374b7b1e9
--- /dev/null
+++ b/worlds/bumpstik/test/TestLogic.py
@@ -0,0 +1,39 @@
+from . import BumpStikTestBase
+
+
+class TestRuleLogic(BumpStikTestBase):
+    def testLogic(self):
+        for x in range(1, 33):
+            if x == 32:
+                self.assertFalse(self.can_reach_location("Level 5 - Cleared all Hazards"))
+
+            self.collect(self.get_item_by_name("Treasure Bumper"))
+            if x % 8 == 0:
+                bb_count = round(x / 8)
+
+                if bb_count < 4:
+                    self.assertFalse(self.can_reach_location(f"Treasure Bumper {x + 1}"))
+                elif bb_count == 4:
+                    bb_count += 1
+
+                for y in range(self.count("Booster Bumper"), bb_count):
+                    self.assertTrue(self.can_reach_location(f"Bonus Booster {y + 1}"),
+                                    f"BB {y + 1} check not reachable with {self.count('Booster Bumper')} BBs")
+                    if y < 4:
+                        self.assertFalse(self.can_reach_location(f"Bonus Booster {y + 2}"),
+                                         f"BB {y + 2} check reachable with {self.count('Treasure Bumper')} TBs")
+                    self.collect(self.get_item_by_name("Booster Bumper"))
+
+            if x < 31:
+                self.assertFalse(self.can_reach_location(f"Treasure Bumper {x + 2}"))
+            elif x == 31:
+                self.assertFalse(self.can_reach_location("Level 5 - 50,000+ Total Points"))
+
+            if x < 32:
+                self.assertTrue(self.can_reach_location(f"Treasure Bumper {x + 1}"),
+                                f"TB {x + 1} check not reachable with {self.count('Treasure Bumper')} TBs")
+            elif x == 32:
+                self.assertTrue(self.can_reach_location("Level 5 - 50,000+ Total Points"))
+                self.assertFalse(self.can_reach_location("Level 5 - Cleared all Hazards"))
+                self.collect(self.get_items_by_name("Hazard Bumper"))
+                self.assertTrue(self.can_reach_location("Level 5 - Cleared all Hazards"))
diff --git a/worlds/bumpstik/test/__init__.py b/worlds/bumpstik/test/__init__.py
new file mode 100644
index 0000000000..1199d7b8e5
--- /dev/null
+++ b/worlds/bumpstik/test/__init__.py
@@ -0,0 +1,5 @@
+from test.TestBase import WorldTestBase
+
+
+class BumpStikTestBase(WorldTestBase):
+    game = "Bumper Stickers"
diff --git a/worlds/checksfinder/Rules.py b/worlds/checksfinder/Rules.py
index 4e12668798..38d7d77ad3 100644
--- a/worlds/checksfinder/Rules.py
+++ b/worlds/checksfinder/Rules.py
@@ -1,37 +1,34 @@
-from ..generic.Rules import set_rule, add_rule
-from BaseClasses import MultiWorld
-from ..AutoWorld import LogicMixin
+from ..generic.Rules import set_rule
+from BaseClasses import MultiWorld, CollectionState
 
 
-class ChecksFinderLogic(LogicMixin):
-
-    def _has_total(self, player: int, total: int):
-        return (self.item_count('Map Width', player)+self.item_count('Map Height', player)+
-                self.item_count('Map Bombs', player)) >= total
+def _has_total(state: CollectionState, player: int, total: int):
+    return (state.count('Map Width', player) + state.count('Map Height', player) +
+            state.count('Map Bombs', player)) >= total
 
 
 # Sets rules on entrances and advancements that are always applied
 def set_rules(world: MultiWorld, player: int):
-    set_rule(world.get_location(("Tile 6"), player), lambda state: state._has_total(player, 1))
-    set_rule(world.get_location(("Tile 7"), player), lambda state: state._has_total(player, 2))
-    set_rule(world.get_location(("Tile 8"), player), lambda state: state._has_total(player, 3))
-    set_rule(world.get_location(("Tile 9"), player), lambda state: state._has_total(player, 4))
-    set_rule(world.get_location(("Tile 10"), player), lambda state: state._has_total(player, 5))
-    set_rule(world.get_location(("Tile 11"), player), lambda state: state._has_total(player, 6))
-    set_rule(world.get_location(("Tile 12"), player), lambda state: state._has_total(player, 7))
-    set_rule(world.get_location(("Tile 13"), player), lambda state: state._has_total(player, 8))
-    set_rule(world.get_location(("Tile 14"), player), lambda state: state._has_total(player, 9))
-    set_rule(world.get_location(("Tile 15"), player), lambda state: state._has_total(player, 10))
-    set_rule(world.get_location(("Tile 16"), player), lambda state: state._has_total(player, 11))
-    set_rule(world.get_location(("Tile 17"), player), lambda state: state._has_total(player, 12))
-    set_rule(world.get_location(("Tile 18"), player), lambda state: state._has_total(player, 13))
-    set_rule(world.get_location(("Tile 19"), player), lambda state: state._has_total(player, 14))
-    set_rule(world.get_location(("Tile 20"), player), lambda state: state._has_total(player, 15))
-    set_rule(world.get_location(("Tile 21"), player), lambda state: state._has_total(player, 16))
-    set_rule(world.get_location(("Tile 22"), player), lambda state: state._has_total(player, 17))
-    set_rule(world.get_location(("Tile 23"), player), lambda state: state._has_total(player, 18))
-    set_rule(world.get_location(("Tile 24"), player), lambda state: state._has_total(player, 19))
-    set_rule(world.get_location(("Tile 25"), player), lambda state: state._has_total(player, 20))
+    set_rule(world.get_location("Tile 6", player), lambda state: _has_total(state, player, 1))
+    set_rule(world.get_location("Tile 7", player), lambda state: _has_total(state, player, 2))
+    set_rule(world.get_location("Tile 8", player), lambda state: _has_total(state, player, 3))
+    set_rule(world.get_location("Tile 9", player), lambda state: _has_total(state, player, 4))
+    set_rule(world.get_location("Tile 10", player), lambda state: _has_total(state, player, 5))
+    set_rule(world.get_location("Tile 11", player), lambda state: _has_total(state, player, 6))
+    set_rule(world.get_location("Tile 12", player), lambda state: _has_total(state, player, 7))
+    set_rule(world.get_location("Tile 13", player), lambda state: _has_total(state, player, 8))
+    set_rule(world.get_location("Tile 14", player), lambda state: _has_total(state, player, 9))
+    set_rule(world.get_location("Tile 15", player), lambda state: _has_total(state, player, 10))
+    set_rule(world.get_location("Tile 16", player), lambda state: _has_total(state, player, 11))
+    set_rule(world.get_location("Tile 17", player), lambda state: _has_total(state, player, 12))
+    set_rule(world.get_location("Tile 18", player), lambda state: _has_total(state, player, 13))
+    set_rule(world.get_location("Tile 19", player), lambda state: _has_total(state, player, 14))
+    set_rule(world.get_location("Tile 20", player), lambda state: _has_total(state, player, 15))
+    set_rule(world.get_location("Tile 21", player), lambda state: _has_total(state, player, 16))
+    set_rule(world.get_location("Tile 22", player), lambda state: _has_total(state, player, 17))
+    set_rule(world.get_location("Tile 23", player), lambda state: _has_total(state, player, 18))
+    set_rule(world.get_location("Tile 24", player), lambda state: _has_total(state, player, 19))
+    set_rule(world.get_location("Tile 25", player), lambda state: _has_total(state, player, 20))
 
 
 # Sets rules on completion condition
diff --git a/worlds/checksfinder/__init__.py b/worlds/checksfinder/__init__.py
index 9ca16ca0d2..621e8f5c37 100644
--- a/worlds/checksfinder/__init__.py
+++ b/worlds/checksfinder/__init__.py
@@ -14,8 +14,8 @@ class ChecksFinderWeb(WebWorld):
         "A guide to setting up the Archipelago ChecksFinder software on your computer. This guide covers "
         "single-player, multiworld, and related software.",
         "English",
-        "checksfinder_en.md",
-        "checksfinder/en",
+        "setup_en.md",
+        "setup/en",
         ["Mewlif"]
     )]
 
@@ -45,7 +45,7 @@ class ChecksFinderWorld(World):
             'race': self.multiworld.is_race,
         }
 
-    def generate_basic(self):
+    def create_items(self):
 
         # Generate item pool
         itempool = []
@@ -69,8 +69,8 @@ class ChecksFinderWorld(World):
     def create_regions(self):
         menu = Region("Menu", self.player, self.multiworld)
         board = Region("Board", self.player, self.multiworld)
-        board.locations = [ChecksFinderAdvancement(self.player, loc_name, loc_data.id, board)
-                           for loc_name, loc_data in advancement_table.items() if loc_data.region == board.name]
+        board.locations += [ChecksFinderAdvancement(self.player, loc_name, loc_data.id, board)
+                            for loc_name, loc_data in advancement_table.items() if loc_data.region == board.name]
 
         connection = Entrance(self.player, "New Board", menu)
         menu.exits.append(connection)
diff --git a/worlds/checksfinder/docs/en_ChecksFinder.md b/worlds/checksfinder/docs/en_ChecksFinder.md
index bd82660b09..96fb0529df 100644
--- a/worlds/checksfinder/docs/en_ChecksFinder.md
+++ b/worlds/checksfinder/docs/en_ChecksFinder.md
@@ -14,11 +14,18 @@ many checks as you have gained items, plus five to start with being available.
 ## When the player receives an item, what happens?
 
 When the player receives an item in ChecksFinder, it either can make the future boards they play be bigger in width or
-height, or add a new bomb to the future boards, with a limit to having up to one fifth of the _current_ board being 
-bombs. The items you have gained _before_ the current board was made will be said at the bottom of the screen as a number
+height, or add a new bomb to the future boards, with a limit to having up to one fifth of the _current_ board being
+bombs. The items you have gained _before_ the current board was made will be said at the bottom of the screen as a
+number
 next to an icon, the number is how many you have gotten and the icon represents which item it is.
 
 ## What is the victory condition?
 
 Victory is achieved when the player wins a board they were given after they have received all of their Map Width, Map
-Height, and Map Bomb items. The game will say at the bottom of the screen how many of each you have received.
\ No newline at end of file
+Height, and Map Bomb items. The game will say at the bottom of the screen how many of each you have received.
+
+## Unique Local Commands
+
+The following command is only available when using the ChecksFinderClient to play with Archipelago.
+
+- `/resync` Manually trigger a resync.
diff --git a/worlds/checksfinder/docs/checksfinder_en.md b/worlds/checksfinder/docs/setup_en.md
similarity index 100%
rename from worlds/checksfinder/docs/checksfinder_en.md
rename to worlds/checksfinder/docs/setup_en.md
diff --git a/worlds/dark_souls_3/Items.py b/worlds/dark_souls_3/Items.py
index 754282e736..a13235b12a 100644
--- a/worlds/dark_souls_3/Items.py
+++ b/worlds/dark_souls_3/Items.py
@@ -1271,6 +1271,14 @@ _cut_content_items = [DS3ItemData(row[0], row[1], False, row[2]) for row in [
     ("Dorris Swarm",                        0x40393870, DS3ItemCategory.SKIP),
 ]]
 
+item_descriptions = {
+    "Cinders": """
+      All four Cinders of a Lord.
+
+      Once you have these four, you can fight Soul of Cinder and win the game.
+    """,
+}
+
 _all_items = _vanilla_items + _dlc_items
 
 item_dictionary = {item_data.name: item_data for item_data in _all_items}
diff --git a/worlds/dark_souls_3/Options.py b/worlds/dark_souls_3/Options.py
index d613e47334..df0bb953b8 100644
--- a/worlds/dark_souls_3/Options.py
+++ b/worlds/dark_souls_3/Options.py
@@ -171,6 +171,16 @@ class MaxLevelsIn10WeaponPoolOption(Range):
     default = 10
 
 
+class EarlySmallLothricBanner(Choice):
+    """This option makes it so the user can choose to force the Small Lothric Banner into an early sphere in their world or
+    into an early sphere across all worlds."""
+    display_name = "Early Small Lothric Banner"
+    option_off = 0
+    option_early_global = 1
+    option_early_local = 2
+    default = option_off
+
+
 class LateBasinOfVowsOption(Toggle):
     """This option makes it so the Basin of Vows is still randomized, but guarantees you that you wont have to venture into
     Lothric Castle to find your Small Lothric Banner to get out of High Wall of Lothric. So you may find Basin of Vows early, 
@@ -215,6 +225,7 @@ dark_souls_options: typing.Dict[str, Option] = {
     "max_levels_in_5": MaxLevelsIn5WeaponPoolOption,
     "min_levels_in_10": MinLevelsIn10WeaponPoolOption,
     "max_levels_in_10": MaxLevelsIn10WeaponPoolOption,
+    "early_banner": EarlySmallLothricBanner,
     "late_basin_of_vows": LateBasinOfVowsOption,
     "late_dlc": LateDLCOption,
     "no_spell_requirements": NoSpellRequirementsOption,
diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py
index b78ff0548a..7ee6c2a641 100644
--- a/worlds/dark_souls_3/__init__.py
+++ b/worlds/dark_souls_3/__init__.py
@@ -7,9 +7,9 @@ from Options import Toggle
 from worlds.AutoWorld import World, WebWorld
 from worlds.generic.Rules import set_rule, add_rule, add_item_rule
 
-from .Items import DarkSouls3Item, DS3ItemCategory, item_dictionary, key_item_names
+from .Items import DarkSouls3Item, DS3ItemCategory, item_dictionary, key_item_names, item_descriptions
 from .Locations import DarkSouls3Location, DS3LocationCategory, location_tables, location_dictionary
-from .Options import RandomizeWeaponLevelOption, PoolTypeOption, dark_souls_options
+from .Options import RandomizeWeaponLevelOption, PoolTypeOption, EarlySmallLothricBanner, dark_souls_options
 
 
 class DarkSouls3Web(WebWorld):
@@ -52,6 +52,15 @@ class DarkSouls3World(World):
     required_client_version = (0, 4, 2)
     item_name_to_id = DarkSouls3Item.get_name_to_id()
     location_name_to_id = DarkSouls3Location.get_name_to_id()
+    item_name_groups = {
+        "Cinders": {
+            "Cinders of a Lord - Abyss Watcher",
+            "Cinders of a Lord - Aldrich",
+            "Cinders of a Lord - Yhorm the Giant",
+            "Cinders of a Lord - Lothric Prince"
+        }
+    }
+    item_descriptions = item_descriptions
 
 
     def __init__(self, multiworld: MultiWorld, player: int):
@@ -77,6 +86,10 @@ class DarkSouls3World(World):
             self.enabled_location_categories.add(DS3LocationCategory.NPC)
         if self.multiworld.enable_key_locations[self.player] == Toggle.option_true:
             self.enabled_location_categories.add(DS3LocationCategory.KEY)
+            if self.multiworld.early_banner[self.player] == EarlySmallLothricBanner.option_early_global:
+                self.multiworld.early_items[self.player]['Small Lothric Banner'] = 1
+            elif self.multiworld.early_banner[self.player] == EarlySmallLothricBanner.option_early_local:
+                self.multiworld.local_early_items[self.player]['Small Lothric Banner'] = 1
         if self.multiworld.enable_boss_locations[self.player] == Toggle.option_true:
             self.enabled_location_categories.add(DS3LocationCategory.BOSS)
         if self.multiworld.enable_misc_locations[self.player] == Toggle.option_true:
diff --git a/worlds/dark_souls_3/docs/setup_en.md b/worlds/dark_souls_3/docs/setup_en.md
index d9dbb2e547..7a3ca4e9bd 100644
--- a/worlds/dark_souls_3/docs/setup_en.md
+++ b/worlds/dark_souls_3/docs/setup_en.md
@@ -21,7 +21,20 @@ This client has only been tested with the Official Steam version of the game at
 
 ## Downpatching Dark Souls III
 
-Follow instructions from the [speedsouls wiki](https://wiki.speedsouls.com/darksouls3:Downpatching) to download version 1.15. Your download command, including the correct depot and manifest ids, will be "download_depot 374320 374321 4471176929659548333"
+To downpatch DS3 for use with Archipelago, use the following instructions from the speedsouls wiki database. 
+
+1. Launch Steam (in online mode).
+2. Press the Windows Key + R. This will open the Run window.
+3. Open the Steam console by typing the following string: steam://open/console , Steam should now open in Console Mode.
+4. Insert the string of the depot you wish to download. For the AP supported v1.15, you will want to use: download_depot 374320 374321 4471176929659548333.
+5. Steam will now download the depot. Note: There is no progress bar of the download in Steam, but it is still downloading in the background.
+6. Turn off auto-updates in Steam by right-clicking Dark Souls III in your library > Properties > Updates > set "Automatic Updates" to "Only update this game when I launch it" (or change the value for AutoUpdateBehavior to 1 in "\Steam\steamapps\appmanifest_374320.acf").
+7. Back up your existing game folder in "\Steam\steamapps\common\DARK SOULS III".
+8. Return back to Steam console. Once the download is complete, it should say so along with the temporary local directory in which the depot has been stored. This is usually something like "\Steam\steamapps\content\app_XXXXXX\depot_XXXXXX". Back up this game folder as well.
+9. Delete your existing game folder in "\Steam\steamapps\common\DARK SOULS III", then replace it with your game folder in "\Steam\steamapps\content\app_XXXXXX\depot_XXXXXX".
+10. Back up and delete your save file "DS30000.sl2" in AppData. AppData is hidden by default. To locate it, press Windows Key + R, type %appdata% and hit enter or: open File Explorer > View > Hidden Items and follow "C:\Users\your username\AppData\Roaming\DarkSoulsIII\numbers".
+11. If you did all these steps correctly, you should be able to confirm your game version in the upper left corner after launching Dark Souls III.
+
 
 ## Installing the Archipelago mod
 
diff --git a/worlds/dkc3/docs/setup_en.md b/worlds/dkc3/docs/setup_en.md
index bb10756300..9c4197286e 100644
--- a/worlds/dkc3/docs/setup_en.md
+++ b/worlds/dkc3/docs/setup_en.md
@@ -50,7 +50,7 @@ them. Player settings page: [Donkey Kong Country 3 Player Settings Page](/games/
 ### 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)
+validator page: [YAML Validation page](/check)
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/dlcquest/Items.py b/worlds/dlcquest/Items.py
index 61f4cd30fa..e7008f7b12 100644
--- a/worlds/dlcquest/Items.py
+++ b/worlds/dlcquest/Items.py
@@ -1,15 +1,18 @@
 import csv
 import enum
 import math
-from typing import Protocol, Union, Dict, List, Set
-from BaseClasses import Item, ItemClassification
-from . import Options, data
 from dataclasses import dataclass, field
 from random import Random
+from typing import Dict, List, Set
+
+from BaseClasses import Item, ItemClassification
+from . import Options, data
 
 
 class DLCQuestItem(Item):
     game: str = "DLCQuest"
+    coins: int = 0
+    coin_suffix: str = ""
 
 
 offset = 120_000
@@ -93,38 +96,35 @@ def create_trap_items(world, World_Options: Options.DLCQuestOptions, trap_needed
 
 def create_items(world, World_Options: Options.DLCQuestOptions, locations_count: int, random: Random):
     created_items = []
-    if World_Options[Options.Campaign] == Options.Campaign.option_basic or World_Options[
-        Options.Campaign] == Options.Campaign.option_both:
+    if World_Options.campaign == Options.Campaign.option_basic or World_Options.campaign == Options.Campaign.option_both:
         for item in items_by_group[Group.DLCQuest]:
             if item.has_any_group(Group.DLC):
                 created_items.append(world.create_item(item))
-            if item.has_any_group(Group.Item) and World_Options[
-                Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
+            if item.has_any_group(Group.Item) and World_Options.item_shuffle == Options.ItemShuffle.option_shuffled:
                 created_items.append(world.create_item(item))
-        if World_Options[Options.CoinSanity] == Options.CoinSanity.option_coin:
-            coin_bundle_needed = math.floor(825 / World_Options[Options.CoinSanityRange])
+        if World_Options.coinsanity == Options.CoinSanity.option_coin:
+            coin_bundle_needed = math.floor(825 / World_Options.coinbundlequantity)
             for item in items_by_group[Group.DLCQuest]:
                 if item.has_any_group(Group.Coin):
                     for i in range(coin_bundle_needed):
                         created_items.append(world.create_item(item))
-                    if 825 % World_Options[Options.CoinSanityRange] != 0:
+                    if 825 % World_Options.coinbundlequantity != 0:
                         created_items.append(world.create_item(item))
 
-    if World_Options[Options.Campaign] == Options.Campaign.option_live_freemium_or_die or World_Options[
-        Options.Campaign] == Options.Campaign.option_both:
+    if (World_Options.campaign == Options.Campaign.option_live_freemium_or_die or
+            World_Options.campaign == Options.Campaign.option_both):
         for item in items_by_group[Group.Freemium]:
             if item.has_any_group(Group.DLC):
                 created_items.append(world.create_item(item))
-            if item.has_any_group(Group.Item) and World_Options[
-                Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
+            if item.has_any_group(Group.Item) and World_Options.item_shuffle == Options.ItemShuffle.option_shuffled:
                 created_items.append(world.create_item(item))
-        if World_Options[Options.CoinSanity] == Options.CoinSanity.option_coin:
-            coin_bundle_needed = math.floor(889 / World_Options[Options.CoinSanityRange])
+        if World_Options.coinsanity == Options.CoinSanity.option_coin:
+            coin_bundle_needed = math.floor(889 / World_Options.coinbundlequantity)
             for item in items_by_group[Group.Freemium]:
                 if item.has_any_group(Group.Coin):
                     for i in range(coin_bundle_needed):
                         created_items.append(world.create_item(item))
-                    if 889 % World_Options[Options.CoinSanityRange] != 0:
+                    if 889 % World_Options.coinbundlequantity != 0:
                         created_items.append(world.create_item(item))
 
     trap_items = create_trap_items(world, World_Options, locations_count - len(created_items), random)
diff --git a/worlds/dlcquest/Locations.py b/worlds/dlcquest/Locations.py
index 08d37e7812..a9fdd00a20 100644
--- a/worlds/dlcquest/Locations.py
+++ b/worlds/dlcquest/Locations.py
@@ -1,5 +1,4 @@
-from BaseClasses import Location, MultiWorld
-from . import Options
+from BaseClasses import Location
 
 
 class DLCQuestLocation(Location):
diff --git a/worlds/dlcquest/Options.py b/worlds/dlcquest/Options.py
index a1674a4d5a..769acbec15 100644
--- a/worlds/dlcquest/Options.py
+++ b/worlds/dlcquest/Options.py
@@ -1,22 +1,6 @@
-from typing import Union, Dict, runtime_checkable, Protocol
-from Options import Option, DeathLink, Choice, Toggle, SpecialRange
 from dataclasses import dataclass
 
-
-@runtime_checkable
-class DLCQuestOption(Protocol):
-    internal_name: str
-
-
-@dataclass
-class DLCQuestOptions:
-    options: Dict[str, Union[bool, int]]
-
-    def __getitem__(self, item: Union[str, DLCQuestOption]) -> Union[bool, int]:
-        if isinstance(item, DLCQuestOption):
-            item = item.internal_name
-
-        return self.options.get(item, None)
+from Options import Choice, DeathLink, NamedRange, PerGameCommonOptions
 
 
 class DoubleJumpGlitch(Choice):
@@ -49,7 +33,7 @@ class CoinSanity(Choice):
     default = 0
 
 
-class CoinSanityRange(SpecialRange):
+class CoinSanityRange(NamedRange):
     """This is the amount of coins in a coin bundle
     You need to collect that number of coins to get a location check, and when receiving coin items, you will get bundles of this size
     It is highly recommended to not set this value below 10, as it generates a very large number of boring locations and items.
@@ -94,31 +78,13 @@ class ItemShuffle(Choice):
     default = 0
 
 
-DLCQuest_options: Dict[str, type(Option)] = {
-    option.internal_name: option
-    for option in [
-        DoubleJumpGlitch,
-        CoinSanity,
-        CoinSanityRange,
-        TimeIsMoney,
-        EndingChoice,
-        Campaign,
-        ItemShuffle,
-    ]
-}
-default_options = {option.internal_name: option.default for option in DLCQuest_options.values()}
-DLCQuest_options["death_link"] = DeathLink
-
-
-def fetch_options(world, player: int) -> DLCQuestOptions:
-    return DLCQuestOptions({option: get_option_value(world, player, option) for option in DLCQuest_options})
-
-
-def get_option_value(world, player: int, name: str) -> Union[bool, int]:
-    assert name in DLCQuest_options, f"{name} is not a valid option for DLC Quest."
-
-    value = getattr(world, name)
-
-    if issubclass(DLCQuest_options[name], Toggle):
-        return bool(value[player].value)
-    return value[player].value
+@dataclass
+class DLCQuestOptions(PerGameCommonOptions):
+    double_jump_glitch: DoubleJumpGlitch
+    coinsanity: CoinSanity
+    coinbundlequantity: CoinSanityRange
+    time_is_money: TimeIsMoney
+    ending_choice: EndingChoice
+    campaign: Campaign
+    item_shuffle: ItemShuffle
+    death_link: DeathLink
diff --git a/worlds/dlcquest/Regions.py b/worlds/dlcquest/Regions.py
index 8135a1c362..6dad9fc10c 100644
--- a/worlds/dlcquest/Regions.py
+++ b/worlds/dlcquest/Regions.py
@@ -1,325 +1,190 @@
 import math
-from BaseClasses import MultiWorld, Region, Location, Entrance, ItemClassification
+from typing import List
+
+from BaseClasses import Entrance, MultiWorld, Region
+from . import Options
 from .Locations import DLCQuestLocation, location_table
 from .Rules import create_event
-from . import Options
 
 DLCQuestRegion = ["Movement Pack", "Behind Tree", "Psychological Warfare", "Double Jump Left",
                   "Double Jump Behind the Tree", "The Forest", "Final Room"]
 
 
-def add_coin_freemium(region: Region, Coin: int, player: int):
-    number_coin = f"{Coin} coins freemium"
-    location_coin = f"{region.name} coins freemium"
+def add_coin_lfod(region: Region, coin: int, player: int):
+    add_coin(region, coin, player, " coins freemium")
+
+
+def add_coin_dlcquest(region: Region, coin: int, player: int):
+    add_coin(region, coin, player, " coins")
+
+
+def add_coin(region: Region, coin: int, player: int, suffix: str):
+    number_coin = f"{coin}{suffix}"
+    location_coin = f"{region.name}{suffix}"
     location = DLCQuestLocation(player, location_coin, None, region)
     region.locations.append(location)
-    location.place_locked_item(create_event(player, number_coin))
+    event = create_event(player, number_coin)
+    event.coins = coin
+    event.coin_suffix = suffix
+    location.place_locked_item(event)
 
 
-def add_coin_dlcquest(region: Region, Coin: int, player: int):
-    number_coin = f"{Coin} coins"
-    location_coin = f"{region.name} coins"
-    location = DLCQuestLocation(player, location_coin, None, region)
-    region.locations.append(location)
-    location.place_locked_item(create_event(player, number_coin))
+def create_regions(multiworld: MultiWorld, player: int, world_options: Options.DLCQuestOptions):
+    region_menu = Region("Menu", player, multiworld)
+    has_campaign_basic = world_options.campaign == Options.Campaign.option_basic or world_options.campaign == Options.Campaign.option_both
+    has_campaign_lfod = world_options.campaign == Options.Campaign.option_live_freemium_or_die or world_options.campaign == Options.Campaign.option_both
+    has_coinsanity = world_options.coinsanity == Options.CoinSanity.option_coin
+    coin_bundle_size = world_options.coinbundlequantity.value
+    has_item_shuffle = world_options.item_shuffle == Options.ItemShuffle.option_shuffled
+
+    multiworld.regions.append(region_menu)
+
+    create_regions_basic_campaign(has_campaign_basic, region_menu, has_item_shuffle, has_coinsanity, coin_bundle_size, player, multiworld)
+
+    create_regions_lfod_campaign(coin_bundle_size, has_campaign_lfod, has_coinsanity, has_item_shuffle, multiworld, player, region_menu)
 
 
-def create_regions(world: MultiWorld, player: int, World_Options: Options.DLCQuestOptions):
-    Regmenu = Region("Menu", player, world)
-    if World_Options[Options.Campaign] == Options.Campaign.option_basic or World_Options[
-        Options.Campaign] == Options.Campaign.option_both:
-        Regmenu.exits += [Entrance(player, "DLC Quest Basic", Regmenu)]
-    if World_Options[Options.Campaign] == Options.Campaign.option_live_freemium_or_die or World_Options[
-        Options.Campaign] == Options.Campaign.option_both:
-        Regmenu.exits += [Entrance(player, "Live Freemium or Die", Regmenu)]
-    world.regions.append(Regmenu)
+def create_regions_basic_campaign(has_campaign_basic: bool, region_menu: Region, has_item_shuffle: bool, has_coinsanity: bool,
+                                  coin_bundle_size: int, player: int, world: MultiWorld):
+    if not has_campaign_basic:
+        return
 
-    if World_Options[Options.Campaign] == Options.Campaign.option_basic or World_Options[
-        Options.Campaign] == Options.Campaign.option_both:
+    region_menu.exits += [Entrance(player, "DLC Quest Basic", region_menu)]
+    locations_move_right = ["Movement Pack", "Animation Pack", "Audio Pack", "Pause Menu Pack"]
+    region_move_right = create_region_and_locations_basic("Move Right", locations_move_right, ["Moving"], player, world, 4)
+    create_coinsanity_locations_dlc_quest(has_coinsanity, coin_bundle_size, player, region_move_right)
+    locations_movement_pack = ["Time is Money Pack", "Psychological Warfare Pack", "Armor for your Horse Pack", "Shepherd Sheep"]
+    locations_movement_pack += conditional_location(has_item_shuffle, "Sword")
+    create_region_and_locations_basic("Movement Pack", locations_movement_pack, ["Tree", "Cloud"], player, world, 46)
+    locations_behind_tree = ["Double Jump Pack", "Map Pack", "Between Trees Sheep", "Hole in the Wall Sheep"] + conditional_location(has_item_shuffle, "Gun")
+    create_region_and_locations_basic("Behind Tree", locations_behind_tree, ["Behind Tree Double Jump", "Forest Entrance"], player, world, 60)
+    create_region_and_locations_basic("Psychological Warfare", ["West Cave Sheep"], ["Cloud Double Jump"], player, world, 100)
+    locations_double_jump_left = ["Pet Pack", "Top Hat Pack", "North West Alcove Sheep"]
+    create_region_and_locations_basic("Double Jump Total Left", locations_double_jump_left, ["Cave Tree", "Cave Roof"], player, world, 50)
+    create_region_and_locations_basic("Double Jump Total Left Cave", ["Top Hat Sheep"], [], player, world, 9)
+    create_region_and_locations_basic("Double Jump Total Left Roof", ["North West Ceiling Sheep"], [], player, world, 10)
+    locations_double_jump_left_ceiling = ["Sexy Outfits Pack", "Double Jump Alcove Sheep", "Sexy Outfits Sheep"]
+    create_region_and_locations_basic("Double Jump Behind Tree", locations_double_jump_left_ceiling, ["True Double Jump"], player, world, 89)
+    create_region_and_locations_basic("True Double Jump Behind Tree", ["Double Jump Floating Sheep", "Cutscene Sheep"], [], player, world, 7)
+    create_region_and_locations_basic("The Forest", ["Gun Pack", "Night Map Pack"], ["Behind Ogre", "Forest Double Jump"], player, world, 171)
+    create_region_and_locations_basic("The Forest with double Jump", ["The Zombie Pack", "Forest Low Sheep"], ["Forest True Double Jump"], player, world, 76)
+    create_region_and_locations_basic("The Forest with double Jump Part 2", ["Forest High Sheep"], [], player, world, 203)
+    region_final_boss_room = create_region_and_locations_basic("The Final Boss Room", ["Finish the Fight Pack"], [], player, world)
 
-        Regmoveright = Region("Move Right", player, world, "Start of the basic game")
-        Locmoveright_name = ["Movement Pack", "Animation Pack", "Audio Pack", "Pause Menu Pack"]
-        Regmoveright.exits = [Entrance(player, "Moving", Regmoveright)]
-        Regmoveright.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regmoveright) for
-                                   loc_name in Locmoveright_name]
-        add_coin_dlcquest(Regmoveright, 4, player)
-        if World_Options[Options.CoinSanity] == Options.CoinSanity.option_coin:
-            coin_bundle_needed = math.floor(825 / World_Options[Options.CoinSanityRange])
-            for i in range(coin_bundle_needed):
-                item_coin = f"DLC Quest: {World_Options[Options.CoinSanityRange] * (i + 1)} Coin"
-                Regmoveright.locations += [
-                    DLCQuestLocation(player, item_coin, location_table[item_coin], Regmoveright)]
-            if 825 % World_Options[Options.CoinSanityRange] != 0:
-                Regmoveright.locations += [
-                    DLCQuestLocation(player, "DLC Quest: 825 Coin", location_table["DLC Quest: 825 Coin"],
-                                     Regmoveright)]
-        world.regions.append(Regmoveright)
+    create_victory_event(region_final_boss_room, "Winning Basic", "Victory Basic", player)
 
-        Regmovpack = Region("Movement Pack", player, world)
-        Locmovpack_name = ["Time is Money Pack", "Psychological Warfare Pack", "Armor for your Horse Pack",
-                           "Shepherd Sheep"]
-        if World_Options[Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
-            Locmovpack_name += ["Sword"]
-        Regmovpack.exits = [Entrance(player, "Tree", Regmovpack), Entrance(player, "Cloud", Regmovpack)]
-        Regmovpack.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regmovpack) for loc_name
-                                 in Locmovpack_name]
-        add_coin_dlcquest(Regmovpack, 46, player)
-        world.regions.append(Regmovpack)
+    connect_entrances_basic(player, world)
 
-        Regbtree = Region("Behind Tree", player, world)
-        Locbtree_name = ["Double Jump Pack", "Map Pack", "Between Trees Sheep", "Hole in the Wall Sheep"]
-        if World_Options[Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
-            Locbtree_name += ["Gun"]
-        Regbtree.exits = [Entrance(player, "Behind Tree Double Jump", Regbtree),
-                          Entrance(player, "Forest Entrance", Regbtree)]
-        Regbtree.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regbtree) for loc_name in
-                               Locbtree_name]
-        add_coin_dlcquest(Regbtree, 60, player)
-        world.regions.append(Regbtree)
 
-        Regpsywarfare = Region("Psychological Warfare", player, world)
-        Locpsywarfare_name = ["West Cave Sheep"]
-        Regpsywarfare.exits = [Entrance(player, "Cloud Double Jump", Regpsywarfare)]
-        Regpsywarfare.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regpsywarfare) for
-                                    loc_name in Locpsywarfare_name]
-        add_coin_dlcquest(Regpsywarfare, 100, player)
-        world.regions.append(Regpsywarfare)
+def create_regions_lfod_campaign(coin_bundle_size, has_campaign_lfod, has_coinsanity, has_item_shuffle, multiworld, player, region_menu):
+    if not has_campaign_lfod:
+        return
 
-        Regdoubleleft = Region("Double Jump Total Left", player, world)
-        Locdoubleleft_name = ["Pet Pack", "Top Hat Pack", "North West Alcove Sheep"]
-        Regdoubleleft.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regdoubleleft) for
-                                    loc_name in
-                                    Locdoubleleft_name]
-        Regdoubleleft.exits = [Entrance(player, "Cave Tree", Regdoubleleft),
-                               Entrance(player, "Cave Roof", Regdoubleleft)]
-        add_coin_dlcquest(Regdoubleleft, 50, player)
-        world.regions.append(Regdoubleleft)
+    region_menu.exits += [Entrance(player, "Live Freemium or Die", region_menu)]
+    locations_lfod_start = ["Particles Pack", "Day One Patch Pack", "Checkpoint Pack", "Incredibly Important Pack",
+                            "Nice Try", "Story is Important", "I Get That Reference!"] + conditional_location(has_item_shuffle, "Wooden Sword")
+    region_lfod_start = create_region_and_locations_lfod("Freemium Start", locations_lfod_start, ["Vines"], player, multiworld, 50)
+    create_coinsanity_locations_lfod(has_coinsanity, coin_bundle_size, player, region_lfod_start)
+    locations_behind_vines = ["Wall Jump Pack", "Health Bar Pack", "Parallax Pack"] + conditional_location(has_item_shuffle, "Pickaxe")
+    create_region_and_locations_lfod("Behind the Vines", locations_behind_vines, ["Wall Jump Entrance"], player, multiworld, 95)
+    locations_wall_jump = ["Harmless Plants Pack", "Death of Comedy Pack", "Canadian Dialog Pack", "DLC NPC Pack"]
+    create_region_and_locations_lfod("Wall Jump", locations_wall_jump, ["Harmless Plants", "Pickaxe Hard Cave"], player, multiworld, 150)
+    create_region_and_locations_lfod("Fake Ending", ["Cut Content Pack", "Name Change Pack"], ["Name Change Entrance", "Cut Content Entrance"], player,
+                                     multiworld)
+    create_region_and_locations_lfod("Hard Cave", [], ["Hard Cave Wall Jump"], player, multiworld, 20)
+    create_region_and_locations_lfod("Hard Cave Wall Jump", ["Increased HP Pack"], [], player, multiworld, 130)
+    create_region_and_locations_lfod("Cut Content", conditional_location(has_item_shuffle, "Humble Indie Bindle"), [], player, multiworld, 200)
+    create_region_and_locations_lfod("Name Change", conditional_location(has_item_shuffle, "Box of Various Supplies"), ["Behind Rocks"], player, multiworld)
+    create_region_and_locations_lfod("Top Right", ["Season Pass", "High Definition Next Gen Pack"], ["Blizzard"], player, multiworld, 90)
+    create_region_and_locations_lfod("Season", ["Remove Ads Pack", "Not Exactly Noble"], ["Boss Door"], player, multiworld, 154)
+    region_final_boss = create_region_and_locations_lfod("Final Boss", ["Big Sword Pack", "Really Big Sword Pack", "Unfathomable Sword Pack"], [], player, multiworld)
 
-        Regdoubleleftcave = Region("Double Jump Total Left Cave", player, world)
-        Locdoubleleftcave_name = ["Top Hat Sheep"]
-        Regdoubleleftcave.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regdoubleleftcave)
-                                        for loc_name in Locdoubleleftcave_name]
-        add_coin_dlcquest(Regdoubleleftcave, 9, player)
-        world.regions.append(Regdoubleleftcave)
+    create_victory_event(region_final_boss, "Winning Freemium", "Victory Freemium", player)
 
-        Regdoubleleftroof = Region("Double Jump Total Left Roof", player, world)
-        Locdoubleleftroof_name = ["North West Ceiling Sheep"]
-        Regdoubleleftroof.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regdoubleleftroof)
-                                        for loc_name in Locdoubleleftroof_name]
-        add_coin_dlcquest(Regdoubleleftroof, 10, player)
-        world.regions.append(Regdoubleleftroof)
+    connect_entrances_lfod(multiworld, player)
 
-        Regdoubletree = Region("Double Jump Behind Tree", player, world)
-        Locdoubletree_name = ["Sexy Outfits Pack", "Double Jump Alcove Sheep", "Sexy Outfits Sheep"]
-        Regdoubletree.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regdoubletree) for
-                                    loc_name in
-                                    Locdoubletree_name]
-        Regdoubletree.exits = [Entrance(player, "True Double Jump", Regdoubletree)]
-        add_coin_dlcquest(Regdoubletree, 89, player)
-        world.regions.append(Regdoubletree)
 
-        Regtruedoublejump = Region("True Double Jump Behind Tree", player, world)
-        Loctruedoublejump_name = ["Double Jump Floating Sheep", "Cutscene Sheep"]
-        Regtruedoublejump.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regtruedoublejump)
-                                        for loc_name in Loctruedoublejump_name]
-        add_coin_dlcquest(Regtruedoublejump, 7, player)
-        world.regions.append(Regtruedoublejump)
+def conditional_location(condition: bool, location: str) -> List[str]:
+    return conditional_locations(condition, [location])
 
-        Regforest = Region("The Forest", player, world)
-        Locforest_name = ["Gun Pack", "Night Map Pack"]
-        Regforest.exits = [Entrance(player, "Behind Ogre", Regforest),
-                           Entrance(player, "Forest Double Jump", Regforest)]
-        Regforest.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regforest) for loc_name in
-                                Locforest_name]
-        add_coin_dlcquest(Regforest, 171, player)
-        world.regions.append(Regforest)
 
-        Regforestdoublejump = Region("The Forest whit double Jump", player, world)
-        Locforestdoublejump_name = ["The Zombie Pack", "Forest Low Sheep"]
-        Regforestdoublejump.exits = [Entrance(player, "Forest True Double Jump", Regforestdoublejump)]
-        Regforestdoublejump.locations += [
-            DLCQuestLocation(player, loc_name, location_table[loc_name], Regforestdoublejump) for loc_name in
-            Locforestdoublejump_name]
-        add_coin_dlcquest(Regforestdoublejump, 76, player)
-        world.regions.append(Regforestdoublejump)
+def conditional_locations(condition: bool, locations: List[str]) -> List[str]:
+    return locations if condition else []
 
-        Regforesttruedoublejump = Region("The Forest whit double Jump Part 2", player, world)
-        Locforesttruedoublejump_name = ["Forest High Sheep"]
-        Regforesttruedoublejump.locations += [
-            DLCQuestLocation(player, loc_name, location_table[loc_name], Regforesttruedoublejump)
-            for loc_name in Locforesttruedoublejump_name]
-        add_coin_dlcquest(Regforesttruedoublejump, 203, player)
-        world.regions.append(Regforesttruedoublejump)
 
-        Regfinalroom = Region("The Final Boss Room", player, world)
-        Locfinalroom_name = ["Finish the Fight Pack"]
-        Regfinalroom.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regfinalroom) for
-                                   loc_name in
-                                   Locfinalroom_name]
-        world.regions.append(Regfinalroom)
+def create_region_and_locations_basic(region_name: str, locations: List[str], exits: List[str], player: int, multiworld: MultiWorld,
+                                      number_coins: int = 0) -> Region:
+    return create_region_and_locations(region_name, locations, exits, player, multiworld, number_coins, 0)
 
-        loc_win = DLCQuestLocation(player, "Winning Basic", None, world.get_region("The Final Boss Room", player))
-        world.get_region("The Final Boss Room", player).locations.append(loc_win)
-        loc_win.place_locked_item(create_event(player, "Victory Basic"))
 
-        world.get_entrance("DLC Quest Basic", player).connect(world.get_region("Move Right", player))
+def create_region_and_locations_lfod(region_name: str, locations: List[str], exits: List[str], player: int, multiworld: MultiWorld,
+                                     number_coins: int = 0) -> Region:
+    return create_region_and_locations(region_name, locations, exits, player, multiworld, 0, number_coins)
 
-        world.get_entrance("Moving", player).connect(world.get_region("Movement Pack", player))
 
-        world.get_entrance("Tree", player).connect(world.get_region("Behind Tree", player))
+def create_region_and_locations(region_name: str, locations: List[str], exits: List[str], player: int, multiworld: MultiWorld,
+                                number_coins_basic: int, number_coins_lfod: int) -> Region:
+    region = Region(region_name, player, multiworld)
+    region.exits = [Entrance(player, exit_name, region) for exit_name in exits]
+    region.locations += [DLCQuestLocation(player, name, location_table[name], region) for name in locations]
+    if number_coins_basic > 0:
+        add_coin_dlcquest(region, number_coins_basic, player)
+    if number_coins_lfod > 0:
+        add_coin_lfod(region, number_coins_lfod, player)
+    multiworld.regions.append(region)
+    return region
 
-        world.get_entrance("Cloud", player).connect(world.get_region("Psychological Warfare", player))
 
-        world.get_entrance("Cloud Double Jump", player).connect(world.get_region("Double Jump Total Left", player))
+def create_victory_event(region_victory: Region, event_name: str, item_name: str, player: int):
+    location_victory = DLCQuestLocation(player, event_name, None, region_victory)
+    region_victory.locations.append(location_victory)
+    location_victory.place_locked_item(create_event(player, item_name))
 
-        world.get_entrance("Cave Tree", player).connect(world.get_region("Double Jump Total Left Cave", player))
 
-        world.get_entrance("Cave Roof", player).connect(world.get_region("Double Jump Total Left Roof", player))
+def connect_entrances_basic(player, world):
+    world.get_entrance("DLC Quest Basic", player).connect(world.get_region("Move Right", player))
+    world.get_entrance("Moving", player).connect(world.get_region("Movement Pack", player))
+    world.get_entrance("Tree", player).connect(world.get_region("Behind Tree", player))
+    world.get_entrance("Cloud", player).connect(world.get_region("Psychological Warfare", player))
+    world.get_entrance("Cloud Double Jump", player).connect(world.get_region("Double Jump Total Left", player))
+    world.get_entrance("Cave Tree", player).connect(world.get_region("Double Jump Total Left Cave", player))
+    world.get_entrance("Cave Roof", player).connect(world.get_region("Double Jump Total Left Roof", player))
+    world.get_entrance("Forest Entrance", player).connect(world.get_region("The Forest", player))
+    world.get_entrance("Behind Tree Double Jump", player).connect(world.get_region("Double Jump Behind Tree", player))
+    world.get_entrance("Behind Ogre", player).connect(world.get_region("The Final Boss Room", player))
+    world.get_entrance("Forest Double Jump", player).connect(world.get_region("The Forest with double Jump", player))
+    world.get_entrance("Forest True Double Jump", player).connect(world.get_region("The Forest with double Jump Part 2", player))
+    world.get_entrance("True Double Jump", player).connect(world.get_region("True Double Jump Behind Tree", player))
 
-        world.get_entrance("Forest Entrance", player).connect(world.get_region("The Forest", player))
 
-        world.get_entrance("Behind Tree Double Jump", player).connect(
-            world.get_region("Double Jump Behind Tree", player))
+def connect_entrances_lfod(multiworld, player):
+    multiworld.get_entrance("Live Freemium or Die", player).connect(multiworld.get_region("Freemium Start", player))
+    multiworld.get_entrance("Vines", player).connect(multiworld.get_region("Behind the Vines", player))
+    multiworld.get_entrance("Wall Jump Entrance", player).connect(multiworld.get_region("Wall Jump", player))
+    multiworld.get_entrance("Harmless Plants", player).connect(multiworld.get_region("Fake Ending", player))
+    multiworld.get_entrance("Pickaxe Hard Cave", player).connect(multiworld.get_region("Hard Cave", player))
+    multiworld.get_entrance("Hard Cave Wall Jump", player).connect(multiworld.get_region("Hard Cave Wall Jump", player))
+    multiworld.get_entrance("Name Change Entrance", player).connect(multiworld.get_region("Name Change", player))
+    multiworld.get_entrance("Cut Content Entrance", player).connect(multiworld.get_region("Cut Content", player))
+    multiworld.get_entrance("Behind Rocks", player).connect(multiworld.get_region("Top Right", player))
+    multiworld.get_entrance("Blizzard", player).connect(multiworld.get_region("Season", player))
+    multiworld.get_entrance("Boss Door", player).connect(multiworld.get_region("Final Boss", player))
 
-        world.get_entrance("Behind Ogre", player).connect(world.get_region("The Final Boss Room", player))
 
-        world.get_entrance("Forest Double Jump", player).connect(
-            world.get_region("The Forest whit double Jump", player))
+def create_coinsanity_locations_dlc_quest(has_coinsanity: bool, coin_bundle_size: int, player: int, region_move_right: Region):
+    create_coinsanity_locations(has_coinsanity, coin_bundle_size, player, region_move_right, 825, "DLC Quest")
 
-        world.get_entrance("Forest True Double Jump", player).connect(
-            world.get_region("The Forest whit double Jump Part 2", player))
 
-        world.get_entrance("True Double Jump", player).connect(world.get_region("True Double Jump Behind Tree", player))
+def create_coinsanity_locations_lfod(has_coinsanity: bool, coin_bundle_size: int, player: int, region_lfod_start: Region):
+    create_coinsanity_locations(has_coinsanity, coin_bundle_size, player, region_lfod_start, 889, "Live Freemium or Die")
 
-    if World_Options[Options.Campaign] == Options.Campaign.option_live_freemium_or_die or World_Options[
-        Options.Campaign] == Options.Campaign.option_both:
 
-        Regfreemiumstart = Region("Freemium Start", player, world)
-        Locfreemiumstart_name = ["Particles Pack", "Day One Patch Pack", "Checkpoint Pack", "Incredibly Important Pack",
-                                 "Nice Try", "Story is Important", "I Get That Reference!"]
-        if World_Options[Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
-            Locfreemiumstart_name += ["Wooden Sword"]
-        Regfreemiumstart.exits = [Entrance(player, "Vines", Regfreemiumstart)]
-        Regfreemiumstart.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regfreemiumstart)
-                                       for loc_name in
-                                       Locfreemiumstart_name]
-        add_coin_freemium(Regfreemiumstart, 50, player)
-        if World_Options[Options.CoinSanity] == Options.CoinSanity.option_coin:
-            coin_bundle_needed = math.floor(889 / World_Options[Options.CoinSanityRange])
-            for i in range(coin_bundle_needed):
-                item_coin_freemium = f"Live Freemium or Die: {World_Options[Options.CoinSanityRange] * (i + 1)} Coin"
-                Regfreemiumstart.locations += [
-                    DLCQuestLocation(player, item_coin_freemium, location_table[item_coin_freemium],
-                                     Regfreemiumstart)]
-            if 889 % World_Options[Options.CoinSanityRange] != 0:
-                Regfreemiumstart.locations += [
-                    DLCQuestLocation(player, "Live Freemium or Die: 889 Coin",
-                                     location_table["Live Freemium or Die: 889 Coin"],
-                                     Regfreemiumstart)]
-        world.regions.append(Regfreemiumstart)
+def create_coinsanity_locations(has_coinsanity: bool, coin_bundle_size: int, player: int, region: Region, last_coin_number: int, campaign_prefix: str):
+    if not has_coinsanity:
+        return
 
-        Regbehindvine = Region("Behind the Vines", player, world)
-        Locbehindvine_name = ["Wall Jump Pack", "Health Bar Pack", "Parallax Pack"]
-        if World_Options[Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
-            Locbehindvine_name += ["Pickaxe"]
-        Regbehindvine.exits = [Entrance(player, "Wall Jump Entrance", Regbehindvine)]
-        Regbehindvine.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regbehindvine) for
-                                    loc_name in Locbehindvine_name]
-        add_coin_freemium(Regbehindvine, 95, player)
-        world.regions.append(Regbehindvine)
-
-        Regwalljump = Region("Wall Jump", player, world)
-        Locwalljump_name = ["Harmless Plants Pack", "Death of Comedy Pack", "Canadian Dialog Pack", "DLC NPC Pack"]
-        Regwalljump.exits = [Entrance(player, "Harmless Plants", Regwalljump),
-                             Entrance(player, "Pickaxe Hard Cave", Regwalljump)]
-        Regwalljump.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regwalljump) for
-                                  loc_name in Locwalljump_name]
-        add_coin_freemium(Regwalljump, 150, player)
-        world.regions.append(Regwalljump)
-
-        Regfakeending = Region("Fake Ending", player, world)
-        Locfakeending_name = ["Cut Content Pack", "Name Change Pack"]
-        Regfakeending.exits = [Entrance(player, "Name Change Entrance", Regfakeending),
-                               Entrance(player, "Cut Content Entrance", Regfakeending)]
-        Regfakeending.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regfakeending) for
-                                    loc_name in Locfakeending_name]
-        world.regions.append(Regfakeending)
-
-        Reghardcave = Region("Hard Cave", player, world)
-        add_coin_freemium(Reghardcave, 20, player)
-        Reghardcave.exits = [Entrance(player, "Hard Cave Wall Jump", Reghardcave)]
-        world.regions.append(Reghardcave)
-
-        Reghardcavewalljump = Region("Hard Cave Wall Jump", player, world)
-        Lochardcavewalljump_name = ["Increased HP Pack"]
-        Reghardcavewalljump.locations += [
-            DLCQuestLocation(player, loc_name, location_table[loc_name], Reghardcavewalljump) for
-            loc_name in Lochardcavewalljump_name]
-        add_coin_freemium(Reghardcavewalljump, 130, player)
-        world.regions.append(Reghardcavewalljump)
-
-        Regcutcontent = Region("Cut Content", player, world)
-        Loccutcontent_name = []
-        if World_Options[Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
-            Loccutcontent_name += ["Humble Indie Bindle"]
-        Regcutcontent.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regcutcontent) for
-                                    loc_name in Loccutcontent_name]
-        add_coin_freemium(Regcutcontent, 200, player)
-        world.regions.append(Regcutcontent)
-
-        Regnamechange = Region("Name Change", player, world)
-        Locnamechange_name = []
-        if World_Options[Options.ItemShuffle] == Options.ItemShuffle.option_shuffled:
-            Locnamechange_name += ["Box of Various Supplies"]
-        Regnamechange.exits = [Entrance(player, "Behind Rocks", Regnamechange)]
-        Regnamechange.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regnamechange) for
-                                    loc_name in Locnamechange_name]
-        world.regions.append(Regnamechange)
-
-        Regtopright = Region("Top Right", player, world)
-        Loctopright_name = ["Season Pass", "High Definition Next Gen Pack"]
-        Regtopright.exits = [Entrance(player, "Blizzard", Regtopright)]
-        Regtopright.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regtopright) for
-                                  loc_name in Loctopright_name]
-        add_coin_freemium(Regtopright, 90, player)
-        world.regions.append(Regtopright)
-
-        Regseason = Region("Season", player, world)
-        Locseason_name = ["Remove Ads Pack", "Not Exactly Noble"]
-        Regseason.exits = [Entrance(player, "Boss Door", Regseason)]
-        Regseason.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regseason) for
-                                loc_name in Locseason_name]
-        add_coin_freemium(Regseason, 154, player)
-        world.regions.append(Regseason)
-
-        Regfinalboss = Region("Final Boss", player, world)
-        Locfinalboss_name = ["Big Sword Pack", "Really Big Sword Pack", "Unfathomable Sword Pack"]
-        Regfinalboss.locations += [DLCQuestLocation(player, loc_name, location_table[loc_name], Regfinalboss) for
-                                   loc_name in Locfinalboss_name]
-        world.regions.append(Regfinalboss)
-
-        loc_wining = DLCQuestLocation(player, "Winning Freemium", None, world.get_region("Final Boss", player))
-        world.get_region("Final Boss", player).locations.append(loc_wining)
-        loc_wining.place_locked_item(create_event(player, "Victory Freemium"))
-
-        world.get_entrance("Live Freemium or Die", player).connect(world.get_region("Freemium Start", player))
-
-        world.get_entrance("Vines", player).connect(world.get_region("Behind the Vines", player))
-
-        world.get_entrance("Wall Jump Entrance", player).connect(world.get_region("Wall Jump", player))
-
-        world.get_entrance("Harmless Plants", player).connect(world.get_region("Fake Ending", player))
-
-        world.get_entrance("Pickaxe Hard Cave", player).connect(world.get_region("Hard Cave", player))
-
-        world.get_entrance("Hard Cave Wall Jump", player).connect(world.get_region("Hard Cave Wall Jump", player))
-
-        world.get_entrance("Name Change Entrance", player).connect(world.get_region("Name Change", player))
-
-        world.get_entrance("Cut Content Entrance", player).connect(world.get_region("Cut Content", player))
-
-        world.get_entrance("Behind Rocks", player).connect(world.get_region("Top Right", player))
-
-        world.get_entrance("Blizzard", player).connect(world.get_region("Season", player))
-
-        world.get_entrance("Boss Door", player).connect(world.get_region("Final Boss", player))
+    coin_bundle_needed = math.ceil(last_coin_number / coin_bundle_size)
+    for i in range(1, coin_bundle_needed + 1):
+        number_coins = min(last_coin_number, coin_bundle_size * i)
+        item_coin = f"{campaign_prefix}: {number_coins} Coin"
+        region.locations += [DLCQuestLocation(player, item_coin, location_table[item_coin], region)]
diff --git a/worlds/dlcquest/Rules.py b/worlds/dlcquest/Rules.py
index d2495121f4..5792d9c3ab 100644
--- a/worlds/dlcquest/Rules.py
+++ b/worlds/dlcquest/Rules.py
@@ -1,56 +1,40 @@
 import math
 import re
-from .Locations import DLCQuestLocation
-from ..generic.Rules import add_rule, set_rule, item_name_in_locations
-from .Items import DLCQuestItem
+
 from BaseClasses import ItemClassification
+from worlds.generic.Rules import add_rule, item_name_in_locations, set_rule
 from . import Options
+from .Items import DLCQuestItem
 
 
-def create_event(player, event: str):
+def create_event(player, event: str) -> DLCQuestItem:
     return DLCQuestItem(event, ItemClassification.progression, None, player)
 
 
+def has_enough_coin(player: int, coin: int):
+    return lambda state: state.prog_items[player][" coins"] >= coin
+
+
+def has_enough_coin_freemium(player: int, coin: int):
+    return lambda state: state.prog_items[player][" coins freemium"] >= coin
+
+
 def set_rules(world, player, World_Options: Options.DLCQuestOptions):
-    def has_enough_coin(player: int, coin: int):
-        def has_coin(state, player: int, coins: int):
-            coin_possessed = 0
-            for i in [4, 7, 9, 10, 46, 50, 60, 76, 89, 100, 171, 203]:
-                name_coin = f"{i} coins"
-                if state.has(name_coin, player):
-                    coin_possessed += i
-
-            return coin_possessed >= coins
-
-        return lambda state: has_coin(state, player, coin)
-
-    def has_enough_coin_freemium(player: int, coin: int):
-        def has_coin(state, player: int, coins: int):
-            coin_possessed = 0
-            for i in [20, 50, 90, 95, 130, 150, 154, 200]:
-                name_coin = f"{i} coins freemium"
-                if state.has(name_coin, player):
-                    coin_possessed += i
-
-            return coin_possessed >= coins
-
-        return lambda state: has_coin(state, player, coin)
-
-    set_basic_rules(World_Options, has_enough_coin, player, world)
-    set_lfod_rules(World_Options, has_enough_coin_freemium, player, world)
+    set_basic_rules(World_Options, player, world)
+    set_lfod_rules(World_Options, player, world)
     set_completion_condition(World_Options, player, world)
 
 
-def set_basic_rules(World_Options, has_enough_coin, player, world):
-    if World_Options[Options.Campaign] == Options.Campaign.option_live_freemium_or_die:
+def set_basic_rules(World_Options, player, world):
+    if World_Options.campaign == Options.Campaign.option_live_freemium_or_die:
         return
     set_basic_entrance_rules(player, world)
     set_basic_self_obtained_items_rules(World_Options, player, world)
     set_basic_shuffled_items_rules(World_Options, player, world)
     set_double_jump_glitchless_rules(World_Options, player, world)
     set_easy_double_jump_glitch_rules(World_Options, player, world)
-    self_basic_coinsanity_funded_purchase_rules(World_Options, has_enough_coin, player, world)
-    set_basic_self_funded_purchase_rules(World_Options, has_enough_coin, player, world)
+    self_basic_coinsanity_funded_purchase_rules(World_Options, player, world)
+    set_basic_self_funded_purchase_rules(World_Options, player, world)
     self_basic_win_condition(World_Options, player, world)
 
 
@@ -66,12 +50,12 @@ def set_basic_entrance_rules(player, world):
 
 
 def set_basic_self_obtained_items_rules(World_Options, player, world):
-    if World_Options[Options.ItemShuffle] != Options.ItemShuffle.option_disabled:
+    if World_Options.item_shuffle != Options.ItemShuffle.option_disabled:
         return
     set_rule(world.get_entrance("Behind Ogre", player),
              lambda state: state.has("Gun Pack", player))
 
-    if World_Options[Options.TimeIsMoney] == Options.TimeIsMoney.option_required:
+    if World_Options.time_is_money == Options.TimeIsMoney.option_required:
         set_rule(world.get_entrance("Tree", player),
                  lambda state: state.has("Time is Money Pack", player))
         set_rule(world.get_entrance("Cave Tree", player),
@@ -87,7 +71,7 @@ def set_basic_self_obtained_items_rules(World_Options, player, world):
 
 
 def set_basic_shuffled_items_rules(World_Options, player, world):
-    if World_Options[Options.ItemShuffle] != Options.ItemShuffle.option_shuffled:
+    if World_Options.item_shuffle != Options.ItemShuffle.option_shuffled:
         return
     set_rule(world.get_entrance("Behind Ogre", player),
              lambda state: state.has("Gun", player))
@@ -108,13 +92,13 @@ def set_basic_shuffled_items_rules(World_Options, player, world):
     set_rule(world.get_location("Gun", player),
              lambda state: state.has("Gun Pack", player))
 
-    if World_Options[Options.TimeIsMoney] == Options.TimeIsMoney.option_required:
+    if World_Options.time_is_money == Options.TimeIsMoney.option_required:
         set_rule(world.get_location("Sword", player),
                  lambda state: state.has("Time is Money Pack", player))
 
 
 def set_double_jump_glitchless_rules(World_Options, player, world):
-    if World_Options[Options.DoubleJumpGlitch] != Options.DoubleJumpGlitch.option_none:
+    if World_Options.double_jump_glitch != Options.DoubleJumpGlitch.option_none:
         return
     set_rule(world.get_entrance("Cloud Double Jump", player),
              lambda state: state.has("Double Jump Pack", player))
@@ -123,7 +107,7 @@ def set_double_jump_glitchless_rules(World_Options, player, world):
 
 
 def set_easy_double_jump_glitch_rules(World_Options, player, world):
-    if World_Options[Options.DoubleJumpGlitch] == Options.DoubleJumpGlitch.option_all:
+    if World_Options.double_jump_glitch == Options.DoubleJumpGlitch.option_all:
         return
     set_rule(world.get_entrance("Behind Tree Double Jump", player),
              lambda state: state.has("Double Jump Pack", player))
@@ -131,71 +115,71 @@ def set_easy_double_jump_glitch_rules(World_Options, player, world):
              lambda state: state.has("Double Jump Pack", player))
 
 
-def self_basic_coinsanity_funded_purchase_rules(World_Options, has_enough_coin, player, world):
-    if World_Options[Options.CoinSanity] != Options.CoinSanity.option_coin:
+def self_basic_coinsanity_funded_purchase_rules(World_Options, player, world):
+    if World_Options.coinsanity != Options.CoinSanity.option_coin:
         return
-    number_of_bundle = math.floor(825 / World_Options[Options.CoinSanityRange])
+    number_of_bundle = math.floor(825 / World_Options.coinbundlequantity)
     for i in range(number_of_bundle):
 
-        item_coin = f"DLC Quest: {World_Options[Options.CoinSanityRange] * (i + 1)} Coin"
+        item_coin = f"DLC Quest: {World_Options.coinbundlequantity * (i + 1)} Coin"
         set_rule(world.get_location(item_coin, player),
-                 has_enough_coin(player, World_Options[Options.CoinSanityRange] * (i + 1)))
-        if 825 % World_Options[Options.CoinSanityRange] != 0:
+                 has_enough_coin(player, World_Options.coinbundlequantity * (i + 1)))
+        if 825 % World_Options.coinbundlequantity != 0:
             set_rule(world.get_location("DLC Quest: 825 Coin", player),
                      has_enough_coin(player, 825))
 
     set_rule(world.get_location("Movement Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(4 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(4 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Animation Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Audio Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Pause Menu Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Time is Money Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(20 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(20 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Double Jump Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(100 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(100 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Pet Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Sexy Outfits Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Top Hat Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Map Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(140 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(140 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Gun Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(75 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(75 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("The Zombie Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Night Map Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(75 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(75 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Psychological Warfare Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(50 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(50 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Armor for your Horse Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(250 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(250 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Finish the Fight Pack", player),
              lambda state: state.has("DLC Quest: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
 
 
-def set_basic_self_funded_purchase_rules(World_Options, has_enough_coin, player, world):
-    if World_Options[Options.CoinSanity] != Options.CoinSanity.option_none:
+def set_basic_self_funded_purchase_rules(World_Options, player, world):
+    if World_Options.coinsanity != Options.CoinSanity.option_none:
         return
     set_rule(world.get_location("Movement Pack", player),
              has_enough_coin(player, 4))
@@ -232,23 +216,23 @@ def set_basic_self_funded_purchase_rules(World_Options, has_enough_coin, player,
 
 
 def self_basic_win_condition(World_Options, player, world):
-    if World_Options[Options.EndingChoice] == Options.EndingChoice.option_any:
+    if World_Options.ending_choice == Options.EndingChoice.option_any:
         set_rule(world.get_location("Winning Basic", player),
                  lambda state: state.has("Finish the Fight Pack", player))
-    if World_Options[Options.EndingChoice] == Options.EndingChoice.option_true:
+    if World_Options.ending_choice == Options.EndingChoice.option_true:
         set_rule(world.get_location("Winning Basic", player),
                  lambda state: state.has("Armor for your Horse Pack", player) and state.has("Finish the Fight Pack",
                                                                                             player))
 
 
-def set_lfod_rules(World_Options, has_enough_coin_freemium, player, world):
-    if World_Options[Options.Campaign] == Options.Campaign.option_basic:
+def set_lfod_rules(World_Options, player, world):
+    if World_Options.campaign == Options.Campaign.option_basic:
         return
     set_lfod_entrance_rules(player, world)
     set_boss_door_requirements_rules(player, world)
     set_lfod_self_obtained_items_rules(World_Options, player, world)
     set_lfod_shuffled_items_rules(World_Options, player, world)
-    self_lfod_coinsanity_funded_purchase_rules(World_Options, has_enough_coin_freemium, player, world)
+    self_lfod_coinsanity_funded_purchase_rules(World_Options, player, world)
     set_lfod_self_funded_purchase_rules(World_Options, has_enough_coin_freemium, player, world)
 
 
@@ -297,7 +281,7 @@ def set_boss_door_requirements_rules(player, world):
 
 
 def set_lfod_self_obtained_items_rules(World_Options, player, world):
-    if World_Options[Options.ItemShuffle] != Options.ItemShuffle.option_disabled:
+    if World_Options.item_shuffle != Options.ItemShuffle.option_disabled:
         return
     set_rule(world.get_entrance("Vines", player),
              lambda state: state.has("Incredibly Important Pack", player))
@@ -309,7 +293,7 @@ def set_lfod_self_obtained_items_rules(World_Options, player, world):
 
 
 def set_lfod_shuffled_items_rules(World_Options, player, world):
-    if World_Options[Options.ItemShuffle] != Options.ItemShuffle.option_shuffled:
+    if World_Options.item_shuffle != Options.ItemShuffle.option_shuffled:
         return
     set_rule(world.get_entrance("Vines", player),
              lambda state: state.has("Wooden Sword", player) or state.has("Pickaxe", player))
@@ -327,80 +311,80 @@ def set_lfod_shuffled_items_rules(World_Options, player, world):
              lambda state: state.can_reach("Cut Content", 'region', player))
 
 
-def self_lfod_coinsanity_funded_purchase_rules(World_Options, has_enough_coin_freemium, player, world):
-    if World_Options[Options.CoinSanity] != Options.CoinSanity.option_coin:
+def self_lfod_coinsanity_funded_purchase_rules(World_Options, player, world):
+    if World_Options.coinsanity != Options.CoinSanity.option_coin:
         return
-    number_of_bundle = math.floor(889 / World_Options[Options.CoinSanityRange])
+    number_of_bundle = math.floor(889 / World_Options.coinbundlequantity)
     for i in range(number_of_bundle):
 
         item_coin_freemium = "Live Freemium or Die: number Coin"
-        item_coin_loc_freemium = re.sub("number", str(World_Options[Options.CoinSanityRange] * (i + 1)),
+        item_coin_loc_freemium = re.sub("number", str(World_Options.coinbundlequantity * (i + 1)),
                                         item_coin_freemium)
         set_rule(world.get_location(item_coin_loc_freemium, player),
-                 has_enough_coin_freemium(player, World_Options[Options.CoinSanityRange] * (i + 1)))
-        if 889 % World_Options[Options.CoinSanityRange] != 0:
+                 has_enough_coin_freemium(player, World_Options.coinbundlequantity * (i + 1)))
+        if 889 % World_Options.coinbundlequantity != 0:
             set_rule(world.get_location("Live Freemium or Die: 889 Coin", player),
                      has_enough_coin_freemium(player, 889))
 
     add_rule(world.get_entrance("Boss Door", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(889 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(889 / World_Options.coinbundlequantity)))
 
     set_rule(world.get_location("Particles Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Day One Patch Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Checkpoint Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Incredibly Important Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(15 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(15 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Wall Jump Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(35 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(35 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Health Bar Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Parallax Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(5 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(5 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Harmless Plants Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(130 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(130 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Death of Comedy Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(15 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(15 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Canadian Dialog Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(10 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(10 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("DLC NPC Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(15 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(15 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Cut Content Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(40 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(40 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Name Change Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(150 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(150 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Season Pass", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(199 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(199 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("High Definition Next Gen Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(20 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(20 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Increased HP Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(10 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(10 / World_Options.coinbundlequantity)))
     set_rule(world.get_location("Remove Ads Pack", player),
              lambda state: state.has("Live Freemium or Die: Coin Bundle", player,
-                                     math.ceil(25 / World_Options[Options.CoinSanityRange])))
+                                     math.ceil(25 / World_Options.coinbundlequantity)))
 
 
 def set_lfod_self_funded_purchase_rules(World_Options, has_enough_coin_freemium, player, world):
-    if World_Options[Options.CoinSanity] != Options.CoinSanity.option_none:
+    if World_Options.coinsanity != Options.CoinSanity.option_none:
         return
     add_rule(world.get_entrance("Boss Door", player),
              has_enough_coin_freemium(player, 889))
@@ -442,10 +426,10 @@ def set_lfod_self_funded_purchase_rules(World_Options, has_enough_coin_freemium,
 
 
 def set_completion_condition(World_Options, player, world):
-    if World_Options[Options.Campaign] == Options.Campaign.option_basic:
+    if World_Options.campaign == Options.Campaign.option_basic:
         world.completion_condition[player] = lambda state: state.has("Victory Basic", player)
-    if World_Options[Options.Campaign] == Options.Campaign.option_live_freemium_or_die:
+    if World_Options.campaign == Options.Campaign.option_live_freemium_or_die:
         world.completion_condition[player] = lambda state: state.has("Victory Freemium", player)
-    if World_Options[Options.Campaign] == Options.Campaign.option_both:
+    if World_Options.campaign == Options.Campaign.option_both:
         world.completion_condition[player] = lambda state: state.has("Victory Basic", player) and state.has(
             "Victory Freemium", player)
diff --git a/worlds/dlcquest/__init__.py b/worlds/dlcquest/__init__.py
index 9569d0efcc..c22b7cd984 100644
--- a/worlds/dlcquest/__init__.py
+++ b/worlds/dlcquest/__init__.py
@@ -1,12 +1,13 @@
-from typing import Dict, Any, Iterable, Optional, Union
-from BaseClasses import Tutorial
-from worlds.AutoWorld import World, WebWorld
-from .Items import DLCQuestItem, item_table, ItemData, create_items
-from .Locations import location_table, DLCQuestLocation
-from .Options import DLCQuest_options, DLCQuestOptions, fetch_options
-from .Rules import set_rules
-from .Regions import create_regions
+from typing import Union
+
+from BaseClasses import Tutorial, CollectionState
+from worlds.AutoWorld import WebWorld, World
 from . import Options
+from .Items import DLCQuestItem, ItemData, create_items, item_table, items_by_group, Group
+from .Locations import DLCQuestLocation, location_table
+from .Options import DLCQuestOptions
+from .Regions import create_regions
+from .Rules import set_rules
 
 client_version = 0
 
@@ -35,10 +36,8 @@ class DLCqworld(World):
 
     data_version = 1
 
-    option_definitions = DLCQuest_options
-
-    def generate_early(self):
-        self.options = fetch_options(self.multiworld, self.player)
+    options_dataclass = DLCQuestOptions
+    options: DLCQuestOptions
 
     def create_regions(self):
         create_regions(self.multiworld, self.player, self.options)
@@ -61,31 +60,51 @@ class DLCqworld(World):
         created_items = create_items(self, self.options, locations_count + len(items_to_exclude), self.multiworld.random)
 
         self.multiworld.itempool += created_items
-        self.multiworld.early_items[self.player]["Movement Pack"] = 1
+
+        if self.options.campaign == Options.Campaign.option_basic or self.options.campaign == Options.Campaign.option_both:
+            self.multiworld.early_items[self.player]["Movement Pack"] = 1
 
         for item in items_to_exclude:
             if item in self.multiworld.itempool:
                 self.multiworld.itempool.remove(item)
 
     def precollect_coinsanity(self):
-        if self.options[Options.Campaign] == Options.Campaign.option_basic:
-            if self.options[Options.CoinSanity] == Options.CoinSanity.option_coin and self.options[Options.CoinSanityRange] >= 5:
+        if self.options.campaign == Options.Campaign.option_basic:
+            if self.options.coinsanity == Options.CoinSanity.option_coin and self.options.coinbundlequantity >= 5:
                 self.multiworld.push_precollected(self.create_item("Movement Pack"))
 
-
     def create_item(self, item: Union[str, ItemData]) -> DLCQuestItem:
         if isinstance(item, str):
             item = item_table[item]
 
         return DLCQuestItem(item.name, item.classification, item.code, self.player)
 
+    def get_filler_item_name(self) -> str:
+        trap = self.multiworld.random.choice(items_by_group[Group.Trap])
+        return trap.name
+
     def fill_slot_data(self):
-        return {
-            "death_link": self.multiworld.death_link[self.player].value,
-            "ending_choice": self.multiworld.ending_choice[self.player].value,
-            "campaign": self.multiworld.campaign[self.player].value,
-            "coinsanity": self.multiworld.coinsanity[self.player].value,
-            "coinbundlerange": self.multiworld.coinbundlequantity[self.player].value,
-            "item_shuffle": self.multiworld.item_shuffle[self.player].value,
-            "seed": self.multiworld.per_slot_randoms[self.player].randrange(99999999)
-        }
+        options_dict = self.options.as_dict(
+            "death_link", "ending_choice", "campaign", "coinsanity", "item_shuffle"
+        )
+        options_dict.update({
+            "coinbundlerange": self.options.coinbundlequantity.value,
+            "seed": self.random.randrange(99999999)
+        })
+        return options_dict
+
+    def collect(self, state: CollectionState, item: DLCQuestItem) -> bool:
+        change = super().collect(state, item)
+        if change:
+            suffix = item.coin_suffix
+            if suffix:
+                state.prog_items[self.player][suffix] += item.coins
+        return change
+
+    def remove(self, state: CollectionState, item: DLCQuestItem) -> bool:
+        change = super().remove(state, item)
+        if change:
+            suffix = item.coin_suffix
+            if suffix:
+                state.prog_items[self.player][suffix] -= item.coins
+        return change
diff --git a/worlds/dlcquest/test/TestItemShuffle.py b/worlds/dlcquest/test/TestItemShuffle.py
new file mode 100644
index 0000000000..bfe999246a
--- /dev/null
+++ b/worlds/dlcquest/test/TestItemShuffle.py
@@ -0,0 +1,130 @@
+from . import DLCQuestTestBase
+from .. import Options
+
+sword = "Sword"
+gun = "Gun"
+wooden_sword = "Wooden Sword"
+pickaxe = "Pickaxe"
+humble_bindle = "Humble Indie Bindle"
+box_supplies = "Box of Various Supplies"
+items = [sword, gun, wooden_sword, pickaxe, humble_bindle, box_supplies]
+
+important_pack = "Incredibly Important Pack"
+
+
+class TestItemShuffle(DLCQuestTestBase):
+    options = {Options.ItemShuffle.internal_name: Options.ItemShuffle.option_shuffled,
+               Options.Campaign.internal_name: Options.Campaign.option_both}
+
+    def test_items_in_pool(self):
+        item_names = {item.name for item in self.multiworld.get_items()}
+        for item in items:
+            with self.subTest(f"{item}"):
+                self.assertIn(item, item_names)
+
+    def test_item_locations_in_pool(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for item_location in items:
+            with self.subTest(f"{item_location}"):
+                self.assertIn(item_location, location_names)
+
+    def test_sword_location_has_correct_rules(self):
+        self.assertFalse(self.can_reach_location(sword))
+        movement_pack = self.multiworld.create_item("Movement Pack", self.player)
+        self.collect(movement_pack)
+        self.assertFalse(self.can_reach_location(sword))
+        time_pack = self.multiworld.create_item("Time is Money Pack", self.player)
+        self.collect(time_pack)
+        self.assertTrue(self.can_reach_location(sword))
+
+    def test_gun_location_has_correct_rules(self):
+        self.assertFalse(self.can_reach_location(gun))
+        movement_pack = self.multiworld.create_item("Movement Pack", self.player)
+        self.collect(movement_pack)
+        self.assertFalse(self.can_reach_location(gun))
+        sword_item = self.multiworld.create_item(sword, self.player)
+        self.collect(sword_item)
+        self.assertFalse(self.can_reach_location(gun))
+        gun_pack = self.multiworld.create_item("Gun Pack", self.player)
+        self.collect(gun_pack)
+        self.assertTrue(self.can_reach_location(gun))
+
+    def test_wooden_sword_location_has_correct_rules(self):
+        self.assertFalse(self.can_reach_location(wooden_sword))
+        important_pack_item = self.multiworld.create_item(important_pack, self.player)
+        self.collect(important_pack_item)
+        self.assertTrue(self.can_reach_location(wooden_sword))
+
+    def test_bindle_location_has_correct_rules(self):
+        self.assertFalse(self.can_reach_location(humble_bindle))
+        wooden_sword_item = self.multiworld.create_item(wooden_sword, self.player)
+        self.collect(wooden_sword_item)
+        self.assertFalse(self.can_reach_location(humble_bindle))
+        plants_pack = self.multiworld.create_item("Harmless Plants Pack", self.player)
+        self.collect(plants_pack)
+        self.assertFalse(self.can_reach_location(humble_bindle))
+        wall_jump_pack = self.multiworld.create_item("Wall Jump Pack", self.player)
+        self.collect(wall_jump_pack)
+        self.assertFalse(self.can_reach_location(humble_bindle))
+        name_change_pack = self.multiworld.create_item("Name Change Pack", self.player)
+        self.collect(name_change_pack)
+        self.assertFalse(self.can_reach_location(humble_bindle))
+        cut_content_pack = self.multiworld.create_item("Cut Content Pack", self.player)
+        self.collect(cut_content_pack)
+        self.assertFalse(self.can_reach_location(humble_bindle))
+        box_supplies_item = self.multiworld.create_item(box_supplies, self.player)
+        self.collect(box_supplies_item)
+        self.assertTrue(self.can_reach_location(humble_bindle))
+
+    def test_box_supplies_location_has_correct_rules(self):
+        self.assertFalse(self.can_reach_location(box_supplies))
+        wooden_sword_item = self.multiworld.create_item(wooden_sword, self.player)
+        self.collect(wooden_sword_item)
+        self.assertFalse(self.can_reach_location(box_supplies))
+        plants_pack = self.multiworld.create_item("Harmless Plants Pack", self.player)
+        self.collect(plants_pack)
+        self.assertFalse(self.can_reach_location(box_supplies))
+        wall_jump_pack = self.multiworld.create_item("Wall Jump Pack", self.player)
+        self.collect(wall_jump_pack)
+        self.assertFalse(self.can_reach_location(box_supplies))
+        name_change_pack = self.multiworld.create_item("Name Change Pack", self.player)
+        self.collect(name_change_pack)
+        self.assertFalse(self.can_reach_location(box_supplies))
+        cut_content_pack = self.multiworld.create_item("Cut Content Pack", self.player)
+        self.collect(cut_content_pack)
+        self.assertTrue(self.can_reach_location(box_supplies))
+
+    def test_pickaxe_location_has_correct_rules(self):
+        self.assertFalse(self.can_reach_location(pickaxe))
+        wooden_sword_item = self.multiworld.create_item(wooden_sword, self.player)
+        self.collect(wooden_sword_item)
+        self.assertFalse(self.can_reach_location(pickaxe))
+        plants_pack = self.multiworld.create_item("Harmless Plants Pack", self.player)
+        self.collect(plants_pack)
+        self.assertFalse(self.can_reach_location(pickaxe))
+        wall_jump_pack = self.multiworld.create_item("Wall Jump Pack", self.player)
+        self.collect(wall_jump_pack)
+        self.assertFalse(self.can_reach_location(pickaxe))
+        name_change_pack = self.multiworld.create_item("Name Change Pack", self.player)
+        self.collect(name_change_pack)
+        self.assertFalse(self.can_reach_location(pickaxe))
+        bindle_item = self.multiworld.create_item("Humble Indie Bindle", self.player)
+        self.collect(bindle_item)
+        self.assertTrue(self.can_reach_location(pickaxe))
+
+
+class TestNoItemShuffle(DLCQuestTestBase):
+    options = {Options.ItemShuffle.internal_name: Options.ItemShuffle.option_disabled,
+               Options.Campaign.internal_name: Options.Campaign.option_both}
+
+    def test_items_not_in_pool(self):
+        item_names = {item.name for item in self.multiworld.get_items()}
+        for item in items:
+            with self.subTest(f"{item}"):
+                self.assertNotIn(item, item_names)
+
+    def test_item_locations_not_in_pool(self):
+        location_names = {location.name for location in self.multiworld.get_locations()}
+        for item_location in items:
+            with self.subTest(f"{item_location}"):
+                self.assertNotIn(item_location, location_names)
\ No newline at end of file
diff --git a/worlds/dlcquest/test/TestOptionsLong.py b/worlds/dlcquest/test/TestOptionsLong.py
new file mode 100644
index 0000000000..3e9acac7e7
--- /dev/null
+++ b/worlds/dlcquest/test/TestOptionsLong.py
@@ -0,0 +1,87 @@
+from typing import Dict
+
+from BaseClasses import MultiWorld
+from Options import NamedRange
+from .option_names import options_to_include
+from .checks.world_checks import assert_can_win, assert_same_number_items_locations
+from . import DLCQuestTestBase, setup_dlc_quest_solo_multiworld
+from ... import AutoWorldRegister
+
+
+def basic_checks(tester: DLCQuestTestBase, multiworld: MultiWorld):
+    assert_can_win(tester, multiworld)
+    assert_same_number_items_locations(tester, multiworld)
+
+
+def get_option_choices(option) -> Dict[str, int]:
+    if issubclass(option, NamedRange):
+        return option.special_range_names
+    elif option.options:
+        return option.options
+    return {}
+
+
+class TestGenerateDynamicOptions(DLCQuestTestBase):
+    def test_given_option_pair_when_generate_then_basic_checks(self):
+        num_options = len(options_to_include)
+        for option1_index in range(0, num_options):
+            for option2_index in range(option1_index + 1, num_options):
+                option1 = options_to_include[option1_index]
+                option2 = options_to_include[option2_index]
+                option1_choices = get_option_choices(option1)
+                option2_choices = get_option_choices(option2)
+                for key1 in option1_choices:
+                    for key2 in option2_choices:
+                        with self.subTest(f"{option1.internal_name}: {key1}, {option2.internal_name}: {key2}"):
+                            choices = {option1.internal_name: option1_choices[key1],
+                                       option2.internal_name: option2_choices[key2]}
+                            multiworld = setup_dlc_quest_solo_multiworld(choices)
+                            basic_checks(self, multiworld)
+
+    def test_given_option_truple_when_generate_then_basic_checks(self):
+        num_options = len(options_to_include)
+        for option1_index in range(0, num_options):
+            for option2_index in range(option1_index + 1, num_options):
+                for option3_index in range(option2_index + 1, num_options):
+                    option1 = options_to_include[option1_index]
+                    option2 = options_to_include[option2_index]
+                    option3 = options_to_include[option3_index]
+                    option1_choices = get_option_choices(option1)
+                    option2_choices = get_option_choices(option2)
+                    option3_choices = get_option_choices(option3)
+                    for key1 in option1_choices:
+                        for key2 in option2_choices:
+                            for key3 in option3_choices:
+                                with self.subTest(f"{option1.internal_name}: {key1}, {option2.internal_name}: {key2}, {option3.internal_name}: {key3}"):
+                                    choices = {option1.internal_name: option1_choices[key1],
+                                               option2.internal_name: option2_choices[key2],
+                                               option3.internal_name: option3_choices[key3]}
+                                    multiworld = setup_dlc_quest_solo_multiworld(choices)
+                                    basic_checks(self, multiworld)
+
+    def test_given_option_quartet_when_generate_then_basic_checks(self):
+        num_options = len(options_to_include)
+        for option1_index in range(0, num_options):
+            for option2_index in range(option1_index + 1, num_options):
+                for option3_index in range(option2_index + 1, num_options):
+                    for option4_index in range(option3_index + 1, num_options):
+                        option1 = options_to_include[option1_index]
+                        option2 = options_to_include[option2_index]
+                        option3 = options_to_include[option3_index]
+                        option4 = options_to_include[option4_index]
+                        option1_choices = get_option_choices(option1)
+                        option2_choices = get_option_choices(option2)
+                        option3_choices = get_option_choices(option3)
+                        option4_choices = get_option_choices(option4)
+                        for key1 in option1_choices:
+                            for key2 in option2_choices:
+                                for key3 in option3_choices:
+                                    for key4 in option4_choices:
+                                        with self.subTest(
+                                                f"{option1.internal_name}: {key1}, {option2.internal_name}: {key2}, {option3.internal_name}: {key3}, {option4.internal_name}: {key4}"):
+                                            choices = {option1.internal_name: option1_choices[key1],
+                                                       option2.internal_name: option2_choices[key2],
+                                                       option3.internal_name: option3_choices[key3],
+                                                       option4.internal_name: option4_choices[key4]}
+                                            multiworld = setup_dlc_quest_solo_multiworld(choices)
+                                            basic_checks(self, multiworld)
diff --git a/worlds/dlcquest/test/__init__.py b/worlds/dlcquest/test/__init__.py
new file mode 100644
index 0000000000..e998bd8a5e
--- /dev/null
+++ b/worlds/dlcquest/test/__init__.py
@@ -0,0 +1,53 @@
+from typing import ClassVar
+
+from typing import Dict, FrozenSet, Tuple, Any
+from argparse import Namespace
+
+from BaseClasses import MultiWorld
+from test.TestBase import WorldTestBase
+from .. import DLCqworld
+from test.general import gen_steps, setup_solo_multiworld as setup_base_solo_multiworld
+from worlds.AutoWorld import call_all
+
+
+class DLCQuestTestBase(WorldTestBase):
+    game = "DLCQuest"
+    world: DLCqworld
+    player: ClassVar[int] = 1
+
+    def world_setup(self, *args, **kwargs):
+        super().world_setup(*args, **kwargs)
+        if self.constructed:
+            self.world = self.multiworld.worlds[self.player]  # noqa
+
+    @property
+    def run_default_tests(self) -> bool:
+        # world_setup is overridden, so it'd always run default tests when importing DLCQuestTestBase
+        is_not_dlc_test = type(self) is not DLCQuestTestBase
+        should_run_default_tests = is_not_dlc_test and super().run_default_tests
+        return should_run_default_tests
+
+
+def setup_dlc_quest_solo_multiworld(test_options=None, seed=None, _cache: Dict[FrozenSet[Tuple[str, Any]], MultiWorld] = {}) -> MultiWorld: #noqa
+    if test_options is None:
+        test_options = {}
+
+    # Yes I reuse the worlds generated between tests, its speeds the execution by a couple seconds
+    frozen_options = frozenset(test_options.items()).union({seed})
+    if frozen_options in _cache:
+        return _cache[frozen_options]
+
+    multiworld = setup_base_solo_multiworld(DLCqworld, ())
+    multiworld.set_seed(seed)
+    # print(f"Seed: {multiworld.seed}") # Uncomment to print the seed for every test
+    args = Namespace()
+    for name, option in DLCqworld.options_dataclass.type_hints.items():
+        value = option(test_options[name]) if name in test_options else option.from_any(option.default)
+        setattr(args, name, {1: value})
+    multiworld.set_options(args)
+    for step in gen_steps:
+        call_all(multiworld, step)
+
+    _cache[frozen_options] = multiworld
+
+    return multiworld
diff --git a/worlds/dlcquest/test/checks/__init__.py b/worlds/dlcquest/test/checks/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/dlcquest/test/checks/world_checks.py b/worlds/dlcquest/test/checks/world_checks.py
new file mode 100644
index 0000000000..a97093d620
--- /dev/null
+++ b/worlds/dlcquest/test/checks/world_checks.py
@@ -0,0 +1,42 @@
+from typing import List
+
+from BaseClasses import MultiWorld, ItemClassification
+from .. import DLCQuestTestBase
+from ... import Options
+
+
+def get_all_item_names(multiworld: MultiWorld) -> List[str]:
+    return [item.name for item in multiworld.itempool]
+
+
+def get_all_location_names(multiworld: MultiWorld) -> List[str]:
+    return [location.name for location in multiworld.get_locations() if not location.event]
+
+
+def assert_victory_exists(tester: DLCQuestTestBase, multiworld: MultiWorld):
+    campaign = multiworld.campaign[1]
+    all_items = [item.name for item in multiworld.get_items()]
+    if campaign == Options.Campaign.option_basic or campaign == Options.Campaign.option_both:
+        tester.assertIn("Victory Basic", all_items)
+    if campaign == Options.Campaign.option_live_freemium_or_die or campaign == Options.Campaign.option_both:
+        tester.assertIn("Victory Freemium", all_items)
+
+
+def collect_all_then_assert_can_win(tester: DLCQuestTestBase, multiworld: MultiWorld):
+    for item in multiworld.get_items():
+        multiworld.state.collect(item)
+    campaign = multiworld.campaign[1]
+    if campaign == Options.Campaign.option_basic or campaign == Options.Campaign.option_both:
+        tester.assertTrue(multiworld.find_item("Victory Basic", 1).can_reach(multiworld.state))
+    if campaign == Options.Campaign.option_live_freemium_or_die or campaign == Options.Campaign.option_both:
+        tester.assertTrue(multiworld.find_item("Victory Freemium", 1).can_reach(multiworld.state))
+
+
+def assert_can_win(tester: DLCQuestTestBase, multiworld: MultiWorld):
+    assert_victory_exists(tester, multiworld)
+    collect_all_then_assert_can_win(tester, multiworld)
+
+
+def assert_same_number_items_locations(tester: DLCQuestTestBase, multiworld: MultiWorld):
+    non_event_locations = [location for location in multiworld.get_locations() if not location.event]
+    tester.assertEqual(len(multiworld.itempool), len(non_event_locations))
\ No newline at end of file
diff --git a/worlds/dlcquest/test/option_names.py b/worlds/dlcquest/test/option_names.py
new file mode 100644
index 0000000000..4a4b46e906
--- /dev/null
+++ b/worlds/dlcquest/test/option_names.py
@@ -0,0 +1,5 @@
+from .. import DLCqworld
+
+options_to_exclude = ["progression_balancing", "accessibility", "start_inventory", "start_hints", "death_link"]
+options_to_include = [option for option_name, option in DLCqworld.options_dataclass.type_hints.items()
+                      if option_name not in options_to_exclude]
diff --git a/worlds/doom_1993/Items.py b/worlds/doom_1993/Items.py
index fe5576c4df..3c5124d4d5 100644
--- a/worlds/doom_1993/Items.py
+++ b/worlds/doom_1993/Items.py
@@ -1165,6 +1165,7 @@ item_table: Dict[int, ItemDict] = {
 
 item_name_groups: Dict[str, Set[str]] = {
     'Ammos': {'Box of bullets', 'Box of rockets', 'Box of shotgun shells', 'Energy cell pack', },
+    'Computer area maps': {'Against Thee Wickedly (E4M6) - Computer area map', 'And Hell Followed (E4M7) - Computer area map', 'Central Processing (E1M6) - Computer area map', 'Command Center (E2M5) - Computer area map', 'Command Control (E1M4) - Computer area map', 'Computer Station (E1M7) - Computer area map', 'Containment Area (E2M2) - Computer area map', 'Deimos Anomaly (E2M1) - Computer area map', 'Deimos Lab (E2M4) - Computer area map', 'Dis (E3M8) - Computer area map', 'Fear (E4M9) - Computer area map', 'Fortress of Mystery (E2M9) - Computer area map', 'Halls of the Damned (E2M6) - Computer area map', 'Hangar (E1M1) - Computer area map', 'Hell Beneath (E4M1) - Computer area map', 'Hell Keep (E3M1) - Computer area map', 'House of Pain (E3M4) - Computer area map', 'Limbo (E3M7) - Computer area map', 'Military Base (E1M9) - Computer area map', 'Mt. Erebus (E3M6) - Computer area map', 'Nuclear Plant (E1M2) - Computer area map', 'Pandemonium (E3M3) - Computer area map', 'Perfect Hatred (E4M2) - Computer area map', 'Phobos Anomaly (E1M8) - Computer area map', 'Phobos Lab (E1M5) - Computer area map', 'Refinery (E2M3) - Computer area map', 'Sever the Wicked (E4M3) - Computer area map', 'Slough of Despair (E3M2) - Computer area map', 'Spawning Vats (E2M7) - Computer area map', 'They Will Repent (E4M5) - Computer area map', 'Tower of Babel (E2M8) - Computer area map', 'Toxin Refinery (E1M3) - Computer area map', 'Unholy Cathedral (E3M5) - Computer area map', 'Unruly Evil (E4M4) - Computer area map', 'Unto the Cruel (E4M8) - Computer area map', 'Warrens (E3M9) - Computer area map', },
     'Keys': {'Against Thee Wickedly (E4M6) - Blue skull key', 'Against Thee Wickedly (E4M6) - Red skull key', 'Against Thee Wickedly (E4M6) - Yellow skull key', 'And Hell Followed (E4M7) - Blue skull key', 'And Hell Followed (E4M7) - Red skull key', 'And Hell Followed (E4M7) - Yellow skull key', 'Central Processing (E1M6) - Blue keycard', 'Central Processing (E1M6) - Red keycard', 'Central Processing (E1M6) - Yellow keycard', 'Command Control (E1M4) - Blue keycard', 'Command Control (E1M4) - Yellow keycard', 'Computer Station (E1M7) - Blue keycard', 'Computer Station (E1M7) - Red keycard', 'Computer Station (E1M7) - Yellow keycard', 'Containment Area (E2M2) - Blue keycard', 'Containment Area (E2M2) - Red keycard', 'Containment Area (E2M2) - Yellow keycard', 'Deimos Anomaly (E2M1) - Blue keycard', 'Deimos Anomaly (E2M1) - Red keycard', 'Deimos Lab (E2M4) - Blue keycard', 'Deimos Lab (E2M4) - Yellow keycard', 'Fear (E4M9) - Yellow skull key', 'Fortress of Mystery (E2M9) - Blue skull key', 'Fortress of Mystery (E2M9) - Red skull key', 'Fortress of Mystery (E2M9) - Yellow skull key', 'Halls of the Damned (E2M6) - Blue skull key', 'Halls of the Damned (E2M6) - Red skull key', 'Halls of the Damned (E2M6) - Yellow skull key', 'Hell Beneath (E4M1) - Blue skull key', 'Hell Beneath (E4M1) - Red skull key', 'House of Pain (E3M4) - Blue skull key', 'House of Pain (E3M4) - Red skull key', 'House of Pain (E3M4) - Yellow skull key', 'Limbo (E3M7) - Blue skull key', 'Limbo (E3M7) - Red skull key', 'Limbo (E3M7) - Yellow skull key', 'Military Base (E1M9) - Blue keycard', 'Military Base (E1M9) - Red keycard', 'Military Base (E1M9) - Yellow keycard', 'Mt. Erebus (E3M6) - Blue skull key', 'Nuclear Plant (E1M2) - Red keycard', 'Pandemonium (E3M3) - Blue skull key', 'Perfect Hatred (E4M2) - Blue skull key', 'Perfect Hatred (E4M2) - Yellow skull key', 'Phobos Lab (E1M5) - Blue keycard', 'Phobos Lab (E1M5) - Yellow keycard', 'Refinery (E2M3) - Blue keycard', 'Sever the Wicked (E4M3) - Blue skull key', 'Sever the Wicked (E4M3) - Red skull key', 'Slough of Despair (E3M2) - Blue skull key', 'Spawning Vats (E2M7) - Blue keycard', 'Spawning Vats (E2M7) - Red keycard', 'Spawning Vats (E2M7) - Yellow keycard', 'They Will Repent (E4M5) - Blue skull key', 'They Will Repent (E4M5) - Red skull key', 'They Will Repent (E4M5) - Yellow skull key', 'Toxin Refinery (E1M3) - Blue keycard', 'Toxin Refinery (E1M3) - Yellow keycard', 'Unholy Cathedral (E3M5) - Blue skull key', 'Unholy Cathedral (E3M5) - Yellow skull key', 'Unruly Evil (E4M4) - Red skull key', 'Unto the Cruel (E4M8) - Red skull key', 'Unto the Cruel (E4M8) - Yellow skull key', 'Warrens (E3M9) - Blue skull key', 'Warrens (E3M9) - Red skull key', },
     'Levels': {'Against Thee Wickedly (E4M6)', 'And Hell Followed (E4M7)', 'Central Processing (E1M6)', 'Command Center (E2M5)', 'Command Control (E1M4)', 'Computer Station (E1M7)', 'Containment Area (E2M2)', 'Deimos Anomaly (E2M1)', 'Deimos Lab (E2M4)', 'Dis (E3M8)', 'Fear (E4M9)', 'Fortress of Mystery (E2M9)', 'Halls of the Damned (E2M6)', 'Hangar (E1M1)', 'Hell Beneath (E4M1)', 'Hell Keep (E3M1)', 'House of Pain (E3M4)', 'Limbo (E3M7)', 'Military Base (E1M9)', 'Mt. Erebus (E3M6)', 'Nuclear Plant (E1M2)', 'Pandemonium (E3M3)', 'Perfect Hatred (E4M2)', 'Phobos Anomaly (E1M8)', 'Phobos Lab (E1M5)', 'Refinery (E2M3)', 'Sever the Wicked (E4M3)', 'Slough of Despair (E3M2)', 'Spawning Vats (E2M7)', 'They Will Repent (E4M5)', 'Tower of Babel (E2M8)', 'Toxin Refinery (E1M3)', 'Unholy Cathedral (E3M5)', 'Unruly Evil (E4M4)', 'Unto the Cruel (E4M8)', 'Warrens (E3M9)', },
     'Powerups': {'Armor', 'Berserk', 'Invulnerability', 'Mega Armor', 'Partial invisibility', 'Supercharge', },
diff --git a/worlds/doom_1993/Locations.py b/worlds/doom_1993/Locations.py
index 778efb4661..2cbb9b9d15 100644
--- a/worlds/doom_1993/Locations.py
+++ b/worlds/doom_1993/Locations.py
@@ -1968,7 +1968,7 @@ location_table: Dict[int, LocationDict] = {
              'map': 2,
              'index': -1,
              'doom_type': -1,
-             'region': "Containment Area (E2M2) Red"},
+             'region': "Containment Area (E2M2) Red Exit"},
     351326: {'name': 'Deimos Anomaly (E2M1) - Exit',
              'episode': 2,
              'map': 1,
diff --git a/worlds/doom_1993/Options.py b/worlds/doom_1993/Options.py
index 72bb7c3aea..59f7bcef49 100644
--- a/worlds/doom_1993/Options.py
+++ b/worlds/doom_1993/Options.py
@@ -1,6 +1,18 @@
 import typing
 
-from Options import AssembleOptions, Choice, Toggle, DeathLink, DefaultOnToggle
+from Options import AssembleOptions, Choice, Toggle, DeathLink, DefaultOnToggle, StartInventoryPool
+
+
+class Goal(Choice):
+    """
+    Choose the main goal.
+    complete_all_levels: All levels of the selected episodes
+    complete_boss_levels: Boss levels (E#M8) of selected episodes
+    """
+    display_name = "Goal"
+    option_complete_all_levels = 0
+    option_complete_boss_levels = 1
+    default = 0
 
 
 class Difficulty(Choice):
@@ -27,11 +39,13 @@ class RandomMonsters(Choice):
     vanilla: No randomization
     shuffle: Monsters are shuffled within the level
     random_balanced: Monsters are completely randomized, but balanced based on existing ratio in the level. (Small monsters vs medium vs big)
+    random_chaotic: Monsters are completely randomized, but balanced based on existing ratio in the entire game.    
     """
     display_name = "Random Monsters"
     option_vanilla = 0
     option_shuffle = 1
     option_random_balanced = 2
+    option_random_chaotic = 3
     default = 1
 
 
@@ -49,6 +63,34 @@ class RandomPickups(Choice):
     default = 1
 
 
+class RandomMusic(Choice):
+    """
+    Level musics will be randomized.
+    vanilla: No randomization
+    shuffle_selected: Selected episodes' levels will be shuffled
+    shuffle_game: All the music will be shuffled
+    """
+    display_name = "Random Music"
+    option_vanilla = 0
+    option_shuffle_selected = 1
+    option_shuffle_game = 2
+    default = 0
+
+
+class FlipLevels(Choice):
+    """
+    Flip levels on one axis.
+    vanilla: No flipping
+    flipped: All levels are flipped
+    randomly_flipped: Random levels are flipped
+    """
+    display_name = "Flip Levels"
+    option_vanilla = 0
+    option_flipped = 1
+    option_randomly_flipped = 2
+    default = 0
+
+
 class AllowDeathLogic(Toggle):
     """Some locations require a timed puzzle that can only be tried once.
     After which, if the player failed to get it, the location cannot be checked anymore.
@@ -56,12 +98,24 @@ class AllowDeathLogic(Toggle):
     Get killed in the current map. The map will reset, you can now attempt the puzzle again."""
     display_name = "Allow Death Logic"
 
+    
+class Pro(Toggle):
+    """Include difficult tricks into rules. Mostly employed by speed runners.
+    i.e.: Leaps across to a locked area, trigger a switch behind a window at the right angle, etc."""
+    display_name = "Pro Doom"
+
 
 class StartWithComputerAreaMaps(Toggle):
     """Give the player all Computer Area Map items from the start."""
     display_name = "Start With Computer Area Maps"
 
 
+class ResetLevelOnDeath(DefaultOnToggle):
+    """When dying, levels are reset and monsters respawned. But inventory and checks are kept.
+    Turning this setting off is considered easy mode. Good for new players that don't know the levels well."""
+    display_name="Reset Level on Death"
+
+
 class Episode1(DefaultOnToggle):
     """Knee-Deep in the Dead.
     If none of the episodes are chosen, Episode 1 will be chosen by default."""
@@ -87,12 +141,18 @@ class Episode4(Toggle):
 
 
 options: typing.Dict[str, AssembleOptions] = {
+    "start_inventory_from_pool": StartInventoryPool,
+    "goal": Goal,
     "difficulty": Difficulty,
     "random_monsters": RandomMonsters,
     "random_pickups": RandomPickups,
+    "random_music": RandomMusic,
+    "flip_levels": FlipLevels,
     "allow_death_logic": AllowDeathLogic,
+    "pro": Pro,
     "start_with_computer_area_maps": StartWithComputerAreaMaps,
     "death_link": DeathLink,
+    "reset_level_on_death": ResetLevelOnDeath,
     "episode1": Episode1,
     "episode2": Episode2,
     "episode3": Episode3,
diff --git a/worlds/doom_1993/Regions.py b/worlds/doom_1993/Regions.py
index 602c29f5bd..f013bdceaf 100644
--- a/worlds/doom_1993/Regions.py
+++ b/worlds/doom_1993/Regions.py
@@ -3,11 +3,15 @@
 from typing import List
 from BaseClasses import TypedDict
 
-class RegionDict(TypedDict, total=False): 
+class ConnectionDict(TypedDict, total=False):
+    target: str
+    pro: bool
+
+class RegionDict(TypedDict, total=False):
     name: str
     connects_to_hub: bool
     episode: int
-    connections: List[str]
+    connections: List[ConnectionDict]
 
 
 regions:List[RegionDict] = [
@@ -21,121 +25,131 @@ regions:List[RegionDict] = [
     {"name":"Nuclear Plant (E1M2) Main",
      "connects_to_hub":True,
      "episode":1,
-     "connections":["Nuclear Plant (E1M2) Red"]},
+     "connections":[{"target":"Nuclear Plant (E1M2) Red","pro":False}]},
     {"name":"Nuclear Plant (E1M2) Red",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Nuclear Plant (E1M2) Main"]},
+     "connections":[{"target":"Nuclear Plant (E1M2) Main","pro":False}]},
 
     # Toxin Refinery (E1M3)
     {"name":"Toxin Refinery (E1M3) Main",
      "connects_to_hub":True,
      "episode":1,
-     "connections":["Toxin Refinery (E1M3) Blue"]},
+     "connections":[{"target":"Toxin Refinery (E1M3) Blue","pro":False}]},
     {"name":"Toxin Refinery (E1M3) Blue",
      "connects_to_hub":False,
      "episode":1,
      "connections":[
-        "Toxin Refinery (E1M3) Yellow",
-        "Toxin Refinery (E1M3) Main"]},
+        {"target":"Toxin Refinery (E1M3) Yellow","pro":False},
+        {"target":"Toxin Refinery (E1M3) Main","pro":False}]},
     {"name":"Toxin Refinery (E1M3) Yellow",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Toxin Refinery (E1M3) Blue"]},
+     "connections":[{"target":"Toxin Refinery (E1M3) Blue","pro":False}]},
 
     # Command Control (E1M4)
     {"name":"Command Control (E1M4) Main",
      "connects_to_hub":True,
      "episode":1,
      "connections":[
-        "Command Control (E1M4) Blue",
-        "Command Control (E1M4) Yellow"]},
+        {"target":"Command Control (E1M4) Blue","pro":False},
+        {"target":"Command Control (E1M4) Yellow","pro":False},
+        {"target":"Command Control (E1M4) Ledge","pro":True}]},
     {"name":"Command Control (E1M4) Blue",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Command Control (E1M4) Main"]},
+     "connections":[
+        {"target":"Command Control (E1M4) Ledge","pro":False},
+        {"target":"Command Control (E1M4) Main","pro":False}]},
     {"name":"Command Control (E1M4) Yellow",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Command Control (E1M4) Main"]},
+     "connections":[{"target":"Command Control (E1M4) Main","pro":False}]},
+    {"name":"Command Control (E1M4) Ledge",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"Command Control (E1M4) Main","pro":False},
+        {"target":"Command Control (E1M4) Blue","pro":False},
+        {"target":"Command Control (E1M4) Yellow","pro":False}]},
 
     # Phobos Lab (E1M5)
     {"name":"Phobos Lab (E1M5) Main",
      "connects_to_hub":True,
      "episode":1,
-     "connections":["Phobos Lab (E1M5) Yellow"]},
+     "connections":[{"target":"Phobos Lab (E1M5) Yellow","pro":False}]},
     {"name":"Phobos Lab (E1M5) Yellow",
      "connects_to_hub":False,
      "episode":1,
      "connections":[
-        "Phobos Lab (E1M5) Main",
-        "Phobos Lab (E1M5) Blue",
-        "Phobos Lab (E1M5) Green"]},
+        {"target":"Phobos Lab (E1M5) Main","pro":False},
+        {"target":"Phobos Lab (E1M5) Blue","pro":False},
+        {"target":"Phobos Lab (E1M5) Green","pro":False}]},
     {"name":"Phobos Lab (E1M5) Blue",
      "connects_to_hub":False,
      "episode":1,
      "connections":[
-        "Phobos Lab (E1M5) Green",
-        "Phobos Lab (E1M5) Yellow"]},
+        {"target":"Phobos Lab (E1M5) Green","pro":False},
+        {"target":"Phobos Lab (E1M5) Yellow","pro":False}]},
     {"name":"Phobos Lab (E1M5) Green",
      "connects_to_hub":False,
      "episode":1,
      "connections":[
-        "Phobos Lab (E1M5) Main",
-        "Phobos Lab (E1M5) Blue"]},
+        {"target":"Phobos Lab (E1M5) Main","pro":False},
+        {"target":"Phobos Lab (E1M5) Blue","pro":False}]},
 
     # Central Processing (E1M6)
     {"name":"Central Processing (E1M6) Main",
      "connects_to_hub":True,
      "episode":1,
      "connections":[
-        "Central Processing (E1M6) Yellow",
-        "Central Processing (E1M6) Red",
-        "Central Processing (E1M6) Blue",
-        "Central Processing (E1M6) Nukage"]},
+        {"target":"Central Processing (E1M6) Yellow","pro":False},
+        {"target":"Central Processing (E1M6) Red","pro":False},
+        {"target":"Central Processing (E1M6) Blue","pro":False},
+        {"target":"Central Processing (E1M6) Nukage","pro":False}]},
     {"name":"Central Processing (E1M6) Red",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Central Processing (E1M6) Main"]},
+     "connections":[{"target":"Central Processing (E1M6) Main","pro":False}]},
     {"name":"Central Processing (E1M6) Blue",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Central Processing (E1M6) Main"]},
+     "connections":[{"target":"Central Processing (E1M6) Main","pro":False}]},
     {"name":"Central Processing (E1M6) Yellow",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Central Processing (E1M6) Main"]},
+     "connections":[{"target":"Central Processing (E1M6) Main","pro":False}]},
     {"name":"Central Processing (E1M6) Nukage",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Central Processing (E1M6) Yellow"]},
+     "connections":[{"target":"Central Processing (E1M6) Yellow","pro":False}]},
 
     # Computer Station (E1M7)
     {"name":"Computer Station (E1M7) Main",
      "connects_to_hub":True,
      "episode":1,
      "connections":[
-        "Computer Station (E1M7) Red",
-        "Computer Station (E1M7) Yellow"]},
+        {"target":"Computer Station (E1M7) Red","pro":False},
+        {"target":"Computer Station (E1M7) Yellow","pro":False}]},
     {"name":"Computer Station (E1M7) Blue",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Computer Station (E1M7) Yellow"]},
+     "connections":[{"target":"Computer Station (E1M7) Yellow","pro":False}]},
     {"name":"Computer Station (E1M7) Red",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Computer Station (E1M7) Main"]},
+     "connections":[{"target":"Computer Station (E1M7) Main","pro":False}]},
     {"name":"Computer Station (E1M7) Yellow",
      "connects_to_hub":False,
      "episode":1,
      "connections":[
-        "Computer Station (E1M7) Blue",
-        "Computer Station (E1M7) Courtyard",
-        "Computer Station (E1M7) Main"]},
+        {"target":"Computer Station (E1M7) Blue","pro":False},
+        {"target":"Computer Station (E1M7) Courtyard","pro":False},
+        {"target":"Computer Station (E1M7) Main","pro":False}]},
     {"name":"Computer Station (E1M7) Courtyard",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Computer Station (E1M7) Yellow"]},
+     "connections":[{"target":"Computer Station (E1M7) Yellow","pro":False}]},
 
     # Phobos Anomaly (E1M8)
     {"name":"Phobos Anomaly (E1M8) Main",
@@ -145,91 +159,98 @@ regions:List[RegionDict] = [
     {"name":"Phobos Anomaly (E1M8) Start",
      "connects_to_hub":True,
      "episode":1,
-     "connections":["Phobos Anomaly (E1M8) Main"]},
+     "connections":[{"target":"Phobos Anomaly (E1M8) Main","pro":False}]},
 
     # Military Base (E1M9)
     {"name":"Military Base (E1M9) Main",
      "connects_to_hub":True,
      "episode":1,
      "connections":[
-        "Military Base (E1M9) Blue",
-        "Military Base (E1M9) Yellow",
-        "Military Base (E1M9) Red"]},
+        {"target":"Military Base (E1M9) Blue","pro":False},
+        {"target":"Military Base (E1M9) Yellow","pro":False},
+        {"target":"Military Base (E1M9) Red","pro":False}]},
     {"name":"Military Base (E1M9) Blue",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Military Base (E1M9) Main"]},
+     "connections":[{"target":"Military Base (E1M9) Main","pro":False}]},
     {"name":"Military Base (E1M9) Red",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Military Base (E1M9) Main"]},
+     "connections":[{"target":"Military Base (E1M9) Main","pro":False}]},
     {"name":"Military Base (E1M9) Yellow",
      "connects_to_hub":False,
      "episode":1,
-     "connections":["Military Base (E1M9) Main"]},
+     "connections":[{"target":"Military Base (E1M9) Main","pro":False}]},
 
     # Deimos Anomaly (E2M1)
     {"name":"Deimos Anomaly (E2M1) Main",
      "connects_to_hub":True,
      "episode":2,
      "connections":[
-        "Deimos Anomaly (E2M1) Red",
-        "Deimos Anomaly (E2M1) Blue"]},
+        {"target":"Deimos Anomaly (E2M1) Red","pro":False},
+        {"target":"Deimos Anomaly (E2M1) Blue","pro":False}]},
     {"name":"Deimos Anomaly (E2M1) Blue",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Deimos Anomaly (E2M1) Main"]},
+     "connections":[{"target":"Deimos Anomaly (E2M1) Main","pro":False}]},
     {"name":"Deimos Anomaly (E2M1) Red",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Deimos Anomaly (E2M1) Main"]},
+     "connections":[{"target":"Deimos Anomaly (E2M1) Main","pro":False}]},
 
     # Containment Area (E2M2)
     {"name":"Containment Area (E2M2) Main",
      "connects_to_hub":True,
      "episode":2,
      "connections":[
-        "Containment Area (E2M2) Yellow",
-        "Containment Area (E2M2) Blue",
-        "Containment Area (E2M2) Red"]},
+        {"target":"Containment Area (E2M2) Yellow","pro":False},
+        {"target":"Containment Area (E2M2) Blue","pro":False},
+        {"target":"Containment Area (E2M2) Red","pro":False},
+        {"target":"Containment Area (E2M2) Red Exit","pro":True}]},
     {"name":"Containment Area (E2M2) Blue",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Containment Area (E2M2) Main"]},
+     "connections":[{"target":"Containment Area (E2M2) Main","pro":False}]},
     {"name":"Containment Area (E2M2) Red",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Containment Area (E2M2) Main"]},
+     "connections":[
+        {"target":"Containment Area (E2M2) Main","pro":False},
+        {"target":"Containment Area (E2M2) Red Exit","pro":False}]},
     {"name":"Containment Area (E2M2) Yellow",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Containment Area (E2M2) Main"]},
+     "connections":[{"target":"Containment Area (E2M2) Main","pro":False}]},
+    {"name":"Containment Area (E2M2) Red Exit",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[]},
 
     # Refinery (E2M3)
     {"name":"Refinery (E2M3) Main",
      "connects_to_hub":True,
      "episode":2,
-     "connections":["Refinery (E2M3) Blue"]},
+     "connections":[{"target":"Refinery (E2M3) Blue","pro":False}]},
     {"name":"Refinery (E2M3) Blue",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Refinery (E2M3) Main"]},
+     "connections":[{"target":"Refinery (E2M3) Main","pro":False}]},
 
     # Deimos Lab (E2M4)
     {"name":"Deimos Lab (E2M4) Main",
      "connects_to_hub":True,
      "episode":2,
-     "connections":["Deimos Lab (E2M4) Blue"]},
+     "connections":[{"target":"Deimos Lab (E2M4) Blue","pro":False}]},
     {"name":"Deimos Lab (E2M4) Blue",
      "connects_to_hub":False,
      "episode":2,
      "connections":[
-        "Deimos Lab (E2M4) Main",
-        "Deimos Lab (E2M4) Yellow"]},
+        {"target":"Deimos Lab (E2M4) Main","pro":False},
+        {"target":"Deimos Lab (E2M4) Yellow","pro":False}]},
     {"name":"Deimos Lab (E2M4) Yellow",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Deimos Lab (E2M4) Blue"]},
+     "connections":[{"target":"Deimos Lab (E2M4) Blue","pro":False}]},
 
     # Command Center (E2M5)
     {"name":"Command Center (E2M5) Main",
@@ -242,47 +263,54 @@ regions:List[RegionDict] = [
      "connects_to_hub":True,
      "episode":2,
      "connections":[
-        "Halls of the Damned (E2M6) Blue Yellow Red",
-        "Halls of the Damned (E2M6) Yellow",
-        "Halls of the Damned (E2M6) One way Yellow"]},
+        {"target":"Halls of the Damned (E2M6) Blue Yellow Red","pro":False},
+        {"target":"Halls of the Damned (E2M6) Yellow","pro":False},
+        {"target":"Halls of the Damned (E2M6) One way Yellow","pro":False}]},
     {"name":"Halls of the Damned (E2M6) Yellow",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Halls of the Damned (E2M6) Main"]},
+     "connections":[{"target":"Halls of the Damned (E2M6) Main","pro":False}]},
     {"name":"Halls of the Damned (E2M6) Blue Yellow Red",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Halls of the Damned (E2M6) Main"]},
+     "connections":[{"target":"Halls of the Damned (E2M6) Main","pro":False}]},
     {"name":"Halls of the Damned (E2M6) One way Yellow",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Halls of the Damned (E2M6) Main"]},
+     "connections":[{"target":"Halls of the Damned (E2M6) Main","pro":False}]},
 
     # Spawning Vats (E2M7)
     {"name":"Spawning Vats (E2M7) Main",
      "connects_to_hub":True,
      "episode":2,
      "connections":[
-        "Spawning Vats (E2M7) Blue",
-        "Spawning Vats (E2M7) Entrance Secret",
-        "Spawning Vats (E2M7) Red",
-        "Spawning Vats (E2M7) Yellow"]},
+        {"target":"Spawning Vats (E2M7) Blue","pro":False},
+        {"target":"Spawning Vats (E2M7) Entrance Secret","pro":False},
+        {"target":"Spawning Vats (E2M7) Red","pro":False},
+        {"target":"Spawning Vats (E2M7) Yellow","pro":False},
+        {"target":"Spawning Vats (E2M7) Red Exit","pro":True}]},
     {"name":"Spawning Vats (E2M7) Blue",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Spawning Vats (E2M7) Main"]},
+     "connections":[{"target":"Spawning Vats (E2M7) Main","pro":False}]},
     {"name":"Spawning Vats (E2M7) Yellow",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Spawning Vats (E2M7) Main"]},
+     "connections":[{"target":"Spawning Vats (E2M7) Main","pro":False}]},
     {"name":"Spawning Vats (E2M7) Red",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Spawning Vats (E2M7) Main"]},
+     "connections":[
+        {"target":"Spawning Vats (E2M7) Main","pro":False},
+        {"target":"Spawning Vats (E2M7) Red Exit","pro":False}]},
     {"name":"Spawning Vats (E2M7) Entrance Secret",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Spawning Vats (E2M7) Main"]},
+     "connections":[{"target":"Spawning Vats (E2M7) Main","pro":False}]},
+    {"name":"Spawning Vats (E2M7) Red Exit",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[]},
 
     # Tower of Babel (E2M8)
     {"name":"Tower of Babel (E2M8) Main",
@@ -295,134 +323,134 @@ regions:List[RegionDict] = [
      "connects_to_hub":True,
      "episode":2,
      "connections":[
-        "Fortress of Mystery (E2M9) Blue",
-        "Fortress of Mystery (E2M9) Red",
-        "Fortress of Mystery (E2M9) Yellow"]},
+        {"target":"Fortress of Mystery (E2M9) Blue","pro":False},
+        {"target":"Fortress of Mystery (E2M9) Red","pro":False},
+        {"target":"Fortress of Mystery (E2M9) Yellow","pro":False}]},
     {"name":"Fortress of Mystery (E2M9) Blue",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Fortress of Mystery (E2M9) Main"]},
+     "connections":[{"target":"Fortress of Mystery (E2M9) Main","pro":False}]},
     {"name":"Fortress of Mystery (E2M9) Red",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Fortress of Mystery (E2M9) Main"]},
+     "connections":[{"target":"Fortress of Mystery (E2M9) Main","pro":False}]},
     {"name":"Fortress of Mystery (E2M9) Yellow",
      "connects_to_hub":False,
      "episode":2,
-     "connections":["Fortress of Mystery (E2M9) Main"]},
+     "connections":[{"target":"Fortress of Mystery (E2M9) Main","pro":False}]},
 
     # Hell Keep (E3M1)
     {"name":"Hell Keep (E3M1) Main",
      "connects_to_hub":True,
      "episode":3,
-     "connections":["Hell Keep (E3M1) Narrow"]},
+     "connections":[{"target":"Hell Keep (E3M1) Narrow","pro":False}]},
     {"name":"Hell Keep (E3M1) Narrow",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Hell Keep (E3M1) Main"]},
+     "connections":[{"target":"Hell Keep (E3M1) Main","pro":False}]},
 
     # Slough of Despair (E3M2)
     {"name":"Slough of Despair (E3M2) Main",
      "connects_to_hub":True,
      "episode":3,
-     "connections":["Slough of Despair (E3M2) Blue"]},
+     "connections":[{"target":"Slough of Despair (E3M2) Blue","pro":False}]},
     {"name":"Slough of Despair (E3M2) Blue",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Slough of Despair (E3M2) Main"]},
+     "connections":[{"target":"Slough of Despair (E3M2) Main","pro":False}]},
 
     # Pandemonium (E3M3)
     {"name":"Pandemonium (E3M3) Main",
      "connects_to_hub":True,
      "episode":3,
-     "connections":["Pandemonium (E3M3) Blue"]},
+     "connections":[{"target":"Pandemonium (E3M3) Blue","pro":False}]},
     {"name":"Pandemonium (E3M3) Blue",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Pandemonium (E3M3) Main"]},
+     "connections":[{"target":"Pandemonium (E3M3) Main","pro":False}]},
 
     # House of Pain (E3M4)
     {"name":"House of Pain (E3M4) Main",
      "connects_to_hub":True,
      "episode":3,
-     "connections":["House of Pain (E3M4) Blue"]},
+     "connections":[{"target":"House of Pain (E3M4) Blue","pro":False}]},
     {"name":"House of Pain (E3M4) Blue",
      "connects_to_hub":False,
      "episode":3,
      "connections":[
-        "House of Pain (E3M4) Main",
-        "House of Pain (E3M4) Yellow",
-        "House of Pain (E3M4) Red"]},
+        {"target":"House of Pain (E3M4) Main","pro":False},
+        {"target":"House of Pain (E3M4) Yellow","pro":False},
+        {"target":"House of Pain (E3M4) Red","pro":False}]},
     {"name":"House of Pain (E3M4) Red",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["House of Pain (E3M4) Blue"]},
+     "connections":[{"target":"House of Pain (E3M4) Blue","pro":False}]},
     {"name":"House of Pain (E3M4) Yellow",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["House of Pain (E3M4) Blue"]},
+     "connections":[{"target":"House of Pain (E3M4) Blue","pro":False}]},
 
     # Unholy Cathedral (E3M5)
     {"name":"Unholy Cathedral (E3M5) Main",
      "connects_to_hub":True,
      "episode":3,
      "connections":[
-        "Unholy Cathedral (E3M5) Yellow",
-        "Unholy Cathedral (E3M5) Blue"]},
+        {"target":"Unholy Cathedral (E3M5) Yellow","pro":False},
+        {"target":"Unholy Cathedral (E3M5) Blue","pro":False}]},
     {"name":"Unholy Cathedral (E3M5) Blue",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Unholy Cathedral (E3M5) Main"]},
+     "connections":[{"target":"Unholy Cathedral (E3M5) Main","pro":False}]},
     {"name":"Unholy Cathedral (E3M5) Yellow",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Unholy Cathedral (E3M5) Main"]},
+     "connections":[{"target":"Unholy Cathedral (E3M5) Main","pro":False}]},
 
     # Mt. Erebus (E3M6)
     {"name":"Mt. Erebus (E3M6) Main",
      "connects_to_hub":True,
      "episode":3,
-     "connections":["Mt. Erebus (E3M6) Blue"]},
+     "connections":[{"target":"Mt. Erebus (E3M6) Blue","pro":False}]},
     {"name":"Mt. Erebus (E3M6) Blue",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Mt. Erebus (E3M6) Main"]},
+     "connections":[{"target":"Mt. Erebus (E3M6) Main","pro":False}]},
 
     # Limbo (E3M7)
     {"name":"Limbo (E3M7) Main",
      "connects_to_hub":True,
      "episode":3,
      "connections":[
-        "Limbo (E3M7) Red",
-        "Limbo (E3M7) Blue",
-        "Limbo (E3M7) Pink"]},
+        {"target":"Limbo (E3M7) Red","pro":False},
+        {"target":"Limbo (E3M7) Blue","pro":False},
+        {"target":"Limbo (E3M7) Pink","pro":False}]},
     {"name":"Limbo (E3M7) Blue",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Limbo (E3M7) Main"]},
+     "connections":[{"target":"Limbo (E3M7) Main","pro":False}]},
     {"name":"Limbo (E3M7) Red",
      "connects_to_hub":False,
      "episode":3,
      "connections":[
-        "Limbo (E3M7) Main",
-        "Limbo (E3M7) Yellow",
-        "Limbo (E3M7) Green"]},
+        {"target":"Limbo (E3M7) Main","pro":False},
+        {"target":"Limbo (E3M7) Yellow","pro":False},
+        {"target":"Limbo (E3M7) Green","pro":False}]},
     {"name":"Limbo (E3M7) Yellow",
      "connects_to_hub":False,
      "episode":3,
-     "connections":["Limbo (E3M7) Red"]},
+     "connections":[{"target":"Limbo (E3M7) Red","pro":False}]},
     {"name":"Limbo (E3M7) Pink",
      "connects_to_hub":False,
      "episode":3,
      "connections":[
-        "Limbo (E3M7) Green",
-        "Limbo (E3M7) Main"]},
+        {"target":"Limbo (E3M7) Green","pro":False},
+        {"target":"Limbo (E3M7) Main","pro":False}]},
     {"name":"Limbo (E3M7) Green",
      "connects_to_hub":False,
      "episode":3,
      "connections":[
-        "Limbo (E3M7) Pink",
-        "Limbo (E3M7) Red"]},
+        {"target":"Limbo (E3M7) Pink","pro":False},
+        {"target":"Limbo (E3M7) Red","pro":False}]},
 
     # Dis (E3M8)
     {"name":"Dis (E3M8) Main",
@@ -435,8 +463,8 @@ regions:List[RegionDict] = [
      "connects_to_hub":True,
      "episode":3,
      "connections":[
-        "Warrens (E3M9) Blue",
-        "Warrens (E3M9) Blue trigger"]},
+        {"target":"Warrens (E3M9) Blue","pro":False},
+        {"target":"Warrens (E3M9) Blue trigger","pro":False}]},
     {"name":"Warrens (E3M9) Red",
      "connects_to_hub":False,
      "episode":3,
@@ -445,8 +473,8 @@ regions:List[RegionDict] = [
      "connects_to_hub":False,
      "episode":3,
      "connections":[
-        "Warrens (E3M9) Main",
-        "Warrens (E3M9) Red"]},
+        {"target":"Warrens (E3M9) Main","pro":False},
+        {"target":"Warrens (E3M9) Red","pro":False}]},
     {"name":"Warrens (E3M9) Blue trigger",
      "connects_to_hub":False,
      "episode":3,
@@ -457,36 +485,36 @@ regions:List[RegionDict] = [
      "connects_to_hub":True,
      "episode":4,
      "connections":[
-        "Hell Beneath (E4M1) Red",
-        "Hell Beneath (E4M1) Blue"]},
+        {"target":"Hell Beneath (E4M1) Red","pro":False},
+        {"target":"Hell Beneath (E4M1) Blue","pro":False}]},
     {"name":"Hell Beneath (E4M1) Red",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Hell Beneath (E4M1) Main"]},
+     "connections":[{"target":"Hell Beneath (E4M1) Main","pro":False}]},
     {"name":"Hell Beneath (E4M1) Blue",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Hell Beneath (E4M1) Main"]},
+     "connections":[{"target":"Hell Beneath (E4M1) Main","pro":False}]},
 
     # Perfect Hatred (E4M2)
     {"name":"Perfect Hatred (E4M2) Main",
      "connects_to_hub":True,
      "episode":4,
      "connections":[
-        "Perfect Hatred (E4M2) Blue",
-        "Perfect Hatred (E4M2) Yellow"]},
+        {"target":"Perfect Hatred (E4M2) Blue","pro":False},
+        {"target":"Perfect Hatred (E4M2) Yellow","pro":False}]},
     {"name":"Perfect Hatred (E4M2) Blue",
      "connects_to_hub":False,
      "episode":4,
      "connections":[
-        "Perfect Hatred (E4M2) Main",
-        "Perfect Hatred (E4M2) Cave"]},
+        {"target":"Perfect Hatred (E4M2) Main","pro":False},
+        {"target":"Perfect Hatred (E4M2) Cave","pro":False}]},
     {"name":"Perfect Hatred (E4M2) Yellow",
      "connects_to_hub":False,
      "episode":4,
      "connections":[
-        "Perfect Hatred (E4M2) Main",
-        "Perfect Hatred (E4M2) Cave"]},
+        {"target":"Perfect Hatred (E4M2) Main","pro":False},
+        {"target":"Perfect Hatred (E4M2) Cave","pro":False}]},
     {"name":"Perfect Hatred (E4M2) Cave",
      "connects_to_hub":False,
      "episode":4,
@@ -496,132 +524,135 @@ regions:List[RegionDict] = [
     {"name":"Sever the Wicked (E4M3) Main",
      "connects_to_hub":True,
      "episode":4,
-     "connections":["Sever the Wicked (E4M3) Red"]},
+     "connections":[{"target":"Sever the Wicked (E4M3) Red","pro":False}]},
     {"name":"Sever the Wicked (E4M3) Red",
      "connects_to_hub":False,
      "episode":4,
      "connections":[
-        "Sever the Wicked (E4M3) Blue",
-        "Sever the Wicked (E4M3) Main"]},
+        {"target":"Sever the Wicked (E4M3) Blue","pro":False},
+        {"target":"Sever the Wicked (E4M3) Main","pro":False}]},
     {"name":"Sever the Wicked (E4M3) Blue",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Sever the Wicked (E4M3) Red"]},
+     "connections":[{"target":"Sever the Wicked (E4M3) Red","pro":False}]},
 
     # Unruly Evil (E4M4)
     {"name":"Unruly Evil (E4M4) Main",
      "connects_to_hub":True,
      "episode":4,
-     "connections":["Unruly Evil (E4M4) Red"]},
+     "connections":[{"target":"Unruly Evil (E4M4) Red","pro":False}]},
     {"name":"Unruly Evil (E4M4) Red",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Unruly Evil (E4M4) Main"]},
+     "connections":[{"target":"Unruly Evil (E4M4) Main","pro":False}]},
 
     # They Will Repent (E4M5)
     {"name":"They Will Repent (E4M5) Main",
      "connects_to_hub":True,
      "episode":4,
-     "connections":["They Will Repent (E4M5) Red"]},
+     "connections":[{"target":"They Will Repent (E4M5) Red","pro":False}]},
     {"name":"They Will Repent (E4M5) Yellow",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["They Will Repent (E4M5) Red"]},
+     "connections":[{"target":"They Will Repent (E4M5) Red","pro":False}]},
     {"name":"They Will Repent (E4M5) Blue",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["They Will Repent (E4M5) Red"]},
+     "connections":[{"target":"They Will Repent (E4M5) Red","pro":False}]},
     {"name":"They Will Repent (E4M5) Red",
      "connects_to_hub":False,
      "episode":4,
      "connections":[
-        "They Will Repent (E4M5) Main",
-        "They Will Repent (E4M5) Yellow",
-        "They Will Repent (E4M5) Blue"]},
+        {"target":"They Will Repent (E4M5) Main","pro":False},
+        {"target":"They Will Repent (E4M5) Yellow","pro":False},
+        {"target":"They Will Repent (E4M5) Blue","pro":False}]},
 
     # Against Thee Wickedly (E4M6)
     {"name":"Against Thee Wickedly (E4M6) Main",
      "connects_to_hub":True,
      "episode":4,
-     "connections":["Against Thee Wickedly (E4M6) Blue"]},
+     "connections":[
+        {"target":"Against Thee Wickedly (E4M6) Blue","pro":False},
+        {"target":"Against Thee Wickedly (E4M6) Pink","pro":True}]},
     {"name":"Against Thee Wickedly (E4M6) Red",
      "connects_to_hub":False,
      "episode":4,
      "connections":[
-        "Against Thee Wickedly (E4M6) Blue",
-        "Against Thee Wickedly (E4M6) Pink",
-        "Against Thee Wickedly (E4M6) Main"]},
+        {"target":"Against Thee Wickedly (E4M6) Blue","pro":False},
+        {"target":"Against Thee Wickedly (E4M6) Pink","pro":False},
+        {"target":"Against Thee Wickedly (E4M6) Main","pro":False},
+        {"target":"Against Thee Wickedly (E4M6) Magenta","pro":True}]},
     {"name":"Against Thee Wickedly (E4M6) Blue",
      "connects_to_hub":False,
      "episode":4,
      "connections":[
-        "Against Thee Wickedly (E4M6) Main",
-        "Against Thee Wickedly (E4M6) Yellow",
-        "Against Thee Wickedly (E4M6) Red"]},
+        {"target":"Against Thee Wickedly (E4M6) Main","pro":False},
+        {"target":"Against Thee Wickedly (E4M6) Yellow","pro":False},
+        {"target":"Against Thee Wickedly (E4M6) Red","pro":False}]},
     {"name":"Against Thee Wickedly (E4M6) Magenta",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Against Thee Wickedly (E4M6) Main"]},
+     "connections":[{"target":"Against Thee Wickedly (E4M6) Main","pro":False}]},
     {"name":"Against Thee Wickedly (E4M6) Yellow",
      "connects_to_hub":False,
      "episode":4,
      "connections":[
-        "Against Thee Wickedly (E4M6) Blue",
-        "Against Thee Wickedly (E4M6) Magenta"]},
+        {"target":"Against Thee Wickedly (E4M6) Blue","pro":False},
+        {"target":"Against Thee Wickedly (E4M6) Magenta","pro":False}]},
     {"name":"Against Thee Wickedly (E4M6) Pink",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Against Thee Wickedly (E4M6) Main"]},
+     "connections":[{"target":"Against Thee Wickedly (E4M6) Main","pro":False}]},
 
     # And Hell Followed (E4M7)
     {"name":"And Hell Followed (E4M7) Main",
      "connects_to_hub":True,
      "episode":4,
      "connections":[
-        "And Hell Followed (E4M7) Blue",
-        "And Hell Followed (E4M7) Red",
-        "And Hell Followed (E4M7) Yellow"]},
+        {"target":"And Hell Followed (E4M7) Blue","pro":False},
+        {"target":"And Hell Followed (E4M7) Red","pro":False},
+        {"target":"And Hell Followed (E4M7) Yellow","pro":False}]},
     {"name":"And Hell Followed (E4M7) Red",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["And Hell Followed (E4M7) Main"]},
+     "connections":[{"target":"And Hell Followed (E4M7) Main","pro":False}]},
     {"name":"And Hell Followed (E4M7) Blue",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["And Hell Followed (E4M7) Main"]},
+     "connections":[{"target":"And Hell Followed (E4M7) Main","pro":False}]},
     {"name":"And Hell Followed (E4M7) Yellow",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["And Hell Followed (E4M7) Main"]},
+     "connections":[{"target":"And Hell Followed (E4M7) Main","pro":False}]},
 
     # Unto the Cruel (E4M8)
     {"name":"Unto the Cruel (E4M8) Main",
      "connects_to_hub":True,
      "episode":4,
      "connections":[
-        "Unto the Cruel (E4M8) Red",
-        "Unto the Cruel (E4M8) Yellow",
-        "Unto the Cruel (E4M8) Orange"]},
+        {"target":"Unto the Cruel (E4M8) Red","pro":False},
+        {"target":"Unto the Cruel (E4M8) Yellow","pro":False},
+        {"target":"Unto the Cruel (E4M8) Orange","pro":False}]},
     {"name":"Unto the Cruel (E4M8) Yellow",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Unto the Cruel (E4M8) Main"]},
+     "connections":[{"target":"Unto the Cruel (E4M8) Main","pro":False}]},
     {"name":"Unto the Cruel (E4M8) Red",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Unto the Cruel (E4M8) Main"]},
+     "connections":[{"target":"Unto the Cruel (E4M8) Main","pro":False}]},
     {"name":"Unto the Cruel (E4M8) Orange",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Unto the Cruel (E4M8) Main"]},
+     "connections":[{"target":"Unto the Cruel (E4M8) Main","pro":False}]},
 
     # Fear (E4M9)
     {"name":"Fear (E4M9) Main",
      "connects_to_hub":True,
      "episode":4,
-     "connections":["Fear (E4M9) Yellow"]},
+     "connections":[{"target":"Fear (E4M9) Yellow","pro":False}]},
     {"name":"Fear (E4M9) Yellow",
      "connects_to_hub":False,
      "episode":4,
-     "connections":["Fear (E4M9) Main"]},
+     "connections":[{"target":"Fear (E4M9) Main","pro":False}]},
 ]
diff --git a/worlds/doom_1993/Rules.py b/worlds/doom_1993/Rules.py
index 6e13a8af34..d5abc367a1 100644
--- a/worlds/doom_1993/Rules.py
+++ b/worlds/doom_1993/Rules.py
@@ -7,7 +7,7 @@ if TYPE_CHECKING:
     from . import DOOM1993World
 
 
-def set_episode1_rules(player, world):
+def set_episode1_rules(player, world, pro):
     # Hangar (E1M1)
     set_rule(world.get_entrance("Hub -> Hangar (E1M1) Main", player), lambda state:
         state.has("Hangar (E1M1)", player, 1))
@@ -130,7 +130,7 @@ def set_episode1_rules(player, world):
         state.has("Military Base (E1M9) - Yellow keycard", player, 1))
 
 
-def set_episode2_rules(player, world):
+def set_episode2_rules(player, world, pro):
     # Deimos Anomaly (E2M1)
     set_rule(world.get_entrance("Hub -> Deimos Anomaly (E2M1) Main", player), lambda state:
         state.has("Deimos Anomaly (E2M1)", player, 1))
@@ -226,6 +226,9 @@ def set_episode2_rules(player, world):
         state.has("Spawning Vats (E2M7) - Red keycard", player, 1))
     set_rule(world.get_entrance("Spawning Vats (E2M7) Main -> Spawning Vats (E2M7) Yellow", player), lambda state:
         state.has("Spawning Vats (E2M7) - Yellow keycard", player, 1))
+    if pro:
+        set_rule(world.get_entrance("Spawning Vats (E2M7) Main -> Spawning Vats (E2M7) Red Exit", player), lambda state:
+            state.has("Rocket launcher", player, 1))
     set_rule(world.get_entrance("Spawning Vats (E2M7) Yellow -> Spawning Vats (E2M7) Main", player), lambda state:
         state.has("Spawning Vats (E2M7) - Yellow keycard", player, 1))
     set_rule(world.get_entrance("Spawning Vats (E2M7) Red -> Spawning Vats (E2M7) Main", player), lambda state:
@@ -260,7 +263,7 @@ def set_episode2_rules(player, world):
         state.has("Fortress of Mystery (E2M9) - Yellow skull key", player, 1))
 
 
-def set_episode3_rules(player, world):
+def set_episode3_rules(player, world, pro):
     # Hell Keep (E3M1)
     set_rule(world.get_entrance("Hub -> Hell Keep (E3M1) Main", player), lambda state:
         state.has("Hell Keep (E3M1)", player, 1))
@@ -385,7 +388,7 @@ def set_episode3_rules(player, world):
         state.has("Warrens (E3M9) - Red skull key", player, 1))
 
 
-def set_episode4_rules(player, world):
+def set_episode4_rules(player, world, pro):
     # Hell Beneath (E4M1)
     set_rule(world.get_entrance("Hub -> Hell Beneath (E4M1) Main", player), lambda state:
         state.has("Hell Beneath (E4M1)", player, 1))
@@ -520,15 +523,15 @@ def set_episode4_rules(player, world):
         state.has("Fear (E4M9) - Yellow skull key", player, 1))
 
 
-def set_rules(doom_1993_world: "DOOM1993World", included_episodes):
+def set_rules(doom_1993_world: "DOOM1993World", included_episodes, pro):
     player = doom_1993_world.player
     world = doom_1993_world.multiworld
 
     if included_episodes[0]:
-        set_episode1_rules(player, world)
+        set_episode1_rules(player, world, pro)
     if included_episodes[1]:
-        set_episode2_rules(player, world)
+        set_episode2_rules(player, world, pro)
     if included_episodes[2]:
-        set_episode3_rules(player, world)
+        set_episode3_rules(player, world, pro)
     if included_episodes[3]:
-        set_episode4_rules(player, world)
+        set_episode4_rules(player, world, pro)
diff --git a/worlds/doom_1993/__init__.py b/worlds/doom_1993/__init__.py
index 83a8652af1..e420b34b4f 100644
--- a/worlds/doom_1993/__init__.py
+++ b/worlds/doom_1993/__init__.py
@@ -56,6 +56,13 @@ class DOOM1993World(World):
         "Hell Beneath (E4M1)"
     ]
 
+    boss_level_for_espidoes: List[str] = [
+        "Phobos Anomaly (E1M8)",
+        "Tower of Babel (E2M8)",
+        "Dis (E3M8)",
+        "Unto the Cruel (E4M8)"
+    ]
+
     # Item ratio that scales depending on episode count. These are the ratio for 3 episode.
     items_ratio: Dict[str, float] = {
         "Armor": 41,
@@ -90,6 +97,8 @@ class DOOM1993World(World):
             self.included_episodes[0] = 1
 
     def create_regions(self):
+        pro = getattr(self.multiworld, "pro")[self.player].value
+
         # Main regions
         menu_region = Region("Menu", self.player, self.multiworld)
         hub_region = Region("Hub", self.player, self.multiworld)
@@ -116,8 +125,11 @@ class DOOM1993World(World):
 
             self.multiworld.regions.append(region)
 
-            for connection in region_dict["connections"]:
-                connections.append((region, connection))
+            for connection_dict in region_dict["connections"]:
+                # Check if it's a pro-only connection
+                if connection_dict["pro"] and not pro:
+                    continue
+                connections.append((region, connection_dict["target"]))
         
         # Connect main regions to Hub
         hub_region.add_exits(main_regions)
@@ -135,7 +147,11 @@ class DOOM1993World(World):
         self.location_count = len(self.multiworld.get_locations(self.player))
 
     def completion_rule(self, state: CollectionState):
-        for map_name in Maps.map_names:
+        goal_levels = Maps.map_names
+        if getattr(self.multiworld, "goal")[self.player].value:
+            goal_levels = self.boss_level_for_espidoes
+
+        for map_name in goal_levels:
             if map_name + " - Exit" not in self.location_name_to_id:
                 continue
             
@@ -151,12 +167,15 @@ class DOOM1993World(World):
         return True
 
     def set_rules(self):
-        Rules.set_rules(self, self.included_episodes)
+        pro = getattr(self.multiworld, "pro")[self.player].value
+        allow_death_logic = getattr(self.multiworld, "allow_death_logic")[self.player].value
+
+        Rules.set_rules(self, self.included_episodes, pro)
         self.multiworld.completion_condition[self.player] = lambda state: self.completion_rule(state)
 
         # Forbid progression items to locations that can be missed and can't be picked up. (e.g. One-time timed
         # platform) Unless the user allows for it.
-        if not getattr(self.multiworld, "allow_death_logic")[self.player].value:
+        if not allow_death_logic:
             for death_logic_location in Locations.death_logic_locations:
                 self.multiworld.exclude_locations[self.player].value.add(death_logic_location)
     
@@ -165,7 +184,6 @@ class DOOM1993World(World):
         return DOOM1993Item(name, Items.item_table[item_id]["classification"], item_id, self.player)
 
     def create_items(self):
-        is_only_first_episode: bool = self.get_episode_count() == 1 and self.included_episodes[0]
         itempool: List[DOOM1993Item] = []
         start_with_computer_area_maps: bool = getattr(self.multiworld, "start_with_computer_area_maps")[self.player].value
 
@@ -180,9 +198,6 @@ class DOOM1993World(World):
             if item["episode"] != -1 and not self.included_episodes[item["episode"] - 1]:
                 continue
 
-            if item["name"] in {"BFG9000", "Plasma Gun"} and is_only_first_episode:
-                continue  # Don't include those guns if only first episode
-
             count = item["count"] if item["name"] not in self.starting_level_for_episode else item["count"] - 1
             itempool += [self.create_item(item["name"]) for _ in range(count)]
 
@@ -212,8 +227,10 @@ class DOOM1993World(World):
         # Give Computer area maps if option selected
         if getattr(self.multiworld, "start_with_computer_area_maps")[self.player].value:
             for item_id, item_dict in Items.item_table.items():
-                if item_dict["doom_type"] == DOOM_TYPE_COMPUTER_AREA_MAP:
-                    self.multiworld.push_precollected(self.create_item(item_dict["name"]))
+                item_episode = item_dict["episode"]
+                if item_episode > 0:
+                    if item_dict["doom_type"] == DOOM_TYPE_COMPUTER_AREA_MAP and self.included_episodes[item_episode - 1]:
+                        self.multiworld.push_precollected(self.create_item(item_dict["name"]))
 
         # Fill the rest starting with powerups, then fillers
         self.create_ratioed_items("Armor", itempool)
diff --git a/worlds/doom_1993/docs/setup_en.md b/worlds/doom_1993/docs/setup_en.md
index cfd97f623a..1e546d359c 100644
--- a/worlds/doom_1993/docs/setup_en.md
+++ b/worlds/doom_1993/docs/setup_en.md
@@ -8,6 +8,8 @@
 ## Optional Software
 
 - [ArchipelagoTextClient](https://github.com/ArchipelagoMW/Archipelago/releases)
+- [PopTracker](https://github.com/black-sliver/PopTracker/)
+  - [OZone's APDoom tracker pack](https://github.com/Ozone31/doom-ap-tracker/releases)
 
 ## Installing AP Doom
 1. Download [APDOOM.zip](https://github.com/Daivuk/apdoom/releases) and extract it.
@@ -17,10 +19,11 @@
 
 ## Joining a MultiWorld Game
 
-1. Launch APDoomLauncher.exe
-2. Enter the Archipelago server address, slot name, and password (if you have one)
-3. Press "Launch DOOM"
-4. Enjoy!
+1. Launch apdoom-launcher.exe
+2. Select `Ultimate DOOM` from the drop-down
+3. Enter the Archipelago server address, slot name, and password (if you have one)
+4. Press "Launch DOOM"
+5. Enjoy!
 
 To continue a game, follow the same connection steps.
 Connecting with a different seed won't erase your progress in other seeds.
@@ -31,8 +34,23 @@ We recommend having Archipelago's Text Client open on the side to keep track of
 APDOOM has in-game messages,
 but they disappear quickly and there's no reasonable way to check your message history in-game.
 
+### Hinting
+
+To hint from in-game, use the chat (Default key: 'T'). Hinting from DOOM can be difficult because names are rather long and contain special characters. For example:
+```
+!hint Toxin Refinery (E1M3) - Computer area map
+```
+The game has a hint helper implemented, where you can simply type this:
+```
+!hint e1m3 map
+```
+For this to work, include the map short name (`E1M1`), followed by one of the keywords: `map`, `blue`, `yellow`, `red`.
+
 ## Auto-Tracking
 
 APDOOM has a functional map tracker integrated into the level select screen.
 It tells you which levels you have unlocked, which keys you have for each level, which levels have been completed,
 and how many of the checks you have completed in each level.
+
+For better tracking, try OZone's poptracker package: https://github.com/Ozone31/doom-ap-tracker/releases .
+Requires [PopTracker](https://github.com/black-sliver/PopTracker/).
diff --git a/worlds/doom_ii/Items.py b/worlds/doom_ii/Items.py
new file mode 100644
index 0000000000..fc426cc883
--- /dev/null
+++ b/worlds/doom_ii/Items.py
@@ -0,0 +1,1071 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from BaseClasses import ItemClassification
+from typing import TypedDict, Dict, Set 
+
+
+class ItemDict(TypedDict, total=False): 
+    classification: ItemClassification 
+    count: int 
+    name: str 
+    doom_type: int # Unique numerical id used to spawn the item. -1 is level item, -2 is level complete item. 
+    episode: int # Relevant if that item targets a specific level, like keycard or map reveal pickup. 
+    map: int 
+
+
+item_table: Dict[int, ItemDict] = {
+    360000: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Shotgun',
+             'doom_type': 2001,
+             'episode': -1,
+             'map': -1},
+    360001: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Rocket launcher',
+             'doom_type': 2003,
+             'episode': -1,
+             'map': -1},
+    360002: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Plasma gun',
+             'doom_type': 2004,
+             'episode': -1,
+             'map': -1},
+    360003: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Chainsaw',
+             'doom_type': 2005,
+             'episode': -1,
+             'map': -1},
+    360004: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Chaingun',
+             'doom_type': 2002,
+             'episode': -1,
+             'map': -1},
+    360005: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'BFG9000',
+             'doom_type': 2006,
+             'episode': -1,
+             'map': -1},
+    360006: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Super Shotgun',
+             'doom_type': 82,
+             'episode': -1,
+             'map': -1},
+    360007: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Backpack',
+             'doom_type': 8,
+             'episode': -1,
+             'map': -1},
+    360008: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Armor',
+             'doom_type': 2018,
+             'episode': -1,
+             'map': -1},
+    360009: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Mega Armor',
+             'doom_type': 2019,
+             'episode': -1,
+             'map': -1},
+    360010: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Berserk',
+             'doom_type': 2023,
+             'episode': -1,
+             'map': -1},
+    360011: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Invulnerability',
+             'doom_type': 2022,
+             'episode': -1,
+             'map': -1},
+    360012: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Partial invisibility',
+             'doom_type': 2024,
+             'episode': -1,
+             'map': -1},
+    360013: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Supercharge',
+             'doom_type': 2013,
+             'episode': -1,
+             'map': -1},
+    360014: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Megasphere',
+             'doom_type': 83,
+             'episode': -1,
+             'map': -1},
+    360015: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Medikit',
+             'doom_type': 2012,
+             'episode': -1,
+             'map': -1},
+    360016: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Box of bullets',
+             'doom_type': 2048,
+             'episode': -1,
+             'map': -1},
+    360017: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Box of rockets',
+             'doom_type': 2046,
+             'episode': -1,
+             'map': -1},
+    360018: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Box of shotgun shells',
+             'doom_type': 2049,
+             'episode': -1,
+             'map': -1},
+    360019: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Energy cell pack',
+             'doom_type': 17,
+             'episode': -1,
+             'map': -1},
+    360200: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Underhalls (MAP02) - Red keycard',
+             'doom_type': 13,
+             'episode': 1,
+             'map': 2},
+    360201: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Underhalls (MAP02) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 2},
+    360202: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gantlet (MAP03) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 3},
+    360203: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gantlet (MAP03) - Red keycard',
+             'doom_type': 13,
+             'episode': 1,
+             'map': 3},
+    360204: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Focus (MAP04) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 4},
+    360205: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Focus (MAP04) - Red keycard',
+             'doom_type': 13,
+             'episode': 1,
+             'map': 4},
+    360206: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Focus (MAP04) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 1,
+             'map': 4},
+    360207: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Waste Tunnels (MAP05) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 5},
+    360208: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Waste Tunnels (MAP05) - Red keycard',
+             'doom_type': 13,
+             'episode': 1,
+             'map': 5},
+    360209: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Waste Tunnels (MAP05) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 1,
+             'map': 5},
+    360210: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crusher (MAP06) - Red keycard',
+             'doom_type': 13,
+             'episode': 1,
+             'map': 6},
+    360211: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crusher (MAP06) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 1,
+             'map': 6},
+    360212: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crusher (MAP06) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 6},
+    360213: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tricks and Traps (MAP08) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 1,
+             'map': 8},
+    360214: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tricks and Traps (MAP08) - Red skull key',
+             'doom_type': 38,
+             'episode': 1,
+             'map': 8},
+    360215: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Pit (MAP09) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 9},
+    360216: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Pit (MAP09) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 1,
+             'map': 9},
+    360217: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Refueling Base (MAP10) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 10},
+    360218: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Refueling Base (MAP10) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 1,
+             'map': 10},
+    360219: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Circle of Death (MAP11) - Red keycard',
+             'doom_type': 13,
+             'episode': 1,
+             'map': 11},
+    360220: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Circle of Death (MAP11) - Blue keycard',
+             'doom_type': 5,
+             'episode': 1,
+             'map': 11},
+    360221: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Factory (MAP12) - Blue keycard',
+             'doom_type': 5,
+             'episode': 2,
+             'map': 1},
+    360222: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Factory (MAP12) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 2,
+             'map': 1},
+    360223: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Downtown (MAP13) - Blue keycard',
+             'doom_type': 5,
+             'episode': 2,
+             'map': 2},
+    360224: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Downtown (MAP13) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 2,
+             'map': 2},
+    360225: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Downtown (MAP13) - Red keycard',
+             'doom_type': 13,
+             'episode': 2,
+             'map': 2},
+    360226: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Inmost Dens (MAP14) - Red skull key',
+             'doom_type': 38,
+             'episode': 2,
+             'map': 3},
+    360227: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Inmost Dens (MAP14) - Blue skull key',
+             'doom_type': 40,
+             'episode': 2,
+             'map': 3},
+    360228: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Industrial Zone (MAP15) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 2,
+             'map': 4},
+    360229: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Industrial Zone (MAP15) - Red keycard',
+             'doom_type': 13,
+             'episode': 2,
+             'map': 4},
+    360230: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Industrial Zone (MAP15) - Blue keycard',
+             'doom_type': 5,
+             'episode': 2,
+             'map': 4},
+    360231: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Suburbs (MAP16) - Blue skull key',
+             'doom_type': 40,
+             'episode': 2,
+             'map': 5},
+    360232: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Suburbs (MAP16) - Red skull key',
+             'doom_type': 38,
+             'episode': 2,
+             'map': 5},
+    360233: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tenements (MAP17) - Red keycard',
+             'doom_type': 13,
+             'episode': 2,
+             'map': 6},
+    360234: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tenements (MAP17) - Blue keycard',
+             'doom_type': 5,
+             'episode': 2,
+             'map': 6},
+    360235: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tenements (MAP17) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 2,
+             'map': 6},
+    360236: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Courtyard (MAP18) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 2,
+             'map': 7},
+    360237: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Courtyard (MAP18) - Blue skull key',
+             'doom_type': 40,
+             'episode': 2,
+             'map': 7},
+    360238: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (MAP19) - Blue skull key',
+             'doom_type': 40,
+             'episode': 2,
+             'map': 8},
+    360239: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (MAP19) - Red skull key',
+             'doom_type': 38,
+             'episode': 2,
+             'map': 8},
+    360240: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (MAP19) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 2,
+             'map': 8},
+    360241: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Nirvana (MAP21) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 3,
+             'map': 1},
+    360242: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Nirvana (MAP21) - Blue skull key',
+             'doom_type': 40,
+             'episode': 3,
+             'map': 1},
+    360243: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Nirvana (MAP21) - Red skull key',
+             'doom_type': 38,
+             'episode': 3,
+             'map': 1},
+    360244: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (MAP22) - Blue skull key',
+             'doom_type': 40,
+             'episode': 3,
+             'map': 2},
+    360245: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (MAP22) - Red skull key',
+             'doom_type': 38,
+             'episode': 3,
+             'map': 2},
+    360246: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Barrels o Fun (MAP23) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 3,
+             'map': 3},
+    360247: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (MAP24) - Blue keycard',
+             'doom_type': 5,
+             'episode': 3,
+             'map': 4},
+    360248: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (MAP24) - Red keycard',
+             'doom_type': 13,
+             'episode': 3,
+             'map': 4},
+    360249: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Bloodfalls (MAP25) - Blue skull key',
+             'doom_type': 40,
+             'episode': 3,
+             'map': 5},
+    360250: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Abandoned Mines (MAP26) - Blue keycard',
+             'doom_type': 5,
+             'episode': 3,
+             'map': 6},
+    360251: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Abandoned Mines (MAP26) - Red keycard',
+             'doom_type': 13,
+             'episode': 3,
+             'map': 6},
+    360252: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Abandoned Mines (MAP26) - Yellow keycard',
+             'doom_type': 6,
+             'episode': 3,
+             'map': 6},
+    360253: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Monster Condo (MAP27) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 3,
+             'map': 7},
+    360254: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Monster Condo (MAP27) - Red skull key',
+             'doom_type': 38,
+             'episode': 3,
+             'map': 7},
+    360255: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Monster Condo (MAP27) - Blue skull key',
+             'doom_type': 40,
+             'episode': 3,
+             'map': 7},
+    360256: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Spirit World (MAP28) - Yellow skull key',
+             'doom_type': 39,
+             'episode': 3,
+             'map': 8},
+    360257: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Spirit World (MAP28) - Red skull key',
+             'doom_type': 38,
+             'episode': 3,
+             'map': 8},
+    360400: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Entryway (MAP01)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 1},
+    360401: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Entryway (MAP01) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 1},
+    360402: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Entryway (MAP01) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 1},
+    360403: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Underhalls (MAP02)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 2},
+    360404: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Underhalls (MAP02) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 2},
+    360405: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Underhalls (MAP02) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 2},
+    360406: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gantlet (MAP03)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 3},
+    360407: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gantlet (MAP03) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 3},
+    360408: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Gantlet (MAP03) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 3},
+    360409: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Focus (MAP04)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 4},
+    360410: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Focus (MAP04) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 4},
+    360411: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Focus (MAP04) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 4},
+    360412: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Waste Tunnels (MAP05)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 5},
+    360413: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Waste Tunnels (MAP05) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 5},
+    360414: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Waste Tunnels (MAP05) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 5},
+    360415: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crusher (MAP06)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 6},
+    360416: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crusher (MAP06) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 6},
+    360417: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Crusher (MAP06) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 6},
+    360418: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Dead Simple (MAP07)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 7},
+    360419: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Dead Simple (MAP07) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 7},
+    360420: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Dead Simple (MAP07) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 7},
+    360421: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tricks and Traps (MAP08)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 8},
+    360422: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tricks and Traps (MAP08) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 8},
+    360423: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Tricks and Traps (MAP08) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 8},
+    360424: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Pit (MAP09)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 9},
+    360425: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Pit (MAP09) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 9},
+    360426: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Pit (MAP09) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 9},
+    360427: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Refueling Base (MAP10)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 10},
+    360428: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Refueling Base (MAP10) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 10},
+    360429: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Refueling Base (MAP10) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 10},
+    360430: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Circle of Death (MAP11)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 11},
+    360431: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Circle of Death (MAP11) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 11},
+    360432: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Circle of Death (MAP11) - Computer area map',
+             'doom_type': 2026,
+             'episode': 1,
+             'map': 11},
+    360433: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Factory (MAP12)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 1},
+    360434: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Factory (MAP12) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 1},
+    360435: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Factory (MAP12) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 1},
+    360436: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Downtown (MAP13)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 2},
+    360437: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Downtown (MAP13) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 2},
+    360438: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Downtown (MAP13) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 2},
+    360439: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Inmost Dens (MAP14)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 3},
+    360440: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Inmost Dens (MAP14) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 3},
+    360441: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Inmost Dens (MAP14) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 3},
+    360442: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Industrial Zone (MAP15)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 4},
+    360443: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Industrial Zone (MAP15) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 4},
+    360444: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Industrial Zone (MAP15) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 4},
+    360445: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Suburbs (MAP16)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 5},
+    360446: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Suburbs (MAP16) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 5},
+    360447: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Suburbs (MAP16) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 5},
+    360448: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tenements (MAP17)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 6},
+    360449: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Tenements (MAP17) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 6},
+    360450: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Tenements (MAP17) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 6},
+    360451: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Courtyard (MAP18)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 7},
+    360452: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Courtyard (MAP18) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 7},
+    360453: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Courtyard (MAP18) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 7},
+    360454: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (MAP19)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 8},
+    360455: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (MAP19) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 8},
+    360456: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Citadel (MAP19) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 8},
+    360457: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Gotcha! (MAP20)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 9},
+    360458: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Gotcha! (MAP20) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 9},
+    360459: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Gotcha! (MAP20) - Computer area map',
+             'doom_type': 2026,
+             'episode': 2,
+             'map': 9},
+    360460: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Nirvana (MAP21)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 1},
+    360461: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Nirvana (MAP21) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 1},
+    360462: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Nirvana (MAP21) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 1},
+    360463: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (MAP22)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 2},
+    360464: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (MAP22) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 2},
+    360465: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Catacombs (MAP22) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 2},
+    360466: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Barrels o Fun (MAP23)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 3},
+    360467: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Barrels o Fun (MAP23) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 3},
+    360468: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Barrels o Fun (MAP23) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 3},
+    360469: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (MAP24)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 4},
+    360470: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (MAP24) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 4},
+    360471: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Chasm (MAP24) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 4},
+    360472: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Bloodfalls (MAP25)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 5},
+    360473: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Bloodfalls (MAP25) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 5},
+    360474: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Bloodfalls (MAP25) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 5},
+    360475: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Abandoned Mines (MAP26)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 6},
+    360476: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Abandoned Mines (MAP26) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 6},
+    360477: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Abandoned Mines (MAP26) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 6},
+    360478: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Monster Condo (MAP27)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 7},
+    360479: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Monster Condo (MAP27) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 7},
+    360480: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Monster Condo (MAP27) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 7},
+    360481: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Spirit World (MAP28)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 8},
+    360482: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Spirit World (MAP28) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 8},
+    360483: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Spirit World (MAP28) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 8},
+    360484: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Living End (MAP29)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 9},
+    360485: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Living End (MAP29) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 9},
+    360486: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Living End (MAP29) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 9},
+    360487: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Icon of Sin (MAP30)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 10},
+    360488: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Icon of Sin (MAP30) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 10},
+    360489: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Icon of Sin (MAP30) - Computer area map',
+             'doom_type': 2026,
+             'episode': 3,
+             'map': 10},
+    360490: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Wolfenstein2 (MAP31)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 1},
+    360491: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Wolfenstein2 (MAP31) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 1},
+    360492: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Wolfenstein2 (MAP31) - Computer area map',
+             'doom_type': 2026,
+             'episode': 4,
+             'map': 1},
+    360493: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Grosse2 (MAP32)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 2},
+    360494: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Grosse2 (MAP32) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 2},
+    360495: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Grosse2 (MAP32) - Computer area map',
+             'doom_type': 2026,
+             'episode': 4,
+             'map': 2},
+}
+
+
+item_name_groups: Dict[str, Set[str]] = {
+    'Ammos': {'Box of bullets', 'Box of rockets', 'Box of shotgun shells', 'Energy cell pack', },
+    'Computer area maps': {'Barrels o Fun (MAP23) - Computer area map', 'Bloodfalls (MAP25) - Computer area map', 'Circle of Death (MAP11) - Computer area map', 'Dead Simple (MAP07) - Computer area map', 'Downtown (MAP13) - Computer area map', 'Entryway (MAP01) - Computer area map', 'Gotcha! (MAP20) - Computer area map', 'Grosse2 (MAP32) - Computer area map', 'Icon of Sin (MAP30) - Computer area map', 'Industrial Zone (MAP15) - Computer area map', 'Monster Condo (MAP27) - Computer area map', 'Nirvana (MAP21) - Computer area map', 'Refueling Base (MAP10) - Computer area map', 'Suburbs (MAP16) - Computer area map', 'Tenements (MAP17) - Computer area map', 'The Abandoned Mines (MAP26) - Computer area map', 'The Catacombs (MAP22) - Computer area map', 'The Chasm (MAP24) - Computer area map', 'The Citadel (MAP19) - Computer area map', 'The Courtyard (MAP18) - Computer area map', 'The Crusher (MAP06) - Computer area map', 'The Factory (MAP12) - Computer area map', 'The Focus (MAP04) - Computer area map', 'The Gantlet (MAP03) - Computer area map', 'The Inmost Dens (MAP14) - Computer area map', 'The Living End (MAP29) - Computer area map', 'The Pit (MAP09) - Computer area map', 'The Spirit World (MAP28) - Computer area map', 'The Waste Tunnels (MAP05) - Computer area map', 'Tricks and Traps (MAP08) - Computer area map', 'Underhalls (MAP02) - Computer area map', 'Wolfenstein2 (MAP31) - Computer area map', },
+    'Keys': {'Barrels o Fun (MAP23) - Yellow skull key', 'Bloodfalls (MAP25) - Blue skull key', 'Circle of Death (MAP11) - Blue keycard', 'Circle of Death (MAP11) - Red keycard', 'Downtown (MAP13) - Blue keycard', 'Downtown (MAP13) - Red keycard', 'Downtown (MAP13) - Yellow keycard', 'Industrial Zone (MAP15) - Blue keycard', 'Industrial Zone (MAP15) - Red keycard', 'Industrial Zone (MAP15) - Yellow keycard', 'Monster Condo (MAP27) - Blue skull key', 'Monster Condo (MAP27) - Red skull key', 'Monster Condo (MAP27) - Yellow skull key', 'Nirvana (MAP21) - Blue skull key', 'Nirvana (MAP21) - Red skull key', 'Nirvana (MAP21) - Yellow skull key', 'Refueling Base (MAP10) - Blue keycard', 'Refueling Base (MAP10) - Yellow keycard', 'Suburbs (MAP16) - Blue skull key', 'Suburbs (MAP16) - Red skull key', 'Tenements (MAP17) - Blue keycard', 'Tenements (MAP17) - Red keycard', 'Tenements (MAP17) - Yellow skull key', 'The Abandoned Mines (MAP26) - Blue keycard', 'The Abandoned Mines (MAP26) - Red keycard', 'The Abandoned Mines (MAP26) - Yellow keycard', 'The Catacombs (MAP22) - Blue skull key', 'The Catacombs (MAP22) - Red skull key', 'The Chasm (MAP24) - Blue keycard', 'The Chasm (MAP24) - Red keycard', 'The Citadel (MAP19) - Blue skull key', 'The Citadel (MAP19) - Red skull key', 'The Citadel (MAP19) - Yellow skull key', 'The Courtyard (MAP18) - Blue skull key', 'The Courtyard (MAP18) - Yellow skull key', 'The Crusher (MAP06) - Blue keycard', 'The Crusher (MAP06) - Red keycard', 'The Crusher (MAP06) - Yellow keycard', 'The Factory (MAP12) - Blue keycard', 'The Factory (MAP12) - Yellow keycard', 'The Focus (MAP04) - Blue keycard', 'The Focus (MAP04) - Red keycard', 'The Focus (MAP04) - Yellow keycard', 'The Gantlet (MAP03) - Blue keycard', 'The Gantlet (MAP03) - Red keycard', 'The Inmost Dens (MAP14) - Blue skull key', 'The Inmost Dens (MAP14) - Red skull key', 'The Pit (MAP09) - Blue keycard', 'The Pit (MAP09) - Yellow keycard', 'The Spirit World (MAP28) - Red skull key', 'The Spirit World (MAP28) - Yellow skull key', 'The Waste Tunnels (MAP05) - Blue keycard', 'The Waste Tunnels (MAP05) - Red keycard', 'The Waste Tunnels (MAP05) - Yellow keycard', 'Tricks and Traps (MAP08) - Red skull key', 'Tricks and Traps (MAP08) - Yellow skull key', 'Underhalls (MAP02) - Blue keycard', 'Underhalls (MAP02) - Red keycard', },
+    'Levels': {'Barrels o Fun (MAP23)', 'Bloodfalls (MAP25)', 'Circle of Death (MAP11)', 'Dead Simple (MAP07)', 'Downtown (MAP13)', 'Entryway (MAP01)', 'Gotcha! (MAP20)', 'Grosse2 (MAP32)', 'Icon of Sin (MAP30)', 'Industrial Zone (MAP15)', 'Monster Condo (MAP27)', 'Nirvana (MAP21)', 'Refueling Base (MAP10)', 'Suburbs (MAP16)', 'Tenements (MAP17)', 'The Abandoned Mines (MAP26)', 'The Catacombs (MAP22)', 'The Chasm (MAP24)', 'The Citadel (MAP19)', 'The Courtyard (MAP18)', 'The Crusher (MAP06)', 'The Factory (MAP12)', 'The Focus (MAP04)', 'The Gantlet (MAP03)', 'The Inmost Dens (MAP14)', 'The Living End (MAP29)', 'The Pit (MAP09)', 'The Spirit World (MAP28)', 'The Waste Tunnels (MAP05)', 'Tricks and Traps (MAP08)', 'Underhalls (MAP02)', 'Wolfenstein2 (MAP31)', },
+    'Powerups': {'Armor', 'Berserk', 'Invulnerability', 'Mega Armor', 'Megasphere', 'Partial invisibility', 'Supercharge', },
+    'Weapons': {'BFG9000', 'Chaingun', 'Chainsaw', 'Plasma gun', 'Rocket launcher', 'Shotgun', 'Super Shotgun', },
+}
diff --git a/worlds/doom_ii/Locations.py b/worlds/doom_ii/Locations.py
new file mode 100644
index 0000000000..3ce87b8a66
--- /dev/null
+++ b/worlds/doom_ii/Locations.py
@@ -0,0 +1,3442 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import Dict, TypedDict, List, Set 
+
+
+class LocationDict(TypedDict, total=False): 
+    name: str 
+    episode: int 
+    map: int 
+    index: int # Thing index as it is stored in the wad file. 
+    doom_type: int # In case index end up unreliable, we can use doom type. Maps have often only one of each important things. 
+    region: str 
+
+
+location_table: Dict[int, LocationDict] = {
+    361000: {'name': 'Entryway (MAP01) - Armor',
+             'episode': 1,
+             'map': 1,
+             'index': 17,
+             'doom_type': 2018,
+             'region': "Entryway (MAP01) Main"},
+    361001: {'name': 'Entryway (MAP01) - Shotgun',
+             'episode': 1,
+             'map': 1,
+             'index': 37,
+             'doom_type': 2001,
+             'region': "Entryway (MAP01) Main"},
+    361002: {'name': 'Entryway (MAP01) - Rocket launcher',
+             'episode': 1,
+             'map': 1,
+             'index': 52,
+             'doom_type': 2003,
+             'region': "Entryway (MAP01) Main"},
+    361003: {'name': 'Entryway (MAP01) - Chainsaw',
+             'episode': 1,
+             'map': 1,
+             'index': 68,
+             'doom_type': 2005,
+             'region': "Entryway (MAP01) Main"},
+    361004: {'name': 'Entryway (MAP01) - Exit',
+             'episode': 1,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Entryway (MAP01) Main"},
+    361005: {'name': 'Underhalls (MAP02) - Red keycard',
+             'episode': 1,
+             'map': 2,
+             'index': 31,
+             'doom_type': 13,
+             'region': "Underhalls (MAP02) Main"},
+    361006: {'name': 'Underhalls (MAP02) - Blue keycard',
+             'episode': 1,
+             'map': 2,
+             'index': 44,
+             'doom_type': 5,
+             'region': "Underhalls (MAP02) Red"},
+    361007: {'name': 'Underhalls (MAP02) - Mega Armor',
+             'episode': 1,
+             'map': 2,
+             'index': 116,
+             'doom_type': 2019,
+             'region': "Underhalls (MAP02) Main"},
+    361008: {'name': 'Underhalls (MAP02) - Super Shotgun',
+             'episode': 1,
+             'map': 2,
+             'index': 127,
+             'doom_type': 82,
+             'region': "Underhalls (MAP02) Main"},
+    361009: {'name': 'Underhalls (MAP02) - Exit',
+             'episode': 1,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Underhalls (MAP02) Blue"},
+    361010: {'name': 'The Gantlet (MAP03) - Mega Armor',
+             'episode': 1,
+             'map': 3,
+             'index': 5,
+             'doom_type': 2019,
+             'region': "The Gantlet (MAP03) Main"},
+    361011: {'name': 'The Gantlet (MAP03) - Shotgun',
+             'episode': 1,
+             'map': 3,
+             'index': 6,
+             'doom_type': 2001,
+             'region': "The Gantlet (MAP03) Main"},
+    361012: {'name': 'The Gantlet (MAP03) - Blue keycard',
+             'episode': 1,
+             'map': 3,
+             'index': 85,
+             'doom_type': 5,
+             'region': "The Gantlet (MAP03) Main"},
+    361013: {'name': 'The Gantlet (MAP03) - Rocket launcher',
+             'episode': 1,
+             'map': 3,
+             'index': 86,
+             'doom_type': 2003,
+             'region': "The Gantlet (MAP03) Main"},
+    361014: {'name': 'The Gantlet (MAP03) - Partial invisibility',
+             'episode': 1,
+             'map': 3,
+             'index': 96,
+             'doom_type': 2024,
+             'region': "The Gantlet (MAP03) Main"},
+    361015: {'name': 'The Gantlet (MAP03) - Supercharge',
+             'episode': 1,
+             'map': 3,
+             'index': 97,
+             'doom_type': 2013,
+             'region': "The Gantlet (MAP03) Main"},
+    361016: {'name': 'The Gantlet (MAP03) - Mega Armor 2',
+             'episode': 1,
+             'map': 3,
+             'index': 98,
+             'doom_type': 2019,
+             'region': "The Gantlet (MAP03) Main"},
+    361017: {'name': 'The Gantlet (MAP03) - Red keycard',
+             'episode': 1,
+             'map': 3,
+             'index': 104,
+             'doom_type': 13,
+             'region': "The Gantlet (MAP03) Blue"},
+    361018: {'name': 'The Gantlet (MAP03) - Chaingun',
+             'episode': 1,
+             'map': 3,
+             'index': 122,
+             'doom_type': 2002,
+             'region': "The Gantlet (MAP03) Main"},
+    361019: {'name': 'The Gantlet (MAP03) - Backpack',
+             'episode': 1,
+             'map': 3,
+             'index': 146,
+             'doom_type': 8,
+             'region': "The Gantlet (MAP03) Blue"},
+    361020: {'name': 'The Gantlet (MAP03) - Exit',
+             'episode': 1,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Gantlet (MAP03) Red"},
+    361021: {'name': 'The Focus (MAP04) - Super Shotgun',
+             'episode': 1,
+             'map': 4,
+             'index': 4,
+             'doom_type': 82,
+             'region': "The Focus (MAP04) Main"},
+    361022: {'name': 'The Focus (MAP04) - Blue keycard',
+             'episode': 1,
+             'map': 4,
+             'index': 21,
+             'doom_type': 5,
+             'region': "The Focus (MAP04) Main"},
+    361023: {'name': 'The Focus (MAP04) - Red keycard',
+             'episode': 1,
+             'map': 4,
+             'index': 32,
+             'doom_type': 13,
+             'region': "The Focus (MAP04) Blue"},
+    361024: {'name': 'The Focus (MAP04) - Yellow keycard',
+             'episode': 1,
+             'map': 4,
+             'index': 59,
+             'doom_type': 6,
+             'region': "The Focus (MAP04) Red"},
+    361025: {'name': 'The Focus (MAP04) - Exit',
+             'episode': 1,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Focus (MAP04) Yellow"},
+    361026: {'name': 'The Waste Tunnels (MAP05) - Rocket launcher',
+             'episode': 1,
+             'map': 5,
+             'index': 45,
+             'doom_type': 2003,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361027: {'name': 'The Waste Tunnels (MAP05) - Super Shotgun',
+             'episode': 1,
+             'map': 5,
+             'index': 46,
+             'doom_type': 82,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361028: {'name': 'The Waste Tunnels (MAP05) - Blue keycard',
+             'episode': 1,
+             'map': 5,
+             'index': 50,
+             'doom_type': 5,
+             'region': "The Waste Tunnels (MAP05) Red"},
+    361029: {'name': 'The Waste Tunnels (MAP05) - Plasma gun',
+             'episode': 1,
+             'map': 5,
+             'index': 53,
+             'doom_type': 2004,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361030: {'name': 'The Waste Tunnels (MAP05) - Red keycard',
+             'episode': 1,
+             'map': 5,
+             'index': 55,
+             'doom_type': 13,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361031: {'name': 'The Waste Tunnels (MAP05) - Supercharge',
+             'episode': 1,
+             'map': 5,
+             'index': 56,
+             'doom_type': 2013,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361032: {'name': 'The Waste Tunnels (MAP05) - Mega Armor',
+             'episode': 1,
+             'map': 5,
+             'index': 57,
+             'doom_type': 2019,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361033: {'name': 'The Waste Tunnels (MAP05) - Yellow keycard',
+             'episode': 1,
+             'map': 5,
+             'index': 78,
+             'doom_type': 6,
+             'region': "The Waste Tunnels (MAP05) Blue"},
+    361034: {'name': 'The Waste Tunnels (MAP05) - Armor',
+             'episode': 1,
+             'map': 5,
+             'index': 151,
+             'doom_type': 2018,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361035: {'name': 'The Waste Tunnels (MAP05) - Supercharge 2',
+             'episode': 1,
+             'map': 5,
+             'index': 170,
+             'doom_type': 2013,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361036: {'name': 'The Waste Tunnels (MAP05) - Shotgun',
+             'episode': 1,
+             'map': 5,
+             'index': 202,
+             'doom_type': 2001,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361037: {'name': 'The Waste Tunnels (MAP05) - Berserk',
+             'episode': 1,
+             'map': 5,
+             'index': 215,
+             'doom_type': 2023,
+             'region': "The Waste Tunnels (MAP05) Main"},
+    361038: {'name': 'The Waste Tunnels (MAP05) - Exit',
+             'episode': 1,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Waste Tunnels (MAP05) Yellow"},
+    361039: {'name': 'The Crusher (MAP06) - Red keycard',
+             'episode': 1,
+             'map': 6,
+             'index': 0,
+             'doom_type': 13,
+             'region': "The Crusher (MAP06) Blue"},
+    361040: {'name': 'The Crusher (MAP06) - Yellow keycard',
+             'episode': 1,
+             'map': 6,
+             'index': 1,
+             'doom_type': 6,
+             'region': "The Crusher (MAP06) Red"},
+    361041: {'name': 'The Crusher (MAP06) - Blue keycard',
+             'episode': 1,
+             'map': 6,
+             'index': 36,
+             'doom_type': 5,
+             'region': "The Crusher (MAP06) Main"},
+    361042: {'name': 'The Crusher (MAP06) - Supercharge',
+             'episode': 1,
+             'map': 6,
+             'index': 55,
+             'doom_type': 2013,
+             'region': "The Crusher (MAP06) Main"},
+    361043: {'name': 'The Crusher (MAP06) - Plasma gun',
+             'episode': 1,
+             'map': 6,
+             'index': 59,
+             'doom_type': 2004,
+             'region': "The Crusher (MAP06) Main"},
+    361044: {'name': 'The Crusher (MAP06) - Blue keycard 2',
+             'episode': 1,
+             'map': 6,
+             'index': 74,
+             'doom_type': 5,
+             'region': "The Crusher (MAP06) Main"},
+    361045: {'name': 'The Crusher (MAP06) - Blue keycard 3',
+             'episode': 1,
+             'map': 6,
+             'index': 75,
+             'doom_type': 5,
+             'region': "The Crusher (MAP06) Main"},
+    361046: {'name': 'The Crusher (MAP06) - Megasphere',
+             'episode': 1,
+             'map': 6,
+             'index': 94,
+             'doom_type': 83,
+             'region': "The Crusher (MAP06) Main"},
+    361047: {'name': 'The Crusher (MAP06) - Armor',
+             'episode': 1,
+             'map': 6,
+             'index': 130,
+             'doom_type': 2018,
+             'region': "The Crusher (MAP06) Main"},
+    361048: {'name': 'The Crusher (MAP06) - Super Shotgun',
+             'episode': 1,
+             'map': 6,
+             'index': 134,
+             'doom_type': 82,
+             'region': "The Crusher (MAP06) Blue"},
+    361049: {'name': 'The Crusher (MAP06) - Mega Armor',
+             'episode': 1,
+             'map': 6,
+             'index': 222,
+             'doom_type': 2019,
+             'region': "The Crusher (MAP06) Blue"},
+    361050: {'name': 'The Crusher (MAP06) - Rocket launcher',
+             'episode': 1,
+             'map': 6,
+             'index': 223,
+             'doom_type': 2003,
+             'region': "The Crusher (MAP06) Blue"},
+    361051: {'name': 'The Crusher (MAP06) - Backpack',
+             'episode': 1,
+             'map': 6,
+             'index': 225,
+             'doom_type': 8,
+             'region': "The Crusher (MAP06) Blue"},
+    361052: {'name': 'The Crusher (MAP06) - Megasphere 2',
+             'episode': 1,
+             'map': 6,
+             'index': 246,
+             'doom_type': 83,
+             'region': "The Crusher (MAP06) Blue"},
+    361053: {'name': 'The Crusher (MAP06) - Exit',
+             'episode': 1,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Crusher (MAP06) Yellow"},
+    361054: {'name': 'Dead Simple (MAP07) - Megasphere',
+             'episode': 1,
+             'map': 7,
+             'index': 4,
+             'doom_type': 83,
+             'region': "Dead Simple (MAP07) Main"},
+    361055: {'name': 'Dead Simple (MAP07) - Rocket launcher',
+             'episode': 1,
+             'map': 7,
+             'index': 5,
+             'doom_type': 2003,
+             'region': "Dead Simple (MAP07) Main"},
+    361056: {'name': 'Dead Simple (MAP07) - Partial invisibility',
+             'episode': 1,
+             'map': 7,
+             'index': 7,
+             'doom_type': 2024,
+             'region': "Dead Simple (MAP07) Main"},
+    361057: {'name': 'Dead Simple (MAP07) - Super Shotgun',
+             'episode': 1,
+             'map': 7,
+             'index': 8,
+             'doom_type': 82,
+             'region': "Dead Simple (MAP07) Main"},
+    361058: {'name': 'Dead Simple (MAP07) - Chaingun',
+             'episode': 1,
+             'map': 7,
+             'index': 9,
+             'doom_type': 2002,
+             'region': "Dead Simple (MAP07) Main"},
+    361059: {'name': 'Dead Simple (MAP07) - Plasma gun',
+             'episode': 1,
+             'map': 7,
+             'index': 10,
+             'doom_type': 2004,
+             'region': "Dead Simple (MAP07) Main"},
+    361060: {'name': 'Dead Simple (MAP07) - Backpack',
+             'episode': 1,
+             'map': 7,
+             'index': 43,
+             'doom_type': 8,
+             'region': "Dead Simple (MAP07) Main"},
+    361061: {'name': 'Dead Simple (MAP07) - Berserk',
+             'episode': 1,
+             'map': 7,
+             'index': 44,
+             'doom_type': 2023,
+             'region': "Dead Simple (MAP07) Main"},
+    361062: {'name': 'Dead Simple (MAP07) - Partial invisibility 2',
+             'episode': 1,
+             'map': 7,
+             'index': 60,
+             'doom_type': 2024,
+             'region': "Dead Simple (MAP07) Main"},
+    361063: {'name': 'Dead Simple (MAP07) - Partial invisibility 3',
+             'episode': 1,
+             'map': 7,
+             'index': 73,
+             'doom_type': 2024,
+             'region': "Dead Simple (MAP07) Main"},
+    361064: {'name': 'Dead Simple (MAP07) - Partial invisibility 4',
+             'episode': 1,
+             'map': 7,
+             'index': 74,
+             'doom_type': 2024,
+             'region': "Dead Simple (MAP07) Main"},
+    361065: {'name': 'Dead Simple (MAP07) - Exit',
+             'episode': 1,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Dead Simple (MAP07) Main"},
+    361066: {'name': 'Tricks and Traps (MAP08) - Plasma gun',
+             'episode': 1,
+             'map': 8,
+             'index': 14,
+             'doom_type': 2004,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361067: {'name': 'Tricks and Traps (MAP08) - Rocket launcher',
+             'episode': 1,
+             'map': 8,
+             'index': 17,
+             'doom_type': 2003,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361068: {'name': 'Tricks and Traps (MAP08) - Armor',
+             'episode': 1,
+             'map': 8,
+             'index': 36,
+             'doom_type': 2018,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361069: {'name': 'Tricks and Traps (MAP08) - Chaingun',
+             'episode': 1,
+             'map': 8,
+             'index': 48,
+             'doom_type': 2002,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361070: {'name': 'Tricks and Traps (MAP08) - Shotgun',
+             'episode': 1,
+             'map': 8,
+             'index': 87,
+             'doom_type': 2001,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361071: {'name': 'Tricks and Traps (MAP08) - Supercharge',
+             'episode': 1,
+             'map': 8,
+             'index': 119,
+             'doom_type': 2013,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361072: {'name': 'Tricks and Traps (MAP08) - Invulnerability',
+             'episode': 1,
+             'map': 8,
+             'index': 120,
+             'doom_type': 2022,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361073: {'name': 'Tricks and Traps (MAP08) - Invulnerability 2',
+             'episode': 1,
+             'map': 8,
+             'index': 122,
+             'doom_type': 2022,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361074: {'name': 'Tricks and Traps (MAP08) - Yellow skull key',
+             'episode': 1,
+             'map': 8,
+             'index': 123,
+             'doom_type': 39,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361075: {'name': 'Tricks and Traps (MAP08) - Backpack',
+             'episode': 1,
+             'map': 8,
+             'index': 133,
+             'doom_type': 8,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361076: {'name': 'Tricks and Traps (MAP08) - Backpack 2',
+             'episode': 1,
+             'map': 8,
+             'index': 134,
+             'doom_type': 8,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361077: {'name': 'Tricks and Traps (MAP08) - Invulnerability 3',
+             'episode': 1,
+             'map': 8,
+             'index': 135,
+             'doom_type': 2022,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361078: {'name': 'Tricks and Traps (MAP08) - Invulnerability 4',
+             'episode': 1,
+             'map': 8,
+             'index': 136,
+             'doom_type': 2022,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361079: {'name': 'Tricks and Traps (MAP08) - BFG9000',
+             'episode': 1,
+             'map': 8,
+             'index': 161,
+             'doom_type': 2006,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361080: {'name': 'Tricks and Traps (MAP08) - Supercharge 2',
+             'episode': 1,
+             'map': 8,
+             'index': 162,
+             'doom_type': 2013,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361081: {'name': 'Tricks and Traps (MAP08) - Backpack 3',
+             'episode': 1,
+             'map': 8,
+             'index': 163,
+             'doom_type': 8,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361082: {'name': 'Tricks and Traps (MAP08) - Backpack 4',
+             'episode': 1,
+             'map': 8,
+             'index': 164,
+             'doom_type': 8,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361083: {'name': 'Tricks and Traps (MAP08) - Chainsaw',
+             'episode': 1,
+             'map': 8,
+             'index': 168,
+             'doom_type': 2005,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361084: {'name': 'Tricks and Traps (MAP08) - Red skull key',
+             'episode': 1,
+             'map': 8,
+             'index': 176,
+             'doom_type': 38,
+             'region': "Tricks and Traps (MAP08) Yellow"},
+    361085: {'name': 'Tricks and Traps (MAP08) - Invulnerability 5',
+             'episode': 1,
+             'map': 8,
+             'index': 202,
+             'doom_type': 2022,
+             'region': "Tricks and Traps (MAP08) Yellow"},
+    361086: {'name': 'Tricks and Traps (MAP08) - Armor 2',
+             'episode': 1,
+             'map': 8,
+             'index': 220,
+             'doom_type': 2018,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361087: {'name': 'Tricks and Traps (MAP08) - Backpack 5',
+             'episode': 1,
+             'map': 8,
+             'index': 226,
+             'doom_type': 8,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361088: {'name': 'Tricks and Traps (MAP08) - Partial invisibility',
+             'episode': 1,
+             'map': 8,
+             'index': 235,
+             'doom_type': 2024,
+             'region': "Tricks and Traps (MAP08) Main"},
+    361089: {'name': 'Tricks and Traps (MAP08) - Exit',
+             'episode': 1,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Tricks and Traps (MAP08) Red"},
+    361090: {'name': 'The Pit (MAP09) - Berserk',
+             'episode': 1,
+             'map': 9,
+             'index': 5,
+             'doom_type': 2023,
+             'region': "The Pit (MAP09) Main"},
+    361091: {'name': 'The Pit (MAP09) - Shotgun',
+             'episode': 1,
+             'map': 9,
+             'index': 21,
+             'doom_type': 2001,
+             'region': "The Pit (MAP09) Main"},
+    361092: {'name': 'The Pit (MAP09) - Mega Armor',
+             'episode': 1,
+             'map': 9,
+             'index': 26,
+             'doom_type': 2019,
+             'region': "The Pit (MAP09) Main"},
+    361093: {'name': 'The Pit (MAP09) - Supercharge',
+             'episode': 1,
+             'map': 9,
+             'index': 78,
+             'doom_type': 2013,
+             'region': "The Pit (MAP09) Main"},
+    361094: {'name': 'The Pit (MAP09) - Berserk 2',
+             'episode': 1,
+             'map': 9,
+             'index': 90,
+             'doom_type': 2023,
+             'region': "The Pit (MAP09) Main"},
+    361095: {'name': 'The Pit (MAP09) - Rocket launcher',
+             'episode': 1,
+             'map': 9,
+             'index': 92,
+             'doom_type': 2003,
+             'region': "The Pit (MAP09) Main"},
+    361096: {'name': 'The Pit (MAP09) - BFG9000',
+             'episode': 1,
+             'map': 9,
+             'index': 184,
+             'doom_type': 2006,
+             'region': "The Pit (MAP09) Main"},
+    361097: {'name': 'The Pit (MAP09) - Blue keycard',
+             'episode': 1,
+             'map': 9,
+             'index': 185,
+             'doom_type': 5,
+             'region': "The Pit (MAP09) Main"},
+    361098: {'name': 'The Pit (MAP09) - Yellow keycard',
+             'episode': 1,
+             'map': 9,
+             'index': 226,
+             'doom_type': 6,
+             'region': "The Pit (MAP09) Blue"},
+    361099: {'name': 'The Pit (MAP09) - Backpack',
+             'episode': 1,
+             'map': 9,
+             'index': 244,
+             'doom_type': 8,
+             'region': "The Pit (MAP09) Blue"},
+    361100: {'name': 'The Pit (MAP09) - Computer area map',
+             'episode': 1,
+             'map': 9,
+             'index': 245,
+             'doom_type': 2026,
+             'region': "The Pit (MAP09) Blue"},
+    361101: {'name': 'The Pit (MAP09) - Supercharge 2',
+             'episode': 1,
+             'map': 9,
+             'index': 250,
+             'doom_type': 2013,
+             'region': "The Pit (MAP09) Blue"},
+    361102: {'name': 'The Pit (MAP09) - Mega Armor 2',
+             'episode': 1,
+             'map': 9,
+             'index': 251,
+             'doom_type': 2019,
+             'region': "The Pit (MAP09) Blue"},
+    361103: {'name': 'The Pit (MAP09) - Berserk 3',
+             'episode': 1,
+             'map': 9,
+             'index': 309,
+             'doom_type': 2023,
+             'region': "The Pit (MAP09) Blue"},
+    361104: {'name': 'The Pit (MAP09) - Armor',
+             'episode': 1,
+             'map': 9,
+             'index': 348,
+             'doom_type': 2018,
+             'region': "The Pit (MAP09) Main"},
+    361105: {'name': 'The Pit (MAP09) - Exit',
+             'episode': 1,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Pit (MAP09) Yellow"},
+    361106: {'name': 'Refueling Base (MAP10) - BFG9000',
+             'episode': 1,
+             'map': 10,
+             'index': 17,
+             'doom_type': 2006,
+             'region': "Refueling Base (MAP10) Main"},
+    361107: {'name': 'Refueling Base (MAP10) - Supercharge',
+             'episode': 1,
+             'map': 10,
+             'index': 28,
+             'doom_type': 2013,
+             'region': "Refueling Base (MAP10) Main"},
+    361108: {'name': 'Refueling Base (MAP10) - Plasma gun',
+             'episode': 1,
+             'map': 10,
+             'index': 29,
+             'doom_type': 2004,
+             'region': "Refueling Base (MAP10) Main"},
+    361109: {'name': 'Refueling Base (MAP10) - Blue keycard',
+             'episode': 1,
+             'map': 10,
+             'index': 50,
+             'doom_type': 5,
+             'region': "Refueling Base (MAP10) Main"},
+    361110: {'name': 'Refueling Base (MAP10) - Shotgun',
+             'episode': 1,
+             'map': 10,
+             'index': 99,
+             'doom_type': 2001,
+             'region': "Refueling Base (MAP10) Main"},
+    361111: {'name': 'Refueling Base (MAP10) - Chaingun',
+             'episode': 1,
+             'map': 10,
+             'index': 158,
+             'doom_type': 2002,
+             'region': "Refueling Base (MAP10) Main"},
+    361112: {'name': 'Refueling Base (MAP10) - Armor',
+             'episode': 1,
+             'map': 10,
+             'index': 172,
+             'doom_type': 2018,
+             'region': "Refueling Base (MAP10) Main"},
+    361113: {'name': 'Refueling Base (MAP10) - Rocket launcher',
+             'episode': 1,
+             'map': 10,
+             'index': 291,
+             'doom_type': 2003,
+             'region': "Refueling Base (MAP10) Main"},
+    361114: {'name': 'Refueling Base (MAP10) - Supercharge 2',
+             'episode': 1,
+             'map': 10,
+             'index': 359,
+             'doom_type': 2013,
+             'region': "Refueling Base (MAP10) Main"},
+    361115: {'name': 'Refueling Base (MAP10) - Backpack',
+             'episode': 1,
+             'map': 10,
+             'index': 368,
+             'doom_type': 8,
+             'region': "Refueling Base (MAP10) Main"},
+    361116: {'name': 'Refueling Base (MAP10) - Berserk',
+             'episode': 1,
+             'map': 10,
+             'index': 392,
+             'doom_type': 2023,
+             'region': "Refueling Base (MAP10) Main"},
+    361117: {'name': 'Refueling Base (MAP10) - Mega Armor',
+             'episode': 1,
+             'map': 10,
+             'index': 395,
+             'doom_type': 2019,
+             'region': "Refueling Base (MAP10) Main"},
+    361118: {'name': 'Refueling Base (MAP10) - Invulnerability',
+             'episode': 1,
+             'map': 10,
+             'index': 396,
+             'doom_type': 2022,
+             'region': "Refueling Base (MAP10) Main"},
+    361119: {'name': 'Refueling Base (MAP10) - Invulnerability 2',
+             'episode': 1,
+             'map': 10,
+             'index': 398,
+             'doom_type': 2022,
+             'region': "Refueling Base (MAP10) Main"},
+    361120: {'name': 'Refueling Base (MAP10) - Armor 2',
+             'episode': 1,
+             'map': 10,
+             'index': 400,
+             'doom_type': 2018,
+             'region': "Refueling Base (MAP10) Main"},
+    361121: {'name': 'Refueling Base (MAP10) - Berserk 2',
+             'episode': 1,
+             'map': 10,
+             'index': 441,
+             'doom_type': 2023,
+             'region': "Refueling Base (MAP10) Main"},
+    361122: {'name': 'Refueling Base (MAP10) - Partial invisibility',
+             'episode': 1,
+             'map': 10,
+             'index': 470,
+             'doom_type': 2024,
+             'region': "Refueling Base (MAP10) Main"},
+    361123: {'name': 'Refueling Base (MAP10) - Chainsaw',
+             'episode': 1,
+             'map': 10,
+             'index': 472,
+             'doom_type': 2005,
+             'region': "Refueling Base (MAP10) Main"},
+    361124: {'name': 'Refueling Base (MAP10) - Yellow keycard',
+             'episode': 1,
+             'map': 10,
+             'index': 473,
+             'doom_type': 6,
+             'region': "Refueling Base (MAP10) Main"},
+    361125: {'name': 'Refueling Base (MAP10) - Megasphere',
+             'episode': 1,
+             'map': 10,
+             'index': 507,
+             'doom_type': 83,
+             'region': "Refueling Base (MAP10) Main"},
+    361126: {'name': 'Refueling Base (MAP10) - Exit',
+             'episode': 1,
+             'map': 10,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Refueling Base (MAP10) Yellow Blue"},
+    361127: {'name': 'Circle of Death (MAP11) - Red keycard',
+             'episode': 1,
+             'map': 11,
+             'index': 1,
+             'doom_type': 13,
+             'region': "Circle of Death (MAP11) Main"},
+    361128: {'name': 'Circle of Death (MAP11) - Chaingun',
+             'episode': 1,
+             'map': 11,
+             'index': 14,
+             'doom_type': 2002,
+             'region': "Circle of Death (MAP11) Main"},
+    361129: {'name': 'Circle of Death (MAP11) - Supercharge',
+             'episode': 1,
+             'map': 11,
+             'index': 23,
+             'doom_type': 2013,
+             'region': "Circle of Death (MAP11) Main"},
+    361130: {'name': 'Circle of Death (MAP11) - Plasma gun',
+             'episode': 1,
+             'map': 11,
+             'index': 30,
+             'doom_type': 2004,
+             'region': "Circle of Death (MAP11) Main"},
+    361131: {'name': 'Circle of Death (MAP11) - Blue keycard',
+             'episode': 1,
+             'map': 11,
+             'index': 40,
+             'doom_type': 5,
+             'region': "Circle of Death (MAP11) Main"},
+    361132: {'name': 'Circle of Death (MAP11) - Armor',
+             'episode': 1,
+             'map': 11,
+             'index': 42,
+             'doom_type': 2018,
+             'region': "Circle of Death (MAP11) Main"},
+    361133: {'name': 'Circle of Death (MAP11) - Shotgun',
+             'episode': 1,
+             'map': 11,
+             'index': 50,
+             'doom_type': 2001,
+             'region': "Circle of Death (MAP11) Main"},
+    361134: {'name': 'Circle of Death (MAP11) - Mega Armor',
+             'episode': 1,
+             'map': 11,
+             'index': 58,
+             'doom_type': 2019,
+             'region': "Circle of Death (MAP11) Blue"},
+    361135: {'name': 'Circle of Death (MAP11) - Partial invisibility',
+             'episode': 1,
+             'map': 11,
+             'index': 70,
+             'doom_type': 2024,
+             'region': "Circle of Death (MAP11) Main"},
+    361136: {'name': 'Circle of Death (MAP11) - Invulnerability',
+             'episode': 1,
+             'map': 11,
+             'index': 83,
+             'doom_type': 2022,
+             'region': "Circle of Death (MAP11) Red"},
+    361137: {'name': 'Circle of Death (MAP11) - Rocket launcher',
+             'episode': 1,
+             'map': 11,
+             'index': 86,
+             'doom_type': 2003,
+             'region': "Circle of Death (MAP11) Red"},
+    361138: {'name': 'Circle of Death (MAP11) - Backpack',
+             'episode': 1,
+             'map': 11,
+             'index': 88,
+             'doom_type': 8,
+             'region': "Circle of Death (MAP11) Red"},
+    361139: {'name': 'Circle of Death (MAP11) - Supercharge 2',
+             'episode': 1,
+             'map': 11,
+             'index': 108,
+             'doom_type': 2013,
+             'region': "Circle of Death (MAP11) Red"},
+    361140: {'name': 'Circle of Death (MAP11) - BFG9000',
+             'episode': 1,
+             'map': 11,
+             'index': 110,
+             'doom_type': 2006,
+             'region': "Circle of Death (MAP11) Red"},
+    361141: {'name': 'Circle of Death (MAP11) - Exit',
+             'episode': 1,
+             'map': 11,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Circle of Death (MAP11) Red"},
+    361142: {'name': 'The Factory (MAP12) - Shotgun',
+             'episode': 2,
+             'map': 1,
+             'index': 14,
+             'doom_type': 2001,
+             'region': "The Factory (MAP12) Main"},
+    361143: {'name': 'The Factory (MAP12) - Berserk',
+             'episode': 2,
+             'map': 1,
+             'index': 35,
+             'doom_type': 2023,
+             'region': "The Factory (MAP12) Main"},
+    361144: {'name': 'The Factory (MAP12) - Chaingun',
+             'episode': 2,
+             'map': 1,
+             'index': 38,
+             'doom_type': 2002,
+             'region': "The Factory (MAP12) Main"},
+    361145: {'name': 'The Factory (MAP12) - Supercharge',
+             'episode': 2,
+             'map': 1,
+             'index': 52,
+             'doom_type': 2013,
+             'region': "The Factory (MAP12) Main"},
+    361146: {'name': 'The Factory (MAP12) - Blue keycard',
+             'episode': 2,
+             'map': 1,
+             'index': 54,
+             'doom_type': 5,
+             'region': "The Factory (MAP12) Main"},
+    361147: {'name': 'The Factory (MAP12) - Armor',
+             'episode': 2,
+             'map': 1,
+             'index': 63,
+             'doom_type': 2018,
+             'region': "The Factory (MAP12) Blue"},
+    361148: {'name': 'The Factory (MAP12) - Backpack',
+             'episode': 2,
+             'map': 1,
+             'index': 70,
+             'doom_type': 8,
+             'region': "The Factory (MAP12) Blue"},
+    361149: {'name': 'The Factory (MAP12) - Supercharge 2',
+             'episode': 2,
+             'map': 1,
+             'index': 83,
+             'doom_type': 2013,
+             'region': "The Factory (MAP12) Main"},
+    361150: {'name': 'The Factory (MAP12) - Armor 2',
+             'episode': 2,
+             'map': 1,
+             'index': 92,
+             'doom_type': 2018,
+             'region': "The Factory (MAP12) Main"},
+    361151: {'name': 'The Factory (MAP12) - Partial invisibility',
+             'episode': 2,
+             'map': 1,
+             'index': 93,
+             'doom_type': 2024,
+             'region': "The Factory (MAP12) Main"},
+    361152: {'name': 'The Factory (MAP12) - Berserk 2',
+             'episode': 2,
+             'map': 1,
+             'index': 107,
+             'doom_type': 2023,
+             'region': "The Factory (MAP12) Main"},
+    361153: {'name': 'The Factory (MAP12) - Yellow keycard',
+             'episode': 2,
+             'map': 1,
+             'index': 123,
+             'doom_type': 6,
+             'region': "The Factory (MAP12) Main"},
+    361154: {'name': 'The Factory (MAP12) - BFG9000',
+             'episode': 2,
+             'map': 1,
+             'index': 135,
+             'doom_type': 2006,
+             'region': "The Factory (MAP12) Blue"},
+    361155: {'name': 'The Factory (MAP12) - Berserk 3',
+             'episode': 2,
+             'map': 1,
+             'index': 189,
+             'doom_type': 2023,
+             'region': "The Factory (MAP12) Main"},
+    361156: {'name': 'The Factory (MAP12) - Super Shotgun',
+             'episode': 2,
+             'map': 1,
+             'index': 192,
+             'doom_type': 82,
+             'region': "The Factory (MAP12) Main"},
+    361157: {'name': 'The Factory (MAP12) - Exit',
+             'episode': 2,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Factory (MAP12) Yellow"},
+    361158: {'name': 'Downtown (MAP13) - Rocket launcher',
+             'episode': 2,
+             'map': 2,
+             'index': 4,
+             'doom_type': 2003,
+             'region': "Downtown (MAP13) Main"},
+    361159: {'name': 'Downtown (MAP13) - Shotgun',
+             'episode': 2,
+             'map': 2,
+             'index': 42,
+             'doom_type': 2001,
+             'region': "Downtown (MAP13) Main"},
+    361160: {'name': 'Downtown (MAP13) - Supercharge',
+             'episode': 2,
+             'map': 2,
+             'index': 73,
+             'doom_type': 2013,
+             'region': "Downtown (MAP13) Main"},
+    361161: {'name': 'Downtown (MAP13) - Berserk',
+             'episode': 2,
+             'map': 2,
+             'index': 131,
+             'doom_type': 2023,
+             'region': "Downtown (MAP13) Main"},
+    361162: {'name': 'Downtown (MAP13) - Mega Armor',
+             'episode': 2,
+             'map': 2,
+             'index': 158,
+             'doom_type': 2019,
+             'region': "Downtown (MAP13) Main"},
+    361163: {'name': 'Downtown (MAP13) - Chaingun',
+             'episode': 2,
+             'map': 2,
+             'index': 183,
+             'doom_type': 2002,
+             'region': "Downtown (MAP13) Main"},
+    361164: {'name': 'Downtown (MAP13) - Blue keycard',
+             'episode': 2,
+             'map': 2,
+             'index': 195,
+             'doom_type': 5,
+             'region': "Downtown (MAP13) Main"},
+    361165: {'name': 'Downtown (MAP13) - Yellow keycard',
+             'episode': 2,
+             'map': 2,
+             'index': 201,
+             'doom_type': 6,
+             'region': "Downtown (MAP13) Red"},
+    361166: {'name': 'Downtown (MAP13) - Berserk 2',
+             'episode': 2,
+             'map': 2,
+             'index': 207,
+             'doom_type': 2023,
+             'region': "Downtown (MAP13) Red"},
+    361167: {'name': 'Downtown (MAP13) - Plasma gun',
+             'episode': 2,
+             'map': 2,
+             'index': 231,
+             'doom_type': 2004,
+             'region': "Downtown (MAP13) Main"},
+    361168: {'name': 'Downtown (MAP13) - Partial invisibility',
+             'episode': 2,
+             'map': 2,
+             'index': 249,
+             'doom_type': 2024,
+             'region': "Downtown (MAP13) Main"},
+    361169: {'name': 'Downtown (MAP13) - Backpack',
+             'episode': 2,
+             'map': 2,
+             'index': 250,
+             'doom_type': 8,
+             'region': "Downtown (MAP13) Main"},
+    361170: {'name': 'Downtown (MAP13) - Chainsaw',
+             'episode': 2,
+             'map': 2,
+             'index': 257,
+             'doom_type': 2005,
+             'region': "Downtown (MAP13) Blue"},
+    361171: {'name': 'Downtown (MAP13) - BFG9000',
+             'episode': 2,
+             'map': 2,
+             'index': 258,
+             'doom_type': 2006,
+             'region': "Downtown (MAP13) Main"},
+    361172: {'name': 'Downtown (MAP13) - Invulnerability',
+             'episode': 2,
+             'map': 2,
+             'index': 269,
+             'doom_type': 2022,
+             'region': "Downtown (MAP13) Blue"},
+    361173: {'name': 'Downtown (MAP13) - Invulnerability 2',
+             'episode': 2,
+             'map': 2,
+             'index': 280,
+             'doom_type': 2022,
+             'region': "Downtown (MAP13) Main"},
+    361174: {'name': 'Downtown (MAP13) - Partial invisibility 2',
+             'episode': 2,
+             'map': 2,
+             'index': 281,
+             'doom_type': 2024,
+             'region': "Downtown (MAP13) Main"},
+    361175: {'name': 'Downtown (MAP13) - Partial invisibility 3',
+             'episode': 2,
+             'map': 2,
+             'index': 282,
+             'doom_type': 2024,
+             'region': "Downtown (MAP13) Main"},
+    361176: {'name': 'Downtown (MAP13) - Red keycard',
+             'episode': 2,
+             'map': 2,
+             'index': 283,
+             'doom_type': 13,
+             'region': "Downtown (MAP13) Blue"},
+    361177: {'name': 'Downtown (MAP13) - Berserk 3',
+             'episode': 2,
+             'map': 2,
+             'index': 296,
+             'doom_type': 2023,
+             'region': "Downtown (MAP13) Yellow"},
+    361178: {'name': 'Downtown (MAP13) - Computer area map',
+             'episode': 2,
+             'map': 2,
+             'index': 298,
+             'doom_type': 2026,
+             'region': "Downtown (MAP13) Main"},
+    361179: {'name': 'Downtown (MAP13) - Exit',
+             'episode': 2,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Downtown (MAP13) Yellow"},
+    361180: {'name': 'The Inmost Dens (MAP14) - Shotgun',
+             'episode': 2,
+             'map': 3,
+             'index': 13,
+             'doom_type': 2001,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361181: {'name': 'The Inmost Dens (MAP14) - Supercharge',
+             'episode': 2,
+             'map': 3,
+             'index': 16,
+             'doom_type': 2013,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361182: {'name': 'The Inmost Dens (MAP14) - Mega Armor',
+             'episode': 2,
+             'map': 3,
+             'index': 22,
+             'doom_type': 2019,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361183: {'name': 'The Inmost Dens (MAP14) - Berserk',
+             'episode': 2,
+             'map': 3,
+             'index': 78,
+             'doom_type': 2023,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361184: {'name': 'The Inmost Dens (MAP14) - Chaingun',
+             'episode': 2,
+             'map': 3,
+             'index': 80,
+             'doom_type': 2002,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361185: {'name': 'The Inmost Dens (MAP14) - Plasma gun',
+             'episode': 2,
+             'map': 3,
+             'index': 81,
+             'doom_type': 2004,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361186: {'name': 'The Inmost Dens (MAP14) - Red skull key',
+             'episode': 2,
+             'map': 3,
+             'index': 119,
+             'doom_type': 38,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361187: {'name': 'The Inmost Dens (MAP14) - Rocket launcher',
+             'episode': 2,
+             'map': 3,
+             'index': 123,
+             'doom_type': 2003,
+             'region': "The Inmost Dens (MAP14) Main"},
+    361188: {'name': 'The Inmost Dens (MAP14) - Blue skull key',
+             'episode': 2,
+             'map': 3,
+             'index': 130,
+             'doom_type': 40,
+             'region': "The Inmost Dens (MAP14) Red South"},
+    361189: {'name': 'The Inmost Dens (MAP14) - Partial invisibility',
+             'episode': 2,
+             'map': 3,
+             'index': 138,
+             'doom_type': 2024,
+             'region': "The Inmost Dens (MAP14) Red South"},
+    361190: {'name': 'The Inmost Dens (MAP14) - Exit',
+             'episode': 2,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Inmost Dens (MAP14) Blue"},
+    361191: {'name': 'Industrial Zone (MAP15) - Berserk',
+             'episode': 2,
+             'map': 4,
+             'index': 4,
+             'doom_type': 2023,
+             'region': "Industrial Zone (MAP15) Main"},
+    361192: {'name': 'Industrial Zone (MAP15) - Rocket launcher',
+             'episode': 2,
+             'map': 4,
+             'index': 11,
+             'doom_type': 2003,
+             'region': "Industrial Zone (MAP15) Main"},
+    361193: {'name': 'Industrial Zone (MAP15) - Shotgun',
+             'episode': 2,
+             'map': 4,
+             'index': 13,
+             'doom_type': 2001,
+             'region': "Industrial Zone (MAP15) Main"},
+    361194: {'name': 'Industrial Zone (MAP15) - Partial invisibility',
+             'episode': 2,
+             'map': 4,
+             'index': 14,
+             'doom_type': 2024,
+             'region': "Industrial Zone (MAP15) Main"},
+    361195: {'name': 'Industrial Zone (MAP15) - Backpack',
+             'episode': 2,
+             'map': 4,
+             'index': 24,
+             'doom_type': 8,
+             'region': "Industrial Zone (MAP15) Main"},
+    361196: {'name': 'Industrial Zone (MAP15) - BFG9000',
+             'episode': 2,
+             'map': 4,
+             'index': 48,
+             'doom_type': 2006,
+             'region': "Industrial Zone (MAP15) Main"},
+    361197: {'name': 'Industrial Zone (MAP15) - Supercharge',
+             'episode': 2,
+             'map': 4,
+             'index': 56,
+             'doom_type': 2013,
+             'region': "Industrial Zone (MAP15) Main"},
+    361198: {'name': 'Industrial Zone (MAP15) - Mega Armor',
+             'episode': 2,
+             'map': 4,
+             'index': 57,
+             'doom_type': 2019,
+             'region': "Industrial Zone (MAP15) Main"},
+    361199: {'name': 'Industrial Zone (MAP15) - Armor',
+             'episode': 2,
+             'map': 4,
+             'index': 59,
+             'doom_type': 2018,
+             'region': "Industrial Zone (MAP15) Main"},
+    361200: {'name': 'Industrial Zone (MAP15) - Yellow keycard',
+             'episode': 2,
+             'map': 4,
+             'index': 71,
+             'doom_type': 6,
+             'region': "Industrial Zone (MAP15) Main"},
+    361201: {'name': 'Industrial Zone (MAP15) - Chaingun',
+             'episode': 2,
+             'map': 4,
+             'index': 74,
+             'doom_type': 2002,
+             'region': "Industrial Zone (MAP15) Main"},
+    361202: {'name': 'Industrial Zone (MAP15) - Plasma gun',
+             'episode': 2,
+             'map': 4,
+             'index': 86,
+             'doom_type': 2004,
+             'region': "Industrial Zone (MAP15) Yellow West"},
+    361203: {'name': 'Industrial Zone (MAP15) - Partial invisibility 2',
+             'episode': 2,
+             'map': 4,
+             'index': 91,
+             'doom_type': 2024,
+             'region': "Industrial Zone (MAP15) Yellow West"},
+    361204: {'name': 'Industrial Zone (MAP15) - Computer area map',
+             'episode': 2,
+             'map': 4,
+             'index': 93,
+             'doom_type': 2026,
+             'region': "Industrial Zone (MAP15) Yellow West"},
+    361205: {'name': 'Industrial Zone (MAP15) - Invulnerability',
+             'episode': 2,
+             'map': 4,
+             'index': 94,
+             'doom_type': 2022,
+             'region': "Industrial Zone (MAP15) Main"},
+    361206: {'name': 'Industrial Zone (MAP15) - Red keycard',
+             'episode': 2,
+             'map': 4,
+             'index': 100,
+             'doom_type': 13,
+             'region': "Industrial Zone (MAP15) Main"},
+    361207: {'name': 'Industrial Zone (MAP15) - Backpack 2',
+             'episode': 2,
+             'map': 4,
+             'index': 103,
+             'doom_type': 8,
+             'region': "Industrial Zone (MAP15) Yellow West"},
+    361208: {'name': 'Industrial Zone (MAP15) - Chainsaw',
+             'episode': 2,
+             'map': 4,
+             'index': 113,
+             'doom_type': 2005,
+             'region': "Industrial Zone (MAP15) Yellow East"},
+    361209: {'name': 'Industrial Zone (MAP15) - Megasphere',
+             'episode': 2,
+             'map': 4,
+             'index': 125,
+             'doom_type': 83,
+             'region': "Industrial Zone (MAP15) Yellow East"},
+    361210: {'name': 'Industrial Zone (MAP15) - Berserk 2',
+             'episode': 2,
+             'map': 4,
+             'index': 178,
+             'doom_type': 2023,
+             'region': "Industrial Zone (MAP15) Yellow East"},
+    361211: {'name': 'Industrial Zone (MAP15) - Blue keycard',
+             'episode': 2,
+             'map': 4,
+             'index': 337,
+             'doom_type': 5,
+             'region': "Industrial Zone (MAP15) Yellow West"},
+    361212: {'name': 'Industrial Zone (MAP15) - Mega Armor 2',
+             'episode': 2,
+             'map': 4,
+             'index': 361,
+             'doom_type': 2019,
+             'region': "Industrial Zone (MAP15) Main"},
+    361213: {'name': 'Industrial Zone (MAP15) - Exit',
+             'episode': 2,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Industrial Zone (MAP15) Blue"},
+    361214: {'name': 'Suburbs (MAP16) - Megasphere',
+             'episode': 2,
+             'map': 5,
+             'index': 7,
+             'doom_type': 83,
+             'region': "Suburbs (MAP16) Main"},
+    361215: {'name': 'Suburbs (MAP16) - Super Shotgun',
+             'episode': 2,
+             'map': 5,
+             'index': 11,
+             'doom_type': 82,
+             'region': "Suburbs (MAP16) Main"},
+    361216: {'name': 'Suburbs (MAP16) - Chaingun',
+             'episode': 2,
+             'map': 5,
+             'index': 15,
+             'doom_type': 2002,
+             'region': "Suburbs (MAP16) Main"},
+    361217: {'name': 'Suburbs (MAP16) - Backpack',
+             'episode': 2,
+             'map': 5,
+             'index': 53,
+             'doom_type': 8,
+             'region': "Suburbs (MAP16) Main"},
+    361218: {'name': 'Suburbs (MAP16) - Rocket launcher',
+             'episode': 2,
+             'map': 5,
+             'index': 59,
+             'doom_type': 2003,
+             'region': "Suburbs (MAP16) Main"},
+    361219: {'name': 'Suburbs (MAP16) - Berserk',
+             'episode': 2,
+             'map': 5,
+             'index': 60,
+             'doom_type': 2023,
+             'region': "Suburbs (MAP16) Main"},
+    361220: {'name': 'Suburbs (MAP16) - Plasma gun',
+             'episode': 2,
+             'map': 5,
+             'index': 62,
+             'doom_type': 2004,
+             'region': "Suburbs (MAP16) Blue"},
+    361221: {'name': 'Suburbs (MAP16) - Plasma gun 2',
+             'episode': 2,
+             'map': 5,
+             'index': 63,
+             'doom_type': 2004,
+             'region': "Suburbs (MAP16) Blue"},
+    361222: {'name': 'Suburbs (MAP16) - Plasma gun 3',
+             'episode': 2,
+             'map': 5,
+             'index': 64,
+             'doom_type': 2004,
+             'region': "Suburbs (MAP16) Blue"},
+    361223: {'name': 'Suburbs (MAP16) - Plasma gun 4',
+             'episode': 2,
+             'map': 5,
+             'index': 65,
+             'doom_type': 2004,
+             'region': "Suburbs (MAP16) Blue"},
+    361224: {'name': 'Suburbs (MAP16) - BFG9000',
+             'episode': 2,
+             'map': 5,
+             'index': 169,
+             'doom_type': 2006,
+             'region': "Suburbs (MAP16) Main"},
+    361225: {'name': 'Suburbs (MAP16) - Shotgun',
+             'episode': 2,
+             'map': 5,
+             'index': 182,
+             'doom_type': 2001,
+             'region': "Suburbs (MAP16) Main"},
+    361226: {'name': 'Suburbs (MAP16) - Supercharge',
+             'episode': 2,
+             'map': 5,
+             'index': 185,
+             'doom_type': 2013,
+             'region': "Suburbs (MAP16) Main"},
+    361227: {'name': 'Suburbs (MAP16) - Blue skull key',
+             'episode': 2,
+             'map': 5,
+             'index': 186,
+             'doom_type': 40,
+             'region': "Suburbs (MAP16) Main"},
+    361228: {'name': 'Suburbs (MAP16) - Invulnerability',
+             'episode': 2,
+             'map': 5,
+             'index': 221,
+             'doom_type': 2022,
+             'region': "Suburbs (MAP16) Main"},
+    361229: {'name': 'Suburbs (MAP16) - Partial invisibility',
+             'episode': 2,
+             'map': 5,
+             'index': 231,
+             'doom_type': 2024,
+             'region': "Suburbs (MAP16) Main"},
+    361230: {'name': 'Suburbs (MAP16) - Red skull key',
+             'episode': 2,
+             'map': 5,
+             'index': 236,
+             'doom_type': 38,
+             'region': "Suburbs (MAP16) Blue"},
+    361231: {'name': 'Suburbs (MAP16) - Exit',
+             'episode': 2,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Suburbs (MAP16) Red"},
+    361232: {'name': 'Tenements (MAP17) - Armor',
+             'episode': 2,
+             'map': 6,
+             'index': 1,
+             'doom_type': 2018,
+             'region': "Tenements (MAP17) Red"},
+    361233: {'name': 'Tenements (MAP17) - Supercharge',
+             'episode': 2,
+             'map': 6,
+             'index': 7,
+             'doom_type': 2013,
+             'region': "Tenements (MAP17) Yellow"},
+    361234: {'name': 'Tenements (MAP17) - Shotgun',
+             'episode': 2,
+             'map': 6,
+             'index': 18,
+             'doom_type': 2001,
+             'region': "Tenements (MAP17) Main"},
+    361235: {'name': 'Tenements (MAP17) - Red keycard',
+             'episode': 2,
+             'map': 6,
+             'index': 34,
+             'doom_type': 13,
+             'region': "Tenements (MAP17) Main"},
+    361236: {'name': 'Tenements (MAP17) - Blue keycard',
+             'episode': 2,
+             'map': 6,
+             'index': 69,
+             'doom_type': 5,
+             'region': "Tenements (MAP17) Red"},
+    361237: {'name': 'Tenements (MAP17) - Supercharge 2',
+             'episode': 2,
+             'map': 6,
+             'index': 75,
+             'doom_type': 2013,
+             'region': "Tenements (MAP17) Blue"},
+    361238: {'name': 'Tenements (MAP17) - Yellow skull key',
+             'episode': 2,
+             'map': 6,
+             'index': 76,
+             'doom_type': 39,
+             'region': "Tenements (MAP17) Blue"},
+    361239: {'name': 'Tenements (MAP17) - Rocket launcher',
+             'episode': 2,
+             'map': 6,
+             'index': 77,
+             'doom_type': 2003,
+             'region': "Tenements (MAP17) Blue"},
+    361240: {'name': 'Tenements (MAP17) - Partial invisibility',
+             'episode': 2,
+             'map': 6,
+             'index': 81,
+             'doom_type': 2024,
+             'region': "Tenements (MAP17) Blue"},
+    361241: {'name': 'Tenements (MAP17) - Chaingun',
+             'episode': 2,
+             'map': 6,
+             'index': 92,
+             'doom_type': 2002,
+             'region': "Tenements (MAP17) Red"},
+    361242: {'name': 'Tenements (MAP17) - BFG9000',
+             'episode': 2,
+             'map': 6,
+             'index': 102,
+             'doom_type': 2006,
+             'region': "Tenements (MAP17) Main"},
+    361243: {'name': 'Tenements (MAP17) - Plasma gun',
+             'episode': 2,
+             'map': 6,
+             'index': 114,
+             'doom_type': 2004,
+             'region': "Tenements (MAP17) Yellow"},
+    361244: {'name': 'Tenements (MAP17) - Mega Armor',
+             'episode': 2,
+             'map': 6,
+             'index': 168,
+             'doom_type': 2019,
+             'region': "Tenements (MAP17) Red"},
+    361245: {'name': 'Tenements (MAP17) - Armor 2',
+             'episode': 2,
+             'map': 6,
+             'index': 179,
+             'doom_type': 2018,
+             'region': "Tenements (MAP17) Red"},
+    361246: {'name': 'Tenements (MAP17) - Berserk',
+             'episode': 2,
+             'map': 6,
+             'index': 218,
+             'doom_type': 2023,
+             'region': "Tenements (MAP17) Red"},
+    361247: {'name': 'Tenements (MAP17) - Backpack',
+             'episode': 2,
+             'map': 6,
+             'index': 261,
+             'doom_type': 8,
+             'region': "Tenements (MAP17) Blue"},
+    361248: {'name': 'Tenements (MAP17) - Megasphere',
+             'episode': 2,
+             'map': 6,
+             'index': 419,
+             'doom_type': 83,
+             'region': "Tenements (MAP17) Yellow"},
+    361249: {'name': 'Tenements (MAP17) - Exit',
+             'episode': 2,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Tenements (MAP17) Yellow"},
+    361250: {'name': 'The Courtyard (MAP18) - Shotgun',
+             'episode': 2,
+             'map': 7,
+             'index': 12,
+             'doom_type': 2001,
+             'region': "The Courtyard (MAP18) Main"},
+    361251: {'name': 'The Courtyard (MAP18) - Plasma gun',
+             'episode': 2,
+             'map': 7,
+             'index': 36,
+             'doom_type': 2004,
+             'region': "The Courtyard (MAP18) Main"},
+    361252: {'name': 'The Courtyard (MAP18) - Armor',
+             'episode': 2,
+             'map': 7,
+             'index': 48,
+             'doom_type': 2018,
+             'region': "The Courtyard (MAP18) Main"},
+    361253: {'name': 'The Courtyard (MAP18) - Berserk',
+             'episode': 2,
+             'map': 7,
+             'index': 52,
+             'doom_type': 2023,
+             'region': "The Courtyard (MAP18) Main"},
+    361254: {'name': 'The Courtyard (MAP18) - Chaingun',
+             'episode': 2,
+             'map': 7,
+             'index': 95,
+             'doom_type': 2002,
+             'region': "The Courtyard (MAP18) Main"},
+    361255: {'name': 'The Courtyard (MAP18) - Rocket launcher',
+             'episode': 2,
+             'map': 7,
+             'index': 130,
+             'doom_type': 2003,
+             'region': "The Courtyard (MAP18) Main"},
+    361256: {'name': 'The Courtyard (MAP18) - Partial invisibility',
+             'episode': 2,
+             'map': 7,
+             'index': 170,
+             'doom_type': 2024,
+             'region': "The Courtyard (MAP18) Main"},
+    361257: {'name': 'The Courtyard (MAP18) - Partial invisibility 2',
+             'episode': 2,
+             'map': 7,
+             'index': 171,
+             'doom_type': 2024,
+             'region': "The Courtyard (MAP18) Main"},
+    361258: {'name': 'The Courtyard (MAP18) - Backpack',
+             'episode': 2,
+             'map': 7,
+             'index': 198,
+             'doom_type': 8,
+             'region': "The Courtyard (MAP18) Main"},
+    361259: {'name': 'The Courtyard (MAP18) - Supercharge',
+             'episode': 2,
+             'map': 7,
+             'index': 218,
+             'doom_type': 2013,
+             'region': "The Courtyard (MAP18) Main"},
+    361260: {'name': 'The Courtyard (MAP18) - Invulnerability',
+             'episode': 2,
+             'map': 7,
+             'index': 228,
+             'doom_type': 2022,
+             'region': "The Courtyard (MAP18) Main"},
+    361261: {'name': 'The Courtyard (MAP18) - Invulnerability 2',
+             'episode': 2,
+             'map': 7,
+             'index': 229,
+             'doom_type': 2022,
+             'region': "The Courtyard (MAP18) Main"},
+    361262: {'name': 'The Courtyard (MAP18) - Yellow skull key',
+             'episode': 2,
+             'map': 7,
+             'index': 254,
+             'doom_type': 39,
+             'region': "The Courtyard (MAP18) Main"},
+    361263: {'name': 'The Courtyard (MAP18) - Blue skull key',
+             'episode': 2,
+             'map': 7,
+             'index': 268,
+             'doom_type': 40,
+             'region': "The Courtyard (MAP18) Yellow"},
+    361264: {'name': 'The Courtyard (MAP18) - BFG9000',
+             'episode': 2,
+             'map': 7,
+             'index': 400,
+             'doom_type': 2006,
+             'region': "The Courtyard (MAP18) Main"},
+    361265: {'name': 'The Courtyard (MAP18) - Computer area map',
+             'episode': 2,
+             'map': 7,
+             'index': 458,
+             'doom_type': 2026,
+             'region': "The Courtyard (MAP18) Main"},
+    361266: {'name': 'The Courtyard (MAP18) - Super Shotgun',
+             'episode': 2,
+             'map': 7,
+             'index': 461,
+             'doom_type': 82,
+             'region': "The Courtyard (MAP18) Main"},
+    361267: {'name': 'The Courtyard (MAP18) - Exit',
+             'episode': 2,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Courtyard (MAP18) Blue"},
+    361268: {'name': 'The Citadel (MAP19) - Armor',
+             'episode': 2,
+             'map': 8,
+             'index': 64,
+             'doom_type': 2018,
+             'region': "The Citadel (MAP19) Main"},
+    361269: {'name': 'The Citadel (MAP19) - Chaingun',
+             'episode': 2,
+             'map': 8,
+             'index': 99,
+             'doom_type': 2002,
+             'region': "The Citadel (MAP19) Main"},
+    361270: {'name': 'The Citadel (MAP19) - Berserk',
+             'episode': 2,
+             'map': 8,
+             'index': 116,
+             'doom_type': 2023,
+             'region': "The Citadel (MAP19) Main"},
+    361271: {'name': 'The Citadel (MAP19) - Mega Armor',
+             'episode': 2,
+             'map': 8,
+             'index': 127,
+             'doom_type': 2019,
+             'region': "The Citadel (MAP19) Main"},
+    361272: {'name': 'The Citadel (MAP19) - Supercharge',
+             'episode': 2,
+             'map': 8,
+             'index': 174,
+             'doom_type': 2013,
+             'region': "The Citadel (MAP19) Main"},
+    361273: {'name': 'The Citadel (MAP19) - Armor 2',
+             'episode': 2,
+             'map': 8,
+             'index': 223,
+             'doom_type': 2018,
+             'region': "The Citadel (MAP19) Main"},
+    361274: {'name': 'The Citadel (MAP19) - Backpack',
+             'episode': 2,
+             'map': 8,
+             'index': 232,
+             'doom_type': 8,
+             'region': "The Citadel (MAP19) Main"},
+    361275: {'name': 'The Citadel (MAP19) - Invulnerability',
+             'episode': 2,
+             'map': 8,
+             'index': 315,
+             'doom_type': 2022,
+             'region': "The Citadel (MAP19) Main"},
+    361276: {'name': 'The Citadel (MAP19) - Blue skull key',
+             'episode': 2,
+             'map': 8,
+             'index': 370,
+             'doom_type': 40,
+             'region': "The Citadel (MAP19) Main"},
+    361277: {'name': 'The Citadel (MAP19) - Partial invisibility',
+             'episode': 2,
+             'map': 8,
+             'index': 403,
+             'doom_type': 2024,
+             'region': "The Citadel (MAP19) Main"},
+    361278: {'name': 'The Citadel (MAP19) - Red skull key',
+             'episode': 2,
+             'map': 8,
+             'index': 404,
+             'doom_type': 38,
+             'region': "The Citadel (MAP19) Main"},
+    361279: {'name': 'The Citadel (MAP19) - Yellow skull key',
+             'episode': 2,
+             'map': 8,
+             'index': 405,
+             'doom_type': 39,
+             'region': "The Citadel (MAP19) Main"},
+    361280: {'name': 'The Citadel (MAP19) - Computer area map',
+             'episode': 2,
+             'map': 8,
+             'index': 415,
+             'doom_type': 2026,
+             'region': "The Citadel (MAP19) Main"},
+    361281: {'name': 'The Citadel (MAP19) - Rocket launcher',
+             'episode': 2,
+             'map': 8,
+             'index': 416,
+             'doom_type': 2003,
+             'region': "The Citadel (MAP19) Main"},
+    361282: {'name': 'The Citadel (MAP19) - Super Shotgun',
+             'episode': 2,
+             'map': 8,
+             'index': 431,
+             'doom_type': 82,
+             'region': "The Citadel (MAP19) Main"},
+    361283: {'name': 'The Citadel (MAP19) - Exit',
+             'episode': 2,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Citadel (MAP19) Red"},
+    361284: {'name': 'Gotcha! (MAP20) - Mega Armor',
+             'episode': 2,
+             'map': 9,
+             'index': 9,
+             'doom_type': 2019,
+             'region': "Gotcha! (MAP20) Main"},
+    361285: {'name': 'Gotcha! (MAP20) - Rocket launcher',
+             'episode': 2,
+             'map': 9,
+             'index': 10,
+             'doom_type': 2003,
+             'region': "Gotcha! (MAP20) Main"},
+    361286: {'name': 'Gotcha! (MAP20) - Supercharge',
+             'episode': 2,
+             'map': 9,
+             'index': 12,
+             'doom_type': 2013,
+             'region': "Gotcha! (MAP20) Main"},
+    361287: {'name': 'Gotcha! (MAP20) - Armor',
+             'episode': 2,
+             'map': 9,
+             'index': 33,
+             'doom_type': 2018,
+             'region': "Gotcha! (MAP20) Main"},
+    361288: {'name': 'Gotcha! (MAP20) - Megasphere',
+             'episode': 2,
+             'map': 9,
+             'index': 43,
+             'doom_type': 83,
+             'region': "Gotcha! (MAP20) Main"},
+    361289: {'name': 'Gotcha! (MAP20) - Armor 2',
+             'episode': 2,
+             'map': 9,
+             'index': 47,
+             'doom_type': 2018,
+             'region': "Gotcha! (MAP20) Main"},
+    361290: {'name': 'Gotcha! (MAP20) - Super Shotgun',
+             'episode': 2,
+             'map': 9,
+             'index': 54,
+             'doom_type': 82,
+             'region': "Gotcha! (MAP20) Main"},
+    361291: {'name': 'Gotcha! (MAP20) - Plasma gun',
+             'episode': 2,
+             'map': 9,
+             'index': 70,
+             'doom_type': 2004,
+             'region': "Gotcha! (MAP20) Main"},
+    361292: {'name': 'Gotcha! (MAP20) - Mega Armor 2',
+             'episode': 2,
+             'map': 9,
+             'index': 96,
+             'doom_type': 2019,
+             'region': "Gotcha! (MAP20) Main"},
+    361293: {'name': 'Gotcha! (MAP20) - Berserk',
+             'episode': 2,
+             'map': 9,
+             'index': 109,
+             'doom_type': 2023,
+             'region': "Gotcha! (MAP20) Main"},
+    361294: {'name': 'Gotcha! (MAP20) - Supercharge 2',
+             'episode': 2,
+             'map': 9,
+             'index': 119,
+             'doom_type': 2013,
+             'region': "Gotcha! (MAP20) Main"},
+    361295: {'name': 'Gotcha! (MAP20) - Supercharge 3',
+             'episode': 2,
+             'map': 9,
+             'index': 122,
+             'doom_type': 2013,
+             'region': "Gotcha! (MAP20) Main"},
+    361296: {'name': 'Gotcha! (MAP20) - BFG9000',
+             'episode': 2,
+             'map': 9,
+             'index': 142,
+             'doom_type': 2006,
+             'region': "Gotcha! (MAP20) Main"},
+    361297: {'name': 'Gotcha! (MAP20) - Supercharge 4',
+             'episode': 2,
+             'map': 9,
+             'index': 145,
+             'doom_type': 2013,
+             'region': "Gotcha! (MAP20) Main"},
+    361298: {'name': 'Gotcha! (MAP20) - Exit',
+             'episode': 2,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Gotcha! (MAP20) Main"},
+    361299: {'name': 'Nirvana (MAP21) - Super Shotgun',
+             'episode': 3,
+             'map': 1,
+             'index': 70,
+             'doom_type': 82,
+             'region': "Nirvana (MAP21) Main"},
+    361300: {'name': 'Nirvana (MAP21) - Rocket launcher',
+             'episode': 3,
+             'map': 1,
+             'index': 76,
+             'doom_type': 2003,
+             'region': "Nirvana (MAP21) Main"},
+    361301: {'name': 'Nirvana (MAP21) - Yellow skull key',
+             'episode': 3,
+             'map': 1,
+             'index': 108,
+             'doom_type': 39,
+             'region': "Nirvana (MAP21) Main"},
+    361302: {'name': 'Nirvana (MAP21) - Backpack',
+             'episode': 3,
+             'map': 1,
+             'index': 109,
+             'doom_type': 8,
+             'region': "Nirvana (MAP21) Main"},
+    361303: {'name': 'Nirvana (MAP21) - Megasphere',
+             'episode': 3,
+             'map': 1,
+             'index': 112,
+             'doom_type': 83,
+             'region': "Nirvana (MAP21) Main"},
+    361304: {'name': 'Nirvana (MAP21) - Invulnerability',
+             'episode': 3,
+             'map': 1,
+             'index': 194,
+             'doom_type': 2022,
+             'region': "Nirvana (MAP21) Yellow"},
+    361305: {'name': 'Nirvana (MAP21) - Blue skull key',
+             'episode': 3,
+             'map': 1,
+             'index': 199,
+             'doom_type': 40,
+             'region': "Nirvana (MAP21) Yellow"},
+    361306: {'name': 'Nirvana (MAP21) - Red skull key',
+             'episode': 3,
+             'map': 1,
+             'index': 215,
+             'doom_type': 38,
+             'region': "Nirvana (MAP21) Yellow"},
+    361307: {'name': 'Nirvana (MAP21) - Exit',
+             'episode': 3,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Nirvana (MAP21) Magenta"},
+    361308: {'name': 'The Catacombs (MAP22) - Rocket launcher',
+             'episode': 3,
+             'map': 2,
+             'index': 4,
+             'doom_type': 2003,
+             'region': "The Catacombs (MAP22) Main"},
+    361309: {'name': 'The Catacombs (MAP22) - Blue skull key',
+             'episode': 3,
+             'map': 2,
+             'index': 5,
+             'doom_type': 40,
+             'region': "The Catacombs (MAP22) Main"},
+    361310: {'name': 'The Catacombs (MAP22) - Red skull key',
+             'episode': 3,
+             'map': 2,
+             'index': 12,
+             'doom_type': 38,
+             'region': "The Catacombs (MAP22) Blue"},
+    361311: {'name': 'The Catacombs (MAP22) - Shotgun',
+             'episode': 3,
+             'map': 2,
+             'index': 28,
+             'doom_type': 2001,
+             'region': "The Catacombs (MAP22) Main"},
+    361312: {'name': 'The Catacombs (MAP22) - Berserk',
+             'episode': 3,
+             'map': 2,
+             'index': 45,
+             'doom_type': 2023,
+             'region': "The Catacombs (MAP22) Main"},
+    361313: {'name': 'The Catacombs (MAP22) - Plasma gun',
+             'episode': 3,
+             'map': 2,
+             'index': 83,
+             'doom_type': 2004,
+             'region': "The Catacombs (MAP22) Main"},
+    361314: {'name': 'The Catacombs (MAP22) - Supercharge',
+             'episode': 3,
+             'map': 2,
+             'index': 118,
+             'doom_type': 2013,
+             'region': "The Catacombs (MAP22) Main"},
+    361315: {'name': 'The Catacombs (MAP22) - Armor',
+             'episode': 3,
+             'map': 2,
+             'index': 119,
+             'doom_type': 2018,
+             'region': "The Catacombs (MAP22) Main"},
+    361316: {'name': 'The Catacombs (MAP22) - Exit',
+             'episode': 3,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Catacombs (MAP22) Red"},
+    361317: {'name': 'Barrels o Fun (MAP23) - Shotgun',
+             'episode': 3,
+             'map': 3,
+             'index': 136,
+             'doom_type': 2001,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361318: {'name': 'Barrels o Fun (MAP23) - Berserk',
+             'episode': 3,
+             'map': 3,
+             'index': 222,
+             'doom_type': 2023,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361319: {'name': 'Barrels o Fun (MAP23) - Backpack',
+             'episode': 3,
+             'map': 3,
+             'index': 223,
+             'doom_type': 8,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361320: {'name': 'Barrels o Fun (MAP23) - Computer area map',
+             'episode': 3,
+             'map': 3,
+             'index': 224,
+             'doom_type': 2026,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361321: {'name': 'Barrels o Fun (MAP23) - Armor',
+             'episode': 3,
+             'map': 3,
+             'index': 249,
+             'doom_type': 2018,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361322: {'name': 'Barrels o Fun (MAP23) - Rocket launcher',
+             'episode': 3,
+             'map': 3,
+             'index': 264,
+             'doom_type': 2003,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361323: {'name': 'Barrels o Fun (MAP23) - Megasphere',
+             'episode': 3,
+             'map': 3,
+             'index': 266,
+             'doom_type': 83,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361324: {'name': 'Barrels o Fun (MAP23) - Supercharge',
+             'episode': 3,
+             'map': 3,
+             'index': 277,
+             'doom_type': 2013,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361325: {'name': 'Barrels o Fun (MAP23) - Backpack 2',
+             'episode': 3,
+             'map': 3,
+             'index': 301,
+             'doom_type': 8,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361326: {'name': 'Barrels o Fun (MAP23) - Yellow skull key',
+             'episode': 3,
+             'map': 3,
+             'index': 307,
+             'doom_type': 39,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361327: {'name': 'Barrels o Fun (MAP23) - BFG9000',
+             'episode': 3,
+             'map': 3,
+             'index': 342,
+             'doom_type': 2006,
+             'region': "Barrels o Fun (MAP23) Main"},
+    361328: {'name': 'Barrels o Fun (MAP23) - Exit',
+             'episode': 3,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Barrels o Fun (MAP23) Yellow"},
+    361329: {'name': 'The Chasm (MAP24) - Plasma gun',
+             'episode': 3,
+             'map': 4,
+             'index': 5,
+             'doom_type': 2004,
+             'region': "The Chasm (MAP24) Main"},
+    361330: {'name': 'The Chasm (MAP24) - Shotgun',
+             'episode': 3,
+             'map': 4,
+             'index': 6,
+             'doom_type': 2001,
+             'region': "The Chasm (MAP24) Main"},
+    361331: {'name': 'The Chasm (MAP24) - Invulnerability',
+             'episode': 3,
+             'map': 4,
+             'index': 12,
+             'doom_type': 2022,
+             'region': "The Chasm (MAP24) Main"},
+    361332: {'name': 'The Chasm (MAP24) - Rocket launcher',
+             'episode': 3,
+             'map': 4,
+             'index': 22,
+             'doom_type': 2003,
+             'region': "The Chasm (MAP24) Main"},
+    361333: {'name': 'The Chasm (MAP24) - Blue keycard',
+             'episode': 3,
+             'map': 4,
+             'index': 23,
+             'doom_type': 5,
+             'region': "The Chasm (MAP24) Main"},
+    361334: {'name': 'The Chasm (MAP24) - Backpack',
+             'episode': 3,
+             'map': 4,
+             'index': 31,
+             'doom_type': 8,
+             'region': "The Chasm (MAP24) Main"},
+    361335: {'name': 'The Chasm (MAP24) - Berserk',
+             'episode': 3,
+             'map': 4,
+             'index': 79,
+             'doom_type': 2023,
+             'region': "The Chasm (MAP24) Main"},
+    361336: {'name': 'The Chasm (MAP24) - Berserk 2',
+             'episode': 3,
+             'map': 4,
+             'index': 155,
+             'doom_type': 2023,
+             'region': "The Chasm (MAP24) Main"},
+    361337: {'name': 'The Chasm (MAP24) - Armor',
+             'episode': 3,
+             'map': 4,
+             'index': 169,
+             'doom_type': 2018,
+             'region': "The Chasm (MAP24) Main"},
+    361338: {'name': 'The Chasm (MAP24) - Red keycard',
+             'episode': 3,
+             'map': 4,
+             'index': 261,
+             'doom_type': 13,
+             'region': "The Chasm (MAP24) Main"},
+    361339: {'name': 'The Chasm (MAP24) - BFG9000',
+             'episode': 3,
+             'map': 4,
+             'index': 295,
+             'doom_type': 2006,
+             'region': "The Chasm (MAP24) Main"},
+    361340: {'name': 'The Chasm (MAP24) - Super Shotgun',
+             'episode': 3,
+             'map': 4,
+             'index': 353,
+             'doom_type': 82,
+             'region': "The Chasm (MAP24) Main"},
+    361341: {'name': 'The Chasm (MAP24) - Megasphere',
+             'episode': 3,
+             'map': 4,
+             'index': 355,
+             'doom_type': 83,
+             'region': "The Chasm (MAP24) Main"},
+    361342: {'name': 'The Chasm (MAP24) - Megasphere 2',
+             'episode': 3,
+             'map': 4,
+             'index': 362,
+             'doom_type': 83,
+             'region': "The Chasm (MAP24) Main"},
+    361343: {'name': 'The Chasm (MAP24) - Exit',
+             'episode': 3,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Chasm (MAP24) Red"},
+    361344: {'name': 'Bloodfalls (MAP25) - Super Shotgun',
+             'episode': 3,
+             'map': 5,
+             'index': 6,
+             'doom_type': 82,
+             'region': "Bloodfalls (MAP25) Main"},
+    361345: {'name': 'Bloodfalls (MAP25) - Partial invisibility',
+             'episode': 3,
+             'map': 5,
+             'index': 7,
+             'doom_type': 2024,
+             'region': "Bloodfalls (MAP25) Blue"},
+    361346: {'name': 'Bloodfalls (MAP25) - Megasphere',
+             'episode': 3,
+             'map': 5,
+             'index': 23,
+             'doom_type': 83,
+             'region': "Bloodfalls (MAP25) Main"},
+    361347: {'name': 'Bloodfalls (MAP25) - BFG9000',
+             'episode': 3,
+             'map': 5,
+             'index': 34,
+             'doom_type': 2006,
+             'region': "Bloodfalls (MAP25) Blue"},
+    361348: {'name': 'Bloodfalls (MAP25) - Mega Armor',
+             'episode': 3,
+             'map': 5,
+             'index': 103,
+             'doom_type': 2019,
+             'region': "Bloodfalls (MAP25) Main"},
+    361349: {'name': 'Bloodfalls (MAP25) - Armor',
+             'episode': 3,
+             'map': 5,
+             'index': 104,
+             'doom_type': 2018,
+             'region': "Bloodfalls (MAP25) Main"},
+    361350: {'name': 'Bloodfalls (MAP25) - Blue skull key',
+             'episode': 3,
+             'map': 5,
+             'index': 106,
+             'doom_type': 40,
+             'region': "Bloodfalls (MAP25) Main"},
+    361351: {'name': 'Bloodfalls (MAP25) - Chaingun',
+             'episode': 3,
+             'map': 5,
+             'index': 150,
+             'doom_type': 2002,
+             'region': "Bloodfalls (MAP25) Main"},
+    361352: {'name': 'Bloodfalls (MAP25) - Plasma gun',
+             'episode': 3,
+             'map': 5,
+             'index': 169,
+             'doom_type': 2004,
+             'region': "Bloodfalls (MAP25) Main"},
+    361353: {'name': 'Bloodfalls (MAP25) - BFG9000 2',
+             'episode': 3,
+             'map': 5,
+             'index': 186,
+             'doom_type': 2006,
+             'region': "Bloodfalls (MAP25) Main"},
+    361354: {'name': 'Bloodfalls (MAP25) - Rocket launcher',
+             'episode': 3,
+             'map': 5,
+             'index': 236,
+             'doom_type': 2003,
+             'region': "Bloodfalls (MAP25) Main"},
+    361355: {'name': 'Bloodfalls (MAP25) - Exit',
+             'episode': 3,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Bloodfalls (MAP25) Blue"},
+    361356: {'name': 'The Abandoned Mines (MAP26) - Blue keycard',
+             'episode': 3,
+             'map': 6,
+             'index': 20,
+             'doom_type': 5,
+             'region': "The Abandoned Mines (MAP26) Red"},
+    361357: {'name': 'The Abandoned Mines (MAP26) - Super Shotgun',
+             'episode': 3,
+             'map': 6,
+             'index': 21,
+             'doom_type': 82,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361358: {'name': 'The Abandoned Mines (MAP26) - Rocket launcher',
+             'episode': 3,
+             'map': 6,
+             'index': 49,
+             'doom_type': 2003,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361359: {'name': 'The Abandoned Mines (MAP26) - Mega Armor',
+             'episode': 3,
+             'map': 6,
+             'index': 95,
+             'doom_type': 2019,
+             'region': "The Abandoned Mines (MAP26) Red"},
+    361360: {'name': 'The Abandoned Mines (MAP26) - Plasma gun',
+             'episode': 3,
+             'map': 6,
+             'index': 107,
+             'doom_type': 2004,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361361: {'name': 'The Abandoned Mines (MAP26) - Supercharge',
+             'episode': 3,
+             'map': 6,
+             'index': 154,
+             'doom_type': 2013,
+             'region': "The Abandoned Mines (MAP26) Red"},
+    361362: {'name': 'The Abandoned Mines (MAP26) - Chaingun',
+             'episode': 3,
+             'map': 6,
+             'index': 155,
+             'doom_type': 2002,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361363: {'name': 'The Abandoned Mines (MAP26) - Partial invisibility',
+             'episode': 3,
+             'map': 6,
+             'index': 159,
+             'doom_type': 2024,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361364: {'name': 'The Abandoned Mines (MAP26) - Armor',
+             'episode': 3,
+             'map': 6,
+             'index': 170,
+             'doom_type': 2018,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361365: {'name': 'The Abandoned Mines (MAP26) - Red keycard',
+             'episode': 3,
+             'map': 6,
+             'index': 182,
+             'doom_type': 13,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361366: {'name': 'The Abandoned Mines (MAP26) - Yellow keycard',
+             'episode': 3,
+             'map': 6,
+             'index': 229,
+             'doom_type': 6,
+             'region': "The Abandoned Mines (MAP26) Blue"},
+    361367: {'name': 'The Abandoned Mines (MAP26) - Backpack',
+             'episode': 3,
+             'map': 6,
+             'index': 254,
+             'doom_type': 8,
+             'region': "The Abandoned Mines (MAP26) Main"},
+    361368: {'name': 'The Abandoned Mines (MAP26) - Exit',
+             'episode': 3,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Abandoned Mines (MAP26) Yellow"},
+    361369: {'name': 'Monster Condo (MAP27) - Rocket launcher',
+             'episode': 3,
+             'map': 7,
+             'index': 4,
+             'doom_type': 2003,
+             'region': "Monster Condo (MAP27) Main"},
+    361370: {'name': 'Monster Condo (MAP27) - Partial invisibility',
+             'episode': 3,
+             'map': 7,
+             'index': 51,
+             'doom_type': 2024,
+             'region': "Monster Condo (MAP27) Main"},
+    361371: {'name': 'Monster Condo (MAP27) - Plasma gun',
+             'episode': 3,
+             'map': 7,
+             'index': 58,
+             'doom_type': 2004,
+             'region': "Monster Condo (MAP27) Main"},
+    361372: {'name': 'Monster Condo (MAP27) - Invulnerability',
+             'episode': 3,
+             'map': 7,
+             'index': 60,
+             'doom_type': 2022,
+             'region': "Monster Condo (MAP27) Main"},
+    361373: {'name': 'Monster Condo (MAP27) - Armor',
+             'episode': 3,
+             'map': 7,
+             'index': 86,
+             'doom_type': 2018,
+             'region': "Monster Condo (MAP27) Main"},
+    361374: {'name': 'Monster Condo (MAP27) - Backpack',
+             'episode': 3,
+             'map': 7,
+             'index': 105,
+             'doom_type': 8,
+             'region': "Monster Condo (MAP27) Main"},
+    361375: {'name': 'Monster Condo (MAP27) - Invulnerability 2',
+             'episode': 3,
+             'map': 7,
+             'index': 107,
+             'doom_type': 2022,
+             'region': "Monster Condo (MAP27) Main"},
+    361376: {'name': 'Monster Condo (MAP27) - Partial invisibility 2',
+             'episode': 3,
+             'map': 7,
+             'index': 122,
+             'doom_type': 2024,
+             'region': "Monster Condo (MAP27) Main"},
+    361377: {'name': 'Monster Condo (MAP27) - Supercharge',
+             'episode': 3,
+             'map': 7,
+             'index': 236,
+             'doom_type': 2013,
+             'region': "Monster Condo (MAP27) Main"},
+    361378: {'name': 'Monster Condo (MAP27) - Armor 2',
+             'episode': 3,
+             'map': 7,
+             'index': 239,
+             'doom_type': 2018,
+             'region': "Monster Condo (MAP27) Main"},
+    361379: {'name': 'Monster Condo (MAP27) - Chaingun',
+             'episode': 3,
+             'map': 7,
+             'index': 251,
+             'doom_type': 2002,
+             'region': "Monster Condo (MAP27) Main"},
+    361380: {'name': 'Monster Condo (MAP27) - BFG9000',
+             'episode': 3,
+             'map': 7,
+             'index': 279,
+             'doom_type': 2006,
+             'region': "Monster Condo (MAP27) Main"},
+    361381: {'name': 'Monster Condo (MAP27) - Backpack 2',
+             'episode': 3,
+             'map': 7,
+             'index': 285,
+             'doom_type': 8,
+             'region': "Monster Condo (MAP27) Main"},
+    361382: {'name': 'Monster Condo (MAP27) - Backpack 3',
+             'episode': 3,
+             'map': 7,
+             'index': 286,
+             'doom_type': 8,
+             'region': "Monster Condo (MAP27) Main"},
+    361383: {'name': 'Monster Condo (MAP27) - Backpack 4',
+             'episode': 3,
+             'map': 7,
+             'index': 287,
+             'doom_type': 8,
+             'region': "Monster Condo (MAP27) Main"},
+    361384: {'name': 'Monster Condo (MAP27) - Yellow skull key',
+             'episode': 3,
+             'map': 7,
+             'index': 310,
+             'doom_type': 39,
+             'region': "Monster Condo (MAP27) Main"},
+    361385: {'name': 'Monster Condo (MAP27) - Red skull key',
+             'episode': 3,
+             'map': 7,
+             'index': 364,
+             'doom_type': 38,
+             'region': "Monster Condo (MAP27) Blue"},
+    361386: {'name': 'Monster Condo (MAP27) - Supercharge 2',
+             'episode': 3,
+             'map': 7,
+             'index': 365,
+             'doom_type': 2013,
+             'region': "Monster Condo (MAP27) Blue"},
+    361387: {'name': 'Monster Condo (MAP27) - Blue skull key',
+             'episode': 3,
+             'map': 7,
+             'index': 382,
+             'doom_type': 40,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361388: {'name': 'Monster Condo (MAP27) - Supercharge 3',
+             'episode': 3,
+             'map': 7,
+             'index': 392,
+             'doom_type': 2013,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361389: {'name': 'Monster Condo (MAP27) - Computer area map',
+             'episode': 3,
+             'map': 7,
+             'index': 393,
+             'doom_type': 2026,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361390: {'name': 'Monster Condo (MAP27) - Berserk',
+             'episode': 3,
+             'map': 7,
+             'index': 394,
+             'doom_type': 2023,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361391: {'name': 'Monster Condo (MAP27) - Supercharge 4',
+             'episode': 3,
+             'map': 7,
+             'index': 414,
+             'doom_type': 2013,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361392: {'name': 'Monster Condo (MAP27) - Supercharge 5',
+             'episode': 3,
+             'map': 7,
+             'index': 424,
+             'doom_type': 2013,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361393: {'name': 'Monster Condo (MAP27) - Computer area map 2',
+             'episode': 3,
+             'map': 7,
+             'index': 425,
+             'doom_type': 2026,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361394: {'name': 'Monster Condo (MAP27) - Berserk 2',
+             'episode': 3,
+             'map': 7,
+             'index': 426,
+             'doom_type': 2023,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361395: {'name': 'Monster Condo (MAP27) - Partial invisibility 3',
+             'episode': 3,
+             'map': 7,
+             'index': 454,
+             'doom_type': 2024,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361396: {'name': 'Monster Condo (MAP27) - Invulnerability 3',
+             'episode': 3,
+             'map': 7,
+             'index': 455,
+             'doom_type': 2022,
+             'region': "Monster Condo (MAP27) Yellow"},
+    361397: {'name': 'Monster Condo (MAP27) - Chainsaw',
+             'episode': 3,
+             'map': 7,
+             'index': 460,
+             'doom_type': 2005,
+             'region': "Monster Condo (MAP27) Main"},
+    361398: {'name': 'Monster Condo (MAP27) - Super Shotgun',
+             'episode': 3,
+             'map': 7,
+             'index': 470,
+             'doom_type': 82,
+             'region': "Monster Condo (MAP27) Main"},
+    361399: {'name': 'Monster Condo (MAP27) - Exit',
+             'episode': 3,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Monster Condo (MAP27) Red"},
+    361400: {'name': 'The Spirit World (MAP28) - Armor',
+             'episode': 3,
+             'map': 8,
+             'index': 19,
+             'doom_type': 2018,
+             'region': "The Spirit World (MAP28) Main"},
+    361401: {'name': 'The Spirit World (MAP28) - Chainsaw',
+             'episode': 3,
+             'map': 8,
+             'index': 66,
+             'doom_type': 2005,
+             'region': "The Spirit World (MAP28) Main"},
+    361402: {'name': 'The Spirit World (MAP28) - Invulnerability',
+             'episode': 3,
+             'map': 8,
+             'index': 76,
+             'doom_type': 2022,
+             'region': "The Spirit World (MAP28) Main"},
+    361403: {'name': 'The Spirit World (MAP28) - Yellow skull key',
+             'episode': 3,
+             'map': 8,
+             'index': 87,
+             'doom_type': 39,
+             'region': "The Spirit World (MAP28) Main"},
+    361404: {'name': 'The Spirit World (MAP28) - Supercharge',
+             'episode': 3,
+             'map': 8,
+             'index': 95,
+             'doom_type': 2013,
+             'region': "The Spirit World (MAP28) Main"},
+    361405: {'name': 'The Spirit World (MAP28) - Chaingun',
+             'episode': 3,
+             'map': 8,
+             'index': 96,
+             'doom_type': 2002,
+             'region': "The Spirit World (MAP28) Main"},
+    361406: {'name': 'The Spirit World (MAP28) - Rocket launcher',
+             'episode': 3,
+             'map': 8,
+             'index': 124,
+             'doom_type': 2003,
+             'region': "The Spirit World (MAP28) Main"},
+    361407: {'name': 'The Spirit World (MAP28) - Backpack',
+             'episode': 3,
+             'map': 8,
+             'index': 155,
+             'doom_type': 8,
+             'region': "The Spirit World (MAP28) Main"},
+    361408: {'name': 'The Spirit World (MAP28) - Backpack 2',
+             'episode': 3,
+             'map': 8,
+             'index': 156,
+             'doom_type': 8,
+             'region': "The Spirit World (MAP28) Main"},
+    361409: {'name': 'The Spirit World (MAP28) - Backpack 3',
+             'episode': 3,
+             'map': 8,
+             'index': 157,
+             'doom_type': 8,
+             'region': "The Spirit World (MAP28) Main"},
+    361410: {'name': 'The Spirit World (MAP28) - Backpack 4',
+             'episode': 3,
+             'map': 8,
+             'index': 158,
+             'doom_type': 8,
+             'region': "The Spirit World (MAP28) Main"},
+    361411: {'name': 'The Spirit World (MAP28) - Berserk',
+             'episode': 3,
+             'map': 8,
+             'index': 159,
+             'doom_type': 2023,
+             'region': "The Spirit World (MAP28) Main"},
+    361412: {'name': 'The Spirit World (MAP28) - Plasma gun',
+             'episode': 3,
+             'map': 8,
+             'index': 163,
+             'doom_type': 2004,
+             'region': "The Spirit World (MAP28) Main"},
+    361413: {'name': 'The Spirit World (MAP28) - Invulnerability 2',
+             'episode': 3,
+             'map': 8,
+             'index': 179,
+             'doom_type': 2022,
+             'region': "The Spirit World (MAP28) Main"},
+    361414: {'name': 'The Spirit World (MAP28) - Invulnerability 3',
+             'episode': 3,
+             'map': 8,
+             'index': 180,
+             'doom_type': 2022,
+             'region': "The Spirit World (MAP28) Main"},
+    361415: {'name': 'The Spirit World (MAP28) - BFG9000',
+             'episode': 3,
+             'map': 8,
+             'index': 181,
+             'doom_type': 2006,
+             'region': "The Spirit World (MAP28) Main"},
+    361416: {'name': 'The Spirit World (MAP28) - Megasphere',
+             'episode': 3,
+             'map': 8,
+             'index': 183,
+             'doom_type': 83,
+             'region': "The Spirit World (MAP28) Main"},
+    361417: {'name': 'The Spirit World (MAP28) - Megasphere 2',
+             'episode': 3,
+             'map': 8,
+             'index': 185,
+             'doom_type': 83,
+             'region': "The Spirit World (MAP28) Main"},
+    361418: {'name': 'The Spirit World (MAP28) - Invulnerability 4',
+             'episode': 3,
+             'map': 8,
+             'index': 186,
+             'doom_type': 2022,
+             'region': "The Spirit World (MAP28) Main"},
+    361419: {'name': 'The Spirit World (MAP28) - Invulnerability 5',
+             'episode': 3,
+             'map': 8,
+             'index': 195,
+             'doom_type': 2022,
+             'region': "The Spirit World (MAP28) Main"},
+    361420: {'name': 'The Spirit World (MAP28) - Super Shotgun',
+             'episode': 3,
+             'map': 8,
+             'index': 214,
+             'doom_type': 82,
+             'region': "The Spirit World (MAP28) Main"},
+    361421: {'name': 'The Spirit World (MAP28) - Red skull key',
+             'episode': 3,
+             'map': 8,
+             'index': 216,
+             'doom_type': 38,
+             'region': "The Spirit World (MAP28) Yellow"},
+    361422: {'name': 'The Spirit World (MAP28) - Exit',
+             'episode': 3,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Spirit World (MAP28) Red"},
+    361423: {'name': 'The Living End (MAP29) - Chaingun',
+             'episode': 3,
+             'map': 9,
+             'index': 85,
+             'doom_type': 2002,
+             'region': "The Living End (MAP29) Main"},
+    361424: {'name': 'The Living End (MAP29) - Plasma gun',
+             'episode': 3,
+             'map': 9,
+             'index': 124,
+             'doom_type': 2004,
+             'region': "The Living End (MAP29) Main"},
+    361425: {'name': 'The Living End (MAP29) - Backpack',
+             'episode': 3,
+             'map': 9,
+             'index': 179,
+             'doom_type': 8,
+             'region': "The Living End (MAP29) Main"},
+    361426: {'name': 'The Living End (MAP29) - Super Shotgun',
+             'episode': 3,
+             'map': 9,
+             'index': 195,
+             'doom_type': 82,
+             'region': "The Living End (MAP29) Main"},
+    361427: {'name': 'The Living End (MAP29) - Mega Armor',
+             'episode': 3,
+             'map': 9,
+             'index': 216,
+             'doom_type': 2019,
+             'region': "The Living End (MAP29) Main"},
+    361428: {'name': 'The Living End (MAP29) - Armor',
+             'episode': 3,
+             'map': 9,
+             'index': 224,
+             'doom_type': 2018,
+             'region': "The Living End (MAP29) Main"},
+    361429: {'name': 'The Living End (MAP29) - Backpack 2',
+             'episode': 3,
+             'map': 9,
+             'index': 235,
+             'doom_type': 8,
+             'region': "The Living End (MAP29) Main"},
+    361430: {'name': 'The Living End (MAP29) - Supercharge',
+             'episode': 3,
+             'map': 9,
+             'index': 237,
+             'doom_type': 2013,
+             'region': "The Living End (MAP29) Main"},
+    361431: {'name': 'The Living End (MAP29) - Berserk',
+             'episode': 3,
+             'map': 9,
+             'index': 241,
+             'doom_type': 2023,
+             'region': "The Living End (MAP29) Main"},
+    361432: {'name': 'The Living End (MAP29) - Berserk 2',
+             'episode': 3,
+             'map': 9,
+             'index': 263,
+             'doom_type': 2023,
+             'region': "The Living End (MAP29) Main"},
+    361433: {'name': 'The Living End (MAP29) - Exit',
+             'episode': 3,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Living End (MAP29) Main"},
+    361434: {'name': 'Icon of Sin (MAP30) - Supercharge',
+             'episode': 3,
+             'map': 10,
+             'index': 25,
+             'doom_type': 2013,
+             'region': "Icon of Sin (MAP30) Main"},
+    361435: {'name': 'Icon of Sin (MAP30) - Supercharge 2',
+             'episode': 3,
+             'map': 10,
+             'index': 26,
+             'doom_type': 2013,
+             'region': "Icon of Sin (MAP30) Main"},
+    361436: {'name': 'Icon of Sin (MAP30) - Supercharge 3',
+             'episode': 3,
+             'map': 10,
+             'index': 28,
+             'doom_type': 2013,
+             'region': "Icon of Sin (MAP30) Main"},
+    361437: {'name': 'Icon of Sin (MAP30) - Invulnerability',
+             'episode': 3,
+             'map': 10,
+             'index': 29,
+             'doom_type': 2022,
+             'region': "Icon of Sin (MAP30) Main"},
+    361438: {'name': 'Icon of Sin (MAP30) - Invulnerability 2',
+             'episode': 3,
+             'map': 10,
+             'index': 30,
+             'doom_type': 2022,
+             'region': "Icon of Sin (MAP30) Main"},
+    361439: {'name': 'Icon of Sin (MAP30) - Invulnerability 3',
+             'episode': 3,
+             'map': 10,
+             'index': 31,
+             'doom_type': 2022,
+             'region': "Icon of Sin (MAP30) Main"},
+    361440: {'name': 'Icon of Sin (MAP30) - Invulnerability 4',
+             'episode': 3,
+             'map': 10,
+             'index': 32,
+             'doom_type': 2022,
+             'region': "Icon of Sin (MAP30) Main"},
+    361441: {'name': 'Icon of Sin (MAP30) - BFG9000',
+             'episode': 3,
+             'map': 10,
+             'index': 40,
+             'doom_type': 2006,
+             'region': "Icon of Sin (MAP30) Main"},
+    361442: {'name': 'Icon of Sin (MAP30) - Chaingun',
+             'episode': 3,
+             'map': 10,
+             'index': 41,
+             'doom_type': 2002,
+             'region': "Icon of Sin (MAP30) Main"},
+    361443: {'name': 'Icon of Sin (MAP30) - Chainsaw',
+             'episode': 3,
+             'map': 10,
+             'index': 42,
+             'doom_type': 2005,
+             'region': "Icon of Sin (MAP30) Main"},
+    361444: {'name': 'Icon of Sin (MAP30) - Plasma gun',
+             'episode': 3,
+             'map': 10,
+             'index': 43,
+             'doom_type': 2004,
+             'region': "Icon of Sin (MAP30) Main"},
+    361445: {'name': 'Icon of Sin (MAP30) - Rocket launcher',
+             'episode': 3,
+             'map': 10,
+             'index': 44,
+             'doom_type': 2003,
+             'region': "Icon of Sin (MAP30) Main"},
+    361446: {'name': 'Icon of Sin (MAP30) - Shotgun',
+             'episode': 3,
+             'map': 10,
+             'index': 45,
+             'doom_type': 2001,
+             'region': "Icon of Sin (MAP30) Main"},
+    361447: {'name': 'Icon of Sin (MAP30) - Super Shotgun',
+             'episode': 3,
+             'map': 10,
+             'index': 46,
+             'doom_type': 82,
+             'region': "Icon of Sin (MAP30) Main"},
+    361448: {'name': 'Icon of Sin (MAP30) - Backpack',
+             'episode': 3,
+             'map': 10,
+             'index': 47,
+             'doom_type': 8,
+             'region': "Icon of Sin (MAP30) Main"},
+    361449: {'name': 'Icon of Sin (MAP30) - Megasphere',
+             'episode': 3,
+             'map': 10,
+             'index': 64,
+             'doom_type': 83,
+             'region': "Icon of Sin (MAP30) Main"},
+    361450: {'name': 'Icon of Sin (MAP30) - Megasphere 2',
+             'episode': 3,
+             'map': 10,
+             'index': 85,
+             'doom_type': 83,
+             'region': "Icon of Sin (MAP30) Main"},
+    361451: {'name': 'Icon of Sin (MAP30) - Berserk',
+             'episode': 3,
+             'map': 10,
+             'index': 94,
+             'doom_type': 2023,
+             'region': "Icon of Sin (MAP30) Main"},
+    361452: {'name': 'Icon of Sin (MAP30) - Exit',
+             'episode': 3,
+             'map': 10,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Icon of Sin (MAP30) Main"},
+    361453: {'name': 'Wolfenstein2 (MAP31) - Rocket launcher',
+             'episode': 4,
+             'map': 1,
+             'index': 110,
+             'doom_type': 2003,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361454: {'name': 'Wolfenstein2 (MAP31) - Shotgun',
+             'episode': 4,
+             'map': 1,
+             'index': 139,
+             'doom_type': 2001,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361455: {'name': 'Wolfenstein2 (MAP31) - Berserk',
+             'episode': 4,
+             'map': 1,
+             'index': 263,
+             'doom_type': 2023,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361456: {'name': 'Wolfenstein2 (MAP31) - Supercharge',
+             'episode': 4,
+             'map': 1,
+             'index': 278,
+             'doom_type': 2013,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361457: {'name': 'Wolfenstein2 (MAP31) - Chaingun',
+             'episode': 4,
+             'map': 1,
+             'index': 305,
+             'doom_type': 2002,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361458: {'name': 'Wolfenstein2 (MAP31) - Super Shotgun',
+             'episode': 4,
+             'map': 1,
+             'index': 308,
+             'doom_type': 82,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361459: {'name': 'Wolfenstein2 (MAP31) - Partial invisibility',
+             'episode': 4,
+             'map': 1,
+             'index': 309,
+             'doom_type': 2024,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361460: {'name': 'Wolfenstein2 (MAP31) - Megasphere',
+             'episode': 4,
+             'map': 1,
+             'index': 310,
+             'doom_type': 83,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361461: {'name': 'Wolfenstein2 (MAP31) - Backpack',
+             'episode': 4,
+             'map': 1,
+             'index': 311,
+             'doom_type': 8,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361462: {'name': 'Wolfenstein2 (MAP31) - Backpack 2',
+             'episode': 4,
+             'map': 1,
+             'index': 312,
+             'doom_type': 8,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361463: {'name': 'Wolfenstein2 (MAP31) - Backpack 3',
+             'episode': 4,
+             'map': 1,
+             'index': 313,
+             'doom_type': 8,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361464: {'name': 'Wolfenstein2 (MAP31) - Backpack 4',
+             'episode': 4,
+             'map': 1,
+             'index': 314,
+             'doom_type': 8,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361465: {'name': 'Wolfenstein2 (MAP31) - BFG9000',
+             'episode': 4,
+             'map': 1,
+             'index': 315,
+             'doom_type': 2006,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361466: {'name': 'Wolfenstein2 (MAP31) - Plasma gun',
+             'episode': 4,
+             'map': 1,
+             'index': 316,
+             'doom_type': 2004,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361467: {'name': 'Wolfenstein2 (MAP31) - Exit',
+             'episode': 4,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Wolfenstein2 (MAP31) Main"},
+    361468: {'name': 'Grosse2 (MAP32) - Plasma gun',
+             'episode': 4,
+             'map': 2,
+             'index': 33,
+             'doom_type': 2004,
+             'region': "Grosse2 (MAP32) Main"},
+    361469: {'name': 'Grosse2 (MAP32) - Rocket launcher',
+             'episode': 4,
+             'map': 2,
+             'index': 57,
+             'doom_type': 2003,
+             'region': "Grosse2 (MAP32) Main"},
+    361470: {'name': 'Grosse2 (MAP32) - Invulnerability',
+             'episode': 4,
+             'map': 2,
+             'index': 70,
+             'doom_type': 2022,
+             'region': "Grosse2 (MAP32) Main"},
+    361471: {'name': 'Grosse2 (MAP32) - Super Shotgun',
+             'episode': 4,
+             'map': 2,
+             'index': 74,
+             'doom_type': 82,
+             'region': "Grosse2 (MAP32) Main"},
+    361472: {'name': 'Grosse2 (MAP32) - BFG9000',
+             'episode': 4,
+             'map': 2,
+             'index': 75,
+             'doom_type': 2006,
+             'region': "Grosse2 (MAP32) Main"},
+    361473: {'name': 'Grosse2 (MAP32) - Megasphere',
+             'episode': 4,
+             'map': 2,
+             'index': 78,
+             'doom_type': 83,
+             'region': "Grosse2 (MAP32) Main"},
+    361474: {'name': 'Grosse2 (MAP32) - Chaingun',
+             'episode': 4,
+             'map': 2,
+             'index': 79,
+             'doom_type': 2002,
+             'region': "Grosse2 (MAP32) Main"},
+    361475: {'name': 'Grosse2 (MAP32) - Chaingun 2',
+             'episode': 4,
+             'map': 2,
+             'index': 80,
+             'doom_type': 2002,
+             'region': "Grosse2 (MAP32) Main"},
+    361476: {'name': 'Grosse2 (MAP32) - Chaingun 3',
+             'episode': 4,
+             'map': 2,
+             'index': 81,
+             'doom_type': 2002,
+             'region': "Grosse2 (MAP32) Main"},
+    361477: {'name': 'Grosse2 (MAP32) - Berserk',
+             'episode': 4,
+             'map': 2,
+             'index': 82,
+             'doom_type': 2023,
+             'region': "Grosse2 (MAP32) Main"},
+    361478: {'name': 'Grosse2 (MAP32) - Exit',
+             'episode': 4,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Grosse2 (MAP32) Main"},
+}
+
+
+location_name_groups: Dict[str, Set[str]] = {
+    'Barrels o Fun (MAP23)': {
+        'Barrels o Fun (MAP23) - Armor',
+        'Barrels o Fun (MAP23) - BFG9000',
+        'Barrels o Fun (MAP23) - Backpack',
+        'Barrels o Fun (MAP23) - Backpack 2',
+        'Barrels o Fun (MAP23) - Berserk',
+        'Barrels o Fun (MAP23) - Computer area map',
+        'Barrels o Fun (MAP23) - Exit',
+        'Barrels o Fun (MAP23) - Megasphere',
+        'Barrels o Fun (MAP23) - Rocket launcher',
+        'Barrels o Fun (MAP23) - Shotgun',
+        'Barrels o Fun (MAP23) - Supercharge',
+        'Barrels o Fun (MAP23) - Yellow skull key',
+    },
+    'Bloodfalls (MAP25)': {
+        'Bloodfalls (MAP25) - Armor',
+        'Bloodfalls (MAP25) - BFG9000',
+        'Bloodfalls (MAP25) - BFG9000 2',
+        'Bloodfalls (MAP25) - Blue skull key',
+        'Bloodfalls (MAP25) - Chaingun',
+        'Bloodfalls (MAP25) - Exit',
+        'Bloodfalls (MAP25) - Mega Armor',
+        'Bloodfalls (MAP25) - Megasphere',
+        'Bloodfalls (MAP25) - Partial invisibility',
+        'Bloodfalls (MAP25) - Plasma gun',
+        'Bloodfalls (MAP25) - Rocket launcher',
+        'Bloodfalls (MAP25) - Super Shotgun',
+    },
+    'Circle of Death (MAP11)': {
+        'Circle of Death (MAP11) - Armor',
+        'Circle of Death (MAP11) - BFG9000',
+        'Circle of Death (MAP11) - Backpack',
+        'Circle of Death (MAP11) - Blue keycard',
+        'Circle of Death (MAP11) - Chaingun',
+        'Circle of Death (MAP11) - Exit',
+        'Circle of Death (MAP11) - Invulnerability',
+        'Circle of Death (MAP11) - Mega Armor',
+        'Circle of Death (MAP11) - Partial invisibility',
+        'Circle of Death (MAP11) - Plasma gun',
+        'Circle of Death (MAP11) - Red keycard',
+        'Circle of Death (MAP11) - Rocket launcher',
+        'Circle of Death (MAP11) - Shotgun',
+        'Circle of Death (MAP11) - Supercharge',
+        'Circle of Death (MAP11) - Supercharge 2',
+    },
+    'Dead Simple (MAP07)': {
+        'Dead Simple (MAP07) - Backpack',
+        'Dead Simple (MAP07) - Berserk',
+        'Dead Simple (MAP07) - Chaingun',
+        'Dead Simple (MAP07) - Exit',
+        'Dead Simple (MAP07) - Megasphere',
+        'Dead Simple (MAP07) - Partial invisibility',
+        'Dead Simple (MAP07) - Partial invisibility 2',
+        'Dead Simple (MAP07) - Partial invisibility 3',
+        'Dead Simple (MAP07) - Partial invisibility 4',
+        'Dead Simple (MAP07) - Plasma gun',
+        'Dead Simple (MAP07) - Rocket launcher',
+        'Dead Simple (MAP07) - Super Shotgun',
+    },
+    'Downtown (MAP13)': {
+        'Downtown (MAP13) - BFG9000',
+        'Downtown (MAP13) - Backpack',
+        'Downtown (MAP13) - Berserk',
+        'Downtown (MAP13) - Berserk 2',
+        'Downtown (MAP13) - Berserk 3',
+        'Downtown (MAP13) - Blue keycard',
+        'Downtown (MAP13) - Chaingun',
+        'Downtown (MAP13) - Chainsaw',
+        'Downtown (MAP13) - Computer area map',
+        'Downtown (MAP13) - Exit',
+        'Downtown (MAP13) - Invulnerability',
+        'Downtown (MAP13) - Invulnerability 2',
+        'Downtown (MAP13) - Mega Armor',
+        'Downtown (MAP13) - Partial invisibility',
+        'Downtown (MAP13) - Partial invisibility 2',
+        'Downtown (MAP13) - Partial invisibility 3',
+        'Downtown (MAP13) - Plasma gun',
+        'Downtown (MAP13) - Red keycard',
+        'Downtown (MAP13) - Rocket launcher',
+        'Downtown (MAP13) - Shotgun',
+        'Downtown (MAP13) - Supercharge',
+        'Downtown (MAP13) - Yellow keycard',
+    },
+    'Entryway (MAP01)': {
+        'Entryway (MAP01) - Armor',
+        'Entryway (MAP01) - Chainsaw',
+        'Entryway (MAP01) - Exit',
+        'Entryway (MAP01) - Rocket launcher',
+        'Entryway (MAP01) - Shotgun',
+    },
+    'Gotcha! (MAP20)': {
+        'Gotcha! (MAP20) - Armor',
+        'Gotcha! (MAP20) - Armor 2',
+        'Gotcha! (MAP20) - BFG9000',
+        'Gotcha! (MAP20) - Berserk',
+        'Gotcha! (MAP20) - Exit',
+        'Gotcha! (MAP20) - Mega Armor',
+        'Gotcha! (MAP20) - Mega Armor 2',
+        'Gotcha! (MAP20) - Megasphere',
+        'Gotcha! (MAP20) - Plasma gun',
+        'Gotcha! (MAP20) - Rocket launcher',
+        'Gotcha! (MAP20) - Super Shotgun',
+        'Gotcha! (MAP20) - Supercharge',
+        'Gotcha! (MAP20) - Supercharge 2',
+        'Gotcha! (MAP20) - Supercharge 3',
+        'Gotcha! (MAP20) - Supercharge 4',
+    },
+    'Grosse2 (MAP32)': {
+        'Grosse2 (MAP32) - BFG9000',
+        'Grosse2 (MAP32) - Berserk',
+        'Grosse2 (MAP32) - Chaingun',
+        'Grosse2 (MAP32) - Chaingun 2',
+        'Grosse2 (MAP32) - Chaingun 3',
+        'Grosse2 (MAP32) - Exit',
+        'Grosse2 (MAP32) - Invulnerability',
+        'Grosse2 (MAP32) - Megasphere',
+        'Grosse2 (MAP32) - Plasma gun',
+        'Grosse2 (MAP32) - Rocket launcher',
+        'Grosse2 (MAP32) - Super Shotgun',
+    },
+    'Icon of Sin (MAP30)': {
+        'Icon of Sin (MAP30) - BFG9000',
+        'Icon of Sin (MAP30) - Backpack',
+        'Icon of Sin (MAP30) - Berserk',
+        'Icon of Sin (MAP30) - Chaingun',
+        'Icon of Sin (MAP30) - Chainsaw',
+        'Icon of Sin (MAP30) - Exit',
+        'Icon of Sin (MAP30) - Invulnerability',
+        'Icon of Sin (MAP30) - Invulnerability 2',
+        'Icon of Sin (MAP30) - Invulnerability 3',
+        'Icon of Sin (MAP30) - Invulnerability 4',
+        'Icon of Sin (MAP30) - Megasphere',
+        'Icon of Sin (MAP30) - Megasphere 2',
+        'Icon of Sin (MAP30) - Plasma gun',
+        'Icon of Sin (MAP30) - Rocket launcher',
+        'Icon of Sin (MAP30) - Shotgun',
+        'Icon of Sin (MAP30) - Super Shotgun',
+        'Icon of Sin (MAP30) - Supercharge',
+        'Icon of Sin (MAP30) - Supercharge 2',
+        'Icon of Sin (MAP30) - Supercharge 3',
+    },
+    'Industrial Zone (MAP15)': {
+        'Industrial Zone (MAP15) - Armor',
+        'Industrial Zone (MAP15) - BFG9000',
+        'Industrial Zone (MAP15) - Backpack',
+        'Industrial Zone (MAP15) - Backpack 2',
+        'Industrial Zone (MAP15) - Berserk',
+        'Industrial Zone (MAP15) - Berserk 2',
+        'Industrial Zone (MAP15) - Blue keycard',
+        'Industrial Zone (MAP15) - Chaingun',
+        'Industrial Zone (MAP15) - Chainsaw',
+        'Industrial Zone (MAP15) - Computer area map',
+        'Industrial Zone (MAP15) - Exit',
+        'Industrial Zone (MAP15) - Invulnerability',
+        'Industrial Zone (MAP15) - Mega Armor',
+        'Industrial Zone (MAP15) - Mega Armor 2',
+        'Industrial Zone (MAP15) - Megasphere',
+        'Industrial Zone (MAP15) - Partial invisibility',
+        'Industrial Zone (MAP15) - Partial invisibility 2',
+        'Industrial Zone (MAP15) - Plasma gun',
+        'Industrial Zone (MAP15) - Red keycard',
+        'Industrial Zone (MAP15) - Rocket launcher',
+        'Industrial Zone (MAP15) - Shotgun',
+        'Industrial Zone (MAP15) - Supercharge',
+        'Industrial Zone (MAP15) - Yellow keycard',
+    },
+    'Monster Condo (MAP27)': {
+        'Monster Condo (MAP27) - Armor',
+        'Monster Condo (MAP27) - Armor 2',
+        'Monster Condo (MAP27) - BFG9000',
+        'Monster Condo (MAP27) - Backpack',
+        'Monster Condo (MAP27) - Backpack 2',
+        'Monster Condo (MAP27) - Backpack 3',
+        'Monster Condo (MAP27) - Backpack 4',
+        'Monster Condo (MAP27) - Berserk',
+        'Monster Condo (MAP27) - Berserk 2',
+        'Monster Condo (MAP27) - Blue skull key',
+        'Monster Condo (MAP27) - Chaingun',
+        'Monster Condo (MAP27) - Chainsaw',
+        'Monster Condo (MAP27) - Computer area map',
+        'Monster Condo (MAP27) - Computer area map 2',
+        'Monster Condo (MAP27) - Exit',
+        'Monster Condo (MAP27) - Invulnerability',
+        'Monster Condo (MAP27) - Invulnerability 2',
+        'Monster Condo (MAP27) - Invulnerability 3',
+        'Monster Condo (MAP27) - Partial invisibility',
+        'Monster Condo (MAP27) - Partial invisibility 2',
+        'Monster Condo (MAP27) - Partial invisibility 3',
+        'Monster Condo (MAP27) - Plasma gun',
+        'Monster Condo (MAP27) - Red skull key',
+        'Monster Condo (MAP27) - Rocket launcher',
+        'Monster Condo (MAP27) - Super Shotgun',
+        'Monster Condo (MAP27) - Supercharge',
+        'Monster Condo (MAP27) - Supercharge 2',
+        'Monster Condo (MAP27) - Supercharge 3',
+        'Monster Condo (MAP27) - Supercharge 4',
+        'Monster Condo (MAP27) - Supercharge 5',
+        'Monster Condo (MAP27) - Yellow skull key',
+    },
+    'Nirvana (MAP21)': {
+        'Nirvana (MAP21) - Backpack',
+        'Nirvana (MAP21) - Blue skull key',
+        'Nirvana (MAP21) - Exit',
+        'Nirvana (MAP21) - Invulnerability',
+        'Nirvana (MAP21) - Megasphere',
+        'Nirvana (MAP21) - Red skull key',
+        'Nirvana (MAP21) - Rocket launcher',
+        'Nirvana (MAP21) - Super Shotgun',
+        'Nirvana (MAP21) - Yellow skull key',
+    },
+    'Refueling Base (MAP10)': {
+        'Refueling Base (MAP10) - Armor',
+        'Refueling Base (MAP10) - Armor 2',
+        'Refueling Base (MAP10) - BFG9000',
+        'Refueling Base (MAP10) - Backpack',
+        'Refueling Base (MAP10) - Berserk',
+        'Refueling Base (MAP10) - Berserk 2',
+        'Refueling Base (MAP10) - Blue keycard',
+        'Refueling Base (MAP10) - Chaingun',
+        'Refueling Base (MAP10) - Chainsaw',
+        'Refueling Base (MAP10) - Exit',
+        'Refueling Base (MAP10) - Invulnerability',
+        'Refueling Base (MAP10) - Invulnerability 2',
+        'Refueling Base (MAP10) - Mega Armor',
+        'Refueling Base (MAP10) - Megasphere',
+        'Refueling Base (MAP10) - Partial invisibility',
+        'Refueling Base (MAP10) - Plasma gun',
+        'Refueling Base (MAP10) - Rocket launcher',
+        'Refueling Base (MAP10) - Shotgun',
+        'Refueling Base (MAP10) - Supercharge',
+        'Refueling Base (MAP10) - Supercharge 2',
+        'Refueling Base (MAP10) - Yellow keycard',
+    },
+    'Suburbs (MAP16)': {
+        'Suburbs (MAP16) - BFG9000',
+        'Suburbs (MAP16) - Backpack',
+        'Suburbs (MAP16) - Berserk',
+        'Suburbs (MAP16) - Blue skull key',
+        'Suburbs (MAP16) - Chaingun',
+        'Suburbs (MAP16) - Exit',
+        'Suburbs (MAP16) - Invulnerability',
+        'Suburbs (MAP16) - Megasphere',
+        'Suburbs (MAP16) - Partial invisibility',
+        'Suburbs (MAP16) - Plasma gun',
+        'Suburbs (MAP16) - Plasma gun 2',
+        'Suburbs (MAP16) - Plasma gun 3',
+        'Suburbs (MAP16) - Plasma gun 4',
+        'Suburbs (MAP16) - Red skull key',
+        'Suburbs (MAP16) - Rocket launcher',
+        'Suburbs (MAP16) - Shotgun',
+        'Suburbs (MAP16) - Super Shotgun',
+        'Suburbs (MAP16) - Supercharge',
+    },
+    'Tenements (MAP17)': {
+        'Tenements (MAP17) - Armor',
+        'Tenements (MAP17) - Armor 2',
+        'Tenements (MAP17) - BFG9000',
+        'Tenements (MAP17) - Backpack',
+        'Tenements (MAP17) - Berserk',
+        'Tenements (MAP17) - Blue keycard',
+        'Tenements (MAP17) - Chaingun',
+        'Tenements (MAP17) - Exit',
+        'Tenements (MAP17) - Mega Armor',
+        'Tenements (MAP17) - Megasphere',
+        'Tenements (MAP17) - Partial invisibility',
+        'Tenements (MAP17) - Plasma gun',
+        'Tenements (MAP17) - Red keycard',
+        'Tenements (MAP17) - Rocket launcher',
+        'Tenements (MAP17) - Shotgun',
+        'Tenements (MAP17) - Supercharge',
+        'Tenements (MAP17) - Supercharge 2',
+        'Tenements (MAP17) - Yellow skull key',
+    },
+    'The Abandoned Mines (MAP26)': {
+        'The Abandoned Mines (MAP26) - Armor',
+        'The Abandoned Mines (MAP26) - Backpack',
+        'The Abandoned Mines (MAP26) - Blue keycard',
+        'The Abandoned Mines (MAP26) - Chaingun',
+        'The Abandoned Mines (MAP26) - Exit',
+        'The Abandoned Mines (MAP26) - Mega Armor',
+        'The Abandoned Mines (MAP26) - Partial invisibility',
+        'The Abandoned Mines (MAP26) - Plasma gun',
+        'The Abandoned Mines (MAP26) - Red keycard',
+        'The Abandoned Mines (MAP26) - Rocket launcher',
+        'The Abandoned Mines (MAP26) - Super Shotgun',
+        'The Abandoned Mines (MAP26) - Supercharge',
+        'The Abandoned Mines (MAP26) - Yellow keycard',
+    },
+    'The Catacombs (MAP22)': {
+        'The Catacombs (MAP22) - Armor',
+        'The Catacombs (MAP22) - Berserk',
+        'The Catacombs (MAP22) - Blue skull key',
+        'The Catacombs (MAP22) - Exit',
+        'The Catacombs (MAP22) - Plasma gun',
+        'The Catacombs (MAP22) - Red skull key',
+        'The Catacombs (MAP22) - Rocket launcher',
+        'The Catacombs (MAP22) - Shotgun',
+        'The Catacombs (MAP22) - Supercharge',
+    },
+    'The Chasm (MAP24)': {
+        'The Chasm (MAP24) - Armor',
+        'The Chasm (MAP24) - BFG9000',
+        'The Chasm (MAP24) - Backpack',
+        'The Chasm (MAP24) - Berserk',
+        'The Chasm (MAP24) - Berserk 2',
+        'The Chasm (MAP24) - Blue keycard',
+        'The Chasm (MAP24) - Exit',
+        'The Chasm (MAP24) - Invulnerability',
+        'The Chasm (MAP24) - Megasphere',
+        'The Chasm (MAP24) - Megasphere 2',
+        'The Chasm (MAP24) - Plasma gun',
+        'The Chasm (MAP24) - Red keycard',
+        'The Chasm (MAP24) - Rocket launcher',
+        'The Chasm (MAP24) - Shotgun',
+        'The Chasm (MAP24) - Super Shotgun',
+    },
+    'The Citadel (MAP19)': {
+        'The Citadel (MAP19) - Armor',
+        'The Citadel (MAP19) - Armor 2',
+        'The Citadel (MAP19) - Backpack',
+        'The Citadel (MAP19) - Berserk',
+        'The Citadel (MAP19) - Blue skull key',
+        'The Citadel (MAP19) - Chaingun',
+        'The Citadel (MAP19) - Computer area map',
+        'The Citadel (MAP19) - Exit',
+        'The Citadel (MAP19) - Invulnerability',
+        'The Citadel (MAP19) - Mega Armor',
+        'The Citadel (MAP19) - Partial invisibility',
+        'The Citadel (MAP19) - Red skull key',
+        'The Citadel (MAP19) - Rocket launcher',
+        'The Citadel (MAP19) - Super Shotgun',
+        'The Citadel (MAP19) - Supercharge',
+        'The Citadel (MAP19) - Yellow skull key',
+    },
+    'The Courtyard (MAP18)': {
+        'The Courtyard (MAP18) - Armor',
+        'The Courtyard (MAP18) - BFG9000',
+        'The Courtyard (MAP18) - Backpack',
+        'The Courtyard (MAP18) - Berserk',
+        'The Courtyard (MAP18) - Blue skull key',
+        'The Courtyard (MAP18) - Chaingun',
+        'The Courtyard (MAP18) - Computer area map',
+        'The Courtyard (MAP18) - Exit',
+        'The Courtyard (MAP18) - Invulnerability',
+        'The Courtyard (MAP18) - Invulnerability 2',
+        'The Courtyard (MAP18) - Partial invisibility',
+        'The Courtyard (MAP18) - Partial invisibility 2',
+        'The Courtyard (MAP18) - Plasma gun',
+        'The Courtyard (MAP18) - Rocket launcher',
+        'The Courtyard (MAP18) - Shotgun',
+        'The Courtyard (MAP18) - Super Shotgun',
+        'The Courtyard (MAP18) - Supercharge',
+        'The Courtyard (MAP18) - Yellow skull key',
+    },
+    'The Crusher (MAP06)': {
+        'The Crusher (MAP06) - Armor',
+        'The Crusher (MAP06) - Backpack',
+        'The Crusher (MAP06) - Blue keycard',
+        'The Crusher (MAP06) - Blue keycard 2',
+        'The Crusher (MAP06) - Blue keycard 3',
+        'The Crusher (MAP06) - Exit',
+        'The Crusher (MAP06) - Mega Armor',
+        'The Crusher (MAP06) - Megasphere',
+        'The Crusher (MAP06) - Megasphere 2',
+        'The Crusher (MAP06) - Plasma gun',
+        'The Crusher (MAP06) - Red keycard',
+        'The Crusher (MAP06) - Rocket launcher',
+        'The Crusher (MAP06) - Super Shotgun',
+        'The Crusher (MAP06) - Supercharge',
+        'The Crusher (MAP06) - Yellow keycard',
+    },
+    'The Factory (MAP12)': {
+        'The Factory (MAP12) - Armor',
+        'The Factory (MAP12) - Armor 2',
+        'The Factory (MAP12) - BFG9000',
+        'The Factory (MAP12) - Backpack',
+        'The Factory (MAP12) - Berserk',
+        'The Factory (MAP12) - Berserk 2',
+        'The Factory (MAP12) - Berserk 3',
+        'The Factory (MAP12) - Blue keycard',
+        'The Factory (MAP12) - Chaingun',
+        'The Factory (MAP12) - Exit',
+        'The Factory (MAP12) - Partial invisibility',
+        'The Factory (MAP12) - Shotgun',
+        'The Factory (MAP12) - Super Shotgun',
+        'The Factory (MAP12) - Supercharge',
+        'The Factory (MAP12) - Supercharge 2',
+        'The Factory (MAP12) - Yellow keycard',
+    },
+    'The Focus (MAP04)': {
+        'The Focus (MAP04) - Blue keycard',
+        'The Focus (MAP04) - Exit',
+        'The Focus (MAP04) - Red keycard',
+        'The Focus (MAP04) - Super Shotgun',
+        'The Focus (MAP04) - Yellow keycard',
+    },
+    'The Gantlet (MAP03)': {
+        'The Gantlet (MAP03) - Backpack',
+        'The Gantlet (MAP03) - Blue keycard',
+        'The Gantlet (MAP03) - Chaingun',
+        'The Gantlet (MAP03) - Exit',
+        'The Gantlet (MAP03) - Mega Armor',
+        'The Gantlet (MAP03) - Mega Armor 2',
+        'The Gantlet (MAP03) - Partial invisibility',
+        'The Gantlet (MAP03) - Red keycard',
+        'The Gantlet (MAP03) - Rocket launcher',
+        'The Gantlet (MAP03) - Shotgun',
+        'The Gantlet (MAP03) - Supercharge',
+    },
+    'The Inmost Dens (MAP14)': {
+        'The Inmost Dens (MAP14) - Berserk',
+        'The Inmost Dens (MAP14) - Blue skull key',
+        'The Inmost Dens (MAP14) - Chaingun',
+        'The Inmost Dens (MAP14) - Exit',
+        'The Inmost Dens (MAP14) - Mega Armor',
+        'The Inmost Dens (MAP14) - Partial invisibility',
+        'The Inmost Dens (MAP14) - Plasma gun',
+        'The Inmost Dens (MAP14) - Red skull key',
+        'The Inmost Dens (MAP14) - Rocket launcher',
+        'The Inmost Dens (MAP14) - Shotgun',
+        'The Inmost Dens (MAP14) - Supercharge',
+    },
+    'The Living End (MAP29)': {
+        'The Living End (MAP29) - Armor',
+        'The Living End (MAP29) - Backpack',
+        'The Living End (MAP29) - Backpack 2',
+        'The Living End (MAP29) - Berserk',
+        'The Living End (MAP29) - Berserk 2',
+        'The Living End (MAP29) - Chaingun',
+        'The Living End (MAP29) - Exit',
+        'The Living End (MAP29) - Mega Armor',
+        'The Living End (MAP29) - Plasma gun',
+        'The Living End (MAP29) - Super Shotgun',
+        'The Living End (MAP29) - Supercharge',
+    },
+    'The Pit (MAP09)': {
+        'The Pit (MAP09) - Armor',
+        'The Pit (MAP09) - BFG9000',
+        'The Pit (MAP09) - Backpack',
+        'The Pit (MAP09) - Berserk',
+        'The Pit (MAP09) - Berserk 2',
+        'The Pit (MAP09) - Berserk 3',
+        'The Pit (MAP09) - Blue keycard',
+        'The Pit (MAP09) - Computer area map',
+        'The Pit (MAP09) - Exit',
+        'The Pit (MAP09) - Mega Armor',
+        'The Pit (MAP09) - Mega Armor 2',
+        'The Pit (MAP09) - Rocket launcher',
+        'The Pit (MAP09) - Shotgun',
+        'The Pit (MAP09) - Supercharge',
+        'The Pit (MAP09) - Supercharge 2',
+        'The Pit (MAP09) - Yellow keycard',
+    },
+    'The Spirit World (MAP28)': {
+        'The Spirit World (MAP28) - Armor',
+        'The Spirit World (MAP28) - BFG9000',
+        'The Spirit World (MAP28) - Backpack',
+        'The Spirit World (MAP28) - Backpack 2',
+        'The Spirit World (MAP28) - Backpack 3',
+        'The Spirit World (MAP28) - Backpack 4',
+        'The Spirit World (MAP28) - Berserk',
+        'The Spirit World (MAP28) - Chaingun',
+        'The Spirit World (MAP28) - Chainsaw',
+        'The Spirit World (MAP28) - Exit',
+        'The Spirit World (MAP28) - Invulnerability',
+        'The Spirit World (MAP28) - Invulnerability 2',
+        'The Spirit World (MAP28) - Invulnerability 3',
+        'The Spirit World (MAP28) - Invulnerability 4',
+        'The Spirit World (MAP28) - Invulnerability 5',
+        'The Spirit World (MAP28) - Megasphere',
+        'The Spirit World (MAP28) - Megasphere 2',
+        'The Spirit World (MAP28) - Plasma gun',
+        'The Spirit World (MAP28) - Red skull key',
+        'The Spirit World (MAP28) - Rocket launcher',
+        'The Spirit World (MAP28) - Super Shotgun',
+        'The Spirit World (MAP28) - Supercharge',
+        'The Spirit World (MAP28) - Yellow skull key',
+    },
+    'The Waste Tunnels (MAP05)': {
+        'The Waste Tunnels (MAP05) - Armor',
+        'The Waste Tunnels (MAP05) - Berserk',
+        'The Waste Tunnels (MAP05) - Blue keycard',
+        'The Waste Tunnels (MAP05) - Exit',
+        'The Waste Tunnels (MAP05) - Mega Armor',
+        'The Waste Tunnels (MAP05) - Plasma gun',
+        'The Waste Tunnels (MAP05) - Red keycard',
+        'The Waste Tunnels (MAP05) - Rocket launcher',
+        'The Waste Tunnels (MAP05) - Shotgun',
+        'The Waste Tunnels (MAP05) - Super Shotgun',
+        'The Waste Tunnels (MAP05) - Supercharge',
+        'The Waste Tunnels (MAP05) - Supercharge 2',
+        'The Waste Tunnels (MAP05) - Yellow keycard',
+    },
+    'Tricks and Traps (MAP08)': {
+        'Tricks and Traps (MAP08) - Armor',
+        'Tricks and Traps (MAP08) - Armor 2',
+        'Tricks and Traps (MAP08) - BFG9000',
+        'Tricks and Traps (MAP08) - Backpack',
+        'Tricks and Traps (MAP08) - Backpack 2',
+        'Tricks and Traps (MAP08) - Backpack 3',
+        'Tricks and Traps (MAP08) - Backpack 4',
+        'Tricks and Traps (MAP08) - Backpack 5',
+        'Tricks and Traps (MAP08) - Chaingun',
+        'Tricks and Traps (MAP08) - Chainsaw',
+        'Tricks and Traps (MAP08) - Exit',
+        'Tricks and Traps (MAP08) - Invulnerability',
+        'Tricks and Traps (MAP08) - Invulnerability 2',
+        'Tricks and Traps (MAP08) - Invulnerability 3',
+        'Tricks and Traps (MAP08) - Invulnerability 4',
+        'Tricks and Traps (MAP08) - Invulnerability 5',
+        'Tricks and Traps (MAP08) - Partial invisibility',
+        'Tricks and Traps (MAP08) - Plasma gun',
+        'Tricks and Traps (MAP08) - Red skull key',
+        'Tricks and Traps (MAP08) - Rocket launcher',
+        'Tricks and Traps (MAP08) - Shotgun',
+        'Tricks and Traps (MAP08) - Supercharge',
+        'Tricks and Traps (MAP08) - Supercharge 2',
+        'Tricks and Traps (MAP08) - Yellow skull key',
+    },
+    'Underhalls (MAP02)': {
+        'Underhalls (MAP02) - Blue keycard',
+        'Underhalls (MAP02) - Exit',
+        'Underhalls (MAP02) - Mega Armor',
+        'Underhalls (MAP02) - Red keycard',
+        'Underhalls (MAP02) - Super Shotgun',
+    },
+    'Wolfenstein2 (MAP31)': {
+        'Wolfenstein2 (MAP31) - BFG9000',
+        'Wolfenstein2 (MAP31) - Backpack',
+        'Wolfenstein2 (MAP31) - Backpack 2',
+        'Wolfenstein2 (MAP31) - Backpack 3',
+        'Wolfenstein2 (MAP31) - Backpack 4',
+        'Wolfenstein2 (MAP31) - Berserk',
+        'Wolfenstein2 (MAP31) - Chaingun',
+        'Wolfenstein2 (MAP31) - Exit',
+        'Wolfenstein2 (MAP31) - Megasphere',
+        'Wolfenstein2 (MAP31) - Partial invisibility',
+        'Wolfenstein2 (MAP31) - Plasma gun',
+        'Wolfenstein2 (MAP31) - Rocket launcher',
+        'Wolfenstein2 (MAP31) - Shotgun',
+        'Wolfenstein2 (MAP31) - Super Shotgun',
+        'Wolfenstein2 (MAP31) - Supercharge',
+    },
+}
+
+
+death_logic_locations = [
+    "Entryway (MAP01) - Armor",
+]
diff --git a/worlds/doom_ii/Maps.py b/worlds/doom_ii/Maps.py
new file mode 100644
index 0000000000..cf41939fa5
--- /dev/null
+++ b/worlds/doom_ii/Maps.py
@@ -0,0 +1,39 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import List
+
+
+map_names: List[str] = [
+    'Entryway (MAP01)',
+    'Underhalls (MAP02)',
+    'The Gantlet (MAP03)',
+    'The Focus (MAP04)',
+    'The Waste Tunnels (MAP05)',
+    'The Crusher (MAP06)',
+    'Dead Simple (MAP07)',
+    'Tricks and Traps (MAP08)',
+    'The Pit (MAP09)',
+    'Refueling Base (MAP10)',
+    'Circle of Death (MAP11)',
+    'The Factory (MAP12)',
+    'Downtown (MAP13)',
+    'The Inmost Dens (MAP14)',
+    'Industrial Zone (MAP15)',
+    'Suburbs (MAP16)',
+    'Tenements (MAP17)',
+    'The Courtyard (MAP18)',
+    'The Citadel (MAP19)',
+    'Gotcha! (MAP20)',
+    'Nirvana (MAP21)',
+    'The Catacombs (MAP22)',
+    'Barrels o Fun (MAP23)',
+    'The Chasm (MAP24)',
+    'Bloodfalls (MAP25)',
+    'The Abandoned Mines (MAP26)',
+    'Monster Condo (MAP27)',
+    'The Spirit World (MAP28)',
+    'The Living End (MAP29)',
+    'Icon of Sin (MAP30)',
+    'Wolfenstein2 (MAP31)',
+    'Grosse2 (MAP32)',
+]
diff --git a/worlds/doom_ii/Options.py b/worlds/doom_ii/Options.py
new file mode 100644
index 0000000000..cc39512a17
--- /dev/null
+++ b/worlds/doom_ii/Options.py
@@ -0,0 +1,150 @@
+import typing
+
+from Options import PerGameCommonOptions, Choice, Toggle, DeathLink, DefaultOnToggle, StartInventoryPool
+from dataclasses import dataclass
+
+
+class Difficulty(Choice):
+    """
+    Choose the difficulty option. Those match DOOM's difficulty options.
+    baby (I'm too young to die.) double ammos, half damage, less monsters or strength.
+    easy (Hey, not too rough.) less monsters or strength.
+    medium (Hurt me plenty.) Default.
+    hard (Ultra-Violence.) More monsters or strength.
+    nightmare (Nightmare!) Monsters attack more rapidly and respawn.
+    """
+    display_name = "Difficulty"
+    option_baby = 0
+    option_easy = 1
+    option_medium = 2
+    option_hard = 3
+    option_nightmare = 4
+    default = 2
+
+
+class RandomMonsters(Choice):
+    """
+    Choose how monsters are randomized.
+    vanilla: No randomization
+    shuffle: Monsters are shuffled within the level
+    random_balanced: Monsters are completely randomized, but balanced based on existing ratio in the level. (Small monsters vs medium vs big)
+    random_chaotic: Monsters are completely randomized, but balanced based on existing ratio in the entire game.
+    """
+    display_name = "Random Monsters"
+    option_vanilla = 0
+    option_shuffle = 1
+    option_random_balanced = 2
+    option_random_chaotic = 3
+    default = 2
+
+
+class RandomPickups(Choice):
+    """
+    Choose how pickups are randomized.
+    vanilla: No randomization
+    shuffle: Pickups are shuffled within the level
+    random_balanced: Pickups are completely randomized, but balanced based on existing ratio in the level. (Small pickups vs Big)
+    """
+    display_name = "Random Pickups"
+    option_vanilla = 0
+    option_shuffle = 1
+    option_random_balanced = 2
+    default = 1
+
+
+class RandomMusic(Choice):
+    """
+    Level musics will be randomized.
+    vanilla: No randomization
+    shuffle_selected: Selected episodes' levels will be shuffled
+    shuffle_game: All the music will be shuffled
+    """
+    display_name = "Random Music"
+    option_vanilla = 0
+    option_shuffle_selected = 1
+    option_shuffle_game = 2
+    default = 0
+    
+
+class FlipLevels(Choice):
+    """
+    Flip levels on one axis.
+    vanilla: No flipping
+    flipped: All levels are flipped
+    random: Random levels are flipped
+    """
+    display_name = "Flip Levels"
+    option_vanilla = 0
+    option_flipped = 1
+    option_randomly_flipped = 2
+    default = 0
+
+
+class AllowDeathLogic(Toggle):
+    """Some locations require a timed puzzle that can only be tried once.
+    After which, if the player failed to get it, the location cannot be checked anymore.
+    By default, no progression items are placed here. There is a way, hovewer, to still get them:
+    Get killed in the current map. The map will reset, you can now attempt the puzzle again."""
+    display_name = "Allow Death Logic"
+
+    
+class Pro(Toggle):
+    """Include difficult tricks into rules. Mostly employed by speed runners.
+    i.e.: Leaps across to a locked area, trigger a switch behind a window at the right angle, etc."""
+    display_name = "Pro Doom"
+
+
+class StartWithComputerAreaMaps(Toggle):
+    """Give the player all Computer Area Map items from the start."""
+    display_name = "Start With Computer Area Maps"
+
+
+class ResetLevelOnDeath(DefaultOnToggle):
+    """When dying, levels are reset and monsters respawned. But inventory and checks are kept.
+    Turning this setting off is considered easy mode. Good for new players that don't know the levels well."""
+    display_message="Reset level on death"
+
+
+class Episode1(DefaultOnToggle):
+    """Subterranean and Outpost.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 1"
+
+
+class Episode2(DefaultOnToggle):
+    """City.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 2"
+
+
+class Episode3(DefaultOnToggle):
+    """Hell.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 3"
+
+
+class SecretLevels(Toggle):
+    """Secret levels.
+    This is too short to be an episode. It's additive.
+    Another episode will have to be selected along with this one.
+    Otherwise episode 1 will be added."""
+    display_name = "Secret Levels"
+
+
+@dataclass
+class DOOM2Options(PerGameCommonOptions):
+    start_inventory_from_pool: StartInventoryPool
+    difficulty: Difficulty
+    random_monsters: RandomMonsters
+    random_pickups: RandomPickups
+    random_music: RandomMusic
+    flip_levels: FlipLevels
+    allow_death_logic: AllowDeathLogic
+    pro: Pro
+    start_with_computer_area_maps: StartWithComputerAreaMaps
+    death_link: DeathLink
+    reset_level_on_death: ResetLevelOnDeath
+    episode1: Episode1
+    episode2: Episode2
+    episode3: Episode3
+    episode4: SecretLevels
diff --git a/worlds/doom_ii/Regions.py b/worlds/doom_ii/Regions.py
new file mode 100644
index 0000000000..3d81d7abb8
--- /dev/null
+++ b/worlds/doom_ii/Regions.py
@@ -0,0 +1,502 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import List
+from BaseClasses import TypedDict
+
+class ConnectionDict(TypedDict, total=False):
+    target: str
+    pro: bool
+
+class RegionDict(TypedDict, total=False):
+    name: str
+    connects_to_hub: bool
+    episode: int
+    connections: List[ConnectionDict]
+
+
+regions:List[RegionDict] = [
+    # Entryway (MAP01)
+    {"name":"Entryway (MAP01) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[]},
+
+    # Underhalls (MAP02)
+    {"name":"Underhalls (MAP02) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[{"target":"Underhalls (MAP02) Red","pro":False}]},
+    {"name":"Underhalls (MAP02) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"Underhalls (MAP02) Red","pro":False}]},
+    {"name":"Underhalls (MAP02) Red",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"Underhalls (MAP02) Blue","pro":False},
+        {"target":"Underhalls (MAP02) Main","pro":False}]},
+
+    # The Gantlet (MAP03)
+    {"name":"The Gantlet (MAP03) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Gantlet (MAP03) Blue","pro":False},
+        {"target":"The Gantlet (MAP03) Blue Pro Jump","pro":True}]},
+    {"name":"The Gantlet (MAP03) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Gantlet (MAP03) Main","pro":False},
+        {"target":"The Gantlet (MAP03) Red","pro":False},
+        {"target":"The Gantlet (MAP03) Blue Pro Jump","pro":False}]},
+    {"name":"The Gantlet (MAP03) Red",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[]},
+    {"name":"The Gantlet (MAP03) Blue Pro Jump",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Gantlet (MAP03) Blue","pro":False}]},
+
+    # The Focus (MAP04)
+    {"name":"The Focus (MAP04) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Focus (MAP04) Red","pro":False},
+        {"target":"The Focus (MAP04) Blue","pro":False}]},
+    {"name":"The Focus (MAP04) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Focus (MAP04) Main","pro":False}]},
+    {"name":"The Focus (MAP04) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Focus (MAP04) Red","pro":False}]},
+    {"name":"The Focus (MAP04) Red",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Focus (MAP04) Yellow","pro":False},
+        {"target":"The Focus (MAP04) Main","pro":False}]},
+
+    # The Waste Tunnels (MAP05)
+    {"name":"The Waste Tunnels (MAP05) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Waste Tunnels (MAP05) Red","pro":False},
+        {"target":"The Waste Tunnels (MAP05) Blue","pro":False}]},
+    {"name":"The Waste Tunnels (MAP05) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Waste Tunnels (MAP05) Yellow","pro":False},
+        {"target":"The Waste Tunnels (MAP05) Main","pro":False}]},
+    {"name":"The Waste Tunnels (MAP05) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Waste Tunnels (MAP05) Blue","pro":False}]},
+    {"name":"The Waste Tunnels (MAP05) Red",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Waste Tunnels (MAP05) Main","pro":False}]},
+
+    # The Crusher (MAP06)
+    {"name":"The Crusher (MAP06) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[{"target":"The Crusher (MAP06) Blue","pro":False}]},
+    {"name":"The Crusher (MAP06) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Crusher (MAP06) Red","pro":False},
+        {"target":"The Crusher (MAP06) Main","pro":False}]},
+    {"name":"The Crusher (MAP06) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Crusher (MAP06) Red","pro":False}]},
+    {"name":"The Crusher (MAP06) Red",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Crusher (MAP06) Yellow","pro":False},
+        {"target":"The Crusher (MAP06) Blue","pro":False},
+        {"target":"The Crusher (MAP06) Main","pro":False}]},
+
+    # Dead Simple (MAP07)
+    {"name":"Dead Simple (MAP07) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[]},
+
+    # Tricks and Traps (MAP08)
+    {"name":"Tricks and Traps (MAP08) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"Tricks and Traps (MAP08) Red","pro":False},
+        {"target":"Tricks and Traps (MAP08) Yellow","pro":False}]},
+    {"name":"Tricks and Traps (MAP08) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"Tricks and Traps (MAP08) Main","pro":False}]},
+    {"name":"Tricks and Traps (MAP08) Red",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"Tricks and Traps (MAP08) Main","pro":False}]},
+
+    # The Pit (MAP09)
+    {"name":"The Pit (MAP09) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Pit (MAP09) Yellow","pro":False},
+        {"target":"The Pit (MAP09) Blue","pro":False}]},
+    {"name":"The Pit (MAP09) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[]},
+    {"name":"The Pit (MAP09) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Pit (MAP09) Main","pro":False}]},
+
+    # Refueling Base (MAP10)
+    {"name":"Refueling Base (MAP10) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[{"target":"Refueling Base (MAP10) Yellow","pro":False}]},
+    {"name":"Refueling Base (MAP10) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"Refueling Base (MAP10) Main","pro":False},
+        {"target":"Refueling Base (MAP10) Yellow Blue","pro":False}]},
+    {"name":"Refueling Base (MAP10) Yellow Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"Refueling Base (MAP10) Yellow","pro":False}]},
+
+    # Circle of Death (MAP11)
+    {"name":"Circle of Death (MAP11) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"Circle of Death (MAP11) Blue","pro":False},
+        {"target":"Circle of Death (MAP11) Red","pro":False}]},
+    {"name":"Circle of Death (MAP11) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"Circle of Death (MAP11) Main","pro":False}]},
+    {"name":"Circle of Death (MAP11) Red",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"Circle of Death (MAP11) Main","pro":False}]},
+
+    # The Factory (MAP12)
+    {"name":"The Factory (MAP12) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"The Factory (MAP12) Yellow","pro":False},
+        {"target":"The Factory (MAP12) Blue","pro":False}]},
+    {"name":"The Factory (MAP12) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Factory (MAP12) Main","pro":False}]},
+    {"name":"The Factory (MAP12) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[]},
+
+    # Downtown (MAP13)
+    {"name":"Downtown (MAP13) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"Downtown (MAP13) Yellow","pro":False},
+        {"target":"Downtown (MAP13) Red","pro":False},
+        {"target":"Downtown (MAP13) Blue","pro":False}]},
+    {"name":"Downtown (MAP13) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Downtown (MAP13) Main","pro":False}]},
+    {"name":"Downtown (MAP13) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Downtown (MAP13) Main","pro":False}]},
+    {"name":"Downtown (MAP13) Red",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Downtown (MAP13) Main","pro":False}]},
+
+    # The Inmost Dens (MAP14)
+    {"name":"The Inmost Dens (MAP14) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[{"target":"The Inmost Dens (MAP14) Red","pro":False}]},
+    {"name":"The Inmost Dens (MAP14) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Inmost Dens (MAP14) Main","pro":False},
+        {"target":"The Inmost Dens (MAP14) Red East","pro":False}]},
+    {"name":"The Inmost Dens (MAP14) Red",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Inmost Dens (MAP14) Main","pro":False},
+        {"target":"The Inmost Dens (MAP14) Red South","pro":False},
+        {"target":"The Inmost Dens (MAP14) Red East","pro":False}]},
+    {"name":"The Inmost Dens (MAP14) Red East",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Inmost Dens (MAP14) Blue","pro":False},
+        {"target":"The Inmost Dens (MAP14) Main","pro":False}]},
+    {"name":"The Inmost Dens (MAP14) Red South",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Inmost Dens (MAP14) Main","pro":False}]},
+
+    # Industrial Zone (MAP15)
+    {"name":"Industrial Zone (MAP15) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"Industrial Zone (MAP15) Yellow East","pro":False},
+        {"target":"Industrial Zone (MAP15) Yellow West","pro":False}]},
+    {"name":"Industrial Zone (MAP15) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Industrial Zone (MAP15) Yellow East","pro":False}]},
+    {"name":"Industrial Zone (MAP15) Yellow East",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"Industrial Zone (MAP15) Blue","pro":False},
+        {"target":"Industrial Zone (MAP15) Main","pro":False}]},
+    {"name":"Industrial Zone (MAP15) Yellow West",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Industrial Zone (MAP15) Main","pro":False}]},
+
+    # Suburbs (MAP16)
+    {"name":"Suburbs (MAP16) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"Suburbs (MAP16) Red","pro":False},
+        {"target":"Suburbs (MAP16) Blue","pro":False}]},
+    {"name":"Suburbs (MAP16) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Suburbs (MAP16) Main","pro":False}]},
+    {"name":"Suburbs (MAP16) Red",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Suburbs (MAP16) Main","pro":False}]},
+
+    # Tenements (MAP17)
+    {"name":"Tenements (MAP17) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[{"target":"Tenements (MAP17) Red","pro":False}]},
+    {"name":"Tenements (MAP17) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"Tenements (MAP17) Red","pro":False}]},
+    {"name":"Tenements (MAP17) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"Tenements (MAP17) Red","pro":False},
+        {"target":"Tenements (MAP17) Blue","pro":False}]},
+    {"name":"Tenements (MAP17) Red",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"Tenements (MAP17) Yellow","pro":False},
+        {"target":"Tenements (MAP17) Blue","pro":False},
+        {"target":"Tenements (MAP17) Main","pro":False}]},
+
+    # The Courtyard (MAP18)
+    {"name":"The Courtyard (MAP18) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"The Courtyard (MAP18) Yellow","pro":False},
+        {"target":"The Courtyard (MAP18) Blue","pro":False}]},
+    {"name":"The Courtyard (MAP18) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Courtyard (MAP18) Main","pro":False}]},
+    {"name":"The Courtyard (MAP18) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Courtyard (MAP18) Main","pro":False}]},
+
+    # The Citadel (MAP19)
+    {"name":"The Citadel (MAP19) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[{"target":"The Citadel (MAP19) Red","pro":False}]},
+    {"name":"The Citadel (MAP19) Red",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Citadel (MAP19) Main","pro":False}]},
+
+    # Gotcha! (MAP20)
+    {"name":"Gotcha! (MAP20) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[]},
+
+    # Nirvana (MAP21)
+    {"name":"Nirvana (MAP21) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"Nirvana (MAP21) Yellow","pro":False}]},
+    {"name":"Nirvana (MAP21) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"Nirvana (MAP21) Main","pro":False},
+        {"target":"Nirvana (MAP21) Magenta","pro":False}]},
+    {"name":"Nirvana (MAP21) Magenta",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"Nirvana (MAP21) Yellow","pro":False}]},
+
+    # The Catacombs (MAP22)
+    {"name":"The Catacombs (MAP22) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"The Catacombs (MAP22) Blue","pro":False},
+        {"target":"The Catacombs (MAP22) Red","pro":False}]},
+    {"name":"The Catacombs (MAP22) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Catacombs (MAP22) Main","pro":False}]},
+    {"name":"The Catacombs (MAP22) Red",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Catacombs (MAP22) Main","pro":False}]},
+
+    # Barrels o Fun (MAP23)
+    {"name":"Barrels o Fun (MAP23) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"Barrels o Fun (MAP23) Yellow","pro":False}]},
+    {"name":"Barrels o Fun (MAP23) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"Barrels o Fun (MAP23) Main","pro":False}]},
+
+    # The Chasm (MAP24)
+    {"name":"The Chasm (MAP24) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"The Chasm (MAP24) Red","pro":False}]},
+    {"name":"The Chasm (MAP24) Red",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Chasm (MAP24) Main","pro":False}]},
+
+    # Bloodfalls (MAP25)
+    {"name":"Bloodfalls (MAP25) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"Bloodfalls (MAP25) Blue","pro":False}]},
+    {"name":"Bloodfalls (MAP25) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"Bloodfalls (MAP25) Main","pro":False}]},
+
+    # The Abandoned Mines (MAP26)
+    {"name":"The Abandoned Mines (MAP26) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"The Abandoned Mines (MAP26) Yellow","pro":False},
+        {"target":"The Abandoned Mines (MAP26) Red","pro":False},
+        {"target":"The Abandoned Mines (MAP26) Blue","pro":False}]},
+    {"name":"The Abandoned Mines (MAP26) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Abandoned Mines (MAP26) Main","pro":False}]},
+    {"name":"The Abandoned Mines (MAP26) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Abandoned Mines (MAP26) Main","pro":False}]},
+    {"name":"The Abandoned Mines (MAP26) Red",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Abandoned Mines (MAP26) Main","pro":False}]},
+
+    # Monster Condo (MAP27)
+    {"name":"Monster Condo (MAP27) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"Monster Condo (MAP27) Yellow","pro":False},
+        {"target":"Monster Condo (MAP27) Red","pro":False},
+        {"target":"Monster Condo (MAP27) Blue","pro":False}]},
+    {"name":"Monster Condo (MAP27) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"Monster Condo (MAP27) Main","pro":False}]},
+    {"name":"Monster Condo (MAP27) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"Monster Condo (MAP27) Main","pro":False}]},
+    {"name":"Monster Condo (MAP27) Red",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"Monster Condo (MAP27) Main","pro":False}]},
+
+    # The Spirit World (MAP28)
+    {"name":"The Spirit World (MAP28) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"The Spirit World (MAP28) Yellow","pro":False},
+        {"target":"The Spirit World (MAP28) Red","pro":False}]},
+    {"name":"The Spirit World (MAP28) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Spirit World (MAP28) Main","pro":False}]},
+    {"name":"The Spirit World (MAP28) Red",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Spirit World (MAP28) Main","pro":False}]},
+
+    # The Living End (MAP29)
+    {"name":"The Living End (MAP29) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[]},
+
+    # Icon of Sin (MAP30)
+    {"name":"Icon of Sin (MAP30) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[]},
+
+    # Wolfenstein2 (MAP31)
+    {"name":"Wolfenstein2 (MAP31) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[]},
+
+    # Grosse2 (MAP32)
+    {"name":"Grosse2 (MAP32) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[]},
+]
diff --git a/worlds/doom_ii/Rules.py b/worlds/doom_ii/Rules.py
new file mode 100644
index 0000000000..89f3a10f9f
--- /dev/null
+++ b/worlds/doom_ii/Rules.py
@@ -0,0 +1,501 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import TYPE_CHECKING
+from worlds.generic.Rules import set_rule
+
+if TYPE_CHECKING:
+    from . import DOOM2World
+
+
+def set_episode1_rules(player, world, pro):
+    # Entryway (MAP01)
+    set_rule(world.get_entrance("Hub -> Entryway (MAP01) Main", player), lambda state:
+        state.has("Entryway (MAP01)", player, 1))
+    set_rule(world.get_entrance("Hub -> Entryway (MAP01) Main", player), lambda state:
+        state.has("Entryway (MAP01)", player, 1))
+
+    # Underhalls (MAP02)
+    set_rule(world.get_entrance("Hub -> Underhalls (MAP02) Main", player), lambda state:
+        state.has("Underhalls (MAP02)", player, 1))
+    set_rule(world.get_entrance("Hub -> Underhalls (MAP02) Main", player), lambda state:
+        state.has("Underhalls (MAP02)", player, 1))
+    set_rule(world.get_entrance("Hub -> Underhalls (MAP02) Main", player), lambda state:
+        state.has("Underhalls (MAP02)", player, 1))
+    set_rule(world.get_entrance("Underhalls (MAP02) Main -> Underhalls (MAP02) Red", player), lambda state:
+        state.has("Underhalls (MAP02) - Red keycard", player, 1))
+    set_rule(world.get_entrance("Underhalls (MAP02) Blue -> Underhalls (MAP02) Red", player), lambda state:
+        state.has("Underhalls (MAP02) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("Underhalls (MAP02) Red -> Underhalls (MAP02) Blue", player), lambda state:
+        state.has("Underhalls (MAP02) - Blue keycard", player, 1))
+
+    # The Gantlet (MAP03)
+    set_rule(world.get_entrance("Hub -> The Gantlet (MAP03) Main", player), lambda state:
+       (state.has("The Gantlet (MAP03)", player, 1)) and
+       (state.has("Shotgun", player, 1) or
+        state.has("Chaingun", player, 1) or
+        state.has("Super Shotgun", player, 1)))
+    set_rule(world.get_entrance("The Gantlet (MAP03) Main -> The Gantlet (MAP03) Blue", player), lambda state:
+        state.has("The Gantlet (MAP03) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Gantlet (MAP03) Blue -> The Gantlet (MAP03) Red", player), lambda state:
+        state.has("The Gantlet (MAP03) - Red keycard", player, 1))
+
+    # The Focus (MAP04)
+    set_rule(world.get_entrance("Hub -> The Focus (MAP04) Main", player), lambda state:
+       (state.has("The Focus (MAP04)", player, 1)) and
+       (state.has("Shotgun", player, 1) or
+        state.has("Chaingun", player, 1) or
+        state.has("Super Shotgun", player, 1)))
+    set_rule(world.get_entrance("The Focus (MAP04) Main -> The Focus (MAP04) Red", player), lambda state:
+        state.has("The Focus (MAP04) - Red keycard", player, 1))
+    set_rule(world.get_entrance("The Focus (MAP04) Main -> The Focus (MAP04) Blue", player), lambda state:
+        state.has("The Focus (MAP04) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Focus (MAP04) Yellow -> The Focus (MAP04) Red", player), lambda state:
+        state.has("The Focus (MAP04) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Focus (MAP04) Red -> The Focus (MAP04) Yellow", player), lambda state:
+        state.has("The Focus (MAP04) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Focus (MAP04) Red -> The Focus (MAP04) Main", player), lambda state:
+        state.has("The Focus (MAP04) - Red keycard", player, 1))
+
+    # The Waste Tunnels (MAP05)
+    set_rule(world.get_entrance("Hub -> The Waste Tunnels (MAP05) Main", player), lambda state:
+       (state.has("The Waste Tunnels (MAP05)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("The Waste Tunnels (MAP05) Main -> The Waste Tunnels (MAP05) Red", player), lambda state:
+        state.has("The Waste Tunnels (MAP05) - Red keycard", player, 1))
+    set_rule(world.get_entrance("The Waste Tunnels (MAP05) Main -> The Waste Tunnels (MAP05) Blue", player), lambda state:
+        state.has("The Waste Tunnels (MAP05) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Waste Tunnels (MAP05) Blue -> The Waste Tunnels (MAP05) Yellow", player), lambda state:
+        state.has("The Waste Tunnels (MAP05) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Waste Tunnels (MAP05) Blue -> The Waste Tunnels (MAP05) Main", player), lambda state:
+        state.has("The Waste Tunnels (MAP05) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Waste Tunnels (MAP05) Yellow -> The Waste Tunnels (MAP05) Blue", player), lambda state:
+        state.has("The Waste Tunnels (MAP05) - Yellow keycard", player, 1))
+
+    # The Crusher (MAP06)
+    set_rule(world.get_entrance("Hub -> The Crusher (MAP06) Main", player), lambda state:
+       (state.has("The Crusher (MAP06)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("The Crusher (MAP06) Main -> The Crusher (MAP06) Blue", player), lambda state:
+        state.has("The Crusher (MAP06) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Crusher (MAP06) Blue -> The Crusher (MAP06) Red", player), lambda state:
+        state.has("The Crusher (MAP06) - Red keycard", player, 1))
+    set_rule(world.get_entrance("The Crusher (MAP06) Blue -> The Crusher (MAP06) Main", player), lambda state:
+        state.has("The Crusher (MAP06) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Crusher (MAP06) Yellow -> The Crusher (MAP06) Red", player), lambda state:
+        state.has("The Crusher (MAP06) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Crusher (MAP06) Red -> The Crusher (MAP06) Yellow", player), lambda state:
+        state.has("The Crusher (MAP06) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Crusher (MAP06) Red -> The Crusher (MAP06) Blue", player), lambda state:
+        state.has("The Crusher (MAP06) - Red keycard", player, 1))
+
+    # Dead Simple (MAP07)
+    set_rule(world.get_entrance("Hub -> Dead Simple (MAP07) Main", player), lambda state:
+       (state.has("Dead Simple (MAP07)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+
+    # Tricks and Traps (MAP08)
+    set_rule(world.get_entrance("Hub -> Tricks and Traps (MAP08) Main", player), lambda state:
+       (state.has("Tricks and Traps (MAP08)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Tricks and Traps (MAP08) Main -> Tricks and Traps (MAP08) Red", player), lambda state:
+        state.has("Tricks and Traps (MAP08) - Red skull key", player, 1))
+    set_rule(world.get_entrance("Tricks and Traps (MAP08) Main -> Tricks and Traps (MAP08) Yellow", player), lambda state:
+        state.has("Tricks and Traps (MAP08) - Yellow skull key", player, 1))
+
+    # The Pit (MAP09)
+    set_rule(world.get_entrance("Hub -> The Pit (MAP09) Main", player), lambda state:
+       (state.has("The Pit (MAP09)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("The Pit (MAP09) Main -> The Pit (MAP09) Yellow", player), lambda state:
+        state.has("The Pit (MAP09) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Pit (MAP09) Main -> The Pit (MAP09) Blue", player), lambda state:
+        state.has("The Pit (MAP09) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Pit (MAP09) Yellow -> The Pit (MAP09) Main", player), lambda state:
+        state.has("The Pit (MAP09) - Yellow keycard", player, 1))
+
+    # Refueling Base (MAP10)
+    set_rule(world.get_entrance("Hub -> Refueling Base (MAP10) Main", player), lambda state:
+       (state.has("Refueling Base (MAP10)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Refueling Base (MAP10) Main -> Refueling Base (MAP10) Yellow", player), lambda state:
+        state.has("Refueling Base (MAP10) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("Refueling Base (MAP10) Yellow -> Refueling Base (MAP10) Yellow Blue", player), lambda state:
+        state.has("Refueling Base (MAP10) - Blue keycard", player, 1))
+
+    # Circle of Death (MAP11)
+    set_rule(world.get_entrance("Hub -> Circle of Death (MAP11) Main", player), lambda state:
+       (state.has("Circle of Death (MAP11)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Circle of Death (MAP11) Main -> Circle of Death (MAP11) Blue", player), lambda state:
+        state.has("Circle of Death (MAP11) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("Circle of Death (MAP11) Main -> Circle of Death (MAP11) Red", player), lambda state:
+        state.has("Circle of Death (MAP11) - Red keycard", player, 1))
+
+
+def set_episode2_rules(player, world, pro):
+    # The Factory (MAP12)
+    set_rule(world.get_entrance("Hub -> The Factory (MAP12) Main", player), lambda state:
+       (state.has("The Factory (MAP12)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("The Factory (MAP12) Main -> The Factory (MAP12) Yellow", player), lambda state:
+        state.has("The Factory (MAP12) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Factory (MAP12) Main -> The Factory (MAP12) Blue", player), lambda state:
+        state.has("The Factory (MAP12) - Blue keycard", player, 1))
+
+    # Downtown (MAP13)
+    set_rule(world.get_entrance("Hub -> Downtown (MAP13) Main", player), lambda state:
+       (state.has("Downtown (MAP13)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Downtown (MAP13) Main -> Downtown (MAP13) Yellow", player), lambda state:
+        state.has("Downtown (MAP13) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("Downtown (MAP13) Main -> Downtown (MAP13) Red", player), lambda state:
+        state.has("Downtown (MAP13) - Red keycard", player, 1))
+    set_rule(world.get_entrance("Downtown (MAP13) Main -> Downtown (MAP13) Blue", player), lambda state:
+        state.has("Downtown (MAP13) - Blue keycard", player, 1))
+
+    # The Inmost Dens (MAP14)
+    set_rule(world.get_entrance("Hub -> The Inmost Dens (MAP14) Main", player), lambda state:
+       (state.has("The Inmost Dens (MAP14)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("The Inmost Dens (MAP14) Main -> The Inmost Dens (MAP14) Red", player), lambda state:
+        state.has("The Inmost Dens (MAP14) - Red skull key", player, 1))
+    set_rule(world.get_entrance("The Inmost Dens (MAP14) Blue -> The Inmost Dens (MAP14) Red East", player), lambda state:
+        state.has("The Inmost Dens (MAP14) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("The Inmost Dens (MAP14) Red -> The Inmost Dens (MAP14) Main", player), lambda state:
+        state.has("The Inmost Dens (MAP14) - Red skull key", player, 1))
+    set_rule(world.get_entrance("The Inmost Dens (MAP14) Red East -> The Inmost Dens (MAP14) Blue", player), lambda state:
+        state.has("The Inmost Dens (MAP14) - Blue skull key", player, 1))
+
+    # Industrial Zone (MAP15)
+    set_rule(world.get_entrance("Hub -> Industrial Zone (MAP15) Main", player), lambda state:
+       (state.has("Industrial Zone (MAP15)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Industrial Zone (MAP15) Main -> Industrial Zone (MAP15) Yellow East", player), lambda state:
+        state.has("Industrial Zone (MAP15) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("Industrial Zone (MAP15) Main -> Industrial Zone (MAP15) Yellow West", player), lambda state:
+        state.has("Industrial Zone (MAP15) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("Industrial Zone (MAP15) Blue -> Industrial Zone (MAP15) Yellow East", player), lambda state:
+        state.has("Industrial Zone (MAP15) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("Industrial Zone (MAP15) Yellow East -> Industrial Zone (MAP15) Blue", player), lambda state:
+        state.has("Industrial Zone (MAP15) - Blue keycard", player, 1))
+
+    # Suburbs (MAP16)
+    set_rule(world.get_entrance("Hub -> Suburbs (MAP16) Main", player), lambda state:
+       (state.has("Suburbs (MAP16)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Suburbs (MAP16) Main -> Suburbs (MAP16) Red", player), lambda state:
+        state.has("Suburbs (MAP16) - Red skull key", player, 1))
+    set_rule(world.get_entrance("Suburbs (MAP16) Main -> Suburbs (MAP16) Blue", player), lambda state:
+        state.has("Suburbs (MAP16) - Blue skull key", player, 1))
+
+    # Tenements (MAP17)
+    set_rule(world.get_entrance("Hub -> Tenements (MAP17) Main", player), lambda state:
+       (state.has("Tenements (MAP17)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Tenements (MAP17) Main -> Tenements (MAP17) Red", player), lambda state:
+        state.has("Tenements (MAP17) - Red keycard", player, 1))
+    set_rule(world.get_entrance("Tenements (MAP17) Red -> Tenements (MAP17) Yellow", player), lambda state:
+        state.has("Tenements (MAP17) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("Tenements (MAP17) Red -> Tenements (MAP17) Blue", player), lambda state:
+        state.has("Tenements (MAP17) - Blue keycard", player, 1))
+
+    # The Courtyard (MAP18)
+    set_rule(world.get_entrance("Hub -> The Courtyard (MAP18) Main", player), lambda state:
+       (state.has("The Courtyard (MAP18)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("The Courtyard (MAP18) Main -> The Courtyard (MAP18) Yellow", player), lambda state:
+        state.has("The Courtyard (MAP18) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("The Courtyard (MAP18) Main -> The Courtyard (MAP18) Blue", player), lambda state:
+        state.has("The Courtyard (MAP18) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("The Courtyard (MAP18) Blue -> The Courtyard (MAP18) Main", player), lambda state:
+        state.has("The Courtyard (MAP18) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("The Courtyard (MAP18) Yellow -> The Courtyard (MAP18) Main", player), lambda state:
+        state.has("The Courtyard (MAP18) - Yellow skull key", player, 1))
+
+    # The Citadel (MAP19)
+    set_rule(world.get_entrance("Hub -> The Citadel (MAP19) Main", player), lambda state:
+       (state.has("The Citadel (MAP19)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("The Citadel (MAP19) Main -> The Citadel (MAP19) Red", player), lambda state:
+       (state.has("The Citadel (MAP19) - Red skull key", player, 1)) and       (state.has("The Citadel (MAP19) - Blue skull key", player, 1) or
+        state.has("The Citadel (MAP19) - Yellow skull key", player, 1)))
+    set_rule(world.get_entrance("The Citadel (MAP19) Red -> The Citadel (MAP19) Main", player), lambda state:
+       (state.has("The Citadel (MAP19) - Red skull key", player, 1)) and       (state.has("The Citadel (MAP19) - Yellow skull key", player, 1) or
+        state.has("The Citadel (MAP19) - Blue skull key", player, 1)))
+
+    # Gotcha! (MAP20)
+    set_rule(world.get_entrance("Hub -> Gotcha! (MAP20) Main", player), lambda state:
+       (state.has("Gotcha! (MAP20)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+
+
+def set_episode3_rules(player, world, pro):
+    # Nirvana (MAP21)
+    set_rule(world.get_entrance("Hub -> Nirvana (MAP21) Main", player), lambda state:
+       (state.has("Nirvana (MAP21)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Nirvana (MAP21) Main -> Nirvana (MAP21) Yellow", player), lambda state:
+        state.has("Nirvana (MAP21) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("Nirvana (MAP21) Yellow -> Nirvana (MAP21) Main", player), lambda state:
+        state.has("Nirvana (MAP21) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("Nirvana (MAP21) Yellow -> Nirvana (MAP21) Magenta", player), lambda state:
+        state.has("Nirvana (MAP21) - Red skull key", player, 1) and
+        state.has("Nirvana (MAP21) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("Nirvana (MAP21) Magenta -> Nirvana (MAP21) Yellow", player), lambda state:
+        state.has("Nirvana (MAP21) - Red skull key", player, 1) and
+        state.has("Nirvana (MAP21) - Blue skull key", player, 1))
+
+    # The Catacombs (MAP22)
+    set_rule(world.get_entrance("Hub -> The Catacombs (MAP22) Main", player), lambda state:
+       (state.has("The Catacombs (MAP22)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("BFG9000", player, 1) or
+        state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1)))
+    set_rule(world.get_entrance("The Catacombs (MAP22) Main -> The Catacombs (MAP22) Blue", player), lambda state:
+        state.has("The Catacombs (MAP22) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("The Catacombs (MAP22) Main -> The Catacombs (MAP22) Red", player), lambda state:
+        state.has("The Catacombs (MAP22) - Red skull key", player, 1))
+    set_rule(world.get_entrance("The Catacombs (MAP22) Red -> The Catacombs (MAP22) Main", player), lambda state:
+        state.has("The Catacombs (MAP22) - Red skull key", player, 1))
+
+    # Barrels o Fun (MAP23)
+    set_rule(world.get_entrance("Hub -> Barrels o Fun (MAP23) Main", player), lambda state:
+       (state.has("Barrels o Fun (MAP23)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+    set_rule(world.get_entrance("Barrels o Fun (MAP23) Main -> Barrels o Fun (MAP23) Yellow", player), lambda state:
+        state.has("Barrels o Fun (MAP23) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("Barrels o Fun (MAP23) Yellow -> Barrels o Fun (MAP23) Main", player), lambda state:
+        state.has("Barrels o Fun (MAP23) - Yellow skull key", player, 1))
+
+    # The Chasm (MAP24)
+    set_rule(world.get_entrance("Hub -> The Chasm (MAP24) Main", player), lambda state:
+        state.has("The Chasm (MAP24)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Rocket launcher", player, 1) and
+        state.has("Plasma gun", player, 1) and
+        state.has("BFG9000", player, 1) and
+        state.has("Super Shotgun", player, 1))
+    set_rule(world.get_entrance("The Chasm (MAP24) Main -> The Chasm (MAP24) Red", player), lambda state:
+        state.has("The Chasm (MAP24) - Red keycard", player, 1))
+    set_rule(world.get_entrance("The Chasm (MAP24) Red -> The Chasm (MAP24) Main", player), lambda state:
+        state.has("The Chasm (MAP24) - Red keycard", player, 1))
+
+    # Bloodfalls (MAP25)
+    set_rule(world.get_entrance("Hub -> Bloodfalls (MAP25) Main", player), lambda state:
+        state.has("Bloodfalls (MAP25)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Rocket launcher", player, 1) and
+        state.has("Plasma gun", player, 1) and
+        state.has("BFG9000", player, 1) and
+        state.has("Super Shotgun", player, 1))
+    set_rule(world.get_entrance("Bloodfalls (MAP25) Main -> Bloodfalls (MAP25) Blue", player), lambda state:
+        state.has("Bloodfalls (MAP25) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("Bloodfalls (MAP25) Blue -> Bloodfalls (MAP25) Main", player), lambda state:
+        state.has("Bloodfalls (MAP25) - Blue skull key", player, 1))
+
+    # The Abandoned Mines (MAP26)
+    set_rule(world.get_entrance("Hub -> The Abandoned Mines (MAP26) Main", player), lambda state:
+        state.has("The Abandoned Mines (MAP26)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Rocket launcher", player, 1) and
+        state.has("BFG9000", player, 1) and
+        state.has("Plasma gun", player, 1) and
+        state.has("Super Shotgun", player, 1))
+    set_rule(world.get_entrance("The Abandoned Mines (MAP26) Main -> The Abandoned Mines (MAP26) Yellow", player), lambda state:
+        state.has("The Abandoned Mines (MAP26) - Yellow keycard", player, 1))
+    set_rule(world.get_entrance("The Abandoned Mines (MAP26) Main -> The Abandoned Mines (MAP26) Red", player), lambda state:
+        state.has("The Abandoned Mines (MAP26) - Red keycard", player, 1))
+    set_rule(world.get_entrance("The Abandoned Mines (MAP26) Main -> The Abandoned Mines (MAP26) Blue", player), lambda state:
+        state.has("The Abandoned Mines (MAP26) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Abandoned Mines (MAP26) Blue -> The Abandoned Mines (MAP26) Main", player), lambda state:
+        state.has("The Abandoned Mines (MAP26) - Blue keycard", player, 1))
+    set_rule(world.get_entrance("The Abandoned Mines (MAP26) Yellow -> The Abandoned Mines (MAP26) Main", player), lambda state:
+        state.has("The Abandoned Mines (MAP26) - Yellow keycard", player, 1))
+
+    # Monster Condo (MAP27)
+    set_rule(world.get_entrance("Hub -> Monster Condo (MAP27) Main", player), lambda state:
+        state.has("Monster Condo (MAP27)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Rocket launcher", player, 1) and
+        state.has("Plasma gun", player, 1) and
+        state.has("BFG9000", player, 1) and
+        state.has("Super Shotgun", player, 1))
+    set_rule(world.get_entrance("Monster Condo (MAP27) Main -> Monster Condo (MAP27) Yellow", player), lambda state:
+        state.has("Monster Condo (MAP27) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("Monster Condo (MAP27) Main -> Monster Condo (MAP27) Red", player), lambda state:
+        state.has("Monster Condo (MAP27) - Red skull key", player, 1))
+    set_rule(world.get_entrance("Monster Condo (MAP27) Main -> Monster Condo (MAP27) Blue", player), lambda state:
+        state.has("Monster Condo (MAP27) - Blue skull key", player, 1))
+    set_rule(world.get_entrance("Monster Condo (MAP27) Red -> Monster Condo (MAP27) Main", player), lambda state:
+        state.has("Monster Condo (MAP27) - Red skull key", player, 1))
+
+    # The Spirit World (MAP28)
+    set_rule(world.get_entrance("Hub -> The Spirit World (MAP28) Main", player), lambda state:
+        state.has("The Spirit World (MAP28)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Rocket launcher", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Plasma gun", player, 1) and
+        state.has("BFG9000", player, 1) and
+        state.has("Super Shotgun", player, 1))
+    set_rule(world.get_entrance("The Spirit World (MAP28) Main -> The Spirit World (MAP28) Yellow", player), lambda state:
+        state.has("The Spirit World (MAP28) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("The Spirit World (MAP28) Main -> The Spirit World (MAP28) Red", player), lambda state:
+        state.has("The Spirit World (MAP28) - Red skull key", player, 1))
+    set_rule(world.get_entrance("The Spirit World (MAP28) Yellow -> The Spirit World (MAP28) Main", player), lambda state:
+        state.has("The Spirit World (MAP28) - Yellow skull key", player, 1))
+    set_rule(world.get_entrance("The Spirit World (MAP28) Red -> The Spirit World (MAP28) Main", player), lambda state:
+        state.has("The Spirit World (MAP28) - Red skull key", player, 1))
+
+    # The Living End (MAP29)
+    set_rule(world.get_entrance("Hub -> The Living End (MAP29) Main", player), lambda state:
+        state.has("The Living End (MAP29)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Rocket launcher", player, 1) and
+        state.has("Plasma gun", player, 1) and
+        state.has("BFG9000", player, 1) and
+        state.has("Super Shotgun", player, 1))
+
+    # Icon of Sin (MAP30)
+    set_rule(world.get_entrance("Hub -> Icon of Sin (MAP30) Main", player), lambda state:
+        state.has("Icon of Sin (MAP30)", player, 1) and
+        state.has("Rocket launcher", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Plasma gun", player, 1) and
+        state.has("BFG9000", player, 1) and
+        state.has("Super Shotgun", player, 1))
+
+
+def set_episode4_rules(player, world, pro):
+    # Wolfenstein2 (MAP31)
+    set_rule(world.get_entrance("Hub -> Wolfenstein2 (MAP31) Main", player), lambda state:
+       (state.has("Wolfenstein2 (MAP31)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+
+    # Grosse2 (MAP32)
+    set_rule(world.get_entrance("Hub -> Grosse2 (MAP32) Main", player), lambda state:
+       (state.has("Grosse2 (MAP32)", player, 1) and
+        state.has("Shotgun", player, 1) and
+        state.has("Chaingun", player, 1) and
+        state.has("Super Shotgun", player, 1)) and
+       (state.has("Rocket launcher", player, 1) or
+        state.has("Plasma gun", player, 1) or
+        state.has("BFG9000", player, 1)))
+
+
+def set_rules(doom_ii_world: "DOOM2World", included_episodes, pro):
+    player = doom_ii_world.player
+    world = doom_ii_world.multiworld
+
+    if included_episodes[0]:
+        set_episode1_rules(player, world, pro)
+    if included_episodes[1]:
+        set_episode2_rules(player, world, pro)
+    if included_episodes[2]:
+        set_episode3_rules(player, world, pro)
+    if included_episodes[3]:
+        set_episode4_rules(player, world, pro)
diff --git a/worlds/doom_ii/__init__.py b/worlds/doom_ii/__init__.py
new file mode 100644
index 0000000000..22dee2ab74
--- /dev/null
+++ b/worlds/doom_ii/__init__.py
@@ -0,0 +1,267 @@
+import functools
+import logging
+from typing import Any, Dict, List
+
+from BaseClasses import Entrance, CollectionState, Item, Location, MultiWorld, Region, Tutorial
+from worlds.AutoWorld import WebWorld, World
+from . import Items, Locations, Maps, Regions, Rules
+from .Options import DOOM2Options
+
+logger = logging.getLogger("DOOM II")
+
+DOOM_TYPE_LEVEL_COMPLETE = -2
+DOOM_TYPE_COMPUTER_AREA_MAP = 2026
+
+
+class DOOM2Location(Location):
+    game: str = "DOOM II"
+
+
+class DOOM2Item(Item):
+    game: str = "DOOM II"
+
+
+class DOOM2Web(WebWorld):
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the DOOM II randomizer connected to an Archipelago Multiworld",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Daivuk"]
+    )]
+    theme = "dirt"
+
+
+class DOOM2World(World):
+    """
+    Doom II, also known as Doom II: Hell on Earth, is a first-person shooter game by id Software.
+    It was released for MS-DOS in 1994.
+    Compared to its predecessor, Doom II features larger levels, new enemies, a new "super shotgun" weapon
+    """
+    options_dataclass = DOOM2Options
+    options: DOOM2Options
+    game = "DOOM II"
+    web = DOOM2Web()
+    data_version = 3
+    required_client_version = (0, 3, 9)
+
+    item_name_to_id = {data["name"]: item_id for item_id, data in Items.item_table.items()}
+    item_name_groups = Items.item_name_groups
+
+    location_name_to_id = {data["name"]: loc_id for loc_id, data in Locations.location_table.items()}
+    location_name_groups = Locations.location_name_groups
+
+    starting_level_for_episode: List[str] = [
+        "Entryway (MAP01)",
+        "The Factory (MAP12)",
+        "Nirvana (MAP21)"
+    ]
+
+    # Item ratio that scales depending on episode count. These are the ratio for 3 episode. In DOOM1.
+    # The ratio have been tweaked seem, and feel good.
+    items_ratio: Dict[str, float] = {
+        "Armor": 41,
+        "Mega Armor": 25,
+        "Berserk": 12,
+        "Invulnerability": 10,
+        "Partial invisibility": 18,
+        "Supercharge": 28,
+        "Medikit": 15,
+        "Box of bullets": 13,
+        "Box of rockets": 13,
+        "Box of shotgun shells": 13,
+        "Energy cell pack": 10
+    }
+
+    def __init__(self, world: MultiWorld, player: int):
+        self.included_episodes = [1, 1, 1, 0]
+        self.location_count = 0
+
+        super().__init__(world, player)
+
+    def get_episode_count(self):
+        # Don't include 4th, those are secret levels they are additive
+        return sum(self.included_episodes[:3])
+
+    def generate_early(self):
+        # Cache which episodes are included
+        self.included_episodes[0] = self.options.episode1.value
+        self.included_episodes[1] = self.options.episode2.value
+        self.included_episodes[2] = self.options.episode3.value
+        self.included_episodes[3] = self.options.episode4.value # 4th episode are secret levels
+
+        # If no episodes selected, select Episode 1
+        if self.get_episode_count() == 0:
+            self.included_episodes[0] = 1
+
+    def create_regions(self):
+        pro = self.options.pro.value
+
+        # Main regions
+        menu_region = Region("Menu", self.player, self.multiworld)
+        hub_region = Region("Hub", self.player, self.multiworld)
+        self.multiworld.regions += [menu_region, hub_region]
+        menu_region.add_exits(["Hub"])
+
+        # Create regions and locations
+        main_regions = []
+        connections = []
+        for region_dict in Regions.regions:
+            if not self.included_episodes[region_dict["episode"] - 1]:
+                continue
+
+            region_name = region_dict["name"]
+            if region_dict["connects_to_hub"]:
+                main_regions.append(region_name)
+
+            region = Region(region_name, self.player, self.multiworld)
+            region.add_locations({
+                loc["name"]: loc_id
+                for loc_id, loc in Locations.location_table.items()
+                if loc["region"] == region_name and self.included_episodes[loc["episode"] - 1]
+            }, DOOM2Location)
+
+            self.multiworld.regions.append(region)
+
+            for connection_dict in region_dict["connections"]:
+                # Check if it's a pro-only connection
+                if connection_dict["pro"] and not pro:
+                    continue
+                connections.append((region, connection_dict["target"]))
+        
+        # Connect main regions to Hub
+        hub_region.add_exits(main_regions)
+
+        # Do the other connections between regions (They are not all both ways)
+        for connection in connections:
+            source = connection[0]
+            target = self.multiworld.get_region(connection[1], self.player)
+
+            entrance = Entrance(self.player, f"{source.name} -> {target.name}", source)
+            source.exits.append(entrance)
+            entrance.connect(target)
+
+        # Sum locations for items creation
+        self.location_count = len(self.multiworld.get_locations(self.player))
+
+    def completion_rule(self, state: CollectionState):
+        for map_name in Maps.map_names:
+            if map_name + " - Exit" not in self.location_name_to_id:
+                continue
+            
+            # Exit location names are in form: Entryway (MAP01) - Exit
+            loc = Locations.location_table[self.location_name_to_id[map_name + " - Exit"]]
+            if not self.included_episodes[loc["episode"] - 1]:
+                continue
+
+            # Map complete item names are in form: Entryway (MAP01) - Complete
+            if not state.has(map_name + " - Complete", self.player, 1):
+                return False
+            
+        return True
+
+    def set_rules(self):
+        pro = self.options.pro.value
+        allow_death_logic = self.options.allow_death_logic.value
+
+        Rules.set_rules(self, self.included_episodes, pro)
+        self.multiworld.completion_condition[self.player] = lambda state: self.completion_rule(state)
+
+        # Forbid progression items to locations that can be missed and can't be picked up. (e.g. One-time timed
+        # platform) Unless the user allows for it.
+        if not allow_death_logic:
+            for death_logic_location in Locations.death_logic_locations:
+                self.multiworld.exclude_locations[self.player].value.add(death_logic_location)
+    
+    def create_item(self, name: str) -> DOOM2Item:
+        item_id: int = self.item_name_to_id[name]
+        return DOOM2Item(name, Items.item_table[item_id]["classification"], item_id, self.player)
+
+    def create_items(self):
+        itempool: List[DOOM2Item] = []
+        start_with_computer_area_maps: bool = self.options.start_with_computer_area_maps.value
+
+        # Items
+        for item_id, item in Items.item_table.items():
+            if item["doom_type"] == DOOM_TYPE_LEVEL_COMPLETE:
+                continue # We'll fill it manually later
+
+            if item["doom_type"] == DOOM_TYPE_COMPUTER_AREA_MAP and start_with_computer_area_maps:
+                continue # We'll fill it manually, and we will put fillers in place
+
+            if item["episode"] != -1 and not self.included_episodes[item["episode"] - 1]:
+                continue
+
+            count = item["count"] if item["name"] not in self.starting_level_for_episode else item["count"] - 1
+            itempool += [self.create_item(item["name"]) for _ in range(count)]
+
+        # Place end level items in locked locations
+        for map_name in Maps.map_names:
+            loc_name = map_name + " - Exit"
+            item_name = map_name + " - Complete"
+
+            if loc_name not in self.location_name_to_id:
+                continue
+
+            if item_name not in self.item_name_to_id:
+                continue
+
+            loc = Locations.location_table[self.location_name_to_id[loc_name]]
+            if not self.included_episodes[loc["episode"] - 1]:
+                continue
+
+            self.multiworld.get_location(loc_name, self.player).place_locked_item(self.create_item(item_name))
+            self.location_count -= 1
+
+        # Give starting levels right away
+        for i in range(len(self.starting_level_for_episode)):
+            if self.included_episodes[i]:
+                self.multiworld.push_precollected(self.create_item(self.starting_level_for_episode[i]))
+        
+        # Give Computer area maps if option selected
+        if start_with_computer_area_maps:
+            for item_id, item_dict in Items.item_table.items():
+                item_episode = item_dict["episode"]
+                if item_episode > 0:
+                    if item_dict["doom_type"] == DOOM_TYPE_COMPUTER_AREA_MAP and self.included_episodes[item_episode - 1]:
+                        self.multiworld.push_precollected(self.create_item(item_dict["name"]))
+
+        # Fill the rest starting with powerups, then fillers
+        self.create_ratioed_items("Armor", itempool)
+        self.create_ratioed_items("Mega Armor", itempool)
+        self.create_ratioed_items("Berserk", itempool)
+        self.create_ratioed_items("Invulnerability", itempool)
+        self.create_ratioed_items("Partial invisibility", itempool)
+        self.create_ratioed_items("Supercharge", itempool)
+
+        while len(itempool) < self.location_count:
+            itempool.append(self.create_item(self.get_filler_item_name()))
+
+        # add itempool to multiworld
+        self.multiworld.itempool += itempool
+
+    def get_filler_item_name(self):
+        return self.multiworld.random.choice([
+            "Medikit",
+            "Box of bullets",
+            "Box of rockets",
+            "Box of shotgun shells",
+            "Energy cell pack"
+        ])
+
+    def create_ratioed_items(self, item_name: str, itempool: List[DOOM2Item]):
+        remaining_loc = self.location_count - len(itempool)
+        ep_count = self.get_episode_count()
+
+        # Was balanced based on DOOM 1993's first 3 episodes
+        count = min(remaining_loc, max(1, int(round(self.items_ratio[item_name] * ep_count / 3))))
+        if count == 0:
+            logger.warning("Warning, no ", item_name, " will be placed.")
+            return
+
+        for i in range(count):
+            itempool.append(self.create_item(item_name))
+
+    def fill_slot_data(self) -> Dict[str, Any]:
+        return self.options.as_dict("difficulty", "random_monsters", "random_pickups", "random_music", "flip_levels", "allow_death_logic", "pro", "death_link", "reset_level_on_death", "episode1", "episode2", "episode3", "episode4")
diff --git a/worlds/doom_ii/docs/en_DOOM II.md b/worlds/doom_ii/docs/en_DOOM II.md
new file mode 100644
index 0000000000..d561745b76
--- /dev/null
+++ b/worlds/doom_ii/docs/en_DOOM II.md	
@@ -0,0 +1,23 @@
+# DOOM II
+
+## Where is the settings page?
+
+The [player settings page](../player-settings) contains the options needed to configure your game session.
+
+## What does randomization do to this game?
+
+Guns, keycards, and level unlocks have been randomized. Typically, you will end up playing different levels out of order to find your keycards and level unlocks and eventually complete your game.
+
+Maps can be selected on a level select screen. You can exit a level at any time by visiting the hub station at the beginning of each level. The state of each level is saved and restored upon re-entering the level.
+
+## What is the goal?
+
+The goal is to complete every level.
+
+## What is a "check" in DOOM II?
+
+Guns, keycards, and powerups have been replaced with Archipelago checks. The switch at the end of each level is also a check.
+
+## What "items" can you unlock in DOOM II?
+
+Keycards and level unlocks are your main progression items. Gun unlocks and some upgrades are your useful items. Temporary powerups, ammo, healing, and armor are filler items.
diff --git a/worlds/doom_ii/docs/setup_en.md b/worlds/doom_ii/docs/setup_en.md
new file mode 100644
index 0000000000..321d440ea6
--- /dev/null
+++ b/worlds/doom_ii/docs/setup_en.md
@@ -0,0 +1,51 @@
+# DOOM II Randomizer Setup
+
+## Required Software
+
+- [DOOM II (e.g. Steam version)](https://store.steampowered.com/app/2300/DOOM_II/)
+- [Archipelago Crispy DOOM](https://github.com/Daivuk/apdoom/releases)
+
+## Optional Software
+
+- [ArchipelagoTextClient](https://github.com/ArchipelagoMW/Archipelago/releases)
+
+## Installing AP Doom
+1. Download [APDOOM.zip](https://github.com/Daivuk/apdoom/releases) and extract it.
+2. Copy DOOM2.WAD from your steam install into the extracted folder.
+   You can find the folder in steam by finding the game in your library,
+   right clicking it and choosing *Manage→Browse Local Files*.
+
+## Joining a MultiWorld Game
+
+1. Launch apdoom-launcher.exe
+2. Select `DOOM II` from the drop-down
+3. Enter the Archipelago server address, slot name, and password (if you have one)
+4. Press "Launch DOOM"
+5. Enjoy!
+
+To continue a game, follow the same connection steps.
+Connecting with a different seed won't erase your progress in other seeds.
+
+## Archipelago Text Client
+
+We recommend having Archipelago's Text Client open on the side to keep track of what items you receive and send.
+APDOOM has in-game messages,
+but they disappear quickly and there's no reasonable way to check your message history in-game.
+
+### Hinting
+
+To hint from in-game, use the chat (Default key: 'T'). Hinting from DOOM II can be difficult because names are rather long and contain special characters. For example:
+```
+!hint Underhalls (MAP02) - Red keycard
+```
+The game has a hint helper implemented, where you can simply type this:
+```
+!hint map02 red
+```
+For this to work, include the map short name (`MAP01`), followed by one of the keywords: `map`, `blue`, `yellow`, `red`.
+
+## Auto-Tracking
+
+APDOOM has a functional map tracker integrated into the level select screen.
+It tells you which levels you have unlocked, which keys you have for each level, which levels have been completed,
+and how many of the checks you have completed in each level.
diff --git a/worlds/factorio/Locations.py b/worlds/factorio/Locations.py
index f9db5f4a2b..52f0954cba 100644
--- a/worlds/factorio/Locations.py
+++ b/worlds/factorio/Locations.py
@@ -3,18 +3,13 @@ from typing import Dict, List
 from .Technologies import factorio_base_id
 from .Options import MaxSciencePack
 
-boundary: int = 0xff
-total_locations: int = 0xff
-
-assert total_locations <= boundary
-
 
 def make_pools() -> Dict[str, List[str]]:
     pools: Dict[str, List[str]] = {}
     for i, pack in enumerate(MaxSciencePack.get_ordered_science_packs(), start=1):
-        max_needed: int = 0xff
+        max_needed: int = 999
         prefix: str = f"AP-{i}-"
-        pools[pack] = [prefix + hex(x)[2:].upper().zfill(2) for x in range(1, max_needed + 1)]
+        pools[pack] = [prefix + str(x).upper().zfill(3) for x in range(1, max_needed + 1)]
     return pools
 
 
diff --git a/worlds/factorio/Mod.py b/worlds/factorio/Mod.py
index 270e7dacf0..d7b3d4b1eb 100644
--- a/worlds/factorio/Mod.py
+++ b/worlds/factorio/Mod.py
@@ -5,7 +5,7 @@ import os
 import shutil
 import threading
 import zipfile
-from typing import Optional, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING, Any, List, Callable, Tuple, Union
 
 import jinja2
 
@@ -24,6 +24,7 @@ data_template: Optional[jinja2.Template] = None
 data_final_template: Optional[jinja2.Template] = None
 locale_template: Optional[jinja2.Template] = None
 control_template: Optional[jinja2.Template] = None
+settings_template: Optional[jinja2.Template] = None
 
 template_load_lock = threading.Lock()
 
@@ -62,15 +63,24 @@ recipe_time_ranges = {
 class FactorioModFile(worlds.Files.APContainer):
     game = "Factorio"
     compression_method = zipfile.ZIP_DEFLATED  # Factorio can't load LZMA archives
+    writing_tasks: List[Callable[[], Tuple[str, Union[str, bytes]]]]
+
+    def __init__(self, *args: Any, **kwargs: Any):
+        super().__init__(*args, **kwargs)
+        self.writing_tasks = []
 
     def write_contents(self, opened_zipfile: zipfile.ZipFile):
         # directory containing Factorio mod has to come first, or Factorio won't recognize this file as a mod.
         mod_dir = self.path[:-4]  # cut off .zip
         for root, dirs, files in os.walk(mod_dir):
             for file in files:
-                opened_zipfile.write(os.path.join(root, file),
-                                     os.path.relpath(os.path.join(root, file),
+                filename = os.path.join(root, file)
+                opened_zipfile.write(filename,
+                                     os.path.relpath(filename,
                                                      os.path.join(mod_dir, '..')))
+        for task in self.writing_tasks:
+            target, content = task()
+            opened_zipfile.writestr(target, content)
         # now we can add extras.
         super(FactorioModFile, self).write_contents(opened_zipfile)
 
@@ -98,6 +108,7 @@ def generate_mod(world: "Factorio", output_directory: str):
     locations = [(location, location.item)
                  for location in world.science_locations]
     mod_name = f"AP-{multiworld.seed_name}-P{player}-{multiworld.get_file_safe_player_name(player)}"
+    versioned_mod_name = mod_name + "_" + Utils.__version__
 
     random = multiworld.per_slot_randoms[player]
 
@@ -153,48 +164,40 @@ def generate_mod(world: "Factorio", output_directory: str):
     template_data["free_sample_blacklist"].update({item: 1 for item in multiworld.free_sample_blacklist[player].value})
     template_data["free_sample_blacklist"].update({item: 0 for item in multiworld.free_sample_whitelist[player].value})
 
-    control_code = control_template.render(**template_data)
-    data_template_code = data_template.render(**template_data)
-    data_final_fixes_code = data_final_template.render(**template_data)
-    settings_code = settings_template.render(**template_data)
-
-    mod_dir = os.path.join(output_directory, mod_name + "_" + Utils.__version__)
-    en_locale_dir = os.path.join(mod_dir, "locale", "en")
-    os.makedirs(en_locale_dir, exist_ok=True)
+    zf_path = os.path.join(output_directory, versioned_mod_name + ".zip")
+    mod = FactorioModFile(zf_path, player=player, player_name=multiworld.player_name[player])
 
     if world.zip_path:
-        # Maybe investigate read from zip, write to zip, without temp file?
         with zipfile.ZipFile(world.zip_path) as zf:
             for file in zf.infolist():
                 if not file.is_dir() and "/data/mod/" in file.filename:
                     path_part = Utils.get_text_after(file.filename, "/data/mod/")
-                    target = os.path.join(mod_dir, path_part)
-                    os.makedirs(os.path.split(target)[0], exist_ok=True)
-
-                    with open(target, "wb") as f:
-                        f.write(zf.read(file))
+                    mod.writing_tasks.append(lambda arcpath=versioned_mod_name+"/"+path_part, content=zf.read(file):
+                                             (arcpath, content))
     else:
-        shutil.copytree(os.path.join(os.path.dirname(__file__), "data", "mod"), mod_dir, dirs_exist_ok=True)
+        basepath = os.path.join(os.path.dirname(__file__), "data", "mod")
+        for dirpath, dirnames, filenames in os.walk(basepath):
+            base_arc_path = (versioned_mod_name+"/"+os.path.relpath(dirpath, basepath)).rstrip("/.\\")
+            for filename in filenames:
+                mod.writing_tasks.append(lambda arcpath=base_arc_path+"/"+filename,
+                                                file_path=os.path.join(dirpath, filename):
+                                         (arcpath, open(file_path, "rb").read()))
+
+    mod.writing_tasks.append(lambda: (versioned_mod_name + "/data.lua",
+                                      data_template.render(**template_data)))
+    mod.writing_tasks.append(lambda: (versioned_mod_name + "/data-final-fixes.lua",
+                                      data_final_template.render(**template_data)))
+    mod.writing_tasks.append(lambda: (versioned_mod_name + "/control.lua",
+                                      control_template.render(**template_data)))
+    mod.writing_tasks.append(lambda: (versioned_mod_name + "/settings.lua",
+                                      settings_template.render(**template_data)))
+    mod.writing_tasks.append(lambda: (versioned_mod_name + "/locale/en/locale.cfg",
+                                      locale_template.render(**template_data)))
 
-    with open(os.path.join(mod_dir, "data.lua"), "wt") as f:
-        f.write(data_template_code)
-    with open(os.path.join(mod_dir, "data-final-fixes.lua"), "wt") as f:
-        f.write(data_final_fixes_code)
-    with open(os.path.join(mod_dir, "control.lua"), "wt") as f:
-        f.write(control_code)
-    with open(os.path.join(mod_dir, "settings.lua"), "wt") as f:
-        f.write(settings_code)
-    locale_content = locale_template.render(**template_data)
-    with open(os.path.join(en_locale_dir, "locale.cfg"), "wt") as f:
-        f.write(locale_content)
     info = base_info.copy()
     info["name"] = mod_name
-    with open(os.path.join(mod_dir, "info.json"), "wt") as f:
-        json.dump(info, f, indent=4)
+    mod.writing_tasks.append(lambda: (versioned_mod_name + "/info.json",
+                                      json.dumps(info, indent=4)))
 
-    # zip the result
-    zf_path = os.path.join(mod_dir + ".zip")
-    mod = FactorioModFile(zf_path, player=player, player_name=multiworld.player_name[player])
+    # write the mod file
     mod.write()
-
-    shutil.rmtree(mod_dir)
diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index 18eee67e03..3429ebbd42 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 import typing
 import datetime
 
-from Options import Choice, OptionDict, OptionSet, ItemDict, Option, DefaultOnToggle, Range, DeathLink, Toggle, \
+from Options import Choice, OptionDict, OptionSet, Option, DefaultOnToggle, Range, DeathLink, Toggle, \
     StartInventoryPool
 from schema import Schema, Optional, And, Or
 
@@ -207,11 +207,10 @@ class RecipeIngredientsOffset(Range):
     range_end = 5
 
 
-class FactorioStartItems(ItemDict):
+class FactorioStartItems(OptionDict):
     """Mapping of Factorio internal item-name to amount granted on start."""
     display_name = "Starting Items"
-    verify_item_name = False
-    default = {"burner-mining-drill": 19, "stone-furnace": 19}
+    default = {"burner-mining-drill": 4, "stone-furnace": 4,  "raw-fish": 50}
 
 
 class FactorioFreeSampleBlacklist(OptionSet):
diff --git a/worlds/factorio/Technologies.py b/worlds/factorio/Technologies.py
index d68c6f2f77..096396c0e7 100644
--- a/worlds/factorio/Technologies.py
+++ b/worlds/factorio/Technologies.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import json
+import orjson
 import logging
 import os
 import string
@@ -20,7 +20,7 @@ pool = ThreadPoolExecutor(1)
 
 
 def load_json_data(data_name: str) -> Union[List[str], Dict[str, Any]]:
-    return json.loads(pkgutil.get_data(__name__, "data/" + data_name + ".json").decode())
+    return orjson.loads(pkgutil.get_data(__name__, "data/" + data_name + ".json"))
 
 
 techs_future = pool.submit(load_json_data, "techs")
diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py
index 8308bb2d65..17f3163e90 100644
--- a/worlds/factorio/__init__.py
+++ b/worlds/factorio/__init__.py
@@ -246,7 +246,8 @@ class Factorio(World):
                 location.access_rule = lambda state, ingredient=ingredient, custom_recipe=custom_recipe: \
                     (ingredient not in technology_table or state.has(ingredient, player)) and \
                     all(state.has(technology.name, player) for sub_ingredient in custom_recipe.ingredients
-                        for technology in required_technologies[sub_ingredient])
+                        for technology in required_technologies[sub_ingredient]) and \
+                    all(state.has(technology.name, player) for technology in required_technologies[custom_recipe.crafting_machine])
             else:
                 location.access_rule = lambda state, ingredient=ingredient: \
                     all(state.has(technology.name, player) for technology in required_technologies[ingredient])
@@ -541,7 +542,7 @@ class FactorioScienceLocation(FactorioLocation):
         super(FactorioScienceLocation, self).__init__(player, name, address, parent)
         # "AP-{Complexity}-{Cost}"
         self.complexity = int(self.name[3]) - 1
-        self.rel_cost = int(self.name[5:], 16)
+        self.rel_cost = int(self.name[5:])
 
         self.ingredients = {Factorio.ordered_science_packs[self.complexity]: 1}
         for complexity in range(self.complexity):
diff --git a/worlds/factorio/data/mod/graphics/icons/ap.png b/worlds/factorio/data/mod/graphics/icons/ap.png
index 8f0da105a1..fa6b80ccca 100644
Binary files a/worlds/factorio/data/mod/graphics/icons/ap.png and b/worlds/factorio/data/mod/graphics/icons/ap.png differ
diff --git a/worlds/factorio/data/mod/graphics/icons/ap_unimportant.png b/worlds/factorio/data/mod/graphics/icons/ap_unimportant.png
index 8471317a93..68ee52a5e8 100644
Binary files a/worlds/factorio/data/mod/graphics/icons/ap_unimportant.png and b/worlds/factorio/data/mod/graphics/icons/ap_unimportant.png differ
diff --git a/worlds/factorio/data/mod/info.json b/worlds/factorio/data/mod/info.json
deleted file mode 100644
index 70a9518344..0000000000
--- a/worlds/factorio/data/mod/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "archipelago-client",
-    "version": "0.0.1",
-    "title": "Archipelago",
-    "author": "Berserker and Dewiniaid",
-    "homepage": "https://archipelago.gg",
-    "description": "Integration client for the Archipelago Randomizer",
-    "factorio_version": "1.1",
-    "dependencies": [
-      "base >= 1.1.0",
-      "? science-not-invited",
-      "? factory-levels"
-    ]
-}
diff --git a/worlds/factorio/docs/en_Factorio.md b/worlds/factorio/docs/en_Factorio.md
index 61bceb3820..dbc33d05df 100644
--- a/worlds/factorio/docs/en_Factorio.md
+++ b/worlds/factorio/docs/en_Factorio.md
@@ -42,3 +42,9 @@ depositing excess energy and supplementing energy deficits, much like Accumulato
 Each placed EnergyLink Bridge provides 10 MW of throughput. The shared storage has unlimited capacity, but 25% of energy
 is lost during depositing. The amount of energy currently in the shared storage is displayed in the Archipelago client.
 It can also be queried by typing `/energy-link` in-game.
+
+## Unique Local Commands
+The following commands are only available when using the FactorioClient to play Factorio with Archipelago.
+
+- `/factorio <command text>` Sends the command argument to the Factorio server as a command.
+- `/energy-link` Displays the amount of energy currently in shared storage for EnergyLink
diff --git a/worlds/factorio/docs/setup_en.md b/worlds/factorio/docs/setup_en.md
index 09ad431a21..b6d4545925 100644
--- a/worlds/factorio/docs/setup_en.md
+++ b/worlds/factorio/docs/setup_en.md
@@ -31,7 +31,7 @@ them. Factorio player settings page: [Factorio Settings Page](/games/Factorio/pl
 ### 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)
+Validator page: [Yaml Validation Page](/check)
 
 ## Connecting to Someone Else's Factorio Game
 
diff --git a/worlds/ff1/__init__.py b/worlds/ff1/__init__.py
index 56b41d62d0..4ff361c072 100644
--- a/worlds/ff1/__init__.py
+++ b/worlds/ff1/__init__.py
@@ -14,7 +14,7 @@ class FF1Settings(settings.Group):
 
 
 class FF1Web(WebWorld):
-    settings_page = "https://finalfantasyrandomizer.com/"
+    options_page = "https://finalfantasyrandomizer.com/"
     tutorials = [Tutorial(
         "Multiworld Setup Guide",
         "A guide to playing Final Fantasy multiworld. This guide only covers playing multiworld.",
@@ -74,6 +74,7 @@ class FF1World(World):
         items = get_options(self.multiworld, 'items', self.player)
         goal_rule = generate_rule([[name for name in items.keys() if name in FF1_PROGRESSION_LIST and name != "Shard"]],
                                   self.player)
+        terminated_event.access_rule = goal_rule
         if "Shard" in items.keys():
             def goal_rule_and_shards(state):
                 return goal_rule(state) and state.has("Shard", self.player, 32)
@@ -91,7 +92,7 @@ class FF1World(World):
     def set_rules(self):
         self.multiworld.completion_condition[self.player] = lambda state: state.has(CHAOS_TERMINATED_EVENT, self.player)
 
-    def generate_basic(self):
+    def create_items(self):
         items = get_options(self.multiworld, 'items', self.player)
         if FF1_BRIDGE in items.keys():
             self._place_locked_item_in_sphere0(FF1_BRIDGE)
diff --git a/worlds/ff1/docs/en_Final Fantasy.md b/worlds/ff1/docs/en_Final Fantasy.md
index 29d4d29f80..59fa85d916 100644
--- a/worlds/ff1/docs/en_Final Fantasy.md	
+++ b/worlds/ff1/docs/en_Final Fantasy.md	
@@ -24,3 +24,9 @@ All items can appear in other players worlds, including consumables, shards, wea
 
 All local and remote items appear the same. Final Fantasy will say that you received an item, then BOTH the client log and the
 emulator will display what was found external to the in-game text box.
+
+## Unique Local Commands
+The following commands are only available when using the FF1Client for the Final Fantasy Randomizer.
+
+- `/nes` Shows the current status of the NES connection.
+- `/toggle_msgs` Toggle displaying messages in EmuHawk
diff --git a/worlds/ffmq/Client.py b/worlds/ffmq/Client.py
new file mode 100644
index 0000000000..c53f275017
--- /dev/null
+++ b/worlds/ffmq/Client.py
@@ -0,0 +1,119 @@
+
+from NetUtils import ClientStatus, color
+from worlds.AutoSNIClient import SNIClient
+from .Regions import offset
+import logging
+
+snes_logger = logging.getLogger("SNES")
+
+ROM_NAME = (0x7FC0, 0x7FD4 + 1 - 0x7FC0)
+
+READ_DATA_START = 0xF50EA8
+READ_DATA_END = 0xF50FE7 + 1
+
+GAME_FLAGS = (0xF50EA8, 64)
+COMPLETED_GAME = (0xF50F22, 1)
+BATTLEFIELD_DATA = (0xF50FD4, 20)
+
+RECEIVED_DATA = (0xE01FF0, 3)
+
+ITEM_CODE_START = 0x420000
+
+IN_GAME_FLAG = (4 * 8) + 2
+
+NPC_CHECKS = {
+    4325676: ((6 * 8) + 4, False),  # Old Man Level Forest
+    4325677: ((3 * 8) + 6, True),  # Kaeli Level Forest
+    4325678: ((25 * 8) + 1, True),  # Tristam
+    4325680: ((26 * 8) + 0, True),  # Aquaria Vendor Girl
+    4325681: ((29 * 8) + 2, True),  # Phoebe Wintry Cave
+    4325682: ((25 * 8) + 6, False),  # Mysterious Man (Life Temple)
+    4325683: ((29 * 8) + 3, True),  # Reuben Mine
+    4325684: ((29 * 8) + 7, True),  # Spencer
+    4325685: ((29 * 8) + 6, False),  # Venus Chest
+    4325686: ((29 * 8) + 1, True),  # Fireburg Tristam
+    4325687: ((26 * 8) + 1, True),  # Fireburg Vendor Girl
+    4325688: ((14 * 8) + 4, True),  # MegaGrenade Dude
+    4325689: ((29 * 8) + 5, False),  # Tristam's Chest
+    4325690: ((29 * 8) + 4, True),  # Arion
+    4325691: ((29 * 8) + 0, True),  # Windia Kaeli
+    4325692: ((26 * 8) + 2, True),  # Windia Vendor Girl
+
+}
+
+
+def get_flag(data, flag):
+    byte = int(flag / 8)
+    bit = int(0x80 / (2 ** (flag % 8)))
+    return (data[byte] & bit) > 0
+
+
+class FFMQClient(SNIClient):
+    game = "Final Fantasy Mystic Quest"
+
+    async def validate_rom(self, ctx):
+        from SNIClient import snes_read
+        rom_name = await snes_read(ctx, *ROM_NAME)
+        if rom_name is None:
+            return False
+        if rom_name[:2] != b"MQ":
+            return False
+
+        ctx.rom = rom_name
+        ctx.game = self.game
+        ctx.items_handling = 0b001
+        return True
+
+    async def game_watcher(self, ctx):
+        from SNIClient import snes_buffered_write, snes_flush_writes, snes_read
+
+        check_1 = await snes_read(ctx, 0xF53749, 1)
+        received = await snes_read(ctx, RECEIVED_DATA[0], RECEIVED_DATA[1])
+        data = await snes_read(ctx, READ_DATA_START, READ_DATA_END - READ_DATA_START)
+        check_2 = await snes_read(ctx, 0xF53749, 1)
+        if check_1 == b'\x00' or check_2 == b'\x00':
+            return
+
+        def get_range(data_range):
+            return data[data_range[0] - READ_DATA_START:data_range[0] + data_range[1] - READ_DATA_START]
+        completed_game = get_range(COMPLETED_GAME)
+        battlefield_data = get_range(BATTLEFIELD_DATA)
+        game_flags = get_range(GAME_FLAGS)
+
+        if game_flags is None:
+            return
+        if not get_flag(game_flags, IN_GAME_FLAG):
+            return
+
+        if not ctx.finished_game:
+            if completed_game[0] & 0x80 and game_flags[30] & 0x18:
+                await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+                ctx.finished_game = True
+
+        old_locations_checked = ctx.locations_checked.copy()
+
+        for container in range(256):
+            if get_flag(game_flags, (0x20 * 8) + container):
+                ctx.locations_checked.add(offset["Chest"] + container)
+
+        for location, data in NPC_CHECKS.items():
+            if get_flag(game_flags, data[0]) is data[1]:
+                ctx.locations_checked.add(location)
+
+        for battlefield in range(20):
+            if battlefield_data[battlefield] == 0:
+                ctx.locations_checked.add(offset["BattlefieldItem"] + battlefield + 1)
+
+        if old_locations_checked != ctx.locations_checked:
+            await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": ctx.locations_checked}])
+
+        if received[0] == 0:
+            received_index = int.from_bytes(received[1:], "big")
+            if received_index < len(ctx.items_received):
+                item = ctx.items_received[received_index]
+                received_index += 1
+                code = (item.item - ITEM_CODE_START) + 1
+                if code > 256:
+                    code -= 256
+                snes_buffered_write(ctx, RECEIVED_DATA[0], bytes([code, *received_index.to_bytes(2, "big")]))
+        await snes_flush_writes(ctx)
diff --git a/worlds/ffmq/Items.py b/worlds/ffmq/Items.py
new file mode 100644
index 0000000000..3eab5dd532
--- /dev/null
+++ b/worlds/ffmq/Items.py
@@ -0,0 +1,298 @@
+from BaseClasses import ItemClassification, Item
+
+fillers = {"Cure Potion": 61, "Heal Potion": 52, "Refresher": 17, "Seed": 2, "Bomb Refill": 19,
+           "Projectile Refill": 50}
+
+
+class ItemData:
+    def __init__(self, item_id, classification, groups=(), data_name=None):
+        self.groups = groups
+        self.classification = classification
+        self.id = None
+        if item_id is not None:
+            self.id = item_id + 0x420000
+        self.data_name = data_name
+
+
+item_table = {
+    "Elixir": ItemData(0, ItemClassification.progression, ["Key Items"]),
+    "Tree Wither": ItemData(1, ItemClassification.progression, ["Key Items"]),
+    "Wakewater": ItemData(2, ItemClassification.progression, ["Key Items"]),
+    "Venus Key": ItemData(3, ItemClassification.progression, ["Key Items"]),
+    "Multi Key": ItemData(4, ItemClassification.progression, ["Key Items"]),
+    "Mask": ItemData(5, ItemClassification.progression, ["Key Items"]),
+    "Magic Mirror": ItemData(6, ItemClassification.progression, ["Key Items"]),
+    "Thunder Rock": ItemData(7, ItemClassification.progression, ["Key Items"]),
+    "Captain's Cap": ItemData(8, ItemClassification.progression_skip_balancing, ["Key Items"]),
+    "Libra Crest": ItemData(9, ItemClassification.progression, ["Key Items"]),
+    "Gemini Crest": ItemData(10, ItemClassification.progression, ["Key Items"]),
+    "Mobius Crest": ItemData(11, ItemClassification.progression, ["Key Items"]),
+    "Sand Coin": ItemData(12, ItemClassification.progression, ["Key Items", "Coins"]),
+    "River Coin": ItemData(13, ItemClassification.progression, ["Key Items", "Coins"]),
+    "Sun Coin": ItemData(14, ItemClassification.progression, ["Key Items", "Coins"]),
+    "Sky Coin": ItemData(15, ItemClassification.progression_skip_balancing, ["Key Items", "Coins"]),
+    "Sky Fragment": ItemData(15 + 256, ItemClassification.progression_skip_balancing, ["Key Items"]),
+    "Cure Potion": ItemData(16, ItemClassification.filler, ["Consumables"]),
+    "Heal Potion": ItemData(17, ItemClassification.filler, ["Consumables"]),
+    "Seed": ItemData(18, ItemClassification.filler, ["Consumables"]),
+    "Refresher": ItemData(19, ItemClassification.filler, ["Consumables"]),
+    "Exit Book": ItemData(20, ItemClassification.useful, ["Spells"]),
+    "Cure Book": ItemData(21, ItemClassification.useful, ["Spells"]),
+    "Heal Book": ItemData(22, ItemClassification.useful, ["Spells"]),
+    "Life Book": ItemData(23, ItemClassification.useful, ["Spells"]),
+    "Quake Book": ItemData(24, ItemClassification.useful, ["Spells"]),
+    "Blizzard Book": ItemData(25, ItemClassification.useful, ["Spells"]),
+    "Fire Book": ItemData(26, ItemClassification.useful, ["Spells"]),
+    "Aero Book": ItemData(27, ItemClassification.useful, ["Spells"]),
+    "Thunder Seal": ItemData(28, ItemClassification.useful, ["Spells"]),
+    "White Seal": ItemData(29, ItemClassification.useful, ["Spells"]),
+    "Meteor Seal": ItemData(30, ItemClassification.useful, ["Spells"]),
+    "Flare Seal": ItemData(31, ItemClassification.useful, ["Spells"]),
+    "Progressive Sword": ItemData(32 + 256, ItemClassification.progression, ["Weapons", "Swords"]),
+    "Steel Sword": ItemData(32, ItemClassification.progression, ["Weapons", "Swords"]),
+    "Knight Sword": ItemData(33, ItemClassification.progression_skip_balancing, ["Weapons", "Swords"]),
+    "Excalibur": ItemData(34, ItemClassification.progression_skip_balancing, ["Weapons", "Swords"]),
+    "Progressive Axe": ItemData(35 + 256, ItemClassification.progression, ["Weapons", "Axes"]),
+    "Axe": ItemData(35, ItemClassification.progression, ["Weapons", "Axes"]),
+    "Battle Axe": ItemData(36, ItemClassification.progression_skip_balancing, ["Weapons", "Axes"]),
+    "Giant's Axe": ItemData(37, ItemClassification.progression_skip_balancing, ["Weapons", "Axes"]),
+    "Progressive Claw": ItemData(38 + 256, ItemClassification.progression, ["Weapons", "Axes"]),
+    "Cat Claw": ItemData(38, ItemClassification.progression, ["Weapons", "Claws"]),
+    "Charm Claw": ItemData(39, ItemClassification.progression_skip_balancing, ["Weapons", "Claws"]),
+    "Dragon Claw": ItemData(40, ItemClassification.progression, ["Weapons", "Claws"]),
+    "Progressive Bomb": ItemData(41 + 256, ItemClassification.progression, ["Weapons", "Bombs"]),
+    "Bomb": ItemData(41, ItemClassification.progression, ["Weapons", "Bombs"]),
+    "Jumbo Bomb": ItemData(42, ItemClassification.progression_skip_balancing, ["Weapons", "Bombs"]),
+    "Mega Grenade": ItemData(43, ItemClassification.progression, ["Weapons", "Bombs"]),
+    # Ally-only equipment does nothing when received, no reason to put them in the datapackage
+    #"Morning Star": ItemData(44, ItemClassification.progression, ["Weapons"]),
+    #"Bow Of Grace": ItemData(45, ItemClassification.progression, ["Weapons"]),
+    #"Ninja Star": ItemData(46, ItemClassification.progression, ["Weapons"]),
+
+    "Progressive Helm": ItemData(47 + 256, ItemClassification.useful, ["Helms"]),
+    "Steel Helm": ItemData(47, ItemClassification.useful, ["Helms"]),
+    "Moon Helm": ItemData(48, ItemClassification.useful, ["Helms"]),
+    "Apollo Helm": ItemData(49, ItemClassification.useful, ["Helms"]),
+    "Progressive Armor": ItemData(50 + 256, ItemClassification.useful, ["Armors"]),
+    "Steel Armor": ItemData(50, ItemClassification.useful, ["Armors"]),
+    "Noble Armor": ItemData(51, ItemClassification.useful, ["Armors"]),
+    "Gaia's Armor": ItemData(52, ItemClassification.useful, ["Armors"]),
+    #"Replica Armor": ItemData(53, ItemClassification.progression, ["Armors"]),
+    #"Mystic Robes": ItemData(54, ItemClassification.progression, ["Armors"]),
+    #"Flame Armor": ItemData(55, ItemClassification.progression, ["Armors"]),
+    #"Black Robe": ItemData(56, ItemClassification.progression, ["Armors"]),
+    "Progressive Shield": ItemData(57 + 256, ItemClassification.useful, ["Shields"]),
+    "Steel Shield": ItemData(57, ItemClassification.useful, ["Shields"]),
+    "Venus Shield": ItemData(58, ItemClassification.useful, ["Shields"]),
+    "Aegis Shield": ItemData(59, ItemClassification.useful, ["Shields"]),
+    #"Ether Shield": ItemData(60, ItemClassification.progression, ["Shields"]),
+    "Progressive Accessory": ItemData(61 + 256, ItemClassification.useful, ["Accessories"]),
+    "Charm": ItemData(61, ItemClassification.useful, ["Accessories"]),
+    "Magic Ring": ItemData(62, ItemClassification.useful, ["Accessories"]),
+    "Cupid Locket": ItemData(63, ItemClassification.useful, ["Accessories"]),
+
+    # these are understood by FFMQR and I could place these if I want, but it's easier to just let FFMQR
+    # place them. I want an option to make shuffle battlefield rewards NOT color-code the battlefields,
+    # and then I would make the non-item reward battlefields into AP checks and these would be put into those as
+    # the item for AP. But there is no such option right now.
+    # "54 XP": ItemData(96, ItemClassification.filler, data_name="Xp54"),
+    # "99 XP": ItemData(97, ItemClassification.filler, data_name="Xp99"),
+    # "540 XP": ItemData(98, ItemClassification.filler, data_name="Xp540"),
+    # "744 XP": ItemData(99, ItemClassification.filler, data_name="Xp744"),
+    # "816 XP": ItemData(100, ItemClassification.filler, data_name="Xp816"),
+    # "1068 XP": ItemData(101, ItemClassification.filler, data_name="Xp1068"),
+    # "1200 XP": ItemData(102, ItemClassification.filler, data_name="Xp1200"),
+    # "2700 XP": ItemData(103, ItemClassification.filler, data_name="Xp2700"),
+    # "2808 XP": ItemData(104, ItemClassification.filler, data_name="Xp2808"),
+    # "150 Gp": ItemData(105, ItemClassification.filler, data_name="Gp150"),
+    # "300 Gp": ItemData(106, ItemClassification.filler, data_name="Gp300"),
+    # "600 Gp": ItemData(107, ItemClassification.filler, data_name="Gp600"),
+    # "900 Gp": ItemData(108, ItemClassification.filler, data_name="Gp900"),
+    # "1200 Gp": ItemData(109, ItemClassification.filler, data_name="Gp1200"),
+
+
+    "Bomb Refill": ItemData(221, ItemClassification.filler, ["Refills"]),
+    "Projectile Refill": ItemData(222, ItemClassification.filler, ["Refills"]),
+    #"None": ItemData(255, ItemClassification.progression, []),
+
+    "Kaeli 1": ItemData(None, ItemClassification.progression),
+    "Kaeli 2": ItemData(None, ItemClassification.progression),
+    "Tristam": ItemData(None, ItemClassification.progression),
+    "Phoebe 1": ItemData(None, ItemClassification.progression),
+    "Reuben 1": ItemData(None, ItemClassification.progression),
+    "Reuben Dad Saved": ItemData(None, ItemClassification.progression),
+    "Otto": ItemData(None, ItemClassification.progression),
+    "Captain Mac": ItemData(None, ItemClassification.progression),
+    "Ship Steering Wheel": ItemData(None, ItemClassification.progression),
+    "Minotaur": ItemData(None, ItemClassification.progression),
+    "Flamerus Rex": ItemData(None, ItemClassification.progression),
+    "Phanquid": ItemData(None, ItemClassification.progression),
+    "Freezer Crab": ItemData(None, ItemClassification.progression),
+    "Ice Golem": ItemData(None, ItemClassification.progression),
+    "Jinn": ItemData(None, ItemClassification.progression),
+    "Medusa": ItemData(None, ItemClassification.progression),
+    "Dualhead Hydra": ItemData(None, ItemClassification.progression),
+    "Gidrah": ItemData(None, ItemClassification.progression),
+    "Dullahan": ItemData(None, ItemClassification.progression),
+    "Pazuzu": ItemData(None, ItemClassification.progression),
+    "Aquaria Plaza": ItemData(None, ItemClassification.progression),
+    "Summer Aquaria": ItemData(None, ItemClassification.progression),
+    "Reuben Mine": ItemData(None, ItemClassification.progression),
+    "Alive Forest": ItemData(None, ItemClassification.progression),
+    "Rainbow Bridge": ItemData(None, ItemClassification.progression),
+    "Collapse Spencer's Cave": ItemData(None, ItemClassification.progression),
+    "Ship Liberated": ItemData(None, ItemClassification.progression),
+    "Ship Loaned": ItemData(None, ItemClassification.progression),
+    "Ship Dock Access": ItemData(None, ItemClassification.progression),
+    "Stone Golem": ItemData(None, ItemClassification.progression),
+    "Twinhead Wyvern": ItemData(None, ItemClassification.progression),
+    "Zuh": ItemData(None, ItemClassification.progression),
+
+    "Libra Temple Crest Tile": ItemData(None, ItemClassification.progression),
+    "Life Temple Crest Tile": ItemData(None, ItemClassification.progression),
+    "Aquaria Vendor Crest Tile": ItemData(None, ItemClassification.progression),
+    "Fireburg Vendor Crest Tile": ItemData(None, ItemClassification.progression),
+    "Fireburg Grenademan Crest Tile": ItemData(None, ItemClassification.progression),
+    "Sealed Temple Crest Tile": ItemData(None, ItemClassification.progression),
+    "Wintry Temple Crest Tile": ItemData(None, ItemClassification.progression),
+    "Kaidge Temple Crest Tile": ItemData(None, ItemClassification.progression),
+    "Light Temple Crest Tile": ItemData(None, ItemClassification.progression),
+    "Windia Kids Crest Tile": ItemData(None, ItemClassification.progression),
+    "Windia Dock Crest Tile": ItemData(None, ItemClassification.progression),
+    "Ship Dock Crest Tile": ItemData(None, ItemClassification.progression),
+    "Alive Forest Libra Crest Tile": ItemData(None, ItemClassification.progression),
+    "Alive Forest Gemini Crest Tile": ItemData(None, ItemClassification.progression),
+    "Alive Forest Mobius Crest Tile": ItemData(None, ItemClassification.progression),
+    "Wood House Libra Crest Tile": ItemData(None, ItemClassification.progression),
+    "Wood House Gemini Crest Tile": ItemData(None, ItemClassification.progression),
+    "Wood House Mobius Crest Tile": ItemData(None, ItemClassification.progression),
+    "Barrel Pushed": ItemData(None, ItemClassification.progression),
+    "Long Spine Bombed": ItemData(None, ItemClassification.progression),
+    "Short Spine Bombed": ItemData(None, ItemClassification.progression),
+    "Skull 1 Bombed": ItemData(None, ItemClassification.progression),
+    "Skull 2 Bombed": ItemData(None, ItemClassification.progression),
+    "Ice Pyramid 1F Statue": ItemData(None, ItemClassification.progression),
+    "Ice Pyramid 3F Statue": ItemData(None, ItemClassification.progression),
+    "Ice Pyramid 4F Statue": ItemData(None, ItemClassification.progression),
+    "Ice Pyramid 5F Statue": ItemData(None, ItemClassification.progression),
+    "Spencer Cave Libra Block Bombed": ItemData(None, ItemClassification.progression),
+    "Lava Dome Plate": ItemData(None, ItemClassification.progression),
+    "Pazuzu 2F Lock": ItemData(None, ItemClassification.progression),
+    "Pazuzu 4F Lock": ItemData(None, ItemClassification.progression),
+    "Pazuzu 6F Lock": ItemData(None, ItemClassification.progression),
+    "Pazuzu 1F": ItemData(None, ItemClassification.progression),
+    "Pazuzu 2F": ItemData(None, ItemClassification.progression),
+    "Pazuzu 3F": ItemData(None, ItemClassification.progression),
+    "Pazuzu 4F": ItemData(None, ItemClassification.progression),
+    "Pazuzu 5F": ItemData(None, ItemClassification.progression),
+    "Pazuzu 6F": ItemData(None, ItemClassification.progression),
+    "Dark King": ItemData(None, ItemClassification.progression),
+    "Tristam Bone Item Given": ItemData(None, ItemClassification.progression),
+    #"Barred": ItemData(None, ItemClassification.progression),
+
+}
+
+prog_map = {
+    "Swords": "Progressive Sword",
+    "Axes": "Progressive Axe",
+    "Claws": "Progressive Claw",
+    "Bombs": "Progressive Bomb",
+    "Shields": "Progressive Shield",
+    "Armors": "Progressive Armor",
+    "Helms": "Progressive Helm",
+    "Accessories": "Progressive Accessory",
+}
+
+
+def yaml_item(text):
+    if text == "CaptainCap":
+        return "Captain's Cap"
+    elif text == "WakeWater":
+        return "Wakewater"
+    return "".join(
+        [(" " + c if (c.isupper() or c.isnumeric()) and not (text[i - 1].isnumeric() and c == "F") else c) for
+         i, c in enumerate(text)]).strip()
+
+
+item_groups = {}
+for item, data in item_table.items():
+    for group in data.groups:
+        item_groups[group] = item_groups.get(group, []) + [item]
+
+
+def create_items(self) -> None:
+    items = []
+    starting_weapon = self.multiworld.starting_weapon[self.player].current_key.title().replace("_", " ")
+    if self.multiworld.progressive_gear[self.player]:
+        for item_group in prog_map:
+            if starting_weapon in self.item_name_groups[item_group]:
+                starting_weapon = prog_map[item_group]
+                break
+    self.multiworld.push_precollected(self.create_item(starting_weapon))
+    self.multiworld.push_precollected(self.create_item("Steel Armor"))
+    if self.multiworld.sky_coin_mode[self.player] == "start_with":
+        self.multiworld.push_precollected(self.create_item("Sky Coin"))
+
+    precollected_item_names = {item.name for item in self.multiworld.precollected_items[self.player]}
+
+    def add_item(item_name):
+        if item_name in ["Steel Armor", "Sky Fragment"] or "Progressive" in item_name:
+            return
+        if item_name.lower().replace(" ", "_") == self.multiworld.starting_weapon[self.player].current_key:
+            return
+        if self.multiworld.progressive_gear[self.player]:
+            for item_group in prog_map:
+                if item_name in self.item_name_groups[item_group]:
+                    item_name = prog_map[item_group]
+                    break
+        if item_name == "Sky Coin":
+            if self.multiworld.sky_coin_mode[self.player] == "shattered_sky_coin":
+                for _ in range(40):
+                    items.append(self.create_item("Sky Fragment"))
+                return
+            elif self.multiworld.sky_coin_mode[self.player] == "save_the_crystals":
+                items.append(self.create_filler())
+                return
+        if item_name in precollected_item_names:
+            items.append(self.create_filler())
+            return
+        i = self.create_item(item_name)
+        if self.multiworld.logic[self.player] != "friendly" and item_name in ("Magic Mirror", "Mask"):
+            i.classification = ItemClassification.useful
+        if (self.multiworld.logic[self.player] == "expert" and self.multiworld.map_shuffle[self.player] == "none" and
+                item_name == "Exit Book"):
+            i.classification = ItemClassification.progression
+        items.append(i)
+
+    for item_group in ("Key Items", "Spells", "Armors", "Helms", "Shields", "Accessories", "Weapons"):
+        for item in self.item_name_groups[item_group]:
+            add_item(item)
+
+    if self.multiworld.brown_boxes[self.player] == "include":
+        filler_items = []
+        for item, count in fillers.items():
+            filler_items += [self.create_item(item) for _ in range(count)]
+        if self.multiworld.sky_coin_mode[self.player] == "shattered_sky_coin":
+            self.multiworld.random.shuffle(filler_items)
+            filler_items = filler_items[39:]
+        items += filler_items
+
+    self.multiworld.itempool += items
+
+    if len(self.multiworld.player_ids) > 1:
+        early_choices = ["Sand Coin", "River Coin"]
+        early_item = self.multiworld.random.choice(early_choices)
+        self.multiworld.early_items[self.player][early_item] = 1
+
+
+class FFMQItem(Item):
+    game = "Final Fantasy Mystic Quest"
+    type = None
+
+    def __init__(self, name, player: int = None):
+        item_data = item_table[name]
+        super(FFMQItem, self).__init__(
+            name,
+            item_data.classification,
+            item_data.id, player
+        )
\ No newline at end of file
diff --git a/worlds/ffmq/LICENSE b/worlds/ffmq/LICENSE
new file mode 100644
index 0000000000..46ad1c0074
--- /dev/null
+++ b/worlds/ffmq/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2023 Alex "Alchav" Avery
+Copyright (c) 2023 wildham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/worlds/ffmq/Options.py b/worlds/ffmq/Options.py
new file mode 100644
index 0000000000..4b9f4a4a88
--- /dev/null
+++ b/worlds/ffmq/Options.py
@@ -0,0 +1,356 @@
+from Options import Choice, FreeText, Toggle, Range
+
+
+class Logic(Choice):
+    """Placement logic sets the rules that will be applied when placing items. Friendly: Required Items to clear a
+    dungeon will never be placed in that dungeon to avoid the need to revisit it. Also, the Magic Mirror and the Mask
+    will always be available before Ice Pyramid and Volcano, respectively. Note: If Dungeons are shuffled, Friendly
+    logic will only ensure the availability of the Mirror and the Mask. Standard: Items are randomly placed and logic
+    merely verifies that they're all accessible. As for Region access, only the Coins are considered. Expert: Same as
+    Standard, but Items Placement logic also includes other routes than Coins: the Crests Teleporters, the
+    Fireburg-Aquaria Lava bridge and the Sealed Temple Exit trick."""
+    option_friendly = 0
+    option_standard = 1
+    option_expert = 2
+    default = 1
+    display_name = "Logic"
+
+
+class BrownBoxes(Choice):
+    """Include the 201 brown box locations from the original game. Brown Boxes are all the boxes that contained a
+    consumable in the original game. If shuffle is chosen, the consumables contained will be shuffled but the brown
+    boxes will not be Archipelago location checks."""
+    option_exclude = 0
+    option_include = 1
+    option_shuffle = 2
+    default = 1
+    display_name = "Brown Boxes"
+
+
+class SkyCoinMode(Choice):
+    """Configure how the Sky Coin is acquired. With standard, the Sky Coin will be placed randomly. With Start With, the
+    Sky Coin will be in your inventory at the start of the game. With Save The Crystals, the Sky Coin will be acquired
+    once you save all 4 crystals. With Shattered Sky Coin, the Sky Coin is split in 40 fragments; you can enter Doom
+    Castle once the required amount is found. Shattered Sky Coin will force brown box locations to be included."""
+    option_standard = 0
+    option_start_with = 1
+    option_save_the_crystals = 2
+    option_shattered_sky_coin = 3
+    default = 0
+    display_name = "Sky Coin Mode"
+
+
+class ShatteredSkyCoinQuantity(Choice):
+    """Configure the number of the 40 Sky Coin Fragments required to enter the Doom Castle. Only has an effect if
+    Sky Coin Mode is set to shattered. Low: 16. Mid: 24. High: 32. Random Narrow: random between 16 and 32.
+    Random Wide: random between 10 and 38."""
+    option_low_16 = 0
+    option_mid_24 = 1
+    option_high_32 = 2
+    option_random_narrow = 3
+    option_random_wide = 4
+    default = 1
+    display_name = "Shattered Sky Coin"
+
+
+class StartingWeapon(Choice):
+    """Choose your starting weapon."""
+    display_name = "Starting Weapon"
+    option_steel_sword = 0
+    option_axe = 1
+    option_cat_claw = 2
+    option_bomb = 3
+    default = "random"
+
+
+class ProgressiveGear(Toggle):
+    """Pieces of gear are always acquired from weakest to strongest in a set."""
+    display_name = "Progressive Gear"
+
+
+class EnemiesDensity(Choice):
+    """Set how many of the original enemies are on each map."""
+    display_name = "Enemies Density"
+    option_all = 0
+    option_three_quarter = 1
+    option_half = 2
+    option_quarter = 3
+    option_none = 4
+
+
+class EnemyScaling(Choice):
+    """Superclass for enemy scaling options."""
+    option_quarter = 0
+    option_half = 1
+    option_three_quarter = 2
+    option_normal = 3
+    option_one_and_quarter = 4
+    option_one_and_half = 5
+    option_double = 6
+    option_double_and_half = 7
+    option_triple = 8
+
+
+class EnemiesScalingLower(EnemyScaling):
+    """Randomly adjust enemies stats by the selected range percentage. Include mini-bosses' weaker clones."""
+    display_name = "Enemies Scaling Lower"
+    default = 0
+
+
+class EnemiesScalingUpper(EnemyScaling):
+    """Randomly adjust enemies stats by the selected range percentage. Include mini-bosses' weaker clones."""
+    display_name = "Enemies Scaling Upper"
+    default = 4
+
+
+class BossesScalingLower(EnemyScaling):
+    """Randomly adjust bosses stats by the selected range percentage. Include Mini-Bosses, Bosses, Bosses' refights and
+    the Dark King."""
+    display_name = "Bosses Scaling Lower"
+    default = 0
+
+
+class BossesScalingUpper(EnemyScaling):
+    """Randomly adjust bosses stats by the selected range percentage. Include Mini-Bosses, Bosses, Bosses' refights and
+    the Dark King."""
+    display_name = "Bosses Scaling Upper"
+    default = 4
+
+
+class EnemizerAttacks(Choice):
+    """Shuffles enemy attacks. Standard: No shuffle. Safe: Randomize every attack but leave out self-destruct and Dark
+    King attacks. Chaos: Randomize and include self-destruct and Dark King attacks. Self Destruct: Every enemy
+    self-destructs. Simple Shuffle: Instead of randomizing, shuffle one monster's attacks to another. Dark King is left
+    vanilla."""
+    display_name = "Enemizer Attacks"
+    option_normal = 0
+    option_safe = 1
+    option_chaos = 2
+    option_self_destruct = 3
+    option_simple_shuffle = 4
+    default = 0
+
+
+class EnemizerGroups(Choice):
+    """Set which enemy groups will be affected by Enemizer."""
+    display_name = "Enemizer Groups"
+    option_mobs_only = 0
+    option_mobs_and_bosses = 1
+    option_mobs_bosses_and_dark_king = 2
+    default = 1
+
+
+class ShuffleResWeakType(Toggle):
+    """Resistance and Weakness types are shuffled for all enemies."""
+    display_name = "Shuffle Resistance/Weakness Types"
+    default = 0
+
+
+class ShuffleEnemiesPositions(Toggle):
+    """Instead of their original position in a given map, enemies are randomly placed."""
+    display_name = "Shuffle Enemies' Positions"
+    default = 1
+
+
+class ProgressiveFormations(Choice):
+    """Enemies' formations are selected by regions, with the weakest formations always selected in Foresta and the
+    strongest in Windia. Disabled: Standard formations are used. Regions Strict: Formations will come exclusively
+    from the current region, whatever the map is. Regions Keep Type: Formations will keep the original formation type
+    and match with the nearest power level."""
+    display_name = "Progressive Formations"
+    option_disabled = 0
+    option_regions_strict = 1
+    option_regions_keep_type = 2
+
+
+class DoomCastle(Choice):
+    """Configure how you reach the Dark King. With Standard, you need to defeat all four bosses and their floors to
+    reach the Dark King. With Boss Rush, only the bosses are blocking your way in the corridor to the Dark King's room.
+    With Dark King Only, the way to the Dark King is free of any obstacle."""
+    display_name = "Doom Castle"
+    option_standard = 0
+    option_boss_rush = 1
+    option_dark_king_only = 2
+
+
+class DoomCastleShortcut(Toggle):
+    """Create a shortcut granting access from the start to Doom Castle at Focus Tower's entrance.
+    Also modify the Desert floor, so it can be navigated without the Mega Grenades and the Dragon Claw."""
+    display_name = "Doom Castle Shortcut"
+
+
+class TweakFrustratingDungeons(Toggle):
+    """Make some small changes to a few of the most annoying dungeons. Ice Pyramid: Add 3 shortcuts on the 1st floor.
+    Giant Tree: Add shortcuts on the 1st and 4th floors and curtail mushrooms population.
+    Pazuzu's Tower: Staircases are devoid of enemies (regardless of Enemies Density settings)."""
+    display_name = "Tweak Frustrating Dungeons"
+
+
+class MapShuffle(Choice):
+    """None: No shuffle. Overworld: Only shuffle the Overworld locations. Dungeons: Only shuffle the dungeons' floors
+    amongst themselves. Temples and Towns aren't included. Overworld And Dungeons: Shuffle the Overworld and dungeons
+    at the same time. Everything: Shuffle the Overworld, dungeons, temples and towns all amongst each others.
+    When dungeons are shuffled, defeating Pazuzu won't teleport you to the 7th floor, you have to get there normally to
+    save the Crystal and get Pazuzu's Chest."""
+    display_name = "Map Shuffle"
+    option_none = 0
+    option_overworld = 1
+    option_dungeons = 2
+    option_overworld_and_dungeons = 3
+    option_everything = 4
+    default = 0
+
+
+class CrestShuffle(Toggle):
+    """Shuffle the Crest tiles amongst themselves."""
+    display_name = "Crest Shuffle"
+
+
+class MapShuffleSeed(FreeText):
+    """If this is a number, it will be used as a set seed number for Map, Crest, and Battlefield Reward shuffles.
+    If this is "random" the seed will be chosen randomly. If it is any other text, it will be used as a seed group name.
+    All players using the same seed group name will get the same shuffle results, as long as their Map Shuffle,
+    Crest Shuffle, and Shuffle Battlefield Rewards settings are the same."""
+    display_name = "Map Shuffle Seed"
+    default = "random"
+
+
+class LevelingCurve(Choice):
+    """Adjust the level gain rate."""
+    display_name = "Leveling Curve"
+    option_half = 0
+    option_normal = 1
+    option_one_and_half = 2
+    option_double = 3
+    option_double_and_half = 4
+    option_triple = 5
+    option_quadruple = 6
+    default = 4
+
+
+class ShuffleBattlefieldRewards(Toggle):
+    """Shuffle the type of reward (Item, XP, GP) given by battlefields and color code them by reward type.
+    Blue: Give an item. Grey: Give XP. Green: Give GP."""
+    display_name = "Shuffle Battlefield Rewards"
+
+
+class BattlefieldsBattlesQuantities(Choice):
+    """Adjust the number of battles that need to be fought to get a battlefield's reward."""
+    display_name = "Battlefields Battles Quantity"
+    option_ten = 0
+    option_seven = 1
+    option_five = 2
+    option_three = 3
+    option_one = 4
+    option_random_one_through_five = 5
+    option_random_one_through_ten = 6
+
+
+class CompanionLevelingType(Choice):
+    """Set how companions gain levels.
+    Quests: Complete each companion's individual quest for them to promote to their second version.
+    Quests Extended: Each companion has four exclusive quests, leveling each time a quest is completed.
+    Save the Crystals (All): Each time a Crystal is saved, all companions gain levels.
+    Save the Crystals (Individual): Each companion will level to their second version when a specific Crystal is saved.
+    Benjamin Level: Companions' level tracks Benjamin's."""
+    option_quests = 0
+    option_quests_extended = 1
+    option_save_crystals_individual = 2
+    option_save_crystals_all = 3
+    option_benjamin_level = 4
+    option_benjamin_level_plus_5 = 5
+    option_benjamin_level_plus_10 = 6
+    default = 0
+    display_name = "Companion Leveling Type"
+
+
+class CompanionSpellbookType(Choice):
+    """Update companions' spellbook.
+    Standard: Original game spellbooks.
+    Extended: Add some extra spells. Tristam gains Exit and Quake and Reuben gets Blizzard.
+    Random Balanced: Randomize the spellbooks with an appropriate mix of spells.
+    Random Chaos: Randomize the spellbooks in total free-for-all."""
+    option_standard = 0
+    option_extended = 1
+    option_random_balanced = 2
+    option_random_chaos = 3
+    default = 0
+    display_name = "Companion Spellbook Type"
+
+
+class StartingCompanion(Choice):
+    """Set a companion to start with.
+    Random Companion: Randomly select one companion.
+    Random Plus None: Randomly select a companion, with the possibility of none selected."""
+    display_name = "Starting Companion"
+    default = 0
+    option_none = 0
+    option_kaeli = 1
+    option_tristam = 2
+    option_phoebe = 3
+    option_reuben = 4
+    option_random_companion = 5
+    option_random_plus_none = 6
+
+
+class AvailableCompanions(Range):
+    """Select randomly which companions will join your party. Unavailable companions can still be reached to get their items and complete their quests if needed.
+    Note: If a Starting Companion is selected, it will always be available, regardless of this setting."""
+    display_name = "Available Companions"
+    default = 4
+    range_start = 0
+    range_end = 4
+
+
+class CompanionsLocations(Choice):
+    """Set the primary location of companions. Their secondary location is always the same.
+    Standard: Companions will be at the same locations as in the original game.
+    Shuffled: Companions' locations are shuffled amongst themselves.
+    Shuffled Extended: Add all the Temples, as well as Phoebe's House and the Rope Bridge as possible locations."""
+    display_name = "Companions' Locations"
+    default = 0
+    option_standard = 0
+    option_shuffled = 1
+    option_shuffled_extended = 2
+
+
+class KaelisMomFightsMinotaur(Toggle):
+    """Transfer Kaeli's requirements (Tree Wither, Elixir) and the two items she's giving to her mom.
+    Kaeli will be available to join the party right away without the Tree Wither."""
+    display_name = "Kaeli's Mom Fights Minotaur"
+    default = 0
+
+
+option_definitions = {
+    "logic": Logic,
+    "brown_boxes": BrownBoxes,
+    "sky_coin_mode": SkyCoinMode,
+    "shattered_sky_coin_quantity": ShatteredSkyCoinQuantity,
+    "starting_weapon": StartingWeapon,
+    "progressive_gear": ProgressiveGear,
+    "leveling_curve": LevelingCurve,
+    "starting_companion": StartingCompanion,
+    "available_companions": AvailableCompanions,
+    "companions_locations": CompanionsLocations,
+    "kaelis_mom_fight_minotaur": KaelisMomFightsMinotaur,
+    "companion_leveling_type": CompanionLevelingType,
+    "companion_spellbook_type": CompanionSpellbookType,
+    "enemies_density": EnemiesDensity,
+    "enemies_scaling_lower": EnemiesScalingLower,
+    "enemies_scaling_upper": EnemiesScalingUpper,
+    "bosses_scaling_lower": BossesScalingLower,
+    "bosses_scaling_upper": BossesScalingUpper,
+    "enemizer_attacks": EnemizerAttacks,
+    "enemizer_groups": EnemizerGroups,
+    "shuffle_res_weak_types": ShuffleResWeakType,
+    "shuffle_enemies_position": ShuffleEnemiesPositions,
+    "progressive_formations": ProgressiveFormations,
+    "doom_castle_mode": DoomCastle,
+    "doom_castle_shortcut": DoomCastleShortcut,
+    "tweak_frustrating_dungeons": TweakFrustratingDungeons,
+    "map_shuffle": MapShuffle,
+    "crest_shuffle": CrestShuffle,
+    "shuffle_battlefield_rewards": ShuffleBattlefieldRewards,
+    "map_shuffle_seed": MapShuffleSeed,
+    "battlefields_battles_quantities": BattlefieldsBattlesQuantities,
+}
diff --git a/worlds/ffmq/Output.py b/worlds/ffmq/Output.py
new file mode 100644
index 0000000000..98ecd28986
--- /dev/null
+++ b/worlds/ffmq/Output.py
@@ -0,0 +1,125 @@
+import yaml
+import os
+import zipfile
+from copy import deepcopy
+from .Regions import object_id_table
+from Main import __version__
+from worlds.Files import APContainer
+import pkgutil
+
+settings_template = yaml.load(pkgutil.get_data(__name__, "data/settings.yaml"), yaml.Loader)
+
+
+def generate_output(self, output_directory):
+    def output_item_name(item):
+        if item.player == self.player:
+            if item.code > 0x420000 + 256:
+                item_name = self.item_id_to_name[item.code - 256]
+            else:
+                item_name = item.name
+            item_name = "".join(item_name.split("'"))
+            item_name = "".join(item_name.split(" "))
+        else:
+            if item.advancement or item.useful or (item.trap and
+                                                   self.multiworld.per_slot_randoms[self.player].randint(0, 1)):
+                item_name = "APItem"
+            else:
+                item_name = "APItemFiller"
+        return item_name
+
+    item_placement = []
+    for location in self.multiworld.get_locations(self.player):
+        if location.type != "Trigger":
+            item_placement.append({"object_id": object_id_table[location.name], "type": location.type, "content":
+                output_item_name(location.item), "player": self.multiworld.player_name[location.item.player],
+                                   "item_name": location.item.name})
+
+    def cc(option):
+        return option.current_key.title().replace("_", "").replace("OverworldAndDungeons",
+            "OverworldDungeons").replace("MobsAndBosses", "MobsBosses").replace("MobsBossesAndDarkKing",
+            "MobsBossesDK").replace("BenjaminLevelPlus", "BenPlus").replace("BenjaminLevel", "BenPlus0").replace(
+            "RandomCompanion", "Random")
+
+    def tf(option):
+        return True if option else False
+
+    options = deepcopy(settings_template)
+    options["name"] = self.multiworld.player_name[self.player]
+    option_writes = {
+        "enemies_density": cc(self.multiworld.enemies_density[self.player]),
+        "chests_shuffle": "Include",
+        "shuffle_boxes_content": self.multiworld.brown_boxes[self.player] == "shuffle",
+        "npcs_shuffle": "Include",
+        "battlefields_shuffle": "Include",
+        "logic_options": cc(self.multiworld.logic[self.player]),
+        "shuffle_enemies_position": tf(self.multiworld.shuffle_enemies_position[self.player]),
+        "enemies_scaling_lower": cc(self.multiworld.enemies_scaling_lower[self.player]),
+        "enemies_scaling_upper": cc(self.multiworld.enemies_scaling_upper[self.player]),
+        "bosses_scaling_lower": cc(self.multiworld.bosses_scaling_lower[self.player]),
+        "bosses_scaling_upper": cc(self.multiworld.bosses_scaling_upper[self.player]),
+        "enemizer_attacks": cc(self.multiworld.enemizer_attacks[self.player]),
+        "leveling_curve": cc(self.multiworld.leveling_curve[self.player]),
+        "battles_quantity": cc(self.multiworld.battlefields_battles_quantities[self.player]) if
+                               self.multiworld.battlefields_battles_quantities[self.player].value < 5 else
+                               "RandomLow" if
+                               self.multiworld.battlefields_battles_quantities[self.player].value == 5 else
+                               "RandomHigh",
+        "shuffle_battlefield_rewards": tf(self.multiworld.shuffle_battlefield_rewards[self.player]),
+        "random_starting_weapon": True,
+        "progressive_gear": tf(self.multiworld.progressive_gear[self.player]),
+        "tweaked_dungeons": tf(self.multiworld.tweak_frustrating_dungeons[self.player]),
+        "doom_castle_mode": cc(self.multiworld.doom_castle_mode[self.player]),
+        "doom_castle_shortcut": tf(self.multiworld.doom_castle_shortcut[self.player]),
+        "sky_coin_mode": cc(self.multiworld.sky_coin_mode[self.player]),
+        "sky_coin_fragments_qty": cc(self.multiworld.shattered_sky_coin_quantity[self.player]),
+        "enable_spoilers": False,
+        "progressive_formations": cc(self.multiworld.progressive_formations[self.player]),
+        "map_shuffling": cc(self.multiworld.map_shuffle[self.player]),
+        "crest_shuffle": tf(self.multiworld.crest_shuffle[self.player]),
+        "enemizer_groups": cc(self.multiworld.enemizer_groups[self.player]),
+        "shuffle_res_weak_type": tf(self.multiworld.shuffle_res_weak_types[self.player]),
+        "companion_leveling_type": cc(self.multiworld.companion_leveling_type[self.player]),
+        "companion_spellbook_type": cc(self.multiworld.companion_spellbook_type[self.player]),
+        "starting_companion": cc(self.multiworld.starting_companion[self.player]),
+        "available_companions": ["Zero", "One", "Two",
+                                 "Three", "Four"][self.multiworld.available_companions[self.player].value],
+        "companions_locations": cc(self.multiworld.companions_locations[self.player]),
+        "kaelis_mom_fight_minotaur": tf(self.multiworld.kaelis_mom_fight_minotaur[self.player]),
+    }
+
+    for option, data in option_writes.items():
+        options["Final Fantasy Mystic Quest"][option][data] = 1
+
+    rom_name = f'MQ{__version__.replace(".", "")[0:3]}_{self.player}_{self.multiworld.seed_name:11}'[:21]
+    self.rom_name = bytearray(rom_name,
+                              'utf8')
+    self.rom_name_available_event.set()
+
+    setup = {"version": "1.5", "name": self.multiworld.player_name[self.player], "romname": rom_name, "seed":
+             hex(self.multiworld.per_slot_randoms[self.player].randint(0, 0xFFFFFFFF)).split("0x")[1].upper()}
+
+    starting_items = [output_item_name(item) for item in self.multiworld.precollected_items[self.player]]
+    if self.multiworld.sky_coin_mode[self.player] == "shattered_sky_coin":
+        starting_items.append("SkyCoin")
+
+    file_path = os.path.join(output_directory, f"{self.multiworld.get_out_file_name_base(self.player)}.apmq")
+
+    APMQ = APMQFile(file_path, player=self.player, player_name=self.multiworld.player_name[self.player])
+    with zipfile.ZipFile(file_path, mode="w", compression=zipfile.ZIP_DEFLATED,
+                         compresslevel=9) as zf:
+        zf.writestr("itemplacement.yaml", yaml.dump(item_placement))
+        zf.writestr("flagset.yaml", yaml.dump(options))
+        zf.writestr("startingitems.yaml", yaml.dump(starting_items))
+        zf.writestr("setup.yaml", yaml.dump(setup))
+        zf.writestr("rooms.yaml", yaml.dump(self.rooms))
+
+        APMQ.write_contents(zf)
+
+
+class APMQFile(APContainer):
+    game = "Final Fantasy Mystic Quest"
+
+    def get_manifest(self):
+        manifest = super().get_manifest()
+        manifest["patch_file_ending"] = ".apmq"
+        return manifest
\ No newline at end of file
diff --git a/worlds/ffmq/Regions.py b/worlds/ffmq/Regions.py
new file mode 100644
index 0000000000..61f70864c0
--- /dev/null
+++ b/worlds/ffmq/Regions.py
@@ -0,0 +1,251 @@
+from BaseClasses import Region, MultiWorld, Entrance, Location, LocationProgressType, ItemClassification
+from worlds.generic.Rules import add_rule
+from .Items import item_groups, yaml_item
+import pkgutil
+import yaml
+
+rooms = yaml.load(pkgutil.get_data(__name__, "data/rooms.yaml"), yaml.Loader)
+entrance_names = {entrance["id"]: entrance["name"] for entrance in yaml.load(pkgutil.get_data(__name__, "data/entrances.yaml"), yaml.Loader)}
+
+object_id_table = {}
+object_type_table = {}
+offset = {"Chest": 0x420000, "Box": 0x420000, "NPC": 0x420000 + 300, "BattlefieldItem": 0x420000 + 350}
+for room in rooms:
+    for object in room["game_objects"]:
+        if "Hero Chest" in object["name"] or object["type"] == "Trigger":
+            continue
+        if object["type"] in ("BattlefieldItem", "BattlefieldXp", "BattlefieldGp"):
+            object_type_table[object["name"]] = "BattlefieldItem"
+        elif object["type"] in ("Chest", "NPC", "Box"):
+            object_type_table[object["name"]] = object["type"]
+        object_id_table[object["name"]] = object["object_id"]
+
+location_table = {loc_name: offset[object_type_table[loc_name]] + obj_id for loc_name, obj_id in
+                  object_id_table.items()}
+
+weapons = ("Claw", "Bomb", "Sword", "Axe")
+crest_warps = [51, 52, 53, 76, 96, 108, 158, 171, 175, 191, 275, 276, 277, 308, 334, 336, 396, 397]
+
+
+def process_rules(spot, access):
+    for weapon in weapons:
+        if weapon in access:
+            add_rule(spot, lambda state, w=weapon: state.has_any(item_groups[w + "s"], spot.player))
+    access = [yaml_item(rule) for rule in access if rule not in weapons]
+    add_rule(spot, lambda state: state.has_all(access, spot.player))
+
+
+def create_region(world: MultiWorld, player: int, name: str, room_id=None, locations=None, links=None):
+    if links is None:
+        links = []
+    ret = Region(name, player, world)
+    if locations:
+        for location in locations:
+            location.parent_region = ret
+            ret.locations.append(location)
+    ret.links = links
+    ret.id = room_id
+    return ret
+
+
+def get_entrance_to(entrance_to):
+    for room in rooms:
+        if room["id"] == entrance_to["target_room"]:
+            for link in room["links"]:
+                if link["target_room"] == entrance_to["room"]:
+                    return link
+    else:
+        raise Exception(f"Did not find entrance {entrance_to}")
+
+
+def create_regions(self):
+
+    menu_region = create_region(self.multiworld, self.player, "Menu")
+    self.multiworld.regions.append(menu_region)
+
+    for room in self.rooms:
+        self.multiworld.regions.append(create_region(self.multiworld, self.player, room["name"], room["id"],
+            [FFMQLocation(self.player, object["name"], location_table[object["name"]] if object["name"] in
+            location_table else None, object["type"], object["access"],
+            self.create_item(yaml_item(object["on_trigger"][0])) if object["type"] == "Trigger" else None) for object in
+            room["game_objects"] if "Hero Chest" not in object["name"] and object["type"] not in ("BattlefieldGp",
+            "BattlefieldXp") and (object["type"] != "Box" or self.multiworld.brown_boxes[self.player] == "include") and
+            not (object["name"] == "Kaeli Companion" and not object["on_trigger"])], room["links"]))
+
+    dark_king_room = self.multiworld.get_region("Doom Castle Dark King Room", self.player)
+    dark_king = FFMQLocation(self.player, "Dark King", None, "Trigger", [])
+    dark_king.parent_region = dark_king_room
+    dark_king.place_locked_item(self.create_item("Dark King"))
+    dark_king_room.locations.append(dark_king)
+
+    connection = Entrance(self.player, f"Enter Overworld", menu_region)
+    connection.connect(self.multiworld.get_region("Overworld", self.player))
+    menu_region.exits.append(connection)
+
+    for region in self.multiworld.get_regions(self.player):
+        for link in region.links:
+            for connect_room in self.multiworld.get_regions(self.player):
+                if connect_room.id == link["target_room"]:
+                    connection = Entrance(self.player, entrance_names[link["entrance"]] if "entrance" in link and
+                                          link["entrance"] != -1 else f"{region.name} to {connect_room.name}", region)
+                    if "entrance" in link and link["entrance"] != -1:
+                        spoiler = False
+                        if link["entrance"] in crest_warps:
+                            if self.multiworld.crest_shuffle[self.player]:
+                                spoiler = True
+                        elif self.multiworld.map_shuffle[self.player] == "everything":
+                            spoiler = True
+                        elif "Subregion" in region.name and self.multiworld.map_shuffle[self.player] not in ("dungeons",
+                                                                                                             "none"):
+                            spoiler = True
+                        elif "Subregion" not in region.name and self.multiworld.map_shuffle[self.player] not in ("none",
+                                                                                                           "overworld"):
+                            spoiler = True
+
+                        if spoiler:
+                            self.multiworld.spoiler.set_entrance(entrance_names[link["entrance"]], connect_room.name,
+                                                                 'both', self.player)
+                    if link["access"]:
+                        process_rules(connection, link["access"])
+                    region.exits.append(connection)
+                    connection.connect(connect_room)
+                    break
+
+non_dead_end_crest_rooms = [
+    'Libra Temple', 'Aquaria Gemini Room', "GrenadeMan's Mobius Room", 'Fireburg Gemini Room',
+    'Sealed Temple', 'Alive Forest', 'Kaidge Temple Upper Ledge',
+    'Windia Kid House Basement', 'Windia Old People House Basement'
+]
+
+non_dead_end_crest_warps = [
+    'Libra Temple - Libra Tile Script', 'Aquaria Gemini Room - Gemini Script',
+    'GrenadeMan Mobius Room - Mobius Teleporter Script', 'Fireburg Gemini Room - Gemini Teleporter Script',
+    'Sealed Temple - Gemini Tile Script', 'Alive Forest - Libra Teleporter Script',
+    'Alive Forest - Gemini Teleporter Script', 'Alive Forest - Mobius Teleporter Script',
+    'Kaidge Temple - Mobius Teleporter Script', 'Windia Kid House Basement - Mobius Teleporter',
+    'Windia Old People House Basement - Mobius Teleporter Script',
+]
+
+
+vendor_locations = ["Aquaria - Vendor", "Fireburg - Vendor", "Windia - Vendor"]
+
+
+def set_rules(self) -> None:
+    self.multiworld.completion_condition[self.player] = lambda state: state.has("Dark King", self.player)
+
+    def hard_boss_logic(state):
+        return state.has_all(["River Coin", "Sand Coin"], self.player)
+
+    add_rule(self.multiworld.get_location("Pazuzu 1F", self.player), hard_boss_logic)
+    add_rule(self.multiworld.get_location("Gidrah", self.player), hard_boss_logic)
+    add_rule(self.multiworld.get_location("Dullahan", self.player), hard_boss_logic)
+
+    if self.multiworld.map_shuffle[self.player]:
+        for boss in ("Freezer Crab", "Ice Golem", "Jinn", "Medusa", "Dualhead Hydra"):
+            loc = self.multiworld.get_location(boss, self.player)
+            checked_regions = {loc.parent_region}
+
+            def check_foresta(region):
+                if region.name == "Subregion Foresta":
+                    add_rule(loc, hard_boss_logic)
+                    return True
+                elif "Subregion" in region.name:
+                    return True
+                for entrance in region.entrances:
+                    if entrance.parent_region not in checked_regions:
+                        checked_regions.add(entrance.parent_region)
+                        if check_foresta(entrance.parent_region):
+                            return True
+            check_foresta(loc.parent_region)
+
+    if self.multiworld.logic[self.player] == "friendly":
+        process_rules(self.multiworld.get_entrance("Overworld - Ice Pyramid", self.player),
+                      ["MagicMirror"])
+        process_rules(self.multiworld.get_entrance("Overworld - Volcano", self.player),
+                      ["Mask"])
+        if self.multiworld.map_shuffle[self.player] in ("none", "overworld"):
+            process_rules(self.multiworld.get_entrance("Overworld - Bone Dungeon", self.player),
+                          ["Bomb"])
+            process_rules(self.multiworld.get_entrance("Overworld - Wintry Cave", self.player),
+                          ["Bomb", "Claw"])
+            process_rules(self.multiworld.get_entrance("Overworld - Ice Pyramid", self.player),
+                          ["Bomb", "Claw"])
+            process_rules(self.multiworld.get_entrance("Overworld - Mine", self.player),
+                          ["MegaGrenade", "Claw", "Reuben1"])
+            process_rules(self.multiworld.get_entrance("Overworld - Lava Dome", self.player),
+                          ["MegaGrenade"])
+            process_rules(self.multiworld.get_entrance("Overworld - Giant Tree", self.player),
+                          ["DragonClaw", "Axe"])
+            process_rules(self.multiworld.get_entrance("Overworld - Mount Gale", self.player),
+                          ["DragonClaw"])
+            process_rules(self.multiworld.get_entrance("Overworld - Pazuzu Tower", self.player),
+                          ["DragonClaw", "Bomb"])
+            process_rules(self.multiworld.get_entrance("Overworld - Mac Ship", self.player),
+                          ["DragonClaw", "CaptainCap"])
+            process_rules(self.multiworld.get_entrance("Overworld - Mac Ship Doom", self.player),
+                          ["DragonClaw", "CaptainCap"])
+
+    if self.multiworld.logic[self.player] == "expert":
+        if self.multiworld.map_shuffle[self.player] == "none" and not self.multiworld.crest_shuffle[self.player]:
+            inner_room = self.multiworld.get_region("Wintry Temple Inner Room", self.player)
+            connection = Entrance(self.player, "Sealed Temple Exit Trick", inner_room)
+            connection.connect(self.multiworld.get_region("Wintry Temple Outer Room", self.player))
+            connection.access_rule = lambda state: state.has("Exit Book", self.player)
+            inner_room.exits.append(connection)
+    else:
+        for crest_warp in non_dead_end_crest_warps:
+            entrance = self.multiworld.get_entrance(crest_warp, self.player)
+            if entrance.connected_region.name in non_dead_end_crest_rooms:
+                entrance.access_rule = lambda state: False
+
+    if self.multiworld.sky_coin_mode[self.player] == "shattered_sky_coin":
+        logic_coins = [16, 24, 32, 32, 38][self.multiworld.shattered_sky_coin_quantity[self.player].value]
+        self.multiworld.get_entrance("Focus Tower 1F - Sky Door", self.player).access_rule = \
+            lambda state: state.has("Sky Fragment", self.player, logic_coins)
+    elif self.multiworld.sky_coin_mode[self.player] == "save_the_crystals":
+        self.multiworld.get_entrance("Focus Tower 1F - Sky Door", self.player).access_rule = \
+            lambda state: state.has_all(["Flamerus Rex", "Dualhead Hydra", "Ice Golem", "Pazuzu"], self.player)
+    elif self.multiworld.sky_coin_mode[self.player] in ("standard", "start_with"):
+        self.multiworld.get_entrance("Focus Tower 1F - Sky Door", self.player).access_rule = \
+            lambda state: state.has("Sky Coin", self.player)
+
+
+def stage_set_rules(multiworld):
+    # If there's no enemies, there's no repeatable income sources
+    no_enemies_players = [player for player in multiworld.get_game_players("Final Fantasy Mystic Quest")
+                          if multiworld.enemies_density[player] == "none"]
+    if (len([item for item in multiworld.itempool if item.classification in (ItemClassification.filler,
+            ItemClassification.trap)]) > len([player for player in no_enemies_players if
+                                              multiworld.accessibility[player] == "minimal"]) * 3):
+        for player in no_enemies_players:
+            for location in vendor_locations:
+                if multiworld.accessibility[player] == "locations":
+                    print("exclude")
+                    multiworld.get_location(location, player).progress_type = LocationProgressType.EXCLUDED
+                else:
+                    print("unreachable")
+                    multiworld.get_location(location, player).access_rule = lambda state: False
+    else:
+        # There are not enough junk items to fill non-minimal players' vendors. Just set an item rule not allowing
+        # advancement items so that useful items can be placed.
+        print("no advancement")
+        for player in no_enemies_players:
+            for location in vendor_locations:
+                multiworld.get_location(location, player).item_rule = lambda item: not item.advancement
+
+
+
+
+class FFMQLocation(Location):
+    game = "Final Fantasy Mystic Quest"
+
+    def __init__(self, player, name, address, loc_type, access=None, event=None):
+        super(FFMQLocation, self).__init__(
+            player, name,
+            address
+        )
+        self.type = loc_type
+        if access:
+            process_rules(self, access)
+        if event:
+            self.place_locked_item(event)
diff --git a/worlds/ffmq/__init__.py b/worlds/ffmq/__init__.py
new file mode 100644
index 0000000000..b995cc427c
--- /dev/null
+++ b/worlds/ffmq/__init__.py
@@ -0,0 +1,219 @@
+import Utils
+import settings
+import base64
+import threading
+import requests
+import yaml
+from worlds.AutoWorld import World, WebWorld
+from BaseClasses import Tutorial
+from .Regions import create_regions, location_table, set_rules, stage_set_rules, rooms, non_dead_end_crest_rooms,\
+    non_dead_end_crest_warps
+from .Items import item_table, item_groups, create_items, FFMQItem, fillers
+from .Output import generate_output
+from .Options import option_definitions
+from .Client import FFMQClient
+
+
+# removed until lists are supported
+# class FFMQSettings(settings.Group):
+#     class APIUrls(list):
+#         """A list of API URLs to get map shuffle, crest shuffle, and battlefield reward shuffle data from."""
+#     api_urls: APIUrls = [
+#         "https://api.ffmqrando.net/",
+#         "http://ffmqr.jalchavware.com:5271/"
+#     ]
+
+
+class FFMQWebWorld(WebWorld):
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to playing Final Fantasy Mystic Quest with Archipelago.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Alchav"]
+    )]
+
+
+class FFMQWorld(World):
+    """Final Fantasy: Mystic Quest is a simple, humorous RPG for the Super Nintendo. You travel across four continents,
+    linked in the middle of the world by the Focus Tower, which has been locked by four magical coins. Make your way to
+    the bottom of the Focus Tower, then straight up through the top!"""
+    # -Giga Otomia
+
+    game = "Final Fantasy Mystic Quest"
+
+    item_name_to_id = {name: data.id for name, data in item_table.items() if data.id is not None}
+    location_name_to_id = location_table
+    option_definitions = option_definitions
+
+    topology_present = True
+
+    item_name_groups = item_groups
+
+    generate_output = generate_output
+    create_items = create_items
+    create_regions = create_regions
+    set_rules = set_rules
+    stage_set_rules = stage_set_rules
+
+    data_version = 1
+    
+    web = FFMQWebWorld()
+    # settings: FFMQSettings
+
+    def __init__(self, world, player: int):
+        self.rom_name_available_event = threading.Event()
+        self.rom_name = None
+        self.rooms = None
+        super().__init__(world, player)
+
+    def generate_early(self):
+        if self.multiworld.sky_coin_mode[self.player] == "shattered_sky_coin":
+            self.multiworld.brown_boxes[self.player].value = 1
+        if self.multiworld.enemies_scaling_lower[self.player].value > \
+                self.multiworld.enemies_scaling_upper[self.player].value:
+            (self.multiworld.enemies_scaling_lower[self.player].value,
+             self.multiworld.enemies_scaling_upper[self.player].value) =\
+                (self.multiworld.enemies_scaling_upper[self.player].value,
+                 self.multiworld.enemies_scaling_lower[self.player].value)
+        if self.multiworld.bosses_scaling_lower[self.player].value > \
+                self.multiworld.bosses_scaling_upper[self.player].value:
+            (self.multiworld.bosses_scaling_lower[self.player].value,
+             self.multiworld.bosses_scaling_upper[self.player].value) =\
+                (self.multiworld.bosses_scaling_upper[self.player].value,
+                 self.multiworld.bosses_scaling_lower[self.player].value)
+
+    @classmethod
+    def stage_generate_early(cls, multiworld):
+
+        # api_urls = Utils.get_options()["ffmq_options"].get("api_urls", None)
+        api_urls = [
+            "https://api.ffmqrando.net/",
+            "http://ffmqr.jalchavware.com:5271/"
+        ]
+
+        rooms_data = {}
+
+        for world in multiworld.get_game_worlds("Final Fantasy Mystic Quest"):
+            if (world.multiworld.map_shuffle[world.player] or world.multiworld.crest_shuffle[world.player] or
+                    world.multiworld.crest_shuffle[world.player]):
+                if world.multiworld.map_shuffle_seed[world.player].value.isdigit():
+                    multiworld.random.seed(int(world.multiworld.map_shuffle_seed[world.player].value))
+                elif world.multiworld.map_shuffle_seed[world.player].value != "random":
+                    multiworld.random.seed(int(hash(world.multiworld.map_shuffle_seed[world.player].value))
+                                                + int(world.multiworld.seed))
+
+                seed = hex(multiworld.random.randint(0, 0xFFFFFFFF)).split("0x")[1].upper()
+                map_shuffle = multiworld.map_shuffle[world.player].value
+                crest_shuffle = multiworld.crest_shuffle[world.player].current_key
+                battlefield_shuffle = multiworld.shuffle_battlefield_rewards[world.player].current_key
+                companion_shuffle = multiworld.companions_locations[world.player].value
+                kaeli_mom = multiworld.kaelis_mom_fight_minotaur[world.player].current_key
+
+                query = f"s={seed}&m={map_shuffle}&c={crest_shuffle}&b={battlefield_shuffle}&cs={companion_shuffle}&km={kaeli_mom}"
+
+                if query in rooms_data:
+                    world.rooms = rooms_data[query]
+                    continue
+
+                if not api_urls:
+                    raise Exception("No FFMQR API URLs specified in host.yaml")
+
+                errors = []
+                for api_url in api_urls.copy():
+                    try:
+                        response = requests.get(f"{api_url}GenerateRooms?{query}")
+                    except (ConnectionError, requests.exceptions.HTTPError, requests.exceptions.ConnectionError,
+                            requests.exceptions.RequestException) as err:
+                        api_urls.remove(api_url)
+                        errors.append([api_url, err])
+                    else:
+                        if response.ok:
+                            world.rooms = rooms_data[query] = yaml.load(response.text, yaml.Loader)
+                            break
+                        else:
+                            api_urls.remove(api_url)
+                            errors.append([api_url, response])
+                else:
+                    error_text = f"Failed to fetch map shuffle data for FFMQ player {world.player}"
+                    for error in errors:
+                        error_text += f"\n{error[0]} - got error {error[1].status_code} {error[1].reason} {error[1].text}"
+                    raise Exception(error_text)
+                api_urls.append(api_urls.pop(0))
+            else:
+                world.rooms = rooms
+
+    def create_item(self, name: str):
+        return FFMQItem(name, self.player)
+
+    def collect_item(self, state, item, remove=False):
+        if "Progressive" in item.name:
+            i = item.code - 256
+            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 if item.advancement else None
+
+    def modify_multidata(self, multidata):
+        # 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()
+            payload = multidata["connect_names"][self.multiworld.player_name[self.player]]
+            multidata["connect_names"][new_name] = payload
+
+    def get_filler_item_name(self):
+        r = self.multiworld.random.randint(0, 201)
+        for item, count in fillers.items():
+            r -= count
+            r -= fillers[item]
+            if r <= 0:
+                return item
+
+    def extend_hint_information(self, hint_data):
+        hint_data[self.player] = {}
+        if self.multiworld.map_shuffle[self.player]:
+            single_location_regions = ["Subregion Volcano Battlefield", "Subregion Mac's Ship", "Subregion Doom Castle"]
+            for subregion in ["Subregion Foresta", "Subregion Aquaria", "Subregion Frozen Fields", "Subregion Fireburg",
+                              "Subregion Volcano Battlefield", "Subregion Windia", "Subregion Mac's Ship",
+                              "Subregion Doom Castle"]:
+                region = self.multiworld.get_region(subregion, self.player)
+                for location in region.locations:
+                    if location.address and self.multiworld.map_shuffle[self.player] != "dungeons":
+                        hint_data[self.player][location.address] = (subregion.split("Subregion ")[-1]
+                                                                    + (" Region" if subregion not in
+                                                                       single_location_regions else ""))
+                for overworld_spot in region.exits:
+                    if ("Subregion" in overworld_spot.connected_region.name or
+                            overworld_spot.name == "Overworld - Mac Ship Doom" or "Focus Tower" in overworld_spot.name
+                            or "Doom Castle" in overworld_spot.name or overworld_spot.name == "Overworld - Giant Tree"):
+                        continue
+                    exits = list(overworld_spot.connected_region.exits) + [overworld_spot]
+                    checked_regions = set()
+                    while exits:
+                        exit_check = exits.pop()
+                        if (exit_check.connected_region not in checked_regions and "Subregion" not in
+                                exit_check.connected_region.name):
+                            checked_regions.add(exit_check.connected_region)
+                            exits.extend(exit_check.connected_region.exits)
+                            for location in exit_check.connected_region.locations:
+                                if location.address:
+                                    hint = []
+                                    if self.multiworld.map_shuffle[self.player] != "dungeons":
+                                        hint.append((subregion.split("Subregion ")[-1] + (" Region" if subregion not
+                                                    in single_location_regions else "")))
+                                    if self.multiworld.map_shuffle[self.player] != "overworld" and subregion not in \
+                                            ("Subregion Mac's Ship", "Subregion Doom Castle"):
+                                        hint.append(overworld_spot.name.split("Overworld - ")[-1].replace("Pazuzu",
+                                            "Pazuzu's"))
+                                    hint = " - ".join(hint)
+                                    if location.address in hint_data[self.player]:
+                                        hint_data[self.player][location.address] += f"/{hint}"
+                                    else:
+                                        hint_data[self.player][location.address] = hint
+
diff --git a/worlds/ffmq/data/entrances.yaml b/worlds/ffmq/data/entrances.yaml
new file mode 100644
index 0000000000..1dfef2655c
--- /dev/null
+++ b/worlds/ffmq/data/entrances.yaml
@@ -0,0 +1,2450 @@
+- name: Doom Castle - Sand Floor - To Sky Door - Sand Floor
+  id: 0
+  area: 7
+  coordinates: [24, 19]
+  teleporter: [0, 0]
+- name: Doom Castle - Sand Floor - Main Entrance - Sand Floor
+  id: 1
+  area: 7
+  coordinates: [19, 43]
+  teleporter: [1, 6]
+- name: Doom Castle - Aero Room - Aero Room Entrance
+  id: 2
+  area: 7
+  coordinates: [27, 39]
+  teleporter: [1, 0]
+- name: Focus Tower B1 - Main Loop - South Entrance
+  id: 3
+  area: 8
+  coordinates: [43, 60]
+  teleporter: [2, 6]
+- name: Focus Tower B1 - Main Loop - To Focus Tower 1F - Main Hall
+  id: 4
+  area: 8
+  coordinates: [37, 41]
+  teleporter: [4, 0]
+- name: Focus Tower B1 - Aero Corridor - To Focus Tower 1F - Sun Coin Room
+  id: 5
+  area: 8
+  coordinates: [59, 35]
+  teleporter: [5, 0]
+- name: Focus Tower B1 - Aero Corridor - To Sand Floor - Aero Chest
+  id: 6
+  area: 8
+  coordinates: [57, 59]
+  teleporter: [8, 0]
+- name: Focus Tower B1 - Inner Loop - To Focus Tower 1F - Sky Door
+  id: 7
+  area: 8
+  coordinates: [51, 49]
+  teleporter: [6, 0]
+- name: Focus Tower B1 - Inner Loop - To Doom Castle Sand Floor
+  id: 8
+  area: 8
+  coordinates: [51, 45]
+  teleporter: [7, 0]
+- name: Focus Tower 1F - Focus Tower West Entrance
+  id: 9
+  area: 9
+  coordinates: [25, 29]
+  teleporter: [3, 6]
+- name: Focus Tower 1F - To Focus Tower 2F - From SandCoin
+  id: 10
+  area: 9
+  coordinates: [16, 4]
+  teleporter: [10, 0]
+- name: Focus Tower 1F - To Focus Tower B1 - Main Hall
+  id: 11
+  area: 9
+  coordinates: [4, 23]
+  teleporter: [11, 0]
+- name: Focus Tower 1F - To Focus Tower B1 - To Aero Chest
+  id: 12
+  area: 9
+  coordinates: [26, 17]
+  teleporter: [12, 0]
+- name: Focus Tower 1F - Sky Door
+  id: 13
+  area: 9
+  coordinates: [16, 24]
+  teleporter: [13, 0]
+- name: Focus Tower 1F - To Focus Tower 2F - From RiverCoin
+  id: 14
+  area: 9
+  coordinates: [16, 10]
+  teleporter: [14, 0]
+- name: Focus Tower 1F - To Focus Tower B1 - From Sky Door
+  id: 15
+  area: 9
+  coordinates: [16, 29]
+  teleporter: [15, 0]
+- name: Focus Tower 2F - Sand Coin Passage - North Entrance
+  id: 16
+  area: 10
+  coordinates: [49, 30]
+  teleporter: [4, 6]
+- name: Focus Tower 2F - Sand Coin Passage - To Focus Tower 1F - To SandCoin
+  id: 17
+  area: 10
+  coordinates: [47, 33]
+  teleporter: [17, 0]
+- name: Focus Tower 2F - River Coin Passage - To Focus Tower 1F - To RiverCoin
+  id: 18
+  area: 10
+  coordinates: [47, 41]
+  teleporter: [18, 0]
+- name: Focus Tower 2F - River Coin Passage - To Focus Tower 3F - Lower Floor
+  id: 19
+  area: 10
+  coordinates: [38, 40]
+  teleporter: [20, 0]
+- name: Focus Tower 2F - Venus Chest Room - To Focus Tower 3F - Upper Floor
+  id: 20
+  area: 10
+  coordinates: [56, 40]
+  teleporter: [19, 0]
+- name: Focus Tower 2F - Venus Chest Room - Pillar Script
+  id: 21
+  area: 10
+  coordinates: [48, 53]
+  teleporter: [13, 8]
+- name: Focus Tower 3F - Lower Floor - To Fireburg Entrance
+  id: 22
+  area: 11
+  coordinates: [11, 39]
+  teleporter: [6, 6]
+- name: Focus Tower 3F - Lower Floor - To Focus Tower 2F - Jump on Pillar
+  id: 23
+  area: 11
+  coordinates: [6, 47]
+  teleporter: [24, 0]
+- name: Focus Tower 3F - Upper Floor - To Aquaria Entrance
+  id: 24
+  area: 11
+  coordinates: [21, 38]
+  teleporter: [5, 6]
+- name: Focus Tower 3F - Upper Floor - To Focus Tower 2F - Venus Chest Room
+  id: 25
+  area: 11
+  coordinates: [24, 47]
+  teleporter: [23, 0]
+- name: Level Forest - Boulder Script
+  id: 26
+  area: 14
+  coordinates: [52, 15]
+  teleporter: [0, 8]
+- name: Level Forest - Rotten Tree Script
+  id: 27
+  area: 14
+  coordinates: [47, 6]
+  teleporter: [2, 8]
+- name: Level Forest - Exit Level Forest 1
+  id: 28
+  area: 14
+  coordinates: [46, 25]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 2
+  id: 29
+  area: 14
+  coordinates: [46, 26]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 3
+  id: 30
+  area: 14
+  coordinates: [47, 25]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 4
+  id: 31
+  area: 14
+  coordinates: [47, 26]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 5
+  id: 32
+  area: 14
+  coordinates: [60, 14]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 6
+  id: 33
+  area: 14
+  coordinates: [61, 14]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 7
+  id: 34
+  area: 14
+  coordinates: [46, 4]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 8
+  id: 35
+  area: 14
+  coordinates: [46, 3]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest 9
+  id: 36
+  area: 14
+  coordinates: [47, 4]
+  teleporter: [25, 0]
+- name: Level Forest - Exit Level Forest A
+  id: 37
+  area: 14
+  coordinates: [47, 3]
+  teleporter: [25, 0]
+- name: Foresta - Exit Foresta 1
+  id: 38
+  area: 15
+  coordinates: [10, 25]
+  teleporter: [31, 0]
+- name: Foresta - Exit Foresta 2
+  id: 39
+  area: 15
+  coordinates: [10, 26]
+  teleporter: [31, 0]
+- name: Foresta - Exit Foresta 3
+  id: 40
+  area: 15
+  coordinates: [11, 25]
+  teleporter: [31, 0]
+- name: Foresta - Exit Foresta 4
+  id: 41
+  area: 15
+  coordinates: [11, 26]
+  teleporter: [31, 0]
+- name: Foresta - Old Man House - Front Door
+  id: 42
+  area: 15
+  coordinates: [25, 17]
+  teleporter: [32, 4]
+- name: Foresta - Old Man House - Back Door
+  id: 43
+  area: 15
+  coordinates: [25, 14]
+  teleporter: [33, 0]
+- name: Foresta - Kaeli's House
+  id: 44
+  area: 15
+  coordinates: [7, 21]
+  teleporter: [0, 5]
+- name: Foresta - Rest House
+  id: 45
+  area: 15
+  coordinates: [23, 23]
+  teleporter: [1, 5]
+- name: Kaeli's House - Kaeli's House Entrance
+  id: 46
+  area: 16
+  coordinates: [11, 20]
+  teleporter: [86, 3]
+- name: Foresta Houses - Old Man's House - Old Man Front Exit
+  id: 47
+  area: 17
+  coordinates: [35, 44]
+  teleporter: [34, 0]
+- name: Foresta Houses - Old Man's House - Old Man Back Exit
+  id: 48
+  area: 17
+  coordinates: [35, 27]
+  teleporter: [35, 0]
+- name: Foresta - Old Man House - Barrel Tile Script # New, use the focus tower column's script
+  id: 483
+  area: 17
+  coordinates: [0x23, 0x1E]
+  teleporter: [0x0D, 8]
+- name: Foresta Houses - Rest House - Bed Script
+  id: 49
+  area: 17
+  coordinates: [30, 6]
+  teleporter: [1, 8]
+- name: Foresta Houses - Rest House - Rest House Exit
+  id: 50
+  area: 17
+  coordinates: [35, 20]
+  teleporter: [87, 3]
+- name: Foresta Houses - Libra House - Libra House Script
+  id: 51
+  area: 17
+  coordinates: [8, 49]
+  teleporter: [67, 8]
+- name: Foresta Houses - Gemini House - Gemini House Script
+  id: 52
+  area: 17
+  coordinates: [26, 55]
+  teleporter: [68, 8]
+- name: Foresta Houses - Mobius House - Mobius House Script
+  id: 53
+  area: 17
+  coordinates: [14, 33]
+  teleporter: [69, 8]
+- name: Sand Temple - Sand Temple Entrance
+  id: 54
+  area: 18
+  coordinates: [56, 27]
+  teleporter: [36, 0]
+- name: Bone Dungeon 1F - Bone Dungeon Entrance
+  id: 55
+  area: 19
+  coordinates: [13, 60]
+  teleporter: [37, 0]
+- name: Bone Dungeon 1F - To Bone Dungeon B1
+  id: 56
+  area: 19
+  coordinates: [13, 39]
+  teleporter: [2, 2]
+- name: Bone Dungeon B1 - Waterway - Exit Waterway
+  id: 57
+  area: 20
+  coordinates: [27, 39]
+  teleporter: [3, 2]
+- name: Bone Dungeon B1 - Waterway - Tristam's Script
+  id: 58
+  area: 20
+  coordinates: [27, 45]
+  teleporter: [3, 8]
+- name: Bone Dungeon B1 - Waterway - To Bone Dungeon 1F
+  id: 59
+  area: 20
+  coordinates: [54, 61]
+  teleporter: [88, 3]
+- name: Bone Dungeon B1 - Checker Room - Exit Checker Room
+  id: 60
+  area: 20
+  coordinates: [23, 40]
+  teleporter: [4, 2]
+- name: Bone Dungeon B1 - Checker Room - To Waterway
+  id: 61
+  area: 20
+  coordinates: [39, 49]
+  teleporter: [89, 3]
+- name: Bone Dungeon B1 - Hidden Room - To B2 - Exploding Skull Room
+  id: 62
+  area: 20
+  coordinates: [5, 33]
+  teleporter: [91, 3]
+- name: Bonne Dungeon B2 - Exploding Skull Room - To Hidden Passage
+  id: 63
+  area: 21
+  coordinates: [19, 13]
+  teleporter: [5, 2]
+- name: Bonne Dungeon B2 - Exploding Skull Room - To Two Skulls Room
+  id: 64
+  area: 21
+  coordinates: [29, 15]
+  teleporter: [6, 2]
+- name: Bonne Dungeon B2 - Exploding Skull Room - To Checker Room
+  id: 65
+  area: 21
+  coordinates: [8, 25]
+  teleporter: [90, 3]
+- name: Bonne Dungeon B2 - Box Room - To B2 - Two Skulls Room
+  id: 66
+  area: 21
+  coordinates: [59, 12]
+  teleporter: [93, 3]
+- name: Bonne Dungeon B2 - Quake Room - To B2 - Two Skulls Room
+  id: 67
+  area: 21
+  coordinates: [59, 28]
+  teleporter: [94, 3]
+- name: Bonne Dungeon B2 - Two Skulls Room - To Box Room
+  id: 68
+  area: 21
+  coordinates: [53, 7]
+  teleporter: [7, 2]
+- name: Bonne Dungeon B2 - Two Skulls Room - To Quake Room
+  id: 69
+  area: 21
+  coordinates: [41, 3]
+  teleporter: [8, 2]
+- name: Bonne Dungeon B2 - Two Skulls Room - To Boss Room
+  id: 70
+  area: 21
+  coordinates: [47, 57]
+  teleporter: [9, 2]
+- name: Bonne Dungeon B2 - Two Skulls Room - To B2 - Exploding Skull Room
+  id: 71
+  area: 21
+  coordinates: [54, 23]
+  teleporter: [92, 3]
+- name: Bone Dungeon B2 - Boss Room - Flamerus Rex Script
+  id: 72
+  area: 22
+  coordinates: [29, 19]
+  teleporter: [4, 8]
+- name: Bone Dungeon B2 - Boss Room - Tristam Leave Script
+  id: 73
+  area: 22
+  coordinates: [29, 23]
+  teleporter: [75, 8]
+- name: Bone Dungeon B2 - Boss Room - To B2 - Two Skulls Room
+  id: 74
+  area: 22
+  coordinates: [30, 27]
+  teleporter: [95, 3]
+- name: Libra Temple - Entrance
+  id: 75
+  area: 23
+  coordinates: [10, 15]
+  teleporter: [13, 6]
+- name: Libra Temple - Libra Tile Script
+  id: 76
+  area: 23
+  coordinates: [9, 8]
+  teleporter: [59, 8]
+- name: Aquaria Winter - Winter Entrance 1
+  id: 77
+  area: 24
+  coordinates: [25, 25]
+  teleporter: [8, 6]
+- name: Aquaria Winter - Winter Entrance 2
+  id: 78
+  area: 24
+  coordinates: [25, 26]
+  teleporter: [8, 6]
+- name: Aquaria Winter - Winter Entrance 3
+  id: 79
+  area: 24
+  coordinates: [26, 25]
+  teleporter: [8, 6]
+- name: Aquaria Winter - Winter Entrance 4
+  id: 80
+  area: 24
+  coordinates: [26, 26]
+  teleporter: [8, 6]
+- name: Aquaria Winter - Winter Phoebe's House Entrance Script #Modified to not be a script
+  id: 81
+  area: 24
+  coordinates: [8, 19]
+  teleporter: [10, 5] # original value [5, 8]
+- name: Aquaria Winter - Winter Vendor House Entrance
+  id: 82
+  area: 24
+  coordinates: [8, 5]
+  teleporter: [44, 4]
+- name: Aquaria Winter - Winter INN Entrance
+  id: 83
+  area: 24
+  coordinates: [26, 17]
+  teleporter: [11, 5]
+- name: Aquaria Summer - Summer Entrance 1
+  id: 84
+  area: 25
+  coordinates: [57, 25]
+  teleporter: [8, 6]
+- name: Aquaria Summer - Summer Entrance 2
+  id: 85
+  area: 25
+  coordinates: [57, 26]
+  teleporter: [8, 6]
+- name: Aquaria Summer - Summer Entrance 3
+  id: 86
+  area: 25
+  coordinates: [58, 25]
+  teleporter: [8, 6]
+- name: Aquaria Summer - Summer Entrance 4
+  id: 87
+  area: 25
+  coordinates: [58, 26]
+  teleporter: [8, 6]
+- name: Aquaria Summer - Summer Phoebe's House Entrance
+  id: 88
+  area: 25
+  coordinates: [40, 19]
+  teleporter: [10, 5]
+- name: Aquaria Summer - Spencer's Place Entrance Top
+  id: 89
+  area: 25
+  coordinates: [40, 16]
+  teleporter: [42, 0]
+- name: Aquaria Summer - Spencer's Place Entrance Side
+  id: 90
+  area: 25
+  coordinates: [41, 18]
+  teleporter: [43, 0]
+- name: Aquaria Summer - Summer Vendor House Entrance
+  id: 91
+  area: 25
+  coordinates: [40, 5]
+  teleporter: [44, 4]
+- name: Aquaria Summer - Summer INN Entrance
+  id: 92
+  area: 25
+  coordinates: [58, 17]
+  teleporter: [11, 5]
+- name: Phoebe's House - Entrance # Change to a script, same as vendor house
+  id: 93
+  area: 26
+  coordinates: [29, 14]
+  teleporter: [5, 8] # Original Value [11,3]
+- name: Aquaria Vendor House - Vendor House Entrance's Script
+  id: 94
+  area: 27
+  coordinates: [7, 10]
+  teleporter: [40, 8]
+- name: Aquaria Vendor House - Vendor House Stairs
+  id: 95
+  area: 27
+  coordinates: [1, 4]
+  teleporter: [47, 0]
+- name: Aquaria Gemini Room - Gemini Script
+  id: 96
+  area: 27
+  coordinates: [2, 40]
+  teleporter: [72, 8]
+- name: Aquaria Gemini Room - Gemini Room Stairs
+  id: 97
+  area: 27
+  coordinates: [4, 39]
+  teleporter: [48, 0]
+- name: Aquaria INN - Aquaria INN entrance # Change to a script, same as vendor house
+  id: 98
+  area: 27
+  coordinates: [51, 46]
+  teleporter: [75, 8] # Original value [48,3]
+- name: Wintry Cave 1F - Main Entrance
+  id: 99
+  area: 28
+  coordinates: [50, 58]
+  teleporter: [49, 0]
+- name: Wintry Cave 1F - To 3F Top
+  id: 100
+  area: 28
+  coordinates: [40, 25]
+  teleporter: [14, 2]
+- name: Wintry Cave 1F - To 2F
+  id: 101
+  area: 28
+  coordinates: [10, 43]
+  teleporter: [15, 2]
+- name: Wintry Cave 1F - Phoebe's Script
+  id: 102
+  area: 28
+  coordinates: [44, 37]
+  teleporter: [6, 8]
+- name: Wintry Cave 2F - To 3F Bottom
+  id: 103
+  area: 29
+  coordinates: [58, 5]
+  teleporter: [50, 0]
+- name: Wintry Cave 2F - To 1F
+  id: 104
+  area: 29
+  coordinates: [38, 18]
+  teleporter: [97, 3]
+- name: Wintry Cave 3F Top - Exit from 3F Top
+  id: 105
+  area: 30
+  coordinates: [24, 6]
+  teleporter: [96, 3]
+- name: Wintry Cave 3F Bottom - Exit to 2F
+  id: 106
+  area: 31
+  coordinates: [4, 29]
+  teleporter: [51, 0]
+- name: Life Temple - Entrance
+  id: 107
+  area: 32
+  coordinates: [9, 60]
+  teleporter: [14, 6]
+- name: Life Temple - Libra Tile Script
+  id: 108
+  area: 32
+  coordinates: [3, 55]
+  teleporter: [60, 8]
+- name: Life Temple - Mysterious Man Script
+  id: 109
+  area: 32
+  coordinates: [9, 44]
+  teleporter: [78, 8]
+- name: Fall Basin - Back Exit Script
+  id: 110
+  area: 33
+  coordinates: [17, 5]
+  teleporter: [9, 0] # Remove script [42, 8] for overworld teleport (but not main exit)
+- name: Fall Basin - Main Exit
+  id: 111
+  area: 33
+  coordinates: [15, 26]
+  teleporter: [53, 0]
+- name: Fall Basin - Phoebe's Script
+  id: 112
+  area: 33
+  coordinates: [17, 6]
+  teleporter: [9, 8]
+- name: Ice Pyramid B1 Taunt Room - To Climbing Wall Room
+  id: 113
+  area: 34
+  coordinates: [43, 6]
+  teleporter: [55, 0]
+- name: Ice Pyramid 1F Maze - Main Entrance 1
+  id: 114
+  area: 35
+  coordinates: [18, 36]
+  teleporter: [56, 0]
+- name: Ice Pyramid 1F Maze - Main Entrance 2
+  id: 115
+  area: 35
+  coordinates: [19, 36]
+  teleporter: [56, 0]
+- name: Ice Pyramid 1F Maze - West Stairs To 2F South Tiled Room
+  id: 116
+  area: 35
+  coordinates: [3, 27]
+  teleporter: [57, 0]
+- name: Ice Pyramid 1F Maze - West Center Stairs to 2F West Room
+  id: 117
+  area: 35
+  coordinates: [11, 15]
+  teleporter: [58, 0]
+- name: Ice Pyramid 1F Maze - East Center Stairs to 2F Center Room
+  id: 118
+  area: 35
+  coordinates: [25, 16]
+  teleporter: [59, 0]
+- name: Ice Pyramid 1F Maze - Upper Stairs to 2F Small North Room
+  id: 119
+  area: 35
+  coordinates: [31, 1]
+  teleporter: [60, 0]
+- name: Ice Pyramid 1F Maze - East Stairs to 2F North Corridor
+  id: 120
+  area: 35
+  coordinates: [34, 9]
+  teleporter: [61, 0]
+- name: Ice Pyramid 1F Maze - Statue's Script
+  id: 121
+  area: 35
+  coordinates: [21, 32]
+  teleporter: [77, 8]
+- name: Ice Pyramid 2F South Tiled Room - To 1F
+  id: 122
+  area: 36
+  coordinates: [4, 26]
+  teleporter: [62, 0]
+- name: Ice Pyramid 2F South Tiled Room - To 3F Two Boxes Room
+  id: 123
+  area: 36
+  coordinates: [22, 17]
+  teleporter: [67, 0]
+- name: Ice Pyramid 2F West Room - To 1F
+  id: 124
+  area: 36
+  coordinates: [9, 10]
+  teleporter: [63, 0]
+- name: Ice Pyramid 2F Center Room - To 1F
+  id: 125
+  area: 36
+  coordinates: [22, 14]
+  teleporter: [64, 0]
+- name: Ice Pyramid 2F Small North Room - To 1F
+  id: 126
+  area: 36
+  coordinates: [26, 4]
+  teleporter: [65, 0]
+- name: Ice Pyramid 2F North Corridor - To 1F
+  id: 127
+  area: 36
+  coordinates: [32, 8]
+  teleporter: [66, 0]
+- name: Ice Pyramid 2F North Corridor - To 3F Main Loop
+  id: 128
+  area: 36
+  coordinates: [12, 7]
+  teleporter: [68, 0]
+- name: Ice Pyramid 3F Two Boxes Room - To 2F South Tiled Room
+  id: 129
+  area: 37
+  coordinates: [24, 54]
+  teleporter: [69, 0]
+- name: Ice Pyramid 3F Main Loop - To 2F Corridor
+  id: 130
+  area: 37
+  coordinates: [16, 45]
+  teleporter: [70, 0]
+- name: Ice Pyramid 3F Main Loop - To 4F
+  id: 131
+  area: 37
+  coordinates: [19, 43]
+  teleporter: [71, 0]
+- name: Ice Pyramid 4F Treasure Room - To 3F Main Loop
+  id: 132
+  area: 38
+  coordinates: [52, 5]
+  teleporter: [72, 0]
+- name: Ice Pyramid 4F Treasure Room - To 5F Leap of Faith Room
+  id: 133
+  area: 38
+  coordinates: [62, 19]
+  teleporter: [73, 0]
+- name: Ice Pyramid 5F Leap of Faith Room - To 4F Treasure Room
+  id: 134
+  area: 39
+  coordinates: [54, 63]
+  teleporter: [74, 0]
+- name: Ice Pyramid 5F Leap of Faith Room - Bombed Ice Plate
+  id: 135
+  area: 39
+  coordinates: [47, 54]
+  teleporter: [77, 8]
+- name: Ice Pyramid 5F Stairs to Ice Golem - To Ice Golem Room
+  id: 136
+  area: 39
+  coordinates: [39, 43]
+  teleporter: [75, 0]
+- name: Ice Pyramid 5F Stairs to Ice Golem - To Climbing Wall Room
+  id: 137
+  area: 39
+  coordinates: [39, 60]
+  teleporter: [76, 0]
+- name: Ice Pyramid - Duplicate Ice Golem Room # not used?
+  id: 138
+  area: 40
+  coordinates: [44, 43]
+  teleporter: [77, 0]
+- name: Ice Pyramid Climbing Wall Room - To Taunt Room
+  id: 139
+  area: 41
+  coordinates: [4, 59]
+  teleporter: [78, 0]
+- name: Ice Pyramid Climbing Wall Room - To 5F Stairs
+  id: 140
+  area: 41
+  coordinates: [4, 45]
+  teleporter: [79, 0]
+- name: Ice Pyramid Ice Golem Room - To 5F Stairs
+  id: 141
+  area: 42
+  coordinates: [44, 43]
+  teleporter: [80, 0]
+- name: Ice Pyramid Ice Golem Room - Ice Golem Script
+  id: 142
+  area: 42
+  coordinates: [53, 32]
+  teleporter: [10, 8]
+- name: Spencer Waterfall - To Spencer Cave
+  id: 143
+  area: 43
+  coordinates: [48, 57]
+  teleporter: [81, 0]
+- name: Spencer Waterfall - Upper Exit to Aquaria 1
+  id: 144
+  area: 43
+  coordinates: [40, 5]
+  teleporter: [82, 0]
+- name: Spencer Waterfall - Upper Exit to Aquaria 2
+  id: 145
+  area: 43
+  coordinates: [40, 6]
+  teleporter: [82, 0]
+- name: Spencer Waterfall - Upper Exit to Aquaria 3
+  id: 146
+  area: 43
+  coordinates: [41, 5]
+  teleporter: [82, 0]
+- name: Spencer Waterfall - Upper Exit to Aquaria 4
+  id: 147
+  area: 43
+  coordinates: [41, 6]
+  teleporter: [82, 0]
+- name: Spencer Waterfall - Right Exit to Aquaria 1
+  id: 148
+  area: 43
+  coordinates: [46, 8]
+  teleporter: [83, 0]
+- name: Spencer Waterfall - Right Exit to Aquaria 2
+  id: 149
+  area: 43
+  coordinates: [47, 8]
+  teleporter: [83, 0]
+- name: Spencer Cave Normal Main - To Waterfall
+  id: 150
+  area: 44
+  coordinates: [14, 39]
+  teleporter: [85, 0]
+- name: Spencer Cave Normal From Overworld - Exit to Overworld
+  id: 151
+  area: 44
+  coordinates: [15, 57]
+  teleporter: [7, 6]
+- name: Spencer Cave Unplug - Exit to Overworld
+  id: 152
+  area: 45
+  coordinates: [40, 29]
+  teleporter: [7, 6]
+- name: Spencer Cave Unplug - Libra Teleporter Start Script
+  id: 153
+  area: 45
+  coordinates: [28, 21]
+  teleporter: [33, 8]
+- name: Spencer Cave Unplug - Libra Teleporter End Script
+  id: 154
+  area: 45
+  coordinates: [46, 4]
+  teleporter: [34, 8]
+- name: Spencer Cave Unplug - Mobius Teleporter Chest Script
+  id: 155
+  area: 45
+  coordinates: [21, 9]
+  teleporter: [35, 8]
+- name: Spencer Cave Unplug - Mobius Teleporter Start Script
+  id: 156
+  area: 45
+  coordinates: [29, 28]
+  teleporter: [36, 8]
+- name: Wintry Temple Outer Room - Main Entrance
+  id: 157
+  area: 46
+  coordinates: [8, 31]
+  teleporter: [15, 6]
+- name: Wintry Temple Inner Room - Gemini Tile to Sealed temple
+  id: 158
+  area: 46
+  coordinates: [9, 24]
+  teleporter: [62, 8]
+- name: Fireburg - To Overworld
+  id: 159
+  area: 47
+  coordinates: [4, 13]
+  teleporter: [9, 6]
+- name: Fireburg - To Overworld
+  id: 160
+  area: 47
+  coordinates: [5, 13]
+  teleporter: [9, 6]
+- name: Fireburg - To Overworld
+  id: 161
+  area: 47
+  coordinates: [28, 15]
+  teleporter: [9, 6]
+- name: Fireburg - To Overworld
+  id: 162
+  area: 47
+  coordinates: [27, 15]
+  teleporter: [9, 6]
+- name: Fireburg - Vendor House
+  id: 163
+  area: 47
+  coordinates: [10, 24]
+  teleporter: [91, 0]
+- name: Fireburg - Reuben House
+  id: 164
+  area: 47
+  coordinates: [14, 6]
+  teleporter: [98, 8] # Script for reuben, original value [16, 2]
+- name: Fireburg - Hotel
+  id: 165
+  area: 47
+  coordinates: [20, 8]
+  teleporter: [96, 8] # It's a script now for tristam, original value [17, 2]
+- name: Fireburg - GrenadeMan House Script
+  id: 166
+  area: 47
+  coordinates: [12, 18]
+  teleporter: [11, 8]
+- name: Reuben House - Main Entrance
+  id: 167
+  area: 48
+  coordinates: [33, 46]
+  teleporter: [98, 3]
+- name: GrenadeMan House - Entrance Script
+  id: 168
+  area: 49
+  coordinates: [55, 60]
+  teleporter: [9, 8]
+- name: GrenadeMan House - To Mobius Crest Room
+  id: 169
+  area: 49
+  coordinates: [57, 52]
+  teleporter: [93, 0]
+- name: GrenadeMan Mobius Room - Stairs to House
+  id: 170
+  area: 49
+  coordinates: [39, 26]
+  teleporter: [94, 0]
+- name: GrenadeMan Mobius Room - Mobius Teleporter Script
+  id: 171
+  area: 49
+  coordinates: [39, 23]
+  teleporter: [54, 8]
+- name: Fireburg Vendor House - Entrance Script # No use to be a script
+  id: 172
+  area: 49
+  coordinates: [7, 10]
+  teleporter: [95, 0] # Original value [39, 8]
+- name: Fireburg Vendor House - Stairs to Gemini Room
+  id: 173
+  area: 49
+  coordinates: [1, 4]
+  teleporter: [96, 0]
+- name: Fireburg Gemini Room - Stairs to Vendor House
+  id: 174
+  area: 49
+  coordinates: [4, 39]
+  teleporter: [97, 0]
+- name: Fireburg Gemini Room - Gemini Teleporter Script
+  id: 175
+  area: 49
+  coordinates: [2, 40]
+  teleporter: [45, 8]
+- name: Fireburg Hotel Lobby - Stairs to beds
+  id: 176
+  area: 49
+  coordinates: [4, 50]
+  teleporter: [213, 0]
+- name: Fireburg Hotel Lobby - Entrance
+  id: 177
+  area: 49
+  coordinates: [17, 56]
+  teleporter: [99, 3]
+- name: Fireburg Hotel Beds - Stairs to Hotel Lobby
+  id: 178
+  area: 49
+  coordinates: [45, 59]
+  teleporter: [214, 0]
+- name: Mine Exterior - Main Entrance
+  id: 179
+  area: 50
+  coordinates: [5, 28]
+  teleporter: [98, 0]
+- name: Mine Exterior - To Cliff
+  id: 180
+  area: 50
+  coordinates: [58, 29]
+  teleporter: [99, 0]
+- name: Mine Exterior - To Parallel Room
+  id: 181
+  area: 50
+  coordinates: [8, 7]
+  teleporter: [20, 2]
+- name: Mine Exterior - To Crescent Room
+  id: 182
+  area: 50
+  coordinates: [26, 15]
+  teleporter: [21, 2]
+- name: Mine Exterior - To Climbing Room
+  id: 183
+  area: 50
+  coordinates: [21, 35]
+  teleporter: [22, 2]
+- name: Mine Exterior - Jinn Fight Script
+  id: 184
+  area: 50
+  coordinates: [58, 31]
+  teleporter: [74, 8]
+- name: Mine Parallel Room - To Mine Exterior
+  id: 185
+  area: 51
+  coordinates: [7, 60]
+  teleporter: [100, 3]
+- name: Mine Crescent Room - To Mine Exterior
+  id: 186
+  area: 51
+  coordinates: [22, 61]
+  teleporter: [101, 3]
+- name: Mine Climbing Room - To Mine Exterior
+  id: 187
+  area: 51
+  coordinates: [56, 21]
+  teleporter: [102, 3]
+- name: Mine Cliff - Entrance
+  id: 188
+  area: 52
+  coordinates: [9, 5]
+  teleporter: [100, 0]
+- name: Mine Cliff - Reuben Grenade Script
+  id: 189
+  area: 52
+  coordinates: [15, 7]
+  teleporter: [12, 8]
+- name: Sealed Temple - To Overworld
+  id: 190
+  area: 53
+  coordinates: [58, 43]
+  teleporter: [16, 6]
+- name: Sealed Temple - Gemini Tile Script
+  id: 191
+  area: 53
+  coordinates: [56, 38]
+  teleporter: [63, 8]
+- name: Volcano Base - Main Entrance 1
+  id: 192
+  area: 54
+  coordinates: [23, 25]
+  teleporter: [103, 0]
+- name: Volcano Base - Main Entrance 2
+  id: 193
+  area: 54
+  coordinates: [23, 26]
+  teleporter: [103, 0]
+- name: Volcano Base - Main Entrance 3
+  id: 194
+  area: 54
+  coordinates: [24, 25]
+  teleporter: [103, 0]
+- name: Volcano Base - Main Entrance 4
+  id: 195
+  area: 54
+  coordinates: [24, 26]
+  teleporter: [103, 0]
+- name: Volcano Base - Left Stairs Script
+  id: 196
+  area: 54
+  coordinates: [20, 5]
+  teleporter: [31, 8]
+- name: Volcano Base - Right Stairs Script
+  id: 197
+  area: 54
+  coordinates: [32, 5]
+  teleporter: [30, 8]
+- name: Volcano Top Right - Top Exit
+  id: 198
+  area: 55
+  coordinates: [44, 8]
+  teleporter: [9, 0] # Original value [103, 0] changed to volcano escape so floor shuffling doesn't pick it up
+- name: Volcano Top Left - To Right-Left Path Script
+  id: 199
+  area: 55
+  coordinates: [40, 24]
+  teleporter: [26, 8]
+- name: Volcano Top Right - To Left-Right Path Script
+  id: 200
+  area: 55
+  coordinates: [52, 24]
+  teleporter: [79, 8]  # Original Value [26, 8]
+- name: Volcano Right Path - To Volcano Base Script
+  id: 201
+  area: 56
+  coordinates: [48, 42]
+  teleporter: [15, 8] # Original Value [27, 8]
+- name: Volcano Left Path - To Volcano Cross Left-Right
+  id: 202
+  area: 56
+  coordinates: [40, 31]
+  teleporter: [25, 2]
+- name: Volcano Left Path - To Volcano Cross Right-Left
+  id: 203
+  area: 56
+  coordinates: [52, 29]
+  teleporter: [26, 2]
+- name: Volcano Left Path - To Volcano Base Script
+  id: 204
+  area: 56
+  coordinates: [36, 42]
+  teleporter: [27, 8]
+- name: Volcano Cross Left-Right - To Volcano Left Path
+  id: 205
+  area: 56
+  coordinates: [10, 42]
+  teleporter: [103, 3]
+- name: Volcano Cross Left-Right - To Volcano Top Right Script
+  id: 206
+  area: 56
+  coordinates: [16, 24]
+  teleporter: [29, 8]
+- name: Volcano Cross Right-Left - To Volcano Top Left Script
+  id: 207
+  area: 56
+  coordinates: [8, 22]
+  teleporter: [28, 8]
+- name: Volcano Cross Right-Left - To Volcano Left Path
+  id: 208
+  area: 56
+  coordinates: [16, 42]
+  teleporter: [104, 3]
+- name: Lava Dome Inner Ring Main Loop - Main Entrance 1
+  id: 209
+  area: 57
+  coordinates: [32, 5]
+  teleporter: [104, 0]
+- name: Lava Dome Inner Ring Main Loop - Main Entrance 2
+  id: 210
+  area: 57
+  coordinates: [33, 5]
+  teleporter: [104, 0]
+- name: Lava Dome Inner Ring Main Loop - To Three Steps Room
+  id: 211
+  area: 57
+  coordinates: [14, 5]
+  teleporter: [105, 0]
+- name: Lava Dome Inner Ring Main Loop - To Life Chest Room Lower
+  id: 212
+  area: 57
+  coordinates: [40, 17]
+  teleporter: [106, 0]
+- name: Lava Dome Inner Ring Main Loop - To Big Jump Room Left
+  id: 213
+  area: 57
+  coordinates: [8, 11]
+  teleporter: [108, 0]
+- name: Lava Dome Inner Ring Main Loop - To Split Corridor Room
+  id: 214
+  area: 57
+  coordinates: [11, 19]
+  teleporter: [111, 0]
+- name: Lava Dome Inner Ring Center Ledge - To Life Chest Room Higher
+  id: 215
+  area: 57
+  coordinates: [32, 11]
+  teleporter: [107, 0]
+- name: Lava Dome Inner Ring Plate Ledge - To Plate Corridor
+  id: 216
+  area: 57
+  coordinates: [12, 23]
+  teleporter: [109, 0]
+- name: Lava Dome Inner Ring Plate Ledge - Plate Script
+  id: 217
+  area: 57
+  coordinates: [5, 23]
+  teleporter: [47, 8]
+- name: Lava Dome Inner Ring Upper Ledges - To Pointless Room
+  id: 218
+  area: 57
+  coordinates: [0, 9]
+  teleporter: [110, 0]
+- name: Lava Dome Inner Ring Upper Ledges - To Lower Moon Helm Room
+  id: 219
+  area: 57
+  coordinates: [0, 15]
+  teleporter: [112, 0]
+- name: Lava Dome Inner Ring Upper Ledges - To Up-Down Corridor
+  id: 220
+  area: 57
+  coordinates: [54, 5]
+  teleporter: [113, 0]
+- name: Lava Dome Inner Ring Big Door Ledge - To Jumping Maze II
+  id: 221
+  area: 57
+  coordinates: [54, 21]
+  teleporter: [114, 0]
+- name: Lava Dome Inner Ring Big Door Ledge - Hydra Gate 1
+  id: 222
+  area: 57
+  coordinates: [62, 20]
+  teleporter: [29, 2]
+- name: Lava Dome Inner Ring Big Door Ledge - Hydra Gate 2
+  id: 223
+  area: 57
+  coordinates: [63, 20]
+  teleporter: [29, 2]
+- name: Lava Dome Inner Ring Big Door Ledge - Hydra Gate 3
+  id: 224
+  area: 57
+  coordinates: [62, 21]
+  teleporter: [29, 2]
+- name: Lava Dome Inner Ring Big Door Ledge - Hydra Gate 4
+  id: 225
+  area: 57
+  coordinates: [63, 21]
+  teleporter: [29, 2]
+- name: Lava Dome Inner Ring Tiny Bottom Ledge - To Four Boxes Corridor
+  id: 226
+  area: 57
+  coordinates: [50, 25]
+  teleporter: [115, 0]
+- name: Lava Dome Jump Maze II - Lower Right Entrance
+  id: 227
+  area: 58
+  coordinates: [55, 28]
+  teleporter: [116, 0]
+- name: Lava Dome Jump Maze II - Upper Entrance
+  id: 228
+  area: 58
+  coordinates: [35, 3]
+  teleporter: [119, 0]
+- name: Lava Dome Jump Maze II - Lower Left Entrance
+  id: 229
+  area: 58
+  coordinates: [34, 27]
+  teleporter: [120, 0]
+- name: Lava Dome Up-Down Corridor - Upper Entrance
+  id: 230
+  area: 58
+  coordinates: [29, 8]
+  teleporter: [117, 0]
+- name: Lava Dome Up-Down Corridor - Lower Entrance
+  id: 231
+  area: 58
+  coordinates: [28, 25]
+  teleporter: [118, 0]
+- name: Lava Dome Jump Maze I - South Entrance
+  id: 232
+  area: 59
+  coordinates: [20, 27]
+  teleporter: [121, 0]
+- name: Lava Dome Jump Maze I - North Entrance
+  id: 233
+  area: 59
+  coordinates: [7, 3]
+  teleporter: [122, 0]
+- name: Lava Dome Pointless Room - Entrance
+  id: 234
+  area: 60
+  coordinates: [2, 7]
+  teleporter: [123, 0]
+- name: Lava Dome Pointless Room - Visit Quest Script 1
+  id: 490
+  area: 60
+  coordinates: [4, 4]
+  teleporter: [99, 8]
+- name: Lava Dome Pointless Room - Visit Quest Script 2
+  id: 491
+  area: 60
+  coordinates: [4, 5]
+  teleporter: [99, 8]
+- name: Lava Dome Lower Moon Helm Room - Left Entrance
+  id: 235
+  area: 60
+  coordinates: [2, 19]
+  teleporter: [124, 0]
+- name: Lava Dome Lower Moon Helm Room - Right Entrance
+  id: 236
+  area: 60
+  coordinates: [11, 21]
+  teleporter: [125, 0]
+- name: Lava Dome Moon Helm Room - Entrance
+  id: 237
+  area: 60
+  coordinates: [15, 23]
+  teleporter: [126, 0]
+- name: Lava Dome Three Jumps Room - To Main Loop
+  id: 238
+  area: 61
+  coordinates: [58, 15]
+  teleporter: [127, 0]
+- name: Lava Dome Life Chest Room - Lower South Entrance
+  id: 239
+  area: 61
+  coordinates: [38, 27]
+  teleporter: [128, 0]
+- name: Lava Dome Life Chest Room - Upper South Entrance
+  id: 240
+  area: 61
+  coordinates: [28, 23]
+  teleporter: [129, 0]
+- name: Lava Dome Big Jump Room - Left Entrance
+  id: 241
+  area: 62
+  coordinates: [42, 51]
+  teleporter: [133, 0]
+- name: Lava Dome Big Jump Room - North Entrance
+  id: 242
+  area: 62
+  coordinates: [30, 29]
+  teleporter: [131, 0]
+- name: Lava Dome Big Jump Room - Lower Right Stairs
+  id: 243
+  area: 62
+  coordinates: [61, 59]
+  teleporter: [132, 0]
+- name: Lava Dome Split Corridor - Upper Stairs
+  id: 244
+  area: 62
+  coordinates: [30, 43]
+  teleporter: [130, 0]
+- name: Lava Dome Split Corridor - Lower Stairs
+  id: 245
+  area: 62
+  coordinates: [36, 61]
+  teleporter: [134, 0]
+- name: Lava Dome Plate Corridor - Right Entrance
+  id: 246
+  area: 63
+  coordinates: [19, 29]
+  teleporter: [135, 0]
+- name: Lava Dome Plate Corridor - Left Entrance
+  id: 247
+  area: 63
+  coordinates: [60, 21]
+  teleporter: [137, 0]
+- name: Lava Dome Four Boxes Stairs - Upper Entrance
+  id: 248
+  area: 63
+  coordinates: [22, 3]
+  teleporter: [136, 0]
+- name: Lava Dome Four Boxes Stairs - Lower Entrance
+  id: 249
+  area: 63
+  coordinates: [22, 17]
+  teleporter: [16, 0]
+- name: Lava Dome Hydra Room - South Entrance
+  id: 250
+  area: 64
+  coordinates: [14, 59]
+  teleporter: [105, 3]
+- name: Lava Dome Hydra Room - North Exit
+  id: 251
+  area: 64
+  coordinates: [25, 31]
+  teleporter: [138, 0]
+- name: Lava Dome Hydra Room - Hydra Script
+  id: 252
+  area: 64
+  coordinates: [14, 36]
+  teleporter: [14, 8]
+- name: Lava Dome Escape Corridor - South Entrance
+  id: 253
+  area: 65
+  coordinates: [22, 17]
+  teleporter: [139, 0]
+- name: Lava Dome Escape Corridor - North Entrance
+  id: 254
+  area: 65
+  coordinates: [22, 3]
+  teleporter: [9, 0]
+- name: Rope Bridge - West Entrance 1
+  id: 255
+  area: 66
+  coordinates: [3, 10]
+  teleporter: [140, 0]
+- name: Rope Bridge - West Entrance 2
+  id: 256
+  area: 66
+  coordinates: [3, 11]
+  teleporter: [140, 0]
+- name: Rope Bridge - West Entrance 3
+  id: 257
+  area: 66
+  coordinates: [3, 12]
+  teleporter: [140, 0]
+- name: Rope Bridge - West Entrance 4
+  id: 258
+  area: 66
+  coordinates: [3, 13]
+  teleporter: [140, 0]
+- name: Rope Bridge - West Entrance 5
+  id: 259
+  area: 66
+  coordinates: [4, 10]
+  teleporter: [140, 0]
+- name: Rope Bridge - West Entrance 6
+  id: 260
+  area: 66
+  coordinates: [4, 11]
+  teleporter: [140, 0]
+- name: Rope Bridge - West Entrance 7
+  id: 261
+  area: 66
+  coordinates: [4, 12]
+  teleporter: [140, 0]
+- name: Rope Bridge - West Entrance 8
+  id: 262
+  area: 66
+  coordinates: [4, 13]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 1
+  id: 263
+  area: 66
+  coordinates: [59, 10]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 2
+  id: 264
+  area: 66
+  coordinates: [59, 11]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 3
+  id: 265
+  area: 66
+  coordinates: [59, 12]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 4
+  id: 266
+  area: 66
+  coordinates: [59, 13]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 5
+  id: 267
+  area: 66
+  coordinates: [60, 10]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 6
+  id: 268
+  area: 66
+  coordinates: [60, 11]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 7
+  id: 269
+  area: 66
+  coordinates: [60, 12]
+  teleporter: [140, 0]
+- name: Rope Bridge - East Entrance 8
+  id: 270
+  area: 66
+  coordinates: [60, 13]
+  teleporter: [140, 0]
+- name: Rope Bridge - Reuben Fall Script
+  id: 271
+  area: 66
+  coordinates: [13, 12]
+  teleporter: [15, 8]
+- name: Alive Forest - West Entrance 1
+  id: 272
+  area: 67
+  coordinates: [8, 13]
+  teleporter: [142, 0]
+- name: Alive Forest - West Entrance 2
+  id: 273
+  area: 67
+  coordinates: [9, 13]
+  teleporter: [142, 0]
+- name: Alive Forest - Giant Tree Entrance
+  id: 274
+  area: 67
+  coordinates: [42, 42]
+  teleporter: [143, 0]
+- name: Alive Forest - Libra Teleporter Script
+  id: 275
+  area: 67
+  coordinates: [8, 52]
+  teleporter: [64, 8]
+- name: Alive Forest - Gemini Teleporter Script
+  id: 276
+  area: 67
+  coordinates: [57, 49]
+  teleporter: [65, 8]
+- name: Alive Forest - Mobius Teleporter Script
+  id: 277
+  area: 67
+  coordinates: [24, 10]
+  teleporter: [66, 8]
+- name: Giant Tree 1F - Entrance Script 1
+  id: 278
+  area: 68
+  coordinates: [18, 31]
+  teleporter: [56, 1] # The script is restored if no map shuffling [49, 8]
+- name: Giant Tree 1F - Entrance Script 2
+  id: 279
+  area: 68
+  coordinates: [19, 31]
+  teleporter: [56, 1] # Same [49, 8]
+- name: Giant Tree 1F - North Entrance To 2F
+  id: 280
+  area: 68
+  coordinates: [16, 1]
+  teleporter: [144, 0]
+- name: Giant Tree 2F Main Lobby - North Entrance to 1F
+  id: 281
+  area: 69
+  coordinates: [44, 33]
+  teleporter: [145, 0]
+- name: Giant Tree 2F Main Lobby - Central Entrance to 3F
+  id: 282
+  area: 69
+  coordinates: [42, 47]
+  teleporter: [146, 0]
+- name: Giant Tree 2F Main Lobby - West Entrance to Mushroom Room
+  id: 283
+  area: 69
+  coordinates: [58, 49]
+  teleporter: [149, 0]
+- name: Giant Tree 2F West Ledge - To 3F Northwest Ledge
+  id: 284
+  area: 69
+  coordinates: [34, 37]
+  teleporter: [147, 0]
+- name: Giant Tree 2F Fall From Vine Script
+  id: 482
+  area: 69
+  coordinates: [0x2E, 0x33]
+  teleporter: [76, 8]
+- name: Giant Tree Meteor Chest Room - To 2F Mushroom Room
+  id: 285
+  area: 69
+  coordinates: [58, 44]
+  teleporter: [148, 0]
+- name: Giant Tree 2F Mushroom Room - Entrance
+  id: 286
+  area: 70
+  coordinates: [55, 18]
+  teleporter: [150, 0]
+- name: Giant Tree 2F Mushroom Room - North Face to Meteor
+  id: 287
+  area: 70
+  coordinates: [56, 7]
+  teleporter: [151, 0]
+- name: Giant Tree 3F Central Room - Central Entrance to 2F
+  id: 288
+  area: 71
+  coordinates: [46, 53]
+  teleporter: [152, 0]
+- name: Giant Tree 3F Central Room - East Entrance to Worm Room
+  id: 289
+  area: 71
+  coordinates: [58, 39]
+  teleporter: [153, 0]
+- name: Giant Tree 3F Lower Corridor - Entrance from Worm Room
+  id: 290
+  area: 71
+  coordinates: [45, 39]
+  teleporter: [154, 0]
+- name: Giant Tree 3F West Platform - Lower Entrance
+  id: 291
+  area: 71
+  coordinates: [33, 43]
+  teleporter: [155, 0]
+- name: Giant Tree 3F West Platform - Top Entrance
+  id: 292
+  area: 71
+  coordinates: [52, 25]
+  teleporter: [156, 0]
+- name: Giant Tree Worm Room - East Entrance
+  id: 293
+  area: 72
+  coordinates: [20, 58]
+  teleporter: [157, 0]
+- name: Giant Tree Worm Room - West Entrance
+  id: 294
+  area: 72
+  coordinates: [6, 56]
+  teleporter: [158, 0]
+- name: Giant Tree 4F Lower Floor - Entrance
+  id: 295
+  area: 73
+  coordinates: [20, 7]
+  teleporter: [159, 0]
+- name: Giant Tree 4F Lower Floor - Lower West Mouth
+  id: 296
+  area: 73
+  coordinates: [8, 23]
+  teleporter: [160, 0]
+- name: Giant Tree 4F Lower Floor - Lower Central Mouth
+  id: 297
+  area: 73
+  coordinates: [14, 25]
+  teleporter: [161, 0]
+- name: Giant Tree 4F Lower Floor - Lower East Mouth
+  id: 298
+  area: 73
+  coordinates: [20, 25]
+  teleporter: [162, 0]
+- name: Giant Tree 4F Upper Floor - Upper West Mouth
+  id: 299
+  area: 73
+  coordinates: [8, 19]
+  teleporter: [163, 0]
+- name: Giant Tree 4F Upper Floor - Upper Central Mouth
+  id: 300
+  area: 73
+  coordinates: [12, 17]
+  teleporter: [164, 0]
+- name: Giant Tree 4F Slime Room - Exit
+  id: 301
+  area: 74
+  coordinates: [47, 10]
+  teleporter: [165, 0]
+- name: Giant Tree 4F Slime Room - West Entrance
+  id: 302
+  area: 74
+  coordinates: [45, 24]
+  teleporter: [166, 0]
+- name: Giant Tree 4F Slime Room - Central Entrance
+  id: 303
+  area: 74
+  coordinates: [50, 24]
+  teleporter: [167, 0]
+- name: Giant Tree 4F Slime Room - East Entrance
+  id: 304
+  area: 74
+  coordinates: [57, 28]
+  teleporter: [168, 0]
+- name: Giant Tree 5F - Entrance
+  id: 305
+  area: 75
+  coordinates: [14, 51]
+  teleporter: [169, 0]
+- name: Giant Tree 5F - Giant Tree Face # Unused
+  id: 306
+  area: 75
+  coordinates: [14, 37]
+  teleporter: [170, 0]
+- name: Kaidge Temple - Entrance
+  id: 307
+  area: 77
+  coordinates: [44, 63]
+  teleporter: [18, 6]
+- name: Kaidge Temple - Mobius Teleporter Script
+  id: 308
+  area: 77
+  coordinates: [35, 57]
+  teleporter: [71, 8]
+- name: Windhole Temple - Entrance
+  id: 309
+  area: 78
+  coordinates: [10, 29]
+  teleporter: [173, 0]
+- name: Mount Gale - Entrance 1
+  id: 310
+  area: 79
+  coordinates: [1, 45]
+  teleporter: [174, 0]
+- name: Mount Gale - Entrance 2
+  id: 311
+  area: 79
+  coordinates: [2, 45]
+  teleporter: [174, 0]
+- name: Mount Gale - Visit Quest
+  id: 494
+  area: 79
+  coordinates: [44, 7]
+  teleporter: [101, 8]
+- name: Windia - Main Entrance 1
+  id: 312
+  area: 80
+  coordinates: [12, 40]
+  teleporter: [10, 6]
+- name: Windia - Main Entrance 2
+  id: 313
+  area: 80
+  coordinates: [13, 40]
+  teleporter: [10, 6]
+- name: Windia - Main Entrance 3
+  id: 314
+  area: 80
+  coordinates: [14, 40]
+  teleporter: [10, 6]
+- name: Windia - Main Entrance 4
+  id: 315
+  area: 80
+  coordinates: [15, 40]
+  teleporter: [10, 6]
+- name: Windia - Main Entrance 5
+  id: 316
+  area: 80
+  coordinates: [12, 41]
+  teleporter: [10, 6]
+- name: Windia - Main Entrance 6
+  id: 317
+  area: 80
+  coordinates: [13, 41]
+  teleporter: [10, 6]
+- name: Windia - Main Entrance 7
+  id: 318
+  area: 80
+  coordinates: [14, 41]
+  teleporter: [10, 6]
+- name: Windia - Main Entrance 8
+  id: 319
+  area: 80
+  coordinates: [15, 41]
+  teleporter: [10, 6]
+- name: Windia - Otto's House
+  id: 320
+  area: 80
+  coordinates: [21, 39]
+  teleporter: [30, 5]
+- name: Windia - INN's Script # Change to teleporter /  Change back to script!
+  id: 321
+  area: 80
+  coordinates: [18, 34]
+  teleporter: [97, 8] # Original value [79, 8] > [31, 2]
+- name: Windia - Vendor House
+  id: 322
+  area: 80
+  coordinates: [8, 36]
+  teleporter: [32, 5]
+- name: Windia - Kid House
+  id: 323
+  area: 80
+  coordinates: [7, 23]
+  teleporter: [176, 4]
+- name: Windia - Old People House
+  id: 324
+  area: 80
+  coordinates: [19, 21]
+  teleporter: [177, 4]
+- name: Windia - Rainbow Bridge Script
+  id: 325
+  area: 80
+  coordinates: [21, 9]
+  teleporter: [10, 6] # Change to entrance, usually a script [41, 8]
+- name: Otto's House - Attic Stairs
+  id: 326
+  area: 81
+  coordinates: [2, 19]
+  teleporter: [33, 2]
+- name: Otto's House - Entrance
+  id: 327
+  area: 81
+  coordinates: [9, 30]
+  teleporter: [106, 3]
+- name: Otto's Attic - Stairs
+  id: 328
+  area: 81
+  coordinates: [26, 23]
+  teleporter: [107, 3]
+- name: Windia Kid House - Entrance Script # Change to teleporter
+  id: 329
+  area: 82
+  coordinates: [7, 10]
+  teleporter: [178, 0] # Original value [38, 8]
+- name: Windia Kid House - Basement Stairs
+  id: 330
+  area: 82
+  coordinates: [1, 4]
+  teleporter: [180, 0]
+- name: Windia Old People House - Entrance
+  id: 331
+  area: 82
+  coordinates: [55, 12]
+  teleporter: [179, 0]
+- name: Windia Old People House - Basement Stairs
+  id: 332
+  area: 82
+  coordinates: [60, 5]
+  teleporter: [181, 0]
+- name: Windia Kid House Basement - Stairs
+  id: 333
+  area: 82
+  coordinates: [43, 8]
+  teleporter: [182, 0]
+- name: Windia Kid House Basement - Mobius Teleporter
+  id: 334
+  area: 82
+  coordinates: [41, 9]
+  teleporter: [44, 8]
+- name: Windia Old People House Basement - Stairs
+  id: 335
+  area: 82
+  coordinates: [39, 26]
+  teleporter: [183, 0]
+- name: Windia Old People House Basement - Mobius Teleporter Script
+  id: 336
+  area: 82
+  coordinates: [39, 23]
+  teleporter: [43, 8]
+- name: Windia Inn Lobby - Stairs to Beds
+  id: 337
+  area: 82
+  coordinates: [45, 24]
+  teleporter: [102, 8]          # Changed to script, original value [215, 0]
+- name: Windia Inn Lobby - Exit
+  id: 338
+  area: 82
+  coordinates: [53, 30]
+  teleporter: [135, 3]
+- name: Windia Inn Beds - Stairs to Lobby
+  id: 339
+  area: 82
+  coordinates: [33, 59]
+  teleporter: [216, 0]
+- name: Windia Vendor House - Entrance
+  id: 340
+  area: 82
+  coordinates: [29, 14]
+  teleporter: [108, 3]
+- name: Pazuzu Tower 1F Main Lobby - Main Entrance 1
+  id: 341
+  area: 83
+  coordinates: [47, 29]
+  teleporter: [184, 0]
+- name: Pazuzu Tower 1F Main Lobby - Main Entrance 2
+  id: 342
+  area: 83
+  coordinates: [47, 30]
+  teleporter: [184, 0]
+- name: Pazuzu Tower 1F Main Lobby - Main Entrance 3
+  id: 343
+  area: 83
+  coordinates: [48, 29]
+  teleporter: [184, 0]
+- name: Pazuzu Tower 1F Main Lobby - Main Entrance 4
+  id: 344
+  area: 83
+  coordinates: [48, 30]
+  teleporter: [184, 0]
+- name: Pazuzu Tower 1F Main Lobby - East Entrance
+  id: 345
+  area: 83
+  coordinates: [55, 12]
+  teleporter: [185, 0]
+- name: Pazuzu Tower 1F Main Lobby - South Stairs
+  id: 346
+  area: 83
+  coordinates: [51, 25]
+  teleporter: [186, 0]
+- name: Pazuzu Tower 1F Main Lobby - Pazuzu Script 1
+  id: 347
+  area: 83
+  coordinates: [47, 8]
+  teleporter: [16, 8]
+- name: Pazuzu Tower 1F Main Lobby - Pazuzu Script 2
+  id: 348
+  area: 83
+  coordinates: [48, 8]
+  teleporter: [16, 8]
+- name: Pazuzu Tower 1F Boxes Room - West Stairs
+  id: 349
+  area: 83
+  coordinates: [38, 17]
+  teleporter: [187, 0]
+- name: Pazuzu 2F - West Upper Stairs
+  id: 350
+  area: 84
+  coordinates: [7, 11]
+  teleporter: [188, 0]
+- name: Pazuzu 2F - South Stairs
+  id: 351
+  area: 84
+  coordinates: [20, 24]
+  teleporter: [189, 0]
+- name: Pazuzu 2F - West Lower Stairs
+  id: 352
+  area: 84
+  coordinates: [6, 17]
+  teleporter: [190, 0]
+- name: Pazuzu 2F - Central Stairs
+  id: 353
+  area: 84
+  coordinates: [15, 15]
+  teleporter: [191, 0]
+- name: Pazuzu 2F - Pazuzu 1
+  id: 354
+  area: 84
+  coordinates: [15, 8]
+  teleporter: [17, 8]
+- name: Pazuzu 2F - Pazuzu 2
+  id: 355
+  area: 84
+  coordinates: [16, 8]
+  teleporter: [17, 8]
+- name: Pazuzu 3F Main Room - North Stairs
+  id: 356
+  area: 85
+  coordinates: [23, 11]
+  teleporter: [192, 0]
+- name: Pazuzu 3F Main Room - West Stairs
+  id: 357
+  area: 85
+  coordinates: [7, 15]
+  teleporter: [193, 0]
+- name: Pazuzu 3F Main Room - Pazuzu Script 1
+  id: 358
+  area: 85
+  coordinates: [15, 8]
+  teleporter: [18, 8]
+- name: Pazuzu 3F Main Room - Pazuzu Script 2
+  id: 359
+  area: 85
+  coordinates: [16, 8]
+  teleporter: [18, 8]
+- name: Pazuzu 3F Central Island - Central Stairs
+  id: 360
+  area: 85
+  coordinates: [15, 14]
+  teleporter: [194, 0]
+- name: Pazuzu 3F Central Island - South Stairs
+  id: 361
+  area: 85
+  coordinates: [17, 25]
+  teleporter: [195, 0]
+- name: Pazuzu 4F - Northwest Stairs
+  id: 362
+  area: 86
+  coordinates: [39, 12]
+  teleporter: [196, 0]
+- name: Pazuzu 4F - Southwest Stairs
+  id: 363
+  area: 86
+  coordinates: [39, 19]
+  teleporter: [197, 0]
+- name: Pazuzu 4F - South Stairs
+  id: 364
+  area: 86
+  coordinates: [47, 24]
+  teleporter: [198, 0]
+- name: Pazuzu 4F - Northeast Stairs
+  id: 365
+  area: 86
+  coordinates: [54, 9]
+  teleporter: [199, 0]
+- name: Pazuzu 4F - Pazuzu Script 1
+  id: 366
+  area: 86
+  coordinates: [47, 8]
+  teleporter: [19, 8]
+- name: Pazuzu 4F - Pazuzu Script 2
+  id: 367
+  area: 86
+  coordinates: [48, 8]
+  teleporter: [19, 8]
+- name: Pazuzu 5F Pazuzu Loop - West Stairs
+  id: 368
+  area: 87
+  coordinates: [9, 49]
+  teleporter: [200, 0]
+- name: Pazuzu 5F Pazuzu Loop - South Stairs
+  id: 369
+  area: 87
+  coordinates: [16, 55]
+  teleporter: [201, 0]
+- name: Pazuzu 5F Upper Loop - Northeast Stairs
+  id: 370
+  area: 87
+  coordinates: [22, 40]
+  teleporter: [202, 0]
+- name: Pazuzu 5F Upper Loop - Northwest Stairs
+  id: 371
+  area: 87
+  coordinates: [9, 40]
+  teleporter: [203, 0]
+- name: Pazuzu 5F Upper Loop - Pazuzu Script 1
+  id: 372
+  area: 87
+  coordinates: [15, 40]
+  teleporter: [20, 8]
+- name: Pazuzu 5F Upper Loop - Pazuzu Script 2
+  id: 373
+  area: 87
+  coordinates: [16, 40]
+  teleporter: [20, 8]
+- name: Pazuzu 6F - West Stairs
+  id: 374
+  area: 88
+  coordinates: [41, 47]
+  teleporter: [204, 0]
+- name: Pazuzu 6F - Northwest Stairs
+  id: 375
+  area: 88
+  coordinates: [41, 40]
+  teleporter: [205, 0]
+- name: Pazuzu 6F - Northeast Stairs
+  id: 376
+  area: 88
+  coordinates: [54, 40]
+  teleporter: [206, 0]
+- name: Pazuzu 6F - South Stairs
+  id: 377
+  area: 88
+  coordinates: [52, 56]
+  teleporter: [207, 0]
+- name: Pazuzu 6F - Pazuzu Script 1
+  id: 378
+  area: 88
+  coordinates: [47, 40]
+  teleporter: [21, 8]
+- name: Pazuzu 6F - Pazuzu Script 2
+  id: 379
+  area: 88
+  coordinates: [48, 40]
+  teleporter: [21, 8]
+- name: Pazuzu 7F Main Room - Southwest Stairs
+  id: 380
+  area: 89
+  coordinates: [15, 54]
+  teleporter: [26, 0]
+- name: Pazuzu 7F Main Room - Northeast Stairs
+  id: 381
+  area: 89
+  coordinates: [21, 40]
+  teleporter: [27, 0]
+- name: Pazuzu 7F Main Room - Southeast Stairs
+  id: 382
+  area: 89
+  coordinates: [21, 56]
+  teleporter: [28, 0]
+- name: Pazuzu 7F Main Room - Pazuzu Script 1
+  id: 383
+  area: 89
+  coordinates: [15, 44]
+  teleporter: [22, 8]
+- name: Pazuzu 7F Main Room - Pazuzu Script 2
+  id: 384
+  area: 89
+  coordinates: [16, 44]
+  teleporter: [22, 8]
+- name: Pazuzu 7F Main Room - Crystal Script # Added for floor shuffle
+  id: 480
+  area: 89
+  coordinates: [15, 40]
+  teleporter: [38, 8]
+- name: Pazuzu 1F to 3F - South Stairs
+  id: 385
+  area: 90
+  coordinates: [43, 60]
+  teleporter: [29, 0]
+- name: Pazuzu 1F to 3F - North Stairs
+  id: 386
+  area: 90
+  coordinates: [43, 36]
+  teleporter: [30, 0]
+- name: Pazuzu 3F to 5F - South Stairs
+  id: 387
+  area: 91
+  coordinates: [43, 60]
+  teleporter: [40, 0]
+- name: Pazuzu 3F to 5F - North Stairs
+  id: 388
+  area: 91
+  coordinates: [43, 36]
+  teleporter: [41, 0]
+- name: Pazuzu 5F to 7F - South Stairs
+  id: 389
+  area: 92
+  coordinates: [43, 60]
+  teleporter: [38, 0]
+- name: Pazuzu 5F to 7F - North Stairs
+  id: 390
+  area: 92
+  coordinates: [43, 36]
+  teleporter: [39, 0]
+- name: Pazuzu 2F to 4F - South Stairs
+  id: 391
+  area: 93
+  coordinates: [43, 60]
+  teleporter: [21, 0]
+- name: Pazuzu 2F to 4F - North Stairs
+  id: 392
+  area: 93
+  coordinates: [43, 36]
+  teleporter: [22, 0]
+- name: Pazuzu 4F to 6F - South Stairs
+  id: 393
+  area: 94
+  coordinates: [43, 60]
+  teleporter: [2, 0]
+- name: Pazuzu 4F to 6F - North Stairs
+  id: 394
+  area: 94
+  coordinates: [43, 36]
+  teleporter: [3, 0]
+- name: Light Temple - Entrance
+  id: 395
+  area: 95
+  coordinates: [28, 57]
+  teleporter: [19, 6]
+- name: Light Temple - Mobius Teleporter Script
+  id: 396
+  area: 95
+  coordinates: [29, 37]
+  teleporter: [70, 8]
+- name: Light Temple - Visit Quest Script 1
+  id: 492
+  area: 95
+  coordinates: [34, 39]
+  teleporter: [100, 8]
+- name: Light Temple - Visit Quest Script 2
+  id: 493
+  area: 95
+  coordinates: [35, 39]
+  teleporter: [100, 8]
+- name: Ship Dock - Mobius Teleporter Script
+  id: 397
+  area: 96
+  coordinates: [15, 18]
+  teleporter: [61, 8]
+- name: Ship Dock - From Overworld
+  id: 398
+  area: 96
+  coordinates: [15, 11]
+  teleporter: [73, 0]
+- name: Ship Dock - Entrance
+  id: 399
+  area: 96
+  coordinates: [15, 23]
+  teleporter: [17, 6]
+- name: Mac Ship Deck - East Entrance Script
+  id: 400
+  area: 97
+  coordinates: [26, 40]
+  teleporter: [37, 8]
+- name: Mac Ship Deck - Central Stairs Script
+  id: 401
+  area: 97
+  coordinates: [16, 47]
+  teleporter: [50, 8]
+- name: Mac Ship Deck - West Stairs Script
+  id: 402
+  area: 97
+  coordinates: [8, 34]
+  teleporter: [51, 8]
+- name: Mac Ship Deck - East Stairs Script
+  id: 403
+  area: 97
+  coordinates: [24, 36]
+  teleporter: [52, 8]
+- name: Mac Ship Deck - North Stairs Script
+  id: 404
+  area: 97
+  coordinates: [12, 9]
+  teleporter: [53, 8]
+- name: Mac Ship B1 Outer Ring - South Stairs
+  id: 405
+  area: 98
+  coordinates: [16, 45]
+  teleporter: [208, 0]
+- name: Mac Ship B1 Outer Ring - West Stairs
+  id: 406
+  area: 98
+  coordinates: [8, 35]
+  teleporter: [175, 0]
+- name: Mac Ship B1 Outer Ring - East Stairs
+  id: 407
+  area: 98
+  coordinates: [25, 37]
+  teleporter: [172, 0]
+- name: Mac Ship B1 Outer Ring - Northwest Stairs
+  id: 408
+  area: 98
+  coordinates: [10, 23]
+  teleporter: [88, 0]
+- name: Mac Ship B1 Square Room - North Stairs
+  id: 409
+  area: 98
+  coordinates: [14, 9]
+  teleporter: [141, 0]
+- name: Mac Ship B1 Square Room - South Stairs
+  id: 410
+  area: 98
+  coordinates: [16, 12]
+  teleporter: [87, 0]
+- name: Mac Ship B1 Mac Room - Stairs # Unused?
+  id: 411
+  area: 98
+  coordinates: [16, 51]
+  teleporter: [101, 0]
+- name: Mac Ship B1 Central Corridor - South Stairs
+  id: 412
+  area: 98
+  coordinates: [16, 38]
+  teleporter: [102, 0]
+- name: Mac Ship B1 Central Corridor - North Stairs
+  id: 413
+  area: 98
+  coordinates: [16, 26]
+  teleporter: [86, 0]
+- name: Mac Ship B2 South Corridor - South Stairs
+  id: 414
+  area: 99
+  coordinates: [48, 51]
+  teleporter: [57, 1]
+- name: Mac Ship B2 South Corridor - North Stairs Script
+  id: 415
+  area: 99
+  coordinates: [48, 38]
+  teleporter: [55, 8]
+- name: Mac Ship B2 North Corridor - South Stairs Script
+  id: 416
+  area: 99
+  coordinates: [48, 27]
+  teleporter: [56, 8]
+- name: Mac Ship B2 North Corridor - North Stairs Script
+  id: 417
+  area: 99
+  coordinates: [48, 12]
+  teleporter: [57, 8]
+- name: Mac Ship B2 Outer Ring - Northwest Stairs Script
+  id: 418
+  area: 99
+  coordinates: [55, 11]
+  teleporter: [58, 8]
+- name: Mac Ship B1 Outer Ring Cleared - South Stairs
+  id: 419
+  area: 100
+  coordinates: [16, 45]
+  teleporter: [208, 0]
+- name: Mac Ship B1 Outer Ring Cleared - West Stairs
+  id: 420
+  area: 100
+  coordinates: [8, 35]
+  teleporter: [175, 0]
+- name: Mac Ship B1 Outer Ring Cleared - East Stairs
+  id: 421
+  area: 100
+  coordinates: [25, 37]
+  teleporter: [172, 0]
+- name: Mac Ship B1 Square Room Cleared - North Stairs
+  id: 422
+  area: 100
+  coordinates: [14, 9]
+  teleporter: [141, 0]
+- name: Mac Ship B1 Square Room Cleared - South Stairs
+  id: 423
+  area: 100
+  coordinates: [16, 12]
+  teleporter: [87, 0]
+- name: Mac Ship B1 Mac Room Cleared - Main Stairs
+  id: 424
+  area: 100
+  coordinates: [16, 51]
+  teleporter: [101, 0]
+- name: Mac Ship B1 Central Corridor Cleared - South Stairs
+  id: 425
+  area: 100
+  coordinates: [16, 38]
+  teleporter: [102, 0]
+- name: Mac Ship B1 Central Corridor Cleared - North Stairs
+  id: 426
+  area: 100
+  coordinates: [16, 26]
+  teleporter: [86, 0]
+- name: Mac Ship B1 Central Corridor Cleared - Northwest Stairs
+  id: 427
+  area: 100
+  coordinates: [23, 10]
+  teleporter: [88, 0]
+- name: Doom Castle Corridor of Destiny - South Entrance
+  id: 428
+  area: 101
+  coordinates: [59, 29]
+  teleporter: [84, 0]
+- name: Doom Castle Corridor of Destiny - Ice Floor Entrance
+  id: 429
+  area: 101
+  coordinates: [59, 21]
+  teleporter: [35, 2]
+- name: Doom Castle Corridor of Destiny - Lava Floor Entrance
+  id: 430
+  area: 101
+  coordinates: [59, 13]
+  teleporter: [209, 0]
+- name: Doom Castle Corridor of Destiny - Sky Floor Entrance
+  id: 431
+  area: 101
+  coordinates: [59, 5]
+  teleporter: [211, 0]
+- name: Doom Castle Corridor of Destiny - Hero Room Entrance
+  id: 432
+  area: 101
+  coordinates: [59, 61]
+  teleporter: [13, 2]
+- name: Doom Castle Ice Floor - Entrance
+  id: 433
+  area: 102
+  coordinates: [23, 42]
+  teleporter: [109, 3]
+- name: Doom Castle Lava Floor - Entrance
+  id: 434
+  area: 103
+  coordinates: [23, 40]
+  teleporter: [210, 0]
+- name: Doom Castle Sky Floor - Entrance
+  id: 435
+  area: 104
+  coordinates: [24, 41]
+  teleporter: [212, 0]
+- name: Doom Castle Hero Room - Dark King Entrance 1
+  id: 436
+  area: 106
+  coordinates: [15, 5]
+  teleporter: [54, 0]
+- name: Doom Castle Hero Room - Dark King Entrance 2
+  id: 437
+  area: 106
+  coordinates: [16, 5]
+  teleporter: [54, 0]
+- name: Doom Castle Hero Room - Dark King Entrance 3
+  id: 438
+  area: 106
+  coordinates: [15, 4]
+  teleporter: [54, 0]
+- name: Doom Castle Hero Room - Dark King Entrance 4
+  id: 439
+  area: 106
+  coordinates: [16, 4]
+  teleporter: [54, 0]
+- name: Doom Castle Hero Room - Hero Statue Script
+  id: 440
+  area: 106
+  coordinates: [15, 17]
+  teleporter: [24, 8]
+- name: Doom Castle Hero Room - Entrance
+  id: 441
+  area: 106
+  coordinates: [15, 24]
+  teleporter: [110, 3]
+- name: Doom Castle Dark King Room - Entrance
+  id: 442
+  area: 107
+  coordinates: [14, 26]
+  teleporter: [52, 0]
+- name: Doom Castle Dark King Room - Dark King Script
+  id: 443
+  area: 107
+  coordinates: [14, 15]
+  teleporter: [25, 8]
+- name: Doom Castle Dark King Room - Unknown
+  id: 444
+  area: 107
+  coordinates: [47, 54]
+  teleporter: [77, 0]
+- name: Overworld - Level Forest
+  id: 445
+  area: 0
+  type: "Overworld"
+  teleporter: [0x2E, 8]
+- name: Overworld - Foresta
+  id: 446
+  area: 0
+  type: "Overworld"
+  teleporter: [0x02, 1]
+- name: Overworld - Sand Temple
+  id: 447
+  area: 0
+  type: "Overworld"
+  teleporter: [0x03, 1]
+- name: Overworld - Bone Dungeon
+  id: 448
+  area: 0
+  type: "Overworld"
+  teleporter: [0x04, 1]
+- name: Overworld - Focus Tower Foresta
+  id: 449
+  area: 0
+  type: "Overworld"
+  teleporter: [0x05, 1]
+- name: Overworld - Focus Tower Aquaria
+  id: 450
+  area: 0
+  type: "Overworld"
+  teleporter: [0x13, 1]
+- name: Overworld - Libra Temple
+  id: 451
+  area: 0
+  type: "Overworld"
+  teleporter: [0x07, 1]
+- name: Overworld - Aquaria
+  id: 452
+  area: 0
+  type: "Overworld"
+  teleporter: [0x08, 8]
+- name: Overworld - Wintry Cave
+  id: 453
+  area: 0
+  type: "Overworld"
+  teleporter: [0x0A, 1]
+- name: Overworld - Life Temple
+  id: 454
+  area: 0
+  type: "Overworld"
+  teleporter: [0x0B, 1]
+- name: Overworld - Falls Basin
+  id: 455
+  area: 0
+  type: "Overworld"
+  teleporter: [0x0C, 1]
+- name: Overworld - Ice Pyramid
+  id: 456
+  area: 0
+  type: "Overworld"
+  teleporter: [0x0D, 1] # Will be switched to a script
+- name: Overworld - Spencer's Place
+  id: 457
+  area: 0
+  type: "Overworld"
+  teleporter: [0x30, 8]
+- name: Overworld - Wintry Temple
+  id: 458
+  area: 0
+  type: "Overworld"
+  teleporter: [0x10, 1]
+- name: Overworld - Focus Tower Frozen Strip
+  id: 459
+  area: 0
+  type: "Overworld"
+  teleporter: [0x11, 1]
+- name: Overworld - Focus Tower Fireburg
+  id: 460
+  area: 0
+  type: "Overworld"
+  teleporter: [0x12, 1]
+- name: Overworld - Fireburg
+  id: 461
+  area: 0
+  type: "Overworld"
+  teleporter: [0x14, 1]
+- name: Overworld - Mine
+  id: 462
+  area: 0
+  type: "Overworld"
+  teleporter: [0x15, 1]
+- name: Overworld - Sealed Temple
+  id: 463
+  area: 0
+  type: "Overworld"
+  teleporter: [0x16, 1]
+- name: Overworld - Volcano
+  id: 464
+  area: 0
+  type: "Overworld"
+  teleporter: [0x17, 1]
+- name: Overworld - Lava Dome
+  id: 465
+  area: 0
+  type: "Overworld"
+  teleporter: [0x18, 1]
+- name: Overworld - Focus Tower Windia
+  id: 466
+  area: 0
+  type: "Overworld"
+  teleporter: [0x06, 1]
+- name: Overworld - Rope Bridge
+  id: 467
+  area: 0
+  type: "Overworld"
+  teleporter: [0x19, 1]
+- name: Overworld - Alive Forest
+  id: 468
+  area: 0
+  type: "Overworld"
+  teleporter: [0x1A, 1]
+- name: Overworld - Giant Tree
+  id: 469
+  area: 0
+  type: "Overworld"
+  teleporter: [0x1B, 1]
+- name: Overworld - Kaidge Temple
+  id: 470
+  area: 0
+  type: "Overworld"
+  teleporter: [0x1C, 1]
+- name: Overworld - Windia
+  id: 471
+  area: 0
+  type: "Overworld"
+  teleporter: [0x1D, 1]
+- name: Overworld - Windhole Temple
+  id: 472
+  area: 0
+  type: "Overworld"
+  teleporter: [0x1E, 1]
+- name: Overworld - Mount Gale
+  id: 473
+  area: 0
+  type: "Overworld"
+  teleporter: [0x1F, 1]
+- name: Overworld - Pazuzu Tower
+  id: 474
+  area: 0
+  type: "Overworld"
+  teleporter: [0x20, 1]
+- name: Overworld - Ship Dock
+  id: 475
+  area: 0
+  type: "Overworld"
+  teleporter: [0x3E, 1]
+- name: Overworld - Doom Castle
+  id: 476
+  area: 0
+  type: "Overworld"
+  teleporter: [0x21, 1]
+- name: Overworld - Light Temple
+  id: 477
+  area: 0
+  type: "Overworld"
+  teleporter: [0x22, 1]
+- name: Overworld - Mac Ship
+  id: 478
+  area: 0
+  type: "Overworld"
+  teleporter: [0x24, 1]
+- name: Overworld - Mac Ship Doom
+  id: 479
+  area: 0
+  type: "Overworld"
+  teleporter: [0x24, 1]
+- name: Dummy House - Bed Script
+  id: 480
+  area: 17
+  coordinates: [0x28, 0x38]
+  teleporter: [1, 8]
+- name: Dummy House - Entrance
+  id: 481
+  area: 17
+  coordinates: [0x29, 0x3B]
+  teleporter: [0, 10] #None
diff --git a/worlds/ffmq/data/rooms.yaml b/worlds/ffmq/data/rooms.yaml
new file mode 100644
index 0000000000..e0c2e8d7f9
--- /dev/null
+++ b/worlds/ffmq/data/rooms.yaml
@@ -0,0 +1,4026 @@
+- name: Overworld
+  id: 0
+  type: "Overworld"
+  game_objects: []
+  links:
+  - target_room: 220 # To Forest Subregion
+    access: []
+- name: Subregion Foresta
+  id: 220
+  type: "Subregion"
+  region: "Foresta"
+  game_objects:
+  - name: "Foresta South Battlefield"
+    object_id: 0x01
+    location: "ForestaSouthBattlefield"
+    location_slot: "ForestaSouthBattlefield"
+    type: "BattlefieldXp"
+    access: []
+  - name: "Foresta West Battlefield"
+    object_id: 0x02
+    location: "ForestaWestBattlefield"
+    location_slot: "ForestaWestBattlefield"
+    type: "BattlefieldItem"
+    access: []
+  - name: "Foresta East Battlefield"
+    object_id: 0x03
+    location: "ForestaEastBattlefield"
+    location_slot: "ForestaEastBattlefield"
+    type: "BattlefieldGp"
+    access: []
+  links:
+  - target_room: 15  # Level Forest
+    location: "LevelForest"
+    location_slot: "LevelForest"
+    entrance: 445
+    teleporter: [0x2E, 8]
+    access: []
+  - target_room: 16  # Foresta
+    location: "Foresta"
+    location_slot: "Foresta"
+    entrance: 446
+    teleporter: [0x02, 1]
+    access: []
+  - target_room: 24  # Sand Temple
+    location: "SandTemple"
+    location_slot: "SandTemple"
+    entrance: 447
+    teleporter: [0x03, 1]
+    access: []
+  - target_room: 25  # Bone Dungeon
+    location: "BoneDungeon"
+    location_slot: "BoneDungeon"
+    entrance: 448
+    teleporter: [0x04, 1]
+    access: []
+  - target_room: 3   # Focus Tower Foresta
+    location: "FocusTowerForesta"
+    location_slot: "FocusTowerForesta"
+    entrance: 449
+    teleporter: [0x05, 1]
+    access: []
+  - target_room: 221
+    access: ["SandCoin"]
+  - target_room: 224
+    access: ["RiverCoin"]
+  - target_room: 226
+    access: ["SunCoin"]
+- name: Subregion Aquaria
+  id: 221
+  type: "Subregion"
+  region: "Aquaria"
+  game_objects:
+  - name: "South of Libra Temple Battlefield"
+    object_id: 0x04
+    location: "AquariaBattlefield01"
+    location_slot: "AquariaBattlefield01"
+    type: "BattlefieldXp"
+    access: []
+  - name: "East of Libra Temple Battlefield"
+    object_id: 0x05
+    location: "AquariaBattlefield02"
+    location_slot: "AquariaBattlefield02"
+    type: "BattlefieldGp"
+    access: []
+  - name: "South of Aquaria Battlefield"
+    object_id: 0x06
+    location: "AquariaBattlefield03"
+    location_slot: "AquariaBattlefield03"
+    type: "BattlefieldItem"
+    access: []
+  - name: "South of Wintry Cave Battlefield"
+    object_id: 0x07
+    location: "WintryBattlefield01"
+    location_slot: "WintryBattlefield01"
+    type: "BattlefieldXp"
+    access: []
+  - name: "West of Wintry Cave Battlefield"
+    object_id: 0x08
+    location: "WintryBattlefield02"
+    location_slot: "WintryBattlefield02"
+    type: "BattlefieldGp"
+    access: []
+  - name: "Ice Pyramid Battlefield"
+    object_id: 0x09
+    location: "PyramidBattlefield01"
+    location_slot: "PyramidBattlefield01"
+    type: "BattlefieldXp"
+    access: []
+  links:
+  - target_room: 10  # Focus Tower Aquaria
+    location: "FocusTowerAquaria"
+    location_slot: "FocusTowerAquaria"
+    entrance: 450
+    teleporter: [0x13, 1]
+    access: []
+  - target_room: 39  # Libra Temple
+    location: "LibraTemple"
+    location_slot: "LibraTemple"
+    entrance: 451
+    teleporter: [0x07, 1]
+    access: []
+  - target_room: 40  # Aquaria
+    location: "Aquaria"
+    location_slot: "Aquaria"
+    entrance: 452
+    teleporter: [0x08, 8]
+    access: []
+  - target_room: 45  # Wintry Cave
+    location: "WintryCave"
+    location_slot: "WintryCave"
+    entrance: 453
+    teleporter: [0x0A, 1]
+    access: []
+  - target_room: 52  # Falls Basin
+    location: "FallsBasin"
+    location_slot: "FallsBasin"
+    entrance: 455
+    teleporter: [0x0C, 1]
+    access: []
+  - target_room: 54  # Ice Pyramid
+    location: "IcePyramid"
+    location_slot: "IcePyramid"
+    entrance: 456
+    teleporter: [0x0D, 1] # Will be switched to a script
+    access: []
+  - target_room: 220
+    access: ["SandCoin"]
+  - target_room: 224
+    access: ["SandCoin", "RiverCoin"]
+  - target_room: 226
+    access: ["SandCoin", "SunCoin"]
+  - target_room: 223
+    access: ["SummerAquaria"]
+- name: Subregion Life Temple
+  id: 222
+  type: "Subregion"
+  region: "LifeTemple"
+  game_objects: []
+  links:
+  - target_room: 51  # Life Temple
+    location: "LifeTemple"
+    location_slot: "LifeTemple"
+    entrance: 454
+    teleporter: [0x0B, 1]
+    access: []
+- name: Subregion Frozen Fields
+  id: 223
+  type: "Subregion"
+  region: "AquariaFrozenField"
+  game_objects:
+  - name: "North of Libra Temple Battlefield"
+    object_id: 0x0A
+    location: "LibraBattlefield01"
+    location_slot: "LibraBattlefield01"
+    type: "BattlefieldItem"
+    access: []
+  - name: "Aquaria Frozen Field Battlefield"
+    object_id: 0x0B
+    location: "LibraBattlefield02"
+    location_slot: "LibraBattlefield02"
+    type: "BattlefieldXp"
+    access: []
+  links:
+  - target_room: 74  # Wintry Temple
+    location: "WintryTemple"
+    location_slot: "WintryTemple"
+    entrance: 458
+    teleporter: [0x10, 1]
+    access: []
+  - target_room: 14  # Focus Tower Frozen Strip
+    location: "FocusTowerFrozen"
+    location_slot: "FocusTowerFrozen"
+    entrance: 459
+    teleporter: [0x11, 1]
+    access: []
+  - target_room: 221
+    access: []
+  - target_room: 225
+    access: ["SummerAquaria", "DualheadHydra"]
+- name: Subregion Fireburg
+  id: 224
+  type: "Subregion"
+  region: "Fireburg"
+  game_objects:
+  - name: "Path to Fireburg Southern Battlefield"
+    object_id: 0x0C
+    location: "FireburgBattlefield01"
+    location_slot: "FireburgBattlefield01"
+    type: "BattlefieldGp"
+    access: []
+  - name: "Path to Fireburg Central Battlefield"
+    object_id: 0x0D
+    location: "FireburgBattlefield02"
+    location_slot: "FireburgBattlefield02"
+    type: "BattlefieldItem"
+    access: []
+  - name: "Path to Fireburg Northern Battlefield"
+    object_id: 0x0E
+    location: "FireburgBattlefield03"
+    location_slot: "FireburgBattlefield03"
+    type: "BattlefieldXp"
+    access: []
+  - name: "Sealed Temple Battlefield"
+    object_id: 0x0F
+    location: "MineBattlefield01"
+    location_slot: "MineBattlefield01"
+    type: "BattlefieldGp"
+    access: []
+  - name: "Mine Battlefield"
+    object_id: 0x10
+    location: "MineBattlefield02"
+    location_slot: "MineBattlefield02"
+    type: "BattlefieldItem"
+    access: []
+  - name: "Boulder Battlefield"
+    object_id: 0x11
+    location: "MineBattlefield03"
+    location_slot: "MineBattlefield03"
+    type: "BattlefieldXp"
+    access: []
+  links:
+  - target_room: 13  # Focus Tower Fireburg
+    location: "FocusTowerFireburg"
+    location_slot: "FocusTowerFireburg"
+    entrance: 460
+    teleporter: [0x12, 1]
+    access: []
+  - target_room: 76  # Fireburg
+    location: "Fireburg"
+    location_slot: "Fireburg"
+    entrance: 461
+    teleporter: [0x14, 1]
+    access: []
+  - target_room: 84  # Mine
+    location: "Mine"
+    location_slot: "Mine"
+    entrance: 462
+    teleporter: [0x15, 1]
+    access: []
+  - target_room: 92  # Sealed Temple
+    location: "SealedTemple"
+    location_slot: "SealedTemple"
+    entrance: 463
+    teleporter: [0x16, 1]
+    access: []
+  - target_room: 93  # Volcano
+    location: "Volcano"
+    location_slot: "Volcano"
+    entrance: 464
+    teleporter: [0x17, 1] # Also this one / 0x0F, 8
+    access: []
+  - target_room: 100 # Lava Dome
+    location: "LavaDome"
+    location_slot: "LavaDome"
+    entrance: 465
+    teleporter: [0x18, 1]
+    access: []
+  - target_room: 220
+    access: ["RiverCoin"]
+  - target_room: 221
+    access: ["SandCoin", "RiverCoin"]
+  - target_room: 226
+    access: ["RiverCoin", "SunCoin"]
+  - target_room: 225
+    access: ["DualheadHydra"]
+- name: Subregion Volcano Battlefield
+  id: 225
+  type: "Subregion"
+  region: "VolcanoBattlefield"
+  game_objects:
+  - name: "Volcano Battlefield"
+    object_id: 0x12
+    location: "VolcanoBattlefield01"
+    location_slot: "VolcanoBattlefield01"
+    type: "BattlefieldXp"
+    access: []
+  links:
+  - target_room: 224
+    access: ["DualheadHydra"]
+  - target_room: 223
+    access: ["SummerAquaria"]
+- name: Subregion Windia
+  id: 226
+  type: "Subregion"
+  region: "Windia"
+  game_objects:
+  - name: "Kaidge Temple Battlefield"
+    object_id: 0x13
+    location: "WindiaBattlefield01"
+    location_slot: "WindiaBattlefield01"
+    type: "BattlefieldXp"
+    access: ["SandCoin", "RiverCoin"]
+  - name: "South of Windia Battlefield"
+    object_id: 0x14
+    location: "WindiaBattlefield02"
+    location_slot: "WindiaBattlefield02"
+    type: "BattlefieldXp"
+    access: ["SandCoin", "RiverCoin"]
+  links:
+  - target_room: 9   # Focus Tower Windia
+    location: "FocusTowerWindia"
+    location_slot: "FocusTowerWindia"
+    entrance: 466
+    teleporter: [0x06, 1]
+    access: []
+  - target_room: 123 # Rope Bridge
+    location: "RopeBridge"
+    location_slot: "RopeBridge"
+    entrance: 467
+    teleporter: [0x19, 1]
+    access: []
+  - target_room: 124 # Alive Forest
+    location: "AliveForest"
+    location_slot: "AliveForest"
+    entrance: 468
+    teleporter: [0x1A, 1]
+    access: []
+  - target_room: 125 # Giant Tree
+    location: "GiantTree"
+    location_slot: "GiantTree"
+    entrance: 469
+    teleporter: [0x1B, 1]
+    access: ["Barred"]
+  - target_room: 152 # Kaidge Temple
+    location: "KaidgeTemple"
+    location_slot: "KaidgeTemple"
+    entrance: 470
+    teleporter: [0x1C, 1]
+    access: []
+  - target_room: 156 # Windia
+    location: "Windia"
+    location_slot: "Windia"
+    entrance: 471
+    teleporter: [0x1D, 1]
+    access: []
+  - target_room: 154 # Windhole Temple
+    location: "WindholeTemple"
+    location_slot: "WindholeTemple"
+    entrance: 472
+    teleporter: [0x1E, 1]
+    access: []
+  - target_room: 155 # Mount Gale
+    location: "MountGale"
+    location_slot: "MountGale"
+    entrance: 473
+    teleporter: [0x1F, 1]
+    access: []
+  - target_room: 166 # Pazuzu Tower
+    location: "PazuzusTower"
+    location_slot: "PazuzusTower"
+    entrance: 474
+    teleporter: [0x20, 1]
+    access: []
+  - target_room: 220
+    access: ["SunCoin"]
+  - target_room: 221
+    access: ["SandCoin", "SunCoin"]
+  - target_room: 224
+    access: ["RiverCoin", "SunCoin"]
+  - target_room: 227
+    access: ["RainbowBridge"]
+- name: Subregion Spencer's Cave
+  id: 227
+  type: "Subregion"
+  region: "SpencerCave"
+  game_objects: []
+  links:
+  - target_room: 73  # Spencer's Place
+    location: "SpencersPlace"
+    location_slot: "SpencersPlace"
+    entrance: 457
+    teleporter: [0x30, 8]
+    access: []
+  - target_room: 226
+    access: ["RainbowBridge"]
+- name: Subregion Ship Dock
+  id: 228
+  type: "Subregion"
+  region: "ShipDock"
+  game_objects: []
+  links:
+  - target_room: 186 # Ship Dock
+    location: "ShipDock"
+    location_slot: "ShipDock"
+    entrance: 475
+    teleporter: [0x3E, 1]
+    access: []
+  - target_room: 229
+    access: ["ShipLiberated", "ShipDockAccess"]
+- name: Subregion Mac's Ship
+  id: 229
+  type: "Subregion"
+  region: "MacShip"
+  game_objects: []
+  links:
+  - target_room: 187 # Mac Ship
+    location: "MacsShip"
+    location_slot: "MacsShip"
+    entrance: 478
+    teleporter: [0x24, 1]
+    access: []
+  - target_room: 228
+    access: ["ShipLiberated", "ShipDockAccess"]
+  - target_room: 231
+    access: ["ShipLoaned", "ShipDockAccess", "ShipSteeringWheel"]
+- name: Subregion Light Temple
+  id: 230
+  type: "Subregion"
+  region: "LightTemple"
+  game_objects: []
+  links:
+  - target_room: 185 # Light Temple
+    location: "LightTemple"
+    location_slot: "LightTemple"
+    entrance: 477
+    teleporter: [0x23, 1]
+    access: []
+- name: Subregion Doom Castle
+  id: 231
+  type: "Subregion"
+  region: "DoomCastle"
+  game_objects: []
+  links:
+  - target_room: 1   # Doom Castle
+    location: "DoomCastle"
+    location_slot: "DoomCastle"
+    entrance: 476
+    teleporter: [0x21, 1]
+    access: []
+  - target_room: 187 # Mac Ship Doom
+    location: "MacsShipDoom"
+    location_slot: "MacsShipDoom"
+    entrance: 479
+    teleporter: [0x24, 1]
+    access: ["Barred"]
+  - target_room: 229
+    access: ["ShipLoaned", "ShipDockAccess", "ShipSteeringWheel"]
+- name: Doom Castle - Sand Floor
+  id: 1
+  game_objects:
+  - name: "Doom Castle B2 - Southeast Chest"
+    object_id: 0x01
+    type: "Chest"
+    access: ["Bomb"]
+  - name: "Doom Castle B2 - Bone Ledge Box"
+    object_id: 0x1E
+    type: "Box"
+    access: []
+  - name: "Doom Castle B2 - Hook Platform Box"
+    object_id: 0x1F
+    type: "Box"
+    access: ["DragonClaw"]
+  links:
+  - target_room: 231
+    entrance: 1
+    teleporter: [1, 6]
+    access: []
+  - target_room: 5
+    entrance: 0
+    teleporter: [0, 0]
+    access: ["DragonClaw", "MegaGrenade"]
+- name: Doom Castle - Aero Room
+  id: 2
+  game_objects:
+  - name: "Doom Castle B2 - Sun Door Chest"
+    object_id: 0x00
+    type: "Chest"
+    access: []
+  links:
+  - target_room: 4
+    entrance: 2
+    teleporter: [1, 0]
+    access: []
+- name: Focus Tower B1 - Main Loop
+  id: 3
+  game_objects: []
+  links:
+  - target_room: 220
+    entrance: 3
+    teleporter: [2, 6]
+    access: []
+  - target_room: 6
+    entrance: 4
+    teleporter: [4, 0]
+    access: []
+- name: Focus Tower B1 - Aero Corridor
+  id: 4
+  game_objects: []
+  links:
+  - target_room: 9
+    entrance: 5
+    teleporter: [5, 0]
+    access: []
+  - target_room: 2
+    entrance: 6
+    teleporter: [8, 0]
+    access: []
+- name: Focus Tower B1 - Inner Loop
+  id: 5
+  game_objects: []
+  links:
+  - target_room: 1
+    entrance: 8
+    teleporter: [7, 0]
+    access: []
+  - target_room: 201
+    entrance: 7
+    teleporter: [6, 0]
+    access: []
+- name: Focus Tower 1F Main Lobby
+  id: 6
+  game_objects:
+  - name: "Focus Tower 1F - Main Lobby Box"
+    object_id: 0x21
+    type: "Box"
+    access: []
+  links:
+  - target_room: 3
+    entrance: 11
+    teleporter: [11, 0]
+    access: []
+  - target_room: 7
+    access: ["SandCoin"]
+  - target_room: 8
+    access: ["RiverCoin"]
+  - target_room: 9
+    access: ["SunCoin"]
+- name: Focus Tower 1F SandCoin Room
+  id: 7
+  game_objects: []
+  links:
+  - target_room: 6
+    access: ["SandCoin"]
+  - target_room: 10
+    entrance: 10
+    teleporter: [10, 0]
+    access: []
+- name: Focus Tower 1F RiverCoin Room
+  id: 8
+  game_objects: []
+  links:
+  - target_room: 6
+    access: ["RiverCoin"]
+  - target_room: 11
+    entrance: 14
+    teleporter: [14, 0]
+    access: []
+- name: Focus Tower 1F SunCoin Room
+  id: 9
+  game_objects: []
+  links:
+  - target_room: 6
+    access: ["SunCoin"]
+  - target_room: 4
+    entrance: 12
+    teleporter: [12, 0]
+    access: []
+  - target_room: 226
+    entrance: 9
+    teleporter: [3, 6]
+    access: []
+- name: Focus Tower 1F SkyCoin Room
+  id: 201
+  game_objects: []
+  links:
+  - target_room: 195
+    entrance: 13
+    teleporter: [13, 0]
+    access: ["SkyCoin", "FlamerusRex", "IceGolem", "DualheadHydra", "Pazuzu"]
+  - target_room: 5
+    entrance: 15
+    teleporter: [15, 0]
+    access: []
+- name: Focus Tower 2F - Sand Coin Passage
+  id: 10
+  game_objects:
+  - name: "Focus Tower 2F - Sand Door Chest"
+    object_id: 0x03
+    type: "Chest"
+    access: []
+  links:
+  - target_room: 221
+    entrance: 16
+    teleporter: [4, 6]
+    access: []
+  - target_room: 7
+    entrance: 17
+    teleporter: [17, 0]
+    access: []
+- name: Focus Tower 2F - River Coin Passage
+  id: 11
+  game_objects: []
+  links:
+  - target_room: 8
+    entrance: 18
+    teleporter: [18, 0]
+    access: []
+  - target_room: 13
+    entrance: 19
+    teleporter: [20, 0]
+    access: []
+- name: Focus Tower 2F - Venus Chest Room
+  id: 12
+  game_objects:
+  - name: "Focus Tower 2F - Back Door Chest"
+    object_id: 0x02
+    type: "Chest"
+    access: []
+  - name: "Focus Tower 2F - Venus Chest"
+    object_id: 9
+    type: "NPC"
+    access: ["Bomb", "VenusKey"]
+  links:
+  - target_room: 14
+    entrance: 20
+    teleporter: [19, 0]
+    access: []
+- name: Focus Tower 3F - Lower Floor
+  id: 13
+  game_objects:
+  - name: "Focus Tower 3F - River Door Box"
+    object_id: 0x22
+    type: "Box"
+    access: []
+  links:
+  - target_room: 224
+    entrance: 22
+    teleporter: [6, 6]
+    access: []
+  - target_room: 11
+    entrance: 23
+    teleporter: [24, 0]
+    access: []
+- name: Focus Tower 3F - Upper Floor
+  id: 14
+  game_objects: []
+  links:
+  - target_room: 223
+    entrance: 24
+    teleporter: [5, 6]
+    access: []
+  - target_room: 12
+    entrance: 25
+    teleporter: [23, 0]
+    access: []
+- name: Level Forest
+  id: 15
+  game_objects:
+  - name: "Level Forest - Northwest Box"
+    object_id: 0x28
+    type: "Box"
+    access: ["Axe"]
+  - name: "Level Forest - Northeast Box"
+    object_id: 0x29
+    type: "Box"
+    access: ["Axe"]
+  - name: "Level Forest - Middle Box"
+    object_id: 0x2A
+    type: "Box"
+    access: []
+  - name: "Level Forest - Southwest Box"
+    object_id: 0x2B
+    type: "Box"
+    access: ["Axe"]
+  - name: "Level Forest - Southeast Box"
+    object_id: 0x2C
+    type: "Box"
+    access: ["Axe"]
+  - name: "Minotaur"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Minotaur"]
+    access: ["Kaeli1"]
+  - name: "Level Forest - Old Man"
+    object_id: 0
+    type: "NPC"
+    access: []
+  - name: "Level Forest - Kaeli"
+    object_id: 1
+    type: "NPC"
+    access: ["Kaeli1", "Minotaur"]
+  links:
+  - target_room: 220
+    entrance: 28
+    teleporter: [25, 0]
+    access: []
+- name: Foresta
+  id: 16
+  game_objects:
+  - name: "Foresta - Outside Box"
+    object_id: 0x2D
+    type: "Box"
+    access: ["Axe"]
+  links:
+  - target_room: 220
+    entrance: 38
+    teleporter: [31, 0]
+    access: []
+  - target_room: 17
+    entrance: 44
+    teleporter: [0, 5]
+    access: []
+  - target_room: 18
+    entrance: 42
+    teleporter: [32, 4]
+    access: []
+  - target_room: 19
+    entrance: 43
+    teleporter: [33, 0]
+    access: []
+  - target_room: 20
+    entrance: 45
+    teleporter: [1, 5]
+    access: []
+- name: Kaeli's House
+  id: 17
+  game_objects:
+  - name: "Foresta - Kaeli's House Box"
+    object_id: 0x2E
+    type: "Box"
+    access: []
+  - name: "Kaeli Companion"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Kaeli1"]
+    access: ["TreeWither"]
+  - name: "Kaeli 2"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Kaeli2"]
+    access: ["Kaeli1", "Minotaur", "Elixir"]
+  links:
+  - target_room: 16
+    entrance: 46
+    teleporter: [86, 3]
+    access: []
+- name: Foresta Houses - Old Man's House Main
+  id: 18
+  game_objects: []
+  links:
+  - target_room: 19
+    access: ["BarrelPushed"]
+  - target_room: 16
+    entrance: 47
+    teleporter: [34, 0]
+    access: []
+- name: Foresta Houses - Old Man's House Back
+  id: 19
+  game_objects:
+  - name: "Foresta - Old Man House Chest"
+    object_id: 0x05
+    type: "Chest"
+    access: []
+  - name: "Old Man Barrel"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["BarrelPushed"]
+    access: []
+  links:
+  - target_room: 18
+    access: ["BarrelPushed"]
+  - target_room: 16
+    entrance: 48
+    teleporter: [35, 0]
+    access: []
+- name: Foresta Houses - Rest House
+  id: 20
+  game_objects:
+  - name: "Foresta - Rest House Box"
+    object_id: 0x2F
+    type: "Box"
+    access: []
+  links:
+  - target_room: 16
+    entrance: 50
+    teleporter: [87, 3]
+    access: []
+- name: Libra Treehouse
+  id: 21
+  game_objects:
+  - name: "Alive Forest - Libra Treehouse Box"
+    object_id: 0x32
+    type: "Box"
+    access: []
+  links:
+  - target_room: 124
+    entrance: 51
+    teleporter: [67, 8]
+    access: ["LibraCrest"]
+- name: Gemini Treehouse
+  id: 22
+  game_objects:
+  - name: "Alive Forest - Gemini Treehouse Box"
+    object_id: 0x33
+    type: "Box"
+    access: []
+  links:
+  - target_room: 124
+    entrance: 52
+    teleporter: [68, 8]
+    access: ["GeminiCrest"]
+- name: Mobius Treehouse
+  id: 23
+  game_objects:
+  - name: "Alive Forest - Mobius Treehouse West Box"
+    object_id: 0x30
+    type: "Box"
+    access: []
+  - name: "Alive Forest - Mobius Treehouse East Box"
+    object_id: 0x31
+    type: "Box"
+    access: []
+  links:
+  - target_room: 124
+    entrance: 53
+    teleporter: [69, 8]
+    access: ["MobiusCrest"]
+- name: Sand Temple
+  id: 24
+  game_objects:
+  - name: "Tristam Companion"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Tristam"]
+    access: []
+  links:
+  - target_room: 220
+    entrance: 54
+    teleporter: [36, 0]
+    access: []
+- name: Bone Dungeon 1F
+  id: 25
+  game_objects:
+  - name: "Bone Dungeon 1F - Entrance Room West Box"
+    object_id: 0x35
+    type: "Box"
+    access: []
+  - name: "Bone Dungeon 1F - Entrance Room Middle Box"
+    object_id: 0x36
+    type: "Box"
+    access: []
+  - name: "Bone Dungeon 1F - Entrance Room East Box"
+    object_id: 0x37
+    type: "Box"
+    access: []
+  links:
+  - target_room: 220
+    entrance: 55
+    teleporter: [37, 0]
+    access: []
+  - target_room: 26
+    entrance: 56
+    teleporter: [2, 2]
+    access: []
+- name: Bone Dungeon B1 - Waterway
+  id: 26
+  game_objects:
+  - name: "Bone Dungeon B1 - Skull Chest"
+    object_id: 0x06
+    type: "Chest"
+    access: ["Bomb"]
+  - name: "Bone Dungeon B1 - Tristam"
+    object_id: 2
+    type: "NPC"
+    access: ["Tristam"]
+  - name: "Tristam Bone Dungeon Item Given"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["TristamBoneItemGiven"]
+    access: ["Tristam"]
+  links:
+  - target_room: 25
+    entrance: 59
+    teleporter: [88, 3]
+    access: []
+  - target_room: 28
+    entrance: 57
+    teleporter: [3, 2]
+    access: ["Bomb"]
+- name: Bone Dungeon B1 - Checker Room
+  id: 28
+  game_objects:
+  - name: "Bone Dungeon B1 - Checker Room Box"
+    object_id: 0x38
+    type: "Box"
+    access: ["Bomb"]
+  links:
+  - target_room: 26
+    entrance: 61
+    teleporter: [89, 3]
+    access: []
+  - target_room: 30
+    entrance: 60
+    teleporter: [4, 2]
+    access: []
+- name: Bone Dungeon B1 - Hidden Room
+  id: 29
+  game_objects:
+  - name: "Bone Dungeon B1 - Ribcage Waterway Box"
+    object_id: 0x39
+    type: "Box"
+    access: []
+  links:
+  - target_room: 31
+    entrance: 62
+    teleporter: [91, 3]
+    access: []
+- name: Bone Dungeon B2 - Exploding Skull Room - First Room
+  id: 30
+  game_objects:
+  - name: "Bone Dungeon B2 - Spines Room Alcove Box"
+    object_id: 0x3B
+    type: "Box"
+    access: []
+  - name: "Long Spine"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["LongSpineBombed"]
+    access: ["Bomb"]
+  links:
+  - target_room: 28
+    entrance: 65
+    teleporter: [90, 3]
+    access: []
+  - target_room: 31
+    access: ["LongSpineBombed"]
+- name: Bone Dungeon B2 - Exploding Skull Room - Second Room
+  id: 31
+  game_objects:
+  - name: "Bone Dungeon B2 - Spines Room Looped Hallway Box"
+    object_id: 0x3A
+    type: "Box"
+    access: []
+  - name: "Short Spine"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["ShortSpineBombed"]
+    access: ["Bomb"]
+  links:
+  - target_room: 29
+    entrance: 63
+    teleporter: [5, 2]
+    access: ["LongSpineBombed"]
+  - target_room: 32
+    access: ["ShortSpineBombed"]
+  - target_room: 30
+    access: ["LongSpineBombed"]
+- name: Bone Dungeon B2 - Exploding Skull Room - Third Room
+  id: 32
+  game_objects: []
+  links:
+  - target_room: 35
+    entrance: 64
+    teleporter: [6, 2]
+    access: []
+  - target_room: 31
+    access: ["ShortSpineBombed"]
+- name: Bone Dungeon B2 - Box Room
+  id: 33
+  game_objects:
+  - name: "Bone Dungeon B2 - Lone Room Box"
+    object_id: 0x3D
+    type: "Box"
+    access: []
+  links:
+  - target_room: 36
+    entrance: 66
+    teleporter: [93, 3]
+    access: []
+- name: Bone Dungeon B2 - Quake Room
+  id: 34
+  game_objects:
+  - name: "Bone Dungeon B2 - Penultimate Room Chest"
+    object_id: 0x07
+    type: "Chest"
+    access: []
+  links:
+  - target_room: 37
+    entrance: 67
+    teleporter: [94, 3]
+    access: []
+- name: Bone Dungeon B2 - Two Skulls Room - First Room
+  id: 35
+  game_objects:
+  - name: "Bone Dungeon B2 - Two Skulls Room Box"
+    object_id: 0x3C
+    type: "Box"
+    access: []
+  - name: "Skull 1"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Skull1Bombed"]
+    access: ["Bomb"]
+  links:
+  - target_room: 32
+    entrance: 71
+    teleporter: [92, 3]
+    access: []
+  - target_room: 36
+    access: ["Skull1Bombed"]
+- name: Bone Dungeon B2 - Two Skulls Room - Second Room
+  id: 36
+  game_objects:
+  - name: "Skull 2"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Skull2Bombed"]
+    access: ["Bomb"]
+  links:
+  - target_room: 33
+    entrance: 68
+    teleporter: [7, 2]
+    access: []
+  - target_room: 37
+    access: ["Skull2Bombed"]
+  - target_room: 35
+    access: ["Skull1Bombed"]
+- name: Bone Dungeon B2 - Two Skulls Room - Third Room
+  id: 37
+  game_objects: []
+  links:
+  - target_room: 34
+    entrance: 69
+    teleporter: [8, 2]
+    access: []
+  - target_room: 38
+    entrance: 70
+    teleporter: [9, 2]
+    access: ["Bomb"]
+  - target_room: 36
+    access: ["Skull2Bombed"]
+- name: Bone Dungeon B2 - Boss Room
+  id: 38
+  game_objects:
+  - name: "Bone Dungeon B2 - North Box"
+    object_id: 0x3E
+    type: "Box"
+    access: []
+  - name: "Bone Dungeon B2 - South Box"
+    object_id: 0x3F
+    type: "Box"
+    access: []
+  - name: "Bone Dungeon B2 - Flamerus Rex Chest"
+    object_id: 0x08
+    type: "Chest"
+    access: []
+  - name: "Bone Dungeon B2 - Tristam's Treasure Chest"
+    object_id: 0x04
+    type: "Chest"
+    access: []
+  - name: "Flamerus Rex"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["FlamerusRex"]
+    access: []
+  links:
+  - target_room: 37
+    entrance: 74
+    teleporter: [95, 3]
+    access: []
+- name: Libra Temple
+  id: 39
+  game_objects:
+  - name: "Libra Temple - Box"
+    object_id: 0x40
+    type: "Box"
+    access: []
+  - name: "Phoebe Companion"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Phoebe1"]
+    access: []
+  links:
+  - target_room: 221
+    entrance: 75
+    teleporter: [13, 6]
+    access: []
+  - target_room: 51
+    entrance: 76
+    teleporter: [59, 8]
+    access: ["LibraCrest"]
+- name: Aquaria
+  id: 40
+  game_objects:
+  - name: "Summer Aquaria"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["SummerAquaria"]
+    access: ["WakeWater"]
+  links:
+  - target_room: 221
+    entrance: 77
+    teleporter: [8, 6]
+    access: []
+  - target_room: 41
+    entrance: 81
+    teleporter: [10, 5]
+    access: []
+  - target_room: 42
+    entrance: 82
+    teleporter: [44, 4]
+    access: []
+  - target_room: 44
+    entrance: 83
+    teleporter: [11, 5]
+    access: []
+  - target_room: 71
+    entrance: 89
+    teleporter: [42, 0]
+    access: ["SummerAquaria"]
+  - target_room: 71
+    entrance: 90
+    teleporter: [43, 0]
+    access: ["SummerAquaria"]
+- name: Phoebe's House
+  id: 41
+  game_objects:
+  - name: "Aquaria - Phoebe's House Chest"
+    object_id: 0x41
+    type: "Box"
+    access: []
+  links:
+  - target_room: 40
+    entrance: 93
+    teleporter: [5, 8]
+    access: []
+- name: Aquaria Vendor House
+  id: 42
+  game_objects:
+  - name: "Aquaria - Vendor"
+    object_id: 4
+    type: "NPC"
+    access: []
+  - name: "Aquaria - Vendor House Box"
+    object_id: 0x42
+    type: "Box"
+    access: []
+  links:
+  - target_room: 40
+    entrance: 94
+    teleporter: [40, 8]
+    access: []
+  - target_room: 43
+    entrance: 95
+    teleporter: [47, 0]
+    access: []
+- name: Aquaria Gemini Room
+  id: 43
+  game_objects: []
+  links:
+  - target_room: 42
+    entrance: 97
+    teleporter: [48, 0]
+    access: []
+  - target_room: 81
+    entrance: 96
+    teleporter: [72, 8]
+    access: ["GeminiCrest"]
+- name: Aquaria INN
+  id: 44
+  game_objects: []
+  links:
+  - target_room: 40
+    entrance: 98
+    teleporter: [75, 8]
+    access: []
+- name: Wintry Cave 1F - East Ledge
+  id: 45
+  game_objects:
+  - name: "Wintry Cave 1F - North Box"
+    object_id: 0x43
+    type: "Box"
+    access: []
+  - name: "Wintry Cave 1F - Entrance Box"
+    object_id: 0x46
+    type: "Box"
+    access: []
+  - name: "Wintry Cave 1F - Slippery Cliff Box"
+    object_id: 0x44
+    type: "Box"
+    access: ["Claw"]
+  - name: "Wintry Cave 1F - Phoebe"
+    object_id: 5
+    type: "NPC"
+    access: ["Phoebe1"]
+  links:
+  - target_room: 221
+    entrance: 99
+    teleporter: [49, 0]
+    access: []
+  - target_room: 49
+    entrance: 100
+    teleporter: [14, 2]
+    access: ["Bomb"]
+  - target_room: 46
+    access: ["Claw"]
+- name: Wintry Cave 1F - Central Space
+  id: 46
+  game_objects:
+  - name: "Wintry Cave 1F - Scenic Overlook Box"
+    object_id: 0x45
+    type: "Box"
+    access: ["Claw"]
+  links:
+  - target_room: 45
+    access: ["Claw"]
+  - target_room: 47
+    access: ["Claw"]
+- name: Wintry Cave 1F - West Ledge
+  id: 47
+  game_objects: []
+  links:
+  - target_room: 48
+    entrance: 101
+    teleporter: [15, 2]
+    access: ["Bomb"]
+  - target_room: 46
+    access: ["Claw"]
+- name: Wintry Cave 2F
+  id: 48
+  game_objects:
+  - name: "Wintry Cave 2F - West Left Box"
+    object_id: 0x47
+    type: "Box"
+    access: []
+  - name: "Wintry Cave 2F - West Right Box"
+    object_id: 0x48
+    type: "Box"
+    access: []
+  - name: "Wintry Cave 2F - East Left Box"
+    object_id: 0x49
+    type: "Box"
+    access: []
+  - name: "Wintry Cave 2F - East Right Box"
+    object_id: 0x4A
+    type: "Box"
+    access: []
+  links:
+  - target_room: 47
+    entrance: 104
+    teleporter: [97, 3]
+    access: []
+  - target_room: 50
+    entrance: 103
+    teleporter: [50, 0]
+    access: []
+- name: Wintry Cave 3F Top
+  id: 49
+  game_objects:
+  - name: "Wintry Cave 3F - West Box"
+    object_id: 0x4B
+    type: "Box"
+    access: []
+  - name: "Wintry Cave 3F - East Box"
+    object_id: 0x4C
+    type: "Box"
+    access: []
+  links:
+  - target_room: 45
+    entrance: 105
+    teleporter: [96, 3]
+    access: []
+- name: Wintry Cave 3F Bottom
+  id: 50
+  game_objects:
+  - name: "Wintry Cave 3F - Squidite Chest"
+    object_id: 0x09
+    type: "Chest"
+    access: ["Phanquid"]
+  - name: "Phanquid"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Phanquid"]
+    access: []
+  - name: "Wintry Cave 3F - Before Boss Box"
+    object_id: 0x4D
+    type: "Box"
+    access: []
+  links:
+  - target_room: 48
+    entrance: 106
+    teleporter: [51, 0]
+    access: []
+- name: Life Temple
+  id: 51
+  game_objects:
+  - name: "Life Temple - Box"
+    object_id: 0x4E
+    type: "Box"
+    access: []
+  - name: "Life Temple - Mysterious Man"
+    object_id: 6
+    type: "NPC"
+    access: []
+  links:
+  - target_room: 222
+    entrance: 107
+    teleporter: [14, 6]
+    access: []
+  - target_room: 39
+    entrance: 108
+    teleporter: [60, 8]
+    access: ["LibraCrest"]
+- name: Fall Basin
+  id: 52
+  game_objects:
+  - name: "Falls Basin - Snow Crab Chest"
+    object_id: 0x0A
+    type: "Chest"
+    access: ["FreezerCrab"]
+  - name: "Freezer Crab"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["FreezerCrab"]
+    access: []
+  - name: "Falls Basin - Box"
+    object_id: 0x4F
+    type: "Box"
+    access: []
+  links:
+  - target_room: 221
+    entrance: 111
+    teleporter: [53, 0]
+    access: []
+- name: Ice Pyramid B1 Taunt Room
+  id: 53
+  game_objects:
+  - name: "Ice Pyramid B1 - Chest"
+    object_id: 0x0B
+    type: "Chest"
+    access: []
+  - name: "Ice Pyramid B1 - West Box"
+    object_id: 0x50
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid B1 - North Box"
+    object_id: 0x51
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid B1 - East Box"
+    object_id: 0x52
+    type: "Box"
+    access: []
+  links:
+  - target_room: 68
+    entrance: 113
+    teleporter: [55, 0]
+    access: []
+- name: Ice Pyramid 1F Maze Lobby
+  id: 54
+  game_objects:
+  - name: "Ice Pyramid 1F Statue"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["IcePyramid1FStatue"]
+    access: ["Sword"]
+  links:
+  - target_room: 221
+    entrance: 114
+    teleporter: [56, 0]
+    access: []
+  - target_room: 55
+    access: ["IcePyramid1FStatue"]
+- name: Ice Pyramid 1F Maze
+  id: 55
+  game_objects:
+  - name: "Ice Pyramid 1F - East Alcove Chest"
+    object_id: 0x0D
+    type: "Chest"
+    access: []
+  - name: "Ice Pyramid 1F - Sandwiched Alcove Box"
+    object_id: 0x53
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 1F - Southwest Left Box"
+    object_id: 0x54
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 1F - Southwest Right Box"
+    object_id: 0x55
+    type: "Box"
+    access: []
+  links:
+  - target_room: 56
+    entrance: 116
+    teleporter: [57, 0]
+    access: []
+  - target_room: 57
+    entrance: 117
+    teleporter: [58, 0]
+    access: []
+  - target_room: 58
+    entrance: 118
+    teleporter: [59, 0]
+    access: []
+  - target_room: 59
+    entrance: 119
+    teleporter: [60, 0]
+    access: []
+  - target_room: 60
+    entrance: 120
+    teleporter: [61, 0]
+    access: []
+  - target_room: 54
+    access: ["IcePyramid1FStatue"]
+- name: Ice Pyramid 2F South Tiled Room
+  id: 56
+  game_objects:
+  - name: "Ice Pyramid 2F - South Side Glass Door Box"
+    object_id: 0x57
+    type: "Box"
+    access: ["Sword"]
+  - name: "Ice Pyramid 2F - South Side East Box"
+    object_id: 0x5B
+    type: "Box"
+    access: []
+  links:
+  - target_room: 55
+    entrance: 122
+    teleporter: [62, 0]
+    access: []
+  - target_room: 61
+    entrance: 123
+    teleporter: [67, 0]
+    access: []
+- name: Ice Pyramid 2F West Room
+  id: 57
+  game_objects:
+  - name: "Ice Pyramid 2F - Northwest Room Box"
+    object_id: 0x5A
+    type: "Box"
+    access: []
+  links:
+  - target_room: 55
+    entrance: 124
+    teleporter: [63, 0]
+    access: []
+- name: Ice Pyramid 2F Center Room
+  id: 58
+  game_objects:
+  - name: "Ice Pyramid 2F - Center Room Box"
+    object_id: 0x56
+    type: "Box"
+    access: []
+  links:
+  - target_room: 55
+    entrance: 125
+    teleporter: [64, 0]
+    access: []
+- name: Ice Pyramid 2F Small North Room
+  id: 59
+  game_objects:
+  - name: "Ice Pyramid 2F - North Room Glass Door Box"
+    object_id: 0x58
+    type: "Box"
+    access: ["Sword"]
+  links:
+  - target_room: 55
+    entrance: 126
+    teleporter: [65, 0]
+    access: []
+- name: Ice Pyramid 2F North Corridor
+  id: 60
+  game_objects:
+  - name: "Ice Pyramid 2F - North Corridor Glass Door Box"
+    object_id: 0x59
+    type: "Box"
+    access: ["Sword"]
+  links:
+  - target_room: 55
+    entrance: 127
+    teleporter: [66, 0]
+    access: []
+  - target_room: 62
+    entrance: 128
+    teleporter: [68, 0]
+    access: []
+- name: Ice Pyramid 3F Two Boxes Room
+  id: 61
+  game_objects:
+  - name: "Ice Pyramid 3F - Staircase Dead End Left Box"
+    object_id: 0x5E
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 3F - Staircase Dead End Right Box"
+    object_id: 0x5F
+    type: "Box"
+    access: []
+  links:
+  - target_room: 56
+    entrance: 129
+    teleporter: [69, 0]
+    access: []
+- name: Ice Pyramid 3F Main Loop
+  id: 62
+  game_objects:
+  - name: "Ice Pyramid 3F - Inner Room North Box"
+    object_id: 0x5C
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 3F - Inner Room South Box"
+    object_id: 0x5D
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 3F - East Alcove Box"
+    object_id: 0x60
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 3F - Leapfrog Box"
+    object_id: 0x61
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 3F Statue"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["IcePyramid3FStatue"]
+    access: ["Sword"]
+  links:
+  - target_room: 60
+    entrance: 130
+    teleporter: [70, 0]
+    access: []
+  - target_room: 63
+    access: ["IcePyramid3FStatue"]
+- name: Ice Pyramid 3F Blocked Room
+  id: 63
+  game_objects: []
+  links:
+  - target_room: 64
+    entrance: 131
+    teleporter: [71, 0]
+    access: []
+  - target_room: 62
+    access: ["IcePyramid3FStatue"]
+- name: Ice Pyramid 4F Main Loop
+  id: 64
+  game_objects: []
+  links:
+  - target_room: 66
+    entrance: 133
+    teleporter: [73, 0]
+    access: []
+  - target_room: 63
+    entrance: 132
+    teleporter: [72, 0]
+    access: []
+  - target_room: 65
+    access: ["IcePyramid4FStatue"]
+- name: Ice Pyramid 4F Treasure Room
+  id: 65
+  game_objects:
+  - name: "Ice Pyramid 4F - Chest"
+    object_id: 0x0C
+    type: "Chest"
+    access: []
+  - name: "Ice Pyramid 4F - Northwest Box"
+    object_id: 0x62
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 4F - West Left Box"
+    object_id: 0x63
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 4F - West Right Box"
+    object_id: 0x64
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 4F - South Left Box"
+    object_id: 0x65
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 4F - South Right Box"
+    object_id: 0x66
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 4F - East Left Box"
+    object_id: 0x67
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 4F - East Right Box"
+    object_id: 0x68
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 4F Statue"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["IcePyramid4FStatue"]
+    access: ["Sword"]
+  links:
+  - target_room: 64
+    access: ["IcePyramid4FStatue"]
+- name: Ice Pyramid 5F Leap of Faith Room
+  id: 66
+  game_objects:
+  - name: "Ice Pyramid 5F - Glass Door Left Box"
+    object_id: 0x69
+    type: "Box"
+    access: ["IcePyramid5FStatue"]
+  - name: "Ice Pyramid 5F - West Ledge Box"
+    object_id: 0x6A
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 5F - South Shelf Box"
+    object_id: 0x6B
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 5F - South Leapfrog Box"
+    object_id: 0x6C
+    type: "Box"
+    access: []
+  - name: "Ice Pyramid 5F - Glass Door Right Box"
+    object_id: 0x6D
+    type: "Box"
+    access: ["IcePyramid5FStatue"]
+  - name: "Ice Pyramid 5F - North Box"
+    object_id: 0x6E
+    type: "Box"
+    access: []
+  links:
+  - target_room: 64
+    entrance: 134
+    teleporter: [74, 0]
+    access: []
+  - target_room: 65
+    access: []
+  - target_room: 53
+    access: ["Bomb", "Claw", "Sword"]
+- name: Ice Pyramid 5F Stairs to Ice Golem
+  id: 67
+  game_objects:
+  - name: "Ice Pyramid 5F Statue"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["IcePyramid5FStatue"]
+    access: ["Sword"]
+  links:
+  - target_room: 69
+    entrance: 137
+    teleporter: [76, 0]
+    access: []
+  - target_room: 65
+    access: []
+  - target_room: 70
+    entrance: 136
+    teleporter: [75, 0]
+    access: []
+- name: Ice Pyramid Climbing Wall Room Lower Space
+  id: 68
+  game_objects: []
+  links:
+  - target_room: 53
+    entrance: 139
+    teleporter: [78, 0]
+    access: []
+  - target_room: 69
+    access: ["Claw"]
+- name: Ice Pyramid Climbing Wall Room Upper Space
+  id: 69
+  game_objects: []
+  links:
+  - target_room: 67
+    entrance: 140
+    teleporter: [79, 0]
+    access: []
+  - target_room: 68
+    access: ["Claw"]
+- name: Ice Pyramid Ice Golem Room
+  id: 70
+  game_objects:
+  - name: "Ice Pyramid 6F - Ice Golem Chest"
+    object_id: 0x0E
+    type: "Chest"
+    access: ["IceGolem"]
+  - name: "Ice Golem"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["IceGolem"]
+    access: []
+  links:
+  - target_room: 67
+    entrance: 141
+    teleporter: [80, 0]
+    access: []
+  - target_room: 66
+    access: []
+- name: Spencer Waterfall
+  id: 71
+  game_objects: []
+  links:
+  - target_room: 72
+    entrance: 143
+    teleporter: [81, 0]
+    access: []
+  - target_room: 40
+    entrance: 145
+    teleporter: [82, 0]
+    access: []
+  - target_room: 40
+    entrance: 148
+    teleporter: [83, 0]
+    access: []
+- name: Spencer Cave Normal Main
+  id: 72
+  game_objects:
+  - name: "Spencer's Cave - Box"
+    object_id: 0x6F
+    type: "Box"
+    access: ["Claw"]
+  - name: "Spencer's Cave - Spencer"
+    object_id: 8
+    type: "NPC"
+    access: []
+  - name: "Spencer's Cave - Locked Chest"
+    object_id: 13
+    type: "NPC"
+    access: ["VenusKey"]
+  links:
+  - target_room: 71
+    entrance: 150
+    teleporter: [85, 0]
+    access: []
+- name: Spencer Cave Normal South Ledge
+  id: 73
+  game_objects:
+  - name: "Collapse Spencer's Cave"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["ShipLiberated"]
+    access: ["MegaGrenade"]
+  links:
+  - target_room: 227
+    entrance: 151
+    teleporter: [7, 6]
+    access: []
+  - target_room: 203
+    access: ["MegaGrenade"]
+#  - target_room: 72  # access to spencer?
+#    access: ["MegaGrenade"]
+- name: Spencer Cave Caved In Main Loop
+  id: 203
+  game_objects: []
+  links:
+  - target_room: 73
+    access: []
+  - target_room: 207
+    entrance: 156
+    teleporter: [36, 8]
+    access: ["MobiusCrest"]
+  - target_room: 204
+    access: ["Claw"]
+  - target_room: 205
+    access: ["Bomb"]
+- name: Spencer Cave Caved In Waters
+  id: 204
+  game_objects:
+  - name: "Bomb Libra Block"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["SpencerCaveLibraBlockBombed"]
+    access: ["MegaGrenade", "Claw"]
+  links:
+  - target_room: 203
+    access: ["Claw"]
+- name: Spencer Cave Caved In Libra Nook
+  id: 205
+  game_objects: []
+  links:
+  - target_room: 206
+    entrance: 153
+    teleporter: [33, 8]
+    access: ["LibraCrest"]
+- name: Spencer Cave Caved In Libra Corridor
+  id: 206
+  game_objects: []
+  links:
+  - target_room: 205
+    entrance: 154
+    teleporter: [34, 8]
+    access: ["LibraCrest"]
+  - target_room: 207
+    access: ["SpencerCaveLibraBlockBombed"]
+- name: Spencer Cave Caved In Mobius Chest
+  id: 207
+  game_objects:
+  - name: "Spencer's Cave - Mobius Chest"
+    object_id: 0x0F
+    type: "Chest"
+    access: []
+  links:
+  - target_room: 203
+    entrance: 155
+    teleporter: [35, 8]
+    access: ["MobiusCrest"]
+  - target_room: 206
+    access: ["Bomb"]
+- name: Wintry Temple Outer Room
+  id: 74
+  game_objects: []
+  links:
+  - target_room: 223
+    entrance: 157
+    teleporter: [15, 6]
+    access: []
+- name: Wintry Temple Inner Room
+  id: 75
+  game_objects:
+  - name: "Wintry Temple - West Box"
+    object_id: 0x70
+    type: "Box"
+    access: []
+  - name: "Wintry Temple - North Box"
+    object_id: 0x71
+    type: "Box"
+    access: []
+  links:
+  - target_room: 92
+    entrance: 158
+    teleporter: [62, 8]
+    access: ["GeminiCrest"]
+- name: Fireburg Upper Plaza
+  id: 76
+  game_objects: []
+  links:
+  - target_room: 224
+    entrance: 159
+    teleporter: [9, 6]
+    access: []
+  - target_room: 80
+    entrance: 163
+    teleporter: [91, 0]
+    access: []
+  - target_room: 77
+    entrance: 164
+    teleporter: [98, 8] # original value [16, 2]
+    access: []
+  - target_room: 82
+    entrance: 165
+    teleporter: [96, 8] # original value [17, 2]
+    access: []
+  - target_room: 208
+    access: ["Claw"]
+- name: Fireburg Lower Plaza
+  id: 208
+  game_objects:
+  - name: "Fireburg - Hidden Tunnel Box"
+    object_id: 0x74
+    type: "Box"
+    access: []
+  links:
+  - target_room: 76
+    access: ["Claw"]
+  - target_room: 78
+    entrance: 166
+    teleporter: [11, 8]
+    access: ["MultiKey"]
+- name: Reuben's House
+  id: 77
+  game_objects:
+  - name: "Fireburg - Reuben's House Arion"
+    object_id: 14
+    type: "NPC"
+    access: ["ReubenDadSaved"]
+  - name: "Reuben Companion"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Reuben1"]
+    access: []
+  - name: "Fireburg - Reuben's House Box"
+    object_id: 0x75
+    type: "Box"
+    access: []
+  links:
+  - target_room: 76
+    entrance: 167
+    teleporter: [98, 3]
+    access: []
+- name: GrenadeMan's House
+  id: 78
+  game_objects:
+  - name: "Fireburg - Locked House Man"
+    object_id: 12
+    type: "NPC"
+    access: []
+  links:
+  - target_room: 208
+    entrance: 168
+    teleporter: [9, 8]
+    access: ["MultiKey"]
+  - target_room: 79
+    entrance: 169
+    teleporter: [93, 0]
+    access: []
+- name: GrenadeMan's Mobius Room
+  id: 79
+  game_objects: []
+  links:
+  - target_room: 78
+    entrance: 170
+    teleporter: [94, 0]
+    access: []
+  - target_room: 161
+    entrance: 171
+    teleporter: [54, 8]
+    access: ["MobiusCrest"]
+- name: Fireburg Vendor House
+  id: 80
+  game_objects:
+  - name: "Fireburg - Vendor"
+    object_id: 11
+    type: "NPC"
+    access: []
+  links:
+  - target_room: 76
+    entrance: 172
+    teleporter: [95, 0]
+    access: []
+  - target_room: 81
+    entrance: 173
+    teleporter: [96, 0]
+    access: []
+- name: Fireburg Gemini Room
+  id: 81
+  game_objects: []
+  links:
+  - target_room: 80
+    entrance: 174
+    teleporter: [97, 0]
+    access: []
+  - target_room: 43
+    entrance: 175
+    teleporter: [45, 8]
+    access: ["GeminiCrest"]
+- name: Fireburg Hotel Lobby
+  id: 82
+  game_objects:
+  - name: "Fireburg - Tristam"
+    object_id: 10
+    type: "NPC"
+    access: ["Tristam", "TristamBoneItemGiven"]
+  links:
+  - target_room: 76
+    entrance: 177
+    teleporter: [99, 3]
+    access: []
+  - target_room: 83
+    entrance: 176
+    teleporter: [213, 0]
+    access: []
+- name: Fireburg Hotel Beds
+  id: 83
+  game_objects: []
+  links:
+  - target_room: 82
+    entrance: 178
+    teleporter: [214, 0]
+    access: []
+- name: Mine Exterior North West Platforms
+  id: 84
+  game_objects: []
+  links:
+  - target_room: 224
+    entrance: 179
+    teleporter: [98, 0]
+    access: []
+  - target_room: 88
+    entrance: 181
+    teleporter: [20, 2]
+    access: ["Bomb"]
+  - target_room: 85
+    access: ["Claw"]
+  - target_room: 86
+    access: ["Claw"]
+  - target_room: 87
+    access: ["Claw"]
+- name: Mine Exterior Central Ledge
+  id: 85
+  game_objects: []
+  links:
+  - target_room: 90
+    entrance: 183
+    teleporter: [22, 2]
+    access: ["Bomb"]
+  - target_room: 84
+    access: ["Claw"]
+- name: Mine Exterior North Ledge
+  id: 86
+  game_objects: []
+  links:
+  - target_room: 89
+    entrance: 182
+    teleporter: [21, 2]
+    access: ["Bomb"]
+  - target_room: 85
+    access: ["Claw"]
+- name: Mine Exterior South East Platforms
+  id: 87
+  game_objects:
+  - name: "Jinn"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Jinn"]
+    access: []
+  links:
+  - target_room: 91
+    entrance: 180
+    teleporter: [99, 0]
+    access: ["Jinn"]
+  - target_room: 86
+    access: []
+  - target_room: 85
+    access: ["Claw"]
+- name: Mine Parallel Room
+  id: 88
+  game_objects:
+  - name: "Mine - Parallel Room West Box"
+    object_id: 0x77
+    type: "Box"
+    access: ["Claw"]
+  - name: "Mine - Parallel Room East Box"
+    object_id: 0x78
+    type: "Box"
+    access: ["Claw"]
+  links:
+  - target_room: 84
+    entrance: 185
+    teleporter: [100, 3]
+    access: []
+- name: Mine Crescent Room
+  id: 89
+  game_objects:
+  - name: "Mine - Crescent Room Chest"
+    object_id: 0x10
+    type: "Chest"
+    access: []
+  links:
+  - target_room: 86
+    entrance: 186
+    teleporter: [101, 3]
+    access: []
+- name: Mine Climbing Room
+  id: 90
+  game_objects:
+  - name: "Mine - Glitchy Collision Cave Box"
+    object_id: 0x76
+    type: "Box"
+    access: ["Claw"]
+  links:
+  - target_room: 85
+    entrance: 187
+    teleporter: [102, 3]
+    access: []
+- name: Mine Cliff
+  id: 91
+  game_objects:
+  - name: "Mine - Cliff Southwest Box"
+    object_id: 0x79
+    type: "Box"
+    access: []
+  - name: "Mine - Cliff Northwest Box"
+    object_id: 0x7A
+    type: "Box"
+    access: []
+  - name: "Mine - Cliff Northeast Box"
+    object_id: 0x7B
+    type: "Box"
+    access: []
+  - name: "Mine - Cliff Southeast Box"
+    object_id: 0x7C
+    type: "Box"
+    access: []
+  - name: "Mine - Reuben"
+    object_id: 7
+    type: "NPC"
+    access: ["Reuben1"]
+  - name: "Reuben's dad Saved"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["ReubenDadSaved"]
+    access: ["MegaGrenade"]
+  links:
+  - target_room: 87
+    entrance: 188
+    teleporter: [100, 0]
+    access: []
+- name: Sealed Temple
+  id: 92
+  game_objects:
+  - name: "Sealed Temple - West Box"
+    object_id: 0x7D
+    type: "Box"
+    access: []
+  - name: "Sealed Temple - East Box"
+    object_id: 0x7E
+    type: "Box"
+    access: []
+  links:
+  - target_room: 224
+    entrance: 190
+    teleporter: [16, 6]
+    access: []
+  - target_room: 75
+    entrance: 191
+    teleporter: [63, 8]
+    access: ["GeminiCrest"]
+- name: Volcano Base
+  id: 93
+  game_objects:
+  - name: "Volcano - Base Chest"
+    object_id: 0x11
+    type: "Chest"
+    access: []
+  - name: "Volcano - Base West Box"
+    object_id: 0x7F
+    type: "Box"
+    access: []
+  - name: "Volcano - Base East Left Box"
+    object_id: 0x80
+    type: "Box"
+    access: []
+  - name: "Volcano - Base East Right Box"
+    object_id: 0x81
+    type: "Box"
+    access: []
+  links:
+  - target_room: 224
+    entrance: 192
+    teleporter: [103, 0]
+    access: []
+  - target_room: 98
+    entrance: 196
+    teleporter: [31, 8]
+    access: []
+  - target_room: 96
+    entrance: 197
+    teleporter: [30, 8]
+    access: []
+- name: Volcano Top Left
+  id: 94
+  game_objects:
+  - name: "Volcano - Medusa Chest"
+    object_id: 0x12
+    type: "Chest"
+    access: ["Medusa"]
+  - name: "Medusa"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Medusa"]
+    access: []
+  - name: "Volcano - Behind Medusa Box"
+    object_id: 0x82
+    type: "Box"
+    access: []
+  links:
+  - target_room: 209
+    entrance: 199
+    teleporter: [26, 8]
+    access: []
+- name: Volcano Top Right
+  id: 95
+  game_objects:
+  - name: "Volcano - Top of the Volcano Left Box"
+    object_id: 0x83
+    type: "Box"
+    access: []
+  - name: "Volcano - Top of the Volcano Right Box"
+    object_id: 0x84
+    type: "Box"
+    access: []
+  links:
+  - target_room: 99
+    entrance: 200
+    teleporter: [79, 8]
+    access: []
+- name: Volcano Right Path
+  id: 96
+  game_objects:
+  - name: "Volcano - Right Path Box"
+    object_id: 0x87
+    type: "Box"
+    access: []
+  links:
+  - target_room: 93
+    entrance: 201
+    teleporter: [15, 8]
+    access: []
+- name: Volcano Left Path
+  id: 98
+  game_objects:
+  - name: "Volcano - Left Path Box"
+    object_id: 0x86
+    type: "Box"
+    access: []
+  links:
+  - target_room: 93
+    entrance: 204
+    teleporter: [27, 8]
+    access: []
+  - target_room: 99
+    entrance: 202
+    teleporter: [25, 2]
+    access: []
+  - target_room: 209
+    entrance: 203
+    teleporter: [26, 2]
+    access: []
+- name: Volcano Cross Left-Right
+  id: 99
+  game_objects: []
+  links:
+  - target_room: 95
+    entrance: 206
+    teleporter: [29, 8]
+    access: []
+  - target_room: 98
+    entrance: 205
+    teleporter: [103, 3]
+    access: []
+- name: Volcano Cross Right-Left
+  id: 209
+  game_objects:
+  - name: "Volcano - Crossover Section Box"
+    object_id: 0x85
+    type: "Box"
+    access: []
+  links:
+  - target_room: 98
+    entrance: 208
+    teleporter: [104, 3]
+    access: []
+  - target_room: 94
+    entrance: 207
+    teleporter: [28, 8]
+    access: []
+- name: Lava Dome Inner Ring Main Loop
+  id: 100
+  game_objects:
+  - name: "Lava Dome - Exterior Caldera Near Switch Cliff Box"
+    object_id: 0x88
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Exterior South Cliff Box"
+    object_id: 0x89
+    type: "Box"
+    access: []
+  links:
+  - target_room: 224
+    entrance: 209
+    teleporter: [104, 0]
+    access: []
+  - target_room: 113
+    entrance: 211
+    teleporter: [105, 0]
+    access: []
+  - target_room: 114
+    entrance: 212
+    teleporter: [106, 0]
+    access: []
+  - target_room: 116
+    entrance: 213
+    teleporter: [108, 0]
+    access: []
+  - target_room: 118
+    entrance: 214
+    teleporter: [111, 0]
+    access: []
+- name: Lava Dome Inner Ring Center Ledge
+  id: 101
+  game_objects:
+  - name: "Lava Dome - Exterior Center Dropoff Ledge Box"
+    object_id: 0x8A
+    type: "Box"
+    access: []
+  links:
+  - target_room: 115
+    entrance: 215
+    teleporter: [107, 0]
+    access: []
+  - target_room: 100
+    access: ["Claw"]
+- name: Lava Dome Inner Ring Plate Ledge
+  id: 102
+  game_objects:
+  - name: "Lava Dome Plate"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["LavaDomePlate"]
+    access: []
+  links:
+  - target_room: 119
+    entrance: 216
+    teleporter: [109, 0]
+    access: []
+- name: Lava Dome Inner Ring Upper Ledge West
+  id: 103
+  game_objects: []
+  links:
+  - target_room: 111
+    entrance: 219
+    teleporter: [112, 0]
+    access: []
+  - target_room: 108
+    entrance: 220
+    teleporter: [113, 0]
+    access: []
+  - target_room: 104
+    access: ["Claw"]
+  - target_room: 100
+    access: ["Claw"]
+- name: Lava Dome Inner Ring Upper Ledge East
+  id: 104
+  game_objects: []
+  links:
+  - target_room: 110
+    entrance: 218
+    teleporter: [110, 0]
+    access: []
+  - target_room: 103
+    access: ["Claw"]
+- name: Lava Dome Inner Ring Big Door Ledge
+  id: 105
+  game_objects: []
+  links:
+  - target_room: 107
+    entrance: 221
+    teleporter: [114, 0]
+    access: []
+  - target_room: 121
+    entrance: 222
+    teleporter: [29, 2]
+    access: ["LavaDomePlate"]
+- name: Lava Dome Inner Ring Tiny Bottom Ledge
+  id: 106
+  game_objects:
+  - name: "Lava Dome - Exterior Dead End Caldera Box"
+    object_id: 0x8B
+    type: "Box"
+    access: []
+  links:
+  - target_room: 120
+    entrance: 226
+    teleporter: [115, 0]
+    access: []
+- name: Lava Dome Jump Maze II
+  id: 107
+  game_objects:
+  - name: "Lava Dome - Gold Maze Northwest Box"
+    object_id: 0x8C
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Gold Maze Southwest Box"
+    object_id: 0xF6
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Gold Maze Northeast Box"
+    object_id: 0xF7
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Gold Maze North Box"
+    object_id: 0xF8
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Gold Maze Center Box"
+    object_id: 0xF9
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Gold Maze Southeast Box"
+    object_id: 0xFA
+    type: "Box"
+    access: []
+  links:
+  - target_room: 105
+    entrance: 227
+    teleporter: [116, 0]
+    access: []
+  - target_room: 108
+    entrance: 228
+    teleporter: [119, 0]
+    access: []
+  - target_room: 120
+    entrance: 229
+    teleporter: [120, 0]
+    access: []
+- name: Lava Dome Up-Down Corridor
+  id: 108
+  game_objects: []
+  links:
+  - target_room: 107
+    entrance: 231
+    teleporter: [118, 0]
+    access: []
+  - target_room: 103
+    entrance: 230
+    teleporter: [117, 0]
+    access: []
+- name: Lava Dome Jump Maze I
+  id: 109
+  game_objects:
+  - name: "Lava Dome - Bare Maze Leapfrog Alcove North Box"
+    object_id: 0x8D
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Bare Maze Leapfrog Alcove South Box"
+    object_id: 0x8E
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Bare Maze Center Box"
+    object_id: 0x8F
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Bare Maze Southwest Box"
+    object_id: 0x90
+    type: "Box"
+    access: []
+  links:
+  - target_room: 118
+    entrance: 232
+    teleporter: [121, 0]
+    access: []
+  - target_room: 111
+    entrance: 233
+    teleporter: [122, 0]
+    access: []
+- name: Lava Dome Pointless Room
+  id: 110
+  game_objects: []
+  links:
+  - target_room: 104
+    entrance: 234
+    teleporter: [123, 0]
+    access: []
+- name: Lava Dome Lower Moon Helm Room
+  id: 111
+  game_objects:
+  - name: "Lava Dome - U-Bend Room North Box"
+    object_id: 0x92
+    type: "Box"
+    access: []
+  - name: "Lava Dome - U-Bend Room South Box"
+    object_id: 0x93
+    type: "Box"
+    access: []
+  links:
+  - target_room: 103
+    entrance: 235
+    teleporter: [124, 0]
+    access: []
+  - target_room: 109
+    entrance: 236
+    teleporter: [125, 0]
+    access: []
+- name: Lava Dome Moon Helm Room
+  id: 112
+  game_objects:
+  - name: "Lava Dome - Beyond River Room Chest"
+    object_id: 0x13
+    type: "Chest"
+    access: []
+  - name: "Lava Dome - Beyond River Room Box"
+    object_id: 0x91
+    type: "Box"
+    access: []
+  links:
+  - target_room: 117
+    entrance: 237
+    teleporter: [126, 0]
+    access: []
+- name: Lava Dome Three Jumps Room
+  id: 113
+  game_objects:
+  - name: "Lava Dome - Three Jumps Room Box"
+    object_id: 0x96
+    type: "Box"
+    access: []
+  links:
+  - target_room: 100
+    entrance: 238
+    teleporter: [127, 0]
+    access: []
+- name: Lava Dome Life Chest Room Lower Ledge
+  id: 114
+  game_objects:
+  - name: "Lava Dome - Gold Bar Room Boulder Chest"
+    object_id: 0x1C
+    type: "Chest"
+    access: ["MegaGrenade"]
+  links:
+  - target_room: 100
+    entrance: 239
+    teleporter: [128, 0]
+    access: []
+  - target_room: 115
+    access: ["Claw"]
+- name: Lava Dome Life Chest Room Upper Ledge
+  id: 115
+  game_objects:
+  - name: "Lava Dome - Gold Bar Room Leapfrog Alcove Box West"
+    object_id: 0x94
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Gold Bar Room Leapfrog Alcove Box East"
+    object_id: 0x95
+    type: "Box"
+    access: []
+  links:
+  - target_room: 101
+    entrance: 240
+    teleporter: [129, 0]
+    access: []
+  - target_room: 114
+    access: ["Claw"]
+- name: Lava Dome Big Jump Room Main Area
+  id: 116
+  game_objects:
+  - name: "Lava Dome - Lava River Room North Box"
+    object_id: 0x98
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Lava River Room East Box"
+    object_id: 0x99
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Lava River Room South Box"
+    object_id: 0x9A
+    type: "Box"
+    access: []
+  links:
+  - target_room: 100
+    entrance: 241
+    teleporter: [133, 0]
+    access: []
+  - target_room: 119
+    entrance: 243
+    teleporter: [132, 0]
+    access: []
+  - target_room: 117
+    access: ["MegaGrenade"]
+- name: Lava Dome Big Jump Room MegaGrenade Area
+  id: 117
+  game_objects: []
+  links:
+  - target_room: 112
+    entrance: 242
+    teleporter: [131, 0]
+    access: []
+  - target_room: 116
+    access: ["Bomb"]
+- name: Lava Dome Split Corridor
+  id: 118
+  game_objects:
+  - name: "Lava Dome - Split Corridor Box"
+    object_id: 0x97
+    type: "Box"
+    access: []
+  links:
+  - target_room: 109
+    entrance: 244
+    teleporter: [130, 0]
+    access: []
+  - target_room: 100
+    entrance: 245
+    teleporter: [134, 0]
+    access: []
+- name: Lava Dome Plate Corridor
+  id: 119
+  game_objects: []
+  links:
+  - target_room: 102
+    entrance: 246
+    teleporter: [135, 0]
+    access: []
+  - target_room: 116
+    entrance: 247
+    teleporter: [137, 0]
+    access: []
+- name: Lava Dome Four Boxes Stairs
+  id: 120
+  game_objects:
+  - name: "Lava Dome - Caldera Stairway West Left Box"
+    object_id: 0x9B
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Caldera Stairway West Right Box"
+    object_id: 0x9C
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Caldera Stairway East Left Box"
+    object_id: 0x9D
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Caldera Stairway East Right Box"
+    object_id: 0x9E
+    type: "Box"
+    access: []
+  links:
+  - target_room: 107
+    entrance: 248
+    teleporter: [136, 0]
+    access: []
+  - target_room: 106
+    entrance: 249
+    teleporter: [16, 0]
+    access: []
+- name: Lava Dome Hydra Room
+  id: 121
+  game_objects:
+  - name: "Lava Dome - Dualhead Hydra Chest"
+    object_id: 0x14
+    type: "Chest"
+    access: ["DualheadHydra"]
+  - name: "Dualhead Hydra"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["DualheadHydra"]
+    access: []
+  - name: "Lava Dome - Hydra Room Northwest Box"
+    object_id: 0x9F
+    type: "Box"
+    access: []
+  - name: "Lava Dome - Hydra Room Southweast Box"
+    object_id: 0xA0
+    type: "Box"
+    access: []
+  links:
+  - target_room: 105
+    entrance: 250
+    teleporter: [105, 3]
+    access: []
+  - target_room: 122
+    entrance: 251
+    teleporter: [138, 0]
+    access: ["DualheadHydra"]
+- name: Lava Dome Escape Corridor
+  id: 122
+  game_objects: []
+  links:
+  - target_room: 121
+    entrance: 253
+    teleporter: [139, 0]
+    access: []
+- name: Rope Bridge
+  id: 123
+  game_objects:
+  - name: "Rope Bridge - West Box"
+    object_id: 0xA3
+    type: "Box"
+    access: []
+  - name: "Rope Bridge - East Box"
+    object_id: 0xA4
+    type: "Box"
+    access: []
+  links:
+  - target_room: 226
+    entrance: 255
+    teleporter: [140, 0]
+    access: []
+- name: Alive Forest
+  id: 124
+  game_objects:
+  - name: "Alive Forest - Tree Stump Chest"
+    object_id: 0x15
+    type: "Chest"
+    access: ["Axe"]
+  - name: "Alive Forest - Near Entrance Box"
+    object_id: 0xA5
+    type: "Box"
+    access: ["Axe"]
+  - name: "Alive Forest - After Bridge Box"
+    object_id: 0xA6
+    type: "Box"
+    access: ["Axe"]
+  - name: "Alive Forest - Gemini Stump Box"
+    object_id: 0xA7
+    type: "Box"
+    access: ["Axe"]
+  links:
+  - target_room: 226
+    entrance: 272
+    teleporter: [142, 0]
+    access: ["Axe"]
+  - target_room: 21
+    entrance: 275
+    teleporter: [64, 8]
+    access: ["LibraCrest", "Axe"]
+  - target_room: 22
+    entrance: 276
+    teleporter: [65, 8]
+    access: ["GeminiCrest", "Axe"]
+  - target_room: 23
+    entrance: 277
+    teleporter: [66, 8]
+    access: ["MobiusCrest", "Axe"]
+  - target_room: 125
+    entrance: 274
+    teleporter: [143, 0]
+    access: ["Axe"]
+- name: Giant Tree 1F Main Area
+  id: 125
+  game_objects:
+  - name: "Giant Tree 1F - Northwest Box"
+    object_id: 0xA8
+    type: "Box"
+    access: []
+  - name: "Giant Tree 1F - Southwest Box"
+    object_id: 0xA9
+    type: "Box"
+    access: []
+  - name: "Giant Tree 1F - Center Box"
+    object_id: 0xAA
+    type: "Box"
+    access: []
+  - name: "Giant Tree 1F - East Box"
+    object_id: 0xAB
+    type: "Box"
+    access: []
+  links:
+  - target_room: 124
+    entrance: 278
+    teleporter: [56, 1] # [49, 8] script restored if no map shuffling
+    access: []
+  - target_room: 202
+    access: ["DragonClaw"]
+- name: Giant Tree 1F North Island
+  id: 202
+  game_objects: []
+  links:
+  - target_room: 127
+    entrance: 280
+    teleporter: [144, 0]
+    access: []
+  - target_room: 125
+    access: ["DragonClaw"]
+- name: Giant Tree 1F Central Island
+  id: 126
+  game_objects: []
+  links:
+  - target_room: 202
+    access: ["DragonClaw"]
+- name: Giant Tree 2F Main Lobby
+  id: 127
+  game_objects:
+  - name: "Giant Tree 2F - North Box"
+    object_id: 0xAC
+    type: "Box"
+    access: []
+  links:
+  - target_room: 126
+    access: ["DragonClaw"]
+  - target_room: 125
+    entrance: 281
+    teleporter: [145, 0]
+    access: []
+  - target_room: 133
+    entrance: 283
+    teleporter: [149, 0]
+    access: []
+  - target_room: 129
+    access: ["DragonClaw"]
+- name: Giant Tree 2F West Ledge
+  id: 128
+  game_objects:
+  - name: "Giant Tree 2F - Dropdown Ledge Box"
+    object_id: 0xAE
+    type: "Box"
+    access: []
+  links:
+  - target_room: 140
+    entrance: 284
+    teleporter: [147, 0]
+    access: ["Sword"]
+  - target_room: 130
+    access: ["DragonClaw"]
+- name: Giant Tree 2F Lower Area
+  id: 129
+  game_objects:
+  - name: "Giant Tree 2F - South Box"
+    object_id: 0xAD
+    type: "Box"
+    access: []
+  links:
+  - target_room: 130
+    access: ["Claw"]
+  - target_room: 131
+    access: ["Claw"]
+- name: Giant Tree 2F Central Island
+  id: 130
+  game_objects: []
+  links:
+  - target_room: 129
+    access: ["Claw"]
+  - target_room: 135
+    entrance: 282
+    teleporter: [146, 0]
+    access: ["Sword"]
+- name: Giant Tree 2F East Ledge
+  id: 131
+  game_objects: []
+  links:
+  - target_room: 129
+    access: ["Claw"]
+  - target_room: 130
+    access: ["DragonClaw"]
+- name: Giant Tree 2F Meteor Chest Room
+  id: 132
+  game_objects:
+  - name: "Giant Tree 2F - Gidrah Chest"
+    object_id: 0x16
+    type: "Chest"
+    access: []
+  links:
+  - target_room: 133
+    entrance: 285
+    teleporter: [148, 0]
+    access: []
+- name: Giant Tree 2F Mushroom Room
+  id: 133
+  game_objects:
+  - name: "Giant Tree 2F - Mushroom Tunnel West Box"
+    object_id: 0xAF
+    type: "Box"
+    access: ["Axe"]
+  - name: "Giant Tree 2F - Mushroom Tunnel East Box"
+    object_id: 0xB0
+    type: "Box"
+    access: ["Axe"]
+  links:
+  - target_room: 127
+    entrance: 286
+    teleporter: [150, 0]
+    access: ["Axe"]
+  - target_room: 132
+    entrance: 287
+    teleporter: [151, 0]
+    access: ["Axe", "Gidrah"]
+- name: Giant Tree 3F Central Island
+  id: 135
+  game_objects:
+  - name: "Giant Tree 3F - Central Island Box"
+    object_id: 0xB3
+    type: "Box"
+    access: []
+  links:
+  - target_room: 130
+    entrance: 288
+    teleporter: [152, 0]
+    access: []
+  - target_room: 136
+    access: ["Claw"]
+  - target_room: 137
+    access: ["DragonClaw"]
+- name: Giant Tree 3F Central Area
+  id: 136
+  game_objects:
+  - name: "Giant Tree 3F - Center North Box"
+    object_id: 0xB1
+    type: "Box"
+    access: []
+  - name: "Giant Tree 3F - Center West Box"
+    object_id: 0xB2
+    type: "Box"
+    access: []
+  links:
+  - target_room: 135
+    access: ["Claw"]
+  - target_room: 127
+    access: []
+  - target_room: 131
+    access: []
+- name: Giant Tree 3F Lower Ledge
+  id: 137
+  game_objects: []
+  links:
+  - target_room: 135
+    access: ["DragonClaw"]
+  - target_room: 142
+    entrance: 289
+    teleporter: [153, 0]
+    access: ["Sword"]
+- name: Giant Tree 3F West Area
+  id: 138
+  game_objects:
+  - name: "Giant Tree 3F - West Side Box"
+    object_id: 0xB4
+    type: "Box"
+    access: []
+  links:
+  - target_room: 128
+    access: []
+  - target_room: 210
+    entrance: 290
+    teleporter: [154, 0]
+    access: []
+- name: Giant Tree 3F Middle Up Island
+  id: 139
+  game_objects: []
+  links:
+  - target_room: 136
+    access: ["Claw"]
+- name: Giant Tree 3F West Platform
+  id: 140
+  game_objects: []
+  links:
+  - target_room: 139
+    access: ["Claw"]
+  - target_room: 141
+    access: ["Claw"]
+  - target_room: 128
+    entrance: 291
+    teleporter: [155, 0]
+    access: []
+- name: Giant Tree 3F North Ledge
+  id: 141
+  game_objects: []
+  links:
+  - target_room: 143
+    entrance: 292
+    teleporter: [156, 0]
+    access: ["Sword"]
+  - target_room: 139
+    access: ["Claw"]
+  - target_room: 136
+    access: ["Claw"]
+- name: Giant Tree Worm Room Upper Ledge
+  id: 142
+  game_objects:
+  - name: "Giant Tree 3F - Worm Room North Box"
+    object_id: 0xB5
+    type: "Box"
+    access: ["Axe"]
+  - name: "Giant Tree 3F - Worm Room South Box"
+    object_id: 0xB6
+    type: "Box"
+    access: ["Axe"]
+  links:
+  - target_room: 137
+    entrance: 293
+    teleporter: [157, 0]
+    access: ["Axe"]
+  - target_room: 210
+    access: ["Axe", "Claw"]
+- name: Giant Tree Worm Room Lower Ledge
+  id: 210
+  game_objects: []
+  links:
+  - target_room: 138
+    entrance: 294
+    teleporter: [158, 0]
+    access: []
+- name: Giant Tree 4F Lower Floor
+  id: 143
+  game_objects: []
+  links:
+  - target_room: 141
+    entrance: 295
+    teleporter: [159, 0]
+    access: []
+  - target_room: 148
+    entrance: 296
+    teleporter: [160, 0]
+    access: []
+  - target_room: 148
+    entrance: 297
+    teleporter: [161, 0]
+    access: []
+  - target_room: 147
+    entrance: 298
+    teleporter: [162, 0]
+    access: ["Sword"]
+- name: Giant Tree 4F Middle Floor
+  id: 144
+  game_objects:
+  - name: "Giant Tree 4F - Highest Platform North Box"
+    object_id: 0xB7
+    type: "Box"
+    access: []
+  - name: "Giant Tree 4F - Highest Platform South Box"
+    object_id: 0xB8
+    type: "Box"
+    access: []
+  links:
+  - target_room: 149
+    entrance: 299
+    teleporter: [163, 0]
+    access: []
+  - target_room: 145
+    access: ["Claw"]
+  - target_room: 146
+    access: ["DragonClaw"]
+- name: Giant Tree 4F Upper Floor
+  id: 145
+  game_objects: []
+  links:
+  - target_room: 150
+    entrance: 300
+    teleporter: [164, 0]
+    access: ["Sword"]
+  - target_room: 144
+    access: ["Claw"]
+- name: Giant Tree 4F South Ledge
+  id: 146
+  game_objects:
+  - name: "Giant Tree 4F - Hook Ledge Northeast Box"
+    object_id: 0xB9
+    type: "Box"
+    access: []
+  - name: "Giant Tree 4F - Hook Ledge Southwest Box"
+    object_id: 0xBA
+    type: "Box"
+    access: []
+  links:
+  - target_room: 144
+    access: ["DragonClaw"]
+- name: Giant Tree 4F Slime Room East Area
+  id: 147
+  game_objects:
+  - name: "Giant Tree 4F - East Slime Room Box"
+    object_id: 0xBC
+    type: "Box"
+    access: ["Axe"]
+  links:
+  - target_room: 143
+    entrance: 304
+    teleporter: [168, 0]
+    access: []
+- name: Giant Tree 4F Slime Room West Area
+  id: 148
+  game_objects: []
+  links:
+  - target_room: 143
+    entrance: 303
+    teleporter: [167, 0]
+    access: ["Axe"]
+  - target_room: 143
+    entrance: 302
+    teleporter: [166, 0]
+    access: ["Axe"]
+  - target_room: 149
+    access: ["Axe", "Claw"]
+- name: Giant Tree 4F Slime Room Platform
+  id: 149
+  game_objects:
+  - name: "Giant Tree 4F - West Slime Room Box"
+    object_id: 0xBB
+    type: "Box"
+    access: []
+  links:
+  - target_room: 144
+    entrance: 301
+    teleporter: [165, 0]
+    access: []
+  - target_room: 148
+    access: ["Claw"]
+- name: Giant Tree 5F Lower Area
+  id: 150
+  game_objects:
+  - name: "Giant Tree 5F - Northwest Left Box"
+    object_id: 0xBD
+    type: "Box"
+    access: []
+  - name: "Giant Tree 5F - Northwest Right Box"
+    object_id: 0xBE
+    type: "Box"
+    access: []
+  - name: "Giant Tree 5F - South Left Box"
+    object_id: 0xBF
+    type: "Box"
+    access: []
+  - name: "Giant Tree 5F - South Right Box"
+    object_id: 0xC0
+    type: "Box"
+    access: []
+  links:
+  - target_room: 145
+    entrance: 305
+    teleporter: [169, 0]
+    access: []
+  - target_room: 151
+    access: ["Claw"]
+  - target_room: 143
+    access: []
+- name: Giant Tree 5F Gidrah Platform
+  id: 151
+  game_objects:
+  - name: "Gidrah"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Gidrah"]
+    access: []
+  links:
+  - target_room: 150
+    access: ["Claw"]
+- name: Kaidge Temple Lower Ledge
+  id: 152
+  game_objects: []
+  links:
+  - target_room: 226
+    entrance: 307
+    teleporter: [18, 6]
+    access: []
+  - target_room: 153
+    access: ["Claw"]
+- name: Kaidge Temple Upper Ledge
+  id: 153
+  game_objects:
+  - name: "Kaidge Temple - Box"
+    object_id: 0xC1
+    type: "Box"
+    access: []
+  links:
+  - target_room: 185
+    entrance: 308
+    teleporter: [71, 8]
+    access: ["MobiusCrest"]
+  - target_room: 152
+    access: ["Claw"]
+- name: Windhole Temple
+  id: 154
+  game_objects:
+  - name: "Windhole Temple - Box"
+    object_id: 0xC2
+    type: "Box"
+    access: []
+  links:
+  - target_room: 226
+    entrance: 309
+    teleporter: [173, 0]
+    access: []
+- name: Mount Gale
+  id: 155
+  game_objects:
+  - name: "Mount Gale - Dullahan Chest"
+    object_id: 0x17
+    type: "Chest"
+    access: ["DragonClaw", "Dullahan"]
+  - name: "Dullahan"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Dullahan"]
+    access: ["DragonClaw"]
+  - name: "Mount Gale - East Box"
+    object_id: 0xC3
+    type: "Box"
+    access: ["DragonClaw"]
+  - name: "Mount Gale - West Box"
+    object_id: 0xC4
+    type: "Box"
+    access: []
+  links:
+  - target_room: 226
+    entrance: 310
+    teleporter: [174, 0]
+    access: []
+- name: Windia
+  id: 156
+  game_objects: []
+  links:
+  - target_room: 226
+    entrance: 312
+    teleporter: [10, 6]
+    access: []
+  - target_room: 157
+    entrance: 320
+    teleporter: [30, 5]
+    access: []
+  - target_room: 163
+    entrance: 321
+    teleporter: [97, 8]
+    access: []
+  - target_room: 165
+    entrance: 322
+    teleporter: [32, 5]
+    access: []
+  - target_room: 159
+    entrance: 323
+    teleporter: [176, 4]
+    access: []
+  - target_room: 160
+    entrance: 324
+    teleporter: [177, 4]
+    access: []
+- name: Otto's House
+  id: 157
+  game_objects:
+  - name: "Otto"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["RainbowBridge"]
+    access: ["ThunderRock"]
+  links:
+  - target_room: 156
+    entrance: 327
+    teleporter: [106, 3]
+    access: []
+  - target_room: 158
+    entrance: 326
+    teleporter: [33, 2]
+    access: []
+- name: Otto's Attic
+  id: 158
+  game_objects:
+  - name: "Windia - Otto's Attic Box"
+    object_id: 0xC5
+    type: "Box"
+    access: []
+  links:
+  - target_room: 157
+    entrance: 328
+    teleporter: [107, 3]
+    access: []
+- name: Windia Kid House
+  id: 159
+  game_objects: []
+  links:
+  - target_room: 156
+    entrance: 329
+    teleporter: [178, 0]
+    access: []
+  - target_room: 161
+    entrance: 330
+    teleporter: [180, 0]
+    access: []
+- name: Windia Old People House
+  id: 160
+  game_objects: []
+  links:
+  - target_room: 156
+    entrance: 331
+    teleporter: [179, 0]
+    access: []
+  - target_room: 162
+    entrance: 332
+    teleporter: [181, 0]
+    access: []
+- name: Windia Kid House Basement
+  id: 161
+  game_objects: []
+  links:
+  - target_room: 159
+    entrance: 333
+    teleporter: [182, 0]
+    access: []
+  - target_room: 79
+    entrance: 334
+    teleporter: [44, 8]
+    access: ["MobiusCrest"]
+- name: Windia Old People House Basement
+  id: 162
+  game_objects:
+  - name: "Windia - Mobius Basement West Box"
+    object_id: 0xC8
+    type: "Box"
+    access: []
+  - name: "Windia - Mobius Basement East Box"
+    object_id: 0xC9
+    type: "Box"
+    access: []
+  links:
+  - target_room: 160
+    entrance: 335
+    teleporter: [183, 0]
+    access: []
+  - target_room: 186
+    entrance: 336
+    teleporter: [43, 8]
+    access: ["MobiusCrest"]
+- name: Windia Inn Lobby
+  id: 163
+  game_objects: []
+  links:
+  - target_room: 156
+    entrance: 338
+    teleporter: [135, 3]
+    access: []
+  - target_room: 164
+    entrance: 337
+    teleporter: [102, 8]
+    access: []
+- name: Windia Inn Beds
+  id: 164
+  game_objects:
+  - name: "Windia - Inn Bedroom North Box"
+    object_id: 0xC6
+    type: "Box"
+    access: []
+  - name: "Windia - Inn Bedroom South Box"
+    object_id: 0xC7
+    type: "Box"
+    access: []
+  - name: "Windia - Kaeli"
+    object_id: 15
+    type: "NPC"
+    access: ["Kaeli2"]
+  links:
+  - target_room: 163
+    entrance: 339
+    teleporter: [216, 0]
+    access: []
+- name: Windia Vendor House
+  id: 165
+  game_objects:
+  - name: "Windia - Vendor"
+    object_id: 16
+    type: "NPC"
+    access: []
+  links:
+  - target_room: 156
+    entrance: 340
+    teleporter: [108, 3]
+    access: []
+- name: Pazuzu Tower 1F Main Lobby
+  id: 166
+  game_objects:
+  - name: "Pazuzu 1F"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu1F"]
+    access: []
+  links:
+  - target_room: 226
+    entrance: 341
+    teleporter: [184, 0]
+    access: []
+  - target_room: 180
+    entrance: 345
+    teleporter: [185, 0]
+    access: []
+- name: Pazuzu Tower 1F Boxes Room
+  id: 167
+  game_objects:
+  - name: "Pazuzu's Tower 1F - Descent Bomb Wall West Box"
+    object_id: 0xCA
+    type: "Box"
+    access: ["Bomb"]
+  - name: "Pazuzu's Tower 1F - Descent Bomb Wall Center Box"
+    object_id: 0xCB
+    type: "Box"
+    access: ["Bomb"]
+  - name: "Pazuzu's Tower 1F - Descent Bomb Wall East Box"
+    object_id: 0xCC
+    type: "Box"
+    access: ["Bomb"]
+  - name: "Pazuzu's Tower 1F - Descent Box"
+    object_id: 0xCD
+    type: "Box"
+    access: []
+  links:
+  - target_room: 169
+    entrance: 349
+    teleporter: [187, 0]
+    access: []
+- name: Pazuzu Tower 1F Southern Platform
+  id: 168
+  game_objects: []
+  links:
+  - target_room: 169
+    entrance: 346
+    teleporter: [186, 0]
+    access: []
+  - target_room: 166
+    access: ["DragonClaw"]
+- name: Pazuzu 2F
+  id: 169
+  game_objects:
+  - name: "Pazuzu's Tower 2F - East Room West Box"
+    object_id: 0xCE
+    type: "Box"
+    access: []
+  - name: "Pazuzu's Tower 2F - East Room East Box"
+    object_id: 0xCF
+    type: "Box"
+    access: []
+  - name: "Pazuzu 2F Lock"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu2FLock"]
+    access: ["Axe"]
+  - name: "Pazuzu 2F"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu2F"]
+    access: ["Bomb"]
+  links:
+  - target_room: 183
+    entrance: 350
+    teleporter: [188, 0]
+    access: []
+  - target_room: 168
+    entrance: 351
+    teleporter: [189, 0]
+    access: []
+  - target_room: 167
+    entrance: 352
+    teleporter: [190, 0]
+    access: []
+  - target_room: 171
+    entrance: 353
+    teleporter: [191, 0]
+    access: []
+- name: Pazuzu 3F Main Room
+  id: 170
+  game_objects:
+  - name: "Pazuzu's Tower 3F - Guest Room West Box"
+    object_id: 0xD0
+    type: "Box"
+    access: []
+  - name: "Pazuzu's Tower 3F - Guest Room East Box"
+    object_id: 0xD1
+    type: "Box"
+    access: []
+  - name: "Pazuzu 3F"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu3F"]
+    access: []
+  links:
+  - target_room: 180
+    entrance: 356
+    teleporter: [192, 0]
+    access: []
+  - target_room: 181
+    entrance: 357
+    teleporter: [193, 0]
+    access: []
+- name: Pazuzu 3F Central Island
+  id: 171
+  game_objects: []
+  links:
+  - target_room: 169
+    entrance: 360
+    teleporter: [194, 0]
+    access: []
+  - target_room: 170
+    access: ["DragonClaw"]
+  - target_room: 172
+    access: ["DragonClaw"]
+- name: Pazuzu 3F Southern Island
+  id: 172
+  game_objects:
+  - name: "Pazuzu's Tower 3F - South Ledge Box"
+    object_id: 0xD2
+    type: "Box"
+    access: []
+  links:
+  - target_room: 173
+    entrance: 361
+    teleporter: [195, 0]
+    access: []
+  - target_room: 171
+    access: ["DragonClaw"]
+- name: Pazuzu 4F
+  id: 173
+  game_objects:
+  - name: "Pazuzu's Tower 4F - Elevator West Box"
+    object_id: 0xD3
+    type: "Box"
+    access: ["Bomb"]
+  - name: "Pazuzu's Tower 4F - Elevator East Box"
+    object_id: 0xD4
+    type: "Box"
+    access: ["Bomb"]
+  - name: "Pazuzu's Tower 4F - East Storage Room Chest"
+    object_id: 0x18
+    type: "Chest"
+    access: []
+  - name: "Pazuzu 4F Lock"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu4FLock"]
+    access: ["Axe"]
+  - name: "Pazuzu 4F"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu4F"]
+    access: ["Bomb"]
+  links:
+  - target_room: 183
+    entrance: 362
+    teleporter: [196, 0]
+    access: []
+  - target_room: 184
+    entrance: 363
+    teleporter: [197, 0]
+    access: []
+  - target_room: 172
+    entrance: 364
+    teleporter: [198, 0]
+    access: []
+  - target_room: 175
+    entrance: 365
+    teleporter: [199, 0]
+    access: []
+- name: Pazuzu 5F Pazuzu Loop
+  id: 174
+  game_objects:
+  - name: "Pazuzu 5F"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu5F"]
+    access: []
+  links:
+  - target_room: 181
+    entrance: 368
+    teleporter: [200, 0]
+    access: []
+  - target_room: 182
+    entrance: 369
+    teleporter: [201, 0]
+    access: []
+- name: Pazuzu 5F Upper Loop
+  id: 175
+  game_objects:
+  - name: "Pazuzu's Tower 5F - North Box"
+    object_id: 0xD5
+    type: "Box"
+    access: []
+  - name: "Pazuzu's Tower 5F - South Box"
+    object_id: 0xD6
+    type: "Box"
+    access: []
+  links:
+  - target_room: 173
+    entrance: 370
+    teleporter: [202, 0]
+    access: []
+  - target_room: 176
+    entrance: 371
+    teleporter: [203, 0]
+    access: []
+- name: Pazuzu 6F
+  id: 176
+  game_objects:
+  - name: "Pazuzu's Tower 6F - Box"
+    object_id: 0xD7
+    type: "Box"
+    access: []
+  - name: "Pazuzu's Tower 6F - Chest"
+    object_id: 0x19
+    type: "Chest"
+    access: []
+  - name: "Pazuzu 6F Lock"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu6FLock"]
+    access: ["Bomb", "Axe"]
+  - name: "Pazuzu 6F"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu6F"]
+    access: ["Bomb"]
+  links:
+  - target_room: 184
+    entrance: 374
+    teleporter: [204, 0]
+    access: []
+  - target_room: 175
+    entrance: 375
+    teleporter: [205, 0]
+    access: []
+  - target_room: 178
+    entrance: 376
+    teleporter: [206, 0]
+    access: []
+  - target_room: 178
+    entrance: 377
+    teleporter: [207, 0]
+    access: []
+- name: Pazuzu 7F Southwest Area
+  id: 177
+  game_objects: []
+  links:
+  - target_room: 182
+    entrance: 380
+    teleporter: [26, 0]
+    access: []
+  - target_room: 178
+    access: ["DragonClaw"]
+- name: Pazuzu 7F Rest of the Area
+  id: 178
+  game_objects: []
+  links:
+  - target_room: 177
+    access: ["DragonClaw"]
+  - target_room: 176
+    entrance: 381
+    teleporter: [27, 0]
+    access: []
+  - target_room: 176
+    entrance: 382
+    teleporter: [28, 0]
+    access: []
+  - target_room: 179
+    access: ["DragonClaw", "Pazuzu2FLock", "Pazuzu4FLock", "Pazuzu6FLock", "Pazuzu1F", "Pazuzu2F", "Pazuzu3F", "Pazuzu4F", "Pazuzu5F", "Pazuzu6F"]
+- name: Pazuzu 7F Sky Room
+  id: 179
+  game_objects:
+  - name: "Pazuzu's Tower 7F - Pazuzu Chest"
+    object_id: 0x1A
+    type: "Chest"
+    access: []
+  - name: "Pazuzu"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Pazuzu"]
+    access: ["Pazuzu2FLock", "Pazuzu4FLock", "Pazuzu6FLock", "Pazuzu1F", "Pazuzu2F", "Pazuzu3F", "Pazuzu4F", "Pazuzu5F", "Pazuzu6F"]
+  links:
+  - target_room: 178
+    access: ["DragonClaw"]
+- name: Pazuzu 1F to 3F
+  id: 180
+  game_objects: []
+  links:
+  - target_room: 166
+    entrance: 385
+    teleporter: [29, 0]
+    access: []
+  - target_room: 170
+    entrance: 386
+    teleporter: [30, 0]
+    access: []
+- name: Pazuzu 3F to 5F
+  id: 181
+  game_objects: []
+  links:
+  - target_room: 170
+    entrance: 387
+    teleporter: [40, 0]
+    access: []
+  - target_room: 174
+    entrance: 388
+    teleporter: [41, 0]
+    access: []
+- name: Pazuzu 5F to 7F
+  id: 182
+  game_objects: []
+  links:
+  - target_room: 174
+    entrance: 389
+    teleporter: [38, 0]
+    access: []
+  - target_room: 177
+    entrance: 390
+    teleporter: [39, 0]
+    access: []
+- name: Pazuzu 2F to 4F
+  id: 183
+  game_objects: []
+  links:
+  - target_room: 169
+    entrance: 391
+    teleporter: [21, 0]
+    access: []
+  - target_room: 173
+    entrance: 392
+    teleporter: [22, 0]
+    access: []
+- name: Pazuzu 4F to 6F
+  id: 184
+  game_objects: []
+  links:
+  - target_room: 173
+    entrance: 393
+    teleporter: [2, 0]
+    access: []
+  - target_room: 176
+    entrance: 394
+    teleporter: [3, 0]
+    access: []
+- name: Light Temple
+  id: 185
+  game_objects:
+  - name: "Light Temple - Box"
+    object_id: 0xD8
+    type: "Box"
+    access: []
+  links:
+  - target_room: 230
+    entrance: 395
+    teleporter: [19, 6]
+    access: []
+  - target_room: 153
+    entrance: 396
+    teleporter: [70, 8]
+    access: ["MobiusCrest"]
+- name: Ship Dock
+  id: 186
+  game_objects:
+  - name: "Ship Dock Access"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["ShipDockAccess"]
+    access: []
+  links:
+  - target_room: 228
+    entrance: 399
+    teleporter: [17, 6]
+    access: []
+  - target_room: 162
+    entrance: 397
+    teleporter: [61, 8]
+    access: ["MobiusCrest"]
+- name: Mac Ship Deck
+  id: 187
+  game_objects:
+  - name: "Mac Ship Steering Wheel"
+    object_id: 00
+    type: "Trigger"
+    on_trigger: ["ShipSteeringWheel"]
+    access: []
+  - name: "Mac's Ship Deck - North Box"
+    object_id: 0xD9
+    type: "Box"
+    access: []
+  - name: "Mac's Ship Deck - Center Box"
+    object_id: 0xDA
+    type: "Box"
+    access: []
+  - name: "Mac's Ship Deck - South Box"
+    object_id: 0xDB
+    type: "Box"
+    access: []
+  links:
+  - target_room: 229
+    entrance: 400
+    teleporter: [37, 8]
+    access: []
+  - target_room: 188
+    entrance: 401
+    teleporter: [50, 8]
+    access: []
+  - target_room: 188
+    entrance: 402
+    teleporter: [51, 8]
+    access: []
+  - target_room: 188
+    entrance: 403
+    teleporter: [52, 8]
+    access: []
+  - target_room: 189
+    entrance: 404
+    teleporter: [53, 8]
+    access: []
+- name: Mac Ship B1 Outer Ring
+  id: 188
+  game_objects:
+  - name: "Mac's Ship B1 - Northwest Hook Platform Box"
+    object_id: 0xE4
+    type: "Box"
+    access: ["DragonClaw"]
+  - name: "Mac's Ship B1 - Center Hook Platform Box"
+    object_id: 0xE5
+    type: "Box"
+    access: ["DragonClaw"]
+  links:
+  - target_room: 187
+    entrance: 405
+    teleporter: [208, 0]
+    access: []
+  - target_room: 187
+    entrance: 406
+    teleporter: [175, 0]
+    access: []
+  - target_room: 187
+    entrance: 407
+    teleporter: [172, 0]
+    access: []
+  - target_room: 193
+    entrance: 408
+    teleporter: [88, 0]
+    access: []
+  - target_room: 193
+    access: []
+- name: Mac Ship B1 Square Room
+  id: 189
+  game_objects: []
+  links:
+  - target_room: 187
+    entrance: 409
+    teleporter: [141, 0]
+    access: []
+  - target_room: 192
+    entrance: 410
+    teleporter: [87, 0]
+    access: []
+- name: Mac Ship B1 Central Corridor
+  id: 190
+  game_objects:
+  - name: "Mac's Ship B1 - Central Corridor Box"
+    object_id: 0xE6
+    type: "Box"
+    access: []
+  links:
+  - target_room: 192
+    entrance: 413
+    teleporter: [86, 0]
+    access: []
+  - target_room: 191
+    entrance: 412
+    teleporter: [102, 0]
+    access: []
+  - target_room: 193
+    access: []
+- name: Mac Ship B2 South Corridor
+  id: 191
+  game_objects: []
+  links:
+  - target_room: 190
+    entrance: 415
+    teleporter: [55, 8]
+    access: []
+  - target_room: 194
+    entrance: 414
+    teleporter: [57, 1]
+    access: []
+- name: Mac Ship B2 North Corridor
+  id: 192
+  game_objects: []
+  links:
+  - target_room: 190
+    entrance: 416
+    teleporter: [56, 8]
+    access: []
+  - target_room: 189
+    entrance: 417
+    teleporter: [57, 8]
+    access: []
+- name: Mac Ship B2 Outer Ring
+  id: 193
+  game_objects:
+  - name: "Mac's Ship B2 - Barrel Room South Box"
+    object_id: 0xDF
+    type: "Box"
+    access: []
+  - name: "Mac's Ship B2 - Barrel Room North Box"
+    object_id: 0xE0
+    type: "Box"
+    access: []
+  - name: "Mac's Ship B2 - Southwest Room Box"
+    object_id: 0xE1
+    type: "Box"
+    access: []
+  - name: "Mac's Ship B2 - Southeast Room Box"
+    object_id: 0xE2
+    type: "Box"
+    access: []
+  links:
+  - target_room: 188
+    entrance: 418
+    teleporter: [58, 8]
+    access: []
+- name: Mac Ship B1 Mac Room
+  id: 194
+  game_objects:
+  - name: "Mac's Ship B1 - Mac Room Chest"
+    object_id: 0x1B
+    type: "Chest"
+    access: []
+  - name: "Captain Mac"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["ShipLoaned"]
+    access: ["CaptainCap"]
+  links:
+  - target_room: 191
+    entrance: 424
+    teleporter: [101, 0]
+    access: []
+- name: Doom Castle Corridor of Destiny
+  id: 195
+  game_objects: []
+  links:
+  - target_room: 201
+    entrance: 428
+    teleporter: [84, 0]
+    access: []
+  - target_room: 196
+    entrance: 429
+    teleporter: [35, 2]
+    access: []
+  - target_room: 197
+    entrance: 430
+    teleporter: [209, 0]
+    access: ["StoneGolem"]
+  - target_room: 198
+    entrance: 431
+    teleporter: [211, 0]
+    access: ["StoneGolem", "TwinheadWyvern"]
+  - target_room: 199
+    entrance: 432
+    teleporter: [13, 2]
+    access: ["StoneGolem", "TwinheadWyvern", "Zuh"]
+- name: Doom Castle Ice Floor
+  id: 196
+  game_objects:
+  - name: "Doom Castle 4F - Northwest Room Box"
+    object_id: 0xE7
+    type: "Box"
+    access: ["Sword", "DragonClaw"]
+  - name: "Doom Castle 4F - Southwest Room Box"
+    object_id: 0xE8
+    type: "Box"
+    access: ["Sword", "DragonClaw"]
+  - name: "Doom Castle 4F - Northeast Room Box"
+    object_id: 0xE9
+    type: "Box"
+    access: ["Sword"]
+  - name: "Doom Castle 4F - Southeast Room Box"
+    object_id: 0xEA
+    type: "Box"
+    access: ["Sword", "DragonClaw"]
+  - name: "Stone Golem"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["StoneGolem"]
+    access: ["Sword", "DragonClaw"]
+  links:
+  - target_room: 195
+    entrance: 433
+    teleporter: [109, 3]
+    access: []
+- name: Doom Castle Lava Floor
+  id: 197
+  game_objects:
+  - name: "Doom Castle 5F - North Left Box"
+    object_id: 0xEB
+    type: "Box"
+    access: ["DragonClaw"]
+  - name: "Doom Castle 5F - North Right Box"
+    object_id: 0xEC
+    type: "Box"
+    access: ["DragonClaw"]
+  - name: "Doom Castle 5F - South Left Box"
+    object_id: 0xED
+    type: "Box"
+    access: ["DragonClaw"]
+  - name: "Doom Castle 5F - South Right Box"
+    object_id: 0xEE
+    type: "Box"
+    access: ["DragonClaw"]
+  - name: "Twinhead Wyvern"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["TwinheadWyvern"]
+    access: ["DragonClaw"]
+  links:
+  - target_room: 195
+    entrance: 434
+    teleporter: [210, 0]
+    access: []
+- name: Doom Castle Sky Floor
+  id: 198
+  game_objects:
+  - name: "Doom Castle 6F - West Box"
+    object_id: 0xEF
+    type: "Box"
+    access: []
+  - name: "Doom Castle 6F - East Box"
+    object_id: 0xF0
+    type: "Box"
+    access: []
+  - name: "Zuh"
+    object_id: 0
+    type: "Trigger"
+    on_trigger: ["Zuh"]
+    access: ["DragonClaw"]
+  links:
+  - target_room: 195
+    entrance: 435
+    teleporter: [212, 0]
+    access: []
+  - target_room: 197
+    access: []
+- name: Doom Castle Hero Room
+  id: 199
+  game_objects:
+  - name: "Doom Castle Hero Chest 01"
+    object_id: 0xF2
+    type: "Chest"
+    access: []
+  - name: "Doom Castle Hero Chest 02"
+    object_id: 0xF3
+    type: "Chest"
+    access: []
+  - name: "Doom Castle Hero Chest 03"
+    object_id: 0xF4
+    type: "Chest"
+    access: []
+  - name: "Doom Castle Hero Chest 04"
+    object_id: 0xF5
+    type: "Chest"
+    access: []
+  links:
+  - target_room: 200
+    entrance: 436
+    teleporter: [54, 0]
+    access: []
+  - target_room: 195
+    entrance: 441
+    teleporter: [110, 3]
+    access: []
+- name: Doom Castle Dark King Room
+  id: 200
+  game_objects: []
+  links:
+  - target_room: 199
+    entrance: 442
+    teleporter: [52, 0]
+    access: []
diff --git a/worlds/ffmq/data/settings.yaml b/worlds/ffmq/data/settings.yaml
new file mode 100644
index 0000000000..826a8c744d
--- /dev/null
+++ b/worlds/ffmq/data/settings.yaml
@@ -0,0 +1,183 @@
+# YAML Preset file for FFMQR
+Final Fantasy Mystic Quest:
+  enemies_density:
+    All: 0
+    ThreeQuarter: 0
+    Half: 0
+    Quarter: 0
+    None: 0
+  chests_shuffle:
+    Prioritize: 0
+    Include: 0
+  shuffle_boxes_content:
+    true: 0
+    false: 0
+  npcs_shuffle:
+    Prioritize: 0
+    Include: 0
+    Exclude: 0
+  battlefields_shuffle:
+    Prioritize: 0
+    Include: 0
+    Exclude: 0
+  logic_options:
+    Friendly: 0
+    Standard: 0
+    Expert: 0
+  shuffle_enemies_position:
+    true: 0
+    false: 0
+  enemies_scaling_lower:
+    Quarter: 0
+    Half: 0
+    ThreeQuarter: 0
+    Normal: 0
+    OneAndQuarter: 0
+    OneAndHalf: 0
+    Double: 0
+    DoubleAndHalf: 0
+    Triple: 0
+  enemies_scaling_upper:
+    Quarter: 0
+    Half: 0
+    ThreeQuarter: 0
+    Normal: 0
+    OneAndQuarter: 0
+    OneAndHalf: 0
+    Double: 0
+    DoubleAndHalf: 0
+    Triple: 0
+  bosses_scaling_lower:
+    Quarter: 0
+    Half: 0
+    ThreeQuarter: 0
+    Normal: 0
+    OneAndQuarter: 0
+    OneAndHalf: 0
+    Double: 0
+    DoubleAndHalf: 0
+    Triple: 0
+  bosses_scaling_upper:
+    Quarter: 0
+    Half: 0
+    ThreeQuarter: 0
+    Normal: 0
+    OneAndQuarter: 0
+    OneAndHalf: 0
+    Double: 0
+    DoubleAndHalf: 0
+    Triple: 0
+  enemizer_attacks:
+    Normal: 0
+    Safe: 0
+    Chaos: 0
+    SelfDestruct: 0
+    SimpleShuffle: 0
+  enemizer_groups:
+    MobsOnly: 0
+    MobsBosses: 0
+    MobsBossesDK: 0
+  shuffle_res_weak_type:
+    true: 0
+    false: 0
+  leveling_curve:
+    Half: 0
+    Normal: 0
+    OneAndHalf: 0
+    Double: 0
+    DoubleAndHalf: 0
+    Triple: 0
+    Quadruple: 0
+  companion_leveling_type:
+    Quests: 0
+    QuestsExtended: 0
+    SaveCrystalsIndividual: 0
+    SaveCrystalsAll: 0
+    BenPlus0: 0
+    BenPlus5: 0
+    BenPlus10: 0
+  companion_spellbook_type:
+    Standard: 0
+    Extended: 0
+    RandomBalanced: 0
+    RandomChaos: 0
+  starting_companion:
+    None: 0
+    Kaeli: 0
+    Tristam: 0
+    Phoebe: 0
+    Reuben: 0
+    Random: 0
+    RandomPlusNone: 0
+  available_companions:
+    Zero: 0
+    One: 0
+    Two: 0
+    Three: 0
+    Four: 0
+    Random14: 0
+    Random04: 0
+  companions_locations:
+    Standard: 0
+    Shuffled: 0
+    ShuffledExtended: 0
+  kaelis_mom_fight_minotaur:
+    true: 0
+    false: 0
+  battles_quantity:
+    Ten: 0
+    Seven: 0
+    Five: 0
+    Three: 0
+    One: 0
+    RandomHigh: 0
+    RandomLow: 0
+  shuffle_battlefield_rewards:
+    true: 0
+    false: 0
+  random_starting_weapon:
+    true: 0
+    false: 0
+  progressive_gear:
+    true: 0
+    false: 0
+  tweaked_dungeons:
+    true: 0
+    false: 0
+  doom_castle_mode:
+    Standard: 0
+    BossRush: 0
+    DarkKingOnly: 0
+  doom_castle_shortcut:
+    true: 0
+    false: 0
+  sky_coin_mode:
+    Standard: 0
+    StartWith: 0
+    SaveTheCrystals: 0
+    ShatteredSkyCoin: 0
+  sky_coin_fragments_qty:
+    Low16: 0
+    Mid24: 0
+    High32: 0
+    RandomNarrow: 0
+    RandomWide: 0
+  enable_spoilers:
+    true: 0
+    false: 0
+  progressive_formations:
+    Disabled: 0
+    RegionsStrict: 0
+    RegionsKeepType: 0
+  map_shuffling:
+    None: 0
+    Overworld: 0
+    Dungeons: 0
+    OverworldDungeons: 0
+    Everything: 0
+  crest_shuffle:
+    true: 0
+    false: 0
+description: Generated by Archipelago
+game: Final Fantasy Mystic Quest
+name: Player
diff --git a/worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md b/worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md
new file mode 100644
index 0000000000..dd4ea354fa
--- /dev/null
+++ b/worlds/ffmq/docs/en_Final Fantasy Mystic Quest.md	
@@ -0,0 +1,33 @@
+# Final Fantasy Mystic Quest
+
+## Where is the settings page?
+
+The [player settings page for this game](../player-settings) contains all the options you need to configure and export a
+config file.
+
+## What does randomization do to this game?
+
+Besides items being shuffled, you have multiple options for shuffling maps, crest warps, and battlefield locations.
+There are a number of other options for tweaking the difficulty of the game.
+
+## What items and locations get shuffled?
+
+Items received normally through chests, from NPCs, or battlefields are shuffled. Optionally, you may also include
+the items from brown boxes.
+
+## Which items can be in another player's world?
+
+Any of the items which can be shuffled may also be placed into another player's world.
+
+## What does another world's item look like in Final Fantasy Mystic Quest?
+
+For locations that are originally boxes or chests, they will appear as a box if the item in it is categorized as a
+filler item, and a chest if it contains a useful or advancement item. Trap items may randomly appear as a box or chest.
+When opening a chest with an item for another player, you will see the Archipelago icon and it will tell you you've
+found an "Archipelago Item"
+
+## When the player receives an item, what happens?
+
+A dialogue box will open to show you the item you've received. You will not receive items while you are in battle,
+menus, or the overworld (except sometimes when closing the menu).
+
diff --git a/worlds/ffmq/docs/setup_en.md b/worlds/ffmq/docs/setup_en.md
new file mode 100644
index 0000000000..9d9088dbc2
--- /dev/null
+++ b/worlds/ffmq/docs/setup_en.md
@@ -0,0 +1,162 @@
+# Final Fantasy Mystic Quest Setup Guide
+
+## Required Software
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases). Make sure to check the box for `SNI Client`
+
+- 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: [BizHawk Website](http://tasvideos.org/BizHawk.html)
+        - RetroArch 1.10.1 or newer from: [RetroArch Website](https://retroarch.com?page=platforms). Or,
+    - An SD2SNES, FXPak Pro ([FXPak Pro Store Page](https://krikzz.com/store/home/54-fxpak-pro.html)), or other
+      compatible hardware
+
+- Your legally obtained Final Fantasy Mystic Quest 1.1 ROM file, probably named `Final Fantasy - Mystic Quest (U) (V1.1).sfc`
+The Archipelago community cannot supply you with this.
+
+## Installation Procedures
+
+### Windows Setup
+
+1. During the installation of Archipelago, you will have been asked to install the SNI Client. If you did not do this,
+   or you are on an older version, you may run the installer again to install the SNI Client.
+2. 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 Settings page on the website allows you to configure your personal settings and export a config file from
+them. Player settings page: [Final Fantasy Mystic Quest Player Settings Page](/games/Final%20Fantasy%20Mystic%20Quest/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)
+
+## Generating a Single-Player Game
+
+1. Navigate to the Player Settings page, configure your options, and click the "Generate Game" button.
+    - Player Settings page: [Final Fantasy Mystic Quest Player Settings Page](/games/Final%20Fantasy%20Mystic%20Quest/player-settings)
+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 1.1 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.
+
+## 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 whoever 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 `.apmq` extension.
+
+Go to the [FFMQR website](https://ffmqrando.net/Archipelago) and select your Final Fantasy Mystic Quest 1.1 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.
+
+### 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/x64` or `/SNI/lua/x86` depending on if the
+      emulator is 64-bit or 32-bit.
+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. You may do this by clicking on the Tools menu in BizHawk and following these
+   menu options:  
+   `Config --> Cores --> SNES --> BSNES`  
+   Once you have changed the loaded core, you must restart BizHawk.
+2. Load your ROM file if it hasn't already been loaded.
+3. Click on the Tools menu and click on **Lua Console**
+4. Click the Open Folder icon that says `Open Script` via the tooltip on mouse hover, or click the Script Menu then `Open Script...`, or press `Ctrl-O`.
+5. Select the `Connector.lua` file included with your client
+    - 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.
+
+##### RetroArch 1.10.1 or newer
+
+You only have to do these steps once. Note, RetroArch 1.9.x will not work as it is older than 1.10.1.
+
+1. Enter the RetroArch main menu screen.
+2. Go to Settings --> User Interface. Set "Show Advanced Settings" to ON.
+3. Go to Settings --> Network. Set "Network Commands" to ON. (It is found below Request Device 16.) Leave the default
+   Network Command Port at 55355.
+
+![Screenshot of Network Commands setting](/static/generated/docs/A%20Link%20to%20the%20Past/retroarch-network-commands-en.png)
+4. Go to Main Menu --> Online Updater --> Core Downloader. Scroll down and select "Nintendo - SNES / SFC (bsnes-mercury
+   Performance)".
+
+When loading a ROM, be sure to select a **bsnes-mercury** core. These are the only cores that allow external tools to
+read ROM data.
+
+#### With hardware
+
+This guide assumes you have downloaded the correct firmware for your device. If you have not done so already, please do
+this now. SD2SNES and FXPak Pro users may download the appropriate firmware on the SD2SNES releases page. SD2SNES
+releases page: [SD2SNES Releases Page](https://github.com/RedGuyyyy/sd2snes/releases)
+
+Other hardware may find helpful information on the usb2snes platforms
+page: [usb2snes Supported Platforms Page](http://usb2snes.com/#supported-platforms)
+
+1. Close your emulator, which may have auto-launched.
+2. Power on your device and load the ROM.
+
+### 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/generic/Rules.py b/worlds/generic/Rules.py
index 520ad22525..ac5e1aa507 100644
--- a/worlds/generic/Rules.py
+++ b/worlds/generic/Rules.py
@@ -1,4 +1,5 @@
 import collections
+import logging
 import typing
 
 from BaseClasses import LocationProgressType, MultiWorld, Location, Region, Entrance
@@ -81,15 +82,18 @@ def locality_rules(world: MultiWorld):
                     i.name not in sending_blockers[i.player] and old_rule(i)
 
 
-def exclusion_rules(world: MultiWorld, player: int, exclude_locations: typing.Set[str]) -> None:
+def exclusion_rules(multiworld: MultiWorld, player: int, exclude_locations: typing.Set[str]) -> None:
     for loc_name in exclude_locations:
         try:
-            location = world.get_location(loc_name, player)
+            location = multiworld.get_location(loc_name, player)
         except KeyError as e:  # failed to find the given location. Check if it's a legitimate location
-            if loc_name not in world.worlds[player].location_name_to_id:
+            if loc_name not in multiworld.worlds[player].location_name_to_id:
                 raise Exception(f"Unable to exclude location {loc_name} in player {player}'s world.") from e
         else:
-            location.progress_type = LocationProgressType.EXCLUDED
+            if not location.event:
+                location.progress_type = LocationProgressType.EXCLUDED
+            else:
+                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):
diff --git a/worlds/generic/docs/advanced_settings_en.md b/worlds/generic/docs/advanced_settings_en.md
index 456795dac4..6d5e20462f 100644
--- a/worlds/generic/docs/advanced_settings_en.md
+++ b/worlds/generic/docs/advanced_settings_en.md
@@ -108,7 +108,9 @@ guide: [Archipelago Plando Guide](/tutorial/Archipelago/plando/en)
     * `minimal` will only guarantee that the seed is beatable. You will be guaranteed able to finish the seed logically
       but may not be able to access all locations or acquire all items. A good example of this is having a big key in
       the big chest in a dungeon in ALTTP making it impossible to get and finish the dungeon.
-* `progression_balancing` is a system the Archipelago generator uses to try and reduce "BK mode" as much as possible.
+* `progression_balancing` is a system the Archipelago generator uses to try and reduce
+  ["BK mode"](/glossary/en/#burger-king-/-bk-mode)
+  as much as possible.
   This primarily involves moving necessary progression items into earlier logic spheres to make the games more
   accessible so that players almost always have something to do. This can be in a range from 0 to 99, and is 50 by
   default. This number represents a percentage of the furthest progressible player.
@@ -130,7 +132,7 @@ guide: [Archipelago Plando Guide](/tutorial/Archipelago/plando/en)
   there without using any hint points.
 * `exclude_locations` lets you define any locations that you don't want to do and during generation will force a "junk"
   item which isn't necessary for progression to go in these locations.
-* `priority_locations` is the inverse of `exlcude_locations`, forcing a progression item in the defined locations.
+* `priority_locations` is the inverse of `exclude_locations`, forcing a progression item in the defined locations.
 * `item_links` allows players to link their items into a group with the same item link name and game. The items declared
   in `item_pool` get combined and when an item is found for the group, all players in the group receive it. Item links
   can also have local and non local items, forcing the items to either be placed within the worlds of the group or in
diff --git a/worlds/generic/docs/commands_en.md b/worlds/generic/docs/commands_en.md
index e52ea20fd2..3e7c0bd4bd 100644
--- a/worlds/generic/docs/commands_en.md
+++ b/worlds/generic/docs/commands_en.md
@@ -1,96 +1,108 @@
-### Helpful Commands
+# Helpful Commands
 
 Commands are split into two types: client commands and server commands. Client commands are commands which are executed
 by the client and do not affect the Archipelago remote session. Server commands are commands which are executed by the
 Archipelago server and affect the Archipelago session or otherwise provide feedback from the server.
 
-In clients which have their own commands the commands are typically prepended by a forward slash:`/`. Remote commands
-are always submitted to the server prepended with an exclamation point: `!`.
+In clients which have their own commands the commands are typically prepended by a forward slash: `/`. 
 
-#### Local Commands
+Server commands are always submitted to the server prepended with an exclamation point: `!`. <br/>
 
-The following list is a list of client commands which may be available to you through your Archipelago client. You
+# Server Commands
+
+Server commands may be executed by any client which allows for sending text chat to the Archipelago server. If your
+client does not allow for sending chat then you may connect to your game slot with the TextClient which comes with the
+Archipelago installation. In order to execute the command you need to merely send a text message with the command,
+including the exclamation point.
+
+### General
+- `!help` Returns a listing of available commands.
+- `!license` Returns the software licensing information.
+- `!options` Returns the current server options, including password in plaintext.
+- `!players` Returns info about the currently connected and non-connected players.
+- `!status` Returns information about the connection status and check completion numbers for all players in the current room. <br /> (Optionally mention a Tag name and get information on who has that Tag. For example: !status DeathLink)
+
+
+### Utilities
+- `!countdown <number of seconds>` Starts a countdown using the given seconds value. Useful for synchronizing starts.
+  Defaults to 10 seconds if no argument is provided.
+- `!alias <alias>` Sets your alias, which allows you to use commands with the alias rather than your provided name.
+- `!admin <command>` Executes a command as if you typed it into the server console. Remote administration must be
+  enabled.
+
+### Information
+- `!remaining` Lists the items remaining in your game, but not where they are or who they go to.
+- `!missing` Lists the location checks you are missing from the server's perspective.
+- `!checked` Lists all the location checks you've done from the server's perspective.
+
+### Hints
+- `!hint` Lists all hints relevant to your world, the number of points you have for hints, and how much a hint costs.
+- `!hint <item name>` Tells you the game world and location your item is in, uses points earned from completing locations.
+- `!hint_location <location>` Tells you what item is in a specific location, uses points earned from completing locations.
+
+### Collect/Release
+- `!collect` Grants you all the remaining items for your world by collecting them from all games. Typically used after 
+goal completion.
+- `!release` Releases all items contained in your world to other worlds. Typically, done automatically by the sever, but
+can be configured to allow/require manual usage of this command.
+
+### Cheats
+- `!getitem <item>` Cheats an item to the currently connected slot, if it is enabled in the server.
+
+
+## Host only (on Archipelago.gg or in your server console)
+
+### General
+- `/help` Returns a list of commands available in the console.
+- `/license` Returns the software licensing information.
+- `/options` Lists the server's current options, including password in plaintext.
+- `/players` List currently connected players.
+- `/save` Saves the state of the current multiworld. Note that the server auto-saves on a minute basis.
+- `/exit` Shutdown the server
+
+### Utilities
+- `/countdown <number of seconds>` Starts a countdown sent to all players via text chat. Defaults to 10 seconds if no
+  argument is provided.
+- `/option <option name> <option value>` Set a server option. For a list of options, use the `/options` command.
+- `/alias <player name> <alias name>` Assign a player an alias, allowing you to reference the player by the alias in commands.
+
+
+### Collect/Release
+- `/collect <player name>` Send out any items remaining in the multiworld belonging to the given player.
+- `/release <player name>` Sends out all remaining items in this world regardless of settings and game completion status.
+- `/allow_release <player name>` Allows the given player to use the `!release` command.
+- `/forbid_release <player name>` Prevents the given player from using the `!release` command.
+
+### Cheats
+- `/send <player name> <item name>` Grants the given player the specified item.
+- `/send_multiple <amount> <player name> <item name>` Grants the given player the stated amount of the specified item.
+- `/send_location <player name> <location name>` Send out the given location for the specified player as if the player checked it
+- `/hint <player name> <item or location name>` Send out a hint for the given item or location for the specified player.
+
+<br/> <br/>
+
+# Local Commands
+
+This a list of client commands which may be available to you through your Archipelago client. You can
 execute these commands in your client window.
 
-The following commands are available in these clients: SNIClient, FactorioClient, FF1Client.
+The following commands are available in the clients that use the CommonClient, for example: TextClient, SNIClient, etc.
 
-- `/connect <address:port>` Connect to the multiworld server.
+- `/connect <address:port>` Connect to the multiworld server at the given address.
 - `/disconnect` Disconnects you from your current session.
-- `/received` Displays all the items you have found or been sent.
+- `/help` Returns a list of available commands.
+- `/license` Returns the software licensing information.
+- `/received` Displays all the items you have received from all players, including yourself.
 - `/missing` Displays all the locations along with their current status (checked/missing).
 - `/items` Lists all the item names for the current game.
 - `/locations` Lists all the location names for the current game.
 - `/ready` Sends ready status to the server.
-- `/help` Returns a list of available commands.
-- `/license` Returns the software licensing information.
-- Just typing anything will broadcast a message to all players
+- Typing anything that doesn't start with `/` will broadcast a message to all players.
 
-##### FF1Client Only
-
-The following command is only available when using the FF1Client for the Final Fantasy Randomizer.
-
-- `/nes` Shows the current status of the NES connection.
-
-##### SNIClient Only
+## SNIClient Only
 
 The following command is only available when using the SNIClient for SNES based games.
 
 - `/snes` Attempts to connect to your SNES device via SNI.
 - `/snes_close` Closes the current SNES connection.
 - `/slow_mode` Toggles on or off slow mode, which limits the rate in which you receive items.
-
-##### FactorioClient Only
-
-The following command is only available when using the FactorioClient to play Factorio with Archipelago.
-
-- `/factorio <command text>` Sends the command argument to the Factorio server as a command.
-
-#### Remote Commands
-
-Remote commands may be executed by any client which allows for sending text chat to the Archipelago server. If your
-client does not allow for sending chat then you may connect to your game slot with the TextClient which comes with the
-Archipelago installation. In order to execute the command you need to merely send a text message with the command,
-including the exclamation point.
-
-- `!help` Returns a listing of available remote commands.
-- `!license` Returns the software licensing information.
-- `!countdown <countdown in seconds>` Starts a countdown using the given seconds value. Useful for synchronizing starts.
-  Defaults to 10 seconds if no argument is provided.
-- `!options` Returns the current server options, including password in plaintext.
-- `!admin <command>` Executes a command as if you typed it into the server console. Remote administration must be
-  enabled.
-- `!players` Returns info about the currently connected and non-connected players.
-- `!status` Returns information about your team. (Currently all players as teams are unimplemented.)
-- `!remaining` Lists the items remaining in your game, but not where they are or who they go to.
-- `!missing` Lists the location checks you are missing from the server's perspective.
-- `!checked` Lists all the location checks you've done from the server's perspective.
-- `!alias <alias>` Sets your alias.
-- `!getitem <item>` Cheats an item, if it is enabled in the server.
-- `!hint_location <location>` Hints for a location specifically. Useful in games where item names may match location
-  names such as Factorio.
-- `!hint <item name>` Tells you at which location in whose game your Item is. Note you need to have checked some
-  locations to earn a hint. You can check how many you have by just running `!hint`
-- `!release` If you didn't turn on auto-release or if you allowed releasing prior to goal completion. Remember that "
-  releasing" actually means sending out your remaining items in your world.
-- `!collect` Grants you all the remaining checks in your world. Typically used after goal completion.
-
-#### Host only (on Archipelago.gg or in your server console)
-
-- `/help` Returns a list of commands available in the console.
-- `/license` Returns the software licensing information.
-- `/countdown <seconds>` Starts a countdown which is sent to all players via text chat. Defaults to 10 seconds if no
-  argument is provided.
-- `/options` Lists the server's current options, including password in plaintext.
-- `/save` Saves the state of the current multiworld. Note that the server autosaves on a minute basis.
-- `/players` List currently connected players.
-- `/exit` Shutdown the server
-- `/alias <player name> <alias name>` Assign a player an alias.
-- `/collect <player name>` Send out any items remaining in the multiworld belonging to the given player.
-- `/release <player name>` Releases someone regardless of settings and game completion status
-- `/allow_release <player name>` Allows the given player to use the `!release` command.
-- `/forbid_release <player name>` Bars the given player from using the `!release` command.
-- `/send <player name> <item name>` Grants the given player the specified item.
-- `/send_multiple <amount> <player name> <item name>` Grants the given player the stated amount of the specified item.
-- `/send_location <player name> <location name>` Send out the given location for the specified player as if the player checked it
-- `/hint <player name> <item or location name>` Send out a hint for the given item or location for the specified player.
-- `/option <option name> <option value>` Set a server option. For a list of options, use the `/options` command.
diff --git a/worlds/generic/docs/setup_en.md b/worlds/generic/docs/setup_en.md
index 132b88e285..93ae217e0d 100644
--- a/worlds/generic/docs/setup_en.md
+++ b/worlds/generic/docs/setup_en.md
@@ -40,7 +40,7 @@ game you will be playing as well as the settings you would like for that game.
 
 YAML is a format very similar to JSON however it is made to be more human-readable. If you are ever unsure of the
 validity of your YAML file you may check the file by uploading it to the check page on the Archipelago website:
-[YAML Validation Page](/mysterycheck)
+[YAML Validation Page](/check)
 
 ### Creating a YAML
 
diff --git a/worlds/heretic/Items.py b/worlds/heretic/Items.py
new file mode 100644
index 0000000000..a0907a3a30
--- /dev/null
+++ b/worlds/heretic/Items.py
@@ -0,0 +1,1606 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from BaseClasses import ItemClassification
+from typing import TypedDict, Dict, Set 
+
+
+class ItemDict(TypedDict, total=False): 
+    classification: ItemClassification 
+    count: int 
+    name: str 
+    doom_type: int # Unique numerical id used to spawn the item. -1 is level item, -2 is level complete item. 
+    episode: int # Relevant if that item targets a specific level, like keycard or map reveal pickup. 
+    map: int 
+
+
+item_table: Dict[int, ItemDict] = {
+    370000: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Gauntlets of the Necromancer',
+             'doom_type': 2005,
+             'episode': -1,
+             'map': -1},
+    370001: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ethereal Crossbow',
+             'doom_type': 2001,
+             'episode': -1,
+             'map': -1},
+    370002: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Dragon Claw',
+             'doom_type': 53,
+             'episode': -1,
+             'map': -1},
+    370003: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Phoenix Rod',
+             'doom_type': 2003,
+             'episode': -1,
+             'map': -1},
+    370004: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Firemace',
+             'doom_type': 2002,
+             'episode': -1,
+             'map': -1},
+    370005: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Hellstaff',
+             'doom_type': 2004,
+             'episode': -1,
+             'map': -1},
+    370006: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Bag of Holding',
+             'doom_type': 8,
+             'episode': -1,
+             'map': -1},
+    370007: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Chaos Device',
+             'doom_type': 36,
+             'episode': -1,
+             'map': -1},
+    370008: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Morph Ovum',
+             'doom_type': 30,
+             'episode': -1,
+             'map': -1},
+    370009: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Mystic Urn',
+             'doom_type': 32,
+             'episode': -1,
+             'map': -1},
+    370010: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Quartz Flask',
+             'doom_type': 82,
+             'episode': -1,
+             'map': -1},
+    370011: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Ring of Invincibility',
+             'doom_type': 84,
+             'episode': -1,
+             'map': -1},
+    370012: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Shadowsphere',
+             'doom_type': 75,
+             'episode': -1,
+             'map': -1},
+    370013: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Timebomb of the Ancients',
+             'doom_type': 34,
+             'episode': -1,
+             'map': -1},
+    370014: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Tome of Power',
+             'doom_type': 86,
+             'episode': -1,
+             'map': -1},
+    370015: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Torch',
+             'doom_type': 33,
+             'episode': -1,
+             'map': -1},
+    370016: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Silver Shield',
+             'doom_type': 85,
+             'episode': -1,
+             'map': -1},
+    370017: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Enchanted Shield',
+             'doom_type': 31,
+             'episode': -1,
+             'map': -1},
+    370018: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Crystal Geode',
+             'doom_type': 12,
+             'episode': -1,
+             'map': -1},
+    370019: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Energy Orb',
+             'doom_type': 55,
+             'episode': -1,
+             'map': -1},
+    370020: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Greater Runes',
+             'doom_type': 21,
+             'episode': -1,
+             'map': -1},
+    370021: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Inferno Orb',
+             'doom_type': 23,
+             'episode': -1,
+             'map': -1},
+    370022: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Pile of Mace Spheres',
+             'doom_type': 16,
+             'episode': -1,
+             'map': -1},
+    370023: {'classification': ItemClassification.filler,
+             'count': 0,
+             'name': 'Quiver of Ethereal Arrows',
+             'doom_type': 19,
+             'episode': -1,
+             'map': -1},
+    370200: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Docks (E1M1) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 1},
+    370201: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Dungeons (E1M2) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 2},
+    370202: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Dungeons (E1M2) - Green key',
+             'doom_type': 73,
+             'episode': 1,
+             'map': 2},
+    370203: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Dungeons (E1M2) - Blue key',
+             'doom_type': 79,
+             'episode': 1,
+             'map': 2},
+    370204: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gatehouse (E1M3) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 3},
+    370205: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gatehouse (E1M3) - Green key',
+             'doom_type': 73,
+             'episode': 1,
+             'map': 3},
+    370206: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Guard Tower (E1M4) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 4},
+    370207: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Guard Tower (E1M4) - Green key',
+             'doom_type': 73,
+             'episode': 1,
+             'map': 4},
+    370208: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (E1M5) - Green key',
+             'doom_type': 73,
+             'episode': 1,
+             'map': 5},
+    370209: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (E1M5) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 5},
+    370210: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (E1M5) - Blue key',
+             'doom_type': 79,
+             'episode': 1,
+             'map': 5},
+    370211: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cathedral (E1M6) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 6},
+    370212: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cathedral (E1M6) - Green key',
+             'doom_type': 73,
+             'episode': 1,
+             'map': 6},
+    370213: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crypts (E1M7) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 7},
+    370214: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crypts (E1M7) - Green key',
+             'doom_type': 73,
+             'episode': 1,
+             'map': 7},
+    370215: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crypts (E1M7) - Blue key',
+             'doom_type': 79,
+             'episode': 1,
+             'map': 7},
+    370216: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Graveyard (E1M9) - Yellow key',
+             'doom_type': 80,
+             'episode': 1,
+             'map': 9},
+    370217: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Graveyard (E1M9) - Green key',
+             'doom_type': 73,
+             'episode': 1,
+             'map': 9},
+    370218: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Graveyard (E1M9) - Blue key',
+             'doom_type': 79,
+             'episode': 1,
+             'map': 9},
+    370219: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crater (E2M1) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 1},
+    370220: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crater (E2M1) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 1},
+    370221: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Lava Pits (E2M2) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 2},
+    370222: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Lava Pits (E2M2) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 2},
+    370223: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The River of Fire (E2M3) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 3},
+    370224: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The River of Fire (E2M3) - Blue key',
+             'doom_type': 79,
+             'episode': 2,
+             'map': 3},
+    370225: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The River of Fire (E2M3) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 3},
+    370226: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ice Grotto (E2M4) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 4},
+    370227: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ice Grotto (E2M4) - Blue key',
+             'doom_type': 79,
+             'episode': 2,
+             'map': 4},
+    370228: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ice Grotto (E2M4) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 4},
+    370229: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (E2M5) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 5},
+    370230: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (E2M5) - Blue key',
+             'doom_type': 79,
+             'episode': 2,
+             'map': 5},
+    370231: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (E2M5) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 5},
+    370232: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Labyrinth (E2M6) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 6},
+    370233: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Labyrinth (E2M6) - Blue key',
+             'doom_type': 79,
+             'episode': 2,
+             'map': 6},
+    370234: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Labyrinth (E2M6) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 6},
+    370235: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Great Hall (E2M7) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 7},
+    370236: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Great Hall (E2M7) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 7},
+    370237: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Great Hall (E2M7) - Blue key',
+             'doom_type': 79,
+             'episode': 2,
+             'map': 7},
+    370238: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Glacier (E2M9) - Yellow key',
+             'doom_type': 80,
+             'episode': 2,
+             'map': 9},
+    370239: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Glacier (E2M9) - Blue key',
+             'doom_type': 79,
+             'episode': 2,
+             'map': 9},
+    370240: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Glacier (E2M9) - Green key',
+             'doom_type': 73,
+             'episode': 2,
+             'map': 9},
+    370241: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Storehouse (E3M1) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 1},
+    370242: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Storehouse (E3M1) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 1},
+    370243: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cesspool (E3M2) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 2},
+    370244: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cesspool (E3M2) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 2},
+    370245: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cesspool (E3M2) - Blue key',
+             'doom_type': 79,
+             'episode': 3,
+             'map': 2},
+    370246: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Confluence (E3M3) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 3},
+    370247: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Confluence (E3M3) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 3},
+    370248: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Confluence (E3M3) - Blue key',
+             'doom_type': 79,
+             'episode': 3,
+             'map': 3},
+    370249: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Azure Fortress (E3M4) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 4},
+    370250: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Azure Fortress (E3M4) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 4},
+    370251: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ophidian Lair (E3M5) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 5},
+    370252: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ophidian Lair (E3M5) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 5},
+    370253: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Halls of Fear (E3M6) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 6},
+    370254: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Halls of Fear (E3M6) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 6},
+    370255: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Halls of Fear (E3M6) - Blue key',
+             'doom_type': 79,
+             'episode': 3,
+             'map': 6},
+    370256: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (E3M7) - Blue key',
+             'doom_type': 79,
+             'episode': 3,
+             'map': 7},
+    370257: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (E3M7) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 7},
+    370258: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (E3M7) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 7},
+    370259: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Aquifier (E3M9) - Blue key',
+             'doom_type': 79,
+             'episode': 3,
+             'map': 9},
+    370260: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Aquifier (E3M9) - Green key',
+             'doom_type': 73,
+             'episode': 3,
+             'map': 9},
+    370261: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Aquifier (E3M9) - Yellow key',
+             'doom_type': 80,
+             'episode': 3,
+             'map': 9},
+    370262: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Catafalque (E4M1) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 1},
+    370263: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Catafalque (E4M1) - Green key',
+             'doom_type': 73,
+             'episode': 4,
+             'map': 1},
+    370264: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Blockhouse (E4M2) - Green key',
+             'doom_type': 73,
+             'episode': 4,
+             'map': 2},
+    370265: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Blockhouse (E4M2) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 2},
+    370266: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Blockhouse (E4M2) - Blue key',
+             'doom_type': 79,
+             'episode': 4,
+             'map': 2},
+    370267: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ambulatory (E4M3) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 3},
+    370268: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ambulatory (E4M3) - Green key',
+             'doom_type': 73,
+             'episode': 4,
+             'map': 3},
+    370269: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ambulatory (E4M3) - Blue key',
+             'doom_type': 79,
+             'episode': 4,
+             'map': 3},
+    370270: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Great Stair (E4M5) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 5},
+    370271: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Great Stair (E4M5) - Green key',
+             'doom_type': 73,
+             'episode': 4,
+             'map': 5},
+    370272: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Great Stair (E4M5) - Blue key',
+             'doom_type': 79,
+             'episode': 4,
+             'map': 5},
+    370273: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Halls of the Apostate (E4M6) - Green key',
+             'doom_type': 73,
+             'episode': 4,
+             'map': 6},
+    370274: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Halls of the Apostate (E4M6) - Blue key',
+             'doom_type': 79,
+             'episode': 4,
+             'map': 6},
+    370275: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Halls of the Apostate (E4M6) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 6},
+    370276: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ramparts of Perdition (E4M7) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 7},
+    370277: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ramparts of Perdition (E4M7) - Green key',
+             'doom_type': 73,
+             'episode': 4,
+             'map': 7},
+    370278: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ramparts of Perdition (E4M7) - Blue key',
+             'doom_type': 79,
+             'episode': 4,
+             'map': 7},
+    370279: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Shattered Bridge (E4M8) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 8},
+    370280: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Mausoleum (E4M9) - Yellow key',
+             'doom_type': 80,
+             'episode': 4,
+             'map': 9},
+    370281: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ochre Cliffs (E5M1) - Yellow key',
+             'doom_type': 80,
+             'episode': 5,
+             'map': 1},
+    370282: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ochre Cliffs (E5M1) - Blue key',
+             'doom_type': 79,
+             'episode': 5,
+             'map': 1},
+    370283: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ochre Cliffs (E5M1) - Green key',
+             'doom_type': 73,
+             'episode': 5,
+             'map': 1},
+    370284: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Rapids (E5M2) - Green key',
+             'doom_type': 73,
+             'episode': 5,
+             'map': 2},
+    370285: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Rapids (E5M2) - Yellow key',
+             'doom_type': 80,
+             'episode': 5,
+             'map': 2},
+    370286: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Quay (E5M3) - Green key',
+             'doom_type': 73,
+             'episode': 5,
+             'map': 3},
+    370287: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Quay (E5M3) - Blue key',
+             'doom_type': 79,
+             'episode': 5,
+             'map': 3},
+    370288: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Quay (E5M3) - Yellow key',
+             'doom_type': 80,
+             'episode': 5,
+             'map': 3},
+    370289: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Courtyard (E5M4) - Blue key',
+             'doom_type': 79,
+             'episode': 5,
+             'map': 4},
+    370290: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Courtyard (E5M4) - Yellow key',
+             'doom_type': 80,
+             'episode': 5,
+             'map': 4},
+    370291: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Courtyard (E5M4) - Green key',
+             'doom_type': 73,
+             'episode': 5,
+             'map': 4},
+    370292: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Hydratyr (E5M5) - Yellow key',
+             'doom_type': 80,
+             'episode': 5,
+             'map': 5},
+    370293: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Hydratyr (E5M5) - Green key',
+             'doom_type': 73,
+             'episode': 5,
+             'map': 5},
+    370294: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Hydratyr (E5M5) - Blue key',
+             'doom_type': 79,
+             'episode': 5,
+             'map': 5},
+    370295: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Colonnade (E5M6) - Yellow key',
+             'doom_type': 80,
+             'episode': 5,
+             'map': 6},
+    370296: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Colonnade (E5M6) - Green key',
+             'doom_type': 73,
+             'episode': 5,
+             'map': 6},
+    370297: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Colonnade (E5M6) - Blue key',
+             'doom_type': 79,
+             'episode': 5,
+             'map': 6},
+    370298: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Foetid Manse (E5M7) - Blue key',
+             'doom_type': 79,
+             'episode': 5,
+             'map': 7},
+    370299: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Foetid Manse (E5M7) - Green key',
+             'doom_type': 73,
+             'episode': 5,
+             'map': 7},
+    370300: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Foetid Manse (E5M7) - Yellow key',
+             'doom_type': 80,
+             'episode': 5,
+             'map': 7},
+    370301: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "Skein of D'Sparil (E5M9) - Blue key",
+             'doom_type': 79,
+             'episode': 5,
+             'map': 9},
+    370302: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "Skein of D'Sparil (E5M9) - Green key",
+             'doom_type': 73,
+             'episode': 5,
+             'map': 9},
+    370303: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "Skein of D'Sparil (E5M9) - Yellow key",
+             'doom_type': 80,
+             'episode': 5,
+             'map': 9},
+    370400: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Docks (E1M1)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 1},
+    370401: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Docks (E1M1) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 1},
+    370402: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Docks (E1M1) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 1},
+    370403: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Dungeons (E1M2)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 2},
+    370404: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Dungeons (E1M2) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 2},
+    370405: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Dungeons (E1M2) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 2},
+    370406: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gatehouse (E1M3)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 3},
+    370407: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Gatehouse (E1M3) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 3},
+    370408: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Gatehouse (E1M3) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 3},
+    370409: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Guard Tower (E1M4)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 4},
+    370410: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Guard Tower (E1M4) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 4},
+    370411: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Guard Tower (E1M4) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 4},
+    370412: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (E1M5)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 5},
+    370413: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Citadel (E1M5) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 5},
+    370414: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Citadel (E1M5) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 5},
+    370415: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cathedral (E1M6)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 6},
+    370416: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cathedral (E1M6) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 6},
+    370417: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Cathedral (E1M6) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 6},
+    370418: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crypts (E1M7)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 7},
+    370419: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crypts (E1M7) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 7},
+    370420: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Crypts (E1M7) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 7},
+    370421: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "Hell's Maw (E1M8)",
+             'doom_type': -1,
+             'episode': 1,
+             'map': 8},
+    370422: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "Hell's Maw (E1M8) - Complete",
+             'doom_type': -2,
+             'episode': 1,
+             'map': 8},
+    370423: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': "Hell's Maw (E1M8) - Map Scroll",
+             'doom_type': 35,
+             'episode': 1,
+             'map': 8},
+    370424: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Graveyard (E1M9)',
+             'doom_type': -1,
+             'episode': 1,
+             'map': 9},
+    370425: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Graveyard (E1M9) - Complete',
+             'doom_type': -2,
+             'episode': 1,
+             'map': 9},
+    370426: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Graveyard (E1M9) - Map Scroll',
+             'doom_type': 35,
+             'episode': 1,
+             'map': 9},
+    370427: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crater (E2M1)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 1},
+    370428: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Crater (E2M1) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 1},
+    370429: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Crater (E2M1) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 1},
+    370430: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Lava Pits (E2M2)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 2},
+    370431: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Lava Pits (E2M2) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 2},
+    370432: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Lava Pits (E2M2) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 2},
+    370433: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The River of Fire (E2M3)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 3},
+    370434: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The River of Fire (E2M3) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 3},
+    370435: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The River of Fire (E2M3) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 3},
+    370436: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ice Grotto (E2M4)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 4},
+    370437: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ice Grotto (E2M4) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 4},
+    370438: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Ice Grotto (E2M4) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 4},
+    370439: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (E2M5)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 5},
+    370440: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Catacombs (E2M5) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 5},
+    370441: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Catacombs (E2M5) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 5},
+    370442: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Labyrinth (E2M6)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 6},
+    370443: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Labyrinth (E2M6) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 6},
+    370444: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Labyrinth (E2M6) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 6},
+    370445: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Great Hall (E2M7)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 7},
+    370446: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Great Hall (E2M7) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 7},
+    370447: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Great Hall (E2M7) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 7},
+    370448: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Portals of Chaos (E2M8)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 8},
+    370449: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Portals of Chaos (E2M8) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 8},
+    370450: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Portals of Chaos (E2M8) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 8},
+    370451: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Glacier (E2M9)',
+             'doom_type': -1,
+             'episode': 2,
+             'map': 9},
+    370452: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Glacier (E2M9) - Complete',
+             'doom_type': -2,
+             'episode': 2,
+             'map': 9},
+    370453: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Glacier (E2M9) - Map Scroll',
+             'doom_type': 35,
+             'episode': 2,
+             'map': 9},
+    370454: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Storehouse (E3M1)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 1},
+    370455: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Storehouse (E3M1) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 1},
+    370456: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Storehouse (E3M1) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 1},
+    370457: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cesspool (E3M2)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 2},
+    370458: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Cesspool (E3M2) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 2},
+    370459: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Cesspool (E3M2) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 2},
+    370460: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Confluence (E3M3)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 3},
+    370461: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Confluence (E3M3) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 3},
+    370462: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Confluence (E3M3) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 3},
+    370463: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Azure Fortress (E3M4)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 4},
+    370464: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Azure Fortress (E3M4) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 4},
+    370465: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Azure Fortress (E3M4) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 4},
+    370466: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ophidian Lair (E3M5)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 5},
+    370467: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Ophidian Lair (E3M5) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 5},
+    370468: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Ophidian Lair (E3M5) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 5},
+    370469: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Halls of Fear (E3M6)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 6},
+    370470: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Halls of Fear (E3M6) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 6},
+    370471: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Halls of Fear (E3M6) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 6},
+    370472: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (E3M7)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 7},
+    370473: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Chasm (E3M7) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 7},
+    370474: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Chasm (E3M7) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 7},
+    370475: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "D'Sparil'S Keep (E3M8)",
+             'doom_type': -1,
+             'episode': 3,
+             'map': 8},
+    370476: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "D'Sparil'S Keep (E3M8) - Complete",
+             'doom_type': -2,
+             'episode': 3,
+             'map': 8},
+    370477: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': "D'Sparil'S Keep (E3M8) - Map Scroll",
+             'doom_type': 35,
+             'episode': 3,
+             'map': 8},
+    370478: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Aquifier (E3M9)',
+             'doom_type': -1,
+             'episode': 3,
+             'map': 9},
+    370479: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'The Aquifier (E3M9) - Complete',
+             'doom_type': -2,
+             'episode': 3,
+             'map': 9},
+    370480: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'The Aquifier (E3M9) - Map Scroll',
+             'doom_type': 35,
+             'episode': 3,
+             'map': 9},
+    370481: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Catafalque (E4M1)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 1},
+    370482: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Catafalque (E4M1) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 1},
+    370483: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Catafalque (E4M1) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 1},
+    370484: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Blockhouse (E4M2)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 2},
+    370485: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Blockhouse (E4M2) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 2},
+    370486: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Blockhouse (E4M2) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 2},
+    370487: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ambulatory (E4M3)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 3},
+    370488: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ambulatory (E4M3) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 3},
+    370489: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Ambulatory (E4M3) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 3},
+    370490: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Sepulcher (E4M4)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 4},
+    370491: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Sepulcher (E4M4) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 4},
+    370492: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Sepulcher (E4M4) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 4},
+    370493: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Great Stair (E4M5)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 5},
+    370494: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Great Stair (E4M5) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 5},
+    370495: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Great Stair (E4M5) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 5},
+    370496: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Halls of the Apostate (E4M6)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 6},
+    370497: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Halls of the Apostate (E4M6) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 6},
+    370498: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Halls of the Apostate (E4M6) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 6},
+    370499: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ramparts of Perdition (E4M7)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 7},
+    370500: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ramparts of Perdition (E4M7) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 7},
+    370501: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Ramparts of Perdition (E4M7) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 7},
+    370502: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Shattered Bridge (E4M8)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 8},
+    370503: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Shattered Bridge (E4M8) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 8},
+    370504: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Shattered Bridge (E4M8) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 8},
+    370505: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Mausoleum (E4M9)',
+             'doom_type': -1,
+             'episode': 4,
+             'map': 9},
+    370506: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Mausoleum (E4M9) - Complete',
+             'doom_type': -2,
+             'episode': 4,
+             'map': 9},
+    370507: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Mausoleum (E4M9) - Map Scroll',
+             'doom_type': 35,
+             'episode': 4,
+             'map': 9},
+    370508: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ochre Cliffs (E5M1)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 1},
+    370509: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Ochre Cliffs (E5M1) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 1},
+    370510: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Ochre Cliffs (E5M1) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 1},
+    370511: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Rapids (E5M2)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 2},
+    370512: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Rapids (E5M2) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 2},
+    370513: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Rapids (E5M2) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 2},
+    370514: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Quay (E5M3)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 3},
+    370515: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Quay (E5M3) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 3},
+    370516: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Quay (E5M3) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 3},
+    370517: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Courtyard (E5M4)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 4},
+    370518: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Courtyard (E5M4) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 4},
+    370519: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Courtyard (E5M4) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 4},
+    370520: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Hydratyr (E5M5)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 5},
+    370521: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Hydratyr (E5M5) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 5},
+    370522: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Hydratyr (E5M5) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 5},
+    370523: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Colonnade (E5M6)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 6},
+    370524: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Colonnade (E5M6) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 6},
+    370525: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Colonnade (E5M6) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 6},
+    370526: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Foetid Manse (E5M7)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 7},
+    370527: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Foetid Manse (E5M7) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 7},
+    370528: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Foetid Manse (E5M7) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 7},
+    370529: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Field of Judgement (E5M8)',
+             'doom_type': -1,
+             'episode': 5,
+             'map': 8},
+    370530: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': 'Field of Judgement (E5M8) - Complete',
+             'doom_type': -2,
+             'episode': 5,
+             'map': 8},
+    370531: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': 'Field of Judgement (E5M8) - Map Scroll',
+             'doom_type': 35,
+             'episode': 5,
+             'map': 8},
+    370532: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "Skein of D'Sparil (E5M9)",
+             'doom_type': -1,
+             'episode': 5,
+             'map': 9},
+    370533: {'classification': ItemClassification.progression,
+             'count': 1,
+             'name': "Skein of D'Sparil (E5M9) - Complete",
+             'doom_type': -2,
+             'episode': 5,
+             'map': 9},
+    370534: {'classification': ItemClassification.filler,
+             'count': 1,
+             'name': "Skein of D'Sparil (E5M9) - Map Scroll",
+             'doom_type': 35,
+             'episode': 5,
+             'map': 9},
+}
+
+
+item_name_groups: Dict[str, Set[str]] = {
+    'Ammos': {'Crystal Geode', 'Energy Orb', 'Greater Runes', 'Inferno Orb', 'Pile of Mace Spheres', 'Quiver of Ethereal Arrows', },
+    'Armors': {'Enchanted Shield', 'Silver Shield', },
+    'Artifacts': {'Chaos Device', 'Morph Ovum', 'Mystic Urn', 'Quartz Flask', 'Ring of Invincibility', 'Shadowsphere', 'Timebomb of the Ancients', 'Tome of Power', 'Torch', },
+    'Keys': {'Ambulatory (E4M3) - Blue key', 'Ambulatory (E4M3) - Green key', 'Ambulatory (E4M3) - Yellow key', 'Blockhouse (E4M2) - Blue key', 'Blockhouse (E4M2) - Green key', 'Blockhouse (E4M2) - Yellow key', 'Catafalque (E4M1) - Green key', 'Catafalque (E4M1) - Yellow key', 'Colonnade (E5M6) - Blue key', 'Colonnade (E5M6) - Green key', 'Colonnade (E5M6) - Yellow key', 'Courtyard (E5M4) - Blue key', 'Courtyard (E5M4) - Green key', 'Courtyard (E5M4) - Yellow key', 'Foetid Manse (E5M7) - Blue key', 'Foetid Manse (E5M7) - Green key', 'Foetid Manse (E5M7) - Yellow key', 'Great Stair (E4M5) - Blue key', 'Great Stair (E4M5) - Green key', 'Great Stair (E4M5) - Yellow key', 'Halls of the Apostate (E4M6) - Blue key', 'Halls of the Apostate (E4M6) - Green key', 'Halls of the Apostate (E4M6) - Yellow key', 'Hydratyr (E5M5) - Blue key', 'Hydratyr (E5M5) - Green key', 'Hydratyr (E5M5) - Yellow key', 'Mausoleum (E4M9) - Yellow key', 'Ochre Cliffs (E5M1) - Blue key', 'Ochre Cliffs (E5M1) - Green key', 'Ochre Cliffs (E5M1) - Yellow key', 'Quay (E5M3) - Blue key', 'Quay (E5M3) - Green key', 'Quay (E5M3) - Yellow key', 'Ramparts of Perdition (E4M7) - Blue key', 'Ramparts of Perdition (E4M7) - Green key', 'Ramparts of Perdition (E4M7) - Yellow key', 'Rapids (E5M2) - Green key', 'Rapids (E5M2) - Yellow key', 'Shattered Bridge (E4M8) - Yellow key', "Skein of D'Sparil (E5M9) - Blue key", "Skein of D'Sparil (E5M9) - Green key", "Skein of D'Sparil (E5M9) - Yellow key", 'The Aquifier (E3M9) - Blue key', 'The Aquifier (E3M9) - Green key', 'The Aquifier (E3M9) - Yellow key', 'The Azure Fortress (E3M4) - Green key', 'The Azure Fortress (E3M4) - Yellow key', 'The Catacombs (E2M5) - Blue key', 'The Catacombs (E2M5) - Green key', 'The Catacombs (E2M5) - Yellow key', 'The Cathedral (E1M6) - Green key', 'The Cathedral (E1M6) - Yellow key', 'The Cesspool (E3M2) - Blue key', 'The Cesspool (E3M2) - Green key', 'The Cesspool (E3M2) - Yellow key', 'The Chasm (E3M7) - Blue key', 'The Chasm (E3M7) - Green key', 'The Chasm (E3M7) - Yellow key', 'The Citadel (E1M5) - Blue key', 'The Citadel (E1M5) - Green key', 'The Citadel (E1M5) - Yellow key', 'The Confluence (E3M3) - Blue key', 'The Confluence (E3M3) - Green key', 'The Confluence (E3M3) - Yellow key', 'The Crater (E2M1) - Green key', 'The Crater (E2M1) - Yellow key', 'The Crypts (E1M7) - Blue key', 'The Crypts (E1M7) - Green key', 'The Crypts (E1M7) - Yellow key', 'The Docks (E1M1) - Yellow key', 'The Dungeons (E1M2) - Blue key', 'The Dungeons (E1M2) - Green key', 'The Dungeons (E1M2) - Yellow key', 'The Gatehouse (E1M3) - Green key', 'The Gatehouse (E1M3) - Yellow key', 'The Glacier (E2M9) - Blue key', 'The Glacier (E2M9) - Green key', 'The Glacier (E2M9) - Yellow key', 'The Graveyard (E1M9) - Blue key', 'The Graveyard (E1M9) - Green key', 'The Graveyard (E1M9) - Yellow key', 'The Great Hall (E2M7) - Blue key', 'The Great Hall (E2M7) - Green key', 'The Great Hall (E2M7) - Yellow key', 'The Guard Tower (E1M4) - Green key', 'The Guard Tower (E1M4) - Yellow key', 'The Halls of Fear (E3M6) - Blue key', 'The Halls of Fear (E3M6) - Green key', 'The Halls of Fear (E3M6) - Yellow key', 'The Ice Grotto (E2M4) - Blue key', 'The Ice Grotto (E2M4) - Green key', 'The Ice Grotto (E2M4) - Yellow key', 'The Labyrinth (E2M6) - Blue key', 'The Labyrinth (E2M6) - Green key', 'The Labyrinth (E2M6) - Yellow key', 'The Lava Pits (E2M2) - Green key', 'The Lava Pits (E2M2) - Yellow key', 'The Ophidian Lair (E3M5) - Green key', 'The Ophidian Lair (E3M5) - Yellow key', 'The River of Fire (E2M3) - Blue key', 'The River of Fire (E2M3) - Green key', 'The River of Fire (E2M3) - Yellow key', 'The Storehouse (E3M1) - Green key', 'The Storehouse (E3M1) - Yellow key', },
+    'Levels': {'Ambulatory (E4M3)', 'Blockhouse (E4M2)', 'Catafalque (E4M1)', 'Colonnade (E5M6)', 'Courtyard (E5M4)', "D'Sparil'S Keep (E3M8)", 'Field of Judgement (E5M8)', 'Foetid Manse (E5M7)', 'Great Stair (E4M5)', 'Halls of the Apostate (E4M6)', "Hell's Maw (E1M8)", 'Hydratyr (E5M5)', 'Mausoleum (E4M9)', 'Ochre Cliffs (E5M1)', 'Quay (E5M3)', 'Ramparts of Perdition (E4M7)', 'Rapids (E5M2)', 'Sepulcher (E4M4)', 'Shattered Bridge (E4M8)', "Skein of D'Sparil (E5M9)", 'The Aquifier (E3M9)', 'The Azure Fortress (E3M4)', 'The Catacombs (E2M5)', 'The Cathedral (E1M6)', 'The Cesspool (E3M2)', 'The Chasm (E3M7)', 'The Citadel (E1M5)', 'The Confluence (E3M3)', 'The Crater (E2M1)', 'The Crypts (E1M7)', 'The Docks (E1M1)', 'The Dungeons (E1M2)', 'The Gatehouse (E1M3)', 'The Glacier (E2M9)', 'The Graveyard (E1M9)', 'The Great Hall (E2M7)', 'The Guard Tower (E1M4)', 'The Halls of Fear (E3M6)', 'The Ice Grotto (E2M4)', 'The Labyrinth (E2M6)', 'The Lava Pits (E2M2)', 'The Ophidian Lair (E3M5)', 'The Portals of Chaos (E2M8)', 'The River of Fire (E2M3)', 'The Storehouse (E3M1)', },
+    'Map Scrolls': {'Ambulatory (E4M3) - Map Scroll', 'Blockhouse (E4M2) - Map Scroll', 'Catafalque (E4M1) - Map Scroll', 'Colonnade (E5M6) - Map Scroll', 'Courtyard (E5M4) - Map Scroll', "D'Sparil'S Keep (E3M8) - Map Scroll", 'Field of Judgement (E5M8) - Map Scroll', 'Foetid Manse (E5M7) - Map Scroll', 'Great Stair (E4M5) - Map Scroll', 'Halls of the Apostate (E4M6) - Map Scroll', "Hell's Maw (E1M8) - Map Scroll", 'Hydratyr (E5M5) - Map Scroll', 'Mausoleum (E4M9) - Map Scroll', 'Ochre Cliffs (E5M1) - Map Scroll', 'Quay (E5M3) - Map Scroll', 'Ramparts of Perdition (E4M7) - Map Scroll', 'Rapids (E5M2) - Map Scroll', 'Sepulcher (E4M4) - Map Scroll', 'Shattered Bridge (E4M8) - Map Scroll', "Skein of D'Sparil (E5M9) - Map Scroll", 'The Aquifier (E3M9) - Map Scroll', 'The Azure Fortress (E3M4) - Map Scroll', 'The Catacombs (E2M5) - Map Scroll', 'The Cathedral (E1M6) - Map Scroll', 'The Cesspool (E3M2) - Map Scroll', 'The Chasm (E3M7) - Map Scroll', 'The Citadel (E1M5) - Map Scroll', 'The Confluence (E3M3) - Map Scroll', 'The Crater (E2M1) - Map Scroll', 'The Crypts (E1M7) - Map Scroll', 'The Docks (E1M1) - Map Scroll', 'The Dungeons (E1M2) - Map Scroll', 'The Gatehouse (E1M3) - Map Scroll', 'The Glacier (E2M9) - Map Scroll', 'The Graveyard (E1M9) - Map Scroll', 'The Great Hall (E2M7) - Map Scroll', 'The Guard Tower (E1M4) - Map Scroll', 'The Halls of Fear (E3M6) - Map Scroll', 'The Ice Grotto (E2M4) - Map Scroll', 'The Labyrinth (E2M6) - Map Scroll', 'The Lava Pits (E2M2) - Map Scroll', 'The Ophidian Lair (E3M5) - Map Scroll', 'The Portals of Chaos (E2M8) - Map Scroll', 'The River of Fire (E2M3) - Map Scroll', 'The Storehouse (E3M1) - Map Scroll', },
+    'Weapons': {'Dragon Claw', 'Ethereal Crossbow', 'Firemace', 'Gauntlets of the Necromancer', 'Hellstaff', 'Phoenix Rod', },
+}
diff --git a/worlds/heretic/Locations.py b/worlds/heretic/Locations.py
new file mode 100644
index 0000000000..f9590de776
--- /dev/null
+++ b/worlds/heretic/Locations.py
@@ -0,0 +1,8229 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import Dict, TypedDict, List, Set 
+
+
+class LocationDict(TypedDict, total=False): 
+    name: str 
+    episode: int 
+    check_sanity: bool 
+    map: int 
+    index: int # Thing index as it is stored in the wad file. 
+    doom_type: int # In case index end up unreliable, we can use doom type. Maps have often only one of each important things. 
+    region: str 
+
+
+location_table: Dict[int, LocationDict] = {
+    371000: {'name': 'The Docks (E1M1) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 1,
+             'index': 5,
+             'doom_type': 80,
+             'region': "The Docks (E1M1) Main"},
+    371001: {'name': 'The Docks (E1M1) - Silver Shield',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 1,
+             'index': 47,
+             'doom_type': 85,
+             'region': "The Docks (E1M1) Main"},
+    371002: {'name': 'The Docks (E1M1) - Gauntlets of the Necromancer',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 1,
+             'index': 52,
+             'doom_type': 2005,
+             'region': "The Docks (E1M1) Yellow"},
+    371003: {'name': 'The Docks (E1M1) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 1,
+             'index': 55,
+             'doom_type': 2001,
+             'region': "The Docks (E1M1) Yellow"},
+    371004: {'name': 'The Docks (E1M1) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 1,
+             'index': 91,
+             'doom_type': 8,
+             'region': "The Docks (E1M1) Sea"},
+    371005: {'name': 'The Docks (E1M1) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 1,
+             'index': 174,
+             'doom_type': 86,
+             'region': "The Docks (E1M1) Yellow"},
+    371006: {'name': 'The Docks (E1M1) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Docks (E1M1) Yellow"},
+    371007: {'name': 'The Dungeons (E1M2) - Dragon Claw',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 1,
+             'doom_type': 53,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371008: {'name': 'The Dungeons (E1M2) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 5,
+             'doom_type': 80,
+             'region': "The Dungeons (E1M2) Main"},
+    371009: {'name': 'The Dungeons (E1M2) - Green key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 17,
+             'doom_type': 73,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371010: {'name': 'The Dungeons (E1M2) - Silver Shield',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 18,
+             'doom_type': 85,
+             'region': "The Dungeons (E1M2) Main"},
+    371011: {'name': 'The Dungeons (E1M2) - Torch',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 19,
+             'doom_type': 33,
+             'region': "The Dungeons (E1M2) Main"},
+    371012: {'name': 'The Dungeons (E1M2) - Map Scroll',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 29,
+             'doom_type': 35,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371013: {'name': 'The Dungeons (E1M2) - Shadowsphere',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 41,
+             'doom_type': 75,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371014: {'name': 'The Dungeons (E1M2) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 44,
+             'doom_type': 8,
+             'region': "The Dungeons (E1M2) Green"},
+    371015: {'name': 'The Dungeons (E1M2) - Blue key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 45,
+             'doom_type': 79,
+             'region': "The Dungeons (E1M2) Green"},
+    371016: {'name': 'The Dungeons (E1M2) - Ring of Invincibility',
+             'episode': 1,
+             'check_sanity': True,
+             'map': 2,
+             'index': 46,
+             'doom_type': 84,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371017: {'name': 'The Dungeons (E1M2) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 77,
+             'doom_type': 86,
+             'region': "The Dungeons (E1M2) Main"},
+    371018: {'name': 'The Dungeons (E1M2) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 80,
+             'doom_type': 2001,
+             'region': "The Dungeons (E1M2) Main"},
+    371019: {'name': 'The Dungeons (E1M2) - Tome of Power 2',
+             'episode': 1,
+             'check_sanity': True,
+             'map': 2,
+             'index': 81,
+             'doom_type': 86,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371020: {'name': 'The Dungeons (E1M2) - Gauntlets of the Necromancer',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 253,
+             'doom_type': 2005,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371021: {'name': 'The Dungeons (E1M2) - Silver Shield 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': 303,
+             'doom_type': 85,
+             'region': "The Dungeons (E1M2) Yellow"},
+    371022: {'name': 'The Dungeons (E1M2) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Dungeons (E1M2) Blue"},
+    371023: {'name': 'The Gatehouse (E1M3) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 8,
+             'doom_type': 80,
+             'region': "The Gatehouse (E1M3) Main"},
+    371024: {'name': 'The Gatehouse (E1M3) - Green key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 9,
+             'doom_type': 73,
+             'region': "The Gatehouse (E1M3) Yellow"},
+    371025: {'name': 'The Gatehouse (E1M3) - Dragon Claw',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 10,
+             'doom_type': 53,
+             'region': "The Gatehouse (E1M3) Main"},
+    371026: {'name': 'The Gatehouse (E1M3) - Silver Shield',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 22,
+             'doom_type': 85,
+             'region': "The Gatehouse (E1M3) Main"},
+    371027: {'name': 'The Gatehouse (E1M3) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 24,
+             'doom_type': 2001,
+             'region': "The Gatehouse (E1M3) Main"},
+    371028: {'name': 'The Gatehouse (E1M3) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 81,
+             'doom_type': 86,
+             'region': "The Gatehouse (E1M3) Sea"},
+    371029: {'name': 'The Gatehouse (E1M3) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 134,
+             'doom_type': 8,
+             'region': "The Gatehouse (E1M3) Yellow"},
+    371030: {'name': 'The Gatehouse (E1M3) - Gauntlets of the Necromancer',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 145,
+             'doom_type': 2005,
+             'region': "The Gatehouse (E1M3) Yellow"},
+    371031: {'name': 'The Gatehouse (E1M3) - Torch',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 203,
+             'doom_type': 33,
+             'region': "The Gatehouse (E1M3) Main"},
+    371032: {'name': 'The Gatehouse (E1M3) - Ring of Invincibility',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 220,
+             'doom_type': 84,
+             'region': "The Gatehouse (E1M3) Yellow"},
+    371033: {'name': 'The Gatehouse (E1M3) - Shadowsphere',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 221,
+             'doom_type': 75,
+             'region': "The Gatehouse (E1M3) Main"},
+    371034: {'name': 'The Gatehouse (E1M3) - Morph Ovum',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 222,
+             'doom_type': 30,
+             'region': "The Gatehouse (E1M3) Yellow"},
+    371035: {'name': 'The Gatehouse (E1M3) - Tome of Power 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 286,
+             'doom_type': 86,
+             'region': "The Gatehouse (E1M3) Main"},
+    371036: {'name': 'The Gatehouse (E1M3) - Tome of Power 3',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': 287,
+             'doom_type': 86,
+             'region': "The Gatehouse (E1M3) Main"},
+    371037: {'name': 'The Gatehouse (E1M3) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Gatehouse (E1M3) Green"},
+    371038: {'name': 'The Guard Tower (E1M4) - Gauntlets of the Necromancer',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 0,
+             'doom_type': 2005,
+             'region': "The Guard Tower (E1M4) Main"},
+    371039: {'name': 'The Guard Tower (E1M4) - Dragon Claw',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 2,
+             'doom_type': 53,
+             'region': "The Guard Tower (E1M4) Main"},
+    371040: {'name': 'The Guard Tower (E1M4) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 3,
+             'doom_type': 2001,
+             'region': "The Guard Tower (E1M4) Main"},
+    371041: {'name': 'The Guard Tower (E1M4) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 4,
+             'doom_type': 80,
+             'region': "The Guard Tower (E1M4) Main"},
+    371042: {'name': 'The Guard Tower (E1M4) - Morph Ovum',
+             'episode': 1,
+             'check_sanity': True,
+             'map': 4,
+             'index': 5,
+             'doom_type': 30,
+             'region': "The Guard Tower (E1M4) Main"},
+    371043: {'name': 'The Guard Tower (E1M4) - Shadowsphere',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 57,
+             'doom_type': 75,
+             'region': "The Guard Tower (E1M4) Yellow"},
+    371044: {'name': 'The Guard Tower (E1M4) - Green key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 60,
+             'doom_type': 73,
+             'region': "The Guard Tower (E1M4) Yellow"},
+    371045: {'name': 'The Guard Tower (E1M4) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': True,
+             'map': 4,
+             'index': 61,
+             'doom_type': 8,
+             'region': "The Guard Tower (E1M4) Main"},
+    371046: {'name': 'The Guard Tower (E1M4) - Map Scroll',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 64,
+             'doom_type': 35,
+             'region': "The Guard Tower (E1M4) Main"},
+    371047: {'name': 'The Guard Tower (E1M4) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 77,
+             'doom_type': 86,
+             'region': "The Guard Tower (E1M4) Main"},
+    371048: {'name': 'The Guard Tower (E1M4) - Silver Shield',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 78,
+             'doom_type': 85,
+             'region': "The Guard Tower (E1M4) Main"},
+    371049: {'name': 'The Guard Tower (E1M4) - Torch',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 143,
+             'doom_type': 33,
+             'region': "The Guard Tower (E1M4) Main"},
+    371050: {'name': 'The Guard Tower (E1M4) - Tome of Power 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 220,
+             'doom_type': 86,
+             'region': "The Guard Tower (E1M4) Yellow"},
+    371051: {'name': 'The Guard Tower (E1M4) - Tome of Power 3',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': 221,
+             'doom_type': 86,
+             'region': "The Guard Tower (E1M4) Main"},
+    371052: {'name': 'The Guard Tower (E1M4) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Guard Tower (E1M4) Green"},
+    371053: {'name': 'The Citadel (E1M5) - Green key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 1,
+             'doom_type': 73,
+             'region': "The Citadel (E1M5) Yellow"},
+    371054: {'name': 'The Citadel (E1M5) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 5,
+             'doom_type': 80,
+             'region': "The Citadel (E1M5) Main"},
+    371055: {'name': 'The Citadel (E1M5) - Blue key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 19,
+             'doom_type': 79,
+             'region': "The Citadel (E1M5) Green"},
+    371056: {'name': 'The Citadel (E1M5) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 23,
+             'doom_type': 86,
+             'region': "The Citadel (E1M5) Well"},
+    371057: {'name': 'The Citadel (E1M5) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 28,
+             'doom_type': 2001,
+             'region': "The Citadel (E1M5) Yellow"},
+    371058: {'name': 'The Citadel (E1M5) - Gauntlets of the Necromancer',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 29,
+             'doom_type': 2005,
+             'region': "The Citadel (E1M5) Main"},
+    371059: {'name': 'The Citadel (E1M5) - Dragon Claw',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 30,
+             'doom_type': 53,
+             'region': "The Citadel (E1M5) Green"},
+    371060: {'name': 'The Citadel (E1M5) - Ring of Invincibility',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 31,
+             'doom_type': 84,
+             'region': "The Citadel (E1M5) Green"},
+    371061: {'name': 'The Citadel (E1M5) - Tome of Power 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 78,
+             'doom_type': 86,
+             'region': "The Citadel (E1M5) Blue"},
+    371062: {'name': 'The Citadel (E1M5) - Shadowsphere',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 79,
+             'doom_type': 75,
+             'region': "The Citadel (E1M5) Main"},
+    371063: {'name': 'The Citadel (E1M5) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 80,
+             'doom_type': 8,
+             'region': "The Citadel (E1M5) Green"},
+    371064: {'name': 'The Citadel (E1M5) - Torch',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 103,
+             'doom_type': 33,
+             'region': "The Citadel (E1M5) Main"},
+    371065: {'name': 'The Citadel (E1M5) - Tome of Power 3',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 105,
+             'doom_type': 86,
+             'region': "The Citadel (E1M5) Green"},
+    371066: {'name': 'The Citadel (E1M5) - Silver Shield',
+             'episode': 1,
+             'check_sanity': True,
+             'map': 5,
+             'index': 129,
+             'doom_type': 85,
+             'region': "The Citadel (E1M5) Main"},
+    371067: {'name': 'The Citadel (E1M5) - Morph Ovum',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 192,
+             'doom_type': 30,
+             'region': "The Citadel (E1M5) Green"},
+    371068: {'name': 'The Citadel (E1M5) - Map Scroll',
+             'episode': 1,
+             'check_sanity': True,
+             'map': 5,
+             'index': 203,
+             'doom_type': 35,
+             'region': "The Citadel (E1M5) Blue"},
+    371069: {'name': 'The Citadel (E1M5) - Silver Shield 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 204,
+             'doom_type': 85,
+             'region': "The Citadel (E1M5) Blue"},
+    371070: {'name': 'The Citadel (E1M5) - Torch 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 205,
+             'doom_type': 33,
+             'region': "The Citadel (E1M5) Green"},
+    371071: {'name': 'The Citadel (E1M5) - Tome of Power 4',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 319,
+             'doom_type': 86,
+             'region': "The Citadel (E1M5) Green"},
+    371072: {'name': 'The Citadel (E1M5) - Tome of Power 5',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': 320,
+             'doom_type': 86,
+             'region': "The Citadel (E1M5) Green"},
+    371073: {'name': 'The Citadel (E1M5) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Citadel (E1M5) Blue"},
+    371074: {'name': 'The Cathedral (E1M6) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 8,
+             'doom_type': 80,
+             'region': "The Cathedral (E1M6) Main"},
+    371075: {'name': 'The Cathedral (E1M6) - Gauntlets of the Necromancer',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 9,
+             'doom_type': 2005,
+             'region': "The Cathedral (E1M6) Main"},
+    371076: {'name': 'The Cathedral (E1M6) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 39,
+             'doom_type': 2001,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371077: {'name': 'The Cathedral (E1M6) - Dragon Claw',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 45,
+             'doom_type': 53,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371078: {'name': 'The Cathedral (E1M6) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 56,
+             'doom_type': 86,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371079: {'name': 'The Cathedral (E1M6) - Shadowsphere',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 61,
+             'doom_type': 75,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371080: {'name': 'The Cathedral (E1M6) - Green key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 98,
+             'doom_type': 73,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371081: {'name': 'The Cathedral (E1M6) - Silver Shield',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 138,
+             'doom_type': 85,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371082: {'name': 'The Cathedral (E1M6) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 139,
+             'doom_type': 8,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371083: {'name': 'The Cathedral (E1M6) - Ring of Invincibility',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 142,
+             'doom_type': 84,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371084: {'name': 'The Cathedral (E1M6) - Torch',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 217,
+             'doom_type': 33,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371085: {'name': 'The Cathedral (E1M6) - Tome of Power 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 273,
+             'doom_type': 86,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371086: {'name': 'The Cathedral (E1M6) - Tome of Power 3',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 274,
+             'doom_type': 86,
+             'region': "The Cathedral (E1M6) Main"},
+    371087: {'name': 'The Cathedral (E1M6) - Morph Ovum',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 277,
+             'doom_type': 30,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371088: {'name': 'The Cathedral (E1M6) - Map Scroll',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 279,
+             'doom_type': 35,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371089: {'name': 'The Cathedral (E1M6) - Ring of Invincibility 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 280,
+             'doom_type': 84,
+             'region': "The Cathedral (E1M6) Yellow"},
+    371090: {'name': 'The Cathedral (E1M6) - Silver Shield 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 281,
+             'doom_type': 85,
+             'region': "The Cathedral (E1M6) Green"},
+    371091: {'name': 'The Cathedral (E1M6) - Tome of Power 4',
+             'episode': 1,
+             'check_sanity': True,
+             'map': 6,
+             'index': 371,
+             'doom_type': 86,
+             'region': "The Cathedral (E1M6) Green"},
+    371092: {'name': 'The Cathedral (E1M6) - Bag of Holding 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 449,
+             'doom_type': 8,
+             'region': "The Cathedral (E1M6) Green"},
+    371093: {'name': 'The Cathedral (E1M6) - Silver Shield 3',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 457,
+             'doom_type': 85,
+             'region': "The Cathedral (E1M6) Main Fly"},
+    371094: {'name': 'The Cathedral (E1M6) - Bag of Holding 3',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': 458,
+             'doom_type': 8,
+             'region': "The Cathedral (E1M6) Main Fly"},
+    371095: {'name': 'The Cathedral (E1M6) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Cathedral (E1M6) Green"},
+    371096: {'name': 'The Crypts (E1M7) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 11,
+             'doom_type': 80,
+             'region': "The Crypts (E1M7) Main"},
+    371097: {'name': 'The Crypts (E1M7) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 17,
+             'doom_type': 2001,
+             'region': "The Crypts (E1M7) Yellow"},
+    371098: {'name': 'The Crypts (E1M7) - Green key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 21,
+             'doom_type': 73,
+             'region': "The Crypts (E1M7) Yellow"},
+    371099: {'name': 'The Crypts (E1M7) - Blue key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 25,
+             'doom_type': 79,
+             'region': "The Crypts (E1M7) Green"},
+    371100: {'name': 'The Crypts (E1M7) - Morph Ovum',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 26,
+             'doom_type': 30,
+             'region': "The Crypts (E1M7) Yellow"},
+    371101: {'name': 'The Crypts (E1M7) - Dragon Claw',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 45,
+             'doom_type': 53,
+             'region': "The Crypts (E1M7) Yellow"},
+    371102: {'name': 'The Crypts (E1M7) - Gauntlets of the Necromancer',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 46,
+             'doom_type': 2005,
+             'region': "The Crypts (E1M7) Main"},
+    371103: {'name': 'The Crypts (E1M7) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 53,
+             'doom_type': 86,
+             'region': "The Crypts (E1M7) Yellow"},
+    371104: {'name': 'The Crypts (E1M7) - Ring of Invincibility',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 90,
+             'doom_type': 84,
+             'region': "The Crypts (E1M7) Yellow"},
+    371105: {'name': 'The Crypts (E1M7) - Silver Shield',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 98,
+             'doom_type': 85,
+             'region': "The Crypts (E1M7) Green"},
+    371106: {'name': 'The Crypts (E1M7) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 130,
+             'doom_type': 8,
+             'region': "The Crypts (E1M7) Blue"},
+    371107: {'name': 'The Crypts (E1M7) - Torch',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 213,
+             'doom_type': 33,
+             'region': "The Crypts (E1M7) Green"},
+    371108: {'name': 'The Crypts (E1M7) - Torch 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 214,
+             'doom_type': 33,
+             'region': "The Crypts (E1M7) Blue"},
+    371109: {'name': 'The Crypts (E1M7) - Tome of Power 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 215,
+             'doom_type': 86,
+             'region': "The Crypts (E1M7) Yellow"},
+    371110: {'name': 'The Crypts (E1M7) - Shadowsphere',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 224,
+             'doom_type': 75,
+             'region': "The Crypts (E1M7) Yellow"},
+    371111: {'name': 'The Crypts (E1M7) - Map Scroll',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 231,
+             'doom_type': 35,
+             'region': "The Crypts (E1M7) Blue"},
+    371112: {'name': 'The Crypts (E1M7) - Silver Shield 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': 232,
+             'doom_type': 85,
+             'region': "The Crypts (E1M7) Green"},
+    371113: {'name': 'The Crypts (E1M7) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Crypts (E1M7) Blue"},
+    371114: {'name': "Hell's Maw (E1M8) - Ethereal Crossbow",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 10,
+             'doom_type': 2001,
+             'region': "Hell's Maw (E1M8) Main"},
+    371115: {'name': "Hell's Maw (E1M8) - Dragon Claw",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 11,
+             'doom_type': 53,
+             'region': "Hell's Maw (E1M8) Main"},
+    371116: {'name': "Hell's Maw (E1M8) - Tome of Power",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 63,
+             'doom_type': 86,
+             'region': "Hell's Maw (E1M8) Main"},
+    371117: {'name': "Hell's Maw (E1M8) - Gauntlets of the Necromancer",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 64,
+             'doom_type': 2005,
+             'region': "Hell's Maw (E1M8) Main"},
+    371118: {'name': "Hell's Maw (E1M8) - Tome of Power 2",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 65,
+             'doom_type': 86,
+             'region': "Hell's Maw (E1M8) Main"},
+    371119: {'name': "Hell's Maw (E1M8) - Silver Shield",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 101,
+             'doom_type': 85,
+             'region': "Hell's Maw (E1M8) Main"},
+    371120: {'name': "Hell's Maw (E1M8) - Shadowsphere",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 102,
+             'doom_type': 75,
+             'region': "Hell's Maw (E1M8) Main"},
+    371121: {'name': "Hell's Maw (E1M8) - Ring of Invincibility",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 103,
+             'doom_type': 84,
+             'region': "Hell's Maw (E1M8) Main"},
+    371122: {'name': "Hell's Maw (E1M8) - Bag of Holding",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 104,
+             'doom_type': 8,
+             'region': "Hell's Maw (E1M8) Main"},
+    371123: {'name': "Hell's Maw (E1M8) - Ring of Invincibility 2",
+             'episode': 1,
+             'check_sanity': True,
+             'map': 8,
+             'index': 237,
+             'doom_type': 84,
+             'region': "Hell's Maw (E1M8) Main"},
+    371124: {'name': "Hell's Maw (E1M8) - Bag of Holding 2",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 238,
+             'doom_type': 8,
+             'region': "Hell's Maw (E1M8) Main"},
+    371125: {'name': "Hell's Maw (E1M8) - Ring of Invincibility 3",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 247,
+             'doom_type': 84,
+             'region': "Hell's Maw (E1M8) Main"},
+    371126: {'name': "Hell's Maw (E1M8) - Morph Ovum",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': 290,
+             'doom_type': 30,
+             'region': "Hell's Maw (E1M8) Main"},
+    371127: {'name': "Hell's Maw (E1M8) - Exit",
+             'episode': 1,
+             'check_sanity': False,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Hell's Maw (E1M8) Main"},
+    371128: {'name': 'The Graveyard (E1M9) - Yellow key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 2,
+             'doom_type': 80,
+             'region': "The Graveyard (E1M9) Main"},
+    371129: {'name': 'The Graveyard (E1M9) - Green key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 21,
+             'doom_type': 73,
+             'region': "The Graveyard (E1M9) Yellow"},
+    371130: {'name': 'The Graveyard (E1M9) - Blue key',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 22,
+             'doom_type': 79,
+             'region': "The Graveyard (E1M9) Green"},
+    371131: {'name': 'The Graveyard (E1M9) - Bag of Holding',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 23,
+             'doom_type': 8,
+             'region': "The Graveyard (E1M9) Main"},
+    371132: {'name': 'The Graveyard (E1M9) - Dragon Claw',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 109,
+             'doom_type': 53,
+             'region': "The Graveyard (E1M9) Yellow"},
+    371133: {'name': 'The Graveyard (E1M9) - Ethereal Crossbow',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 110,
+             'doom_type': 2001,
+             'region': "The Graveyard (E1M9) Green"},
+    371134: {'name': 'The Graveyard (E1M9) - Shadowsphere',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 128,
+             'doom_type': 75,
+             'region': "The Graveyard (E1M9) Green"},
+    371135: {'name': 'The Graveyard (E1M9) - Silver Shield',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 129,
+             'doom_type': 85,
+             'region': "The Graveyard (E1M9) Main"},
+    371136: {'name': 'The Graveyard (E1M9) - Ring of Invincibility',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 217,
+             'doom_type': 84,
+             'region': "The Graveyard (E1M9) Green"},
+    371137: {'name': 'The Graveyard (E1M9) - Torch',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 253,
+             'doom_type': 33,
+             'region': "The Graveyard (E1M9) Green"},
+    371138: {'name': 'The Graveyard (E1M9) - Tome of Power',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 254,
+             'doom_type': 86,
+             'region': "The Graveyard (E1M9) Main"},
+    371139: {'name': 'The Graveyard (E1M9) - Morph Ovum',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 279,
+             'doom_type': 30,
+             'region': "The Graveyard (E1M9) Main"},
+    371140: {'name': 'The Graveyard (E1M9) - Map Scroll',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 280,
+             'doom_type': 35,
+             'region': "The Graveyard (E1M9) Blue"},
+    371141: {'name': 'The Graveyard (E1M9) - Dragon Claw 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 292,
+             'doom_type': 53,
+             'region': "The Graveyard (E1M9) Main"},
+    371142: {'name': 'The Graveyard (E1M9) - Tome of Power 2',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': 339,
+             'doom_type': 86,
+             'region': "The Graveyard (E1M9) Green"},
+    371143: {'name': 'The Graveyard (E1M9) - Exit',
+             'episode': 1,
+             'check_sanity': False,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Graveyard (E1M9) Blue"},
+    371144: {'name': 'The Crater (E2M1) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 8,
+             'doom_type': 80,
+             'region': "The Crater (E2M1) Main"},
+    371145: {'name': 'The Crater (E2M1) - Green key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 10,
+             'doom_type': 73,
+             'region': "The Crater (E2M1) Yellow"},
+    371146: {'name': 'The Crater (E2M1) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 39,
+             'doom_type': 2001,
+             'region': "The Crater (E2M1) Main"},
+    371147: {'name': 'The Crater (E2M1) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 49,
+             'doom_type': 86,
+             'region': "The Crater (E2M1) Main"},
+    371148: {'name': 'The Crater (E2M1) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 90,
+             'doom_type': 53,
+             'region': "The Crater (E2M1) Yellow"},
+    371149: {'name': 'The Crater (E2M1) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 98,
+             'doom_type': 8,
+             'region': "The Crater (E2M1) Yellow"},
+    371150: {'name': 'The Crater (E2M1) - Hellstaff',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 1,
+             'index': 103,
+             'doom_type': 2004,
+             'region': "The Crater (E2M1) Yellow"},
+    371151: {'name': 'The Crater (E2M1) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 141,
+             'doom_type': 75,
+             'region': "The Crater (E2M1) Yellow"},
+    371152: {'name': 'The Crater (E2M1) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 145,
+             'doom_type': 85,
+             'region': "The Crater (E2M1) Main"},
+    371153: {'name': 'The Crater (E2M1) - Torch',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 146,
+             'doom_type': 33,
+             'region': "The Crater (E2M1) Main"},
+    371154: {'name': 'The Crater (E2M1) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': 236,
+             'doom_type': 32,
+             'region': "The Crater (E2M1) Yellow"},
+    371155: {'name': 'The Crater (E2M1) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Crater (E2M1) Green"},
+    371156: {'name': 'The Lava Pits (E2M2) - Green key',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 2,
+             'index': 8,
+             'doom_type': 73,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371157: {'name': 'The Lava Pits (E2M2) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 9,
+             'doom_type': 80,
+             'region': "The Lava Pits (E2M2) Main"},
+    371158: {'name': 'The Lava Pits (E2M2) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 25,
+             'doom_type': 2001,
+             'region': "The Lava Pits (E2M2) Main"},
+    371159: {'name': 'The Lava Pits (E2M2) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 67,
+             'doom_type': 75,
+             'region': "The Lava Pits (E2M2) Main"},
+    371160: {'name': 'The Lava Pits (E2M2) - Ring of Invincibility',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 98,
+             'doom_type': 84,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371161: {'name': 'The Lava Pits (E2M2) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 109,
+             'doom_type': 53,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371162: {'name': 'The Lava Pits (E2M2) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 117,
+             'doom_type': 2004,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371163: {'name': 'The Lava Pits (E2M2) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 122,
+             'doom_type': 8,
+             'region': "The Lava Pits (E2M2) Green"},
+    371164: {'name': 'The Lava Pits (E2M2) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 123,
+             'doom_type': 86,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371165: {'name': 'The Lava Pits (E2M2) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 124,
+             'doom_type': 85,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371166: {'name': 'The Lava Pits (E2M2) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 127,
+             'doom_type': 2005,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371167: {'name': 'The Lava Pits (E2M2) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 133,
+             'doom_type': 31,
+             'region': "The Lava Pits (E2M2) Green"},
+    371168: {'name': 'The Lava Pits (E2M2) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 230,
+             'doom_type': 32,
+             'region': "The Lava Pits (E2M2) Green"},
+    371169: {'name': 'The Lava Pits (E2M2) - Map Scroll',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 232,
+             'doom_type': 35,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371170: {'name': 'The Lava Pits (E2M2) - Tome of Power 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 233,
+             'doom_type': 86,
+             'region': "The Lava Pits (E2M2) Main"},
+    371171: {'name': 'The Lava Pits (E2M2) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 234,
+             'doom_type': 36,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371172: {'name': 'The Lava Pits (E2M2) - Tome of Power 3',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 2,
+             'index': 323,
+             'doom_type': 86,
+             'region': "The Lava Pits (E2M2) Main"},
+    371173: {'name': 'The Lava Pits (E2M2) - Silver Shield 2',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 2,
+             'index': 324,
+             'doom_type': 85,
+             'region': "The Lava Pits (E2M2) Main"},
+    371174: {'name': 'The Lava Pits (E2M2) - Bag of Holding 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 329,
+             'doom_type': 8,
+             'region': "The Lava Pits (E2M2) Main"},
+    371175: {'name': 'The Lava Pits (E2M2) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': 341,
+             'doom_type': 30,
+             'region': "The Lava Pits (E2M2) Yellow"},
+    371176: {'name': 'The Lava Pits (E2M2) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Lava Pits (E2M2) Green"},
+    371177: {'name': 'The River of Fire (E2M3) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 9,
+             'doom_type': 80,
+             'region': "The River of Fire (E2M3) Main"},
+    371178: {'name': 'The River of Fire (E2M3) - Blue key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 10,
+             'doom_type': 79,
+             'region': "The River of Fire (E2M3) Main"},
+    371179: {'name': 'The River of Fire (E2M3) - Green key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 17,
+             'doom_type': 73,
+             'region': "The River of Fire (E2M3) Yellow"},
+    371180: {'name': 'The River of Fire (E2M3) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 26,
+             'doom_type': 2005,
+             'region': "The River of Fire (E2M3) Main"},
+    371181: {'name': 'The River of Fire (E2M3) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 57,
+             'doom_type': 2001,
+             'region': "The River of Fire (E2M3) Main"},
+    371182: {'name': 'The River of Fire (E2M3) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 92,
+             'doom_type': 53,
+             'region': "The River of Fire (E2M3) Main"},
+    371183: {'name': 'The River of Fire (E2M3) - Phoenix Rod',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 122,
+             'doom_type': 2003,
+             'region': "The River of Fire (E2M3) Main"},
+    371184: {'name': 'The River of Fire (E2M3) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 128,
+             'doom_type': 2004,
+             'region': "The River of Fire (E2M3) Blue"},
+    371185: {'name': 'The River of Fire (E2M3) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 3,
+             'index': 136,
+             'doom_type': 8,
+             'region': "The River of Fire (E2M3) Blue"},
+    371186: {'name': 'The River of Fire (E2M3) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 3,
+             'index': 145,
+             'doom_type': 75,
+             'region': "The River of Fire (E2M3) Green"},
+    371187: {'name': 'The River of Fire (E2M3) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 146,
+             'doom_type': 86,
+             'region': "The River of Fire (E2M3) Main"},
+    371188: {'name': 'The River of Fire (E2M3) - Ring of Invincibility',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 147,
+             'doom_type': 84,
+             'region': "The River of Fire (E2M3) Main"},
+    371189: {'name': 'The River of Fire (E2M3) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 148,
+             'doom_type': 85,
+             'region': "The River of Fire (E2M3) Main"},
+    371190: {'name': 'The River of Fire (E2M3) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 297,
+             'doom_type': 31,
+             'region': "The River of Fire (E2M3) Blue"},
+    371191: {'name': 'The River of Fire (E2M3) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 298,
+             'doom_type': 36,
+             'region': "The River of Fire (E2M3) Blue"},
+    371192: {'name': 'The River of Fire (E2M3) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 3,
+             'index': 299,
+             'doom_type': 32,
+             'region': "The River of Fire (E2M3) Main"},
+    371193: {'name': 'The River of Fire (E2M3) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 300,
+             'doom_type': 30,
+             'region': "The River of Fire (E2M3) Yellow"},
+    371194: {'name': 'The River of Fire (E2M3) - Tome of Power 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 313,
+             'doom_type': 86,
+             'region': "The River of Fire (E2M3) Green"},
+    371195: {'name': 'The River of Fire (E2M3) - Firemace',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': 413,
+             'doom_type': 2002,
+             'region': "The River of Fire (E2M3) Main"},
+    371196: {'name': 'The River of Fire (E2M3) - Firemace 2',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 3,
+             'index': 441,
+             'doom_type': 2002,
+             'region': "The River of Fire (E2M3) Yellow"},
+    371197: {'name': 'The River of Fire (E2M3) - Firemace 3',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 3,
+             'index': 448,
+             'doom_type': 2002,
+             'region': "The River of Fire (E2M3) Blue"},
+    371198: {'name': 'The River of Fire (E2M3) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The River of Fire (E2M3) Blue"},
+    371199: {'name': 'The Ice Grotto (E2M4) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 18,
+             'doom_type': 80,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371200: {'name': 'The Ice Grotto (E2M4) - Blue key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 19,
+             'doom_type': 79,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371201: {'name': 'The Ice Grotto (E2M4) - Green key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 28,
+             'doom_type': 73,
+             'region': "The Ice Grotto (E2M4) Yellow"},
+    371202: {'name': 'The Ice Grotto (E2M4) - Phoenix Rod',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 29,
+             'doom_type': 2003,
+             'region': "The Ice Grotto (E2M4) Yellow"},
+    371203: {'name': 'The Ice Grotto (E2M4) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 4,
+             'index': 30,
+             'doom_type': 2005,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371204: {'name': 'The Ice Grotto (E2M4) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 31,
+             'doom_type': 2001,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371205: {'name': 'The Ice Grotto (E2M4) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 32,
+             'doom_type': 2004,
+             'region': "The Ice Grotto (E2M4) Blue"},
+    371206: {'name': 'The Ice Grotto (E2M4) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 33,
+             'doom_type': 53,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371207: {'name': 'The Ice Grotto (E2M4) - Torch',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 34,
+             'doom_type': 33,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371208: {'name': 'The Ice Grotto (E2M4) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 35,
+             'doom_type': 8,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371209: {'name': 'The Ice Grotto (E2M4) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 36,
+             'doom_type': 75,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371210: {'name': 'The Ice Grotto (E2M4) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 37,
+             'doom_type': 36,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371211: {'name': 'The Ice Grotto (E2M4) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 38,
+             'doom_type': 85,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371212: {'name': 'The Ice Grotto (E2M4) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 39,
+             'doom_type': 86,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371213: {'name': 'The Ice Grotto (E2M4) - Tome of Power 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 40,
+             'doom_type': 86,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371214: {'name': 'The Ice Grotto (E2M4) - Bag of Holding 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 41,
+             'doom_type': 8,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371215: {'name': 'The Ice Grotto (E2M4) - Tome of Power 3',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 128,
+             'doom_type': 86,
+             'region': "The Ice Grotto (E2M4) Yellow"},
+    371216: {'name': 'The Ice Grotto (E2M4) - Map Scroll',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 283,
+             'doom_type': 35,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371217: {'name': 'The Ice Grotto (E2M4) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 289,
+             'doom_type': 32,
+             'region': "The Ice Grotto (E2M4) Magenta"},
+    371218: {'name': 'The Ice Grotto (E2M4) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 291,
+             'doom_type': 31,
+             'region': "The Ice Grotto (E2M4) Green"},
+    371219: {'name': 'The Ice Grotto (E2M4) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 299,
+             'doom_type': 30,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371220: {'name': 'The Ice Grotto (E2M4) - Shadowsphere 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': 300,
+             'doom_type': 75,
+             'region': "The Ice Grotto (E2M4) Main"},
+    371221: {'name': 'The Ice Grotto (E2M4) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Ice Grotto (E2M4) Blue"},
+    371222: {'name': 'The Catacombs (E2M5) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 14,
+             'doom_type': 80,
+             'region': "The Catacombs (E2M5) Main"},
+    371223: {'name': 'The Catacombs (E2M5) - Blue key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 25,
+             'doom_type': 79,
+             'region': "The Catacombs (E2M5) Green"},
+    371224: {'name': 'The Catacombs (E2M5) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 27,
+             'doom_type': 2004,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371225: {'name': 'The Catacombs (E2M5) - Phoenix Rod',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 5,
+             'index': 44,
+             'doom_type': 2003,
+             'region': "The Catacombs (E2M5) Green"},
+    371226: {'name': 'The Catacombs (E2M5) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 107,
+             'doom_type': 2001,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371227: {'name': 'The Catacombs (E2M5) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 108,
+             'doom_type': 2005,
+             'region': "The Catacombs (E2M5) Main"},
+    371228: {'name': 'The Catacombs (E2M5) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 109,
+             'doom_type': 53,
+             'region': "The Catacombs (E2M5) Main"},
+    371229: {'name': 'The Catacombs (E2M5) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 110,
+             'doom_type': 8,
+             'region': "The Catacombs (E2M5) Main"},
+    371230: {'name': 'The Catacombs (E2M5) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 112,
+             'doom_type': 85,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371231: {'name': 'The Catacombs (E2M5) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 113,
+             'doom_type': 75,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371232: {'name': 'The Catacombs (E2M5) - Ring of Invincibility',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 114,
+             'doom_type': 84,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371233: {'name': 'The Catacombs (E2M5) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 115,
+             'doom_type': 86,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371234: {'name': 'The Catacombs (E2M5) - Green key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 116,
+             'doom_type': 73,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371235: {'name': 'The Catacombs (E2M5) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 263,
+             'doom_type': 36,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371236: {'name': 'The Catacombs (E2M5) - Tome of Power 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 322,
+             'doom_type': 86,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371237: {'name': 'The Catacombs (E2M5) - Map Scroll',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 323,
+             'doom_type': 35,
+             'region': "The Catacombs (E2M5) Green"},
+    371238: {'name': 'The Catacombs (E2M5) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 324,
+             'doom_type': 32,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371239: {'name': 'The Catacombs (E2M5) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 325,
+             'doom_type': 30,
+             'region': "The Catacombs (E2M5) Green"},
+    371240: {'name': 'The Catacombs (E2M5) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 326,
+             'doom_type': 31,
+             'region': "The Catacombs (E2M5) Green"},
+    371241: {'name': 'The Catacombs (E2M5) - Torch',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 327,
+             'doom_type': 33,
+             'region': "The Catacombs (E2M5) Main"},
+    371242: {'name': 'The Catacombs (E2M5) - Tome of Power 3',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': 328,
+             'doom_type': 86,
+             'region': "The Catacombs (E2M5) Yellow"},
+    371243: {'name': 'The Catacombs (E2M5) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Catacombs (E2M5) Blue"},
+    371244: {'name': 'The Labyrinth (E2M6) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 7,
+             'doom_type': 80,
+             'region': "The Labyrinth (E2M6) Main"},
+    371245: {'name': 'The Labyrinth (E2M6) - Blue key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 14,
+             'doom_type': 79,
+             'region': "The Labyrinth (E2M6) Green"},
+    371246: {'name': 'The Labyrinth (E2M6) - Green key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 15,
+             'doom_type': 73,
+             'region': "The Labyrinth (E2M6) Yellow"},
+    371247: {'name': 'The Labyrinth (E2M6) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 22,
+             'doom_type': 2004,
+             'region': "The Labyrinth (E2M6) Green"},
+    371248: {'name': 'The Labyrinth (E2M6) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 23,
+             'doom_type': 2005,
+             'region': "The Labyrinth (E2M6) Main"},
+    371249: {'name': 'The Labyrinth (E2M6) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 24,
+             'doom_type': 2001,
+             'region': "The Labyrinth (E2M6) Main"},
+    371250: {'name': 'The Labyrinth (E2M6) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 25,
+             'doom_type': 53,
+             'region': "The Labyrinth (E2M6) Yellow"},
+    371251: {'name': 'The Labyrinth (E2M6) - Phoenix Rod',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 26,
+             'doom_type': 2003,
+             'region': "The Labyrinth (E2M6) Green"},
+    371252: {'name': 'The Labyrinth (E2M6) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 27,
+             'doom_type': 8,
+             'region': "The Labyrinth (E2M6) Yellow"},
+    371253: {'name': 'The Labyrinth (E2M6) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 31,
+             'doom_type': 75,
+             'region': "The Labyrinth (E2M6) Yellow"},
+    371254: {'name': 'The Labyrinth (E2M6) - Ring of Invincibility',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 32,
+             'doom_type': 84,
+             'region': "The Labyrinth (E2M6) Blue"},
+    371255: {'name': 'The Labyrinth (E2M6) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 33,
+             'doom_type': 86,
+             'region': "The Labyrinth (E2M6) Green"},
+    371256: {'name': 'The Labyrinth (E2M6) - Silver Shield',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 6,
+             'index': 34,
+             'doom_type': 85,
+             'region': "The Labyrinth (E2M6) Main"},
+    371257: {'name': 'The Labyrinth (E2M6) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 35,
+             'doom_type': 30,
+             'region': "The Labyrinth (E2M6) Main"},
+    371258: {'name': 'The Labyrinth (E2M6) - Map Scroll',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 282,
+             'doom_type': 35,
+             'region': "The Labyrinth (E2M6) Green"},
+    371259: {'name': 'The Labyrinth (E2M6) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 283,
+             'doom_type': 31,
+             'region': "The Labyrinth (E2M6) Green"},
+    371260: {'name': 'The Labyrinth (E2M6) - Tome of Power 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 284,
+             'doom_type': 86,
+             'region': "The Labyrinth (E2M6) Green"},
+    371261: {'name': 'The Labyrinth (E2M6) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 285,
+             'doom_type': 36,
+             'region': "The Labyrinth (E2M6) Yellow"},
+    371262: {'name': 'The Labyrinth (E2M6) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 6,
+             'index': 336,
+             'doom_type': 32,
+             'region': "The Labyrinth (E2M6) Blue"},
+    371263: {'name': 'The Labyrinth (E2M6) - Phoenix Rod 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 422,
+             'doom_type': 2003,
+             'region': "The Labyrinth (E2M6) Blue"},
+    371264: {'name': 'The Labyrinth (E2M6) - Firemace',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 432,
+             'doom_type': 2002,
+             'region': "The Labyrinth (E2M6) Main"},
+    371265: {'name': 'The Labyrinth (E2M6) - Firemace 2',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 6,
+             'index': 456,
+             'doom_type': 2002,
+             'region': "The Labyrinth (E2M6) Yellow"},
+    371266: {'name': 'The Labyrinth (E2M6) - Firemace 3',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 457,
+             'doom_type': 2002,
+             'region': "The Labyrinth (E2M6) Yellow"},
+    371267: {'name': 'The Labyrinth (E2M6) - Firemace 4',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': 458,
+             'doom_type': 2002,
+             'region': "The Labyrinth (E2M6) Blue"},
+    371268: {'name': 'The Labyrinth (E2M6) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Labyrinth (E2M6) Blue"},
+    371269: {'name': 'The Great Hall (E2M7) - Green key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 8,
+             'doom_type': 73,
+             'region': "The Great Hall (E2M7) Yellow"},
+    371270: {'name': 'The Great Hall (E2M7) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 9,
+             'doom_type': 80,
+             'region': "The Great Hall (E2M7) Main"},
+    371271: {'name': 'The Great Hall (E2M7) - Blue key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 11,
+             'doom_type': 79,
+             'region': "The Great Hall (E2M7) Green"},
+    371272: {'name': 'The Great Hall (E2M7) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 64,
+             'doom_type': 30,
+             'region': "The Great Hall (E2M7) Main"},
+    371273: {'name': 'The Great Hall (E2M7) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 76,
+             'doom_type': 75,
+             'region': "The Great Hall (E2M7) Main"},
+    371274: {'name': 'The Great Hall (E2M7) - Ring of Invincibility',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 77,
+             'doom_type': 84,
+             'region': "The Great Hall (E2M7) Yellow"},
+    371275: {'name': 'The Great Hall (E2M7) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 78,
+             'doom_type': 32,
+             'region': "The Great Hall (E2M7) Blue"},
+    371276: {'name': 'The Great Hall (E2M7) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 80,
+             'doom_type': 86,
+             'region': "The Great Hall (E2M7) Yellow"},
+    371277: {'name': 'The Great Hall (E2M7) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 81,
+             'doom_type': 36,
+             'region': "The Great Hall (E2M7) Yellow"},
+    371278: {'name': 'The Great Hall (E2M7) - Torch',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 82,
+             'doom_type': 33,
+             'region': "The Great Hall (E2M7) Main"},
+    371279: {'name': 'The Great Hall (E2M7) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 83,
+             'doom_type': 8,
+             'region': "The Great Hall (E2M7) Main"},
+    371280: {'name': 'The Great Hall (E2M7) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 84,
+             'doom_type': 85,
+             'region': "The Great Hall (E2M7) Main"},
+    371281: {'name': 'The Great Hall (E2M7) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 85,
+             'doom_type': 31,
+             'region': "The Great Hall (E2M7) Main"},
+    371282: {'name': 'The Great Hall (E2M7) - Map Scroll',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 86,
+             'doom_type': 35,
+             'region': "The Great Hall (E2M7) Yellow"},
+    371283: {'name': 'The Great Hall (E2M7) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 91,
+             'doom_type': 2001,
+             'region': "The Great Hall (E2M7) Main"},
+    371284: {'name': 'The Great Hall (E2M7) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 92,
+             'doom_type': 2005,
+             'region': "The Great Hall (E2M7) Main"},
+    371285: {'name': 'The Great Hall (E2M7) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 93,
+             'doom_type': 53,
+             'region': "The Great Hall (E2M7) Yellow"},
+    371286: {'name': 'The Great Hall (E2M7) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 94,
+             'doom_type': 2004,
+             'region': "The Great Hall (E2M7) Yellow"},
+    371287: {'name': 'The Great Hall (E2M7) - Phoenix Rod',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 95,
+             'doom_type': 2003,
+             'region': "The Great Hall (E2M7) Main"},
+    371288: {'name': 'The Great Hall (E2M7) - Tome of Power 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': 477,
+             'doom_type': 86,
+             'region': "The Great Hall (E2M7) Main"},
+    371289: {'name': 'The Great Hall (E2M7) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Great Hall (E2M7) Blue"},
+    371290: {'name': 'The Portals of Chaos (E2M8) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 9,
+             'doom_type': 2001,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371291: {'name': 'The Portals of Chaos (E2M8) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 10,
+             'doom_type': 53,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371292: {'name': 'The Portals of Chaos (E2M8) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 11,
+             'doom_type': 2005,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371293: {'name': 'The Portals of Chaos (E2M8) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 12,
+             'doom_type': 2004,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371294: {'name': 'The Portals of Chaos (E2M8) - Phoenix Rod',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 13,
+             'doom_type': 2003,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371295: {'name': 'The Portals of Chaos (E2M8) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 14,
+             'doom_type': 86,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371296: {'name': 'The Portals of Chaos (E2M8) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 8,
+             'index': 18,
+             'doom_type': 8,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371297: {'name': 'The Portals of Chaos (E2M8) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 8,
+             'index': 40,
+             'doom_type': 32,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371298: {'name': 'The Portals of Chaos (E2M8) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 8,
+             'index': 41,
+             'doom_type': 75,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371299: {'name': 'The Portals of Chaos (E2M8) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 42,
+             'doom_type': 85,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371300: {'name': 'The Portals of Chaos (E2M8) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 43,
+             'doom_type': 31,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371301: {'name': 'The Portals of Chaos (E2M8) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 44,
+             'doom_type': 36,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371302: {'name': 'The Portals of Chaos (E2M8) - Ring of Invincibility',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 272,
+             'doom_type': 84,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371303: {'name': 'The Portals of Chaos (E2M8) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': 274,
+             'doom_type': 30,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371304: {'name': 'The Portals of Chaos (E2M8) - Mystic Urn 2',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 8,
+             'index': 275,
+             'doom_type': 32,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371305: {'name': 'The Portals of Chaos (E2M8) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Portals of Chaos (E2M8) Main"},
+    371306: {'name': 'The Glacier (E2M9) - Yellow key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 6,
+             'doom_type': 80,
+             'region': "The Glacier (E2M9) Main"},
+    371307: {'name': 'The Glacier (E2M9) - Blue key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 16,
+             'doom_type': 79,
+             'region': "The Glacier (E2M9) Green"},
+    371308: {'name': 'The Glacier (E2M9) - Green key',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 17,
+             'doom_type': 73,
+             'region': "The Glacier (E2M9) Yellow"},
+    371309: {'name': 'The Glacier (E2M9) - Phoenix Rod',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 34,
+             'doom_type': 2003,
+             'region': "The Glacier (E2M9) Green"},
+    371310: {'name': 'The Glacier (E2M9) - Gauntlets of the Necromancer',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 9,
+             'index': 39,
+             'doom_type': 2005,
+             'region': "The Glacier (E2M9) Main"},
+    371311: {'name': 'The Glacier (E2M9) - Ethereal Crossbow',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 40,
+             'doom_type': 2001,
+             'region': "The Glacier (E2M9) Main"},
+    371312: {'name': 'The Glacier (E2M9) - Dragon Claw',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 41,
+             'doom_type': 53,
+             'region': "The Glacier (E2M9) Yellow"},
+    371313: {'name': 'The Glacier (E2M9) - Hellstaff',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 42,
+             'doom_type': 2004,
+             'region': "The Glacier (E2M9) Green"},
+    371314: {'name': 'The Glacier (E2M9) - Bag of Holding',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 43,
+             'doom_type': 8,
+             'region': "The Glacier (E2M9) Main"},
+    371315: {'name': 'The Glacier (E2M9) - Tome of Power',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 45,
+             'doom_type': 86,
+             'region': "The Glacier (E2M9) Main"},
+    371316: {'name': 'The Glacier (E2M9) - Shadowsphere',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 46,
+             'doom_type': 75,
+             'region': "The Glacier (E2M9) Main"},
+    371317: {'name': 'The Glacier (E2M9) - Ring of Invincibility',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 47,
+             'doom_type': 84,
+             'region': "The Glacier (E2M9) Green"},
+    371318: {'name': 'The Glacier (E2M9) - Silver Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 48,
+             'doom_type': 85,
+             'region': "The Glacier (E2M9) Main"},
+    371319: {'name': 'The Glacier (E2M9) - Enchanted Shield',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 49,
+             'doom_type': 31,
+             'region': "The Glacier (E2M9) Green"},
+    371320: {'name': 'The Glacier (E2M9) - Mystic Urn',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 50,
+             'doom_type': 32,
+             'region': "The Glacier (E2M9) Blue"},
+    371321: {'name': 'The Glacier (E2M9) - Map Scroll',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 51,
+             'doom_type': 35,
+             'region': "The Glacier (E2M9) Blue"},
+    371322: {'name': 'The Glacier (E2M9) - Mystic Urn 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 52,
+             'doom_type': 32,
+             'region': "The Glacier (E2M9) Green"},
+    371323: {'name': 'The Glacier (E2M9) - Torch',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 53,
+             'doom_type': 33,
+             'region': "The Glacier (E2M9) Green"},
+    371324: {'name': 'The Glacier (E2M9) - Chaos Device',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 424,
+             'doom_type': 36,
+             'region': "The Glacier (E2M9) Yellow"},
+    371325: {'name': 'The Glacier (E2M9) - Dragon Claw 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 456,
+             'doom_type': 53,
+             'region': "The Glacier (E2M9) Main"},
+    371326: {'name': 'The Glacier (E2M9) - Tome of Power 2',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 9,
+             'index': 457,
+             'doom_type': 86,
+             'region': "The Glacier (E2M9) Main"},
+    371327: {'name': 'The Glacier (E2M9) - Torch 2',
+             'episode': 2,
+             'check_sanity': True,
+             'map': 9,
+             'index': 458,
+             'doom_type': 33,
+             'region': "The Glacier (E2M9) Main"},
+    371328: {'name': 'The Glacier (E2M9) - Morph Ovum',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 474,
+             'doom_type': 30,
+             'region': "The Glacier (E2M9) Main"},
+    371329: {'name': 'The Glacier (E2M9) - Firemace',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 479,
+             'doom_type': 2002,
+             'region': "The Glacier (E2M9) Main"},
+    371330: {'name': 'The Glacier (E2M9) - Firemace 2',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 501,
+             'doom_type': 2002,
+             'region': "The Glacier (E2M9) Yellow"},
+    371331: {'name': 'The Glacier (E2M9) - Firemace 3',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 502,
+             'doom_type': 2002,
+             'region': "The Glacier (E2M9) Blue"},
+    371332: {'name': 'The Glacier (E2M9) - Firemace 4',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': 503,
+             'doom_type': 2002,
+             'region': "The Glacier (E2M9) Main"},
+    371333: {'name': 'The Glacier (E2M9) - Exit',
+             'episode': 2,
+             'check_sanity': False,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Glacier (E2M9) Blue"},
+    371334: {'name': 'The Storehouse (E3M1) - Yellow key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 9,
+             'doom_type': 80,
+             'region': "The Storehouse (E3M1) Main"},
+    371335: {'name': 'The Storehouse (E3M1) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 10,
+             'doom_type': 73,
+             'region': "The Storehouse (E3M1) Yellow"},
+    371336: {'name': 'The Storehouse (E3M1) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 29,
+             'doom_type': 8,
+             'region': "The Storehouse (E3M1) Main"},
+    371337: {'name': 'The Storehouse (E3M1) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 38,
+             'doom_type': 75,
+             'region': "The Storehouse (E3M1) Main"},
+    371338: {'name': 'The Storehouse (E3M1) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 39,
+             'doom_type': 84,
+             'region': "The Storehouse (E3M1) Green"},
+    371339: {'name': 'The Storehouse (E3M1) - Silver Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 40,
+             'doom_type': 85,
+             'region': "The Storehouse (E3M1) Main"},
+    371340: {'name': 'The Storehouse (E3M1) - Map Scroll',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 41,
+             'doom_type': 35,
+             'region': "The Storehouse (E3M1) Green"},
+    371341: {'name': 'The Storehouse (E3M1) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 42,
+             'doom_type': 36,
+             'region': "The Storehouse (E3M1) Main"},
+    371342: {'name': 'The Storehouse (E3M1) - Tome of Power',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 43,
+             'doom_type': 86,
+             'region': "The Storehouse (E3M1) Green"},
+    371343: {'name': 'The Storehouse (E3M1) - Torch',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 1,
+             'index': 44,
+             'doom_type': 33,
+             'region': "The Storehouse (E3M1) Main"},
+    371344: {'name': 'The Storehouse (E3M1) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 45,
+             'doom_type': 53,
+             'region': "The Storehouse (E3M1) Main"},
+    371345: {'name': 'The Storehouse (E3M1) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 46,
+             'doom_type': 2004,
+             'region': "The Storehouse (E3M1) Green"},
+    371346: {'name': 'The Storehouse (E3M1) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': 47,
+             'doom_type': 2005,
+             'region': "The Storehouse (E3M1) Main"},
+    371347: {'name': 'The Storehouse (E3M1) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Storehouse (E3M1) Green"},
+    371348: {'name': 'The Cesspool (E3M2) - Yellow key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 4,
+             'doom_type': 80,
+             'region': "The Cesspool (E3M2) Main"},
+    371349: {'name': 'The Cesspool (E3M2) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 19,
+             'doom_type': 73,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371350: {'name': 'The Cesspool (E3M2) - Blue key',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 2,
+             'index': 20,
+             'doom_type': 79,
+             'region': "The Cesspool (E3M2) Green"},
+    371351: {'name': 'The Cesspool (E3M2) - Ethereal Crossbow',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 144,
+             'doom_type': 2001,
+             'region': "The Cesspool (E3M2) Main"},
+    371352: {'name': 'The Cesspool (E3M2) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 145,
+             'doom_type': 84,
+             'region': "The Cesspool (E3M2) Green"},
+    371353: {'name': 'The Cesspool (E3M2) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 146,
+             'doom_type': 2005,
+             'region': "The Cesspool (E3M2) Green"},
+    371354: {'name': 'The Cesspool (E3M2) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 147,
+             'doom_type': 53,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371355: {'name': 'The Cesspool (E3M2) - Phoenix Rod',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 148,
+             'doom_type': 2003,
+             'region': "The Cesspool (E3M2) Green"},
+    371356: {'name': 'The Cesspool (E3M2) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 149,
+             'doom_type': 2004,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371357: {'name': 'The Cesspool (E3M2) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 150,
+             'doom_type': 8,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371358: {'name': 'The Cesspool (E3M2) - Silver Shield',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 2,
+             'index': 151,
+             'doom_type': 85,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371359: {'name': 'The Cesspool (E3M2) - Silver Shield 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 152,
+             'doom_type': 85,
+             'region': "The Cesspool (E3M2) Main"},
+    371360: {'name': 'The Cesspool (E3M2) - Morph Ovum',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 153,
+             'doom_type': 30,
+             'region': "The Cesspool (E3M2) Main"},
+    371361: {'name': 'The Cesspool (E3M2) - Morph Ovum 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 154,
+             'doom_type': 30,
+             'region': "The Cesspool (E3M2) Green"},
+    371362: {'name': 'The Cesspool (E3M2) - Mystic Urn',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 164,
+             'doom_type': 32,
+             'region': "The Cesspool (E3M2) Main"},
+    371363: {'name': 'The Cesspool (E3M2) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 165,
+             'doom_type': 75,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371364: {'name': 'The Cesspool (E3M2) - Enchanted Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 166,
+             'doom_type': 31,
+             'region': "The Cesspool (E3M2) Green"},
+    371365: {'name': 'The Cesspool (E3M2) - Map Scroll',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 167,
+             'doom_type': 35,
+             'region': "The Cesspool (E3M2) Green"},
+    371366: {'name': 'The Cesspool (E3M2) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 168,
+             'doom_type': 36,
+             'region': "The Cesspool (E3M2) Green"},
+    371367: {'name': 'The Cesspool (E3M2) - Tome of Power',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 169,
+             'doom_type': 86,
+             'region': "The Cesspool (E3M2) Main"},
+    371368: {'name': 'The Cesspool (E3M2) - Tome of Power 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 170,
+             'doom_type': 86,
+             'region': "The Cesspool (E3M2) Green"},
+    371369: {'name': 'The Cesspool (E3M2) - Tome of Power 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 171,
+             'doom_type': 86,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371370: {'name': 'The Cesspool (E3M2) - Torch',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 172,
+             'doom_type': 33,
+             'region': "The Cesspool (E3M2) Main"},
+    371371: {'name': 'The Cesspool (E3M2) - Bag of Holding 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 233,
+             'doom_type': 8,
+             'region': "The Cesspool (E3M2) Green"},
+    371372: {'name': 'The Cesspool (E3M2) - Firemace',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 2,
+             'index': 555,
+             'doom_type': 2002,
+             'region': "The Cesspool (E3M2) Green"},
+    371373: {'name': 'The Cesspool (E3M2) - Firemace 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 556,
+             'doom_type': 2002,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371374: {'name': 'The Cesspool (E3M2) - Firemace 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 557,
+             'doom_type': 2002,
+             'region': "The Cesspool (E3M2) Blue"},
+    371375: {'name': 'The Cesspool (E3M2) - Firemace 4',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 2,
+             'index': 558,
+             'doom_type': 2002,
+             'region': "The Cesspool (E3M2) Main"},
+    371376: {'name': 'The Cesspool (E3M2) - Firemace 5',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': 559,
+             'doom_type': 2002,
+             'region': "The Cesspool (E3M2) Yellow"},
+    371377: {'name': 'The Cesspool (E3M2) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Cesspool (E3M2) Blue"},
+    371378: {'name': 'The Confluence (E3M3) - Yellow key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 4,
+             'doom_type': 80,
+             'region': "The Confluence (E3M3) Main"},
+    371379: {'name': 'The Confluence (E3M3) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 7,
+             'doom_type': 73,
+             'region': "The Confluence (E3M3) Yellow"},
+    371380: {'name': 'The Confluence (E3M3) - Blue key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 8,
+             'doom_type': 79,
+             'region': "The Confluence (E3M3) Green"},
+    371381: {'name': 'The Confluence (E3M3) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 43,
+             'doom_type': 2004,
+             'region': "The Confluence (E3M3) Blue"},
+    371382: {'name': 'The Confluence (E3M3) - Tome of Power',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 3,
+             'index': 44,
+             'doom_type': 86,
+             'region': "The Confluence (E3M3) Blue"},
+    371383: {'name': 'The Confluence (E3M3) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 47,
+             'doom_type': 53,
+             'region': "The Confluence (E3M3) Green"},
+    371384: {'name': 'The Confluence (E3M3) - Ethereal Crossbow',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 48,
+             'doom_type': 2001,
+             'region': "The Confluence (E3M3) Yellow"},
+    371385: {'name': 'The Confluence (E3M3) - Hellstaff 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 49,
+             'doom_type': 2004,
+             'region': "The Confluence (E3M3) Blue"},
+    371386: {'name': 'The Confluence (E3M3) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 50,
+             'doom_type': 2005,
+             'region': "The Confluence (E3M3) Blue"},
+    371387: {'name': 'The Confluence (E3M3) - Mystic Urn',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 51,
+             'doom_type': 32,
+             'region': "The Confluence (E3M3) Green"},
+    371388: {'name': 'The Confluence (E3M3) - Tome of Power 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 52,
+             'doom_type': 86,
+             'region': "The Confluence (E3M3) Green"},
+    371389: {'name': 'The Confluence (E3M3) - Tome of Power 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 53,
+             'doom_type': 86,
+             'region': "The Confluence (E3M3) Blue"},
+    371390: {'name': 'The Confluence (E3M3) - Tome of Power 4',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 54,
+             'doom_type': 86,
+             'region': "The Confluence (E3M3) Blue"},
+    371391: {'name': 'The Confluence (E3M3) - Tome of Power 5',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 55,
+             'doom_type': 86,
+             'region': "The Confluence (E3M3) Green"},
+    371392: {'name': 'The Confluence (E3M3) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 58,
+             'doom_type': 8,
+             'region': "The Confluence (E3M3) Green"},
+    371393: {'name': 'The Confluence (E3M3) - Morph Ovum',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 60,
+             'doom_type': 30,
+             'region': "The Confluence (E3M3) Green"},
+    371394: {'name': 'The Confluence (E3M3) - Mystic Urn 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 72,
+             'doom_type': 32,
+             'region': "The Confluence (E3M3) Blue"},
+    371395: {'name': 'The Confluence (E3M3) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 73,
+             'doom_type': 75,
+             'region': "The Confluence (E3M3) Main"},
+    371396: {'name': 'The Confluence (E3M3) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 3,
+             'index': 74,
+             'doom_type': 84,
+             'region': "The Confluence (E3M3) Yellow"},
+    371397: {'name': 'The Confluence (E3M3) - Map Scroll',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 75,
+             'doom_type': 35,
+             'region': "The Confluence (E3M3) Blue"},
+    371398: {'name': 'The Confluence (E3M3) - Silver Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 76,
+             'doom_type': 85,
+             'region': "The Confluence (E3M3) Main"},
+    371399: {'name': 'The Confluence (E3M3) - Phoenix Rod',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 77,
+             'doom_type': 2003,
+             'region': "The Confluence (E3M3) Blue"},
+    371400: {'name': 'The Confluence (E3M3) - Enchanted Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 78,
+             'doom_type': 31,
+             'region': "The Confluence (E3M3) Blue"},
+    371401: {'name': 'The Confluence (E3M3) - Silver Shield 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 79,
+             'doom_type': 85,
+             'region': "The Confluence (E3M3) Green"},
+    371402: {'name': 'The Confluence (E3M3) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 80,
+             'doom_type': 36,
+             'region': "The Confluence (E3M3) Green"},
+    371403: {'name': 'The Confluence (E3M3) - Torch',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 81,
+             'doom_type': 33,
+             'region': "The Confluence (E3M3) Green"},
+    371404: {'name': 'The Confluence (E3M3) - Firemace',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 622,
+             'doom_type': 2002,
+             'region': "The Confluence (E3M3) Green"},
+    371405: {'name': 'The Confluence (E3M3) - Firemace 2',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 3,
+             'index': 623,
+             'doom_type': 2002,
+             'region': "The Confluence (E3M3) Green"},
+    371406: {'name': 'The Confluence (E3M3) - Firemace 3',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 3,
+             'index': 624,
+             'doom_type': 2002,
+             'region': "The Confluence (E3M3) Yellow"},
+    371407: {'name': 'The Confluence (E3M3) - Firemace 4',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 625,
+             'doom_type': 2002,
+             'region': "The Confluence (E3M3) Blue"},
+    371408: {'name': 'The Confluence (E3M3) - Firemace 5',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': 626,
+             'doom_type': 2002,
+             'region': "The Confluence (E3M3) Blue"},
+    371409: {'name': 'The Confluence (E3M3) - Firemace 6',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 3,
+             'index': 627,
+             'doom_type': 2002,
+             'region': "The Confluence (E3M3) Blue"},
+    371410: {'name': 'The Confluence (E3M3) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Confluence (E3M3) Blue"},
+    371411: {'name': 'The Azure Fortress (E3M4) - Yellow key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 6,
+             'doom_type': 80,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371412: {'name': 'The Azure Fortress (E3M4) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 21,
+             'doom_type': 73,
+             'region': "The Azure Fortress (E3M4) Yellow"},
+    371413: {'name': 'The Azure Fortress (E3M4) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 51,
+             'doom_type': 53,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371414: {'name': 'The Azure Fortress (E3M4) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 52,
+             'doom_type': 84,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371415: {'name': 'The Azure Fortress (E3M4) - Ethereal Crossbow',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 53,
+             'doom_type': 2001,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371416: {'name': 'The Azure Fortress (E3M4) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 54,
+             'doom_type': 2005,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371417: {'name': 'The Azure Fortress (E3M4) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 55,
+             'doom_type': 2004,
+             'region': "The Azure Fortress (E3M4) Yellow"},
+    371418: {'name': 'The Azure Fortress (E3M4) - Phoenix Rod',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 56,
+             'doom_type': 2003,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371419: {'name': 'The Azure Fortress (E3M4) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 58,
+             'doom_type': 8,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371420: {'name': 'The Azure Fortress (E3M4) - Bag of Holding 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 59,
+             'doom_type': 8,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371421: {'name': 'The Azure Fortress (E3M4) - Morph Ovum',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 60,
+             'doom_type': 30,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371422: {'name': 'The Azure Fortress (E3M4) - Mystic Urn',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 61,
+             'doom_type': 32,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371423: {'name': 'The Azure Fortress (E3M4) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 62,
+             'doom_type': 75,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371424: {'name': 'The Azure Fortress (E3M4) - Silver Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 63,
+             'doom_type': 85,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371425: {'name': 'The Azure Fortress (E3M4) - Silver Shield 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 64,
+             'doom_type': 85,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371426: {'name': 'The Azure Fortress (E3M4) - Enchanted Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 65,
+             'doom_type': 31,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371427: {'name': 'The Azure Fortress (E3M4) - Map Scroll',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 66,
+             'doom_type': 35,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371428: {'name': 'The Azure Fortress (E3M4) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 67,
+             'doom_type': 36,
+             'region': "The Azure Fortress (E3M4) Yellow"},
+    371429: {'name': 'The Azure Fortress (E3M4) - Tome of Power',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 68,
+             'doom_type': 86,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371430: {'name': 'The Azure Fortress (E3M4) - Torch',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 69,
+             'doom_type': 33,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371431: {'name': 'The Azure Fortress (E3M4) - Torch 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 70,
+             'doom_type': 33,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371432: {'name': 'The Azure Fortress (E3M4) - Torch 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 71,
+             'doom_type': 33,
+             'region': "The Azure Fortress (E3M4) Yellow"},
+    371433: {'name': 'The Azure Fortress (E3M4) - Tome of Power 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 72,
+             'doom_type': 86,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371434: {'name': 'The Azure Fortress (E3M4) - Tome of Power 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 73,
+             'doom_type': 86,
+             'region': "The Azure Fortress (E3M4) Main"},
+    371435: {'name': 'The Azure Fortress (E3M4) - Enchanted Shield 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 75,
+             'doom_type': 31,
+             'region': "The Azure Fortress (E3M4) Yellow"},
+    371436: {'name': 'The Azure Fortress (E3M4) - Morph Ovum 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 76,
+             'doom_type': 30,
+             'region': "The Azure Fortress (E3M4) Yellow"},
+    371437: {'name': 'The Azure Fortress (E3M4) - Mystic Urn 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': 577,
+             'doom_type': 32,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371438: {'name': 'The Azure Fortress (E3M4) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Azure Fortress (E3M4) Green"},
+    371439: {'name': 'The Ophidian Lair (E3M5) - Yellow key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 16,
+             'doom_type': 80,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371440: {'name': 'The Ophidian Lair (E3M5) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 30,
+             'doom_type': 73,
+             'region': "The Ophidian Lair (E3M5) Yellow"},
+    371441: {'name': 'The Ophidian Lair (E3M5) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 48,
+             'doom_type': 2004,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371442: {'name': 'The Ophidian Lair (E3M5) - Phoenix Rod',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 5,
+             'index': 49,
+             'doom_type': 2003,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371443: {'name': 'The Ophidian Lair (E3M5) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 50,
+             'doom_type': 53,
+             'region': "The Ophidian Lair (E3M5) Yellow"},
+    371444: {'name': 'The Ophidian Lair (E3M5) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 51,
+             'doom_type': 2005,
+             'region': "The Ophidian Lair (E3M5) Yellow"},
+    371445: {'name': 'The Ophidian Lair (E3M5) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 52,
+             'doom_type': 8,
+             'region': "The Ophidian Lair (E3M5) Yellow"},
+    371446: {'name': 'The Ophidian Lair (E3M5) - Morph Ovum',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 53,
+             'doom_type': 30,
+             'region': "The Ophidian Lair (E3M5) Yellow"},
+    371447: {'name': 'The Ophidian Lair (E3M5) - Ethereal Crossbow',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 62,
+             'doom_type': 2001,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371448: {'name': 'The Ophidian Lair (E3M5) - Mystic Urn',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 63,
+             'doom_type': 32,
+             'region': "The Ophidian Lair (E3M5) Green"},
+    371449: {'name': 'The Ophidian Lair (E3M5) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 64,
+             'doom_type': 75,
+             'region': "The Ophidian Lair (E3M5) Yellow"},
+    371450: {'name': 'The Ophidian Lair (E3M5) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 65,
+             'doom_type': 84,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371451: {'name': 'The Ophidian Lair (E3M5) - Silver Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 66,
+             'doom_type': 85,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371452: {'name': 'The Ophidian Lair (E3M5) - Enchanted Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 67,
+             'doom_type': 31,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371453: {'name': 'The Ophidian Lair (E3M5) - Silver Shield 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 68,
+             'doom_type': 85,
+             'region': "The Ophidian Lair (E3M5) Green"},
+    371454: {'name': 'The Ophidian Lair (E3M5) - Map Scroll',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 69,
+             'doom_type': 35,
+             'region': "The Ophidian Lair (E3M5) Green"},
+    371455: {'name': 'The Ophidian Lair (E3M5) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 70,
+             'doom_type': 36,
+             'region': "The Ophidian Lair (E3M5) Yellow"},
+    371456: {'name': 'The Ophidian Lair (E3M5) - Torch',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 71,
+             'doom_type': 33,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371457: {'name': 'The Ophidian Lair (E3M5) - Tome of Power',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 5,
+             'index': 72,
+             'doom_type': 86,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371458: {'name': 'The Ophidian Lair (E3M5) - Mystic Urn 2',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 5,
+             'index': 73,
+             'doom_type': 32,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371459: {'name': 'The Ophidian Lair (E3M5) - Tome of Power 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': 74,
+             'doom_type': 86,
+             'region': "The Ophidian Lair (E3M5) Main"},
+    371460: {'name': 'The Ophidian Lair (E3M5) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Ophidian Lair (E3M5) Green"},
+    371461: {'name': 'The Halls of Fear (E3M6) - Yellow key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 10,
+             'doom_type': 80,
+             'region': "The Halls of Fear (E3M6) Main"},
+    371462: {'name': 'The Halls of Fear (E3M6) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 12,
+             'doom_type': 73,
+             'region': "The Halls of Fear (E3M6) Yellow"},
+    371463: {'name': 'The Halls of Fear (E3M6) - Blue key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 15,
+             'doom_type': 79,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371464: {'name': 'The Halls of Fear (E3M6) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 31,
+             'doom_type': 2004,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371465: {'name': 'The Halls of Fear (E3M6) - Phoenix Rod',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 32,
+             'doom_type': 2003,
+             'region': "The Halls of Fear (E3M6) Cyan"},
+    371466: {'name': 'The Halls of Fear (E3M6) - Ethereal Crossbow',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 33,
+             'doom_type': 2001,
+             'region': "The Halls of Fear (E3M6) Main"},
+    371467: {'name': 'The Halls of Fear (E3M6) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 34,
+             'doom_type': 53,
+             'region': "The Halls of Fear (E3M6) Main"},
+    371468: {'name': 'The Halls of Fear (E3M6) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 35,
+             'doom_type': 2005,
+             'region': "The Halls of Fear (E3M6) Yellow"},
+    371469: {'name': 'The Halls of Fear (E3M6) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 38,
+             'doom_type': 36,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371470: {'name': 'The Halls of Fear (E3M6) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 40,
+             'doom_type': 8,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371471: {'name': 'The Halls of Fear (E3M6) - Bag of Holding 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 41,
+             'doom_type': 8,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371472: {'name': 'The Halls of Fear (E3M6) - Morph Ovum',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 42,
+             'doom_type': 30,
+             'region': "The Halls of Fear (E3M6) Yellow"},
+    371473: {'name': 'The Halls of Fear (E3M6) - Mystic Urn',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 51,
+             'doom_type': 32,
+             'region': "The Halls of Fear (E3M6) Yellow"},
+    371474: {'name': 'The Halls of Fear (E3M6) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 52,
+             'doom_type': 75,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371475: {'name': 'The Halls of Fear (E3M6) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 6,
+             'index': 53,
+             'doom_type': 84,
+             'region': "The Halls of Fear (E3M6) Main"},
+    371476: {'name': 'The Halls of Fear (E3M6) - Silver Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 54,
+             'doom_type': 85,
+             'region': "The Halls of Fear (E3M6) Yellow"},
+    371477: {'name': 'The Halls of Fear (E3M6) - Enchanted Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 55,
+             'doom_type': 31,
+             'region': "The Halls of Fear (E3M6) Cyan"},
+    371478: {'name': 'The Halls of Fear (E3M6) - Map Scroll',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 56,
+             'doom_type': 35,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371479: {'name': 'The Halls of Fear (E3M6) - Tome of Power',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 57,
+             'doom_type': 86,
+             'region': "The Halls of Fear (E3M6) Cyan"},
+    371480: {'name': 'The Halls of Fear (E3M6) - Tome of Power 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 58,
+             'doom_type': 86,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371481: {'name': 'The Halls of Fear (E3M6) - Mystic Urn 2',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 6,
+             'index': 59,
+             'doom_type': 32,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371482: {'name': 'The Halls of Fear (E3M6) - Bag of Holding 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 363,
+             'doom_type': 8,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371483: {'name': 'The Halls of Fear (E3M6) - Tome of Power 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 364,
+             'doom_type': 86,
+             'region': "The Halls of Fear (E3M6) Main"},
+    371484: {'name': 'The Halls of Fear (E3M6) - Firemace',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 468,
+             'doom_type': 2002,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371485: {'name': 'The Halls of Fear (E3M6) - Hellstaff 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 472,
+             'doom_type': 2004,
+             'region': "The Halls of Fear (E3M6) Main"},
+    371486: {'name': 'The Halls of Fear (E3M6) - Firemace 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 506,
+             'doom_type': 2002,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371487: {'name': 'The Halls of Fear (E3M6) - Firemace 3',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 6,
+             'index': 507,
+             'doom_type': 2002,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371488: {'name': 'The Halls of Fear (E3M6) - Firemace 4',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': 508,
+             'doom_type': 2002,
+             'region': "The Halls of Fear (E3M6) Main"},
+    371489: {'name': 'The Halls of Fear (E3M6) - Firemace 5',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 6,
+             'index': 509,
+             'doom_type': 2002,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371490: {'name': 'The Halls of Fear (E3M6) - Firemace 6',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 6,
+             'index': 510,
+             'doom_type': 2002,
+             'region': "The Halls of Fear (E3M6) Green"},
+    371491: {'name': 'The Halls of Fear (E3M6) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Halls of Fear (E3M6) Blue"},
+    371492: {'name': 'The Chasm (E3M7) - Blue key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 5,
+             'doom_type': 79,
+             'region': "The Chasm (E3M7) Green"},
+    371493: {'name': 'The Chasm (E3M7) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 12,
+             'doom_type': 73,
+             'region': "The Chasm (E3M7) Yellow"},
+    371494: {'name': 'The Chasm (E3M7) - Yellow key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 26,
+             'doom_type': 80,
+             'region': "The Chasm (E3M7) Main"},
+    371495: {'name': 'The Chasm (E3M7) - Ethereal Crossbow',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 254,
+             'doom_type': 2001,
+             'region': "The Chasm (E3M7) Main"},
+    371496: {'name': 'The Chasm (E3M7) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 255,
+             'doom_type': 2004,
+             'region': "The Chasm (E3M7) Yellow"},
+    371497: {'name': 'The Chasm (E3M7) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 256,
+             'doom_type': 2005,
+             'region': "The Chasm (E3M7) Green"},
+    371498: {'name': 'The Chasm (E3M7) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 257,
+             'doom_type': 53,
+             'region': "The Chasm (E3M7) Main"},
+    371499: {'name': 'The Chasm (E3M7) - Phoenix Rod',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 259,
+             'doom_type': 2003,
+             'region': "The Chasm (E3M7) Green"},
+    371500: {'name': 'The Chasm (E3M7) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 7,
+             'index': 260,
+             'doom_type': 75,
+             'region': "The Chasm (E3M7) Green"},
+    371501: {'name': 'The Chasm (E3M7) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 262,
+             'doom_type': 8,
+             'region': "The Chasm (E3M7) Main"},
+    371502: {'name': 'The Chasm (E3M7) - Silver Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 268,
+             'doom_type': 85,
+             'region': "The Chasm (E3M7) Main"},
+    371503: {'name': 'The Chasm (E3M7) - Tome of Power',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 269,
+             'doom_type': 86,
+             'region': "The Chasm (E3M7) Main"},
+    371504: {'name': 'The Chasm (E3M7) - Torch',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 7,
+             'index': 270,
+             'doom_type': 33,
+             'region': "The Chasm (E3M7) Yellow"},
+    371505: {'name': 'The Chasm (E3M7) - Morph Ovum',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 278,
+             'doom_type': 30,
+             'region': "The Chasm (E3M7) Yellow"},
+    371506: {'name': 'The Chasm (E3M7) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 282,
+             'doom_type': 84,
+             'region': "The Chasm (E3M7) Green"},
+    371507: {'name': 'The Chasm (E3M7) - Mystic Urn',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 283,
+             'doom_type': 32,
+             'region': "The Chasm (E3M7) Green"},
+    371508: {'name': 'The Chasm (E3M7) - Enchanted Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 284,
+             'doom_type': 31,
+             'region': "The Chasm (E3M7) Green"},
+    371509: {'name': 'The Chasm (E3M7) - Map Scroll',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 285,
+             'doom_type': 35,
+             'region': "The Chasm (E3M7) Green"},
+    371510: {'name': 'The Chasm (E3M7) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 286,
+             'doom_type': 36,
+             'region': "The Chasm (E3M7) Green"},
+    371511: {'name': 'The Chasm (E3M7) - Tome of Power 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 287,
+             'doom_type': 86,
+             'region': "The Chasm (E3M7) Green"},
+    371512: {'name': 'The Chasm (E3M7) - Tome of Power 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 288,
+             'doom_type': 86,
+             'region': "The Chasm (E3M7) Green"},
+    371513: {'name': 'The Chasm (E3M7) - Torch 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 289,
+             'doom_type': 33,
+             'region': "The Chasm (E3M7) Green"},
+    371514: {'name': 'The Chasm (E3M7) - Shadowsphere 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 337,
+             'doom_type': 75,
+             'region': "The Chasm (E3M7) Main"},
+    371515: {'name': 'The Chasm (E3M7) - Bag of Holding 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': 660,
+             'doom_type': 8,
+             'region': "The Chasm (E3M7) Main"},
+    371516: {'name': 'The Chasm (E3M7) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Chasm (E3M7) Blue"},
+    371517: {'name': "D'Sparil'S Keep (E3M8) - Phoenix Rod",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 55,
+             'doom_type': 2003,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371518: {'name': "D'Sparil'S Keep (E3M8) - Ethereal Crossbow",
+             'episode': 3,
+             'check_sanity': True,
+             'map': 8,
+             'index': 56,
+             'doom_type': 2001,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371519: {'name': "D'Sparil'S Keep (E3M8) - Dragon Claw",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 57,
+             'doom_type': 53,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371520: {'name': "D'Sparil'S Keep (E3M8) - Gauntlets of the Necromancer",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 58,
+             'doom_type': 2005,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371521: {'name': "D'Sparil'S Keep (E3M8) - Hellstaff",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 59,
+             'doom_type': 2004,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371522: {'name': "D'Sparil'S Keep (E3M8) - Bag of Holding",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 63,
+             'doom_type': 8,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371523: {'name': "D'Sparil'S Keep (E3M8) - Mystic Urn",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 64,
+             'doom_type': 32,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371524: {'name': "D'Sparil'S Keep (E3M8) - Ring of Invincibility",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 65,
+             'doom_type': 84,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371525: {'name': "D'Sparil'S Keep (E3M8) - Shadowsphere",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 66,
+             'doom_type': 75,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371526: {'name': "D'Sparil'S Keep (E3M8) - Silver Shield",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 67,
+             'doom_type': 85,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371527: {'name': "D'Sparil'S Keep (E3M8) - Enchanted Shield",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 68,
+             'doom_type': 31,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371528: {'name': "D'Sparil'S Keep (E3M8) - Tome of Power",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': 69,
+             'doom_type': 86,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371529: {'name': "D'Sparil'S Keep (E3M8) - Tome of Power 2",
+             'episode': 3,
+             'check_sanity': True,
+             'map': 8,
+             'index': 70,
+             'doom_type': 86,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371530: {'name': "D'Sparil'S Keep (E3M8) - Chaos Device",
+             'episode': 3,
+             'check_sanity': True,
+             'map': 8,
+             'index': 71,
+             'doom_type': 36,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371531: {'name': "D'Sparil'S Keep (E3M8) - Tome of Power 3",
+             'episode': 3,
+             'check_sanity': True,
+             'map': 8,
+             'index': 245,
+             'doom_type': 86,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371532: {'name': "D'Sparil'S Keep (E3M8) - Exit",
+             'episode': 3,
+             'check_sanity': False,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "D'Sparil'S Keep (E3M8) Main"},
+    371533: {'name': 'The Aquifier (E3M9) - Blue key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 12,
+             'doom_type': 79,
+             'region': "The Aquifier (E3M9) Green"},
+    371534: {'name': 'The Aquifier (E3M9) - Green key',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 13,
+             'doom_type': 73,
+             'region': "The Aquifier (E3M9) Yellow"},
+    371535: {'name': 'The Aquifier (E3M9) - Yellow key',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 9,
+             'index': 14,
+             'doom_type': 80,
+             'region': "The Aquifier (E3M9) Main"},
+    371536: {'name': 'The Aquifier (E3M9) - Ethereal Crossbow',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 141,
+             'doom_type': 2001,
+             'region': "The Aquifier (E3M9) Main"},
+    371537: {'name': 'The Aquifier (E3M9) - Phoenix Rod',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 142,
+             'doom_type': 2003,
+             'region': "The Aquifier (E3M9) Yellow"},
+    371538: {'name': 'The Aquifier (E3M9) - Dragon Claw',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 143,
+             'doom_type': 53,
+             'region': "The Aquifier (E3M9) Green"},
+    371539: {'name': 'The Aquifier (E3M9) - Hellstaff',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 144,
+             'doom_type': 2004,
+             'region': "The Aquifier (E3M9) Green"},
+    371540: {'name': 'The Aquifier (E3M9) - Gauntlets of the Necromancer',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 145,
+             'doom_type': 2005,
+             'region': "The Aquifier (E3M9) Green"},
+    371541: {'name': 'The Aquifier (E3M9) - Ring of Invincibility',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 148,
+             'doom_type': 84,
+             'region': "The Aquifier (E3M9) Yellow"},
+    371542: {'name': 'The Aquifier (E3M9) - Mystic Urn',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 149,
+             'doom_type': 32,
+             'region': "The Aquifier (E3M9) Green"},
+    371543: {'name': 'The Aquifier (E3M9) - Silver Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 151,
+             'doom_type': 85,
+             'region': "The Aquifier (E3M9) Main"},
+    371544: {'name': 'The Aquifier (E3M9) - Tome of Power',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 152,
+             'doom_type': 86,
+             'region': "The Aquifier (E3M9) Main"},
+    371545: {'name': 'The Aquifier (E3M9) - Bag of Holding',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 153,
+             'doom_type': 8,
+             'region': "The Aquifier (E3M9) Yellow"},
+    371546: {'name': 'The Aquifier (E3M9) - Morph Ovum',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 154,
+             'doom_type': 30,
+             'region': "The Aquifier (E3M9) Green"},
+    371547: {'name': 'The Aquifier (E3M9) - Map Scroll',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 9,
+             'index': 155,
+             'doom_type': 35,
+             'region': "The Aquifier (E3M9) Green"},
+    371548: {'name': 'The Aquifier (E3M9) - Chaos Device',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 156,
+             'doom_type': 36,
+             'region': "The Aquifier (E3M9) Yellow"},
+    371549: {'name': 'The Aquifier (E3M9) - Enchanted Shield',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 157,
+             'doom_type': 31,
+             'region': "The Aquifier (E3M9) Green"},
+    371550: {'name': 'The Aquifier (E3M9) - Tome of Power 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 158,
+             'doom_type': 86,
+             'region': "The Aquifier (E3M9) Green"},
+    371551: {'name': 'The Aquifier (E3M9) - Torch',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 159,
+             'doom_type': 33,
+             'region': "The Aquifier (E3M9) Main"},
+    371552: {'name': 'The Aquifier (E3M9) - Shadowsphere',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 160,
+             'doom_type': 75,
+             'region': "The Aquifier (E3M9) Green"},
+    371553: {'name': 'The Aquifier (E3M9) - Silver Shield 2',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 9,
+             'index': 374,
+             'doom_type': 85,
+             'region': "The Aquifier (E3M9) Green"},
+    371554: {'name': 'The Aquifier (E3M9) - Firemace',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 478,
+             'doom_type': 2002,
+             'region': "The Aquifier (E3M9) Green"},
+    371555: {'name': 'The Aquifier (E3M9) - Firemace 2',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 526,
+             'doom_type': 2002,
+             'region': "The Aquifier (E3M9) Green"},
+    371556: {'name': 'The Aquifier (E3M9) - Firemace 3',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': 527,
+             'doom_type': 2002,
+             'region': "The Aquifier (E3M9) Green"},
+    371557: {'name': 'The Aquifier (E3M9) - Firemace 4',
+             'episode': 3,
+             'check_sanity': True,
+             'map': 9,
+             'index': 528,
+             'doom_type': 2002,
+             'region': "The Aquifier (E3M9) Yellow"},
+    371558: {'name': 'The Aquifier (E3M9) - Exit',
+             'episode': 3,
+             'check_sanity': False,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "The Aquifier (E3M9) Blue"},
+    371559: {'name': 'Catafalque (E4M1) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 4,
+             'doom_type': 80,
+             'region': "Catafalque (E4M1) Main"},
+    371560: {'name': 'Catafalque (E4M1) - Green key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 10,
+             'doom_type': 73,
+             'region': "Catafalque (E4M1) Yellow"},
+    371561: {'name': 'Catafalque (E4M1) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 100,
+             'doom_type': 2001,
+             'region': "Catafalque (E4M1) Main"},
+    371562: {'name': 'Catafalque (E4M1) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 101,
+             'doom_type': 2005,
+             'region': "Catafalque (E4M1) Yellow"},
+    371563: {'name': 'Catafalque (E4M1) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 102,
+             'doom_type': 53,
+             'region': "Catafalque (E4M1) Yellow"},
+    371564: {'name': 'Catafalque (E4M1) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 103,
+             'doom_type': 2004,
+             'region': "Catafalque (E4M1) Green"},
+    371565: {'name': 'Catafalque (E4M1) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 114,
+             'doom_type': 75,
+             'region': "Catafalque (E4M1) Yellow"},
+    371566: {'name': 'Catafalque (E4M1) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 115,
+             'doom_type': 84,
+             'region': "Catafalque (E4M1) Green"},
+    371567: {'name': 'Catafalque (E4M1) - Silver Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 116,
+             'doom_type': 85,
+             'region': "Catafalque (E4M1) Main"},
+    371568: {'name': 'Catafalque (E4M1) - Map Scroll',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 117,
+             'doom_type': 35,
+             'region': "Catafalque (E4M1) Green"},
+    371569: {'name': 'Catafalque (E4M1) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 118,
+             'doom_type': 36,
+             'region': "Catafalque (E4M1) Yellow"},
+    371570: {'name': 'Catafalque (E4M1) - Tome of Power',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 119,
+             'doom_type': 86,
+             'region': "Catafalque (E4M1) Yellow"},
+    371571: {'name': 'Catafalque (E4M1) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 120,
+             'doom_type': 86,
+             'region': "Catafalque (E4M1) Main"},
+    371572: {'name': 'Catafalque (E4M1) - Torch',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 121,
+             'doom_type': 33,
+             'region': "Catafalque (E4M1) Yellow"},
+    371573: {'name': 'Catafalque (E4M1) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 122,
+             'doom_type': 8,
+             'region': "Catafalque (E4M1) Main"},
+    371574: {'name': 'Catafalque (E4M1) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': 123,
+             'doom_type': 30,
+             'region': "Catafalque (E4M1) Main"},
+    371575: {'name': 'Catafalque (E4M1) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Catafalque (E4M1) Green"},
+    371576: {'name': 'Blockhouse (E4M2) - Green key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 18,
+             'doom_type': 73,
+             'region': "Blockhouse (E4M2) Yellow"},
+    371577: {'name': 'Blockhouse (E4M2) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 19,
+             'doom_type': 80,
+             'region': "Blockhouse (E4M2) Main"},
+    371578: {'name': 'Blockhouse (E4M2) - Blue key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 25,
+             'doom_type': 79,
+             'region': "Blockhouse (E4M2) Green"},
+    371579: {'name': 'Blockhouse (E4M2) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 46,
+             'doom_type': 2005,
+             'region': "Blockhouse (E4M2) Main"},
+    371580: {'name': 'Blockhouse (E4M2) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 47,
+             'doom_type': 2001,
+             'region': "Blockhouse (E4M2) Main"},
+    371581: {'name': 'Blockhouse (E4M2) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 48,
+             'doom_type': 53,
+             'region': "Blockhouse (E4M2) Main"},
+    371582: {'name': 'Blockhouse (E4M2) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 49,
+             'doom_type': 2004,
+             'region': "Blockhouse (E4M2) Main"},
+    371583: {'name': 'Blockhouse (E4M2) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 50,
+             'doom_type': 2003,
+             'region': "Blockhouse (E4M2) Main"},
+    371584: {'name': 'Blockhouse (E4M2) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 58,
+             'doom_type': 8,
+             'region': "Blockhouse (E4M2) Main"},
+    371585: {'name': 'Blockhouse (E4M2) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 2,
+             'index': 67,
+             'doom_type': 32,
+             'region': "Blockhouse (E4M2) Main"},
+    371586: {'name': 'Blockhouse (E4M2) - Silver Shield',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 2,
+             'index': 68,
+             'doom_type': 85,
+             'region': "Blockhouse (E4M2) Main"},
+    371587: {'name': 'Blockhouse (E4M2) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 2,
+             'index': 69,
+             'doom_type': 30,
+             'region': "Blockhouse (E4M2) Main"},
+    371588: {'name': 'Blockhouse (E4M2) - Tome of Power',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 2,
+             'index': 70,
+             'doom_type': 86,
+             'region': "Blockhouse (E4M2) Main"},
+    371589: {'name': 'Blockhouse (E4M2) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 71,
+             'doom_type': 36,
+             'region': "Blockhouse (E4M2) Green"},
+    371590: {'name': 'Blockhouse (E4M2) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 72,
+             'doom_type': 84,
+             'region': "Blockhouse (E4M2) Green"},
+    371591: {'name': 'Blockhouse (E4M2) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 73,
+             'doom_type': 8,
+             'region': "Blockhouse (E4M2) Green"},
+    371592: {'name': 'Blockhouse (E4M2) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 74,
+             'doom_type': 31,
+             'region': "Blockhouse (E4M2) Yellow"},
+    371593: {'name': 'Blockhouse (E4M2) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 75,
+             'doom_type': 75,
+             'region': "Blockhouse (E4M2) Main"},
+    371594: {'name': 'Blockhouse (E4M2) - Ring of Invincibility 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 226,
+             'doom_type': 84,
+             'region': "Blockhouse (E4M2) Lake"},
+    371595: {'name': 'Blockhouse (E4M2) - Shadowsphere 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': 227,
+             'doom_type': 75,
+             'region': "Blockhouse (E4M2) Lake"},
+    371596: {'name': 'Blockhouse (E4M2) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Blockhouse (E4M2) Blue"},
+    371597: {'name': 'Ambulatory (E4M3) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 10,
+             'doom_type': 80,
+             'region': "Ambulatory (E4M3) Main"},
+    371598: {'name': 'Ambulatory (E4M3) - Green key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 11,
+             'doom_type': 73,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371599: {'name': 'Ambulatory (E4M3) - Blue key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 12,
+             'doom_type': 79,
+             'region': "Ambulatory (E4M3) Green"},
+    371600: {'name': 'Ambulatory (E4M3) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 3,
+             'index': 265,
+             'doom_type': 2001,
+             'region': "Ambulatory (E4M3) Main"},
+    371601: {'name': 'Ambulatory (E4M3) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 3,
+             'index': 266,
+             'doom_type': 2005,
+             'region': "Ambulatory (E4M3) Main"},
+    371602: {'name': 'Ambulatory (E4M3) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 267,
+             'doom_type': 53,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371603: {'name': 'Ambulatory (E4M3) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 268,
+             'doom_type': 2004,
+             'region': "Ambulatory (E4M3) Green"},
+    371604: {'name': 'Ambulatory (E4M3) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 269,
+             'doom_type': 2003,
+             'region': "Ambulatory (E4M3) Blue"},
+    371605: {'name': 'Ambulatory (E4M3) - Tome of Power',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 270,
+             'doom_type': 86,
+             'region': "Ambulatory (E4M3) Main"},
+    371606: {'name': 'Ambulatory (E4M3) - Silver Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 271,
+             'doom_type': 85,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371607: {'name': 'Ambulatory (E4M3) - Map Scroll',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 3,
+             'index': 272,
+             'doom_type': 35,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371608: {'name': 'Ambulatory (E4M3) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 273,
+             'doom_type': 8,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371609: {'name': 'Ambulatory (E4M3) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 274,
+             'doom_type': 75,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371610: {'name': 'Ambulatory (E4M3) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 3,
+             'index': 275,
+             'doom_type': 30,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371611: {'name': 'Ambulatory (E4M3) - Torch',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 3,
+             'index': 276,
+             'doom_type': 33,
+             'region': "Ambulatory (E4M3) Green"},
+    371612: {'name': 'Ambulatory (E4M3) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 277,
+             'doom_type': 86,
+             'region': "Ambulatory (E4M3) Green"},
+    371613: {'name': 'Ambulatory (E4M3) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 278,
+             'doom_type': 31,
+             'region': "Ambulatory (E4M3) Blue"},
+    371614: {'name': 'Ambulatory (E4M3) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 279,
+             'doom_type': 32,
+             'region': "Ambulatory (E4M3) Blue"},
+    371615: {'name': 'Ambulatory (E4M3) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 281,
+             'doom_type': 84,
+             'region': "Ambulatory (E4M3) Blue"},
+    371616: {'name': 'Ambulatory (E4M3) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 282,
+             'doom_type': 36,
+             'region': "Ambulatory (E4M3) Green"},
+    371617: {'name': 'Ambulatory (E4M3) - Ring of Invincibility 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 283,
+             'doom_type': 84,
+             'region': "Ambulatory (E4M3) Green"},
+    371618: {'name': 'Ambulatory (E4M3) - Morph Ovum 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 284,
+             'doom_type': 30,
+             'region': "Ambulatory (E4M3) Blue"},
+    371619: {'name': 'Ambulatory (E4M3) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 285,
+             'doom_type': 8,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371620: {'name': 'Ambulatory (E4M3) - Firemace',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 297,
+             'doom_type': 2002,
+             'region': "Ambulatory (E4M3) Green"},
+    371621: {'name': 'Ambulatory (E4M3) - Firemace 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 298,
+             'doom_type': 2002,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371622: {'name': 'Ambulatory (E4M3) - Firemace 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 299,
+             'doom_type': 2002,
+             'region': "Ambulatory (E4M3) Yellow"},
+    371623: {'name': 'Ambulatory (E4M3) - Firemace 4',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': 300,
+             'doom_type': 2002,
+             'region': "Ambulatory (E4M3) Blue"},
+    371624: {'name': 'Ambulatory (E4M3) - Firemace 5',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 3,
+             'index': 301,
+             'doom_type': 2002,
+             'region': "Ambulatory (E4M3) Green"},
+    371625: {'name': 'Ambulatory (E4M3) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Ambulatory (E4M3) Blue"},
+    371626: {'name': 'Sepulcher (E4M4) - Silver Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 27,
+             'doom_type': 85,
+             'region': "Sepulcher (E4M4) Main"},
+    371627: {'name': 'Sepulcher (E4M4) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 28,
+             'doom_type': 2004,
+             'region': "Sepulcher (E4M4) Main"},
+    371628: {'name': 'Sepulcher (E4M4) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 29,
+             'doom_type': 53,
+             'region': "Sepulcher (E4M4) Main"},
+    371629: {'name': 'Sepulcher (E4M4) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 30,
+             'doom_type': 2001,
+             'region': "Sepulcher (E4M4) Main"},
+    371630: {'name': 'Sepulcher (E4M4) - Tome of Power',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 31,
+             'doom_type': 86,
+             'region': "Sepulcher (E4M4) Main"},
+    371631: {'name': 'Sepulcher (E4M4) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 40,
+             'doom_type': 75,
+             'region': "Sepulcher (E4M4) Main"},
+    371632: {'name': 'Sepulcher (E4M4) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 4,
+             'index': 41,
+             'doom_type': 32,
+             'region': "Sepulcher (E4M4) Main"},
+    371633: {'name': 'Sepulcher (E4M4) - Chaos Device',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 4,
+             'index': 50,
+             'doom_type': 36,
+             'region': "Sepulcher (E4M4) Main"},
+    371634: {'name': 'Sepulcher (E4M4) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 51,
+             'doom_type': 31,
+             'region': "Sepulcher (E4M4) Main"},
+    371635: {'name': 'Sepulcher (E4M4) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 65,
+             'doom_type': 30,
+             'region': "Sepulcher (E4M4) Main"},
+    371636: {'name': 'Sepulcher (E4M4) - Torch',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 66,
+             'doom_type': 33,
+             'region': "Sepulcher (E4M4) Main"},
+    371637: {'name': 'Sepulcher (E4M4) - Firemace',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 67,
+             'doom_type': 2002,
+             'region': "Sepulcher (E4M4) Main"},
+    371638: {'name': 'Sepulcher (E4M4) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 74,
+             'doom_type': 2003,
+             'region': "Sepulcher (E4M4) Main"},
+    371639: {'name': 'Sepulcher (E4M4) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 137,
+             'doom_type': 84,
+             'region': "Sepulcher (E4M4) Main"},
+    371640: {'name': 'Sepulcher (E4M4) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 138,
+             'doom_type': 8,
+             'region': "Sepulcher (E4M4) Main"},
+    371641: {'name': 'Sepulcher (E4M4) - Ethereal Crossbow 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 199,
+             'doom_type': 2001,
+             'region': "Sepulcher (E4M4) Main"},
+    371642: {'name': 'Sepulcher (E4M4) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 235,
+             'doom_type': 8,
+             'region': "Sepulcher (E4M4) Main"},
+    371643: {'name': 'Sepulcher (E4M4) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 239,
+             'doom_type': 86,
+             'region': "Sepulcher (E4M4) Main"},
+    371644: {'name': 'Sepulcher (E4M4) - Torch 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 243,
+             'doom_type': 33,
+             'region': "Sepulcher (E4M4) Main"},
+    371645: {'name': 'Sepulcher (E4M4) - Silver Shield 2',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 4,
+             'index': 244,
+             'doom_type': 85,
+             'region': "Sepulcher (E4M4) Main"},
+    371646: {'name': 'Sepulcher (E4M4) - Firemace 2',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 4,
+             'index': 307,
+             'doom_type': 2002,
+             'region': "Sepulcher (E4M4) Main"},
+    371647: {'name': 'Sepulcher (E4M4) - Firemace 3',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 4,
+             'index': 308,
+             'doom_type': 2002,
+             'region': "Sepulcher (E4M4) Main"},
+    371648: {'name': 'Sepulcher (E4M4) - Firemace 4',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 4,
+             'index': 309,
+             'doom_type': 2002,
+             'region': "Sepulcher (E4M4) Main"},
+    371649: {'name': 'Sepulcher (E4M4) - Firemace 5',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 310,
+             'doom_type': 2002,
+             'region': "Sepulcher (E4M4) Main"},
+    371650: {'name': 'Sepulcher (E4M4) - Dragon Claw 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 325,
+             'doom_type': 53,
+             'region': "Sepulcher (E4M4) Main"},
+    371651: {'name': 'Sepulcher (E4M4) - Phoenix Rod 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': 339,
+             'doom_type': 2003,
+             'region': "Sepulcher (E4M4) Main"},
+    371652: {'name': 'Sepulcher (E4M4) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Sepulcher (E4M4) Main"},
+    371653: {'name': 'Great Stair (E4M5) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 3,
+             'doom_type': 2001,
+             'region': "Great Stair (E4M5) Main"},
+    371654: {'name': 'Great Stair (E4M5) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 27,
+             'doom_type': 80,
+             'region': "Great Stair (E4M5) Main"},
+    371655: {'name': 'Great Stair (E4M5) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 5,
+             'index': 58,
+             'doom_type': 53,
+             'region': "Great Stair (E4M5) Yellow"},
+    371656: {'name': 'Great Stair (E4M5) - Green key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 64,
+             'doom_type': 73,
+             'region': "Great Stair (E4M5) Yellow"},
+    371657: {'name': 'Great Stair (E4M5) - Blue key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 71,
+             'doom_type': 79,
+             'region': "Great Stair (E4M5) Green"},
+    371658: {'name': 'Great Stair (E4M5) - Silver Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 78,
+             'doom_type': 85,
+             'region': "Great Stair (E4M5) Main"},
+    371659: {'name': 'Great Stair (E4M5) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 90,
+             'doom_type': 2005,
+             'region': "Great Stair (E4M5) Main"},
+    371660: {'name': 'Great Stair (E4M5) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 91,
+             'doom_type': 2004,
+             'region': "Great Stair (E4M5) Yellow"},
+    371661: {'name': 'Great Stair (E4M5) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 5,
+             'index': 92,
+             'doom_type': 2003,
+             'region': "Great Stair (E4M5) Green"},
+    371662: {'name': 'Great Stair (E4M5) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 93,
+             'doom_type': 8,
+             'region': "Great Stair (E4M5) Main"},
+    371663: {'name': 'Great Stair (E4M5) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 94,
+             'doom_type': 8,
+             'region': "Great Stair (E4M5) Green"},
+    371664: {'name': 'Great Stair (E4M5) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 95,
+             'doom_type': 30,
+             'region': "Great Stair (E4M5) Main"},
+    371665: {'name': 'Great Stair (E4M5) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 110,
+             'doom_type': 32,
+             'region': "Great Stair (E4M5) Yellow"},
+    371666: {'name': 'Great Stair (E4M5) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 111,
+             'doom_type': 75,
+             'region': "Great Stair (E4M5) Yellow"},
+    371667: {'name': 'Great Stair (E4M5) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 112,
+             'doom_type': 84,
+             'region': "Great Stair (E4M5) Main"},
+    371668: {'name': 'Great Stair (E4M5) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 113,
+             'doom_type': 31,
+             'region': "Great Stair (E4M5) Green"},
+    371669: {'name': 'Great Stair (E4M5) - Map Scroll',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 114,
+             'doom_type': 35,
+             'region': "Great Stair (E4M5) Green"},
+    371670: {'name': 'Great Stair (E4M5) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 115,
+             'doom_type': 36,
+             'region': "Great Stair (E4M5) Main"},
+    371671: {'name': 'Great Stair (E4M5) - Tome of Power',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 5,
+             'index': 116,
+             'doom_type': 86,
+             'region': "Great Stair (E4M5) Main"},
+    371672: {'name': 'Great Stair (E4M5) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 117,
+             'doom_type': 86,
+             'region': "Great Stair (E4M5) Yellow"},
+    371673: {'name': 'Great Stair (E4M5) - Torch',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 5,
+             'index': 118,
+             'doom_type': 33,
+             'region': "Great Stair (E4M5) Main"},
+    371674: {'name': 'Great Stair (E4M5) - Firemace',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 5,
+             'index': 123,
+             'doom_type': 2002,
+             'region': "Great Stair (E4M5) Main"},
+    371675: {'name': 'Great Stair (E4M5) - Firemace 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 124,
+             'doom_type': 2002,
+             'region': "Great Stair (E4M5) Main"},
+    371676: {'name': 'Great Stair (E4M5) - Firemace 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 125,
+             'doom_type': 2002,
+             'region': "Great Stair (E4M5) Yellow"},
+    371677: {'name': 'Great Stair (E4M5) - Firemace 4',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 126,
+             'doom_type': 2002,
+             'region': "Great Stair (E4M5) Blue"},
+    371678: {'name': 'Great Stair (E4M5) - Firemace 5',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 127,
+             'doom_type': 2002,
+             'region': "Great Stair (E4M5) Yellow"},
+    371679: {'name': 'Great Stair (E4M5) - Mystic Urn 2',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 5,
+             'index': 507,
+             'doom_type': 32,
+             'region': "Great Stair (E4M5) Green"},
+    371680: {'name': 'Great Stair (E4M5) - Tome of Power 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': 508,
+             'doom_type': 86,
+             'region': "Great Stair (E4M5) Green"},
+    371681: {'name': 'Great Stair (E4M5) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Great Stair (E4M5) Blue"},
+    371682: {'name': 'Halls of the Apostate (E4M6) - Green key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 17,
+             'doom_type': 73,
+             'region': "Halls of the Apostate (E4M6) Yellow"},
+    371683: {'name': 'Halls of the Apostate (E4M6) - Blue key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 18,
+             'doom_type': 79,
+             'region': "Halls of the Apostate (E4M6) Green"},
+    371684: {'name': 'Halls of the Apostate (E4M6) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 59,
+             'doom_type': 2005,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371685: {'name': 'Halls of the Apostate (E4M6) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 60,
+             'doom_type': 2001,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371686: {'name': 'Halls of the Apostate (E4M6) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 6,
+             'index': 61,
+             'doom_type': 53,
+             'region': "Halls of the Apostate (E4M6) Yellow"},
+    371687: {'name': 'Halls of the Apostate (E4M6) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 62,
+             'doom_type': 2004,
+             'region': "Halls of the Apostate (E4M6) Green"},
+    371688: {'name': 'Halls of the Apostate (E4M6) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 63,
+             'doom_type': 2003,
+             'region': "Halls of the Apostate (E4M6) Blue"},
+    371689: {'name': 'Halls of the Apostate (E4M6) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 68,
+             'doom_type': 8,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371690: {'name': 'Halls of the Apostate (E4M6) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 79,
+             'doom_type': 30,
+             'region': "Halls of the Apostate (E4M6) Yellow"},
+    371691: {'name': 'Halls of the Apostate (E4M6) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 80,
+             'doom_type': 32,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371692: {'name': 'Halls of the Apostate (E4M6) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 81,
+             'doom_type': 75,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371693: {'name': 'Halls of the Apostate (E4M6) - Silver Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 82,
+             'doom_type': 85,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371694: {'name': 'Halls of the Apostate (E4M6) - Silver Shield 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 83,
+             'doom_type': 85,
+             'region': "Halls of the Apostate (E4M6) Blue"},
+    371695: {'name': 'Halls of the Apostate (E4M6) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 6,
+             'index': 84,
+             'doom_type': 31,
+             'region': "Halls of the Apostate (E4M6) Green"},
+    371696: {'name': 'Halls of the Apostate (E4M6) - Map Scroll',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 85,
+             'doom_type': 35,
+             'region': "Halls of the Apostate (E4M6) Green"},
+    371697: {'name': 'Halls of the Apostate (E4M6) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 86,
+             'doom_type': 36,
+             'region': "Halls of the Apostate (E4M6) Yellow"},
+    371698: {'name': 'Halls of the Apostate (E4M6) - Tome of Power',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 6,
+             'index': 87,
+             'doom_type': 86,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371699: {'name': 'Halls of the Apostate (E4M6) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 88,
+             'doom_type': 86,
+             'region': "Halls of the Apostate (E4M6) Blue"},
+    371700: {'name': 'Halls of the Apostate (E4M6) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 89,
+             'doom_type': 8,
+             'region': "Halls of the Apostate (E4M6) Green"},
+    371701: {'name': 'Halls of the Apostate (E4M6) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 108,
+             'doom_type': 84,
+             'region': "Halls of the Apostate (E4M6) Yellow"},
+    371702: {'name': 'Halls of the Apostate (E4M6) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': 420,
+             'doom_type': 80,
+             'region': "Halls of the Apostate (E4M6) Main"},
+    371703: {'name': 'Halls of the Apostate (E4M6) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Halls of the Apostate (E4M6) Blue"},
+    371704: {'name': 'Ramparts of Perdition (E4M7) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 28,
+             'doom_type': 80,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371705: {'name': 'Ramparts of Perdition (E4M7) - Green key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 33,
+             'doom_type': 73,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371706: {'name': 'Ramparts of Perdition (E4M7) - Blue key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 36,
+             'doom_type': 79,
+             'region': "Ramparts of Perdition (E4M7) Green"},
+    371707: {'name': 'Ramparts of Perdition (E4M7) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 39,
+             'doom_type': 84,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371708: {'name': 'Ramparts of Perdition (E4M7) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 40,
+             'doom_type': 32,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371709: {'name': 'Ramparts of Perdition (E4M7) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 124,
+             'doom_type': 2005,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371710: {'name': 'Ramparts of Perdition (E4M7) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 7,
+             'index': 125,
+             'doom_type': 2001,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371711: {'name': 'Ramparts of Perdition (E4M7) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 7,
+             'index': 126,
+             'doom_type': 53,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371712: {'name': 'Ramparts of Perdition (E4M7) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 127,
+             'doom_type': 2003,
+             'region': "Ramparts of Perdition (E4M7) Green"},
+    371713: {'name': 'Ramparts of Perdition (E4M7) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 128,
+             'doom_type': 2004,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371714: {'name': 'Ramparts of Perdition (E4M7) - Ethereal Crossbow 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 129,
+             'doom_type': 2001,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371715: {'name': 'Ramparts of Perdition (E4M7) - Dragon Claw 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 130,
+             'doom_type': 53,
+             'region': "Ramparts of Perdition (E4M7) Blue"},
+    371716: {'name': 'Ramparts of Perdition (E4M7) - Phoenix Rod 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 131,
+             'doom_type': 2003,
+             'region': "Ramparts of Perdition (E4M7) Blue"},
+    371717: {'name': 'Ramparts of Perdition (E4M7) - Hellstaff 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 132,
+             'doom_type': 2004,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371718: {'name': 'Ramparts of Perdition (E4M7) - Firemace',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 7,
+             'index': 133,
+             'doom_type': 2002,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371719: {'name': 'Ramparts of Perdition (E4M7) - Firemace 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 134,
+             'doom_type': 2002,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371720: {'name': 'Ramparts of Perdition (E4M7) - Firemace 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 135,
+             'doom_type': 2002,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371721: {'name': 'Ramparts of Perdition (E4M7) - Firemace 4',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 136,
+             'doom_type': 2002,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371722: {'name': 'Ramparts of Perdition (E4M7) - Firemace 5',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 7,
+             'index': 137,
+             'doom_type': 2002,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371723: {'name': 'Ramparts of Perdition (E4M7) - Firemace 6',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 138,
+             'doom_type': 2002,
+             'region': "Ramparts of Perdition (E4M7) Blue"},
+    371724: {'name': 'Ramparts of Perdition (E4M7) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 140,
+             'doom_type': 8,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371725: {'name': 'Ramparts of Perdition (E4M7) - Tome of Power',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 141,
+             'doom_type': 86,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371726: {'name': 'Ramparts of Perdition (E4M7) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 7,
+             'index': 142,
+             'doom_type': 8,
+             'region': "Ramparts of Perdition (E4M7) Green"},
+    371727: {'name': 'Ramparts of Perdition (E4M7) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 143,
+             'doom_type': 30,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371728: {'name': 'Ramparts of Perdition (E4M7) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 153,
+             'doom_type': 75,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371729: {'name': 'Ramparts of Perdition (E4M7) - Silver Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 154,
+             'doom_type': 85,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371730: {'name': 'Ramparts of Perdition (E4M7) - Silver Shield 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 155,
+             'doom_type': 85,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371731: {'name': 'Ramparts of Perdition (E4M7) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 156,
+             'doom_type': 31,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371732: {'name': 'Ramparts of Perdition (E4M7) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 157,
+             'doom_type': 86,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371733: {'name': 'Ramparts of Perdition (E4M7) - Tome of Power 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 158,
+             'doom_type': 86,
+             'region': "Ramparts of Perdition (E4M7) Blue"},
+    371734: {'name': 'Ramparts of Perdition (E4M7) - Torch',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 159,
+             'doom_type': 33,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371735: {'name': 'Ramparts of Perdition (E4M7) - Torch 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 160,
+             'doom_type': 33,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371736: {'name': 'Ramparts of Perdition (E4M7) - Mystic Urn 2',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 7,
+             'index': 161,
+             'doom_type': 32,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371737: {'name': 'Ramparts of Perdition (E4M7) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': 162,
+             'doom_type': 36,
+             'region': "Ramparts of Perdition (E4M7) Yellow"},
+    371738: {'name': 'Ramparts of Perdition (E4M7) - Map Scroll',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 7,
+             'index': 163,
+             'doom_type': 35,
+             'region': "Ramparts of Perdition (E4M7) Main"},
+    371739: {'name': 'Ramparts of Perdition (E4M7) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Ramparts of Perdition (E4M7) Blue"},
+    371740: {'name': 'Shattered Bridge (E4M8) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 5,
+             'doom_type': 80,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371741: {'name': 'Shattered Bridge (E4M8) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 58,
+             'doom_type': 53,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371742: {'name': 'Shattered Bridge (E4M8) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 79,
+             'doom_type': 2003,
+             'region': "Shattered Bridge (E4M8) Boss"},
+    371743: {'name': 'Shattered Bridge (E4M8) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 80,
+             'doom_type': 2001,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371744: {'name': 'Shattered Bridge (E4M8) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 81,
+             'doom_type': 2005,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371745: {'name': 'Shattered Bridge (E4M8) - Hellstaff',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 8,
+             'index': 82,
+             'doom_type': 2004,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371746: {'name': 'Shattered Bridge (E4M8) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 8,
+             'index': 96,
+             'doom_type': 8,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371747: {'name': 'Shattered Bridge (E4M8) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 8,
+             'index': 97,
+             'doom_type': 30,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371748: {'name': 'Shattered Bridge (E4M8) - Silver Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 98,
+             'doom_type': 85,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371749: {'name': 'Shattered Bridge (E4M8) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 108,
+             'doom_type': 8,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371750: {'name': 'Shattered Bridge (E4M8) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 109,
+             'doom_type': 32,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371751: {'name': 'Shattered Bridge (E4M8) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 8,
+             'index': 110,
+             'doom_type': 75,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371752: {'name': 'Shattered Bridge (E4M8) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 111,
+             'doom_type': 84,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371753: {'name': 'Shattered Bridge (E4M8) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 112,
+             'doom_type': 36,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371754: {'name': 'Shattered Bridge (E4M8) - Tome of Power',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 8,
+             'index': 113,
+             'doom_type': 86,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371755: {'name': 'Shattered Bridge (E4M8) - Torch',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 114,
+             'doom_type': 33,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371756: {'name': 'Shattered Bridge (E4M8) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 115,
+             'doom_type': 86,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371757: {'name': 'Shattered Bridge (E4M8) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': 118,
+             'doom_type': 31,
+             'region': "Shattered Bridge (E4M8) Main"},
+    371758: {'name': 'Shattered Bridge (E4M8) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Shattered Bridge (E4M8) Boss"},
+    371759: {'name': 'Mausoleum (E4M9) - Yellow key',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 50,
+             'doom_type': 80,
+             'region': "Mausoleum (E4M9) Main"},
+    371760: {'name': 'Mausoleum (E4M9) - Gauntlets of the Necromancer',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 59,
+             'doom_type': 2005,
+             'region': "Mausoleum (E4M9) Main"},
+    371761: {'name': 'Mausoleum (E4M9) - Ethereal Crossbow',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 60,
+             'doom_type': 2001,
+             'region': "Mausoleum (E4M9) Main"},
+    371762: {'name': 'Mausoleum (E4M9) - Dragon Claw',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 61,
+             'doom_type': 53,
+             'region': "Mausoleum (E4M9) Main"},
+    371763: {'name': 'Mausoleum (E4M9) - Hellstaff',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 62,
+             'doom_type': 2004,
+             'region': "Mausoleum (E4M9) Main"},
+    371764: {'name': 'Mausoleum (E4M9) - Phoenix Rod',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 63,
+             'doom_type': 2003,
+             'region': "Mausoleum (E4M9) Main"},
+    371765: {'name': 'Mausoleum (E4M9) - Firemace',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 64,
+             'doom_type': 2002,
+             'region': "Mausoleum (E4M9) Main"},
+    371766: {'name': 'Mausoleum (E4M9) - Firemace 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 65,
+             'doom_type': 2002,
+             'region': "Mausoleum (E4M9) Main"},
+    371767: {'name': 'Mausoleum (E4M9) - Firemace 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 66,
+             'doom_type': 2002,
+             'region': "Mausoleum (E4M9) Main"},
+    371768: {'name': 'Mausoleum (E4M9) - Firemace 4',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 67,
+             'doom_type': 2002,
+             'region': "Mausoleum (E4M9) Main"},
+    371769: {'name': 'Mausoleum (E4M9) - Bag of Holding',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 68,
+             'doom_type': 8,
+             'region': "Mausoleum (E4M9) Main"},
+    371770: {'name': 'Mausoleum (E4M9) - Bag of Holding 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 69,
+             'doom_type': 8,
+             'region': "Mausoleum (E4M9) Main"},
+    371771: {'name': 'Mausoleum (E4M9) - Bag of Holding 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 70,
+             'doom_type': 8,
+             'region': "Mausoleum (E4M9) Main"},
+    371772: {'name': 'Mausoleum (E4M9) - Bag of Holding 4',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 71,
+             'doom_type': 8,
+             'region': "Mausoleum (E4M9) Yellow"},
+    371773: {'name': 'Mausoleum (E4M9) - Morph Ovum',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 79,
+             'doom_type': 30,
+             'region': "Mausoleum (E4M9) Main"},
+    371774: {'name': 'Mausoleum (E4M9) - Mystic Urn',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 81,
+             'doom_type': 32,
+             'region': "Mausoleum (E4M9) Main"},
+    371775: {'name': 'Mausoleum (E4M9) - Shadowsphere',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 82,
+             'doom_type': 75,
+             'region': "Mausoleum (E4M9) Main"},
+    371776: {'name': 'Mausoleum (E4M9) - Ring of Invincibility',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 83,
+             'doom_type': 84,
+             'region': "Mausoleum (E4M9) Main"},
+    371777: {'name': 'Mausoleum (E4M9) - Silver Shield',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 9,
+             'index': 84,
+             'doom_type': 85,
+             'region': "Mausoleum (E4M9) Main"},
+    371778: {'name': 'Mausoleum (E4M9) - Silver Shield 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 85,
+             'doom_type': 85,
+             'region': "Mausoleum (E4M9) Main"},
+    371779: {'name': 'Mausoleum (E4M9) - Enchanted Shield',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 86,
+             'doom_type': 31,
+             'region': "Mausoleum (E4M9) Yellow"},
+    371780: {'name': 'Mausoleum (E4M9) - Map Scroll',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 87,
+             'doom_type': 35,
+             'region': "Mausoleum (E4M9) Yellow"},
+    371781: {'name': 'Mausoleum (E4M9) - Chaos Device',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 88,
+             'doom_type': 36,
+             'region': "Mausoleum (E4M9) Main"},
+    371782: {'name': 'Mausoleum (E4M9) - Torch',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 89,
+             'doom_type': 33,
+             'region': "Mausoleum (E4M9) Main"},
+    371783: {'name': 'Mausoleum (E4M9) - Torch 2',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 9,
+             'index': 90,
+             'doom_type': 33,
+             'region': "Mausoleum (E4M9) Main"},
+    371784: {'name': 'Mausoleum (E4M9) - Tome of Power',
+             'episode': 4,
+             'check_sanity': True,
+             'map': 9,
+             'index': 91,
+             'doom_type': 86,
+             'region': "Mausoleum (E4M9) Main"},
+    371785: {'name': 'Mausoleum (E4M9) - Tome of Power 2',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 93,
+             'doom_type': 86,
+             'region': "Mausoleum (E4M9) Main"},
+    371786: {'name': 'Mausoleum (E4M9) - Tome of Power 3',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': 94,
+             'doom_type': 86,
+             'region': "Mausoleum (E4M9) Main"},
+    371787: {'name': 'Mausoleum (E4M9) - Exit',
+             'episode': 4,
+             'check_sanity': False,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Mausoleum (E4M9) Yellow"},
+    371788: {'name': 'Ochre Cliffs (E5M1) - Yellow key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 4,
+             'doom_type': 80,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371789: {'name': 'Ochre Cliffs (E5M1) - Blue key',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 1,
+             'index': 7,
+             'doom_type': 79,
+             'region': "Ochre Cliffs (E5M1) Green"},
+    371790: {'name': 'Ochre Cliffs (E5M1) - Green key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 9,
+             'doom_type': 73,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371791: {'name': 'Ochre Cliffs (E5M1) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 92,
+             'doom_type': 2005,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371792: {'name': 'Ochre Cliffs (E5M1) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 93,
+             'doom_type': 2001,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371793: {'name': 'Ochre Cliffs (E5M1) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 94,
+             'doom_type': 53,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371794: {'name': 'Ochre Cliffs (E5M1) - Hellstaff',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 95,
+             'doom_type': 2004,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371795: {'name': 'Ochre Cliffs (E5M1) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 96,
+             'doom_type': 2003,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371796: {'name': 'Ochre Cliffs (E5M1) - Firemace',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 1,
+             'index': 97,
+             'doom_type': 2002,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371797: {'name': 'Ochre Cliffs (E5M1) - Firemace 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 98,
+             'doom_type': 2002,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371798: {'name': 'Ochre Cliffs (E5M1) - Firemace 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 99,
+             'doom_type': 2002,
+             'region': "Ochre Cliffs (E5M1) Green"},
+    371799: {'name': 'Ochre Cliffs (E5M1) - Firemace 4',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 100,
+             'doom_type': 2002,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371800: {'name': 'Ochre Cliffs (E5M1) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 101,
+             'doom_type': 8,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371801: {'name': 'Ochre Cliffs (E5M1) - Morph Ovum',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 102,
+             'doom_type': 30,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371802: {'name': 'Ochre Cliffs (E5M1) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 112,
+             'doom_type': 32,
+             'region': "Ochre Cliffs (E5M1) Green"},
+    371803: {'name': 'Ochre Cliffs (E5M1) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 1,
+             'index': 113,
+             'doom_type': 75,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371804: {'name': 'Ochre Cliffs (E5M1) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 114,
+             'doom_type': 84,
+             'region': "Ochre Cliffs (E5M1) Blue"},
+    371805: {'name': 'Ochre Cliffs (E5M1) - Silver Shield',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 1,
+             'index': 115,
+             'doom_type': 85,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371806: {'name': 'Ochre Cliffs (E5M1) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 116,
+             'doom_type': 31,
+             'region': "Ochre Cliffs (E5M1) Blue"},
+    371807: {'name': 'Ochre Cliffs (E5M1) - Map Scroll',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 117,
+             'doom_type': 35,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371808: {'name': 'Ochre Cliffs (E5M1) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 118,
+             'doom_type': 36,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371809: {'name': 'Ochre Cliffs (E5M1) - Torch',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 119,
+             'doom_type': 33,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371810: {'name': 'Ochre Cliffs (E5M1) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 120,
+             'doom_type': 86,
+             'region': "Ochre Cliffs (E5M1) Main"},
+    371811: {'name': 'Ochre Cliffs (E5M1) - Tome of Power 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 121,
+             'doom_type': 86,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371812: {'name': 'Ochre Cliffs (E5M1) - Tome of Power 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 122,
+             'doom_type': 86,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371813: {'name': 'Ochre Cliffs (E5M1) - Bag of Holding 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': 129,
+             'doom_type': 8,
+             'region': "Ochre Cliffs (E5M1) Yellow"},
+    371814: {'name': 'Ochre Cliffs (E5M1) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 1,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Ochre Cliffs (E5M1) Blue"},
+    371815: {'name': 'Rapids (E5M2) - Green key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 2,
+             'doom_type': 73,
+             'region': "Rapids (E5M2) Yellow"},
+    371816: {'name': 'Rapids (E5M2) - Yellow key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 3,
+             'doom_type': 80,
+             'region': "Rapids (E5M2) Main"},
+    371817: {'name': 'Rapids (E5M2) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 34,
+             'doom_type': 2001,
+             'region': "Rapids (E5M2) Main"},
+    371818: {'name': 'Rapids (E5M2) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 35,
+             'doom_type': 2005,
+             'region': "Rapids (E5M2) Main"},
+    371819: {'name': 'Rapids (E5M2) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 36,
+             'doom_type': 53,
+             'region': "Rapids (E5M2) Yellow"},
+    371820: {'name': 'Rapids (E5M2) - Hellstaff',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 2,
+             'index': 37,
+             'doom_type': 2004,
+             'region': "Rapids (E5M2) Yellow"},
+    371821: {'name': 'Rapids (E5M2) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 38,
+             'doom_type': 2003,
+             'region': "Rapids (E5M2) Green"},
+    371822: {'name': 'Rapids (E5M2) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 39,
+             'doom_type': 8,
+             'region': "Rapids (E5M2) Yellow"},
+    371823: {'name': 'Rapids (E5M2) - Bag of Holding 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 40,
+             'doom_type': 8,
+             'region': "Rapids (E5M2) Yellow"},
+    371824: {'name': 'Rapids (E5M2) - Bag of Holding 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 41,
+             'doom_type': 8,
+             'region': "Rapids (E5M2) Yellow"},
+    371825: {'name': 'Rapids (E5M2) - Morph Ovum',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 42,
+             'doom_type': 30,
+             'region': "Rapids (E5M2) Yellow"},
+    371826: {'name': 'Rapids (E5M2) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 50,
+             'doom_type': 32,
+             'region': "Rapids (E5M2) Green"},
+    371827: {'name': 'Rapids (E5M2) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 2,
+             'index': 51,
+             'doom_type': 75,
+             'region': "Rapids (E5M2) Yellow"},
+    371828: {'name': 'Rapids (E5M2) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 52,
+             'doom_type': 84,
+             'region': "Rapids (E5M2) Green"},
+    371829: {'name': 'Rapids (E5M2) - Silver Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 53,
+             'doom_type': 85,
+             'region': "Rapids (E5M2) Main"},
+    371830: {'name': 'Rapids (E5M2) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 54,
+             'doom_type': 31,
+             'region': "Rapids (E5M2) Yellow"},
+    371831: {'name': 'Rapids (E5M2) - Map Scroll',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 55,
+             'doom_type': 35,
+             'region': "Rapids (E5M2) Yellow"},
+    371832: {'name': 'Rapids (E5M2) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 56,
+             'doom_type': 86,
+             'region': "Rapids (E5M2) Yellow"},
+    371833: {'name': 'Rapids (E5M2) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 57,
+             'doom_type': 36,
+             'region': "Rapids (E5M2) Green"},
+    371834: {'name': 'Rapids (E5M2) - Tome of Power 2',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 2,
+             'index': 58,
+             'doom_type': 86,
+             'region': "Rapids (E5M2) Yellow"},
+    371835: {'name': 'Rapids (E5M2) - Torch',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 59,
+             'doom_type': 33,
+             'region': "Rapids (E5M2) Main"},
+    371836: {'name': 'Rapids (E5M2) - Enchanted Shield 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 66,
+             'doom_type': 31,
+             'region': "Rapids (E5M2) Main"},
+    371837: {'name': 'Rapids (E5M2) - Hellstaff 2',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 2,
+             'index': 67,
+             'doom_type': 2004,
+             'region': "Rapids (E5M2) Main"},
+    371838: {'name': 'Rapids (E5M2) - Phoenix Rod 2',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 2,
+             'index': 68,
+             'doom_type': 2003,
+             'region': "Rapids (E5M2) Main"},
+    371839: {'name': 'Rapids (E5M2) - Firemace',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 71,
+             'doom_type': 2002,
+             'region': "Rapids (E5M2) Main"},
+    371840: {'name': 'Rapids (E5M2) - Firemace 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 72,
+             'doom_type': 2002,
+             'region': "Rapids (E5M2) Green"},
+    371841: {'name': 'Rapids (E5M2) - Firemace 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 73,
+             'doom_type': 2002,
+             'region': "Rapids (E5M2) Green"},
+    371842: {'name': 'Rapids (E5M2) - Firemace 4',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 74,
+             'doom_type': 2002,
+             'region': "Rapids (E5M2) Yellow"},
+    371843: {'name': 'Rapids (E5M2) - Firemace 5',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': 75,
+             'doom_type': 2002,
+             'region': "Rapids (E5M2) Green"},
+    371844: {'name': 'Rapids (E5M2) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 2,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Rapids (E5M2) Green"},
+    371845: {'name': 'Quay (E5M3) - Green key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 12,
+             'doom_type': 73,
+             'region': "Quay (E5M3) Yellow"},
+    371846: {'name': 'Quay (E5M3) - Blue key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 13,
+             'doom_type': 79,
+             'region': "Quay (E5M3) Green"},
+    371847: {'name': 'Quay (E5M3) - Yellow key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 15,
+             'doom_type': 80,
+             'region': "Quay (E5M3) Main"},
+    371848: {'name': 'Quay (E5M3) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 212,
+             'doom_type': 2001,
+             'region': "Quay (E5M3) Main"},
+    371849: {'name': 'Quay (E5M3) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 213,
+             'doom_type': 2005,
+             'region': "Quay (E5M3) Main"},
+    371850: {'name': 'Quay (E5M3) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 214,
+             'doom_type': 53,
+             'region': "Quay (E5M3) Yellow"},
+    371851: {'name': 'Quay (E5M3) - Hellstaff',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 215,
+             'doom_type': 2004,
+             'region': "Quay (E5M3) Green"},
+    371852: {'name': 'Quay (E5M3) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 3,
+             'index': 216,
+             'doom_type': 2003,
+             'region': "Quay (E5M3) Blue"},
+    371853: {'name': 'Quay (E5M3) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 217,
+             'doom_type': 8,
+             'region': "Quay (E5M3) Main"},
+    371854: {'name': 'Quay (E5M3) - Morph Ovum',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 218,
+             'doom_type': 30,
+             'region': "Quay (E5M3) Blue"},
+    371855: {'name': 'Quay (E5M3) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 229,
+             'doom_type': 32,
+             'region': "Quay (E5M3) Green"},
+    371856: {'name': 'Quay (E5M3) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 230,
+             'doom_type': 31,
+             'region': "Quay (E5M3) Green"},
+    371857: {'name': 'Quay (E5M3) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 231,
+             'doom_type': 84,
+             'region': "Quay (E5M3) Main"},
+    371858: {'name': 'Quay (E5M3) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 232,
+             'doom_type': 75,
+             'region': "Quay (E5M3) Main"},
+    371859: {'name': 'Quay (E5M3) - Silver Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 233,
+             'doom_type': 85,
+             'region': "Quay (E5M3) Main"},
+    371860: {'name': 'Quay (E5M3) - Silver Shield 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 234,
+             'doom_type': 85,
+             'region': "Quay (E5M3) Blue"},
+    371861: {'name': 'Quay (E5M3) - Map Scroll',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 3,
+             'index': 235,
+             'doom_type': 35,
+             'region': "Quay (E5M3) Blue"},
+    371862: {'name': 'Quay (E5M3) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 236,
+             'doom_type': 36,
+             'region': "Quay (E5M3) Blue"},
+    371863: {'name': 'Quay (E5M3) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 237,
+             'doom_type': 86,
+             'region': "Quay (E5M3) Main"},
+    371864: {'name': 'Quay (E5M3) - Tome of Power 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 238,
+             'doom_type': 86,
+             'region': "Quay (E5M3) Green"},
+    371865: {'name': 'Quay (E5M3) - Tome of Power 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 239,
+             'doom_type': 86,
+             'region': "Quay (E5M3) Blue"},
+    371866: {'name': 'Quay (E5M3) - Torch',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 240,
+             'doom_type': 33,
+             'region': "Quay (E5M3) Green"},
+    371867: {'name': 'Quay (E5M3) - Firemace',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 242,
+             'doom_type': 2002,
+             'region': "Quay (E5M3) Blue"},
+    371868: {'name': 'Quay (E5M3) - Firemace 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 243,
+             'doom_type': 2002,
+             'region': "Quay (E5M3) Main"},
+    371869: {'name': 'Quay (E5M3) - Firemace 3',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 3,
+             'index': 244,
+             'doom_type': 2002,
+             'region': "Quay (E5M3) Yellow"},
+    371870: {'name': 'Quay (E5M3) - Firemace 4',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 245,
+             'doom_type': 2002,
+             'region': "Quay (E5M3) Yellow"},
+    371871: {'name': 'Quay (E5M3) - Firemace 5',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 246,
+             'doom_type': 2002,
+             'region': "Quay (E5M3) Green"},
+    371872: {'name': 'Quay (E5M3) - Firemace 6',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': 247,
+             'doom_type': 2002,
+             'region': "Quay (E5M3) Blue"},
+    371873: {'name': 'Quay (E5M3) - Bag of Holding 2',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 3,
+             'index': 252,
+             'doom_type': 8,
+             'region': "Quay (E5M3) Yellow"},
+    371874: {'name': 'Quay (E5M3) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 3,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Quay (E5M3) Blue"},
+    371875: {'name': 'Courtyard (E5M4) - Blue key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 3,
+             'doom_type': 79,
+             'region': "Courtyard (E5M4) Main"},
+    371876: {'name': 'Courtyard (E5M4) - Yellow key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 16,
+             'doom_type': 80,
+             'region': "Courtyard (E5M4) Main"},
+    371877: {'name': 'Courtyard (E5M4) - Green key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 21,
+             'doom_type': 73,
+             'region': "Courtyard (E5M4) Kakis"},
+    371878: {'name': 'Courtyard (E5M4) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 84,
+             'doom_type': 2005,
+             'region': "Courtyard (E5M4) Main"},
+    371879: {'name': 'Courtyard (E5M4) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 85,
+             'doom_type': 2001,
+             'region': "Courtyard (E5M4) Main"},
+    371880: {'name': 'Courtyard (E5M4) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 86,
+             'doom_type': 53,
+             'region': "Courtyard (E5M4) Main"},
+    371881: {'name': 'Courtyard (E5M4) - Hellstaff',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 87,
+             'doom_type': 2004,
+             'region': "Courtyard (E5M4) Kakis"},
+    371882: {'name': 'Courtyard (E5M4) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 88,
+             'doom_type': 2003,
+             'region': "Courtyard (E5M4) Main"},
+    371883: {'name': 'Courtyard (E5M4) - Morph Ovum',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 89,
+             'doom_type': 30,
+             'region': "Courtyard (E5M4) Main"},
+    371884: {'name': 'Courtyard (E5M4) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 90,
+             'doom_type': 8,
+             'region': "Courtyard (E5M4) Main"},
+    371885: {'name': 'Courtyard (E5M4) - Silver Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 91,
+             'doom_type': 85,
+             'region': "Courtyard (E5M4) Main"},
+    371886: {'name': 'Courtyard (E5M4) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 103,
+             'doom_type': 32,
+             'region': "Courtyard (E5M4) Main"},
+    371887: {'name': 'Courtyard (E5M4) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 104,
+             'doom_type': 84,
+             'region': "Courtyard (E5M4) Kakis"},
+    371888: {'name': 'Courtyard (E5M4) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 105,
+             'doom_type': 75,
+             'region': "Courtyard (E5M4) Main"},
+    371889: {'name': 'Courtyard (E5M4) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 106,
+             'doom_type': 31,
+             'region': "Courtyard (E5M4) Blue"},
+    371890: {'name': 'Courtyard (E5M4) - Map Scroll',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 107,
+             'doom_type': 35,
+             'region': "Courtyard (E5M4) Kakis"},
+    371891: {'name': 'Courtyard (E5M4) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 108,
+             'doom_type': 36,
+             'region': "Courtyard (E5M4) Main"},
+    371892: {'name': 'Courtyard (E5M4) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 109,
+             'doom_type': 86,
+             'region': "Courtyard (E5M4) Main"},
+    371893: {'name': 'Courtyard (E5M4) - Tome of Power 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 110,
+             'doom_type': 86,
+             'region': "Courtyard (E5M4) Blue"},
+    371894: {'name': 'Courtyard (E5M4) - Tome of Power 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 111,
+             'doom_type': 86,
+             'region': "Courtyard (E5M4) Kakis"},
+    371895: {'name': 'Courtyard (E5M4) - Torch',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 112,
+             'doom_type': 33,
+             'region': "Courtyard (E5M4) Main"},
+    371896: {'name': 'Courtyard (E5M4) - Bag of Holding 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 213,
+             'doom_type': 8,
+             'region': "Courtyard (E5M4) Blue"},
+    371897: {'name': 'Courtyard (E5M4) - Silver Shield 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 219,
+             'doom_type': 85,
+             'region': "Courtyard (E5M4) Kakis"},
+    371898: {'name': 'Courtyard (E5M4) - Bag of Holding 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': 272,
+             'doom_type': 8,
+             'region': "Courtyard (E5M4) Main"},
+    371899: {'name': 'Courtyard (E5M4) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 4,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Courtyard (E5M4) Blue"},
+    371900: {'name': 'Hydratyr (E5M5) - Yellow key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 3,
+             'doom_type': 80,
+             'region': "Hydratyr (E5M5) Main"},
+    371901: {'name': 'Hydratyr (E5M5) - Green key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 5,
+             'doom_type': 73,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371902: {'name': 'Hydratyr (E5M5) - Blue key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 11,
+             'doom_type': 79,
+             'region': "Hydratyr (E5M5) Green"},
+    371903: {'name': 'Hydratyr (E5M5) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 238,
+             'doom_type': 2001,
+             'region': "Hydratyr (E5M5) Main"},
+    371904: {'name': 'Hydratyr (E5M5) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 239,
+             'doom_type': 2005,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371905: {'name': 'Hydratyr (E5M5) - Hellstaff',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 240,
+             'doom_type': 2004,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371906: {'name': 'Hydratyr (E5M5) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 241,
+             'doom_type': 53,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371907: {'name': 'Hydratyr (E5M5) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 242,
+             'doom_type': 2003,
+             'region': "Hydratyr (E5M5) Green"},
+    371908: {'name': 'Hydratyr (E5M5) - Firemace',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 243,
+             'doom_type': 2002,
+             'region': "Hydratyr (E5M5) Green"},
+    371909: {'name': 'Hydratyr (E5M5) - Firemace 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 244,
+             'doom_type': 2002,
+             'region': "Hydratyr (E5M5) Green"},
+    371910: {'name': 'Hydratyr (E5M5) - Firemace 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 245,
+             'doom_type': 2002,
+             'region': "Hydratyr (E5M5) Green"},
+    371911: {'name': 'Hydratyr (E5M5) - Firemace 4',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 246,
+             'doom_type': 2002,
+             'region': "Hydratyr (E5M5) Green"},
+    371912: {'name': 'Hydratyr (E5M5) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 248,
+             'doom_type': 8,
+             'region': "Hydratyr (E5M5) Main"},
+    371913: {'name': 'Hydratyr (E5M5) - Morph Ovum',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 259,
+             'doom_type': 30,
+             'region': "Hydratyr (E5M5) Green"},
+    371914: {'name': 'Hydratyr (E5M5) - Bag of Holding 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 260,
+             'doom_type': 8,
+             'region': "Hydratyr (E5M5) Green"},
+    371915: {'name': 'Hydratyr (E5M5) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 261,
+             'doom_type': 32,
+             'region': "Hydratyr (E5M5) Blue"},
+    371916: {'name': 'Hydratyr (E5M5) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 262,
+             'doom_type': 86,
+             'region': "Hydratyr (E5M5) Main"},
+    371917: {'name': 'Hydratyr (E5M5) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 263,
+             'doom_type': 75,
+             'region': "Hydratyr (E5M5) Main"},
+    371918: {'name': 'Hydratyr (E5M5) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 264,
+             'doom_type': 84,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371919: {'name': 'Hydratyr (E5M5) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 265,
+             'doom_type': 36,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371920: {'name': 'Hydratyr (E5M5) - Map Scroll',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 266,
+             'doom_type': 35,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371921: {'name': 'Hydratyr (E5M5) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 267,
+             'doom_type': 31,
+             'region': "Hydratyr (E5M5) Green"},
+    371922: {'name': 'Hydratyr (E5M5) - Torch',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 268,
+             'doom_type': 33,
+             'region': "Hydratyr (E5M5) Main"},
+    371923: {'name': 'Hydratyr (E5M5) - Tome of Power 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 269,
+             'doom_type': 86,
+             'region': "Hydratyr (E5M5) Blue"},
+    371924: {'name': 'Hydratyr (E5M5) - Silver Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 270,
+             'doom_type': 85,
+             'region': "Hydratyr (E5M5) Blue"},
+    371925: {'name': 'Hydratyr (E5M5) - Silver Shield 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 271,
+             'doom_type': 85,
+             'region': "Hydratyr (E5M5) Main"},
+    371926: {'name': 'Hydratyr (E5M5) - Tome of Power 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': 272,
+             'doom_type': 86,
+             'region': "Hydratyr (E5M5) Yellow"},
+    371927: {'name': 'Hydratyr (E5M5) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 5,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Hydratyr (E5M5) Blue"},
+    371928: {'name': 'Colonnade (E5M6) - Yellow key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 8,
+             'doom_type': 80,
+             'region': "Colonnade (E5M6) Main"},
+    371929: {'name': 'Colonnade (E5M6) - Green key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 9,
+             'doom_type': 73,
+             'region': "Colonnade (E5M6) Yellow"},
+    371930: {'name': 'Colonnade (E5M6) - Blue key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 10,
+             'doom_type': 79,
+             'region': "Colonnade (E5M6) Green"},
+    371931: {'name': 'Colonnade (E5M6) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 91,
+             'doom_type': 53,
+             'region': "Colonnade (E5M6) Main"},
+    371932: {'name': 'Colonnade (E5M6) - Hellstaff',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 92,
+             'doom_type': 2004,
+             'region': "Colonnade (E5M6) Yellow"},
+    371933: {'name': 'Colonnade (E5M6) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 93,
+             'doom_type': 2003,
+             'region': "Colonnade (E5M6) Green"},
+    371934: {'name': 'Colonnade (E5M6) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 94,
+             'doom_type': 2005,
+             'region': "Colonnade (E5M6) Yellow"},
+    371935: {'name': 'Colonnade (E5M6) - Firemace',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 95,
+             'doom_type': 2002,
+             'region': "Colonnade (E5M6) Yellow"},
+    371936: {'name': 'Colonnade (E5M6) - Firemace 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 96,
+             'doom_type': 2002,
+             'region': "Colonnade (E5M6) Yellow"},
+    371937: {'name': 'Colonnade (E5M6) - Firemace 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 97,
+             'doom_type': 2002,
+             'region': "Colonnade (E5M6) Yellow"},
+    371938: {'name': 'Colonnade (E5M6) - Firemace 4',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 98,
+             'doom_type': 2002,
+             'region': "Colonnade (E5M6) Main"},
+    371939: {'name': 'Colonnade (E5M6) - Firemace 5',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 99,
+             'doom_type': 2002,
+             'region': "Colonnade (E5M6) Main"},
+    371940: {'name': 'Colonnade (E5M6) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 100,
+             'doom_type': 31,
+             'region': "Colonnade (E5M6) Yellow"},
+    371941: {'name': 'Colonnade (E5M6) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 101,
+             'doom_type': 86,
+             'region': "Colonnade (E5M6) Yellow"},
+    371942: {'name': 'Colonnade (E5M6) - Silver Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 102,
+             'doom_type': 85,
+             'region': "Colonnade (E5M6) Main"},
+    371943: {'name': 'Colonnade (E5M6) - Morph Ovum',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 103,
+             'doom_type': 30,
+             'region': "Colonnade (E5M6) Main"},
+    371944: {'name': 'Colonnade (E5M6) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 104,
+             'doom_type': 36,
+             'region': "Colonnade (E5M6) Main"},
+    371945: {'name': 'Colonnade (E5M6) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 105,
+             'doom_type': 8,
+             'region': "Colonnade (E5M6) Main"},
+    371946: {'name': 'Colonnade (E5M6) - Bag of Holding 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 106,
+             'doom_type': 8,
+             'region': "Colonnade (E5M6) Green"},
+    371947: {'name': 'Colonnade (E5M6) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 121,
+             'doom_type': 32,
+             'region': "Colonnade (E5M6) Yellow"},
+    371948: {'name': 'Colonnade (E5M6) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 122,
+             'doom_type': 75,
+             'region': "Colonnade (E5M6) Yellow"},
+    371949: {'name': 'Colonnade (E5M6) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 123,
+             'doom_type': 84,
+             'region': "Colonnade (E5M6) Main"},
+    371950: {'name': 'Colonnade (E5M6) - Torch',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 124,
+             'doom_type': 33,
+             'region': "Colonnade (E5M6) Yellow"},
+    371951: {'name': 'Colonnade (E5M6) - Map Scroll',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 125,
+             'doom_type': 35,
+             'region': "Colonnade (E5M6) Yellow"},
+    371952: {'name': 'Colonnade (E5M6) - Tome of Power 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 126,
+             'doom_type': 86,
+             'region': "Colonnade (E5M6) Yellow"},
+    371953: {'name': 'Colonnade (E5M6) - Mystic Urn 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 127,
+             'doom_type': 32,
+             'region': "Colonnade (E5M6) Blue"},
+    371954: {'name': 'Colonnade (E5M6) - Ring of Invincibility 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 128,
+             'doom_type': 84,
+             'region': "Colonnade (E5M6) Blue"},
+    371955: {'name': 'Colonnade (E5M6) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': 348,
+             'doom_type': 2001,
+             'region': "Colonnade (E5M6) Main"},
+    371956: {'name': 'Colonnade (E5M6) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 6,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Colonnade (E5M6) Blue"},
+    371957: {'name': 'Foetid Manse (E5M7) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 7,
+             'doom_type': 31,
+             'region': "Foetid Manse (E5M7) Blue"},
+    371958: {'name': 'Foetid Manse (E5M7) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 8,
+             'doom_type': 32,
+             'region': "Foetid Manse (E5M7) Yellow"},
+    371959: {'name': 'Foetid Manse (E5M7) - Morph Ovum',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 9,
+             'doom_type': 30,
+             'region': "Foetid Manse (E5M7) Green"},
+    371960: {'name': 'Foetid Manse (E5M7) - Green key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 12,
+             'doom_type': 73,
+             'region': "Foetid Manse (E5M7) Yellow"},
+    371961: {'name': 'Foetid Manse (E5M7) - Yellow key',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 15,
+             'doom_type': 80,
+             'region': "Foetid Manse (E5M7) Main"},
+    371962: {'name': 'Foetid Manse (E5M7) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 218,
+             'doom_type': 2001,
+             'region': "Foetid Manse (E5M7) Main"},
+    371963: {'name': 'Foetid Manse (E5M7) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 219,
+             'doom_type': 2005,
+             'region': "Foetid Manse (E5M7) Main"},
+    371964: {'name': 'Foetid Manse (E5M7) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 220,
+             'doom_type': 53,
+             'region': "Foetid Manse (E5M7) Yellow"},
+    371965: {'name': 'Foetid Manse (E5M7) - Hellstaff',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 221,
+             'doom_type': 2004,
+             'region': "Foetid Manse (E5M7) Green"},
+    371966: {'name': 'Foetid Manse (E5M7) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': True,
+             'map': 7,
+             'index': 222,
+             'doom_type': 2003,
+             'region': "Foetid Manse (E5M7) Green"},
+    371967: {'name': 'Foetid Manse (E5M7) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 223,
+             'doom_type': 75,
+             'region': "Foetid Manse (E5M7) Yellow"},
+    371968: {'name': 'Foetid Manse (E5M7) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 224,
+             'doom_type': 84,
+             'region': "Foetid Manse (E5M7) Yellow"},
+    371969: {'name': 'Foetid Manse (E5M7) - Silver Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 225,
+             'doom_type': 85,
+             'region': "Foetid Manse (E5M7) Green"},
+    371970: {'name': 'Foetid Manse (E5M7) - Map Scroll',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 234,
+             'doom_type': 35,
+             'region': "Foetid Manse (E5M7) Green"},
+    371971: {'name': 'Foetid Manse (E5M7) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 235,
+             'doom_type': 86,
+             'region': "Foetid Manse (E5M7) Yellow"},
+    371972: {'name': 'Foetid Manse (E5M7) - Tome of Power 2',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 236,
+             'doom_type': 86,
+             'region': "Foetid Manse (E5M7) Green"},
+    371973: {'name': 'Foetid Manse (E5M7) - Tome of Power 3',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 237,
+             'doom_type': 86,
+             'region': "Foetid Manse (E5M7) Green"},
+    371974: {'name': 'Foetid Manse (E5M7) - Torch',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 238,
+             'doom_type': 33,
+             'region': "Foetid Manse (E5M7) Yellow"},
+    371975: {'name': 'Foetid Manse (E5M7) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 239,
+             'doom_type': 36,
+             'region': "Foetid Manse (E5M7) Green"},
+    371976: {'name': 'Foetid Manse (E5M7) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': 240,
+             'doom_type': 8,
+             'region': "Foetid Manse (E5M7) Green"},
+    371977: {'name': 'Foetid Manse (E5M7) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 7,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Foetid Manse (E5M7) Blue"},
+    371978: {'name': 'Field of Judgement (E5M8) - Hellstaff',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 18,
+             'doom_type': 2004,
+             'region': "Field of Judgement (E5M8) Main"},
+    371979: {'name': 'Field of Judgement (E5M8) - Phoenix Rod',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 19,
+             'doom_type': 2003,
+             'region': "Field of Judgement (E5M8) Main"},
+    371980: {'name': 'Field of Judgement (E5M8) - Ethereal Crossbow',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 20,
+             'doom_type': 2001,
+             'region': "Field of Judgement (E5M8) Main"},
+    371981: {'name': 'Field of Judgement (E5M8) - Dragon Claw',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 21,
+             'doom_type': 53,
+             'region': "Field of Judgement (E5M8) Main"},
+    371982: {'name': 'Field of Judgement (E5M8) - Gauntlets of the Necromancer',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 22,
+             'doom_type': 2005,
+             'region': "Field of Judgement (E5M8) Main"},
+    371983: {'name': 'Field of Judgement (E5M8) - Mystic Urn',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 23,
+             'doom_type': 32,
+             'region': "Field of Judgement (E5M8) Main"},
+    371984: {'name': 'Field of Judgement (E5M8) - Shadowsphere',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 24,
+             'doom_type': 75,
+             'region': "Field of Judgement (E5M8) Main"},
+    371985: {'name': 'Field of Judgement (E5M8) - Enchanted Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 25,
+             'doom_type': 31,
+             'region': "Field of Judgement (E5M8) Main"},
+    371986: {'name': 'Field of Judgement (E5M8) - Ring of Invincibility',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 26,
+             'doom_type': 84,
+             'region': "Field of Judgement (E5M8) Main"},
+    371987: {'name': 'Field of Judgement (E5M8) - Tome of Power',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 27,
+             'doom_type': 86,
+             'region': "Field of Judgement (E5M8) Main"},
+    371988: {'name': 'Field of Judgement (E5M8) - Chaos Device',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 28,
+             'doom_type': 36,
+             'region': "Field of Judgement (E5M8) Main"},
+    371989: {'name': 'Field of Judgement (E5M8) - Silver Shield',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 29,
+             'doom_type': 85,
+             'region': "Field of Judgement (E5M8) Main"},
+    371990: {'name': 'Field of Judgement (E5M8) - Bag of Holding',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': 62,
+             'doom_type': 8,
+             'region': "Field of Judgement (E5M8) Main"},
+    371991: {'name': 'Field of Judgement (E5M8) - Exit',
+             'episode': 5,
+             'check_sanity': False,
+             'map': 8,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Field of Judgement (E5M8) Main"},
+    371992: {'name': "Skein of D'Sparil (E5M9) - Blue key",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 0,
+             'doom_type': 79,
+             'region': "Skein of D'Sparil (E5M9) Green"},
+    371993: {'name': "Skein of D'Sparil (E5M9) - Green key",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 1,
+             'doom_type': 73,
+             'region': "Skein of D'Sparil (E5M9) Yellow"},
+    371994: {'name': "Skein of D'Sparil (E5M9) - Yellow key",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 13,
+             'doom_type': 80,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    371995: {'name': "Skein of D'Sparil (E5M9) - Ethereal Crossbow",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 21,
+             'doom_type': 2001,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    371996: {'name': "Skein of D'Sparil (E5M9) - Dragon Claw",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 44,
+             'doom_type': 53,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    371997: {'name': "Skein of D'Sparil (E5M9) - Gauntlets of the Necromancer",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 45,
+             'doom_type': 2005,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    371998: {'name': "Skein of D'Sparil (E5M9) - Hellstaff",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 46,
+             'doom_type': 2004,
+             'region': "Skein of D'Sparil (E5M9) Yellow"},
+    371999: {'name': "Skein of D'Sparil (E5M9) - Phoenix Rod",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 47,
+             'doom_type': 2003,
+             'region': "Skein of D'Sparil (E5M9) Blue"},
+    372000: {'name': "Skein of D'Sparil (E5M9) - Bag of Holding",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 48,
+             'doom_type': 8,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    372001: {'name': "Skein of D'Sparil (E5M9) - Silver Shield",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 51,
+             'doom_type': 85,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    372002: {'name': "Skein of D'Sparil (E5M9) - Tome of Power",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 52,
+             'doom_type': 86,
+             'region': "Skein of D'Sparil (E5M9) Green"},
+    372003: {'name': "Skein of D'Sparil (E5M9) - Torch",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 53,
+             'doom_type': 33,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    372004: {'name': "Skein of D'Sparil (E5M9) - Morph Ovum",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 54,
+             'doom_type': 30,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    372005: {'name': "Skein of D'Sparil (E5M9) - Shadowsphere",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 64,
+             'doom_type': 75,
+             'region': "Skein of D'Sparil (E5M9) Yellow"},
+    372006: {'name': "Skein of D'Sparil (E5M9) - Chaos Device",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 65,
+             'doom_type': 36,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    372007: {'name': "Skein of D'Sparil (E5M9) - Ring of Invincibility",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 66,
+             'doom_type': 84,
+             'region': "Skein of D'Sparil (E5M9) Main"},
+    372008: {'name': "Skein of D'Sparil (E5M9) - Enchanted Shield",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 67,
+             'doom_type': 31,
+             'region': "Skein of D'Sparil (E5M9) Blue"},
+    372009: {'name': "Skein of D'Sparil (E5M9) - Mystic Urn",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 68,
+             'doom_type': 32,
+             'region': "Skein of D'Sparil (E5M9) Blue"},
+    372010: {'name': "Skein of D'Sparil (E5M9) - Tome of Power 2",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 69,
+             'doom_type': 86,
+             'region': "Skein of D'Sparil (E5M9) Green"},
+    372011: {'name': "Skein of D'Sparil (E5M9) - Map Scroll",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 70,
+             'doom_type': 35,
+             'region': "Skein of D'Sparil (E5M9) Green"},
+    372012: {'name': "Skein of D'Sparil (E5M9) - Bag of Holding 2",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': 243,
+             'doom_type': 8,
+             'region': "Skein of D'Sparil (E5M9) Blue"},
+    372013: {'name': "Skein of D'Sparil (E5M9) - Exit",
+             'episode': 5,
+             'check_sanity': False,
+             'map': 9,
+             'index': -1,
+             'doom_type': -1,
+             'region': "Skein of D'Sparil (E5M9) Blue"},
+}
+
+
+location_name_groups: Dict[str, Set[str]] = {
+    'Ambulatory (E4M3)': {
+        'Ambulatory (E4M3) - Bag of Holding',
+        'Ambulatory (E4M3) - Bag of Holding 2',
+        'Ambulatory (E4M3) - Blue key',
+        'Ambulatory (E4M3) - Chaos Device',
+        'Ambulatory (E4M3) - Dragon Claw',
+        'Ambulatory (E4M3) - Enchanted Shield',
+        'Ambulatory (E4M3) - Ethereal Crossbow',
+        'Ambulatory (E4M3) - Exit',
+        'Ambulatory (E4M3) - Firemace',
+        'Ambulatory (E4M3) - Firemace 2',
+        'Ambulatory (E4M3) - Firemace 3',
+        'Ambulatory (E4M3) - Firemace 4',
+        'Ambulatory (E4M3) - Firemace 5',
+        'Ambulatory (E4M3) - Gauntlets of the Necromancer',
+        'Ambulatory (E4M3) - Green key',
+        'Ambulatory (E4M3) - Hellstaff',
+        'Ambulatory (E4M3) - Map Scroll',
+        'Ambulatory (E4M3) - Morph Ovum',
+        'Ambulatory (E4M3) - Morph Ovum 2',
+        'Ambulatory (E4M3) - Mystic Urn',
+        'Ambulatory (E4M3) - Phoenix Rod',
+        'Ambulatory (E4M3) - Ring of Invincibility',
+        'Ambulatory (E4M3) - Ring of Invincibility 2',
+        'Ambulatory (E4M3) - Shadowsphere',
+        'Ambulatory (E4M3) - Silver Shield',
+        'Ambulatory (E4M3) - Tome of Power',
+        'Ambulatory (E4M3) - Tome of Power 2',
+        'Ambulatory (E4M3) - Torch',
+        'Ambulatory (E4M3) - Yellow key',
+    },
+    'Blockhouse (E4M2)': {
+        'Blockhouse (E4M2) - Bag of Holding',
+        'Blockhouse (E4M2) - Bag of Holding 2',
+        'Blockhouse (E4M2) - Blue key',
+        'Blockhouse (E4M2) - Chaos Device',
+        'Blockhouse (E4M2) - Dragon Claw',
+        'Blockhouse (E4M2) - Enchanted Shield',
+        'Blockhouse (E4M2) - Ethereal Crossbow',
+        'Blockhouse (E4M2) - Exit',
+        'Blockhouse (E4M2) - Gauntlets of the Necromancer',
+        'Blockhouse (E4M2) - Green key',
+        'Blockhouse (E4M2) - Hellstaff',
+        'Blockhouse (E4M2) - Morph Ovum',
+        'Blockhouse (E4M2) - Mystic Urn',
+        'Blockhouse (E4M2) - Phoenix Rod',
+        'Blockhouse (E4M2) - Ring of Invincibility',
+        'Blockhouse (E4M2) - Ring of Invincibility 2',
+        'Blockhouse (E4M2) - Shadowsphere',
+        'Blockhouse (E4M2) - Shadowsphere 2',
+        'Blockhouse (E4M2) - Silver Shield',
+        'Blockhouse (E4M2) - Tome of Power',
+        'Blockhouse (E4M2) - Yellow key',
+    },
+    'Catafalque (E4M1)': {
+        'Catafalque (E4M1) - Bag of Holding',
+        'Catafalque (E4M1) - Chaos Device',
+        'Catafalque (E4M1) - Dragon Claw',
+        'Catafalque (E4M1) - Ethereal Crossbow',
+        'Catafalque (E4M1) - Exit',
+        'Catafalque (E4M1) - Gauntlets of the Necromancer',
+        'Catafalque (E4M1) - Green key',
+        'Catafalque (E4M1) - Hellstaff',
+        'Catafalque (E4M1) - Map Scroll',
+        'Catafalque (E4M1) - Morph Ovum',
+        'Catafalque (E4M1) - Ring of Invincibility',
+        'Catafalque (E4M1) - Shadowsphere',
+        'Catafalque (E4M1) - Silver Shield',
+        'Catafalque (E4M1) - Tome of Power',
+        'Catafalque (E4M1) - Tome of Power 2',
+        'Catafalque (E4M1) - Torch',
+        'Catafalque (E4M1) - Yellow key',
+    },
+    'Colonnade (E5M6)': {
+        'Colonnade (E5M6) - Bag of Holding',
+        'Colonnade (E5M6) - Bag of Holding 2',
+        'Colonnade (E5M6) - Blue key',
+        'Colonnade (E5M6) - Chaos Device',
+        'Colonnade (E5M6) - Dragon Claw',
+        'Colonnade (E5M6) - Enchanted Shield',
+        'Colonnade (E5M6) - Ethereal Crossbow',
+        'Colonnade (E5M6) - Exit',
+        'Colonnade (E5M6) - Firemace',
+        'Colonnade (E5M6) - Firemace 2',
+        'Colonnade (E5M6) - Firemace 3',
+        'Colonnade (E5M6) - Firemace 4',
+        'Colonnade (E5M6) - Firemace 5',
+        'Colonnade (E5M6) - Gauntlets of the Necromancer',
+        'Colonnade (E5M6) - Green key',
+        'Colonnade (E5M6) - Hellstaff',
+        'Colonnade (E5M6) - Map Scroll',
+        'Colonnade (E5M6) - Morph Ovum',
+        'Colonnade (E5M6) - Mystic Urn',
+        'Colonnade (E5M6) - Mystic Urn 2',
+        'Colonnade (E5M6) - Phoenix Rod',
+        'Colonnade (E5M6) - Ring of Invincibility',
+        'Colonnade (E5M6) - Ring of Invincibility 2',
+        'Colonnade (E5M6) - Shadowsphere',
+        'Colonnade (E5M6) - Silver Shield',
+        'Colonnade (E5M6) - Tome of Power',
+        'Colonnade (E5M6) - Tome of Power 2',
+        'Colonnade (E5M6) - Torch',
+        'Colonnade (E5M6) - Yellow key',
+    },
+    'Courtyard (E5M4)': {
+        'Courtyard (E5M4) - Bag of Holding',
+        'Courtyard (E5M4) - Bag of Holding 2',
+        'Courtyard (E5M4) - Bag of Holding 3',
+        'Courtyard (E5M4) - Blue key',
+        'Courtyard (E5M4) - Chaos Device',
+        'Courtyard (E5M4) - Dragon Claw',
+        'Courtyard (E5M4) - Enchanted Shield',
+        'Courtyard (E5M4) - Ethereal Crossbow',
+        'Courtyard (E5M4) - Exit',
+        'Courtyard (E5M4) - Gauntlets of the Necromancer',
+        'Courtyard (E5M4) - Green key',
+        'Courtyard (E5M4) - Hellstaff',
+        'Courtyard (E5M4) - Map Scroll',
+        'Courtyard (E5M4) - Morph Ovum',
+        'Courtyard (E5M4) - Mystic Urn',
+        'Courtyard (E5M4) - Phoenix Rod',
+        'Courtyard (E5M4) - Ring of Invincibility',
+        'Courtyard (E5M4) - Shadowsphere',
+        'Courtyard (E5M4) - Silver Shield',
+        'Courtyard (E5M4) - Silver Shield 2',
+        'Courtyard (E5M4) - Tome of Power',
+        'Courtyard (E5M4) - Tome of Power 2',
+        'Courtyard (E5M4) - Tome of Power 3',
+        'Courtyard (E5M4) - Torch',
+        'Courtyard (E5M4) - Yellow key',
+    },
+    "D'Sparil'S Keep (E3M8)": {
+        "D'Sparil'S Keep (E3M8) - Bag of Holding",
+        "D'Sparil'S Keep (E3M8) - Chaos Device",
+        "D'Sparil'S Keep (E3M8) - Dragon Claw",
+        "D'Sparil'S Keep (E3M8) - Enchanted Shield",
+        "D'Sparil'S Keep (E3M8) - Ethereal Crossbow",
+        "D'Sparil'S Keep (E3M8) - Exit",
+        "D'Sparil'S Keep (E3M8) - Gauntlets of the Necromancer",
+        "D'Sparil'S Keep (E3M8) - Hellstaff",
+        "D'Sparil'S Keep (E3M8) - Mystic Urn",
+        "D'Sparil'S Keep (E3M8) - Phoenix Rod",
+        "D'Sparil'S Keep (E3M8) - Ring of Invincibility",
+        "D'Sparil'S Keep (E3M8) - Shadowsphere",
+        "D'Sparil'S Keep (E3M8) - Silver Shield",
+        "D'Sparil'S Keep (E3M8) - Tome of Power",
+        "D'Sparil'S Keep (E3M8) - Tome of Power 2",
+        "D'Sparil'S Keep (E3M8) - Tome of Power 3",
+    },
+    'Field of Judgement (E5M8)': {
+        'Field of Judgement (E5M8) - Bag of Holding',
+        'Field of Judgement (E5M8) - Chaos Device',
+        'Field of Judgement (E5M8) - Dragon Claw',
+        'Field of Judgement (E5M8) - Enchanted Shield',
+        'Field of Judgement (E5M8) - Ethereal Crossbow',
+        'Field of Judgement (E5M8) - Exit',
+        'Field of Judgement (E5M8) - Gauntlets of the Necromancer',
+        'Field of Judgement (E5M8) - Hellstaff',
+        'Field of Judgement (E5M8) - Mystic Urn',
+        'Field of Judgement (E5M8) - Phoenix Rod',
+        'Field of Judgement (E5M8) - Ring of Invincibility',
+        'Field of Judgement (E5M8) - Shadowsphere',
+        'Field of Judgement (E5M8) - Silver Shield',
+        'Field of Judgement (E5M8) - Tome of Power',
+    },
+    'Foetid Manse (E5M7)': {
+        'Foetid Manse (E5M7) - Bag of Holding',
+        'Foetid Manse (E5M7) - Chaos Device',
+        'Foetid Manse (E5M7) - Dragon Claw',
+        'Foetid Manse (E5M7) - Enchanted Shield',
+        'Foetid Manse (E5M7) - Ethereal Crossbow',
+        'Foetid Manse (E5M7) - Exit',
+        'Foetid Manse (E5M7) - Gauntlets of the Necromancer',
+        'Foetid Manse (E5M7) - Green key',
+        'Foetid Manse (E5M7) - Hellstaff',
+        'Foetid Manse (E5M7) - Map Scroll',
+        'Foetid Manse (E5M7) - Morph Ovum',
+        'Foetid Manse (E5M7) - Mystic Urn',
+        'Foetid Manse (E5M7) - Phoenix Rod',
+        'Foetid Manse (E5M7) - Ring of Invincibility',
+        'Foetid Manse (E5M7) - Shadowsphere',
+        'Foetid Manse (E5M7) - Silver Shield',
+        'Foetid Manse (E5M7) - Tome of Power',
+        'Foetid Manse (E5M7) - Tome of Power 2',
+        'Foetid Manse (E5M7) - Tome of Power 3',
+        'Foetid Manse (E5M7) - Torch',
+        'Foetid Manse (E5M7) - Yellow key',
+    },
+    'Great Stair (E4M5)': {
+        'Great Stair (E4M5) - Bag of Holding',
+        'Great Stair (E4M5) - Bag of Holding 2',
+        'Great Stair (E4M5) - Blue key',
+        'Great Stair (E4M5) - Chaos Device',
+        'Great Stair (E4M5) - Dragon Claw',
+        'Great Stair (E4M5) - Enchanted Shield',
+        'Great Stair (E4M5) - Ethereal Crossbow',
+        'Great Stair (E4M5) - Exit',
+        'Great Stair (E4M5) - Firemace',
+        'Great Stair (E4M5) - Firemace 2',
+        'Great Stair (E4M5) - Firemace 3',
+        'Great Stair (E4M5) - Firemace 4',
+        'Great Stair (E4M5) - Firemace 5',
+        'Great Stair (E4M5) - Gauntlets of the Necromancer',
+        'Great Stair (E4M5) - Green key',
+        'Great Stair (E4M5) - Hellstaff',
+        'Great Stair (E4M5) - Map Scroll',
+        'Great Stair (E4M5) - Morph Ovum',
+        'Great Stair (E4M5) - Mystic Urn',
+        'Great Stair (E4M5) - Mystic Urn 2',
+        'Great Stair (E4M5) - Phoenix Rod',
+        'Great Stair (E4M5) - Ring of Invincibility',
+        'Great Stair (E4M5) - Shadowsphere',
+        'Great Stair (E4M5) - Silver Shield',
+        'Great Stair (E4M5) - Tome of Power',
+        'Great Stair (E4M5) - Tome of Power 2',
+        'Great Stair (E4M5) - Tome of Power 3',
+        'Great Stair (E4M5) - Torch',
+        'Great Stair (E4M5) - Yellow key',
+    },
+    'Halls of the Apostate (E4M6)': {
+        'Halls of the Apostate (E4M6) - Bag of Holding',
+        'Halls of the Apostate (E4M6) - Bag of Holding 2',
+        'Halls of the Apostate (E4M6) - Blue key',
+        'Halls of the Apostate (E4M6) - Chaos Device',
+        'Halls of the Apostate (E4M6) - Dragon Claw',
+        'Halls of the Apostate (E4M6) - Enchanted Shield',
+        'Halls of the Apostate (E4M6) - Ethereal Crossbow',
+        'Halls of the Apostate (E4M6) - Exit',
+        'Halls of the Apostate (E4M6) - Gauntlets of the Necromancer',
+        'Halls of the Apostate (E4M6) - Green key',
+        'Halls of the Apostate (E4M6) - Hellstaff',
+        'Halls of the Apostate (E4M6) - Map Scroll',
+        'Halls of the Apostate (E4M6) - Morph Ovum',
+        'Halls of the Apostate (E4M6) - Mystic Urn',
+        'Halls of the Apostate (E4M6) - Phoenix Rod',
+        'Halls of the Apostate (E4M6) - Ring of Invincibility',
+        'Halls of the Apostate (E4M6) - Shadowsphere',
+        'Halls of the Apostate (E4M6) - Silver Shield',
+        'Halls of the Apostate (E4M6) - Silver Shield 2',
+        'Halls of the Apostate (E4M6) - Tome of Power',
+        'Halls of the Apostate (E4M6) - Tome of Power 2',
+        'Halls of the Apostate (E4M6) - Yellow key',
+    },
+    "Hell's Maw (E1M8)": {
+        "Hell's Maw (E1M8) - Bag of Holding",
+        "Hell's Maw (E1M8) - Bag of Holding 2",
+        "Hell's Maw (E1M8) - Dragon Claw",
+        "Hell's Maw (E1M8) - Ethereal Crossbow",
+        "Hell's Maw (E1M8) - Exit",
+        "Hell's Maw (E1M8) - Gauntlets of the Necromancer",
+        "Hell's Maw (E1M8) - Morph Ovum",
+        "Hell's Maw (E1M8) - Ring of Invincibility",
+        "Hell's Maw (E1M8) - Ring of Invincibility 2",
+        "Hell's Maw (E1M8) - Ring of Invincibility 3",
+        "Hell's Maw (E1M8) - Shadowsphere",
+        "Hell's Maw (E1M8) - Silver Shield",
+        "Hell's Maw (E1M8) - Tome of Power",
+        "Hell's Maw (E1M8) - Tome of Power 2",
+    },
+    'Hydratyr (E5M5)': {
+        'Hydratyr (E5M5) - Bag of Holding',
+        'Hydratyr (E5M5) - Bag of Holding 2',
+        'Hydratyr (E5M5) - Blue key',
+        'Hydratyr (E5M5) - Chaos Device',
+        'Hydratyr (E5M5) - Dragon Claw',
+        'Hydratyr (E5M5) - Enchanted Shield',
+        'Hydratyr (E5M5) - Ethereal Crossbow',
+        'Hydratyr (E5M5) - Exit',
+        'Hydratyr (E5M5) - Firemace',
+        'Hydratyr (E5M5) - Firemace 2',
+        'Hydratyr (E5M5) - Firemace 3',
+        'Hydratyr (E5M5) - Firemace 4',
+        'Hydratyr (E5M5) - Gauntlets of the Necromancer',
+        'Hydratyr (E5M5) - Green key',
+        'Hydratyr (E5M5) - Hellstaff',
+        'Hydratyr (E5M5) - Map Scroll',
+        'Hydratyr (E5M5) - Morph Ovum',
+        'Hydratyr (E5M5) - Mystic Urn',
+        'Hydratyr (E5M5) - Phoenix Rod',
+        'Hydratyr (E5M5) - Ring of Invincibility',
+        'Hydratyr (E5M5) - Shadowsphere',
+        'Hydratyr (E5M5) - Silver Shield',
+        'Hydratyr (E5M5) - Silver Shield 2',
+        'Hydratyr (E5M5) - Tome of Power',
+        'Hydratyr (E5M5) - Tome of Power 2',
+        'Hydratyr (E5M5) - Tome of Power 3',
+        'Hydratyr (E5M5) - Torch',
+        'Hydratyr (E5M5) - Yellow key',
+    },
+    'Mausoleum (E4M9)': {
+        'Mausoleum (E4M9) - Bag of Holding',
+        'Mausoleum (E4M9) - Bag of Holding 2',
+        'Mausoleum (E4M9) - Bag of Holding 3',
+        'Mausoleum (E4M9) - Bag of Holding 4',
+        'Mausoleum (E4M9) - Chaos Device',
+        'Mausoleum (E4M9) - Dragon Claw',
+        'Mausoleum (E4M9) - Enchanted Shield',
+        'Mausoleum (E4M9) - Ethereal Crossbow',
+        'Mausoleum (E4M9) - Exit',
+        'Mausoleum (E4M9) - Firemace',
+        'Mausoleum (E4M9) - Firemace 2',
+        'Mausoleum (E4M9) - Firemace 3',
+        'Mausoleum (E4M9) - Firemace 4',
+        'Mausoleum (E4M9) - Gauntlets of the Necromancer',
+        'Mausoleum (E4M9) - Hellstaff',
+        'Mausoleum (E4M9) - Map Scroll',
+        'Mausoleum (E4M9) - Morph Ovum',
+        'Mausoleum (E4M9) - Mystic Urn',
+        'Mausoleum (E4M9) - Phoenix Rod',
+        'Mausoleum (E4M9) - Ring of Invincibility',
+        'Mausoleum (E4M9) - Shadowsphere',
+        'Mausoleum (E4M9) - Silver Shield',
+        'Mausoleum (E4M9) - Silver Shield 2',
+        'Mausoleum (E4M9) - Tome of Power',
+        'Mausoleum (E4M9) - Tome of Power 2',
+        'Mausoleum (E4M9) - Tome of Power 3',
+        'Mausoleum (E4M9) - Torch',
+        'Mausoleum (E4M9) - Torch 2',
+        'Mausoleum (E4M9) - Yellow key',
+    },
+    'Ochre Cliffs (E5M1)': {
+        'Ochre Cliffs (E5M1) - Bag of Holding',
+        'Ochre Cliffs (E5M1) - Bag of Holding 2',
+        'Ochre Cliffs (E5M1) - Blue key',
+        'Ochre Cliffs (E5M1) - Chaos Device',
+        'Ochre Cliffs (E5M1) - Dragon Claw',
+        'Ochre Cliffs (E5M1) - Enchanted Shield',
+        'Ochre Cliffs (E5M1) - Ethereal Crossbow',
+        'Ochre Cliffs (E5M1) - Exit',
+        'Ochre Cliffs (E5M1) - Firemace',
+        'Ochre Cliffs (E5M1) - Firemace 2',
+        'Ochre Cliffs (E5M1) - Firemace 3',
+        'Ochre Cliffs (E5M1) - Firemace 4',
+        'Ochre Cliffs (E5M1) - Gauntlets of the Necromancer',
+        'Ochre Cliffs (E5M1) - Green key',
+        'Ochre Cliffs (E5M1) - Hellstaff',
+        'Ochre Cliffs (E5M1) - Map Scroll',
+        'Ochre Cliffs (E5M1) - Morph Ovum',
+        'Ochre Cliffs (E5M1) - Mystic Urn',
+        'Ochre Cliffs (E5M1) - Phoenix Rod',
+        'Ochre Cliffs (E5M1) - Ring of Invincibility',
+        'Ochre Cliffs (E5M1) - Shadowsphere',
+        'Ochre Cliffs (E5M1) - Silver Shield',
+        'Ochre Cliffs (E5M1) - Tome of Power',
+        'Ochre Cliffs (E5M1) - Tome of Power 2',
+        'Ochre Cliffs (E5M1) - Tome of Power 3',
+        'Ochre Cliffs (E5M1) - Torch',
+        'Ochre Cliffs (E5M1) - Yellow key',
+    },
+    'Quay (E5M3)': {
+        'Quay (E5M3) - Bag of Holding',
+        'Quay (E5M3) - Bag of Holding 2',
+        'Quay (E5M3) - Blue key',
+        'Quay (E5M3) - Chaos Device',
+        'Quay (E5M3) - Dragon Claw',
+        'Quay (E5M3) - Enchanted Shield',
+        'Quay (E5M3) - Ethereal Crossbow',
+        'Quay (E5M3) - Exit',
+        'Quay (E5M3) - Firemace',
+        'Quay (E5M3) - Firemace 2',
+        'Quay (E5M3) - Firemace 3',
+        'Quay (E5M3) - Firemace 4',
+        'Quay (E5M3) - Firemace 5',
+        'Quay (E5M3) - Firemace 6',
+        'Quay (E5M3) - Gauntlets of the Necromancer',
+        'Quay (E5M3) - Green key',
+        'Quay (E5M3) - Hellstaff',
+        'Quay (E5M3) - Map Scroll',
+        'Quay (E5M3) - Morph Ovum',
+        'Quay (E5M3) - Mystic Urn',
+        'Quay (E5M3) - Phoenix Rod',
+        'Quay (E5M3) - Ring of Invincibility',
+        'Quay (E5M3) - Shadowsphere',
+        'Quay (E5M3) - Silver Shield',
+        'Quay (E5M3) - Silver Shield 2',
+        'Quay (E5M3) - Tome of Power',
+        'Quay (E5M3) - Tome of Power 2',
+        'Quay (E5M3) - Tome of Power 3',
+        'Quay (E5M3) - Torch',
+        'Quay (E5M3) - Yellow key',
+    },
+    'Ramparts of Perdition (E4M7)': {
+        'Ramparts of Perdition (E4M7) - Bag of Holding',
+        'Ramparts of Perdition (E4M7) - Bag of Holding 2',
+        'Ramparts of Perdition (E4M7) - Blue key',
+        'Ramparts of Perdition (E4M7) - Chaos Device',
+        'Ramparts of Perdition (E4M7) - Dragon Claw',
+        'Ramparts of Perdition (E4M7) - Dragon Claw 2',
+        'Ramparts of Perdition (E4M7) - Enchanted Shield',
+        'Ramparts of Perdition (E4M7) - Ethereal Crossbow',
+        'Ramparts of Perdition (E4M7) - Ethereal Crossbow 2',
+        'Ramparts of Perdition (E4M7) - Exit',
+        'Ramparts of Perdition (E4M7) - Firemace',
+        'Ramparts of Perdition (E4M7) - Firemace 2',
+        'Ramparts of Perdition (E4M7) - Firemace 3',
+        'Ramparts of Perdition (E4M7) - Firemace 4',
+        'Ramparts of Perdition (E4M7) - Firemace 5',
+        'Ramparts of Perdition (E4M7) - Firemace 6',
+        'Ramparts of Perdition (E4M7) - Gauntlets of the Necromancer',
+        'Ramparts of Perdition (E4M7) - Green key',
+        'Ramparts of Perdition (E4M7) - Hellstaff',
+        'Ramparts of Perdition (E4M7) - Hellstaff 2',
+        'Ramparts of Perdition (E4M7) - Map Scroll',
+        'Ramparts of Perdition (E4M7) - Morph Ovum',
+        'Ramparts of Perdition (E4M7) - Mystic Urn',
+        'Ramparts of Perdition (E4M7) - Mystic Urn 2',
+        'Ramparts of Perdition (E4M7) - Phoenix Rod',
+        'Ramparts of Perdition (E4M7) - Phoenix Rod 2',
+        'Ramparts of Perdition (E4M7) - Ring of Invincibility',
+        'Ramparts of Perdition (E4M7) - Shadowsphere',
+        'Ramparts of Perdition (E4M7) - Silver Shield',
+        'Ramparts of Perdition (E4M7) - Silver Shield 2',
+        'Ramparts of Perdition (E4M7) - Tome of Power',
+        'Ramparts of Perdition (E4M7) - Tome of Power 2',
+        'Ramparts of Perdition (E4M7) - Tome of Power 3',
+        'Ramparts of Perdition (E4M7) - Torch',
+        'Ramparts of Perdition (E4M7) - Torch 2',
+        'Ramparts of Perdition (E4M7) - Yellow key',
+    },
+    'Rapids (E5M2)': {
+        'Rapids (E5M2) - Bag of Holding',
+        'Rapids (E5M2) - Bag of Holding 2',
+        'Rapids (E5M2) - Bag of Holding 3',
+        'Rapids (E5M2) - Chaos Device',
+        'Rapids (E5M2) - Dragon Claw',
+        'Rapids (E5M2) - Enchanted Shield',
+        'Rapids (E5M2) - Enchanted Shield 2',
+        'Rapids (E5M2) - Ethereal Crossbow',
+        'Rapids (E5M2) - Exit',
+        'Rapids (E5M2) - Firemace',
+        'Rapids (E5M2) - Firemace 2',
+        'Rapids (E5M2) - Firemace 3',
+        'Rapids (E5M2) - Firemace 4',
+        'Rapids (E5M2) - Firemace 5',
+        'Rapids (E5M2) - Gauntlets of the Necromancer',
+        'Rapids (E5M2) - Green key',
+        'Rapids (E5M2) - Hellstaff',
+        'Rapids (E5M2) - Hellstaff 2',
+        'Rapids (E5M2) - Map Scroll',
+        'Rapids (E5M2) - Morph Ovum',
+        'Rapids (E5M2) - Mystic Urn',
+        'Rapids (E5M2) - Phoenix Rod',
+        'Rapids (E5M2) - Phoenix Rod 2',
+        'Rapids (E5M2) - Ring of Invincibility',
+        'Rapids (E5M2) - Shadowsphere',
+        'Rapids (E5M2) - Silver Shield',
+        'Rapids (E5M2) - Tome of Power',
+        'Rapids (E5M2) - Tome of Power 2',
+        'Rapids (E5M2) - Torch',
+        'Rapids (E5M2) - Yellow key',
+    },
+    'Sepulcher (E4M4)': {
+        'Sepulcher (E4M4) - Bag of Holding',
+        'Sepulcher (E4M4) - Bag of Holding 2',
+        'Sepulcher (E4M4) - Chaos Device',
+        'Sepulcher (E4M4) - Dragon Claw',
+        'Sepulcher (E4M4) - Dragon Claw 2',
+        'Sepulcher (E4M4) - Enchanted Shield',
+        'Sepulcher (E4M4) - Ethereal Crossbow',
+        'Sepulcher (E4M4) - Ethereal Crossbow 2',
+        'Sepulcher (E4M4) - Exit',
+        'Sepulcher (E4M4) - Firemace',
+        'Sepulcher (E4M4) - Firemace 2',
+        'Sepulcher (E4M4) - Firemace 3',
+        'Sepulcher (E4M4) - Firemace 4',
+        'Sepulcher (E4M4) - Firemace 5',
+        'Sepulcher (E4M4) - Hellstaff',
+        'Sepulcher (E4M4) - Morph Ovum',
+        'Sepulcher (E4M4) - Mystic Urn',
+        'Sepulcher (E4M4) - Phoenix Rod',
+        'Sepulcher (E4M4) - Phoenix Rod 2',
+        'Sepulcher (E4M4) - Ring of Invincibility',
+        'Sepulcher (E4M4) - Shadowsphere',
+        'Sepulcher (E4M4) - Silver Shield',
+        'Sepulcher (E4M4) - Silver Shield 2',
+        'Sepulcher (E4M4) - Tome of Power',
+        'Sepulcher (E4M4) - Tome of Power 2',
+        'Sepulcher (E4M4) - Torch',
+        'Sepulcher (E4M4) - Torch 2',
+    },
+    'Shattered Bridge (E4M8)': {
+        'Shattered Bridge (E4M8) - Bag of Holding',
+        'Shattered Bridge (E4M8) - Bag of Holding 2',
+        'Shattered Bridge (E4M8) - Chaos Device',
+        'Shattered Bridge (E4M8) - Dragon Claw',
+        'Shattered Bridge (E4M8) - Enchanted Shield',
+        'Shattered Bridge (E4M8) - Ethereal Crossbow',
+        'Shattered Bridge (E4M8) - Exit',
+        'Shattered Bridge (E4M8) - Gauntlets of the Necromancer',
+        'Shattered Bridge (E4M8) - Hellstaff',
+        'Shattered Bridge (E4M8) - Morph Ovum',
+        'Shattered Bridge (E4M8) - Mystic Urn',
+        'Shattered Bridge (E4M8) - Phoenix Rod',
+        'Shattered Bridge (E4M8) - Ring of Invincibility',
+        'Shattered Bridge (E4M8) - Shadowsphere',
+        'Shattered Bridge (E4M8) - Silver Shield',
+        'Shattered Bridge (E4M8) - Tome of Power',
+        'Shattered Bridge (E4M8) - Tome of Power 2',
+        'Shattered Bridge (E4M8) - Torch',
+        'Shattered Bridge (E4M8) - Yellow key',
+    },
+    "Skein of D'Sparil (E5M9)": {
+        "Skein of D'Sparil (E5M9) - Bag of Holding",
+        "Skein of D'Sparil (E5M9) - Bag of Holding 2",
+        "Skein of D'Sparil (E5M9) - Blue key",
+        "Skein of D'Sparil (E5M9) - Chaos Device",
+        "Skein of D'Sparil (E5M9) - Dragon Claw",
+        "Skein of D'Sparil (E5M9) - Enchanted Shield",
+        "Skein of D'Sparil (E5M9) - Ethereal Crossbow",
+        "Skein of D'Sparil (E5M9) - Exit",
+        "Skein of D'Sparil (E5M9) - Gauntlets of the Necromancer",
+        "Skein of D'Sparil (E5M9) - Green key",
+        "Skein of D'Sparil (E5M9) - Hellstaff",
+        "Skein of D'Sparil (E5M9) - Map Scroll",
+        "Skein of D'Sparil (E5M9) - Morph Ovum",
+        "Skein of D'Sparil (E5M9) - Mystic Urn",
+        "Skein of D'Sparil (E5M9) - Phoenix Rod",
+        "Skein of D'Sparil (E5M9) - Ring of Invincibility",
+        "Skein of D'Sparil (E5M9) - Shadowsphere",
+        "Skein of D'Sparil (E5M9) - Silver Shield",
+        "Skein of D'Sparil (E5M9) - Tome of Power",
+        "Skein of D'Sparil (E5M9) - Tome of Power 2",
+        "Skein of D'Sparil (E5M9) - Torch",
+        "Skein of D'Sparil (E5M9) - Yellow key",
+    },
+    'The Aquifier (E3M9)': {
+        'The Aquifier (E3M9) - Bag of Holding',
+        'The Aquifier (E3M9) - Blue key',
+        'The Aquifier (E3M9) - Chaos Device',
+        'The Aquifier (E3M9) - Dragon Claw',
+        'The Aquifier (E3M9) - Enchanted Shield',
+        'The Aquifier (E3M9) - Ethereal Crossbow',
+        'The Aquifier (E3M9) - Exit',
+        'The Aquifier (E3M9) - Firemace',
+        'The Aquifier (E3M9) - Firemace 2',
+        'The Aquifier (E3M9) - Firemace 3',
+        'The Aquifier (E3M9) - Firemace 4',
+        'The Aquifier (E3M9) - Gauntlets of the Necromancer',
+        'The Aquifier (E3M9) - Green key',
+        'The Aquifier (E3M9) - Hellstaff',
+        'The Aquifier (E3M9) - Map Scroll',
+        'The Aquifier (E3M9) - Morph Ovum',
+        'The Aquifier (E3M9) - Mystic Urn',
+        'The Aquifier (E3M9) - Phoenix Rod',
+        'The Aquifier (E3M9) - Ring of Invincibility',
+        'The Aquifier (E3M9) - Shadowsphere',
+        'The Aquifier (E3M9) - Silver Shield',
+        'The Aquifier (E3M9) - Silver Shield 2',
+        'The Aquifier (E3M9) - Tome of Power',
+        'The Aquifier (E3M9) - Tome of Power 2',
+        'The Aquifier (E3M9) - Torch',
+        'The Aquifier (E3M9) - Yellow key',
+    },
+    'The Azure Fortress (E3M4)': {
+        'The Azure Fortress (E3M4) - Bag of Holding',
+        'The Azure Fortress (E3M4) - Bag of Holding 2',
+        'The Azure Fortress (E3M4) - Chaos Device',
+        'The Azure Fortress (E3M4) - Dragon Claw',
+        'The Azure Fortress (E3M4) - Enchanted Shield',
+        'The Azure Fortress (E3M4) - Enchanted Shield 2',
+        'The Azure Fortress (E3M4) - Ethereal Crossbow',
+        'The Azure Fortress (E3M4) - Exit',
+        'The Azure Fortress (E3M4) - Gauntlets of the Necromancer',
+        'The Azure Fortress (E3M4) - Green key',
+        'The Azure Fortress (E3M4) - Hellstaff',
+        'The Azure Fortress (E3M4) - Map Scroll',
+        'The Azure Fortress (E3M4) - Morph Ovum',
+        'The Azure Fortress (E3M4) - Morph Ovum 2',
+        'The Azure Fortress (E3M4) - Mystic Urn',
+        'The Azure Fortress (E3M4) - Mystic Urn 2',
+        'The Azure Fortress (E3M4) - Phoenix Rod',
+        'The Azure Fortress (E3M4) - Ring of Invincibility',
+        'The Azure Fortress (E3M4) - Shadowsphere',
+        'The Azure Fortress (E3M4) - Silver Shield',
+        'The Azure Fortress (E3M4) - Silver Shield 2',
+        'The Azure Fortress (E3M4) - Tome of Power',
+        'The Azure Fortress (E3M4) - Tome of Power 2',
+        'The Azure Fortress (E3M4) - Tome of Power 3',
+        'The Azure Fortress (E3M4) - Torch',
+        'The Azure Fortress (E3M4) - Torch 2',
+        'The Azure Fortress (E3M4) - Torch 3',
+        'The Azure Fortress (E3M4) - Yellow key',
+    },
+    'The Catacombs (E2M5)': {
+        'The Catacombs (E2M5) - Bag of Holding',
+        'The Catacombs (E2M5) - Blue key',
+        'The Catacombs (E2M5) - Chaos Device',
+        'The Catacombs (E2M5) - Dragon Claw',
+        'The Catacombs (E2M5) - Enchanted Shield',
+        'The Catacombs (E2M5) - Ethereal Crossbow',
+        'The Catacombs (E2M5) - Exit',
+        'The Catacombs (E2M5) - Gauntlets of the Necromancer',
+        'The Catacombs (E2M5) - Green key',
+        'The Catacombs (E2M5) - Hellstaff',
+        'The Catacombs (E2M5) - Map Scroll',
+        'The Catacombs (E2M5) - Morph Ovum',
+        'The Catacombs (E2M5) - Mystic Urn',
+        'The Catacombs (E2M5) - Phoenix Rod',
+        'The Catacombs (E2M5) - Ring of Invincibility',
+        'The Catacombs (E2M5) - Shadowsphere',
+        'The Catacombs (E2M5) - Silver Shield',
+        'The Catacombs (E2M5) - Tome of Power',
+        'The Catacombs (E2M5) - Tome of Power 2',
+        'The Catacombs (E2M5) - Tome of Power 3',
+        'The Catacombs (E2M5) - Torch',
+        'The Catacombs (E2M5) - Yellow key',
+    },
+    'The Cathedral (E1M6)': {
+        'The Cathedral (E1M6) - Bag of Holding',
+        'The Cathedral (E1M6) - Bag of Holding 2',
+        'The Cathedral (E1M6) - Bag of Holding 3',
+        'The Cathedral (E1M6) - Dragon Claw',
+        'The Cathedral (E1M6) - Ethereal Crossbow',
+        'The Cathedral (E1M6) - Exit',
+        'The Cathedral (E1M6) - Gauntlets of the Necromancer',
+        'The Cathedral (E1M6) - Green key',
+        'The Cathedral (E1M6) - Map Scroll',
+        'The Cathedral (E1M6) - Morph Ovum',
+        'The Cathedral (E1M6) - Ring of Invincibility',
+        'The Cathedral (E1M6) - Ring of Invincibility 2',
+        'The Cathedral (E1M6) - Shadowsphere',
+        'The Cathedral (E1M6) - Silver Shield',
+        'The Cathedral (E1M6) - Silver Shield 2',
+        'The Cathedral (E1M6) - Silver Shield 3',
+        'The Cathedral (E1M6) - Tome of Power',
+        'The Cathedral (E1M6) - Tome of Power 2',
+        'The Cathedral (E1M6) - Tome of Power 3',
+        'The Cathedral (E1M6) - Tome of Power 4',
+        'The Cathedral (E1M6) - Torch',
+        'The Cathedral (E1M6) - Yellow key',
+    },
+    'The Cesspool (E3M2)': {
+        'The Cesspool (E3M2) - Bag of Holding',
+        'The Cesspool (E3M2) - Bag of Holding 2',
+        'The Cesspool (E3M2) - Blue key',
+        'The Cesspool (E3M2) - Chaos Device',
+        'The Cesspool (E3M2) - Dragon Claw',
+        'The Cesspool (E3M2) - Enchanted Shield',
+        'The Cesspool (E3M2) - Ethereal Crossbow',
+        'The Cesspool (E3M2) - Exit',
+        'The Cesspool (E3M2) - Firemace',
+        'The Cesspool (E3M2) - Firemace 2',
+        'The Cesspool (E3M2) - Firemace 3',
+        'The Cesspool (E3M2) - Firemace 4',
+        'The Cesspool (E3M2) - Firemace 5',
+        'The Cesspool (E3M2) - Gauntlets of the Necromancer',
+        'The Cesspool (E3M2) - Green key',
+        'The Cesspool (E3M2) - Hellstaff',
+        'The Cesspool (E3M2) - Map Scroll',
+        'The Cesspool (E3M2) - Morph Ovum',
+        'The Cesspool (E3M2) - Morph Ovum 2',
+        'The Cesspool (E3M2) - Mystic Urn',
+        'The Cesspool (E3M2) - Phoenix Rod',
+        'The Cesspool (E3M2) - Ring of Invincibility',
+        'The Cesspool (E3M2) - Shadowsphere',
+        'The Cesspool (E3M2) - Silver Shield',
+        'The Cesspool (E3M2) - Silver Shield 2',
+        'The Cesspool (E3M2) - Tome of Power',
+        'The Cesspool (E3M2) - Tome of Power 2',
+        'The Cesspool (E3M2) - Tome of Power 3',
+        'The Cesspool (E3M2) - Torch',
+        'The Cesspool (E3M2) - Yellow key',
+    },
+    'The Chasm (E3M7)': {
+        'The Chasm (E3M7) - Bag of Holding',
+        'The Chasm (E3M7) - Bag of Holding 2',
+        'The Chasm (E3M7) - Blue key',
+        'The Chasm (E3M7) - Chaos Device',
+        'The Chasm (E3M7) - Dragon Claw',
+        'The Chasm (E3M7) - Enchanted Shield',
+        'The Chasm (E3M7) - Ethereal Crossbow',
+        'The Chasm (E3M7) - Exit',
+        'The Chasm (E3M7) - Gauntlets of the Necromancer',
+        'The Chasm (E3M7) - Green key',
+        'The Chasm (E3M7) - Hellstaff',
+        'The Chasm (E3M7) - Map Scroll',
+        'The Chasm (E3M7) - Morph Ovum',
+        'The Chasm (E3M7) - Mystic Urn',
+        'The Chasm (E3M7) - Phoenix Rod',
+        'The Chasm (E3M7) - Ring of Invincibility',
+        'The Chasm (E3M7) - Shadowsphere',
+        'The Chasm (E3M7) - Shadowsphere 2',
+        'The Chasm (E3M7) - Silver Shield',
+        'The Chasm (E3M7) - Tome of Power',
+        'The Chasm (E3M7) - Tome of Power 2',
+        'The Chasm (E3M7) - Tome of Power 3',
+        'The Chasm (E3M7) - Torch',
+        'The Chasm (E3M7) - Torch 2',
+        'The Chasm (E3M7) - Yellow key',
+    },
+    'The Citadel (E1M5)': {
+        'The Citadel (E1M5) - Bag of Holding',
+        'The Citadel (E1M5) - Blue key',
+        'The Citadel (E1M5) - Dragon Claw',
+        'The Citadel (E1M5) - Ethereal Crossbow',
+        'The Citadel (E1M5) - Exit',
+        'The Citadel (E1M5) - Gauntlets of the Necromancer',
+        'The Citadel (E1M5) - Green key',
+        'The Citadel (E1M5) - Map Scroll',
+        'The Citadel (E1M5) - Morph Ovum',
+        'The Citadel (E1M5) - Ring of Invincibility',
+        'The Citadel (E1M5) - Shadowsphere',
+        'The Citadel (E1M5) - Silver Shield',
+        'The Citadel (E1M5) - Silver Shield 2',
+        'The Citadel (E1M5) - Tome of Power',
+        'The Citadel (E1M5) - Tome of Power 2',
+        'The Citadel (E1M5) - Tome of Power 3',
+        'The Citadel (E1M5) - Tome of Power 4',
+        'The Citadel (E1M5) - Tome of Power 5',
+        'The Citadel (E1M5) - Torch',
+        'The Citadel (E1M5) - Torch 2',
+        'The Citadel (E1M5) - Yellow key',
+    },
+    'The Confluence (E3M3)': {
+        'The Confluence (E3M3) - Bag of Holding',
+        'The Confluence (E3M3) - Blue key',
+        'The Confluence (E3M3) - Chaos Device',
+        'The Confluence (E3M3) - Dragon Claw',
+        'The Confluence (E3M3) - Enchanted Shield',
+        'The Confluence (E3M3) - Ethereal Crossbow',
+        'The Confluence (E3M3) - Exit',
+        'The Confluence (E3M3) - Firemace',
+        'The Confluence (E3M3) - Firemace 2',
+        'The Confluence (E3M3) - Firemace 3',
+        'The Confluence (E3M3) - Firemace 4',
+        'The Confluence (E3M3) - Firemace 5',
+        'The Confluence (E3M3) - Firemace 6',
+        'The Confluence (E3M3) - Gauntlets of the Necromancer',
+        'The Confluence (E3M3) - Green key',
+        'The Confluence (E3M3) - Hellstaff',
+        'The Confluence (E3M3) - Hellstaff 2',
+        'The Confluence (E3M3) - Map Scroll',
+        'The Confluence (E3M3) - Morph Ovum',
+        'The Confluence (E3M3) - Mystic Urn',
+        'The Confluence (E3M3) - Mystic Urn 2',
+        'The Confluence (E3M3) - Phoenix Rod',
+        'The Confluence (E3M3) - Ring of Invincibility',
+        'The Confluence (E3M3) - Shadowsphere',
+        'The Confluence (E3M3) - Silver Shield',
+        'The Confluence (E3M3) - Silver Shield 2',
+        'The Confluence (E3M3) - Tome of Power',
+        'The Confluence (E3M3) - Tome of Power 2',
+        'The Confluence (E3M3) - Tome of Power 3',
+        'The Confluence (E3M3) - Tome of Power 4',
+        'The Confluence (E3M3) - Tome of Power 5',
+        'The Confluence (E3M3) - Torch',
+        'The Confluence (E3M3) - Yellow key',
+    },
+    'The Crater (E2M1)': {
+        'The Crater (E2M1) - Bag of Holding',
+        'The Crater (E2M1) - Dragon Claw',
+        'The Crater (E2M1) - Ethereal Crossbow',
+        'The Crater (E2M1) - Exit',
+        'The Crater (E2M1) - Green key',
+        'The Crater (E2M1) - Hellstaff',
+        'The Crater (E2M1) - Mystic Urn',
+        'The Crater (E2M1) - Shadowsphere',
+        'The Crater (E2M1) - Silver Shield',
+        'The Crater (E2M1) - Tome of Power',
+        'The Crater (E2M1) - Torch',
+        'The Crater (E2M1) - Yellow key',
+    },
+    'The Crypts (E1M7)': {
+        'The Crypts (E1M7) - Bag of Holding',
+        'The Crypts (E1M7) - Blue key',
+        'The Crypts (E1M7) - Dragon Claw',
+        'The Crypts (E1M7) - Ethereal Crossbow',
+        'The Crypts (E1M7) - Exit',
+        'The Crypts (E1M7) - Gauntlets of the Necromancer',
+        'The Crypts (E1M7) - Green key',
+        'The Crypts (E1M7) - Map Scroll',
+        'The Crypts (E1M7) - Morph Ovum',
+        'The Crypts (E1M7) - Ring of Invincibility',
+        'The Crypts (E1M7) - Shadowsphere',
+        'The Crypts (E1M7) - Silver Shield',
+        'The Crypts (E1M7) - Silver Shield 2',
+        'The Crypts (E1M7) - Tome of Power',
+        'The Crypts (E1M7) - Tome of Power 2',
+        'The Crypts (E1M7) - Torch',
+        'The Crypts (E1M7) - Torch 2',
+        'The Crypts (E1M7) - Yellow key',
+    },
+    'The Docks (E1M1)': {
+        'The Docks (E1M1) - Bag of Holding',
+        'The Docks (E1M1) - Ethereal Crossbow',
+        'The Docks (E1M1) - Exit',
+        'The Docks (E1M1) - Gauntlets of the Necromancer',
+        'The Docks (E1M1) - Silver Shield',
+        'The Docks (E1M1) - Tome of Power',
+        'The Docks (E1M1) - Yellow key',
+    },
+    'The Dungeons (E1M2)': {
+        'The Dungeons (E1M2) - Bag of Holding',
+        'The Dungeons (E1M2) - Blue key',
+        'The Dungeons (E1M2) - Dragon Claw',
+        'The Dungeons (E1M2) - Ethereal Crossbow',
+        'The Dungeons (E1M2) - Exit',
+        'The Dungeons (E1M2) - Gauntlets of the Necromancer',
+        'The Dungeons (E1M2) - Green key',
+        'The Dungeons (E1M2) - Map Scroll',
+        'The Dungeons (E1M2) - Ring of Invincibility',
+        'The Dungeons (E1M2) - Shadowsphere',
+        'The Dungeons (E1M2) - Silver Shield',
+        'The Dungeons (E1M2) - Silver Shield 2',
+        'The Dungeons (E1M2) - Tome of Power',
+        'The Dungeons (E1M2) - Tome of Power 2',
+        'The Dungeons (E1M2) - Torch',
+        'The Dungeons (E1M2) - Yellow key',
+    },
+    'The Gatehouse (E1M3)': {
+        'The Gatehouse (E1M3) - Bag of Holding',
+        'The Gatehouse (E1M3) - Dragon Claw',
+        'The Gatehouse (E1M3) - Ethereal Crossbow',
+        'The Gatehouse (E1M3) - Exit',
+        'The Gatehouse (E1M3) - Gauntlets of the Necromancer',
+        'The Gatehouse (E1M3) - Green key',
+        'The Gatehouse (E1M3) - Morph Ovum',
+        'The Gatehouse (E1M3) - Ring of Invincibility',
+        'The Gatehouse (E1M3) - Shadowsphere',
+        'The Gatehouse (E1M3) - Silver Shield',
+        'The Gatehouse (E1M3) - Tome of Power',
+        'The Gatehouse (E1M3) - Tome of Power 2',
+        'The Gatehouse (E1M3) - Tome of Power 3',
+        'The Gatehouse (E1M3) - Torch',
+        'The Gatehouse (E1M3) - Yellow key',
+    },
+    'The Glacier (E2M9)': {
+        'The Glacier (E2M9) - Bag of Holding',
+        'The Glacier (E2M9) - Blue key',
+        'The Glacier (E2M9) - Chaos Device',
+        'The Glacier (E2M9) - Dragon Claw',
+        'The Glacier (E2M9) - Dragon Claw 2',
+        'The Glacier (E2M9) - Enchanted Shield',
+        'The Glacier (E2M9) - Ethereal Crossbow',
+        'The Glacier (E2M9) - Exit',
+        'The Glacier (E2M9) - Firemace',
+        'The Glacier (E2M9) - Firemace 2',
+        'The Glacier (E2M9) - Firemace 3',
+        'The Glacier (E2M9) - Firemace 4',
+        'The Glacier (E2M9) - Gauntlets of the Necromancer',
+        'The Glacier (E2M9) - Green key',
+        'The Glacier (E2M9) - Hellstaff',
+        'The Glacier (E2M9) - Map Scroll',
+        'The Glacier (E2M9) - Morph Ovum',
+        'The Glacier (E2M9) - Mystic Urn',
+        'The Glacier (E2M9) - Mystic Urn 2',
+        'The Glacier (E2M9) - Phoenix Rod',
+        'The Glacier (E2M9) - Ring of Invincibility',
+        'The Glacier (E2M9) - Shadowsphere',
+        'The Glacier (E2M9) - Silver Shield',
+        'The Glacier (E2M9) - Tome of Power',
+        'The Glacier (E2M9) - Tome of Power 2',
+        'The Glacier (E2M9) - Torch',
+        'The Glacier (E2M9) - Torch 2',
+        'The Glacier (E2M9) - Yellow key',
+    },
+    'The Graveyard (E1M9)': {
+        'The Graveyard (E1M9) - Bag of Holding',
+        'The Graveyard (E1M9) - Blue key',
+        'The Graveyard (E1M9) - Dragon Claw',
+        'The Graveyard (E1M9) - Dragon Claw 2',
+        'The Graveyard (E1M9) - Ethereal Crossbow',
+        'The Graveyard (E1M9) - Exit',
+        'The Graveyard (E1M9) - Green key',
+        'The Graveyard (E1M9) - Map Scroll',
+        'The Graveyard (E1M9) - Morph Ovum',
+        'The Graveyard (E1M9) - Ring of Invincibility',
+        'The Graveyard (E1M9) - Shadowsphere',
+        'The Graveyard (E1M9) - Silver Shield',
+        'The Graveyard (E1M9) - Tome of Power',
+        'The Graveyard (E1M9) - Tome of Power 2',
+        'The Graveyard (E1M9) - Torch',
+        'The Graveyard (E1M9) - Yellow key',
+    },
+    'The Great Hall (E2M7)': {
+        'The Great Hall (E2M7) - Bag of Holding',
+        'The Great Hall (E2M7) - Blue key',
+        'The Great Hall (E2M7) - Chaos Device',
+        'The Great Hall (E2M7) - Dragon Claw',
+        'The Great Hall (E2M7) - Enchanted Shield',
+        'The Great Hall (E2M7) - Ethereal Crossbow',
+        'The Great Hall (E2M7) - Exit',
+        'The Great Hall (E2M7) - Gauntlets of the Necromancer',
+        'The Great Hall (E2M7) - Green key',
+        'The Great Hall (E2M7) - Hellstaff',
+        'The Great Hall (E2M7) - Map Scroll',
+        'The Great Hall (E2M7) - Morph Ovum',
+        'The Great Hall (E2M7) - Mystic Urn',
+        'The Great Hall (E2M7) - Phoenix Rod',
+        'The Great Hall (E2M7) - Ring of Invincibility',
+        'The Great Hall (E2M7) - Shadowsphere',
+        'The Great Hall (E2M7) - Silver Shield',
+        'The Great Hall (E2M7) - Tome of Power',
+        'The Great Hall (E2M7) - Tome of Power 2',
+        'The Great Hall (E2M7) - Torch',
+        'The Great Hall (E2M7) - Yellow key',
+    },
+    'The Guard Tower (E1M4)': {
+        'The Guard Tower (E1M4) - Bag of Holding',
+        'The Guard Tower (E1M4) - Dragon Claw',
+        'The Guard Tower (E1M4) - Ethereal Crossbow',
+        'The Guard Tower (E1M4) - Exit',
+        'The Guard Tower (E1M4) - Gauntlets of the Necromancer',
+        'The Guard Tower (E1M4) - Green key',
+        'The Guard Tower (E1M4) - Map Scroll',
+        'The Guard Tower (E1M4) - Morph Ovum',
+        'The Guard Tower (E1M4) - Shadowsphere',
+        'The Guard Tower (E1M4) - Silver Shield',
+        'The Guard Tower (E1M4) - Tome of Power',
+        'The Guard Tower (E1M4) - Tome of Power 2',
+        'The Guard Tower (E1M4) - Tome of Power 3',
+        'The Guard Tower (E1M4) - Torch',
+        'The Guard Tower (E1M4) - Yellow key',
+    },
+    'The Halls of Fear (E3M6)': {
+        'The Halls of Fear (E3M6) - Bag of Holding',
+        'The Halls of Fear (E3M6) - Bag of Holding 2',
+        'The Halls of Fear (E3M6) - Bag of Holding 3',
+        'The Halls of Fear (E3M6) - Blue key',
+        'The Halls of Fear (E3M6) - Chaos Device',
+        'The Halls of Fear (E3M6) - Dragon Claw',
+        'The Halls of Fear (E3M6) - Enchanted Shield',
+        'The Halls of Fear (E3M6) - Ethereal Crossbow',
+        'The Halls of Fear (E3M6) - Exit',
+        'The Halls of Fear (E3M6) - Firemace',
+        'The Halls of Fear (E3M6) - Firemace 2',
+        'The Halls of Fear (E3M6) - Firemace 3',
+        'The Halls of Fear (E3M6) - Firemace 4',
+        'The Halls of Fear (E3M6) - Firemace 5',
+        'The Halls of Fear (E3M6) - Firemace 6',
+        'The Halls of Fear (E3M6) - Gauntlets of the Necromancer',
+        'The Halls of Fear (E3M6) - Green key',
+        'The Halls of Fear (E3M6) - Hellstaff',
+        'The Halls of Fear (E3M6) - Hellstaff 2',
+        'The Halls of Fear (E3M6) - Map Scroll',
+        'The Halls of Fear (E3M6) - Morph Ovum',
+        'The Halls of Fear (E3M6) - Mystic Urn',
+        'The Halls of Fear (E3M6) - Mystic Urn 2',
+        'The Halls of Fear (E3M6) - Phoenix Rod',
+        'The Halls of Fear (E3M6) - Ring of Invincibility',
+        'The Halls of Fear (E3M6) - Shadowsphere',
+        'The Halls of Fear (E3M6) - Silver Shield',
+        'The Halls of Fear (E3M6) - Tome of Power',
+        'The Halls of Fear (E3M6) - Tome of Power 2',
+        'The Halls of Fear (E3M6) - Tome of Power 3',
+        'The Halls of Fear (E3M6) - Yellow key',
+    },
+    'The Ice Grotto (E2M4)': {
+        'The Ice Grotto (E2M4) - Bag of Holding',
+        'The Ice Grotto (E2M4) - Bag of Holding 2',
+        'The Ice Grotto (E2M4) - Blue key',
+        'The Ice Grotto (E2M4) - Chaos Device',
+        'The Ice Grotto (E2M4) - Dragon Claw',
+        'The Ice Grotto (E2M4) - Enchanted Shield',
+        'The Ice Grotto (E2M4) - Ethereal Crossbow',
+        'The Ice Grotto (E2M4) - Exit',
+        'The Ice Grotto (E2M4) - Gauntlets of the Necromancer',
+        'The Ice Grotto (E2M4) - Green key',
+        'The Ice Grotto (E2M4) - Hellstaff',
+        'The Ice Grotto (E2M4) - Map Scroll',
+        'The Ice Grotto (E2M4) - Morph Ovum',
+        'The Ice Grotto (E2M4) - Mystic Urn',
+        'The Ice Grotto (E2M4) - Phoenix Rod',
+        'The Ice Grotto (E2M4) - Shadowsphere',
+        'The Ice Grotto (E2M4) - Shadowsphere 2',
+        'The Ice Grotto (E2M4) - Silver Shield',
+        'The Ice Grotto (E2M4) - Tome of Power',
+        'The Ice Grotto (E2M4) - Tome of Power 2',
+        'The Ice Grotto (E2M4) - Tome of Power 3',
+        'The Ice Grotto (E2M4) - Torch',
+        'The Ice Grotto (E2M4) - Yellow key',
+    },
+    'The Labyrinth (E2M6)': {
+        'The Labyrinth (E2M6) - Bag of Holding',
+        'The Labyrinth (E2M6) - Blue key',
+        'The Labyrinth (E2M6) - Chaos Device',
+        'The Labyrinth (E2M6) - Dragon Claw',
+        'The Labyrinth (E2M6) - Enchanted Shield',
+        'The Labyrinth (E2M6) - Ethereal Crossbow',
+        'The Labyrinth (E2M6) - Exit',
+        'The Labyrinth (E2M6) - Firemace',
+        'The Labyrinth (E2M6) - Firemace 2',
+        'The Labyrinth (E2M6) - Firemace 3',
+        'The Labyrinth (E2M6) - Firemace 4',
+        'The Labyrinth (E2M6) - Gauntlets of the Necromancer',
+        'The Labyrinth (E2M6) - Green key',
+        'The Labyrinth (E2M6) - Hellstaff',
+        'The Labyrinth (E2M6) - Map Scroll',
+        'The Labyrinth (E2M6) - Morph Ovum',
+        'The Labyrinth (E2M6) - Mystic Urn',
+        'The Labyrinth (E2M6) - Phoenix Rod',
+        'The Labyrinth (E2M6) - Phoenix Rod 2',
+        'The Labyrinth (E2M6) - Ring of Invincibility',
+        'The Labyrinth (E2M6) - Shadowsphere',
+        'The Labyrinth (E2M6) - Silver Shield',
+        'The Labyrinth (E2M6) - Tome of Power',
+        'The Labyrinth (E2M6) - Tome of Power 2',
+        'The Labyrinth (E2M6) - Yellow key',
+    },
+    'The Lava Pits (E2M2)': {
+        'The Lava Pits (E2M2) - Bag of Holding',
+        'The Lava Pits (E2M2) - Bag of Holding 2',
+        'The Lava Pits (E2M2) - Chaos Device',
+        'The Lava Pits (E2M2) - Dragon Claw',
+        'The Lava Pits (E2M2) - Enchanted Shield',
+        'The Lava Pits (E2M2) - Ethereal Crossbow',
+        'The Lava Pits (E2M2) - Exit',
+        'The Lava Pits (E2M2) - Gauntlets of the Necromancer',
+        'The Lava Pits (E2M2) - Green key',
+        'The Lava Pits (E2M2) - Hellstaff',
+        'The Lava Pits (E2M2) - Map Scroll',
+        'The Lava Pits (E2M2) - Morph Ovum',
+        'The Lava Pits (E2M2) - Mystic Urn',
+        'The Lava Pits (E2M2) - Ring of Invincibility',
+        'The Lava Pits (E2M2) - Shadowsphere',
+        'The Lava Pits (E2M2) - Silver Shield',
+        'The Lava Pits (E2M2) - Silver Shield 2',
+        'The Lava Pits (E2M2) - Tome of Power',
+        'The Lava Pits (E2M2) - Tome of Power 2',
+        'The Lava Pits (E2M2) - Tome of Power 3',
+        'The Lava Pits (E2M2) - Yellow key',
+    },
+    'The Ophidian Lair (E3M5)': {
+        'The Ophidian Lair (E3M5) - Bag of Holding',
+        'The Ophidian Lair (E3M5) - Chaos Device',
+        'The Ophidian Lair (E3M5) - Dragon Claw',
+        'The Ophidian Lair (E3M5) - Enchanted Shield',
+        'The Ophidian Lair (E3M5) - Ethereal Crossbow',
+        'The Ophidian Lair (E3M5) - Exit',
+        'The Ophidian Lair (E3M5) - Gauntlets of the Necromancer',
+        'The Ophidian Lair (E3M5) - Green key',
+        'The Ophidian Lair (E3M5) - Hellstaff',
+        'The Ophidian Lair (E3M5) - Map Scroll',
+        'The Ophidian Lair (E3M5) - Morph Ovum',
+        'The Ophidian Lair (E3M5) - Mystic Urn',
+        'The Ophidian Lair (E3M5) - Mystic Urn 2',
+        'The Ophidian Lair (E3M5) - Phoenix Rod',
+        'The Ophidian Lair (E3M5) - Ring of Invincibility',
+        'The Ophidian Lair (E3M5) - Shadowsphere',
+        'The Ophidian Lair (E3M5) - Silver Shield',
+        'The Ophidian Lair (E3M5) - Silver Shield 2',
+        'The Ophidian Lair (E3M5) - Tome of Power',
+        'The Ophidian Lair (E3M5) - Tome of Power 2',
+        'The Ophidian Lair (E3M5) - Torch',
+        'The Ophidian Lair (E3M5) - Yellow key',
+    },
+    'The Portals of Chaos (E2M8)': {
+        'The Portals of Chaos (E2M8) - Bag of Holding',
+        'The Portals of Chaos (E2M8) - Chaos Device',
+        'The Portals of Chaos (E2M8) - Dragon Claw',
+        'The Portals of Chaos (E2M8) - Enchanted Shield',
+        'The Portals of Chaos (E2M8) - Ethereal Crossbow',
+        'The Portals of Chaos (E2M8) - Exit',
+        'The Portals of Chaos (E2M8) - Gauntlets of the Necromancer',
+        'The Portals of Chaos (E2M8) - Hellstaff',
+        'The Portals of Chaos (E2M8) - Morph Ovum',
+        'The Portals of Chaos (E2M8) - Mystic Urn',
+        'The Portals of Chaos (E2M8) - Mystic Urn 2',
+        'The Portals of Chaos (E2M8) - Phoenix Rod',
+        'The Portals of Chaos (E2M8) - Ring of Invincibility',
+        'The Portals of Chaos (E2M8) - Shadowsphere',
+        'The Portals of Chaos (E2M8) - Silver Shield',
+        'The Portals of Chaos (E2M8) - Tome of Power',
+    },
+    'The River of Fire (E2M3)': {
+        'The River of Fire (E2M3) - Bag of Holding',
+        'The River of Fire (E2M3) - Blue key',
+        'The River of Fire (E2M3) - Chaos Device',
+        'The River of Fire (E2M3) - Dragon Claw',
+        'The River of Fire (E2M3) - Enchanted Shield',
+        'The River of Fire (E2M3) - Ethereal Crossbow',
+        'The River of Fire (E2M3) - Exit',
+        'The River of Fire (E2M3) - Firemace',
+        'The River of Fire (E2M3) - Firemace 2',
+        'The River of Fire (E2M3) - Firemace 3',
+        'The River of Fire (E2M3) - Gauntlets of the Necromancer',
+        'The River of Fire (E2M3) - Green key',
+        'The River of Fire (E2M3) - Hellstaff',
+        'The River of Fire (E2M3) - Morph Ovum',
+        'The River of Fire (E2M3) - Mystic Urn',
+        'The River of Fire (E2M3) - Phoenix Rod',
+        'The River of Fire (E2M3) - Ring of Invincibility',
+        'The River of Fire (E2M3) - Shadowsphere',
+        'The River of Fire (E2M3) - Silver Shield',
+        'The River of Fire (E2M3) - Tome of Power',
+        'The River of Fire (E2M3) - Tome of Power 2',
+        'The River of Fire (E2M3) - Yellow key',
+    },
+    'The Storehouse (E3M1)': {
+        'The Storehouse (E3M1) - Bag of Holding',
+        'The Storehouse (E3M1) - Chaos Device',
+        'The Storehouse (E3M1) - Dragon Claw',
+        'The Storehouse (E3M1) - Exit',
+        'The Storehouse (E3M1) - Gauntlets of the Necromancer',
+        'The Storehouse (E3M1) - Green key',
+        'The Storehouse (E3M1) - Hellstaff',
+        'The Storehouse (E3M1) - Map Scroll',
+        'The Storehouse (E3M1) - Ring of Invincibility',
+        'The Storehouse (E3M1) - Shadowsphere',
+        'The Storehouse (E3M1) - Silver Shield',
+        'The Storehouse (E3M1) - Tome of Power',
+        'The Storehouse (E3M1) - Torch',
+        'The Storehouse (E3M1) - Yellow key',
+    },
+}
+
+
+death_logic_locations = [
+    "Ramparts of Perdition (E4M7) - Ring of Invincibility",
+    "Ramparts of Perdition (E4M7) - Ethereal Crossbow 2",
+]
diff --git a/worlds/heretic/Maps.py b/worlds/heretic/Maps.py
new file mode 100644
index 0000000000..716de29041
--- /dev/null
+++ b/worlds/heretic/Maps.py
@@ -0,0 +1,52 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import List
+
+
+map_names: List[str] = [
+    'The Docks (E1M1)',
+    'The Dungeons (E1M2)',
+    'The Gatehouse (E1M3)',
+    'The Guard Tower (E1M4)',
+    'The Citadel (E1M5)',
+    'The Cathedral (E1M6)',
+    'The Crypts (E1M7)',
+    "Hell's Maw (E1M8)",
+    'The Graveyard (E1M9)',
+    'The Crater (E2M1)',
+    'The Lava Pits (E2M2)',
+    'The River of Fire (E2M3)',
+    'The Ice Grotto (E2M4)',
+    'The Catacombs (E2M5)',
+    'The Labyrinth (E2M6)',
+    'The Great Hall (E2M7)',
+    'The Portals of Chaos (E2M8)',
+    'The Glacier (E2M9)',
+    'The Storehouse (E3M1)',
+    'The Cesspool (E3M2)',
+    'The Confluence (E3M3)',
+    'The Azure Fortress (E3M4)',
+    'The Ophidian Lair (E3M5)',
+    'The Halls of Fear (E3M6)',
+    'The Chasm (E3M7)',
+    "D'Sparil'S Keep (E3M8)",
+    'The Aquifier (E3M9)',
+    'Catafalque (E4M1)',
+    'Blockhouse (E4M2)',
+    'Ambulatory (E4M3)',
+    'Sepulcher (E4M4)',
+    'Great Stair (E4M5)',
+    'Halls of the Apostate (E4M6)',
+    'Ramparts of Perdition (E4M7)',
+    'Shattered Bridge (E4M8)',
+    'Mausoleum (E4M9)',
+    'Ochre Cliffs (E5M1)',
+    'Rapids (E5M2)',
+    'Quay (E5M3)',
+    'Courtyard (E5M4)',
+    'Hydratyr (E5M5)',
+    'Colonnade (E5M6)',
+    'Foetid Manse (E5M7)',
+    'Field of Judgement (E5M8)',
+    "Skein of D'Sparil (E5M9)",
+]
diff --git a/worlds/heretic/Options.py b/worlds/heretic/Options.py
new file mode 100644
index 0000000000..34255f39eb
--- /dev/null
+++ b/worlds/heretic/Options.py
@@ -0,0 +1,167 @@
+import typing
+
+from Options import AssembleOptions, Choice, Toggle, DeathLink, DefaultOnToggle, StartInventoryPool
+
+
+class Goal(Choice):
+    """
+    Choose the main goal.
+    complete_all_levels: All levels of the selected episodes
+    complete_boss_levels: Boss levels (E#M8) of selected episodes
+    """
+    display_name = "Goal"
+    option_complete_all_levels = 0
+    option_complete_boss_levels = 1
+    default = 0
+
+
+class Difficulty(Choice):
+    """
+    Choose the difficulty option. Those match DOOM's difficulty options.
+    baby (I'm too young to die.) double ammos, half damage, less monsters or strength.
+    easy (Hey, not too rough.) less monsters or strength.
+    medium (Hurt me plenty.) Default.
+    hard (Ultra-Violence.) More monsters or strength.
+    nightmare (Nightmare!) Monsters attack more rapidly and respawn.
+
+    wet nurse (hou needeth a wet-nurse) - Fewer monsters and more items than medium. Damage taken is halved, and ammo pickups carry twice as much ammo. Any Quartz Flasks and Mystic Urns are automatically used when the player nears death.
+    easy (Yellowbellies-r-us) - Fewer monsters and more items than medium.
+    medium (Bringest them oneth) - Completely balanced, this is the standard difficulty level.
+    hard (Thou art a smite-meister) - More monsters and fewer items than medium.
+    black plague (Black plague possesses thee) - Same as hard, but monsters and their projectiles move much faster. Cheating is also disabled.
+    """
+    display_name = "Difficulty"
+    option_wet_nurse = 0
+    option_easy = 1
+    option_medium = 2
+    option_hard = 3
+    option_black_plague = 4
+    default = 2
+
+
+class RandomMonsters(Choice):
+    """
+    Choose how monsters are randomized.
+    vanilla: No randomization
+    shuffle: Monsters are shuffled within the level
+    random_balanced: Monsters are completely randomized, but balanced based on existing ratio in the level. (Small monsters vs medium vs big)
+    random_chaotic: Monsters are completely randomized, but balanced based on existing ratio in the entire game.
+    """
+    display_name = "Random Monsters"
+    option_vanilla = 0
+    option_shuffle = 1
+    option_random_balanced = 2
+    option_random_chaotic = 3
+    default = 1
+
+
+class RandomPickups(Choice):
+    """
+    Choose how pickups are randomized.
+    vanilla: No randomization
+    shuffle: Pickups are shuffled within the level
+    random_balanced: Pickups are completely randomized, but balanced based on existing ratio in the level. (Small pickups vs Big)
+    """
+    display_name = "Random Pickups"
+    option_vanilla = 0
+    option_shuffle = 1
+    option_random_balanced = 2
+    default = 1
+
+
+class RandomMusic(Choice):
+    """
+    Level musics will be randomized.
+    vanilla: No randomization
+    shuffle_selected: Selected episodes' levels will be shuffled
+    shuffle_game: All the music will be shuffled
+    """
+    display_name = "Random Music"
+    option_vanilla = 0
+    option_shuffle_selected = 1
+    option_shuffle_game = 2
+    default = 0
+
+
+class AllowDeathLogic(Toggle):
+    """Some locations require a timed puzzle that can only be tried once.
+    After which, if the player failed to get it, the location cannot be checked anymore.
+    By default, no progression items are placed here. There is a way, hovewer, to still get them:
+    Get killed in the current map. The map will reset, you can now attempt the puzzle again."""
+    display_name = "Allow Death Logic"
+
+    
+class Pro(Toggle):
+    """Include difficult tricks into rules. Mostly employed by speed runners.
+    i.e.: Leaps across to a locked area, trigger a switch behind a window at the right angle, etc."""
+    display_name = "Pro Heretic"
+
+
+class StartWithMapScrolls(Toggle):
+    """Give the player all Map Scroll items from the start."""
+    display_name = "Start With Map Scrolls"
+
+
+class ResetLevelOnDeath(DefaultOnToggle):
+    """When dying, levels are reset and monsters respawned. But inventory and checks are kept.
+    Turning this setting off is considered easy mode. Good for new players that don't know the levels well."""
+    display_message="Reset level on death"
+
+    
+class CheckSanity(Toggle):
+    """Include redundant checks. This increase total check count for the game.
+    i.e.: In a room, there might be 3 checks close to each other. By default, two of them will be remove.
+    This was done to lower the total count check for Heretic, as it is quite high compared to other games.
+    Check Sanity restores original checks."""
+    display_name = "Check Sanity"
+
+
+class Episode1(DefaultOnToggle):
+    """City of the Damned.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 1"
+
+
+class Episode2(DefaultOnToggle):
+    """Hell's Maw.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 2"
+
+
+class Episode3(DefaultOnToggle):
+    """The Dome of D'Sparil.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 3"
+
+
+class Episode4(Toggle):
+    """The Ossuary.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 4"
+
+
+class Episode5(Toggle):
+    """The Stagnant Demesne.
+    If none of the episodes are chosen, Episode 1 will be chosen by default."""
+    display_name = "Episode 5"
+
+
+options: typing.Dict[str, AssembleOptions] = {
+    "start_inventory_from_pool": StartInventoryPool,
+    "goal": Goal,
+    "difficulty": Difficulty,
+    "random_monsters": RandomMonsters,
+    "random_pickups": RandomPickups,
+    "random_music": RandomMusic,
+    "allow_death_logic": AllowDeathLogic,
+    "pro": Pro,
+    "check_sanity": CheckSanity,
+    "start_with_map_scrolls": StartWithMapScrolls,
+    "reset_level_on_death": ResetLevelOnDeath,
+    "death_link": DeathLink,
+    "episode1": Episode1,
+    "episode2": Episode2,
+    "episode3": Episode3,
+    "episode4": Episode4,
+    "episode5": Episode5
+}
diff --git a/worlds/heretic/Regions.py b/worlds/heretic/Regions.py
new file mode 100644
index 0000000000..a30f0120a0
--- /dev/null
+++ b/worlds/heretic/Regions.py
@@ -0,0 +1,894 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import List
+from BaseClasses import TypedDict
+
+class ConnectionDict(TypedDict, total=False):
+    target: str
+    pro: bool
+
+class RegionDict(TypedDict, total=False):
+    name: str
+    connects_to_hub: bool
+    episode: int
+    connections: List[ConnectionDict]
+
+
+regions:List[RegionDict] = [
+    # The Docks (E1M1)
+    {"name":"The Docks (E1M1) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[{"target":"The Docks (E1M1) Yellow","pro":False}]},
+    {"name":"The Docks (E1M1) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Docks (E1M1) Main","pro":False},
+        {"target":"The Docks (E1M1) Sea","pro":False}]},
+    {"name":"The Docks (E1M1) Sea",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Docks (E1M1) Main","pro":False}]},
+
+    # The Dungeons (E1M2)
+    {"name":"The Dungeons (E1M2) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Dungeons (E1M2) Yellow","pro":False},
+        {"target":"The Dungeons (E1M2) Green","pro":False}]},
+    {"name":"The Dungeons (E1M2) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Dungeons (E1M2) Yellow","pro":False}]},
+    {"name":"The Dungeons (E1M2) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Dungeons (E1M2) Main","pro":False},
+        {"target":"The Dungeons (E1M2) Blue","pro":False}]},
+    {"name":"The Dungeons (E1M2) Green",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Dungeons (E1M2) Main","pro":False},
+        {"target":"The Dungeons (E1M2) Yellow","pro":False}]},
+
+    # The Gatehouse (E1M3)
+    {"name":"The Gatehouse (E1M3) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Gatehouse (E1M3) Yellow","pro":False},
+        {"target":"The Gatehouse (E1M3) Sea","pro":False},
+        {"target":"The Gatehouse (E1M3) Green","pro":False}]},
+    {"name":"The Gatehouse (E1M3) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Gatehouse (E1M3) Main","pro":False}]},
+    {"name":"The Gatehouse (E1M3) Green",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Gatehouse (E1M3) Main","pro":False}]},
+    {"name":"The Gatehouse (E1M3) Sea",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Gatehouse (E1M3) Main","pro":False}]},
+
+    # The Guard Tower (E1M4)
+    {"name":"The Guard Tower (E1M4) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[{"target":"The Guard Tower (E1M4) Yellow","pro":False}]},
+    {"name":"The Guard Tower (E1M4) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Guard Tower (E1M4) Green","pro":False},
+        {"target":"The Guard Tower (E1M4) Main","pro":False}]},
+    {"name":"The Guard Tower (E1M4) Green",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Guard Tower (E1M4) Yellow","pro":False}]},
+
+    # The Citadel (E1M5)
+    {"name":"The Citadel (E1M5) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[{"target":"The Citadel (E1M5) Yellow","pro":False}]},
+    {"name":"The Citadel (E1M5) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Citadel (E1M5) Green","pro":False}]},
+    {"name":"The Citadel (E1M5) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Citadel (E1M5) Main","pro":False},
+        {"target":"The Citadel (E1M5) Well","pro":False},
+        {"target":"The Citadel (E1M5) Green","pro":False}]},
+    {"name":"The Citadel (E1M5) Green",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Citadel (E1M5) Main","pro":False},
+        {"target":"The Citadel (E1M5) Well","pro":False},
+        {"target":"The Citadel (E1M5) Blue","pro":False}]},
+    {"name":"The Citadel (E1M5) Well",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Citadel (E1M5) Main","pro":False}]},
+
+    # The Cathedral (E1M6)
+    {"name":"The Cathedral (E1M6) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[{"target":"The Cathedral (E1M6) Yellow","pro":False}]},
+    {"name":"The Cathedral (E1M6) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Cathedral (E1M6) Green","pro":False},
+        {"target":"The Cathedral (E1M6) Main","pro":False},
+        {"target":"The Cathedral (E1M6) Main Fly","pro":False}]},
+    {"name":"The Cathedral (E1M6) Green",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Cathedral (E1M6) Yellow","pro":False},
+        {"target":"The Cathedral (E1M6) Main Fly","pro":False}]},
+    {"name":"The Cathedral (E1M6) Main Fly",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Cathedral (E1M6) Main","pro":False}]},
+
+    # The Crypts (E1M7)
+    {"name":"The Crypts (E1M7) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Crypts (E1M7) Yellow","pro":False},
+        {"target":"The Crypts (E1M7) Green","pro":False}]},
+    {"name":"The Crypts (E1M7) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Crypts (E1M7) Yellow","pro":False},
+        {"target":"The Crypts (E1M7) Main","pro":False}]},
+    {"name":"The Crypts (E1M7) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Crypts (E1M7) Main","pro":False},
+        {"target":"The Crypts (E1M7) Green","pro":False},
+        {"target":"The Crypts (E1M7) Blue","pro":False}]},
+    {"name":"The Crypts (E1M7) Green",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[
+        {"target":"The Crypts (E1M7) Yellow","pro":False},
+        {"target":"The Crypts (E1M7) Main","pro":False}]},
+
+    # Hell's Maw (E1M8)
+    {"name":"Hell's Maw (E1M8) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[]},
+
+    # The Graveyard (E1M9)
+    {"name":"The Graveyard (E1M9) Main",
+     "connects_to_hub":True,
+     "episode":1,
+     "connections":[
+        {"target":"The Graveyard (E1M9) Yellow","pro":False},
+        {"target":"The Graveyard (E1M9) Green","pro":False},
+        {"target":"The Graveyard (E1M9) Blue","pro":False}]},
+    {"name":"The Graveyard (E1M9) Blue",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Graveyard (E1M9) Main","pro":False}]},
+    {"name":"The Graveyard (E1M9) Yellow",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Graveyard (E1M9) Main","pro":False}]},
+    {"name":"The Graveyard (E1M9) Green",
+     "connects_to_hub":False,
+     "episode":1,
+     "connections":[{"target":"The Graveyard (E1M9) Main","pro":False}]},
+
+    # The Crater (E2M1)
+    {"name":"The Crater (E2M1) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[{"target":"The Crater (E2M1) Yellow","pro":False}]},
+    {"name":"The Crater (E2M1) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Crater (E2M1) Main","pro":False},
+        {"target":"The Crater (E2M1) Green","pro":False}]},
+    {"name":"The Crater (E2M1) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Crater (E2M1) Yellow","pro":False}]},
+
+    # The Lava Pits (E2M2)
+    {"name":"The Lava Pits (E2M2) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[{"target":"The Lava Pits (E2M2) Yellow","pro":False}]},
+    {"name":"The Lava Pits (E2M2) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Lava Pits (E2M2) Green","pro":False},
+        {"target":"The Lava Pits (E2M2) Main","pro":False}]},
+    {"name":"The Lava Pits (E2M2) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Lava Pits (E2M2) Main","pro":False},
+        {"target":"The Lava Pits (E2M2) Yellow","pro":False}]},
+
+    # The River of Fire (E2M3)
+    {"name":"The River of Fire (E2M3) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"The River of Fire (E2M3) Yellow","pro":False},
+        {"target":"The River of Fire (E2M3) Blue","pro":False},
+        {"target":"The River of Fire (E2M3) Green","pro":False}]},
+    {"name":"The River of Fire (E2M3) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The River of Fire (E2M3) Main","pro":False}]},
+    {"name":"The River of Fire (E2M3) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The River of Fire (E2M3) Main","pro":False}]},
+    {"name":"The River of Fire (E2M3) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The River of Fire (E2M3) Main","pro":False}]},
+
+    # The Ice Grotto (E2M4)
+    {"name":"The Ice Grotto (E2M4) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"The Ice Grotto (E2M4) Green","pro":False},
+        {"target":"The Ice Grotto (E2M4) Yellow","pro":False}]},
+    {"name":"The Ice Grotto (E2M4) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Ice Grotto (E2M4) Green","pro":False}]},
+    {"name":"The Ice Grotto (E2M4) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Ice Grotto (E2M4) Main","pro":False},
+        {"target":"The Ice Grotto (E2M4) Magenta","pro":False}]},
+    {"name":"The Ice Grotto (E2M4) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Ice Grotto (E2M4) Main","pro":False},
+        {"target":"The Ice Grotto (E2M4) Blue","pro":False}]},
+    {"name":"The Ice Grotto (E2M4) Magenta",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Ice Grotto (E2M4) Yellow","pro":False}]},
+
+    # The Catacombs (E2M5)
+    {"name":"The Catacombs (E2M5) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[{"target":"The Catacombs (E2M5) Yellow","pro":False}]},
+    {"name":"The Catacombs (E2M5) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Catacombs (E2M5) Green","pro":False}]},
+    {"name":"The Catacombs (E2M5) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Catacombs (E2M5) Green","pro":False},
+        {"target":"The Catacombs (E2M5) Main","pro":False}]},
+    {"name":"The Catacombs (E2M5) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Catacombs (E2M5) Blue","pro":False},
+        {"target":"The Catacombs (E2M5) Yellow","pro":False},
+        {"target":"The Catacombs (E2M5) Main","pro":False}]},
+
+    # The Labyrinth (E2M6)
+    {"name":"The Labyrinth (E2M6) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"The Labyrinth (E2M6) Blue","pro":False},
+        {"target":"The Labyrinth (E2M6) Yellow","pro":False},
+        {"target":"The Labyrinth (E2M6) Green","pro":False}]},
+    {"name":"The Labyrinth (E2M6) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Labyrinth (E2M6) Main","pro":False}]},
+    {"name":"The Labyrinth (E2M6) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Labyrinth (E2M6) Main","pro":False}]},
+    {"name":"The Labyrinth (E2M6) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Labyrinth (E2M6) Main","pro":False}]},
+
+    # The Great Hall (E2M7)
+    {"name":"The Great Hall (E2M7) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"The Great Hall (E2M7) Yellow","pro":False},
+        {"target":"The Great Hall (E2M7) Green","pro":False}]},
+    {"name":"The Great Hall (E2M7) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Great Hall (E2M7) Yellow","pro":False}]},
+    {"name":"The Great Hall (E2M7) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[
+        {"target":"The Great Hall (E2M7) Blue","pro":False},
+        {"target":"The Great Hall (E2M7) Main","pro":False}]},
+    {"name":"The Great Hall (E2M7) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Great Hall (E2M7) Main","pro":False}]},
+
+    # The Portals of Chaos (E2M8)
+    {"name":"The Portals of Chaos (E2M8) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[]},
+
+    # The Glacier (E2M9)
+    {"name":"The Glacier (E2M9) Main",
+     "connects_to_hub":True,
+     "episode":2,
+     "connections":[
+        {"target":"The Glacier (E2M9) Yellow","pro":False},
+        {"target":"The Glacier (E2M9) Blue","pro":False},
+        {"target":"The Glacier (E2M9) Green","pro":False}]},
+    {"name":"The Glacier (E2M9) Blue",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Glacier (E2M9) Main","pro":False}]},
+    {"name":"The Glacier (E2M9) Yellow",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Glacier (E2M9) Main","pro":False}]},
+    {"name":"The Glacier (E2M9) Green",
+     "connects_to_hub":False,
+     "episode":2,
+     "connections":[{"target":"The Glacier (E2M9) Main","pro":False}]},
+
+    # The Storehouse (E3M1)
+    {"name":"The Storehouse (E3M1) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"The Storehouse (E3M1) Yellow","pro":False},
+        {"target":"The Storehouse (E3M1) Green","pro":False}]},
+    {"name":"The Storehouse (E3M1) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Storehouse (E3M1) Main","pro":False}]},
+    {"name":"The Storehouse (E3M1) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Storehouse (E3M1) Main","pro":False}]},
+
+    # The Cesspool (E3M2)
+    {"name":"The Cesspool (E3M2) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"The Cesspool (E3M2) Yellow","pro":False}]},
+    {"name":"The Cesspool (E3M2) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Cesspool (E3M2) Green","pro":False}]},
+    {"name":"The Cesspool (E3M2) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Cesspool (E3M2) Main","pro":False},
+        {"target":"The Cesspool (E3M2) Green","pro":False}]},
+    {"name":"The Cesspool (E3M2) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Cesspool (E3M2) Blue","pro":False},
+        {"target":"The Cesspool (E3M2) Main","pro":False},
+        {"target":"The Cesspool (E3M2) Yellow","pro":False}]},
+
+    # The Confluence (E3M3)
+    {"name":"The Confluence (E3M3) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"The Confluence (E3M3) Green","pro":False},
+        {"target":"The Confluence (E3M3) Yellow","pro":False}]},
+    {"name":"The Confluence (E3M3) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Confluence (E3M3) Green","pro":False}]},
+    {"name":"The Confluence (E3M3) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Confluence (E3M3) Main","pro":False}]},
+    {"name":"The Confluence (E3M3) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Confluence (E3M3) Main","pro":False},
+        {"target":"The Confluence (E3M3) Blue","pro":False},
+        {"target":"The Confluence (E3M3) Yellow","pro":False}]},
+
+    # The Azure Fortress (E3M4)
+    {"name":"The Azure Fortress (E3M4) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"The Azure Fortress (E3M4) Green","pro":False},
+        {"target":"The Azure Fortress (E3M4) Yellow","pro":False}]},
+    {"name":"The Azure Fortress (E3M4) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Azure Fortress (E3M4) Main","pro":False}]},
+    {"name":"The Azure Fortress (E3M4) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Azure Fortress (E3M4) Main","pro":False}]},
+
+    # The Ophidian Lair (E3M5)
+    {"name":"The Ophidian Lair (E3M5) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[
+        {"target":"The Ophidian Lair (E3M5) Yellow","pro":False},
+        {"target":"The Ophidian Lair (E3M5) Green","pro":False}]},
+    {"name":"The Ophidian Lair (E3M5) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Ophidian Lair (E3M5) Main","pro":False}]},
+    {"name":"The Ophidian Lair (E3M5) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Ophidian Lair (E3M5) Main","pro":False}]},
+
+    # The Halls of Fear (E3M6)
+    {"name":"The Halls of Fear (E3M6) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"The Halls of Fear (E3M6) Yellow","pro":False}]},
+    {"name":"The Halls of Fear (E3M6) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Halls of Fear (E3M6) Yellow","pro":False},
+        {"target":"The Halls of Fear (E3M6) Cyan","pro":False}]},
+    {"name":"The Halls of Fear (E3M6) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Halls of Fear (E3M6) Blue","pro":False},
+        {"target":"The Halls of Fear (E3M6) Main","pro":False},
+        {"target":"The Halls of Fear (E3M6) Green","pro":False}]},
+    {"name":"The Halls of Fear (E3M6) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Halls of Fear (E3M6) Yellow","pro":False},
+        {"target":"The Halls of Fear (E3M6) Main","pro":False},
+        {"target":"The Halls of Fear (E3M6) Cyan","pro":False}]},
+    {"name":"The Halls of Fear (E3M6) Cyan",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Halls of Fear (E3M6) Yellow","pro":False},
+        {"target":"The Halls of Fear (E3M6) Main","pro":False}]},
+
+    # The Chasm (E3M7)
+    {"name":"The Chasm (E3M7) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"The Chasm (E3M7) Yellow","pro":False}]},
+    {"name":"The Chasm (E3M7) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[]},
+    {"name":"The Chasm (E3M7) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Chasm (E3M7) Main","pro":False},
+        {"target":"The Chasm (E3M7) Green","pro":False},
+        {"target":"The Chasm (E3M7) Blue","pro":False}]},
+    {"name":"The Chasm (E3M7) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[{"target":"The Chasm (E3M7) Yellow","pro":False}]},
+
+    # D'Sparil'S Keep (E3M8)
+    {"name":"D'Sparil'S Keep (E3M8) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[]},
+
+    # The Aquifier (E3M9)
+    {"name":"The Aquifier (E3M9) Main",
+     "connects_to_hub":True,
+     "episode":3,
+     "connections":[{"target":"The Aquifier (E3M9) Yellow","pro":False}]},
+    {"name":"The Aquifier (E3M9) Blue",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[]},
+    {"name":"The Aquifier (E3M9) Yellow",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Aquifier (E3M9) Green","pro":False},
+        {"target":"The Aquifier (E3M9) Main","pro":False}]},
+    {"name":"The Aquifier (E3M9) Green",
+     "connects_to_hub":False,
+     "episode":3,
+     "connections":[
+        {"target":"The Aquifier (E3M9) Yellow","pro":False},
+        {"target":"The Aquifier (E3M9) Main","pro":False},
+        {"target":"The Aquifier (E3M9) Blue","pro":False}]},
+
+    # Catafalque (E4M1)
+    {"name":"Catafalque (E4M1) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[{"target":"Catafalque (E4M1) Yellow","pro":False}]},
+    {"name":"Catafalque (E4M1) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Catafalque (E4M1) Green","pro":False},
+        {"target":"Catafalque (E4M1) Main","pro":False}]},
+    {"name":"Catafalque (E4M1) Green",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Catafalque (E4M1) Main","pro":False}]},
+
+    # Blockhouse (E4M2)
+    {"name":"Blockhouse (E4M2) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[
+        {"target":"Blockhouse (E4M2) Yellow","pro":False},
+        {"target":"Blockhouse (E4M2) Green","pro":False},
+        {"target":"Blockhouse (E4M2) Blue","pro":False}]},
+    {"name":"Blockhouse (E4M2) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Blockhouse (E4M2) Main","pro":False},
+        {"target":"Blockhouse (E4M2) Balcony","pro":False},
+        {"target":"Blockhouse (E4M2) Lake","pro":False}]},
+    {"name":"Blockhouse (E4M2) Green",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Blockhouse (E4M2) Main","pro":False}]},
+    {"name":"Blockhouse (E4M2) Blue",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Blockhouse (E4M2) Main","pro":False}]},
+    {"name":"Blockhouse (E4M2) Lake",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Blockhouse (E4M2) Balcony","pro":False}]},
+    {"name":"Blockhouse (E4M2) Balcony",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[]},
+
+    # Ambulatory (E4M3)
+    {"name":"Ambulatory (E4M3) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[
+        {"target":"Ambulatory (E4M3) Blue","pro":False},
+        {"target":"Ambulatory (E4M3) Yellow","pro":False},
+        {"target":"Ambulatory (E4M3) Green","pro":False}]},
+    {"name":"Ambulatory (E4M3) Blue",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Ambulatory (E4M3) Yellow","pro":False},
+        {"target":"Ambulatory (E4M3) Green","pro":False}]},
+    {"name":"Ambulatory (E4M3) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Ambulatory (E4M3) Main","pro":False}]},
+    {"name":"Ambulatory (E4M3) Green",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Ambulatory (E4M3) Main","pro":False}]},
+
+    # Sepulcher (E4M4)
+    {"name":"Sepulcher (E4M4) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[]},
+
+    # Great Stair (E4M5)
+    {"name":"Great Stair (E4M5) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[{"target":"Great Stair (E4M5) Yellow","pro":False}]},
+    {"name":"Great Stair (E4M5) Blue",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Great Stair (E4M5) Green","pro":False}]},
+    {"name":"Great Stair (E4M5) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Great Stair (E4M5) Main","pro":False},
+        {"target":"Great Stair (E4M5) Green","pro":False}]},
+    {"name":"Great Stair (E4M5) Green",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Great Stair (E4M5) Blue","pro":False},
+        {"target":"Great Stair (E4M5) Yellow","pro":False}]},
+
+    # Halls of the Apostate (E4M6)
+    {"name":"Halls of the Apostate (E4M6) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[{"target":"Halls of the Apostate (E4M6) Yellow","pro":False}]},
+    {"name":"Halls of the Apostate (E4M6) Blue",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Halls of the Apostate (E4M6) Green","pro":False}]},
+    {"name":"Halls of the Apostate (E4M6) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Halls of the Apostate (E4M6) Main","pro":False},
+        {"target":"Halls of the Apostate (E4M6) Green","pro":False}]},
+    {"name":"Halls of the Apostate (E4M6) Green",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Halls of the Apostate (E4M6) Yellow","pro":False},
+        {"target":"Halls of the Apostate (E4M6) Blue","pro":False}]},
+
+    # Ramparts of Perdition (E4M7)
+    {"name":"Ramparts of Perdition (E4M7) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[{"target":"Ramparts of Perdition (E4M7) Yellow","pro":False}]},
+    {"name":"Ramparts of Perdition (E4M7) Blue",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Ramparts of Perdition (E4M7) Yellow","pro":False}]},
+    {"name":"Ramparts of Perdition (E4M7) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Ramparts of Perdition (E4M7) Main","pro":False},
+        {"target":"Ramparts of Perdition (E4M7) Green","pro":False},
+        {"target":"Ramparts of Perdition (E4M7) Blue","pro":False}]},
+    {"name":"Ramparts of Perdition (E4M7) Green",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Ramparts of Perdition (E4M7) Yellow","pro":False}]},
+
+    # Shattered Bridge (E4M8)
+    {"name":"Shattered Bridge (E4M8) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[{"target":"Shattered Bridge (E4M8) Yellow","pro":False}]},
+    {"name":"Shattered Bridge (E4M8) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[
+        {"target":"Shattered Bridge (E4M8) Main","pro":False},
+        {"target":"Shattered Bridge (E4M8) Boss","pro":False}]},
+    {"name":"Shattered Bridge (E4M8) Boss",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[]},
+
+    # Mausoleum (E4M9)
+    {"name":"Mausoleum (E4M9) Main",
+     "connects_to_hub":True,
+     "episode":4,
+     "connections":[{"target":"Mausoleum (E4M9) Yellow","pro":False}]},
+    {"name":"Mausoleum (E4M9) Yellow",
+     "connects_to_hub":False,
+     "episode":4,
+     "connections":[{"target":"Mausoleum (E4M9) Main","pro":False}]},
+
+    # Ochre Cliffs (E5M1)
+    {"name":"Ochre Cliffs (E5M1) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[{"target":"Ochre Cliffs (E5M1) Yellow","pro":False}]},
+    {"name":"Ochre Cliffs (E5M1) Blue",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Ochre Cliffs (E5M1) Yellow","pro":False}]},
+    {"name":"Ochre Cliffs (E5M1) Yellow",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Ochre Cliffs (E5M1) Main","pro":False},
+        {"target":"Ochre Cliffs (E5M1) Green","pro":False},
+        {"target":"Ochre Cliffs (E5M1) Blue","pro":False}]},
+    {"name":"Ochre Cliffs (E5M1) Green",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Ochre Cliffs (E5M1) Yellow","pro":False}]},
+
+    # Rapids (E5M2)
+    {"name":"Rapids (E5M2) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[{"target":"Rapids (E5M2) Yellow","pro":False}]},
+    {"name":"Rapids (E5M2) Yellow",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Rapids (E5M2) Main","pro":False},
+        {"target":"Rapids (E5M2) Green","pro":False}]},
+    {"name":"Rapids (E5M2) Green",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Rapids (E5M2) Yellow","pro":False},
+        {"target":"Rapids (E5M2) Main","pro":False}]},
+
+    # Quay (E5M3)
+    {"name":"Quay (E5M3) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[
+        {"target":"Quay (E5M3) Yellow","pro":False},
+        {"target":"Quay (E5M3) Green","pro":False},
+        {"target":"Quay (E5M3) Blue","pro":False}]},
+    {"name":"Quay (E5M3) Blue",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Quay (E5M3) Green","pro":False},
+        {"target":"Quay (E5M3) Main","pro":False}]},
+    {"name":"Quay (E5M3) Yellow",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Quay (E5M3) Main","pro":False}]},
+    {"name":"Quay (E5M3) Green",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Quay (E5M3) Main","pro":False},
+        {"target":"Quay (E5M3) Blue","pro":False}]},
+
+    # Courtyard (E5M4)
+    {"name":"Courtyard (E5M4) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[
+        {"target":"Courtyard (E5M4) Kakis","pro":False},
+        {"target":"Courtyard (E5M4) Blue","pro":False}]},
+    {"name":"Courtyard (E5M4) Blue",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Courtyard (E5M4) Main","pro":False}]},
+    {"name":"Courtyard (E5M4) Kakis",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Courtyard (E5M4) Main","pro":False}]},
+
+    # Hydratyr (E5M5)
+    {"name":"Hydratyr (E5M5) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[{"target":"Hydratyr (E5M5) Yellow","pro":False}]},
+    {"name":"Hydratyr (E5M5) Blue",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Hydratyr (E5M5) Green","pro":False}]},
+    {"name":"Hydratyr (E5M5) Yellow",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Hydratyr (E5M5) Main","pro":False},
+        {"target":"Hydratyr (E5M5) Green","pro":False}]},
+    {"name":"Hydratyr (E5M5) Green",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Hydratyr (E5M5) Main","pro":False},
+        {"target":"Hydratyr (E5M5) Yellow","pro":False},
+        {"target":"Hydratyr (E5M5) Blue","pro":False}]},
+
+    # Colonnade (E5M6)
+    {"name":"Colonnade (E5M6) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[
+        {"target":"Colonnade (E5M6) Yellow","pro":False},
+        {"target":"Colonnade (E5M6) Blue","pro":False}]},
+    {"name":"Colonnade (E5M6) Blue",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Colonnade (E5M6) Main","pro":False}]},
+    {"name":"Colonnade (E5M6) Yellow",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Colonnade (E5M6) Main","pro":False},
+        {"target":"Colonnade (E5M6) Green","pro":False}]},
+    {"name":"Colonnade (E5M6) Green",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Colonnade (E5M6) Yellow","pro":False}]},
+
+    # Foetid Manse (E5M7)
+    {"name":"Foetid Manse (E5M7) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[{"target":"Foetid Manse (E5M7) Yellow","pro":False}]},
+    {"name":"Foetid Manse (E5M7) Blue",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Foetid Manse (E5M7) Yellow","pro":False}]},
+    {"name":"Foetid Manse (E5M7) Yellow",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Foetid Manse (E5M7) Main","pro":False},
+        {"target":"Foetid Manse (E5M7) Green","pro":False},
+        {"target":"Foetid Manse (E5M7) Blue","pro":False}]},
+    {"name":"Foetid Manse (E5M7) Green",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[
+        {"target":"Foetid Manse (E5M7) Yellow","pro":False},
+        {"target":"Foetid Manse (E5M7) Main","pro":False}]},
+
+    # Field of Judgement (E5M8)
+    {"name":"Field of Judgement (E5M8) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[]},
+
+    # Skein of D'Sparil (E5M9)
+    {"name":"Skein of D'Sparil (E5M9) Main",
+     "connects_to_hub":True,
+     "episode":5,
+     "connections":[
+        {"target":"Skein of D'Sparil (E5M9) Blue","pro":False},
+        {"target":"Skein of D'Sparil (E5M9) Yellow","pro":False},
+        {"target":"Skein of D'Sparil (E5M9) Green","pro":False}]},
+    {"name":"Skein of D'Sparil (E5M9) Blue",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Skein of D'Sparil (E5M9) Main","pro":False}]},
+    {"name":"Skein of D'Sparil (E5M9) Yellow",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Skein of D'Sparil (E5M9) Main","pro":False}]},
+    {"name":"Skein of D'Sparil (E5M9) Green",
+     "connects_to_hub":False,
+     "episode":5,
+     "connections":[{"target":"Skein of D'Sparil (E5M9) Main","pro":False}]},
+]
diff --git a/worlds/heretic/Rules.py b/worlds/heretic/Rules.py
new file mode 100644
index 0000000000..7ef15d7920
--- /dev/null
+++ b/worlds/heretic/Rules.py
@@ -0,0 +1,736 @@
+# This file is auto generated. More info: https://github.com/Daivuk/apdoom
+
+from typing import TYPE_CHECKING
+from worlds.generic.Rules import set_rule
+
+if TYPE_CHECKING:
+    from . import HereticWorld
+
+
+def set_episode1_rules(player, world, pro):
+    # The Docks (E1M1)
+    set_rule(world.get_entrance("Hub -> The Docks (E1M1) Main", player), lambda state:
+        state.has("The Docks (E1M1)", player, 1))
+    set_rule(world.get_entrance("The Docks (E1M1) Main -> The Docks (E1M1) Yellow", player), lambda state:
+        state.has("The Docks (E1M1) - Yellow key", player, 1))
+
+    # The Dungeons (E1M2)
+    set_rule(world.get_entrance("Hub -> The Dungeons (E1M2) Main", player), lambda state:
+       (state.has("The Dungeons (E1M2)", player, 1)) and
+       (state.has("Dragon Claw", player, 1) or
+        state.has("Ethereal Crossbow", player, 1)))
+    set_rule(world.get_entrance("The Dungeons (E1M2) Main -> The Dungeons (E1M2) Yellow", player), lambda state:
+        state.has("The Dungeons (E1M2) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Dungeons (E1M2) Main -> The Dungeons (E1M2) Green", player), lambda state:
+        state.has("The Dungeons (E1M2) - Green key", player, 1))
+    set_rule(world.get_entrance("The Dungeons (E1M2) Blue -> The Dungeons (E1M2) Yellow", player), lambda state:
+        state.has("The Dungeons (E1M2) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Dungeons (E1M2) Yellow -> The Dungeons (E1M2) Blue", player), lambda state:
+        state.has("The Dungeons (E1M2) - Blue key", player, 1))
+
+    # The Gatehouse (E1M3)
+    set_rule(world.get_entrance("Hub -> The Gatehouse (E1M3) Main", player), lambda state:
+       (state.has("The Gatehouse (E1M3)", player, 1)) and
+       (state.has("Ethereal Crossbow", player, 1) or
+        state.has("Dragon Claw", player, 1)))
+    set_rule(world.get_entrance("The Gatehouse (E1M3) Main -> The Gatehouse (E1M3) Yellow", player), lambda state:
+        state.has("The Gatehouse (E1M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Gatehouse (E1M3) Main -> The Gatehouse (E1M3) Sea", player), lambda state:
+        state.has("The Gatehouse (E1M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Gatehouse (E1M3) Main -> The Gatehouse (E1M3) Green", player), lambda state:
+        state.has("The Gatehouse (E1M3) - Green key", player, 1))
+    set_rule(world.get_entrance("The Gatehouse (E1M3) Green -> The Gatehouse (E1M3) Main", player), lambda state:
+        state.has("The Gatehouse (E1M3) - Green key", player, 1))
+
+    # The Guard Tower (E1M4)
+    set_rule(world.get_entrance("Hub -> The Guard Tower (E1M4) Main", player), lambda state:
+       (state.has("The Guard Tower (E1M4)", player, 1)) and
+       (state.has("Ethereal Crossbow", player, 1) or
+        state.has("Dragon Claw", player, 1)))
+    set_rule(world.get_entrance("The Guard Tower (E1M4) Main -> The Guard Tower (E1M4) Yellow", player), lambda state:
+        state.has("The Guard Tower (E1M4) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Guard Tower (E1M4) Yellow -> The Guard Tower (E1M4) Green", player), lambda state:
+        state.has("The Guard Tower (E1M4) - Green key", player, 1))
+    set_rule(world.get_entrance("The Guard Tower (E1M4) Green -> The Guard Tower (E1M4) Yellow", player), lambda state:
+        state.has("The Guard Tower (E1M4) - Green key", player, 1))
+
+    # The Citadel (E1M5)
+    set_rule(world.get_entrance("Hub -> The Citadel (E1M5) Main", player), lambda state:
+       (state.has("The Citadel (E1M5)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1)) and
+       (state.has("Dragon Claw", player, 1) or
+        state.has("Gauntlets of the Necromancer", player, 1)))
+    set_rule(world.get_entrance("The Citadel (E1M5) Main -> The Citadel (E1M5) Yellow", player), lambda state:
+        state.has("The Citadel (E1M5) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Citadel (E1M5) Blue -> The Citadel (E1M5) Green", player), lambda state:
+        state.has("The Citadel (E1M5) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Citadel (E1M5) Yellow -> The Citadel (E1M5) Green", player), lambda state:
+        state.has("The Citadel (E1M5) - Green key", player, 1))
+    set_rule(world.get_entrance("The Citadel (E1M5) Green -> The Citadel (E1M5) Blue", player), lambda state:
+        state.has("The Citadel (E1M5) - Blue key", player, 1))
+
+    # The Cathedral (E1M6)
+    set_rule(world.get_entrance("Hub -> The Cathedral (E1M6) Main", player), lambda state:
+       (state.has("The Cathedral (E1M6)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1)) and
+       (state.has("Gauntlets of the Necromancer", player, 1) or
+        state.has("Dragon Claw", player, 1)))
+    set_rule(world.get_entrance("The Cathedral (E1M6) Main -> The Cathedral (E1M6) Yellow", player), lambda state:
+        state.has("The Cathedral (E1M6) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Cathedral (E1M6) Yellow -> The Cathedral (E1M6) Green", player), lambda state:
+        state.has("The Cathedral (E1M6) - Green key", player, 1))
+
+    # The Crypts (E1M7)
+    set_rule(world.get_entrance("Hub -> The Crypts (E1M7) Main", player), lambda state:
+       (state.has("The Crypts (E1M7)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1)) and
+       (state.has("Gauntlets of the Necromancer", player, 1) or
+        state.has("Dragon Claw", player, 1)))
+    set_rule(world.get_entrance("The Crypts (E1M7) Main -> The Crypts (E1M7) Yellow", player), lambda state:
+        state.has("The Crypts (E1M7) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Crypts (E1M7) Main -> The Crypts (E1M7) Green", player), lambda state:
+        state.has("The Crypts (E1M7) - Green key", player, 1))
+    set_rule(world.get_entrance("The Crypts (E1M7) Yellow -> The Crypts (E1M7) Green", player), lambda state:
+        state.has("The Crypts (E1M7) - Green key", player, 1))
+    set_rule(world.get_entrance("The Crypts (E1M7) Yellow -> The Crypts (E1M7) Blue", player), lambda state:
+        state.has("The Crypts (E1M7) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Crypts (E1M7) Green -> The Crypts (E1M7) Main", player), lambda state:
+        state.has("The Crypts (E1M7) - Green key", player, 1))
+
+    # Hell's Maw (E1M8)
+    set_rule(world.get_entrance("Hub -> Hell's Maw (E1M8) Main", player), lambda state:
+        state.has("Hell's Maw (E1M8)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1))
+
+    # The Graveyard (E1M9)
+    set_rule(world.get_entrance("Hub -> The Graveyard (E1M9) Main", player), lambda state:
+        state.has("The Graveyard (E1M9)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1))
+    set_rule(world.get_entrance("The Graveyard (E1M9) Main -> The Graveyard (E1M9) Yellow", player), lambda state:
+        state.has("The Graveyard (E1M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Graveyard (E1M9) Main -> The Graveyard (E1M9) Green", player), lambda state:
+        state.has("The Graveyard (E1M9) - Green key", player, 1))
+    set_rule(world.get_entrance("The Graveyard (E1M9) Main -> The Graveyard (E1M9) Blue", player), lambda state:
+        state.has("The Graveyard (E1M9) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Graveyard (E1M9) Yellow -> The Graveyard (E1M9) Main", player), lambda state:
+        state.has("The Graveyard (E1M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Graveyard (E1M9) Green -> The Graveyard (E1M9) Main", player), lambda state:
+        state.has("The Graveyard (E1M9) - Green key", player, 1))
+
+
+def set_episode2_rules(player, world, pro):
+    # The Crater (E2M1)
+    set_rule(world.get_entrance("Hub -> The Crater (E2M1) Main", player), lambda state:
+        state.has("The Crater (E2M1)", player, 1))
+    set_rule(world.get_entrance("The Crater (E2M1) Main -> The Crater (E2M1) Yellow", player), lambda state:
+        state.has("The Crater (E2M1) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Crater (E2M1) Yellow -> The Crater (E2M1) Green", player), lambda state:
+        state.has("The Crater (E2M1) - Green key", player, 1))
+    set_rule(world.get_entrance("The Crater (E2M1) Green -> The Crater (E2M1) Yellow", player), lambda state:
+        state.has("The Crater (E2M1) - Green key", player, 1))
+
+    # The Lava Pits (E2M2)
+    set_rule(world.get_entrance("Hub -> The Lava Pits (E2M2) Main", player), lambda state:
+       (state.has("The Lava Pits (E2M2)", player, 1)) and
+       (state.has("Ethereal Crossbow", player, 1) or
+        state.has("Dragon Claw", player, 1)))
+    set_rule(world.get_entrance("The Lava Pits (E2M2) Main -> The Lava Pits (E2M2) Yellow", player), lambda state:
+        state.has("The Lava Pits (E2M2) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Lava Pits (E2M2) Yellow -> The Lava Pits (E2M2) Green", player), lambda state:
+        state.has("The Lava Pits (E2M2) - Green key", player, 1))
+    set_rule(world.get_entrance("The Lava Pits (E2M2) Yellow -> The Lava Pits (E2M2) Main", player), lambda state:
+        state.has("The Lava Pits (E2M2) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Lava Pits (E2M2) Green -> The Lava Pits (E2M2) Yellow", player), lambda state:
+        state.has("The Lava Pits (E2M2) - Green key", player, 1))
+
+    # The River of Fire (E2M3)
+    set_rule(world.get_entrance("Hub -> The River of Fire (E2M3) Main", player), lambda state:
+        state.has("The River of Fire (E2M3)", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Ethereal Crossbow", player, 1))
+    set_rule(world.get_entrance("The River of Fire (E2M3) Main -> The River of Fire (E2M3) Yellow", player), lambda state:
+        state.has("The River of Fire (E2M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The River of Fire (E2M3) Main -> The River of Fire (E2M3) Blue", player), lambda state:
+        state.has("The River of Fire (E2M3) - Blue key", player, 1))
+    set_rule(world.get_entrance("The River of Fire (E2M3) Main -> The River of Fire (E2M3) Green", player), lambda state:
+        state.has("The River of Fire (E2M3) - Green key", player, 1))
+    set_rule(world.get_entrance("The River of Fire (E2M3) Blue -> The River of Fire (E2M3) Main", player), lambda state:
+        state.has("The River of Fire (E2M3) - Blue key", player, 1))
+    set_rule(world.get_entrance("The River of Fire (E2M3) Yellow -> The River of Fire (E2M3) Main", player), lambda state:
+        state.has("The River of Fire (E2M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The River of Fire (E2M3) Green -> The River of Fire (E2M3) Main", player), lambda state:
+        state.has("The River of Fire (E2M3) - Green key", player, 1))
+
+    # The Ice Grotto (E2M4)
+    set_rule(world.get_entrance("Hub -> The Ice Grotto (E2M4) Main", player), lambda state:
+       (state.has("The Ice Grotto (E2M4)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1)) and
+       (state.has("Hellstaff", player, 1) or
+        state.has("Firemace", player, 1)))
+    set_rule(world.get_entrance("The Ice Grotto (E2M4) Main -> The Ice Grotto (E2M4) Green", player), lambda state:
+        state.has("The Ice Grotto (E2M4) - Green key", player, 1))
+    set_rule(world.get_entrance("The Ice Grotto (E2M4) Main -> The Ice Grotto (E2M4) Yellow", player), lambda state:
+        state.has("The Ice Grotto (E2M4) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Ice Grotto (E2M4) Blue -> The Ice Grotto (E2M4) Green", player), lambda state:
+        state.has("The Ice Grotto (E2M4) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Ice Grotto (E2M4) Yellow -> The Ice Grotto (E2M4) Magenta", player), lambda state:
+        state.has("The Ice Grotto (E2M4) - Green key", player, 1) and
+        state.has("The Ice Grotto (E2M4) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Ice Grotto (E2M4) Green -> The Ice Grotto (E2M4) Blue", player), lambda state:
+        state.has("The Ice Grotto (E2M4) - Blue key", player, 1))
+
+    # The Catacombs (E2M5)
+    set_rule(world.get_entrance("Hub -> The Catacombs (E2M5) Main", player), lambda state:
+       (state.has("The Catacombs (E2M5)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Firemace", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("The Catacombs (E2M5) Main -> The Catacombs (E2M5) Yellow", player), lambda state:
+        state.has("The Catacombs (E2M5) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Catacombs (E2M5) Blue -> The Catacombs (E2M5) Green", player), lambda state:
+        state.has("The Catacombs (E2M5) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Catacombs (E2M5) Yellow -> The Catacombs (E2M5) Green", player), lambda state:
+        state.has("The Catacombs (E2M5) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Catacombs (E2M5) Green -> The Catacombs (E2M5) Blue", player), lambda state:
+        state.has("The Catacombs (E2M5) - Blue key", player, 1))
+
+    # The Labyrinth (E2M6)
+    set_rule(world.get_entrance("Hub -> The Labyrinth (E2M6) Main", player), lambda state:
+       (state.has("The Labyrinth (E2M6)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Firemace", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("The Labyrinth (E2M6) Main -> The Labyrinth (E2M6) Blue", player), lambda state:
+        state.has("The Labyrinth (E2M6) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Labyrinth (E2M6) Main -> The Labyrinth (E2M6) Yellow", player), lambda state:
+        state.has("The Labyrinth (E2M6) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Labyrinth (E2M6) Main -> The Labyrinth (E2M6) Green", player), lambda state:
+        state.has("The Labyrinth (E2M6) - Green key", player, 1))
+    set_rule(world.get_entrance("The Labyrinth (E2M6) Blue -> The Labyrinth (E2M6) Main", player), lambda state:
+        state.has("The Labyrinth (E2M6) - Blue key", player, 1))
+
+    # The Great Hall (E2M7)
+    set_rule(world.get_entrance("Hub -> The Great Hall (E2M7) Main", player), lambda state:
+       (state.has("The Great Hall (E2M7)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("The Great Hall (E2M7) Main -> The Great Hall (E2M7) Yellow", player), lambda state:
+        state.has("The Great Hall (E2M7) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Great Hall (E2M7) Main -> The Great Hall (E2M7) Green", player), lambda state:
+        state.has("The Great Hall (E2M7) - Green key", player, 1))
+    set_rule(world.get_entrance("The Great Hall (E2M7) Blue -> The Great Hall (E2M7) Yellow", player), lambda state:
+        state.has("The Great Hall (E2M7) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Great Hall (E2M7) Yellow -> The Great Hall (E2M7) Blue", player), lambda state:
+        state.has("The Great Hall (E2M7) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Great Hall (E2M7) Yellow -> The Great Hall (E2M7) Main", player), lambda state:
+        state.has("The Great Hall (E2M7) - Yellow key", player, 1))
+
+    # The Portals of Chaos (E2M8)
+    set_rule(world.get_entrance("Hub -> The Portals of Chaos (E2M8) Main", player), lambda state:
+        state.has("The Portals of Chaos (E2M8)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Phoenix Rod", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1))
+
+    # The Glacier (E2M9)
+    set_rule(world.get_entrance("Hub -> The Glacier (E2M9) Main", player), lambda state:
+       (state.has("The Glacier (E2M9)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("The Glacier (E2M9) Main -> The Glacier (E2M9) Yellow", player), lambda state:
+        state.has("The Glacier (E2M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Glacier (E2M9) Main -> The Glacier (E2M9) Blue", player), lambda state:
+        state.has("The Glacier (E2M9) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Glacier (E2M9) Main -> The Glacier (E2M9) Green", player), lambda state:
+        state.has("The Glacier (E2M9) - Green key", player, 1))
+    set_rule(world.get_entrance("The Glacier (E2M9) Blue -> The Glacier (E2M9) Main", player), lambda state:
+        state.has("The Glacier (E2M9) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Glacier (E2M9) Yellow -> The Glacier (E2M9) Main", player), lambda state:
+        state.has("The Glacier (E2M9) - Yellow key", player, 1))
+
+
+def set_episode3_rules(player, world, pro):
+    # The Storehouse (E3M1)
+    set_rule(world.get_entrance("Hub -> The Storehouse (E3M1) Main", player), lambda state:
+        state.has("The Storehouse (E3M1)", player, 1))
+    set_rule(world.get_entrance("The Storehouse (E3M1) Main -> The Storehouse (E3M1) Yellow", player), lambda state:
+        state.has("The Storehouse (E3M1) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Storehouse (E3M1) Main -> The Storehouse (E3M1) Green", player), lambda state:
+        state.has("The Storehouse (E3M1) - Green key", player, 1))
+    set_rule(world.get_entrance("The Storehouse (E3M1) Yellow -> The Storehouse (E3M1) Main", player), lambda state:
+        state.has("The Storehouse (E3M1) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Storehouse (E3M1) Green -> The Storehouse (E3M1) Main", player), lambda state:
+        state.has("The Storehouse (E3M1) - Green key", player, 1))
+
+    # The Cesspool (E3M2)
+    set_rule(world.get_entrance("Hub -> The Cesspool (E3M2) Main", player), lambda state:
+        state.has("The Cesspool (E3M2)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1))
+    set_rule(world.get_entrance("The Cesspool (E3M2) Main -> The Cesspool (E3M2) Yellow", player), lambda state:
+        state.has("The Cesspool (E3M2) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Cesspool (E3M2) Blue -> The Cesspool (E3M2) Green", player), lambda state:
+        state.has("The Cesspool (E3M2) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Cesspool (E3M2) Yellow -> The Cesspool (E3M2) Green", player), lambda state:
+        state.has("The Cesspool (E3M2) - Green key", player, 1))
+    set_rule(world.get_entrance("The Cesspool (E3M2) Green -> The Cesspool (E3M2) Blue", player), lambda state:
+        state.has("The Cesspool (E3M2) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Cesspool (E3M2) Green -> The Cesspool (E3M2) Yellow", player), lambda state:
+        state.has("The Cesspool (E3M2) - Green key", player, 1))
+
+    # The Confluence (E3M3)
+    set_rule(world.get_entrance("Hub -> The Confluence (E3M3) Main", player), lambda state:
+       (state.has("The Confluence (E3M3)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1)) and
+       (state.has("Gauntlets of the Necromancer", player, 1) or
+        state.has("Phoenix Rod", player, 1) or
+        state.has("Firemace", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("The Confluence (E3M3) Main -> The Confluence (E3M3) Green", player), lambda state:
+        state.has("The Confluence (E3M3) - Green key", player, 1))
+    set_rule(world.get_entrance("The Confluence (E3M3) Main -> The Confluence (E3M3) Yellow", player), lambda state:
+        state.has("The Confluence (E3M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Confluence (E3M3) Blue -> The Confluence (E3M3) Green", player), lambda state:
+        state.has("The Confluence (E3M3) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Confluence (E3M3) Green -> The Confluence (E3M3) Main", player), lambda state:
+        state.has("The Confluence (E3M3) - Green key", player, 1))
+    set_rule(world.get_entrance("The Confluence (E3M3) Green -> The Confluence (E3M3) Blue", player), lambda state:
+        state.has("The Confluence (E3M3) - Blue key", player, 1))
+
+    # The Azure Fortress (E3M4)
+    set_rule(world.get_entrance("Hub -> The Azure Fortress (E3M4) Main", player), lambda state:
+       (state.has("The Azure Fortress (E3M4)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Hellstaff", player, 1)) and
+       (state.has("Firemace", player, 1) or
+        state.has("Phoenix Rod", player, 1) or
+        state.has("Gauntlets of the Necromancer", player, 1)))
+    set_rule(world.get_entrance("The Azure Fortress (E3M4) Main -> The Azure Fortress (E3M4) Green", player), lambda state:
+        state.has("The Azure Fortress (E3M4) - Green key", player, 1))
+    set_rule(world.get_entrance("The Azure Fortress (E3M4) Main -> The Azure Fortress (E3M4) Yellow", player), lambda state:
+        state.has("The Azure Fortress (E3M4) - Yellow key", player, 1))
+
+    # The Ophidian Lair (E3M5)
+    set_rule(world.get_entrance("Hub -> The Ophidian Lair (E3M5) Main", player), lambda state:
+       (state.has("The Ophidian Lair (E3M5)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Hellstaff", player, 1)) and
+       (state.has("Gauntlets of the Necromancer", player, 1) or
+        state.has("Phoenix Rod", player, 1) or
+        state.has("Firemace", player, 1)))
+    set_rule(world.get_entrance("The Ophidian Lair (E3M5) Main -> The Ophidian Lair (E3M5) Yellow", player), lambda state:
+        state.has("The Ophidian Lair (E3M5) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Ophidian Lair (E3M5) Main -> The Ophidian Lair (E3M5) Green", player), lambda state:
+        state.has("The Ophidian Lair (E3M5) - Green key", player, 1))
+
+    # The Halls of Fear (E3M6)
+    set_rule(world.get_entrance("Hub -> The Halls of Fear (E3M6) Main", player), lambda state:
+       (state.has("The Halls of Fear (E3M6)", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Ethereal Crossbow", player, 1)) and
+       (state.has("Gauntlets of the Necromancer", player, 1) or
+        state.has("Phoenix Rod", player, 1)))
+    set_rule(world.get_entrance("The Halls of Fear (E3M6) Main -> The Halls of Fear (E3M6) Yellow", player), lambda state:
+        state.has("The Halls of Fear (E3M6) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Halls of Fear (E3M6) Blue -> The Halls of Fear (E3M6) Yellow", player), lambda state:
+        state.has("The Halls of Fear (E3M6) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Halls of Fear (E3M6) Yellow -> The Halls of Fear (E3M6) Blue", player), lambda state:
+        state.has("The Halls of Fear (E3M6) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Halls of Fear (E3M6) Yellow -> The Halls of Fear (E3M6) Green", player), lambda state:
+        state.has("The Halls of Fear (E3M6) - Green key", player, 1))
+
+    # The Chasm (E3M7)
+    set_rule(world.get_entrance("Hub -> The Chasm (E3M7) Main", player), lambda state:
+       (state.has("The Chasm (E3M7)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1)) and
+       (state.has("Gauntlets of the Necromancer", player, 1) or
+        state.has("Phoenix Rod", player, 1)))
+    set_rule(world.get_entrance("The Chasm (E3M7) Main -> The Chasm (E3M7) Yellow", player), lambda state:
+        state.has("The Chasm (E3M7) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Chasm (E3M7) Yellow -> The Chasm (E3M7) Main", player), lambda state:
+        state.has("The Chasm (E3M7) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Chasm (E3M7) Yellow -> The Chasm (E3M7) Green", player), lambda state:
+        state.has("The Chasm (E3M7) - Green key", player, 1))
+    set_rule(world.get_entrance("The Chasm (E3M7) Yellow -> The Chasm (E3M7) Blue", player), lambda state:
+        state.has("The Chasm (E3M7) - Blue key", player, 1))
+    set_rule(world.get_entrance("The Chasm (E3M7) Green -> The Chasm (E3M7) Yellow", player), lambda state:
+        state.has("The Chasm (E3M7) - Green key", player, 1))
+
+    # D'Sparil'S Keep (E3M8)
+    set_rule(world.get_entrance("Hub -> D'Sparil'S Keep (E3M8) Main", player), lambda state:
+        state.has("D'Sparil'S Keep (E3M8)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Phoenix Rod", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1))
+
+    # The Aquifier (E3M9)
+    set_rule(world.get_entrance("Hub -> The Aquifier (E3M9) Main", player), lambda state:
+        state.has("The Aquifier (E3M9)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Phoenix Rod", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1))
+    set_rule(world.get_entrance("The Aquifier (E3M9) Main -> The Aquifier (E3M9) Yellow", player), lambda state:
+        state.has("The Aquifier (E3M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Aquifier (E3M9) Yellow -> The Aquifier (E3M9) Green", player), lambda state:
+        state.has("The Aquifier (E3M9) - Green key", player, 1))
+    set_rule(world.get_entrance("The Aquifier (E3M9) Yellow -> The Aquifier (E3M9) Main", player), lambda state:
+        state.has("The Aquifier (E3M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("The Aquifier (E3M9) Green -> The Aquifier (E3M9) Yellow", player), lambda state:
+        state.has("The Aquifier (E3M9) - Green key", player, 1))
+
+
+def set_episode4_rules(player, world, pro):
+    # Catafalque (E4M1)
+    set_rule(world.get_entrance("Hub -> Catafalque (E4M1) Main", player), lambda state:
+        state.has("Catafalque (E4M1)", player, 1))
+    set_rule(world.get_entrance("Catafalque (E4M1) Main -> Catafalque (E4M1) Yellow", player), lambda state:
+        state.has("Catafalque (E4M1) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Catafalque (E4M1) Yellow -> Catafalque (E4M1) Green", player), lambda state:
+       (state.has("Catafalque (E4M1) - Green key", player, 1)) and       (state.has("Ethereal Crossbow", player, 1) or
+        state.has("Dragon Claw", player, 1) or
+        state.has("Phoenix Rod", player, 1) or
+        state.has("Firemace", player, 1) or
+        state.has("Hellstaff", player, 1)))
+
+    # Blockhouse (E4M2)
+    set_rule(world.get_entrance("Hub -> Blockhouse (E4M2) Main", player), lambda state:
+        state.has("Blockhouse (E4M2)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1))
+    set_rule(world.get_entrance("Blockhouse (E4M2) Main -> Blockhouse (E4M2) Yellow", player), lambda state:
+        state.has("Blockhouse (E4M2) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Blockhouse (E4M2) Main -> Blockhouse (E4M2) Green", player), lambda state:
+        state.has("Blockhouse (E4M2) - Green key", player, 1))
+    set_rule(world.get_entrance("Blockhouse (E4M2) Main -> Blockhouse (E4M2) Blue", player), lambda state:
+        state.has("Blockhouse (E4M2) - Blue key", player, 1))
+    set_rule(world.get_entrance("Blockhouse (E4M2) Green -> Blockhouse (E4M2) Main", player), lambda state:
+        state.has("Blockhouse (E4M2) - Green key", player, 1))
+    set_rule(world.get_entrance("Blockhouse (E4M2) Blue -> Blockhouse (E4M2) Main", player), lambda state:
+        state.has("Blockhouse (E4M2) - Blue key", player, 1))
+
+    # Ambulatory (E4M3)
+    set_rule(world.get_entrance("Hub -> Ambulatory (E4M3) Main", player), lambda state:
+       (state.has("Ambulatory (E4M3)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Firemace", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Ambulatory (E4M3) Main -> Ambulatory (E4M3) Blue", player), lambda state:
+        state.has("Ambulatory (E4M3) - Blue key", player, 1))
+    set_rule(world.get_entrance("Ambulatory (E4M3) Main -> Ambulatory (E4M3) Yellow", player), lambda state:
+        state.has("Ambulatory (E4M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Ambulatory (E4M3) Main -> Ambulatory (E4M3) Green", player), lambda state:
+        state.has("Ambulatory (E4M3) - Green key", player, 1))
+
+    # Sepulcher (E4M4)
+    set_rule(world.get_entrance("Hub -> Sepulcher (E4M4) Main", player), lambda state:
+       (state.has("Sepulcher (E4M4)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+
+    # Great Stair (E4M5)
+    set_rule(world.get_entrance("Hub -> Great Stair (E4M5) Main", player), lambda state:
+       (state.has("Great Stair (E4M5)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Hellstaff", player, 1) or
+        state.has("Phoenix Rod", player, 1)))
+    set_rule(world.get_entrance("Great Stair (E4M5) Main -> Great Stair (E4M5) Yellow", player), lambda state:
+        state.has("Great Stair (E4M5) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Great Stair (E4M5) Blue -> Great Stair (E4M5) Green", player), lambda state:
+        state.has("Great Stair (E4M5) - Blue key", player, 1))
+    set_rule(world.get_entrance("Great Stair (E4M5) Yellow -> Great Stair (E4M5) Green", player), lambda state:
+        state.has("Great Stair (E4M5) - Green key", player, 1))
+    set_rule(world.get_entrance("Great Stair (E4M5) Green -> Great Stair (E4M5) Blue", player), lambda state:
+        state.has("Great Stair (E4M5) - Blue key", player, 1))
+    set_rule(world.get_entrance("Great Stair (E4M5) Green -> Great Stair (E4M5) Yellow", player), lambda state:
+        state.has("Great Stair (E4M5) - Green key", player, 1))
+
+    # Halls of the Apostate (E4M6)
+    set_rule(world.get_entrance("Hub -> Halls of the Apostate (E4M6) Main", player), lambda state:
+       (state.has("Halls of the Apostate (E4M6)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Halls of the Apostate (E4M6) Main -> Halls of the Apostate (E4M6) Yellow", player), lambda state:
+        state.has("Halls of the Apostate (E4M6) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Halls of the Apostate (E4M6) Blue -> Halls of the Apostate (E4M6) Green", player), lambda state:
+        state.has("Halls of the Apostate (E4M6) - Blue key", player, 1))
+    set_rule(world.get_entrance("Halls of the Apostate (E4M6) Yellow -> Halls of the Apostate (E4M6) Green", player), lambda state:
+        state.has("Halls of the Apostate (E4M6) - Green key", player, 1))
+    set_rule(world.get_entrance("Halls of the Apostate (E4M6) Green -> Halls of the Apostate (E4M6) Yellow", player), lambda state:
+        state.has("Halls of the Apostate (E4M6) - Green key", player, 1))
+    set_rule(world.get_entrance("Halls of the Apostate (E4M6) Green -> Halls of the Apostate (E4M6) Blue", player), lambda state:
+        state.has("Halls of the Apostate (E4M6) - Blue key", player, 1))
+
+    # Ramparts of Perdition (E4M7)
+    set_rule(world.get_entrance("Hub -> Ramparts of Perdition (E4M7) Main", player), lambda state:
+       (state.has("Ramparts of Perdition (E4M7)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Ramparts of Perdition (E4M7) Main -> Ramparts of Perdition (E4M7) Yellow", player), lambda state:
+        state.has("Ramparts of Perdition (E4M7) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Ramparts of Perdition (E4M7) Blue -> Ramparts of Perdition (E4M7) Yellow", player), lambda state:
+        state.has("Ramparts of Perdition (E4M7) - Blue key", player, 1))
+    set_rule(world.get_entrance("Ramparts of Perdition (E4M7) Yellow -> Ramparts of Perdition (E4M7) Main", player), lambda state:
+        state.has("Ramparts of Perdition (E4M7) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Ramparts of Perdition (E4M7) Yellow -> Ramparts of Perdition (E4M7) Green", player), lambda state:
+        state.has("Ramparts of Perdition (E4M7) - Green key", player, 1))
+    set_rule(world.get_entrance("Ramparts of Perdition (E4M7) Yellow -> Ramparts of Perdition (E4M7) Blue", player), lambda state:
+        state.has("Ramparts of Perdition (E4M7) - Blue key", player, 1))
+    set_rule(world.get_entrance("Ramparts of Perdition (E4M7) Green -> Ramparts of Perdition (E4M7) Yellow", player), lambda state:
+        state.has("Ramparts of Perdition (E4M7) - Green key", player, 1))
+
+    # Shattered Bridge (E4M8)
+    set_rule(world.get_entrance("Hub -> Shattered Bridge (E4M8) Main", player), lambda state:
+        state.has("Shattered Bridge (E4M8)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Phoenix Rod", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1))
+    set_rule(world.get_entrance("Shattered Bridge (E4M8) Main -> Shattered Bridge (E4M8) Yellow", player), lambda state:
+        state.has("Shattered Bridge (E4M8) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Shattered Bridge (E4M8) Yellow -> Shattered Bridge (E4M8) Main", player), lambda state:
+        state.has("Shattered Bridge (E4M8) - Yellow key", player, 1))
+
+    # Mausoleum (E4M9)
+    set_rule(world.get_entrance("Hub -> Mausoleum (E4M9) Main", player), lambda state:
+       (state.has("Mausoleum (E4M9)", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Mausoleum (E4M9) Main -> Mausoleum (E4M9) Yellow", player), lambda state:
+        state.has("Mausoleum (E4M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Mausoleum (E4M9) Yellow -> Mausoleum (E4M9) Main", player), lambda state:
+        state.has("Mausoleum (E4M9) - Yellow key", player, 1))
+
+
+def set_episode5_rules(player, world, pro):
+    # Ochre Cliffs (E5M1)
+    set_rule(world.get_entrance("Hub -> Ochre Cliffs (E5M1) Main", player), lambda state:
+        state.has("Ochre Cliffs (E5M1)", player, 1))
+    set_rule(world.get_entrance("Ochre Cliffs (E5M1) Main -> Ochre Cliffs (E5M1) Yellow", player), lambda state:
+        state.has("Ochre Cliffs (E5M1) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Ochre Cliffs (E5M1) Blue -> Ochre Cliffs (E5M1) Yellow", player), lambda state:
+        state.has("Ochre Cliffs (E5M1) - Blue key", player, 1))
+    set_rule(world.get_entrance("Ochre Cliffs (E5M1) Yellow -> Ochre Cliffs (E5M1) Main", player), lambda state:
+        state.has("Ochre Cliffs (E5M1) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Ochre Cliffs (E5M1) Yellow -> Ochre Cliffs (E5M1) Green", player), lambda state:
+        state.has("Ochre Cliffs (E5M1) - Green key", player, 1))
+    set_rule(world.get_entrance("Ochre Cliffs (E5M1) Yellow -> Ochre Cliffs (E5M1) Blue", player), lambda state:
+        state.has("Ochre Cliffs (E5M1) - Blue key", player, 1))
+    set_rule(world.get_entrance("Ochre Cliffs (E5M1) Green -> Ochre Cliffs (E5M1) Yellow", player), lambda state:
+        state.has("Ochre Cliffs (E5M1) - Green key", player, 1))
+
+    # Rapids (E5M2)
+    set_rule(world.get_entrance("Hub -> Rapids (E5M2) Main", player), lambda state:
+        state.has("Rapids (E5M2)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1))
+    set_rule(world.get_entrance("Rapids (E5M2) Main -> Rapids (E5M2) Yellow", player), lambda state:
+        state.has("Rapids (E5M2) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Rapids (E5M2) Yellow -> Rapids (E5M2) Main", player), lambda state:
+        state.has("Rapids (E5M2) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Rapids (E5M2) Yellow -> Rapids (E5M2) Green", player), lambda state:
+        state.has("Rapids (E5M2) - Green key", player, 1))
+
+    # Quay (E5M3)
+    set_rule(world.get_entrance("Hub -> Quay (E5M3) Main", player), lambda state:
+       (state.has("Quay (E5M3)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1) or
+        state.has("Firemace", player, 1)))
+    set_rule(world.get_entrance("Quay (E5M3) Main -> Quay (E5M3) Yellow", player), lambda state:
+        state.has("Quay (E5M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Quay (E5M3) Main -> Quay (E5M3) Green", player), lambda state:
+        state.has("Quay (E5M3) - Green key", player, 1))
+    set_rule(world.get_entrance("Quay (E5M3) Main -> Quay (E5M3) Blue", player), lambda state:
+        state.has("Quay (E5M3) - Blue key", player, 1))
+    set_rule(world.get_entrance("Quay (E5M3) Blue -> Quay (E5M3) Green", player), lambda state:
+        state.has("Quay (E5M3) - Blue key", player, 1))
+    set_rule(world.get_entrance("Quay (E5M3) Yellow -> Quay (E5M3) Main", player), lambda state:
+        state.has("Quay (E5M3) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Quay (E5M3) Green -> Quay (E5M3) Main", player), lambda state:
+        state.has("Quay (E5M3) - Green key", player, 1))
+    set_rule(world.get_entrance("Quay (E5M3) Green -> Quay (E5M3) Blue", player), lambda state:
+        state.has("Quay (E5M3) - Blue key", player, 1))
+
+    # Courtyard (E5M4)
+    set_rule(world.get_entrance("Hub -> Courtyard (E5M4) Main", player), lambda state:
+       (state.has("Courtyard (E5M4)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Firemace", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Courtyard (E5M4) Main -> Courtyard (E5M4) Kakis", player), lambda state:
+        state.has("Courtyard (E5M4) - Yellow key", player, 1) or
+        state.has("Courtyard (E5M4) - Green key", player, 1))
+    set_rule(world.get_entrance("Courtyard (E5M4) Main -> Courtyard (E5M4) Blue", player), lambda state:
+        state.has("Courtyard (E5M4) - Blue key", player, 1))
+    set_rule(world.get_entrance("Courtyard (E5M4) Blue -> Courtyard (E5M4) Main", player), lambda state:
+        state.has("Courtyard (E5M4) - Blue key", player, 1))
+    set_rule(world.get_entrance("Courtyard (E5M4) Kakis -> Courtyard (E5M4) Main", player), lambda state:
+        state.has("Courtyard (E5M4) - Yellow key", player, 1) or
+        state.has("Courtyard (E5M4) - Green key", player, 1))
+
+    # Hydratyr (E5M5)
+    set_rule(world.get_entrance("Hub -> Hydratyr (E5M5) Main", player), lambda state:
+       (state.has("Hydratyr (E5M5)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Hydratyr (E5M5) Main -> Hydratyr (E5M5) Yellow", player), lambda state:
+        state.has("Hydratyr (E5M5) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Hydratyr (E5M5) Blue -> Hydratyr (E5M5) Green", player), lambda state:
+        state.has("Hydratyr (E5M5) - Blue key", player, 1))
+    set_rule(world.get_entrance("Hydratyr (E5M5) Yellow -> Hydratyr (E5M5) Green", player), lambda state:
+        state.has("Hydratyr (E5M5) - Green key", player, 1))
+    set_rule(world.get_entrance("Hydratyr (E5M5) Green -> Hydratyr (E5M5) Blue", player), lambda state:
+        state.has("Hydratyr (E5M5) - Blue key", player, 1))
+
+    # Colonnade (E5M6)
+    set_rule(world.get_entrance("Hub -> Colonnade (E5M6) Main", player), lambda state:
+       (state.has("Colonnade (E5M6)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Colonnade (E5M6) Main -> Colonnade (E5M6) Yellow", player), lambda state:
+        state.has("Colonnade (E5M6) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Colonnade (E5M6) Main -> Colonnade (E5M6) Blue", player), lambda state:
+        state.has("Colonnade (E5M6) - Blue key", player, 1))
+    set_rule(world.get_entrance("Colonnade (E5M6) Blue -> Colonnade (E5M6) Main", player), lambda state:
+        state.has("Colonnade (E5M6) - Blue key", player, 1))
+    set_rule(world.get_entrance("Colonnade (E5M6) Yellow -> Colonnade (E5M6) Green", player), lambda state:
+        state.has("Colonnade (E5M6) - Green key", player, 1))
+    set_rule(world.get_entrance("Colonnade (E5M6) Green -> Colonnade (E5M6) Yellow", player), lambda state:
+        state.has("Colonnade (E5M6) - Green key", player, 1))
+
+    # Foetid Manse (E5M7)
+    set_rule(world.get_entrance("Hub -> Foetid Manse (E5M7) Main", player), lambda state:
+       (state.has("Foetid Manse (E5M7)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1)) and
+       (state.has("Phoenix Rod", player, 1) or
+        state.has("Hellstaff", player, 1)))
+    set_rule(world.get_entrance("Foetid Manse (E5M7) Main -> Foetid Manse (E5M7) Yellow", player), lambda state:
+        state.has("Foetid Manse (E5M7) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Foetid Manse (E5M7) Yellow -> Foetid Manse (E5M7) Green", player), lambda state:
+        state.has("Foetid Manse (E5M7) - Green key", player, 1))
+    set_rule(world.get_entrance("Foetid Manse (E5M7) Yellow -> Foetid Manse (E5M7) Blue", player), lambda state:
+        state.has("Foetid Manse (E5M7) - Blue key", player, 1))
+
+    # Field of Judgement (E5M8)
+    set_rule(world.get_entrance("Hub -> Field of Judgement (E5M8) Main", player), lambda state:
+        state.has("Field of Judgement (E5M8)", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Phoenix Rod", player, 1) and
+        state.has("Firemace", player, 1) and
+        state.has("Hellstaff", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Bag of Holding", player, 1))
+
+    # Skein of D'Sparil (E5M9)
+    set_rule(world.get_entrance("Hub -> Skein of D'Sparil (E5M9) Main", player), lambda state:
+        state.has("Skein of D'Sparil (E5M9)", player, 1) and
+        state.has("Bag of Holding", player, 1) and
+        state.has("Hellstaff", player, 1) and
+        state.has("Phoenix Rod", player, 1) and
+        state.has("Dragon Claw", player, 1) and
+        state.has("Ethereal Crossbow", player, 1) and
+        state.has("Gauntlets of the Necromancer", player, 1) and
+        state.has("Firemace", player, 1))
+    set_rule(world.get_entrance("Skein of D'Sparil (E5M9) Main -> Skein of D'Sparil (E5M9) Blue", player), lambda state:
+        state.has("Skein of D'Sparil (E5M9) - Blue key", player, 1))
+    set_rule(world.get_entrance("Skein of D'Sparil (E5M9) Main -> Skein of D'Sparil (E5M9) Yellow", player), lambda state:
+        state.has("Skein of D'Sparil (E5M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Skein of D'Sparil (E5M9) Main -> Skein of D'Sparil (E5M9) Green", player), lambda state:
+        state.has("Skein of D'Sparil (E5M9) - Green key", player, 1))
+    set_rule(world.get_entrance("Skein of D'Sparil (E5M9) Yellow -> Skein of D'Sparil (E5M9) Main", player), lambda state:
+        state.has("Skein of D'Sparil (E5M9) - Yellow key", player, 1))
+    set_rule(world.get_entrance("Skein of D'Sparil (E5M9) Green -> Skein of D'Sparil (E5M9) Main", player), lambda state:
+        state.has("Skein of D'Sparil (E5M9) - Green key", player, 1))
+
+
+def set_rules(heretic_world: "HereticWorld", included_episodes, pro):
+    player = heretic_world.player
+    world = heretic_world.multiworld
+
+    if included_episodes[0]:
+        set_episode1_rules(player, world, pro)
+    if included_episodes[1]:
+        set_episode2_rules(player, world, pro)
+    if included_episodes[2]:
+        set_episode3_rules(player, world, pro)
+    if included_episodes[3]:
+        set_episode4_rules(player, world, pro)
+    if included_episodes[4]:
+        set_episode5_rules(player, world, pro)
diff --git a/worlds/heretic/__init__.py b/worlds/heretic/__init__.py
new file mode 100644
index 0000000000..b0b2bfce8f
--- /dev/null
+++ b/worlds/heretic/__init__.py
@@ -0,0 +1,287 @@
+import functools
+import logging
+from typing import Any, Dict, List, Set
+
+from BaseClasses import Entrance, CollectionState, Item, ItemClassification, Location, MultiWorld, Region, Tutorial
+from worlds.AutoWorld import WebWorld, World
+from . import Items, Locations, Maps, Options, Regions, Rules
+
+logger = logging.getLogger("Heretic")
+
+HERETIC_TYPE_LEVEL_COMPLETE = -2
+HERETIC_TYPE_MAP_SCROLL = 35
+
+
+class HereticLocation(Location):
+    game: str = "Heretic"
+
+
+class HereticItem(Item):
+    game: str = "Heretic"
+
+
+class HereticWeb(WebWorld):
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the Heretic randomizer connected to an Archipelago Multiworld",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Daivuk"]
+    )]
+    theme = "dirt"
+
+
+class HereticWorld(World):
+    """
+    Heretic is a dark fantasy first-person shooter video game released in December 1994. It was developed by Raven Software.
+    """
+    option_definitions = Options.options
+    game = "Heretic"
+    web = HereticWeb()
+    data_version = 3
+    required_client_version = (0, 3, 9)
+
+    item_name_to_id = {data["name"]: item_id for item_id, data in Items.item_table.items()}
+    item_name_groups = Items.item_name_groups
+
+    location_name_to_id = {data["name"]: loc_id for loc_id, data in Locations.location_table.items()}
+    location_name_groups = Locations.location_name_groups
+
+    starting_level_for_episode: List[str] = [
+        "The Docks (E1M1)",
+        "The Crater (E2M1)",
+        "The Storehouse (E3M1)",
+        "Catafalque (E4M1)",
+        "Ochre Cliffs (E5M1)"
+    ]
+
+    boss_level_for_espidoes: List[str] = [
+        "Hell's Maw (E1M8)",
+        "The Portals of Chaos (E2M8)",
+        "D'Sparil'S Keep (E3M8)",
+        "Shattered Bridge (E4M8)",
+        "Field of Judgement (E5M8)"
+    ]
+
+    # Item ratio that scales depending on episode count. These are the ratio for 1 episode.
+    items_ratio: Dict[str, float] = {
+        "Timebomb of the Ancients": 16,
+        "Tome of Power": 16,
+        "Silver Shield": 10,
+        "Enchanted Shield": 5,
+        "Morph Ovum": 3,
+        "Mystic Urn": 2,
+        "Chaos Device": 1,
+        "Ring of Invincibility": 1,
+        "Shadowsphere": 1
+    }
+
+    def __init__(self, world: MultiWorld, player: int):
+        self.included_episodes = [1, 1, 1, 0, 0]
+        self.location_count = 0
+
+        super().__init__(world, player)
+
+    def get_episode_count(self):
+        return functools.reduce(lambda count, episode: count + episode, self.included_episodes)
+
+    def generate_early(self):
+        # Cache which episodes are included
+        for i in range(5):
+            self.included_episodes[i] = getattr(self.multiworld, f"episode{i + 1}")[self.player].value
+
+        # If no episodes selected, select Episode 1
+        if self.get_episode_count() == 0:
+            self.included_episodes[0] = 1
+
+    def create_regions(self):
+        pro = getattr(self.multiworld, "pro")[self.player].value
+        check_sanity = getattr(self.multiworld, "check_sanity")[self.player].value
+
+        # Main regions
+        menu_region = Region("Menu", self.player, self.multiworld)
+        hub_region = Region("Hub", self.player, self.multiworld)
+        self.multiworld.regions += [menu_region, hub_region]
+        menu_region.add_exits(["Hub"])
+
+        # Create regions and locations
+        main_regions = []
+        connections = []
+        for region_dict in Regions.regions:
+            if not self.included_episodes[region_dict["episode"] - 1]:
+                continue
+
+            region_name = region_dict["name"]
+            if region_dict["connects_to_hub"]:
+                main_regions.append(region_name)
+
+            region = Region(region_name, self.player, self.multiworld)
+            region.add_locations({
+                loc["name"]: loc_id
+                for loc_id, loc in Locations.location_table.items()
+                if loc["region"] == region_name and (not loc["check_sanity"] or check_sanity)
+            }, HereticLocation)
+
+            self.multiworld.regions.append(region)
+
+            for connection_dict in region_dict["connections"]:
+                # Check if it's a pro-only connection
+                if connection_dict["pro"] and not pro:
+                    continue
+                connections.append((region, connection_dict["target"]))
+        
+        # Connect main regions to Hub
+        hub_region.add_exits(main_regions)
+
+        # Do the other connections between regions (They are not all both ways)
+        for connection in connections:
+            source = connection[0]
+            target = self.multiworld.get_region(connection[1], self.player)
+
+            entrance = Entrance(self.player, f"{source.name} -> {target.name}", source)
+            source.exits.append(entrance)
+            entrance.connect(target)
+
+        # Sum locations for items creation
+        self.location_count = len(self.multiworld.get_locations(self.player))
+
+    def completion_rule(self, state: CollectionState):
+        goal_levels = Maps.map_names
+        if getattr(self.multiworld, "goal")[self.player].value:
+            goal_levels = self.boss_level_for_espidoes
+
+        for map_name in goal_levels:
+            if map_name + " - Exit" not in self.location_name_to_id:
+                continue
+            
+            # Exit location names are in form: The Docks (E1M1) - Exit
+            loc = Locations.location_table[self.location_name_to_id[map_name + " - Exit"]]
+            if not self.included_episodes[loc["episode"] - 1]:
+                continue
+
+            # Map complete item names are in form: The Docks (E1M1) - Complete
+            if not state.has(map_name + " - Complete", self.player, 1):
+                return False
+            
+        return True
+
+    def set_rules(self):
+        pro = getattr(self.multiworld, "pro")[self.player].value
+        allow_death_logic = getattr(self.multiworld, "allow_death_logic")[self.player].value
+
+        Rules.set_rules(self, self.included_episodes, pro)
+        self.multiworld.completion_condition[self.player] = lambda state: self.completion_rule(state)
+
+        # Forbid progression items to locations that can be missed and can't be picked up. (e.g. One-time timed
+        # platform) Unless the user allows for it.
+        if not allow_death_logic:
+            for death_logic_location in Locations.death_logic_locations:
+                self.multiworld.exclude_locations[self.player].value.add(death_logic_location)
+    
+    def create_item(self, name: str) -> HereticItem:
+        item_id: int = self.item_name_to_id[name]
+        return HereticItem(name, Items.item_table[item_id]["classification"], item_id, self.player)
+
+    def create_items(self):
+        itempool: List[HereticItem] = []
+        start_with_map_scrolls: bool = getattr(self.multiworld, "start_with_map_scrolls")[self.player].value
+
+        # Items
+        for item_id, item in Items.item_table.items():
+            if item["doom_type"] == HERETIC_TYPE_LEVEL_COMPLETE:
+                continue # We'll fill it manually later
+
+            if item["doom_type"] == HERETIC_TYPE_MAP_SCROLL and start_with_map_scrolls:
+                continue # We'll fill it manually, and we will put fillers in place
+
+            if item["episode"] != -1 and not self.included_episodes[item["episode"] - 1]:
+                continue
+
+            count = item["count"] if item["name"] not in self.starting_level_for_episode else item["count"] - 1
+            itempool += [self.create_item(item["name"]) for _ in range(count)]
+
+        # Place end level items in locked locations
+        for map_name in Maps.map_names:
+            loc_name = map_name + " - Exit"
+            item_name = map_name + " - Complete"
+
+            if loc_name not in self.location_name_to_id:
+                continue
+
+            if item_name not in self.item_name_to_id:
+                continue
+
+            loc = Locations.location_table[self.location_name_to_id[loc_name]]
+            if not self.included_episodes[loc["episode"] - 1]:
+                continue
+
+            self.multiworld.get_location(loc_name, self.player).place_locked_item(self.create_item(item_name))
+            self.location_count -= 1
+
+        # Give starting levels right away
+        for i in range(len(self.included_episodes)):
+            if self.included_episodes[i]:
+                self.multiworld.push_precollected(self.create_item(self.starting_level_for_episode[i]))
+        
+        # Give Computer area maps if option selected
+        if getattr(self.multiworld, "start_with_map_scrolls")[self.player].value:
+            for item_id, item_dict in Items.item_table.items():
+                item_episode = item_dict["episode"]
+                if item_episode > 0:
+                    if item_dict["doom_type"] == HERETIC_TYPE_MAP_SCROLL and self.included_episodes[item_episode - 1]:
+                        self.multiworld.push_precollected(self.create_item(item_dict["name"]))
+
+        # Fill the rest starting with powerups, then fillers
+        self.create_ratioed_items("Chaos Device", itempool)
+        self.create_ratioed_items("Morph Ovum", itempool)
+        self.create_ratioed_items("Mystic Urn", itempool)
+        self.create_ratioed_items("Ring of Invincibility", itempool)
+        self.create_ratioed_items("Shadowsphere", itempool)
+        self.create_ratioed_items("Timebomb of the Ancients", itempool)
+        self.create_ratioed_items("Tome of Power", itempool)
+        self.create_ratioed_items("Silver Shield", itempool)
+        self.create_ratioed_items("Enchanted Shield", itempool)
+
+        while len(itempool) < self.location_count:
+            itempool.append(self.create_item(self.get_filler_item_name()))
+
+        # add itempool to multiworld
+        self.multiworld.itempool += itempool
+
+    def get_filler_item_name(self):
+        return self.multiworld.random.choice([
+            "Quartz Flask",
+            "Crystal Geode",
+            "Energy Orb",
+            "Greater Runes",
+            "Inferno Orb",
+            "Pile of Mace Spheres",
+            "Quiver of Ethereal Arrows"
+        ])
+
+    def create_ratioed_items(self, item_name: str, itempool: List[HereticItem]):
+        remaining_loc = self.location_count - len(itempool)
+        if remaining_loc <= 0:
+            return
+
+        episode_count = self.get_episode_count()
+        count = min(remaining_loc, max(1, self.items_ratio[item_name] * episode_count))
+        if count == 0:
+            logger.warning("Warning, no " + item_name + " will be placed.")
+            return
+
+        for i in range(count):
+            itempool.append(self.create_item(item_name))
+
+    def fill_slot_data(self) -> Dict[str, Any]:
+        slot_data = self.options.as_dict("difficulty", "random_monsters", "random_pickups", "random_music", "allow_death_logic", "pro", "death_link", "reset_level_on_death", "check_sanity")
+
+        # Make sure we send proper episode settings
+        slot_data["episode1"] = self.included_episodes[0]
+        slot_data["episode2"] = self.included_episodes[1]
+        slot_data["episode3"] = self.included_episodes[2]
+        slot_data["episode4"] = self.included_episodes[3]
+        slot_data["episode5"] = self.included_episodes[4]
+
+        return slot_data
diff --git a/worlds/heretic/docs/en_Heretic.md b/worlds/heretic/docs/en_Heretic.md
new file mode 100644
index 0000000000..97d371de2c
--- /dev/null
+++ b/worlds/heretic/docs/en_Heretic.md
@@ -0,0 +1,23 @@
+# Heretic
+
+## Where is the settings page?
+
+The [player settings page](../player-settings) contains the options needed to configure your game session.
+
+## What does randomization do to this game?
+
+Weapons, keys, and level unlocks have been randomized. Monsters and Pickups are also randomized. Typically, you will end up playing different levels out of order to find your keys and level unlocks and eventually complete your game.
+
+Maps can be selected on a level select screen. You can exit a level at any time by visiting the hub station at the beginning of each level. The state of each level is saved and restored upon re-entering the level.
+
+## What is the goal?
+
+The goal is to complete every level in the episodes you have chosen to play.
+
+## What is a "check" in The Heretic?
+
+Weapons, keys, and powerups have been replaced with Archipelago checks. Some have been selectively removed because Heretic contains a lot of collectibles. Usually when many bunch together, one was kept. The switch at the end of each level is also a check.
+
+## What "items" can you unlock in Heretic?
+
+Keys and level unlocks are your main progression items. Weapon unlocks and some upgrades are your useful items. Powerups, ammo, healing, and armor are filler items.
diff --git a/worlds/heretic/docs/setup_en.md b/worlds/heretic/docs/setup_en.md
new file mode 100644
index 0000000000..e01d616e8f
--- /dev/null
+++ b/worlds/heretic/docs/setup_en.md
@@ -0,0 +1,51 @@
+# Heretic Randomizer Setup
+
+## Required Software
+
+- [Heretic (e.g. Steam version)](https://store.steampowered.com/app/2390/Heretic_Shadow_of_the_Serpent_Riders/)
+- [Archipelago Crispy DOOM](https://github.com/Daivuk/apdoom/releases) (Same download for DOOM 1993, DOOM II and Heretic)
+
+## Optional Software
+
+- [ArchipelagoTextClient](https://github.com/ArchipelagoMW/Archipelago/releases)
+
+## Installing APDoom
+1. Download [APDOOM.zip](https://github.com/Daivuk/apdoom/releases) and extract it.
+2. Copy HERETIC.WAD from your steam install into the extracted folder.
+   You can find the folder in steam by finding the game in your library,
+   right clicking it and choosing *Manage→Browse Local Files*.
+
+## Joining a MultiWorld Game
+
+1. Launch apdoom-launcher.exe
+2. Choose Heretic in the dropdown
+3. Enter the Archipelago server address, slot name, and password (if you have one)
+4. Press "Launch Game"
+5. Enjoy!
+
+To continue a game, follow the same connection steps.
+Connecting with a different seed won't erase your progress in other seeds.
+
+## Archipelago Text Client
+
+We recommend having Archipelago's Text Client open on the side to keep track of what items you receive and send.
+APDOOM has in-game messages,
+but they disappear quickly and there's no reasonable way to check your message history in-game.
+
+### Hinting
+
+To hint from in-game, use the chat (Default key: 'T'). Hinting from Heretic can be difficult because names are rather long and contain special characters. For example:
+```
+!hint The River of Fire (E2M3) - Green key
+```
+The game has a hint helper implemented, where you can simply type this:
+```
+!hint e2m3 green
+```
+For this to work, include the map short name (`E1M1`), followed by one of the keywords: `map`, `blue`, `yellow`, `green`.
+
+## Auto-Tracking
+
+APDOOM has a functional map tracker integrated into the level select screen.
+It tells you which levels you have unlocked, which keys you have for each level, which levels have been completed,
+and how many of the checks you have completed in each level.
diff --git a/worlds/hk/Items.py b/worlds/hk/Items.py
index a9acbf48f3..def5c32981 100644
--- a/worlds/hk/Items.py
+++ b/worlds/hk/Items.py
@@ -19,18 +19,43 @@ lookup_type_to_names: Dict[str, Set[str]] = {}
 for item, item_data in item_table.items():
     lookup_type_to_names.setdefault(item_data.type, set()).add(item)
 
-item_name_groups = {group: lookup_type_to_names[group] for group in ("Skill", "Charm", "Mask", "Vessel",
-                                                                     "Relic", "Root", "Map", "Stag", "Cocoon",
-                                                                     "Soul", "DreamWarrior", "DreamBoss")}
-
 directionals = ('', 'Left_', 'Right_')
-
-item_name_groups.update({
+item_name_groups = ({
+    "BossEssence": lookup_type_to_names["DreamWarrior"] | lookup_type_to_names["DreamBoss"],
+    "BossGeo": lookup_type_to_names["Boss_Geo"],
+    "CDash": {x + "Crystal_Heart" for x in directionals},
+    "Charms": lookup_type_to_names["Charm"],
+    "CharmNotches": lookup_type_to_names["Notch"],
+    "Claw": {x + "Mantis_Claw" for x in directionals},
+    "Cloak": {x + "Mothwing_Cloak" for x in directionals} | {"Shade_Cloak", "Split_Shade_Cloak"},
+    "Dive": {"Desolate_Dive", "Descending_Dark"},
+    "LifebloodCocoons": lookup_type_to_names["Cocoon"],
     "Dreamers": {"Herrah", "Monomon", "Lurien"},
-    "Cloak": {x + 'Mothwing_Cloak' for x in directionals} | {'Shade_Cloak', 'Split_Shade_Cloak'},
-    "Claw": {x + 'Mantis_Claw' for x in directionals},
-    "CDash": {x + 'Crystal_Heart' for x in directionals},
-    "Fragments": {"Queen_Fragment", "King_Fragment", "Void_Heart"},
+    "Fireball": {"Vengeful_Spirit", "Shade_Soul"},
+    "GeoChests": lookup_type_to_names["Geo"],
+    "GeoRocks": lookup_type_to_names["Rock"],
+    "GrimmkinFlames": lookup_type_to_names["Flame"],
+    "Grubs": lookup_type_to_names["Grub"],
+    "JournalEntries": lookup_type_to_names["Journal"],
+    "JunkPitChests": lookup_type_to_names["JunkPitChest"],
+    "Keys": lookup_type_to_names["Key"],
+    "LoreTablets": lookup_type_to_names["Lore"] | lookup_type_to_names["PalaceLore"],
+    "Maps": lookup_type_to_names["Map"],
+    "MaskShards": lookup_type_to_names["Mask"],
+    "Mimics": lookup_type_to_names["Mimic"],
+    "Nail": lookup_type_to_names["CursedNail"],
+    "PalaceJournal": {"Journal_Entry-Seal_of_Binding"},
+    "PalaceLore": lookup_type_to_names["PalaceLore"],
+    "PalaceTotem": {"Soul_Totem-Palace", "Soul_Totem-Path_of_Pain"},
+    "RancidEggs": lookup_type_to_names["Egg"],
+    "Relics": lookup_type_to_names["Relic"],
+    "Scream": {"Howling_Wraiths", "Abyss_Shriek"},
+    "Skills": lookup_type_to_names["Skill"],
+    "SoulTotems": lookup_type_to_names["Soul"],
+    "Stags": lookup_type_to_names["Stag"],
+    "VesselFragments": lookup_type_to_names["Vessel"],
+    "WhisperingRoots": lookup_type_to_names["Root"],
+    "WhiteFragments": {"Queen_Fragment", "King_Fragment", "Void_Heart"},
 })
 item_name_groups['Horizontal'] = item_name_groups['Cloak'] | item_name_groups['CDash']
 item_name_groups['Vertical'] = item_name_groups['Claw'] | {'Monarch_Wings'}
diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py
index 2a19ffd3e7..ef7fbd0dfe 100644
--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -2,7 +2,7 @@ import typing
 from .ExtractedData import logic_options, starts, pool_options
 from .Rules import cost_terms
 
-from Options import Option, DefaultOnToggle, Toggle, Choice, Range, OptionDict, SpecialRange
+from Options import Option, DefaultOnToggle, Toggle, Choice, Range, OptionDict, NamedRange, DeathLink
 from .Charms import vanilla_costs, names as charm_names
 
 if typing.TYPE_CHECKING:
@@ -242,7 +242,7 @@ class MaximumGeoPrice(Range):
     default = 400
 
 
-class RandomCharmCosts(SpecialRange):
+class RandomCharmCosts(NamedRange):
     """Total Notch Cost of all Charms together. Vanilla sums to 90.
     This value is distributed among all charms in a random fashion.
     Special Cases:
@@ -250,7 +250,7 @@ class RandomCharmCosts(SpecialRange):
     Set to -2 or shuffle to shuffle around the vanilla costs to different charms."""
 
     display_name = "Randomize Charm Notch Costs"
-    range_start = -2
+    range_start = 0
     range_end = 240
     default = -1
     vanilla_costs: typing.List[int] = vanilla_costs
@@ -402,22 +402,34 @@ class WhitePalace(Choice):
     default = 0
 
 
-class DeathLink(Choice):
+class ExtraPlatforms(DefaultOnToggle):
+    """Places additional platforms to make traveling throughout Hallownest more convenient."""
+
+
+class DeathLinkShade(Choice):
+    """Sets whether to create a shade when you are killed by a DeathLink and how to handle your existing shade, if any.
+
+    vanilla: DeathLink deaths function like any other death and overrides your existing shade (including geo), if any.
+    shadeless: DeathLink deaths do not spawn shades. Your existing shade (including geo), if any, is untouched.
+    shade: DeathLink deaths spawn a shade if you do not have an existing shade. Otherwise, it acts like shadeless.
+
+    * This option has no effect if DeathLink is disabled.
+    ** Self-death shade behavior is not changed; if a self-death normally creates a shade in vanilla, it will override
+        your existing shade, if any.
     """
-    When you die, everyone dies. Of course the reverse is true too.
-    When enabled, choose how incoming deathlinks are handled:
-    vanilla: DeathLink kills you and is just like any other death.  RIP your previous shade and geo.
-    shadeless: DeathLink kills you, but no shade spawns and no geo is lost.  Your previous shade, if any, is untouched.
-    shade: DeathLink functions like a normal death if you do not already have a shade, shadeless otherwise.
-    """
-    option_off = 0
-    alias_no = 0
-    alias_true = 1
-    alias_on = 1
-    alias_yes = 1
+    option_vanilla = 0
     option_shadeless = 1
-    option_vanilla = 2
-    option_shade = 3
+    option_shade = 2
+    default = 2
+
+
+class DeathLinkBreaksFragileCharms(Toggle):
+    """Sets if fragile charms break when you are killed by a DeathLink.
+
+    * This option has no effect if DeathLink is disabled.
+    ** Self-death fragile charm behavior is not changed; if a self-death normally breaks fragile charms in vanilla, it
+        will continue to do so.
+    """
 
 
 class StartingGeo(Range):
@@ -476,7 +488,8 @@ hollow_knight_options: typing.Dict[str, type(Option)] = {
     **{
         option.__name__: option
         for option in (
-            StartLocation, Goal, WhitePalace, StartingGeo, DeathLink,
+            StartLocation, Goal, WhitePalace, ExtraPlatforms, StartingGeo,
+            DeathLink, DeathLinkShade, DeathLinkBreaksFragileCharms,
             MinimumGeoPrice, MaximumGeoPrice,
             MinimumGrubPrice, MaximumGrubPrice,
             MinimumEssencePrice, MaximumEssencePrice,
@@ -488,7 +501,7 @@ hollow_knight_options: typing.Dict[str, type(Option)] = {
             LegEaterShopSlots, GrubfatherRewardSlots,
             SeerRewardSlots, ExtraShopSlots,
             SplitCrystalHeart, SplitMothwingCloak, SplitMantisClaw,
-            CostSanity, CostSanityHybridChance,
+            CostSanity, CostSanityHybridChance
         )
     },
     **cost_sanity_weights
diff --git a/worlds/hk/Rules.py b/worlds/hk/Rules.py
index 4fe4160b4c..2dc512eca7 100644
--- a/worlds/hk/Rules.py
+++ b/worlds/hk/Rules.py
@@ -1,5 +1,4 @@
 from ..generic.Rules import set_rule, add_rule
-from BaseClasses import MultiWorld
 from ..AutoWorld import World
 from .GeneratedRules import set_generated_rules
 from typing import NamedTuple
@@ -39,14 +38,12 @@ def hk_set_rule(hk_world: World, location: str, rule):
 
 def set_rules(hk_world: World):
     player = hk_world.player
-    world = hk_world.multiworld
     set_generated_rules(hk_world, hk_set_rule)
 
     # Shop costs
-    for region in world.get_regions(player):
-        for location in region.locations:
-            if location.costs:
-                for term, amount in location.costs.items():
-                    if term == "GEO":  # No geo logic!
-                        continue
-                    add_rule(location, lambda state, term=term, amount=amount: state.count(term, player) >= amount)
+    for location in hk_world.multiworld.get_locations(player):
+        if location.costs:
+            for term, amount in location.costs.items():
+                if term == "GEO":  # No geo logic!
+                    continue
+                add_rule(location, lambda state, term=term, amount=amount: state.count(term, player) >= amount)
diff --git a/worlds/hk/__init__.py b/worlds/hk/__init__.py
index 1a9d4b5d61..8b07b34eb0 100644
--- a/worlds/hk/__init__.py
+++ b/worlds/hk/__init__.py
@@ -170,7 +170,6 @@ class HKWorld(World):
         charm_costs = world.RandomCharmCosts[self.player].get_costs(world.random)
         self.charm_costs = world.PlandoCharmCosts[self.player].get_costs(charm_costs)
         # world.exclude_locations[self.player].value.update(white_palace_locations)
-        world.local_items[self.player].value.add("Mimic_Grub")
         for term, data in cost_terms.items():
             mini = getattr(world, f"Minimum{data.option}Price")[self.player]
             maxi = getattr(world, f"Maximum{data.option}Price")[self.player]
@@ -420,17 +419,16 @@ class HKWorld(World):
     def set_rules(self):
         world = self.multiworld
         player = self.player
-        if world.logic[player] != 'nologic':
-            goal = world.Goal[player]
-            if goal == Goal.option_hollowknight:
-                world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player)
-            elif goal == Goal.option_siblings:
-                world.completion_condition[player] = lambda state: state._hk_siblings_ending(player)
-            elif goal == Goal.option_radiance:
-                world.completion_condition[player] = lambda state: state._hk_can_beat_radiance(player)
-            else:
-                # Any goal
-                world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player) or state._hk_can_beat_radiance(player)
+        goal = world.Goal[player]
+        if goal == Goal.option_hollowknight:
+            world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player)
+        elif goal == Goal.option_siblings:
+            world.completion_condition[player] = lambda state: state._hk_siblings_ending(player)
+        elif goal == Goal.option_radiance:
+            world.completion_condition[player] = lambda state: state._hk_can_beat_radiance(player)
+        else:
+            # Any goal
+            world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player) or state._hk_can_beat_radiance(player)
 
         set_rules(self)
 
@@ -517,12 +515,12 @@ class HKWorld(World):
         change = super(HKWorld, self).collect(state, item)
         if change:
             for effect_name, effect_value in item_effects.get(item.name, {}).items():
-                state.prog_items[effect_name, item.player] += effect_value
+                state.prog_items[item.player][effect_name] += effect_value
         if item.name in {"Left_Mothwing_Cloak", "Right_Mothwing_Cloak"}:
-            if state.prog_items.get(('RIGHTDASH', item.player), 0) and \
-                    state.prog_items.get(('LEFTDASH', item.player), 0):
-                (state.prog_items["RIGHTDASH", item.player], state.prog_items["LEFTDASH", item.player]) = \
-                    ([max(state.prog_items["RIGHTDASH", item.player], state.prog_items["LEFTDASH", item.player])] * 2)
+            if state.prog_items[item.player].get('RIGHTDASH', 0) and \
+                    state.prog_items[item.player].get('LEFTDASH', 0):
+                (state.prog_items[item.player]["RIGHTDASH"], state.prog_items[item.player]["LEFTDASH"]) = \
+                    ([max(state.prog_items[item.player]["RIGHTDASH"], state.prog_items[item.player]["LEFTDASH"])] * 2)
         return change
 
     def remove(self, state, item: HKItem) -> bool:
@@ -530,9 +528,9 @@ class HKWorld(World):
 
         if change:
             for effect_name, effect_value in item_effects.get(item.name, {}).items():
-                if state.prog_items[effect_name, item.player] == effect_value:
-                    del state.prog_items[effect_name, item.player]
-                state.prog_items[effect_name, item.player] -= effect_value
+                if state.prog_items[item.player][effect_name] == effect_value:
+                    del state.prog_items[item.player][effect_name]
+                state.prog_items[item.player][effect_name] -= effect_value
 
         return change
 
diff --git a/worlds/hk/docs/setup_en.md b/worlds/hk/docs/setup_en.md
index adf975ff51..fef0f051fe 100644
--- a/worlds/hk/docs/setup_en.md
+++ b/worlds/hk/docs/setup_en.md
@@ -1,27 +1,27 @@
 # Hollow Knight for Archipelago Setup Guide
 
 ## Required Software
-* Download and unzip the Scarab+ Mod Manager from the [Scarab+ website](https://themulhima.github.io/Scarab/).
+* Download and unzip the Lumafly Mod Manager from the [Lumafly website](https://themulhima.github.io/Lumafly/).
 * A legal copy of Hollow Knight.
 
-## Installing the Archipelago Mod using Scarab+
-1. Launch Scarab+ and ensure it locates your Hollow Knight installation directory.
+## Installing the Archipelago Mod using Lumafly
+1. Launch Lumafly and ensure it locates your Hollow Knight installation directory.
 2. Click the "Install" button near the "Archipelago" mod entry.
    * If desired, also install "Archipelago Map Mod" to use as an in-game tracker.
 3. Launch the game, you're all set!
 
-### What to do if Scarab+ fails to find your XBox Game Pass installation directory
+### What to do if Lumafly fails to find your XBox Game Pass installation directory
 1. Enter the XBox app and move your mouse over "Hollow Knight" on the left sidebar. 
 2. Click the three points then click "Manage".
 3. Go to the "Files" tab and select "Browse...". 
 4. Click "Hollow Knight", then "Content", then click the path bar and copy it.
-5. Run Scarab+ as an administrator and, when it asks you for the path, paste what you copied in step 4.
+5. Run Lumafly as an administrator and, when it asks you for the path, paste what you copied in step 4.
 
 #### Alternative Method:
 1. Click on your profile then "Settings". 
 2. Go to the "General" tab and select "CHANGE FOLDER".
 3. Look for a folder where you want to install the game (preferably inside a folder on your desktop) and copy the path.
-4. Run Scarab+ as an administrator and, when it asks you for the path, paste what you copied in step 3.
+4. Run Lumafly as an administrator and, when it asks you for the path, paste what you copied in step 3.
 
 Note: The path folder needs to have the "Hollow Knight_Data" folder inside. 
 
diff --git a/worlds/hylics2/Rules.py b/worlds/hylics2/Rules.py
index 12c22e01cd..ff9544e0e8 100644
--- a/worlds/hylics2/Rules.py
+++ b/worlds/hylics2/Rules.py
@@ -1,91 +1,128 @@
 from worlds.generic.Rules import add_rule
-from ..AutoWorld import LogicMixin
+from BaseClasses import CollectionState
 
 
-class Hylics2Logic(LogicMixin):
+def air_dash(state: CollectionState, player: int) -> bool:
+    return state.has("PNEUMATOPHORE", player)
 
-    def _hylics2_can_air_dash(self, player):
-        return self.has("PNEUMATOPHORE", player)
 
-    def _hylics2_has_airship(self, player):
-        return self.has("DOCK KEY", player)
+def airship(state: CollectionState, player: int) -> bool:
+    return state.has("DOCK KEY", player)
 
-    def _hylics2_has_jail_key(self, player):
-        return self.has("JAIL KEY", player)
 
-    def _hylics2_has_paddle(self, player):
-        return self.has("PADDLE", player)
+def jail_key(state: CollectionState, player: int) -> bool:
+    return state.has("JAIL KEY", player)
 
-    def _hylics2_has_worm_room_key(self, player):
-        return self.has("WORM ROOM KEY", player)
 
-    def _hylics2_has_bridge_key(self, player):
-        return self.has("BRIDGE KEY", player)
+def paddle(state: CollectionState, player: int) -> bool:
+    return state.has("PADDLE", player)
 
-    def _hylics2_has_upper_chamber_key(self, player):
-        return self.has("UPPER CHAMBER KEY", player)
 
-    def _hylics2_has_vessel_room_key(self, player):
-        return self.has("VESSEL ROOM KEY", player)
+def worm_room_key(state: CollectionState, player: int) -> bool:
+    return state.has("WORM ROOM KEY", player)
 
-    def _hylics2_has_house_key(self, player):
-        return self.has("HOUSE KEY", player)
 
-    def _hylics2_has_cave_key(self, player):
-        return self.has("CAVE KEY", player)
+def bridge_key(state: CollectionState, player: int) -> bool:
+    return state.has("BRIDGE KEY", player)
 
-    def _hylics2_has_skull_bomb(self, player):
-        return self.has("SKULL BOMB", player)
 
-    def _hylics2_has_tower_key(self, player):
-        return self.has("TOWER KEY", player)
+def upper_chamber_key(state: CollectionState, player: int) -> bool:
+    return state.has("UPPER CHAMBER KEY", player)
 
-    def _hylics2_has_deep_key(self, player):
-        return self.has("DEEP KEY", player)
 
-    def _hylics2_has_upper_house_key(self, player):
-        return self.has("UPPER HOUSE KEY", player)
+def vessel_room_key(state: CollectionState, player: int) -> bool:
+    return state.has("VESSEL ROOM KEY", player)
 
-    def _hylics2_has_clicker(self, player):
-        return self.has("CLICKER", player)
 
-    def _hylics2_has_tokens(self, player):
-        return self.has("SAGE TOKEN", player, 3)
+def house_key(state: CollectionState, player: int) -> bool:
+    return state.has("HOUSE KEY", player)
 
-    def _hylics2_has_charge_up(self, player):
-        return self.has("CHARGE UP", player)
 
-    def _hylics2_has_cup(self, player):
-        return self.has("PAPER CUP", player, 1)
+def cave_key(state: CollectionState, player: int) -> bool:
+    return state.has("CAVE KEY", player)
 
-    def _hylics2_has_1_member(self, player):
-        return self.has("Pongorma", player) or self.has("Dedusmuln", player) or self.has("Somsnosa", player)
 
-    def _hylics2_has_2_members(self, player):
-        return (self.has("Pongorma", player) and self.has("Dedusmuln", player)) or\
-            (self.has("Pongorma", player) and self.has("Somsnosa", player)) or\
-                (self.has("Dedusmuln", player) and self.has("Somsnosa", player))
+def skull_bomb(state: CollectionState, player: int) -> bool:
+    return state.has("SKULL BOMB", player)
 
-    def _hylics2_has_3_members(self, player):
-        return self.has("Pongorma", player) and self.has("Dedusmuln", player) and self.has("Somsnosa", player)
 
-    def _hylics2_enter_arcade2(self, player):
-        return self._hylics2_can_air_dash(player) and self._hylics2_has_airship(player)
+def tower_key(state: CollectionState, player: int) -> bool:
+    return state.has("TOWER KEY", player)
 
-    def _hylics2_enter_wormpod(self, player):
-        return self._hylics2_has_airship(player) and self._hylics2_has_worm_room_key(player) and\
-            self._hylics2_has_paddle(player)
 
-    def _hylics2_enter_sageship(self, player):
-        return self._hylics2_has_skull_bomb(player) and self._hylics2_has_airship(player) and\
-            self._hylics2_has_paddle(player)
+def deep_key(state: CollectionState, player: int) -> bool:
+    return state.has("DEEP KEY", player)
 
-    def _hylics2_enter_foglast(self, player):
-        return self._hylics2_enter_wormpod(player)
 
-    def _hylics2_enter_hylemxylem(self, player):
-        return self._hylics2_can_air_dash(player) and self._hylics2_enter_foglast(player) and\
-            self._hylics2_has_bridge_key(player)
+def upper_house_key(state: CollectionState, player: int) -> bool:
+    return state.has("UPPER HOUSE KEY", player)
+
+
+def clicker(state: CollectionState, player: int) -> bool:
+    return state.has("CLICKER", player)
+
+
+def all_tokens(state: CollectionState, player: int) -> bool:
+    return state.has("SAGE TOKEN", player, 3)
+
+
+def charge_up(state: CollectionState, player: int) -> bool:
+    return state.has("CHARGE UP", player)
+
+
+def paper_cup(state: CollectionState, player: int) -> bool:
+    return state.has("PAPER CUP", player)
+
+
+def party_1(state: CollectionState, player: int) -> bool:
+    return state.has_any({"Pongorma", "Dedusmuln", "Somsnosa"}, player)
+
+
+def party_2(state: CollectionState, player: int) -> bool:
+    return (
+        state.has_all({"Pongorma", "Dedusmuln"}, player)
+        or state.has_all({"Pongorma", "Somsnosa"}, player)
+        or state.has_all({"Dedusmuln", "Somsnosa"}, player)
+    )
+
+
+def party_3(state: CollectionState, player: int) -> bool:
+    return state.has_all({"Pongorma", "Dedusmuln", "Somsnosa"}, player)
+
+
+def enter_arcade2(state: CollectionState, player: int) -> bool:
+    return (
+        air_dash(state, player)
+        and airship(state, player)
+    )
+
+
+def enter_wormpod(state: CollectionState, player: int) -> bool:
+    return (
+        airship(state, player)
+        and worm_room_key(state, player)
+        and paddle(state, player)
+    )
+
+
+def enter_sageship(state: CollectionState, player: int) -> bool:
+    return (
+        skull_bomb(state, player)
+        and airship(state, player)
+        and paddle(state, player)
+    )
+
+
+def enter_foglast(state: CollectionState, player: int) -> bool:
+    return enter_wormpod(state, player)
+
+
+def enter_hylemxylem(state: CollectionState, player: int) -> bool:
+    return (
+        air_dash(state, player)
+        and enter_foglast(state, player)
+        and bridge_key(state, player)
+    )
 
 
 def set_rules(hylics2world):
@@ -94,342 +131,441 @@ def set_rules(hylics2world):
 
     # Afterlife
     add_rule(world.get_location("Afterlife: TV", player),
-        lambda state: state._hylics2_has_cave_key(player))
+        lambda state: cave_key(state, player))
 
     # New Muldul
     add_rule(world.get_location("New Muldul: Underground Chest", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("New Muldul: TV", player),
-        lambda state: state._hylics2_has_house_key(player))
+        lambda state: house_key(state, player))
     add_rule(world.get_location("New Muldul: Upper House Chest 1", player),
-        lambda state: state._hylics2_has_upper_house_key(player))
+        lambda state: upper_house_key(state, player))
     add_rule(world.get_location("New Muldul: Upper House Chest 2", player),
-        lambda state: state._hylics2_has_upper_house_key(player))
+        lambda state: upper_house_key(state, player))
     add_rule(world.get_location("New Muldul: Pot above Vault", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
 
     # New Muldul Vault
     add_rule(world.get_location("New Muldul: Rescued Blerol 1", player),
-        lambda state: ((state._hylics2_has_jail_key(player) and state._hylics2_has_paddle(player)) and\
-            (state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))) or\
-                state._hylics2_enter_hylemxylem(player))
+        lambda state: (
+            (
+                (
+                    jail_key(state, player)
+                    and paddle(state, player)
+                )
+                and (
+                    air_dash(state, player)
+                    or airship(state, player)
+                )
+            )
+            or enter_hylemxylem(state, player)
+        ))
     add_rule(world.get_location("New Muldul: Rescued Blerol 2", player),
-        lambda state: ((state._hylics2_has_jail_key(player) and state._hylics2_has_paddle(player)) and\
-            (state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))) or\
-                state._hylics2_enter_hylemxylem(player))
+        lambda state: (
+            (
+                (
+                    jail_key(state, player)
+                    and paddle(state, player)
+                )
+                and (
+                    air_dash(state, player)
+                    or airship(state, player)
+                )
+            )
+            or enter_hylemxylem(state, player)
+        ))
     add_rule(world.get_location("New Muldul: Vault Left Chest", player),
-        lambda state: state._hylics2_enter_hylemxylem(player))
+        lambda state: enter_hylemxylem(state, player))
     add_rule(world.get_location("New Muldul: Vault Right Chest", player),
-        lambda state: state._hylics2_enter_hylemxylem(player))
+        lambda state: enter_hylemxylem(state, player))
     add_rule(world.get_location("New Muldul: Vault Bomb", player),
-        lambda state: state._hylics2_enter_hylemxylem(player))
+        lambda state: enter_hylemxylem(state, player))
 
     # Viewax's Edifice
     add_rule(world.get_location("Viewax's Edifice: Canopic Jar", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: Cave Sarcophagus", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: Shielded Key", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: Shielded Key", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: Tower Pot", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: Tower Jar", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: Tower Chest", player),
-        lambda state: state._hylics2_has_paddle(player) and state._hylics2_has_tower_key(player))
+        lambda state: (
+            paddle(state, player)
+            and tower_key(state, player)
+        ))
     add_rule(world.get_location("Viewax's Edifice: Viewax Pot", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: Defeat Viewax", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Viewax's Edifice: TV", player),
-        lambda state: state._hylics2_has_paddle(player) and state._hylics2_has_jail_key(player))
+        lambda state: (
+            paddle(state, player)
+            and jail_key(state, player)
+        ))
     add_rule(world.get_location("Viewax's Edifice: Sage Fridge", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Viewax's Edifice: Sage Item 1", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Viewax's Edifice: Sage Item 2", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
 
     # Arcade 1
     add_rule(world.get_location("Arcade 1: Key", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Arcade 1: Coin Dash", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Arcade 1: Burrito Alcove 1", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Arcade 1: Burrito Alcove 2", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Arcade 1: Behind Spikes Banana", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Arcade 1: Pyramid Banana", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Arcade 1: Moving Platforms Muscle Applique", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
     add_rule(world.get_location("Arcade 1: Bed Banana", player),
-        lambda state: state._hylics2_has_paddle(player))
+        lambda state: paddle(state, player))
 
     # Airship
     add_rule(world.get_location("Airship: Talk to Somsnosa", player),
-        lambda state: state._hylics2_has_worm_room_key(player))
+        lambda state: worm_room_key(state, player))
 
     # Foglast
     add_rule(world.get_location("Foglast: Underground Sarcophagus", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Foglast: Shielded Key", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Foglast: TV", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_clicker(player))
+        lambda state: (
+            air_dash(state, player)
+            and clicker(state, player)
+        ))
     add_rule(world.get_location("Foglast: Buy Clicker", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Foglast: Shielded Chest", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Foglast: Cave Fridge", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Foglast: Roof Sarcophagus", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_bridge_key(player))
+        lambda state: (
+            air_dash(state, player)
+            and bridge_key(state, player)
+        ))
     add_rule(world.get_location("Foglast: Under Lair Sarcophagus 1", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_bridge_key(player))
+        lambda state: (
+            air_dash(state, player)
+            and bridge_key(state, player)
+        ))
     add_rule(world.get_location("Foglast: Under Lair Sarcophagus 2", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_bridge_key(player))
+        lambda state: (
+            air_dash(state, player)
+            and bridge_key(state, player)
+        ))
     add_rule(world.get_location("Foglast: Under Lair Sarcophagus 3", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_bridge_key(player))
+        lambda state: (
+            air_dash(state, player)
+            and bridge_key(state, player)
+        ))
     add_rule(world.get_location("Foglast: Sage Sarcophagus", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_bridge_key(player))
+        lambda state: (
+            air_dash(state, player)
+            and bridge_key(state, player)
+        ))
     add_rule(world.get_location("Foglast: Sage Item 1", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_bridge_key(player))
+        lambda state: (
+            air_dash(state, player)
+            and bridge_key(state, player)
+        ))
     add_rule(world.get_location("Foglast: Sage Item 2", player),
-        lambda state: state._hylics2_can_air_dash(player) and state._hylics2_has_bridge_key(player))
+        lambda state: (
+            air_dash(state, player)
+            and bridge_key(state, player)
+        ))
 
     # Drill Castle
     add_rule(world.get_location("Drill Castle: Island Banana", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Drill Castle: Island Pot", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Drill Castle: Cave Sarcophagus", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
     add_rule(world.get_location("Drill Castle: TV", player),
-        lambda state: state._hylics2_can_air_dash(player))
+        lambda state: air_dash(state, player))
 
     # Sage Labyrinth
     add_rule(world.get_location("Sage Labyrinth: Sage Item 1", player),
-        lambda state: state._hylics2_has_deep_key(player))
+        lambda state: deep_key(state, player))
     add_rule(world.get_location("Sage Labyrinth: Sage Item 2", player),
-        lambda state: state._hylics2_has_deep_key(player))
+        lambda state: deep_key(state, player))
     add_rule(world.get_location("Sage Labyrinth: Sage Left Arm", player),
-        lambda state: state._hylics2_has_deep_key(player))
+        lambda state: deep_key(state, player))
     add_rule(world.get_location("Sage Labyrinth: Sage Right Arm", player),
-        lambda state: state._hylics2_has_deep_key(player))
+        lambda state: deep_key(state, player))
     add_rule(world.get_location("Sage Labyrinth: Sage Left Leg", player),
-        lambda state: state._hylics2_has_deep_key(player))
+        lambda state: deep_key(state, player))
     add_rule(world.get_location("Sage Labyrinth: Sage Right Leg", player),
-        lambda state: state._hylics2_has_deep_key(player))
+        lambda state: deep_key(state, player))
 
     # Sage Airship
     add_rule(world.get_location("Sage Airship: TV", player),
-        lambda state: state._hylics2_has_tokens(player))
+        lambda state: all_tokens(state, player))
 
     # Hylemxylem
     add_rule(world.get_location("Hylemxylem: Upper Chamber Banana", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Across Upper Reservoir Chest", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Drained Lower Reservoir Chest", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Drained Lower Reservoir Burrito 1", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Drained Lower Reservoir Burrito 2", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Lower Reservoir Hole Pot 1", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Lower Reservoir Hole Pot 2", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Lower Reservoir Hole Pot 3", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Lower Reservoir Hole Sarcophagus", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Drained Upper Reservoir Burrito 1", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Drained Upper Reservoir Burrito 2", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Drained Upper Reservoir Burrito 3", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
     add_rule(world.get_location("Hylemxylem: Upper Reservoir Hole Key", player),
-        lambda state: state._hylics2_has_upper_chamber_key(player))
+        lambda state: upper_chamber_key(state, player))
 
     # extra rules if Extra Items in Logic is enabled
     if world.extra_items_in_logic[player]:
         for i in world.get_region("Foglast", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_charge_up(player))
+            add_rule(i, lambda state: charge_up(state, player))
         for i in world.get_region("Sage Airship", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_charge_up(player) and state._hylics2_has_cup(player) and\
-                state._hylics2_has_worm_room_key(player))
+            add_rule(i, lambda state: (
+                    charge_up(state, player)
+                    and paper_cup(state, player)
+                    and worm_room_key(state, player)
+                ))
         for i in world.get_region("Hylemxylem", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_charge_up(player) and state._hylics2_has_cup(player))
+            add_rule(i, lambda state: (
+                charge_up(state, player)
+                and paper_cup(state, player)
+            ))
 
         add_rule(world.get_location("Sage Labyrinth: Motor Hunter Sarcophagus", player),
-            lambda state: state._hylics2_has_charge_up(player) and state._hylics2_has_cup(player))
+            lambda state: (
+                charge_up(state, player)
+                and paper_cup(state, player)
+            ))
 
     # extra rules if Shuffle Party Members is enabled
     if world.party_shuffle[player]:
         for i in world.get_region("Arcade Island", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_3_members(player))
+            add_rule(i, lambda state: party_3(state, player))
         for i in world.get_region("Foglast", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_3_members(player) or\
-                (state._hylics2_has_2_members(player) and state._hylics2_has_jail_key(player)))
+            add_rule(i, lambda state: (
+                party_3(state, player)
+                or (
+                    party_2(state, player)
+                    and jail_key(state, player)
+                )
+            ))
         for i in world.get_region("Sage Airship", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_3_members(player))
+            add_rule(i, lambda state: party_3(state, player))
         for i in world.get_region("Hylemxylem", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_3_members(player))
+            add_rule(i, lambda state: party_3(state, player))
 
         add_rule(world.get_location("Viewax's Edifice: Defeat Viewax", player),
-            lambda state: state._hylics2_has_2_members(player))
+            lambda state: party_2(state, player))
         add_rule(world.get_location("New Muldul: Rescued Blerol 1", player),
-            lambda state: state._hylics2_has_2_members(player))
+            lambda state: party_2(state, player))
         add_rule(world.get_location("New Muldul: Rescued Blerol 2", player),
-            lambda state: state._hylics2_has_2_members(player))
+            lambda state: party_2(state, player))
         add_rule(world.get_location("New Muldul: Vault Left Chest", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("New Muldul: Vault Right Chest", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("New Muldul: Vault Bomb", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("Juice Ranch: Battle with Somsnosa", player),
-            lambda state: state._hylics2_has_2_members(player))
+            lambda state: party_2(state, player))
         add_rule(world.get_location("Juice Ranch: Somsnosa Joins", player),
-            lambda state: state._hylics2_has_2_members(player))
+            lambda state: party_2(state, player))
         add_rule(world.get_location("Airship: Talk to Somsnosa", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("Sage Labyrinth: Motor Hunter Sarcophagus", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
 
     # extra rules if Shuffle Red Medallions is enabled
     if world.medallion_shuffle[player]:
         add_rule(world.get_location("New Muldul: Upper House Medallion", player),
-            lambda state: state._hylics2_has_upper_house_key(player))
+            lambda state: upper_house_key(state, player))
         add_rule(world.get_location("New Muldul: Vault Rear Left Medallion", player),
-            lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
+            lambda state: (
+                enter_foglast(state, player)
+                and bridge_key(state, player)
+            ))
         add_rule(world.get_location("New Muldul: Vault Rear Right Medallion", player),
-            lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
+            lambda state: (
+                enter_foglast(state, player)
+                and bridge_key(state, player)
+            ))
         add_rule(world.get_location("New Muldul: Vault Center Medallion", player),
-            lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
+            lambda state: (
+                enter_foglast(state, player)
+                and bridge_key(state, player)
+            ))
         add_rule(world.get_location("New Muldul: Vault Front Left Medallion", player),
-            lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
+            lambda state: (
+                enter_foglast(state, player)
+                and bridge_key(state, player)
+            ))
         add_rule(world.get_location("New Muldul: Vault Front Right Medallion", player),
-            lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
+            lambda state: (
+                enter_foglast(state, player)
+                and bridge_key(state, player)
+            ))
         add_rule(world.get_location("Viewax's Edifice: Fort Wall Medallion", player),
-            lambda state: state._hylics2_has_paddle(player))
+            lambda state: paddle(state, player))
         add_rule(world.get_location("Viewax's Edifice: Jar Medallion", player),
-            lambda state: state._hylics2_has_paddle(player))
+            lambda state: paddle(state, player))
         add_rule(world.get_location("Viewax's Edifice: Sage Chair Medallion", player),
-            lambda state: state._hylics2_can_air_dash(player))
+            lambda state: air_dash(state, player))
         add_rule(world.get_location("Arcade 1: Lonely Medallion", player),
-            lambda state: state._hylics2_has_paddle(player))
+            lambda state: paddle(state, player))
         add_rule(world.get_location("Arcade 1: Alcove Medallion", player),
-            lambda state: state._hylics2_has_paddle(player))
+            lambda state: paddle(state, player))
+        add_rule(world.get_location("Arcade 1: Lava Medallion", player),
+            lambda state: paddle(state, player))
         add_rule(world.get_location("Foglast: Under Lair Medallion", player),
-            lambda state: state._hylics2_has_bridge_key(player))
+            lambda state: bridge_key(state, player))
         add_rule(world.get_location("Foglast: Mid-Air Medallion", player),
-            lambda state: state._hylics2_can_air_dash(player))
+            lambda state: air_dash(state, player))
         add_rule(world.get_location("Foglast: Top of Tower Medallion", player),
-            lambda state: state._hylics2_has_paddle(player))
+            lambda state: paddle(state, player))
         add_rule(world.get_location("Hylemxylem: Lower Reservoir Hole Medallion", player),
-            lambda state: state._hylics2_has_upper_chamber_key(player))
+            lambda state: upper_chamber_key(state, player))
 
-    # extra rules is Shuffle Red Medallions and Party Shuffle are enabled
+    # extra rules if Shuffle Red Medallions and Party Shuffle are enabled
     if world.party_shuffle[player] and world.medallion_shuffle[player]:
         add_rule(world.get_location("New Muldul: Vault Rear Left Medallion", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("New Muldul: Vault Rear Right Medallion", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("New Muldul: Vault Center Medallion", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("New Muldul: Vault Front Left Medallion", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
         add_rule(world.get_location("New Muldul: Vault Front Right Medallion", player),
-            lambda state: state._hylics2_has_3_members(player))
+            lambda state: party_3(state, player))
 
     # entrances
     for i in world.get_region("Airship", player).entrances:
-        add_rule(i, lambda state: state._hylics2_has_airship(player))
+        add_rule(i, lambda state: airship(state, player))
     for i in world.get_region("Arcade Island", player).entrances:
-        add_rule(i, lambda state: state._hylics2_has_airship(player) and state._hylics2_can_air_dash(player))
+        add_rule(i, lambda state: (
+            airship(state, player)
+            and air_dash(state, player)
+        ))
     for i in world.get_region("Worm Pod", player).entrances:
-        add_rule(i, lambda state: state._hylics2_enter_wormpod(player))
+        add_rule(i, lambda state: enter_wormpod(state, player))
     for i in world.get_region("Foglast", player).entrances:
-        add_rule(i, lambda state: state._hylics2_enter_foglast(player))
+        add_rule(i, lambda state: enter_foglast(state, player))
     for i in world.get_region("Sage Labyrinth", player).entrances:
-        add_rule(i, lambda state: state._hylics2_has_skull_bomb(player))
+        add_rule(i, lambda state: skull_bomb(state, player))
     for i in world.get_region("Sage Airship", player).entrances:
-        add_rule(i, lambda state: state._hylics2_enter_sageship(player))
+        add_rule(i, lambda state: enter_sageship(state, player))
     for i in world.get_region("Hylemxylem", player).entrances:
-        add_rule(i, lambda state: state._hylics2_enter_hylemxylem(player))
+        add_rule(i, lambda state: enter_hylemxylem(state, player))
 
     # random start logic (default)
     if ((not world.random_start[player]) or \
         (world.random_start[player] and hylics2world.start_location == "Waynehouse")):
         # entrances
         for i in world.get_region("Viewax", player).entrances:
-            add_rule(i, lambda state: state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))
+            add_rule(i, lambda state: (
+                air_dash(state, player)
+                and airship(state, player)
+            ))
         for i in world.get_region("TV Island", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Shield Facility", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Juice Ranch", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
 
     # random start logic (Viewax's Edifice)
     elif (world.random_start[player] and hylics2world.start_location == "Viewax's Edifice"):
         for i in world.get_region("Waynehouse", player).entrances:
-            add_rule(i, lambda state: state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))
+            add_rule(i, lambda state: (
+                air_dash(state, player)
+                or airship(state, player)
+            ))
         for i in world.get_region("New Muldul", player).entrances:
-            add_rule(i, lambda state: state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))
+            add_rule(i, lambda state: (
+                air_dash(state, player)
+                or airship(state, player)
+            ))
         for i in world.get_region("New Muldul Vault", player).entrances:
-            add_rule(i, lambda state: state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))
+            add_rule(i, lambda state: (
+                air_dash(state, player)
+                or airship(state, player)
+            ))
         for i in world.get_region("Drill Castle", player).entrances:
-            add_rule(i, lambda state: state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))
+            add_rule(i, lambda state: (
+                air_dash(state, player)
+                or airship(state, player)
+            ))
         for i in world.get_region("TV Island", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Shield Facility", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Juice Ranch", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Sage Labyrinth", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
 
     # random start logic (TV Island)
     elif (world.random_start[player] and hylics2world.start_location == "TV Island"):
         for i in world.get_region("Waynehouse", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("New Muldul", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("New Muldul Vault", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Drill Castle", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Viewax", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Shield Facility", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Juice Ranch", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Sage Labyrinth", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
 
     # random start logic (Shield Facility)
     elif (world.random_start[player] and hylics2world.start_location == "Shield Facility"):
         for i in world.get_region("Waynehouse", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("New Muldul", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("New Muldul Vault", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Drill Castle", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Viewax", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("TV Island", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
         for i in world.get_region("Sage Labyrinth", player).entrances:
-            add_rule(i, lambda state: state._hylics2_has_airship(player))
+            add_rule(i, lambda state: airship(state, player))
\ No newline at end of file
diff --git a/worlds/hylics2/__init__.py b/worlds/hylics2/__init__.py
index f721fb4749..1c51bacc5d 100644
--- a/worlds/hylics2/__init__.py
+++ b/worlds/hylics2/__init__.py
@@ -2,7 +2,7 @@ from typing import Dict, List, Any
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification
 from worlds.generic.Rules import set_rule
 from . import Exits, Items, Locations, Options, Rules
-from ..AutoWorld import WebWorld, World
+from worlds.AutoWorld import WebWorld, World
 
 
 class Hylics2Web(WebWorld):
@@ -130,11 +130,11 @@ class Hylics2World(World):
             tvs = list(Locations.tv_location_table.items())
 
             # if Extra Items in Logic is enabled place CHARGE UP first and make sure it doesn't get
-            # placed at Sage Airship: TV
+            # placed at Sage Airship: TV or Foglast: TV
             if self.multiworld.extra_items_in_logic[self.player]:
                 tv = self.multiworld.random.choice(tvs)
                 gest = gestures.index((200681, Items.gesture_item_table[200681]))
-                while tv[1]["name"] == "Sage Airship: TV":
+                while tv[1]["name"] == "Sage Airship: TV" or tv[1]["name"] == "Foglast: TV":
                     tv = self.multiworld.random.choice(tvs)
                 self.multiworld.get_location(tv[1]["name"], self.player)\
                     .place_locked_item(self.add_item(gestures[gest][1]["name"], gestures[gest][1]["classification"],
@@ -146,7 +146,7 @@ class Hylics2World(World):
                 gest = self.multiworld.random.choice(gestures)
                 tv = self.multiworld.random.choice(tvs)
                 self.multiworld.get_location(tv[1]["name"], self.player)\
-                    .place_locked_item(self.add_item(gest[1]["name"], gest[1]["classification"], gest[1]))
+                    .place_locked_item(self.add_item(gest[1]["name"], gest[1]["classification"], gest[0]))
                 gestures.remove(gest)
                 tvs.remove(tv)
 
@@ -193,7 +193,7 @@ class Hylics2World(World):
                 if j == i:
                     for k in exits:
                         # create entrance and connect it to parent and destination regions
-                        ent = Entrance(self.player, k, reg)
+                        ent = Entrance(self.player, f"{reg.name} {k}", reg)
                         reg.exits.append(ent)
                         if k == "New Game" and self.multiworld.random_start[self.player]:
                             if self.start_location == "Waynehouse":
@@ -232,8 +232,10 @@ class Hylics2World(World):
         # create location for beating the game and place Victory event there
         loc = Location(self.player, "Defeat Gibby", None, self.multiworld.get_region("Hylemxylem", self.player))
         loc.place_locked_item(self.create_event("Victory"))
-        set_rule(loc, lambda state: state._hylics2_has_upper_chamber_key(self.player)
-            and state._hylics2_has_vessel_room_key(self.player))
+        set_rule(loc, lambda state: (
+                state.has("UPPER CHAMBER KEY", self.player)
+                and state.has("VESSEL ROOM KEY", self.player)
+            ))
         self.multiworld.get_region("Hylemxylem", self.player).locations.append(loc)
         self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
 
diff --git a/worlds/kh2/Client.py b/worlds/kh2/Client.py
new file mode 100644
index 0000000000..544e710741
--- /dev/null
+++ b/worlds/kh2/Client.py
@@ -0,0 +1,941 @@
+import ModuleUpdate
+
+ModuleUpdate.update()
+
+import os
+import asyncio
+import json
+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.serverconneced = 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_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 = []
+        # 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.kh2slotdata = 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
+        }
+        # 0x2A09C00+0x40 is the sve anchor. +1 is the last saved room
+        # self.sveroom = 0x2A09C00 + 0x41
+        # 0 not in battle 1 in yellow battle 2 red battle #short
+        # self.inBattle = 0x2A0EAC4 + 0x40
+        # self.onDeath = 0xAB9078
+        # PC Address anchors
+        self.Now = 0x0714DB8
+        self.Save = 0x09A70B0
+        # self.Sys3 = 0x2A59DF0
+        # self.Bt10 = 0x2A74880
+        # self.BtlEnd = 0x2A0D3E0
+        self.Slot1 = 0x2A20C98
+
+        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()
+        await self.send_connect()
+
+    async def connection_closed(self):
+        self.kh2connected = False
+        self.serverconneced = False
+        if self.kh2seedname is not None and self.auth is not None:
+            with open(os.path.join(self.game_communication_path, f"kh2save2{self.kh2seedname}{self.auth}.json"),
+                    '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.serverconneced = False
+        if self.kh2seedname not in {None} and self.auth not in {None}:
+            with open(os.path.join(self.game_communication_path, f"kh2save2{self.kh2seedname}{self.auth}.json"),
+                    '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(os.path.join(self.game_communication_path, f"kh2save2{self.kh2seedname}{self.auth}.json"),
+                    '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), "big")
+
+    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 on_package(self, cmd: str, args: dict):
+        if cmd in {"RoomInfo"}:
+            self.kh2seedname = args['seed_name']
+            if not os.path.exists(self.game_communication_path):
+                os.makedirs(self.game_communication_path)
+            if not os.path.exists(self.game_communication_path + f"\kh2save2{self.kh2seedname}{self.auth}.json"):
+                self.kh2_seed_save = {
+                    "Levels":        {
+                        "SoraLevel":   0,
+                        "ValorLevel":  0,
+                        "WisdomLevel": 0,
+                        "LimitLevel":  0,
+                        "MasterLevel": 0,
+                        "FinalLevel":  0,
+                        "SummonLevel": 0,
+                    },
+                    "SoldEquipment": [],
+                }
+                with open(os.path.join(self.game_communication_path, f"kh2save2{self.kh2seedname}{self.auth}.json"),
+                        'wt') as f:
+                    pass
+                # self.locations_checked = set()
+            elif os.path.exists(self.game_communication_path + f"\kh2save2{self.kh2seedname}{self.auth}.json"):
+                with open(self.game_communication_path + f"\kh2save2{self.kh2seedname}{self.auth}.json", 'r') 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 in {"Connected"}:
+            asyncio.create_task(self.send_msgs([{"cmd": "GetDataPackage", "games": ["Kingdom Hearts 2"]}]))
+            self.kh2slotdata = args['slot_data']
+            # self.kh2_local_items = {int(location): item for location, item in self.kh2slotdata["LocalItems"].items()}
+            self.locations_checked = set(args["checked_locations"])
+
+        if cmd in {"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.serverconneced:
+                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 in {"RoomUpdate"}:
+            if "checked_locations" in args:
+                new_locations = set(args["checked_locations"])
+                self.locations_checked |= new_locations
+
+        if cmd in {"DataPackage"}:
+            self.kh2_loc_name_to_id = args["data"]["games"]["Kingdom Hearts 2"]["location_name_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 = args["data"]["games"]["Kingdom Hearts 2"]["item_name_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"]]
+
+            if "keyblade_abilities" in self.kh2slotdata.keys():
+                sora_ability_dict = self.kh2slotdata["KeybladeAbilities"]
+                # sora ability to slot
+                # itemid:[slots that are available for that item]
+                for k, v in sora_ability_dict.items():
+                    if v >= 1:
+                        if k not in self.sora_ability_to_slot.keys():
+                            self.sora_ability_to_slot[k] = []
+                        for _ in range(sora_ability_dict[k]):
+                            self.sora_ability_to_slot[k].append(self.kh2_seed_save_cache["SoraInvo"][0])
+                            self.kh2_seed_save_cache["SoraInvo"][0] -= 2
+                donald_ability_dict = self.kh2slotdata["StaffAbilities"]
+                for k, v in donald_ability_dict.items():
+                    if v >= 1:
+                        if k not in self.donald_ability_to_slot.keys():
+                            self.donald_ability_to_slot[k] = []
+                        for _ in range(donald_ability_dict[k]):
+                            self.donald_ability_to_slot[k].append(self.kh2_seed_save_cache["DonaldInvo"][0])
+                            self.kh2_seed_save_cache["DonaldInvo"][0] -= 2
+                goofy_ability_dict = self.kh2slotdata["ShieldAbilities"]
+                for k, v in goofy_ability_dict.items():
+                    if v >= 1:
+                        if k not in self.goofy_ability_to_slot.keys():
+                            self.goofy_ability_to_slot[k] = []
+                        for _ in range(goofy_ability_dict[k]):
+                            self.goofy_ability_to_slot[k].append(self.kh2_seed_save_cache["GoofyInvo"][0])
+                            self.kh2_seed_save_cache["GoofyInvo"][0] -= 2
+
+            all_weapon_location_id = []
+            for weapon_location in all_weapon_slot:
+                all_weapon_location_id.append(self.kh2_loc_name_to_id[weapon_location])
+            self.all_weapon_location_id = set(all_weapon_location_id)
+            try:
+                self.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
+                logger.info("You are now auto-tracking")
+                self.kh2connected = True
+
+            except Exception as e:
+                if self.kh2connected:
+                    self.kh2connected = False
+                logger.info("Game is not open.")
+            self.serverconneced = True
+            asyncio.create_task(self.send_msgs([{'cmd': 'Sync'}]))
+
+    async def checkWorldLocations(self):
+        try:
+            currentworldint = self.kh2_read_byte(self.Now)
+            await self.send_msgs([{
+                "cmd":     "Set", "key": "Slot: " + str(self.slot) + " :CurrentWorld",
+                "default": 0, "want_reply": True, "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]
+            }
+            # TODO: remove formDict[i][0] in self.kh2_seed_save_cache["Levels"].keys() after 4.3
+            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:
+            # todo: ripout all the itemtype stuff and just have one dictionary. the only thing that needs to be tracked from the server/local is abilites
+            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
+                # for non beta. remove after 4.3
+                if "PoptrackerVersion" in self.kh2slotdata:
+                    if self.kh2slotdata["PoptrackerVersionCheck"] < 4.3:
+                        if (itemname in self.sora_ability_set
+                            and len(self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname]) < self.item_name_to_data[itemname].quantity) \
+                                and self.kh2_seed_save_cache["SoraInvo"][1] > 0x254C:
+                            ability_slot = self.kh2_seed_save_cache["SoraInvo"][1]
+                            self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
+                            self.kh2_seed_save_cache["SoraInvo"][1] -= 2
+                        elif itemname in self.donald_ability_set:
+                            ability_slot = self.kh2_seed_save_cache["DonaldInvo"][1]
+                            self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
+                            self.kh2_seed_save_cache["DonaldInvo"][1] -= 2
+                        else:
+                            ability_slot = self.kh2_seed_save_cache["GoofyInvo"][1]
+                            self.kh2_seed_save_cache["AmountInvo"]["Ability"][itemname].append(ability_slot)
+                            self.kh2_seed_save_cache["GoofyInvo"][1] -= 2
+                        if ability_slot in self.front_ability_slots:
+                            self.front_ability_slots.remove(ability_slot)
+
+                elif 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)
+
+            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)
+
+            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
+
+            elif itemname in self.all_equipment:
+                self.kh2_seed_save_cache["AmountInvo"]["Equipment"].append(itemname)
+
+            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:
+                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(0x741230)
+        shop = self.kh2_read_short(0x741320)
+        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(0x741230)
+                shop = self.kh2_read_short(0x741320)
+                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(0x741320) 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]
+                if self.kh2_read_byte(self.Slot1 + 0x1B2) >= 5:
+                    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 finishedGame(ctx: KH2Context, message):
+    if ctx.kh2slotdata['FinalXemnas'] == 1:
+        if not ctx.final_xemnas and ctx.kh2_loc_name_to_id[LocationName.FinalXemnas] in ctx.locations_checked:
+            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:
+            for boss in ctx.kh2slotdata["hitlist"]:
+                if boss in message[0]["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.serverconneced:
+                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())
+                message = [{"cmd": 'LocationChecks', "locations": ctx.sending}]
+                if finishedGame(ctx, message) and not ctx.kh2_finished_game:
+                    await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+                    ctx.kh2_finished_game = True
+                await ctx.send_msgs(message)
+            elif not ctx.kh2connected and ctx.serverconneced:
+                logger.info("Game Connection lost. waiting 15 seconds until trying to reconnect.")
+                ctx.kh2 = None
+                while not ctx.kh2connected and ctx.serverconneced:
+                    await asyncio.sleep(15)
+                    ctx.kh2 = pymem.Pymem(process_name="KINGDOM HEARTS II FINAL MIX")
+                    if ctx.kh2 is not None:
+                        logger.info("You are now auto-tracking")
+                        ctx.kh2connected = True
+        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/Items.py b/worlds/kh2/Items.py
index aa0e326c3d..3e656b418b 100644
--- a/worlds/kh2/Items.py
+++ b/worlds/kh2/Items.py
@@ -9,7 +9,6 @@ class KH2Item(Item):
 
 
 class ItemData(typing.NamedTuple):
-    code: typing.Optional[int]
     quantity: int = 0
     kh2id: int = 0
     # Save+ mem addr
@@ -20,336 +19,421 @@ class ItemData(typing.NamedTuple):
     ability: bool = False
 
 
+# 0x130000
 Reports_Table = {
-    ItemName.SecretAnsemsReport1:  ItemData(0x130000, 1, 226, 0x36C4, 6),
-    ItemName.SecretAnsemsReport2:  ItemData(0x130001, 1, 227, 0x36C4, 7),
-    ItemName.SecretAnsemsReport3:  ItemData(0x130002, 1, 228, 0x36C5, 0),
-    ItemName.SecretAnsemsReport4:  ItemData(0x130003, 1, 229, 0x36C5, 1),
-    ItemName.SecretAnsemsReport5:  ItemData(0x130004, 1, 230, 0x36C5, 2),
-    ItemName.SecretAnsemsReport6:  ItemData(0x130005, 1, 231, 0x36C5, 3),
-    ItemName.SecretAnsemsReport7:  ItemData(0x130006, 1, 232, 0x36C5, 4),
-    ItemName.SecretAnsemsReport8:  ItemData(0x130007, 1, 233, 0x36C5, 5),
-    ItemName.SecretAnsemsReport9:  ItemData(0x130008, 1, 234, 0x36C5, 6),
-    ItemName.SecretAnsemsReport10: ItemData(0x130009, 1, 235, 0x36C5, 7),
-    ItemName.SecretAnsemsReport11: ItemData(0x13000A, 1, 236, 0x36C6, 0),
-    ItemName.SecretAnsemsReport12: ItemData(0x13000B, 1, 237, 0x36C6, 1),
-    ItemName.SecretAnsemsReport13: ItemData(0x13000C, 1, 238, 0x36C6, 2),
+    ItemName.SecretAnsemsReport1:  ItemData(1, 226, 0x36C4, 6),
+    ItemName.SecretAnsemsReport2:  ItemData(1, 227, 0x36C4, 7),
+    ItemName.SecretAnsemsReport3:  ItemData(1, 228, 0x36C5, 0),
+    ItemName.SecretAnsemsReport4:  ItemData(1, 229, 0x36C5, 1),
+    ItemName.SecretAnsemsReport5:  ItemData(1, 230, 0x36C5, 2),
+    ItemName.SecretAnsemsReport6:  ItemData(1, 231, 0x36C5, 3),
+    ItemName.SecretAnsemsReport7:  ItemData(1, 232, 0x36C5, 4),
+    ItemName.SecretAnsemsReport8:  ItemData(1, 233, 0x36C5, 5),
+    ItemName.SecretAnsemsReport9:  ItemData(1, 234, 0x36C5, 6),
+    ItemName.SecretAnsemsReport10: ItemData(1, 235, 0x36C5, 7),
+    ItemName.SecretAnsemsReport11: ItemData(1, 236, 0x36C6, 0),
+    ItemName.SecretAnsemsReport12: ItemData(1, 237, 0x36C6, 1),
+    ItemName.SecretAnsemsReport13: ItemData(1, 238, 0x36C6, 2),
 }
 
 Progression_Table = {
-    ItemName.ProofofConnection:   ItemData(0x13000D, 1, 593, 0x36B2),
-    ItemName.ProofofNonexistence: ItemData(0x13000E, 1, 594, 0x36B3),
-    ItemName.ProofofPeace:        ItemData(0x13000F, 1, 595, 0x36B4),
-    ItemName.PromiseCharm:        ItemData(0x130010, 1, 524, 0x3694),
-    ItemName.NamineSketches:      ItemData(0x130011, 1, 368, 0x3642),
-    ItemName.CastleKey:           ItemData(0x130012, 2, 460, 0x365D),  # dummy 13
-    ItemName.BattlefieldsofWar:   ItemData(0x130013, 2, 54, 0x35AE),
-    ItemName.SwordoftheAncestor:  ItemData(0x130014, 2, 55, 0x35AF),
-    ItemName.BeastsClaw:          ItemData(0x130015, 2, 59, 0x35B3),
-    ItemName.BoneFist:            ItemData(0x130016, 2, 60, 0x35B4),
-    ItemName.ProudFang:           ItemData(0x130017, 2, 61, 0x35B5),
-    ItemName.SkillandCrossbones:  ItemData(0x130018, 2, 62, 0x35B6),
-    ItemName.Scimitar:            ItemData(0x130019, 2, 72, 0x35C0),
-    ItemName.MembershipCard:      ItemData(0x13001A, 2, 369, 0x3643),
-    ItemName.IceCream:            ItemData(0x13001B, 3, 375, 0x3649),
+    ItemName.ProofofConnection:   ItemData(1, 593, 0x36B2),
+    ItemName.ProofofNonexistence: ItemData(1, 594, 0x36B3),
+    ItemName.ProofofPeace:        ItemData(1, 595, 0x36B4),
+    ItemName.PromiseCharm:        ItemData(1, 524, 0x3694),
+    ItemName.NamineSketches:      ItemData(1, 368, 0x3642),
+    ItemName.CastleKey:           ItemData(2, 460, 0x365D),  # dummy 13
+    ItemName.BattlefieldsofWar:   ItemData(2, 54, 0x35AE),
+    ItemName.SwordoftheAncestor:  ItemData(2, 55, 0x35AF),
+    ItemName.BeastsClaw:          ItemData(2, 59, 0x35B3),
+    ItemName.BoneFist:            ItemData(2, 60, 0x35B4),
+    ItemName.ProudFang:           ItemData(2, 61, 0x35B5),
+    ItemName.SkillandCrossbones:  ItemData(2, 62, 0x35B6),
+    ItemName.Scimitar:            ItemData(2, 72, 0x35C0),
+    ItemName.MembershipCard:      ItemData(2, 369, 0x3643),
+    ItemName.IceCream:            ItemData(3, 375, 0x3649),
     # Changed to 3 instead of one poster, picture and ice cream respectively
-    ItemName.WaytotheDawn:        ItemData(0x13001C, 1, 73, 0x35C1),
+    ItemName.WaytotheDawn:        ItemData(2, 73, 0x35C1),
     # currently first visit locking doesn't work for twtnw.When goa is updated should be 2
-    ItemName.IdentityDisk:        ItemData(0x13001D, 2, 74, 0x35C2),
-    ItemName.TornPages:           ItemData(0x13001E, 5, 32, 0x3598),
+    ItemName.IdentityDisk:        ItemData(2, 74, 0x35C2),
+    ItemName.TornPages:           ItemData(5, 32, 0x3598),
 
 }
 Forms_Table = {
-    ItemName.ValorForm:  ItemData(0x13001F, 1, 26, 0x36C0, 1),
-    ItemName.WisdomForm: ItemData(0x130020, 1, 27, 0x36C0, 2),
-    ItemName.LimitForm:  ItemData(0x130021, 1, 563, 0x36CA, 3),
-    ItemName.MasterForm: ItemData(0x130022, 1, 31, 0x36C0, 6),
-    ItemName.FinalForm:  ItemData(0x130023, 1, 29, 0x36C0, 4),
+    ItemName.ValorForm:  ItemData(1, 26, 0x36C0, 1),
+    ItemName.WisdomForm: ItemData(1, 27, 0x36C0, 2),
+    ItemName.LimitForm:  ItemData(1, 563, 0x36CA, 3),
+    ItemName.MasterForm: ItemData(1, 31, 0x36C0, 6),
+    ItemName.FinalForm:  ItemData(1, 29, 0x36C0, 4),
+    ItemName.AntiForm:   ItemData(1, 30, 0x36C0, 5)
 }
 Magic_Table = {
-    ItemName.FireElement:     ItemData(0x130024, 3, 21, 0x3594),
-    ItemName.BlizzardElement: ItemData(0x130025, 3, 22, 0x3595),
-    ItemName.ThunderElement:  ItemData(0x130026, 3, 23, 0x3596),
-    ItemName.CureElement:     ItemData(0x130027, 3, 24, 0x3597),
-    ItemName.MagnetElement:   ItemData(0x130028, 3, 87, 0x35CF),
-    ItemName.ReflectElement:  ItemData(0x130029, 3, 88, 0x35D0),
-    ItemName.Genie:           ItemData(0x13002A, 1, 159, 0x36C4, 4),
-    ItemName.PeterPan:        ItemData(0x13002B, 1, 160, 0x36C4, 5),
-    ItemName.Stitch:          ItemData(0x13002C, 1, 25, 0x36C0, 0),
-    ItemName.ChickenLittle:   ItemData(0x13002D, 1, 383, 0x36C0, 3),
+    ItemName.FireElement:     ItemData(3, 21, 0x3594),
+    ItemName.BlizzardElement: ItemData(3, 22, 0x3595),
+    ItemName.ThunderElement:  ItemData(3, 23, 0x3596),
+    ItemName.CureElement:     ItemData(3, 24, 0x3597),
+    ItemName.MagnetElement:   ItemData(3, 87, 0x35CF),
+    ItemName.ReflectElement:  ItemData(3, 88, 0x35D0),
+}
+Summon_Table = {
+    ItemName.Genie:         ItemData(1, 159, 0x36C4, 4),
+    ItemName.PeterPan:      ItemData(1, 160, 0x36C4, 5),
+    ItemName.Stitch:        ItemData(1, 25, 0x36C0, 0),
+    ItemName.ChickenLittle: ItemData(1, 383, 0x36C0, 3),
 }
-
 Movement_Table = {
-    ItemName.HighJump:    ItemData(0x13002E, 4, 94, 0x05E, 0, True),
-    ItemName.QuickRun:    ItemData(0x13002F, 4, 98, 0x062, 0, True),
-    ItemName.DodgeRoll:   ItemData(0x130030, 4, 564, 0x234, 0, True),
-    ItemName.AerialDodge: ItemData(0x130031, 4, 102, 0x066, 0, True),
-    ItemName.Glide:       ItemData(0x130032, 4, 106, 0x06A, 0, True),
+    ItemName.HighJump:    ItemData(4, 94, 0x05E, ability=True),
+    ItemName.QuickRun:    ItemData(4, 98, 0x062, ability=True),
+    ItemName.DodgeRoll:   ItemData(4, 564, 0x234, ability=True),
+    ItemName.AerialDodge: ItemData(4, 102, 0x066, ability=True),
+    ItemName.Glide:       ItemData(4, 106, 0x06A, ability=True),
 }
 
 Keyblade_Table = {
-    ItemName.Oathkeeper:      ItemData(0x130033, 1, 42, 0x35A2),
-    ItemName.Oblivion:        ItemData(0x130034, 1, 43, 0x35A3),
-    ItemName.StarSeeker:      ItemData(0x130035, 1, 480, 0x367B),
-    ItemName.HiddenDragon:    ItemData(0x130036, 1, 481, 0x367C),
-    ItemName.HerosCrest:      ItemData(0x130037, 1, 484, 0x367F),
-    ItemName.Monochrome:      ItemData(0x130038, 1, 485, 0x3680),
-    ItemName.FollowtheWind:   ItemData(0x130039, 1, 486, 0x3681),
-    ItemName.CircleofLife:    ItemData(0x13003A, 1, 487, 0x3682),
-    ItemName.PhotonDebugger:  ItemData(0x13003B, 1, 488, 0x3683),
-    ItemName.GullWing:        ItemData(0x13003C, 1, 489, 0x3684),
-    ItemName.RumblingRose:    ItemData(0x13003D, 1, 490, 0x3685),
-    ItemName.GuardianSoul:    ItemData(0x13003E, 1, 491, 0x3686),
-    ItemName.WishingLamp:     ItemData(0x13003F, 1, 492, 0x3687),
-    ItemName.DecisivePumpkin: ItemData(0x130040, 1, 493, 0x3688),
-    ItemName.SleepingLion:    ItemData(0x130041, 1, 494, 0x3689),
-    ItemName.SweetMemories:   ItemData(0x130042, 1, 495, 0x368A),
-    ItemName.MysteriousAbyss: ItemData(0x130043, 1, 496, 0x368B),
-    ItemName.TwoBecomeOne:    ItemData(0x130044, 1, 543, 0x3698),
-    ItemName.FatalCrest:      ItemData(0x130045, 1, 497, 0x368C),
-    ItemName.BondofFlame:     ItemData(0x130046, 1, 498, 0x368D),
-    ItemName.Fenrir:          ItemData(0x130047, 1, 499, 0x368E),
-    ItemName.UltimaWeapon:    ItemData(0x130048, 1, 500, 0x368F),
-    ItemName.WinnersProof:    ItemData(0x130049, 1, 544, 0x3699),
-    ItemName.Pureblood:       ItemData(0x13004A, 1, 71, 0x35BF),
+    ItemName.Oathkeeper:      ItemData(1, 42, 0x35A2),
+    ItemName.Oblivion:        ItemData(1, 43, 0x35A3),
+    ItemName.StarSeeker:      ItemData(1, 480, 0x367B),
+    ItemName.HiddenDragon:    ItemData(1, 481, 0x367C),
+    ItemName.HerosCrest:      ItemData(1, 484, 0x367F),
+    ItemName.Monochrome:      ItemData(1, 485, 0x3680),
+    ItemName.FollowtheWind:   ItemData(1, 486, 0x3681),
+    ItemName.CircleofLife:    ItemData(1, 487, 0x3682),
+    ItemName.PhotonDebugger:  ItemData(1, 488, 0x3683),
+    ItemName.GullWing:        ItemData(1, 489, 0x3684),
+    ItemName.RumblingRose:    ItemData(1, 490, 0x3685),
+    ItemName.GuardianSoul:    ItemData(1, 491, 0x3686),
+    ItemName.WishingLamp:     ItemData(1, 492, 0x3687),
+    ItemName.DecisivePumpkin: ItemData(1, 493, 0x3688),
+    ItemName.SleepingLion:    ItemData(1, 494, 0x3689),
+    ItemName.SweetMemories:   ItemData(1, 495, 0x368A),
+    ItemName.MysteriousAbyss: ItemData(1, 496, 0x368B),
+    ItemName.TwoBecomeOne:    ItemData(1, 543, 0x3698),
+    ItemName.FatalCrest:      ItemData(1, 497, 0x368C),
+    ItemName.BondofFlame:     ItemData(1, 498, 0x368D),
+    ItemName.Fenrir:          ItemData(1, 499, 0x368E),
+    ItemName.UltimaWeapon:    ItemData(1, 500, 0x368F),
+    ItemName.WinnersProof:    ItemData(1, 544, 0x3699),
+    ItemName.Pureblood:       ItemData(1, 71, 0x35BF),
 }
 Staffs_Table = {
-    ItemName.Centurion2:        ItemData(0x13004B, 1, 546, 0x369B),
-    ItemName.MeteorStaff:       ItemData(0x13004C, 1, 150, 0x35F1),
-    ItemName.NobodyLance:       ItemData(0x13004D, 1, 155, 0x35F6),
-    ItemName.PreciousMushroom:  ItemData(0x13004E, 1, 549, 0x369E),
-    ItemName.PreciousMushroom2: ItemData(0x13004F, 1, 550, 0x369F),
-    ItemName.PremiumMushroom:   ItemData(0x130050, 1, 551, 0x36A0),
-    ItemName.RisingDragon:      ItemData(0x130051, 1, 154, 0x35F5),
-    ItemName.SaveTheQueen2:     ItemData(0x130052, 1, 503, 0x3692),
-    ItemName.ShamansRelic:      ItemData(0x130053, 1, 156, 0x35F7),
+    ItemName.Centurion2:        ItemData(1, 546, 0x369B),
+    ItemName.MeteorStaff:       ItemData(1, 150, 0x35F1),
+    ItemName.NobodyLance:       ItemData(1, 155, 0x35F6),
+    ItemName.PreciousMushroom:  ItemData(1, 549, 0x369E),
+    ItemName.PreciousMushroom2: ItemData(1, 550, 0x369F),
+    ItemName.PremiumMushroom:   ItemData(1, 551, 0x36A0),
+    ItemName.RisingDragon:      ItemData(1, 154, 0x35F5),
+    ItemName.SaveTheQueen2:     ItemData(1, 503, 0x3692),
+    ItemName.ShamansRelic:      ItemData(1, 156, 0x35F7),
 }
 Shields_Table = {
-    ItemName.AkashicRecord:     ItemData(0x130054, 1, 146, 0x35ED),
-    ItemName.FrozenPride2:      ItemData(0x130055, 1, 553, 0x36A2),
-    ItemName.GenjiShield:       ItemData(0x130056, 1, 145, 0x35EC),
-    ItemName.MajesticMushroom:  ItemData(0x130057, 1, 556, 0x36A5),
-    ItemName.MajesticMushroom2: ItemData(0x130058, 1, 557, 0x36A6),
-    ItemName.NobodyGuard:       ItemData(0x130059, 1, 147, 0x35EE),
-    ItemName.OgreShield:        ItemData(0x13005A, 1, 141, 0x35E8),
-    ItemName.SaveTheKing2:      ItemData(0x13005B, 1, 504, 0x3693),
-    ItemName.UltimateMushroom:  ItemData(0x13005C, 1, 558, 0x36A7),
+    ItemName.AkashicRecord:     ItemData(1, 146, 0x35ED),
+    ItemName.FrozenPride2:      ItemData(1, 553, 0x36A2),
+    ItemName.GenjiShield:       ItemData(1, 145, 0x35EC),
+    ItemName.MajesticMushroom:  ItemData(1, 556, 0x36A5),
+    ItemName.MajesticMushroom2: ItemData(1, 557, 0x36A6),
+    ItemName.NobodyGuard:       ItemData(1, 147, 0x35EE),
+    ItemName.OgreShield:        ItemData(1, 141, 0x35E8),
+    ItemName.SaveTheKing2:      ItemData(1, 504, 0x3693),
+    ItemName.UltimateMushroom:  ItemData(1, 558, 0x36A7),
 }
 Accessory_Table = {
-    ItemName.AbilityRing:     ItemData(0x13005D, 1, 8, 0x3587),
-    ItemName.EngineersRing:   ItemData(0x13005E, 1, 9, 0x3588),
-    ItemName.TechniciansRing: ItemData(0x13005F, 1, 10, 0x3589),
-    ItemName.SkillRing:       ItemData(0x130060, 1, 38, 0x359F),
-    ItemName.SkillfulRing:    ItemData(0x130061, 1, 39, 0x35A0),
-    ItemName.ExpertsRing:     ItemData(0x130062, 1, 11, 0x358A),
-    ItemName.MastersRing:     ItemData(0x130063, 1, 34, 0x359B),
-    ItemName.CosmicRing:      ItemData(0x130064, 1, 52, 0x35AD),
-    ItemName.ExecutivesRing:  ItemData(0x130065, 1, 599, 0x36B5),
-    ItemName.SardonyxRing:    ItemData(0x130066, 1, 12, 0x358B),
-    ItemName.TourmalineRing:  ItemData(0x130067, 1, 13, 0x358C),
-    ItemName.AquamarineRing:  ItemData(0x130068, 1, 14, 0x358D),
-    ItemName.GarnetRing:      ItemData(0x130069, 1, 15, 0x358E),
-    ItemName.DiamondRing:     ItemData(0x13006A, 1, 16, 0x358F),
-    ItemName.SilverRing:      ItemData(0x13006B, 1, 17, 0x3590),
-    ItemName.GoldRing:        ItemData(0x13006C, 1, 18, 0x3591),
-    ItemName.PlatinumRing:    ItemData(0x13006D, 1, 19, 0x3592),
-    ItemName.MythrilRing:     ItemData(0x13006E, 1, 20, 0x3593),
-    ItemName.OrichalcumRing:  ItemData(0x13006F, 1, 28, 0x359A),
-    ItemName.SoldierEarring:  ItemData(0x130070, 1, 40, 0x35A6),
-    ItemName.FencerEarring:   ItemData(0x130071, 1, 46, 0x35A7),
-    ItemName.MageEarring:     ItemData(0x130072, 1, 47, 0x35A8),
-    ItemName.SlayerEarring:   ItemData(0x130073, 1, 48, 0x35AC),
-    ItemName.Medal:           ItemData(0x130074, 1, 53, 0x35B0),
-    ItemName.MoonAmulet:      ItemData(0x130075, 1, 35, 0x359C),
-    ItemName.StarCharm:       ItemData(0x130076, 1, 36, 0x359E),
-    ItemName.CosmicArts:      ItemData(0x130077, 1, 56, 0x35B1),
-    ItemName.ShadowArchive:   ItemData(0x130078, 1, 57, 0x35B2),
-    ItemName.ShadowArchive2:  ItemData(0x130079, 1, 58, 0x35B7),
-    ItemName.FullBloom:       ItemData(0x13007A, 1, 64, 0x35B9),
-    ItemName.FullBloom2:      ItemData(0x13007B, 1, 66, 0x35BB),
-    ItemName.DrawRing:        ItemData(0x13007C, 1, 65, 0x35BA),
-    ItemName.LuckyRing:       ItemData(0x13007D, 1, 63, 0x35B8),
+    ItemName.AbilityRing:     ItemData(1, 8, 0x3587),
+    ItemName.EngineersRing:   ItemData(1, 9, 0x3588),
+    ItemName.TechniciansRing: ItemData(1, 10, 0x3589),
+    ItemName.SkillRing:       ItemData(1, 38, 0x359F),
+    ItemName.SkillfulRing:    ItemData(1, 39, 0x35A0),
+    ItemName.ExpertsRing:     ItemData(1, 11, 0x358A),
+    ItemName.MastersRing:     ItemData(1, 34, 0x359B),
+    ItemName.CosmicRing:      ItemData(1, 52, 0x35AD),
+    ItemName.ExecutivesRing:  ItemData(1, 599, 0x36B5),
+    ItemName.SardonyxRing:    ItemData(1, 12, 0x358B),
+    ItemName.TourmalineRing:  ItemData(1, 13, 0x358C),
+    ItemName.AquamarineRing:  ItemData(1, 14, 0x358D),
+    ItemName.GarnetRing:      ItemData(1, 15, 0x358E),
+    ItemName.DiamondRing:     ItemData(1, 16, 0x358F),
+    ItemName.SilverRing:      ItemData(1, 17, 0x3590),
+    ItemName.GoldRing:        ItemData(1, 18, 0x3591),
+    ItemName.PlatinumRing:    ItemData(1, 19, 0x3592),
+    ItemName.MythrilRing:     ItemData(1, 20, 0x3593),
+    ItemName.OrichalcumRing:  ItemData(1, 28, 0x359A),
+    ItemName.SoldierEarring:  ItemData(1, 40, 0x35A6),
+    ItemName.FencerEarring:   ItemData(1, 46, 0x35A7),
+    ItemName.MageEarring:     ItemData(1, 47, 0x35A8),
+    ItemName.SlayerEarring:   ItemData(1, 48, 0x35AC),
+    ItemName.Medal:           ItemData(1, 53, 0x35B0),
+    ItemName.MoonAmulet:      ItemData(1, 35, 0x359C),
+    ItemName.StarCharm:       ItemData(1, 36, 0x359E),
+    ItemName.CosmicArts:      ItemData(1, 56, 0x35B1),
+    ItemName.ShadowArchive:   ItemData(1, 57, 0x35B2),
+    ItemName.ShadowArchive2:  ItemData(1, 58, 0x35B7),
+    ItemName.FullBloom:       ItemData(1, 64, 0x35B9),
+    ItemName.FullBloom2:      ItemData(1, 66, 0x35BB),
+    ItemName.DrawRing:        ItemData(1, 65, 0x35BA),
+    ItemName.LuckyRing:       ItemData(1, 63, 0x35B8),
 }
 Armor_Table = {
-    ItemName.ElvenBandana:     ItemData(0x13007E, 1, 67, 0x35BC),
-    ItemName.DivineBandana:    ItemData(0x13007F, 1, 68, 0x35BD),
-    ItemName.ProtectBelt:      ItemData(0x130080, 1, 78, 0x35C7),
-    ItemName.GaiaBelt:         ItemData(0x130081, 1, 79, 0x35CA),
-    ItemName.PowerBand:        ItemData(0x130082, 1, 69, 0x35BE),
-    ItemName.BusterBand:       ItemData(0x130083, 1, 70, 0x35C6),
-    ItemName.CosmicBelt:       ItemData(0x130084, 1, 111, 0x35D1),
-    ItemName.FireBangle:       ItemData(0x130085, 1, 173, 0x35D7),
-    ItemName.FiraBangle:       ItemData(0x130086, 1, 174, 0x35D8),
-    ItemName.FiragaBangle:     ItemData(0x130087, 1, 197, 0x35D9),
-    ItemName.FiragunBangle:    ItemData(0x130088, 1, 284, 0x35DA),
-    ItemName.BlizzardArmlet:   ItemData(0x130089, 1, 286, 0x35DC),
-    ItemName.BlizzaraArmlet:   ItemData(0x13008A, 1, 287, 0x35DD),
-    ItemName.BlizzagaArmlet:   ItemData(0x13008B, 1, 288, 0x35DE),
-    ItemName.BlizzagunArmlet:  ItemData(0x13008C, 1, 289, 0x35DF),
-    ItemName.ThunderTrinket:   ItemData(0x13008D, 1, 291, 0x35E2),
-    ItemName.ThundaraTrinket:  ItemData(0x13008E, 1, 292, 0x35E3),
-    ItemName.ThundagaTrinket:  ItemData(0x13008F, 1, 293, 0x35E4),
-    ItemName.ThundagunTrinket: ItemData(0x130090, 1, 294, 0x35E5),
-    ItemName.ShockCharm:       ItemData(0x130091, 1, 132, 0x35D2),
-    ItemName.ShockCharm2:      ItemData(0x130092, 1, 133, 0x35D3),
-    ItemName.ShadowAnklet:     ItemData(0x130093, 1, 296, 0x35F9),
-    ItemName.DarkAnklet:       ItemData(0x130094, 1, 297, 0x35FB),
-    ItemName.MidnightAnklet:   ItemData(0x130095, 1, 298, 0x35FC),
-    ItemName.ChaosAnklet:      ItemData(0x130096, 1, 299, 0x35FD),
-    ItemName.ChampionBelt:     ItemData(0x130097, 1, 305, 0x3603),
-    ItemName.AbasChain:        ItemData(0x130098, 1, 301, 0x35FF),
-    ItemName.AegisChain:       ItemData(0x130099, 1, 302, 0x3600),
-    ItemName.Acrisius:         ItemData(0x13009A, 1, 303, 0x3601),
-    ItemName.Acrisius2:        ItemData(0x13009B, 1, 307, 0x3605),
-    ItemName.CosmicChain:      ItemData(0x13009C, 1, 308, 0x3606),
-    ItemName.PetiteRibbon:     ItemData(0x13009D, 1, 306, 0x3604),
-    ItemName.Ribbon:           ItemData(0x13009E, 1, 304, 0x3602),
-    ItemName.GrandRibbon:      ItemData(0x13009F, 1, 157, 0x35D4),
+    ItemName.ElvenBandana:     ItemData(1, 67, 0x35BC),
+    ItemName.DivineBandana:    ItemData(1, 68, 0x35BD),
+    ItemName.ProtectBelt:      ItemData(1, 78, 0x35C7),
+    ItemName.GaiaBelt:         ItemData(1, 79, 0x35CA),
+    ItemName.PowerBand:        ItemData(1, 69, 0x35BE),
+    ItemName.BusterBand:       ItemData(1, 70, 0x35C6),
+    ItemName.CosmicBelt:       ItemData(1, 111, 0x35D1),
+    ItemName.FireBangle:       ItemData(1, 173, 0x35D7),
+    ItemName.FiraBangle:       ItemData(1, 174, 0x35D8),
+    ItemName.FiragaBangle:     ItemData(1, 197, 0x35D9),
+    ItemName.FiragunBangle:    ItemData(1, 284, 0x35DA),
+    ItemName.BlizzardArmlet:   ItemData(1, 286, 0x35DC),
+    ItemName.BlizzaraArmlet:   ItemData(1, 287, 0x35DD),
+    ItemName.BlizzagaArmlet:   ItemData(1, 288, 0x35DE),
+    ItemName.BlizzagunArmlet:  ItemData(1, 289, 0x35DF),
+    ItemName.ThunderTrinket:   ItemData(1, 291, 0x35E2),
+    ItemName.ThundaraTrinket:  ItemData(1, 292, 0x35E3),
+    ItemName.ThundagaTrinket:  ItemData(1, 293, 0x35E4),
+    ItemName.ThundagunTrinket: ItemData(1, 294, 0x35E5),
+    ItemName.ShockCharm:       ItemData(1, 132, 0x35D2),
+    ItemName.ShockCharm2:      ItemData(1, 133, 0x35D3),
+    ItemName.ShadowAnklet:     ItemData(1, 296, 0x35F9),
+    ItemName.DarkAnklet:       ItemData(1, 297, 0x35FB),
+    ItemName.MidnightAnklet:   ItemData(1, 298, 0x35FC),
+    ItemName.ChaosAnklet:      ItemData(1, 299, 0x35FD),
+    ItemName.ChampionBelt:     ItemData(1, 305, 0x3603),
+    ItemName.AbasChain:        ItemData(1, 301, 0x35FF),
+    ItemName.AegisChain:       ItemData(1, 302, 0x3600),
+    ItemName.Acrisius:         ItemData(1, 303, 0x3601),
+    ItemName.Acrisius2:        ItemData(1, 307, 0x3605),
+    ItemName.CosmicChain:      ItemData(1, 308, 0x3606),
+    ItemName.PetiteRibbon:     ItemData(1, 306, 0x3604),
+    ItemName.Ribbon:           ItemData(1, 304, 0x3602),
+    ItemName.GrandRibbon:      ItemData(1, 157, 0x35D4),
 }
 Usefull_Table = {
-    ItemName.MickyMunnyPouch:  ItemData(0x1300A0, 3, 535, 0x3695),  # 5000 munny per
-    ItemName.OletteMunnyPouch: ItemData(0x1300A1, 6, 362, 0x363C),  # 2500 munny per
-    ItemName.HadesCupTrophy:   ItemData(0x1300A2, 1, 537, 0x3696),
-    ItemName.UnknownDisk:      ItemData(0x1300A3, 1, 462, 0x365F),
-    ItemName.OlympusStone:     ItemData(0x1300A4, 1, 370, 0x3644),
-    ItemName.MaxHPUp:          ItemData(0x1300A5, 20, 470, 0x3671),
-    ItemName.MaxMPUp:          ItemData(0x1300A6, 4, 471, 0x3672),
-    ItemName.DriveGaugeUp:     ItemData(0x1300A7, 6, 472, 0x3673),
-    ItemName.ArmorSlotUp:      ItemData(0x1300A8, 3, 473, 0x3674),
-    ItemName.AccessorySlotUp:  ItemData(0x1300A9, 3, 474, 0x3675),
-    ItemName.ItemSlotUp:       ItemData(0x1300AA, 5, 463, 0x3660),
+    ItemName.MickeyMunnyPouch:  ItemData(1, 535, 0x3695),  # 5000 munny per
+    ItemName.OletteMunnyPouch: ItemData(2, 362, 0x363C),  # 2500 munny per
+    ItemName.HadesCupTrophy:   ItemData(1, 537, 0x3696),
+    ItemName.UnknownDisk:      ItemData(1, 462, 0x365F),
+    ItemName.OlympusStone:     ItemData(1, 370, 0x3644),
+    ItemName.MaxHPUp:          ItemData(20, 112, 0x3671),  # 470 is DUMMY 23, 112 is Encampment Area Map
+    ItemName.MaxMPUp:          ItemData(4, 113, 0x3672),  # 471 is DUMMY 24, 113 is Village Area Map
+    ItemName.DriveGaugeUp:     ItemData(6, 114, 0x3673),  # 472 is DUMMY 25, 114 is Cornerstone Hill Map
+    ItemName.ArmorSlotUp:      ItemData(3, 116, 0x3674),  # 473 is DUMMY 26, 116 is Lilliput Map
+    ItemName.AccessorySlotUp:  ItemData(3, 117, 0x3675),  # 474 is DUMMY 27, 117 is Building Site Map
+    ItemName.ItemSlotUp:       ItemData(5, 118, 0x3660),  # 463 is DUMMY 16, 118 is Mickey’s House Map
 }
 SupportAbility_Table = {
-    ItemName.Scan:             ItemData(0x1300AB, 2, 138, 0x08A, 0, True),
-    ItemName.AerialRecovery:   ItemData(0x1300AC, 1, 158, 0x09E, 0, True),
-    ItemName.ComboMaster:      ItemData(0x1300AD, 1, 539, 0x21B, 0, True),
-    ItemName.ComboPlus:        ItemData(0x1300AE, 3, 162, 0x0A2, 0, True),
-    ItemName.AirComboPlus:     ItemData(0x1300AF, 3, 163, 0x0A3, 0, True),
-    ItemName.ComboBoost:       ItemData(0x1300B0, 2, 390, 0x186, 0, True),
-    ItemName.AirComboBoost:    ItemData(0x1300B1, 2, 391, 0x187, 0, True),
-    ItemName.ReactionBoost:    ItemData(0x1300B2, 3, 392, 0x188, 0, True),
-    ItemName.FinishingPlus:    ItemData(0x1300B3, 3, 393, 0x189, 0, True),
-    ItemName.NegativeCombo:    ItemData(0x1300B4, 2, 394, 0x18A, 0, True),
-    ItemName.BerserkCharge:    ItemData(0x1300B5, 2, 395, 0x18B, 0, True),
-    ItemName.DamageDrive:      ItemData(0x1300B6, 2, 396, 0x18C, 0, True),
-    ItemName.DriveBoost:       ItemData(0x1300B7, 2, 397, 0x18D, 0, True),
-    ItemName.FormBoost:        ItemData(0x1300B8, 3, 398, 0x18E, 0, True),
-    ItemName.SummonBoost:      ItemData(0x1300B9, 1, 399, 0x18F, 0, True),
-    ItemName.ExperienceBoost:  ItemData(0x1300BA, 2, 401, 0x191, 0, True),
-    ItemName.Draw:             ItemData(0x1300BB, 4, 405, 0x195, 0, True),
-    ItemName.Jackpot:          ItemData(0x1300BC, 2, 406, 0x196, 0, True),
-    ItemName.LuckyLucky:       ItemData(0x1300BD, 3, 407, 0x197, 0, True),
-    ItemName.DriveConverter:   ItemData(0x1300BE, 2, 540, 0x21C, 0, True),
-    ItemName.FireBoost:        ItemData(0x1300BF, 2, 408, 0x198, 0, True),
-    ItemName.BlizzardBoost:    ItemData(0x1300C0, 2, 409, 0x199, 0, True),
-    ItemName.ThunderBoost:     ItemData(0x1300C1, 2, 410, 0x19A, 0, True),
-    ItemName.ItemBoost:        ItemData(0x1300C2, 2, 411, 0x19B, 0, True),
-    ItemName.MPRage:           ItemData(0x1300C3, 2, 412, 0x19C, 0, True),
-    ItemName.MPHaste:          ItemData(0x1300C4, 2, 413, 0x19D, 0, True),
-    ItemName.MPHastera:        ItemData(0x1300C5, 2, 421, 0x1A5, 0, True),
-    ItemName.MPHastega:        ItemData(0x1300C6, 1, 422, 0x1A6, 0, True),
-    ItemName.Defender:         ItemData(0x1300C7, 2, 414, 0x19E, 0, True),
-    ItemName.DamageControl:    ItemData(0x1300C8, 2, 542, 0x21E, 0, True),
-    ItemName.NoExperience:     ItemData(0x1300C9, 1, 404, 0x194, 0, True),
-    ItemName.LightDarkness:    ItemData(0x1300CA, 1, 541, 0x21D, 0, True),
-    ItemName.MagicLock:        ItemData(0x1300CB, 1, 403, 0x193, 0, True),
-    ItemName.LeafBracer:       ItemData(0x1300CC, 1, 402, 0x192, 0, True),
-    ItemName.CombinationBoost: ItemData(0x1300CD, 1, 400, 0x190, 0, True),
-    ItemName.OnceMore:         ItemData(0x1300CE, 1, 416, 0x1A0, 0, True),
-    ItemName.SecondChance:     ItemData(0x1300CF, 1, 415, 0x19F, 0, True),
+    ItemName.Scan:             ItemData(2, 138, 0x08A, ability=True),
+    ItemName.AerialRecovery:   ItemData(1, 158, 0x09E, ability=True),
+    ItemName.ComboMaster:      ItemData(1, 539, 0x21B, ability=True),
+    ItemName.ComboPlus:        ItemData(3, 162, 0x0A2, ability=True),
+    ItemName.AirComboPlus:     ItemData(3, 163, 0x0A3, ability=True),
+    ItemName.ComboBoost:       ItemData(2, 390, 0x186, ability=True),
+    ItemName.AirComboBoost:    ItemData(2, 391, 0x187, ability=True),
+    ItemName.ReactionBoost:    ItemData(3, 392, 0x188, ability=True),
+    ItemName.FinishingPlus:    ItemData(3, 393, 0x189, ability=True),
+    ItemName.NegativeCombo:    ItemData(2, 394, 0x18A, ability=True),
+    ItemName.BerserkCharge:    ItemData(2, 395, 0x18B, ability=True),
+    ItemName.DamageDrive:      ItemData(2, 396, 0x18C, ability=True),
+    ItemName.DriveBoost:       ItemData(2, 397, 0x18D, ability=True),
+    ItemName.FormBoost:        ItemData(3, 398, 0x18E, ability=True),
+    ItemName.SummonBoost:      ItemData(1, 399, 0x18F, ability=True),
+    ItemName.ExperienceBoost:  ItemData(2, 401, 0x191, ability=True),
+    ItemName.Draw:             ItemData(4, 405, 0x195, ability=True),
+    ItemName.Jackpot:          ItemData(2, 406, 0x196, ability=True),
+    ItemName.LuckyLucky:       ItemData(3, 407, 0x197, ability=True),
+    ItemName.DriveConverter:   ItemData(2, 540, 0x21C, ability=True),
+    ItemName.FireBoost:        ItemData(2, 408, 0x198, ability=True),
+    ItemName.BlizzardBoost:    ItemData(2, 409, 0x199, ability=True),
+    ItemName.ThunderBoost:     ItemData(2, 410, 0x19A, ability=True),
+    ItemName.ItemBoost:        ItemData(2, 411, 0x19B, ability=True),
+    ItemName.MPRage:           ItemData(2, 412, 0x19C, ability=True),
+    ItemName.MPHaste:          ItemData(2, 413, 0x19D, ability=True),
+    ItemName.MPHastera:        ItemData(2, 421, 0x1A5, ability=True),
+    ItemName.MPHastega:        ItemData(1, 422, 0x1A6, ability=True),
+    ItemName.Defender:         ItemData(2, 414, 0x19E, ability=True),
+    ItemName.DamageControl:    ItemData(2, 542, 0x21E, ability=True),
+    ItemName.NoExperience:     ItemData(0, 404, 0x194, ability=True),  # quantity changed to 0 because the player starts with one always.
+    ItemName.LightDarkness:    ItemData(1, 541, 0x21D, ability=True),
+    ItemName.MagicLock:        ItemData(1, 403, 0x193, ability=True),
+    ItemName.LeafBracer:       ItemData(1, 402, 0x192, ability=True),
+    ItemName.CombinationBoost: ItemData(1, 400, 0x190, ability=True),
+    ItemName.OnceMore:         ItemData(1, 416, 0x1A0, ability=True),
+    ItemName.SecondChance:     ItemData(1, 415, 0x19F, ability=True),
 }
 ActionAbility_Table = {
-    ItemName.Guard:            ItemData(0x1300D0, 1, 82, 0x052, 0, True),
-    ItemName.UpperSlash:       ItemData(0x1300D1, 1, 137, 0x089, 0, True),
-    ItemName.HorizontalSlash:  ItemData(0x1300D2, 1, 271, 0x10F, 0, True),
-    ItemName.FinishingLeap:    ItemData(0x1300D3, 1, 267, 0x10B, 0, True),
-    ItemName.RetaliatingSlash: ItemData(0x1300D4, 1, 273, 0x111, 0, True),
-    ItemName.Slapshot:         ItemData(0x1300D5, 1, 262, 0x106, 0, True),
-    ItemName.DodgeSlash:       ItemData(0x1300D6, 1, 263, 0x107, 0, True),
-    ItemName.FlashStep:        ItemData(0x1300D7, 1, 559, 0x22F, 0, True),
-    ItemName.SlideDash:        ItemData(0x1300D8, 1, 264, 0x108, 0, True),
-    ItemName.VicinityBreak:    ItemData(0x1300D9, 1, 562, 0x232, 0, True),
-    ItemName.GuardBreak:       ItemData(0x1300DA, 1, 265, 0x109, 0, True),
-    ItemName.Explosion:        ItemData(0x1300DB, 1, 266, 0x10A, 0, True),
-    ItemName.AerialSweep:      ItemData(0x1300DC, 1, 269, 0x10D, 0, True),
-    ItemName.AerialDive:       ItemData(0x1300DD, 1, 560, 0x230, 0, True),
-    ItemName.AerialSpiral:     ItemData(0x1300DE, 1, 270, 0x10E, 0, True),
-    ItemName.AerialFinish:     ItemData(0x1300DF, 1, 272, 0x110, 0, True),
-    ItemName.MagnetBurst:      ItemData(0x1300E0, 1, 561, 0x231, 0, True),
-    ItemName.Counterguard:     ItemData(0x1300E1, 1, 268, 0x10C, 0, True),
-    ItemName.AutoValor:        ItemData(0x1300E2, 1, 385, 0x181, 0, True),
-    ItemName.AutoWisdom:       ItemData(0x1300E3, 1, 386, 0x182, 0, True),
-    ItemName.AutoLimit:        ItemData(0x1300E4, 1, 568, 0x238, 0, True),
-    ItemName.AutoMaster:       ItemData(0x1300E5, 1, 387, 0x183, 0, True),
-    ItemName.AutoFinal:        ItemData(0x1300E6, 1, 388, 0x184, 0, True),
-    ItemName.AutoSummon:       ItemData(0x1300E7, 1, 389, 0x185, 0, True),
-    ItemName.TrinityLimit:     ItemData(0x1300E8, 1, 198, 0x0C6, 0, True),
+    ItemName.Guard:            ItemData(1, 82, 0x052, ability=True),
+    ItemName.UpperSlash:       ItemData(1, 137, 0x089, ability=True),
+    ItemName.HorizontalSlash:  ItemData(1, 271, 0x10F, ability=True),
+    ItemName.FinishingLeap:    ItemData(1, 267, 0x10B, ability=True),
+    ItemName.RetaliatingSlash: ItemData(1, 273, 0x111, ability=True),
+    ItemName.Slapshot:         ItemData(1, 262, 0x106, ability=True),
+    ItemName.DodgeSlash:       ItemData(1, 263, 0x107, ability=True),
+    ItemName.FlashStep:        ItemData(1, 559, 0x22F, ability=True),
+    ItemName.SlideDash:        ItemData(1, 264, 0x108, ability=True),
+    ItemName.VicinityBreak:    ItemData(1, 562, 0x232, ability=True),
+    ItemName.GuardBreak:       ItemData(1, 265, 0x109, ability=True),
+    ItemName.Explosion:        ItemData(1, 266, 0x10A, ability=True),
+    ItemName.AerialSweep:      ItemData(1, 269, 0x10D, ability=True),
+    ItemName.AerialDive:       ItemData(1, 560, 0x230, ability=True),
+    ItemName.AerialSpiral:     ItemData(1, 270, 0x10E, ability=True),
+    ItemName.AerialFinish:     ItemData(1, 272, 0x110, ability=True),
+    ItemName.MagnetBurst:      ItemData(1, 561, 0x231, ability=True),
+    ItemName.Counterguard:     ItemData(1, 268, 0x10C, ability=True),
+    ItemName.AutoValor:        ItemData(1, 385, 0x181, ability=True),
+    ItemName.AutoWisdom:       ItemData(1, 386, 0x182, ability=True),
+    ItemName.AutoLimit:        ItemData(1, 568, 0x238, ability=True),
+    ItemName.AutoMaster:       ItemData(1, 387, 0x183, ability=True),
+    ItemName.AutoFinal:        ItemData(1, 388, 0x184, ability=True),
+    ItemName.AutoSummon:       ItemData(1, 389, 0x185, ability=True),
+    ItemName.TrinityLimit:     ItemData(1, 198, 0x0C6, ability=True),
 }
-Items_Table = {
-    ItemName.PowerBoost:   ItemData(0x1300E9, 1, 276, 0x3666),
-    ItemName.MagicBoost:   ItemData(0x1300EA, 1, 277, 0x3667),
-    ItemName.DefenseBoost: ItemData(0x1300EB, 1, 278, 0x3668),
-    ItemName.APBoost:      ItemData(0x1300EC, 1, 279, 0x3669),
+Boosts_Table = {
+    ItemName.PowerBoost:   ItemData(1, 253, 0x359D),  # 276, 0x3666, market place map
+    ItemName.MagicBoost:   ItemData(1, 586, 0x35E0),  # 277, 0x3667, dark rememberance map
+    ItemName.DefenseBoost: ItemData(1, 590, 0x35F8),  # 278, 0x3668, depths of remembrance map
+    ItemName.APBoost:      ItemData(1, 532, 0x35FE),  # 279, 0x3669, mansion map
 }
 
 # These items cannot be in other games so these are done locally in kh2
 DonaldAbility_Table = {
-    ItemName.DonaldFire:          ItemData(0x1300ED, 1, 165, 0xA5, 0, True),
-    ItemName.DonaldBlizzard:      ItemData(0x1300EE, 1, 166, 0xA6, 0, True),
-    ItemName.DonaldThunder:       ItemData(0x1300EF, 1, 167, 0xA7, 0, True),
-    ItemName.DonaldCure:          ItemData(0x1300F0, 1, 168, 0xA8, 0, True),
-    ItemName.Fantasia:            ItemData(0x1300F1, 1, 199, 0xC7, 0, True),
-    ItemName.FlareForce:          ItemData(0x1300F2, 1, 200, 0xC8, 0, True),
-    ItemName.DonaldMPRage:        ItemData(0x1300F3, 3, 412, 0x19C, 0, True),
-    ItemName.DonaldJackpot:       ItemData(0x1300F4, 1, 406, 0x196, 0, True),
-    ItemName.DonaldLuckyLucky:    ItemData(0x1300F5, 3, 407, 0x197, 0, True),
-    ItemName.DonaldFireBoost:     ItemData(0x1300F6, 2, 408, 0x198, 0, True),
-    ItemName.DonaldBlizzardBoost: ItemData(0x1300F7, 2, 409, 0x199, 0, True),
-    ItemName.DonaldThunderBoost:  ItemData(0x1300F8, 2, 410, 0x19A, 0, True),
-    ItemName.DonaldMPHaste:       ItemData(0x1300F9, 1, 413, 0x19D, 0, True),
-    ItemName.DonaldMPHastera:     ItemData(0x1300FA, 2, 421, 0x1A5, 0, True),
-    ItemName.DonaldMPHastega:     ItemData(0x1300FB, 2, 422, 0x1A6, 0, True),
-    ItemName.DonaldAutoLimit:     ItemData(0x1300FC, 1, 417, 0x1A1, 0, True),
-    ItemName.DonaldHyperHealing:  ItemData(0x1300FD, 2, 419, 0x1A3, 0, True),
-    ItemName.DonaldAutoHealing:   ItemData(0x1300FE, 1, 420, 0x1A4, 0, True),
-    ItemName.DonaldItemBoost:     ItemData(0x1300FF, 1, 411, 0x19B, 0, True),
-    ItemName.DonaldDamageControl: ItemData(0x130100, 2, 542, 0x21E, 0, True),
-    ItemName.DonaldDraw:          ItemData(0x130101, 1, 405, 0x195, 0, True),
+    ItemName.DonaldFire:          ItemData(1, 165, 0xA5, ability=True),
+    ItemName.DonaldBlizzard:      ItemData(1, 166, 0xA6, ability=True),
+    ItemName.DonaldThunder:       ItemData(1, 167, 0xA7, ability=True),
+    ItemName.DonaldCure:          ItemData(1, 168, 0xA8, ability=True),
+    ItemName.Fantasia:            ItemData(1, 199, 0xC7, ability=True),
+    ItemName.FlareForce:          ItemData(1, 200, 0xC8, ability=True),
+    ItemName.DonaldMPRage:        ItemData(1, 412, 0x19C, ability=True),  # originally 3 but swapped to 1 because crit checks
+    ItemName.DonaldJackpot:       ItemData(1, 406, 0x196, ability=True),
+    ItemName.DonaldLuckyLucky:    ItemData(3, 407, 0x197, ability=True),
+    ItemName.DonaldFireBoost:     ItemData(2, 408, 0x198, ability=True),
+    ItemName.DonaldBlizzardBoost: ItemData(2, 409, 0x199, ability=True),
+    ItemName.DonaldThunderBoost:  ItemData(2, 410, 0x19A, ability=True),
+    ItemName.DonaldMPHaste:       ItemData(1, 413, 0x19D, ability=True),
+    ItemName.DonaldMPHastera:     ItemData(2, 421, 0x1A5, ability=True),
+    ItemName.DonaldMPHastega:     ItemData(2, 422, 0x1A6, ability=True),
+    ItemName.DonaldAutoLimit:     ItemData(1, 417, 0x1A1, ability=True),
+    ItemName.DonaldHyperHealing:  ItemData(2, 419, 0x1A3, ability=True),
+    ItemName.DonaldAutoHealing:   ItemData(1, 420, 0x1A4, ability=True),
+    ItemName.DonaldItemBoost:     ItemData(1, 411, 0x19B, ability=True),
+    ItemName.DonaldDamageControl: ItemData(2, 542, 0x21E, ability=True),
+    ItemName.DonaldDraw:          ItemData(1, 405, 0x195, ability=True),
 }
+
 GoofyAbility_Table = {
-    ItemName.GoofyTornado:       ItemData(0x130102, 1, 423, 0x1A7, 0, True),
-    ItemName.GoofyTurbo:         ItemData(0x130103, 1, 425, 0x1A9, 0, True),
-    ItemName.GoofyBash:          ItemData(0x130104, 1, 429, 0x1AD, 0, True),
-    ItemName.TornadoFusion:      ItemData(0x130105, 1, 201, 0xC9, 0, True),
-    ItemName.Teamwork:           ItemData(0x130106, 1, 202, 0xCA, 0, True),
-    ItemName.GoofyDraw:          ItemData(0x130107, 1, 405, 0x195, 0, True),
-    ItemName.GoofyJackpot:       ItemData(0x130108, 1, 406, 0x196, 0, True),
-    ItemName.GoofyLuckyLucky:    ItemData(0x130109, 1, 407, 0x197, 0, True),
-    ItemName.GoofyItemBoost:     ItemData(0x13010A, 2, 411, 0x19B, 0, True),
-    ItemName.GoofyMPRage:        ItemData(0x13010B, 2, 412, 0x19C, 0, True),
-    ItemName.GoofyDefender:      ItemData(0x13010C, 2, 414, 0x19E, 0, True),
-    ItemName.GoofyDamageControl: ItemData(0x13010D, 3, 542, 0x21E, 0, True),
-    ItemName.GoofyAutoLimit:     ItemData(0x13010E, 1, 417, 0x1A1, 0, True),
-    ItemName.GoofySecondChance:  ItemData(0x13010F, 1, 415, 0x19F, 0, True),
-    ItemName.GoofyOnceMore:      ItemData(0x130110, 1, 416, 0x1A0, 0, True),
-    ItemName.GoofyAutoChange:    ItemData(0x130111, 1, 418, 0x1A2, 0, True),
-    ItemName.GoofyHyperHealing:  ItemData(0x130112, 2, 419, 0x1A3, 0, True),
-    ItemName.GoofyAutoHealing:   ItemData(0x130113, 1, 420, 0x1A4, 0, True),
-    ItemName.GoofyMPHaste:       ItemData(0x130114, 1, 413, 0x19D, 0, True),
-    ItemName.GoofyMPHastera:     ItemData(0x130115, 1, 421, 0x1A5, 0, True),
-    ItemName.GoofyMPHastega:     ItemData(0x130116, 1, 422, 0x1A6, 0, True),
-    ItemName.GoofyProtect:       ItemData(0x130117, 2, 596, 0x254, 0, True),
-    ItemName.GoofyProtera:       ItemData(0x130118, 2, 597, 0x255, 0, True),
-    ItemName.GoofyProtega:       ItemData(0x130119, 2, 598, 0x256, 0, True),
+    ItemName.GoofyTornado:       ItemData(1, 423, 0x1A7, ability=True),
+    ItemName.GoofyTurbo:         ItemData(1, 425, 0x1A9, ability=True),
+    ItemName.GoofyBash:          ItemData(1, 429, 0x1AD, ability=True),
+    ItemName.TornadoFusion:      ItemData(1, 201, 0xC9, ability=True),
+    ItemName.Teamwork:           ItemData(1, 202, 0xCA, ability=True),
+    ItemName.GoofyDraw:          ItemData(1, 405, 0x195, ability=True),
+    ItemName.GoofyJackpot:       ItemData(1, 406, 0x196, ability=True),
+    ItemName.GoofyLuckyLucky:    ItemData(1, 407, 0x197, ability=True),
+    ItemName.GoofyItemBoost:     ItemData(2, 411, 0x19B, ability=True),
+    ItemName.GoofyMPRage:        ItemData(2, 412, 0x19C, ability=True),
+    ItemName.GoofyDefender:      ItemData(2, 414, 0x19E, ability=True),
+    ItemName.GoofyDamageControl: ItemData(1, 542, 0x21E, ability=True),  # originally 3 but swapped to 1 because crit checks
+    ItemName.GoofyAutoLimit:     ItemData(1, 417, 0x1A1, ability=True),
+    ItemName.GoofySecondChance:  ItemData(1, 415, 0x19F, ability=True),
+    ItemName.GoofyOnceMore:      ItemData(1, 416, 0x1A0, ability=True),
+    ItemName.GoofyAutoChange:    ItemData(1, 418, 0x1A2, ability=True),
+    ItemName.GoofyHyperHealing:  ItemData(2, 419, 0x1A3, ability=True),
+    ItemName.GoofyAutoHealing:   ItemData(1, 420, 0x1A4, ability=True),
+    ItemName.GoofyMPHaste:       ItemData(1, 413, 0x19D, ability=True),
+    ItemName.GoofyMPHastera:     ItemData(1, 421, 0x1A5, ability=True),
+    ItemName.GoofyMPHastega:     ItemData(1, 422, 0x1A6, ability=True),
+    ItemName.GoofyProtect:       ItemData(2, 596, 0x254, ability=True),
+    ItemName.GoofyProtera:       ItemData(2, 597, 0x255, ability=True),
+    ItemName.GoofyProtega:       ItemData(2, 598, 0x256, ability=True),
 
 }
 
-Misc_Table = {
-    ItemName.LuckyEmblem: ItemData(0x13011A, 0, 367, 0x3641),  # letter item
-    ItemName.Victory:     ItemData(0x13011B, 0, 263, 0x111),
-    ItemName.Bounty:      ItemData(0x13011C, 0, 461, 0, 0),  # Dummy 14
-    # ItemName.UniversalKey:ItemData(0x130129,0,365,0x363F,0)#Tournament Poster
+Wincon_Table = {
+    ItemName.LuckyEmblem: ItemData(kh2id=367, memaddr=0x3641),  # letter item
+    ItemName.Victory:     ItemData(kh2id=263, memaddr=0x111),
+    ItemName.Bounty:      ItemData(kh2id=461, memaddr=0x365E),  # Dummy 14
+    # ItemName.UniversalKey:ItemData(,365,0x363F,0)#Tournament Poster
+}
 
+Consumable_Table = {
+    ItemName.Potion:            ItemData(1, 127, 0x36B8),  # 1, 0x3580, piglets house map
+    ItemName.HiPotion:          ItemData(1, 126, 0x36B9),  # 2, 0x03581, rabbits house map
+    ItemName.Ether:             ItemData(1, 128, 0x36BA),  # 3, 0x3582, kangas house map
+    ItemName.Elixir:            ItemData(1, 129, 0x36BB),  # 4, 0x3583, spooky cave map
+    ItemName.Megalixir:         ItemData(1, 124, 0x36BC),  # 7, 0x3586, starry hill map
+    ItemName.Tent:              ItemData(1, 512, 0x36BD),  # 131,0x35E1, savannah map
+    ItemName.DriveRecovery:     ItemData(1, 252, 0x36BE),  # 274,0x3664, pride rock map
+    ItemName.HighDriveRecovery: ItemData(1, 511, 0x36BF),  # 275,0x3665, oasis map
+}
+
+Events_Table = {
+    ItemName.HostileProgramEvent,
+    ItemName.McpEvent,
+    ItemName.ASLarxeneEvent,
+    ItemName.DataLarxeneEvent,
+    ItemName.BarbosaEvent,
+    ItemName.GrimReaper1Event,
+    ItemName.GrimReaper2Event,
+    ItemName.DataLuxordEvent,
+    ItemName.DataAxelEvent,
+    ItemName.CerberusEvent,
+    ItemName.OlympusPeteEvent,
+    ItemName.HydraEvent,
+    ItemName.OcPainAndPanicCupEvent,
+    ItemName.OcCerberusCupEvent,
+    ItemName.HadesEvent,
+    ItemName.ASZexionEvent,
+    ItemName.DataZexionEvent,
+    ItemName.Oc2TitanCupEvent,
+    ItemName.Oc2GofCupEvent,
+    ItemName.Oc2CupsEvent,
+    ItemName.HadesCupEvents,
+    ItemName.PrisonKeeperEvent,
+    ItemName.OogieBoogieEvent,
+    ItemName.ExperimentEvent,
+    ItemName.ASVexenEvent,
+    ItemName.DataVexenEvent,
+    ItemName.ShanYuEvent,
+    ItemName.AnsemRikuEvent,
+    ItemName.StormRiderEvent,
+    ItemName.DataXigbarEvent,
+    ItemName.RoxasEvent,
+    ItemName.XigbarEvent,
+    ItemName.LuxordEvent,
+    ItemName.SaixEvent,
+    ItemName.XemnasEvent,
+    ItemName.ArmoredXemnasEvent,
+    ItemName.ArmoredXemnas2Event,
+    ItemName.FinalXemnasEvent,
+    ItemName.DataXemnasEvent,
+    ItemName.ThresholderEvent,
+    ItemName.BeastEvent,
+    ItemName.DarkThornEvent,
+    ItemName.XaldinEvent,
+    ItemName.DataXaldinEvent,
+    ItemName.TwinLordsEvent,
+    ItemName.GenieJafarEvent,
+    ItemName.ASLexaeusEvent,
+    ItemName.DataLexaeusEvent,
+    ItemName.ScarEvent,
+    ItemName.GroundShakerEvent,
+    ItemName.DataSaixEvent,
+    ItemName.HBDemyxEvent,
+    ItemName.ThousandHeartlessEvent,
+    ItemName.Mushroom13Event,
+    ItemName.SephiEvent,
+    ItemName.DataDemyxEvent,
+    ItemName.CorFirstFightEvent,
+    ItemName.CorSecondFightEvent,
+    ItemName.TransportEvent,
+    ItemName.OldPeteEvent,
+    ItemName.FuturePeteEvent,
+    ItemName.ASMarluxiaEvent,
+    ItemName.DataMarluxiaEvent,
+    ItemName.TerraEvent,
+    ItemName.TwilightThornEvent,
+    ItemName.Axel1Event,
+    ItemName.Axel2Event,
+    ItemName.DataRoxasEvent,
 }
 # Items that are prone to duping.
 # anchors for checking form keyblade
@@ -358,185 +442,37 @@ Misc_Table = {
 # Equipped abilities have an offset of 0x8000 so check for if whatever || whatever+0x8000
 CheckDupingItems = {
     "Items":          {
-        ItemName.ProofofConnection,
-        ItemName.ProofofNonexistence,
-        ItemName.ProofofPeace,
-        ItemName.PromiseCharm,
-        ItemName.NamineSketches,
-        ItemName.CastleKey,
-        ItemName.BattlefieldsofWar,
-        ItemName.SwordoftheAncestor,
-        ItemName.BeastsClaw,
-        ItemName.BoneFist,
-        ItemName.ProudFang,
-        ItemName.SkillandCrossbones,
-        ItemName.Scimitar,
-        ItemName.MembershipCard,
-        ItemName.IceCream,
-        ItemName.WaytotheDawn,
-        ItemName.IdentityDisk,
-        ItemName.TornPages,
-        ItemName.LuckyEmblem,
-        ItemName.MickyMunnyPouch,
-        ItemName.OletteMunnyPouch,
-        ItemName.HadesCupTrophy,
-        ItemName.UnknownDisk,
-        ItemName.OlympusStone,
+        item_name for keys in [Progression_Table.keys(), Wincon_Table.keys(), Consumable_Table, [ItemName.MickeyMunnyPouch,
+                                                                                                 ItemName.OletteMunnyPouch,
+                                                                                                 ItemName.HadesCupTrophy,
+                                                                                                 ItemName.UnknownDisk,
+                                                                                                 ItemName.OlympusStone, ], Boosts_Table.keys()]
+        for item_name in keys
+
     },
     "Magic":          {
-        ItemName.FireElement,
-        ItemName.BlizzardElement,
-        ItemName.ThunderElement,
-        ItemName.CureElement,
-        ItemName.MagnetElement,
-        ItemName.ReflectElement,
+        magic for magic in Magic_Table.keys()
     },
     "Bitmask":        {
-        ItemName.ValorForm,
-        ItemName.WisdomForm,
-        ItemName.LimitForm,
-        ItemName.MasterForm,
-        ItemName.FinalForm,
-        ItemName.Genie,
-        ItemName.PeterPan,
-        ItemName.Stitch,
-        ItemName.ChickenLittle,
-        ItemName.SecretAnsemsReport1,
-        ItemName.SecretAnsemsReport2,
-        ItemName.SecretAnsemsReport3,
-        ItemName.SecretAnsemsReport4,
-        ItemName.SecretAnsemsReport5,
-        ItemName.SecretAnsemsReport6,
-        ItemName.SecretAnsemsReport7,
-        ItemName.SecretAnsemsReport8,
-        ItemName.SecretAnsemsReport9,
-        ItemName.SecretAnsemsReport10,
-        ItemName.SecretAnsemsReport11,
-        ItemName.SecretAnsemsReport12,
-        ItemName.SecretAnsemsReport13,
-
+        item_name for keys in [Forms_Table.keys(), Summon_Table.keys(), Reports_Table.keys()] for item_name in keys
     },
     "Weapons":        {
         "Keyblades": {
-            ItemName.Oathkeeper,
-            ItemName.Oblivion,
-            ItemName.StarSeeker,
-            ItemName.HiddenDragon,
-            ItemName.HerosCrest,
-            ItemName.Monochrome,
-            ItemName.FollowtheWind,
-            ItemName.CircleofLife,
-            ItemName.PhotonDebugger,
-            ItemName.GullWing,
-            ItemName.RumblingRose,
-            ItemName.GuardianSoul,
-            ItemName.WishingLamp,
-            ItemName.DecisivePumpkin,
-            ItemName.SleepingLion,
-            ItemName.SweetMemories,
-            ItemName.MysteriousAbyss,
-            ItemName.TwoBecomeOne,
-            ItemName.FatalCrest,
-            ItemName.BondofFlame,
-            ItemName.Fenrir,
-            ItemName.UltimaWeapon,
-            ItemName.WinnersProof,
-            ItemName.Pureblood,
+            keyblade for keyblade in Keyblade_Table.keys()
         },
         "Staffs":    {
-            ItemName.Centurion2,
-            ItemName.MeteorStaff,
-            ItemName.NobodyLance,
-            ItemName.PreciousMushroom,
-            ItemName.PreciousMushroom2,
-            ItemName.PremiumMushroom,
-            ItemName.RisingDragon,
-            ItemName.SaveTheQueen2,
-            ItemName.ShamansRelic,
+            staff for staff in Staffs_Table.keys()
         },
         "Shields":   {
-            ItemName.AkashicRecord,
-            ItemName.FrozenPride2,
-            ItemName.GenjiShield,
-            ItemName.MajesticMushroom,
-            ItemName.MajesticMushroom2,
-            ItemName.NobodyGuard,
-            ItemName.OgreShield,
-            ItemName.SaveTheKing2,
-            ItemName.UltimateMushroom,
+            shield for shield in Shields_Table.keys()
         }
     },
     "Equipment":      {
         "Accessories": {
-            ItemName.AbilityRing,
-            ItemName.EngineersRing,
-            ItemName.TechniciansRing,
-            ItemName.SkillRing,
-            ItemName.SkillfulRing,
-            ItemName.ExpertsRing,
-            ItemName.MastersRing,
-            ItemName.CosmicRing,
-            ItemName.ExecutivesRing,
-            ItemName.SardonyxRing,
-            ItemName.TourmalineRing,
-            ItemName.AquamarineRing,
-            ItemName.GarnetRing,
-            ItemName.DiamondRing,
-            ItemName.SilverRing,
-            ItemName.GoldRing,
-            ItemName.PlatinumRing,
-            ItemName.MythrilRing,
-            ItemName.OrichalcumRing,
-            ItemName.SoldierEarring,
-            ItemName.FencerEarring,
-            ItemName.MageEarring,
-            ItemName.SlayerEarring,
-            ItemName.Medal,
-            ItemName.MoonAmulet,
-            ItemName.StarCharm,
-            ItemName.CosmicArts,
-            ItemName.ShadowArchive,
-            ItemName.ShadowArchive2,
-            ItemName.FullBloom,
-            ItemName.FullBloom2,
-            ItemName.DrawRing,
-            ItemName.LuckyRing,
+            accessory for accessory in Accessory_Table.keys()
         },
         "Armor":       {
-            ItemName.ElvenBandana,
-            ItemName.DivineBandana,
-            ItemName.ProtectBelt,
-            ItemName.GaiaBelt,
-            ItemName.PowerBand,
-            ItemName.BusterBand,
-            ItemName.CosmicBelt,
-            ItemName.FireBangle,
-            ItemName.FiraBangle,
-            ItemName.FiragaBangle,
-            ItemName.FiragunBangle,
-            ItemName.BlizzardArmlet,
-            ItemName.BlizzaraArmlet,
-            ItemName.BlizzagaArmlet,
-            ItemName.BlizzagunArmlet,
-            ItemName.ThunderTrinket,
-            ItemName.ThundaraTrinket,
-            ItemName.ThundagaTrinket,
-            ItemName.ThundagunTrinket,
-            ItemName.ShockCharm,
-            ItemName.ShockCharm2,
-            ItemName.ShadowAnklet,
-            ItemName.DarkAnklet,
-            ItemName.MidnightAnklet,
-            ItemName.ChaosAnklet,
-            ItemName.ChampionBelt,
-            ItemName.AbasChain,
-            ItemName.AegisChain,
-            ItemName.Acrisius,
-            ItemName.Acrisius2,
-            ItemName.CosmicChain,
-            ItemName.PetiteRibbon,
-            ItemName.Ribbon,
-            ItemName.GrandRibbon,
+            armor for armor in Armor_Table.keys()
         }
     },
     "Stat Increases": {
@@ -549,297 +485,103 @@ CheckDupingItems = {
     },
     "Abilities":      {
         "Sora":   {
-            ItemName.Scan,
+            item_name for keys in [SupportAbility_Table.keys(), ActionAbility_Table.keys(), Movement_Table.keys()] for item_name in keys
+        },
+        "Donald": {
+            donald_ability for donald_ability in DonaldAbility_Table.keys()
+        },
+        "Goofy":  {
+            goofy_ability for goofy_ability in GoofyAbility_Table.keys()
+        }
+    },
+}
+progression_set = {
+    # abilities
+    item_name for keys in [
+        Wincon_Table.keys(),
+        Progression_Table.keys(),
+        Forms_Table.keys(),
+        Magic_Table.keys(),
+        Summon_Table.keys(),
+        Movement_Table.keys(),
+        Keyblade_Table.keys(),
+        Staffs_Table.keys(),
+        Shields_Table.keys(),
+        [
             ItemName.AerialRecovery,
             ItemName.ComboMaster,
             ItemName.ComboPlus,
             ItemName.AirComboPlus,
-            ItemName.ComboBoost,
-            ItemName.AirComboBoost,
-            ItemName.ReactionBoost,
             ItemName.FinishingPlus,
             ItemName.NegativeCombo,
             ItemName.BerserkCharge,
-            ItemName.DamageDrive,
-            ItemName.DriveBoost,
             ItemName.FormBoost,
-            ItemName.SummonBoost,
-            ItemName.ExperienceBoost,
-            ItemName.Draw,
-            ItemName.Jackpot,
-            ItemName.LuckyLucky,
-            ItemName.DriveConverter,
-            ItemName.FireBoost,
-            ItemName.BlizzardBoost,
-            ItemName.ThunderBoost,
-            ItemName.ItemBoost,
-            ItemName.MPRage,
-            ItemName.MPHaste,
-            ItemName.MPHastera,
-            ItemName.MPHastega,
-            ItemName.Defender,
-            ItemName.DamageControl,
-            ItemName.NoExperience,
             ItemName.LightDarkness,
-            ItemName.MagicLock,
-            ItemName.LeafBracer,
-            ItemName.CombinationBoost,
             ItemName.OnceMore,
             ItemName.SecondChance,
             ItemName.Guard,
-            ItemName.UpperSlash,
             ItemName.HorizontalSlash,
             ItemName.FinishingLeap,
-            ItemName.RetaliatingSlash,
             ItemName.Slapshot,
-            ItemName.DodgeSlash,
             ItemName.FlashStep,
             ItemName.SlideDash,
-            ItemName.VicinityBreak,
             ItemName.GuardBreak,
             ItemName.Explosion,
             ItemName.AerialSweep,
             ItemName.AerialDive,
             ItemName.AerialSpiral,
             ItemName.AerialFinish,
-            ItemName.MagnetBurst,
-            ItemName.Counterguard,
             ItemName.AutoValor,
             ItemName.AutoWisdom,
             ItemName.AutoLimit,
             ItemName.AutoMaster,
             ItemName.AutoFinal,
-            ItemName.AutoSummon,
             ItemName.TrinityLimit,
-            ItemName.HighJump,
-            ItemName.QuickRun,
-            ItemName.DodgeRoll,
-            ItemName.AerialDodge,
-            ItemName.Glide,
-        },
-        "Donald": {
-            ItemName.DonaldFire,
-            ItemName.DonaldBlizzard,
-            ItemName.DonaldThunder,
-            ItemName.DonaldCure,
-            ItemName.Fantasia,
+            ItemName.DriveConverter,
+            # Party Limits
             ItemName.FlareForce,
-            ItemName.DonaldMPRage,
-            ItemName.DonaldJackpot,
-            ItemName.DonaldLuckyLucky,
-            ItemName.DonaldFireBoost,
-            ItemName.DonaldBlizzardBoost,
-            ItemName.DonaldThunderBoost,
-            ItemName.DonaldMPHaste,
-            ItemName.DonaldMPHastera,
-            ItemName.DonaldMPHastega,
-            ItemName.DonaldAutoLimit,
-            ItemName.DonaldHyperHealing,
-            ItemName.DonaldAutoHealing,
-            ItemName.DonaldItemBoost,
-            ItemName.DonaldDamageControl,
-            ItemName.DonaldDraw,
-        },
-        "Goofy":  {
-            ItemName.GoofyTornado,
-            ItemName.GoofyTurbo,
-            ItemName.GoofyBash,
-            ItemName.TornadoFusion,
+            ItemName.Fantasia,
             ItemName.Teamwork,
-            ItemName.GoofyDraw,
-            ItemName.GoofyJackpot,
-            ItemName.GoofyLuckyLucky,
-            ItemName.GoofyItemBoost,
-            ItemName.GoofyMPRage,
-            ItemName.GoofyDefender,
-            ItemName.GoofyDamageControl,
-            ItemName.GoofyAutoLimit,
-            ItemName.GoofySecondChance,
-            ItemName.GoofyOnceMore,
-            ItemName.GoofyAutoChange,
-            ItemName.GoofyHyperHealing,
-            ItemName.GoofyAutoHealing,
-            ItemName.GoofyMPHaste,
-            ItemName.GoofyMPHastera,
-            ItemName.GoofyMPHastega,
-            ItemName.GoofyProtect,
-            ItemName.GoofyProtera,
-            ItemName.GoofyProtega,
-        }
-    },
-    "Boosts":         {
-        ItemName.PowerBoost,
-        ItemName.MagicBoost,
-        ItemName.DefenseBoost,
-        ItemName.APBoost,
-    }
+            ItemName.TornadoFusion,
+            ItemName.HadesCupTrophy],
+        Events_Table]
+    for item_name in keys
 }
+party_filler_set = {
+    ItemName.GoofyAutoHealing,
+    ItemName.GoofyMPHaste,
+    ItemName.GoofyMPHastera,
+    ItemName.GoofyMPHastega,
+    ItemName.GoofyProtect,
+    ItemName.GoofyProtera,
+    ItemName.GoofyProtega,
+    ItemName.GoofyMPRage,
+    ItemName.GoofyDefender,
+    ItemName.GoofyDamageControl,
 
-Progression_Dicts = {
-    # Items that are classified as progression
-    "Progression":     {
-        # Wincons
-        ItemName.Victory,
-        ItemName.LuckyEmblem,
-        ItemName.Bounty,
-        ItemName.ProofofConnection,
-        ItemName.ProofofNonexistence,
-        ItemName.ProofofPeace,
-        ItemName.PromiseCharm,
-        # visit locking
-        ItemName.NamineSketches,
-        # dummy 13
-        ItemName.CastleKey,
-        ItemName.BattlefieldsofWar,
-        ItemName.SwordoftheAncestor,
-        ItemName.BeastsClaw,
-        ItemName.BoneFist,
-        ItemName.ProudFang,
-        ItemName.SkillandCrossbones,
-        ItemName.Scimitar,
-        ItemName.MembershipCard,
-        ItemName.IceCream,
-        ItemName.WaytotheDawn,
-        ItemName.IdentityDisk,
-        ItemName.TornPages,
-        # forms
-        ItemName.ValorForm,
-        ItemName.WisdomForm,
-        ItemName.LimitForm,
-        ItemName.MasterForm,
-        ItemName.FinalForm,
-        # magic
-        ItemName.FireElement,
-        ItemName.BlizzardElement,
-        ItemName.ThunderElement,
-        ItemName.CureElement,
-        ItemName.MagnetElement,
-        ItemName.ReflectElement,
-        ItemName.Genie,
-        ItemName.PeterPan,
-        ItemName.Stitch,
-        ItemName.ChickenLittle,
-        # movement
-        ItemName.HighJump,
-        ItemName.QuickRun,
-        ItemName.DodgeRoll,
-        ItemName.AerialDodge,
-        ItemName.Glide,
-        # abilities
-        ItemName.Scan,
-        ItemName.AerialRecovery,
-        ItemName.ComboMaster,
-        ItemName.ComboPlus,
-        ItemName.AirComboPlus,
-        ItemName.ComboBoost,
-        ItemName.AirComboBoost,
-        ItemName.ReactionBoost,
-        ItemName.FinishingPlus,
-        ItemName.NegativeCombo,
-        ItemName.BerserkCharge,
-        ItemName.DamageDrive,
-        ItemName.DriveBoost,
-        ItemName.FormBoost,
-        ItemName.SummonBoost,
-        ItemName.ExperienceBoost,
-        ItemName.Draw,
-        ItemName.Jackpot,
-        ItemName.LuckyLucky,
-        ItemName.DriveConverter,
-        ItemName.FireBoost,
-        ItemName.BlizzardBoost,
-        ItemName.ThunderBoost,
-        ItemName.ItemBoost,
-        ItemName.MPRage,
-        ItemName.MPHaste,
-        ItemName.MPHastera,
-        ItemName.MPHastega,
-        ItemName.Defender,
-        ItemName.DamageControl,
-        ItemName.NoExperience,
-        ItemName.LightDarkness,
-        ItemName.MagicLock,
-        ItemName.LeafBracer,
-        ItemName.CombinationBoost,
-        ItemName.OnceMore,
-        ItemName.SecondChance,
-        ItemName.Guard,
-        ItemName.UpperSlash,
-        ItemName.HorizontalSlash,
-        ItemName.FinishingLeap,
-        ItemName.RetaliatingSlash,
-        ItemName.Slapshot,
-        ItemName.DodgeSlash,
-        ItemName.FlashStep,
-        ItemName.SlideDash,
-        ItemName.VicinityBreak,
-        ItemName.GuardBreak,
-        ItemName.Explosion,
-        ItemName.AerialSweep,
-        ItemName.AerialDive,
-        ItemName.AerialSpiral,
-        ItemName.AerialFinish,
-        ItemName.MagnetBurst,
-        ItemName.Counterguard,
-        ItemName.AutoValor,
-        ItemName.AutoWisdom,
-        ItemName.AutoLimit,
-        ItemName.AutoMaster,
-        ItemName.AutoFinal,
-        ItemName.AutoSummon,
-        ItemName.TrinityLimit,
-        # keyblades
-        ItemName.Oathkeeper,
-        ItemName.Oblivion,
-        ItemName.StarSeeker,
-        ItemName.HiddenDragon,
-        ItemName.HerosCrest,
-        ItemName.Monochrome,
-        ItemName.FollowtheWind,
-        ItemName.CircleofLife,
-        ItemName.PhotonDebugger,
-        ItemName.GullWing,
-        ItemName.RumblingRose,
-        ItemName.GuardianSoul,
-        ItemName.WishingLamp,
-        ItemName.DecisivePumpkin,
-        ItemName.SleepingLion,
-        ItemName.SweetMemories,
-        ItemName.MysteriousAbyss,
-        ItemName.TwoBecomeOne,
-        ItemName.FatalCrest,
-        ItemName.BondofFlame,
-        ItemName.Fenrir,
-        ItemName.UltimaWeapon,
-        ItemName.WinnersProof,
-        ItemName.Pureblood,
-        # Staffs
-        ItemName.Centurion2,
-        ItemName.MeteorStaff,
-        ItemName.NobodyLance,
-        ItemName.PreciousMushroom,
-        ItemName.PreciousMushroom2,
-        ItemName.PremiumMushroom,
-        ItemName.RisingDragon,
-        ItemName.SaveTheQueen2,
-        ItemName.ShamansRelic,
-        # Shields
-        ItemName.AkashicRecord,
-        ItemName.FrozenPride2,
-        ItemName.GenjiShield,
-        ItemName.MajesticMushroom,
-        ItemName.MajesticMushroom2,
-        ItemName.NobodyGuard,
-        ItemName.OgreShield,
-        ItemName.SaveTheKing2,
-        ItemName.UltimateMushroom,
-        # Party Limits
-        ItemName.FlareForce,
-        ItemName.Fantasia,
-        ItemName.Teamwork,
-        ItemName.TornadoFusion
-    },
-    "2VisitLocking":   {
+    ItemName.DonaldFireBoost,
+    ItemName.DonaldBlizzardBoost,
+    ItemName.DonaldThunderBoost,
+    ItemName.DonaldMPHaste,
+    ItemName.DonaldMPHastera,
+    ItemName.DonaldMPHastega,
+    ItemName.DonaldAutoHealing,
+    ItemName.DonaldDamageControl,
+    ItemName.DonaldDraw,
+    ItemName.DonaldMPRage,
+}
+useful_set = {item_name for keys in [
+    SupportAbility_Table.keys(),
+    ActionAbility_Table.keys(),
+    DonaldAbility_Table.keys(),
+    GoofyAbility_Table.keys(),
+    Armor_Table.keys(),
+    Usefull_Table.keys(),
+    Accessory_Table.keys()]
+              for item_name in keys if item_name not in progression_set and item_name not in party_filler_set}
+
+visit_locking_dict = {
+    "2VisitLocking":   [
         ItemName.CastleKey,
         ItemName.BattlefieldsofWar,
         ItemName.SwordoftheAncestor,
@@ -854,7 +596,7 @@ Progression_Dicts = {
         ItemName.IdentityDisk,
         ItemName.IceCream,
         ItemName.NamineSketches
-    },
+    ],
     "AllVisitLocking": {
         ItemName.CastleKey:          2,
         ItemName.BattlefieldsofWar:  2,
@@ -865,84 +607,13 @@ Progression_Dicts = {
         ItemName.SkillandCrossbones: 2,
         ItemName.Scimitar:           2,
         ItemName.MembershipCard:     2,
-        ItemName.WaytotheDawn:       1,
+        ItemName.WaytotheDawn:       2,
         ItemName.IdentityDisk:       2,
         ItemName.IceCream:           3,
         ItemName.NamineSketches:     1,
     }
 }
-
-exclusionItem_table = {
-    "Ability": {
-        ItemName.Scan,
-        ItemName.AerialRecovery,
-        ItemName.ComboMaster,
-        ItemName.ComboPlus,
-        ItemName.AirComboPlus,
-        ItemName.ComboBoost,
-        ItemName.AirComboBoost,
-        ItemName.ReactionBoost,
-        ItemName.FinishingPlus,
-        ItemName.NegativeCombo,
-        ItemName.BerserkCharge,
-        ItemName.DamageDrive,
-        ItemName.DriveBoost,
-        ItemName.FormBoost,
-        ItemName.SummonBoost,
-        ItemName.ExperienceBoost,
-        ItemName.Draw,
-        ItemName.Jackpot,
-        ItemName.LuckyLucky,
-        ItemName.DriveConverter,
-        ItemName.FireBoost,
-        ItemName.BlizzardBoost,
-        ItemName.ThunderBoost,
-        ItemName.ItemBoost,
-        ItemName.MPRage,
-        ItemName.MPHaste,
-        ItemName.MPHastera,
-        ItemName.MPHastega,
-        ItemName.Defender,
-        ItemName.DamageControl,
-        ItemName.NoExperience,
-        ItemName.LightDarkness,
-        ItemName.MagicLock,
-        ItemName.LeafBracer,
-        ItemName.CombinationBoost,
-        ItemName.DamageDrive,
-        ItemName.OnceMore,
-        ItemName.SecondChance,
-        ItemName.Guard,
-        ItemName.UpperSlash,
-        ItemName.HorizontalSlash,
-        ItemName.FinishingLeap,
-        ItemName.RetaliatingSlash,
-        ItemName.Slapshot,
-        ItemName.DodgeSlash,
-        ItemName.FlashStep,
-        ItemName.SlideDash,
-        ItemName.VicinityBreak,
-        ItemName.GuardBreak,
-        ItemName.Explosion,
-        ItemName.AerialSweep,
-        ItemName.AerialDive,
-        ItemName.AerialSpiral,
-        ItemName.AerialFinish,
-        ItemName.MagnetBurst,
-        ItemName.Counterguard,
-        ItemName.AutoValor,
-        ItemName.AutoWisdom,
-        ItemName.AutoLimit,
-        ItemName.AutoMaster,
-        ItemName.AutoFinal,
-        ItemName.AutoSummon,
-        ItemName.TrinityLimit,
-        ItemName.HighJump,
-        ItemName.QuickRun,
-        ItemName.DodgeRoll,
-        ItemName.AerialDodge,
-        ItemName.Glide,
-    },
+exclusion_item_table = {
     "StatUps": {
         ItemName.MaxHPUp,
         ItemName.MaxMPUp,
@@ -951,59 +622,64 @@ exclusionItem_table = {
         ItemName.AccessorySlotUp,
         ItemName.ItemSlotUp,
     },
+    "Ability": {
+        item_name for keys in [SupportAbility_Table.keys(), ActionAbility_Table.keys(), Movement_Table.keys()] for item_name in keys
+    }
 }
 
-item_dictionary_table = {**Reports_Table,
-                         **Progression_Table,
-                         **Forms_Table,
-                         **Magic_Table,
-                         **Armor_Table,
-                         **Movement_Table,
-                         **Staffs_Table,
-                         **Shields_Table,
-                         **Keyblade_Table,
-                         **Accessory_Table,
-                         **Usefull_Table,
-                         **SupportAbility_Table,
-                         **ActionAbility_Table,
-                         **Items_Table,
-                         **Misc_Table,
-                         **Items_Table,
-                         **DonaldAbility_Table,
-                         **GoofyAbility_Table,
-                         }
-
-lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_dictionary_table.items() if
-                                            data.code}
-
-item_groups: typing.Dict[str, list] = {"Drive Form":      [item_name for item_name in Forms_Table.keys()],
-                                       "Growth":          [item_name for item_name in Movement_Table.keys()],
-                                       "Donald Limit":    [ItemName.FlareForce, ItemName.Fantasia],
-                                       "Goofy Limit":     [ItemName.Teamwork, ItemName.TornadoFusion],
-                                       "Magic":           [ItemName.FireElement, ItemName.BlizzardElement,
-                                                           ItemName.ThunderElement,
-                                                           ItemName.CureElement, ItemName.MagnetElement,
-                                                           ItemName.ReflectElement],
-                                       "Summon":          [ItemName.ChickenLittle, ItemName.Genie, ItemName.Stitch,
-                                                           ItemName.PeterPan],
-                                       "Gap Closer":      [ItemName.SlideDash, ItemName.FlashStep],
-                                       "Ground Finisher": [ItemName.GuardBreak, ItemName.Explosion,
-                                                           ItemName.FinishingLeap],
-                                       "Visit Lock":      [item_name for item_name in
-                                                           Progression_Dicts["2VisitLocking"]],
-                                       "Keyblade":        [item_name for item_name in Keyblade_Table.keys()],
-                                       "Fire":            [ItemName.FireElement],
-                                       "Blizzard":        [ItemName.BlizzardElement],
-                                       "Thunder":         [ItemName.ThunderElement],
-                                       "Cure":            [ItemName.CureElement],
-                                       "Magnet":          [ItemName.MagnetElement],
-                                       "Reflect":         [ItemName.ReflectElement],
-                                       "Proof":           [ItemName.ProofofNonexistence, ItemName.ProofofPeace,
-                                                           ItemName.ProofofConnection],
-                                       "Filler":          [
-                                           ItemName.PowerBoost, ItemName.MagicBoost,
-                                           ItemName.DefenseBoost, ItemName.APBoost]
-                                       }
-
-# lookup_kh2id_to_name: typing.Dict[int, str] = {data.kh2id: item_name for item_name, data in
-#                                               item_dictionary_table.items() if data.kh2id}
+default_itempool_option = {
+    item_name: ItemData.quantity for dic in [Magic_Table, Progression_Table, Summon_Table, Movement_Table, Forms_Table] for item_name, ItemData in dic.items()
+}
+item_dictionary_table = {
+    **Reports_Table,
+    **Progression_Table,
+    **Forms_Table,
+    **Magic_Table,
+    **Summon_Table,
+    **Armor_Table,
+    **Movement_Table,
+    **Staffs_Table,
+    **Shields_Table,
+    **Keyblade_Table,
+    **Accessory_Table,
+    **Usefull_Table,
+    **SupportAbility_Table,
+    **ActionAbility_Table,
+    **Boosts_Table,
+    **Wincon_Table,
+    **Boosts_Table,
+    **DonaldAbility_Table,
+    **GoofyAbility_Table,
+    **Consumable_Table
+}
+filler_items = [ItemName.PowerBoost, ItemName.MagicBoost, ItemName.DefenseBoost, ItemName.APBoost,
+                ItemName.Potion, ItemName.HiPotion, ItemName.Ether, ItemName.Elixir, ItemName.Megalixir,
+                ItemName.Tent, ItemName.DriveRecovery, ItemName.HighDriveRecovery,
+                ]
+item_groups: typing.Dict[str, list] = {
+    "Drive Form":      [item_name for item_name in Forms_Table.keys()],
+    "Growth":          [item_name for item_name in Movement_Table.keys()],
+    "Donald Limit":    [ItemName.FlareForce, ItemName.Fantasia],
+    "Goofy Limit":     [ItemName.Teamwork, ItemName.TornadoFusion],
+    "Magic":           [ItemName.FireElement, ItemName.BlizzardElement,
+                        ItemName.ThunderElement,
+                        ItemName.CureElement, ItemName.MagnetElement,
+                        ItemName.ReflectElement],
+    "Summon":          [ItemName.ChickenLittle, ItemName.Genie, ItemName.Stitch,
+                        ItemName.PeterPan],
+    "Gap Closer":      [ItemName.SlideDash, ItemName.FlashStep],
+    "Ground Finisher": [ItemName.GuardBreak, ItemName.Explosion,
+                        ItemName.FinishingLeap],
+    "Visit Lock":      [item_name for item_name in
+                        visit_locking_dict["2VisitLocking"]],
+    "Keyblade":        [item_name for item_name in Keyblade_Table.keys()],
+    "Fire":            [ItemName.FireElement],
+    "Blizzard":        [ItemName.BlizzardElement],
+    "Thunder":         [ItemName.ThunderElement],
+    "Cure":            [ItemName.CureElement],
+    "Magnet":          [ItemName.MagnetElement],
+    "Reflect":         [ItemName.ReflectElement],
+    "Proof":           [ItemName.ProofofNonexistence, ItemName.ProofofPeace,
+                        ItemName.ProofofConnection],
+    "hitlist":         [ItemName.Bounty],
+}
diff --git a/worlds/kh2/Locations.py b/worlds/kh2/Locations.py
index 9046dfc67b..9d7d948443 100644
--- a/worlds/kh2/Locations.py
+++ b/worlds/kh2/Locations.py
@@ -1,7 +1,7 @@
 import typing
 
 from BaseClasses import Location
-from .Names import LocationName, RegionName, ItemName
+from .Names import LocationName, ItemName
 
 
 class KH2Location(Location):
@@ -9,7 +9,6 @@ class KH2Location(Location):
 
 
 class LocationData(typing.NamedTuple):
-    code: typing.Optional[int]
     locid: int
     yml: str
     charName: str = "Sora"
@@ -18,950 +17,1072 @@ class LocationData(typing.NamedTuple):
 
 # data's addrcheck sys3 addr obtained roomid bit index is eventid
 LoD_Checks = {
-    LocationName.BambooGroveDarkShard:        LocationData(0x130000, 245, "Chest"),
-    LocationName.BambooGroveEther:            LocationData(0x130001, 497, "Chest"),
-    LocationName.BambooGroveMythrilShard:     LocationData(0x130002, 498, "Chest"),
-    LocationName.EncampmentAreaMap:           LocationData(0x130003, 350, "Chest"),
-    LocationName.Mission3:                    LocationData(0x130004, 417, "Chest"),
-    LocationName.CheckpointHiPotion:          LocationData(0x130005, 21, "Chest"),
-    LocationName.CheckpointMythrilShard:      LocationData(0x130006, 121, "Chest"),
-    LocationName.MountainTrailLightningShard: LocationData(0x130007, 22, "Chest"),
-    LocationName.MountainTrailRecoveryRecipe: LocationData(0x130008, 23, "Chest"),
-    LocationName.MountainTrailEther:          LocationData(0x130009, 122, "Chest"),
-    LocationName.MountainTrailMythrilShard:   LocationData(0x13000A, 123, "Chest"),
-    LocationName.VillageCaveAreaMap:          LocationData(0x13000B, 495, "Chest"),
-    LocationName.VillageCaveDarkShard:        LocationData(0x13000C, 125, "Chest"),
-    LocationName.VillageCaveAPBoost:          LocationData(0x13000D, 124, "Chest"),
-    LocationName.VillageCaveBonus:            LocationData(0x13000E, 43, "Get Bonus"),
-    LocationName.RidgeFrostShard:             LocationData(0x13000F, 24, "Chest"),
-    LocationName.RidgeAPBoost:                LocationData(0x130010, 126, "Chest"),
-    LocationName.ShanYu:                      LocationData(0x130011, 9, "Double Get Bonus"),
-    LocationName.ShanYuGetBonus:              LocationData(0x130012, 9, "Second Get Bonus"),
-    LocationName.HiddenDragon:                LocationData(0x130013, 257, "Chest"),
-
-}
-LoD2_Checks = {
-    LocationName.ThroneRoomTornPages:      LocationData(0x130014, 25, "Chest"),
-    LocationName.ThroneRoomPalaceMap:      LocationData(0x130015, 127, "Chest"),
-    LocationName.ThroneRoomAPBoost:        LocationData(0x130016, 26, "Chest"),
-    LocationName.ThroneRoomQueenRecipe:    LocationData(0x130017, 27, "Chest"),
-    LocationName.ThroneRoomAPBoost2:       LocationData(0x130018, 128, "Chest"),
-    LocationName.ThroneRoomOgreShield:     LocationData(0x130019, 129, "Chest"),
-    LocationName.ThroneRoomMythrilCrystal: LocationData(0x13001A, 130, "Chest"),
-    LocationName.ThroneRoomOrichalcum:     LocationData(0x13001B, 131, "Chest"),
-    LocationName.StormRider:               LocationData(0x13001C, 10, "Get Bonus"),
-    LocationName.XigbarDataDefenseBoost:   LocationData(0x13001D, 555, "Chest"),
+    LocationName.BambooGroveDarkShard:        LocationData(245, "Chest"),
+    LocationName.BambooGroveEther:            LocationData(497, "Chest"),
+    LocationName.BambooGroveMythrilShard:     LocationData(498, "Chest"),
+    LocationName.EncampmentAreaMap:           LocationData(350, "Chest"),
+    LocationName.Mission3:                    LocationData(417, "Chest"),
+    LocationName.CheckpointHiPotion:          LocationData(21, "Chest"),
+    LocationName.CheckpointMythrilShard:      LocationData(121, "Chest"),
+    LocationName.MountainTrailLightningShard: LocationData(22, "Chest"),
+    LocationName.MountainTrailRecoveryRecipe: LocationData(23, "Chest"),
+    LocationName.MountainTrailEther:          LocationData(122, "Chest"),
+    LocationName.MountainTrailMythrilShard:   LocationData(123, "Chest"),
+    LocationName.VillageCaveAreaMap:          LocationData(495, "Chest"),
+    LocationName.VillageCaveDarkShard:        LocationData(125, "Chest"),
+    LocationName.VillageCaveAPBoost:          LocationData(124, "Chest"),
+    LocationName.VillageCaveBonus:            LocationData(43, "Get Bonus"),
+    LocationName.RidgeFrostShard:             LocationData(24, "Chest"),
+    LocationName.RidgeAPBoost:                LocationData(126, "Chest"),
+    LocationName.ShanYu:                      LocationData(9, "Double Get Bonus"),
+    LocationName.ShanYuGetBonus:              LocationData(9, "Second Get Bonus"),
+    LocationName.HiddenDragon:                LocationData(257, "Chest"),
+    LocationName.ThroneRoomTornPages:         LocationData(25, "Chest"),
+    LocationName.ThroneRoomPalaceMap:         LocationData(127, "Chest"),
+    LocationName.ThroneRoomAPBoost:           LocationData(26, "Chest"),
+    LocationName.ThroneRoomQueenRecipe:       LocationData(27, "Chest"),
+    LocationName.ThroneRoomAPBoost2:          LocationData(128, "Chest"),
+    LocationName.ThroneRoomOgreShield:        LocationData(129, "Chest"),
+    LocationName.ThroneRoomMythrilCrystal:    LocationData(130, "Chest"),
+    LocationName.ThroneRoomOrichalcum:        LocationData(131, "Chest"),
+    LocationName.StormRider:                  LocationData(10, "Get Bonus"),
+    LocationName.XigbarDataDefenseBoost:      LocationData(555, "Chest"),
 
 }
 AG_Checks = {
-    LocationName.AgrabahMap:                        LocationData(0x13001E, 353, "Chest"),
-    LocationName.AgrabahDarkShard:                  LocationData(0x13001F, 28, "Chest"),
-    LocationName.AgrabahMythrilShard:               LocationData(0x130020, 29, "Chest"),
-    LocationName.AgrabahHiPotion:                   LocationData(0x130021, 30, "Chest"),
-    LocationName.AgrabahAPBoost:                    LocationData(0x130022, 132, "Chest"),
-    LocationName.AgrabahMythrilStone:               LocationData(0x130023, 133, "Chest"),
-    LocationName.AgrabahMythrilShard2:              LocationData(0x130024, 249, "Chest"),
-    LocationName.AgrabahSerenityShard:              LocationData(0x130025, 501, "Chest"),
-    LocationName.BazaarMythrilGem:                  LocationData(0x130026, 31, "Chest"),
-    LocationName.BazaarPowerShard:                  LocationData(0x130027, 32, "Chest"),
-    LocationName.BazaarHiPotion:                    LocationData(0x130028, 33, "Chest"),
-    LocationName.BazaarAPBoost:                     LocationData(0x130029, 134, "Chest"),
-    LocationName.BazaarMythrilShard:                LocationData(0x13002A, 135, "Chest"),
-    LocationName.PalaceWallsSkillRing:              LocationData(0x13002B, 136, "Chest"),
-    LocationName.PalaceWallsMythrilStone:           LocationData(0x13002C, 520, "Chest"),
-    LocationName.CaveEntrancePowerStone:            LocationData(0x13002D, 250, "Chest"),
-    LocationName.CaveEntranceMythrilShard:          LocationData(0x13002E, 251, "Chest"),
-    LocationName.ValleyofStoneMythrilStone:         LocationData(0x13002F, 35, "Chest"),
-    LocationName.ValleyofStoneAPBoost:              LocationData(0x130030, 36, "Chest"),
-    LocationName.ValleyofStoneMythrilShard:         LocationData(0x130031, 137, "Chest"),
-    LocationName.ValleyofStoneHiPotion:             LocationData(0x130032, 138, "Chest"),
-    LocationName.AbuEscort:                         LocationData(0x130033, 42, "Get Bonus"),
-    LocationName.ChasmofChallengesCaveofWondersMap: LocationData(0x130034, 487, "Chest"),
-    LocationName.ChasmofChallengesAPBoost:          LocationData(0x130035, 37, "Chest"),
-    LocationName.TreasureRoom:                      LocationData(0x130036, 46, "Get Bonus"),
-    LocationName.TreasureRoomAPBoost:               LocationData(0x130037, 502, "Chest"),
-    LocationName.TreasureRoomSerenityGem:           LocationData(0x130038, 503, "Chest"),
-    LocationName.ElementalLords:                    LocationData(0x130039, 37, "Get Bonus"),
-    LocationName.LampCharm:                         LocationData(0x13003A, 300, "Chest"),
-
-}
-AG2_Checks = {
-    LocationName.RuinedChamberTornPages:          LocationData(0x13003B, 34, "Chest"),
-    LocationName.RuinedChamberRuinsMap:           LocationData(0x13003C, 486, "Chest"),
-    LocationName.GenieJafar:                      LocationData(0x13003D, 15, "Get Bonus"),
-    LocationName.WishingLamp:                     LocationData(0x13003E, 303, "Chest"),
-    LocationName.LexaeusBonus:                    LocationData(0x13003F, 65, "Get Bonus"),
-    LocationName.LexaeusASStrengthBeyondStrength: LocationData(0x130040, 545, "Chest"),
-    LocationName.LexaeusDataLostIllusion:         LocationData(0x130041, 550, "Chest"),
+    LocationName.AgrabahMap:                        LocationData(353, "Chest"),
+    LocationName.AgrabahDarkShard:                  LocationData(28, "Chest"),
+    LocationName.AgrabahMythrilShard:               LocationData(29, "Chest"),
+    LocationName.AgrabahHiPotion:                   LocationData(30, "Chest"),
+    LocationName.AgrabahAPBoost:                    LocationData(132, "Chest"),
+    LocationName.AgrabahMythrilStone:               LocationData(133, "Chest"),
+    LocationName.AgrabahMythrilShard2:              LocationData(249, "Chest"),
+    LocationName.AgrabahSerenityShard:              LocationData(501, "Chest"),
+    LocationName.BazaarMythrilGem:                  LocationData(31, "Chest"),
+    LocationName.BazaarPowerShard:                  LocationData(32, "Chest"),
+    LocationName.BazaarHiPotion:                    LocationData(33, "Chest"),
+    LocationName.BazaarAPBoost:                     LocationData(134, "Chest"),
+    LocationName.BazaarMythrilShard:                LocationData(135, "Chest"),
+    LocationName.PalaceWallsSkillRing:              LocationData(136, "Chest"),
+    LocationName.PalaceWallsMythrilStone:           LocationData(520, "Chest"),
+    LocationName.CaveEntrancePowerStone:            LocationData(250, "Chest"),
+    LocationName.CaveEntranceMythrilShard:          LocationData(251, "Chest"),
+    LocationName.ValleyofStoneMythrilStone:         LocationData(35, "Chest"),
+    LocationName.ValleyofStoneAPBoost:              LocationData(36, "Chest"),
+    LocationName.ValleyofStoneMythrilShard:         LocationData(137, "Chest"),
+    LocationName.ValleyofStoneHiPotion:             LocationData(138, "Chest"),
+    LocationName.AbuEscort:                         LocationData(42, "Get Bonus"),
+    LocationName.ChasmofChallengesCaveofWondersMap: LocationData(487, "Chest"),
+    LocationName.ChasmofChallengesAPBoost:          LocationData(37, "Chest"),
+    LocationName.TreasureRoom:                      LocationData(46, "Get Bonus"),
+    LocationName.TreasureRoomAPBoost:               LocationData(502, "Chest"),
+    LocationName.TreasureRoomSerenityGem:           LocationData(503, "Chest"),
+    LocationName.ElementalLords:                    LocationData(37, "Get Bonus"),
+    LocationName.LampCharm:                         LocationData(300, "Chest"),
+    LocationName.RuinedChamberTornPages:            LocationData(34, "Chest"),
+    LocationName.RuinedChamberRuinsMap:             LocationData(486, "Chest"),
+    LocationName.GenieJafar:                        LocationData(15, "Get Bonus"),
+    LocationName.WishingLamp:                       LocationData(303, "Chest"),
+    LocationName.LexaeusBonus:                      LocationData(65, "Get Bonus"),
+    LocationName.LexaeusASStrengthBeyondStrength:   LocationData(545, "Chest"),
+    LocationName.LexaeusDataLostIllusion:           LocationData(550, "Chest"),
 }
 DC_Checks = {
-    LocationName.DCCourtyardMythrilShard:  LocationData(0x130042, 16, "Chest"),
-    LocationName.DCCourtyardStarRecipe:    LocationData(0x130043, 17, "Chest"),
-    LocationName.DCCourtyardAPBoost:       LocationData(0x130044, 18, "Chest"),
-    LocationName.DCCourtyardMythrilStone:  LocationData(0x130045, 92, "Chest"),
-    LocationName.DCCourtyardBlazingStone:  LocationData(0x130046, 93, "Chest"),
-    LocationName.DCCourtyardBlazingShard:  LocationData(0x130047, 247, "Chest"),
-    LocationName.DCCourtyardMythrilShard2: LocationData(0x130048, 248, "Chest"),
-    LocationName.LibraryTornPages:         LocationData(0x130049, 91, "Chest"),
-    LocationName.DisneyCastleMap:          LocationData(0x13004A, 332, "Chest"),
-    LocationName.MinnieEscort:             LocationData(0x13004B, 38, "Double Get Bonus"),
-    LocationName.MinnieEscortGetBonus:     LocationData(0x13004C, 38, "Second Get Bonus"),
+    LocationName.DCCourtyardMythrilShard:        LocationData(16, "Chest"),
+    LocationName.DCCourtyardStarRecipe:          LocationData(17, "Chest"),
+    LocationName.DCCourtyardAPBoost:             LocationData(18, "Chest"),
+    LocationName.DCCourtyardMythrilStone:        LocationData(92, "Chest"),
+    LocationName.DCCourtyardBlazingStone:        LocationData(93, "Chest"),
+    LocationName.DCCourtyardBlazingShard:        LocationData(247, "Chest"),
+    LocationName.DCCourtyardMythrilShard2:       LocationData(248, "Chest"),
+    LocationName.LibraryTornPages:               LocationData(91, "Chest"),
+    LocationName.DisneyCastleMap:                LocationData(332, "Chest"),
+    LocationName.MinnieEscort:                   LocationData(38, "Double Get Bonus"),
+    LocationName.MinnieEscortGetBonus:           LocationData(38, "Second Get Bonus"),
+    LocationName.CornerstoneHillMap:             LocationData(79, "Chest"),
+    LocationName.CornerstoneHillFrostShard:      LocationData(12, "Chest"),
+    LocationName.PierMythrilShard:               LocationData(81, "Chest"),
+    LocationName.PierHiPotion:                   LocationData(82, "Chest"),
+    LocationName.WaterwayMythrilStone:           LocationData(83, "Chest"),
+    LocationName.WaterwayAPBoost:                LocationData(84, "Chest"),
+    LocationName.WaterwayFrostStone:             LocationData(85, "Chest"),
+    LocationName.WindowofTimeMap:                LocationData(368, "Chest"),
+    LocationName.BoatPete:                       LocationData(16, "Get Bonus"),
+    LocationName.FuturePete:                     LocationData(17, "Double Get Bonus"),
+    LocationName.FuturePeteGetBonus:             LocationData(17, "Second Get Bonus"),
+    LocationName.Monochrome:                     LocationData(261, "Chest"),
+    LocationName.WisdomForm:                     LocationData(262, "Chest"),
+    LocationName.MarluxiaGetBonus:               LocationData(67, "Get Bonus"),
+    LocationName.MarluxiaASEternalBlossom:       LocationData(548, "Chest"),
+    LocationName.MarluxiaDataLostIllusion:       LocationData(553, "Chest"),
+    LocationName.LingeringWillBonus:             LocationData(70, "Get Bonus"),
+    LocationName.LingeringWillProofofConnection: LocationData(587, "Chest"),
+    LocationName.LingeringWillManifestIllusion:  LocationData(591, "Chest"),
 
 }
-TR_Checks = {
-    LocationName.CornerstoneHillMap:             LocationData(0x13004D, 79, "Chest"),
-    LocationName.CornerstoneHillFrostShard:      LocationData(0x13004E, 12, "Chest"),
-    LocationName.PierMythrilShard:               LocationData(0x13004F, 81, "Chest"),
-    LocationName.PierHiPotion:                   LocationData(0x130050, 82, "Chest"),
-    LocationName.WaterwayMythrilStone:           LocationData(0x130051, 83, "Chest"),
-    LocationName.WaterwayAPBoost:                LocationData(0x130052, 84, "Chest"),
-    LocationName.WaterwayFrostStone:             LocationData(0x130053, 85, "Chest"),
-    LocationName.WindowofTimeMap:                LocationData(0x130054, 368, "Chest"),
-    LocationName.BoatPete:                       LocationData(0x130055, 16, "Get Bonus"),
-    LocationName.FuturePete:                     LocationData(0x130056, 17, "Double Get Bonus"),
-    LocationName.FuturePeteGetBonus:             LocationData(0x130057, 17, "Second Get Bonus"),
-    LocationName.Monochrome:                     LocationData(0x130058, 261, "Chest"),
-    LocationName.WisdomForm:                     LocationData(0x130059, 262, "Chest"),
-    LocationName.MarluxiaGetBonus:               LocationData(0x13005A, 67, "Get Bonus"),
-    LocationName.MarluxiaASEternalBlossom:       LocationData(0x13005B, 548, "Chest"),
-    LocationName.MarluxiaDataLostIllusion:       LocationData(0x13005C, 553, "Chest"),
-    LocationName.LingeringWillBonus:             LocationData(0x13005D, 70, "Get Bonus"),
-    LocationName.LingeringWillProofofConnection: LocationData(0x13005E, 587, "Chest"),
-    LocationName.LingeringWillManifestIllusion:  LocationData(0x13005F, 591, "Chest"),
 
-}
-# the mismatch might be here
-HundredAcre1_Checks = {
-    LocationName.PoohsHouse100AcreWoodMap: LocationData(0x130060, 313, "Chest"),
-    LocationName.PoohsHouseAPBoost:        LocationData(0x130061, 97, "Chest"),
-    LocationName.PoohsHouseMythrilStone:   LocationData(0x130062, 98, "Chest"),
-}
-HundredAcre2_Checks = {
-    LocationName.PigletsHouseDefenseBoost: LocationData(0x130063, 105, "Chest"),
-    LocationName.PigletsHouseAPBoost:      LocationData(0x130064, 103, "Chest"),
-    LocationName.PigletsHouseMythrilGem:   LocationData(0x130065, 104, "Chest"),
-}
-HundredAcre3_Checks = {
-    LocationName.RabbitsHouseDrawRing:       LocationData(0x130066, 314, "Chest"),
-    LocationName.RabbitsHouseMythrilCrystal: LocationData(0x130067, 100, "Chest"),
-    LocationName.RabbitsHouseAPBoost:        LocationData(0x130068, 101, "Chest"),
-}
-HundredAcre4_Checks = {
-    LocationName.KangasHouseMagicBoost: LocationData(0x130069, 108, "Chest"),
-    LocationName.KangasHouseAPBoost:    LocationData(0x13006A, 106, "Chest"),
-    LocationName.KangasHouseOrichalcum: LocationData(0x13006B, 107, "Chest"),
-}
-HundredAcre5_Checks = {
-    LocationName.SpookyCaveMythrilGem:     LocationData(0x13006C, 110, "Chest"),
-    LocationName.SpookyCaveAPBoost:        LocationData(0x13006D, 111, "Chest"),
-    LocationName.SpookyCaveOrichalcum:     LocationData(0x13006E, 112, "Chest"),
-    LocationName.SpookyCaveGuardRecipe:    LocationData(0x13006F, 113, "Chest"),
-    LocationName.SpookyCaveMythrilCrystal: LocationData(0x130070, 115, "Chest"),
-    LocationName.SpookyCaveAPBoost2:       LocationData(0x130071, 116, "Chest"),
-    LocationName.SweetMemories:            LocationData(0x130072, 284, "Chest"),
-    LocationName.SpookyCaveMap:            LocationData(0x130073, 485, "Chest"),
-}
-HundredAcre6_Checks = {
-    LocationName.StarryHillCosmicRing:     LocationData(0x130074, 312, "Chest"),
-    LocationName.StarryHillStyleRecipe:    LocationData(0x130075, 94, "Chest"),
-    LocationName.StarryHillCureElement:    LocationData(0x130076, 285, "Chest"),
-    LocationName.StarryHillOrichalcumPlus: LocationData(0x130077, 539, "Chest"),
+HundredAcre_Checks = {
+    LocationName.PoohsHouse100AcreWoodMap:   LocationData(313, "Chest"),
+    LocationName.PoohsHouseAPBoost:          LocationData(97, "Chest"),
+    LocationName.PoohsHouseMythrilStone:     LocationData(98, "Chest"),
+    LocationName.PigletsHouseDefenseBoost:   LocationData(105, "Chest"),
+    LocationName.PigletsHouseAPBoost:        LocationData(103, "Chest"),
+    LocationName.PigletsHouseMythrilGem:     LocationData(104, "Chest"),
+    LocationName.RabbitsHouseDrawRing:       LocationData(314, "Chest"),
+    LocationName.RabbitsHouseMythrilCrystal: LocationData(100, "Chest"),
+    LocationName.RabbitsHouseAPBoost:        LocationData(101, "Chest"),
+    LocationName.KangasHouseMagicBoost:      LocationData(108, "Chest"),
+    LocationName.KangasHouseAPBoost:         LocationData(106, "Chest"),
+    LocationName.KangasHouseOrichalcum:      LocationData(107, "Chest"),
+    LocationName.SpookyCaveMythrilGem:       LocationData(110, "Chest"),
+    LocationName.SpookyCaveAPBoost:          LocationData(111, "Chest"),
+    LocationName.SpookyCaveOrichalcum:       LocationData(112, "Chest"),
+    LocationName.SpookyCaveGuardRecipe:      LocationData(113, "Chest"),
+    LocationName.SpookyCaveMythrilCrystal:   LocationData(115, "Chest"),
+    LocationName.SpookyCaveAPBoost2:         LocationData(116, "Chest"),
+    LocationName.SweetMemories:              LocationData(284, "Chest"),
+    LocationName.SpookyCaveMap:              LocationData(485, "Chest"),
+    LocationName.StarryHillCosmicRing:       LocationData(312, "Chest"),
+    LocationName.StarryHillStyleRecipe:      LocationData(94, "Chest"),
+    LocationName.StarryHillCureElement:      LocationData(285, "Chest"),
+    LocationName.StarryHillOrichalcumPlus:   LocationData(539, "Chest"),
 }
 Oc_Checks = {
-    LocationName.PassageMythrilShard:          LocationData(0x130078, 7, "Chest"),
-    LocationName.PassageMythrilStone:          LocationData(0x130079, 8, "Chest"),
-    LocationName.PassageEther:                 LocationData(0x13007A, 144, "Chest"),
-    LocationName.PassageAPBoost:               LocationData(0x13007B, 145, "Chest"),
-    LocationName.PassageHiPotion:              LocationData(0x13007C, 146, "Chest"),
-    LocationName.InnerChamberUnderworldMap:    LocationData(0x13007D, 2, "Chest"),
-    LocationName.InnerChamberMythrilShard:     LocationData(0x13007E, 243, "Chest"),
-    LocationName.Cerberus:                     LocationData(0x13007F, 5, "Get Bonus"),
-    LocationName.ColiseumMap:                  LocationData(0x130080, 338, "Chest"),
-    LocationName.Urns:                         LocationData(0x130081, 57, "Get Bonus"),
-    LocationName.UnderworldEntrancePowerBoost: LocationData(0x130082, 242, "Chest"),
-    LocationName.CavernsEntranceLucidShard:    LocationData(0x130083, 3, "Chest"),
-    LocationName.CavernsEntranceAPBoost:       LocationData(0x130084, 11, "Chest"),
-    LocationName.CavernsEntranceMythrilShard:  LocationData(0x130085, 504, "Chest"),
-    LocationName.TheLostRoadBrightShard:       LocationData(0x130086, 9, "Chest"),
-    LocationName.TheLostRoadEther:             LocationData(0x130087, 10, "Chest"),
-    LocationName.TheLostRoadMythrilShard:      LocationData(0x130088, 148, "Chest"),
-    LocationName.TheLostRoadMythrilStone:      LocationData(0x130089, 149, "Chest"),
-    LocationName.AtriumLucidStone:             LocationData(0x13008A, 150, "Chest"),
-    LocationName.AtriumAPBoost:                LocationData(0x13008B, 151, "Chest"),
-    LocationName.DemyxOC:                      LocationData(0x13008C, 58, "Get Bonus"),
-    LocationName.SecretAnsemReport5:           LocationData(0x13008D, 529, "Chest"),
-    LocationName.OlympusStone:                 LocationData(0x13008E, 293, "Chest"),
-    LocationName.TheLockCavernsMap:            LocationData(0x13008F, 244, "Chest"),
-    LocationName.TheLockMythrilShard:          LocationData(0x130090, 5, "Chest"),
-    LocationName.TheLockAPBoost:               LocationData(0x130091, 142, "Chest"),
-    LocationName.PeteOC:                       LocationData(0x130092, 6, "Get Bonus"),
-    LocationName.Hydra:                        LocationData(0x130093, 7, "Double Get Bonus"),
-    LocationName.HydraGetBonus:                LocationData(0x130094, 7, "Second Get Bonus"),
-    LocationName.HerosCrest:                   LocationData(0x130095, 260, "Chest"),
-
-}
-Oc2_Checks = {
-    LocationName.AuronsStatue:           LocationData(0x130096, 295, "Chest"),
-    LocationName.Hades:                  LocationData(0x130097, 8, "Double Get Bonus"),
-    LocationName.HadesGetBonus:          LocationData(0x130098, 8, "Second Get Bonus"),
-    LocationName.GuardianSoul:           LocationData(0x130099, 272, "Chest"),
-    LocationName.ZexionBonus:            LocationData(0x13009A, 66, "Get Bonus"),
-    LocationName.ZexionASBookofShadows:  LocationData(0x13009B, 546, "Chest"),
-    LocationName.ZexionDataLostIllusion: LocationData(0x13009C, 551, "Chest"),
-}
-Oc2Cups = {
-    LocationName.ProtectBeltPainandPanicCup:     LocationData(0x13009D, 513, "Chest"),
-    LocationName.SerenityGemPainandPanicCup:     LocationData(0x13009E, 540, "Chest"),
-    LocationName.RisingDragonCerberusCup:        LocationData(0x13009F, 515, "Chest"),
-    LocationName.SerenityCrystalCerberusCup:     LocationData(0x1300A0, 542, "Chest"),
-    LocationName.GenjiShieldTitanCup:            LocationData(0x1300A1, 514, "Chest"),
-    LocationName.SkillfulRingTitanCup:           LocationData(0x1300A2, 541, "Chest"),
-    LocationName.FatalCrestGoddessofFateCup:     LocationData(0x1300A3, 516, "Chest"),
-    LocationName.OrichalcumPlusGoddessofFateCup: LocationData(0x1300A4, 517, "Chest"),
-    LocationName.HadesCupTrophyParadoxCups:      LocationData(0x1300A5, 518, "Chest"),
+    LocationName.PassageMythrilShard:            LocationData(7, "Chest"),
+    LocationName.PassageMythrilStone:            LocationData(8, "Chest"),
+    LocationName.PassageEther:                   LocationData(144, "Chest"),
+    LocationName.PassageAPBoost:                 LocationData(145, "Chest"),
+    LocationName.PassageHiPotion:                LocationData(146, "Chest"),
+    LocationName.InnerChamberUnderworldMap:      LocationData(2, "Chest"),
+    LocationName.InnerChamberMythrilShard:       LocationData(243, "Chest"),
+    LocationName.Cerberus:                       LocationData(5, "Get Bonus"),
+    LocationName.ColiseumMap:                    LocationData(338, "Chest"),
+    LocationName.Urns:                           LocationData(57, "Get Bonus"),
+    LocationName.UnderworldEntrancePowerBoost:   LocationData(242, "Chest"),
+    LocationName.CavernsEntranceLucidShard:      LocationData(3, "Chest"),
+    LocationName.CavernsEntranceAPBoost:         LocationData(11, "Chest"),
+    LocationName.CavernsEntranceMythrilShard:    LocationData(504, "Chest"),
+    LocationName.TheLostRoadBrightShard:         LocationData(9, "Chest"),
+    LocationName.TheLostRoadEther:               LocationData(10, "Chest"),
+    LocationName.TheLostRoadMythrilShard:        LocationData(148, "Chest"),
+    LocationName.TheLostRoadMythrilStone:        LocationData(149, "Chest"),
+    LocationName.AtriumLucidStone:               LocationData(150, "Chest"),
+    LocationName.AtriumAPBoost:                  LocationData(151, "Chest"),
+    LocationName.DemyxOC:                        LocationData(58, "Get Bonus"),
+    LocationName.SecretAnsemReport5:             LocationData(529, "Chest"),
+    LocationName.OlympusStone:                   LocationData(293, "Chest"),
+    LocationName.TheLockCavernsMap:              LocationData(244, "Chest"),
+    LocationName.TheLockMythrilShard:            LocationData(5, "Chest"),
+    LocationName.TheLockAPBoost:                 LocationData(142, "Chest"),
+    LocationName.PeteOC:                         LocationData(6, "Get Bonus"),
+    LocationName.Hydra:                          LocationData(7, "Double Get Bonus"),
+    LocationName.HydraGetBonus:                  LocationData(7, "Second Get Bonus"),
+    LocationName.HerosCrest:                     LocationData(260, "Chest"),
+    LocationName.AuronsStatue:                   LocationData(295, "Chest"),
+    LocationName.Hades:                          LocationData(8, "Double Get Bonus"),
+    LocationName.HadesGetBonus:                  LocationData(8, "Second Get Bonus"),
+    LocationName.GuardianSoul:                   LocationData(272, "Chest"),
+    LocationName.ZexionBonus:                    LocationData(66, "Get Bonus"),
+    LocationName.ZexionASBookofShadows:          LocationData(546, "Chest"),
+    LocationName.ZexionDataLostIllusion:         LocationData(551, "Chest"),
+    LocationName.ProtectBeltPainandPanicCup:     LocationData(513, "Chest"),
+    LocationName.SerenityGemPainandPanicCup:     LocationData(540, "Chest"),
+    LocationName.RisingDragonCerberusCup:        LocationData(515, "Chest"),
+    LocationName.SerenityCrystalCerberusCup:     LocationData(542, "Chest"),
+    LocationName.GenjiShieldTitanCup:            LocationData(514, "Chest"),
+    LocationName.SkillfulRingTitanCup:           LocationData(541, "Chest"),
+    LocationName.FatalCrestGoddessofFateCup:     LocationData(516, "Chest"),
+    LocationName.OrichalcumPlusGoddessofFateCup: LocationData(517, "Chest"),
+    LocationName.HadesCupTrophyParadoxCups:      LocationData(518, "Chest"),
 }
 
 BC_Checks = {
-    LocationName.BCCourtyardAPBoost:            LocationData(0x1300A6, 39, "Chest"),
-    LocationName.BCCourtyardHiPotion:           LocationData(0x1300A7, 40, "Chest"),
-    LocationName.BCCourtyardMythrilShard:       LocationData(0x1300A8, 505, "Chest"),
-    LocationName.BellesRoomCastleMap:           LocationData(0x1300A9, 46, "Chest"),
-    LocationName.BellesRoomMegaRecipe:          LocationData(0x1300AA, 240, "Chest"),
-    LocationName.TheEastWingMythrilShard:       LocationData(0x1300AB, 63, "Chest"),
-    LocationName.TheEastWingTent:               LocationData(0x1300AC, 155, "Chest"),
-    LocationName.TheWestHallHiPotion:           LocationData(0x1300AD, 41, "Chest"),
-    LocationName.TheWestHallPowerShard:         LocationData(0x1300AE, 207, "Chest"),
-    LocationName.TheWestHallAPBoostPostDungeon: LocationData(0x1300AF, 158, "Chest"),
-    LocationName.TheWestHallBrightStone:        LocationData(0x1300B0, 159, "Chest"),
-    LocationName.TheWestHallMythrilShard:       LocationData(0x1300B1, 206, "Chest"),
-    LocationName.Thresholder:                   LocationData(0x1300B2, 2, "Get Bonus"),
-    LocationName.DungeonBasementMap:            LocationData(0x1300B3, 239, "Chest"),
-    LocationName.DungeonAPBoost:                LocationData(0x1300B4, 43, "Chest"),
-    LocationName.SecretPassageMythrilShard:     LocationData(0x1300B5, 44, "Chest"),
-    LocationName.SecretPassageHiPotion:         LocationData(0x1300B6, 168, "Chest"),
-    LocationName.SecretPassageLucidShard:       LocationData(0x1300B7, 45, "Chest"),
-    LocationName.TheWestHallMythrilShard2:      LocationData(0x1300B8, 208, "Chest"),
-    LocationName.TheWestWingMythrilShard:       LocationData(0x1300B9, 42, "Chest"),
-    LocationName.TheWestWingTent:               LocationData(0x1300BA, 164, "Chest"),
-    LocationName.Beast:                         LocationData(0x1300BB, 12, "Get Bonus"),
-    LocationName.TheBeastsRoomBlazingShard:     LocationData(0x1300BC, 241, "Chest"),
-    LocationName.DarkThorn:                     LocationData(0x1300BD, 3, "Double Get Bonus"),
-    LocationName.DarkThornGetBonus:             LocationData(0x1300BE, 3, "Second Get Bonus"),
-    LocationName.DarkThornCureElement:          LocationData(0x1300BF, 299, "Chest"),
-
-}
-BC2_Checks = {
-    LocationName.RumblingRose:           LocationData(0x1300C0, 270, "Chest"),
-    LocationName.CastleWallsMap:         LocationData(0x1300C1, 325, "Chest"),
-    LocationName.Xaldin:                 LocationData(0x1300C2, 4, "Double Get Bonus"),
-    LocationName.XaldinGetBonus:         LocationData(0x1300C3, 4, "Second Get Bonus"),
-    LocationName.SecretAnsemReport4:     LocationData(0x1300C4, 528, "Chest"),
-    LocationName.XaldinDataDefenseBoost: LocationData(0x1300C5, 559, "Chest"),
+    LocationName.BCCourtyardAPBoost:            LocationData(39, "Chest"),
+    LocationName.BCCourtyardHiPotion:           LocationData(40, "Chest"),
+    LocationName.BCCourtyardMythrilShard:       LocationData(505, "Chest"),
+    LocationName.BellesRoomCastleMap:           LocationData(46, "Chest"),
+    LocationName.BellesRoomMegaRecipe:          LocationData(240, "Chest"),
+    LocationName.TheEastWingMythrilShard:       LocationData(63, "Chest"),
+    LocationName.TheEastWingTent:               LocationData(155, "Chest"),
+    LocationName.TheWestHallHiPotion:           LocationData(41, "Chest"),
+    LocationName.TheWestHallPowerShard:         LocationData(207, "Chest"),
+    LocationName.TheWestHallAPBoostPostDungeon: LocationData(158, "Chest"),
+    LocationName.TheWestHallBrightStone:        LocationData(159, "Chest"),
+    LocationName.TheWestHallMythrilShard:       LocationData(206, "Chest"),
+    LocationName.Thresholder:                   LocationData(2, "Get Bonus"),
+    LocationName.DungeonBasementMap:            LocationData(239, "Chest"),
+    LocationName.DungeonAPBoost:                LocationData(43, "Chest"),
+    LocationName.SecretPassageMythrilShard:     LocationData(44, "Chest"),
+    LocationName.SecretPassageHiPotion:         LocationData(168, "Chest"),
+    LocationName.SecretPassageLucidShard:       LocationData(45, "Chest"),
+    LocationName.TheWestHallMythrilShard2:      LocationData(208, "Chest"),
+    LocationName.TheWestWingMythrilShard:       LocationData(42, "Chest"),
+    LocationName.TheWestWingTent:               LocationData(164, "Chest"),
+    LocationName.Beast:                         LocationData(12, "Get Bonus"),
+    LocationName.TheBeastsRoomBlazingShard:     LocationData(241, "Chest"),
+    LocationName.DarkThorn:                     LocationData(3, "Double Get Bonus"),
+    LocationName.DarkThornGetBonus:             LocationData(3, "Second Get Bonus"),
+    LocationName.DarkThornCureElement:          LocationData(299, "Chest"),
+    LocationName.RumblingRose:                  LocationData(270, "Chest"),
+    LocationName.CastleWallsMap:                LocationData(325, "Chest"),
+    LocationName.Xaldin:                        LocationData(4, "Double Get Bonus"),
+    LocationName.XaldinGetBonus:                LocationData(4, "Second Get Bonus"),
+    LocationName.SecretAnsemReport4:            LocationData(528, "Chest"),
+    LocationName.XaldinDataDefenseBoost:        LocationData(559, "Chest"),
 }
 SP_Checks = {
-    LocationName.PitCellAreaMap:               LocationData(0x1300C6, 316, "Chest"),
-    LocationName.PitCellMythrilCrystal:        LocationData(0x1300C7, 64, "Chest"),
-    LocationName.CanyonDarkCrystal:            LocationData(0x1300C8, 65, "Chest"),
-    LocationName.CanyonMythrilStone:           LocationData(0x1300C9, 171, "Chest"),
-    LocationName.CanyonMythrilGem:             LocationData(0x1300CA, 253, "Chest"),
-    LocationName.CanyonFrostCrystal:           LocationData(0x1300CB, 521, "Chest"),
-    LocationName.Screens:                      LocationData(0x1300CC, 45, "Get Bonus"),
-    LocationName.HallwayPowerCrystal:          LocationData(0x1300CD, 49, "Chest"),
-    LocationName.HallwayAPBoost:               LocationData(0x1300CE, 50, "Chest"),
-    LocationName.CommunicationsRoomIOTowerMap: LocationData(0x1300CF, 255, "Chest"),
-    LocationName.CommunicationsRoomGaiaBelt:   LocationData(0x1300D0, 499, "Chest"),
-    LocationName.HostileProgram:               LocationData(0x1300D1, 31, "Double Get Bonus"),
-    LocationName.HostileProgramGetBonus:       LocationData(0x1300D2, 31, "Second Get Bonus"),
-    LocationName.PhotonDebugger:               LocationData(0x1300D3, 267, "Chest"),
-
-}
-SP2_Checks = {
-    LocationName.SolarSailer:                       LocationData(0x1300D4, 61, "Get Bonus"),
-    LocationName.CentralComputerCoreAPBoost:        LocationData(0x1300D5, 177, "Chest"),
-    LocationName.CentralComputerCoreOrichalcumPlus: LocationData(0x1300D6, 178, "Chest"),
-    LocationName.CentralComputerCoreCosmicArts:     LocationData(0x1300D7, 51, "Chest"),
-    LocationName.CentralComputerCoreMap:            LocationData(0x1300D8, 488, "Chest"),
-    LocationName.MCP:                               LocationData(0x1300D9, 32, "Double Get Bonus"),
-    LocationName.MCPGetBonus:                       LocationData(0x1300DA, 32, "Second Get Bonus"),
-    LocationName.LarxeneBonus:                      LocationData(0x1300DB, 68, "Get Bonus"),
-    LocationName.LarxeneASCloakedThunder:           LocationData(0x1300DC, 547, "Chest"),
-    LocationName.LarxeneDataLostIllusion:           LocationData(0x1300DD, 552, "Chest"),
+    LocationName.PitCellAreaMap:                    LocationData(316, "Chest"),
+    LocationName.PitCellMythrilCrystal:             LocationData(64, "Chest"),
+    LocationName.CanyonDarkCrystal:                 LocationData(65, "Chest"),
+    LocationName.CanyonMythrilStone:                LocationData(171, "Chest"),
+    LocationName.CanyonMythrilGem:                  LocationData(253, "Chest"),
+    LocationName.CanyonFrostCrystal:                LocationData(521, "Chest"),
+    LocationName.Screens:                           LocationData(45, "Get Bonus"),
+    LocationName.HallwayPowerCrystal:               LocationData(49, "Chest"),
+    LocationName.HallwayAPBoost:                    LocationData(50, "Chest"),
+    LocationName.CommunicationsRoomIOTowerMap:      LocationData(255, "Chest"),
+    LocationName.CommunicationsRoomGaiaBelt:        LocationData(499, "Chest"),
+    LocationName.HostileProgram:                    LocationData(31, "Double Get Bonus"),
+    LocationName.HostileProgramGetBonus:            LocationData(31, "Second Get Bonus"),
+    LocationName.PhotonDebugger:                    LocationData(267, "Chest"),
+    LocationName.SolarSailer:                       LocationData(61, "Get Bonus"),
+    LocationName.CentralComputerCoreAPBoost:        LocationData(177, "Chest"),
+    LocationName.CentralComputerCoreOrichalcumPlus: LocationData(178, "Chest"),
+    LocationName.CentralComputerCoreCosmicArts:     LocationData(51, "Chest"),
+    LocationName.CentralComputerCoreMap:            LocationData(488, "Chest"),
+    LocationName.MCP:                               LocationData(32, "Double Get Bonus"),
+    LocationName.MCPGetBonus:                       LocationData(32, "Second Get Bonus"),
+    LocationName.LarxeneBonus:                      LocationData(68, "Get Bonus"),
+    LocationName.LarxeneASCloakedThunder:           LocationData(547, "Chest"),
+    LocationName.LarxeneDataLostIllusion:           LocationData(552, "Chest"),
 }
 HT_Checks = {
-    LocationName.GraveyardMythrilShard:           LocationData(0x1300DE, 53, "Chest"),
-    LocationName.GraveyardSerenityGem:            LocationData(0x1300DF, 212, "Chest"),
-    LocationName.FinklesteinsLabHalloweenTownMap: LocationData(0x1300E0, 211, "Chest"),
-    LocationName.TownSquareMythrilStone:          LocationData(0x1300E1, 209, "Chest"),
-    LocationName.TownSquareEnergyShard:           LocationData(0x1300E2, 210, "Chest"),
-    LocationName.HinterlandsLightningShard:       LocationData(0x1300E3, 54, "Chest"),
-    LocationName.HinterlandsMythrilStone:         LocationData(0x1300E4, 213, "Chest"),
-    LocationName.HinterlandsAPBoost:              LocationData(0x1300E5, 214, "Chest"),
-    LocationName.CandyCaneLaneMegaPotion:         LocationData(0x1300E6, 55, "Chest"),
-    LocationName.CandyCaneLaneMythrilGem:         LocationData(0x1300E7, 56, "Chest"),
-    LocationName.CandyCaneLaneLightningStone:     LocationData(0x1300E8, 216, "Chest"),
-    LocationName.CandyCaneLaneMythrilStone:       LocationData(0x1300E9, 217, "Chest"),
-    LocationName.SantasHouseChristmasTownMap:     LocationData(0x1300EA, 57, "Chest"),
-    LocationName.SantasHouseAPBoost:              LocationData(0x1300EB, 58, "Chest"),
-    LocationName.PrisonKeeper:                    LocationData(0x1300EC, 18, "Get Bonus"),
-    LocationName.OogieBoogie:                     LocationData(0x1300ED, 19, "Get Bonus"),
-    LocationName.OogieBoogieMagnetElement:        LocationData(0x1300EE, 301, "Chest"),
-}
-HT2_Checks = {
-    LocationName.Lock:                   LocationData(0x1300EF, 40, "Get Bonus"),
-    LocationName.Present:                LocationData(0x1300F0, 297, "Chest"),
-    LocationName.DecoyPresents:          LocationData(0x1300F1, 298, "Chest"),
-    LocationName.Experiment:             LocationData(0x1300F2, 20, "Get Bonus"),
-    LocationName.DecisivePumpkin:        LocationData(0x1300F3, 275, "Chest"),
-    LocationName.VexenBonus:             LocationData(0x1300F4, 64, "Get Bonus"),
-    LocationName.VexenASRoadtoDiscovery: LocationData(0x1300F5, 544, "Chest"),
-    LocationName.VexenDataLostIllusion:  LocationData(0x1300F6, 549, "Chest"),
+    LocationName.GraveyardMythrilShard:           LocationData(53, "Chest"),
+    LocationName.GraveyardSerenityGem:            LocationData(212, "Chest"),
+    LocationName.FinklesteinsLabHalloweenTownMap: LocationData(211, "Chest"),
+    LocationName.TownSquareMythrilStone:          LocationData(209, "Chest"),
+    LocationName.TownSquareEnergyShard:           LocationData(210, "Chest"),
+    LocationName.HinterlandsLightningShard:       LocationData(54, "Chest"),
+    LocationName.HinterlandsMythrilStone:         LocationData(213, "Chest"),
+    LocationName.HinterlandsAPBoost:              LocationData(214, "Chest"),
+    LocationName.CandyCaneLaneMegaPotion:         LocationData(55, "Chest"),
+    LocationName.CandyCaneLaneMythrilGem:         LocationData(56, "Chest"),
+    LocationName.CandyCaneLaneLightningStone:     LocationData(216, "Chest"),
+    LocationName.CandyCaneLaneMythrilStone:       LocationData(217, "Chest"),
+    LocationName.SantasHouseChristmasTownMap:     LocationData(57, "Chest"),
+    LocationName.SantasHouseAPBoost:              LocationData(58, "Chest"),
+    LocationName.PrisonKeeper:                    LocationData(18, "Get Bonus"),
+    LocationName.OogieBoogie:                     LocationData(19, "Get Bonus"),
+    LocationName.OogieBoogieMagnetElement:        LocationData(301, "Chest"),
+    LocationName.Lock:                            LocationData(40, "Get Bonus"),
+    LocationName.Present:                         LocationData(297, "Chest"),
+    LocationName.DecoyPresents:                   LocationData(298, "Chest"),
+    LocationName.Experiment:                      LocationData(20, "Get Bonus"),
+    LocationName.DecisivePumpkin:                 LocationData(275, "Chest"),
+    LocationName.VexenBonus:                      LocationData(64, "Get Bonus"),
+    LocationName.VexenASRoadtoDiscovery:          LocationData(544, "Chest"),
+    LocationName.VexenDataLostIllusion:           LocationData(549, "Chest"),
 }
 PR_Checks = {
-    LocationName.RampartNavalMap:           LocationData(0x1300F7, 70, "Chest"),
-    LocationName.RampartMythrilStone:       LocationData(0x1300F8, 219, "Chest"),
-    LocationName.RampartDarkShard:          LocationData(0x1300F9, 220, "Chest"),
-    LocationName.TownDarkStone:             LocationData(0x1300FA, 71, "Chest"),
-    LocationName.TownAPBoost:               LocationData(0x1300FB, 72, "Chest"),
-    LocationName.TownMythrilShard:          LocationData(0x1300FC, 73, "Chest"),
-    LocationName.TownMythrilGem:            LocationData(0x1300FD, 221, "Chest"),
-    LocationName.CaveMouthBrightShard:      LocationData(0x1300FE, 74, "Chest"),
-    LocationName.CaveMouthMythrilShard:     LocationData(0x1300FF, 223, "Chest"),
-    LocationName.IsladeMuertaMap:           LocationData(0x130100, 329, "Chest"),
-    LocationName.BoatFight:                 LocationData(0x130101, 62, "Get Bonus"),
-    LocationName.InterceptorBarrels:        LocationData(0x130102, 39, "Get Bonus"),
-    LocationName.PowderStoreAPBoost1:       LocationData(0x130103, 369, "Chest"),
-    LocationName.PowderStoreAPBoost2:       LocationData(0x130104, 370, "Chest"),
-    LocationName.MoonlightNookMythrilShard: LocationData(0x130105, 75, "Chest"),
-    LocationName.MoonlightNookSerenityGem:  LocationData(0x130106, 224, "Chest"),
-    LocationName.MoonlightNookPowerStone:   LocationData(0x130107, 371, "Chest"),
-    LocationName.Barbossa:                  LocationData(0x130108, 21, "Double Get Bonus"),
-    LocationName.BarbossaGetBonus:          LocationData(0x130109, 21, "Second Get Bonus"),
-    LocationName.FollowtheWind:             LocationData(0x13010A, 263, "Chest"),
-
-}
-PR2_Checks = {
-    LocationName.GrimReaper1:                  LocationData(0x13010B, 59, "Get Bonus"),
-    LocationName.InterceptorsHoldFeatherCharm: LocationData(0x13010C, 252, "Chest"),
-    LocationName.SeadriftKeepAPBoost:          LocationData(0x13010D, 76, "Chest"),
-    LocationName.SeadriftKeepOrichalcum:       LocationData(0x13010E, 225, "Chest"),
-    LocationName.SeadriftKeepMeteorStaff:      LocationData(0x13010F, 372, "Chest"),
-    LocationName.SeadriftRowSerenityGem:       LocationData(0x130110, 77, "Chest"),
-    LocationName.SeadriftRowKingRecipe:        LocationData(0x130111, 78, "Chest"),
-    LocationName.SeadriftRowMythrilCrystal:    LocationData(0x130112, 373, "Chest"),
-    LocationName.SeadriftRowCursedMedallion:   LocationData(0x130113, 296, "Chest"),
-    LocationName.SeadriftRowShipGraveyardMap:  LocationData(0x130114, 331, "Chest"),
-    LocationName.GrimReaper2:                  LocationData(0x130115, 22, "Get Bonus"),
-    LocationName.SecretAnsemReport6:           LocationData(0x130116, 530, "Chest"),
-    LocationName.LuxordDataAPBoost:            LocationData(0x130117, 557, "Chest"),
+    LocationName.RampartNavalMap:              LocationData(70, "Chest"),
+    LocationName.RampartMythrilStone:          LocationData(219, "Chest"),
+    LocationName.RampartDarkShard:             LocationData(220, "Chest"),
+    LocationName.TownDarkStone:                LocationData(71, "Chest"),
+    LocationName.TownAPBoost:                  LocationData(72, "Chest"),
+    LocationName.TownMythrilShard:             LocationData(73, "Chest"),
+    LocationName.TownMythrilGem:               LocationData(221, "Chest"),
+    LocationName.CaveMouthBrightShard:         LocationData(74, "Chest"),
+    LocationName.CaveMouthMythrilShard:        LocationData(223, "Chest"),
+    LocationName.IsladeMuertaMap:              LocationData(329, "Chest"),
+    LocationName.BoatFight:                    LocationData(62, "Get Bonus"),
+    LocationName.InterceptorBarrels:           LocationData(39, "Get Bonus"),
+    LocationName.PowderStoreAPBoost1:          LocationData(369, "Chest"),
+    LocationName.PowderStoreAPBoost2:          LocationData(370, "Chest"),
+    LocationName.MoonlightNookMythrilShard:    LocationData(75, "Chest"),
+    LocationName.MoonlightNookSerenityGem:     LocationData(224, "Chest"),
+    LocationName.MoonlightNookPowerStone:      LocationData(371, "Chest"),
+    LocationName.Barbossa:                     LocationData(21, "Double Get Bonus"),
+    LocationName.BarbossaGetBonus:             LocationData(21, "Second Get Bonus"),
+    LocationName.FollowtheWind:                LocationData(263, "Chest"),
+    LocationName.GrimReaper1:                  LocationData(59, "Get Bonus"),
+    LocationName.InterceptorsHoldFeatherCharm: LocationData(252, "Chest"),
+    LocationName.SeadriftKeepAPBoost:          LocationData(76, "Chest"),
+    LocationName.SeadriftKeepOrichalcum:       LocationData(225, "Chest"),
+    LocationName.SeadriftKeepMeteorStaff:      LocationData(372, "Chest"),
+    LocationName.SeadriftRowSerenityGem:       LocationData(77, "Chest"),
+    LocationName.SeadriftRowKingRecipe:        LocationData(78, "Chest"),
+    LocationName.SeadriftRowMythrilCrystal:    LocationData(373, "Chest"),
+    LocationName.SeadriftRowCursedMedallion:   LocationData(296, "Chest"),
+    LocationName.SeadriftRowShipGraveyardMap:  LocationData(331, "Chest"),
+    LocationName.GrimReaper2:                  LocationData(22, "Get Bonus"),
+    LocationName.SecretAnsemReport6:           LocationData(530, "Chest"),
+    LocationName.LuxordDataAPBoost:            LocationData(557, "Chest"),
 }
 HB_Checks = {
-    LocationName.MarketplaceMap:              LocationData(0x130118, 362, "Chest"),
-    LocationName.BoroughDriveRecovery:        LocationData(0x130119, 194, "Chest"),
-    LocationName.BoroughAPBoost:              LocationData(0x13011A, 195, "Chest"),
-    LocationName.BoroughHiPotion:             LocationData(0x13011B, 196, "Chest"),
-    LocationName.BoroughMythrilShard:         LocationData(0x13011C, 305, "Chest"),
-    LocationName.BoroughDarkShard:            LocationData(0x13011D, 506, "Chest"),
-    LocationName.MerlinsHouseMembershipCard:  LocationData(0x13011E, 256, "Chest"),
-    LocationName.MerlinsHouseBlizzardElement: LocationData(0x13011F, 292, "Chest"),
-    LocationName.Bailey:                      LocationData(0x130120, 47, "Get Bonus"),
-    LocationName.BaileySecretAnsemReport7:    LocationData(0x130121, 531, "Chest"),
-    LocationName.BaseballCharm:               LocationData(0x130122, 258, "Chest"),
-}
-HB2_Checks = {
-    LocationName.PosternCastlePerimeterMap:                    LocationData(0x130123, 310, "Chest"),
-    LocationName.PosternMythrilGem:                            LocationData(0x130124, 189, "Chest"),
-    LocationName.PosternAPBoost:                               LocationData(0x130125, 190, "Chest"),
-    LocationName.CorridorsMythrilStone:                        LocationData(0x130126, 200, "Chest"),
-    LocationName.CorridorsMythrilCrystal:                      LocationData(0x130127, 201, "Chest"),
-    LocationName.CorridorsDarkCrystal:                         LocationData(0x130128, 202, "Chest"),
-    LocationName.CorridorsAPBoost:                             LocationData(0x130129, 307, "Chest"),
-    LocationName.AnsemsStudyMasterForm:                        LocationData(0x13012A, 276, "Chest"),
-    LocationName.AnsemsStudySleepingLion:                      LocationData(0x13012B, 266, "Chest"),
-    LocationName.AnsemsStudySkillRecipe:                       LocationData(0x13012C, 184, "Chest"),
-    LocationName.AnsemsStudyUkuleleCharm:                      LocationData(0x13012D, 183, "Chest"),
-    LocationName.RestorationSiteMoonRecipe:                    LocationData(0x13012E, 309, "Chest"),
-    LocationName.RestorationSiteAPBoost:                       LocationData(0x13012F, 507, "Chest"),
-    LocationName.DemyxHB:                                      LocationData(0x130130, 28, "Double Get Bonus"),
-    LocationName.DemyxHBGetBonus:                              LocationData(0x130131, 28, "Second Get Bonus"),
-    LocationName.FFFightsCureElement:                          LocationData(0x130132, 361, "Chest"),
-    LocationName.CrystalFissureTornPages:                      LocationData(0x130133, 179, "Chest"),
-    LocationName.CrystalFissureTheGreatMawMap:                 LocationData(0x130134, 489, "Chest"),
-    LocationName.CrystalFissureEnergyCrystal:                  LocationData(0x130135, 180, "Chest"),
-    LocationName.CrystalFissureAPBoost:                        LocationData(0x130136, 181, "Chest"),
-    LocationName.ThousandHeartless:                            LocationData(0x130137, 60, "Get Bonus"),
-    LocationName.ThousandHeartlessSecretAnsemReport1:          LocationData(0x130138, 525, "Chest"),
-    LocationName.ThousandHeartlessIceCream:                    LocationData(0x130139, 269, "Chest"),
-    LocationName.ThousandHeartlessPicture:                     LocationData(0x13013A, 511, "Chest"),
-    LocationName.PosternGullWing:                              LocationData(0x13013B, 491, "Chest"),
-    LocationName.HeartlessManufactoryCosmicChain:              LocationData(0x13013C, 311, "Chest"),
-    LocationName.SephirothBonus:                               LocationData(0x13013D, 35, "Get Bonus"),
-    LocationName.SephirothFenrir:                              LocationData(0x13013E, 282, "Chest"),
-    LocationName.WinnersProof:                                 LocationData(0x13013F, 588, "Chest"),
-    LocationName.ProofofPeace:                                 LocationData(0x130140, 589, "Chest"),
-    LocationName.DemyxDataAPBoost:                             LocationData(0x130141, 560, "Chest"),
-    LocationName.CoRDepthsAPBoost:                             LocationData(0x130142, 562, "Chest"),
-    LocationName.CoRDepthsPowerCrystal:                        LocationData(0x130143, 563, "Chest"),
-    LocationName.CoRDepthsFrostCrystal:                        LocationData(0x130144, 564, "Chest"),
-    LocationName.CoRDepthsManifestIllusion:                    LocationData(0x130145, 565, "Chest"),
-    LocationName.CoRDepthsAPBoost2:                            LocationData(0x130146, 566, "Chest"),
-    LocationName.CoRMineshaftLowerLevelDepthsofRemembranceMap: LocationData(0x130147, 580, "Chest"),
-    LocationName.CoRMineshaftLowerLevelAPBoost:                LocationData(0x130148, 578, "Chest"),
-
-}
-CoR_Checks = {
-    LocationName.CoRDepthsUpperLevelRemembranceGem:  LocationData(0x130149, 567, "Chest"),
-    LocationName.CoRMiningAreaSerenityGem:           LocationData(0x13014A, 568, "Chest"),
-    LocationName.CoRMiningAreaAPBoost:               LocationData(0x13014B, 569, "Chest"),
-    LocationName.CoRMiningAreaSerenityCrystal:       LocationData(0x13014C, 570, "Chest"),
-    LocationName.CoRMiningAreaManifestIllusion:      LocationData(0x13014D, 571, "Chest"),
-    LocationName.CoRMiningAreaSerenityGem2:          LocationData(0x13014E, 572, "Chest"),
-    LocationName.CoRMiningAreaDarkRemembranceMap:    LocationData(0x13014F, 573, "Chest"),
-    LocationName.CoRMineshaftMidLevelPowerBoost:     LocationData(0x130150, 581, "Chest"),
-    LocationName.CoREngineChamberSerenityCrystal:    LocationData(0x130151, 574, "Chest"),
-    LocationName.CoREngineChamberRemembranceCrystal: LocationData(0x130152, 575, "Chest"),
-    LocationName.CoREngineChamberAPBoost:            LocationData(0x130153, 576, "Chest"),
-    LocationName.CoREngineChamberManifestIllusion:   LocationData(0x130154, 577, "Chest"),
-    LocationName.CoRMineshaftUpperLevelMagicBoost:   LocationData(0x130155, 582, "Chest"),
-    LocationName.CoRMineshaftUpperLevelAPBoost:      LocationData(0x130156, 579, "Chest"),
-    LocationName.TransporttoRemembrance:             LocationData(0x130157, 72, "Get Bonus"),
+    LocationName.MarketplaceMap:                               LocationData(362, "Chest"),
+    LocationName.BoroughDriveRecovery:                         LocationData(194, "Chest"),
+    LocationName.BoroughAPBoost:                               LocationData(195, "Chest"),
+    LocationName.BoroughHiPotion:                              LocationData(196, "Chest"),
+    LocationName.BoroughMythrilShard:                          LocationData(305, "Chest"),
+    LocationName.BoroughDarkShard:                             LocationData(506, "Chest"),
+    LocationName.MerlinsHouseMembershipCard:                   LocationData(256, "Chest"),
+    LocationName.MerlinsHouseBlizzardElement:                  LocationData(292, "Chest"),
+    LocationName.Bailey:                                       LocationData(47, "Get Bonus"),
+    LocationName.BaileySecretAnsemReport7:                     LocationData(531, "Chest"),
+    LocationName.BaseballCharm:                                LocationData(258, "Chest"),
+    LocationName.PosternCastlePerimeterMap:                    LocationData(310, "Chest"),
+    LocationName.PosternMythrilGem:                            LocationData(189, "Chest"),
+    LocationName.PosternAPBoost:                               LocationData(190, "Chest"),
+    LocationName.CorridorsMythrilStone:                        LocationData(200, "Chest"),
+    LocationName.CorridorsMythrilCrystal:                      LocationData(201, "Chest"),
+    LocationName.CorridorsDarkCrystal:                         LocationData(202, "Chest"),
+    LocationName.CorridorsAPBoost:                             LocationData(307, "Chest"),
+    LocationName.AnsemsStudyMasterForm:                        LocationData(276, "Chest"),
+    LocationName.AnsemsStudySleepingLion:                      LocationData(266, "Chest"),
+    LocationName.AnsemsStudySkillRecipe:                       LocationData(184, "Chest"),
+    LocationName.AnsemsStudyUkuleleCharm:                      LocationData(183, "Chest"),
+    LocationName.RestorationSiteMoonRecipe:                    LocationData(309, "Chest"),
+    LocationName.RestorationSiteAPBoost:                       LocationData(507, "Chest"),
+    LocationName.DemyxHB:                                      LocationData(28, "Double Get Bonus"),
+    LocationName.DemyxHBGetBonus:                              LocationData(28, "Second Get Bonus"),
+    LocationName.FFFightsCureElement:                          LocationData(361, "Chest"),
+    LocationName.CrystalFissureTornPages:                      LocationData(179, "Chest"),
+    LocationName.CrystalFissureTheGreatMawMap:                 LocationData(489, "Chest"),
+    LocationName.CrystalFissureEnergyCrystal:                  LocationData(180, "Chest"),
+    LocationName.CrystalFissureAPBoost:                        LocationData(181, "Chest"),
+    LocationName.ThousandHeartless:                            LocationData(60, "Get Bonus"),
+    LocationName.ThousandHeartlessSecretAnsemReport1:          LocationData(525, "Chest"),
+    LocationName.ThousandHeartlessIceCream:                    LocationData(269, "Chest"),
+    LocationName.ThousandHeartlessPicture:                     LocationData(511, "Chest"),
+    LocationName.PosternGullWing:                              LocationData(491, "Chest"),
+    LocationName.HeartlessManufactoryCosmicChain:              LocationData(311, "Chest"),
+    LocationName.SephirothBonus:                               LocationData(35, "Get Bonus"),
+    LocationName.SephirothFenrir:                              LocationData(282, "Chest"),
+    LocationName.WinnersProof:                                 LocationData(588, "Chest"),
+    LocationName.ProofofPeace:                                 LocationData(589, "Chest"),
+    LocationName.DemyxDataAPBoost:                             LocationData(560, "Chest"),
+    LocationName.CoRDepthsAPBoost:                             LocationData(562, "Chest"),
+    LocationName.CoRDepthsPowerCrystal:                        LocationData(563, "Chest"),
+    LocationName.CoRDepthsFrostCrystal:                        LocationData(564, "Chest"),
+    LocationName.CoRDepthsManifestIllusion:                    LocationData(565, "Chest"),
+    LocationName.CoRDepthsAPBoost2:                            LocationData(566, "Chest"),
+    LocationName.CoRMineshaftLowerLevelDepthsofRemembranceMap: LocationData(580, "Chest"),
+    LocationName.CoRMineshaftLowerLevelAPBoost:                LocationData(578, "Chest"),
+    LocationName.CoRDepthsUpperLevelRemembranceGem:            LocationData(567, "Chest"),
+    LocationName.CoRMiningAreaSerenityGem:                     LocationData(568, "Chest"),
+    LocationName.CoRMiningAreaAPBoost:                         LocationData(569, "Chest"),
+    LocationName.CoRMiningAreaSerenityCrystal:                 LocationData(570, "Chest"),
+    LocationName.CoRMiningAreaManifestIllusion:                LocationData(571, "Chest"),
+    LocationName.CoRMiningAreaSerenityGem2:                    LocationData(572, "Chest"),
+    LocationName.CoRMiningAreaDarkRemembranceMap:              LocationData(573, "Chest"),
+    LocationName.CoRMineshaftMidLevelPowerBoost:               LocationData(581, "Chest"),
+    LocationName.CoREngineChamberSerenityCrystal:              LocationData(574, "Chest"),
+    LocationName.CoREngineChamberRemembranceCrystal:           LocationData(575, "Chest"),
+    LocationName.CoREngineChamberAPBoost:                      LocationData(576, "Chest"),
+    LocationName.CoREngineChamberManifestIllusion:             LocationData(577, "Chest"),
+    LocationName.CoRMineshaftUpperLevelMagicBoost:             LocationData(582, "Chest"),
+    LocationName.CoRMineshaftUpperLevelAPBoost:                LocationData(579, "Chest"),
+    LocationName.TransporttoRemembrance:                       LocationData(72, "Get Bonus"),
 }
 PL_Checks = {
-    LocationName.GorgeSavannahMap:              LocationData(0x130158, 492, "Chest"),
-    LocationName.GorgeDarkGem:                  LocationData(0x130159, 404, "Chest"),
-    LocationName.GorgeMythrilStone:             LocationData(0x13015A, 405, "Chest"),
-    LocationName.ElephantGraveyardFrostGem:     LocationData(0x13015B, 401, "Chest"),
-    LocationName.ElephantGraveyardMythrilStone: LocationData(0x13015C, 402, "Chest"),
-    LocationName.ElephantGraveyardBrightStone:  LocationData(0x13015D, 403, "Chest"),
-    LocationName.ElephantGraveyardAPBoost:      LocationData(0x13015E, 508, "Chest"),
-    LocationName.ElephantGraveyardMythrilShard: LocationData(0x13015F, 509, "Chest"),
-    LocationName.PrideRockMap:                  LocationData(0x130160, 418, "Chest"),
-    LocationName.PrideRockMythrilStone:         LocationData(0x130161, 392, "Chest"),
-    LocationName.PrideRockSerenityCrystal:      LocationData(0x130162, 393, "Chest"),
-    LocationName.WildebeestValleyEnergyStone:   LocationData(0x130163, 396, "Chest"),
-    LocationName.WildebeestValleyAPBoost:       LocationData(0x130164, 397, "Chest"),
-    LocationName.WildebeestValleyMythrilGem:    LocationData(0x130165, 398, "Chest"),
-    LocationName.WildebeestValleyMythrilStone:  LocationData(0x130166, 399, "Chest"),
-    LocationName.WildebeestValleyLucidGem:      LocationData(0x130167, 400, "Chest"),
-    LocationName.WastelandsMythrilShard:        LocationData(0x130168, 406, "Chest"),
-    LocationName.WastelandsSerenityGem:         LocationData(0x130169, 407, "Chest"),
-    LocationName.WastelandsMythrilStone:        LocationData(0x13016A, 408, "Chest"),
-    LocationName.JungleSerenityGem:             LocationData(0x13016B, 409, "Chest"),
-    LocationName.JungleMythrilStone:            LocationData(0x13016C, 410, "Chest"),
-    LocationName.JungleSerenityCrystal:         LocationData(0x13016D, 411, "Chest"),
-    LocationName.OasisMap:                      LocationData(0x13016E, 412, "Chest"),
-    LocationName.OasisTornPages:                LocationData(0x13016F, 493, "Chest"),
-    LocationName.OasisAPBoost:                  LocationData(0x130170, 413, "Chest"),
-    LocationName.CircleofLife:                  LocationData(0x130171, 264, "Chest"),
-    LocationName.Hyenas1:                       LocationData(0x130172, 49, "Get Bonus"),
-    LocationName.Scar:                          LocationData(0x130173, 29, "Get Bonus"),
-    LocationName.ScarFireElement:               LocationData(0x130174, 302, "Chest"),
-
-}
-PL2_Checks = {
-    LocationName.Hyenas2:              LocationData(0x130175, 50, "Get Bonus"),
-    LocationName.Groundshaker:         LocationData(0x130176, 30, "Double Get Bonus"),
-    LocationName.GroundshakerGetBonus: LocationData(0x130177, 30, "Second Get Bonus"),
-    LocationName.SaixDataDefenseBoost: LocationData(0x130178, 556, "Chest"),
+    LocationName.GorgeSavannahMap:              LocationData(492, "Chest"),
+    LocationName.GorgeDarkGem:                  LocationData(404, "Chest"),
+    LocationName.GorgeMythrilStone:             LocationData(405, "Chest"),
+    LocationName.ElephantGraveyardFrostGem:     LocationData(401, "Chest"),
+    LocationName.ElephantGraveyardMythrilStone: LocationData(402, "Chest"),
+    LocationName.ElephantGraveyardBrightStone:  LocationData(403, "Chest"),
+    LocationName.ElephantGraveyardAPBoost:      LocationData(508, "Chest"),
+    LocationName.ElephantGraveyardMythrilShard: LocationData(509, "Chest"),
+    LocationName.PrideRockMap:                  LocationData(418, "Chest"),
+    LocationName.PrideRockMythrilStone:         LocationData(392, "Chest"),
+    LocationName.PrideRockSerenityCrystal:      LocationData(393, "Chest"),
+    LocationName.WildebeestValleyEnergyStone:   LocationData(396, "Chest"),
+    LocationName.WildebeestValleyAPBoost:       LocationData(397, "Chest"),
+    LocationName.WildebeestValleyMythrilGem:    LocationData(398, "Chest"),
+    LocationName.WildebeestValleyMythrilStone:  LocationData(399, "Chest"),
+    LocationName.WildebeestValleyLucidGem:      LocationData(400, "Chest"),
+    LocationName.WastelandsMythrilShard:        LocationData(406, "Chest"),
+    LocationName.WastelandsSerenityGem:         LocationData(407, "Chest"),
+    LocationName.WastelandsMythrilStone:        LocationData(408, "Chest"),
+    LocationName.JungleSerenityGem:             LocationData(409, "Chest"),
+    LocationName.JungleMythrilStone:            LocationData(410, "Chest"),
+    LocationName.JungleSerenityCrystal:         LocationData(411, "Chest"),
+    LocationName.OasisMap:                      LocationData(412, "Chest"),
+    LocationName.OasisTornPages:                LocationData(493, "Chest"),
+    LocationName.OasisAPBoost:                  LocationData(413, "Chest"),
+    LocationName.CircleofLife:                  LocationData(264, "Chest"),
+    LocationName.Hyenas1:                       LocationData(49, "Get Bonus"),
+    LocationName.Scar:                          LocationData(29, "Get Bonus"),
+    LocationName.ScarFireElement:               LocationData(302, "Chest"),
+    LocationName.Hyenas2:                       LocationData(50, "Get Bonus"),
+    LocationName.Groundshaker:                  LocationData(30, "Double Get Bonus"),
+    LocationName.GroundshakerGetBonus:          LocationData(30, "Second Get Bonus"),
+    LocationName.SaixDataDefenseBoost:          LocationData(556, "Chest"),
 }
 STT_Checks = {
-    LocationName.TwilightTownMap:                 LocationData(0x130179, 319, "Chest"),
-    LocationName.MunnyPouchOlette:                LocationData(0x13017A, 288, "Chest"),
-    LocationName.StationDusks:                    LocationData(0x13017B, 54, "Get Bonus", "Roxas", 14),
-    LocationName.StationofSerenityPotion:         LocationData(0x13017C, 315, "Chest"),
-    LocationName.StationofCallingPotion:          LocationData(0x13017D, 472, "Chest"),
-    LocationName.TwilightThorn:                   LocationData(0x13017E, 33, "Get Bonus", "Roxas", 14),
-    LocationName.Axel1:                           LocationData(0x13017F, 73, "Get Bonus", "Roxas", 14),
-    LocationName.JunkChampionBelt:                LocationData(0x130180, 389, "Chest"),
-    LocationName.JunkMedal:                       LocationData(0x130181, 390, "Chest"),
-    LocationName.TheStruggleTrophy:               LocationData(0x130182, 519, "Chest"),
-    LocationName.CentralStationPotion1:           LocationData(0x130183, 428, "Chest"),
-    LocationName.STTCentralStationHiPotion:       LocationData(0x130184, 429, "Chest"),
-    LocationName.CentralStationPotion2:           LocationData(0x130185, 430, "Chest"),
-    LocationName.SunsetTerraceAbilityRing:        LocationData(0x130186, 434, "Chest"),
-    LocationName.SunsetTerraceHiPotion:           LocationData(0x130187, 435, "Chest"),
-    LocationName.SunsetTerracePotion1:            LocationData(0x130188, 436, "Chest"),
-    LocationName.SunsetTerracePotion2:            LocationData(0x130189, 437, "Chest"),
-    LocationName.MansionFoyerHiPotion:            LocationData(0x13018A, 449, "Chest"),
-    LocationName.MansionFoyerPotion1:             LocationData(0x13018B, 450, "Chest"),
-    LocationName.MansionFoyerPotion2:             LocationData(0x13018C, 451, "Chest"),
-    LocationName.MansionDiningRoomElvenBandanna:  LocationData(0x13018D, 455, "Chest"),
-    LocationName.MansionDiningRoomPotion:         LocationData(0x13018E, 456, "Chest"),
-    LocationName.NaminesSketches:                 LocationData(0x13018F, 289, "Chest"),
-    LocationName.MansionMap:                      LocationData(0x130190, 483, "Chest"),
-    LocationName.MansionLibraryHiPotion:          LocationData(0x130191, 459, "Chest"),
-    LocationName.Axel2:                           LocationData(0x130192, 34, "Get Bonus", "Roxas", 14),
-    LocationName.MansionBasementCorridorHiPotion: LocationData(0x130193, 463, "Chest"),
-    LocationName.RoxasDataMagicBoost:             LocationData(0x130194, 558, "Chest"),
+    LocationName.TwilightTownMap:                 LocationData(319, "Chest"),
+    LocationName.MunnyPouchOlette:                LocationData(288, "Chest"),
+    LocationName.StationDusks:                    LocationData(54, "Get Bonus", "Roxas", 14),
+    LocationName.StationofSerenityPotion:         LocationData(315, "Chest"),
+    LocationName.StationofCallingPotion:          LocationData(472, "Chest"),
+    LocationName.TwilightThorn:                   LocationData(33, "Get Bonus", "Roxas", 14),
+    LocationName.Axel1:                           LocationData(73, "Get Bonus", "Roxas", 14),
+    LocationName.JunkChampionBelt:                LocationData(389, "Chest"),
+    LocationName.JunkMedal:                       LocationData(390, "Chest"),
+    LocationName.TheStruggleTrophy:               LocationData(519, "Chest"),
+    LocationName.CentralStationPotion1:           LocationData(428, "Chest"),
+    LocationName.STTCentralStationHiPotion:       LocationData(429, "Chest"),
+    LocationName.CentralStationPotion2:           LocationData(430, "Chest"),
+    LocationName.SunsetTerraceAbilityRing:        LocationData(434, "Chest"),
+    LocationName.SunsetTerraceHiPotion:           LocationData(435, "Chest"),
+    LocationName.SunsetTerracePotion1:            LocationData(436, "Chest"),
+    LocationName.SunsetTerracePotion2:            LocationData(437, "Chest"),
+    LocationName.MansionFoyerHiPotion:            LocationData(449, "Chest"),
+    LocationName.MansionFoyerPotion1:             LocationData(450, "Chest"),
+    LocationName.MansionFoyerPotion2:             LocationData(451, "Chest"),
+    LocationName.MansionDiningRoomElvenBandanna:  LocationData(455, "Chest"),
+    LocationName.MansionDiningRoomPotion:         LocationData(456, "Chest"),
+    LocationName.NaminesSketches:                 LocationData(289, "Chest"),
+    LocationName.MansionMap:                      LocationData(483, "Chest"),
+    LocationName.MansionLibraryHiPotion:          LocationData(459, "Chest"),
+    LocationName.Axel2:                           LocationData(34, "Get Bonus", "Roxas", 14),
+    LocationName.MansionBasementCorridorHiPotion: LocationData(463, "Chest"),
+    LocationName.RoxasDataMagicBoost:             LocationData(558, "Chest"),
 
 }
 TT_Checks = {
-    LocationName.OldMansionPotion:               LocationData(0x130195, 447, "Chest"),
-    LocationName.OldMansionMythrilShard:         LocationData(0x130196, 448, "Chest"),
-    LocationName.TheWoodsPotion:                 LocationData(0x130197, 442, "Chest"),
-    LocationName.TheWoodsMythrilShard:           LocationData(0x130198, 443, "Chest"),
-    LocationName.TheWoodsHiPotion:               LocationData(0x130199, 444, "Chest"),
-    LocationName.TramCommonHiPotion:             LocationData(0x13019A, 420, "Chest"),
-    LocationName.TramCommonAPBoost:              LocationData(0x13019B, 421, "Chest"),
-    LocationName.TramCommonTent:                 LocationData(0x13019C, 422, "Chest"),
-    LocationName.TramCommonMythrilShard1:        LocationData(0x13019D, 423, "Chest"),
-    LocationName.TramCommonPotion1:              LocationData(0x13019E, 424, "Chest"),
-    LocationName.TramCommonMythrilShard2:        LocationData(0x13019F, 425, "Chest"),
-    LocationName.TramCommonPotion2:              LocationData(0x1301A0, 484, "Chest"),
-    LocationName.StationPlazaSecretAnsemReport2: LocationData(0x1301A1, 526, "Chest"),
-    LocationName.MunnyPouchMickey:               LocationData(0x1301A2, 290, "Chest"),
-    LocationName.CrystalOrb:                     LocationData(0x1301A3, 291, "Chest"),
-    LocationName.CentralStationTent:             LocationData(0x1301A4, 431, "Chest"),
-    LocationName.TTCentralStationHiPotion:       LocationData(0x1301A5, 432, "Chest"),
-    LocationName.CentralStationMythrilShard:     LocationData(0x1301A6, 433, "Chest"),
-    LocationName.TheTowerPotion:                 LocationData(0x1301A7, 465, "Chest"),
-    LocationName.TheTowerHiPotion:               LocationData(0x1301A8, 466, "Chest"),
-    LocationName.TheTowerEther:                  LocationData(0x1301A9, 522, "Chest"),
-    LocationName.TowerEntrywayEther:             LocationData(0x1301AA, 467, "Chest"),
-    LocationName.TowerEntrywayMythrilShard:      LocationData(0x1301AB, 468, "Chest"),
-    LocationName.SorcerersLoftTowerMap:          LocationData(0x1301AC, 469, "Chest"),
-    LocationName.TowerWardrobeMythrilStone:      LocationData(0x1301AD, 470, "Chest"),
-    LocationName.StarSeeker:                     LocationData(0x1301AE, 304, "Chest"),
-    LocationName.ValorForm:                      LocationData(0x1301AF, 286, "Chest"),
-
-}
-TT2_Checks = {
-    LocationName.SeifersTrophy: LocationData(0x1301B0, 294, "Chest"),
-    LocationName.Oathkeeper:    LocationData(0x1301B1, 265, "Chest"),
-    LocationName.LimitForm:     LocationData(0x1301B2, 543, "Chest"),
-}
-TT3_Checks = {
-    LocationName.UndergroundConcourseMythrilGem:        LocationData(0x1301B3, 479, "Chest"),
-    LocationName.UndergroundConcourseAPBoost:           LocationData(0x1301B4, 481, "Chest"),
-    LocationName.UndergroundConcourseOrichalcum:        LocationData(0x1301B5, 480, "Chest"),
-    LocationName.UndergroundConcourseMythrilCrystal:    LocationData(0x1301B6, 482, "Chest"),
-    LocationName.TunnelwayOrichalcum:                   LocationData(0x1301B7, 477, "Chest"),
-    LocationName.TunnelwayMythrilCrystal:               LocationData(0x1301B8, 478, "Chest"),
-    LocationName.SunsetTerraceOrichalcumPlus:           LocationData(0x1301B9, 438, "Chest"),
-    LocationName.SunsetTerraceMythrilShard:             LocationData(0x1301BA, 439, "Chest"),
-    LocationName.SunsetTerraceMythrilCrystal:           LocationData(0x1301BB, 440, "Chest"),
-    LocationName.SunsetTerraceAPBoost:                  LocationData(0x1301BC, 441, "Chest"),
-    LocationName.MansionNobodies:                       LocationData(0x1301BD, 56, "Get Bonus"),
-    LocationName.MansionFoyerMythrilCrystal:            LocationData(0x1301BE, 452, "Chest"),
-    LocationName.MansionFoyerMythrilStone:              LocationData(0x1301BF, 453, "Chest"),
-    LocationName.MansionFoyerSerenityCrystal:           LocationData(0x1301C0, 454, "Chest"),
-    LocationName.MansionDiningRoomMythrilCrystal:       LocationData(0x1301C1, 457, "Chest"),
-    LocationName.MansionDiningRoomMythrilStone:         LocationData(0x1301C2, 458, "Chest"),
-    LocationName.MansionLibraryOrichalcum:              LocationData(0x1301C3, 460, "Chest"),
-    LocationName.BeamSecretAnsemReport10:               LocationData(0x1301C4, 534, "Chest"),
-    LocationName.MansionBasementCorridorUltimateRecipe: LocationData(0x1301C5, 464, "Chest"),
-    LocationName.BetwixtandBetween:                     LocationData(0x1301C6, 63, "Get Bonus"),
-    LocationName.BetwixtandBetweenBondofFlame:          LocationData(0x1301C7, 317, "Chest"),
-    LocationName.AxelDataMagicBoost:                    LocationData(0x1301C8, 561, "Chest"),
+    LocationName.OldMansionPotion:                      LocationData(447, "Chest"),
+    LocationName.OldMansionMythrilShard:                LocationData(448, "Chest"),
+    LocationName.TheWoodsPotion:                        LocationData(442, "Chest"),
+    LocationName.TheWoodsMythrilShard:                  LocationData(443, "Chest"),
+    LocationName.TheWoodsHiPotion:                      LocationData(444, "Chest"),
+    LocationName.TramCommonHiPotion:                    LocationData(420, "Chest"),
+    LocationName.TramCommonAPBoost:                     LocationData(421, "Chest"),
+    LocationName.TramCommonTent:                        LocationData(422, "Chest"),
+    LocationName.TramCommonMythrilShard1:               LocationData(423, "Chest"),
+    LocationName.TramCommonPotion1:                     LocationData(424, "Chest"),
+    LocationName.TramCommonMythrilShard2:               LocationData(425, "Chest"),
+    LocationName.TramCommonPotion2:                     LocationData(484, "Chest"),
+    LocationName.StationPlazaSecretAnsemReport2:        LocationData(526, "Chest"),
+    LocationName.MunnyPouchMickey:                      LocationData(290, "Chest"),
+    LocationName.CrystalOrb:                            LocationData(291, "Chest"),
+    LocationName.CentralStationTent:                    LocationData(431, "Chest"),
+    LocationName.TTCentralStationHiPotion:              LocationData(432, "Chest"),
+    LocationName.CentralStationMythrilShard:            LocationData(433, "Chest"),
+    LocationName.TheTowerPotion:                        LocationData(465, "Chest"),
+    LocationName.TheTowerHiPotion:                      LocationData(466, "Chest"),
+    LocationName.TheTowerEther:                         LocationData(522, "Chest"),
+    LocationName.TowerEntrywayEther:                    LocationData(467, "Chest"),
+    LocationName.TowerEntrywayMythrilShard:             LocationData(468, "Chest"),
+    LocationName.SorcerersLoftTowerMap:                 LocationData(469, "Chest"),
+    LocationName.TowerWardrobeMythrilStone:             LocationData(470, "Chest"),
+    LocationName.StarSeeker:                            LocationData(304, "Chest"),
+    LocationName.ValorForm:                             LocationData(286, "Chest"),
+    LocationName.SeifersTrophy:                         LocationData(294, "Chest"),
+    LocationName.Oathkeeper:                            LocationData(265, "Chest"),
+    LocationName.LimitForm:                             LocationData(543, "Chest"),
+    LocationName.UndergroundConcourseMythrilGem:        LocationData(479, "Chest"),
+    LocationName.UndergroundConcourseAPBoost:           LocationData(481, "Chest"),
+    LocationName.UndergroundConcourseOrichalcum:        LocationData(480, "Chest"),
+    LocationName.UndergroundConcourseMythrilCrystal:    LocationData(482, "Chest"),
+    LocationName.TunnelwayOrichalcum:                   LocationData(477, "Chest"),
+    LocationName.TunnelwayMythrilCrystal:               LocationData(478, "Chest"),
+    LocationName.SunsetTerraceOrichalcumPlus:           LocationData(438, "Chest"),
+    LocationName.SunsetTerraceMythrilShard:             LocationData(439, "Chest"),
+    LocationName.SunsetTerraceMythrilCrystal:           LocationData(440, "Chest"),
+    LocationName.SunsetTerraceAPBoost:                  LocationData(441, "Chest"),
+    LocationName.MansionNobodies:                       LocationData(56, "Get Bonus"),
+    LocationName.MansionFoyerMythrilCrystal:            LocationData(452, "Chest"),
+    LocationName.MansionFoyerMythrilStone:              LocationData(453, "Chest"),
+    LocationName.MansionFoyerSerenityCrystal:           LocationData(454, "Chest"),
+    LocationName.MansionDiningRoomMythrilCrystal:       LocationData(457, "Chest"),
+    LocationName.MansionDiningRoomMythrilStone:         LocationData(458, "Chest"),
+    LocationName.MansionLibraryOrichalcum:              LocationData(460, "Chest"),
+    LocationName.BeamSecretAnsemReport10:               LocationData(534, "Chest"),
+    LocationName.MansionBasementCorridorUltimateRecipe: LocationData(464, "Chest"),
+    LocationName.BetwixtandBetween:                     LocationData(63, "Get Bonus"),
+    LocationName.BetwixtandBetweenBondofFlame:          LocationData(317, "Chest"),
+    LocationName.AxelDataMagicBoost:                    LocationData(561, "Chest"),
 }
 TWTNW_Checks = {
-    LocationName.FragmentCrossingMythrilStone:    LocationData(0x1301C9, 374, "Chest"),
-    LocationName.FragmentCrossingMythrilCrystal:  LocationData(0x1301CA, 375, "Chest"),
-    LocationName.FragmentCrossingAPBoost:         LocationData(0x1301CB, 376, "Chest"),
-    LocationName.FragmentCrossingOrichalcum:      LocationData(0x1301CC, 377, "Chest"),
-    LocationName.Roxas:                           LocationData(0x1301CD, 69, "Double Get Bonus"),
-    LocationName.RoxasGetBonus:                   LocationData(0x1301CE, 69, "Second Get Bonus"),
-    LocationName.RoxasSecretAnsemReport8:         LocationData(0x1301CF, 532, "Chest"),
-    LocationName.TwoBecomeOne:                    LocationData(0x1301D0, 277, "Chest"),
-    LocationName.MemorysSkyscaperMythrilCrystal:  LocationData(0x1301D1, 391, "Chest"),
-    LocationName.MemorysSkyscaperAPBoost:         LocationData(0x1301D2, 523, "Chest"),
-    LocationName.MemorysSkyscaperMythrilStone:    LocationData(0x1301D3, 524, "Chest"),
-    LocationName.TheBrinkofDespairDarkCityMap:    LocationData(0x1301D4, 335, "Chest"),
-    LocationName.TheBrinkofDespairOrichalcumPlus: LocationData(0x1301D5, 500, "Chest"),
-    LocationName.NothingsCallMythrilGem:          LocationData(0x1301D6, 378, "Chest"),
-    LocationName.NothingsCallOrichalcum:          LocationData(0x1301D7, 379, "Chest"),
-    LocationName.TwilightsViewCosmicBelt:         LocationData(0x1301D8, 336, "Chest"),
-}
-TWTNW2_Checks = {
-    LocationName.XigbarBonus:                           LocationData(0x1301D9, 23, "Get Bonus"),
-    LocationName.XigbarSecretAnsemReport3:              LocationData(0x1301DA, 527, "Chest"),
-    LocationName.NaughtsSkywayMythrilGem:               LocationData(0x1301DB, 380, "Chest"),
-    LocationName.NaughtsSkywayOrichalcum:               LocationData(0x1301DC, 381, "Chest"),
-    LocationName.NaughtsSkywayMythrilCrystal:           LocationData(0x1301DD, 382, "Chest"),
-    LocationName.Oblivion:                              LocationData(0x1301DE, 278, "Chest"),
-    LocationName.CastleThatNeverWasMap:                 LocationData(0x1301DF, 496, "Chest"),
-    LocationName.Luxord:                                LocationData(0x1301E0, 24, "Double Get Bonus"),
-    LocationName.LuxordGetBonus:                        LocationData(0x1301E1, 24, "Second Get Bonus"),
-    LocationName.LuxordSecretAnsemReport9:              LocationData(0x1301E2, 533, "Chest"),
-    LocationName.SaixBonus:                             LocationData(0x1301E3, 25, "Get Bonus"),
-    LocationName.SaixSecretAnsemReport12:               LocationData(0x1301E4, 536, "Chest"),
-    LocationName.PreXemnas1SecretAnsemReport11:         LocationData(0x1301E5, 535, "Chest"),
-    LocationName.RuinandCreationsPassageMythrilStone:   LocationData(0x1301E6, 385, "Chest"),
-    LocationName.RuinandCreationsPassageAPBoost:        LocationData(0x1301E7, 386, "Chest"),
-    LocationName.RuinandCreationsPassageMythrilCrystal: LocationData(0x1301E8, 387, "Chest"),
-    LocationName.RuinandCreationsPassageOrichalcum:     LocationData(0x1301E9, 388, "Chest"),
-    LocationName.Xemnas1:                               LocationData(0x1301EA, 26, "Double Get Bonus"),
-    LocationName.Xemnas1GetBonus:                       LocationData(0x1301EB, 26, "Second Get Bonus"),
-    LocationName.Xemnas1SecretAnsemReport13:            LocationData(0x1301EC, 537, "Chest"),
-    LocationName.FinalXemnas:                           LocationData(0x1301ED, 71, "Get Bonus"),
-    LocationName.XemnasDataPowerBoost:                  LocationData(0x1301EE, 554, "Chest"),
+    LocationName.FragmentCrossingMythrilStone:          LocationData(374, "Chest"),
+    LocationName.FragmentCrossingMythrilCrystal:        LocationData(375, "Chest"),
+    LocationName.FragmentCrossingAPBoost:               LocationData(376, "Chest"),
+    LocationName.FragmentCrossingOrichalcum:            LocationData(377, "Chest"),
+    LocationName.Roxas:                                 LocationData(69, "Double Get Bonus"),
+    LocationName.RoxasGetBonus:                         LocationData(69, "Second Get Bonus"),
+    LocationName.RoxasSecretAnsemReport8:               LocationData(532, "Chest"),
+    LocationName.TwoBecomeOne:                          LocationData(277, "Chest"),
+    LocationName.MemorysSkyscaperMythrilCrystal:        LocationData(391, "Chest"),
+    LocationName.MemorysSkyscaperAPBoost:               LocationData(523, "Chest"),
+    LocationName.MemorysSkyscaperMythrilStone:          LocationData(524, "Chest"),
+    LocationName.TheBrinkofDespairDarkCityMap:          LocationData(335, "Chest"),
+    LocationName.TheBrinkofDespairOrichalcumPlus:       LocationData(500, "Chest"),
+    LocationName.NothingsCallMythrilGem:                LocationData(378, "Chest"),
+    LocationName.NothingsCallOrichalcum:                LocationData(379, "Chest"),
+    LocationName.TwilightsViewCosmicBelt:               LocationData(336, "Chest"),
+    LocationName.XigbarBonus:                           LocationData(23, "Get Bonus"),
+    LocationName.XigbarSecretAnsemReport3:              LocationData(527, "Chest"),
+    LocationName.NaughtsSkywayMythrilGem:               LocationData(380, "Chest"),
+    LocationName.NaughtsSkywayOrichalcum:               LocationData(381, "Chest"),
+    LocationName.NaughtsSkywayMythrilCrystal:           LocationData(382, "Chest"),
+    LocationName.Oblivion:                              LocationData(278, "Chest"),
+    LocationName.CastleThatNeverWasMap:                 LocationData(496, "Chest"),
+    LocationName.Luxord:                                LocationData(24, "Double Get Bonus"),
+    LocationName.LuxordGetBonus:                        LocationData(24, "Second Get Bonus"),
+    LocationName.LuxordSecretAnsemReport9:              LocationData(533, "Chest"),
+    LocationName.SaixBonus:                             LocationData(25, "Get Bonus"),
+    LocationName.SaixSecretAnsemReport12:               LocationData(536, "Chest"),
+    LocationName.PreXemnas1SecretAnsemReport11:         LocationData(535, "Chest"),
+    LocationName.RuinandCreationsPassageMythrilStone:   LocationData(385, "Chest"),
+    LocationName.RuinandCreationsPassageAPBoost:        LocationData(386, "Chest"),
+    LocationName.RuinandCreationsPassageMythrilCrystal: LocationData(387, "Chest"),
+    LocationName.RuinandCreationsPassageOrichalcum:     LocationData(388, "Chest"),
+    LocationName.Xemnas1:                               LocationData(26, "Double Get Bonus"),
+    LocationName.Xemnas1GetBonus:                       LocationData(26, "Second Get Bonus"),
+    LocationName.Xemnas1SecretAnsemReport13:            LocationData(537, "Chest"),
+    LocationName.FinalXemnas:                           LocationData(71, "Get Bonus"),
+    LocationName.XemnasDataPowerBoost:                  LocationData(554, "Chest"),
 }
 
 SoraLevels = {
-    LocationName.Lvl1:  LocationData(0x1301EF, 1, "Levels"),
-    LocationName.Lvl2:  LocationData(0x1301F0, 2, "Levels"),
-    LocationName.Lvl3:  LocationData(0x1301F1, 3, "Levels"),
-    LocationName.Lvl4:  LocationData(0x1301F2, 4, "Levels"),
-    LocationName.Lvl5:  LocationData(0x1301F3, 5, "Levels"),
-    LocationName.Lvl6:  LocationData(0x1301F4, 6, "Levels"),
-    LocationName.Lvl7:  LocationData(0x1301F5, 7, "Levels"),
-    LocationName.Lvl8:  LocationData(0x1301F6, 8, "Levels"),
-    LocationName.Lvl9:  LocationData(0x1301F7, 9, "Levels"),
-    LocationName.Lvl10: LocationData(0x1301F8, 10, "Levels"),
-    LocationName.Lvl11: LocationData(0x1301F9, 11, "Levels"),
-    LocationName.Lvl12: LocationData(0x1301FA, 12, "Levels"),
-    LocationName.Lvl13: LocationData(0x1301FB, 13, "Levels"),
-    LocationName.Lvl14: LocationData(0x1301FC, 14, "Levels"),
-    LocationName.Lvl15: LocationData(0x1301FD, 15, "Levels"),
-    LocationName.Lvl16: LocationData(0x1301FE, 16, "Levels"),
-    LocationName.Lvl17: LocationData(0x1301FF, 17, "Levels"),
-    LocationName.Lvl18: LocationData(0x130200, 18, "Levels"),
-    LocationName.Lvl19: LocationData(0x130201, 19, "Levels"),
-    LocationName.Lvl20: LocationData(0x130202, 20, "Levels"),
-    LocationName.Lvl21: LocationData(0x130203, 21, "Levels"),
-    LocationName.Lvl22: LocationData(0x130204, 22, "Levels"),
-    LocationName.Lvl23: LocationData(0x130205, 23, "Levels"),
-    LocationName.Lvl24: LocationData(0x130206, 24, "Levels"),
-    LocationName.Lvl25: LocationData(0x130207, 25, "Levels"),
-    LocationName.Lvl26: LocationData(0x130208, 26, "Levels"),
-    LocationName.Lvl27: LocationData(0x130209, 27, "Levels"),
-    LocationName.Lvl28: LocationData(0x13020A, 28, "Levels"),
-    LocationName.Lvl29: LocationData(0x13020B, 29, "Levels"),
-    LocationName.Lvl30: LocationData(0x13020C, 30, "Levels"),
-    LocationName.Lvl31: LocationData(0x13020D, 31, "Levels"),
-    LocationName.Lvl32: LocationData(0x13020E, 32, "Levels"),
-    LocationName.Lvl33: LocationData(0x13020F, 33, "Levels"),
-    LocationName.Lvl34: LocationData(0x130210, 34, "Levels"),
-    LocationName.Lvl35: LocationData(0x130211, 35, "Levels"),
-    LocationName.Lvl36: LocationData(0x130212, 36, "Levels"),
-    LocationName.Lvl37: LocationData(0x130213, 37, "Levels"),
-    LocationName.Lvl38: LocationData(0x130214, 38, "Levels"),
-    LocationName.Lvl39: LocationData(0x130215, 39, "Levels"),
-    LocationName.Lvl40: LocationData(0x130216, 40, "Levels"),
-    LocationName.Lvl41: LocationData(0x130217, 41, "Levels"),
-    LocationName.Lvl42: LocationData(0x130218, 42, "Levels"),
-    LocationName.Lvl43: LocationData(0x130219, 43, "Levels"),
-    LocationName.Lvl44: LocationData(0x13021A, 44, "Levels"),
-    LocationName.Lvl45: LocationData(0x13021B, 45, "Levels"),
-    LocationName.Lvl46: LocationData(0x13021C, 46, "Levels"),
-    LocationName.Lvl47: LocationData(0x13021D, 47, "Levels"),
-    LocationName.Lvl48: LocationData(0x13021E, 48, "Levels"),
-    LocationName.Lvl49: LocationData(0x13021F, 49, "Levels"),
-    LocationName.Lvl50: LocationData(0x130220, 50, "Levels"),
-    LocationName.Lvl51: LocationData(0x130221, 51, "Levels"),
-    LocationName.Lvl52: LocationData(0x130222, 52, "Levels"),
-    LocationName.Lvl53: LocationData(0x130223, 53, "Levels"),
-    LocationName.Lvl54: LocationData(0x130224, 54, "Levels"),
-    LocationName.Lvl55: LocationData(0x130225, 55, "Levels"),
-    LocationName.Lvl56: LocationData(0x130226, 56, "Levels"),
-    LocationName.Lvl57: LocationData(0x130227, 57, "Levels"),
-    LocationName.Lvl58: LocationData(0x130228, 58, "Levels"),
-    LocationName.Lvl59: LocationData(0x130229, 59, "Levels"),
-    LocationName.Lvl60: LocationData(0x13022A, 60, "Levels"),
-    LocationName.Lvl61: LocationData(0x13022B, 61, "Levels"),
-    LocationName.Lvl62: LocationData(0x13022C, 62, "Levels"),
-    LocationName.Lvl63: LocationData(0x13022D, 63, "Levels"),
-    LocationName.Lvl64: LocationData(0x13022E, 64, "Levels"),
-    LocationName.Lvl65: LocationData(0x13022F, 65, "Levels"),
-    LocationName.Lvl66: LocationData(0x130230, 66, "Levels"),
-    LocationName.Lvl67: LocationData(0x130231, 67, "Levels"),
-    LocationName.Lvl68: LocationData(0x130232, 68, "Levels"),
-    LocationName.Lvl69: LocationData(0x130233, 69, "Levels"),
-    LocationName.Lvl70: LocationData(0x130234, 70, "Levels"),
-    LocationName.Lvl71: LocationData(0x130235, 71, "Levels"),
-    LocationName.Lvl72: LocationData(0x130236, 72, "Levels"),
-    LocationName.Lvl73: LocationData(0x130237, 73, "Levels"),
-    LocationName.Lvl74: LocationData(0x130238, 74, "Levels"),
-    LocationName.Lvl75: LocationData(0x130239, 75, "Levels"),
-    LocationName.Lvl76: LocationData(0x13023A, 76, "Levels"),
-    LocationName.Lvl77: LocationData(0x13023B, 77, "Levels"),
-    LocationName.Lvl78: LocationData(0x13023C, 78, "Levels"),
-    LocationName.Lvl79: LocationData(0x13023D, 79, "Levels"),
-    LocationName.Lvl80: LocationData(0x13023E, 80, "Levels"),
-    LocationName.Lvl81: LocationData(0x13023F, 81, "Levels"),
-    LocationName.Lvl82: LocationData(0x130240, 82, "Levels"),
-    LocationName.Lvl83: LocationData(0x130241, 83, "Levels"),
-    LocationName.Lvl84: LocationData(0x130242, 84, "Levels"),
-    LocationName.Lvl85: LocationData(0x130243, 85, "Levels"),
-    LocationName.Lvl86: LocationData(0x130244, 86, "Levels"),
-    LocationName.Lvl87: LocationData(0x130245, 87, "Levels"),
-    LocationName.Lvl88: LocationData(0x130246, 88, "Levels"),
-    LocationName.Lvl89: LocationData(0x130247, 89, "Levels"),
-    LocationName.Lvl90: LocationData(0x130248, 90, "Levels"),
-    LocationName.Lvl91: LocationData(0x130249, 91, "Levels"),
-    LocationName.Lvl92: LocationData(0x13024A, 92, "Levels"),
-    LocationName.Lvl93: LocationData(0x13024B, 93, "Levels"),
-    LocationName.Lvl94: LocationData(0x13024C, 94, "Levels"),
-    LocationName.Lvl95: LocationData(0x13024D, 95, "Levels"),
-    LocationName.Lvl96: LocationData(0x13024E, 96, "Levels"),
-    LocationName.Lvl97: LocationData(0x13024F, 97, "Levels"),
-    LocationName.Lvl98: LocationData(0x130250, 98, "Levels"),
-    LocationName.Lvl99: LocationData(0x130251, 99, "Levels"),
+    LocationName.Lvl2:  LocationData(2, "Levels"),
+    LocationName.Lvl3:  LocationData(3, "Levels"),
+    LocationName.Lvl4:  LocationData(4, "Levels"),
+    LocationName.Lvl5:  LocationData(5, "Levels"),
+    LocationName.Lvl6:  LocationData(6, "Levels"),
+    LocationName.Lvl7:  LocationData(7, "Levels"),
+    LocationName.Lvl8:  LocationData(8, "Levels"),
+    LocationName.Lvl9:  LocationData(9, "Levels"),
+    LocationName.Lvl10: LocationData(10, "Levels"),
+    LocationName.Lvl11: LocationData(11, "Levels"),
+    LocationName.Lvl12: LocationData(12, "Levels"),
+    LocationName.Lvl13: LocationData(13, "Levels"),
+    LocationName.Lvl14: LocationData(14, "Levels"),
+    LocationName.Lvl15: LocationData(15, "Levels"),
+    LocationName.Lvl16: LocationData(16, "Levels"),
+    LocationName.Lvl17: LocationData(17, "Levels"),
+    LocationName.Lvl18: LocationData(18, "Levels"),
+    LocationName.Lvl19: LocationData(19, "Levels"),
+    LocationName.Lvl20: LocationData(20, "Levels"),
+    LocationName.Lvl21: LocationData(21, "Levels"),
+    LocationName.Lvl22: LocationData(22, "Levels"),
+    LocationName.Lvl23: LocationData(23, "Levels"),
+    LocationName.Lvl24: LocationData(24, "Levels"),
+    LocationName.Lvl25: LocationData(25, "Levels"),
+    LocationName.Lvl26: LocationData(26, "Levels"),
+    LocationName.Lvl27: LocationData(27, "Levels"),
+    LocationName.Lvl28: LocationData(28, "Levels"),
+    LocationName.Lvl29: LocationData(29, "Levels"),
+    LocationName.Lvl30: LocationData(30, "Levels"),
+    LocationName.Lvl31: LocationData(31, "Levels"),
+    LocationName.Lvl32: LocationData(32, "Levels"),
+    LocationName.Lvl33: LocationData(33, "Levels"),
+    LocationName.Lvl34: LocationData(34, "Levels"),
+    LocationName.Lvl35: LocationData(35, "Levels"),
+    LocationName.Lvl36: LocationData(36, "Levels"),
+    LocationName.Lvl37: LocationData(37, "Levels"),
+    LocationName.Lvl38: LocationData(38, "Levels"),
+    LocationName.Lvl39: LocationData(39, "Levels"),
+    LocationName.Lvl40: LocationData(40, "Levels"),
+    LocationName.Lvl41: LocationData(41, "Levels"),
+    LocationName.Lvl42: LocationData(42, "Levels"),
+    LocationName.Lvl43: LocationData(43, "Levels"),
+    LocationName.Lvl44: LocationData(44, "Levels"),
+    LocationName.Lvl45: LocationData(45, "Levels"),
+    LocationName.Lvl46: LocationData(46, "Levels"),
+    LocationName.Lvl47: LocationData(47, "Levels"),
+    LocationName.Lvl48: LocationData(48, "Levels"),
+    LocationName.Lvl49: LocationData(49, "Levels"),
+    LocationName.Lvl50: LocationData(50, "Levels"),
+    LocationName.Lvl51: LocationData(51, "Levels"),
+    LocationName.Lvl52: LocationData(52, "Levels"),
+    LocationName.Lvl53: LocationData(53, "Levels"),
+    LocationName.Lvl54: LocationData(54, "Levels"),
+    LocationName.Lvl55: LocationData(55, "Levels"),
+    LocationName.Lvl56: LocationData(56, "Levels"),
+    LocationName.Lvl57: LocationData(57, "Levels"),
+    LocationName.Lvl58: LocationData(58, "Levels"),
+    LocationName.Lvl59: LocationData(59, "Levels"),
+    LocationName.Lvl60: LocationData(60, "Levels"),
+    LocationName.Lvl61: LocationData(61, "Levels"),
+    LocationName.Lvl62: LocationData(62, "Levels"),
+    LocationName.Lvl63: LocationData(63, "Levels"),
+    LocationName.Lvl64: LocationData(64, "Levels"),
+    LocationName.Lvl65: LocationData(65, "Levels"),
+    LocationName.Lvl66: LocationData(66, "Levels"),
+    LocationName.Lvl67: LocationData(67, "Levels"),
+    LocationName.Lvl68: LocationData(68, "Levels"),
+    LocationName.Lvl69: LocationData(69, "Levels"),
+    LocationName.Lvl70: LocationData(70, "Levels"),
+    LocationName.Lvl71: LocationData(71, "Levels"),
+    LocationName.Lvl72: LocationData(72, "Levels"),
+    LocationName.Lvl73: LocationData(73, "Levels"),
+    LocationName.Lvl74: LocationData(74, "Levels"),
+    LocationName.Lvl75: LocationData(75, "Levels"),
+    LocationName.Lvl76: LocationData(76, "Levels"),
+    LocationName.Lvl77: LocationData(77, "Levels"),
+    LocationName.Lvl78: LocationData(78, "Levels"),
+    LocationName.Lvl79: LocationData(79, "Levels"),
+    LocationName.Lvl80: LocationData(80, "Levels"),
+    LocationName.Lvl81: LocationData(81, "Levels"),
+    LocationName.Lvl82: LocationData(82, "Levels"),
+    LocationName.Lvl83: LocationData(83, "Levels"),
+    LocationName.Lvl84: LocationData(84, "Levels"),
+    LocationName.Lvl85: LocationData(85, "Levels"),
+    LocationName.Lvl86: LocationData(86, "Levels"),
+    LocationName.Lvl87: LocationData(87, "Levels"),
+    LocationName.Lvl88: LocationData(88, "Levels"),
+    LocationName.Lvl89: LocationData(89, "Levels"),
+    LocationName.Lvl90: LocationData(90, "Levels"),
+    LocationName.Lvl91: LocationData(91, "Levels"),
+    LocationName.Lvl92: LocationData(92, "Levels"),
+    LocationName.Lvl93: LocationData(93, "Levels"),
+    LocationName.Lvl94: LocationData(94, "Levels"),
+    LocationName.Lvl95: LocationData(95, "Levels"),
+    LocationName.Lvl96: LocationData(96, "Levels"),
+    LocationName.Lvl97: LocationData(97, "Levels"),
+    LocationName.Lvl98: LocationData(98, "Levels"),
+    LocationName.Lvl99: LocationData(99, "Levels"),
 }
 Form_Checks = {
-    LocationName.Valorlvl2:  LocationData(0x130253, 2, "Forms", 1),
-    LocationName.Valorlvl3:  LocationData(0x130254, 3, "Forms", 1),
-    LocationName.Valorlvl4:  LocationData(0x130255, 4, "Forms", 1),
-    LocationName.Valorlvl5:  LocationData(0x130256, 5, "Forms", 1),
-    LocationName.Valorlvl6:  LocationData(0x130257, 6, "Forms", 1),
-    LocationName.Valorlvl7:  LocationData(0x130258, 7, "Forms", 1),
+    LocationName.Valorlvl2:  LocationData(2, "Forms", 1),
+    LocationName.Valorlvl3:  LocationData(3, "Forms", 1),
+    LocationName.Valorlvl4:  LocationData(4, "Forms", 1),
+    LocationName.Valorlvl5:  LocationData(5, "Forms", 1),
+    LocationName.Valorlvl6:  LocationData(6, "Forms", 1),
+    LocationName.Valorlvl7:  LocationData(7, "Forms", 1),
 
-    LocationName.Wisdomlvl2: LocationData(0x13025A, 2, "Forms", 2),
-    LocationName.Wisdomlvl3: LocationData(0x13025B, 3, "Forms", 2),
-    LocationName.Wisdomlvl4: LocationData(0x13025C, 4, "Forms", 2),
-    LocationName.Wisdomlvl5: LocationData(0x13025D, 5, "Forms", 2),
-    LocationName.Wisdomlvl6: LocationData(0x13025E, 6, "Forms", 2),
-    LocationName.Wisdomlvl7: LocationData(0x13025F, 7, "Forms", 2),
+    LocationName.Wisdomlvl2: LocationData(2, "Forms", 2),
+    LocationName.Wisdomlvl3: LocationData(3, "Forms", 2),
+    LocationName.Wisdomlvl4: LocationData(4, "Forms", 2),
+    LocationName.Wisdomlvl5: LocationData(5, "Forms", 2),
+    LocationName.Wisdomlvl6: LocationData(6, "Forms", 2),
+    LocationName.Wisdomlvl7: LocationData(7, "Forms", 2),
 
-    LocationName.Limitlvl2:  LocationData(0x130261, 2, "Forms", 3),
-    LocationName.Limitlvl3:  LocationData(0x130262, 3, "Forms", 3),
-    LocationName.Limitlvl4:  LocationData(0x130263, 4, "Forms", 3),
-    LocationName.Limitlvl5:  LocationData(0x130264, 5, "Forms", 3),
-    LocationName.Limitlvl6:  LocationData(0x130265, 6, "Forms", 3),
-    LocationName.Limitlvl7:  LocationData(0x130266, 7, "Forms", 3),
+    LocationName.Limitlvl2:  LocationData(2, "Forms", 3),
+    LocationName.Limitlvl3:  LocationData(3, "Forms", 3),
+    LocationName.Limitlvl4:  LocationData(4, "Forms", 3),
+    LocationName.Limitlvl5:  LocationData(5, "Forms", 3),
+    LocationName.Limitlvl6:  LocationData(6, "Forms", 3),
+    LocationName.Limitlvl7:  LocationData(7, "Forms", 3),
 
-    LocationName.Masterlvl2: LocationData(0x130268, 2, "Forms", 4),
-    LocationName.Masterlvl3: LocationData(0x130269, 3, "Forms", 4),
-    LocationName.Masterlvl4: LocationData(0x13026A, 4, "Forms", 4),
-    LocationName.Masterlvl5: LocationData(0x13026B, 5, "Forms", 4),
-    LocationName.Masterlvl6: LocationData(0x13026C, 6, "Forms", 4),
-    LocationName.Masterlvl7: LocationData(0x13026D, 7, "Forms", 4),
+    LocationName.Masterlvl2: LocationData(2, "Forms", 4),
+    LocationName.Masterlvl3: LocationData(3, "Forms", 4),
+    LocationName.Masterlvl4: LocationData(4, "Forms", 4),
+    LocationName.Masterlvl5: LocationData(5, "Forms", 4),
+    LocationName.Masterlvl6: LocationData(6, "Forms", 4),
+    LocationName.Masterlvl7: LocationData(7, "Forms", 4),
 
-    LocationName.Finallvl2:  LocationData(0x13026F, 2, "Forms", 5),
-    LocationName.Finallvl3:  LocationData(0x130270, 3, "Forms", 5),
-    LocationName.Finallvl4:  LocationData(0x130271, 4, "Forms", 5),
-    LocationName.Finallvl5:  LocationData(0x130272, 5, "Forms", 5),
-    LocationName.Finallvl6:  LocationData(0x130273, 6, "Forms", 5),
-    LocationName.Finallvl7:  LocationData(0x130274, 7, "Forms", 5),
+    LocationName.Finallvl2:  LocationData(2, "Forms", 5),
+    LocationName.Finallvl3:  LocationData(3, "Forms", 5),
+    LocationName.Finallvl4:  LocationData(4, "Forms", 5),
+    LocationName.Finallvl5:  LocationData(5, "Forms", 5),
+    LocationName.Finallvl6:  LocationData(6, "Forms", 5),
+    LocationName.Finallvl7:  LocationData(7, "Forms", 5),
+}
+Summon_Checks = {
+    LocationName.Summonlvl2: LocationData(2, "Summons"),
+    LocationName.Summonlvl3: LocationData(3, "Summons"),
+    LocationName.Summonlvl4: LocationData(4, "Summons"),
+    LocationName.Summonlvl5: LocationData(5, "Summons"),
+    LocationName.Summonlvl6: LocationData(6, "Summons"),
+    LocationName.Summonlvl7: LocationData(7, "Summons"),
 }
 GoA_Checks = {
-    LocationName.GardenofAssemblageMap: LocationData(0x130275, 585, "Chest"),
-    LocationName.GoALostIllusion:       LocationData(0x130276, 586, "Chest"),
-    LocationName.ProofofNonexistence:   LocationData(0x130277, 590, "Chest"),
+    LocationName.GardenofAssemblageMap: LocationData(585, "Chest"),
+    LocationName.GoALostIllusion:       LocationData(586, "Chest"),
+    LocationName.ProofofNonexistence:   LocationData(590, "Chest"),
 }
 Keyblade_Slots = {
-    LocationName.FAKESlot:            LocationData(0x130278, 116, "Keyblade"),
-    LocationName.DetectionSaberSlot:  LocationData(0x130279, 83, "Keyblade"),
-    LocationName.EdgeofUltimaSlot:    LocationData(0x13027A, 84, "Keyblade"),
-    LocationName.KingdomKeySlot:      LocationData(0x13027B, 80, "Keyblade"),
-    LocationName.OathkeeperSlot:      LocationData(0x13027C, 81, "Keyblade"),
-    LocationName.OblivionSlot:        LocationData(0x13027D, 82, "Keyblade"),
-    LocationName.StarSeekerSlot:      LocationData(0x13027E, 123, "Keyblade"),
-    LocationName.HiddenDragonSlot:    LocationData(0x13027F, 124, "Keyblade"),
-    LocationName.HerosCrestSlot:      LocationData(0x130280, 127, "Keyblade"),
-    LocationName.MonochromeSlot:      LocationData(0x130281, 128, "Keyblade"),
-    LocationName.FollowtheWindSlot:   LocationData(0x130282, 129, "Keyblade"),
-    LocationName.CircleofLifeSlot:    LocationData(0x130283, 130, "Keyblade"),
-    LocationName.PhotonDebuggerSlot:  LocationData(0x130284, 131, "Keyblade"),
-    LocationName.GullWingSlot:        LocationData(0x130285, 132, "Keyblade"),
-    LocationName.RumblingRoseSlot:    LocationData(0x130286, 133, "Keyblade"),
-    LocationName.GuardianSoulSlot:    LocationData(0x130287, 134, "Keyblade"),
-    LocationName.WishingLampSlot:     LocationData(0x130288, 135, "Keyblade"),
-    LocationName.DecisivePumpkinSlot: LocationData(0x130289, 136, "Keyblade"),
-    LocationName.SweetMemoriesSlot:   LocationData(0x13028A, 138, "Keyblade"),
-    LocationName.MysteriousAbyssSlot: LocationData(0x13028B, 139, "Keyblade"),
-    LocationName.SleepingLionSlot:    LocationData(0x13028C, 137, "Keyblade"),
-    LocationName.BondofFlameSlot:     LocationData(0x13028D, 141, "Keyblade"),
-    LocationName.TwoBecomeOneSlot:    LocationData(0x13028E, 148, "Keyblade"),
-    LocationName.FatalCrestSlot:      LocationData(0x13028F, 140, "Keyblade"),
-    LocationName.FenrirSlot:          LocationData(0x130290, 142, "Keyblade"),
-    LocationName.UltimaWeaponSlot:    LocationData(0x130291, 143, "Keyblade"),
-    LocationName.WinnersProofSlot:    LocationData(0x130292, 149, "Keyblade"),
-    LocationName.PurebloodSlot:       LocationData(0x1302DB, 85, "Keyblade"),
-}
-#  checks are given when talking to the computer in the GoA
-Critical_Checks = {
-    LocationName.Crit_1: LocationData(0x130293, 1, "Critical"),
-    LocationName.Crit_2: LocationData(0x130294, 1, "Critical"),
-    LocationName.Crit_3: LocationData(0x130295, 1, "Critical"),
-    LocationName.Crit_4: LocationData(0x130296, 1, "Critical"),
-    LocationName.Crit_5: LocationData(0x130297, 1, "Critical"),
-    LocationName.Crit_6: LocationData(0x130298, 1, "Critical"),
-    LocationName.Crit_7: LocationData(0x130299, 1, "Critical"),
+    LocationName.FAKESlot:            LocationData(116, "Keyblade"),
+    LocationName.DetectionSaberSlot:  LocationData(83, "Keyblade"),
+    LocationName.EdgeofUltimaSlot:    LocationData(84, "Keyblade"),
+    LocationName.KingdomKeySlot:      LocationData(80, "Keyblade"),
+    LocationName.OathkeeperSlot:      LocationData(81, "Keyblade"),
+    LocationName.OblivionSlot:        LocationData(82, "Keyblade"),
+    LocationName.StarSeekerSlot:      LocationData(123, "Keyblade"),
+    LocationName.HiddenDragonSlot:    LocationData(124, "Keyblade"),
+    LocationName.HerosCrestSlot:      LocationData(127, "Keyblade"),
+    LocationName.MonochromeSlot:      LocationData(128, "Keyblade"),
+    LocationName.FollowtheWindSlot:   LocationData(129, "Keyblade"),
+    LocationName.CircleofLifeSlot:    LocationData(130, "Keyblade"),
+    LocationName.PhotonDebuggerSlot:  LocationData(131, "Keyblade"),
+    LocationName.GullWingSlot:        LocationData(132, "Keyblade"),
+    LocationName.RumblingRoseSlot:    LocationData(133, "Keyblade"),
+    LocationName.GuardianSoulSlot:    LocationData(134, "Keyblade"),
+    LocationName.WishingLampSlot:     LocationData(135, "Keyblade"),
+    LocationName.DecisivePumpkinSlot: LocationData(136, "Keyblade"),
+    LocationName.SweetMemoriesSlot:   LocationData(138, "Keyblade"),
+    LocationName.MysteriousAbyssSlot: LocationData(139, "Keyblade"),
+    LocationName.SleepingLionSlot:    LocationData(137, "Keyblade"),
+    LocationName.BondofFlameSlot:     LocationData(141, "Keyblade"),
+    LocationName.TwoBecomeOneSlot:    LocationData(148, "Keyblade"),
+    LocationName.FatalCrestSlot:      LocationData(140, "Keyblade"),
+    LocationName.FenrirSlot:          LocationData(142, "Keyblade"),
+    LocationName.UltimaWeaponSlot:    LocationData(143, "Keyblade"),
+    LocationName.WinnersProofSlot:    LocationData(149, "Keyblade"),
+    LocationName.PurebloodSlot:       LocationData(85, "Keyblade"),
 }
 
 Donald_Checks = {
-    LocationName.DonaldScreens:          LocationData(0x13029A, 45, "Get Bonus", "Donald", 2),
-    LocationName.DonaldDemyxHBGetBonus:  LocationData(0x13029B, 28, "Get Bonus", "Donald", 2),
-    LocationName.DonaldDemyxOC:          LocationData(0x13029C, 58, "Get Bonus", "Donald", 2),
-    LocationName.DonaldBoatPete:         LocationData(0x13029D, 16, "Double Get Bonus", "Donald", 2),
-    LocationName.DonaldBoatPeteGetBonus: LocationData(0x13029E, 16, "Second Get Bonus", "Donald", 2),
-    LocationName.DonaldPrisonKeeper:     LocationData(0x13029F, 18, "Get Bonus", "Donald", 2),
-    LocationName.DonaldScar:             LocationData(0x1302A0, 29, "Get Bonus", "Donald", 2),
-    LocationName.DonaldSolarSailer:      LocationData(0x1302A1, 61, "Get Bonus", "Donald", 2),
-    LocationName.DonaldExperiment:       LocationData(0x1302A2, 20, "Get Bonus", "Donald", 2),
-    LocationName.DonaldBoatFight:        LocationData(0x1302A3, 62, "Get Bonus", "Donald", 2),
-    LocationName.DonaldMansionNobodies:  LocationData(0x1302A4, 56, "Get Bonus", "Donald", 2),
-    LocationName.DonaldThresholder:      LocationData(0x1302A5, 2, "Get Bonus", "Donald", 2),
-    LocationName.DonaldXaldinGetBonus:   LocationData(0x1302A6, 4, "Get Bonus", "Donald", 2),
-    LocationName.DonaladGrimReaper2:     LocationData(0x1302A7, 22, "Get Bonus", "Donald", 2),
+    LocationName.DonaldScreens:          LocationData(45, "Get Bonus", "Donald", 2),
+    LocationName.DonaldDemyxHBGetBonus:  LocationData(28, "Get Bonus", "Donald", 2),
+    LocationName.DonaldDemyxOC:          LocationData(58, "Get Bonus", "Donald", 2),
+    LocationName.DonaldBoatPete:         LocationData(16, "Double Get Bonus", "Donald", 2),
+    LocationName.DonaldBoatPeteGetBonus: LocationData(16, "Second Get Bonus", "Donald", 2),
+    LocationName.DonaldPrisonKeeper:     LocationData(18, "Get Bonus", "Donald", 2),
+    LocationName.DonaldScar:             LocationData(29, "Get Bonus", "Donald", 2),
+    LocationName.DonaldSolarSailer:      LocationData(61, "Get Bonus", "Donald", 2),
+    LocationName.DonaldExperiment:       LocationData(20, "Get Bonus", "Donald", 2),
+    LocationName.DonaldBoatFight:        LocationData(62, "Get Bonus", "Donald", 2),
+    LocationName.DonaldMansionNobodies:  LocationData(56, "Get Bonus", "Donald", 2),
+    LocationName.DonaldThresholder:      LocationData(2, "Get Bonus", "Donald", 2),
+    LocationName.DonaldXaldinGetBonus:   LocationData(4, "Get Bonus", "Donald", 2),
+    LocationName.DonaladGrimReaper2:     LocationData(22, "Get Bonus", "Donald", 2),
 
-    LocationName.CometStaff:             LocationData(0x1302A8, 90, "Keyblade", "Donald"),
-    LocationName.HammerStaff:            LocationData(0x1302A9, 87, "Keyblade", "Donald"),
-    LocationName.LordsBroom:             LocationData(0x1302AA, 91, "Keyblade", "Donald"),
-    LocationName.MagesStaff:             LocationData(0x1302AB, 86, "Keyblade", "Donald"),
-    LocationName.MeteorStaff:            LocationData(0x1302AC, 89, "Keyblade", "Donald"),
-    LocationName.NobodyLance:            LocationData(0x1302AD, 94, "Keyblade", "Donald"),
-    LocationName.PreciousMushroom:       LocationData(0x1302AE, 154, "Keyblade", "Donald"),
-    LocationName.PreciousMushroom2:      LocationData(0x1302AF, 155, "Keyblade", "Donald"),
-    LocationName.PremiumMushroom:        LocationData(0x1302B0, 156, "Keyblade", "Donald"),
-    LocationName.RisingDragon:           LocationData(0x1302B1, 93, "Keyblade", "Donald"),
-    LocationName.SaveTheQueen2:          LocationData(0x1302B2, 146, "Keyblade", "Donald"),
-    LocationName.ShamansRelic:           LocationData(0x1302B3, 95, "Keyblade", "Donald"),
-    LocationName.VictoryBell:            LocationData(0x1302B4, 88, "Keyblade", "Donald"),
-    LocationName.WisdomWand:             LocationData(0x1302B5, 92, "Keyblade", "Donald"),
-    LocationName.Centurion2:             LocationData(0x1302B6, 151, "Keyblade", "Donald"),
-    LocationName.DonaldAbuEscort:        LocationData(0x1302B7, 42, "Get Bonus", "Donald", 2),
-    LocationName.DonaldStarting1:        LocationData(0x1302B8, 2, "Critical", "Donald"),
-    LocationName.DonaldStarting2:        LocationData(0x1302B9, 2, "Critical", "Donald"),
+    LocationName.CometStaff:             LocationData(90, "Keyblade", "Donald"),
+    LocationName.HammerStaff:            LocationData(87, "Keyblade", "Donald"),
+    LocationName.LordsBroom:             LocationData(91, "Keyblade", "Donald"),
+    LocationName.MagesStaff:             LocationData(86, "Keyblade", "Donald"),
+    LocationName.MeteorStaff:            LocationData(89, "Keyblade", "Donald"),
+    LocationName.NobodyLance:            LocationData(94, "Keyblade", "Donald"),
+    LocationName.PreciousMushroom:       LocationData(154, "Keyblade", "Donald"),
+    LocationName.PreciousMushroom2:      LocationData(155, "Keyblade", "Donald"),
+    LocationName.PremiumMushroom:        LocationData(156, "Keyblade", "Donald"),
+    LocationName.RisingDragon:           LocationData(93, "Keyblade", "Donald"),
+    LocationName.SaveTheQueen2:          LocationData(146, "Keyblade", "Donald"),
+    LocationName.ShamansRelic:           LocationData(95, "Keyblade", "Donald"),
+    LocationName.VictoryBell:            LocationData(88, "Keyblade", "Donald"),
+    LocationName.WisdomWand:             LocationData(92, "Keyblade", "Donald"),
+    LocationName.Centurion2:             LocationData(151, "Keyblade", "Donald"),
+    LocationName.DonaldAbuEscort:        LocationData(42, "Get Bonus", "Donald", 2),
+    # LocationName.DonaldStarting1:        LocationData(2, "Critical", "Donald"),
+    # LocationName.DonaldStarting2:        LocationData(2, "Critical", "Donald"),
 }
 
 Goofy_Checks = {
-    LocationName.GoofyBarbossa:           LocationData(0x1302BA, 21, "Double Get Bonus", "Goofy", 3),
-    LocationName.GoofyBarbossaGetBonus:   LocationData(0x1302BB, 21, "Second Get Bonus", "Goofy", 3),
-    LocationName.GoofyGrimReaper1:        LocationData(0x1302BC, 59, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyHostileProgram:     LocationData(0x1302BD, 31, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyHyenas1:            LocationData(0x1302BE, 49, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyHyenas2:            LocationData(0x1302BF, 50, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyLock:               LocationData(0x1302C0, 40, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyOogieBoogie:        LocationData(0x1302C1, 19, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyPeteOC:             LocationData(0x1302C2, 6, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyFuturePete:         LocationData(0x1302C3, 17, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyShanYu:             LocationData(0x1302C4, 9, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyStormRider:         LocationData(0x1302C5, 10, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyBeast:              LocationData(0x1302C6, 12, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyInterceptorBarrels: LocationData(0x1302C7, 39, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyTreasureRoom:       LocationData(0x1302C8, 46, "Get Bonus", "Goofy", 3),
-    LocationName.GoofyZexion:             LocationData(0x1302C9, 66, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyBarbossa:           LocationData(21, "Double Get Bonus", "Goofy", 3),
+    LocationName.GoofyBarbossaGetBonus:   LocationData(21, "Second Get Bonus", "Goofy", 3),
+    LocationName.GoofyGrimReaper1:        LocationData(59, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyHostileProgram:     LocationData(31, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyHyenas1:            LocationData(49, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyHyenas2:            LocationData(50, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyLock:               LocationData(40, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyOogieBoogie:        LocationData(19, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyPeteOC:             LocationData(6, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyFuturePete:         LocationData(17, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyShanYu:             LocationData(9, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyStormRider:         LocationData(10, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyBeast:              LocationData(12, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyInterceptorBarrels: LocationData(39, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyTreasureRoom:       LocationData(46, "Get Bonus", "Goofy", 3),
+    LocationName.GoofyZexion:             LocationData(66, "Get Bonus", "Goofy", 3),
 
-    LocationName.AdamantShield:           LocationData(0x1302CA, 100, "Keyblade", "Goofy"),
-    LocationName.AkashicRecord:           LocationData(0x1302CB, 107, "Keyblade", "Goofy"),
-    LocationName.ChainGear:               LocationData(0x1302CC, 101, "Keyblade", "Goofy"),
-    LocationName.DreamCloud:              LocationData(0x1302CD, 104, "Keyblade", "Goofy"),
-    LocationName.FallingStar:             LocationData(0x1302CE, 103, "Keyblade", "Goofy"),
-    LocationName.FrozenPride2:            LocationData(0x1302CF, 158, "Keyblade", "Goofy"),
-    LocationName.GenjiShield:             LocationData(0x1302D0, 106, "Keyblade", "Goofy"),
-    LocationName.KnightDefender:          LocationData(0x1302D1, 105, "Keyblade", "Goofy"),
-    LocationName.KnightsShield:           LocationData(0x1302D2, 99, "Keyblade", "Goofy"),
-    LocationName.MajesticMushroom:        LocationData(0x1302D3, 161, "Keyblade", "Goofy"),
-    LocationName.MajesticMushroom2:       LocationData(0x1302D4, 162, "Keyblade", "Goofy"),
-    LocationName.NobodyGuard:             LocationData(0x1302D5, 108, "Keyblade", "Goofy"),
-    LocationName.OgreShield:              LocationData(0x1302D6, 102, "Keyblade", "Goofy"),
-    LocationName.SaveTheKing2:            LocationData(0x1302D7, 147, "Keyblade", "Goofy"),
-    LocationName.UltimateMushroom:        LocationData(0x1302D8, 163, "Keyblade", "Goofy"),
-    LocationName.GoofyStarting1:          LocationData(0x1302D9, 3, "Critical", "Goofy"),
-    LocationName.GoofyStarting2:          LocationData(0x1302DA, 3, "Critical", "Goofy"),
+    LocationName.AdamantShield:           LocationData(100, "Keyblade", "Goofy"),
+    LocationName.AkashicRecord:           LocationData(107, "Keyblade", "Goofy"),
+    LocationName.ChainGear:               LocationData(101, "Keyblade", "Goofy"),
+    LocationName.DreamCloud:              LocationData(104, "Keyblade", "Goofy"),
+    LocationName.FallingStar:             LocationData(103, "Keyblade", "Goofy"),
+    LocationName.FrozenPride2:            LocationData(158, "Keyblade", "Goofy"),
+    LocationName.GenjiShield:             LocationData(106, "Keyblade", "Goofy"),
+    LocationName.KnightDefender:          LocationData(105, "Keyblade", "Goofy"),
+    LocationName.KnightsShield:           LocationData(99, "Keyblade", "Goofy"),
+    LocationName.MajesticMushroom:        LocationData(161, "Keyblade", "Goofy"),
+    LocationName.MajesticMushroom2:       LocationData(162, "Keyblade", "Goofy"),
+    LocationName.NobodyGuard:             LocationData(108, "Keyblade", "Goofy"),
+    LocationName.OgreShield:              LocationData(102, "Keyblade", "Goofy"),
+    LocationName.SaveTheKing2:            LocationData(147, "Keyblade", "Goofy"),
+    LocationName.UltimateMushroom:        LocationData(163, "Keyblade", "Goofy"),
+    # LocationName.GoofyStarting1:          LocationData(3, "Critical", "Goofy"),
+    # LocationName.GoofyStarting2:          LocationData(3, "Critical", "Goofy"),
+}
+
+Atlantica_Checks = {
+    LocationName.UnderseaKingdomMap:     LocationData(367, "Chest"),
+    LocationName.MysteriousAbyss:        LocationData(287, "Chest"),  # needs 2 magnets
+    LocationName.MusicalBlizzardElement: LocationData(279, "Chest"),  # 2 magnets all thunders
+    LocationName.MusicalOrichalcumPlus:  LocationData(538, "Chest"),  # 2 magnets all thunders
+}
+
+event_location_to_item = {
+    LocationName.HostileProgramEventLocation:        ItemName.HostileProgramEvent,
+    LocationName.McpEventLocation:                   ItemName.McpEvent,
+    # LocationName.ASLarxeneEventLocation:             ItemName.ASLarxeneEvent,
+    LocationName.DataLarxeneEventLocation:           ItemName.DataLarxeneEvent,
+    LocationName.BarbosaEventLocation:               ItemName.BarbosaEvent,
+    LocationName.GrimReaper1EventLocation:           ItemName.GrimReaper1Event,
+    LocationName.GrimReaper2EventLocation:           ItemName.GrimReaper2Event,
+    LocationName.DataLuxordEventLocation:            ItemName.DataLuxordEvent,
+    LocationName.DataAxelEventLocation:              ItemName.DataAxelEvent,
+    LocationName.CerberusEventLocation:              ItemName.CerberusEvent,
+    LocationName.OlympusPeteEventLocation:           ItemName.OlympusPeteEvent,
+    LocationName.HydraEventLocation:                 ItemName.HydraEvent,
+    LocationName.OcPainAndPanicCupEventLocation: ItemName.OcPainAndPanicCupEvent,
+    LocationName.OcCerberusCupEventLocation:       ItemName.OcCerberusCupEvent,
+    LocationName.HadesEventLocation:                 ItemName.HadesEvent,
+    # LocationName.ASZexionEventLocation:              ItemName.ASZexionEvent,
+    LocationName.DataZexionEventLocation:            ItemName.DataZexionEvent,
+    LocationName.Oc2TitanCupEventLocation:         ItemName.Oc2TitanCupEvent,
+    LocationName.Oc2GofCupEventLocation:           ItemName.Oc2GofCupEvent,
+    # LocationName.Oc2CupsEventLocation:               ItemName.Oc2CupsEventLocation,
+    LocationName.HadesCupEventLocations:             ItemName.HadesCupEvents,
+    LocationName.PrisonKeeperEventLocation:          ItemName.PrisonKeeperEvent,
+    LocationName.OogieBoogieEventLocation:           ItemName.OogieBoogieEvent,
+    LocationName.ExperimentEventLocation:            ItemName.ExperimentEvent,
+    # LocationName.ASVexenEventLocation:               ItemName.ASVexenEvent,
+    LocationName.DataVexenEventLocation:             ItemName.DataVexenEvent,
+    LocationName.ShanYuEventLocation:                ItemName.ShanYuEvent,
+    LocationName.AnsemRikuEventLocation:             ItemName.AnsemRikuEvent,
+    LocationName.StormRiderEventLocation:            ItemName.StormRiderEvent,
+    LocationName.DataXigbarEventLocation:            ItemName.DataXigbarEvent,
+    LocationName.RoxasEventLocation:                 ItemName.RoxasEvent,
+    LocationName.XigbarEventLocation:                ItemName.XigbarEvent,
+    LocationName.LuxordEventLocation:                ItemName.LuxordEvent,
+    LocationName.SaixEventLocation:                  ItemName.SaixEvent,
+    LocationName.XemnasEventLocation:                ItemName.XemnasEvent,
+    LocationName.ArmoredXemnasEventLocation:         ItemName.ArmoredXemnasEvent,
+    LocationName.ArmoredXemnas2EventLocation:        ItemName.ArmoredXemnas2Event,
+    # LocationName.FinalXemnasEventLocation:           ItemName.FinalXemnasEvent,
+    LocationName.DataXemnasEventLocation:            ItemName.DataXemnasEvent,
+    LocationName.ThresholderEventLocation:           ItemName.ThresholderEvent,
+    LocationName.BeastEventLocation:                 ItemName.BeastEvent,
+    LocationName.DarkThornEventLocation:             ItemName.DarkThornEvent,
+    LocationName.XaldinEventLocation:                ItemName.XaldinEvent,
+    LocationName.DataXaldinEventLocation:            ItemName.DataXaldinEvent,
+    LocationName.TwinLordsEventLocation:             ItemName.TwinLordsEvent,
+    LocationName.GenieJafarEventLocation:            ItemName.GenieJafarEvent,
+    # LocationName.ASLexaeusEventLocation:             ItemName.ASLexaeusEvent,
+    LocationName.DataLexaeusEventLocation:           ItemName.DataLexaeusEvent,
+    LocationName.ScarEventLocation:                  ItemName.ScarEvent,
+    LocationName.GroundShakerEventLocation:          ItemName.GroundShakerEvent,
+    LocationName.DataSaixEventLocation:              ItemName.DataSaixEvent,
+    LocationName.HBDemyxEventLocation:               ItemName.HBDemyxEvent,
+    LocationName.ThousandHeartlessEventLocation:     ItemName.ThousandHeartlessEvent,
+    LocationName.Mushroom13EventLocation:            ItemName.Mushroom13Event,
+    LocationName.SephiEventLocation:                 ItemName.SephiEvent,
+    LocationName.DataDemyxEventLocation:             ItemName.DataDemyxEvent,
+    LocationName.CorFirstFightEventLocation:         ItemName.CorFirstFightEvent,
+    LocationName.CorSecondFightEventLocation:        ItemName.CorSecondFightEvent,
+    LocationName.TransportEventLocation:             ItemName.TransportEvent,
+    LocationName.OldPeteEventLocation:               ItemName.OldPeteEvent,
+    LocationName.FuturePeteEventLocation:            ItemName.FuturePeteEvent,
+    # LocationName.ASMarluxiaEventLocation:            ItemName.ASMarluxiaEvent,
+    LocationName.DataMarluxiaEventLocation:          ItemName.DataMarluxiaEvent,
+    LocationName.TerraEventLocation:                 ItemName.TerraEvent,
+    LocationName.TwilightThornEventLocation:         ItemName.TwilightThornEvent,
+    LocationName.Axel1EventLocation:                 ItemName.Axel1Event,
+    LocationName.Axel2EventLocation:                 ItemName.Axel2Event,
+    LocationName.DataRoxasEventLocation:             ItemName.DataRoxasEvent,
+}
+all_weapon_slot = {
+    LocationName.FAKESlot,
+    LocationName.DetectionSaberSlot,
+    LocationName.EdgeofUltimaSlot,
+    LocationName.KingdomKeySlot,
+    LocationName.OathkeeperSlot,
+    LocationName.OblivionSlot,
+    LocationName.StarSeekerSlot,
+    LocationName.HiddenDragonSlot,
+    LocationName.HerosCrestSlot,
+    LocationName.MonochromeSlot,
+    LocationName.FollowtheWindSlot,
+    LocationName.CircleofLifeSlot,
+    LocationName.PhotonDebuggerSlot,
+    LocationName.GullWingSlot,
+    LocationName.RumblingRoseSlot,
+    LocationName.GuardianSoulSlot,
+    LocationName.WishingLampSlot,
+    LocationName.DecisivePumpkinSlot,
+    LocationName.SweetMemoriesSlot,
+    LocationName.MysteriousAbyssSlot,
+    LocationName.SleepingLionSlot,
+    LocationName.BondofFlameSlot,
+    LocationName.TwoBecomeOneSlot,
+    LocationName.FatalCrestSlot,
+    LocationName.FenrirSlot,
+    LocationName.UltimaWeaponSlot,
+    LocationName.WinnersProofSlot,
+    LocationName.PurebloodSlot,
+
+    LocationName.Centurion2,
+    LocationName.CometStaff,
+    LocationName.HammerStaff,
+    LocationName.LordsBroom,
+    LocationName.MagesStaff,
+    LocationName.MeteorStaff,
+    LocationName.NobodyLance,
+    LocationName.PreciousMushroom,
+    LocationName.PreciousMushroom2,
+    LocationName.PremiumMushroom,
+    LocationName.RisingDragon,
+    LocationName.SaveTheQueen2,
+    LocationName.ShamansRelic,
+    LocationName.VictoryBell,
+    LocationName.WisdomWand,
+
+    LocationName.AdamantShield,
+    LocationName.AkashicRecord,
+    LocationName.ChainGear,
+    LocationName.DreamCloud,
+    LocationName.FallingStar,
+    LocationName.FrozenPride2,
+    LocationName.GenjiShield,
+    LocationName.KnightDefender,
+    LocationName.KnightsShield,
+    LocationName.MajesticMushroom,
+    LocationName.MajesticMushroom2,
+    LocationName.NobodyGuard,
+    LocationName.OgreShield,
+    LocationName.SaveTheKing2,
+    LocationName.UltimateMushroom, }
+
+all_locations = {
+    **TWTNW_Checks,
+    **TT_Checks,
+    **STT_Checks,
+    **PL_Checks,
+    **HB_Checks,
+    **HT_Checks,
+    **PR_Checks,
+    **PR_Checks,
+    **SP_Checks,
+    **BC_Checks,
+    **Oc_Checks,
+    **HundredAcre_Checks,
+    **DC_Checks,
+    **AG_Checks,
+    **LoD_Checks,
+    **SoraLevels,
+    **Form_Checks,
+    **GoA_Checks,
+    **Keyblade_Slots,
+    **Donald_Checks,
+    **Goofy_Checks,
+    **Atlantica_Checks,
+    **Summon_Checks,
+}
+
+popups_set = {
+    LocationName.SweetMemories,
+    LocationName.SpookyCaveMap,
+    LocationName.StarryHillCureElement,
+    LocationName.StarryHillOrichalcumPlus,
+    LocationName.AgrabahMap,
+    LocationName.LampCharm,
+    LocationName.WishingLamp,
+    LocationName.DarkThornCureElement,
+    LocationName.RumblingRose,
+    LocationName.CastleWallsMap,
+    LocationName.SecretAnsemReport4,
+    LocationName.DisneyCastleMap,
+    LocationName.WindowofTimeMap,
+    LocationName.Monochrome,
+    LocationName.WisdomForm,
+    LocationName.LingeringWillProofofConnection,
+    LocationName.LingeringWillManifestIllusion,
+    LocationName.OogieBoogieMagnetElement,
+    LocationName.Present,
+    LocationName.DecoyPresents,
+    LocationName.DecisivePumpkin,
+    LocationName.MarketplaceMap,
+    LocationName.MerlinsHouseMembershipCard,
+    LocationName.MerlinsHouseBlizzardElement,
+    LocationName.BaileySecretAnsemReport7,
+    LocationName.BaseballCharm,
+    LocationName.AnsemsStudyMasterForm,
+    LocationName.AnsemsStudySkillRecipe,
+    LocationName.AnsemsStudySleepingLion,
+    LocationName.FFFightsCureElement,
+    LocationName.ThousandHeartlessSecretAnsemReport1,
+    LocationName.ThousandHeartlessIceCream,
+    LocationName.ThousandHeartlessPicture,
+    LocationName.WinnersProof,
+    LocationName.ProofofPeace,
+    LocationName.SephirothFenrir,
+    LocationName.EncampmentAreaMap,
+    LocationName.Mission3,
+    LocationName.VillageCaveAreaMap,
+    LocationName.HiddenDragon,
+    LocationName.ColiseumMap,
+    LocationName.SecretAnsemReport6,
+    LocationName.OlympusStone,
+    LocationName.HerosCrest,
+    LocationName.AuronsStatue,
+    LocationName.GuardianSoul,
+    LocationName.ProtectBeltPainandPanicCup,
+    LocationName.SerenityGemPainandPanicCup,
+    LocationName.RisingDragonCerberusCup,
+    LocationName.SerenityCrystalCerberusCup,
+    LocationName.GenjiShieldTitanCup,
+    LocationName.SkillfulRingTitanCup,
+    LocationName.FatalCrestGoddessofFateCup,
+    LocationName.OrichalcumPlusGoddessofFateCup,
+    LocationName.HadesCupTrophyParadoxCups,
+    LocationName.IsladeMuertaMap,
+    LocationName.FollowtheWind,
+    LocationName.SeadriftRowCursedMedallion,
+    LocationName.SeadriftRowShipGraveyardMap,
+    LocationName.SecretAnsemReport5,
+    LocationName.CircleofLife,
+    LocationName.ScarFireElement,
+    LocationName.TwilightTownMap,
+    LocationName.MunnyPouchOlette,
+    LocationName.JunkChampionBelt,
+    LocationName.JunkMedal,
+    LocationName.TheStruggleTrophy,
+    LocationName.NaminesSketches,
+    LocationName.MansionMap,
+    LocationName.PhotonDebugger,
+    LocationName.StationPlazaSecretAnsemReport2,
+    LocationName.MunnyPouchMickey,
+    LocationName.CrystalOrb,
+    LocationName.StarSeeker,
+    LocationName.ValorForm,
+    LocationName.SeifersTrophy,
+    LocationName.Oathkeeper,
+    LocationName.LimitForm,
+    LocationName.BeamSecretAnsemReport10,
+    LocationName.BetwixtandBetweenBondofFlame,
+    LocationName.TwoBecomeOne,
+    LocationName.RoxasSecretAnsemReport8,
+    LocationName.XigbarSecretAnsemReport3,
+    LocationName.Oblivion,
+    LocationName.CastleThatNeverWasMap,
+    LocationName.LuxordSecretAnsemReport9,
+    LocationName.SaixSecretAnsemReport12,
+    LocationName.PreXemnas1SecretAnsemReport11,
+    LocationName.Xemnas1SecretAnsemReport13,
+    LocationName.XemnasDataPowerBoost,
+    LocationName.AxelDataMagicBoost,
+    LocationName.RoxasDataMagicBoost,
+    LocationName.SaixDataDefenseBoost,
+    LocationName.DemyxDataAPBoost,
+    LocationName.LuxordDataAPBoost,
+    LocationName.VexenDataLostIllusion,
+    LocationName.LarxeneDataLostIllusion,
+    LocationName.XaldinDataDefenseBoost,
+    LocationName.MarluxiaDataLostIllusion,
+    LocationName.LexaeusDataLostIllusion,
+    LocationName.XigbarDataDefenseBoost,
+    LocationName.VexenASRoadtoDiscovery,
+    LocationName.LarxeneASCloakedThunder,
+    LocationName.ZexionASBookofShadows,
+    LocationName.ZexionDataLostIllusion,
+    LocationName.LexaeusASStrengthBeyondStrength,
+    LocationName.MarluxiaASEternalBlossom,
+    LocationName.UnderseaKingdomMap,
+    LocationName.MysteriousAbyss,
+    LocationName.MusicalBlizzardElement,
+    LocationName.MusicalOrichalcumPlus,
 }
 exclusion_table = {
-    "Popups":        {
-        LocationName.SweetMemories,
-        LocationName.SpookyCaveMap,
-        LocationName.StarryHillCureElement,
-        LocationName.StarryHillOrichalcumPlus,
-        LocationName.AgrabahMap,
-        LocationName.LampCharm,
-        LocationName.WishingLamp,
-        LocationName.DarkThornCureElement,
-        LocationName.RumblingRose,
-        LocationName.CastleWallsMap,
-        LocationName.SecretAnsemReport4,
-        LocationName.DisneyCastleMap,
-        LocationName.WindowofTimeMap,
-        LocationName.Monochrome,
-        LocationName.WisdomForm,
+    "SuperBosses":   {
+        LocationName.LingeringWillBonus,
         LocationName.LingeringWillProofofConnection,
         LocationName.LingeringWillManifestIllusion,
-        LocationName.OogieBoogieMagnetElement,
-        LocationName.Present,
-        LocationName.DecoyPresents,
-        LocationName.DecisivePumpkin,
-        LocationName.MarketplaceMap,
-        LocationName.MerlinsHouseMembershipCard,
-        LocationName.MerlinsHouseBlizzardElement,
-        LocationName.BaileySecretAnsemReport7,
-        LocationName.BaseballCharm,
-        LocationName.AnsemsStudyMasterForm,
-        LocationName.AnsemsStudySkillRecipe,
-        LocationName.AnsemsStudySleepingLion,
-        LocationName.FFFightsCureElement,
-        LocationName.ThousandHeartlessSecretAnsemReport1,
-        LocationName.ThousandHeartlessIceCream,
-        LocationName.ThousandHeartlessPicture,
-        LocationName.WinnersProof,
-        LocationName.ProofofPeace,
+        LocationName.SephirothBonus,
         LocationName.SephirothFenrir,
-        LocationName.EncampmentAreaMap,
-        LocationName.Mission3,
-        LocationName.VillageCaveAreaMap,
-        LocationName.HiddenDragon,
-        LocationName.ColiseumMap,
-        LocationName.SecretAnsemReport6,
-        LocationName.OlympusStone,
-        LocationName.HerosCrest,
-        LocationName.AuronsStatue,
-        LocationName.GuardianSoul,
-        LocationName.ProtectBeltPainandPanicCup,
-        LocationName.SerenityGemPainandPanicCup,
-        LocationName.RisingDragonCerberusCup,
-        LocationName.SerenityCrystalCerberusCup,
-        LocationName.GenjiShieldTitanCup,
-        LocationName.SkillfulRingTitanCup,
-        LocationName.FatalCrestGoddessofFateCup,
-        LocationName.OrichalcumPlusGoddessofFateCup,
-        LocationName.HadesCupTrophyParadoxCups,
-        LocationName.IsladeMuertaMap,
-        LocationName.FollowtheWind,
-        LocationName.SeadriftRowCursedMedallion,
-        LocationName.SeadriftRowShipGraveyardMap,
-        LocationName.SecretAnsemReport5,
-        LocationName.CircleofLife,
-        LocationName.ScarFireElement,
-        LocationName.TwilightTownMap,
-        LocationName.MunnyPouchOlette,
-        LocationName.JunkChampionBelt,
-        LocationName.JunkMedal,
-        LocationName.TheStruggleTrophy,
-        LocationName.NaminesSketches,
-        LocationName.MansionMap,
-        LocationName.PhotonDebugger,
-        LocationName.StationPlazaSecretAnsemReport2,
-        LocationName.MunnyPouchMickey,
-        LocationName.CrystalOrb,
-        LocationName.StarSeeker,
-        LocationName.ValorForm,
-        LocationName.SeifersTrophy,
-        LocationName.Oathkeeper,
-        LocationName.LimitForm,
-        LocationName.BeamSecretAnsemReport10,
-        LocationName.BetwixtandBetweenBondofFlame,
-        LocationName.TwoBecomeOne,
-        LocationName.RoxasSecretAnsemReport8,
-        LocationName.XigbarSecretAnsemReport3,
-        LocationName.Oblivion,
-        LocationName.CastleThatNeverWasMap,
-        LocationName.LuxordSecretAnsemReport9,
-        LocationName.SaixSecretAnsemReport12,
-        LocationName.PreXemnas1SecretAnsemReport11,
-        LocationName.Xemnas1SecretAnsemReport13,
-        LocationName.XemnasDataPowerBoost,
-        LocationName.AxelDataMagicBoost,
-        LocationName.RoxasDataMagicBoost,
-        LocationName.SaixDataDefenseBoost,
-        LocationName.DemyxDataAPBoost,
-        LocationName.LuxordDataAPBoost,
-        LocationName.VexenDataLostIllusion,
-        LocationName.LarxeneDataLostIllusion,
-        LocationName.XaldinDataDefenseBoost,
-        LocationName.MarluxiaDataLostIllusion,
-        LocationName.LexaeusDataLostIllusion,
-        LocationName.XigbarDataDefenseBoost,
-        LocationName.VexenASRoadtoDiscovery,
-        LocationName.LarxeneASCloakedThunder,
-        LocationName.ZexionASBookofShadows,
-        LocationName.ZexionDataLostIllusion,
-        LocationName.LexaeusASStrengthBeyondStrength,
-        LocationName.MarluxiaASEternalBlossom
-    },
-    "Datas":         {
         LocationName.XemnasDataPowerBoost,
         LocationName.AxelDataMagicBoost,
         LocationName.RoxasDataMagicBoost,
@@ -985,13 +1106,7 @@ exclusion_table = {
         LocationName.ZexionDataLostIllusion,
         LocationName.ZexionBonus,
         LocationName.ZexionASBookofShadows,
-    },
-    "SuperBosses":   {
-        LocationName.LingeringWillBonus,
-        LocationName.LingeringWillProofofConnection,
-        LocationName.LingeringWillManifestIllusion,
-        LocationName.SephirothBonus,
-        LocationName.SephirothFenrir,
+        LocationName.GoofyZexion,
     },
 
     # 23 checks spread through 50 levels
@@ -1148,15 +1263,6 @@ exclusion_table = {
         LocationName.Lvl98,
         LocationName.Lvl99,
     },
-    "Critical":      {
-        LocationName.Crit_1,
-        LocationName.Crit_2,
-        LocationName.Crit_3,
-        LocationName.Crit_4,
-        LocationName.Crit_5,
-        LocationName.Crit_6,
-        LocationName.Crit_7,
-    },
     "Hitlist":       [
         LocationName.XemnasDataPowerBoost,
         LocationName.AxelDataMagicBoost,
@@ -1179,9 +1285,11 @@ exclusion_table = {
         LocationName.Limitlvl7,
         LocationName.Masterlvl7,
         LocationName.Finallvl7,
+        LocationName.Summonlvl7,
         LocationName.TransporttoRemembrance,
         LocationName.OrichalcumPlusGoddessofFateCup,
         LocationName.HadesCupTrophyParadoxCups,
+        LocationName.MusicalOrichalcumPlus,
     ],
     "Cups":          {
         LocationName.ProtectBeltPainandPanicCup,
@@ -1194,6 +1302,12 @@ exclusion_table = {
         LocationName.OrichalcumPlusGoddessofFateCup,
         LocationName.HadesCupTrophyParadoxCups,
     },
+    "Atlantica":     {
+        LocationName.MysteriousAbyss,
+        LocationName.MusicalOrichalcumPlus,
+        LocationName.MusicalBlizzardElement,
+        LocationName.UnderseaKingdomMap,
+    },
     "WeaponSlots":   {
         LocationName.FAKESlot:            ItemName.ValorForm,
         LocationName.DetectionSaberSlot:  ItemName.MasterForm,
@@ -1244,536 +1358,6 @@ exclusion_table = {
         LocationName.Centurion2:          ItemName.Centurion2,
     },
     "Chests":        {
-        LocationName.BambooGroveDarkShard,
-        LocationName.BambooGroveEther,
-        LocationName.BambooGroveMythrilShard,
-        LocationName.CheckpointHiPotion,
-        LocationName.CheckpointMythrilShard,
-        LocationName.MountainTrailLightningShard,
-        LocationName.MountainTrailRecoveryRecipe,
-        LocationName.MountainTrailEther,
-        LocationName.MountainTrailMythrilShard,
-        LocationName.VillageCaveAPBoost,
-        LocationName.VillageCaveDarkShard,
-        LocationName.RidgeFrostShard,
-        LocationName.RidgeAPBoost,
-        LocationName.ThroneRoomTornPages,
-        LocationName.ThroneRoomPalaceMap,
-        LocationName.ThroneRoomAPBoost,
-        LocationName.ThroneRoomQueenRecipe,
-        LocationName.ThroneRoomAPBoost2,
-        LocationName.ThroneRoomOgreShield,
-        LocationName.ThroneRoomMythrilCrystal,
-        LocationName.ThroneRoomOrichalcum,
-        LocationName.AgrabahDarkShard,
-        LocationName.AgrabahMythrilShard,
-        LocationName.AgrabahHiPotion,
-        LocationName.AgrabahAPBoost,
-        LocationName.AgrabahMythrilStone,
-        LocationName.AgrabahMythrilShard2,
-        LocationName.AgrabahSerenityShard,
-        LocationName.BazaarMythrilGem,
-        LocationName.BazaarPowerShard,
-        LocationName.BazaarHiPotion,
-        LocationName.BazaarAPBoost,
-        LocationName.BazaarMythrilShard,
-        LocationName.PalaceWallsSkillRing,
-        LocationName.PalaceWallsMythrilStone,
-        LocationName.CaveEntrancePowerStone,
-        LocationName.CaveEntranceMythrilShard,
-        LocationName.ValleyofStoneMythrilStone,
-        LocationName.ValleyofStoneAPBoost,
-        LocationName.ValleyofStoneMythrilShard,
-        LocationName.ValleyofStoneHiPotion,
-        LocationName.ChasmofChallengesCaveofWondersMap,
-        LocationName.ChasmofChallengesAPBoost,
-        LocationName.TreasureRoomAPBoost,
-        LocationName.TreasureRoomSerenityGem,
-        LocationName.RuinedChamberTornPages,
-        LocationName.RuinedChamberRuinsMap,
-        LocationName.DCCourtyardMythrilShard,
-        LocationName.DCCourtyardStarRecipe,
-        LocationName.DCCourtyardAPBoost,
-        LocationName.DCCourtyardMythrilStone,
-        LocationName.DCCourtyardBlazingStone,
-        LocationName.DCCourtyardBlazingShard,
-        LocationName.DCCourtyardMythrilShard2,
-        LocationName.LibraryTornPages,
-        LocationName.CornerstoneHillMap,
-        LocationName.CornerstoneHillFrostShard,
-        LocationName.PierMythrilShard,
-        LocationName.PierHiPotion,
-        LocationName.WaterwayMythrilStone,
-        LocationName.WaterwayAPBoost,
-        LocationName.WaterwayFrostStone,
-        LocationName.PoohsHouse100AcreWoodMap,
-        LocationName.PoohsHouseAPBoost,
-        LocationName.PoohsHouseMythrilStone,
-        LocationName.PigletsHouseDefenseBoost,
-        LocationName.PigletsHouseAPBoost,
-        LocationName.PigletsHouseMythrilGem,
-        LocationName.RabbitsHouseDrawRing,
-        LocationName.RabbitsHouseMythrilCrystal,
-        LocationName.RabbitsHouseAPBoost,
-        LocationName.KangasHouseMagicBoost,
-        LocationName.KangasHouseAPBoost,
-        LocationName.KangasHouseOrichalcum,
-        LocationName.SpookyCaveMythrilGem,
-        LocationName.SpookyCaveAPBoost,
-        LocationName.SpookyCaveOrichalcum,
-        LocationName.SpookyCaveGuardRecipe,
-        LocationName.SpookyCaveMythrilCrystal,
-        LocationName.SpookyCaveAPBoost2,
-        LocationName.StarryHillCosmicRing,
-        LocationName.StarryHillStyleRecipe,
-        LocationName.RampartNavalMap,
-        LocationName.RampartMythrilStone,
-        LocationName.RampartDarkShard,
-        LocationName.TownDarkStone,
-        LocationName.TownAPBoost,
-        LocationName.TownMythrilShard,
-        LocationName.TownMythrilGem,
-        LocationName.CaveMouthBrightShard,
-        LocationName.CaveMouthMythrilShard,
-        LocationName.PowderStoreAPBoost1,
-        LocationName.PowderStoreAPBoost2,
-        LocationName.MoonlightNookMythrilShard,
-        LocationName.MoonlightNookSerenityGem,
-        LocationName.MoonlightNookPowerStone,
-        LocationName.InterceptorsHoldFeatherCharm,
-        LocationName.SeadriftKeepAPBoost,
-        LocationName.SeadriftKeepOrichalcum,
-        LocationName.SeadriftKeepMeteorStaff,
-        LocationName.SeadriftRowSerenityGem,
-        LocationName.SeadriftRowKingRecipe,
-        LocationName.SeadriftRowMythrilCrystal,
-        LocationName.PassageMythrilShard,
-        LocationName.PassageMythrilStone,
-        LocationName.PassageEther,
-        LocationName.PassageAPBoost,
-        LocationName.PassageHiPotion,
-        LocationName.InnerChamberUnderworldMap,
-        LocationName.InnerChamberMythrilShard,
-        LocationName.UnderworldEntrancePowerBoost,
-        LocationName.CavernsEntranceLucidShard,
-        LocationName.CavernsEntranceAPBoost,
-        LocationName.CavernsEntranceMythrilShard,
-        LocationName.TheLostRoadBrightShard,
-        LocationName.TheLostRoadEther,
-        LocationName.TheLostRoadMythrilShard,
-        LocationName.TheLostRoadMythrilStone,
-        LocationName.AtriumLucidStone,
-        LocationName.AtriumAPBoost,
-        LocationName.TheLockCavernsMap,
-        LocationName.TheLockMythrilShard,
-        LocationName.TheLockAPBoost,
-        LocationName.BCCourtyardAPBoost,
-        LocationName.BCCourtyardHiPotion,
-        LocationName.BCCourtyardMythrilShard,
-        LocationName.BellesRoomCastleMap,
-        LocationName.BellesRoomMegaRecipe,
-        LocationName.TheEastWingMythrilShard,
-        LocationName.TheEastWingTent,
-        LocationName.TheWestHallHiPotion,
-        LocationName.TheWestHallPowerShard,
-        LocationName.TheWestHallMythrilShard2,
-        LocationName.TheWestHallBrightStone,
-        LocationName.TheWestHallMythrilShard,
-        LocationName.DungeonBasementMap,
-        LocationName.DungeonAPBoost,
-        LocationName.SecretPassageMythrilShard,
-        LocationName.SecretPassageHiPotion,
-        LocationName.SecretPassageLucidShard,
-        LocationName.TheWestHallAPBoostPostDungeon,
-        LocationName.TheWestWingMythrilShard,
-        LocationName.TheWestWingTent,
-        LocationName.TheBeastsRoomBlazingShard,
-        LocationName.PitCellAreaMap,
-        LocationName.PitCellMythrilCrystal,
-        LocationName.CanyonDarkCrystal,
-        LocationName.CanyonMythrilStone,
-        LocationName.CanyonMythrilGem,
-        LocationName.CanyonFrostCrystal,
-        LocationName.HallwayPowerCrystal,
-        LocationName.HallwayAPBoost,
-        LocationName.CommunicationsRoomIOTowerMap,
-        LocationName.CommunicationsRoomGaiaBelt,
-        LocationName.CentralComputerCoreAPBoost,
-        LocationName.CentralComputerCoreOrichalcumPlus,
-        LocationName.CentralComputerCoreCosmicArts,
-        LocationName.CentralComputerCoreMap,
-        LocationName.GraveyardMythrilShard,
-        LocationName.GraveyardSerenityGem,
-        LocationName.FinklesteinsLabHalloweenTownMap,
-        LocationName.TownSquareMythrilStone,
-        LocationName.TownSquareEnergyShard,
-        LocationName.HinterlandsLightningShard,
-        LocationName.HinterlandsMythrilStone,
-        LocationName.HinterlandsAPBoost,
-        LocationName.CandyCaneLaneMegaPotion,
-        LocationName.CandyCaneLaneMythrilGem,
-        LocationName.CandyCaneLaneLightningStone,
-        LocationName.CandyCaneLaneMythrilStone,
-        LocationName.SantasHouseChristmasTownMap,
-        LocationName.SantasHouseAPBoost,
-        LocationName.BoroughDriveRecovery,
-        LocationName.BoroughAPBoost,
-        LocationName.BoroughHiPotion,
-        LocationName.BoroughMythrilShard,
-        LocationName.BoroughDarkShard,
-        LocationName.PosternCastlePerimeterMap,
-        LocationName.PosternMythrilGem,
-        LocationName.PosternAPBoost,
-        LocationName.CorridorsMythrilStone,
-        LocationName.CorridorsMythrilCrystal,
-        LocationName.CorridorsDarkCrystal,
-        LocationName.CorridorsAPBoost,
-        LocationName.AnsemsStudyUkuleleCharm,
-        LocationName.RestorationSiteMoonRecipe,
-        LocationName.RestorationSiteAPBoost,
-        LocationName.CoRDepthsAPBoost,
-        LocationName.CoRDepthsPowerCrystal,
-        LocationName.CoRDepthsFrostCrystal,
-        LocationName.CoRDepthsManifestIllusion,
-        LocationName.CoRDepthsAPBoost2,
-        LocationName.CoRMineshaftLowerLevelDepthsofRemembranceMap,
-        LocationName.CoRMineshaftLowerLevelAPBoost,
-        LocationName.CrystalFissureTornPages,
-        LocationName.CrystalFissureTheGreatMawMap,
-        LocationName.CrystalFissureEnergyCrystal,
-        LocationName.CrystalFissureAPBoost,
-        LocationName.PosternGullWing,
-        LocationName.HeartlessManufactoryCosmicChain,
-        LocationName.CoRDepthsUpperLevelRemembranceGem,
-        LocationName.CoRMiningAreaSerenityGem,
-        LocationName.CoRMiningAreaAPBoost,
-        LocationName.CoRMiningAreaSerenityCrystal,
-        LocationName.CoRMiningAreaManifestIllusion,
-        LocationName.CoRMiningAreaSerenityGem2,
-        LocationName.CoRMiningAreaDarkRemembranceMap,
-        LocationName.CoRMineshaftMidLevelPowerBoost,
-        LocationName.CoREngineChamberSerenityCrystal,
-        LocationName.CoREngineChamberRemembranceCrystal,
-        LocationName.CoREngineChamberAPBoost,
-        LocationName.CoREngineChamberManifestIllusion,
-        LocationName.CoRMineshaftUpperLevelMagicBoost,
-        LocationName.CoRMineshaftUpperLevelAPBoost,
-        LocationName.GorgeSavannahMap,
-        LocationName.GorgeDarkGem,
-        LocationName.GorgeMythrilStone,
-        LocationName.ElephantGraveyardFrostGem,
-        LocationName.ElephantGraveyardMythrilStone,
-        LocationName.ElephantGraveyardBrightStone,
-        LocationName.ElephantGraveyardAPBoost,
-        LocationName.ElephantGraveyardMythrilShard,
-        LocationName.PrideRockMap,
-        LocationName.PrideRockMythrilStone,
-        LocationName.PrideRockSerenityCrystal,
-        LocationName.WildebeestValleyEnergyStone,
-        LocationName.WildebeestValleyAPBoost,
-        LocationName.WildebeestValleyMythrilGem,
-        LocationName.WildebeestValleyMythrilStone,
-        LocationName.WildebeestValleyLucidGem,
-        LocationName.WastelandsMythrilShard,
-        LocationName.WastelandsSerenityGem,
-        LocationName.WastelandsMythrilStone,
-        LocationName.JungleSerenityGem,
-        LocationName.JungleMythrilStone,
-        LocationName.JungleSerenityCrystal,
-        LocationName.OasisMap,
-        LocationName.OasisTornPages,
-        LocationName.OasisAPBoost,
-        LocationName.StationofCallingPotion,
-        LocationName.CentralStationPotion1,
-        LocationName.STTCentralStationHiPotion,
-        LocationName.CentralStationPotion2,
-        LocationName.SunsetTerraceAbilityRing,
-        LocationName.SunsetTerraceHiPotion,
-        LocationName.SunsetTerracePotion1,
-        LocationName.SunsetTerracePotion2,
-        LocationName.MansionFoyerHiPotion,
-        LocationName.MansionFoyerPotion1,
-        LocationName.MansionFoyerPotion2,
-        LocationName.MansionDiningRoomElvenBandanna,
-        LocationName.MansionDiningRoomPotion,
-        LocationName.MansionLibraryHiPotion,
-        LocationName.MansionBasementCorridorHiPotion,
-        LocationName.OldMansionPotion,
-        LocationName.OldMansionMythrilShard,
-        LocationName.TheWoodsPotion,
-        LocationName.TheWoodsMythrilShard,
-        LocationName.TheWoodsHiPotion,
-        LocationName.TramCommonHiPotion,
-        LocationName.TramCommonAPBoost,
-        LocationName.TramCommonTent,
-        LocationName.TramCommonMythrilShard1,
-        LocationName.TramCommonPotion1,
-        LocationName.TramCommonMythrilShard2,
-        LocationName.TramCommonPotion2,
-        LocationName.CentralStationTent,
-        LocationName.TTCentralStationHiPotion,
-        LocationName.CentralStationMythrilShard,
-        LocationName.TheTowerPotion,
-        LocationName.TheTowerHiPotion,
-        LocationName.TheTowerEther,
-        LocationName.TowerEntrywayEther,
-        LocationName.TowerEntrywayMythrilShard,
-        LocationName.SorcerersLoftTowerMap,
-        LocationName.TowerWardrobeMythrilStone,
-        LocationName.UndergroundConcourseMythrilGem,
-        LocationName.UndergroundConcourseAPBoost,
-        LocationName.UndergroundConcourseMythrilCrystal,
-        LocationName.UndergroundConcourseOrichalcum,
-        LocationName.TunnelwayOrichalcum,
-        LocationName.TunnelwayMythrilCrystal,
-        LocationName.SunsetTerraceOrichalcumPlus,
-        LocationName.SunsetTerraceMythrilShard,
-        LocationName.SunsetTerraceMythrilCrystal,
-        LocationName.SunsetTerraceAPBoost,
-        LocationName.MansionFoyerMythrilCrystal,
-        LocationName.MansionFoyerMythrilStone,
-        LocationName.MansionFoyerSerenityCrystal,
-        LocationName.MansionDiningRoomMythrilCrystal,
-        LocationName.MansionDiningRoomMythrilStone,
-        LocationName.MansionLibraryOrichalcum,
-        LocationName.MansionBasementCorridorUltimateRecipe,
-        LocationName.FragmentCrossingMythrilStone,
-        LocationName.FragmentCrossingMythrilCrystal,
-        LocationName.FragmentCrossingAPBoost,
-        LocationName.FragmentCrossingOrichalcum,
-        LocationName.MemorysSkyscaperMythrilCrystal,
-        LocationName.MemorysSkyscaperAPBoost,
-        LocationName.MemorysSkyscaperMythrilStone,
-        LocationName.TheBrinkofDespairDarkCityMap,
-        LocationName.TheBrinkofDespairOrichalcumPlus,
-        LocationName.NothingsCallMythrilGem,
-        LocationName.NothingsCallOrichalcum,
-        LocationName.TwilightsViewCosmicBelt,
-        LocationName.NaughtsSkywayMythrilGem,
-        LocationName.NaughtsSkywayOrichalcum,
-        LocationName.NaughtsSkywayMythrilCrystal,
-        LocationName.RuinandCreationsPassageMythrilStone,
-        LocationName.RuinandCreationsPassageAPBoost,
-        LocationName.RuinandCreationsPassageMythrilCrystal,
-        LocationName.RuinandCreationsPassageOrichalcum,
-        LocationName.GardenofAssemblageMap,
-        LocationName.GoALostIllusion,
-        LocationName.ProofofNonexistence,
+        location for location, data in all_locations.items() if location not in event_location_to_item.keys() and location not in popups_set and location != LocationName.StationofSerenityPotion and data.yml == "Chest"
     }
 }
-
-AllWeaponSlot = {
-    LocationName.FAKESlot,
-    LocationName.DetectionSaberSlot,
-    LocationName.EdgeofUltimaSlot,
-    LocationName.KingdomKeySlot,
-    LocationName.OathkeeperSlot,
-    LocationName.OblivionSlot,
-    LocationName.StarSeekerSlot,
-    LocationName.HiddenDragonSlot,
-    LocationName.HerosCrestSlot,
-    LocationName.MonochromeSlot,
-    LocationName.FollowtheWindSlot,
-    LocationName.CircleofLifeSlot,
-    LocationName.PhotonDebuggerSlot,
-    LocationName.GullWingSlot,
-    LocationName.RumblingRoseSlot,
-    LocationName.GuardianSoulSlot,
-    LocationName.WishingLampSlot,
-    LocationName.DecisivePumpkinSlot,
-    LocationName.SweetMemoriesSlot,
-    LocationName.MysteriousAbyssSlot,
-    LocationName.SleepingLionSlot,
-    LocationName.BondofFlameSlot,
-    LocationName.TwoBecomeOneSlot,
-    LocationName.FatalCrestSlot,
-    LocationName.FenrirSlot,
-    LocationName.UltimaWeaponSlot,
-    LocationName.WinnersProofSlot,
-    LocationName.PurebloodSlot,
-    LocationName.Centurion2,
-    LocationName.CometStaff,
-    LocationName.HammerStaff,
-    LocationName.LordsBroom,
-    LocationName.MagesStaff,
-    LocationName.MeteorStaff,
-    LocationName.NobodyLance,
-    LocationName.PreciousMushroom,
-    LocationName.PreciousMushroom2,
-    LocationName.PremiumMushroom,
-    LocationName.RisingDragon,
-    LocationName.SaveTheQueen2,
-    LocationName.ShamansRelic,
-    LocationName.VictoryBell,
-    LocationName.WisdomWand,
-
-    LocationName.AdamantShield,
-    LocationName.AkashicRecord,
-    LocationName.ChainGear,
-    LocationName.DreamCloud,
-    LocationName.FallingStar,
-    LocationName.FrozenPride2,
-    LocationName.GenjiShield,
-    LocationName.KnightDefender,
-    LocationName.KnightsShield,
-    LocationName.MajesticMushroom,
-    LocationName.MajesticMushroom2,
-    LocationName.NobodyGuard,
-    LocationName.OgreShield,
-    LocationName.SaveTheKing2,
-    LocationName.UltimateMushroom, }
-RegionTable = {
-    "FirstVisits":  {
-        RegionName.LoD_Region,
-        RegionName.Ag_Region,
-        RegionName.Dc_Region,
-        RegionName.Pr_Region,
-        RegionName.Oc_Region,
-        RegionName.Bc_Region,
-        RegionName.Sp_Region,
-        RegionName.Ht_Region,
-        RegionName.Hb_Region,
-        RegionName.Pl_Region,
-        RegionName.STT_Region,
-        RegionName.TT_Region,
-        RegionName.Twtnw_Region,
-    },
-    "SecondVisits": {
-        RegionName.LoD2_Region,
-        RegionName.Ag2_Region,
-        RegionName.Tr_Region,
-        RegionName.Pr2_Region,
-        RegionName.Oc2_Region,
-        RegionName.Bc2_Region,
-        RegionName.Sp2_Region,
-        RegionName.Ht2_Region,
-        RegionName.Hb2_Region,
-        RegionName.Pl2_Region,
-        RegionName.STT_Region,
-        RegionName.Twtnw2_Region,
-    },
-    "ValorRegion":  {
-        RegionName.LoD_Region,
-        RegionName.Ag_Region,
-        RegionName.Dc_Region,
-        RegionName.Pr_Region,
-        RegionName.Oc_Region,
-        RegionName.Bc_Region,
-        RegionName.Sp_Region,
-        RegionName.Ht_Region,
-        RegionName.Hb_Region,
-        RegionName.TT_Region,
-        RegionName.Twtnw_Region,
-    },
-    "WisdomRegion": {
-        RegionName.LoD_Region,
-        RegionName.Ag_Region,
-        RegionName.Dc_Region,
-        RegionName.Pr_Region,
-        RegionName.Oc_Region,
-        RegionName.Bc_Region,
-        RegionName.Sp_Region,
-        RegionName.Ht_Region,
-        RegionName.Hb_Region,
-        RegionName.TT_Region,
-        RegionName.Twtnw_Region,
-    },
-    "LimitRegion":  {
-        RegionName.LoD_Region,
-        RegionName.Ag_Region,
-        RegionName.Dc_Region,
-        RegionName.Pr_Region,
-        RegionName.Oc_Region,
-        RegionName.Bc_Region,
-        RegionName.Sp_Region,
-        RegionName.Ht_Region,
-        RegionName.Hb_Region,
-        RegionName.TT_Region,
-        RegionName.Twtnw_Region,
-        RegionName.STT_Region,
-    },
-    "MasterRegion": {
-        RegionName.LoD_Region,
-        RegionName.Ag_Region,
-        RegionName.Dc_Region,
-        RegionName.Pr_Region,
-        RegionName.Oc_Region,
-        RegionName.Bc_Region,
-        RegionName.Sp_Region,
-        RegionName.Ht_Region,
-        RegionName.Hb_Region,
-        RegionName.TT_Region,
-        RegionName.Twtnw_Region,
-    },  # could add lod2 and bc2 as an option since those spawns are rng
-    "FinalRegion":  {
-        RegionName.TT3_Region,
-        RegionName.Twtnw_PostRoxas,
-        RegionName.Twtnw2_Region,
-    }
-}
-
-all_locations = {
-    **TWTNW_Checks,
-    **TWTNW2_Checks,
-    **TT_Checks,
-    **TT2_Checks,
-    **TT3_Checks,
-    **STT_Checks,
-    **PL_Checks,
-    **PL2_Checks,
-    **CoR_Checks,
-    **HB_Checks,
-    **HB2_Checks,
-    **HT_Checks,
-    **HT2_Checks,
-    **PR_Checks,
-    **PR2_Checks,
-    **PR_Checks,
-    **PR2_Checks,
-    **SP_Checks,
-    **SP2_Checks,
-    **BC_Checks,
-    **BC2_Checks,
-    **Oc_Checks,
-    **Oc2_Checks,
-    **Oc2Cups,
-    **HundredAcre1_Checks,
-    **HundredAcre2_Checks,
-    **HundredAcre3_Checks,
-    **HundredAcre4_Checks,
-    **HundredAcre5_Checks,
-    **HundredAcre6_Checks,
-    **DC_Checks,
-    **TR_Checks,
-    **AG_Checks,
-    **AG2_Checks,
-    **LoD_Checks,
-    **LoD2_Checks,
-    **SoraLevels,
-    **Form_Checks,
-    **GoA_Checks,
-    **Keyblade_Slots,
-    **Critical_Checks,
-    **Donald_Checks,
-    **Goofy_Checks,
-}
-
-location_table = {}
-
-
-def setup_locations():
-    totallocation_table = {**TWTNW_Checks, **TWTNW2_Checks, **TT_Checks, **TT2_Checks, **TT3_Checks, **STT_Checks,
-                           **PL_Checks, **PL2_Checks, **CoR_Checks, **HB_Checks, **HB2_Checks,
-                           **PR_Checks, **PR2_Checks, **PR_Checks, **PR2_Checks, **SP_Checks, **SP2_Checks, **BC_Checks,
-                           **BC2_Checks, **HT_Checks, **HT2_Checks,
-                           **Oc_Checks, **Oc2_Checks, **Oc2Cups, **Critical_Checks, **Donald_Checks, **Goofy_Checks,
-                           **HundredAcre1_Checks, **HundredAcre2_Checks, **HundredAcre3_Checks, **HundredAcre4_Checks,
-                           **HundredAcre5_Checks, **HundredAcre6_Checks,
-                           **DC_Checks, **TR_Checks, **AG_Checks, **AG2_Checks, **LoD_Checks, **LoD2_Checks,
-                           **SoraLevels,
-                           **Form_Checks, **GoA_Checks, **Keyblade_Slots}
-    return totallocation_table
-
-
-lookup_id_to_Location: typing.Dict[int, str] = {data.code: item_name for item_name, data in location_table.items() if
-                                                data.code}
diff --git a/worlds/kh2/Logic.py b/worlds/kh2/Logic.py
new file mode 100644
index 0000000000..1f13aa5f02
--- /dev/null
+++ b/worlds/kh2/Logic.py
@@ -0,0 +1,642 @@
+from .Names import ItemName, RegionName, LocationName
+
+# this file contains the dicts,lists and sets used for making rules in rules.py
+base_tools = [
+    ItemName.FinishingPlus,
+    ItemName.Guard,
+    ItemName.AerialRecovery
+]
+gap_closer = [
+    ItemName.SlideDash,
+    ItemName.FlashStep
+]
+defensive_tool = [
+    ItemName.ReflectElement,
+    ItemName.Guard
+]
+form_list = [
+    ItemName.ValorForm,
+    ItemName.WisdomForm,
+    ItemName.LimitForm,
+    ItemName.MasterForm,
+    ItemName.FinalForm
+]
+form_list_without_final = [
+    ItemName.ValorForm,
+    ItemName.WisdomForm,
+    ItemName.LimitForm,
+    ItemName.MasterForm
+]
+ground_finisher = [
+    ItemName.GuardBreak,
+    ItemName.Explosion,
+    ItemName.FinishingLeap
+]
+party_limit = [
+    ItemName.Fantasia,
+    ItemName.FlareForce,
+    ItemName.Teamwork,
+    ItemName.TornadoFusion
+]
+donald_limit = [
+    ItemName.Fantasia,
+    ItemName.FlareForce
+]
+aerial_move = [
+    ItemName.AerialDive,
+    ItemName.AerialSpiral,
+    ItemName.HorizontalSlash,
+    ItemName.AerialSweep,
+    ItemName.AerialFinish
+]
+level_3_form_loc = [
+    LocationName.Valorlvl3,
+    LocationName.Wisdomlvl3,
+    LocationName.Limitlvl3,
+    LocationName.Masterlvl3,
+    LocationName.Finallvl3
+]
+black_magic = [
+    ItemName.FireElement,
+    ItemName.BlizzardElement,
+    ItemName.ThunderElement
+]
+magic = [
+    ItemName.FireElement,
+    ItemName.BlizzardElement,
+    ItemName.ThunderElement,
+    ItemName.ReflectElement,
+    ItemName.CureElement,
+    ItemName.MagnetElement
+]
+summons = [
+    ItemName.ChickenLittle,
+    ItemName.Stitch,
+    ItemName.Genie,
+    ItemName.PeterPan
+]
+three_proofs = [
+    ItemName.ProofofConnection,
+    ItemName.ProofofPeace,
+    ItemName.ProofofNonexistence
+]
+
+auto_form_dict = {
+    ItemName.FinalForm:  ItemName.AutoFinal,
+    ItemName.MasterForm: ItemName.AutoMaster,
+    ItemName.LimitForm:  ItemName.AutoLimit,
+    ItemName.WisdomForm: ItemName.AutoWisdom,
+    ItemName.ValorForm:  ItemName.AutoValor,
+}
+
+# could use comprehension for getting a list of the region objects but eh I like this more
+drive_form_list = [RegionName.Valor, RegionName.Wisdom, RegionName.Limit, RegionName.Master, RegionName.Final, RegionName.Summon]
+
+easy_data_xigbar_tools = {
+    ItemName.FinishingPlus:   1,
+    ItemName.Guard:           1,
+    ItemName.AerialDive:      1,
+    ItemName.HorizontalSlash: 1,
+    ItemName.AirComboPlus:    2,
+    ItemName.FireElement:     3,
+    ItemName.ReflectElement:  3,
+}
+normal_data_xigbar_tools = {
+    ItemName.FinishingPlus:   1,
+    ItemName.Guard:           1,
+    ItemName.HorizontalSlash: 1,
+    ItemName.FireElement:     3,
+    ItemName.ReflectElement:  3,
+}
+
+easy_data_lex_tools = {
+    ItemName.Guard:          1,
+    ItemName.FireElement:    3,
+    ItemName.ReflectElement: 2,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1
+}
+normal_data_lex_tools = {
+    ItemName.Guard:          1,
+    ItemName.FireElement:    3,
+    ItemName.ReflectElement: 1,
+}
+
+easy_data_marluxia_tools = {
+    ItemName.Guard:          1,
+    ItemName.FireElement:    3,
+    ItemName.ReflectElement: 2,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.AerialRecovery: 1,
+}
+normal_data_marluxia_tools = {
+    ItemName.Guard:          1,
+    ItemName.FireElement:    3,
+    ItemName.ReflectElement: 1,
+    ItemName.AerialRecovery: 1,
+}
+easy_terra_tools = {
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.Explosion:      1,
+    ItemName.ComboPlus:      2,
+    ItemName.FireElement:    3,
+    ItemName.Fantasia:       1,
+    ItemName.FlareForce:     1,
+    ItemName.ReflectElement: 1,
+    ItemName.Guard:          1,
+    ItemName.DodgeRoll:      3,
+    ItemName.AerialDodge:    3,
+    ItemName.Glide:          3
+}
+normal_terra_tools = {
+    ItemName.SlideDash:   1,
+    ItemName.FlashStep:   1,
+    ItemName.Explosion:   1,
+    ItemName.ComboPlus:   2,
+    ItemName.Guard:       1,
+    ItemName.DodgeRoll:   2,
+    ItemName.AerialDodge: 2,
+    ItemName.Glide:       2
+}
+hard_terra_tools = {
+    ItemName.Explosion:   1,
+    ItemName.ComboPlus:   2,
+    ItemName.DodgeRoll:   2,
+    ItemName.AerialDodge: 2,
+    ItemName.Glide:       2,
+    ItemName.Guard:       1
+}
+easy_data_luxord_tools = {
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.AerialDodge:    2,
+    ItemName.Glide:          2,
+    ItemName.ReflectElement: 3,
+    ItemName.Guard:          1,
+}
+easy_data_zexion = {
+    ItemName.FireElement:    3,
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+    ItemName.Fantasia:       1,
+    ItemName.FlareForce:     1,
+    ItemName.ReflectElement: 3,
+    ItemName.Guard:          1,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.QuickRun:       3,
+}
+normal_data_zexion = {
+    ItemName.FireElement:    3,
+    ItemName.ReflectElement: 3,
+    ItemName.Guard:          1,
+    ItemName.QuickRun:       3
+}
+hard_data_zexion = {
+    ItemName.FireElement:    2,
+    ItemName.ReflectElement: 1,
+    ItemName.QuickRun:       2,
+}
+easy_data_xaldin = {
+    ItemName.FireElement:     3,
+    ItemName.AirComboPlus:    2,
+    ItemName.FinishingPlus:   1,
+    ItemName.Guard:           1,
+    ItemName.ReflectElement:  3,
+    ItemName.FlareForce:      1,
+    ItemName.Fantasia:        1,
+    ItemName.HighJump:        3,
+    ItemName.AerialDodge:     3,
+    ItemName.Glide:           3,
+    ItemName.MagnetElement:   1,
+    ItemName.HorizontalSlash: 1,
+    ItemName.AerialDive:      1,
+    ItemName.AerialSpiral:    1,
+    ItemName.BerserkCharge:   1
+}
+normal_data_xaldin = {
+    ItemName.FireElement:     3,
+    ItemName.FinishingPlus:   1,
+    ItemName.Guard:           1,
+    ItemName.ReflectElement:  3,
+    ItemName.FlareForce:      1,
+    ItemName.Fantasia:        1,
+    ItemName.HighJump:        3,
+    ItemName.AerialDodge:     3,
+    ItemName.Glide:           3,
+    ItemName.MagnetElement:   1,
+    ItemName.HorizontalSlash: 1,
+    ItemName.AerialDive:      1,
+    ItemName.AerialSpiral:    1,
+}
+hard_data_xaldin = {
+    ItemName.FireElement:   2,
+    ItemName.FinishingPlus: 1,
+    ItemName.Guard:         1,
+    ItemName.HighJump:      2,
+    ItemName.AerialDodge:   2,
+    ItemName.Glide:         2,
+    ItemName.MagnetElement: 1,
+    ItemName.AerialDive:    1
+}
+easy_data_larxene = {
+    ItemName.FireElement:    3,
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+    ItemName.Fantasia:       1,
+    ItemName.FlareForce:     1,
+    ItemName.ReflectElement: 3,
+    ItemName.Guard:          1,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.AerialDodge:    3,
+    ItemName.Glide:          3,
+    ItemName.GuardBreak:     1,
+    ItemName.Explosion:      1
+}
+normal_data_larxene = {
+    ItemName.FireElement:    3,
+    ItemName.ReflectElement: 3,
+    ItemName.Guard:          1,
+    ItemName.AerialDodge:    3,
+    ItemName.Glide:          3,
+}
+hard_data_larxene = {
+    ItemName.FireElement:    2,
+    ItemName.ReflectElement: 1,
+    ItemName.Guard:          1,
+    ItemName.AerialDodge:    2,
+    ItemName.Glide:          2,
+}
+easy_data_vexen = {
+    ItemName.FireElement:    3,
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+    ItemName.Fantasia:       1,
+    ItemName.FlareForce:     1,
+    ItemName.ReflectElement: 3,
+    ItemName.Guard:          1,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.AerialDodge:    3,
+    ItemName.Glide:          3,
+    ItemName.GuardBreak:     1,
+    ItemName.Explosion:      1,
+    ItemName.DodgeRoll:      3,
+    ItemName.QuickRun:       3,
+}
+normal_data_vexen = {
+    ItemName.FireElement:    3,
+    ItemName.ReflectElement: 3,
+    ItemName.Guard:          1,
+    ItemName.AerialDodge:    3,
+    ItemName.Glide:          3,
+    ItemName.DodgeRoll:      3,
+    ItemName.QuickRun:       3,
+}
+hard_data_vexen = {
+    ItemName.FireElement:    2,
+    ItemName.ReflectElement: 1,
+    ItemName.Guard:          1,
+    ItemName.AerialDodge:    2,
+    ItemName.Glide:          2,
+    ItemName.DodgeRoll:      3,
+    ItemName.QuickRun:       3,
+}
+easy_thousand_heartless_rules = {
+    ItemName.SecondChance:  1,
+    ItemName.OnceMore:      1,
+    ItemName.Guard:         1,
+    ItemName.MagnetElement: 2,
+}
+normal_thousand_heartless_rules = {
+    ItemName.LimitForm: 1,
+    ItemName.Guard:     1,
+}
+easy_data_demyx = {
+    ItemName.FormBoost:      1,
+    ItemName.ReflectElement: 2,
+    ItemName.FireElement:    3,
+    ItemName.FlareForce:     1,
+    ItemName.Guard:          1,
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+    ItemName.FinishingPlus:  1,
+}
+normal_data_demyx = {
+    ItemName.ReflectElement: 2,
+    ItemName.FireElement:    3,
+    ItemName.FlareForce:     1,
+    ItemName.Guard:          1,
+    ItemName.FinishingPlus:  1,
+}
+hard_data_demyx = {
+    ItemName.ReflectElement: 1,
+    ItemName.FireElement:    2,
+    ItemName.FlareForce:     1,
+    ItemName.Guard:          1,
+    ItemName.FinishingPlus:  1,
+}
+easy_sephiroth_tools = {
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 3,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.GuardBreak:     1,
+    ItemName.Explosion:      1,
+    ItemName.DodgeRoll:      3,
+    ItemName.FinishingPlus:  1,
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+}
+normal_sephiroth_tools = {
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.GuardBreak:     1,
+    ItemName.Explosion:      1,
+    ItemName.DodgeRoll:      3,
+    ItemName.FinishingPlus:  1,
+}
+hard_sephiroth_tools = {
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 1,
+    ItemName.DodgeRoll:      2,
+    ItemName.FinishingPlus:  1,
+}
+
+not_hard_cor_tools_dict = {
+    ItemName.ReflectElement: 3,
+    ItemName.Stitch:         1,
+    ItemName.ChickenLittle:  1,
+    ItemName.MagnetElement:  2,
+    ItemName.Explosion:      1,
+    ItemName.FinishingLeap:  1,
+    ItemName.ThunderElement: 2,
+}
+transport_tools_dict = {
+    ItemName.ReflectElement: 3,
+    ItemName.Stitch:         1,
+    ItemName.ChickenLittle:  1,
+    ItemName.MagnetElement:  2,
+    ItemName.Explosion:      1,
+    ItemName.FinishingLeap:  1,
+    ItemName.ThunderElement: 3,
+    ItemName.Fantasia:       1,
+    ItemName.FlareForce:     1,
+    ItemName.Genie:          1,
+}
+easy_data_saix = {
+    ItemName.Guard:           1,
+    ItemName.SlideDash:       1,
+    ItemName.FlashStep:       1,
+    ItemName.ThunderElement:  1,
+    ItemName.BlizzardElement: 1,
+    ItemName.FlareForce:      1,
+    ItemName.Fantasia:        1,
+    ItemName.FireElement:     3,
+    ItemName.ReflectElement:  3,
+    ItemName.GuardBreak:      1,
+    ItemName.Explosion:       1,
+    ItemName.AerialDodge:     3,
+    ItemName.Glide:           3,
+    ItemName.SecondChance:    1,
+    ItemName.OnceMore:        1
+}
+normal_data_saix = {
+    ItemName.Guard:           1,
+    ItemName.ThunderElement:  1,
+    ItemName.BlizzardElement: 1,
+    ItemName.FireElement:     3,
+    ItemName.ReflectElement:  3,
+    ItemName.AerialDodge:     3,
+    ItemName.Glide:           3,
+}
+hard_data_saix = {
+    ItemName.Guard:           1,
+    ItemName.BlizzardElement: 1,
+    ItemName.ReflectElement:  1,
+    ItemName.AerialDodge:     3,
+    ItemName.Glide:           3,
+}
+easy_data_roxas_tools = {
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 3,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.GuardBreak:     1,
+    ItemName.Explosion:      1,
+    ItemName.DodgeRoll:      3,
+    ItemName.FinishingPlus:  1,
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+}
+normal_data_roxas_tools = {
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.GuardBreak:     1,
+    ItemName.Explosion:      1,
+    ItemName.DodgeRoll:      3,
+    ItemName.FinishingPlus:  1,
+}
+hard_data_roxas_tools = {
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 1,
+    ItemName.DodgeRoll:      2,
+    ItemName.FinishingPlus:  1,
+}
+easy_data_axel_tools = {
+    ItemName.Guard:           1,
+    ItemName.ReflectElement:  3,
+    ItemName.SlideDash:       1,
+    ItemName.FlashStep:       1,
+    ItemName.GuardBreak:      1,
+    ItemName.Explosion:       1,
+    ItemName.DodgeRoll:       3,
+    ItemName.FinishingPlus:   1,
+    ItemName.SecondChance:    1,
+    ItemName.OnceMore:        1,
+    ItemName.BlizzardElement: 3,
+}
+normal_data_axel_tools = {
+    ItemName.Guard:           1,
+    ItemName.ReflectElement:  2,
+    ItemName.SlideDash:       1,
+    ItemName.FlashStep:       1,
+    ItemName.GuardBreak:      1,
+    ItemName.Explosion:       1,
+    ItemName.DodgeRoll:       3,
+    ItemName.FinishingPlus:   1,
+    ItemName.BlizzardElement: 3,
+}
+hard_data_axel_tools = {
+    ItemName.Guard:           1,
+    ItemName.ReflectElement:  1,
+    ItemName.DodgeRoll:       2,
+    ItemName.FinishingPlus:   1,
+    ItemName.BlizzardElement: 2,
+}
+easy_roxas_tools = {
+    ItemName.AerialDodge:     1,
+    ItemName.Glide:           1,
+    ItemName.LimitForm:       1,
+    ItemName.ThunderElement:  1,
+    ItemName.ReflectElement:  2,
+    ItemName.GuardBreak:      1,
+    ItemName.SlideDash:       1,
+    ItemName.FlashStep:       1,
+    ItemName.FinishingPlus:   1,
+    ItemName.BlizzardElement: 1
+}
+normal_roxas_tools = {
+    ItemName.ThunderElement:  1,
+    ItemName.ReflectElement:  2,
+    ItemName.GuardBreak:      1,
+    ItemName.SlideDash:       1,
+    ItemName.FlashStep:       1,
+    ItemName.FinishingPlus:   1,
+    ItemName.BlizzardElement: 1
+}
+easy_xigbar_tools = {
+    ItemName.HorizontalSlash: 1,
+    ItemName.FireElement:     2,
+    ItemName.FinishingPlus:   1,
+    ItemName.Glide:           2,
+    ItemName.AerialDodge:     2,
+    ItemName.QuickRun:        2,
+    ItemName.ReflectElement:  1,
+    ItemName.Guard:           1,
+}
+normal_xigbar_tools = {
+    ItemName.FireElement:    2,
+    ItemName.FinishingPlus:  1,
+    ItemName.Glide:          2,
+    ItemName.AerialDodge:    2,
+    ItemName.QuickRun:       2,
+    ItemName.ReflectElement: 1,
+    ItemName.Guard:          1
+}
+easy_luxord_tools = {
+    ItemName.AerialDodge:    1,
+    ItemName.Glide:          1,
+    ItemName.QuickRun:       2,
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.LimitForm:      1,
+}
+normal_luxord_tools = {
+    ItemName.AerialDodge:    1,
+    ItemName.Glide:          1,
+    ItemName.QuickRun:       2,
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+}
+easy_saix_tools = {
+    ItemName.AerialDodge:    1,
+    ItemName.Glide:          1,
+    ItemName.QuickRun:       2,
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.LimitForm:      1,
+}
+normal_saix_tools = {
+    ItemName.AerialDodge:    1,
+    ItemName.Glide:          1,
+    ItemName.QuickRun:       2,
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+}
+easy_xemnas_tools = {
+    ItemName.AerialDodge:    1,
+    ItemName.Glide:          1,
+    ItemName.QuickRun:       2,
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.LimitForm:      1,
+}
+normal_xemnas_tools = {
+    ItemName.AerialDodge:    1,
+    ItemName.Glide:          1,
+    ItemName.QuickRun:       2,
+    ItemName.Guard:          1,
+    ItemName.ReflectElement: 2,
+}
+easy_data_xemnas = {
+    ItemName.ComboMaster:    1,
+    ItemName.Slapshot:       1,
+    ItemName.ReflectElement: 3,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.FinishingPlus:  1,
+    ItemName.Guard:          1,
+    ItemName.TrinityLimit:   1,
+    ItemName.SecondChance:   1,
+    ItemName.OnceMore:       1,
+    ItemName.LimitForm:      1,
+}
+normal_data_xemnas = {
+    ItemName.ComboMaster:    1,
+    ItemName.Slapshot:       1,
+    ItemName.ReflectElement: 3,
+    ItemName.SlideDash:      1,
+    ItemName.FlashStep:      1,
+    ItemName.FinishingPlus:  1,
+    ItemName.Guard:          1,
+    ItemName.LimitForm:      1,
+}
+hard_data_xemnas = {
+    ItemName.ComboMaster:    1,
+    ItemName.Slapshot:       1,
+    ItemName.ReflectElement: 2,
+    ItemName.FinishingPlus:  1,
+    ItemName.Guard:          1,
+    ItemName.LimitForm:      1,
+}
+final_leveling_access = {
+    LocationName.MemorysSkyscaperMythrilCrystal,
+    LocationName.GrimReaper2,
+    LocationName.Xaldin,
+    LocationName.StormRider,
+    LocationName.SunsetTerraceAbilityRing
+}
+
+multi_form_region_access = {
+    ItemName.CastleKey,
+    ItemName.BattlefieldsofWar,
+    ItemName.SwordoftheAncestor,
+    ItemName.BeastsClaw,
+    ItemName.BoneFist,
+    ItemName.SkillandCrossbones,
+    ItemName.Scimitar,
+    ItemName.MembershipCard,
+    ItemName.IceCream,
+    ItemName.WaytotheDawn,
+    ItemName.IdentityDisk,
+}
+limit_form_region_access = {
+    ItemName.CastleKey,
+    ItemName.BattlefieldsofWar,
+    ItemName.SwordoftheAncestor,
+    ItemName.BeastsClaw,
+    ItemName.BoneFist,
+    ItemName.SkillandCrossbones,
+    ItemName.Scimitar,
+    ItemName.MembershipCard,
+    ItemName.IceCream,
+    ItemName.WaytotheDawn,
+    ItemName.IdentityDisk,
+    ItemName.NamineSketches
+}
diff --git a/worlds/kh2/Names/ItemName.py b/worlds/kh2/Names/ItemName.py
index 57cfcbe060..d7dbdb0ad3 100644
--- a/worlds/kh2/Names/ItemName.py
+++ b/worlds/kh2/Names/ItemName.py
@@ -12,8 +12,7 @@ SecretAnsemsReport10 = "Secret Ansem's Report 10"
 SecretAnsemsReport11 = "Secret Ansem's Report 11"
 SecretAnsemsReport12 = "Secret Ansem's Report 12"
 SecretAnsemsReport13 = "Secret Ansem's Report 13"
-
-# progression
+# proofs, visit unlocks and forms
 ProofofConnection = "Proof of Connection"
 ProofofNonexistence = "Proof of Nonexistence"
 ProofofPeace = "Proof of Peace"
@@ -32,51 +31,33 @@ IdentityDisk = "Identity Disk"
 NamineSketches = "Namine Sketches"
 CastleKey = "Disney Castle Key"
 TornPages = "Torn Page"
-TornPages = "Torn Page"
-TornPages = "Torn Page"
-TornPages = "Torn Page"
-TornPages = "Torn Page"
 ValorForm = "Valor Form"
 WisdomForm = "Wisdom Form"
 LimitForm = "Limit Form"
 MasterForm = "Master Form"
 FinalForm = "Final Form"
-
+AntiForm = "Anti Form"
 # magic and summons
-FireElement = "Fire Element"
-
-BlizzardElement = "Blizzard Element"
-
-ThunderElement = "Thunder Element"
-
-CureElement = "Cure Element"
-
-MagnetElement = "Magnet Element"
-
-ReflectElement = "Reflect Element"
+FireElement      = "Fire Element"
+BlizzardElement  = "Blizzard Element"
+ThunderElement   = "Thunder Element"
+CureElement      = "Cure Element"
+MagnetElement    = "Magnet Element"
+ReflectElement   = "Reflect Element"
 
 Genie = "Genie"
 PeterPan = "Peter Pan"
 Stitch = "Stitch"
 ChickenLittle = "Chicken Little"
 
-#movement
+# movement
 HighJump = "High Jump"
-
-
 QuickRun = "Quick Run"
-
-
 AerialDodge = "Aerial Dodge"
-
-
 Glide = "Glide"
-
-
 DodgeRoll = "Dodge Roll"
 
-
-#keyblades
+# keyblades
 Oathkeeper = "Oathkeeper"
 Oblivion = "Oblivion"
 StarSeeker = "Star Seeker"
@@ -109,7 +90,6 @@ MagesStaff = "Mages Staff"
 MeteorStaff = "Meteor Staff"
 CometStaff = "Comet Staff"
 Centurion2 = "Centurion+"
-MeteorStaff = "Meteor Staff"
 NobodyLance = "Nobody Lance"
 PreciousMushroom = "Precious Mushroom"
 PreciousMushroom2 = "Precious Mushroom+"
@@ -203,7 +183,7 @@ Ribbon = "Ribbon"
 GrandRibbon = "Grand Ribbon"
 
 # usefull and stat incre
-MickyMunnyPouch = "Mickey Munny Pouch"
+MickeyMunnyPouch = "Mickey Munny Pouch"
 OletteMunnyPouch = "Olette Munny Pouch"
 HadesCupTrophy = "Hades Cup Trophy"
 UnknownDisk = "Unknown Disk"
@@ -253,7 +233,6 @@ LightDarkness = "Light & Darkness"
 MagicLock = "Magic Lock-On"
 LeafBracer = "Leaf Bracer"
 CombinationBoost = "Combination Boost"
-DamageDrive = "Damage Drive"
 OnceMore = "Once More"
 SecondChance = "Second Chance"
 
@@ -313,10 +292,6 @@ DonaldLuckyLucky = "Donald Lucky Lucky"
 DonaldFireBoost = "Donald Fire Boost"
 DonaldBlizzardBoost = "Donald Blizzard Boost"
 DonaldThunderBoost = "Donald Thunder Boost"
-DonaldFireBoost = "Donald Fire Boost"
-DonaldBlizzardBoost = "Donald Blizzard Boost"
-DonaldThunderBoost = "Donald Thunder Boost"
-DonaldMPRage = "Donald MP Rage"
 DonaldMPHastera = "Donald MP Hastera"
 DonaldAutoLimit = "Donald Auto Limit"
 DonaldHyperHealing = "Donald Hyper Healing"
@@ -324,14 +299,7 @@ DonaldAutoHealing = "Donald Auto Healing"
 DonaldMPHastega = "Donald MP Hastega"
 DonaldItemBoost = "Donald Item Boost"
 DonaldDamageControl = "Donald Damage Control"
-DonaldHyperHealing = "Donald Hyper Healing"
-DonaldMPRage = "Donald MP Rage"
 DonaldMPHaste = "Donald MP Haste"
-DonaldMPHastera = "Donald MP Hastera"
-DonaldMPHastega = "Donald MP Hastega"
-DonaldMPHaste = "Donald MP Haste"
-DonaldDamageControl = "Donald Damage Control"
-DonaldMPHastera = "Donald MP Hastera"
 DonaldDraw = "Donald Draw"
 
 # goofy abili
@@ -353,27 +321,18 @@ GoofyOnceMore = "Goofy Once More"
 GoofyAutoChange = "Goofy Auto Change"
 GoofyHyperHealing = "Goofy Hyper Healing"
 GoofyAutoHealing = "Goofy Auto Healing"
-GoofyDefender = "Goofy Defender"
-GoofyHyperHealing = "Goofy Hyper Healing"
 GoofyMPHaste = "Goofy MP Haste"
 GoofyMPHastera = "Goofy MP Hastera"
-GoofyMPRage = "Goofy MP Rage"
 GoofyMPHastega = "Goofy MP Hastega"
-GoofyItemBoost = "Goofy Item Boost"
-GoofyDamageControl = "Goofy Damage Control"
-GoofyProtect = "Goofy Protect"
-GoofyProtera = "Goofy Protera"
-GoofyProtega = "Goofy Protega"
-GoofyDamageControl = "Goofy Damage Control"
 GoofyProtect = "Goofy Protect"
 GoofyProtera = "Goofy Protera"
 GoofyProtega = "Goofy Protega"
 
 Victory = "Victory"
 LuckyEmblem = "Lucky Emblem"
-Bounty="Bounty"
+Bounty = "Bounty"
 
-UniversalKey="Universal Key"
+# UniversalKey = "Universal Key"
 # Keyblade Slots
 FAKESlot = "FAKE (Slot)"
 DetectionSaberSlot = "Detection Saber (Slot)"
@@ -402,3 +361,73 @@ FatalCrestSlot = "Fatal Crest (Slot)"
 FenrirSlot = "Fenrir (Slot)"
 UltimaWeaponSlot = "Ultima Weapon (Slot)"
 WinnersProofSlot = "Winner's Proof (Slot)"
+
+# events
+HostileProgramEvent = "Hostile Program Event"
+McpEvent = "Master Control Program Event"
+ASLarxeneEvent = "AS Larxene Event"
+DataLarxeneEvent = "Data Larxene Event"
+BarbosaEvent = "Barbosa Event"
+GrimReaper1Event = "Grim Reaper 1 Event"
+GrimReaper2Event = "Grim Reaper 2 Event"
+DataLuxordEvent = "Data Luxord Event"
+DataAxelEvent = "Data Axel Event"
+CerberusEvent = "Cerberus Event"
+OlympusPeteEvent = "Olympus Pete Event"
+HydraEvent = "Hydra Event"
+OcPainAndPanicCupEvent = "Pain and Panic Cup Event"
+OcCerberusCupEvent = "Cerberus Cup Event"
+HadesEvent = "Hades Event"
+ASZexionEvent = "AS Zexion Event"
+DataZexionEvent = "Data Zexion Event"
+Oc2TitanCupEvent = "Titan Cup Event"
+Oc2GofCupEvent = "Goddess of Fate Cup Event"
+Oc2CupsEvent = "Olympus Coliseum Cups Event"
+HadesCupEvents = "Olympus Coliseum Hade's Paradox Event"
+PrisonKeeperEvent = "Prison Keeper Event"
+OogieBoogieEvent = "Oogie Boogie Event"
+ExperimentEvent = "The Experiment Event"
+ASVexenEvent = "AS Vexen Event"
+DataVexenEvent = "Data Vexen Event"
+ShanYuEvent = "Shan Yu Event"
+AnsemRikuEvent = "Ansem Riku Event"
+StormRiderEvent = "Storm Rider Event"
+DataXigbarEvent = "Data Xigbar Event"
+RoxasEvent = "Roxas Event"
+XigbarEvent = "Xigbar Event"
+LuxordEvent = "Luxord Event"
+SaixEvent = "Saix Event"
+XemnasEvent = "Xemnas Event"
+ArmoredXemnasEvent = "Armored Xemnas Event"
+ArmoredXemnas2Event = "Armored Xemnas 2 Event"
+FinalXemnasEvent = "Final Xemnas Event"
+DataXemnasEvent = "Data Xemnas Event"
+ThresholderEvent = "Thresholder Event"
+BeastEvent = "Beast Event"
+DarkThornEvent = "Dark Thorn Event"
+XaldinEvent = "Xaldin Event"
+DataXaldinEvent = "Data Xaldin Event"
+TwinLordsEvent = "Twin Lords Event"
+GenieJafarEvent = "Genie Jafar Event"
+ASLexaeusEvent = "AS Lexaeus Event"
+DataLexaeusEvent = "Data Lexaeus Event"
+ScarEvent = "Scar Event"
+GroundShakerEvent = "Groundshaker Event"
+DataSaixEvent = "Data Saix Event"
+HBDemyxEvent = "Hollow Bastion Demyx Event"
+ThousandHeartlessEvent = "Thousand Heartless Event"
+Mushroom13Event = "Mushroom 13 Event"
+SephiEvent = "Sephiroth Event"
+DataDemyxEvent = "Data Demyx Event"
+CorFirstFightEvent = "Cavern of Rememberance:Fight 1 Event"
+CorSecondFightEvent = "Cavern of Rememberance:Fight 2 Event"
+TransportEvent = "Transport to Rememberance Event"
+OldPeteEvent = "Old Pete Event"
+FuturePeteEvent = "Future Pete Event"
+ASMarluxiaEvent = "AS Marluxia Event"
+DataMarluxiaEvent = "Data Marluxia Event"
+TerraEvent = "Terra Event"
+TwilightThornEvent = "Twilight Thorn Event"
+Axel1Event = "Axel 1 Event"
+Axel2Event = "Axel 2 Event"
+DataRoxasEvent = "Data Roxas Event"
diff --git a/worlds/kh2/Names/LocationName.py b/worlds/kh2/Names/LocationName.py
index 1a6c4d07fb..bcaf664558 100644
--- a/worlds/kh2/Names/LocationName.py
+++ b/worlds/kh2/Names/LocationName.py
@@ -27,7 +27,7 @@ ThroneRoomOgreShield                         =  "(LoD2) Throne Room Ogre Shield"
 ThroneRoomMythrilCrystal                     =  "(LoD2) Throne Room Mythril Crystal"
 ThroneRoomOrichalcum                         =  "(LoD2) Throne Room Orichalcum"
 StormRider                                   =  "(LoD2) Storm Rider Bonus: Sora Slot 1"
-XigbarDataDefenseBoost                       =  "Data Xigbar"
+XigbarDataDefenseBoost                       =  "(Post LoD2: Summit) Data Xigbar"
 
 AgrabahMap                                   =  "(AG) Agrabah Map"
 AgrabahDarkShard                             =  "(AG) Agrabah Dark Shard"
@@ -62,9 +62,10 @@ RuinedChamberTornPages                       =  "(AG2) Ruined Chamber Torn Pages
 RuinedChamberRuinsMap                        =  "(AG2) Ruined Chamber Ruins Map"
 GenieJafar                                   =  "(AG2) Genie Jafar"
 WishingLamp                                  =  "(AG2) Wishing Lamp"
-LexaeusBonus                                 =  "Lexaeus Bonus: Sora Slot 1"
-LexaeusASStrengthBeyondStrength              =  "AS Lexaeus"
-LexaeusDataLostIllusion                      =  "Data Lexaeus"
+LexaeusBonus                                 =  "(Post AG2: Peddler's Shop) Lexaeus Bonus: Sora Slot 1"
+LexaeusASStrengthBeyondStrength              =  "(Post AG2: Peddler's Shop) AS Lexaeus"
+LexaeusDataLostIllusion                      =  "(Post AG2: Peddler's Shop) Data Lexaeus"
+
 DCCourtyardMythrilShard                      =  "(DC) Courtyard Mythril Shard"
 DCCourtyardStarRecipe                        =  "(DC) Courtyard Star Recipe"
 DCCourtyardAPBoost                           =  "(DC) Courtyard AP Boost"
@@ -89,12 +90,15 @@ FuturePete                                   =  "(TR) Future Pete Bonus: Sora Sl
 FuturePeteGetBonus                           =  "(TR) Future Pete Bonus: Sora Slot 2"
 Monochrome                                   =  "(TR) Monochrome"
 WisdomForm                                   =  "(TR) Wisdom Form"
-MarluxiaGetBonus                             =  "Marluxia Bonus: Sora Slot 1"
-MarluxiaASEternalBlossom                     =  "AS Marluxia"
-MarluxiaDataLostIllusion                     =  "Data Marluxia"
-LingeringWillBonus                           =  "Lingering Will Bonus: Sora Slot 1"
-LingeringWillProofofConnection               =  "Lingering Will Proof of Connection"
-LingeringWillManifestIllusion                =  "Lingering Will Manifest Illusion"
+
+MarluxiaGetBonus                             =  "(Post TR:Hall of the Cornerstone) Marluxia Bonus: Sora Slot 1"
+MarluxiaASEternalBlossom                     =  "(Post TR:Hall of the Cornerstone) AS Marluxia"
+MarluxiaDataLostIllusion                     =  "(Post TR:Hall of the Cornerstone) Data Marluxia"
+
+LingeringWillBonus                           =  "(Post TR:Hall of the Cornerstone) Lingering Will Bonus: Sora Slot 1"
+LingeringWillProofofConnection               =  "(Post TR:Hall of the Cornerstone) Lingering Will Proof of Connection"
+LingeringWillManifestIllusion                =  "(Post TR:Hall of the Cornerstone) Lingering Will Manifest Illusion"
+
 PoohsHouse100AcreWoodMap                     =  "(100Acre) Pooh's House 100 Acre Wood Map"
 PoohsHouseAPBoost                            =  "(100Acre) Pooh's House AP Boost"
 PoohsHouseMythrilStone                       =  "(100Acre) Pooh's House Mythril Stone"
@@ -119,6 +123,7 @@ StarryHillCosmicRing                         =  "(100Acre) Starry Hill Cosmic Ri
 StarryHillStyleRecipe                        =  "(100Acre) Starry Hill Style Recipe"
 StarryHillCureElement                        =  "(100Acre) Starry Hill Cure Element"
 StarryHillOrichalcumPlus                     =  "(100Acre) Starry Hill Orichalcum+"
+
 PassageMythrilShard                          =  "(OC) Passage Mythril Shard"
 PassageMythrilStone                          =  "(OC) Passage Mythril Stone"
 PassageEther                                 =  "(OC) Passage Ether"
@@ -162,9 +167,9 @@ SkillfulRingTitanCup                         =  "Skillful Ring Titan Cup"
 FatalCrestGoddessofFateCup                   =  "Fatal Crest Goddess of Fate Cup"
 OrichalcumPlusGoddessofFateCup               =  "Orichalcum+ Goddess of Fate Cup"
 HadesCupTrophyParadoxCups                    =  "Hades Cup Trophy Paradox Cups"
-ZexionBonus                                  =  "Zexion Bonus: Sora Slot 1"
-ZexionASBookofShadows                        =  "AS Zexion"
-ZexionDataLostIllusion                       =  "Data Zexion"
+ZexionBonus                                  =  "(Post OC2: Cave of the Dead Inner Chamber) Zexion Bonus: Sora Slot 1"
+ZexionASBookofShadows                        =  "(Post OC2: Cave of the Dead Inner Chamber) AS Zexion"
+ZexionDataLostIllusion                       =  "(Post OC2: Cave of the Dead Inner Chamber) Data Zexion"
 
 
 BCCourtyardAPBoost                           =  "(BC) Courtyard AP Boost"
@@ -198,7 +203,7 @@ CastleWallsMap                               =  "(BC2) Castle Walls Map"
 Xaldin                                       =  "(BC2) Xaldin Bonus: Sora Slot 1"
 XaldinGetBonus                               =  "(BC2) Xaldin Bonus: Sora Slot 2"
 SecretAnsemReport4                           =  "(BC2) Secret Ansem Report 4 (Xaldin)"
-XaldinDataDefenseBoost                       =  "Data Xaldin"
+XaldinDataDefenseBoost                       =  "(Post BC2: Ballroom) Data Xaldin"
 
 
 
@@ -223,9 +228,9 @@ CentralComputerCoreCosmicArts                =  "(SP2) Central Computer Core Cos
 CentralComputerCoreMap                       =  "(SP2) Central Computer Core Map"
 MCP                                          =  "(SP2) MCP Bonus: Sora Slot 1"
 MCPGetBonus                                  =  "(SP2) MCP Bonus: Sora Slot 2"
-LarxeneBonus                                 =  "Larxene Bonus: Sora Slot 1"
-LarxeneASCloakedThunder                      =  "AS Larxene"
-LarxeneDataLostIllusion                      =  "Data Larxene"
+LarxeneBonus                                 =  "(Post SP2: Central Computer Core) Larxene Bonus: Sora Slot 1"
+LarxeneASCloakedThunder                      =  "(Post SP2: Central Computer Core) AS Larxene"
+LarxeneDataLostIllusion                      =  "(Post SP2: Central Computer Core) Data Larxene"
 
 GraveyardMythrilShard                        =  "(HT) Graveyard Mythril Shard"
 GraveyardSerenityGem                         =  "(HT) Graveyard Serenity Gem"
@@ -249,9 +254,9 @@ Present                                      =  "(HT2) Present"
 DecoyPresents                                =  "(HT2) Decoy Presents"
 Experiment                                   =  "(HT2) Experiment Bonus: Sora Slot 1"
 DecisivePumpkin                              =  "(HT2) Decisive Pumpkin"
-VexenBonus                                   =  "Vexen Bonus: Sora Slot 1"
-VexenASRoadtoDiscovery                       =  "AS Vexen"
-VexenDataLostIllusion                        =  "Data Vexen"
+VexenBonus                                   =  "(Post HT2: Yuletide Hill) Vexen Bonus: Sora Slot 1"
+VexenASRoadtoDiscovery                       =  "(Post HT2: Yuletide Hill) AS Vexen"
+VexenDataLostIllusion                        =  "(Post HT2: Yuletide Hill) Data Vexen"
 
 RampartNavalMap                              =  "(PR) Rampart Naval Map"
 RampartMythrilStone                          =  "(PR) Rampart Mythril Stone"
@@ -286,7 +291,7 @@ SeadriftRowShipGraveyardMap                  =  "(PR2) Seadrift Row Ship Graveya
 GrimReaper2                                  =  "(PR2) Grim Reaper 2 Bonus: Sora Slot 1"
 SecretAnsemReport6                           =  "(PR2) Secret Ansem Report 6 (Grim Reaper 2)"
 
-LuxordDataAPBoost                            =  "Data Luxord"
+LuxordDataAPBoost                            =  "(Post PR2: Treasure Heap) Data Luxord"
 
 MarketplaceMap                               =  "(HB) Marketplace Map"
 BoroughDriveRecovery                         =  "(HB) Borough Drive Recovery"
@@ -329,7 +334,7 @@ SephirothBonus                               =  "Sephiroth Bonus: Sora Slot 1"
 SephirothFenrir                              =  "Sephiroth Fenrir"
 WinnersProof                                 =  "(HB2) Winner's Proof"
 ProofofPeace                                 =  "(HB2) Proof of Peace"
-DemyxDataAPBoost                             =  "Data Demyx"
+DemyxDataAPBoost                             =  "(Post HB2: Restoration Site) Data Demyx"
 
 CoRDepthsAPBoost                             =  "(CoR) Depths AP Boost"
 CoRDepthsPowerCrystal                        =  "(CoR) Depths Power Crystal"
@@ -386,7 +391,7 @@ ScarFireElement                              =  "(PL) Scar Fire Element"
 Hyenas2                                      =  "(PL2) Hyenas 2 Bonus: Sora Slot 1"
 Groundshaker                                 =  "(PL2) Groundshaker Bonus: Sora Slot 1"
 GroundshakerGetBonus                         =  "(PL2) Groundshaker Bonus: Sora Slot 2"
-SaixDataDefenseBoost                         =  "Data Saix"
+SaixDataDefenseBoost                         =  "(Post PL2: Peak) Data Saix"
 
 TwilightTownMap                              =  "(STT) Twilight Town Map"
 MunnyPouchOlette                             =  "(STT) Munny Pouch Olette"
@@ -415,7 +420,7 @@ MansionMap                                   =  "(STT) Mansion Map"
 MansionLibraryHiPotion                       =  "(STT) Mansion Library Hi-Potion"
 Axel2                                        =  "(STT) Axel 2"
 MansionBasementCorridorHiPotion              =  "(STT) Mansion Basement Corridor Hi-Potion"
-RoxasDataMagicBoost                          =  "Data Roxas"
+RoxasDataMagicBoost                          =  "(Post STT: Mansion Pod Room) Data Roxas"
 
 OldMansionPotion                             =  "(TT) Old Mansion Potion"
 OldMansionMythrilShard                       =  "(TT) Old Mansion Mythril Shard"
@@ -468,46 +473,46 @@ BeamSecretAnsemReport10                      =  "(TT3) Beam Secret Ansem Report
 MansionBasementCorridorUltimateRecipe        =  "(TT3) Mansion Basement Corridor Ultimate Recipe"
 BetwixtandBetween                            =  "(TT3) Betwixt and Between"
 BetwixtandBetweenBondofFlame                 =  "(TT3) Betwixt and Between Bond of Flame"
-AxelDataMagicBoost                           =  "Data Axel"
+AxelDataMagicBoost                           =  "(Post TT3: Betwixt and Between) Data Axel"
 
 FragmentCrossingMythrilStone                 =  "(TWTNW) Fragment Crossing Mythril Stone"
 FragmentCrossingMythrilCrystal               =  "(TWTNW) Fragment Crossing Mythril Crystal"
 FragmentCrossingAPBoost                      =  "(TWTNW) Fragment Crossing AP Boost"
 FragmentCrossingOrichalcum                   =  "(TWTNW) Fragment Crossing Orichalcum"
-Roxas                                        =  "(TWTNW) Roxas Bonus: Sora Slot 1"
-RoxasGetBonus                                =  "(TWTNW) Roxas Bonus: Sora Slot 2"
-RoxasSecretAnsemReport8                      =  "(TWTNW) Roxas Secret Ansem Report 8"
-TwoBecomeOne                                 =  "(TWTNW) Two Become One"
-MemorysSkyscaperMythrilCrystal               =  "(TWTNW) Memory's Skyscaper Mythril Crystal"
-MemorysSkyscaperAPBoost                      =  "(TWTNW) Memory's Skyscaper AP Boost"
-MemorysSkyscaperMythrilStone                 =  "(TWTNW) Memory's Skyscaper Mythril Stone"
-TheBrinkofDespairDarkCityMap                 =  "(TWTNW) The Brink of Despair Dark City Map"
-TheBrinkofDespairOrichalcumPlus              =  "(TWTNW) The Brink of Despair Orichalcum+"
-NothingsCallMythrilGem                       =  "(TWTNW) Nothing's Call Mythril Gem"
-NothingsCallOrichalcum                       =  "(TWTNW) Nothing's Call Orichalcum"
-TwilightsViewCosmicBelt                      =  "(TWTNW) Twilight's View Cosmic Belt"
-XigbarBonus                                  =  "(TWTNW) Xigbar Bonus: Sora Slot 1"
-XigbarSecretAnsemReport3                     =  "(TWTNW) Xigbar Secret Ansem Report 3"
-NaughtsSkywayMythrilGem                      =  "(TWTNW) Naught's Skyway Mythril Gem"
-NaughtsSkywayOrichalcum                      =  "(TWTNW) Naught's Skyway Orichalcum"
-NaughtsSkywayMythrilCrystal                  =  "(TWTNW) Naught's Skyway Mythril Crystal"
-Oblivion                                     =  "(TWTNW) Oblivion"
-CastleThatNeverWasMap                        =  "(TWTNW) Castle That Never Was Map"
-Luxord                                       =  "(TWTNW) Luxord"
-LuxordGetBonus                               =  "(TWTNW) Luxord Bonus: Sora Slot 1"
-LuxordSecretAnsemReport9                     =  "(TWTNW) Luxord Secret Ansem Report 9"
-SaixBonus                                    =  "(TWTNW) Saix Bonus: Sora Slot 1"
-SaixSecretAnsemReport12                      =  "(TWTNW) Saix Secret Ansem Report 12"
-PreXemnas1SecretAnsemReport11                =  "(TWTNW) Secret Ansem Report 11 (Pre-Xemnas 1)"
-RuinandCreationsPassageMythrilStone          =  "(TWTNW) Ruin and Creation's Passage Mythril Stone"
-RuinandCreationsPassageAPBoost               =  "(TWTNW) Ruin and Creation's Passage AP Boost"
-RuinandCreationsPassageMythrilCrystal        =  "(TWTNW) Ruin and Creation's Passage Mythril Crystal"
-RuinandCreationsPassageOrichalcum            =  "(TWTNW) Ruin and Creation's Passage Orichalcum"
-Xemnas1                                      =  "(TWTNW) Xemnas 1 Bonus: Sora Slot 1"
-Xemnas1GetBonus                              =  "(TWTNW) Xemnas 1 Bonus: Sora Slot 2"
-Xemnas1SecretAnsemReport13                   =  "(TWTNW) Xemnas 1 Secret Ansem Report 13"
+Roxas                                        =  "(TWTNW2) Roxas Bonus: Sora Slot 1"
+RoxasGetBonus                                =  "(TWTNW2) Roxas Bonus: Sora Slot 2"
+RoxasSecretAnsemReport8                      =  "(TWTNW2) Roxas Secret Ansem Report 8"
+TwoBecomeOne                                 =  "(TWTNW2) Two Become One"
+MemorysSkyscaperMythrilCrystal               =  "(TWTNW2) Memory's Skyscaper Mythril Crystal"
+MemorysSkyscaperAPBoost                      =  "(TWTNW2) Memory's Skyscaper AP Boost"
+MemorysSkyscaperMythrilStone                 =  "(TWTNW2) Memory's Skyscaper Mythril Stone"
+TheBrinkofDespairDarkCityMap                 =  "(TWTNW2) The Brink of Despair Dark City Map"
+TheBrinkofDespairOrichalcumPlus              =  "(TWTNW2) The Brink of Despair Orichalcum+"
+NothingsCallMythrilGem                       =  "(TWTNW2) Nothing's Call Mythril Gem"
+NothingsCallOrichalcum                       =  "(TWTNW2) Nothing's Call Orichalcum"
+TwilightsViewCosmicBelt                      =  "(TWTNW2) Twilight's View Cosmic Belt"
+XigbarBonus                                  =  "(TWTNW2) Xigbar Bonus: Sora Slot 1"
+XigbarSecretAnsemReport3                     =  "(TWTNW2) Xigbar Secret Ansem Report 3"
+NaughtsSkywayMythrilGem                      =  "(TWTNW2) Naught's Skyway Mythril Gem"
+NaughtsSkywayOrichalcum                      =  "(TWTNW2) Naught's Skyway Orichalcum"
+NaughtsSkywayMythrilCrystal                  =  "(TWTNW2) Naught's Skyway Mythril Crystal"
+Oblivion                                     =  "(TWTNW2) Oblivion"
+CastleThatNeverWasMap                        =  "(TWTNW2) Castle That Never Was Map"
+Luxord                                       =  "(TWTNW2) Luxord Bonus: Sora Slot 2"
+LuxordGetBonus                               =  "(TWTNW2) Luxord Bonus: Sora Slot 1"
+LuxordSecretAnsemReport9                     =  "(TWTNW2) Luxord Secret Ansem Report 9"
+SaixBonus                                    =  "(TWTNW2) Saix Bonus: Sora Slot 1"
+SaixSecretAnsemReport12                      =  "(TWTNW2) Saix Secret Ansem Report 12"
+PreXemnas1SecretAnsemReport11                =  "(TWTNW3) Secret Ansem Report 11 (Pre-Xemnas 1)"
+RuinandCreationsPassageMythrilStone          =  "(TWTNW3) Ruin and Creation's Passage Mythril Stone"
+RuinandCreationsPassageAPBoost               =  "(TWTNW3) Ruin and Creation's Passage AP Boost"
+RuinandCreationsPassageMythrilCrystal        =  "(TWTNW3) Ruin and Creation's Passage Mythril Crystal"
+RuinandCreationsPassageOrichalcum            =  "(TWTNW3) Ruin and Creation's Passage Orichalcum"
+Xemnas1                                      =  "(TWTNW3) Xemnas 1 Bonus: Sora Slot 1"
+Xemnas1GetBonus                              =  "(TWTNW3) Xemnas 1 Bonus: Sora Slot 2"
+Xemnas1SecretAnsemReport13                   =  "(TWTNW3) Xemnas 1 Secret Ansem Report 13"
 FinalXemnas                                  =  "Final Xemnas"
-XemnasDataPowerBoost                         =  "Data Xemnas"
+XemnasDataPowerBoost                         =  "(Post TWTNW3: The Altar of Naught) Data Xemnas"
 Lvl1                                    ="Level 01"
 Lvl2                                    ="Level 02"
 Lvl3                                    ="Level 03"
@@ -605,7 +610,7 @@ Lvl94                                    ="Level 94"
 Lvl95                                    ="Level 95"
 Lvl96                                    ="Level 96"
 Lvl97                                    ="Level 97"
-Lvl98                                    ="Level 98"  
+Lvl98                                    ="Level 98"
 Lvl99                                    ="Level 99"
 Valorlvl1                                    ="Valor level 1"
 Valorlvl2                                    ="Valor level 2"
@@ -643,13 +648,28 @@ Finallvl5                                    ="Final level 5"
 Finallvl6                                    ="Final level 6"
 Finallvl7                                    ="Final level 7"
 
+Summonlvl2="Summon level 2"
+Summonlvl3="Summon level 3"
+Summonlvl4="Summon level 4"
+Summonlvl5="Summon level 5"
+Summonlvl6="Summon level 6"
+Summonlvl7="Summon level 7"
+
+
 GardenofAssemblageMap                        ="Garden of Assemblage Map"
 GoALostIllusion                              ="GoA Lost Illusion"
 ProofofNonexistence                          ="Proof of Nonexistence Location"
 
-test=                                       "test"
-
+UnderseaKingdomMap                           ="(AT) Undersea Kingdom Map"
+MysteriousAbyss                              ="(AT) Mysterious Abyss"
+MusicalBlizzardElement                       ="(AT) Musical Blizzard Element"
+MusicalOrichalcumPlus                        ="(AT) Musical Orichalcum+"
 
+DonaldStarting1                              ="Donald Starting Item 1"
+DonaldStarting2                              ="Donald Starting Item 2"
+GoofyStarting1                               ="Goofy Starting Item 1"
+GoofyStarting2                               ="Goofy Starting Item 2"
+#   TODO: remove in 4.3
 Crit_1                                       ="Critical Starting Ability 1"
 Crit_2                                       ="Critical Starting Ability 2"
 Crit_3                                       ="Critical Starting Ability 3"
@@ -657,14 +677,9 @@ Crit_4                                       ="Critical Starting Ability 4"
 Crit_5                                       ="Critical Starting Ability 5"
 Crit_6                                       ="Critical Starting Ability 6"
 Crit_7                                       ="Critical Starting Ability 7"
-DonaldStarting1                              ="Donald Starting Item 1"
-DonaldStarting2                              ="Donald Starting Item 2"
-GoofyStarting1                               ="Goofy Starting Item 1"
-GoofyStarting2                               ="Goofy Starting Item 2"
-
 
 DonaldScreens                                ="(SP) Screens Bonus: Donald Slot 1"
-DonaldDemyxHBGetBonus                        ="(HB) Demyx Bonus: Donald Slot 1"
+DonaldDemyxHBGetBonus                        ="(HB2) Demyx Bonus: Donald Slot 1"
 DonaldDemyxOC                                ="(OC) Demyx Bonus: Donald Slot 1"
 DonaldBoatPete                               ="(TR) Boat Pete Bonus: Donald Slot 1"
 DonaldBoatPeteGetBonus                       ="(TR) Boat Pete Bonus: Donald Slot 2"
@@ -694,7 +709,7 @@ GoofyStormRider                              ="(LoD2) Storm Rider Bonus: Goofy S
 GoofyBeast                                   ="(BC) Beast Bonus: Goofy Slot 1"
 GoofyInterceptorBarrels                      ="(PR) Interceptor Barrels Bonus: Goofy Slot 1"
 GoofyTreasureRoom                            ="(AG) Treasure Room Heartless Bonus: Goofy Slot 1"
-GoofyZexion                                  ="Zexion Bonus: Goofy Slot 1"
+GoofyZexion                                  ="(Post OC2: Cave of the Dead Inner Chamber) Zexion Bonus: Goofy Slot 1"
 
 
 AdamantShield                                ="Adamant Shield Slot"
@@ -760,4 +775,86 @@ UltimaWeaponSlot          ="Ultima Weapon Slot"
 WinnersProofSlot          ="Winner's Proof Slot"
 PurebloodSlot             ="Pureblood Slot"
 
-#Final_Region                                 ="Final Form"
+Mushroom13_1 =  "(Post TWTNW3: Memory's Skyscraper) Mushroom XIII No. 1"
+Mushroom13_2 =  "(Post HT2: Christmas Tree Plaza) Mushroom XIII No. 2"
+Mushroom13_3 =  "(Post BC2: Bridge) Mushroom XIII No. 3"
+Mushroom13_4 =  "(Post LOD2: Palace Gates) Mushroom XIII No. 4"
+Mushroom13_5 =  "(Post AG2: Treasure Room) Mushroom XIII No. 5"
+Mushroom13_6 =  "(Post OC2: Atrium) Mushroom XIII No. 6"
+Mushroom13_7 =  "(Post TT3: Tunnel way) Mushroom XIII No. 7"
+Mushroom13_8 =  "(Post TT3: Tower) Mushroom XIII No. 8"
+Mushroom13_9 =  "(Post HB2: Castle Gates) Mushroom XIII No. 9"
+Mushroom13_10 = "(Post PR2: Moonlight Nook) Mushroom XIII No. 10"
+Mushroom13_11 = "(Post TR: Waterway) Mushroom XIII No. 11"
+Mushroom13_12 = "(Post TT3: Old Mansion) Mushroom XIII No. 12"
+
+
+HostileProgramEventLocation = "Hostile Program Event Location"
+McpEventLocation = "Master Control Program Event Location"
+ASLarxeneEventLocation = "AS Larxene Event Location"
+DataLarxeneEventLocation = "Data Larxene Event Location"
+BarbosaEventLocation = "Barbosa Event Location"
+GrimReaper1EventLocation = "Grim Reaper 1 Event Location"
+GrimReaper2EventLocation = "Grim Reaper 2 Event Location"
+DataLuxordEventLocation = "Data Luxord Event Location"
+DataAxelEventLocation = "Data Axel Event Location"
+CerberusEventLocation = "Cerberus Event Location"
+OlympusPeteEventLocation = "Olympus Pete Event Location"
+HydraEventLocation = "Hydra Event Location"
+OcPainAndPanicCupEventLocation = "Pain and Panic Cup Event Location"
+OcCerberusCupEventLocation = "Cerberus Cup Event Location"
+HadesEventLocation = "Hades Event Location"
+ASZexionEventLocation = "AS Zexion Event Location"
+DataZexionEventLocation = "Data Zexion Event Location"
+Oc2TitanCupEventLocation = "Titan Cup Event Location"
+Oc2GofCupEventLocation = "Goddess of Fate Cup Event Location"
+Oc2CupsEventLocation = "Olympus Coliseum Cups Event Location"
+HadesCupEventLocations = "Olympus Coliseum Hade's Paradox Event Location"
+PrisonKeeperEventLocation = "Prison Keeper Event Location"
+OogieBoogieEventLocation = "Oogie Boogie Event Location"
+ExperimentEventLocation = "The Experiment Event Location"
+ASVexenEventLocation = "AS Vexen Event Location"
+DataVexenEventLocation = "Data Vexen Event Location"
+ShanYuEventLocation = "Shan Yu Event Location"
+AnsemRikuEventLocation = "Ansem Riku Event Location"
+StormRiderEventLocation = "Storm Rider Event Location"
+DataXigbarEventLocation = "Data Xigbar Event Location"
+RoxasEventLocation = "Roxas Event Location"
+XigbarEventLocation = "Xigbar Event Location"
+LuxordEventLocation = "Luxord Event Location"
+SaixEventLocation = "Saix Event Location"
+XemnasEventLocation = "Xemnas Event Location"
+ArmoredXemnasEventLocation = "Armored Xemnas Event Location"
+ArmoredXemnas2EventLocation = "Armored Xemnas 2 Event Location"
+FinalXemnasEventLocation = "Final Xemnas Event Location"
+DataXemnasEventLocation = "Data Xemnas Event Location"
+ThresholderEventLocation = "Thresholder Event Location"
+BeastEventLocation = "Beast Event Location"
+DarkThornEventLocation = "Dark Thorn Event Location"
+XaldinEventLocation = "Xaldin Event Location"
+DataXaldinEventLocation = "Data Xaldin Event Location"
+TwinLordsEventLocation = "Twin Lords Event Location"
+GenieJafarEventLocation = "Genie Jafar Event Location"
+ASLexaeusEventLocation = "AS Lexaeus Event Location"
+DataLexaeusEventLocation = "Data Lexaeus Event Location"
+ScarEventLocation = "Scar Event Location"
+GroundShakerEventLocation = "Groundshaker Event Location"
+DataSaixEventLocation = "Data Saix Event Location"
+HBDemyxEventLocation = "Hollow Bastion Demyx Event Location"
+ThousandHeartlessEventLocation = "Thousand Heartless Event Location"
+Mushroom13EventLocation = "Mushroom 13 Event Location"
+SephiEventLocation = "Sephiroth Event Location"
+DataDemyxEventLocation = "Data Demyx Event Location"
+CorFirstFightEventLocation = "Cavern of Rememberance:Fight 1 Event Location"
+CorSecondFightEventLocation = "Cavern of Rememberance:Fight 2 Event Location"
+TransportEventLocation = "Transport to Rememberance Event Location"
+OldPeteEventLocation = "Old Pete Event Location"
+FuturePeteEventLocation = "Future Pete Event Location"
+ASMarluxiaEventLocation = "AS Marluxia Event Location"
+DataMarluxiaEventLocation = "Data Marluxia Event Location"
+TerraEventLocation = "Terra Event Location"
+TwilightThornEventLocation = "Twilight Thorn Event Location"
+Axel1EventLocation = "Axel 1 Event Location"
+Axel2EventLocation = "Axel 2 Event Location"
+DataRoxasEventLocation = "Data Roxas Event Location"
+
diff --git a/worlds/kh2/Names/RegionName.py b/worlds/kh2/Names/RegionName.py
index d07b5d3de3..63ba6acdb8 100644
--- a/worlds/kh2/Names/RegionName.py
+++ b/worlds/kh2/Names/RegionName.py
@@ -1,90 +1,156 @@
-LoD_Region                                   ="Land of Dragons"
-LoD2_Region                                  ="Land of Dragons 2"
+Ha1 = "Pooh's House"
+Ha2 = "Piglet's House"
+Ha3 = "Rabbit's House"
+Ha4 = "Roo's House"
+Ha5 = "Spooky Cave"
+Ha6 = "Starry Hill"
 
-Ag_Region                                    ="Agrabah"
-Ag2_Region                                   ="Agrabah 2"
+SoraLevels = "Sora's Levels"
+GoA = "Garden Of Assemblage"
+Keyblade = "Weapon Slots"
 
-Dc_Region                                    ="Disney Castle"
-Tr_Region                                    ="Timeless River"
+Valor = "Valor Form"
+Wisdom = "Wisdom Form"
+Limit = "Limit Form"
+Master = "Master Form"
+Final = "Final Form"
+Summon = "Summons"
+# sp
+Sp = "Space Paranoids"
+HostileProgram = "Hostile Program"
+Sp2 = "Space Paranoids 2"
+Mcp = "Master Control Program"
+ASLarxene = "AS Larxene"
+DataLarxene = "Data Larxene"
 
-HundredAcre1_Region                          ="Pooh's House"
-HundredAcre2_Region                          ="Piglet's House"
-HundredAcre3_Region                          ="Rabbit's House"
-HundredAcre4_Region                          ="Roo's House"
-HundredAcre5_Region                          ="Spookey Cave"
-HundredAcre6_Region                          ="Starry Hill"
+# pr
+Pr = "Port Royal"
+Barbosa = "Barbosa"
+Pr2 = "Port Royal 2"
+GrimReaper1 = "Grim Reaper 1"
+GrimReaper2 = "Grim Reaper 2"
+DataLuxord = "Data Luxord"
 
-Pr_Region                                    ="Port Royal"
-Pr2_Region                                   ="Port Royal 2"
-Gr2_Region                                   ="Grim Reaper 2"
+# tt
+Tt = "Twilight Town"
+Tt2 = "Twilight Town 2"
+Tt3 = "Twilight Town 3"
+DataAxel = "Data Axel"
 
-Oc_Region                                    ="Olympus Coliseum"
-Oc2_Region                                   ="Olympus Coliseum 2"
-Oc2_pain_and_panic_Region                    ="Pain and Panic Cup"
-Oc2_titan_Region                             ="Titan Cup"
-Oc2_cerberus_Region                          ="Cerberus Cup"
-Oc2_gof_Region                               ="Goddest of Fate Cup"
-Oc2Cups_Region                               ="Olympus Coliseum Cups"
-HadesCups_Region                             ="Olympus Coliseum Hade's Paradox"
+# oc
+Oc = "Olympus Coliseum"
+Cerberus = "Cerberus"
+OlympusPete = "Olympus Pete"
+Hydra = "Hydra"
+OcPainAndPanicCup = "Pain and Panic Cup"
+OcCerberusCup = "Cerberus Cup"
+Oc2 = "Olympus Coliseum 2"
+Hades = "Hades"
+ASZexion = "AS Zexion"
+DataZexion = "Data Zexion"
+Oc2TitanCup = "Titan Cup"
+Oc2GofCup = "Goddess of Fate Cup"
+Oc2Cups = "Olympus Coliseum Cups"
+HadesCups = "Olympus Coliseum Hade's Paradox"
 
-Bc_Region                                    ="Beast's Castle"
-Bc2_Region                                   ="Beast's Castle 2"
-Xaldin_Region                                ="Xaldin"
+# ht
+Ht = "Holloween Town"
+PrisonKeeper = "Prison Keeper"
+OogieBoogie = "Oogie Boogie"
+Ht2 = "Holloween Town 2"
+Experiment = "The Experiment"
+ASVexen = "AS Vexen"
+DataVexen = "Data Vexen"
 
-Sp_Region                                    ="Space Paranoids"
-Sp2_Region                                   ="Space Paranoids 2"
-Mcp_Region                                   ="Master Control Program"
+# lod
+LoD = "Land of Dragons"
+ShanYu = "Shan Yu"
+LoD2 = "Land of Dragons 2"
+AnsemRiku = "Ansem Riku"
+StormRider = "Storm Rider"
+DataXigbar = "Data Xigbar"
 
-Ht_Region                                    ="Holloween Town"
-Ht2_Region                                   ="Holloween Town 2"
+# twtnw
+Twtnw = "The World That Never Was (Pre Roxas)"
+Roxas = "Roxas"
+Xigbar = "Xigbar"
+Luxord = "Luxord"
+Saix = "Saix"
+Twtnw2 = "The World That Never Was (Second Visit)"  # Post riku transformation
+Xemnas = "Xemnas"
+ArmoredXemnas = "Armored Xemnas"
+ArmoredXemnas2 = "Armored Xemnas 2"
+FinalXemnas = "Final Xemnas"
+DataXemnas = "Data Xemnas"
 
-Hb_Region                                    ="Hollow Bastion"
-Hb2_Region                                   ="Hollow Bastion 2"
-ThousandHeartless_Region                     ="Thousand Hearless"
-Mushroom13_Region                            ="Mushroom 13"
-CoR_Region                                   ="Cavern of Rememberance"
-Transport_Region                             ="Transport to Rememberance"
+# bc
+Bc = "Beast's Castle"
+Thresholder = "Thresholder"
+Beast = "Beast"
+DarkThorn = "Dark Thorn"
+Bc2 = "Beast's Castle 2"
+Xaldin = "Xaldin"
+DataXaldin = "Data Xaldin"
 
-Pl_Region                                    ="Pride Lands"
-Pl2_Region                                   ="Pride Lands 2"
+# ag
+Ag = "Agrabah"
+TwinLords = "Twin Lords"
+Ag2 = "Agrabah 2"
+GenieJafar = "Genie Jafar"
+ASLexaeus = "AS Lexaeus"
+DataLexaeus = "Data Lexaeus"
 
-STT_Region                                   ="Simulated Twilight Town"
+# pl
+Pl = "Pride Lands"
+Scar = "Scar"
+Pl2 = "Pride Lands 2"
+GroundShaker = "Groundshaker"
+DataSaix = "Data Saix"
 
-TT_Region                                    ="Twlight Town"
-TT2_Region                                   ="Twlight Town 2"
-TT3_Region                                   ="Twlight Town 3"
+# hb
+Hb = "Hollow Bastion"
+Hb2 = "Hollow Bastion 2"
+HBDemyx = "Hollow Bastion Demyx"
+ThousandHeartless = "Thousand Heartless"
+Mushroom13 = "Mushroom 13"
+Sephi = "Sephiroth"
+DataDemyx = "Data Demyx"
 
-Twtnw_Region                                 ="The World That Never Was (First Visit)"
-Twtnw_PostRoxas                              ="The World That Never Was (Post Roxas)"
-Twtnw_PostXigbar                             ="The World That Never Was (Post Xigbar)"
-Twtnw2_Region                                ="The World That Never Was (Second Visit)"  #before riku transformation
+# CoR
+CoR = "Cavern of Rememberance"
+CorFirstFight = "Cavern of Rememberance:Fight 1"
+CorSecondFight = "Cavern of Rememberance:Fight 2"
+Transport = "Transport to Rememberance"
 
-SoraLevels_Region                            ="Sora's Levels"
-GoA_Region                                   ="Garden Of Assemblage"
-Keyblade_Region                              ="Keyblade Slots"
+# dc
+Dc = "Disney Castle"
+Tr = "Timeless River"
+OldPete = "Old Pete"
+FuturePete = "Future Pete"
+ASMarluxia = "AS Marluxia"
+DataMarluxia = "Data Marluxia"
+Terra = "Terra"
 
-Valor_Region                                 ="Valor Form"
-Wisdom_Region                                ="Wisdom Form"
-Limit_Region                                 ="Limit Form"
-Master_Region                                ="Master Form"
-Final_Region                                 ="Final Form"
+# stt
+Stt = "Simulated Twilight Town"
+TwilightThorn = "Twilight Thorn"
+Axel1 = "Axel 1"
+Axel2 = "Axel 2"
+DataRoxas = "Data Roxas"
 
-Terra_Region                                 ="Lingering Will"
-Sephi_Region                                 ="Sephiroth"
-Marluxia_Region                              ="Marluxia"
-Larxene_Region                               ="Larxene"
-Vexen_Region                                 ="Vexen"
-Lexaeus_Region                               ="Lexaeus"
-Zexion_Region                                ="Zexion"
+AtlanticaSongOne = "Atlantica First Song"
+AtlanticaSongTwo = "Atlantica Second Song"
+AtlanticaSongThree = "Atlantica Third Song"
+AtlanticaSongFour = "Atlantica Fourth Song"
 
-LevelsVS1                                    ="Levels Region (1 Visit Locking Item)"
-LevelsVS3                                    ="Levels Region (3 Visit Locking Items)"
-LevelsVS6                                    ="Levels Region (6 Visit Locking Items)"
-LevelsVS9                                    ="Levels Region (9 Visit Locking Items)"
-LevelsVS12                                    ="Levels Region (12 Visit Locking Items)"
-LevelsVS15                                    ="Levels Region (15 Visit Locking Items)"
-LevelsVS18                                    ="Levels Region (18 Visit Locking Items)"
-LevelsVS21                                    ="Levels Region (21 Visit Locking Items)"
-LevelsVS24                                    ="Levels Region (24 Visit Locking Items)"
-LevelsVS26                                    ="Levels Region (26 Visit Locking Items)"
 
+LevelsVS1 = "Levels Region (1 Visit Locking Item)"
+LevelsVS3 = "Levels Region (3 Visit Locking Items)"
+LevelsVS6 = "Levels Region (6 Visit Locking Items)"
+LevelsVS9 = "Levels Region (9 Visit Locking Items)"
+LevelsVS12 = "Levels Region (12 Visit Locking Items)"
+LevelsVS15 = "Levels Region (15 Visit Locking Items)"
+LevelsVS18 = "Levels Region (18 Visit Locking Items)"
+LevelsVS21 = "Levels Region (21 Visit Locking Items)"
+LevelsVS24 = "Levels Region (24 Visit Locking Items)"
+LevelsVS26 = "Levels Region (26 Visit Locking Items)"
diff --git a/worlds/kh2/OpenKH.py b/worlds/kh2/OpenKH.py
index c3334dbb99..6b0418c997 100644
--- a/worlds/kh2/OpenKH.py
+++ b/worlds/kh2/OpenKH.py
@@ -5,7 +5,7 @@ import os
 import Utils
 import zipfile
 
-from .Items import item_dictionary_table, CheckDupingItems
+from .Items import item_dictionary_table
 from .Locations import all_locations, SoraLevels, exclusion_table
 from .XPValues import lvlStats, formExp, soraExp
 from worlds.Files import APContainer
@@ -15,7 +15,7 @@ class KH2Container(APContainer):
     game: str = 'Kingdom Hearts 2'
 
     def __init__(self, patch_data: dict, base_path: str, output_directory: str,
-                 player=None, player_name: str = "", server: str = ""):
+        player=None, player_name: str = "", server: str = ""):
         self.patch_data = patch_data
         self.file_path = base_path
         container_path = os.path.join(output_directory, base_path + ".zip")
@@ -24,12 +24,6 @@ class KH2Container(APContainer):
     def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
         for filename, yml in self.patch_data.items():
             opened_zipfile.writestr(filename, yml)
-        for root, dirs, files in os.walk(os.path.join(os.path.dirname(__file__), "mod_template")):
-            for file in files:
-                opened_zipfile.write(os.path.join(root, file),
-                                     os.path.relpath(os.path.join(root, file),
-                                                     os.path.join(os.path.dirname(__file__), "mod_template")))
-        # opened_zipfile.writestr(self.zpf_path, self.patch_data)
         super().write_contents(opened_zipfile)
 
 
@@ -59,13 +53,6 @@ def patch_kh2(self, output_directory):
     formexp = None
     formName = None
     levelsetting = list()
-    slotDataDuping = set()
-    for values in CheckDupingItems.values():
-        if isinstance(values, set):
-            slotDataDuping = slotDataDuping.union(values)
-        else:
-            for inner_values in values.values():
-                slotDataDuping = slotDataDuping.union(inner_values)
 
     if self.multiworld.Keyblade_Minimum[self.player].value > self.multiworld.Keyblade_Maximum[self.player].value:
         logging.info(
@@ -89,14 +76,19 @@ def patch_kh2(self, output_directory):
             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)}"
-
+    all_valid_locations = {location for location, data in all_locations.items()}
     for location in self.multiworld.get_filled_locations(self.player):
-
-        data = all_locations[location.name]
-        if location.item.player == self.player:
-            itemcode = item_dictionary_table[location.item.name].kh2id
+        if location.name in all_valid_locations:
+            data = all_locations[location.name]
         else:
-            itemcode = 90  # castle map
+            continue
+        if location.item:
+            if location.item.player == self.player:
+                itemcode = item_dictionary_table[location.item.name].kh2id
+            else:
+                itemcode = 90  # castle map
+        else:
+            itemcode = 90
 
         if data.yml == "Chest":
             self.formattedTrsr[data.locid] = {"ItemId": itemcode}
@@ -129,8 +121,8 @@ def patch_kh2(self, output_directory):
         elif data.yml == "Keyblade":
             self.formattedItem["Stats"].append({
                 "Id":                  data.locid,
-                "Attack":              self.multiworld.per_slot_randoms[self.player].randint(keyblademin, keyblademax),
-                "Magic":               self.multiworld.per_slot_randoms[self.player].randint(keyblademin, keyblademax),
+                "Attack":              self.random.randint(keyblademin, keyblademax),
+                "Magic":               self.random.randint(keyblademin, keyblademax),
                 "Defense":             0,
                 "Ability":             itemcode,
                 "AbilityPoints":       0,
@@ -154,7 +146,8 @@ def patch_kh2(self, output_directory):
                     2: self.multiworld.Wisdom_Form_EXP[self.player].value,
                     3: self.multiworld.Limit_Form_EXP[self.player].value,
                     4: self.multiworld.Master_Form_EXP[self.player].value,
-                    5: self.multiworld.Final_Form_EXP[self.player].value}
+                    5: self.multiworld.Final_Form_EXP[self.player].value
+                }
                 formexp = formDictExp[data.charName]
                 formName = formDict[data.charName]
                 self.formattedFmlv[formName] = []
@@ -174,7 +167,7 @@ def patch_kh2(self, output_directory):
                 "GrowthAbilityLevel": 0,
             })
 
-    # Summons have no checks on them so done fully locally
+    # Summons have no actual locations so done down here.
     self.formattedFmlv["Summon"] = []
     for x in range(1, 7):
         self.formattedFmlv["Summon"].append({
@@ -185,17 +178,18 @@ def patch_kh2(self, output_directory):
             "GrowthAbilityLevel": 0,
         })
     # levels done down here because of optional settings that can take locations out of the pool.
-    self.i = 1
+    self.i = 2
     for location in SoraLevels:
-        increaseStat(self.multiworld.per_slot_randoms[self.player].randint(0, 3))
+        increaseStat(self.random.randint(0, 3))
         if location in levelsetting:
             data = self.multiworld.get_location(location, self.player)
-            if data.item.player == self.player:
-                itemcode = item_dictionary_table[data.item.name].kh2id
-            else:
-                itemcode = 90  # castle map
+            if data.item:
+                if data.item.player == self.player:
+                    itemcode = item_dictionary_table[data.item.name].kh2id
+                else:
+                    itemcode = 90  # castle map
         else:
-            increaseStat(self.multiworld.per_slot_randoms[self.player].randint(0, 3))
+            increaseStat(self.random.randint(0, 3))
             itemcode = 0
         self.formattedLvup["Sora"][self.i] = {
             "Exp":           int(soraExp[self.i] / self.multiworld.Sora_Level_EXP[self.player].value),
@@ -229,6 +223,193 @@ def patch_kh2(self, output_directory):
             "GeneralResistance":   100,
             "Unknown":             0
         })
+    self.formattedLvup["Sora"][1] = {
+        "Exp":           int(soraExp[1] / self.multiworld.Sora_Level_EXP[self.player].value),
+        "Strength":      2,
+        "Magic":         6,
+        "Defense":       2,
+        "Ap":            0,
+        "SwordAbility":  0,
+        "ShieldAbility": 0,
+        "StaffAbility":  0,
+        "Padding":       0,
+        "Character":     "Sora",
+        "Level":         1
+    }
+    self.mod_yml = {
+        "assets": [
+            {
+                'method': 'binarc',
+                'name':   '00battle.bin',
+                'source': [
+                    {
+                        'method': 'listpatch',
+                        'name':   'fmlv',
+                        'source': [
+                            {
+                                'name': 'FmlvList.yml',
+                                'type': 'fmlv'
+                            }
+                        ],
+                        'type':   'List'
+                    },
+                    {
+                        'method': 'listpatch',
+                        'name':   'lvup',
+                        'source': [
+                            {
+                                'name': 'LvupList.yml',
+                                'type': 'lvup'
+                            }
+                        ],
+                        'type':   'List'
+                    },
+                    {
+                        'method': 'listpatch',
+                        'name':   'bons',
+                        'source': [
+                            {
+                                'name': 'BonsList.yml',
+                                'type': 'bons'
+                            }
+                        ],
+                        'type':   'List'
+                    }
+                ]
+            },
+            {
+                'method': 'binarc',
+                'name':   '03system.bin',
+                'source': [
+                    {
+                        'method': 'listpatch',
+                        'name':   'trsr',
+                        'source': [
+                            {
+                                'name': 'TrsrList.yml',
+                                'type': 'trsr'
+                            }
+                        ],
+                        'type':   'List'
+                    },
+                    {
+                        'method': 'listpatch',
+                        'name':   'item',
+                        'source': [
+                            {
+                                'name': 'ItemList.yml',
+                                'type': 'item'
+                            }
+                        ],
+                        'type':   'List'
+                    }
+                ]
+            },
+            {
+                'name':   'msg/us/po.bar',
+                'multi':  [
+                    {
+                        'name': 'msg/fr/po.bar'
+                    },
+                    {
+                        'name': 'msg/gr/po.bar'
+                    },
+                    {
+                        'name': 'msg/it/po.bar'
+                    },
+                    {
+                        'name': 'msg/sp/po.bar'
+                    }
+                ],
+                'method': 'binarc',
+                'source': [
+                    {
+                        'name':   'po',
+                        'type':   'list',
+                        'method': 'kh2msg',
+                        'source': [
+                            {
+                                'name':     'po.yml',
+                                'language': 'en'
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                'name':   'msg/us/sys.bar',
+                'multi':  [
+                    {
+                        'name': 'msg/fr/sys.bar'
+                    },
+                    {
+                        'name': 'msg/gr/sys.bar'
+                    },
+                    {
+                        'name': 'msg/it/sys.bar'
+                    },
+                    {
+                        'name': 'msg/sp/sys.bar'
+                    }
+                ],
+                'method': 'binarc',
+                'source': [
+                    {
+                        'name':   'sys',
+                        'type':   'list',
+                        'method': 'kh2msg',
+                        'source': [
+                            {
+                                'name':     'sys.yml',
+                                'language': 'en'
+                            }
+                        ]
+                    }
+                ]
+            },
+        ],
+        'title':  'Randomizer Seed'
+    }
+
+    goal_to_text = {
+        0: "Three Proofs",
+        1: "Lucky Emblem",
+        2: "Hitlist",
+        3: "Lucky Emblem and Hitlist",
+    }
+    lucky_emblem_text = {
+        0: "Your Goal is not Lucky Emblem. It is Hitlist or Three Proofs.",
+        1: f"Lucky Emblem Required: {self.multiworld.LuckyEmblemsRequired[self.player]} out of {self.multiworld.LuckyEmblemsAmount[self.player]}",
+        2: "Your Goal is not Lucky Emblem. It is Hitlist or Three Proofs.",
+        3: f"Lucky Emblem Required: {self.multiworld.LuckyEmblemsRequired[self.player]} out of {self.multiworld.LuckyEmblemsAmount[self.player]}"
+    }
+    hitlist_text = {
+        0: "Your Goal is not Hitlist. It is Lucky Emblem or Three Proofs",
+        1: "Your Goal is not Hitlist. It is Lucky Emblem or Three Proofs",
+        2: f"Bounties Required: {self.multiworld.BountyRequired[self.player]} out of {self.multiworld.BountyAmount[self.player]}",
+        3: f"Bounties Required: {self.multiworld.BountyRequired[self.player]} out of {self.multiworld.BountyAmount[self.player]}",
+    }
+
+    self.pooh_text = [
+        {
+            'id': 18326,
+            'en': f"Your goal is {goal_to_text[self.multiworld.Goal[self.player].value]}"
+        },
+        {
+            'id': 18327,
+            'en': lucky_emblem_text[self.multiworld.Goal[self.player].value]
+        },
+        {
+            'id': 18328,
+            'en': hitlist_text[self.multiworld.Goal[self.player].value]
+        }
+    ]
+    self.level_depth_text = [
+        {
+            'id': 0x3BF1,
+            'en': f"Your Level Depth is {self.multiworld.LevelDepth[self.player].current_option_name}"
+        }
+    ]
     mod_dir = os.path.join(output_directory, mod_name + "_" + Utils.__version__)
 
     openkhmod = {
@@ -237,8 +418,11 @@ def patch_kh2(self, output_directory):
         "BonsList.yml": yaml.dump(self.formattedBons, line_break="\n"),
         "ItemList.yml": yaml.dump(self.formattedItem, line_break="\n"),
         "FmlvList.yml": yaml.dump(self.formattedFmlv, line_break="\n"),
+        "mod.yml":      yaml.dump(self.mod_yml, line_break="\n"),
+        "po.yml":       yaml.dump(self.pooh_text, line_break="\n"),
+        "sys.yml":      yaml.dump(self.level_depth_text, line_break="\n"),
     }
 
     mod = KH2Container(openkhmod, mod_dir, output_directory, self.player,
-                       self.multiworld.get_file_safe_player_name(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 7a6f106aa9..7ba7c0082d 100644
--- a/worlds/kh2/Options.py
+++ b/worlds/kh2/Options.py
@@ -1,7 +1,8 @@
-from Options import Choice, Option, Range, Toggle, OptionSet
-import typing
+from dataclasses import dataclass
 
-from worlds.kh2 import SupportAbility_Table, ActionAbility_Table
+from Options import Choice, Range, Toggle, ItemDict, PerGameCommonOptions, StartInventoryPool
+
+from worlds.kh2 import default_itempool_option
 
 
 class SoraEXP(Range):
@@ -107,23 +108,61 @@ class Visitlocking(Choice):
     First and Second Visit Locking: One item for First Visit Two For Second Visit"""
     display_name = "Visit locking"
     option_no_visit_locking = 0  # starts with 25 visit locking
-    option_second_visit_locking = 1  # starts with 13 (no icecream/picture)
+    option_second_visit_locking = 1  # starts with 12 visit locking
     option_first_and_second_visit_locking = 2  # starts with nothing
     default = 2
 
 
+class FightLogic(Choice):
+    """
+    The level of logic to use when determining what fights in each KH2 world are beatable.
+
+    Easy: For Players not very comfortable doing things without a lot of tools.
+
+    Normal: For Players somewhat comfortable doing fights with some of the tools.
+
+    Hard: For Players comfortable doing fights with almost no tools.
+    """
+    display_name = "Fight Logic"
+    option_easy = 0
+    option_normal = 1
+    option_hard = 2
+    default = 1
+
+
+class FinalFormLogic(Choice):
+    """Determines forcing final form logic
+
+    No Light and Darkness: Light and Darkness is not in logic.
+    Light And Darkness: Final Forcing with light and darkness is in logic.
+    Just a Form: All that requires final forcing is another form.
+    """
+    display_name = "Final Form Logic"
+    option_no_light_and_darkness = 0
+    option_light_and_darkness = 1
+    option_just_a_form = 2
+    default = 1
+
+
+class AutoFormLogic(Toggle):
+    """ Have Auto Forms levels in logic.
+    """
+    display_name = "Auto Form Logic"
+    default = False
+
+
 class RandomVisitLockingItem(Range):
     """Start with random amount of visit locking items."""
     display_name = "Random Visit Locking Item"
     range_start = 0
     range_end = 25
-    default = 3
+    default = 0
 
 
 class SuperBosses(Toggle):
-    """Terra, Sephiroth and Data Fights Toggle."""
+    """Terra Sephiroth and Data Fights Toggle."""
     display_name = "Super Bosses"
-    default = False
+    default = True
 
 
 class Cups(Choice):
@@ -135,7 +174,7 @@ class Cups(Choice):
     option_no_cups = 0
     option_cups = 1
     option_cups_and_hades_paradox = 2
-    default = 1
+    default = 0
 
 
 class LevelDepth(Choice):
@@ -157,67 +196,71 @@ class LevelDepth(Choice):
     default = 0
 
 
+class DonaldGoofyStatsanity(Toggle):
+    """Toggles if on Donald and Goofy's Get Bonus locations can be any item"""
+    display_name = "Donald & Goofy Statsanity"
+    default = True
+
+
+class AtlanticaToggle(Toggle):
+    """Atlantica Toggle"""
+    display_name = "Atlantica Toggle"
+    default = False
+
+
 class PromiseCharm(Toggle):
-    """Add Promise Charm to the Pool"""
+    """Add Promise Charm to the pool"""
     display_name = "Promise Charm"
     default = False
 
 
-class KeybladeAbilities(Choice):
-    """
-    Action: Action Abilities in the Keyblade Slot Pool.
-
-    Support: Support Abilities in the Keyblade Slot Pool.
-
-    Both: Action and Support Abilities in the Keyblade Slot Pool."""
-    display_name = "Keyblade Abilities"
-    option_support = 0
-    option_action = 1
-    option_both = 2
-    default = 0
-
-
-class BlacklistKeyblade(OptionSet):
-    """Black List these Abilities on Keyblades"""
-    display_name = "Blacklist Keyblade Abilities"
-    valid_keys = set(SupportAbility_Table.keys()).union(ActionAbility_Table.keys())
+class AntiForm(Toggle):
+    """Add Anti Form to the pool"""
+    display_name = "Anti Form"
+    default = False
 
 
 class Goal(Choice):
     """Win Condition
-    Three Proofs: Get a Gold Crown on Sora's Head.
+    Three Proofs: Find the 3 Proofs to unlock the final door.
 
-    Lucky Emblem Hunt: Find Required Amount of Lucky Emblems .
+    Lucky Emblem Hunt: Find required amount of Lucky Emblems.
 
-    Hitlist (Bounty Hunt): Find Required Amount of Bounties"""
+    Hitlist (Bounty Hunt): Find required amount of Bounties.
+
+    Lucky Emblem and Hitlist: Find the required amount of Lucky Emblems and Bounties."""
     display_name = "Goal"
     option_three_proofs = 0
     option_lucky_emblem_hunt = 1
     option_hitlist = 2
-    default = 0
+    option_hitlist_and_lucky_emblem = 3
+    default = 1
 
 
 class FinalXemnas(Toggle):
     """Kill Final Xemnas to Beat the Game.
-    This is in addition to your Goal. I.E. get three proofs+kill final Xemnas"""
+
+    This is in addition to your Goal.
+
+    I.E. get three proofs+kill final Xemnas"""
     display_name = "Final Xemnas"
     default = True
 
 
 class LuckyEmblemsRequired(Range):
-    """Number of Lucky Emblems to collect to Win/Unlock Final Xemnas Door.
+    """Number of Lucky Emblems to collect to Win/Unlock Final Xemnas' Door.
 
-    If Goal is not Lucky Emblem Hunt this does nothing."""
+    If Goal is not Lucky Emblem Hunt or Lucky Emblem and Hitlist this does nothing."""
     display_name = "Lucky Emblems Required"
     range_start = 1
     range_end = 60
-    default = 30
+    default = 35
 
 
 class LuckyEmblemsAmount(Range):
     """Number of Lucky Emblems that are in the pool.
 
-    If Goal is not Lucky Emblem Hunt this does nothing."""
+    If Goal is not Lucky Emblem Hunt or Lucky Emblem and Hitlist this does nothing."""
     display_name = "Lucky Emblems Available"
     range_start = 1
     range_end = 60
@@ -227,48 +270,103 @@ class LuckyEmblemsAmount(Range):
 class BountyRequired(Range):
     """Number of Bounties to collect to Win/Unlock Final Xemnas Door.
 
-    If Goal is not Hitlist this does nothing."""
+    If Goal is not Hitlist or Lucky Emblem and Hitlist this does nothing."""
     display_name = "Bounties Required"
     range_start = 1
-    range_end = 24
+    range_end = 26
     default = 7
 
 
 class BountyAmount(Range):
     """Number of Bounties that are in the pool.
 
-    If Goal is not Hitlist this does nothing."""
+    If Goal is not Hitlist or Lucky Emblem and Hitlist this does nothing."""
     display_name = "Bounties Available"
     range_start = 1
-    range_end = 24
-    default = 13
+    range_end = 26
+    default = 10
 
 
-KH2_Options: typing.Dict[str, type(Option)] = {
-    "LevelDepth":             LevelDepth,
-    "Sora_Level_EXP":         SoraEXP,
-    "Valor_Form_EXP":         ValorEXP,
-    "Wisdom_Form_EXP":        WisdomEXP,
-    "Limit_Form_EXP":         LimitEXP,
-    "Master_Form_EXP":        MasterEXP,
-    "Final_Form_EXP":         FinalEXP,
-    "Summon_EXP":             SummonEXP,
-    "Schmovement":            Schmovement,
-    "RandomGrowth":           RandomGrowth,
-    "Promise_Charm":          PromiseCharm,
-    "Goal":                   Goal,
-    "FinalXemnas":            FinalXemnas,
-    "LuckyEmblemsAmount":     LuckyEmblemsAmount,
-    "LuckyEmblemsRequired":   LuckyEmblemsRequired,
-    "BountyAmount":           BountyAmount,
-    "BountyRequired":         BountyRequired,
-    "Keyblade_Minimum":       KeybladeMin,
-    "Keyblade_Maximum":       KeybladeMax,
-    "Visitlocking":           Visitlocking,
-    "RandomVisitLockingItem": RandomVisitLockingItem,
-    "SuperBosses":            SuperBosses,
-    "KeybladeAbilities":      KeybladeAbilities,
-    "BlacklistKeyblade":      BlacklistKeyblade,
-    "Cups":                   Cups,
+class BountyStartHint(Toggle):
+    """Start with Bounties Hinted"""
+    display_name = "Start with Bounties Hinted"
+    default = False
 
-}
+
+class WeaponSlotStartHint(Toggle):
+    """Start with Weapon Slots' Hinted"""
+    display_name = "Start with Weapon Slots Hinted"
+    default = False
+
+
+class CorSkipToggle(Toggle):
+    """Toggle for Cor skip.
+
+    Tools depend on which difficulty was chosen on Fight Difficulty.
+
+    Toggle does not negate fight logic but is an alternative.
+
+    Final Chest is also can be put into logic with this skip.
+    """
+    display_name = "CoR Skip Toggle."
+    default = False
+
+
+class CustomItemPoolQuantity(ItemDict):
+    """Add more of an item into the itempool. Note: You cannot take out items from the pool."""
+    display_name = "Custom Item Pool"
+    verify_item_name = True
+    default = default_itempool_option
+
+
+class FillerItemsLocal(Toggle):
+    """Make all dynamic filler classified items local. Recommended when playing with games with fewer locations than kh2"""
+    display_name = "Local Filler Items"
+    default = True
+
+
+class SummonLevelLocationToggle(Toggle):
+    """Toggle Summon levels to have locations."""
+    display_name = "Summon Level Locations"
+    default = False
+
+
+# shamelessly stolen from the messanger
+@dataclass
+class KingdomHearts2Options(PerGameCommonOptions):
+    start_inventory: StartInventoryPool
+    LevelDepth: LevelDepth
+    Sora_Level_EXP: SoraEXP
+    Valor_Form_EXP: ValorEXP
+    Wisdom_Form_EXP: WisdomEXP
+    Limit_Form_EXP: LimitEXP
+    Master_Form_EXP: MasterEXP
+    Final_Form_EXP: FinalEXP
+    Summon_EXP: SummonEXP
+    Schmovement: Schmovement
+    RandomGrowth: RandomGrowth
+    AntiForm: AntiForm
+    Promise_Charm: PromiseCharm
+    Goal: Goal
+    FinalXemnas: FinalXemnas
+    LuckyEmblemsAmount: LuckyEmblemsAmount
+    LuckyEmblemsRequired: LuckyEmblemsRequired
+    BountyAmount: BountyAmount
+    BountyRequired: BountyRequired
+    BountyStartingHintToggle: BountyStartHint
+    Keyblade_Minimum: KeybladeMin
+    Keyblade_Maximum: KeybladeMax
+    WeaponSlotStartHint: WeaponSlotStartHint
+    FightLogic: FightLogic
+    FinalFormLogic: FinalFormLogic
+    AutoFormLogic: AutoFormLogic
+    DonaldGoofyStatsanity: DonaldGoofyStatsanity
+    FillerItemsLocal: FillerItemsLocal
+    Visitlocking: Visitlocking
+    RandomVisitLockingItem: RandomVisitLockingItem
+    SuperBosses: SuperBosses
+    Cups: Cups
+    SummonLevelLocationToggle: SummonLevelLocationToggle
+    AtlanticaToggle: AtlanticaToggle
+    CorSkipToggle: CorSkipToggle
+    CustomItemPoolQuantity: CustomItemPoolQuantity
diff --git a/worlds/kh2/Regions.py b/worlds/kh2/Regions.py
index 36fc0c046b..6dd8313107 100644
--- a/worlds/kh2/Regions.py
+++ b/worlds/kh2/Regions.py
@@ -1,35 +1,22 @@
 import typing
 
-from BaseClasses import MultiWorld, Region, Entrance
+from BaseClasses import MultiWorld, Region
 
-from .Locations import KH2Location, RegionTable
-from .Names import LocationName, ItemName, RegionName
+from .Locations import KH2Location, event_location_to_item
+from . import LocationName, RegionName, Events_Table
 
-
-def create_regions(world, player: int, active_locations):
-    menu_region = create_region(world, player, active_locations, 'Menu', None)
-
-    goa_region_locations = [
-        LocationName.Crit_1,
-        LocationName.Crit_2,
-        LocationName.Crit_3,
-        LocationName.Crit_4,
-        LocationName.Crit_5,
-        LocationName.Crit_6,
-        LocationName.Crit_7,
+KH2REGIONS: typing.Dict[str, typing.List[str]] = {
+    "Menu":                        [],
+    RegionName.GoA:                [
         LocationName.GardenofAssemblageMap,
         LocationName.GoALostIllusion,
         LocationName.ProofofNonexistence,
-        LocationName.DonaldStarting1,
-        LocationName.DonaldStarting2,
-        LocationName.GoofyStarting1,
-        LocationName.GoofyStarting2,
-    ]
-
-    goa_region = create_region(world, player, active_locations, RegionName.GoA_Region,
-                               goa_region_locations)
-
-    lod_Region_locations = [
+        # LocationName.DonaldStarting1,
+        # LocationName.DonaldStarting2,
+        # LocationName.GoofyStarting1,
+        # LocationName.GoofyStarting2
+    ],
+    RegionName.LoD:                [
         LocationName.BambooGroveDarkShard,
         LocationName.BambooGroveEther,
         LocationName.BambooGroveMythrilShard,
@@ -47,14 +34,16 @@ def create_regions(world, player: int, active_locations):
         LocationName.VillageCaveBonus,
         LocationName.RidgeFrostShard,
         LocationName.RidgeAPBoost,
+    ],
+    RegionName.ShanYu:             [
         LocationName.ShanYu,
         LocationName.ShanYuGetBonus,
         LocationName.HiddenDragon,
         LocationName.GoofyShanYu,
-    ]
-    lod_Region = create_region(world, player, active_locations, RegionName.LoD_Region,
-                               lod_Region_locations)
-    lod2_Region_locations = [
+        LocationName.ShanYuEventLocation
+    ],
+    RegionName.LoD2:               [],
+    RegionName.AnsemRiku:          [
         LocationName.ThroneRoomTornPages,
         LocationName.ThroneRoomPalaceMap,
         LocationName.ThroneRoomAPBoost,
@@ -63,13 +52,18 @@ def create_regions(world, player: int, active_locations):
         LocationName.ThroneRoomOgreShield,
         LocationName.ThroneRoomMythrilCrystal,
         LocationName.ThroneRoomOrichalcum,
+        LocationName.AnsemRikuEventLocation,
+    ],
+    RegionName.StormRider:         [
         LocationName.StormRider,
-        LocationName.XigbarDataDefenseBoost,
         LocationName.GoofyStormRider,
-    ]
-    lod2_Region = create_region(world, player, active_locations, RegionName.LoD2_Region,
-                                lod2_Region_locations)
-    ag_region_locations = [
+        LocationName.StormRiderEventLocation
+    ],
+    RegionName.DataXigbar:         [
+        LocationName.XigbarDataDefenseBoost,
+        LocationName.DataXigbarEventLocation
+    ],
+    RegionName.Ag:                 [
         LocationName.AgrabahMap,
         LocationName.AgrabahDarkShard,
         LocationName.AgrabahMythrilShard,
@@ -97,30 +91,30 @@ def create_regions(world, player: int, active_locations):
         LocationName.TreasureRoom,
         LocationName.TreasureRoomAPBoost,
         LocationName.TreasureRoomSerenityGem,
+        LocationName.GoofyTreasureRoom,
+        LocationName.DonaldAbuEscort
+    ],
+    RegionName.TwinLords:          [
         LocationName.ElementalLords,
         LocationName.LampCharm,
-        LocationName.GoofyTreasureRoom,
-        LocationName.DonaldAbuEscort,
-    ]
-    ag_region = create_region(world, player, active_locations, RegionName.Ag_Region,
-                              ag_region_locations)
-    ag2_region_locations = [
+        LocationName.TwinLordsEventLocation
+    ],
+    RegionName.Ag2:                [
         LocationName.RuinedChamberTornPages,
         LocationName.RuinedChamberRuinsMap,
+    ],
+    RegionName.GenieJafar:         [
         LocationName.GenieJafar,
         LocationName.WishingLamp,
-    ]
-    ag2_region = create_region(world, player, active_locations, RegionName.Ag2_Region,
-                               ag2_region_locations)
-    lexaeus_region_locations = [
+        LocationName.GenieJafarEventLocation,
+    ],
+    RegionName.DataLexaeus:        [
         LocationName.LexaeusBonus,
         LocationName.LexaeusASStrengthBeyondStrength,
         LocationName.LexaeusDataLostIllusion,
-    ]
-    lexaeus_region = create_region(world, player, active_locations, RegionName.Lexaeus_Region,
-                                   lexaeus_region_locations)
-
-    dc_region_locations = [
+        LocationName.DataLexaeusEventLocation
+    ],
+    RegionName.Dc:                 [
         LocationName.DCCourtyardMythrilShard,
         LocationName.DCCourtyardStarRecipe,
         LocationName.DCCourtyardAPBoost,
@@ -131,74 +125,65 @@ def create_regions(world, player: int, active_locations):
         LocationName.LibraryTornPages,
         LocationName.DisneyCastleMap,
         LocationName.MinnieEscort,
-        LocationName.MinnieEscortGetBonus,
-    ]
-    dc_region = create_region(world, player, active_locations, RegionName.Dc_Region,
-                              dc_region_locations)
-    tr_region_locations = [
+        LocationName.MinnieEscortGetBonus
+    ],
+    RegionName.Tr:                 [
         LocationName.CornerstoneHillMap,
         LocationName.CornerstoneHillFrostShard,
         LocationName.PierMythrilShard,
         LocationName.PierHiPotion,
+    ],
+    RegionName.OldPete:            [
         LocationName.WaterwayMythrilStone,
         LocationName.WaterwayAPBoost,
         LocationName.WaterwayFrostStone,
         LocationName.WindowofTimeMap,
         LocationName.BoatPete,
+        LocationName.DonaldBoatPete,
+        LocationName.DonaldBoatPeteGetBonus,
+        LocationName.OldPeteEventLocation,
+    ],
+    RegionName.FuturePete:         [
         LocationName.FuturePete,
         LocationName.FuturePeteGetBonus,
         LocationName.Monochrome,
         LocationName.WisdomForm,
-        LocationName.DonaldBoatPete,
-        LocationName.DonaldBoatPeteGetBonus,
         LocationName.GoofyFuturePete,
-    ]
-    tr_region = create_region(world, player, active_locations, RegionName.Tr_Region,
-                              tr_region_locations)
-    marluxia_region_locations = [
+        LocationName.FuturePeteEventLocation
+    ],
+    RegionName.DataMarluxia:       [
         LocationName.MarluxiaGetBonus,
         LocationName.MarluxiaASEternalBlossom,
         LocationName.MarluxiaDataLostIllusion,
-    ]
-    marluxia_region = create_region(world, player, active_locations, RegionName.Marluxia_Region,
-                                    marluxia_region_locations)
-    terra_region_locations = [
+        LocationName.DataMarluxiaEventLocation
+    ],
+    RegionName.Terra:              [
         LocationName.LingeringWillBonus,
         LocationName.LingeringWillProofofConnection,
         LocationName.LingeringWillManifestIllusion,
-    ]
-    terra_region = create_region(world, player, active_locations, RegionName.Terra_Region,
-                                 terra_region_locations)
-
-    hundred_acre1_region_locations = [
+        LocationName.TerraEventLocation
+    ],
+    RegionName.Ha1:                [
         LocationName.PoohsHouse100AcreWoodMap,
         LocationName.PoohsHouseAPBoost,
-        LocationName.PoohsHouseMythrilStone,
-    ]
-    hundred_acre1_region = create_region(world, player, active_locations, RegionName.HundredAcre1_Region,
-                                         hundred_acre1_region_locations)
-    hundred_acre2_region_locations = [
+        LocationName.PoohsHouseMythrilStone
+    ],
+    RegionName.Ha2:                [
         LocationName.PigletsHouseDefenseBoost,
         LocationName.PigletsHouseAPBoost,
-        LocationName.PigletsHouseMythrilGem,
-    ]
-    hundred_acre2_region = create_region(world, player, active_locations, RegionName.HundredAcre2_Region,
-                                         hundred_acre2_region_locations)
-    hundred_acre3_region_locations = [
+        LocationName.PigletsHouseMythrilGem
+    ],
+    RegionName.Ha3:                [
         LocationName.RabbitsHouseDrawRing,
         LocationName.RabbitsHouseMythrilCrystal,
         LocationName.RabbitsHouseAPBoost,
-    ]
-    hundred_acre3_region = create_region(world, player, active_locations, RegionName.HundredAcre3_Region,
-                                         hundred_acre3_region_locations)
-    hundred_acre4_region_locations = [
+    ],
+    RegionName.Ha4:                [
         LocationName.KangasHouseMagicBoost,
         LocationName.KangasHouseAPBoost,
         LocationName.KangasHouseOrichalcum,
-    ]
-    hundred_acre4_region = create_region(world, player, active_locations, RegionName.HundredAcre4_Region,
-                                         hundred_acre4_region_locations)
-    hundred_acre5_region_locations = [
+    ],
+    RegionName.Ha5:                [
         LocationName.SpookyCaveMythrilGem,
         LocationName.SpookyCaveAPBoost,
         LocationName.SpookyCaveOrichalcum,
@@ -206,19 +191,15 @@ def create_regions(world, player: int, active_locations):
         LocationName.SpookyCaveMythrilCrystal,
         LocationName.SpookyCaveAPBoost2,
         LocationName.SweetMemories,
-        LocationName.SpookyCaveMap,
-    ]
-    hundred_acre5_region = create_region(world, player, active_locations, RegionName.HundredAcre5_Region,
-                                         hundred_acre5_region_locations)
-    hundred_acre6_region_locations = [
+        LocationName.SpookyCaveMap
+    ],
+    RegionName.Ha6:                [
         LocationName.StarryHillCosmicRing,
         LocationName.StarryHillStyleRecipe,
         LocationName.StarryHillCureElement,
-        LocationName.StarryHillOrichalcumPlus,
-    ]
-    hundred_acre6_region = create_region(world, player, active_locations, RegionName.HundredAcre6_Region,
-                                         hundred_acre6_region_locations)
-    pr_region_locations = [
+        LocationName.StarryHillOrichalcumPlus
+    ],
+    RegionName.Pr:                 [
         LocationName.RampartNavalMap,
         LocationName.RampartMythrilStone,
         LocationName.RampartDarkShard,
@@ -236,17 +217,20 @@ def create_regions(world, player: int, active_locations):
         LocationName.MoonlightNookMythrilShard,
         LocationName.MoonlightNookSerenityGem,
         LocationName.MoonlightNookPowerStone,
+        LocationName.DonaldBoatFight,
+        LocationName.GoofyInterceptorBarrels,
+
+    ],
+    RegionName.Barbosa:            [
         LocationName.Barbossa,
         LocationName.BarbossaGetBonus,
         LocationName.FollowtheWind,
-        LocationName.DonaldBoatFight,
         LocationName.GoofyBarbossa,
         LocationName.GoofyBarbossaGetBonus,
-        LocationName.GoofyInterceptorBarrels,
-    ]
-    pr_region = create_region(world, player, active_locations, RegionName.Pr_Region,
-                              pr_region_locations)
-    pr2_region_locations = [
+        LocationName.BarbosaEventLocation,
+    ],
+    RegionName.Pr2:                [],
+    RegionName.GrimReaper1:        [
         LocationName.GrimReaper1,
         LocationName.InterceptorsHoldFeatherCharm,
         LocationName.SeadriftKeepAPBoost,
@@ -258,19 +242,19 @@ def create_regions(world, player: int, active_locations):
         LocationName.SeadriftRowCursedMedallion,
         LocationName.SeadriftRowShipGraveyardMap,
         LocationName.GoofyGrimReaper1,
-
-    ]
-    pr2_region = create_region(world, player, active_locations, RegionName.Pr2_Region,
-                               pr2_region_locations)
-    gr2_region_locations = [
+        LocationName.GrimReaper1EventLocation,
+    ],
+    RegionName.GrimReaper2:        [
         LocationName.DonaladGrimReaper2,
         LocationName.GrimReaper2,
         LocationName.SecretAnsemReport6,
+        LocationName.GrimReaper2EventLocation,
+    ],
+    RegionName.DataLuxord:         [
         LocationName.LuxordDataAPBoost,
-    ]
-    gr2_region = create_region(world, player, active_locations, RegionName.Gr2_Region,
-                               gr2_region_locations)
-    oc_region_locations = [
+        LocationName.DataLuxordEventLocation
+    ],
+    RegionName.Oc:                 [
         LocationName.PassageMythrilShard,
         LocationName.PassageMythrilStone,
         LocationName.PassageEther,
@@ -278,6 +262,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.PassageHiPotion,
         LocationName.InnerChamberUnderworldMap,
         LocationName.InnerChamberMythrilShard,
+    ],
+    RegionName.Cerberus:           [
         LocationName.Cerberus,
         LocationName.ColiseumMap,
         LocationName.Urns,
@@ -297,56 +283,61 @@ def create_regions(world, player: int, active_locations):
         LocationName.TheLockCavernsMap,
         LocationName.TheLockMythrilShard,
         LocationName.TheLockAPBoost,
+        LocationName.CerberusEventLocation
+    ],
+    RegionName.OlympusPete:        [
         LocationName.PeteOC,
+        LocationName.DonaldDemyxOC,
+        LocationName.GoofyPeteOC,
+        LocationName.OlympusPeteEventLocation
+    ],
+    RegionName.Hydra:              [
         LocationName.Hydra,
         LocationName.HydraGetBonus,
         LocationName.HerosCrest,
-        LocationName.DonaldDemyxOC,
-        LocationName.GoofyPeteOC,
-    ]
-    oc_region = create_region(world, player, active_locations, RegionName.Oc_Region,
-                              oc_region_locations)
-    oc2_region_locations = [
+        LocationName.HydraEventLocation
+    ],
+    RegionName.Oc2:                [
         LocationName.AuronsStatue,
+    ],
+    RegionName.Hades:              [
         LocationName.Hades,
         LocationName.HadesGetBonus,
         LocationName.GuardianSoul,
-
-    ]
-    oc2_region = create_region(world, player, active_locations, RegionName.Oc2_Region,
-                               oc2_region_locations)
-    oc2_pain_and_panic_locations = [
+        LocationName.HadesEventLocation
+    ],
+    RegionName.OcPainAndPanicCup:  [
         LocationName.ProtectBeltPainandPanicCup,
         LocationName.SerenityGemPainandPanicCup,
-    ]
-    oc2_titan_locations = [
-        LocationName.GenjiShieldTitanCup,
-        LocationName.SkillfulRingTitanCup,
-    ]
-    oc2_cerberus_locations = [
+        LocationName.OcPainAndPanicCupEventLocation
+    ],
+    RegionName.OcCerberusCup:      [
         LocationName.RisingDragonCerberusCup,
         LocationName.SerenityCrystalCerberusCup,
-    ]
-    oc2_gof_cup_locations = [
+        LocationName.OcCerberusCupEventLocation
+    ],
+    RegionName.Oc2TitanCup:        [
+        LocationName.GenjiShieldTitanCup,
+        LocationName.SkillfulRingTitanCup,
+        LocationName.Oc2TitanCupEventLocation
+    ],
+    RegionName.Oc2GofCup:          [
         LocationName.FatalCrestGoddessofFateCup,
         LocationName.OrichalcumPlusGoddessofFateCup,
+        LocationName.Oc2GofCupEventLocation,
+    ],
+    RegionName.HadesCups:          [
         LocationName.HadesCupTrophyParadoxCups,
-    ]
-    zexion_region_locations = [
+        LocationName.HadesCupEventLocations
+    ],
+    RegionName.DataZexion:         [
         LocationName.ZexionBonus,
         LocationName.ZexionASBookofShadows,
         LocationName.ZexionDataLostIllusion,
         LocationName.GoofyZexion,
-    ]
-    oc2_pain_and_panic_cup = create_region(world, player, active_locations, RegionName.Oc2_pain_and_panic_Region,
-                                           oc2_pain_and_panic_locations)
-    oc2_titan_cup = create_region(world, player, active_locations, RegionName.Oc2_titan_Region, oc2_titan_locations)
-    oc2_cerberus_cup = create_region(world, player, active_locations, RegionName.Oc2_cerberus_Region,
-                                     oc2_cerberus_locations)
-    oc2_gof_cup = create_region(world, player, active_locations, RegionName.Oc2_gof_Region, oc2_gof_cup_locations)
-    zexion_region = create_region(world, player, active_locations, RegionName.Zexion_Region, zexion_region_locations)
-
-    bc_region_locations = [
+        LocationName.DataZexionEventLocation
+    ],
+    RegionName.Bc:                 [
         LocationName.BCCourtyardAPBoost,
         LocationName.BCCourtyardHiPotion,
         LocationName.BCCourtyardMythrilShard,
@@ -359,6 +350,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.TheWestHallMythrilShard2,
         LocationName.TheWestHallBrightStone,
         LocationName.TheWestHallMythrilShard,
+    ],
+    RegionName.Thresholder:        [
         LocationName.Thresholder,
         LocationName.DungeonBasementMap,
         LocationName.DungeonAPBoost,
@@ -368,33 +361,37 @@ def create_regions(world, player: int, active_locations):
         LocationName.TheWestHallAPBoostPostDungeon,
         LocationName.TheWestWingMythrilShard,
         LocationName.TheWestWingTent,
+        LocationName.DonaldThresholder,
+        LocationName.ThresholderEventLocation
+    ],
+    RegionName.Beast:              [
         LocationName.Beast,
         LocationName.TheBeastsRoomBlazingShard,
+        LocationName.GoofyBeast,
+        LocationName.BeastEventLocation
+    ],
+    RegionName.DarkThorn:          [
         LocationName.DarkThorn,
         LocationName.DarkThornGetBonus,
         LocationName.DarkThornCureElement,
-        LocationName.DonaldThresholder,
-        LocationName.GoofyBeast,
-    ]
-    bc_region = create_region(world, player, active_locations, RegionName.Bc_Region,
-                              bc_region_locations)
-    bc2_region_locations = [
+        LocationName.DarkThornEventLocation,
+    ],
+    RegionName.Bc2:                [
         LocationName.RumblingRose,
-        LocationName.CastleWallsMap,
-
-    ]
-    bc2_region = create_region(world, player, active_locations, RegionName.Bc2_Region,
-                               bc2_region_locations)
-    xaldin_region_locations = [
+        LocationName.CastleWallsMap
+    ],
+    RegionName.Xaldin:             [
         LocationName.Xaldin,
         LocationName.XaldinGetBonus,
         LocationName.DonaldXaldinGetBonus,
         LocationName.SecretAnsemReport4,
+        LocationName.XaldinEventLocation
+    ],
+    RegionName.DataXaldin:         [
         LocationName.XaldinDataDefenseBoost,
-    ]
-    xaldin_region = create_region(world, player, active_locations, RegionName.Xaldin_Region,
-                                  xaldin_region_locations)
-    sp_region_locations = [
+        LocationName.DataXaldinEventLocation
+    ],
+    RegionName.Sp:                 [
         LocationName.PitCellAreaMap,
         LocationName.PitCellMythrilCrystal,
         LocationName.CanyonDarkCrystal,
@@ -406,41 +403,35 @@ def create_regions(world, player: int, active_locations):
         LocationName.HallwayAPBoost,
         LocationName.CommunicationsRoomIOTowerMap,
         LocationName.CommunicationsRoomGaiaBelt,
+        LocationName.DonaldScreens,
+    ],
+    RegionName.HostileProgram:     [
         LocationName.HostileProgram,
         LocationName.HostileProgramGetBonus,
         LocationName.PhotonDebugger,
-        LocationName.DonaldScreens,
         LocationName.GoofyHostileProgram,
-
-    ]
-    sp_region = create_region(world, player, active_locations, RegionName.Sp_Region,
-                              sp_region_locations)
-    sp2_region_locations = [
+        LocationName.HostileProgramEventLocation
+    ],
+    RegionName.Sp2:                [
         LocationName.SolarSailer,
         LocationName.CentralComputerCoreAPBoost,
         LocationName.CentralComputerCoreOrichalcumPlus,
         LocationName.CentralComputerCoreCosmicArts,
         LocationName.CentralComputerCoreMap,
-
-        LocationName.DonaldSolarSailer,
-    ]
-
-    sp2_region = create_region(world, player, active_locations, RegionName.Sp2_Region,
-                               sp2_region_locations)
-    mcp_region_locations = [
+        LocationName.DonaldSolarSailer
+    ],
+    RegionName.Mcp:                [
         LocationName.MCP,
         LocationName.MCPGetBonus,
-    ]
-    mcp_region = create_region(world, player, active_locations, RegionName.Mcp_Region,
-                               mcp_region_locations)
-    larxene_region_locations = [
+        LocationName.McpEventLocation
+    ],
+    RegionName.DataLarxene:        [
         LocationName.LarxeneBonus,
         LocationName.LarxeneASCloakedThunder,
         LocationName.LarxeneDataLostIllusion,
-    ]
-    larxene_region = create_region(world, player, active_locations, RegionName.Larxene_Region,
-                                   larxene_region_locations)
-    ht_region_locations = [
+        LocationName.DataLarxeneEventLocation
+    ],
+    RegionName.Ht:                 [
         LocationName.GraveyardMythrilShard,
         LocationName.GraveyardSerenityGem,
         LocationName.FinklesteinsLabHalloweenTownMap,
@@ -455,34 +446,37 @@ def create_regions(world, player: int, active_locations):
         LocationName.CandyCaneLaneMythrilStone,
         LocationName.SantasHouseChristmasTownMap,
         LocationName.SantasHouseAPBoost,
+    ],
+    RegionName.PrisonKeeper:       [
         LocationName.PrisonKeeper,
+        LocationName.DonaldPrisonKeeper,
+        LocationName.PrisonKeeperEventLocation,
+    ],
+    RegionName.OogieBoogie:        [
         LocationName.OogieBoogie,
         LocationName.OogieBoogieMagnetElement,
-        LocationName.DonaldPrisonKeeper,
         LocationName.GoofyOogieBoogie,
-    ]
-    ht_region = create_region(world, player, active_locations, RegionName.Ht_Region,
-                              ht_region_locations)
-    ht2_region_locations = [
+        LocationName.OogieBoogieEventLocation
+    ],
+    RegionName.Ht2:                [
         LocationName.Lock,
         LocationName.Present,
         LocationName.DecoyPresents,
+        LocationName.GoofyLock
+    ],
+    RegionName.Experiment:         [
         LocationName.Experiment,
         LocationName.DecisivePumpkin,
-
         LocationName.DonaldExperiment,
-        LocationName.GoofyLock,
-    ]
-    ht2_region = create_region(world, player, active_locations, RegionName.Ht2_Region,
-                               ht2_region_locations)
-    vexen_region_locations = [
+        LocationName.ExperimentEventLocation,
+    ],
+    RegionName.DataVexen:          [
         LocationName.VexenBonus,
         LocationName.VexenASRoadtoDiscovery,
         LocationName.VexenDataLostIllusion,
-    ]
-    vexen_region = create_region(world, player, active_locations, RegionName.Vexen_Region,
-                                 vexen_region_locations)
-    hb_region_locations = [
+        LocationName.DataVexenEventLocation
+    ],
+    RegionName.Hb:                 [
         LocationName.MarketplaceMap,
         LocationName.BoroughDriveRecovery,
         LocationName.BoroughAPBoost,
@@ -493,11 +487,9 @@ def create_regions(world, player: int, active_locations):
         LocationName.MerlinsHouseBlizzardElement,
         LocationName.Bailey,
         LocationName.BaileySecretAnsemReport7,
-        LocationName.BaseballCharm,
-    ]
-    hb_region = create_region(world, player, active_locations, RegionName.Hb_Region,
-                              hb_region_locations)
-    hb2_region_locations = [
+        LocationName.BaseballCharm
+    ],
+    RegionName.Hb2:                [
         LocationName.PosternCastlePerimeterMap,
         LocationName.PosternMythrilGem,
         LocationName.PosternAPBoost,
@@ -511,18 +503,9 @@ def create_regions(world, player: int, active_locations):
         LocationName.AnsemsStudyUkuleleCharm,
         LocationName.RestorationSiteMoonRecipe,
         LocationName.RestorationSiteAPBoost,
-        LocationName.CoRDepthsAPBoost,
-        LocationName.CoRDepthsPowerCrystal,
-        LocationName.CoRDepthsFrostCrystal,
-        LocationName.CoRDepthsManifestIllusion,
-        LocationName.CoRDepthsAPBoost2,
-        LocationName.CoRMineshaftLowerLevelDepthsofRemembranceMap,
-        LocationName.CoRMineshaftLowerLevelAPBoost,
+    ],
+    RegionName.HBDemyx:            [
         LocationName.DonaldDemyxHBGetBonus,
-    ]
-    hb2_region = create_region(world, player, active_locations, RegionName.Hb2_Region,
-                               hb2_region_locations)
-    onek_region_locations = [
         LocationName.DemyxHB,
         LocationName.DemyxHBGetBonus,
         LocationName.FFFightsCureElement,
@@ -530,30 +513,41 @@ def create_regions(world, player: int, active_locations):
         LocationName.CrystalFissureTheGreatMawMap,
         LocationName.CrystalFissureEnergyCrystal,
         LocationName.CrystalFissureAPBoost,
+        LocationName.HBDemyxEventLocation,
+    ],
+    RegionName.ThousandHeartless:  [
         LocationName.ThousandHeartless,
         LocationName.ThousandHeartlessSecretAnsemReport1,
         LocationName.ThousandHeartlessIceCream,
         LocationName.ThousandHeartlessPicture,
         LocationName.PosternGullWing,
         LocationName.HeartlessManufactoryCosmicChain,
+        LocationName.ThousandHeartlessEventLocation,
+    ],
+    RegionName.DataDemyx:          [
         LocationName.DemyxDataAPBoost,
-    ]
-    onek_region = create_region(world, player, active_locations, RegionName.ThousandHeartless_Region,
-                                onek_region_locations)
-    mushroom_region_locations = [
+        LocationName.DataDemyxEventLocation,
+    ],
+    RegionName.Mushroom13:         [
         LocationName.WinnersProof,
         LocationName.ProofofPeace,
-    ]
-    mushroom_region = create_region(world, player, active_locations, RegionName.Mushroom13_Region,
-                                    mushroom_region_locations)
-    sephi_region_locations = [
+        LocationName.Mushroom13EventLocation,
+    ],
+    RegionName.Sephi:              [
         LocationName.SephirothBonus,
         LocationName.SephirothFenrir,
-    ]
-    sephi_region = create_region(world, player, active_locations, RegionName.Sephi_Region,
-                                 sephi_region_locations)
-
-    cor_region_locations = [
+        LocationName.SephiEventLocation
+    ],
+    RegionName.CoR:                [
+        LocationName.CoRDepthsAPBoost,
+        LocationName.CoRDepthsPowerCrystal,
+        LocationName.CoRDepthsFrostCrystal,
+        LocationName.CoRDepthsManifestIllusion,
+        LocationName.CoRDepthsAPBoost2,
+        LocationName.CoRMineshaftLowerLevelDepthsofRemembranceMap,
+        LocationName.CoRMineshaftLowerLevelAPBoost,
+    ],
+    RegionName.CorFirstFight:      [
         LocationName.CoRDepthsUpperLevelRemembranceGem,
         LocationName.CoRMiningAreaSerenityGem,
         LocationName.CoRMiningAreaAPBoost,
@@ -561,22 +555,23 @@ def create_regions(world, player: int, active_locations):
         LocationName.CoRMiningAreaManifestIllusion,
         LocationName.CoRMiningAreaSerenityGem2,
         LocationName.CoRMiningAreaDarkRemembranceMap,
+        LocationName.CorFirstFightEventLocation,
+    ],
+    RegionName.CorSecondFight:     [
         LocationName.CoRMineshaftMidLevelPowerBoost,
         LocationName.CoREngineChamberSerenityCrystal,
         LocationName.CoREngineChamberRemembranceCrystal,
         LocationName.CoREngineChamberAPBoost,
         LocationName.CoREngineChamberManifestIllusion,
         LocationName.CoRMineshaftUpperLevelMagicBoost,
-    ]
-    cor_region = create_region(world, player, active_locations, RegionName.CoR_Region,
-                               cor_region_locations)
-    transport_region_locations = [
-        LocationName.CoRMineshaftUpperLevelAPBoost,
+        LocationName.CorSecondFightEventLocation,
+    ],
+    RegionName.Transport:          [
+        LocationName.CoRMineshaftUpperLevelAPBoost,  # last chest
         LocationName.TransporttoRemembrance,
-    ]
-    transport_region = create_region(world, player, active_locations, RegionName.Transport_Region,
-                                     transport_region_locations)
-    pl_region_locations = [
+        LocationName.TransportEventLocation,
+    ],
+    RegionName.Pl:                 [
         LocationName.GorgeSavannahMap,
         LocationName.GorgeDarkGem,
         LocationName.GorgeMythrilStone,
@@ -604,31 +599,40 @@ def create_regions(world, player: int, active_locations):
         LocationName.OasisAPBoost,
         LocationName.CircleofLife,
         LocationName.Hyenas1,
+
+        LocationName.GoofyHyenas1
+    ],
+    RegionName.Scar:               [
         LocationName.Scar,
         LocationName.ScarFireElement,
         LocationName.DonaldScar,
-        LocationName.GoofyHyenas1,
-
-    ]
-    pl_region = create_region(world, player, active_locations, RegionName.Pl_Region,
-                              pl_region_locations)
-    pl2_region_locations = [
+        LocationName.ScarEventLocation,
+    ],
+    RegionName.Pl2:                [
         LocationName.Hyenas2,
+        LocationName.GoofyHyenas2
+    ],
+    RegionName.GroundShaker:       [
         LocationName.Groundshaker,
         LocationName.GroundshakerGetBonus,
+        LocationName.GroundShakerEventLocation,
+    ],
+    RegionName.DataSaix:           [
         LocationName.SaixDataDefenseBoost,
-        LocationName.GoofyHyenas2,
-    ]
-    pl2_region = create_region(world, player, active_locations, RegionName.Pl2_Region,
-                               pl2_region_locations)
-
-    stt_region_locations = [
+        LocationName.DataSaixEventLocation
+    ],
+    RegionName.Stt:                [
         LocationName.TwilightTownMap,
         LocationName.MunnyPouchOlette,
         LocationName.StationDusks,
         LocationName.StationofSerenityPotion,
         LocationName.StationofCallingPotion,
+    ],
+    RegionName.TwilightThorn:      [
         LocationName.TwilightThorn,
+        LocationName.TwilightThornEventLocation
+    ],
+    RegionName.Axel1:              [
         LocationName.Axel1,
         LocationName.JunkChampionBelt,
         LocationName.JunkMedal,
@@ -648,14 +652,18 @@ def create_regions(world, player: int, active_locations):
         LocationName.NaminesSketches,
         LocationName.MansionMap,
         LocationName.MansionLibraryHiPotion,
+        LocationName.Axel1EventLocation
+    ],
+    RegionName.Axel2:              [
         LocationName.Axel2,
         LocationName.MansionBasementCorridorHiPotion,
+        LocationName.Axel2EventLocation
+    ],
+    RegionName.DataRoxas:          [
         LocationName.RoxasDataMagicBoost,
-    ]
-    stt_region = create_region(world, player, active_locations, RegionName.STT_Region,
-                               stt_region_locations)
-
-    tt_region_locations = [
+        LocationName.DataRoxasEventLocation
+    ],
+    RegionName.Tt:                 [
         LocationName.OldMansionPotion,
         LocationName.OldMansionMythrilShard,
         LocationName.TheWoodsPotion,
@@ -682,18 +690,14 @@ def create_regions(world, player: int, active_locations):
         LocationName.SorcerersLoftTowerMap,
         LocationName.TowerWardrobeMythrilStone,
         LocationName.StarSeeker,
-        LocationName.ValorForm,
-    ]
-    tt_region = create_region(world, player, active_locations, RegionName.TT_Region,
-                              tt_region_locations)
-    tt2_region_locations = [
+        LocationName.ValorForm
+    ],
+    RegionName.Tt2:                [
         LocationName.SeifersTrophy,
         LocationName.Oathkeeper,
-        LocationName.LimitForm,
-    ]
-    tt2_region = create_region(world, player, active_locations, RegionName.TT2_Region,
-                               tt2_region_locations)
-    tt3_region_locations = [
+        LocationName.LimitForm
+    ],
+    RegionName.Tt3:                [
         LocationName.UndergroundConcourseMythrilGem,
         LocationName.UndergroundConcourseAPBoost,
         LocationName.UndergroundConcourseMythrilCrystal,
@@ -715,22 +719,19 @@ def create_regions(world, player: int, active_locations):
         LocationName.MansionBasementCorridorUltimateRecipe,
         LocationName.BetwixtandBetween,
         LocationName.BetwixtandBetweenBondofFlame,
+        LocationName.DonaldMansionNobodies
+    ],
+    RegionName.DataAxel:           [
         LocationName.AxelDataMagicBoost,
-        LocationName.DonaldMansionNobodies,
-    ]
-    tt3_region = create_region(world, player, active_locations, RegionName.TT3_Region,
-                               tt3_region_locations)
-
-    twtnw_region_locations = [
+        LocationName.DataAxelEventLocation,
+    ],
+    RegionName.Twtnw:              [
         LocationName.FragmentCrossingMythrilStone,
         LocationName.FragmentCrossingMythrilCrystal,
         LocationName.FragmentCrossingAPBoost,
-        LocationName.FragmentCrossingOrichalcum,
-    ]
-
-    twtnw_region = create_region(world, player, active_locations, RegionName.Twtnw_Region,
-                                 twtnw_region_locations)
-    twtnw_postroxas_region_locations = [
+        LocationName.FragmentCrossingOrichalcum
+    ],
+    RegionName.Roxas:              [
         LocationName.Roxas,
         LocationName.RoxasGetBonus,
         LocationName.RoxasSecretAnsemReport8,
@@ -743,11 +744,9 @@ def create_regions(world, player: int, active_locations):
         LocationName.NothingsCallMythrilGem,
         LocationName.NothingsCallOrichalcum,
         LocationName.TwilightsViewCosmicBelt,
-
-    ]
-    twtnw_postroxas_region = create_region(world, player, active_locations, RegionName.Twtnw_PostRoxas,
-                                           twtnw_postroxas_region_locations)
-    twtnw_postxigbar_region_locations = [
+        LocationName.RoxasEventLocation
+    ],
+    RegionName.Xigbar:             [
         LocationName.XigbarBonus,
         LocationName.XigbarSecretAnsemReport3,
         LocationName.NaughtsSkywayMythrilGem,
@@ -755,80 +754,100 @@ def create_regions(world, player: int, active_locations):
         LocationName.NaughtsSkywayMythrilCrystal,
         LocationName.Oblivion,
         LocationName.CastleThatNeverWasMap,
+        LocationName.XigbarEventLocation,
+    ],
+    RegionName.Luxord:             [
         LocationName.Luxord,
         LocationName.LuxordGetBonus,
         LocationName.LuxordSecretAnsemReport9,
-    ]
-    twtnw_postxigbar_region = create_region(world, player, active_locations, RegionName.Twtnw_PostXigbar,
-                                            twtnw_postxigbar_region_locations)
-    twtnw2_region_locations = [
+        LocationName.LuxordEventLocation,
+    ],
+    RegionName.Saix:               [
         LocationName.SaixBonus,
         LocationName.SaixSecretAnsemReport12,
+        LocationName.SaixEventLocation,
+    ],
+    RegionName.Twtnw2:             [
         LocationName.PreXemnas1SecretAnsemReport11,
         LocationName.RuinandCreationsPassageMythrilStone,
         LocationName.RuinandCreationsPassageAPBoost,
         LocationName.RuinandCreationsPassageMythrilCrystal,
-        LocationName.RuinandCreationsPassageOrichalcum,
+        LocationName.RuinandCreationsPassageOrichalcum
+    ],
+    RegionName.Xemnas:             [
         LocationName.Xemnas1,
         LocationName.Xemnas1GetBonus,
         LocationName.Xemnas1SecretAnsemReport13,
-        LocationName.FinalXemnas,
-        LocationName.XemnasDataPowerBoost,
-    ]
-    twtnw2_region = create_region(world, player, active_locations, RegionName.Twtnw2_Region,
-                                  twtnw2_region_locations)
+        LocationName.XemnasEventLocation
 
-    valor_region_locations = [
+    ],
+    RegionName.ArmoredXemnas:      [
+        LocationName.ArmoredXemnasEventLocation
+    ],
+    RegionName.ArmoredXemnas2:     [
+        LocationName.ArmoredXemnas2EventLocation
+    ],
+    RegionName.FinalXemnas:        [
+        LocationName.FinalXemnas
+    ],
+    RegionName.DataXemnas:         [
+        LocationName.XemnasDataPowerBoost,
+        LocationName.DataXemnasEventLocation
+    ],
+    RegionName.AtlanticaSongOne:   [
+        LocationName.UnderseaKingdomMap
+    ],
+    RegionName.AtlanticaSongTwo:   [
+
+    ],
+    RegionName.AtlanticaSongThree: [
+        LocationName.MysteriousAbyss
+    ],
+    RegionName.AtlanticaSongFour:  [
+        LocationName.MusicalBlizzardElement,
+        LocationName.MusicalOrichalcumPlus
+    ],
+    RegionName.Valor:              [
         LocationName.Valorlvl2,
         LocationName.Valorlvl3,
         LocationName.Valorlvl4,
         LocationName.Valorlvl5,
         LocationName.Valorlvl6,
-        LocationName.Valorlvl7,
-    ]
-    valor_region = create_region(world, player, active_locations, RegionName.Valor_Region,
-                                 valor_region_locations)
-    wisdom_region_locations = [
+        LocationName.Valorlvl7
+    ],
+    RegionName.Wisdom:             [
         LocationName.Wisdomlvl2,
         LocationName.Wisdomlvl3,
         LocationName.Wisdomlvl4,
         LocationName.Wisdomlvl5,
         LocationName.Wisdomlvl6,
-        LocationName.Wisdomlvl7,
-    ]
-    wisdom_region = create_region(world, player, active_locations, RegionName.Wisdom_Region,
-                                  wisdom_region_locations)
-    limit_region_locations = [
+        LocationName.Wisdomlvl7
+    ],
+    RegionName.Limit:              [
         LocationName.Limitlvl2,
         LocationName.Limitlvl3,
         LocationName.Limitlvl4,
         LocationName.Limitlvl5,
         LocationName.Limitlvl6,
-        LocationName.Limitlvl7,
-    ]
-    limit_region = create_region(world, player, active_locations, RegionName.Limit_Region,
-                                 limit_region_locations)
-    master_region_locations = [
+        LocationName.Limitlvl7
+    ],
+    RegionName.Master:             [
         LocationName.Masterlvl2,
         LocationName.Masterlvl3,
         LocationName.Masterlvl4,
         LocationName.Masterlvl5,
         LocationName.Masterlvl6,
-        LocationName.Masterlvl7,
-    ]
-    master_region = create_region(world, player, active_locations, RegionName.Master_Region,
-                                  master_region_locations)
-    final_region_locations = [
+        LocationName.Masterlvl7
+    ],
+    RegionName.Final:              [
         LocationName.Finallvl2,
         LocationName.Finallvl3,
         LocationName.Finallvl4,
         LocationName.Finallvl5,
         LocationName.Finallvl6,
-        LocationName.Finallvl7,
-    ]
-    final_region = create_region(world, player, active_locations, RegionName.Final_Region,
-                                 final_region_locations)
-    keyblade_region_locations = [
+        LocationName.Finallvl7
+    ],
+    RegionName.Keyblade:           [
         LocationName.FAKESlot,
         LocationName.DetectionSaberSlot,
         LocationName.EdgeofUltimaSlot,
@@ -887,356 +906,255 @@ def create_regions(world, player: int, active_locations):
         LocationName.NobodyGuard,
         LocationName.OgreShield,
         LocationName.SaveTheKing2,
-        LocationName.UltimateMushroom,
-    ]
-    keyblade_region = create_region(world, player, active_locations, RegionName.Keyblade_Region,
-                                    keyblade_region_locations)
+        LocationName.UltimateMushroom
+    ],
+}
+level_region_list = [
+    RegionName.LevelsVS1,
+    RegionName.LevelsVS3,
+    RegionName.LevelsVS6,
+    RegionName.LevelsVS9,
+    RegionName.LevelsVS12,
+    RegionName.LevelsVS15,
+    RegionName.LevelsVS18,
+    RegionName.LevelsVS21,
+    RegionName.LevelsVS24,
+    RegionName.LevelsVS26,
+]
 
-    world.regions += [
-        lod_Region,
-        lod2_Region,
-        ag_region,
-        ag2_region,
-        lexaeus_region,
-        dc_region,
-        tr_region,
-        terra_region,
-        marluxia_region,
-        hundred_acre1_region,
-        hundred_acre2_region,
-        hundred_acre3_region,
-        hundred_acre4_region,
-        hundred_acre5_region,
-        hundred_acre6_region,
-        pr_region,
-        pr2_region,
-        gr2_region,
-        oc_region,
-        oc2_region,
-        oc2_pain_and_panic_cup,
-        oc2_titan_cup,
-        oc2_cerberus_cup,
-        oc2_gof_cup,
-        zexion_region,
-        bc_region,
-        bc2_region,
-        xaldin_region,
-        sp_region,
-        sp2_region,
-        mcp_region,
-        larxene_region,
-        ht_region,
-        ht2_region,
-        vexen_region,
-        hb_region,
-        hb2_region,
-        onek_region,
-        mushroom_region,
-        sephi_region,
-        cor_region,
-        transport_region,
-        pl_region,
-        pl2_region,
-        stt_region,
-        tt_region,
-        tt2_region,
-        tt3_region,
-        twtnw_region,
-        twtnw_postroxas_region,
-        twtnw_postxigbar_region,
-        twtnw2_region,
-        goa_region,
-        menu_region,
-        valor_region,
-        wisdom_region,
-        limit_region,
-        master_region,
-        final_region,
-        keyblade_region,
-    ]
+
+def create_regions(self):
     # Level region depends on level depth.
     # for every 5 levels there should be +3 visit locking
-    levelVL1 = []
-    levelVL3 = []
-    levelVL6 = []
-    levelVL9 = []
-    levelVL12 = []
-    levelVL15 = []
-    levelVL18 = []
-    levelVL21 = []
-    levelVL24 = []
-    levelVL26 = []
     # level 50
-    if world.LevelDepth[player] == "level_50":
-        levelVL1 = [LocationName.Lvl2, LocationName.Lvl4, LocationName.Lvl7, LocationName.Lvl9, LocationName.Lvl10]
-        levelVL3 = [LocationName.Lvl12, LocationName.Lvl14, LocationName.Lvl15, LocationName.Lvl17,
-                    LocationName.Lvl20, ]
-        levelVL6 = [LocationName.Lvl23, LocationName.Lvl25, LocationName.Lvl28, LocationName.Lvl30]
-        levelVL9 = [LocationName.Lvl32, LocationName.Lvl34, LocationName.Lvl36, LocationName.Lvl39, LocationName.Lvl41]
-        levelVL12 = [LocationName.Lvl44, LocationName.Lvl46, LocationName.Lvl48]
-        levelVL15 = [LocationName.Lvl50]
+    multiworld = self.multiworld
+    player = self.player
+    active_locations = self.location_name_to_id
+
+    for level_region_name in level_region_list:
+        KH2REGIONS[level_region_name] = []
+    if multiworld.LevelDepth[player] == "level_50":
+        KH2REGIONS[RegionName.LevelsVS1] = [LocationName.Lvl2, LocationName.Lvl4, LocationName.Lvl7, LocationName.Lvl9,
+                                            LocationName.Lvl10]
+        KH2REGIONS[RegionName.LevelsVS3] = [LocationName.Lvl12, LocationName.Lvl14, LocationName.Lvl15,
+                                            LocationName.Lvl17,
+                                            LocationName.Lvl20]
+        KH2REGIONS[RegionName.LevelsVS6] = [LocationName.Lvl23, LocationName.Lvl25, LocationName.Lvl28,
+                                            LocationName.Lvl30]
+        KH2REGIONS[RegionName.LevelsVS9] = [LocationName.Lvl32, LocationName.Lvl34, LocationName.Lvl36,
+                                            LocationName.Lvl39, LocationName.Lvl41]
+        KH2REGIONS[RegionName.LevelsVS12] = [LocationName.Lvl44, LocationName.Lvl46, LocationName.Lvl48]
+        KH2REGIONS[RegionName.LevelsVS15] = [LocationName.Lvl50]
+
     # level 99
-    elif world.LevelDepth[player] == "level_99":
-        levelVL1 = [LocationName.Lvl7, LocationName.Lvl9, ]
-        levelVL3 = [LocationName.Lvl12, LocationName.Lvl15, LocationName.Lvl17, LocationName.Lvl20]
-        levelVL6 = [LocationName.Lvl23, LocationName.Lvl25, LocationName.Lvl28]
-        levelVL9 = [LocationName.Lvl31, LocationName.Lvl33, LocationName.Lvl36, LocationName.Lvl39]
-        levelVL12 = [LocationName.Lvl41, LocationName.Lvl44, LocationName.Lvl47, LocationName.Lvl49]
-        levelVL15 = [LocationName.Lvl53, LocationName.Lvl59]
-        levelVL18 = [LocationName.Lvl65]
-        levelVL21 = [LocationName.Lvl73]
-        levelVL24 = [LocationName.Lvl85]
-        levelVL26 = [LocationName.Lvl99]
+    elif multiworld.LevelDepth[player] == "level_99":
+        KH2REGIONS[RegionName.LevelsVS1] = [LocationName.Lvl7, LocationName.Lvl9]
+        KH2REGIONS[RegionName.LevelsVS3] = [LocationName.Lvl12, LocationName.Lvl15, LocationName.Lvl17,
+                                            LocationName.Lvl20]
+        KH2REGIONS[RegionName.LevelsVS6] = [LocationName.Lvl23, LocationName.Lvl25, LocationName.Lvl28]
+        KH2REGIONS[RegionName.LevelsVS9] = [LocationName.Lvl31, LocationName.Lvl33, LocationName.Lvl36,
+                                            LocationName.Lvl39]
+        KH2REGIONS[RegionName.LevelsVS12] = [LocationName.Lvl41, LocationName.Lvl44, LocationName.Lvl47,
+                                             LocationName.Lvl49]
+        KH2REGIONS[RegionName.LevelsVS15] = [LocationName.Lvl53, LocationName.Lvl59]
+        KH2REGIONS[RegionName.LevelsVS18] = [LocationName.Lvl65]
+        KH2REGIONS[RegionName.LevelsVS21] = [LocationName.Lvl73]
+        KH2REGIONS[RegionName.LevelsVS24] = [LocationName.Lvl85]
+        KH2REGIONS[RegionName.LevelsVS26] = [LocationName.Lvl99]
     # level sanity
     # has to be [] instead of {} for in
-    elif world.LevelDepth[player] in ["level_50_sanity", "level_99_sanity"]:
-        levelVL1 = [LocationName.Lvl2, LocationName.Lvl3, LocationName.Lvl4, LocationName.Lvl5, LocationName.Lvl6,
-                    LocationName.Lvl7, LocationName.Lvl8, LocationName.Lvl9, LocationName.Lvl10]
-        levelVL3 = [LocationName.Lvl11, LocationName.Lvl12, LocationName.Lvl13, LocationName.Lvl14, LocationName.Lvl15,
-                    LocationName.Lvl16, LocationName.Lvl17, LocationName.Lvl18, LocationName.Lvl19, LocationName.Lvl20]
-        levelVL6 = [LocationName.Lvl21, LocationName.Lvl22, LocationName.Lvl23, LocationName.Lvl24, LocationName.Lvl25,
-                    LocationName.Lvl26, LocationName.Lvl27, LocationName.Lvl28, LocationName.Lvl29, LocationName.Lvl30]
-        levelVL9 = [LocationName.Lvl31, LocationName.Lvl32, LocationName.Lvl33, LocationName.Lvl34, LocationName.Lvl35,
-                    LocationName.Lvl36, LocationName.Lvl37, LocationName.Lvl38, LocationName.Lvl39, LocationName.Lvl40]
-        levelVL12 = [LocationName.Lvl41, LocationName.Lvl42, LocationName.Lvl43, LocationName.Lvl44, LocationName.Lvl45,
-                     LocationName.Lvl46, LocationName.Lvl47, LocationName.Lvl48, LocationName.Lvl49, LocationName.Lvl50]
+    elif multiworld.LevelDepth[player] in ["level_50_sanity", "level_99_sanity"]:
+        KH2REGIONS[RegionName.LevelsVS1] = [LocationName.Lvl2, LocationName.Lvl3, LocationName.Lvl4, LocationName.Lvl5,
+                                            LocationName.Lvl6,
+                                            LocationName.Lvl7, LocationName.Lvl8, LocationName.Lvl9, LocationName.Lvl10]
+        KH2REGIONS[RegionName.LevelsVS3] = [LocationName.Lvl11, LocationName.Lvl12, LocationName.Lvl13,
+                                            LocationName.Lvl14, LocationName.Lvl15,
+                                            LocationName.Lvl16, LocationName.Lvl17, LocationName.Lvl18,
+                                            LocationName.Lvl19, LocationName.Lvl20]
+        KH2REGIONS[RegionName.LevelsVS6] = [LocationName.Lvl21, LocationName.Lvl22, LocationName.Lvl23,
+                                            LocationName.Lvl24, LocationName.Lvl25,
+                                            LocationName.Lvl26, LocationName.Lvl27, LocationName.Lvl28,
+                                            LocationName.Lvl29, LocationName.Lvl30]
+        KH2REGIONS[RegionName.LevelsVS9] = [LocationName.Lvl31, LocationName.Lvl32, LocationName.Lvl33,
+                                            LocationName.Lvl34, LocationName.Lvl35,
+                                            LocationName.Lvl36, LocationName.Lvl37, LocationName.Lvl38,
+                                            LocationName.Lvl39, LocationName.Lvl40]
+        KH2REGIONS[RegionName.LevelsVS12] = [LocationName.Lvl41, LocationName.Lvl42, LocationName.Lvl43,
+                                             LocationName.Lvl44, LocationName.Lvl45,
+                                             LocationName.Lvl46, LocationName.Lvl47, LocationName.Lvl48,
+                                             LocationName.Lvl49, LocationName.Lvl50]
         # level 99 sanity
-        if world.LevelDepth[player] == "level_99_sanity":
-            levelVL15 = [LocationName.Lvl51, LocationName.Lvl52, LocationName.Lvl53, LocationName.Lvl54,
-                         LocationName.Lvl55, LocationName.Lvl56, LocationName.Lvl57, LocationName.Lvl58,
-                         LocationName.Lvl59, LocationName.Lvl60]
-            levelVL18 = [LocationName.Lvl61, LocationName.Lvl62, LocationName.Lvl63, LocationName.Lvl64,
-                         LocationName.Lvl65, LocationName.Lvl66, LocationName.Lvl67, LocationName.Lvl68,
-                         LocationName.Lvl69, LocationName.Lvl70]
-            levelVL21 = [LocationName.Lvl71, LocationName.Lvl72, LocationName.Lvl73, LocationName.Lvl74,
-                         LocationName.Lvl75, LocationName.Lvl76, LocationName.Lvl77, LocationName.Lvl78,
-                         LocationName.Lvl79, LocationName.Lvl80]
-            levelVL24 = [LocationName.Lvl81, LocationName.Lvl82, LocationName.Lvl83, LocationName.Lvl84,
-                         LocationName.Lvl85, LocationName.Lvl86, LocationName.Lvl87, LocationName.Lvl88,
-                         LocationName.Lvl89, LocationName.Lvl90]
-            levelVL26 = [LocationName.Lvl91, LocationName.Lvl92, LocationName.Lvl93, LocationName.Lvl94,
-                         LocationName.Lvl95, LocationName.Lvl96, LocationName.Lvl97, LocationName.Lvl98,
-                         LocationName.Lvl99]
-
-    level_regionVL1 = create_region(world, player, active_locations, RegionName.LevelsVS1,
-                                    levelVL1)
-    level_regionVL3 = create_region(world, player, active_locations, RegionName.LevelsVS3,
-                                    levelVL3)
-    level_regionVL6 = create_region(world, player, active_locations, RegionName.LevelsVS6,
-                                    levelVL6)
-    level_regionVL9 = create_region(world, player, active_locations, RegionName.LevelsVS9,
-                                    levelVL9)
-    level_regionVL12 = create_region(world, player, active_locations, RegionName.LevelsVS12,
-                                     levelVL12)
-    level_regionVL15 = create_region(world, player, active_locations, RegionName.LevelsVS15,
-                                     levelVL15)
-    level_regionVL18 = create_region(world, player, active_locations, RegionName.LevelsVS18,
-                                     levelVL18)
-    level_regionVL21 = create_region(world, player, active_locations, RegionName.LevelsVS21,
-                                     levelVL21)
-    level_regionVL24 = create_region(world, player, active_locations, RegionName.LevelsVS24,
-                                     levelVL24)
-    level_regionVL26 = create_region(world, player, active_locations, RegionName.LevelsVS26,
-                                     levelVL26)
-    world.regions += [level_regionVL1, level_regionVL3, level_regionVL6, level_regionVL9, level_regionVL12,
-                      level_regionVL15, level_regionVL18, level_regionVL21, level_regionVL24, level_regionVL26]
+        if multiworld.LevelDepth[player] == "level_99_sanity":
+            KH2REGIONS[RegionName.LevelsVS15] = [LocationName.Lvl51, LocationName.Lvl52, LocationName.Lvl53,
+                                                 LocationName.Lvl54,
+                                                 LocationName.Lvl55, LocationName.Lvl56, LocationName.Lvl57,
+                                                 LocationName.Lvl58,
+                                                 LocationName.Lvl59, LocationName.Lvl60]
+            KH2REGIONS[RegionName.LevelsVS18] = [LocationName.Lvl61, LocationName.Lvl62, LocationName.Lvl63,
+                                                 LocationName.Lvl64,
+                                                 LocationName.Lvl65, LocationName.Lvl66, LocationName.Lvl67,
+                                                 LocationName.Lvl68,
+                                                 LocationName.Lvl69, LocationName.Lvl70]
+            KH2REGIONS[RegionName.LevelsVS21] = [LocationName.Lvl71, LocationName.Lvl72, LocationName.Lvl73,
+                                                 LocationName.Lvl74,
+                                                 LocationName.Lvl75, LocationName.Lvl76, LocationName.Lvl77,
+                                                 LocationName.Lvl78,
+                                                 LocationName.Lvl79, LocationName.Lvl80]
+            KH2REGIONS[RegionName.LevelsVS24] = [LocationName.Lvl81, LocationName.Lvl82, LocationName.Lvl83,
+                                                 LocationName.Lvl84,
+                                                 LocationName.Lvl85, LocationName.Lvl86, LocationName.Lvl87,
+                                                 LocationName.Lvl88,
+                                                 LocationName.Lvl89, LocationName.Lvl90]
+            KH2REGIONS[RegionName.LevelsVS26] = [LocationName.Lvl91, LocationName.Lvl92, LocationName.Lvl93,
+                                                 LocationName.Lvl94,
+                                                 LocationName.Lvl95, LocationName.Lvl96, LocationName.Lvl97,
+                                                 LocationName.Lvl98, LocationName.Lvl99]
+    KH2REGIONS[RegionName.Summon] = []
+    if multiworld.SummonLevelLocationToggle[player]:
+        KH2REGIONS[RegionName.Summon] = [LocationName.Summonlvl2,
+                                         LocationName.Summonlvl3,
+                                         LocationName.Summonlvl4,
+                                         LocationName.Summonlvl5,
+                                         LocationName.Summonlvl6,
+                                         LocationName.Summonlvl7]
+    multiworld.regions += [create_region(multiworld, player, active_locations, region, locations) for region, locations in
+                           KH2REGIONS.items()]
+    # fill the event locations with events
+    for location, item in event_location_to_item.items():
+        multiworld.get_location(location, player).place_locked_item(
+                multiworld.worlds[player].create_event_item(item))
 
 
-def connect_regions(world: MultiWorld, player: int):
+def connect_regions(self):
+    multiworld = self.multiworld
+    player = self.player
     # connecting every first visit to the GoA
+    KH2RegionConnections: typing.Dict[str, typing.Set[str]] = {
+        "Menu":                        {RegionName.GoA},
+        RegionName.GoA:                {RegionName.Sp, RegionName.Pr, RegionName.Tt, RegionName.Oc, RegionName.Ht,
+                                        RegionName.LoD,
+                                        RegionName.Twtnw, RegionName.Bc, RegionName.Ag, RegionName.Pl, RegionName.Hb,
+                                        RegionName.Dc, RegionName.Stt,
+                                        RegionName.Ha1, RegionName.Keyblade, RegionName.LevelsVS1,
+                                        RegionName.Valor, RegionName.Wisdom, RegionName.Limit, RegionName.Master,
+                                        RegionName.Final, RegionName.Summon, RegionName.AtlanticaSongOne},
+        RegionName.LoD:                {RegionName.ShanYu},
+        RegionName.ShanYu:             {RegionName.LoD2},
+        RegionName.LoD2:               {RegionName.AnsemRiku},
+        RegionName.AnsemRiku:          {RegionName.StormRider},
+        RegionName.StormRider:         {RegionName.DataXigbar},
+        RegionName.Ag:                 {RegionName.TwinLords},
+        RegionName.TwinLords:          {RegionName.Ag2},
+        RegionName.Ag2:                {RegionName.GenieJafar},
+        RegionName.GenieJafar:         {RegionName.DataLexaeus},
+        RegionName.Dc:                 {RegionName.Tr},
+        RegionName.Tr:                 {RegionName.OldPete},
+        RegionName.OldPete:            {RegionName.FuturePete},
+        RegionName.FuturePete:         {RegionName.Terra, RegionName.DataMarluxia},
+        RegionName.Ha1:                {RegionName.Ha2},
+        RegionName.Ha2:                {RegionName.Ha3},
+        RegionName.Ha3:                {RegionName.Ha4},
+        RegionName.Ha4:                {RegionName.Ha5},
+        RegionName.Ha5:                {RegionName.Ha6},
+        RegionName.Pr:                 {RegionName.Barbosa},
+        RegionName.Barbosa:            {RegionName.Pr2},
+        RegionName.Pr2:                {RegionName.GrimReaper1},
+        RegionName.GrimReaper1:        {RegionName.GrimReaper2},
+        RegionName.GrimReaper2:        {RegionName.DataLuxord},
+        RegionName.Oc:                 {RegionName.Cerberus},
+        RegionName.Cerberus:           {RegionName.OlympusPete},
+        RegionName.OlympusPete:        {RegionName.Hydra},
+        RegionName.Hydra:              {RegionName.OcPainAndPanicCup, RegionName.OcCerberusCup, RegionName.Oc2},
+        RegionName.Oc2:                {RegionName.Hades},
+        RegionName.Hades:              {RegionName.Oc2TitanCup, RegionName.Oc2GofCup, RegionName.DataZexion},
+        RegionName.Oc2GofCup:          {RegionName.HadesCups},
+        RegionName.Bc:                 {RegionName.Thresholder},
+        RegionName.Thresholder:        {RegionName.Beast},
+        RegionName.Beast:              {RegionName.DarkThorn},
+        RegionName.DarkThorn:          {RegionName.Bc2},
+        RegionName.Bc2:                {RegionName.Xaldin},
+        RegionName.Xaldin:             {RegionName.DataXaldin},
+        RegionName.Sp:                 {RegionName.HostileProgram},
+        RegionName.HostileProgram:     {RegionName.Sp2},
+        RegionName.Sp2:                {RegionName.Mcp},
+        RegionName.Mcp:                {RegionName.DataLarxene},
+        RegionName.Ht:                 {RegionName.PrisonKeeper},
+        RegionName.PrisonKeeper:       {RegionName.OogieBoogie},
+        RegionName.OogieBoogie:        {RegionName.Ht2},
+        RegionName.Ht2:                {RegionName.Experiment},
+        RegionName.Experiment:         {RegionName.DataVexen},
+        RegionName.Hb:                 {RegionName.Hb2},
+        RegionName.Hb2:                {RegionName.CoR, RegionName.HBDemyx},
+        RegionName.HBDemyx:            {RegionName.ThousandHeartless},
+        RegionName.ThousandHeartless:  {RegionName.Mushroom13, RegionName.DataDemyx, RegionName.Sephi},
+        RegionName.CoR:                {RegionName.CorFirstFight},
+        RegionName.CorFirstFight:      {RegionName.CorSecondFight},
+        RegionName.CorSecondFight:     {RegionName.Transport},
+        RegionName.Pl:                 {RegionName.Scar},
+        RegionName.Scar:               {RegionName.Pl2},
+        RegionName.Pl2:                {RegionName.GroundShaker},
+        RegionName.GroundShaker:       {RegionName.DataSaix},
+        RegionName.Stt:                {RegionName.TwilightThorn},
+        RegionName.TwilightThorn:      {RegionName.Axel1},
+        RegionName.Axel1:              {RegionName.Axel2},
+        RegionName.Axel2:              {RegionName.DataRoxas},
+        RegionName.Tt:                 {RegionName.Tt2},
+        RegionName.Tt2:                {RegionName.Tt3},
+        RegionName.Tt3:                {RegionName.DataAxel},
+        RegionName.Twtnw:              {RegionName.Roxas},
+        RegionName.Roxas:              {RegionName.Xigbar},
+        RegionName.Xigbar:             {RegionName.Luxord},
+        RegionName.Luxord:             {RegionName.Saix},
+        RegionName.Saix:               {RegionName.Twtnw2},
+        RegionName.Twtnw2:             {RegionName.Xemnas},
+        RegionName.Xemnas:             {RegionName.ArmoredXemnas, RegionName.DataXemnas},
+        RegionName.ArmoredXemnas:      {RegionName.ArmoredXemnas2},
+        RegionName.ArmoredXemnas2:     {RegionName.FinalXemnas},
+        RegionName.LevelsVS1:          {RegionName.LevelsVS3},
+        RegionName.LevelsVS3:          {RegionName.LevelsVS6},
+        RegionName.LevelsVS6:          {RegionName.LevelsVS9},
+        RegionName.LevelsVS9:          {RegionName.LevelsVS12},
+        RegionName.LevelsVS12:         {RegionName.LevelsVS15},
+        RegionName.LevelsVS15:         {RegionName.LevelsVS18},
+        RegionName.LevelsVS18:         {RegionName.LevelsVS21},
+        RegionName.LevelsVS21:         {RegionName.LevelsVS24},
+        RegionName.LevelsVS24:         {RegionName.LevelsVS26},
+        RegionName.AtlanticaSongOne:   {RegionName.AtlanticaSongTwo},
+        RegionName.AtlanticaSongTwo:   {RegionName.AtlanticaSongThree},
+        RegionName.AtlanticaSongThree: {RegionName.AtlanticaSongFour},
+    }
 
-    names: typing.Dict[str, int] = {}
-
-    connect(world, player, names, "Menu", RegionName.Keyblade_Region)
-    connect(world, player, names, "Menu", RegionName.GoA_Region)
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.LoD_Region,
-            lambda state: state.kh_lod_unlocked(player, 1))
-    connect(world, player, names, RegionName.LoD_Region, RegionName.LoD2_Region,
-            lambda state: state.kh_lod_unlocked(player, 2))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Oc_Region,
-            lambda state: state.kh_oc_unlocked(player, 1))
-    connect(world, player, names, RegionName.Oc_Region, RegionName.Oc2_Region,
-            lambda state: state.kh_oc_unlocked(player, 2))
-    connect(world, player, names, RegionName.Oc2_Region, RegionName.Zexion_Region,
-            lambda state: state.kh_datazexion(player))
-
-    connect(world, player, names, RegionName.Oc2_Region, RegionName.Oc2_pain_and_panic_Region,
-            lambda state: state.kh_painandpanic(player))
-    connect(world, player, names, RegionName.Oc2_Region, RegionName.Oc2_cerberus_Region,
-            lambda state: state.kh_cerberuscup(player))
-    connect(world, player, names, RegionName.Oc2_Region, RegionName.Oc2_titan_Region,
-            lambda state: state.kh_titan(player))
-    connect(world, player, names, RegionName.Oc2_Region, RegionName.Oc2_gof_Region,
-            lambda state: state.kh_gof(player))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Ag_Region,
-            lambda state: state.kh_ag_unlocked(player, 1))
-    connect(world, player, names, RegionName.Ag_Region, RegionName.Ag2_Region,
-            lambda state: state.kh_ag_unlocked(player, 2)
-                          and (state.has(ItemName.FireElement, player)
-                               and state.has(ItemName.BlizzardElement, player)
-                               and state.has(ItemName.ThunderElement, player)))
-    connect(world, player, names, RegionName.Ag2_Region, RegionName.Lexaeus_Region,
-            lambda state: state.kh_datalexaeus(player))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Dc_Region,
-            lambda state: state.kh_dc_unlocked(player, 1))
-    connect(world, player, names, RegionName.Dc_Region, RegionName.Tr_Region,
-            lambda state: state.kh_dc_unlocked(player, 2))
-    connect(world, player, names, RegionName.Tr_Region, RegionName.Marluxia_Region,
-            lambda state: state.kh_datamarluxia(player))
-    connect(world, player, names, RegionName.Tr_Region, RegionName.Terra_Region, lambda state: state.kh_terra(player))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Pr_Region,
-            lambda state: state.kh_pr_unlocked(player, 1))
-    connect(world, player, names, RegionName.Pr_Region, RegionName.Pr2_Region,
-            lambda state: state.kh_pr_unlocked(player, 2))
-    connect(world, player, names, RegionName.Pr2_Region, RegionName.Gr2_Region,
-            lambda state: state.kh_gr2(player))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Bc_Region,
-            lambda state: state.kh_bc_unlocked(player, 1))
-    connect(world, player, names, RegionName.Bc_Region, RegionName.Bc2_Region,
-            lambda state: state.kh_bc_unlocked(player, 2))
-    connect(world, player, names, RegionName.Bc2_Region, RegionName.Xaldin_Region,
-            lambda state: state.kh_xaldin(player))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Sp_Region,
-            lambda state: state.kh_sp_unlocked(player, 1))
-    connect(world, player, names, RegionName.Sp_Region, RegionName.Sp2_Region,
-            lambda state: state.kh_sp_unlocked(player, 2))
-    connect(world, player, names, RegionName.Sp2_Region, RegionName.Mcp_Region,
-            lambda state: state.kh_mcp(player))
-    connect(world, player, names, RegionName.Mcp_Region, RegionName.Larxene_Region,
-            lambda state: state.kh_datalarxene(player))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Ht_Region,
-            lambda state: state.kh_ht_unlocked(player, 1))
-    connect(world, player, names, RegionName.Ht_Region, RegionName.Ht2_Region,
-            lambda state: state.kh_ht_unlocked(player, 2))
-    connect(world, player, names, RegionName.Ht2_Region, RegionName.Vexen_Region,
-            lambda state: state.kh_datavexen(player))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Hb_Region,
-            lambda state: state.kh_hb_unlocked(player, 1))
-    connect(world, player, names, RegionName.Hb_Region, RegionName.Hb2_Region,
-            lambda state: state.kh_hb_unlocked(player, 2))
-    connect(world, player, names, RegionName.Hb2_Region, RegionName.ThousandHeartless_Region,
-            lambda state: state.kh_onek(player))
-    connect(world, player, names, RegionName.ThousandHeartless_Region, RegionName.Mushroom13_Region,
-            lambda state: state.has(ItemName.ProofofPeace, player))
-    connect(world, player, names, RegionName.ThousandHeartless_Region, RegionName.Sephi_Region,
-            lambda state: state.kh_sephi(player))
-
-    connect(world, player, names, RegionName.Hb2_Region, RegionName.CoR_Region, lambda state: state.kh_cor(player))
-    connect(world, player, names, RegionName.CoR_Region, RegionName.Transport_Region, lambda state:
-    state.has(ItemName.HighJump, player, 3)
-    and state.has(ItemName.AerialDodge, player, 3)
-    and state.has(ItemName.Glide, player, 3))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Pl_Region,
-            lambda state: state.kh_pl_unlocked(player, 1))
-    connect(world, player, names, RegionName.Pl_Region, RegionName.Pl2_Region,
-            lambda state: state.kh_pl_unlocked(player, 2) and (
-                    state.has(ItemName.BerserkCharge, player) or state.kh_reflect(player)))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.STT_Region,
-            lambda state: state.kh_stt_unlocked(player, 1))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.TT_Region,
-            lambda state: state.kh_tt_unlocked(player, 1))
-    connect(world, player, names, RegionName.TT_Region, RegionName.TT2_Region,
-            lambda state: state.kh_tt_unlocked(player, 2))
-    connect(world, player, names, RegionName.TT2_Region, RegionName.TT3_Region,
-            lambda state: state.kh_tt_unlocked(player, 3))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.Twtnw_Region,
-            lambda state: state.kh_twtnw_unlocked(player, 0))
-    connect(world, player, names, RegionName.Twtnw_Region, RegionName.Twtnw_PostRoxas,
-            lambda state: state.kh_roxastools(player))
-    connect(world, player, names, RegionName.Twtnw_PostRoxas, RegionName.Twtnw_PostXigbar,
-            lambda state: state.kh_basetools(player) and (state.kh_donaldlimit(player) or (
-                    state.has(ItemName.FinalForm, player) and state.has(ItemName.FireElement, player))))
-    connect(world, player, names, RegionName.Twtnw_PostRoxas, RegionName.Twtnw2_Region,
-            lambda state: state.kh_twtnw_unlocked(player, 1))
-
-    hundredacrevisits = {RegionName.HundredAcre1_Region: 0, RegionName.HundredAcre2_Region: 1,
-                         RegionName.HundredAcre3_Region: 2,
-                         RegionName.HundredAcre4_Region: 3, RegionName.HundredAcre5_Region: 4,
-                         RegionName.HundredAcre6_Region: 5}
-    for visit, tornpage in hundredacrevisits.items():
-        connect(world, player, names, RegionName.GoA_Region, visit,
-                lambda state: (state.has(ItemName.TornPages, player, tornpage)))
-
-    connect(world, player, names, RegionName.GoA_Region, RegionName.LevelsVS1,
-            lambda state: state.kh_visit_locking_amount(player, 1))
-    connect(world, player, names, RegionName.LevelsVS1, RegionName.LevelsVS3,
-            lambda state: state.kh_visit_locking_amount(player, 3))
-    connect(world, player, names, RegionName.LevelsVS3, RegionName.LevelsVS6,
-            lambda state: state.kh_visit_locking_amount(player, 6))
-    connect(world, player, names, RegionName.LevelsVS6, RegionName.LevelsVS9,
-            lambda state: state.kh_visit_locking_amount(player, 9))
-    connect(world, player, names, RegionName.LevelsVS9, RegionName.LevelsVS12,
-            lambda state: state.kh_visit_locking_amount(player, 12))
-    connect(world, player, names, RegionName.LevelsVS12, RegionName.LevelsVS15,
-            lambda state: state.kh_visit_locking_amount(player, 15))
-    connect(world, player, names, RegionName.LevelsVS15, RegionName.LevelsVS18,
-            lambda state: state.kh_visit_locking_amount(player, 18))
-    connect(world, player, names, RegionName.LevelsVS18, RegionName.LevelsVS21,
-            lambda state: state.kh_visit_locking_amount(player, 21))
-    connect(world, player, names, RegionName.LevelsVS21, RegionName.LevelsVS24,
-            lambda state: state.kh_visit_locking_amount(player, 24))
-    connect(world, player, names, RegionName.LevelsVS24, RegionName.LevelsVS26,
-            lambda state: state.kh_visit_locking_amount(player, 25))  # 25 because of goa twtnw bugs with visit locking.
-
-    for region in RegionTable["ValorRegion"]:
-        connect(world, player, names, region, RegionName.Valor_Region,
-                lambda state: state.has(ItemName.ValorForm, player))
-    for region in RegionTable["WisdomRegion"]:
-        connect(world, player, names, region, RegionName.Wisdom_Region,
-                lambda state: state.has(ItemName.WisdomForm, player))
-    for region in RegionTable["LimitRegion"]:
-        connect(world, player, names, region, RegionName.Limit_Region,
-                lambda state: state.has(ItemName.LimitForm, player))
-    for region in RegionTable["MasterRegion"]:
-        connect(world, player, names, region, RegionName.Master_Region,
-                lambda state: state.has(ItemName.MasterForm, player) and state.has(ItemName.DriveConverter, player))
-    for region in RegionTable["FinalRegion"]:
-        connect(world, player, names, region, RegionName.Final_Region,
-                lambda state: state.has(ItemName.FinalForm, player))
+    for source, target in KH2RegionConnections.items():
+        source_region = multiworld.get_region(source, player)
+        source_region.add_exits(target)
 
 
-# shamelessly stolen from the sa2b
-def connect(world: MultiWorld, player: int, used_names: typing.Dict[str, int], source: str, target: str,
-            rule: typing.Optional[typing.Callable] = None):
-    source_region = world.get_region(source, player)
-    target_region = world.get_region(target, player)
+# cave fight:fire/guard
+# hades escape logic:fire,blizzard,slide dash, base tools
+# windows:chicken little.fire element,base tools
+# chasm of challenges:reflect, blizzard, trinity limit,chicken little
+# living bones: magnet
+# some things for barbosa(PR), chicken little
+# hyneas(magnet,reflect)
+# tt2: reflect,chicken,form, guard,aerial recovery,finising plus,
+# corridors,dancers:chicken little or stitch +demyx tools
+# 1k: guard,once more,limit form,
+# snipers +before: stitch, magnet, finishing leap, base tools, reflect
+# dragoons:stitch, magnet, base tools, reflect
+# oc2 tournament thing: stitch, magnet, base tools, reflera
+# lock,shock and barrel: reflect, base tools
+# carpet section: magnera, reflect, base tools,
+# sp2: reflera, stitch, basse tools, reflera, thundara, fantasia/duck flare,once more.
+# tt3: stitch/chicken little, magnera,reflera,base tools,finishing leap,limit form
+# cor
 
-    if target not in used_names:
-        used_names[target] = 1
-        name = target
-    else:
-        used_names[target] += 1
-        name = target + (' ' * used_names[target])
-
-    connection = Entrance(player, name, source_region)
-
-    if rule:
-        connection.access_rule = rule
-
-    source_region.exits.append(connection)
-    connection.connect(target_region)
-
-
-def create_region(world: MultiWorld, player: int, active_locations, name: str, locations=None):
-    ret = Region(name, player, world)
+def create_region(multiworld, player: int, active_locations, name: str, locations=None):
+    ret = Region(name, player, multiworld)
     if locations:
-        for location in locations:
-            loc_id = active_locations.get(location, 0)
-            if loc_id:
-                location = KH2Location(player, location, loc_id.code, ret)
-                ret.locations.append(location)
+        loc_to_id = {loc: active_locations.get(loc, 0) for loc in locations if active_locations.get(loc, None)}
+        ret.add_locations(loc_to_id, KH2Location)
+        loc_to_event = {loc: active_locations.get(loc, None) for loc in locations if
+                        not active_locations.get(loc, None)}
+        ret.add_locations(loc_to_event, KH2Location)
 
     return ret
diff --git a/worlds/kh2/Rules.py b/worlds/kh2/Rules.py
index b86ae4a2db..7c5551dbd5 100644
--- a/worlds/kh2/Rules.py
+++ b/worlds/kh2/Rules.py
@@ -1,96 +1,1162 @@
+from typing import Dict, Callable, TYPE_CHECKING
 
-from BaseClasses import MultiWorld
+from BaseClasses import CollectionState
+from .Items import exclusion_item_table, visit_locking_dict, DonaldAbility_Table, GoofyAbility_Table
+from .Locations import exclusion_table, popups_set, Goofy_Checks, Donald_Checks
+from .Names import LocationName, ItemName, RegionName
+from worlds.generic.Rules import add_rule, forbid_items, add_item_rule
+from .Logic import *
 
-from .Items import exclusionItem_table
-from .Locations import STT_Checks, exclusion_table
-from .Names import LocationName, ItemName
-from ..generic.Rules import add_rule, forbid_items, set_rule
+# I don't know what is going on here, but it works.
+if TYPE_CHECKING:
+    from . import KH2World
+else:
+    KH2World = object
 
 
-def set_rules(world: MultiWorld, player: int):
+# Shamelessly Stolen from Messanger
 
-    add_rule(world.get_location(LocationName.RoxasDataMagicBoost, player),
-             lambda state: state.kh_dataroxas(player))
-    add_rule(world.get_location(LocationName.DemyxDataAPBoost, player),
-             lambda state: state.kh_datademyx(player))
-    add_rule(world.get_location(LocationName.SaixDataDefenseBoost, player),
-             lambda state: state.kh_datasaix(player))
-    add_rule(world.get_location(LocationName.XaldinDataDefenseBoost, player),
-             lambda state: state.kh_dataxaldin(player))
-    add_rule(world.get_location(LocationName.XemnasDataPowerBoost, player),
-             lambda state: state.kh_dataxemnas(player))
-    add_rule(world.get_location(LocationName.XigbarDataDefenseBoost, player),
-             lambda state: state.kh_dataxigbar(player))
-    add_rule(world.get_location(LocationName.VexenDataLostIllusion, player),
-             lambda state: state.kh_dataaxel(player))
-    add_rule(world.get_location(LocationName.LuxordDataAPBoost, player),
-             lambda state: state.kh_dataluxord(player))
 
-    for slot, weapon in exclusion_table["WeaponSlots"].items():
-        add_rule(world.get_location(slot, player), lambda state: state.has(weapon, player))
-    formLogicTable = {
-        ItemName.ValorForm:     [LocationName.Valorlvl4,
-                                 LocationName.Valorlvl5,
-                                 LocationName.Valorlvl6,
-                                 LocationName.Valorlvl7],
-        ItemName.WisdomForm:    [LocationName.Wisdomlvl4,
-                                 LocationName.Wisdomlvl5,
-                                 LocationName.Wisdomlvl6,
-                                 LocationName.Wisdomlvl7],
-        ItemName.LimitForm:     [LocationName.Limitlvl4,
-                                 LocationName.Limitlvl5,
-                                 LocationName.Limitlvl6,
-                                 LocationName.Limitlvl7],
-        ItemName.MasterForm:    [LocationName.Masterlvl4,
-                                 LocationName.Masterlvl5,
-                                 LocationName.Masterlvl6,
-                                 LocationName.Masterlvl7],
-        ItemName.FinalForm:     [LocationName.Finallvl4,
-                                 LocationName.Finallvl5,
-                                 LocationName.Finallvl6,
-                                 LocationName.Finallvl7]
-    }
+class KH2Rules:
+    player: int
+    world: KH2World
+    # World Rules: Rules for the visit locks
+    # Location Rules: Deterministic of player settings.
+    # Form Rules: Rules for Drive Forms and Summon levels. These Are Locations
+    # Fight Rules: Rules for fights. These are regions in the worlds.
+    world_rules: Dict[str, Callable[[CollectionState], bool]]
+    location_rules: Dict[str, Callable[[CollectionState], bool]]
 
-    for form in formLogicTable:
-        for i in range(4):
-            location = world.get_location(formLogicTable[form][i], player)
-            set_rule(location, lambda state, i=i + 1, form=form: state.kh_amount_of_forms(player, i, form))
+    fight_rules: Dict[str, Callable[[CollectionState], bool]]
 
-    if world.Goal[player] == "three_proofs":
-        add_rule(world.get_location(LocationName.FinalXemnas, player),
-                 lambda state: state.kh_three_proof_unlocked(player))
-        if world.FinalXemnas[player]:
-            world.completion_condition[player] = lambda state: state.kh_victory(player)
+    def __init__(self, world: KH2World) -> None:
+        self.player = world.player
+        self.world = world
+        self.multiworld = world.multiworld
+
+    def lod_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.SwordoftheAncestor, self.player, Amount)
+
+    def oc_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.BattlefieldsofWar, self.player, Amount)
+
+    def twtnw_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.WaytotheDawn, self.player, Amount)
+
+    def ht_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.BoneFist, self.player, Amount)
+
+    def tt_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.IceCream, self.player, Amount)
+
+    def pr_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.SkillandCrossbones, self.player, Amount)
+
+    def sp_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.IdentityDisk, self.player, Amount)
+
+    def stt_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.NamineSketches, self.player, Amount)
+
+    def dc_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.CastleKey, self.player, Amount)  # Using Dummy 13 for this
+
+    def hb_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.MembershipCard, self.player, Amount)
+
+    def pl_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.ProudFang, self.player, Amount)
+
+    def ag_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.Scimitar, self.player, Amount)
+
+    def bc_unlocked(self, state: CollectionState, Amount) -> bool:
+        return state.has(ItemName.BeastsClaw, self.player, Amount)
+
+    def at_three_unlocked(self, state: CollectionState) -> bool:
+        return state.has(ItemName.MagnetElement, self.player, 2)
+
+    def at_four_unlocked(self, state: CollectionState) -> bool:
+        return state.has(ItemName.ThunderElement, self.player, 3)
+
+    def hundred_acre_unlocked(self, state: CollectionState, amount) -> bool:
+        return state.has(ItemName.TornPages, self.player, amount)
+
+    def level_locking_unlock(self, state: CollectionState, amount):
+        return amount <= sum([state.count(item_name, self.player) for item_name in visit_locking_dict["2VisitLocking"]])
+
+    def summon_levels_unlocked(self, state: CollectionState, amount) -> bool:
+        return amount <= sum([state.count(item_name, self.player) for item_name in summons])
+
+    def kh2_list_count_sum(self, item_name_set: list, state: CollectionState) -> int:
+        """
+        Returns the sum of state.count() for each item in the list.
+        """
+        return sum(
+                [state.count(item_name, self.player) for item_name in item_name_set]
+        )
+
+    def kh2_list_any_sum(self, list_of_item_name_list: list, state: CollectionState) -> int:
+        """
+        Returns sum that increments by 1 if state.has_any
+        """
+        return sum(
+                [1 for item_list in list_of_item_name_list if
+                 state.has_any(set(item_list), self.player)]
+        )
+
+    def kh2_dict_count(self, item_name_to_count: dict, state: CollectionState) -> bool:
+        """
+        simplifies count to a dictionary.
+        """
+        return all(
+                [state.count(item_name, self.player) >= item_amount for item_name, item_amount in
+                 item_name_to_count.items()]
+        )
+
+    def kh2_dict_one_count(self, item_name_to_count: dict, state: CollectionState) -> int:
+        """
+        simplifies count to a dictionary.
+        """
+        return sum(
+                [1 for item_name, item_amount in
+                 item_name_to_count.items() if state.count(item_name, self.player) >= item_amount]
+        )
+
+    def kh2_can_reach_any(self, loc_set: list, state: CollectionState):
+        """
+        Can reach any locations in the set.
+        """
+        return any(
+                [self.kh2_can_reach(location, state) for location in
+                 loc_set]
+        )
+
+    def kh2_can_reach_all(self, loc_list: list, state: CollectionState):
+        """
+        Can reach all locations in the set.
+        """
+        return all(
+                [self.kh2_can_reach(location, state) for location in loc_list]
+        )
+
+    def kh2_can_reach(self, loc: str, state: CollectionState):
+        """
+        Returns bool instead of collection state.
+        """
+        return state.can_reach(self.multiworld.get_location(loc, self.player), "location", self.player)
+
+    def kh2_has_all(self, items: list, state: CollectionState):
+        """If state has at least one of all."""
+        return state.has_all(set(items), self.player)
+
+    def kh2_has_any(self, items: list, state: CollectionState):
+        return state.has_any(set(items), self.player)
+
+    def form_list_unlock(self, state: CollectionState, parent_form_list, level_required, fight_logic=False) -> bool:
+        form_access = {parent_form_list}
+        if self.multiworld.AutoFormLogic[self.player] and state.has(ItemName.SecondChance, self.player) and not fight_logic:
+            if parent_form_list == ItemName.MasterForm:
+                if state.has(ItemName.DriveConverter, self.player):
+                    form_access.add(auto_form_dict[parent_form_list])
+            else:
+                form_access.add(auto_form_dict[parent_form_list])
+        return state.has_any(form_access, self.player) \
+            and self.get_form_level_requirement(state, level_required)
+
+    def get_form_level_requirement(self, state, amount):
+        forms_available = 0
+        form_list = [ItemName.ValorForm, ItemName.WisdomForm, ItemName.LimitForm, ItemName.MasterForm,
+                     ItemName.FinalForm]
+        if self.world.multiworld.FinalFormLogic[self.player] != "no_light_and_darkness":
+            if self.world.multiworld.FinalFormLogic[self.player] == "light_and_darkness":
+                if state.has(ItemName.LightDarkness, self.player) and state.has_any(set(form_list), self.player):
+                    forms_available += 1
+                    form_list.remove(ItemName.FinalForm)
+            else:  # self.multiworld.FinalFormLogic=="just a form"
+                form_list.remove(ItemName.FinalForm)
+                if state.has_any(form_list, self.player):
+                    forms_available += 1
+        forms_available += sum([1 for form in form_list if state.has(form, self.player)])
+        return forms_available >= amount
+
+
+class KH2WorldRules(KH2Rules):
+    def __init__(self, kh2world: KH2World) -> None:
+        # These Rules are Always in effect
+        super().__init__(kh2world)
+        self.region_rules = {
+            RegionName.LoD:                lambda state: self.lod_unlocked(state, 1),
+            RegionName.LoD2:               lambda state: self.lod_unlocked(state, 2),
+
+            RegionName.Oc:                 lambda state: self.oc_unlocked(state, 1),
+            RegionName.Oc2:                lambda state: self.oc_unlocked(state, 2),
+
+            RegionName.Twtnw2:             lambda state: self.twtnw_unlocked(state, 2),
+            # These will be swapped and First Visit lock for twtnw is in development.
+            # RegionName.Twtnw1: lambda state: self.lod_unlocked(state, 2),
+
+            RegionName.Ht:                 lambda state: self.ht_unlocked(state, 1),
+            RegionName.Ht2:                lambda state: self.ht_unlocked(state, 2),
+
+            RegionName.Tt:                 lambda state: self.tt_unlocked(state, 1),
+            RegionName.Tt2:                lambda state: self.tt_unlocked(state, 2),
+            RegionName.Tt3:                lambda state: self.tt_unlocked(state, 3),
+
+            RegionName.Pr:                 lambda state: self.pr_unlocked(state, 1),
+            RegionName.Pr2:                lambda state: self.pr_unlocked(state, 2),
+
+            RegionName.Sp:                 lambda state: self.sp_unlocked(state, 1),
+            RegionName.Sp2:                lambda state: self.sp_unlocked(state, 2),
+
+            RegionName.Stt:                lambda state: self.stt_unlocked(state, 1),
+
+            RegionName.Dc:                 lambda state: self.dc_unlocked(state, 1),
+            RegionName.Tr:                 lambda state: self.dc_unlocked(state, 2),
+            #  Terra is a fight and can have more than just this requirement.
+            # RegionName.Terra:      lambda state:state.has(ItemName.ProofofConnection,self.player),
+
+            RegionName.Hb:                 lambda state: self.hb_unlocked(state, 1),
+            RegionName.Hb2:                lambda state: self.hb_unlocked(state, 2),
+            RegionName.Mushroom13:         lambda state: state.has(ItemName.ProofofPeace, self.player),
+
+            RegionName.Pl:                 lambda state: self.pl_unlocked(state, 1),
+            RegionName.Pl2:                lambda state: self.pl_unlocked(state, 2),
+
+            RegionName.Ag:                 lambda state: self.ag_unlocked(state, 1),
+            RegionName.Ag2:                lambda state: self.ag_unlocked(state, 2) and self.kh2_has_all([ItemName.FireElement,ItemName.BlizzardElement,ItemName.ThunderElement],state),
+
+            RegionName.Bc:                 lambda state: self.bc_unlocked(state, 1),
+            RegionName.Bc2:                lambda state: self.bc_unlocked(state, 2),
+
+            RegionName.AtlanticaSongThree: lambda state: self.at_three_unlocked(state),
+            RegionName.AtlanticaSongFour:  lambda state: self.at_four_unlocked(state),
+
+            RegionName.Ha1:                lambda state: True,
+            RegionName.Ha2:                lambda state: self.hundred_acre_unlocked(state, 1),
+            RegionName.Ha3:                lambda state: self.hundred_acre_unlocked(state, 2),
+            RegionName.Ha4:                lambda state: self.hundred_acre_unlocked(state, 3),
+            RegionName.Ha5:                lambda state: self.hundred_acre_unlocked(state, 4),
+            RegionName.Ha6:                lambda state: self.hundred_acre_unlocked(state, 5),
+
+            RegionName.LevelsVS1:          lambda state: self.level_locking_unlock(state, 1),
+            RegionName.LevelsVS3:          lambda state: self.level_locking_unlock(state, 3),
+            RegionName.LevelsVS6:          lambda state: self.level_locking_unlock(state, 6),
+            RegionName.LevelsVS9:          lambda state: self.level_locking_unlock(state, 9),
+            RegionName.LevelsVS12:         lambda state: self.level_locking_unlock(state, 12),
+            RegionName.LevelsVS15:         lambda state: self.level_locking_unlock(state, 15),
+            RegionName.LevelsVS18:         lambda state: self.level_locking_unlock(state, 18),
+            RegionName.LevelsVS21:         lambda state: self.level_locking_unlock(state, 21),
+            RegionName.LevelsVS24:         lambda state: self.level_locking_unlock(state, 24),
+            RegionName.LevelsVS26:         lambda state: self.level_locking_unlock(state, 26),
+        }
+
+    def set_kh2_rules(self) -> None:
+        for region_name, rules in self.region_rules.items():
+            region = self.multiworld.get_region(region_name, self.player)
+            for entrance in region.entrances:
+                entrance.access_rule = rules
+
+        self.set_kh2_goal()
+
+        weapon_region = self.multiworld.get_region(RegionName.Keyblade, self.player)
+        for location in weapon_region.locations:
+            add_rule(location, lambda state: state.has(exclusion_table["WeaponSlots"][location.name], self.player))
+            if location.name in Goofy_Checks:
+                add_item_rule(location, lambda item: item.player == self.player and item.name in GoofyAbility_Table.keys())
+            elif location.name in Donald_Checks:
+                add_item_rule(location, lambda item: item.player == self.player and item.name in DonaldAbility_Table.keys())
+
+    def set_kh2_goal(self):
+        final_xemnas_location = self.multiworld.get_location(LocationName.FinalXemnas, self.player)
+        if self.multiworld.Goal[self.player] == "three_proofs":
+            final_xemnas_location.access_rule = lambda state: self.kh2_has_all(three_proofs, state)
+            if self.multiworld.FinalXemnas[self.player]:
+                self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Victory, self.player, 1)
+            else:
+                self.multiworld.completion_condition[self.player] = lambda state: self.kh2_has_all(three_proofs, state)
+        # lucky emblem hunt
+        elif self.multiworld.Goal[self.player] == "lucky_emblem_hunt":
+            final_xemnas_location.access_rule = lambda state: state.has(ItemName.LuckyEmblem, self.player, self.multiworld.LuckyEmblemsRequired[self.player].value)
+            if self.multiworld.FinalXemnas[self.player]:
+                self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Victory, self.player, 1)
+            else:
+                self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.LuckyEmblem, self.player, self.multiworld.LuckyEmblemsRequired[self.player].value)
+        # hitlist if == 2
+        elif self.multiworld.Goal[self.player] == "hitlist":
+            final_xemnas_location.access_rule = lambda state: state.has(ItemName.Bounty, self.player, self.multiworld.BountyRequired[self.player].value)
+            if self.multiworld.FinalXemnas[self.player]:
+                self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Victory, self.player, 1)
+            else:
+                self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Bounty, self.player, self.multiworld.BountyRequired[self.player].value)
         else:
-            world.completion_condition[player] = lambda state: state.kh_three_proof_unlocked(player)
-    # lucky emblem hunt
-    elif world.Goal[player] == "lucky_emblem_hunt":
-        add_rule(world.get_location(LocationName.FinalXemnas, player),
-                 lambda state: state.kh_lucky_emblem_unlocked(player, world.LuckyEmblemsRequired[player].value))
-        if world.FinalXemnas[player]:
-            world.completion_condition[player] = lambda state: state.kh_victory(player)
-        else:
-            world.completion_condition[player] = lambda state: state.kh_lucky_emblem_unlocked(player, world.LuckyEmblemsRequired[player].value)
-    # hitlist if == 2
-    else:
-        add_rule(world.get_location(LocationName.FinalXemnas, player),
-                 lambda state: state.kh_hitlist(player, world.BountyRequired[player].value))
-        if world.FinalXemnas[player]:
-            world.completion_condition[player] = lambda state: state.kh_victory(player)
-        else:
-            world.completion_condition[player] = lambda state: state.kh_hitlist(player, world.BountyRequired[player].value)
+            final_xemnas_location.access_rule = lambda state: state.has(ItemName.Bounty, self.player, self.multiworld.BountyRequired[self.player].value) and \
+                                                              state.has(ItemName.LuckyEmblem, self.player, self.multiworld.LuckyEmblemsRequired[self.player].value)
+            if self.multiworld.FinalXemnas[self.player]:
+                self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Victory, self.player, 1)
+            else:
+                self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Bounty, self.player, self.multiworld.BountyRequired[self.player].value) and \
+                                                                                  state.has(ItemName.LuckyEmblem, self.player, self.multiworld.LuckyEmblemsRequired[self.player].value)
 
-    #  Forbid Abilities on popups due to game limitations
-    for location in exclusion_table["Popups"]:
-        forbid_items(world.get_location(location, player), exclusionItem_table["Ability"])
-        forbid_items(world.get_location(location, player), exclusionItem_table["StatUps"])
 
-    for location in STT_Checks:
-        forbid_items(world.get_location(location, player), exclusionItem_table["StatUps"])
+class KH2FormRules(KH2Rules):
+    #: Dict[str, Callable[[CollectionState], bool]]
+    def __init__(self, world: KH2World) -> None:
+        super().__init__(world)
+        # access rules on where you can level a form.
 
-    # Santa's house also breaks with stat ups
-    for location in {LocationName.SantasHouseChristmasTownMap, LocationName.SantasHouseAPBoost}:
-        forbid_items(world.get_location(location, player), exclusionItem_table["StatUps"])
+        self.form_rules = {
+            LocationName.Valorlvl2:  lambda state: self.form_list_unlock(state, ItemName.ValorForm, 0),
+            LocationName.Valorlvl3:  lambda state: self.form_list_unlock(state, ItemName.ValorForm, 1),
+            LocationName.Valorlvl4:  lambda state: self.form_list_unlock(state, ItemName.ValorForm, 2),
+            LocationName.Valorlvl5:  lambda state: self.form_list_unlock(state, ItemName.ValorForm, 3),
+            LocationName.Valorlvl6:  lambda state: self.form_list_unlock(state, ItemName.ValorForm, 4),
+            LocationName.Valorlvl7:  lambda state: self.form_list_unlock(state, ItemName.ValorForm, 5),
+            LocationName.Wisdomlvl2: lambda state: self.form_list_unlock(state, ItemName.WisdomForm, 0),
+            LocationName.Wisdomlvl3: lambda state: self.form_list_unlock(state, ItemName.WisdomForm, 1),
+            LocationName.Wisdomlvl4: lambda state: self.form_list_unlock(state, ItemName.WisdomForm, 2),
+            LocationName.Wisdomlvl5: lambda state: self.form_list_unlock(state, ItemName.WisdomForm, 3),
+            LocationName.Wisdomlvl6: lambda state: self.form_list_unlock(state, ItemName.WisdomForm, 4),
+            LocationName.Wisdomlvl7: lambda state: self.form_list_unlock(state, ItemName.WisdomForm, 5),
+            LocationName.Limitlvl2:  lambda state: self.form_list_unlock(state, ItemName.LimitForm, 0),
+            LocationName.Limitlvl3:  lambda state: self.form_list_unlock(state, ItemName.LimitForm, 1),
+            LocationName.Limitlvl4:  lambda state: self.form_list_unlock(state, ItemName.LimitForm, 2),
+            LocationName.Limitlvl5:  lambda state: self.form_list_unlock(state, ItemName.LimitForm, 3),
+            LocationName.Limitlvl6:  lambda state: self.form_list_unlock(state, ItemName.LimitForm, 4),
+            LocationName.Limitlvl7:  lambda state: self.form_list_unlock(state, ItemName.LimitForm, 5),
+            LocationName.Masterlvl2: lambda state: self.form_list_unlock(state, ItemName.MasterForm, 0),
+            LocationName.Masterlvl3: lambda state: self.form_list_unlock(state, ItemName.MasterForm, 1),
+            LocationName.Masterlvl4: lambda state: self.form_list_unlock(state, ItemName.MasterForm, 2),
+            LocationName.Masterlvl5: lambda state: self.form_list_unlock(state, ItemName.MasterForm, 3),
+            LocationName.Masterlvl6: lambda state: self.form_list_unlock(state, ItemName.MasterForm, 4),
+            LocationName.Masterlvl7: lambda state: self.form_list_unlock(state, ItemName.MasterForm, 5),
+            LocationName.Finallvl2:  lambda state: self.form_list_unlock(state, ItemName.FinalForm, 0),
+            LocationName.Finallvl3:  lambda state: self.form_list_unlock(state, ItemName.FinalForm, 1),
+            LocationName.Finallvl4:  lambda state: self.form_list_unlock(state, ItemName.FinalForm, 2),
+            LocationName.Finallvl5:  lambda state: self.form_list_unlock(state, ItemName.FinalForm, 3),
+            LocationName.Finallvl6:  lambda state: self.form_list_unlock(state, ItemName.FinalForm, 4),
+            LocationName.Finallvl7:  lambda state: self.form_list_unlock(state, ItemName.FinalForm, 5),
+            LocationName.Summonlvl2: lambda state: self.summon_levels_unlocked(state, 1),
+            LocationName.Summonlvl3: lambda state: self.summon_levels_unlocked(state, 1),
+            LocationName.Summonlvl4: lambda state: self.summon_levels_unlocked(state, 2),
+            LocationName.Summonlvl5: lambda state: self.summon_levels_unlocked(state, 3),
+            LocationName.Summonlvl6: lambda state: self.summon_levels_unlocked(state, 4),
+            LocationName.Summonlvl7: lambda state: self.summon_levels_unlocked(state, 4),
+        }
+        self.form_region_rules = {
+            RegionName.Valor:  lambda state: self.multi_form_region_access(),
+            RegionName.Wisdom: lambda state: self.multi_form_region_access(),
+            RegionName.Limit:  lambda state: self.limit_form_region_access(),
+            RegionName.Master: lambda state: self.multi_form_region_access(),
+            RegionName.Final:  lambda state: self.final_form_region_access(state)
+        }
 
-    add_rule(world.get_location(LocationName.TransporttoRemembrance, player),
-             lambda state: state.kh_transport(player))
+    def final_form_region_access(self, state: CollectionState) -> bool:
+        """
+        Can reach one of TT3,Twtnw post Roxas, BC2, LoD2 or PR2
+        """
+        # tt3 start, can beat roxas, can beat gr2, can beat xaldin, can beat storm rider.
+
+        return any(
+                self.multiworld.get_location(location, self.player).can_reach(state) for location in
+                final_leveling_access
+        )
+
+    @staticmethod
+    def limit_form_region_access() -> bool:
+        """
+        returns true since twtnw always is open and has enemies
+        """
+        return True
+
+    @staticmethod
+    def multi_form_region_access() -> bool:
+        """
+        returns true since twtnw always is open and has enemies
+        Valor, Wisdom and Master Form region access.
+        Note: This does not account for having the drive form. See form_list_unlock
+        """
+        # todo: if boss enemy start the player with oc stone because of cerb
+        return True
+
+    def set_kh2_form_rules(self):
+        for region_name in drive_form_list:
+            if region_name == RegionName.Summon and not self.world.options.SummonLevelLocationToggle:
+                continue
+            # could get the location of each of these, but I feel like that would be less optimal
+            region = self.multiworld.get_region(region_name, self.player)
+            # if region_name in form_region_rules
+            if region_name != RegionName.Summon:
+                for entrance in region.entrances:
+                    entrance.access_rule = self.form_region_rules[region_name]
+            for loc in region.locations:
+                loc.access_rule = self.form_rules[loc.name]
+
+
+class KH2FightRules(KH2Rules):
+    player: int
+    world: KH2World
+    region_rules: Dict[str, Callable[[CollectionState], bool]]
+    location_rules: Dict[str, Callable[[CollectionState], bool]]
+
+    # cor logic
+    # have 3 things for the logic
+    # region:movement_rules and (fight_rules or skip rules)
+    # if skip rules are of return false
+    def __init__(self, world: KH2World) -> None:
+        super().__init__(world)
+        self.fight_logic = self.multiworld.FightLogic[self.player].current_key
+
+        self.fight_region_rules = {
+            RegionName.ShanYu:            lambda state: self.get_shan_yu_rules(state),
+            RegionName.AnsemRiku:         lambda state: self.get_ansem_riku_rules(state),
+            RegionName.StormRider:        lambda state: self.get_storm_rider_rules(state),
+            RegionName.DataXigbar:        lambda state: self.get_data_xigbar_rules(state),
+            RegionName.TwinLords:         lambda state: self.get_fire_lord_rules(state) and self.get_blizzard_lord_rules(state),
+            RegionName.GenieJafar:        lambda state: self.get_genie_jafar_rules(state),
+            RegionName.DataLexaeus:       lambda state: self.get_data_lexaeus_rules(state),
+            RegionName.OldPete:           lambda state: self.get_old_pete_rules(),
+            RegionName.FuturePete:        lambda state: self.get_future_pete_rules(state),
+            RegionName.Terra:             lambda state: self.get_terra_rules(state),
+            RegionName.DataMarluxia:      lambda state: self.get_data_marluxia_rules(state),
+            RegionName.Barbosa:           lambda state: self.get_barbosa_rules(state),
+            RegionName.GrimReaper1:       lambda state: self.get_grim_reaper1_rules(),
+            RegionName.GrimReaper2:       lambda state: self.get_grim_reaper2_rules(state),
+            RegionName.DataLuxord:        lambda state: self.get_data_luxord_rules(state),
+            RegionName.Cerberus:          lambda state: self.get_cerberus_rules(state),
+            RegionName.OlympusPete:       lambda state: self.get_olympus_pete_rules(state),
+            RegionName.Hydra:             lambda state: self.get_hydra_rules(state),
+            RegionName.Hades:             lambda state: self.get_hades_rules(state),
+            RegionName.DataZexion:        lambda state: self.get_data_zexion_rules(state),
+            RegionName.OcPainAndPanicCup: lambda state: self.get_pain_and_panic_cup_rules(state),
+            RegionName.OcCerberusCup:     lambda state: self.get_cerberus_cup_rules(state),
+            RegionName.Oc2TitanCup:       lambda state: self.get_titan_cup_rules(state),
+            RegionName.Oc2GofCup:         lambda state: self.get_goddess_of_fate_cup_rules(state),
+            RegionName.HadesCups:         lambda state: self.get_hades_cup_rules(state),
+            RegionName.Thresholder:       lambda state: self.get_thresholder_rules(state),
+            RegionName.Beast:             lambda state: self.get_beast_rules(),
+            RegionName.DarkThorn:         lambda state: self.get_dark_thorn_rules(state),
+            RegionName.Xaldin:            lambda state: self.get_xaldin_rules(state),
+            RegionName.DataXaldin:        lambda state: self.get_data_xaldin_rules(state),
+            RegionName.HostileProgram:    lambda state: self.get_hostile_program_rules(state),
+            RegionName.Mcp:               lambda state: self.get_mcp_rules(state),
+            RegionName.DataLarxene:       lambda state: self.get_data_larxene_rules(state),
+            RegionName.PrisonKeeper:      lambda state: self.get_prison_keeper_rules(state),
+            RegionName.OogieBoogie:       lambda state: self.get_oogie_rules(),
+            RegionName.Experiment:        lambda state: self.get_experiment_rules(state),
+            RegionName.DataVexen:         lambda state: self.get_data_vexen_rules(state),
+            RegionName.HBDemyx:           lambda state: self.get_demyx_rules(state),
+            RegionName.ThousandHeartless: lambda state: self.get_thousand_heartless_rules(state),
+            RegionName.DataDemyx:         lambda state: self.get_data_demyx_rules(state),
+            RegionName.Sephi:             lambda state: self.get_sephiroth_rules(state),
+            RegionName.CorFirstFight:     lambda state: self.get_cor_first_fight_movement_rules(state) and (self.get_cor_first_fight_rules(state) or self.get_cor_skip_first_rules(state)),
+            RegionName.CorSecondFight:    lambda state: self.get_cor_second_fight_movement_rules(state),
+            RegionName.Transport:         lambda state: self.get_transport_movement_rules(state),
+            RegionName.Scar:              lambda state: self.get_scar_rules(state),
+            RegionName.GroundShaker:      lambda state: self.get_groundshaker_rules(state),
+            RegionName.DataSaix:          lambda state: self.get_data_saix_rules(state),
+            RegionName.TwilightThorn:     lambda state: self.get_twilight_thorn_rules(),
+            RegionName.Axel1:             lambda state: self.get_axel_one_rules(),
+            RegionName.Axel2:             lambda state: self.get_axel_two_rules(),
+            RegionName.DataRoxas:         lambda state: self.get_data_roxas_rules(state),
+            RegionName.DataAxel:          lambda state: self.get_data_axel_rules(state),
+            RegionName.Roxas:             lambda state: self.get_roxas_rules(state) and self.twtnw_unlocked(state, 1),
+            RegionName.Xigbar:            lambda state: self.get_xigbar_rules(state),
+            RegionName.Luxord:            lambda state: self.get_luxord_rules(state),
+            RegionName.Saix:              lambda state: self.get_saix_rules(state),
+            RegionName.Xemnas:            lambda state: self.get_xemnas_rules(state),
+            RegionName.ArmoredXemnas:     lambda state: self.get_armored_xemnas_one_rules(state),
+            RegionName.ArmoredXemnas2:    lambda state: self.get_armored_xemnas_two_rules(state),
+            RegionName.FinalXemnas:       lambda state: self.get_final_xemnas_rules(state),
+            RegionName.DataXemnas:        lambda state: self.get_data_xemnas_rules(state),
+        }
+
+    def set_kh2_fight_rules(self) -> None:
+        for region_name, rules in self.fight_region_rules.items():
+            region = self.multiworld.get_region(region_name, self.player)
+            for entrance in region.entrances:
+                entrance.access_rule = rules
+
+        for loc_name in [LocationName.TransportEventLocation, LocationName.TransporttoRemembrance]:
+            location = self.multiworld.get_location(loc_name, self.player)
+            add_rule(location, lambda state: self.get_transport_fight_rules(state))
+
+    def get_shan_yu_rules(self, state: CollectionState) -> bool:
+        # easy: gap closer, defensive tool,drive form
+        # normal: 2 out of easy
+        # hard: defensive tool or drive form
+        shan_yu_rules = {
+            "easy":   self.kh2_list_any_sum([gap_closer, defensive_tool, form_list], state) >= 3,
+            "normal": self.kh2_list_any_sum([gap_closer, defensive_tool, form_list], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool, form_list], state) >= 1
+        }
+        return shan_yu_rules[self.fight_logic]
+
+    def get_ansem_riku_rules(self, state: CollectionState) -> bool:
+        # easy: gap closer,defensive tool,ground finisher/limit form 
+        # normal: defensive tool and (gap closer/ground finisher/limit form)
+        # hard: defensive tool or limit form
+        ansem_riku_rules = {
+            "easy":   self.kh2_list_any_sum([gap_closer, defensive_tool, [ItemName.LimitForm], ground_finisher], state) >= 3,
+            "normal": self.kh2_list_any_sum([gap_closer, defensive_tool, [ItemName.LimitForm], ground_finisher], state) >= 2,
+            "hard":   self.kh2_has_any([ItemName.ReflectElement, ItemName.Guard, ItemName.LimitForm], state),
+        }
+        return ansem_riku_rules[self.fight_logic]
+
+    def get_storm_rider_rules(self, state: CollectionState) -> bool:
+        # easy: has defensive tool,drive form, party limit,aerial move
+        # normal: has 3 of those things
+        # hard: has 2 of those things 
+        storm_rider_rules = {
+            "easy":   self.kh2_list_any_sum([defensive_tool, party_limit, aerial_move, form_list], state) >= 4,
+            "normal": self.kh2_list_any_sum([defensive_tool, party_limit, aerial_move, form_list], state) >= 3,
+            "hard":   self.kh2_list_any_sum([defensive_tool, party_limit, aerial_move, form_list], state) >= 2,
+        }
+        return storm_rider_rules[self.fight_logic]
+
+    def get_data_xigbar_rules(self, state: CollectionState) -> bool:
+        # easy:final 7,firaga,2 air combo plus,air gap closer, finishing plus,guard,reflega,horizontal slash,donald limit
+        # normal:final 7,firaga,finishing plus,guard,reflect horizontal slash,donald limit
+        # hard:((final 5, fira) or donald limit), finishing plus,guard/reflect
+        data_xigbar_rules = {
+            "easy":   self.kh2_dict_count(easy_data_xigbar_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True) and self.kh2_has_any(donald_limit, state),
+            "normal": self.kh2_dict_count(normal_data_xigbar_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True) and self.kh2_has_any(donald_limit, state),
+            "hard":   ((self.form_list_unlock(state, ItemName.FinalForm, 3, True) and state.has(ItemName.FireElement, self.player, 2)) or self.kh2_has_any(donald_limit, state))
+                      and state.has(ItemName.FinishingPlus, self.player) and self.kh2_has_any(defensive_tool, state)
+        }
+        return data_xigbar_rules[self.fight_logic]
+
+    def get_fire_lord_rules(self, state: CollectionState) -> bool:
+        # easy: drive form,defensive tool,one black magic,party limit
+        # normal: 3 of those things
+        # hard:2 of those things
+        # duplicate of the other because in boss rando there will be to bosses in arena and these bosses can be split.
+        fire_lords_rules = {
+            "easy":   self.kh2_list_any_sum([form_list, defensive_tool, black_magic, party_limit], state) >= 4,
+            "normal": self.kh2_list_any_sum([form_list, defensive_tool, black_magic, party_limit], state) >= 3,
+            "hard":   self.kh2_list_any_sum([form_list, defensive_tool, black_magic, party_limit], state) >= 2,
+        }
+        return fire_lords_rules[self.fight_logic]
+
+    def get_blizzard_lord_rules(self, state: CollectionState) -> bool:
+        # easy: drive form,defensive tool,one black magic,party limit
+        # normal: 3 of those things
+        # hard:2 of those things
+        # duplicate of the other because in boss rando there will be to bosses in arena and these bosses can be split.
+        blizzard_lords_rules = {
+            "easy":   self.kh2_list_any_sum([form_list, defensive_tool, black_magic, party_limit], state) >= 4,
+            "normal": self.kh2_list_any_sum([form_list, defensive_tool, black_magic, party_limit], state) >= 3,
+            "hard":   self.kh2_list_any_sum([form_list, defensive_tool, black_magic, party_limit], state) >= 2,
+        }
+        return blizzard_lords_rules[self.fight_logic]
+
+    def get_genie_jafar_rules(self, state: CollectionState) -> bool:
+        # easy: defensive tool,black magic,ground finisher,finishing plus
+        # normal: defensive tool, ground finisher,finishing plus
+        # hard: defensive tool,finishing plus
+        genie_jafar_rules = {
+            "easy":   self.kh2_list_any_sum([defensive_tool, black_magic, ground_finisher, {ItemName.FinishingPlus}], state) >= 4,
+            "normal": self.kh2_list_any_sum([defensive_tool, ground_finisher, {ItemName.FinishingPlus}], state) >= 3,
+            "hard":   self.kh2_list_any_sum([defensive_tool, {ItemName.FinishingPlus}], state) >= 2,
+        }
+        return genie_jafar_rules[self.fight_logic]
+
+    def get_data_lexaeus_rules(self, state: CollectionState) -> bool:
+        # easy:both gap closers,final 7,firaga,reflera,donald limit, guard
+        # normal:one gap closer,final 5,fira,reflect, donald limit,guard
+        # hard:defensive tool,gap closer
+        data_lexaues_rules = {
+            "easy":   self.kh2_dict_count(easy_data_lex_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True) and self.kh2_list_any_sum([donald_limit], state) >= 1,
+            "normal": self.kh2_dict_count(normal_data_lex_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 3, True) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool, gap_closer], state) >= 2,
+        }
+        return data_lexaues_rules[self.fight_logic]
+
+    @staticmethod
+    def get_old_pete_rules():
+        # fight is free.
+        return True
+
+    def get_future_pete_rules(self, state: CollectionState) -> bool:
+        # easy:defensive option,gap closer,drive form
+        # norma:2 of those things
+        # hard 1 of those things
+        future_pete_rules = {
+            "easy":   self.kh2_list_any_sum([defensive_tool, gap_closer, form_list], state) >= 3,
+            "normal": self.kh2_list_any_sum([defensive_tool, gap_closer, form_list], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool, gap_closer, form_list], state) >= 1,
+        }
+        return future_pete_rules[self.fight_logic]
+
+    def get_data_marluxia_rules(self, state: CollectionState) -> bool:
+        # easy:both gap closers,final 7,firaga,reflera,donald limit, guard
+        # normal:one gap closer,final 5,fira,reflect, donald limit,guard
+        # hard:defensive tool,gap closer
+        data_marluxia_rules = {
+            "easy":   self.kh2_dict_count(easy_data_marluxia_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True) and self.kh2_list_any_sum([donald_limit], state) >= 1,
+            "normal": self.kh2_dict_count(normal_data_marluxia_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 3, True) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool, gap_closer, [ItemName.AerialRecovery]], state) >= 3,
+        }
+        return data_marluxia_rules[self.fight_logic]
+
+    def get_terra_rules(self, state: CollectionState) -> bool:
+        # easy:scom,gap closers,explosion,2 combo pluses,final 7,firaga, donald limits,reflect,guard,3 dodge roll,3 aerial dodge and 3glide
+        # normal:gap closers,explosion,2 combo pluses,2 dodge roll,2 aerial dodge and lvl 2glide,guard,donald limit, guard
+        # hard:1 gap closer,explosion,2 combo pluses,2 dodge roll,2 aerial dodge and lvl 2glide,guard
+        terra_rules = {
+            "easy":   self.kh2_dict_count(easy_terra_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "normal": self.kh2_dict_count(normal_terra_tools, state) and self.kh2_list_any_sum([donald_limit], state) >= 1,
+            "hard":   self.kh2_dict_count(hard_terra_tools, state) and self.kh2_list_any_sum([gap_closer], state) >= 1,
+        }
+        return terra_rules[self.fight_logic]
+
+    def get_barbosa_rules(self, state: CollectionState) -> bool:
+        # easy:blizzara and thundara or one of each,defensive tool
+        # normal:(blizzard or thunder) and defensive tool
+        # hard: defensive tool
+        barbosa_rules = {
+            "easy":   self.kh2_list_count_sum([ItemName.BlizzardElement, ItemName.ThunderElement], state) >= 2 and self.kh2_list_any_sum([defensive_tool], state) >= 1,
+            "normal": self.kh2_list_any_sum([defensive_tool, {ItemName.BlizzardElement, ItemName.ThunderElement}], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool], state) >= 1,
+        }
+        return barbosa_rules[self.fight_logic]
+
+    @staticmethod
+    def get_grim_reaper1_rules():
+        # fight is free.
+        return True
+
+    def get_grim_reaper2_rules(self, state: CollectionState) -> bool:
+        # easy:master form,thunder,defensive option
+        # normal:master form/stitch,thunder,defensive option
+        # hard:any black magic,defensive option.
+        gr2_rules = {
+            "easy":   self.kh2_list_any_sum([defensive_tool, {ItemName.MasterForm, ItemName.ThunderElement}], state) >= 2,
+            "normal": self.kh2_list_any_sum([defensive_tool, {ItemName.MasterForm, ItemName.Stitch}, {ItemName.ThunderElement}], state) >= 3,
+            "hard":   self.kh2_list_any_sum([black_magic, defensive_tool], state) >= 2
+        }
+        return gr2_rules[self.fight_logic]
+
+    def get_data_luxord_rules(self, state: CollectionState) -> bool:
+        # easy:gap closers,reflega,aerial dodge lvl 2,glide lvl 2,guard
+        # normal:1 gap closer,reflect,aerial dodge lvl 1,glide lvl 1,guard
+        # hard:quick run,defensive option
+        data_luxord_rules = {
+            "easy":   self.kh2_dict_count(easy_data_luxord_tools, state),
+            "normal": self.kh2_has_all([ItemName.ReflectElement, ItemName.AerialDodge, ItemName.Glide, ItemName.Guard], state) and self.kh2_has_any(defensive_tool, state),
+            "hard":   self.kh2_list_any_sum([{ItemName.QuickRun}, defensive_tool], state)
+        }
+        return data_luxord_rules[self.fight_logic]
+
+    def get_cerberus_rules(self, state: CollectionState) -> bool:
+        # easy,normal:defensive option, offensive magic
+        # hard:defensive option
+        cerberus_rules = {
+            "easy":   self.kh2_list_any_sum([defensive_tool, black_magic], state) >= 2,
+            "normal": self.kh2_list_any_sum([defensive_tool, black_magic], state) >= 2,
+            "hard":   self.kh2_has_any(defensive_tool, state),
+        }
+        return cerberus_rules[self.fight_logic]
+
+    def get_pain_and_panic_cup_rules(self, state: CollectionState) -> bool:
+        # easy:2 party limit,reflect
+        # normal:1 party limit,reflect
+        # hard:reflect
+        pain_and_panic_rules = {
+            "easy":   self.kh2_list_count_sum(party_limit, state) >= 2 and state.has(ItemName.ReflectElement, self.player),
+            "normal": self.kh2_list_count_sum(party_limit, state) >= 1 and state.has(ItemName.ReflectElement, self.player),
+            "hard":   state.has(ItemName.ReflectElement, self.player)
+        }
+        return pain_and_panic_rules[self.fight_logic] and (self.kh2_has_all([ItemName.FuturePeteEvent], state) or state.has(ItemName.HadesCupTrophy, self.player))
+
+    def get_cerberus_cup_rules(self, state: CollectionState) -> bool:
+        # easy:3 drive forms,reflect
+        # normal:2 drive forms,reflect
+        # hard:reflect
+        cerberus_cup_rules = {
+            "easy":   self.kh2_can_reach_any([LocationName.Valorlvl5, LocationName.Wisdomlvl5, LocationName.Limitlvl5, LocationName.Masterlvl5, LocationName.Finallvl5], state) and state.has(ItemName.ReflectElement, self.player),
+            "normal": self.kh2_can_reach_any([LocationName.Valorlvl4, LocationName.Wisdomlvl4, LocationName.Limitlvl4, LocationName.Masterlvl4, LocationName.Finallvl4], state) and state.has(ItemName.ReflectElement, self.player),
+            "hard":   state.has(ItemName.ReflectElement, self.player)
+        }
+        return cerberus_cup_rules[self.fight_logic] and (self.kh2_has_all([ItemName.ScarEvent, ItemName.OogieBoogieEvent, ItemName.TwinLordsEvent], state) or state.has(ItemName.HadesCupTrophy, self.player))
+
+    def get_titan_cup_rules(self, state: CollectionState) -> bool:
+        # easy:4 summons,reflera
+        # normal:4 summons,reflera
+        # hard:2 summons,reflera
+        titan_cup_rules = {
+            "easy":   self.kh2_list_count_sum(summons, state) >= 4 and state.has(ItemName.ReflectElement, self.player, 2),
+            "normal": self.kh2_list_count_sum(summons, state) >= 3 and state.has(ItemName.ReflectElement, self.player, 2),
+            "hard":   self.kh2_list_count_sum(summons, state) >= 2 and state.has(ItemName.ReflectElement, self.player, 2),
+        }
+        return titan_cup_rules[self.fight_logic] and (state.has(ItemName.HadesEvent, self.player) or state.has(ItemName.HadesCupTrophy, self.player))
+
+    def get_goddess_of_fate_cup_rules(self, state: CollectionState) -> bool:
+        # can beat all the other cups+xemnas 1
+        return self.kh2_has_all([ItemName.OcPainAndPanicCupEvent, ItemName.OcCerberusCupEvent, ItemName.Oc2TitanCupEvent], state)
+
+    def get_hades_cup_rules(self, state: CollectionState) -> bool:
+        # can beat goddess of fate cup
+        return state.has(ItemName.Oc2GofCupEvent, self.player)
+
+    def get_olympus_pete_rules(self, state: CollectionState) -> bool:
+        # easy:gap closer,defensive option,drive form
+        # normal:2 of those things
+        # hard:1 of those things
+        olympus_pete_rules = {
+            "easy":   self.kh2_list_any_sum([gap_closer, defensive_tool, form_list], state) >= 3,
+            "normal": self.kh2_list_any_sum([gap_closer, defensive_tool, form_list], state) >= 2,
+            "hard":   self.kh2_list_any_sum([gap_closer, defensive_tool, form_list], state) >= 1,
+        }
+        return olympus_pete_rules[self.fight_logic]
+
+    def get_hydra_rules(self, state: CollectionState) -> bool:
+        # easy:drive form,defensive option,offensive magic
+        # normal 2 of those things
+        # hard: one of those things
+        hydra_rules = {
+            "easy":   self.kh2_list_any_sum([black_magic, defensive_tool, form_list], state) >= 3,
+            "normal": self.kh2_list_any_sum([black_magic, defensive_tool, form_list], state) >= 2,
+            "hard":   self.kh2_list_any_sum([black_magic, defensive_tool, form_list], state) >= 1,
+        }
+        return hydra_rules[self.fight_logic]
+
+    def get_hades_rules(self, state: CollectionState) -> bool:
+        # easy:drive form,summon,gap closer,defensive option
+        # normal:3 of those things
+        # hard:2 of those things
+        hades_rules = {
+            "easy":   self.kh2_list_any_sum([gap_closer, summons, defensive_tool, form_list], state) >= 4,
+            "normal": self.kh2_list_any_sum([gap_closer, summons, defensive_tool, form_list], state) >= 3,
+            "hard":   self.kh2_list_any_sum([gap_closer, summons, defensive_tool, form_list], state) >= 2,
+        }
+        return hades_rules[self.fight_logic]
+
+    def get_data_zexion_rules(self, state: CollectionState) -> bool:
+        # easy: final 7,firaga,scom,both donald limits, Reflega ,guard,2 gap closers,quick run level 3
+        # normal:final 7,firaga, donald limit, Reflega ,guard,1 gap closers,quick run level 3
+        # hard:final 5,fira, donald limit, reflect,gap closer,quick run level 2
+        data_zexion_rules = {
+            "easy":   self.kh2_dict_count(easy_data_zexion, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "normal": self.kh2_dict_count(normal_data_zexion, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+            "hard":   self.kh2_dict_count(hard_data_zexion, state) and self.form_list_unlock(state, ItemName.FinalForm, 3, True) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+        }
+        return data_zexion_rules[self.fight_logic]
+
+    def get_thresholder_rules(self, state: CollectionState) -> bool:
+        # easy:drive form,black magic,defensive tool
+        # normal:2 of those things
+        # hard:defensive tool or drive form
+        thresholder_rules = {
+            "easy":   self.kh2_list_any_sum([form_list, black_magic, defensive_tool], state) >= 3,
+            "normal": self.kh2_list_any_sum([form_list, black_magic, defensive_tool], state) >= 2,
+            "hard":   self.kh2_list_any_sum([form_list, defensive_tool], state) >= 1,
+        }
+        return thresholder_rules[self.fight_logic]
+
+    @staticmethod
+    def get_beast_rules():
+        # fight is free
+        return True
+
+    def get_dark_thorn_rules(self, state: CollectionState) -> bool:
+        # easy:drive form,defensive tool,gap closer
+        # normal:drive form,defensive tool
+        # hard:defensive tool
+        dark_thorn_rules = {
+            "easy":   self.kh2_list_any_sum([form_list, gap_closer, defensive_tool], state) >= 3,
+            "normal": self.kh2_list_any_sum([form_list, defensive_tool], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool], state) >= 1,
+        }
+        return dark_thorn_rules[self.fight_logic]
+
+    def get_xaldin_rules(self, state: CollectionState) -> bool:
+        # easy:guard,2 aerial modifier,valor/master/final
+        # normal:guard,1 aerial modifier
+        # hard:guard
+        xaldin_rules = {
+            "easy":   self.kh2_list_any_sum([[ItemName.Guard], [ItemName.ValorForm, ItemName.MasterForm, ItemName.FinalForm]], state) >= 2 and self.kh2_list_count_sum(aerial_move, state) >= 2,
+            "normal": self.kh2_list_any_sum([aerial_move], state) >= 1 and state.has(ItemName.Guard, self.player),
+            "hard":   state.has(ItemName.Guard, self.player),
+        }
+        return xaldin_rules[self.fight_logic]
+
+    def get_data_xaldin_rules(self, state: CollectionState) -> bool:
+        # easy:final 7,firaga,2 air combo plus, finishing plus,guard,reflega,donald limit,high jump aerial dodge glide lvl 3,magnet,aerial dive,aerial spiral,hori slash,berserk charge
+        # normal:final 7,firaga, finishing plus,guard,reflega,donald limit,high jump aerial dodge glide lvl 3,magnet,aerial dive,aerial spiral,hori slash
+        # hard:final 5, fira, party limit, finishing plus,guard,high jump aerial dodge glide lvl 2,magnet,aerial dive
+        data_xaldin_rules = {
+            "easy":   self.kh2_dict_count(easy_data_xaldin, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "normal": self.kh2_dict_count(normal_data_xaldin, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "hard":   self.kh2_dict_count(hard_data_xaldin, state) and self.form_list_unlock(state, ItemName.FinalForm, 3, True) and self.kh2_has_any(party_limit, state),
+        }
+        return data_xaldin_rules[self.fight_logic]
+
+    def get_hostile_program_rules(self, state: CollectionState) -> bool:
+        # easy:donald limit,reflect,drive form,summon
+        # normal:3 of those things
+        # hard: 2 of those things
+        hostile_program_rules = {
+            "easy":   self.kh2_list_any_sum([donald_limit, form_list, summons, {ItemName.ReflectElement}], state) >= 4,
+            "normal": self.kh2_list_any_sum([donald_limit, form_list, summons, {ItemName.ReflectElement}], state) >= 3,
+            "hard":   self.kh2_list_any_sum([donald_limit, form_list, summons, {ItemName.ReflectElement}], state) >= 2,
+        }
+        return hostile_program_rules[self.fight_logic]
+
+    def get_mcp_rules(self, state: CollectionState) -> bool:
+        # easy:donald limit,reflect,drive form,summon
+        # normal:3 of those things
+        # hard: 2 of those things
+        mcp_rules = {
+            "easy":   self.kh2_list_any_sum([donald_limit, form_list, summons, {ItemName.ReflectElement}], state) >= 4,
+            "normal": self.kh2_list_any_sum([donald_limit, form_list, summons, {ItemName.ReflectElement}], state) >= 3,
+            "hard":   self.kh2_list_any_sum([donald_limit, form_list, summons, {ItemName.ReflectElement}], state) >= 2,
+        }
+        return mcp_rules[self.fight_logic]
+
+    def get_data_larxene_rules(self, state: CollectionState) -> bool:
+        # easy: final 7,firaga,scom,both donald limits, Reflega,guard,2 gap closers,2 ground finishers,aerial dodge 3,glide 3
+        # normal:final 7,firaga, donald limit, Reflega ,guard,1 gap closers,1 ground finisher,aerial dodge 3,glide 3
+        # hard:final 5,fira, donald limit, reflect,gap closer,aerial dodge 2,glide 2
+        data_larxene_rules = {
+            "easy":   self.kh2_dict_count(easy_data_larxene, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "normal": self.kh2_dict_count(normal_data_larxene, state) and self.kh2_list_any_sum([gap_closer, ground_finisher, donald_limit], state) >= 3 and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "hard":   self.kh2_dict_count(hard_data_larxene, state) and self.kh2_list_any_sum([gap_closer, donald_limit], state) >= 2 and self.form_list_unlock(state, ItemName.FinalForm, 3, True),
+        }
+        return data_larxene_rules[self.fight_logic]
+
+    def get_prison_keeper_rules(self, state: CollectionState) -> bool:
+        # easy:defensive tool,drive form, party limit
+        # normal:two of those things
+        # hard:one of those things
+        prison_keeper_rules = {
+            "easy":   self.kh2_list_any_sum([defensive_tool, form_list, party_limit], state) >= 3,
+            "normal": self.kh2_list_any_sum([defensive_tool, form_list, party_limit], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool, form_list, party_limit], state) >= 1,
+        }
+        return prison_keeper_rules[self.fight_logic]
+
+    @staticmethod
+    def get_oogie_rules():
+        # fight is free
+        return True
+
+    def get_experiment_rules(self, state: CollectionState) -> bool:
+        # easy:drive form,defensive tool,summon,party limit
+        # normal:3 of those things
+        # hard 2 of those things
+        experiment_rules = {
+            "easy":   self.kh2_list_any_sum([form_list, defensive_tool, party_limit, summons], state) >= 4,
+            "normal": self.kh2_list_any_sum([form_list, defensive_tool, party_limit, summons], state) >= 3,
+            "hard":   self.kh2_list_any_sum([form_list, defensive_tool, party_limit, summons], state) >= 2,
+        }
+        return experiment_rules[self.fight_logic]
+
+    def get_data_vexen_rules(self, state: CollectionState) -> bool:
+        # easy: final 7,firaga,scom,both donald limits, Reflega,guard,2 gap closers,2 ground finishers,aerial dodge 3,glide 3,dodge roll 3,quick run 3
+        # normal:final 7,firaga, donald limit, Reflega,guard,1 gap closers,1 ground finisher,aerial dodge 3,glide 3,dodge roll 3,quick run 3
+        # hard:final 5,fira, donald limit, reflect,gap closer,aerial dodge 2,glide 2,dodge roll 2,quick run 2
+        data_vexen_rules = {
+            "easy":   self.kh2_dict_count(easy_data_vexen, state) and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "normal": self.kh2_dict_count(normal_data_vexen, state) and self.kh2_list_any_sum([gap_closer, ground_finisher, donald_limit], state) >= 3 and self.form_list_unlock(state, ItemName.FinalForm, 5, True),
+            "hard":   self.kh2_dict_count(hard_data_vexen, state) and self.kh2_list_any_sum([gap_closer, donald_limit], state) >= 2 and self.form_list_unlock(state, ItemName.FinalForm, 3, True),
+        }
+        return data_vexen_rules[self.fight_logic]
+
+    def get_demyx_rules(self, state: CollectionState) -> bool:
+        # defensive option,drive form,party limit
+        # defensive option,drive form
+        # defensive option
+        demyx_rules = {
+            "easy":   self.kh2_list_any_sum([defensive_tool, form_list, party_limit], state) >= 3,
+            "normal": self.kh2_list_any_sum([defensive_tool, form_list], state) >= 2,
+            "hard":   self.kh2_list_any_sum([defensive_tool], state) >= 1,
+        }
+        return demyx_rules[self.fight_logic]
+
+    def get_thousand_heartless_rules(self, state: CollectionState) -> bool:
+        # easy:scom,limit form,guard,magnera
+        # normal:limit form, guard
+        # hard:guard
+        thousand_heartless_rules = {
+            "easy":   self.kh2_dict_count(easy_thousand_heartless_rules, state),
+            "normal": self.kh2_dict_count(normal_thousand_heartless_rules, state),
+            "hard":   state.has(ItemName.Guard, self.player),
+        }
+        return thousand_heartless_rules[self.fight_logic]
+
+    def get_data_demyx_rules(self, state: CollectionState) -> bool:
+        # easy:wisdom 7,1 form boosts,reflera,firaga,duck flare,guard,scom,finishing plus
+        # normal:remove form boost and scom
+        # hard:wisdom 6,reflect,guard,duck flare,fira,finishing plus
+        data_demyx_rules = {
+            "easy":   self.kh2_dict_count(easy_data_demyx, state) and self.form_list_unlock(state, ItemName.WisdomForm, 5, True),
+            "normal": self.kh2_dict_count(normal_data_demyx, state) and self.form_list_unlock(state, ItemName.WisdomForm, 5, True),
+            "hard":   self.kh2_dict_count(hard_data_demyx, state) and self.form_list_unlock(state, ItemName.WisdomForm, 4, True),
+        }
+        return data_demyx_rules[self.fight_logic]
+
+    def get_sephiroth_rules(self, state: CollectionState) -> bool:
+        # easy:both gap closers,limit 5,reflega,guard,both 2 ground finishers,3 dodge roll,finishing plus,scom
+        # normal:both gap closers,limit 5,reflera,guard,both 2 ground finishers,3 dodge roll,finishing plus
+        # hard:1 gap closers,reflect, guard,both 1 ground finisher,2 dodge roll,finishing plus
+        sephiroth_rules = {
+            "easy":   self.kh2_dict_count(easy_sephiroth_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit], state) >= 1,
+            "normal": self.kh2_dict_count(normal_sephiroth_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+            "hard":   self.kh2_dict_count(hard_sephiroth_tools, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2,
+        }
+        return sephiroth_rules[self.fight_logic]
+
+    def get_cor_first_fight_movement_rules(self, state: CollectionState) -> bool:
+        # easy: quick run 3 or wisdom 5 (wisdom has qr 3)
+        # normal: quick run 2 and aerial dodge 1 or wisdom 5 (wisdom has qr 3)
+        # hard: (quick run 1, aerial dodge 1) or (wisdom form and aerial dodge 1)
+        cor_first_fight_movement_rules = {
+            "easy":   state.has(ItemName.QuickRun, self.player, 3) or self.form_list_unlock(state, ItemName.WisdomForm, 3, True),
+            "normal": self.kh2_dict_count({ItemName.QuickRun: 2, ItemName.AerialDodge: 1}, state) or self.form_list_unlock(state, ItemName.WisdomForm, 3, True),
+            "hard":   self.kh2_has_all([ItemName.AerialDodge, ItemName.QuickRun], state) or self.kh2_has_all([ItemName.AerialDodge, ItemName.WisdomForm], state),
+        }
+        return cor_first_fight_movement_rules[self.fight_logic]
+
+    def get_cor_first_fight_rules(self, state: CollectionState) -> bool:
+        # easy:have 5 of these things (reflega,stitch and chicken,final form,magnera,explosion,thundara)
+        # normal:have 3 of these things (reflega,stitch and chicken,final form,magnera,explosion,thundara)
+        # hard: reflect,stitch or chicken,final form
+        cor_first_fight_rules = {
+            "easy":   self.kh2_dict_one_count(not_hard_cor_tools_dict, state) >= 5 or self.kh2_dict_one_count(not_hard_cor_tools_dict, state) >= 4 and self.form_list_unlock(state, ItemName.FinalForm, 1, True),
+            "normal": self.kh2_dict_one_count(not_hard_cor_tools_dict, state) >= 3 or self.kh2_dict_one_count(not_hard_cor_tools_dict, state) >= 2 and self.form_list_unlock(state, ItemName.FinalForm, 1, True),
+            "hard":   state.has(ItemName.ReflectElement, self.player) and self.kh2_has_any([ItemName.Stitch, ItemName.ChickenLittle], state) and self.form_list_unlock(state, ItemName.FinalForm, 1, True),
+        }
+        return cor_first_fight_rules[self.fight_logic]
+
+    def get_cor_skip_first_rules(self, state: CollectionState) -> bool:
+        # if option is not allow skips return false else run rules
+        if not self.multiworld.CorSkipToggle[self.player]:
+            return False
+        # easy: aerial dodge 3,master form,fire
+        # normal: aerial dodge 2, master form,fire
+        # hard:void cross(quick run 3,aerial dodge 1)
+        # or (quick run 2,aerial dodge 2 and magic)
+        # or (final form and (magic or combo master))
+        # or (master form and (reflect or fire or thunder or combo master)
+        # wall rise(aerial dodge 1 and (final form lvl 3 or glide 2) or (master form and (1 of black magic or combo master)
+        void_cross_rules = {
+            "easy":   state.has(ItemName.AerialDodge, self.player, 3) and self.kh2_has_all([ItemName.MasterForm, ItemName.FireElement], state),
+            "normal": state.has(ItemName.AerialDodge, self.player, 2) and self.kh2_has_all([ItemName.MasterForm, ItemName.FireElement], state),
+            "hard":   (self.kh2_dict_count({ItemName.QuickRun: 3, ItemName.AerialDodge: 1}, state)) \
+                      or (self.kh2_dict_count({ItemName.QuickRun: 2, ItemName.AerialDodge: 2}, state) and self.kh2_has_any(magic, state)) \
+                      or (state.has(ItemName.FinalForm, self.player) and (self.kh2_has_any(magic, state) or state.has(ItemName.ComboMaster, self.player))) \
+                      or (state.has(ItemName.MasterForm, self.player) and (self.kh2_has_any([ItemName.ReflectElement, ItemName.FireElement, ItemName.ComboMaster], state)))
+        }
+        wall_rise_rules = {
+            "easy":   True,
+            "normal": True,
+            "hard":   state.has(ItemName.AerialDodge, self.player) and (self.form_list_unlock(state, ItemName.FinalForm, 1, True) or state.has(ItemName.Glide, self.player, 2))
+        }
+        return void_cross_rules[self.fight_logic] and wall_rise_rules[self.fight_logic]
+
+    def get_cor_second_fight_movement_rules(self, state: CollectionState) -> bool:
+        # easy: quick run 2, aerial dodge 3 or master form 5
+        # normal: quick run 2, aerial dodge 2 or master 5
+        # hard: (glide 1,aerial dodge 1 any magic) or (master 3 any magic) or glide 1 and aerial dodge 2
+
+        cor_second_fight_movement_rules = {
+            "easy":   self.kh2_dict_count({ItemName.QuickRun: 2, ItemName.AerialDodge: 3}, state) or self.form_list_unlock(state, ItemName.MasterForm, 3, True),
+            "normal": self.kh2_dict_count({ItemName.QuickRun: 2, ItemName.AerialDodge: 2}, state) or self.form_list_unlock(state, ItemName.MasterForm, 3, True),
+            "hard":   (self.kh2_has_all([ItemName.Glide, ItemName.AerialDodge], state) and self.kh2_has_any(magic, state)) \
+                      or (state.has(ItemName.MasterForm, self.player) and self.kh2_has_any(magic, state)) \
+                      or (state.has(ItemName.Glide, self.player) and state.has(ItemName.AerialDodge, self.player, 2)),
+        }
+        return cor_second_fight_movement_rules[self.fight_logic]
+
+    def get_transport_fight_rules(self, state: CollectionState) -> bool:
+        # easy: reflega,stitch and chicken,final form,magnera,explosion,finishing leap,thundaga,2 donald limits
+        # normal: 7 of those things
+        # hard: 5 of those things
+        transport_fight_rules = {
+            "easy":   self.kh2_dict_count(transport_tools_dict, state),
+            "normal": self.kh2_dict_one_count(transport_tools_dict, state) >= 7,
+            "hard":   self.kh2_dict_one_count(transport_tools_dict, state) >= 5,
+        }
+        return transport_fight_rules[self.fight_logic]
+
+    def get_transport_movement_rules(self, state: CollectionState) -> bool:
+        # easy:high jump 3,aerial dodge 3,glide 3
+        # normal: high jump 2,glide 3,aerial dodge 2
+        # hard: (hj 2,glide 2,ad 1,any magic) or hj 1,glide 2,ad 3 any magic or (any magic master form,ad) or hj lvl 1,glide 3,ad 1
+        transport_movement_rules = {
+            "easy":   self.kh2_dict_count({ItemName.HighJump: 3, ItemName.AerialDodge: 3, ItemName.Glide: 3}, state),
+            "normal": self.kh2_dict_count({ItemName.HighJump: 2, ItemName.AerialDodge: 2, ItemName.Glide: 3}, state),
+            "hard":   (self.kh2_dict_count({ItemName.HighJump: 2, ItemName.AerialDodge: 1, ItemName.Glide: 2}, state) and self.kh2_has_any(magic, state)) \
+                      or (self.kh2_dict_count({ItemName.HighJump: 1, ItemName.Glide: 2, ItemName.AerialDodge: 3}, state) and self.kh2_has_any(magic, state)) \
+                      or (self.kh2_dict_count({ItemName.HighJump: 1, ItemName.Glide: 3, ItemName.AerialDodge: 1}, state)) \
+                      or (self.kh2_has_all([ItemName.MasterForm, ItemName.AerialDodge], state) and self.kh2_has_any(magic, state)),
+        }
+        return transport_movement_rules[self.fight_logic]
+
+    def get_scar_rules(self, state: CollectionState) -> bool:
+        # easy: reflect,thunder,fire
+        # normal:reflect,fire
+        # hard:reflect
+        scar_rules = {
+            "easy":   self.kh2_has_all([ItemName.ReflectElement, ItemName.ThunderElement, ItemName.FireElement], state),
+            "normal": self.kh2_has_all([ItemName.ReflectElement, ItemName.FireElement], state),
+            "hard":   state.has(ItemName.ReflectElement, self.player),
+        }
+        return scar_rules[self.fight_logic]
+
+    def get_groundshaker_rules(self, state: CollectionState) -> bool:
+        # easy:berserk charge,cure,2 air combo plus,reflect
+        # normal:berserk charge,reflect,cure
+        # hard:berserk charge or 2 air combo plus. reflect
+        groundshaker_rules = {
+            "easy":   state.has(ItemName.AirComboPlus, self.player, 2) and self.kh2_has_all([ItemName.BerserkCharge, ItemName.CureElement, ItemName.ReflectElement], state),
+            "normal": self.kh2_has_all([ItemName.BerserkCharge, ItemName.ReflectElement, ItemName.CureElement], state),
+            "hard":   (state.has(ItemName.BerserkCharge, self.player) or state.has(ItemName.AirComboPlus, self.player, 2)) and state.has(ItemName.ReflectElement, self.player),
+        }
+        return groundshaker_rules[self.fight_logic]
+
+    def get_data_saix_rules(self, state: CollectionState) -> bool:
+        # easy:guard,2 gap closers,thunder,blizzard,2 donald limit,reflega,2 ground finisher,aerial dodge 3,glide 3,final 7,firaga,scom
+        # normal:guard,1 gap closers,thunder,blizzard,1 donald limit,reflega,1 ground finisher,aerial dodge 3,glide 3,final 7,firaga
+        # hard:aerial dodge 3,glide 3,guard,reflect,blizzard,1 gap closer,1 ground finisher
+        easy_data_rules = {
+            "easy":   self.kh2_dict_count(easy_data_saix, state) and self.form_list_unlock(state, ItemName.FinalForm, 5),
+            "normal": self.kh2_dict_count(normal_data_saix, state) and self.kh2_list_any_sum([gap_closer, ground_finisher, donald_limit], state) >= 3 and self.form_list_unlock(state, ItemName.FinalForm, 5),
+            "hard":   self.kh2_dict_count(hard_data_saix, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2
+        }
+        return easy_data_rules[self.fight_logic]
+
+    @staticmethod
+    def get_twilight_thorn_rules() -> bool:
+        return True
+
+    @staticmethod
+    def get_axel_one_rules() -> bool:
+        return True
+
+    @staticmethod
+    def get_axel_two_rules() -> bool:
+        return True
+
+    def get_data_roxas_rules(self, state: CollectionState) -> bool:
+        # easy:both gap closers,limit 5,reflega,guard,both 2 ground finishers,3 dodge roll,finishing plus,scom
+        # normal:both gap closers,limit 5,reflera,guard,both 2 ground finishers,3 dodge roll,finishing plus
+        # hard:1 gap closers,reflect, guard,both 1 ground finisher,2 dodge roll,finishing plus
+        data_roxas_rules = {
+            "easy":   self.kh2_dict_count(easy_data_roxas_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit], state) >= 1,
+            "normal": self.kh2_dict_count(normal_data_roxas_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+            "hard":   self.kh2_dict_count(hard_data_roxas_tools, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2
+        }
+        return data_roxas_rules[self.fight_logic]
+
+    def get_data_axel_rules(self, state: CollectionState) -> bool:
+        # easy:both gap closers,limit 5,reflega,guard,both 2 ground finishers,3 dodge roll,finishing plus,scom,blizzaga
+        # normal:both gap closers,limit 5,reflera,guard,both 2 ground finishers,3 dodge roll,finishing plus,blizzaga
+        # hard:1 gap closers,reflect, guard,both 1 ground finisher,2 dodge roll,finishing plus,blizzara
+        data_axel_rules = {
+            "easy":   self.kh2_dict_count(easy_data_axel_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit], state) >= 1,
+            "normal": self.kh2_dict_count(normal_data_axel_tools, state) and self.kh2_can_reach(LocationName.Limitlvl5, state) and self.kh2_list_any_sum([donald_limit, gap_closer], state) >= 2,
+            "hard":   self.kh2_dict_count(hard_data_axel_tools, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2
+        }
+        return data_axel_rules[self.fight_logic]
+
+    def get_roxas_rules(self, state: CollectionState) -> bool:
+        # easy:aerial dodge 1,glide 1, limit form,thunder,reflera,guard break,2 gap closers,finishing plus,blizzard
+        # normal:thunder,reflera,guard break,2 gap closers,finishing plus,blizzard
+        # hard:guard
+        roxas_rules = {
+            "easy":   self.kh2_dict_count(easy_roxas_tools, state),
+            "normal": self.kh2_dict_count(normal_roxas_tools, state),
+            "hard":   state.has(ItemName.Guard, self.player),
+        }
+        return roxas_rules[self.fight_logic]
+
+    def get_xigbar_rules(self, state: CollectionState) -> bool:
+        # easy:final 4,horizontal slash,fira,finishing plus,glide 2,aerial dodge 2,quick run 2,guard,reflect
+        # normal:final 4,fira,finishing plus,glide 2,aerial dodge 2,quick run 2,guard,reflect
+        # hard:guard,quick run,finishing plus
+        xigbar_rules = {
+            "easy":   self.kh2_dict_count(easy_xigbar_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 1) and self.kh2_has_any([ItemName.LightDarkness, ItemName.FinalForm], state),
+            "normal": self.kh2_dict_count(normal_xigbar_tools, state) and self.form_list_unlock(state, ItemName.FinalForm, 1),
+            "hard":   self.kh2_has_all([ItemName.Guard, ItemName.QuickRun, ItemName.FinishingPlus], state),
+        }
+        return xigbar_rules[self.fight_logic]
+
+    def get_luxord_rules(self, state: CollectionState) -> bool:
+        # easy:aerial dodge 1,glide 1,quickrun 2,guard,reflera,2 gap closers,ground finisher,limit form
+        # normal:aerial dodge 1,glide 1,quickrun 2,guard,reflera,1 gap closers,ground finisher
+        # hard:quick run,guard
+        luxord_rules = {
+            "easy":   self.kh2_dict_count(easy_luxord_tools, state) and self.kh2_has_any(ground_finisher, state),
+            "normal": self.kh2_dict_count(normal_luxord_tools, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2,
+            "hard":   self.kh2_has_all([ItemName.Guard, ItemName.QuickRun], state)
+        }
+        return luxord_rules[self.fight_logic]
+
+    def get_saix_rules(self, state: CollectionState) -> bool:
+        # easy:aerial dodge 1,glide 1,quickrun 2,guard,reflera,2 gap closers,ground finisher,limit form
+        # normal:aerial dodge 1,glide 1,quickrun 2,guard,reflera,1 gap closers,ground finisher
+        # hard:,guard
+
+        saix_rules = {
+            "easy":   self.kh2_dict_count(easy_saix_tools, state) and self.kh2_has_any(ground_finisher, state),
+            "normal": self.kh2_dict_count(normal_saix_tools, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2,
+            "hard":   self.kh2_has_all([ItemName.Guard], state)
+        }
+        return saix_rules[self.fight_logic]
+
+    def get_xemnas_rules(self, state: CollectionState) -> bool:
+        # easy:aerial dodge 1,glide 1,quickrun 2,guard,reflera,2 gap closers,ground finisher,limit form
+        # normal:aerial dodge 1,glide 1,quickrun 2,guard,reflera,1 gap closers,ground finisher
+        # hard:,guard
+        xemnas_rules = {
+            "easy":   self.kh2_dict_count(easy_xemnas_tools, state) and self.kh2_has_any(ground_finisher, state),
+            "normal": self.kh2_dict_count(normal_xemnas_tools, state) and self.kh2_list_any_sum([gap_closer, ground_finisher], state) >= 2,
+            "hard":   self.kh2_has_all([ItemName.Guard], state)
+        }
+        return xemnas_rules[self.fight_logic]
+
+    def get_armored_xemnas_one_rules(self, state: CollectionState) -> bool:
+        # easy:donald limit,reflect,1 gap closer,ground finisher
+        # normal:reflect,gap closer,ground finisher
+        # hard:reflect
+        armored_xemnas_one_rules = {
+            "easy":   self.kh2_list_any_sum([donald_limit, gap_closer, ground_finisher, {ItemName.ReflectElement}], state) >= 4,
+            "normal": self.kh2_list_any_sum([gap_closer, ground_finisher, {ItemName.ReflectElement}], state) >= 3,
+            "hard":   state.has(ItemName.ReflectElement, self.player),
+        }
+        return armored_xemnas_one_rules[self.fight_logic]
+
+    def get_armored_xemnas_two_rules(self, state: CollectionState) -> bool:
+        # easy:donald limit,reflect,1 gap closer,ground finisher
+        # normal:reflect,gap closer,ground finisher
+        # hard:reflect
+        armored_xemnas_two_rules = {
+            "easy":   self.kh2_list_any_sum([gap_closer, ground_finisher, {ItemName.ReflectElement}, {ItemName.ThunderElement}], state) >= 4,
+            "normal": self.kh2_list_any_sum([gap_closer, ground_finisher, {ItemName.ReflectElement}], state) >= 3,
+            "hard":   state.has(ItemName.ReflectElement, self.player),
+        }
+        return armored_xemnas_two_rules[self.fight_logic]
+
+    def get_final_xemnas_rules(self, state: CollectionState) -> bool:
+        # easy:reflera,limit form,finishing plus,gap closer,guard
+        # normal:reflect,finishing plus,guard
+        # hard:guard
+        final_xemnas_rules = {
+            "easy":   self.kh2_has_all([ItemName.LimitForm, ItemName.FinishingPlus, ItemName.Guard], state) and state.has(ItemName.ReflectElement, self.player, 2) and self.kh2_has_any(gap_closer, state),
+            "normal": self.kh2_has_all([ItemName.ReflectElement, ItemName.FinishingPlus, ItemName.Guard], state),
+            "hard":   state.has(ItemName.Guard, self.player),
+        }
+        return final_xemnas_rules[self.fight_logic]
+
+    def get_data_xemnas_rules(self, state: CollectionState) -> bool:
+        # easy:combo master,slapshot,reflega,2 ground finishers,both gap closers,finishing plus,guard,limit 5,scom,trinity limit
+        # normal:combo master,slapshot,reflega,2 ground finishers,both gap closers,finishing plus,guard,limit 5,
+        # hard:combo master,slapshot,reflera,1 ground finishers,1 gap closers,finishing plus,guard,limit form
+        data_xemnas_rules = {
+            "easy":   self.kh2_dict_count(easy_data_xemnas, state) and self.kh2_list_count_sum(ground_finisher, state) >= 2 and self.kh2_can_reach(LocationName.Limitlvl5, state),
+            "normal": self.kh2_dict_count(normal_data_xemnas, state) and self.kh2_list_count_sum(ground_finisher, state) >= 2 and self.kh2_can_reach(LocationName.Limitlvl5, state),
+            "hard":   self.kh2_dict_count(hard_data_xemnas, state) and self.kh2_list_any_sum([ground_finisher, gap_closer], state) >= 2
+        }
+        return data_xemnas_rules[self.fight_logic]
diff --git a/worlds/kh2/WorldLocations.py b/worlds/kh2/WorldLocations.py
index 172874c2b7..6df18fc800 100644
--- a/worlds/kh2/WorldLocations.py
+++ b/worlds/kh2/WorldLocations.py
@@ -96,6 +96,10 @@ DC_Checks = {
     LocationName.LingeringWillBonus:             WorldLocationData(0x370C, 6),
     LocationName.LingeringWillProofofConnection: WorldLocationData(0x370C, 6),
     LocationName.LingeringWillManifestIllusion:  WorldLocationData(0x370C, 6),
+
+    'Lingering Will Bonus: Sora Slot 1':         WorldLocationData(14092, 6),
+    'Lingering Will Proof of Connection':        WorldLocationData(14092, 6),
+    'Lingering Will Manifest Illusion':          WorldLocationData(14092, 6),
 }
 TR_Checks = {
     LocationName.CornerstoneHillMap:        WorldLocationData(0x23B2, 0),
@@ -226,6 +230,8 @@ BC_Checks = {
     LocationName.DonaldXaldinGetBonus:          WorldLocationData(0x3704, 4),
     LocationName.SecretAnsemReport4:            WorldLocationData(0x1D31, 2),
     LocationName.XaldinDataDefenseBoost:        WorldLocationData(0x1D34, 7),
+
+    'Data Xaldin':                              WorldLocationData(7476, 7),
 }
 SP_Checks = {
     LocationName.PitCellAreaMap:                    WorldLocationData(0x23CA, 2),
@@ -351,6 +357,7 @@ HB_Checks = {
     LocationName.RestorationSiteMoonRecipe:                    WorldLocationData(0x23C9, 3),
     LocationName.RestorationSiteAPBoost:                       WorldLocationData(0x23DB, 2),
     LocationName.DemyxHB:                                      WorldLocationData(0x3707, 4),
+    '(HB) Demyx Bonus: Donald Slot 1':                         WorldLocationData(14087, 4),
     LocationName.DemyxHBGetBonus:                              WorldLocationData(0x3707, 4),
     LocationName.DonaldDemyxHBGetBonus:                        WorldLocationData(0x3707, 4),
     LocationName.FFFightsCureElement:                          WorldLocationData(0x1D14, 6),
@@ -409,6 +416,25 @@ HB_Checks = {
     LocationName.VexenASRoadtoDiscovery:                       WorldLocationData(0x370C, 0),
     LocationName.VexenDataLostIllusion:                        WorldLocationData(0x370C, 0),  #
     LocationName.DemyxDataAPBoost:                             WorldLocationData(0x1D26, 5),
+
+    'Lexaeus Bonus: Sora Slot 1':                              WorldLocationData(14092, 1),
+    'AS Lexaeus':                                              WorldLocationData(14092, 1),
+    'Data Lexaeus':                                            WorldLocationData(14092, 1),
+    'Marluxia Bonus: Sora Slot 1':                             WorldLocationData(14092, 3),
+    'AS Marluxia':                                             WorldLocationData(14092, 3),
+    'Data Marluxia':                                           WorldLocationData(14092, 3),
+    'Zexion Bonus: Sora Slot 1':                               WorldLocationData(14092, 2),
+    'Zexion Bonus: Goofy Slot 1':                              WorldLocationData(14092, 2),
+    'AS Zexion':                                               WorldLocationData(14092, 2),
+    'Data Zexion':                                             WorldLocationData(14092, 2),
+    'Larxene Bonus: Sora Slot 1':                              WorldLocationData(14092, 4),
+    'AS Larxene':                                              WorldLocationData(14092, 4),
+    'Data Larxene':                                            WorldLocationData(14092, 4),
+    'Vexen Bonus: Sora Slot 1':                                WorldLocationData(14092, 0),
+    'AS Vexen':                                                WorldLocationData(14092, 0),
+    'Data Vexen':                                              WorldLocationData(14092, 0),
+    'Data Demyx':                                              WorldLocationData(7462, 5),
+
     LocationName.GardenofAssemblageMap:                        WorldLocationData(0x23DF, 1),
     LocationName.GoALostIllusion:                              WorldLocationData(0x23DF, 2),
     LocationName.ProofofNonexistence:                          WorldLocationData(0x23DF, 3),
@@ -549,50 +575,97 @@ TT_Checks = {
     LocationName.BetwixtandBetween:                     WorldLocationData(0x370B, 7),
     LocationName.BetwixtandBetweenBondofFlame:          WorldLocationData(0x1CE9, 1),
     LocationName.AxelDataMagicBoost:                    WorldLocationData(0x1CEB, 4),
+
+    'Data Axel':                                        WorldLocationData(7403, 4),
 }
 TWTNW_Checks = {
-    LocationName.FragmentCrossingMythrilStone:          WorldLocationData(0x23CB, 4),
-    LocationName.FragmentCrossingMythrilCrystal:        WorldLocationData(0x23CB, 5),
-    LocationName.FragmentCrossingAPBoost:               WorldLocationData(0x23CB, 6),
-    LocationName.FragmentCrossingOrichalcum:            WorldLocationData(0x23CB, 7),
-    LocationName.Roxas:                                 WorldLocationData(0x370C, 5),
-    LocationName.RoxasGetBonus:                         WorldLocationData(0x370C, 5),
-    LocationName.RoxasSecretAnsemReport8:               WorldLocationData(0x1ED1, 1),
-    LocationName.TwoBecomeOne:                          WorldLocationData(0x1ED1, 1),
-    LocationName.MemorysSkyscaperMythrilCrystal:        WorldLocationData(0x23CD, 3),
-    LocationName.MemorysSkyscaperAPBoost:               WorldLocationData(0x23DC, 0),
-    LocationName.MemorysSkyscaperMythrilStone:          WorldLocationData(0x23DC, 1),
-    LocationName.TheBrinkofDespairDarkCityMap:          WorldLocationData(0x23CA, 5),
-    LocationName.TheBrinkofDespairOrichalcumPlus:       WorldLocationData(0x23DA, 2),
-    LocationName.NothingsCallMythrilGem:                WorldLocationData(0x23CC, 0),
-    LocationName.NothingsCallOrichalcum:                WorldLocationData(0x23CC, 1),
-    LocationName.TwilightsViewCosmicBelt:               WorldLocationData(0x23CA, 6),
-    LocationName.XigbarBonus:                           WorldLocationData(0x3706, 7),
-    LocationName.XigbarSecretAnsemReport3:              WorldLocationData(0x1ED2, 2),
-    LocationName.NaughtsSkywayMythrilGem:               WorldLocationData(0x23CC, 2),
-    LocationName.NaughtsSkywayOrichalcum:               WorldLocationData(0x23CC, 3),
-    LocationName.NaughtsSkywayMythrilCrystal:           WorldLocationData(0x23CC, 4),
-    LocationName.Oblivion:                              WorldLocationData(0x1ED2, 4),
-    LocationName.CastleThatNeverWasMap:                 WorldLocationData(0x1ED2, 4),
-    LocationName.Luxord:                                WorldLocationData(0x3707, 0),
-    LocationName.LuxordGetBonus:                        WorldLocationData(0x3707, 0),
-    LocationName.LuxordSecretAnsemReport9:              WorldLocationData(0x1ED2, 7),
-    LocationName.SaixBonus:                             WorldLocationData(0x3707, 1),
-    LocationName.SaixSecretAnsemReport12:               WorldLocationData(0x1ED3, 2),
-    LocationName.PreXemnas1SecretAnsemReport11:         WorldLocationData(0x1ED3, 6),
-    LocationName.RuinandCreationsPassageMythrilStone:   WorldLocationData(0x23CC, 7),
-    LocationName.RuinandCreationsPassageAPBoost:        WorldLocationData(0x23CD, 0),
-    LocationName.RuinandCreationsPassageMythrilCrystal: WorldLocationData(0x23CD, 1),
-    LocationName.RuinandCreationsPassageOrichalcum:     WorldLocationData(0x23CD, 2),
-    LocationName.Xemnas1:                               WorldLocationData(0x3707, 2),
-    LocationName.Xemnas1GetBonus:                       WorldLocationData(0x3707, 2),
-    LocationName.Xemnas1SecretAnsemReport13:            WorldLocationData(0x1ED4, 5),
-    LocationName.FinalXemnas:                           WorldLocationData(0x1ED8, 1),
-    LocationName.XemnasDataPowerBoost:                  WorldLocationData(0x1EDA, 2),
-    LocationName.XigbarDataDefenseBoost:                WorldLocationData(0x1ED9, 7),
-    LocationName.SaixDataDefenseBoost:                  WorldLocationData(0x1EDA, 0),
-    LocationName.LuxordDataAPBoost:                     WorldLocationData(0x1EDA, 1),
-    LocationName.RoxasDataMagicBoost:                   WorldLocationData(0x1ED9, 6),
+    LocationName.FragmentCrossingMythrilStone:             WorldLocationData(0x23CB, 4),
+    LocationName.FragmentCrossingMythrilCrystal:           WorldLocationData(0x23CB, 5),
+    LocationName.FragmentCrossingAPBoost:                  WorldLocationData(0x23CB, 6),
+    LocationName.FragmentCrossingOrichalcum:               WorldLocationData(0x23CB, 7),
+    LocationName.Roxas:                                    WorldLocationData(0x370C, 5),
+    LocationName.RoxasGetBonus:                            WorldLocationData(0x370C, 5),
+    LocationName.RoxasSecretAnsemReport8:                  WorldLocationData(0x1ED1, 1),
+    LocationName.TwoBecomeOne:                             WorldLocationData(0x1ED1, 1),
+    LocationName.MemorysSkyscaperMythrilCrystal:           WorldLocationData(0x23CD, 3),
+    LocationName.MemorysSkyscaperAPBoost:                  WorldLocationData(0x23DC, 0),
+    LocationName.MemorysSkyscaperMythrilStone:             WorldLocationData(0x23DC, 1),
+    LocationName.TheBrinkofDespairDarkCityMap:             WorldLocationData(0x23CA, 5),
+    LocationName.TheBrinkofDespairOrichalcumPlus:          WorldLocationData(0x23DA, 2),
+    LocationName.NothingsCallMythrilGem:                   WorldLocationData(0x23CC, 0),
+    LocationName.NothingsCallOrichalcum:                   WorldLocationData(0x23CC, 1),
+    LocationName.TwilightsViewCosmicBelt:                  WorldLocationData(0x23CA, 6),
+    LocationName.XigbarBonus:                              WorldLocationData(0x3706, 7),
+    LocationName.XigbarSecretAnsemReport3:                 WorldLocationData(0x1ED2, 2),
+    LocationName.NaughtsSkywayMythrilGem:                  WorldLocationData(0x23CC, 2),
+    LocationName.NaughtsSkywayOrichalcum:                  WorldLocationData(0x23CC, 3),
+    LocationName.NaughtsSkywayMythrilCrystal:              WorldLocationData(0x23CC, 4),
+    LocationName.Oblivion:                                 WorldLocationData(0x1ED2, 4),
+    LocationName.CastleThatNeverWasMap:                    WorldLocationData(0x1ED2, 4),
+    LocationName.Luxord:                                   WorldLocationData(0x3707, 0),
+    LocationName.LuxordGetBonus:                           WorldLocationData(0x3707, 0),
+    LocationName.LuxordSecretAnsemReport9:                 WorldLocationData(0x1ED2, 7),
+    LocationName.SaixBonus:                                WorldLocationData(0x3707, 1),
+    LocationName.SaixSecretAnsemReport12:                  WorldLocationData(0x1ED3, 2),
+    LocationName.PreXemnas1SecretAnsemReport11:            WorldLocationData(0x1ED3, 6),
+    LocationName.RuinandCreationsPassageMythrilStone:      WorldLocationData(0x23CC, 7),
+    LocationName.RuinandCreationsPassageAPBoost:           WorldLocationData(0x23CD, 0),
+    LocationName.RuinandCreationsPassageMythrilCrystal:    WorldLocationData(0x23CD, 1),
+    LocationName.RuinandCreationsPassageOrichalcum:        WorldLocationData(0x23CD, 2),
+    LocationName.Xemnas1:                                  WorldLocationData(0x3707, 2),
+    LocationName.Xemnas1GetBonus:                          WorldLocationData(0x3707, 2),
+    LocationName.Xemnas1SecretAnsemReport13:               WorldLocationData(0x1ED4, 5),
+    LocationName.FinalXemnas:                              WorldLocationData(0x1ED8, 1),
+    LocationName.XemnasDataPowerBoost:                     WorldLocationData(0x1EDA, 2),
+    LocationName.XigbarDataDefenseBoost:                   WorldLocationData(0x1ED9, 7),
+    LocationName.SaixDataDefenseBoost:                     WorldLocationData(0x1EDA, 0),
+    LocationName.LuxordDataAPBoost:                        WorldLocationData(0x1EDA, 1),
+    LocationName.RoxasDataMagicBoost:                      WorldLocationData(0x1ED9, 6),
+
+    "(TWTNW) Roxas Bonus: Sora Slot 1":                    WorldLocationData(14092, 5),
+    "(TWTNW) Roxas Bonus: Sora Slot 2":                    WorldLocationData(14092, 5),
+    "(TWTNW) Roxas Secret Ansem Report 8":                 WorldLocationData(7889, 1),
+    "(TWTNW) Two Become One":                              WorldLocationData(7889, 1),
+    "(TWTNW) Memory's Skyscaper Mythril Crystal":          WorldLocationData(9165, 3),
+    "(TWTNW) Memory's Skyscaper AP Boost":                 WorldLocationData(9180, 0),
+    "(TWTNW) Memory's Skyscaper Mythril Stone":            WorldLocationData(9180, 1),
+    "(TWTNW) The Brink of Despair Dark City Map":          WorldLocationData(9162, 5),
+    "(TWTNW) The Brink of Despair Orichalcum+":            WorldLocationData(9178, 2),
+    "(TWTNW) Nothing's Call Mythril Gem":                  WorldLocationData(9164, 0),
+    "(TWTNW) Nothing's Call Orichalcum":                   WorldLocationData(9164, 1),
+    "(TWTNW) Twilight's View Cosmic Belt":                 WorldLocationData(9162, 6),
+    "(TWTNW) Xigbar Bonus: Sora Slot 1":                   WorldLocationData(14086, 7),
+    "(TWTNW) Xigbar Secret Ansem Report 3":                WorldLocationData(7890, 2),
+    "(TWTNW) Naught's Skyway Mythril Gem":                 WorldLocationData(9164, 2),
+    "(TWTNW) Naught's Skyway Orichalcum":                  WorldLocationData(9164, 3),
+    "(TWTNW) Naught's Skyway Mythril Crystal":             WorldLocationData(9164, 4),
+    "(TWTNW) Oblivion":                                    WorldLocationData(7890, 4),
+    "(TWTNW) Castle That Never Was Map":                   WorldLocationData(7890, 4),
+    "(TWTNW) Luxord":                                      WorldLocationData(14087, 0),
+    "(TWTNW) Luxord Bonus: Sora Slot 1":                   WorldLocationData(14087, 0),
+    "(TWTNW) Luxord Secret Ansem Report 9":                WorldLocationData(7890, 7),
+    "(TWTNW) Saix Bonus: Sora Slot 1":                     WorldLocationData(14087, 1),
+    "(TWTNW) Saix Secret Ansem Report 12":                 WorldLocationData(7891, 2),
+    "(TWTNW) Secret Ansem Report 11 (Pre-Xemnas 1)":       WorldLocationData(7891, 6),
+    "(TWTNW) Ruin and Creation's Passage Mythril Stone":   WorldLocationData(9164, 7),
+    "(TWTNW) Ruin and Creation's Passage AP Boost":        WorldLocationData(9165, 0),
+    "(TWTNW) Ruin and Creation's Passage Mythril Crystal": WorldLocationData(9165, 1),
+    "(TWTNW) Ruin and Creation's Passage Orichalcum":      WorldLocationData(9165, 2),
+    "(TWTNW) Xemnas 1 Bonus: Sora Slot 1":                 WorldLocationData(14087, 2),
+    "(TWTNW) Xemnas 1 Bonus: Sora Slot 2":                 WorldLocationData(14087, 2),
+    "(TWTNW) Xemnas 1 Secret Ansem Report 13":             WorldLocationData(7892, 5),
+    "Data Xemnas":                                         WorldLocationData(7898, 2),
+    "Data Xigbar":                                         WorldLocationData(7897, 7),
+    "Data Saix":                                           WorldLocationData(7898, 0),
+    "Data Luxord":                                         WorldLocationData(7898, 1),
+    "Data Roxas":                                          WorldLocationData(7897, 6),
+
+}
+Atlantica_Checks = {
+    LocationName.UnderseaKingdomMap:     WorldLocationData(0x1DF4, 2),
+    LocationName.MysteriousAbyss:        WorldLocationData(0x1DF5, 3),
+    LocationName.MusicalOrichalcumPlus:  WorldLocationData(0x1DF4, 1),
+    LocationName.MusicalBlizzardElement: WorldLocationData(0x1DF4, 1)
 }
 SoraLevels = {
     # LocationName.Lvl1:  WorldLocationData(0xFFFF,1),
@@ -743,6 +816,15 @@ FinalLevels = {
     LocationName.Finallvl6: WorldLocationData(0x33D6, 6),
     LocationName.Finallvl7: WorldLocationData(0x33D6, 7),
 
+}
+SummonLevels = {
+    LocationName.Summonlvl2: WorldLocationData(0x3526, 2),
+    LocationName.Summonlvl3: WorldLocationData(0x3526, 3),
+    LocationName.Summonlvl4: WorldLocationData(0x3526, 4),
+    LocationName.Summonlvl5: WorldLocationData(0x3526, 5),
+    LocationName.Summonlvl6: WorldLocationData(0x3526, 6),
+    LocationName.Summonlvl7: WorldLocationData(0x3526, 7),
+
 }
 weaponSlots = {
     LocationName.AdamantShield:       WorldLocationData(0x35E6, 1),
@@ -817,7 +899,6 @@ tornPageLocks = {
 all_world_locations = {
     **TWTNW_Checks,
     **TT_Checks,
-    **TT_Checks,
     **HB_Checks,
     **BC_Checks,
     **Oc_Checks,
@@ -828,11 +909,9 @@ all_world_locations = {
     **DC_Checks,
     **TR_Checks,
     **HT_Checks,
-    **HB_Checks,
     **PR_Checks,
     **SP_Checks,
-    **TWTNW_Checks,
-    **HB_Checks,
+    **Atlantica_Checks,
 }
 
 levels_locations = {
diff --git a/worlds/kh2/__init__.py b/worlds/kh2/__init__.py
index 23075a2084..2bddbd5ec3 100644
--- a/worlds/kh2/__init__.py
+++ b/worlds/kh2/__init__.py
@@ -1,15 +1,25 @@
-from BaseClasses import Tutorial, ItemClassification
 import logging
+from typing import List
 
+from BaseClasses import Tutorial, ItemClassification
+from Fill import fill_restrictive
+from worlds.LauncherComponents import Component, components, Type, launch_subprocess
+from worlds.AutoWorld import World, WebWorld
 from .Items import *
-from .Locations import all_locations, setup_locations, exclusion_table, AllWeaponSlot
-from .Names import ItemName, LocationName
+from .Locations import *
+from .Names import ItemName, LocationName, RegionName
 from .OpenKH import patch_kh2
-from .Options import KH2_Options
+from .Options import KingdomHearts2Options
 from .Regions import create_regions, connect_regions
-from .Rules import set_rules
-from ..AutoWorld import World, WebWorld
-from .logic import KH2Logic
+from .Rules import *
+
+
+def launch_client():
+    from .Client import launch
+    launch_subprocess(launch, name="KH2Client")
+
+
+components.append(Component("KH2 Client", "KH2Client", func=launch_client, component_type=Type.CLIENT))
 
 
 class KingdomHearts2Web(WebWorld):
@@ -23,99 +33,123 @@ class KingdomHearts2Web(WebWorld):
     )]
 
 
-# noinspection PyUnresolvedReferences
 class KH2World(World):
     """
     Kingdom Hearts II is an action role-playing game developed and published by Square Enix and released in 2005.
     It is the sequel to Kingdom Hearts and Kingdom Hearts: Chain of Memories, and like the two previous games,
     focuses on Sora and his friends' continued battle against the Darkness.
     """
-    game: str = "Kingdom Hearts 2"
+    game = "Kingdom Hearts 2"
     web = KingdomHearts2Web()
-    data_version = 1
-    required_client_version = (0, 4, 0)
-    option_definitions = KH2_Options
-    item_name_to_id = {name: data.code for name, data in item_dictionary_table.items()}
-    location_name_to_id = {item_name: data.code for item_name, data in all_locations.items() if data.code}
+
+    required_client_version = (0, 4, 4)
+    options_dataclass = KingdomHearts2Options
+    options: KingdomHearts2Options
+    item_name_to_id = {item: item_id
+                       for item_id, item in enumerate(item_dictionary_table.keys(), 0x130000)}
+    location_name_to_id = {item: location
+                           for location, item in enumerate(all_locations.keys(), 0x130000)}
     item_name_groups = item_groups
 
+    visitlocking_dict: Dict[str, int]
+    plando_locations: Dict[str, str]
+    lucky_emblem_amount: int
+    lucky_emblem_required: int
+    bounties_required: int
+    bounties_amount: int
+    filler_items: List[str]
+    item_quantity_dict: Dict[str, int]
+    local_items: Dict[int, int]
+    sora_ability_dict: Dict[str, int]
+    goofy_ability_dict: Dict[str, int]
+    donald_ability_dict: Dict[str, int]
+    total_locations: int
+
+    # growth_list: list[str]
+
     def __init__(self, multiworld: "MultiWorld", player: int):
         super().__init__(multiworld, player)
-        self.valid_abilities = None
-        self.visitlocking_dict = None
-        self.plando_locations = None
-        self.luckyemblemamount = None
-        self.luckyemblemrequired = None
-        self.BountiesRequired = None
-        self.BountiesAmount = None
-        self.hitlist = None
-        self.LocalItems = {}
-        self.RandomSuperBoss = list()
-        self.filler_items = list()
-        self.item_quantity_dict = {}
-        self.donald_ability_pool = list()
-        self.goofy_ability_pool = list()
-        self.sora_keyblade_ability_pool = list()
-        self.keyblade_slot_copy = list(Locations.Keyblade_Slots.keys())
-        self.keyblade_slot_copy.remove(LocationName.KingdomKeySlot)
-        self.totalLocations = len(all_locations.items())
+        # random_super_boss_list List[str]
+        # has to be in __init__ or else other players affect each other's bounties
+        self.random_super_boss_list = list()
         self.growth_list = list()
-        for x in range(4):
-            self.growth_list.extend(Movement_Table.keys())
-        self.slotDataDuping = set()
-        self.localItems = dict()
+        # lists of KH2Item
+        self.keyblade_ability_pool = list()
+
+        self.goofy_get_bonus_abilities = list()
+        self.goofy_weapon_abilities = list()
+        self.donald_get_bonus_abilities = list()
+        self.donald_weapon_abilities = list()
+
+        self.slot_data_goofy_weapon = dict()
+        self.slot_data_sora_weapon = dict()
+        self.slot_data_donald_weapon = dict()
 
     def fill_slot_data(self) -> dict:
-        for values in CheckDupingItems.values():
-            if isinstance(values, set):
-                self.slotDataDuping = self.slotDataDuping.union(values)
-            else:
-                for inner_values in values.values():
-                    self.slotDataDuping = self.slotDataDuping.union(inner_values)
-        self.LocalItems = {location.address: item_dictionary_table[location.item.name].code
-                           for location in self.multiworld.get_filled_locations(self.player)
-                           if location.item.player == self.player
-                           and location.item.name in self.slotDataDuping
-                           and location.name not in AllWeaponSlot}
+        for ability in self.slot_data_sora_weapon:
+            if ability in self.sora_ability_dict and self.sora_ability_dict[ability] >= 1:
+                self.sora_ability_dict[ability] -= 1
+        self.donald_ability_dict = {k: v.quantity for k, v in DonaldAbility_Table.items()}
+        for ability in self.slot_data_donald_weapon:
+            if ability in self.donald_ability_dict and self.donald_ability_dict[ability] >= 1:
+                self.donald_ability_dict[ability] -= 1
+        self.goofy_ability_dict = {k: v.quantity for k, v in GoofyAbility_Table.items()}
+        for ability in self.slot_data_goofy_weapon:
+            if ability in self.goofy_ability_dict and self.goofy_ability_dict[ability] >= 1:
+                self.goofy_ability_dict[ability] -= 1
 
-        return {"hitlist":              self.hitlist,
-                "LocalItems":           self.LocalItems,
-                "Goal":                 self.multiworld.Goal[self.player].value,
-                "FinalXemnas":          self.multiworld.FinalXemnas[self.player].value,
-                "LuckyEmblemsRequired": self.multiworld.LuckyEmblemsRequired[self.player].value,
-                "BountyRequired":       self.multiworld.BountyRequired[self.player].value}
+        slot_data = self.options.as_dict("Goal", "FinalXemnas", "LuckyEmblemsRequired", "BountyRequired")
+        slot_data.update({
+            "hitlist":                [],  # remove this after next update
+            "PoptrackerVersionCheck": 4.3,
+            "KeybladeAbilities":      self.sora_ability_dict,
+            "StaffAbilities":         self.donald_ability_dict,
+            "ShieldAbilities":        self.goofy_ability_dict,
+        })
+        return slot_data
 
-    def create_item(self, name: str, ) -> Item:
-        data = item_dictionary_table[name]
-        if name in Progression_Dicts["Progression"]:
+    def create_item(self, name: str) -> Item:
+        """
+        Returns created KH2Item
+        """
+        # data = item_dictionary_table[name]
+        if name in progression_set:
             item_classification = ItemClassification.progression
+        elif name in useful_set:
+            item_classification = ItemClassification.useful
         else:
             item_classification = ItemClassification.filler
-
-        created_item = KH2Item(name, item_classification, data.code, self.player)
+        created_item = KH2Item(name, item_classification, self.item_name_to_id[name], self.player)
 
         return created_item
 
+    def create_event_item(self, name: str) -> Item:
+        item_classification = ItemClassification.progression
+        created_item = KH2Item(name, item_classification, None, self.player)
+        return created_item
+
     def create_items(self) -> None:
-        self.visitlocking_dict = Progression_Dicts["AllVisitLocking"].copy()
-        if self.multiworld.Schmovement[self.player] != "level_0":
-            for _ in range(self.multiworld.Schmovement[self.player].value):
-                for name in {ItemName.HighJump, ItemName.QuickRun, ItemName.DodgeRoll, ItemName.AerialDodge,
-                             ItemName.Glide}:
+        """
+        Fills ItemPool and manages schmovement, random growth, visit locking and random starting visit locking.
+        """
+        self.visitlocking_dict = visit_locking_dict["AllVisitLocking"].copy()
+        if self.options.Schmovement != "level_0":
+            for _ in range(self.options.Schmovement.value):
+                for name in Movement_Table.keys():
                     self.item_quantity_dict[name] -= 1
                     self.growth_list.remove(name)
                     self.multiworld.push_precollected(self.create_item(name))
 
-        if self.multiworld.RandomGrowth[self.player] != 0:
-            max_growth = min(self.multiworld.RandomGrowth[self.player].value, len(self.growth_list))
+        if self.options.RandomGrowth:
+            max_growth = min(self.options.RandomGrowth.value, len(self.growth_list))
             for _ in range(max_growth):
-                random_growth = self.multiworld.per_slot_randoms[self.player].choice(self.growth_list)
+                random_growth = self.random.choice(self.growth_list)
                 self.item_quantity_dict[random_growth] -= 1
                 self.growth_list.remove(random_growth)
                 self.multiworld.push_precollected(self.create_item(random_growth))
 
-        if self.multiworld.Visitlocking[self.player] == "no_visit_locking":
-            for item, amount in Progression_Dicts["AllVisitLocking"].items():
+        if self.options.Visitlocking == "no_visit_locking":
+            for item, amount in visit_locking_dict["AllVisitLocking"].items():
                 for _ in range(amount):
                     self.multiworld.push_precollected(self.create_item(item))
                     self.item_quantity_dict[item] -= 1
@@ -123,19 +157,19 @@ class KH2World(World):
                     if self.visitlocking_dict[item] == 0:
                         self.visitlocking_dict.pop(item)
 
-        elif self.multiworld.Visitlocking[self.player] == "second_visit_locking":
-            for item in Progression_Dicts["2VisitLocking"]:
+        elif self.options.Visitlocking == "second_visit_locking":
+            for item in visit_locking_dict["2VisitLocking"]:
                 self.item_quantity_dict[item] -= 1
                 self.visitlocking_dict[item] -= 1
                 if self.visitlocking_dict[item] == 0:
                     self.visitlocking_dict.pop(item)
                 self.multiworld.push_precollected(self.create_item(item))
 
-        for _ in range(self.multiworld.RandomVisitLockingItem[self.player].value):
+        for _ in range(self.options.RandomVisitLockingItem.value):
             if sum(self.visitlocking_dict.values()) <= 0:
                 break
             visitlocking_set = list(self.visitlocking_dict.keys())
-            item = self.multiworld.per_slot_randoms[self.player].choice(visitlocking_set)
+            item = self.random.choice(visitlocking_set)
             self.item_quantity_dict[item] -= 1
             self.visitlocking_dict[item] -= 1
             if self.visitlocking_dict[item] == 0:
@@ -145,175 +179,258 @@ class KH2World(World):
         itempool = [self.create_item(item) for item, data in self.item_quantity_dict.items() for _ in range(data)]
 
         # Creating filler for unfilled locations
-        itempool += [self.create_filler()
-                     for _ in range(self.totalLocations - len(itempool))]
+        itempool += [self.create_filler() for _ in range(self.total_locations - len(itempool))]
+
         self.multiworld.itempool += itempool
 
     def generate_early(self) -> None:
-        # Item Quantity dict because Abilities can be a problem for KH2's Software.
+        """
+        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())
+        for x in range(4):
+            self.growth_list.extend(Movement_Table.keys())
+
         self.item_quantity_dict = {item: data.quantity for item, data in item_dictionary_table.items()}
+        self.sora_ability_dict = {k: v.quantity for dic in [SupportAbility_Table, ActionAbility_Table] for k, v in
+                                  dic.items()}
         # Dictionary to mark locations with their plandoed item
         # Example. Final Xemnas: Victory
+        # 3 random support abilities because there are left over slots
+        support_abilities = list(SupportAbility_Table.keys())
+        for _ in range(6):
+            random_support_ability = self.random.choice(support_abilities)
+            self.item_quantity_dict[random_support_ability] += 1
+            self.sora_ability_dict[random_support_ability] += 1
+
         self.plando_locations = dict()
-        self.hitlist = []
         self.starting_invo_verify()
+
+        for k, v in self.options.CustomItemPoolQuantity.value.items():
+            # kh2's items cannot hold more than a byte
+            if 255 > v > self.item_quantity_dict[k] and k in default_itempool_option.keys():
+                self.item_quantity_dict[k] = v
+            elif 255 <= v:
+                logging.warning(
+                        f"{self.player} has too many {k} in their CustomItemPool setting. Setting to default quantity")
         # Option to turn off Promise Charm Item
-        if not self.multiworld.Promise_Charm[self.player]:
-            self.item_quantity_dict[ItemName.PromiseCharm] = 0
+        if not self.options.Promise_Charm:
+            del self.item_quantity_dict[ItemName.PromiseCharm]
+
+        if not self.options.AntiForm:
+            del self.item_quantity_dict[ItemName.AntiForm]
 
         self.set_excluded_locations()
 
-        if self.multiworld.Goal[self.player] == "lucky_emblem_hunt":
-            self.luckyemblemamount = self.multiworld.LuckyEmblemsAmount[self.player].value
-            self.luckyemblemrequired = self.multiworld.LuckyEmblemsRequired[self.player].value
+        if self.options.Goal not in ["hitlist", "three_proofs"]:
+            self.lucky_emblem_amount = self.options.LuckyEmblemsAmount.value
+            self.lucky_emblem_required = self.options.LuckyEmblemsRequired.value
             self.emblem_verify()
 
         # hitlist
-        elif self.multiworld.Goal[self.player] == "hitlist":
-            self.RandomSuperBoss.extend(exclusion_table["Hitlist"])
-            self.BountiesAmount = self.multiworld.BountyAmount[self.player].value
-            self.BountiesRequired = self.multiworld.BountyRequired[self.player].value
+        if self.options.Goal not in ["lucky_emblem_hunt", "three_proofs"]:
+            self.random_super_boss_list.extend(exclusion_table["Hitlist"])
+            self.bounties_amount = self.options.BountyAmount.value
+            self.bounties_required = self.options.BountyRequired.value
 
             self.hitlist_verify()
 
-            for bounty in range(self.BountiesAmount):
-                randomBoss = self.multiworld.per_slot_randoms[self.player].choice(self.RandomSuperBoss)
-                self.plando_locations[randomBoss] = ItemName.Bounty
-                self.hitlist.append(self.location_name_to_id[randomBoss])
-                self.RandomSuperBoss.remove(randomBoss)
-                self.totalLocations -= 1
+            prio_hitlist = [location for location in self.multiworld.priority_locations[self.player].value if
+                            location in self.random_super_boss_list]
+            for bounty in range(self.options.BountyAmount.value):
+                if prio_hitlist:
+                    random_boss = self.random.choice(prio_hitlist)
+                    prio_hitlist.remove(random_boss)
+                else:
+                    random_boss = self.random.choice(self.random_super_boss_list)
+                self.plando_locations[random_boss] = ItemName.Bounty
+                self.random_super_boss_list.remove(random_boss)
+                self.total_locations -= 1
 
-        self.donald_fill()
-        self.goofy_fill()
-        self.keyblade_fill()
+        self.donald_gen_early()
+        self.goofy_gen_early()
+        self.keyblade_gen_early()
 
         if self.multiworld.FinalXemnas[self.player]:
             self.plando_locations[LocationName.FinalXemnas] = ItemName.Victory
         else:
             self.plando_locations[LocationName.FinalXemnas] = self.create_filler().name
+        self.total_locations -= 1
 
-        # same item placed because you can only get one of these 2 locations
-        # they are both under the same flag so the player gets both locations just one of the two items
-        random_stt_item = self.create_filler().name
-        for location in {LocationName.JunkMedal, LocationName.JunkMedal}:
-            self.plando_locations[location] = random_stt_item
-        self.level_subtraction()
-        # subtraction from final xemnas and stt
-        self.totalLocations -= 3
+        if self.options.WeaponSlotStartHint:
+            for location in all_weapon_slot:
+                self.multiworld.start_location_hints[self.player].value.add(location)
+
+        if self.options.FillerItemsLocal:
+            for item in filler_items:
+                self.multiworld.local_items[self.player].value.add(item)
+        # By imitating remote this doesn't have to be plandoded filler anymore
+        #  for location in {LocationName.JunkMedal, LocationName.JunkMedal}:
+        #    self.plando_locations[location] = random_stt_item
+        if not self.options.SummonLevelLocationToggle:
+            self.total_locations -= 6
+
+        self.total_locations -= self.level_subtraction()
 
     def pre_fill(self):
+        """
+        Plandoing Events and Fill_Restrictive for donald,goofy and sora
+        """
+        self.donald_pre_fill()
+        self.goofy_pre_fill()
+        self.keyblade_pre_fill()
+
         for location, item in self.plando_locations.items():
             self.multiworld.get_location(location, self.player).place_locked_item(
                     self.create_item(item))
 
     def create_regions(self):
-        location_table = setup_locations()
-        create_regions(self.multiworld, self.player, location_table)
-        connect_regions(self.multiworld, self.player)
+        """
+        Creates the Regions and Connects them.
+        """
+        create_regions(self)
+        connect_regions(self)
 
     def set_rules(self):
-        set_rules(self.multiworld, self.player)
+        """
+        Sets the Logic for the Regions and Locations.
+        """
+        universal_logic = Rules.KH2WorldRules(self)
+        form_logic = Rules.KH2FormRules(self)
+        fight_rules = Rules.KH2FightRules(self)
+        fight_rules.set_kh2_fight_rules()
+        universal_logic.set_kh2_rules()
+        form_logic.set_kh2_form_rules()
 
     def generate_output(self, output_directory: str):
+        """
+        Generates the .zip for OpenKH (The KH Mod Manager)
+        """
         patch_kh2(self, output_directory)
 
-    def donald_fill(self):
-        for item in DonaldAbility_Table:
-            data = self.item_quantity_dict[item]
-            for _ in range(data):
-                self.donald_ability_pool.append(item)
-            self.item_quantity_dict[item] = 0
-            # 32 is the amount of donald abilities
-        while len(self.donald_ability_pool) < 32:
-            self.donald_ability_pool.append(
-                    self.multiworld.per_slot_randoms[self.player].choice(self.donald_ability_pool))
-            # Placing Donald Abilities on donald locations
-        for donaldLocation in Locations.Donald_Checks.keys():
-            random_ability = self.multiworld.per_slot_randoms[self.player].choice(self.donald_ability_pool)
-            self.plando_locations[donaldLocation] = random_ability
-            self.totalLocations -= 1
-            self.donald_ability_pool.remove(random_ability)
-
-    def goofy_fill(self):
-        for item in GoofyAbility_Table.keys():
-            data = self.item_quantity_dict[item]
-            for _ in range(data):
-                self.goofy_ability_pool.append(item)
-            self.item_quantity_dict[item] = 0
-            # 32 is the amount of goofy abilities
-        while len(self.goofy_ability_pool) < 33:
-            self.goofy_ability_pool.append(
-                    self.multiworld.per_slot_randoms[self.player].choice(self.goofy_ability_pool))
-        # Placing Goofy Abilities on goofy locations
-        for goofyLocation in Locations.Goofy_Checks.keys():
-            random_ability = self.multiworld.per_slot_randoms[self.player].choice(self.goofy_ability_pool)
-            self.plando_locations[goofyLocation] = random_ability
-            self.totalLocations -= 1
-            self.goofy_ability_pool.remove(random_ability)
-
-    def keyblade_fill(self):
-        if self.multiworld.KeybladeAbilities[self.player] == "support":
-            self.sora_keyblade_ability_pool = {
-                **{item: data for item, data in self.item_quantity_dict.items() if item in SupportAbility_Table},
-                **{ItemName.NegativeCombo: 1, ItemName.AirComboPlus: 1, ItemName.ComboPlus: 1,
-                   ItemName.FinishingPlus: 1}}
-
-        elif self.multiworld.KeybladeAbilities[self.player] == "action":
-            self.sora_keyblade_ability_pool = {item: data for item, data in self.item_quantity_dict.items() if
-                                               item in ActionAbility_Table}
-            # there are too little action abilities so 2 random support abilities are placed
-            for _ in range(3):
-                randomSupportAbility = self.multiworld.per_slot_randoms[self.player].choice(
-                        list(SupportAbility_Table.keys()))
-                while randomSupportAbility in self.sora_keyblade_ability_pool:
-                    randomSupportAbility = self.multiworld.per_slot_randoms[self.player].choice(
-                            list(SupportAbility_Table.keys()))
-                self.sora_keyblade_ability_pool[randomSupportAbility] = 1
-        else:
-            # both action and support on keyblades.
-            # TODO: make option to just exclude scom
-            self.sora_keyblade_ability_pool = {
-                **{item: data for item, data in self.item_quantity_dict.items() if item in SupportAbility_Table},
-                **{item: data for item, data in self.item_quantity_dict.items() if item in ActionAbility_Table},
-                **{ItemName.NegativeCombo: 1, ItemName.AirComboPlus: 1, ItemName.ComboPlus: 1,
-                   ItemName.FinishingPlus: 1}}
-
-        for ability in self.multiworld.BlacklistKeyblade[self.player].value:
-            if ability in self.sora_keyblade_ability_pool:
-                self.sora_keyblade_ability_pool.pop(ability)
-
-        # magic number for amount of keyblades
-        if sum(self.sora_keyblade_ability_pool.values()) < 28:
-            raise Exception(
-                    f"{self.multiworld.get_file_safe_player_name(self.player)} has too little Keyblade Abilities in the Keyblade Pool")
-
-        self.valid_abilities = list(self.sora_keyblade_ability_pool.keys())
-        #  Kingdom Key cannot have No Experience so plandoed here instead of checking 26 times if its kingdom key
-        random_ability = self.multiworld.per_slot_randoms[self.player].choice(self.valid_abilities)
-        while random_ability == ItemName.NoExperience:
-            random_ability = self.multiworld.per_slot_randoms[self.player].choice(self.valid_abilities)
-        self.plando_locations[LocationName.KingdomKeySlot] = random_ability
-        self.item_quantity_dict[random_ability] -= 1
-        self.sora_keyblade_ability_pool[random_ability] -= 1
-        if self.sora_keyblade_ability_pool[random_ability] == 0:
-            self.valid_abilities.remove(random_ability)
-            self.sora_keyblade_ability_pool.pop(random_ability)
-
-        # plando keyblades because they can only have abilities
-        for keyblade in self.keyblade_slot_copy:
-            random_ability = self.multiworld.per_slot_randoms[self.player].choice(self.valid_abilities)
-            self.plando_locations[keyblade] = random_ability
+    def donald_gen_early(self):
+        random_prog_ability = self.random.choice([ItemName.Fantasia, ItemName.FlareForce])
+        donald_master_ability = [donald_ability for donald_ability in DonaldAbility_Table.keys() for _ in
+                                 range(self.item_quantity_dict[donald_ability]) if
+                                 donald_ability != random_prog_ability]
+        self.donald_weapon_abilities = []
+        self.donald_get_bonus_abilities = []
+        # fill goofy weapons first
+        for _ in range(15):
+            random_ability = self.random.choice(donald_master_ability)
+            donald_master_ability.remove(random_ability)
+            self.donald_weapon_abilities += [self.create_item(random_ability)]
             self.item_quantity_dict[random_ability] -= 1
-            self.sora_keyblade_ability_pool[random_ability] -= 1
-            if self.sora_keyblade_ability_pool[random_ability] == 0:
-                self.valid_abilities.remove(random_ability)
-                self.sora_keyblade_ability_pool.pop(random_ability)
-            self.totalLocations -= 1
+            self.total_locations -= 1
+        self.slot_data_donald_weapon = [item_name.name for item_name in self.donald_weapon_abilities]
+        if not self.multiworld.DonaldGoofyStatsanity[self.player]:
+            # pre plando donald get bonuses
+            self.donald_get_bonus_abilities += [self.create_item(random_prog_ability)]
+            self.total_locations -= 1
+            for item_name in donald_master_ability:
+                self.donald_get_bonus_abilities += [self.create_item(item_name)]
+                self.item_quantity_dict[item_name] -= 1
+                self.total_locations -= 1
+
+    def goofy_gen_early(self):
+        random_prog_ability = self.random.choice([ItemName.Teamwork, ItemName.TornadoFusion])
+        goofy_master_ability = [goofy_ability for goofy_ability in GoofyAbility_Table.keys() for _ in
+                                range(self.item_quantity_dict[goofy_ability]) if goofy_ability != random_prog_ability]
+        self.goofy_weapon_abilities = []
+        self.goofy_get_bonus_abilities = []
+        # fill goofy weapons first
+        for _ in range(15):
+            random_ability = self.random.choice(goofy_master_ability)
+            goofy_master_ability.remove(random_ability)
+            self.goofy_weapon_abilities += [self.create_item(random_ability)]
+            self.item_quantity_dict[random_ability] -= 1
+            self.total_locations -= 1
+
+        self.slot_data_goofy_weapon = [item_name.name for item_name in self.goofy_weapon_abilities]
+
+        if not self.options.DonaldGoofyStatsanity:
+            # pre plando goofy get bonuses
+            self.goofy_get_bonus_abilities += [self.create_item(random_prog_ability)]
+            self.total_locations -= 1
+            for item_name in goofy_master_ability:
+                self.goofy_get_bonus_abilities += [self.create_item(item_name)]
+                self.item_quantity_dict[item_name] -= 1
+                self.total_locations -= 1
+
+    def keyblade_gen_early(self):
+        keyblade_master_ability = [ability for ability in SupportAbility_Table.keys() if ability not in progression_set
+                                   for _ in range(self.item_quantity_dict[ability])]
+        self.keyblade_ability_pool = []
+
+        for _ in range(len(Keyblade_Slots)):
+            random_ability = self.random.choice(keyblade_master_ability)
+            keyblade_master_ability.remove(random_ability)
+            self.keyblade_ability_pool += [self.create_item(random_ability)]
+            self.item_quantity_dict[random_ability] -= 1
+            self.total_locations -= 1
+        self.slot_data_sora_weapon = [item_name.name for item_name in self.keyblade_ability_pool]
+
+    def goofy_pre_fill(self):
+        """
+        Removes donald locations from the location pool maps random donald items to be plandoded.
+        """
+        goofy_weapon_location_list = [self.multiworld.get_location(location, self.player) for location in
+                                      Goofy_Checks.keys() if Goofy_Checks[location].yml == "Keyblade"]
+        # 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)
+            location.place_locked_item(random_ability)
+            self.goofy_weapon_abilities.remove(random_ability)
+
+        if not self.multiworld.DonaldGoofyStatsanity[self.player]:
+            # plando goofy get bonuses
+            goofy_get_bonus_location_pool = [self.multiworld.get_location(location, self.player) for location in
+                                             Goofy_Checks.keys() if Goofy_Checks[location].yml != "Keyblade"]
+            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)
+                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
+                                       Donald_Checks.keys() if Donald_Checks[location].yml == "Keyblade"]
+
+        # 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)
+            location.place_locked_item(random_ability)
+            self.donald_weapon_abilities.remove(random_ability)
+
+        if not self.multiworld.DonaldGoofyStatsanity[self.player]:
+            # plando goofy get bonuses
+            donald_get_bonus_location_pool = [self.multiworld.get_location(location, self.player) for location in
+                                              Donald_Checks.keys() if Donald_Checks[location].yml != "Keyblade"]
+            for location in donald_get_bonus_location_pool:
+                random_ability = self.random.choice(self.donald_get_bonus_abilities)
+                location.place_locked_item(random_ability)
+                self.donald_get_bonus_abilities.remove(random_ability)
+
+    def keyblade_pre_fill(self):
+        """
+        Fills keyblade slots with abilities determined on player's setting
+        """
+        keyblade_locations = [self.multiworld.get_location(location, self.player) for location in Keyblade_Slots.keys()]
+        state = self.multiworld.get_all_state(False)
+        keyblade_ability_pool_copy = self.keyblade_ability_pool.copy()
+        fill_restrictive(self.multiworld, state, keyblade_locations, keyblade_ability_pool_copy, True, True)
 
     def starting_invo_verify(self):
+        """
+        Making sure the player doesn't put too many abilities in their starting inventory.
+        """
         for item, value in self.multiworld.start_inventory[self.player].value.items():
             if item in ActionAbility_Table \
-                    or item in SupportAbility_Table or exclusionItem_table["StatUps"] \
+                    or item in SupportAbility_Table or exclusion_item_table["StatUps"] \
                     or item in DonaldAbility_Table or item in GoofyAbility_Table:
                 # cannot have more than the quantity for abilties
                 if value > item_dictionary_table[item].quantity:
@@ -324,78 +441,100 @@ class KH2World(World):
                 self.item_quantity_dict[item] -= value
 
     def emblem_verify(self):
-        if self.luckyemblemamount < self.luckyemblemrequired:
+        """
+        Making sure lucky emblems have amount>=required.
+        """
+        if self.lucky_emblem_amount < self.lucky_emblem_required:
             logging.info(
-                    f"Lucky Emblem Amount {self.multiworld.LuckyEmblemsAmount[self.player].value} is less than required "
-                    f"{self.multiworld.LuckyEmblemsRequired[self.player].value} for player {self.multiworld.get_file_safe_player_name(self.player)}."
-                    f" Setting amount to {self.multiworld.LuckyEmblemsRequired[self.player].value}")
-            luckyemblemamount = max(self.luckyemblemamount, self.luckyemblemrequired)
-            self.multiworld.LuckyEmblemsAmount[self.player].value = luckyemblemamount
+                    f"Lucky Emblem Amount {self.options.LuckyEmblemsAmount.value} is less than required "
+                    f"{self.options.LuckyEmblemsRequired.value} for player {self.multiworld.get_file_safe_player_name(self.player)}."
+                    f" Setting amount to {self.options.LuckyEmblemsRequired.value}")
+            luckyemblemamount = max(self.lucky_emblem_amount, self.lucky_emblem_required)
+            self.options.LuckyEmblemsAmount.value = luckyemblemamount
 
-        self.item_quantity_dict[ItemName.LuckyEmblem] = self.multiworld.LuckyEmblemsAmount[self.player].value
+        self.item_quantity_dict[ItemName.LuckyEmblem] = self.options.LuckyEmblemsAmount.value
         # give this proof to unlock the final door once the player has the amount of lucky emblem required
-        self.item_quantity_dict[ItemName.ProofofNonexistence] = 0
+        if ItemName.ProofofNonexistence in self.item_quantity_dict:
+            del self.item_quantity_dict[ItemName.ProofofNonexistence]
 
     def hitlist_verify(self):
+        """
+        Making sure hitlist have amount>=required.
+        """
         for location in self.multiworld.exclude_locations[self.player].value:
-            if location in self.RandomSuperBoss:
-                self.RandomSuperBoss.remove(location)
+            if location in self.random_super_boss_list:
+                self.random_super_boss_list.remove(location)
+
+        if not self.options.SummonLevelLocationToggle and LocationName.Summonlvl7 in self.random_super_boss_list:
+            self.random_super_boss_list.remove(LocationName.Summonlvl7)
 
         #  Testing if the player has the right amount of Bounties for Completion.
-        if len(self.RandomSuperBoss) < self.BountiesAmount:
+        if len(self.random_super_boss_list) < self.bounties_amount:
             logging.info(
                     f"{self.multiworld.get_file_safe_player_name(self.player)} has more bounties than bosses."
-                    f" Setting total bounties to {len(self.RandomSuperBoss)}")
-            self.BountiesAmount = len(self.RandomSuperBoss)
-            self.multiworld.BountyAmount[self.player].value = self.BountiesAmount
+                    f" Setting total bounties to {len(self.random_super_boss_list)}")
+            self.bounties_amount = len(self.random_super_boss_list)
+            self.options.BountyAmount.value = self.bounties_amount
 
-        if len(self.RandomSuperBoss) < self.BountiesRequired:
+        if len(self.random_super_boss_list) < self.bounties_required:
             logging.info(f"{self.multiworld.get_file_safe_player_name(self.player)} has too many required bounties."
-                         f" Setting required bounties to {len(self.RandomSuperBoss)}")
-            self.BountiesRequired = len(self.RandomSuperBoss)
-            self.multiworld.BountyRequired[self.player].value = self.BountiesRequired
+                         f" Setting required bounties to {len(self.random_super_boss_list)}")
+            self.bounties_required = len(self.random_super_boss_list)
+            self.options.BountyRequired.value = self.bounties_required
 
-        if self.BountiesAmount < self.BountiesRequired:
-            logging.info(f"Bounties Amount {self.multiworld.BountyAmount[self.player].value} is less than required "
-                         f"{self.multiworld.BountyRequired[self.player].value} for player {self.multiworld.get_file_safe_player_name(self.player)}."
-                         f" Setting amount to {self.multiworld.BountyRequired[self.player].value}")
-            self.BountiesAmount = max(self.BountiesAmount, self.BountiesRequired)
-            self.multiworld.BountyAmount[self.player].value = self.BountiesAmount
+        if self.bounties_amount < self.bounties_required:
+            logging.info(
+                    f"Bounties Amount is less than required for player {self.multiworld.get_file_safe_player_name(self.player)}."
+                    f" Swapping Amount and Required")
+            temp = self.options.BountyRequired.value
+            self.options.BountyRequired.value = self.options.BountyAmount.value
+            self.options.BountyAmount.value = temp
 
-        self.multiworld.start_hints[self.player].value.add(ItemName.Bounty)
-        self.item_quantity_dict[ItemName.ProofofNonexistence] = 0
+        if self.options.BountyStartingHintToggle:
+            self.multiworld.start_hints[self.player].value.add(ItemName.Bounty)
+
+        if ItemName.ProofofNonexistence in self.item_quantity_dict:
+            del self.item_quantity_dict[ItemName.ProofofNonexistence]
 
     def set_excluded_locations(self):
+        """
+        Fills excluded_locations from player's settings.
+        """
         # Option to turn off all superbosses. Can do this individually but its like 20+ checks
-        if not self.multiworld.SuperBosses[self.player] and not self.multiworld.Goal[self.player] == "hitlist":
-            for superboss in exclusion_table["Datas"]:
-                self.multiworld.exclude_locations[self.player].value.add(superboss)
+        if not self.options.SuperBosses:
             for superboss in exclusion_table["SuperBosses"]:
                 self.multiworld.exclude_locations[self.player].value.add(superboss)
 
         # Option to turn off Olympus Colosseum Cups.
-        if self.multiworld.Cups[self.player] == "no_cups":
+        if self.options.Cups == "no_cups":
             for cup in exclusion_table["Cups"]:
                 self.multiworld.exclude_locations[self.player].value.add(cup)
         # exclude only hades paradox. If cups and hades paradox then nothing is excluded
-        elif self.multiworld.Cups[self.player] == "cups":
+        elif self.options.Cups == "cups":
             self.multiworld.exclude_locations[self.player].value.add(LocationName.HadesCupTrophyParadoxCups)
 
+        if not self.options.AtlanticaToggle:
+            for loc in exclusion_table["Atlantica"]:
+                self.multiworld.exclude_locations[self.player].value.add(loc)
+
     def level_subtraction(self):
-        # there are levels but level 1 is there for the yamls
-        if self.multiworld.LevelDepth[self.player] == "level_99_sanity":
-            # level 99 sanity
-            self.totalLocations -= 1
-        elif self.multiworld.LevelDepth[self.player] == "level_50_sanity":
+        """
+       Determine how many locations are on sora's levels.
+       """
+        if self.options.LevelDepth == "level_50_sanity":
             # level 50 sanity
-            self.totalLocations -= 50
-        elif self.multiworld.LevelDepth[self.player] == "level_1":
+            return 49
+        elif self.options.LevelDepth == "level_1":
             # level 1. No checks on levels
-            self.totalLocations -= 99
+            return 98
+        elif self.options.LevelDepth in ["level_50", "level_99"]:
+            # could be if leveldepth!= 99 sanity but this reads better imo
+            return 75
         else:
-            # level 50/99 since they contain the same amount of levels
-            self.totalLocations -= 76
+            return 0
 
     def get_filler_item_name(self) -> str:
-        return self.multiworld.random.choice(
-                [ItemName.PowerBoost, ItemName.MagicBoost, ItemName.DefenseBoost, ItemName.APBoost])
+        """
+        Returns random filler item name.
+        """
+        return self.random.choice(filler_items)
diff --git a/worlds/kh2/docs/en_Kingdom Hearts 2.md b/worlds/kh2/docs/en_Kingdom Hearts 2.md
index 8258a099cc..a07f29be54 100644
--- a/worlds/kh2/docs/en_Kingdom Hearts 2.md	
+++ b/worlds/kh2/docs/en_Kingdom Hearts 2.md	
@@ -63,6 +63,22 @@ For example, if you are fighting Roxas, receive Reflect Element, then die mid-fi
 - Customize the amount and level of progressive movement (Growth Abilities) you start with.
 - Customize start inventory, i.e., begin every run with certain items or spells of your choice.
 
+<h2 style="text-transform:none";>What are Lucky Emblems?</h2>
+Lucky Emblems are items that are required to beat the game if your goal is "Lucky Emblem Hunt".<br>
+You can think of these as requiring X number of Proofs of Nonexistence to open the final door.
+
+<h2 style="text-transform:none";>What is Hitlist/Bounties?</h2>
+The Hitlist goal adds "bounty" items to select late-game fights and locations, and you need to collect X number of them to win.<br>
+The list of possible locations that can contain a bounty:
+
+- Each of the 13 Data Fights
+- Max level (7) for each Drive Form
+- Sephiroth
+- Lingering Will
+- Starry Hill
+- Transport to Remembrance
+- Godess of Fate cup and Hades Paradox cup
+
 <h2 style="text-transform:none";>Quality of life:</h2>
 
 
diff --git a/worlds/kh2/docs/setup_en.md b/worlds/kh2/docs/setup_en.md
index 17235042e1..e0c8330632 100644
--- a/worlds/kh2/docs/setup_en.md
+++ b/worlds/kh2/docs/setup_en.md
@@ -66,30 +66,33 @@ Enter `The room's port number` into the top box <b> where the x's are</b> and pr
     - If you don't want to have a save in the GoA. Disconnect the client, load the auto save, and then reconnect the client after it loads the auto save.
 - Set fps limit to 60fps.
 - 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
 
 <h2 style="text-transform:none";>Requirement/logic sheet</h2>
 Have any questions on what's in logic? This spreadsheet has the answer [Requirements/logic sheet](https://docs.google.com/spreadsheets/d/1Embae0t7pIrbzvX-NRywk7bTHHEvuFzzQBUUpSUL7Ak/edit?usp=sharing)
 <h2 style="text-transform:none";>F.A.Q.</h2>
 
+- Why is my HP/MP continuously increasing without stopping?
+    - You do not have `JaredWeakStrike/APCompanion` set up correctly. Make sure it is above the `GoA ROM Mod` in the mod manager.
+- Why is my HP/MP continuously increasing without stopping when I have the APCompanion Mod?
+    - You have a leftover GOA lua script in your `Documents\KINGDOM HEARTS HD 1.5+2.5 ReMIX\scripts\KH2`.
+- Why am I missing worlds/portals in the GoA?
+    - You are missing the required visit-locking item to access the world/portal.
+- 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 `only` the most up to date version on the Epic Game Store is supported: version `1.0.0.8_WW`.
 - 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?
     - 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.
-- Why am I missing worlds/portals in the GoA?
-    - You are missing the required visit locking item to access the world/portal.
-- What versions of Kingdom Hearts 2 are supported?
-    - Currently `only` the most up to date version on the Epic Game Store is supported `1.0.0.8_WW`. Emulator may be added in the future.
 - Why did I crash?
     - The port of Kingdom Hearts 2 can and will randomly crash, this is the fault of the game not the randomizer or the archipelago client.
       - If you have a continuous/constant crash (in the same area/event every time) you will want to reverify your installed files. This can be done by doing the following: Open Epic Game Store --> Library --> Click Triple Dots --> Manage --> Verify
 - 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 is my HP/MP continuously increasing without stopping?
-    - You do not have `JaredWeakStrike/APCompanion` setup correctly. Make Sure it is above the GOA in the mod manager.
 - 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 did I not load in to the correct visit
-    - You need to trigger a cutscene or visit The World That Never Was for it to update you have recevied the item.
 - Why should I install the auto save mod at `KH2FM-Mods-equations19/auto-save`?
     - Because Kingdom Hearts 2 is prone to crashes and will keep you from losing your progress.
 - How do I load an auto save?
diff --git a/worlds/kh2/logic.py b/worlds/kh2/logic.py
deleted file mode 100644
index 1c5883f5ce..0000000000
--- a/worlds/kh2/logic.py
+++ /dev/null
@@ -1,312 +0,0 @@
-from .Names import ItemName
-from ..AutoWorld import LogicMixin
-
-
-class KH2Logic(LogicMixin):
-    def kh_lod_unlocked(self, player, amount):
-        return self.has(ItemName.SwordoftheAncestor, player, amount)
-
-    def kh_oc_unlocked(self, player, amount):
-        return self.has(ItemName.BattlefieldsofWar, player, amount)
-
-    def kh_twtnw_unlocked(self, player, amount):
-        return self.has(ItemName.WaytotheDawn, player, amount)
-
-    def kh_ht_unlocked(self, player, amount):
-        return self.has(ItemName.BoneFist, player, amount)
-
-    def kh_tt_unlocked(self, player, amount):
-        return self.has(ItemName.IceCream, player, amount)
-
-    def kh_pr_unlocked(self, player, amount):
-        return self.has(ItemName.SkillandCrossbones, player, amount)
-
-    def kh_sp_unlocked(self, player, amount):
-        return self.has(ItemName.IdentityDisk, player, amount)
-
-    def kh_stt_unlocked(self, player: int, amount):
-        return self.has(ItemName.NamineSketches, player, amount)
-
-    # Using Dummy 13 for this
-    def kh_dc_unlocked(self, player: int, amount):
-        return self.has(ItemName.CastleKey, player, amount)
-
-    def kh_hb_unlocked(self, player, amount):
-        return self.has(ItemName.MembershipCard, player, amount)
-
-    def kh_pl_unlocked(self, player, amount):
-        return self.has(ItemName.ProudFang, player, amount)
-
-    def kh_ag_unlocked(self, player, amount):
-        return self.has(ItemName.Scimitar, player, amount)
-
-    def kh_bc_unlocked(self, player, amount):
-        return self.has(ItemName.BeastsClaw, player, amount)
-
-    def kh_amount_of_forms(self, player, amount, requiredform="None"):
-        level = 0
-        formList = [ItemName.ValorForm, ItemName.WisdomForm, ItemName.LimitForm, ItemName.MasterForm,
-                    ItemName.FinalForm]
-        #  required form is in the logic for region connections
-        if requiredform != "None":
-            formList.remove(requiredform)
-        for form in formList:
-            if self.has(form, player):
-                level += 1
-        return level >= amount
-
-    def kh_visit_locking_amount(self, player, amount):
-        visit = 0
-        # torn pages are not added since you cannot get exp from that world
-        for item in {ItemName.CastleKey, ItemName.BattlefieldsofWar, ItemName.SwordoftheAncestor, ItemName.BeastsClaw,
-                     ItemName.BoneFist, ItemName.ProudFang, ItemName.SkillandCrossbones, ItemName.Scimitar,
-                     ItemName.MembershipCard,
-                     ItemName.IceCream, ItemName.WaytotheDawn,
-                     ItemName.IdentityDisk, ItemName.NamineSketches}:
-            visit += self.item_count(item, player)
-        return visit >= amount
-
-    def kh_three_proof_unlocked(self, player):
-        return self.has(ItemName.ProofofConnection, player, 1) \
-            and self.has(ItemName.ProofofNonexistence, player, 1) \
-            and self.has(ItemName.ProofofPeace, player, 1)
-
-    def kh_hitlist(self, player, amount):
-        return self.has(ItemName.Bounty, player, amount)
-
-    def kh_lucky_emblem_unlocked(self, player, amount):
-        return self.has(ItemName.LuckyEmblem, player, amount)
-
-    def kh_victory(self, player):
-        return self.has(ItemName.Victory, player, 1)
-
-    def kh_summon(self, player, amount):
-        summonlevel = 0
-        for summon in {ItemName.Genie, ItemName.ChickenLittle, ItemName.Stitch, ItemName.PeterPan}:
-            if self.has(summon, player):
-                summonlevel += 1
-        return summonlevel >= amount
-
-    # magic progression
-    def kh_fire(self, player):
-        return self.has(ItemName.FireElement, player, 1)
-
-    def kh_fira(self, player):
-        return self.has(ItemName.FireElement, player, 2)
-
-    def kh_firaga(self, player):
-        return self.has(ItemName.FireElement, player, 3)
-
-    def kh_blizzard(self, player):
-        return self.has(ItemName.BlizzardElement, player, 1)
-
-    def kh_blizzara(self, player):
-        return self.has(ItemName.BlizzardElement, player, 2)
-
-    def kh_blizzaga(self, player):
-        return self.has(ItemName.BlizzardElement, player, 3)
-
-    def kh_thunder(self, player):
-        return self.has(ItemName.ThunderElement, player, 1)
-
-    def kh_thundara(self, player):
-        return self.has(ItemName.ThunderElement, player, 2)
-
-    def kh_thundaga(self, player):
-        return self.has(ItemName.ThunderElement, player, 3)
-
-    def kh_magnet(self, player):
-        return self.has(ItemName.MagnetElement, player, 1)
-
-    def kh_magnera(self, player):
-        return self.has(ItemName.MagnetElement, player, 2)
-
-    def kh_magnega(self, player):
-        return self.has(ItemName.MagnetElement, player, 3)
-
-    def kh_reflect(self, player):
-        return self.has(ItemName.ReflectElement, player, 1)
-
-    def kh_reflera(self, player):
-        return self.has(ItemName.ReflectElement, player, 2)
-
-    def kh_reflega(self, player):
-        return self.has(ItemName.ReflectElement, player, 3)
-
-    def kh_highjump(self, player, amount):
-        return self.has(ItemName.HighJump, player, amount)
-
-    def kh_quickrun(self, player, amount):
-        return self.has(ItemName.QuickRun, player, amount)
-
-    def kh_dodgeroll(self, player, amount):
-        return self.has(ItemName.DodgeRoll, player, amount)
-
-    def kh_aerialdodge(self, player, amount):
-        return self.has(ItemName.AerialDodge, player, amount)
-
-    def kh_glide(self, player, amount):
-        return self.has(ItemName.Glide, player, amount)
-
-    def kh_comboplus(self, player, amount):
-        return self.has(ItemName.ComboPlus, player, amount)
-
-    def kh_aircomboplus(self, player, amount):
-        return self.has(ItemName.AirComboPlus, player, amount)
-
-    def kh_valorgenie(self, player):
-        return self.has(ItemName.Genie, player) and self.has(ItemName.ValorForm, player)
-
-    def kh_wisdomgenie(self, player):
-        return self.has(ItemName.Genie, player) and self.has(ItemName.WisdomForm, player)
-
-    def kh_mastergenie(self, player):
-        return self.has(ItemName.Genie, player) and self.has(ItemName.MasterForm, player)
-
-    def kh_finalgenie(self, player):
-        return self.has(ItemName.Genie, player) and self.has(ItemName.FinalForm, player)
-
-    def kh_rsr(self, player):
-        return self.has(ItemName.Slapshot, player, 1) and self.has(ItemName.ComboMaster, player) and self.kh_reflect(
-            player)
-
-    def kh_gapcloser(self, player):
-        return self.has(ItemName.FlashStep, player, 1) or self.has(ItemName.SlideDash, player)
-
-    #  Crowd Control and Berserk Hori will be used when I add hard logic.
-
-    def kh_crowdcontrol(self, player):
-        return self.kh_magnera(player) and self.has(ItemName.ChickenLittle, player) \
-            or self.kh_magnega(player) and self.kh_mastergenie(player)
-
-    def kh_berserkhori(self, player):
-        return self.has(ItemName.HorizontalSlash, player, 1) and self.has(ItemName.BerserkCharge, player)
-
-    def kh_donaldlimit(self, player):
-        return self.has(ItemName.FlareForce, player, 1) or self.has(ItemName.Fantasia, player)
-
-    def kh_goofylimit(self, player):
-        return self.has(ItemName.TornadoFusion, player, 1) or self.has(ItemName.Teamwork, player)
-
-    def kh_basetools(self, player):
-        # TODO: if option is easy then add reflect,gap closer and second chance&once more. #option east scom option normal adds gap closer or combo master #hard is what is right now
-        return self.has(ItemName.Guard, player, 1) and self.has(ItemName.AerialRecovery, player, 1) \
-            and self.has(ItemName.FinishingPlus, player, 1)
-
-    def kh_roxastools(self, player):
-        return self.kh_basetools(player) and (
-                    self.has(ItemName.QuickRun, player) or self.has(ItemName.NegativeCombo, player, 2))
-
-    def kh_painandpanic(self, player):
-        return (self.kh_goofylimit(player) or self.kh_donaldlimit(player)) and self.kh_dc_unlocked(player, 2)
-
-    def kh_cerberuscup(self, player):
-        return self.kh_amount_of_forms(player, 2) and self.kh_thundara(player) \
-            and self.kh_ag_unlocked(player, 1) and self.kh_ht_unlocked(player, 1) \
-            and self.kh_pl_unlocked(player, 1)
-
-    def kh_titan(self, player: int):
-        return self.kh_summon(player, 2) and (self.kh_thundara(player) or self.kh_magnera(player)) \
-            and self.kh_oc_unlocked(player, 2)
-
-    def kh_gof(self, player):
-        return self.kh_titan(player) and self.kh_cerberuscup(player) \
-            and self.kh_painandpanic(player) and self.kh_twtnw_unlocked(player, 1)
-
-    def kh_dataroxas(self, player):
-        return self.kh_basetools(player) and \
-            ((self.has(ItemName.LimitForm, player) and self.kh_amount_of_forms(player, 3) and self.has(
-                ItemName.TrinityLimit, player) and self.kh_gapcloser(player))
-             or (self.has(ItemName.NegativeCombo, player, 2) or self.kh_quickrun(player, 2)))
-
-    def kh_datamarluxia(self, player):
-        return self.kh_basetools(player) and self.kh_reflera(player) \
-            and ((self.kh_amount_of_forms(player, 3) and self.has(ItemName.FinalForm, player) and self.kh_fira(
-                player)) or self.has(ItemName.NegativeCombo, player, 2) or self.kh_donaldlimit(player))
-
-    def kh_datademyx(self, player):
-        return self.kh_basetools(player) and self.kh_amount_of_forms(player, 5) and self.kh_firaga(player) \
-            and (self.kh_donaldlimit(player) or self.kh_blizzard(player))
-
-    def kh_datalexaeus(self, player):
-        return self.kh_basetools(player) and self.kh_amount_of_forms(player, 3) and self.kh_reflera(player) \
-            and (self.has(ItemName.NegativeCombo, player, 2) or self.kh_donaldlimit(player))
-
-    def kh_datasaix(self, player):
-        return self.kh_basetools(player) and (self.kh_thunder(player) or self.kh_blizzard(player)) \
-            and self.kh_highjump(player, 2) and self.kh_aerialdodge(player, 2) and self.kh_glide(player, 2) and self.kh_amount_of_forms(player, 3) \
-            and (self.kh_rsr(player) or self.has(ItemName.NegativeCombo, player, 2) or self.has(ItemName.PeterPan,
-                                                                                                player))
-
-    def kh_dataxaldin(self, player):
-        return self.kh_basetools(player) and self.kh_donaldlimit(player) and self.kh_goofylimit(player) \
-            and self.kh_highjump(player, 2) and self.kh_aerialdodge(player, 2) and self.kh_glide(player,
-                                                                                                 2) and self.kh_magnet(
-                player)
-        # and (self.kh_form_level_unlocked(player, 3) or self.kh_berserkhori(player))
-
-    def kh_dataxemnas(self, player):
-        return self.kh_basetools(player) and self.kh_rsr(player) and self.kh_gapcloser(player) \
-            and (self.has(ItemName.LimitForm, player) or self.has(ItemName.TrinityLimit, player))
-
-    def kh_dataxigbar(self, player):
-        return self.kh_basetools(player) and self.kh_donaldlimit(player) and self.has(ItemName.FinalForm, player) \
-            and self.kh_amount_of_forms(player, 3) and self.kh_reflera(player)
-
-    def kh_datavexen(self, player):
-        return self.kh_basetools(player) and self.kh_donaldlimit(player) and self.has(ItemName.FinalForm, player) \
-            and self.kh_amount_of_forms(player, 4) and self.kh_reflera(player) and self.kh_fira(player)
-
-    def kh_datazexion(self, player):
-        return self.kh_basetools(player) and self.kh_donaldlimit(player) and self.has(ItemName.FinalForm, player) \
-            and self.kh_amount_of_forms(player, 3) \
-            and self.kh_reflera(player) and self.kh_fira(player)
-
-    def kh_dataaxel(self, player):
-        return self.kh_basetools(player) \
-            and ((self.kh_reflera(player) and self.kh_blizzara(player)) or self.has(ItemName.NegativeCombo, player, 2))
-
-    def kh_dataluxord(self, player):
-        return self.kh_basetools(player) and self.kh_reflect(player)
-
-    def kh_datalarxene(self, player):
-        return self.kh_basetools(player) and self.kh_reflera(player) \
-            and ((self.has(ItemName.FinalForm, player) and self.kh_amount_of_forms(player, 4) and self.kh_fire(
-                player))
-                 or (self.kh_donaldlimit(player) and self.kh_amount_of_forms(player, 2)))
-
-    def kh_sephi(self, player):
-        return self.kh_dataxemnas(player)
-
-    def kh_onek(self, player):
-        return self.kh_reflect(player) or self.has(ItemName.Guard, player)
-
-    def kh_terra(self, player):
-        return self.has(ItemName.ProofofConnection, player) and self.kh_basetools(player) \
-            and self.kh_dodgeroll(player, 2) and self.kh_aerialdodge(player, 2) and self.kh_glide(player, 3) \
-            and ((self.kh_comboplus(player, 2) and self.has(ItemName.Explosion, player)) or self.has(
-                ItemName.NegativeCombo, player, 2))
-
-    def kh_cor(self, player):
-        return self.kh_reflect(player) \
-            and self.kh_highjump(player, 2) and self.kh_quickrun(player, 2) and self.kh_aerialdodge(player, 2) \
-            and (self.has(ItemName.MasterForm, player) and self.kh_fire(player)
-                 or (self.has(ItemName.ChickenLittle, player) and self.kh_donaldlimit(player) and self.kh_glide(player,
-                                                                                                                2)))
-
-    def kh_transport(self, player):
-        return self.kh_basetools(player) and self.kh_reflera(player) \
-            and ((self.kh_mastergenie(player) and self.kh_magnera(player) and self.kh_donaldlimit(player))
-                 or (self.has(ItemName.FinalForm, player) and self.kh_amount_of_forms(player, 4) and self.kh_fira(
-                        player)))
-
-    def kh_gr2(self, player):
-        return (self.has(ItemName.MasterForm, player) or self.has(ItemName.Stitch, player)) \
-            and (self.kh_fire(player) or self.kh_blizzard(player) or self.kh_thunder(player))
-
-    def kh_xaldin(self, player):
-        return self.kh_basetools(player) and (self.kh_donaldlimit(player) or self.kh_amount_of_forms(player, 1))
-
-    def kh_mcp(self, player):
-        return self.kh_reflect(player) and (
-                    self.has(ItemName.MasterForm, player) or self.has(ItemName.FinalForm, player))
diff --git a/worlds/kh2/mod_template/mod.yml b/worlds/kh2/mod_template/mod.yml
deleted file mode 100644
index 4246132c26..0000000000
--- a/worlds/kh2/mod_template/mod.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-assets:
-- method: binarc
-  name: 00battle.bin
-  source:
-  - method: listpatch
-    name: fmlv
-    source:
-    - name: FmlvList.yml
-      type: fmlv
-    type: List
-  - method: listpatch
-    name: lvup
-    source:
-    - name: LvupList.yml
-      type: lvup
-    type: List
-  - method: listpatch
-    name: bons
-    source:
-    - name: BonsList.yml
-      type: bons
-    type: List
-- method: binarc
-  name: 03system.bin
-  source:
-  - method: listpatch
-    name: trsr
-    source:
-    - name: TrsrList.yml
-      type: trsr
-    type: List
-  - method: listpatch
-    name: item
-    source:
-    - name: ItemList.yml
-      type: item
-    type: List
-title: Randomizer Seed
diff --git a/worlds/kh2/test/TestGoal.py b/worlds/kh2/test/TestGoal.py
deleted file mode 100644
index 97874da2d0..0000000000
--- a/worlds/kh2/test/TestGoal.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from . import KH2TestBase
-from ..Names import ItemName
-
-
-class TestDefault(KH2TestBase):
-    options = {}
-
-    def testEverything(self):
-        self.collect_all_but([ItemName.Victory])
-        self.assertBeatable(True)
-
-
-class TestLuckyEmblem(KH2TestBase):
-    options = {
-        "Goal": 1,
-    }
-
-    def testEverything(self):
-        self.collect_all_but([ItemName.LuckyEmblem])
-        self.assertBeatable(True)
-
-
-class TestHitList(KH2TestBase):
-    options = {
-        "Goal": 2,
-    }
-
-    def testEverything(self):
-        self.collect_all_but([ItemName.Bounty])
-        self.assertBeatable(True)
diff --git a/worlds/kh2/test/TestSlotData.py b/worlds/kh2/test/TestSlotData.py
deleted file mode 100644
index 656cd48d5a..0000000000
--- a/worlds/kh2/test/TestSlotData.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import unittest
-
-from test.general import setup_solo_multiworld
-from . import KH2TestBase
-from .. import KH2World, all_locations, item_dictionary_table, CheckDupingItems, AllWeaponSlot, KH2Item
-from ..Names import ItemName
-from ... import AutoWorldRegister
-from ...AutoWorld import call_all
-
-
-class TestLocalItems(KH2TestBase):
-
-    def testSlotData(self):
-        gen_steps = ("generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill")
-        multiworld = setup_solo_multiworld(KH2World, gen_steps)
-        for location in multiworld.get_locations():
-            if location.item is None:
-                location.place_locked_item(multiworld.worlds[1].create_item(ItemName.NoExperience))
-        call_all(multiworld, "fill_slot_data")
-        slotdata = multiworld.worlds[1].fill_slot_data()
-        assert len(slotdata["LocalItems"]) > 0, f"{slotdata['LocalItems']} is empty"
diff --git a/worlds/kh2/test/__init__.py b/worlds/kh2/test/__init__.py
index dfef227627..6cefe6e791 100644
--- a/worlds/kh2/test/__init__.py
+++ b/worlds/kh2/test/__init__.py
@@ -1,4 +1,4 @@
-from test.TestBase import WorldTestBase
+from test.bases import WorldTestBase
 
 
 class KH2TestBase(WorldTestBase):
diff --git a/worlds/kh2/test/test_fight_logic.py b/worlds/kh2/test/test_fight_logic.py
new file mode 100644
index 0000000000..0c47d132f0
--- /dev/null
+++ b/worlds/kh2/test/test_fight_logic.py
@@ -0,0 +1,19 @@
+from . import KH2TestBase
+
+
+class TestEasy(KH2TestBase):
+    options = {
+        "FightLogic": 0
+    }
+
+
+class TestNormal(KH2TestBase):
+    options = {
+        "FightLogic": 1
+    }
+
+
+class TestHard(KH2TestBase):
+    options = {
+        "FightLogic": 2
+    }
diff --git a/worlds/kh2/test/test_form_logic.py b/worlds/kh2/test/test_form_logic.py
new file mode 100644
index 0000000000..1cd850a985
--- /dev/null
+++ b/worlds/kh2/test/test_form_logic.py
@@ -0,0 +1,214 @@
+from . import KH2TestBase
+from ..Names import ItemName, LocationName
+
+global_all_possible_forms = [ItemName.ValorForm, ItemName.WisdomForm, ItemName.LimitForm, ItemName.MasterForm, ItemName.FinalForm] + [ItemName.AutoValor, ItemName.AutoWisdom, ItemName.AutoLimit, ItemName.AutoMaster, ItemName.AutoFinal]
+
+
+class KH2TestFormBase(KH2TestBase):
+    allForms = [ItemName.ValorForm, ItemName.WisdomForm, ItemName.LimitForm, ItemName.MasterForm, ItemName.FinalForm]
+    autoForms = [ItemName.AutoValor, ItemName.AutoWisdom, ItemName.AutoLimit, ItemName.AutoMaster, ItemName.AutoFinal]
+    allLevel2 = [LocationName.Valorlvl2, LocationName.Wisdomlvl2, LocationName.Limitlvl2, LocationName.Masterlvl2,
+                 LocationName.Finallvl2]
+    allLevel3 = [LocationName.Valorlvl3, LocationName.Wisdomlvl3, LocationName.Limitlvl3, LocationName.Masterlvl3,
+                 LocationName.Finallvl3]
+    allLevel4 = [LocationName.Valorlvl4, LocationName.Wisdomlvl4, LocationName.Limitlvl4, LocationName.Masterlvl4,
+                 LocationName.Finallvl4]
+    allLevel5 = [LocationName.Valorlvl5, LocationName.Wisdomlvl5, LocationName.Limitlvl5, LocationName.Masterlvl5,
+                 LocationName.Finallvl5]
+    allLevel6 = [LocationName.Valorlvl6, LocationName.Wisdomlvl6, LocationName.Limitlvl6, LocationName.Masterlvl6,
+                 LocationName.Finallvl6]
+    allLevel7 = [LocationName.Valorlvl7, LocationName.Wisdomlvl7, LocationName.Limitlvl7, LocationName.Masterlvl7,
+                 LocationName.Finallvl7]
+    driveToAuto = {
+        ItemName.FinalForm:  ItemName.AutoFinal,
+        ItemName.MasterForm: ItemName.AutoMaster,
+        ItemName.LimitForm:  ItemName.AutoLimit,
+        ItemName.WisdomForm: ItemName.AutoWisdom,
+        ItemName.ValorForm:  ItemName.AutoValor,
+    }
+    AutoToDrive = {Auto: Drive for Drive, Auto in driveToAuto.items()}
+    driveFormMap = {
+        ItemName.ValorForm:  [LocationName.Valorlvl2,
+                              LocationName.Valorlvl3,
+                              LocationName.Valorlvl4,
+                              LocationName.Valorlvl5,
+                              LocationName.Valorlvl6,
+                              LocationName.Valorlvl7],
+        ItemName.WisdomForm: [LocationName.Wisdomlvl2,
+                              LocationName.Wisdomlvl3,
+                              LocationName.Wisdomlvl4,
+                              LocationName.Wisdomlvl5,
+                              LocationName.Wisdomlvl6,
+                              LocationName.Wisdomlvl7],
+        ItemName.LimitForm:  [LocationName.Limitlvl2,
+                              LocationName.Limitlvl3,
+                              LocationName.Limitlvl4,
+                              LocationName.Limitlvl5,
+                              LocationName.Limitlvl6,
+                              LocationName.Limitlvl7],
+        ItemName.MasterForm: [LocationName.Masterlvl2,
+                              LocationName.Masterlvl3,
+                              LocationName.Masterlvl4,
+                              LocationName.Masterlvl5,
+                              LocationName.Masterlvl6,
+                              LocationName.Masterlvl7],
+        ItemName.FinalForm:  [LocationName.Finallvl2,
+                              LocationName.Finallvl3,
+                              LocationName.Finallvl4,
+                              LocationName.Finallvl5,
+                              LocationName.Finallvl6,
+                              LocationName.Finallvl7],
+    }
+    # global_all_possible_forms = allForms + autoForms
+
+
+class TestDefaultForms(KH2TestFormBase):
+    """
+    Test default form access rules.
+    """
+    options = {
+        "AutoFormLogic":  False,
+        "FinalFormLogic": "light_and_darkness"
+    }
+
+    def test_default_Auto_Form_Logic(self):
+        allPossibleForms = global_all_possible_forms
+        # this tests with a light and darkness in the inventory.
+        self.collect_all_but(allPossibleForms)
+        for form in self.allForms:
+            self.assertFalse((self.can_reach_location(self.driveFormMap[form][0])), form)
+            self.collect(self.get_item_by_name(self.driveToAuto[form]))
+            self.assertFalse((self.can_reach_location(self.driveFormMap[form][0])), form)
+
+    def test_default_Final_Form(self):
+        allPossibleForms = global_all_possible_forms
+        self.collect_all_but(allPossibleForms)
+        self.collect_by_name(ItemName.FinalForm)
+        self.assertTrue((self.can_reach_location(LocationName.Finallvl2)))
+        self.assertTrue((self.can_reach_location(LocationName.Finallvl3)))
+        self.assertFalse((self.can_reach_location(LocationName.Finallvl4)))
+
+    def test_default_without_LnD(self):
+        allPossibleForms = self.allForms
+        self.collect_all_but(allPossibleForms)
+        for form, levels in self.driveFormMap.items():
+            # final form is unique and breaks using this test. Tested above.
+            if levels[0] == LocationName.Finallvl2:
+                continue
+            for driveForm in self.allForms:
+                if self.count(driveForm) >= 1:
+                    for _ in range(self.count(driveForm)):
+                        self.remove(self.get_item_by_name(driveForm))
+            allFormsCopy = self.allForms.copy()
+            allFormsCopy.remove(form)
+            self.collect(self.get_item_by_name(form))
+            for _ in range(self.count(ItemName.LightDarkness)):
+                self.remove(self.get_item_by_name(ItemName.LightDarkness))
+            self.assertTrue((self.can_reach_location(levels[0])), levels[0])
+            self.assertTrue((self.can_reach_location(levels[1])), levels[1])
+            self.assertFalse((self.can_reach_location(levels[2])), levels[2])
+            for i in range(3):
+                self.collect(self.get_item_by_name(allFormsCopy[i]))
+                # for some reason after collecting a form it can pick up light and darkness
+                for _ in range(self.count(ItemName.LightDarkness)):
+                    self.remove(self.get_item_by_name(ItemName.LightDarkness))
+
+                self.assertTrue((self.can_reach_location(levels[2 + i])))
+                if i < 2:
+                    self.assertFalse((self.can_reach_location(levels[3 + i])))
+                else:
+                    self.collect(self.get_item_by_name(allFormsCopy[i + 1]))
+                    for _ in range(self.count(ItemName.LightDarkness)):
+                        self.remove(self.get_item_by_name(ItemName.LightDarkness))
+                    self.assertTrue((self.can_reach_location(levels[3 + i])))
+
+    def test_default_with_lnd(self):
+        allPossibleForms = self.allForms
+        self.collect_all_but(allPossibleForms)
+        for form, levels in self.driveFormMap.items():
+            if form != ItemName.FinalForm:
+                for driveForm in self.allForms:
+                    for _ in range(self.count(driveForm)):
+                        self.remove(self.get_item_by_name(driveForm))
+                allFormsCopy = self.allForms.copy()
+                allFormsCopy.remove(form)
+                self.collect(self.get_item_by_name(ItemName.LightDarkness))
+                self.assertFalse((self.can_reach_location(levels[0])))
+                self.collect(self.get_item_by_name(form))
+
+                self.assertTrue((self.can_reach_location(levels[0])))
+                self.assertTrue((self.can_reach_location(levels[1])))
+                self.assertTrue((self.can_reach_location(levels[2])))
+                self.assertFalse((self.can_reach_location(levels[3])))
+                for i in range(2):
+                    self.collect(self.get_item_by_name(allFormsCopy[i]))
+                    self.assertTrue((self.can_reach_location(levels[i + 3])))
+                    if i <= 2:
+                        self.assertFalse((self.can_reach_location(levels[i + 4])))
+
+
+class TestJustAForm(KH2TestFormBase):
+    # this test checks if you can unlock final form with just a form.
+    options = {
+        "AutoFormLogic":  False,
+        "FinalFormLogic": "just_a_form"
+    }
+
+    def test_just_a_form_connections(self):
+        allPossibleForms = self.allForms
+        self.collect_all_but(allPossibleForms)
+        allPossibleForms.remove(ItemName.FinalForm)
+        for form, levels in self.driveFormMap.items():
+            for driveForm in self.allForms:
+                for _ in range(self.count(driveForm)):
+                    self.remove(self.get_item_by_name(driveForm))
+            if form != ItemName.FinalForm:
+                # reset the forms
+                allFormsCopy = self.allForms.copy()
+                allFormsCopy.remove(form)
+                self.assertFalse((self.can_reach_location(levels[0])))
+                self.collect(self.get_item_by_name(form))
+                self.assertTrue((self.can_reach_location(levels[0])))
+                self.assertTrue((self.can_reach_location(levels[1])))
+                self.assertTrue((self.can_reach_location(levels[2])))
+
+                # level 4 of a form. This tests if the player can unlock final form.
+                self.assertFalse((self.can_reach_location(levels[3])))
+                # amount of forms left in the pool are 3. 1 already collected and one is final form.
+                for i in range(3):
+                    allFormsCopy.remove(allFormsCopy[0])
+                    # so we don't accidentally collect another form like light and darkness in the above tests.
+                    self.collect_all_but(allFormsCopy)
+                    self.assertTrue((self.can_reach_location(levels[3 + i])), levels[3 + i])
+                    if i < 2:
+                        self.assertFalse((self.can_reach_location(levels[4 + i])), levels[4 + i])
+
+
+class TestAutoForms(KH2TestFormBase):
+    options = {
+        "AutoFormLogic":  True,
+        "FinalFormLogic": "light_and_darkness"
+    }
+
+    def test_Nothing(self):
+        KH2TestBase()
+
+    def test_auto_forms_level_progression(self):
+        allPossibleForms = self.allForms + [ItemName.LightDarkness]
+        # state has all auto forms
+        self.collect_all_but(allPossibleForms)
+        allPossibleFormsCopy = allPossibleForms.copy()
+        collectedDrives = []
+        i = 0
+        for form in allPossibleForms:
+            currentDriveForm = form
+            collectedDrives += [currentDriveForm]
+            allPossibleFormsCopy.remove(currentDriveForm)
+            self.collect_all_but(allPossibleFormsCopy)
+            for driveForm in self.allForms:
+                # +1 every iteration.
+                self.assertTrue((self.can_reach_location(self.driveFormMap[driveForm][i])), driveForm)
+                # making sure having the form still gives an extra drive level to its own form.
+                if driveForm in collectedDrives and i < 5:
+                    self.assertTrue((self.can_reach_location(self.driveFormMap[driveForm][i + 1])), driveForm)
+            i += 1
diff --git a/worlds/kh2/test/test_goal.py b/worlds/kh2/test/test_goal.py
new file mode 100644
index 0000000000..1a481ad3d9
--- /dev/null
+++ b/worlds/kh2/test/test_goal.py
@@ -0,0 +1,59 @@
+from . import KH2TestBase
+from ..Names import ItemName
+
+
+class TestDefault(KH2TestBase):
+    options = {}
+
+
+class TestThreeProofs(KH2TestBase):
+    options = {
+        "Goal": 0,
+    }
+
+
+class TestLuckyEmblem(KH2TestBase):
+    options = {
+        "Goal": 1,
+    }
+
+
+class TestHitList(KH2TestBase):
+    options = {
+        "Goal": 2,
+    }
+
+
+class TestLuckyEmblemHitlist(KH2TestBase):
+    options = {
+        "Goal": 3,
+    }
+
+
+class TestThreeProofsNoXemnas(KH2TestBase):
+    options = {
+        "Goal":        0,
+        "FinalXemnas": False,
+    }
+
+
+class TestLuckyEmblemNoXemnas(KH2TestBase):
+    options = {
+        "Goal":        1,
+        "FinalXemnas": False,
+    }
+
+
+class TestHitListNoXemnas(KH2TestBase):
+    options = {
+        "Goal":        2,
+        "FinalXemnas": False,
+    }
+
+
+class TestLuckyEmblemHitlistNoXemnas(KH2TestBase):
+    options = {
+        "Goal":        3,
+        "FinalXemnas": False,
+    }
+
diff --git a/worlds/ladx/LADXR/generator.py b/worlds/ladx/LADXR/generator.py
index 733ab314da..0406ad51f8 100644
--- a/worlds/ladx/LADXR/generator.py
+++ b/worlds/ladx/LADXR/generator.py
@@ -3,6 +3,7 @@ import importlib.util
 import importlib.machinery
 import os
 import pkgutil
+from collections import defaultdict
 
 from .romTables import ROMWithTables
 from . import assembler
@@ -55,6 +56,9 @@ from .patches import tradeSequence as _
 from . import hints
 
 from .patches import bank34
+from .utils import formatText
+from ..Options import TrendyGame, Palette
+from .roomEditor import RoomEditor, Object
 from .patches.aesthetics import rgb_to_bin, bin_to_rgb
 
 from .locations.keyLocation import KeyLocation
@@ -134,7 +138,7 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
     patches.core.fixWrongWarp(rom)
     patches.core.alwaysAllowSecretBook(rom)
     patches.core.injectMainLoop(rom)
-    
+
     from ..Options import ShuffleSmallKeys, ShuffleNightmareKeys
 
     if ap_settings["shuffle_small_keys"] != ShuffleSmallKeys.option_original_dungeon or  ap_settings["shuffle_nightmare_keys"] != ShuffleNightmareKeys.option_original_dungeon:
@@ -239,7 +243,7 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
         patches.core.quickswap(rom, 1)
     elif settings.quickswap == 'b':
         patches.core.quickswap(rom, 0)
-    
+
     world_setup = logic.world_setup
 
     JUNK_HINT = 0.33
@@ -263,7 +267,7 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
             name = "Your"
         else:
             name = f"{multiworld.player_name[location.item.player]}'s"
-        
+
         if isinstance(location, LinksAwakeningLocation):
             location_name = location.ladxr_item.metadata.name
         else:
@@ -319,11 +323,27 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
     if args.doubletrouble:
         patches.enemies.doubleTrouble(rom)
 
+    if ap_settings["text_shuffle"]:
+        buckets = defaultdict(list)
+        # For each ROM bank, shuffle text within the bank
+        for n, data in enumerate(rom.texts._PointerTable__data):
+            # Don't muck up which text boxes are questions and which are statements
+            if type(data) != int and data and data != b'\xFF':
+                buckets[(rom.texts._PointerTable__banks[n], data[len(data) - 1] == 0xfe)].append((n, data))
+        for bucket in buckets.values():
+            # For each bucket, make a copy and shuffle
+            shuffled = bucket.copy()
+            rnd.shuffle(shuffled)
+            # Then put new text in
+            for bucket_idx, (orig_idx, data) in enumerate(bucket):
+                rom.texts[shuffled[bucket_idx][0]] = data
+    
+
     if ap_settings["trendy_game"] != TrendyGame.option_normal:
 
         # TODO: if 0 or 4, 5, remove inaccurate conveyor tiles
 
-        from .roomEditor import RoomEditor, Object
+
         room_editor = RoomEditor(rom, 0x2A0)
 
         if ap_settings["trendy_game"] == TrendyGame.option_easy:
@@ -352,12 +372,12 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
                 }
                 def speed():
                     return rnd.randint(*speeds[ap_settings["trendy_game"]])
-                rom.banks[0x4][0x76A0-0x4000] = 0xFF - speed()                
+                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 int(ap_settings["trendy_game"]) >= TrendyGame.option_hardest:
-                    rom.banks[0x4][0x76A1-0x4000] = 0xFF - speed()                
+                    rom.banks[0x4][0x76A1-0x4000] = 0xFF - speed()
                     rom.banks[0x4][0x76A3-0x4000] = speed()
                     rom.banks[0x4][0x76A5-0x4000] = speed()
                     rom.banks[0x4][0x76A7-0x4000] = 0xFF - speed()
@@ -374,12 +394,14 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
             [0x0f, 0x38, 0x0f],
             [0x30, 0x62, 0x30],
             [0x8b, 0xac, 0x0f],
-            [0x9b, 0xbc, 0x0f], 
+            [0x9b, 0xbc, 0x0f],
         ]
         for color in gb_colors:
             for channel in range(3):
                 color[channel] = color[channel] * 31 // 0xbc
-        
+
+    if ap_settings["warp_improvements"]:
+        patches.core.addWarpImprovements(rom, ap_settings["additional_warp_points"])
 
     palette = ap_settings["palette"]
     if palette != Palette.option_normal:
@@ -410,7 +432,7 @@ def generateRom(args, settings, ap_settings, auth, seed_name, logic, rnd=None, m
             for address in range(start, end, 2):
                 packed = (rom.banks[bank][address + 1] << 8) | rom.banks[bank][address]
                 r,g,b = bin_to_rgb(packed)
-                
+
                 # 1 bit
                 if palette == Palette.option_1bit:
                     r &= 0b10000
diff --git a/worlds/ladx/LADXR/patches/core.py b/worlds/ladx/LADXR/patches/core.py
index a202e661f9..c9f3a7c34b 100644
--- a/worlds/ladx/LADXR/patches/core.py
+++ b/worlds/ladx/LADXR/patches/core.py
@@ -255,8 +255,9 @@ noWrapDown:
     """ % (type, map, room, x, y)), fill_nop=True)
 
    # Patch the RAM clear not to delete our custom dialog when we screen transition
+   # This is kind of horrible as it relies on bank 1 being loaded, lol
     rom.patch(0x01, 0x042C, "C629", "6B7E")
-    rom.patch(0x01, 0x3E6B, 0x3FFF, ASM("""
+    rom.patch(0x01, 0x3E6B, 0x3E7B, ASM("""
         ld bc, $A0
         call $29DC
         ld bc, $1200
@@ -537,3 +538,205 @@ OAMData:
         gfx_low = "\n".join([line.split(" ")[n] for line in tile_graphics.split("\n")[8:]])
         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 addWarpImprovements(rom, extra_warps):
+    # Patch in a warp icon
+    tile = utils.createTileData( \
+"""11111111
+10000000
+10200320 
+10323200
+10033300
+10023230
+10230020
+10000000""", key="0231")
+    MINIMAP_BASE = 0x3800
+    
+    # This is replacing a junk tile never used on the minimap
+    rom.banks[0x2C][MINIMAP_BASE + len(tile) * 0x65 : MINIMAP_BASE + len(tile) * 0x66] = tile
+    
+    # Allow using ENTITY_WARP for finding which map sections are warps
+    # Interesting - 3CA0 should be free, but something has pushed all the code forward a byte
+    rom.patch(0x02, 0x3CA1, None, ASM("""
+        ld   e, $0F
+        ld   d, $00
+    warp_search_loop:
+        ; Warp search loop
+        ld   hl, $C3A0
+        add  hl, de                     ; $5FE1: $19
+        ld   a, [hl]                    ; $5FE2: $7E
+        cp   $61 ; ENTITY_WARP
+        jr   nz, search_continue        ; if it's not a warp, check the next one
+        ld   hl, $C280
+        add  hl, de
+        ld   a, [hl]
+        and  a
+        jr   z, search_continue         ; if this is despawned, check the next one
+    found:
+        jp   $511B                      ; found
+    search_continue:
+        dec  e
+        ld   a, e
+        cp   $FF
+        jr   nz, warp_search_loop
+    
+    not_found:
+        jp   $512B
+
+    """))
+
+    # Insert redirect to above code
+    rom.patch(0x02, 0x1109, ASM("""
+    ldh a, [$F6]
+    cp 1
+    
+    """), ASM("""
+    jp $7CA1
+    nop
+    """))
+    # Leaves some extra bytes behind, if we need more space in 0x02
+
+    # On warp hole, open map instead
+    rom.patch(0x19, 0x1DB9, None, ASM("""
+        ld a, 7       ; Set GAMEPLAY_MAP
+        ld [$DB95], a
+        ld a, 0       ; reset subtype
+        ld [$DB96], a
+        ld a, 1         ; Set flag for using teleport
+        ld [$FFDD], a
+
+        ret
+    """), fill_nop=True)
+
+    # Patch over some instructions that decided if we are in debug mode holding some 
+    # buttons with instead checking for FFDD (why FFDD? It appears to be never used anywhere, so we repurpose it for "is in teleport mode")
+    rom.banks[0x01][0x17B8] = 0xDD
+    rom.banks[0x01][0x17B9] = 0xFF
+    rom.banks[0x01][0x17FD] = 0xDD
+    rom.banks[0x01][0x17FE] = 0xFF
+
+    # If in warp mode, don't allow manual exit
+    rom.patch(0x01, 0x1800, "20021E60", ASM("jp nz, $5818"), fill_nop=True)
+
+    # Allow warp with just B
+    rom.banks[0x01][0x17C0] = 0x20
+
+    # Allow cursor to move over black squares
+    # This allows warping to undiscovered areas - a fine cheat, but needs a check for wOverworldRoomStatus in the warp code
+    CHEAT_WARP_ANYWHERE = False
+    if CHEAT_WARP_ANYWHERE:
+        rom.patch(0x01, 0x1AE8, None, ASM("jp $5AF5"))
+
+    # This disables the arrows around the selection bubble
+    #rom.patch(0x01, 0x1B6F, None, ASM("ret"), fill_nop=True)
+    
+    # Fix lag when moving the cursor
+    # One option - just disable the delay code
+    #rom.patch(0x01, 0x1A76, 0x1A76+3, ASM("xor a"), fill_nop=True)
+    #rom.banks[0x01][0x1A7C] = 0
+    # Another option - just remove the animation
+    rom.banks[0x01][0x1B20] = 0
+    rom.banks[0x01][0x1B3B] = 0
+
+    # Patch the icon for all teleports
+    all_warps = [0x01, 0x95, 0x2C, 0xEC]
+
+
+    if extra_warps:
+        # mamu
+        all_warps.append(0x45)
+        # Tweak the flute location
+        rom.banks[0x14][0x0E95] += 0x10
+        rom.banks[0x14][0x0EA3] += 0x01
+
+        mamu_pond = RoomEditor(rom, 0x45)
+        # Remove some tall grass so we can add a warp instead
+        mamu_pond.changeObject(1, 6, 0xE8)
+        mamu_pond.moveObject(1, 6, 3, 5)
+        mamu_pond.addEntity(3, 5, 0x61)
+
+        mamu_pond.store(rom)
+
+        # eagle
+        all_warps.append(0x0F)
+        room = RoomEditor(rom, 0x0F)
+        # Move one cliff edge and change it into a pit
+        room.changeObject(7, 6, 0xE8)
+        room.moveObject(7, 6, 6, 4)
+
+        # Add the warp
+        room.addEntity(6, 4, 0x61)
+        # move the two corners
+        room.moveObject(6, 7, 7, 7)
+        room.moveObject(6, 6, 7, 6)
+        for object in room.objects:
+            # Extend the lower wall
+            if ((object.x == 0 and object.y == 7)
+            # Extend the lower floor
+            or (object.x == 0 and object.y == 6)):
+                room.overlay[object.x + object.count + object.y * 10] = object.type_id
+                object.count += 1
+        room.store(rom)
+    
+    for warp in all_warps:
+        # Set icon
+        rom.banks[0x20][0x168B + warp] = 0x55
+        # Set text
+        if not rom.banks[0x01][0x1959 + warp]:
+            rom.banks[0x01][0x1959 + warp] = 0x42
+        # Set palette
+        # rom.banks[0x20][0x178B + 0x95] = 0x1      
+
+    # Setup [?!] icon on map and associated text
+    rom.banks[0x01][0x1909 + 0x42] = 0x2B
+    rom.texts[0x02B] = utils.formatText('Warp')
+
+    # call warp function (why not just jmp?!)
+    rom.patch(0x01, 0x17C3, None, ASM("""
+    call $7E7B
+    ret
+    """))
+    
+    # Build a switch statement by hand
+    warp_jump = "".join(f"cp ${hex(warp)[2:]}\njr z, success\n" for warp in all_warps)
+
+    rom.patch(0x01, 0x3E7B, None, ASM(f"""
+TeleportHandler:
+
+    ld  a, [$DBB4] ; Load the current selected tile
+    ; TODO: check if actually revealed so we can have free movement
+    ; Check cursor against different tiles to see if we are selecting a warp
+    {warp_jump}
+    jr exit
+
+success:
+    ld   a, $0B
+    ld   [$DB95], a ; Gameplay type
+    xor a
+    ld   [$D401], a                  ; wWarp0MapCategory
+    ldh [$DD], a                     ; unset teleport flag(!!!)
+    ld   [$D402], a                  ; wWarp0Map
+    ld   a, [$DBB4]                  ; wDBB4
+    ld   [$D403], a                  ; wWarp0Room
+
+    ld   a, $68
+    ld   [$D404], a                  ; wWarp0DestinationX
+    ldh  [$98], a                    ; LinkPositionY
+    ld  [$D475], a
+    ld   a, $70
+    ld   [$D405], a                  ; wWarp0DestinationY
+    ldh  [$99], a                    ; LinkPositionX
+    ld   a, $66                        
+    ld   [$D416], a                  ; wWarp0PositionTileIndex
+    ld   a, $07
+    ld   [$DB96], a                  ; wGameplaySubtype
+    ldh a, [$A2]
+    ld  [$DBC8], a
+    call $0C83                       ; ApplyMapFadeOutTransition
+    xor  a                                        ; $5DF3: $AF
+    ld   [$C167], a                               ; $5DF4: $EA $67 $C1
+
+exit:
+    ret
+        """))
+
diff --git a/worlds/ladx/LADXR/patches/owl.py b/worlds/ladx/LADXR/patches/owl.py
index b22386a6cb..47e575191a 100644
--- a/worlds/ladx/LADXR/patches/owl.py
+++ b/worlds/ladx/LADXR/patches/owl.py
@@ -11,15 +11,17 @@ def removeOwlEvents(rom):
             re.removeEntities(0x41)
             re.store(rom)
     # Clear texts used by the owl. Potentially reused somewhere o else.
-    rom.texts[0x0D9] = b'\xff'  # used by boomerang
     # 1 Used by empty chest (master stalfos message)
     # 8 unused (0x0C0-0x0C7)
     # 1 used by bowwow in chest
     # 1 used by item for other player message
     # 2 used by arrow chest messages
     # 2 used by tunics
-    for idx in range(0x0BE, 0x0CE):
-        rom.texts[idx] = b'\xff'
+    
+    # Undoing this, we use it for text shuffle now
+    #rom.texts[0x0D9] = b'\xff'  # used by boomerang
+    # for idx in range(0x0BE, 0x0CE):
+    #     rom.texts[idx] = b'\xff'
 
 
     # Patch the owl entity into a ghost to allow refill of powder/bombs/arrows
diff --git a/worlds/ladx/LADXR/patches/phone.py b/worlds/ladx/LADXR/patches/phone.py
index f38745606c..a2f3939a08 100644
--- a/worlds/ladx/LADXR/patches/phone.py
+++ b/worlds/ladx/LADXR/patches/phone.py
@@ -2,34 +2,35 @@ from ..assembler import ASM
 
 
 def patchPhone(rom):
-    rom.texts[0x141] = b""
-    rom.texts[0x142] = b""
-    rom.texts[0x143] = b""
-    rom.texts[0x144] = b""
-    rom.texts[0x145] = b""
-    rom.texts[0x146] = b""
-    rom.texts[0x147] = b""
-    rom.texts[0x148] = b""
-    rom.texts[0x149] = b""
-    rom.texts[0x14A] = b""
-    rom.texts[0x14B] = b""
-    rom.texts[0x14C] = b""
-    rom.texts[0x14D] = b""
-    rom.texts[0x14E] = b""
-    rom.texts[0x14F] = b""
-    rom.texts[0x16E] = b""
-    rom.texts[0x1FD] = b""
-    rom.texts[0x228] = b""
-    rom.texts[0x229] = b""
-    rom.texts[0x22A] = b""
-    rom.texts[0x240] = b""
-    rom.texts[0x241] = b""
-    rom.texts[0x242] = b""
-    rom.texts[0x243] = b""
-    rom.texts[0x244] = b""
-    rom.texts[0x245] = b""
-    rom.texts[0x247] = b""
-    rom.texts[0x248] = b""
+    # reenabled for text shuffle
+#     rom.texts[0x141] = b""
+#     rom.texts[0x142] = b""
+#     rom.texts[0x143] = b""
+#     rom.texts[0x144] = b""
+#     rom.texts[0x145] = b""
+#     rom.texts[0x146] = b""
+#     rom.texts[0x147] = b""
+#     rom.texts[0x148] = b""
+#     rom.texts[0x149] = b""
+#     rom.texts[0x14A] = b""
+#     rom.texts[0x14B] = b""
+#     rom.texts[0x14C] = b""
+#     rom.texts[0x14D] = b""
+#     rom.texts[0x14E] = b""
+#     rom.texts[0x14F] = b""
+#     rom.texts[0x16E] = b""
+#     rom.texts[0x1FD] = b""
+#     rom.texts[0x228] = b""
+#     rom.texts[0x229] = b""
+#     rom.texts[0x22A] = b""
+#     rom.texts[0x240] = b""
+#     rom.texts[0x241] = b""
+#     rom.texts[0x242] = b""
+#     rom.texts[0x243] = b""
+#     rom.texts[0x244] = b""
+#     rom.texts[0x245] = b""
+#     rom.texts[0x247] = b""
+#     rom.texts[0x248] = b""
     rom.patch(0x06, 0x2A8F, 0x2BBC, ASM("""
         ; We use $DB6D to store which tunics we have. This is normally the Dungeon9 instrument, which does not exist.
         ld  a, [$DC0F]
diff --git a/worlds/ladx/LADXR/pointerTable.py b/worlds/ladx/LADXR/pointerTable.py
index 9b8d49466c..a1a92ba178 100644
--- a/worlds/ladx/LADXR/pointerTable.py
+++ b/worlds/ladx/LADXR/pointerTable.py
@@ -116,7 +116,10 @@ class PointerTable:
             rom.banks[ptr_bank][ptr_addr] = pointer & 0xFF
             rom.banks[ptr_bank][ptr_addr + 1] = (pointer >> 8) | 0x40
 
-        for n, s in enumerate(self.__data):
+        data = list(enumerate(self.__data))        
+        data.sort(key=lambda t: type(t[1]) == int or -len(t[1]))
+
+        for n, s in data:
             if isinstance(s, int):
                 pointer = s
             else:
diff --git a/worlds/ladx/Locations.py b/worlds/ladx/Locations.py
index 6c89db3891..c7b127ef2b 100644
--- a/worlds/ladx/Locations.py
+++ b/worlds/ladx/Locations.py
@@ -124,13 +124,13 @@ class GameStateAdapater:
         # Don't allow any money usage if you can't get back wasted rupees
         if item == "RUPEES":
             if can_farm_rupees(self.state, self.player):
-                return self.state.prog_items["RUPEES", self.player]
+                return self.state.prog_items[self.player]["RUPEES"]
             return 0
         elif item.endswith("_USED"):
             return 0
         else:
             item = ladxr_item_to_la_item_name[item]
-        return self.state.prog_items.get((item, self.player), default)
+        return self.state.prog_items[self.player].get(item, default)
 
 
 class LinksAwakeningEntrance(Entrance):
@@ -219,7 +219,7 @@ def create_regions_from_ladxr(player, multiworld, logic):
 
         r = LinksAwakeningRegion(
             name=name, ladxr_region=l, hint="", player=player, world=multiworld)
-        r.locations = [LinksAwakeningLocation(player, r, i) for i in l.items]
+        r.locations += [LinksAwakeningLocation(player, r, i) for i in l.items]
         regions[l] = r
 
     for ladxr_location in logic.location_list:
diff --git a/worlds/ladx/Options.py b/worlds/ladx/Options.py
index 4c85e5c3d0..691891c0b3 100644
--- a/worlds/ladx/Options.py
+++ b/worlds/ladx/Options.py
@@ -40,13 +40,21 @@ class TradeQuest(DefaultOffToggle, LADXROption):
     [On] adds the trade items to the pool (the trade locations will always be local items)
     [Off] (default) doesn't add them
     """
+    display_name = "Trade Quest"
     ladxr_name = "tradequest"
 
+class TextShuffle(DefaultOffToggle):
+    """
+    [On] Shuffles all the text in the game
+    [Off] (default) doesn't shuffle them.
+    """
+
 class Rooster(DefaultOnToggle, LADXROption):
     """
     [On] Adds the rooster to the item pool. 
     [Off] The rooster spot is still a check giving an item. But you will never find the rooster. Any rooster spot is accessible without rooster by other means.
     """
+    display_name = "Rooster"
     ladxr_name = "rooster"
 
 class Boomerang(Choice):
@@ -77,6 +85,7 @@ class EntranceShuffle(Choice, LADXROption):
     #option_expert = 3    
     #option_insanity = 4
     default = option_none
+    display_name = "Experimental Entrance Shuffle"
     ladxr_name = "entranceshuffle"
 
 class DungeonShuffle(DefaultOffToggle, LADXROption):
@@ -84,13 +93,14 @@ class DungeonShuffle(DefaultOffToggle, LADXROption):
     [WARNING] Experimental, may fail to fill
     Randomizes dungeon entrances within eachother
     """
+    display_name = "Experimental Dungeon Shuffle"
     ladxr_name = "dungeonshuffle"
 
 class APTitleScreen(DefaultOnToggle):
     """
     Enables AP specific title screen and disables the intro cutscene
     """
-    
+    display_name = "AP Title Screen"
 
 class BossShuffle(Choice):
     none = 0
@@ -119,6 +129,7 @@ class ShuffleNightmareKeys(DungeonItemShuffle):
     [Any World] The item could be anywhere
     [Different World] The item will be somewhere in another world
     """
+    display_name = "Shuffle Nightmare Keys"
     ladxr_item = "NIGHTMARE_KEY"
 
 class ShuffleSmallKeys(DungeonItemShuffle):
@@ -130,6 +141,7 @@ class ShuffleSmallKeys(DungeonItemShuffle):
     [Any World] The item could be anywhere
     [Different World] The item will be somewhere in another world 
     """
+    display_name = "Shuffle Small Keys"
     ladxr_item = "KEY"
 class ShuffleMaps(DungeonItemShuffle):
     """
@@ -140,6 +152,7 @@ class ShuffleMaps(DungeonItemShuffle):
     [Any World] The item could be anywhere
     [Different World] The item will be somewhere in another world
     """
+    display_name = "Shuffle Maps"
     ladxr_item = "MAP"
 
 class ShuffleCompasses(DungeonItemShuffle):
@@ -151,6 +164,7 @@ class ShuffleCompasses(DungeonItemShuffle):
     [Any World] The item could be anywhere
     [Different World] The item will be somewhere in another world
     """
+    display_name = "Shuffle Compasses"
     ladxr_item = "COMPASS"
 
 class ShuffleStoneBeaks(DungeonItemShuffle):
@@ -162,6 +176,7 @@ class ShuffleStoneBeaks(DungeonItemShuffle):
     [Any World] The item could be anywhere
     [Different World] The item will be somewhere in another world
     """
+    display_name = "Shuffle Stone Beaks"
     ladxr_item = "STONE_BEAK"
 
 class Goal(Choice, LADXROption):
@@ -189,6 +204,7 @@ class InstrumentCount(Range, LADXROption):
     """
     Sets the number of instruments required to open the Egg
     """
+    display_name = "Instrument Count"
     ladxr_name = None
     range_start = 0
     range_end = 8
@@ -198,7 +214,7 @@ class NagMessages(DefaultOffToggle, LADXROption):
     """
     Controls if nag messages are shown when rocks and crystals are touched. Useful for glitches, annoying for everyone else.
     """
-
+    display_name = "Nag Messages"
     ladxr_name = "nagmessages"
 
 class MusicChangeCondition(Choice):
@@ -207,6 +223,7 @@ class MusicChangeCondition(Choice):
     [Sword] When you pick up a sword, the music changes
     [Always] You always have the post-sword music
     """
+    display_name = "Music Change Condition"
     option_sword = 0
     option_always = 1
     default = option_always
@@ -288,7 +305,7 @@ class LinkPalette(Choice, LADXROption):
     Sets link's palette
     A-D are color palettes usually used during the damage animation and can change based on where you are.
     """
-    display_name = "Links Palette"
+    display_name = "Link's Palette"
     ladxr_name = "linkspalette"
     option_normal = -1
     option_green = 0
@@ -313,6 +330,7 @@ class TrendyGame(Choice):
     [Hardest] The items move diagonally
     [Impossible] The items move impossibly fast, may scroll on and off the screen
     """
+    display_name = "Trendy Game"
     option_easy = 0
     option_normal = 1
     option_hard = 2
@@ -331,18 +349,19 @@ class GfxMod(FreeText, LADXROption):
     normal = ''
     default = 'Link'
 
+    __spriteDir: str = Utils.local_path(os.path.join('data', 'sprites','ladx'))
     __spriteFiles: typing.DefaultDict[str, typing.List[str]] = defaultdict(list)
-    __spriteDir: str = None
 
     extensions = [".bin", ".bdiff", ".png", ".bmp"]
+
+    for file in os.listdir(__spriteDir):
+        name, extension = os.path.splitext(file)
+        if extension in extensions:
+            __spriteFiles[name].append(file)
+            
     def __init__(self, value: str):
         super().__init__(value)
-        if not GfxMod.__spriteDir:
-            GfxMod.__spriteDir = Utils.local_path(os.path.join('data', 'sprites','ladx'))
-            for file in os.listdir(GfxMod.__spriteDir):
-                name, extension = os.path.splitext(file)
-                if extension in self.extensions:
-                    GfxMod.__spriteFiles[name].append(file)
+
                     
     def verify(self, world, player_name: str, plando_options) -> None:
         if self.value == "Link" or self.value in GfxMod.__spriteFiles:
@@ -372,13 +391,27 @@ class Palette(Choice):
     [Pink] Aesthetic
     [Inverted] Inverted
     """
+    display_name = "Palette"
     option_normal = 0
     option_1bit = 1
     option_2bit = 2
     option_greyscale = 3
     option_pink = 4
     option_inverted = 5
-    
+
+class WarpImprovements(DefaultOffToggle):
+    """
+    [On] 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.
+    [Off] No change
+    """
+
+class AdditionalWarpPoints(DefaultOffToggle):
+    """
+    [On] (requires warp improvements) Adds a warp point at Crazy Tracy's house (the Mambo teleport spot) and Eagle's Tower
+    [Off] No change
+    """
+     
+
 links_awakening_options: typing.Dict[str, typing.Type[Option]] = {
     'logic': Logic,
     # 'heartpiece': DefaultOnToggle, # description='Includes heart pieces in the item pool'),                
@@ -400,9 +433,12 @@ links_awakening_options: typing.Dict[str, typing.Type[Option]] = {
     # 'bowwow': Bowwow,
     # 'overworld': Overworld,
     'link_palette': LinkPalette,
+    'warp_improvements': WarpImprovements,
+    'additional_warp_points': AdditionalWarpPoints,
     'trendy_game': TrendyGame,
     'gfxmod': GfxMod,
     'palette': Palette,
+    'text_shuffle': TextShuffle,
     'shuffle_nightmare_keys': ShuffleNightmareKeys,
     'shuffle_small_keys': ShuffleSmallKeys,
     'shuffle_maps': ShuffleMaps,
@@ -411,4 +447,5 @@ links_awakening_options: typing.Dict[str, typing.Type[Option]] = {
     'music_change_condition': MusicChangeCondition,
     'nag_messages': NagMessages,
     'ap_title_screen': APTitleScreen,
+    
 }
diff --git a/worlds/ladx/__init__.py b/worlds/ladx/__init__.py
index 1d6c85dd64..181cc05322 100644
--- a/worlds/ladx/__init__.py
+++ b/worlds/ladx/__init__.py
@@ -1,32 +1,29 @@
 import binascii
-import bsdiff4
 import os
 import pkgutil
-import settings
-import typing
 import tempfile
+import typing
 
+import bsdiff4
 
+import settings
 from BaseClasses import Entrance, Item, ItemClassification, Location, Tutorial
 from Fill import fill_restrictive
 from worlds.AutoWorld import WebWorld, World
-
 from .Common import *
-from .Items import (DungeonItemData, DungeonItemType, LinksAwakeningItem, TradeItemData,
-                    ladxr_item_to_la_item_name, links_awakening_items,
-                    links_awakening_items_by_name, ItemName)
+from .Items import (DungeonItemData, DungeonItemType, ItemName, LinksAwakeningItem, TradeItemData,
+                    ladxr_item_to_la_item_name, links_awakening_items, links_awakening_items_by_name)
 from .LADXR import generator
 from .LADXR.itempool import ItemPool as LADXRItemPool
+from .LADXR.locations.constants import CHEST_ITEMS
+from .LADXR.locations.instrument import Instrument
 from .LADXR.logic import Logic as LAXDRLogic
 from .LADXR.main import get_parser
 from .LADXR.settings import Settings as LADXRSettings
 from .LADXR.worldSetup import WorldSetup as LADXRWorldSetup
-from .LADXR.locations.instrument import Instrument
-from .LADXR.locations.constants import CHEST_ITEMS
 from .Locations import (LinksAwakeningLocation, LinksAwakeningRegion,
                         create_regions_from_ladxr, get_locations_to_id)
-from .Options import links_awakening_options, DungeonItemShuffle
-
+from .Options import DungeonItemShuffle, links_awakening_options
 from .Rom import LADXDeltaPatch
 
 DEVELOPER_MODE = False
@@ -231,9 +228,7 @@ class LinksAwakeningWorld(World):
                             # Find instrument, lock
                             # TODO: we should be able to pinpoint the region we want, save a lookup table please
                             found = False
-                            for r in self.multiworld.get_regions():
-                                if r.player != self.player:
-                                    continue
+                            for r in self.multiworld.get_regions(self.player):
                                 if r.dungeon_index != item.item_data.dungeon_index:
                                     continue
                                 for loc in r.locations:
@@ -269,10 +264,7 @@ class LinksAwakeningWorld(World):
         event_location.place_locked_item(self.create_event("Can Play Trendy Game"))
        
         self.dungeon_locations_by_dungeon = [[], [], [], [], [], [], [], [], []]     
-        for r in self.multiworld.get_regions():
-            if r.player != self.player:
-                continue
-
+        for r in self.multiworld.get_regions(self.player):
             # Set aside dungeon locations
             if r.dungeon_index:
                 self.dungeon_locations_by_dungeon[r.dungeon_index - 1] += r.locations
@@ -516,16 +508,12 @@ class LinksAwakeningWorld(World):
 
     def collect(self, state, item: Item) -> bool:
         change = super().collect(state, item)
-        if change:
-            rupees = self.rupees.get(item.name, 0)
-            state.prog_items["RUPEES", item.player] += rupees
-
+        if change and item.name in self.rupees:
+            state.prog_items[self.player]["RUPEES"] += self.rupees[item.name]
         return change
 
     def remove(self, state, item: Item) -> bool:
         change = super().remove(state, item)
-        if change:
-            rupees = self.rupees.get(item.name, 0)
-            state.prog_items["RUPEES", item.player] -= rupees
-
+        if change and item.name in self.rupees:
+            state.prog_items[self.player]["RUPEES"] -= self.rupees[item.name]
         return change
diff --git a/worlds/ladx/docs/setup_en.md b/worlds/ladx/docs/setup_en.md
index 538d70d45e..e21c5bddc4 100644
--- a/worlds/ladx/docs/setup_en.md
+++ b/worlds/ladx/docs/setup_en.md
@@ -40,7 +40,7 @@ your personal settings 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](/mysterycheck) page.
+[YAML Validator](/check) page.
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/ladx/test/testShop.py b/worlds/ladx/test/testShop.py
new file mode 100644
index 0000000000..91d504d521
--- /dev/null
+++ b/worlds/ladx/test/testShop.py
@@ -0,0 +1,38 @@
+from typing import Optional
+
+from Fill import distribute_planned
+from test.general import setup_solo_multiworld
+from worlds.AutoWorld import call_all
+from . import LADXTestBase
+from .. import LinksAwakeningWorld
+
+
+class PlandoTest(LADXTestBase):
+    options = {
+        "plando_items": [{
+            "items": {
+                "Progressive Sword": 2,
+            },
+            "locations": [
+                "Shop 200 Item (Mabe Village)",
+                "Shop 980 Item (Mabe Village)",
+            ],
+        }],
+    }
+    
+    def world_setup(self, seed: Optional[int] = None) -> None:
+        self.multiworld = setup_solo_multiworld(
+            LinksAwakeningWorld,
+            ("generate_early", "create_regions", "create_items", "set_rules", "generate_basic")
+        )
+        self.multiworld.plando_items[1] = self.options["plando_items"]
+        distribute_planned(self.multiworld)
+        call_all(self.multiworld, "pre_fill")
+        
+    def test_planned(self):
+        """Tests plandoing swords in the shop."""
+        location_names = ["Shop 200 Item (Mabe Village)", "Shop 980 Item (Mabe Village)"]
+        locations = [self.multiworld.get_location(loc, 1) for loc in location_names]
+        for loc in locations:
+            self.assertEqual("Progressive Sword", loc.item.name)
+            self.assertFalse(loc.can_reach(self.multiworld.state))
diff --git a/worlds/landstalker/Hints.py b/worlds/landstalker/Hints.py
new file mode 100644
index 0000000000..93274f1d68
--- /dev/null
+++ b/worlds/landstalker/Hints.py
@@ -0,0 +1,140 @@
+from typing import TYPE_CHECKING
+
+from BaseClasses import Location
+from .data.hint_source import HINT_SOURCES_JSON
+
+if TYPE_CHECKING:
+    from random import Random
+    from . import LandstalkerWorld
+
+
+def generate_blurry_location_hint(location: Location, random: "Random"):
+    cleaned_location_name = location.hint_text.lower().translate({ord(c): None for c in "(),:"})
+    cleaned_location_name.replace("-", " ")
+    cleaned_location_name.replace("/", " ")
+    cleaned_location_name.replace(".", " ")
+    location_name_words = [w for w in cleaned_location_name.split(" ") if len(w) > 3]
+
+    random_word_1 = "mysterious"
+    random_word_2 = "place"
+    if location_name_words:
+        random_word_1 = random.choice(location_name_words)
+        location_name_words.remove(random_word_1)
+        if location_name_words:
+            random_word_2 = random.choice(location_name_words)
+    return [random_word_1, random_word_2]
+
+
+def generate_lithograph_hint(world: "LandstalkerWorld"):
+    hint_text = "It's barely readable:\n"
+    jewel_items = world.jewel_items
+
+    for item in jewel_items:
+        # Jewel hints are composed of 4 'words' shuffled randomly:
+        # - the name of the player whose world contains said jewel (if not ours)
+        # - the color of the jewel (if relevant)
+        # - two random words from the location name
+        words = generate_blurry_location_hint(item.location, world.random)
+        words[0] = words[0].upper()
+        words[1] = words[1].upper()
+        if len(jewel_items) < 6:
+            # Add jewel color if we are not using generic jewels because jewel count is 6 or more
+            words.append(item.name.split(" ")[0].upper())
+        if item.location.player != world.player:
+            # Add player name if it's not in our own world
+            player_name = world.multiworld.get_player_name(world.player)
+            words.append(player_name.upper())
+        world.random.shuffle(words)
+        hint_text += " ".join(words) + "\n"
+    return hint_text.rstrip("\n")
+
+
+def generate_random_hints(world: "LandstalkerWorld"):
+    hints = {}
+    hint_texts = []
+    random = world.random
+    multiworld = world.multiworld
+    this_player = world.player
+
+    # Exclude Life Stock from the hints as some of them are considered as progression for Fahl, but isn't really
+    # exciting when hinted
+    excluded_items = ["Life Stock", "EkeEke"]
+
+    progression_items = [item for item in multiworld.itempool if item.advancement and
+                         item.name not in excluded_items]
+
+    local_own_progression_items = [item for item in progression_items if item.player == this_player
+                                   and item.location.player == this_player]
+    remote_own_progression_items = [item for item in progression_items if item.player == this_player
+                                    and item.location.player != this_player]
+    local_unowned_progression_items = [item for item in progression_items if item.player != this_player
+                                       and item.location.player == this_player]
+    remote_unowned_progression_items = [item for item in progression_items if item.player != this_player
+                                        and item.location.player != this_player]
+
+    # Hint-type #1: Own progression item in own world
+    for item in local_own_progression_items:
+        region_hint = item.location.parent_region.hint_text
+        hint_texts.append(f"I can sense {item.name} {region_hint}.")
+
+    # Hint-type #2: Remote progression item in own world
+    for item in local_unowned_progression_items:
+        other_player = multiworld.get_player_name(item.player)
+        own_local_region = item.location.parent_region.hint_text
+        hint_texts.append(f"You might find something useful for {other_player} {own_local_region}. "
+                          f"It is a {item.name}, to be precise.")
+
+    # Hint-type #3: Own progression item in remote location
+    for item in remote_own_progression_items:
+        other_player = multiworld.get_player_name(item.location.player)
+        if item.location.game == "Landstalker - The Treasures of King Nole":
+            region_hint_name = item.location.parent_region.hint_text
+            hint_texts.append(f"If you need {item.name}, tell {other_player} to look {region_hint_name}.")
+        else:
+            [word_1, word_2] = generate_blurry_location_hint(item.location, random)
+            if word_1 == "mysterious" and word_2 == "place":
+                continue
+            hint_texts.append(f"Looking for {item.name}? I read something about {other_player}'s world... "
+                              f"Does \"{word_1} {word_2}\" remind you anything?")
+
+    # Hint-type #4: Remote progression item in remote location
+    for item in remote_unowned_progression_items:
+        owner_name = multiworld.get_player_name(item.player)
+        if item.location.player == item.player:
+            world_name = "their own world"
+        else:
+            world_name = f"{multiworld.get_player_name(item.location.player)}'s world"
+        [word_1, word_2] = generate_blurry_location_hint(item.location, random)
+        if word_1 == "mysterious" and word_2 == "place":
+            continue
+        hint_texts.append(f"I once found {owner_name}'s {item.name} in {world_name}. "
+                          f"I remember \"{word_1} {word_2}\"... Does that make any sense?")
+
+    # Hint-type #5: Jokes
+    other_player_names = [multiworld.get_player_name(player) for player in multiworld.player_ids if
+                          player != this_player]
+    if other_player_names:
+        random_player_name = random.choice(other_player_names)
+        hint_texts.append(f"{random_player_name}'s world is objectively better than yours.")
+
+    hint_texts.append(f"Have you found all of the {len(multiworld.itempool)} items in this universe?")
+
+    local_progression_item_count = len(local_own_progression_items) + len(local_unowned_progression_items)
+    remote_progression_item_count = len(remote_own_progression_items) + len(remote_unowned_progression_items)
+    percent = (local_progression_item_count / (local_progression_item_count + remote_progression_item_count)) * 100
+    hint_texts.append(f"Did you know that your world contains {int(percent)} percent of all progression items?")
+
+    # Shuffle hint texts and hint source names, and pair the two of those together
+    hint_texts = list(set(hint_texts))
+    random.shuffle(hint_texts)
+
+    hint_count = world.options.hint_count.value
+    del hint_texts[hint_count:]
+
+    hint_source_names = [source["description"] for source in HINT_SOURCES_JSON if
+                         source["description"].startswith("Foxy")]
+    random.shuffle(hint_source_names)
+
+    for i in range(hint_count):
+        hints[hint_source_names[i]] = hint_texts[i]
+    return hints
diff --git a/worlds/landstalker/Items.py b/worlds/landstalker/Items.py
new file mode 100644
index 0000000000..ad7efa1cb2
--- /dev/null
+++ b/worlds/landstalker/Items.py
@@ -0,0 +1,105 @@
+from typing import Dict, List, NamedTuple
+
+from BaseClasses import Item, ItemClassification
+
+BASE_ITEM_ID = 4000
+
+
+class LandstalkerItem(Item):
+    game: str = "Landstalker - The Treasures of King Nole"
+    price_in_shops: int
+
+
+class LandstalkerItemData(NamedTuple):
+    id: int
+    classification: ItemClassification
+    price_in_shops: int
+    quantity: int = 1
+
+
+item_table: Dict[str, LandstalkerItemData] = {
+    "EkeEke":               LandstalkerItemData(0,  ItemClassification.filler,      20,     0),  # Variable amount
+    "Magic Sword":          LandstalkerItemData(1,  ItemClassification.useful,      300),
+    "Sword of Ice":         LandstalkerItemData(2,  ItemClassification.useful,      300),
+    "Thunder Sword":        LandstalkerItemData(3,  ItemClassification.useful,      500),
+    "Sword of Gaia":        LandstalkerItemData(4,  ItemClassification.progression, 300),
+    "Fireproof":            LandstalkerItemData(5,  ItemClassification.progression, 150),
+    "Iron Boots":           LandstalkerItemData(6,  ItemClassification.progression, 150),
+    "Healing Boots":        LandstalkerItemData(7,  ItemClassification.useful,      300),
+    "Snow Spikes":          LandstalkerItemData(8,  ItemClassification.progression, 400),
+    "Steel Breast":         LandstalkerItemData(9,  ItemClassification.useful,      200),
+    "Chrome Breast":        LandstalkerItemData(10, ItemClassification.useful,      350),
+    "Shell Breast":         LandstalkerItemData(11, ItemClassification.useful,      500),
+    "Hyper Breast":         LandstalkerItemData(12, ItemClassification.useful,      700),
+    "Mars Stone":           LandstalkerItemData(13, ItemClassification.useful,      150),
+    "Moon Stone":           LandstalkerItemData(14, ItemClassification.useful,      150),
+    "Saturn Stone":         LandstalkerItemData(15, ItemClassification.useful,      200),
+    "Venus Stone":          LandstalkerItemData(16, ItemClassification.useful,      300),
+    # Awakening Book: 17
+    "Detox Grass":          LandstalkerItemData(18, ItemClassification.filler,      25,     9),
+    "Statue of Gaia":       LandstalkerItemData(19, ItemClassification.filler,      75,     12),
+    "Golden Statue":        LandstalkerItemData(20, ItemClassification.filler,      150,    10),
+    "Mind Repair":          LandstalkerItemData(21, ItemClassification.filler,      25,     7),
+    "Casino Ticket":        LandstalkerItemData(22, ItemClassification.progression, 50),
+    "Axe Magic":            LandstalkerItemData(23, ItemClassification.progression, 400),
+    "Blue Ribbon":          LandstalkerItemData(24, ItemClassification.filler,      50),
+    "Buyer Card":           LandstalkerItemData(25, ItemClassification.progression, 150),
+    "Lantern":              LandstalkerItemData(26, ItemClassification.progression, 200),
+    "Garlic":               LandstalkerItemData(27, ItemClassification.progression, 150,    2),
+    "Anti Paralyze":        LandstalkerItemData(28, ItemClassification.filler,      20,     7),
+    "Statue of Jypta":      LandstalkerItemData(29, ItemClassification.useful,      250),
+    "Sun Stone":            LandstalkerItemData(30, ItemClassification.progression, 300),
+    "Armlet":               LandstalkerItemData(31, ItemClassification.progression, 300),
+    "Einstein Whistle":     LandstalkerItemData(32, ItemClassification.progression, 200),
+    "Blue Jewel":           LandstalkerItemData(33, ItemClassification.progression, 500,    0),  # Detox Book in base game
+    "Yellow Jewel":         LandstalkerItemData(34, ItemClassification.progression, 500,    0),  # AntiCurse Book in base game
+    # Record Book: 35
+    # Spell Book: 36
+    # Hotel Register: 37
+    # Island Map: 38
+    "Lithograph":           LandstalkerItemData(39, ItemClassification.progression, 250),
+    "Red Jewel":            LandstalkerItemData(40, ItemClassification.progression, 500,    0),
+    "Pawn Ticket":          LandstalkerItemData(41, ItemClassification.useful,      200,    4),
+    "Purple Jewel":         LandstalkerItemData(42, ItemClassification.progression, 500,    0),
+    "Gola's Eye":           LandstalkerItemData(43, ItemClassification.progression, 400),
+    "Death Statue":         LandstalkerItemData(44, ItemClassification.filler,      150),
+    "Dahl":                 LandstalkerItemData(45, ItemClassification.filler,      100,    18),
+    "Restoration":          LandstalkerItemData(46, ItemClassification.filler,      40,     9),
+    "Logs":                 LandstalkerItemData(47, ItemClassification.progression, 100,    2),
+    "Oracle Stone":         LandstalkerItemData(48, ItemClassification.progression, 250),
+    "Idol Stone":           LandstalkerItemData(49, ItemClassification.progression, 200),
+    "Key":                  LandstalkerItemData(50, ItemClassification.progression, 150),
+    "Safety Pass":          LandstalkerItemData(51, ItemClassification.progression, 250),
+    "Green Jewel":          LandstalkerItemData(52, ItemClassification.progression, 500,    0),  # No52 in base game
+    "Bell":                 LandstalkerItemData(53, ItemClassification.useful,      200),
+    "Short Cake":           LandstalkerItemData(54, ItemClassification.useful,      250),
+    "Gola's Nail":          LandstalkerItemData(55, ItemClassification.progression, 800),
+    "Gola's Horn":          LandstalkerItemData(56, ItemClassification.progression, 800),
+    "Gola's Fang":          LandstalkerItemData(57, ItemClassification.progression, 800),
+    # Broad Sword: 58
+    # Leather Breast: 59
+    # Leather Boots: 60
+    # No Ring: 61
+    "Life Stock":           LandstalkerItemData(62, ItemClassification.filler,      250,    0),  # Variable amount
+    "No Item":              LandstalkerItemData(63, ItemClassification.filler,      0,      0),
+    "1 Gold":               LandstalkerItemData(64, ItemClassification.filler,      1),
+    "20 Golds":             LandstalkerItemData(65, ItemClassification.filler,      20,     15),
+    "50 Golds":             LandstalkerItemData(66, ItemClassification.filler,      50,     7),
+    "100 Golds":            LandstalkerItemData(67, ItemClassification.filler,      100,    5),
+    "200 Golds":            LandstalkerItemData(68, ItemClassification.useful,      200,    2),
+
+    "Progressive Armor":    LandstalkerItemData(69, ItemClassification.useful,      250,    0),
+    "Kazalt Jewel":         LandstalkerItemData(70, ItemClassification.progression, 500,    0)
+}
+
+
+def get_weighted_filler_item_names():
+    weighted_item_names: List[str] = []
+    for name, data in item_table.items():
+        if data.classification == ItemClassification.filler:
+            weighted_item_names += [name for _ in range(data.quantity)]
+    return weighted_item_names
+
+
+def build_item_name_to_id_table():
+    return {name: data.id + BASE_ITEM_ID for name, data in item_table.items()}
diff --git a/worlds/landstalker/Locations.py b/worlds/landstalker/Locations.py
new file mode 100644
index 0000000000..5e42fbecda
--- /dev/null
+++ b/worlds/landstalker/Locations.py
@@ -0,0 +1,53 @@
+from typing import Dict, Optional
+
+from BaseClasses import Location
+from .Regions import LandstalkerRegion
+from .data.item_source import ITEM_SOURCES_JSON
+
+BASE_LOCATION_ID = 4000
+BASE_GROUND_LOCATION_ID = BASE_LOCATION_ID + 256
+BASE_SHOP_LOCATION_ID = BASE_GROUND_LOCATION_ID + 30
+BASE_REWARD_LOCATION_ID = BASE_SHOP_LOCATION_ID + 50
+
+
+class LandstalkerLocation(Location):
+    game: str = "Landstalker - The Treasures of King Nole"
+    type_string: str
+    price: int = 0
+
+    def __init__(self, player: int, name: str, location_id: Optional[int], region: LandstalkerRegion, type_string: str):
+        super().__init__(player, name, location_id, region)
+        self.type_string = type_string
+
+
+def create_locations(player: int, regions_table: Dict[str, LandstalkerRegion], name_to_id_table: Dict[str, int]):
+    # Create real locations from the data inside the corresponding JSON file
+    for data in ITEM_SOURCES_JSON:
+        region_id = data["nodeId"]
+        region = regions_table[region_id]
+        new_location = LandstalkerLocation(player, data["name"], name_to_id_table[data["name"]], region, data["type"])
+        region.locations.append(new_location)
+
+    # Create a specific end location that will contain a fake win-condition item
+    end_location = LandstalkerLocation(player, "End", None, regions_table["end"], "reward")
+    regions_table["end"].locations.append(end_location)
+
+
+def build_location_name_to_id_table():
+    location_name_to_id_table = {}
+
+    for data in ITEM_SOURCES_JSON:
+        if data["type"] == "chest":
+            location_id = BASE_LOCATION_ID + int(data["chestId"])
+        elif data["type"] == "ground":
+            location_id = BASE_GROUND_LOCATION_ID + int(data["groundItemId"])
+        elif data["type"] == "shop":
+            location_id = BASE_SHOP_LOCATION_ID + int(data["shopItemId"])
+        else:  # if data["type"] == "reward":
+            location_id = BASE_REWARD_LOCATION_ID + int(data["rewardId"])
+        location_name_to_id_table[data["name"]] = location_id
+
+    # Win condition location ID
+    location_name_to_id_table["Gola"] = BASE_REWARD_LOCATION_ID + 10
+
+    return location_name_to_id_table
diff --git a/worlds/landstalker/Options.py b/worlds/landstalker/Options.py
new file mode 100644
index 0000000000..65ffd2c1f3
--- /dev/null
+++ b/worlds/landstalker/Options.py
@@ -0,0 +1,228 @@
+from dataclasses import dataclass
+
+from Options import Choice, DeathLink, DefaultOnToggle, PerGameCommonOptions, Range, Toggle
+
+
+class LandstalkerGoal(Choice):
+    """
+    The goal to accomplish in order to complete the seed.
+    - Beat Gola: beat the usual final boss (same as vanilla)
+    - Reach Kazalt: find the jewels and take the teleporter to Kazalt
+    - Beat Dark Nole: the door to King Nole's fight brings you into a final dungeon with an absurdly hard boss you have
+        to beat to win the game
+    """
+    display_name = "Goal"
+
+    option_beat_gola = 0
+    option_reach_kazalt = 1
+    option_beat_dark_nole = 2
+
+    default = 0
+
+
+class JewelCount(Range):
+    """
+    Determines the number of jewels to find to be able to reach Kazalt.
+    """
+    display_name = "Jewel Count"
+    range_start = 0
+    range_end = 9
+    default = 5
+
+
+class ProgressiveArmors(DefaultOnToggle):
+    """
+    When obtaining an armor, you get the next armor tier instead of getting the specific armor tier that was
+    placed here by randomization. Enabling this provides a smoother progression.
+    """
+    display_name = "Progressive Armors"
+
+
+class UseRecordBook(DefaultOnToggle):
+    """
+    Gives a Record Book item in starting inventory, allowing to save the game anywhere.
+    This makes the game significantly less frustrating and enables interesting save-scumming strategies in some places.
+    """
+    display_name = "Use Record Book"
+
+
+class UseSpellBook(DefaultOnToggle):
+    """
+    Gives a Spell Book item in starting inventory, allowing to warp back to the starting location at any time.
+    This prevents any kind of softlock and makes the world easier to explore.
+    """
+    display_name = "Use Spell Book"
+
+
+class EnsureEkeEkeInShops(DefaultOnToggle):
+    """
+    Ensures an EkeEke will always be for sale in one shop per region in the game.
+    Disabling this can lead to frustrating situations where you cannot refill your health items and might get locked.
+    """
+    display_name = "Ensure EkeEke in Shops"
+
+
+class RemoveGumiBoulder(Toggle):
+    """
+    Removes the boulder between Gumi and Ryuma, which is usually a one-way path.
+    This makes the vanilla early game (Massan, Gumi...) more easily accessible when starting outside it.
+    """
+    display_name = "Remove Boulder After Gumi"
+
+
+class EnemyJumpingInLogic(Toggle):
+    """
+    Adds jumping on enemies' heads as a logical rule.
+    This gives access to Mountainous Area from Lake Shrine sector and to the cliff chest behind a magic tree near Mir Tower.
+    These tricks not being easy, you should leave this disabled until practiced.
+    """
+    display_name = "Enemy Jumping in Logic"
+
+
+class TreeCuttingGlitchInLogic(Toggle):
+    """
+    Adds tree-cutting glitch as a logical rule, enabling access to both chests behind magic trees in Mir Tower Sector
+    without having Axe Magic.
+    """
+    display_name = "Tree-cutting Glitch in Logic"
+
+
+class DamageBoostingInLogic(Toggle):
+    """
+    Adds damage boosting as a logical rule, removing any requirements involving Iron Boots or Fireproof Boots.
+    Who doesn't like walking on spikes and lava?
+    """
+    display_name = "Damage Boosting in Logic"
+
+
+class WhistleUsageBehindTrees(DefaultOnToggle):
+    """
+    In Greenmaze, Einstein Whistle can only be used to call Cutter from the intended side by default.
+    Enabling this allows using Einstein Whistle from both sides of the magic trees.
+    This is only useful in seeds starting in the "waterfall" spawn region or where teleportation trees are made open from the start.
+    """
+    display_name = "Allow Using Einstein Whistle Behind Trees"
+
+
+class SpawnRegion(Choice):
+    """
+    List of spawn locations that can be picked by the randomizer.
+    It is advised to keep Massan as your spawn location for your first few seeds.
+    Picking a late-game location can make the seed significantly harder, both for logic and combat.
+    """
+    display_name = "Starting Region"
+
+    option_massan = 0
+    option_gumi = 1
+    option_kado = 2
+    option_waterfall = 3
+    option_ryuma = 4
+    option_mercator = 5
+    option_verla = 6
+    option_greenmaze = 7
+    option_destel = 8
+
+    default = 0
+
+
+class TeleportTreeRequirements(Choice):
+    """
+    Determines the requirements to be able to use a teleport tree pair.
+    - None: All teleport trees are available right from the start
+    - Clear Tibor: Tibor needs to be cleared before unlocking any tree
+    - Visit Trees: Both trees from a tree pair need to be visited to teleport between them
+    Vanilla behavior is "Clear Tibor And Visit Trees"
+    """
+    display_name = "Teleportation Trees Requirements"
+
+    option_none = 0
+    option_clear_tibor = 1
+    option_visit_trees = 2
+    option_clear_tibor_and_visit_trees = 3
+
+    default = 3
+
+
+class ShuffleTrees(Toggle):
+    """
+    If enabled, all teleportation trees will be shuffled into new pairs.
+    """
+    display_name = "Shuffle Teleportation Trees"
+
+
+class ReviveUsingEkeeke(DefaultOnToggle):
+    """
+    In the vanilla game, when you die, you are automatically revived by Friday using an EkeEke.
+    This setting allows disabling this feature, making the game extremely harder.
+    USE WITH CAUTION!
+    """
+    display_name = "Revive Using EkeEke"
+
+
+class ShopPricesFactor(Range):
+    """
+    Applies a percentage factor on all prices in shops. Having higher prices can lead to a bit of gold farming, which
+    can make seeds longer but also sometimes more frustrating.
+    """
+    display_name = "Shop Prices Factor (%)"
+    range_start = 50
+    range_end = 200
+    default = 100
+
+
+class CombatDifficulty(Choice):
+    """
+    Determines the overall combat difficulty in the game by modifying both monsters HP & damage.
+    - Peaceful: 50% HP & damage
+    - Easy: 75% HP & damage
+    - Normal: 100% HP & damage
+    - Hard: 140% HP & damage
+    - Insane: 200% HP & damage
+    """
+    display_name = "Combat Difficulty"
+
+    option_peaceful = 0
+    option_easy = 1
+    option_normal = 2
+    option_hard = 3
+    option_insane = 4
+
+    default = 2
+
+
+class HintCount(Range):
+    """
+    Determines the number of Foxy NPCs that will be scattered across the world, giving various types of hints
+    """
+    display_name = "Hint Count"
+    range_start = 0
+    range_end = 25
+    default = 12
+
+
+@dataclass
+class LandstalkerOptions(PerGameCommonOptions):
+    goal: LandstalkerGoal
+    spawn_region: SpawnRegion
+    jewel_count: JewelCount
+    progressive_armors: ProgressiveArmors
+    use_record_book: UseRecordBook
+    use_spell_book: UseSpellBook
+
+    shop_prices_factor: ShopPricesFactor
+    combat_difficulty: CombatDifficulty
+
+    teleport_tree_requirements: TeleportTreeRequirements
+    shuffle_trees: ShuffleTrees
+
+    ensure_ekeeke_in_shops: EnsureEkeEkeInShops
+    remove_gumi_boulder: RemoveGumiBoulder
+    allow_whistle_usage_behind_trees: WhistleUsageBehindTrees
+    handle_damage_boosting_in_logic: DamageBoostingInLogic
+    handle_enemy_jumping_in_logic: EnemyJumpingInLogic
+    handle_tree_cutting_glitch_in_logic: TreeCuttingGlitchInLogic
+
+    hint_count: HintCount
+
+    revive_using_ekeeke: ReviveUsingEkeeke
+    death_link: DeathLink
diff --git a/worlds/landstalker/Regions.py b/worlds/landstalker/Regions.py
new file mode 100644
index 0000000000..21704194f1
--- /dev/null
+++ b/worlds/landstalker/Regions.py
@@ -0,0 +1,118 @@
+from typing import Dict, List, NamedTuple, Optional, TYPE_CHECKING
+
+from BaseClasses import MultiWorld, Region
+from .data.world_node import WORLD_NODES_JSON
+from .data.world_path import WORLD_PATHS_JSON
+from .data.world_region import WORLD_REGIONS_JSON
+from .data.world_teleport_tree import WORLD_TELEPORT_TREES_JSON
+
+if TYPE_CHECKING:
+    from . import LandstalkerWorld
+
+
+class LandstalkerRegion(Region):
+    code: str
+
+    def __init__(self, code: str, name: str, player: int, multiworld: MultiWorld, hint: Optional[str] = None):
+        super().__init__(name, player, multiworld, hint)
+        self.code = code
+
+
+class LandstalkerRegionData(NamedTuple):
+    locations: Optional[List[str]]
+    region_exits: Optional[List[str]]
+
+
+def create_regions(world: "LandstalkerWorld"):
+    regions_table: Dict[str, LandstalkerRegion] = {}
+    multiworld = world.multiworld
+    player = world.player
+
+    # Create the hardcoded starting "Menu" region
+    menu_region = LandstalkerRegion("menu", "Menu", player, multiworld)
+    regions_table["menu"] = menu_region
+    multiworld.regions.append(menu_region)
+
+    # Create regions from world_nodes
+    for code, region_data in WORLD_NODES_JSON.items():
+        random_hint_name = None
+        if "hints" in region_data:
+            random_hint_name = multiworld.random.choice(region_data["hints"])
+        region = LandstalkerRegion(code, region_data["name"], player, multiworld, random_hint_name)
+        regions_table[code] = region
+        multiworld.regions.append(region)
+
+    # Create exits/entrances from world_paths
+    for data in WORLD_PATHS_JSON:
+        two_way = data["twoWay"] if "twoWay" in data else False
+        create_entrance(data["fromId"], data["toId"], two_way, regions_table)
+
+    # Create a path between the fake Menu location and the starting location
+    starting_region = get_starting_region(world, regions_table)
+    menu_region.connect(starting_region, f"menu -> {starting_region.code}")
+
+    add_specific_paths(world, regions_table)
+
+    return regions_table
+
+
+def add_specific_paths(world: "LandstalkerWorld", regions_table: Dict[str, LandstalkerRegion]):
+    # If Gumi boulder is removed, add a path from "route_gumi_ryuma" to "gumi"
+    if world.options.remove_gumi_boulder == 1:
+        create_entrance("route_gumi_ryuma", "gumi", False, regions_table)
+
+    # If enemy jumping is in logic, Mountainous Area can be reached from route to Lake Shrine by doing a "ghost jump"
+    # at crossroads map
+    if world.options.handle_enemy_jumping_in_logic == 1:
+        create_entrance("route_lake_shrine", "route_lake_shrine_cliff", False, regions_table)
+
+    # If using Einstein Whistle behind trees is allowed, add a new logic path there to reflect that change
+    if world.options.allow_whistle_usage_behind_trees == 1:
+        create_entrance("greenmaze_post_whistle", "greenmaze_pre_whistle", False, regions_table)
+
+
+def create_entrance(from_id: str, to_id: str, two_way: bool, regions_table: Dict[str, LandstalkerRegion]):
+    created_entrances = []
+
+    name = from_id + " -> " + to_id
+    from_region = regions_table[from_id]
+    to_region = regions_table[to_id]
+
+    created_entrances.append(from_region.connect(to_region, name))
+
+    if two_way:
+        reverse_name = to_id + " -> " + from_id
+        created_entrances.append(to_region.connect(from_region, reverse_name))
+
+    return created_entrances
+
+
+def get_starting_region(world: "LandstalkerWorld", regions_table: Dict[str, LandstalkerRegion]):
+    # Most spawn locations have the same name as the region they are bound to, but a few vary.
+    spawn_id = world.options.spawn_region.current_key
+    if spawn_id == "waterfall":
+        return regions_table["greenmaze_post_whistle"]
+    elif spawn_id == "kado":
+        return regions_table["route_gumi_ryuma"]
+    elif spawn_id == "greenmaze":
+        return regions_table["greenmaze_pre_whistle"]
+    return regions_table[spawn_id]
+
+
+def get_darkenable_regions():
+    return {data["name"]: data["nodeIds"] for data in WORLD_REGIONS_JSON if "darkMapIds" in data}
+
+
+def load_teleport_trees():
+    pairs = []
+    for pair in WORLD_TELEPORT_TREES_JSON:
+        first_tree = {
+            'name':   pair[0]["name"],
+            'region': pair[0]["nodeId"]
+        }
+        second_tree = {
+            'name':   pair[1]["name"],
+            'region': pair[1]["nodeId"]
+        }
+        pairs.append([first_tree, second_tree])
+    return pairs
diff --git a/worlds/landstalker/Rules.py b/worlds/landstalker/Rules.py
new file mode 100644
index 0000000000..51357c9480
--- /dev/null
+++ b/worlds/landstalker/Rules.py
@@ -0,0 +1,134 @@
+from typing import List, TYPE_CHECKING
+
+from BaseClasses import CollectionState
+from .data.world_path import WORLD_PATHS_JSON
+from .Locations import LandstalkerLocation
+from .Regions import LandstalkerRegion
+
+if TYPE_CHECKING:
+    from . import LandstalkerWorld
+
+
+def _landstalker_has_visited_regions(state: CollectionState, player: int, regions):
+    return all([state.can_reach(region, None, player) for region in regions])
+
+
+def _landstalker_has_health(state: CollectionState, player: int, health):
+    return state.has("Life Stock", player, health)
+
+
+# multiworld: MultiWorld, player: int, regions_table: Dict[str, Region], dark_region_ids: List[str]
+def create_rules(world: "LandstalkerWorld"):
+    # Item & exploration requirements to take paths
+    add_path_requirements(world)
+    add_specific_path_requirements(world)
+
+    # Location rules to forbid some item types depending on location types
+    add_location_rules(world)
+
+    # Win condition
+    world.multiworld.completion_condition[world.player] = lambda state: state.has("King Nole's Treasure", world.player)
+
+
+# multiworld: MultiWorld, player: int, regions_table: Dict[str, Region],
+#                           dark_region_ids: List[str]
+def add_path_requirements(world: "LandstalkerWorld"):
+    for data in WORLD_PATHS_JSON:
+        name = data["fromId"] + " -> " + data["toId"]
+
+        # Determine required items to reach this region
+        required_items = data["requiredItems"] if "requiredItems" in data else []
+        if "itemsPlacedWhenCrossing" in data:
+            required_items += data["itemsPlacedWhenCrossing"]
+
+        if data["toId"] in world.dark_region_ids:
+            # Make Lantern required to reach the randomly selected dark regions
+            required_items.append("Lantern")
+        if world.options.handle_damage_boosting_in_logic:
+            # If damage boosting is handled in logic, remove all iron boots & fireproof requirements
+            required_items = [item for item in required_items if item != "Iron Boots" and item != "Fireproof"]
+
+        # Determine required other visited regions to reach this region
+        required_region_ids = data["requiredNodes"] if "requiredNodes" in data else []
+        required_regions = [world.regions_table[region_id] for region_id in required_region_ids]
+
+        if not (required_items or required_regions):
+            continue
+
+        # Create the rule lambda using those requirements
+        access_rule = make_path_requirement_lambda(world.player, required_items, required_regions)
+        world.multiworld.get_entrance(name, world.player).access_rule = access_rule
+
+        # If two-way, also apply the rule to the opposite path
+        if "twoWay" in data and data["twoWay"] is True:
+            reverse_name = data["toId"] + " -> " + data["fromId"]
+            world.multiworld.get_entrance(reverse_name, world.player).access_rule = access_rule
+
+
+def add_specific_path_requirements(world: "LandstalkerWorld"):
+    multiworld = world.multiworld
+    player = world.player
+
+    # Make the jewels required to reach Kazalt
+    jewel_count = world.options.jewel_count.value
+    path_to_kazalt = multiworld.get_entrance("king_nole_cave -> kazalt", player)
+    if jewel_count < 6:
+        # 5- jewels => the player needs to find as many uniquely named jewel items
+        required_jewels = ["Red Jewel", "Purple Jewel", "Green Jewel", "Blue Jewel", "Yellow Jewel"]
+        del required_jewels[jewel_count:]
+        path_to_kazalt.access_rule = make_path_requirement_lambda(player, required_jewels, [])
+    else:
+        # 6+ jewels => the player needs to find as many "Kazalt Jewel" items
+        path_to_kazalt.access_rule = lambda state: state.has("Kazalt Jewel", player, jewel_count)
+
+    # If enemy jumping is enabled, Mir Tower sector first tree can be bypassed to reach the elevated ledge
+    if world.options.handle_enemy_jumping_in_logic == 1:
+        remove_requirements_for(world, "mir_tower_sector -> mir_tower_sector_tree_ledge")
+
+    # Both trees in Mir Tower sector can be abused using tree cutting glitch
+    if world.options.handle_tree_cutting_glitch_in_logic == 1:
+        remove_requirements_for(world, "mir_tower_sector -> mir_tower_sector_tree_ledge")
+        remove_requirements_for(world, "mir_tower_sector -> mir_tower_sector_tree_coast")
+
+    # If Whistle can be used from behind the trees, it adds a new path that requires the whistle as well
+    if world.options.allow_whistle_usage_behind_trees == 1:
+        entrance = multiworld.get_entrance("greenmaze_post_whistle -> greenmaze_pre_whistle", player)
+        entrance.access_rule = make_path_requirement_lambda(player, ["Einstein Whistle"], [])
+
+
+def make_path_requirement_lambda(player: int, required_items: List[str], required_regions: List[LandstalkerRegion]):
+    """
+    Lambdas are created in a for loop, so values need to be captured
+    """
+    return lambda state: \
+        state.has_all(set(required_items), player) and _landstalker_has_visited_regions(state, player, required_regions)
+
+
+def make_shop_location_requirement_lambda(player: int, location: LandstalkerLocation):
+    """
+    Lambdas are created in a for loop, so values need to be captured
+    """
+    # Prevent local golds in shops, as well as duplicates
+    other_locations_in_shop = [loc for loc in location.parent_region.locations if loc != location]
+    return lambda item: \
+        item.player != player \
+        or (" Gold" not in item.name
+            and item.name not in [loc.item.name for loc in other_locations_in_shop if loc.item is not None])
+
+
+def remove_requirements_for(world: "LandstalkerWorld", entrance_name: str):
+    entrance = world.multiworld.get_entrance(entrance_name, world.player)
+    entrance.access_rule = lambda state: True
+
+
+def add_location_rules(world: "LandstalkerWorld"):
+    location: LandstalkerLocation
+    for location in world.multiworld.get_locations(world.player):
+        if location.type_string == "ground":
+            location.item_rule = lambda item: not (item.player == world.player and " Gold" in item.name)
+        elif location.type_string == "shop":
+            location.item_rule = make_shop_location_requirement_lambda(world.player, location)
+
+    # Add a special rule for Fahl
+    fahl_location = world.multiworld.get_location("Mercator: Fahl's dojo challenge reward", world.player)
+    fahl_location.access_rule = lambda state: _landstalker_has_health(state, world.player, 15)
diff --git a/worlds/landstalker/__init__.py b/worlds/landstalker/__init__.py
new file mode 100644
index 0000000000..baa1deb620
--- /dev/null
+++ b/worlds/landstalker/__init__.py
@@ -0,0 +1,262 @@
+from typing import ClassVar, Set
+
+from BaseClasses import LocationProgressType, Tutorial
+from worlds.AutoWorld import WebWorld, World
+from .Hints import *
+from .Items import *
+from .Locations import *
+from .Options import JewelCount, LandstalkerGoal, LandstalkerOptions, ProgressiveArmors, TeleportTreeRequirements
+from .Regions import *
+from .Rules import *
+
+
+class LandstalkerWeb(WebWorld):
+    theme = "grass"
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setting up the Landstalker Randomizer software on your computer.",
+        "English",
+        "landstalker_setup_en.md",
+        "landstalker_setup/en",
+        ["Dinopony"]
+    )]
+
+
+class LandstalkerWorld(World):
+    """
+    Landstalker: The Treasures of King Nole is a classic Action-RPG with an isometric view (also known as "2.5D").
+    You play Nigel, a treasure hunter exploring the island of Mercator trying to find the legendary treasure.
+    Roam freely on the island, get stronger to beat dungeons and gather the required key items in order to reach the
+    hidden palace and claim the treasure.
+    """
+    game = "Landstalker - The Treasures of King Nole"
+    options_dataclass = LandstalkerOptions
+    options: LandstalkerOptions
+    required_client_version = (0, 4, 4)
+    web = LandstalkerWeb()
+
+    item_name_to_id = build_item_name_to_id_table()
+    location_name_to_id = build_location_name_to_id_table()
+
+    cached_spheres: ClassVar[List[Set[Location]]]
+
+    def __init__(self, multiworld, player):
+        super().__init__(multiworld, player)
+        self.regions_table: Dict[str, LandstalkerRegion] = {}
+        self.dark_dungeon_id = "None"
+        self.dark_region_ids = []
+        self.teleport_tree_pairs = []
+        self.jewel_items = []
+
+    def fill_slot_data(self) -> dict:
+        # Generate hints.
+        self.adjust_shop_prices()
+        hints = Hints.generate_random_hints(self)
+        hints["Lithograph"] = Hints.generate_lithograph_hint(self)
+        hints["Oracle Stone"] = f"It shows {self.dark_dungeon_id}\nenshrouded in darkness."
+
+        # Put options, locations' contents and some additional data inside slot data
+        options = [
+            "goal", "jewel_count", "progressive_armors", "use_record_book", "use_spell_book", "shop_prices_factor",
+            "combat_difficulty", "teleport_tree_requirements", "shuffle_trees", "ensure_ekeeke_in_shops",
+            "remove_gumi_boulder", "allow_whistle_usage_behind_trees", "handle_damage_boosting_in_logic",
+            "handle_enemy_jumping_in_logic", "handle_tree_cutting_glitch_in_logic", "hint_count", "death_link",
+            "revive_using_ekeeke",
+        ]
+
+        slot_data = self.options.as_dict(*options)
+        slot_data["spawn_region"] = self.options.spawn_region.current_key
+        slot_data["seed"] = self.random.randint(0, 2 ** 32 - 1)
+        slot_data["dark_region"] = self.dark_dungeon_id
+        slot_data["hints"] = hints
+        slot_data["teleport_tree_pairs"] = [[pair[0]["name"], pair[1]["name"]] for pair in self.teleport_tree_pairs]
+
+        # Type hinting for location.
+        location: LandstalkerLocation
+        slot_data["location_prices"] = {
+            location.name: location.price for location in self.multiworld.get_locations(self.player) if location.price}
+
+        return slot_data
+
+    def generate_early(self):
+        # Randomly pick a set of dark regions where Lantern is needed
+        darkenable_regions = get_darkenable_regions()
+        self.dark_dungeon_id = self.random.choice(list(darkenable_regions))
+        self.dark_region_ids = darkenable_regions[self.dark_dungeon_id]
+
+    def create_regions(self):
+        self.regions_table = Regions.create_regions(self)
+        Locations.create_locations(self.player, self.regions_table, self.location_name_to_id)
+        self.create_teleportation_trees()
+
+    def create_item(self, name: str, classification_override: Optional[ItemClassification] = None) -> LandstalkerItem:
+        data = item_table[name]
+        classification = classification_override or data.classification
+        item = LandstalkerItem(name, classification, BASE_ITEM_ID + data.id, self.player)
+        item.price_in_shops = data.price_in_shops
+        return item
+
+    def create_event(self, name: str) -> LandstalkerItem:
+        return LandstalkerItem(name, ItemClassification.progression, None, self.player)
+
+    def get_filler_item_name(self) -> str:
+        return "EkeEke"
+
+    def create_items(self):
+        item_pool: List[LandstalkerItem] = []
+        for name, data in item_table.items():
+            # If item is an armor and progressive armors are enabled, transform it into a progressive armor item
+            if self.options.progressive_armors and "Breast" in name:
+                name = "Progressive Armor"
+            item_pool += [self.create_item(name) for _ in range(data.quantity)]
+
+        # If the appropriate setting is on, place one EkeEke in one shop in every town in the game
+        if self.options.ensure_ekeeke_in_shops:
+            shops_to_fill = [
+                "Massan: Shop item #1",
+                "Gumi: Inn item #1",
+                "Ryuma: Inn item",
+                "Mercator: Shop item #1",
+                "Verla: Shop item #1",
+                "Destel: Inn item",
+                "Route to Lake Shrine: Greedly's shop item #1",
+                "Kazalt: Shop item #1"
+            ]
+            for location_name in shops_to_fill:
+                self.multiworld.get_location(location_name, self.player).place_locked_item(self.create_item("EkeEke"))
+
+        # Add a fixed amount of progression Life Stock for a specific requirement (Fahl)
+        fahl_lifestock_req = 15
+        item_pool += [self.create_item("Life Stock", ItemClassification.progression) for _ in range(fahl_lifestock_req)]
+        # Add a unique progression EkeEke for a specific requirement (Cutter)
+        item_pool.append(self.create_item("EkeEke", ItemClassification.progression))
+
+        # Add a variable amount of "useful" Life Stock to the pool, depending on the amount of starting Life Stock
+        # (i.e. on the starting location)
+        starting_lifestocks = self.get_starting_health() - 4
+        lifestock_count = 80 - starting_lifestocks - fahl_lifestock_req
+        item_pool += [self.create_item("Life Stock") for _ in range(lifestock_count)]
+
+        # Add jewels to the item pool depending on the number of jewels set in generation settings
+        self.jewel_items = [self.create_item(name) for name in self.get_jewel_names(self.options.jewel_count)]
+        item_pool += self.jewel_items
+
+        # Add a pre-placed fake win condition item
+        self.multiworld.get_location("End", self.player).place_locked_item(self.create_event("King Nole's Treasure"))
+
+        # Fill the rest of the item pool with EkeEke
+        remaining_items = len(self.multiworld.get_unfilled_locations(self.player)) - len(item_pool)
+        item_pool += [self.create_item(self.get_filler_item_name()) for _ in range(remaining_items)]
+
+        self.multiworld.itempool += item_pool
+
+    def create_teleportation_trees(self):
+        self.teleport_tree_pairs = load_teleport_trees()
+
+        def pairwise(iterable):
+            """Yields pairs of elements from the given list -> [0,1], [2,3]..."""
+            a = iter(iterable)
+            return zip(a, a)
+
+        # Shuffle teleport tree pairs if the matching setting is on
+        if self.options.shuffle_trees:
+            all_trees = [item for pair in self.teleport_tree_pairs for item in pair]
+            self.random.shuffle(all_trees)
+            self.teleport_tree_pairs = [[x, y] for x, y in pairwise(all_trees)]
+
+        # If a specific setting is set, teleport trees are potentially active without visiting both sides.
+        # This means we need to add those as explorable paths for the generation algorithm.
+        teleport_trees_mode = self.options.teleport_tree_requirements.value
+        created_entrances = []
+        if teleport_trees_mode in [TeleportTreeRequirements.option_none, TeleportTreeRequirements.option_clear_tibor]:
+            for pair in self.teleport_tree_pairs:
+                entrances = create_entrance(pair[0]["region"], pair[1]["region"], True, self.regions_table)
+                created_entrances += entrances
+
+        # Teleport trees are open but require access to Tibor to work
+        if teleport_trees_mode == TeleportTreeRequirements.option_clear_tibor:
+            for entrance in created_entrances:
+                entrance.access_rule = make_path_requirement_lambda(self.player, [], [self.regions_table["tibor"]])
+
+    def set_rules(self):
+        Rules.create_rules(self)
+
+        # In "Reach Kazalt" goal, player doesn't have access to Kazalt, King Nole's Labyrinth & King Nole's Palace.
+        # As a consequence, all locations inside those regions must be excluded, and the teleporter from
+        # King Nole's Cave to Kazalt must go to the end region instead.
+        if self.options.goal == LandstalkerGoal.option_reach_kazalt:
+            kazalt_tp = self.multiworld.get_entrance("king_nole_cave -> kazalt", self.player)
+            kazalt_tp.connected_region = self.regions_table["end"]
+
+            excluded_regions = [
+                "kazalt",
+                "king_nole_labyrinth_pre_door",
+                "king_nole_labyrinth_post_door",
+                "king_nole_labyrinth_exterior",
+                "king_nole_labyrinth_fall_from_exterior",
+                "king_nole_labyrinth_raft_entrance",
+                "king_nole_labyrinth_raft",
+                "king_nole_labyrinth_sacred_tree",
+                "king_nole_labyrinth_path_to_palace",
+                "king_nole_palace"
+            ]
+
+            for location in self.multiworld.get_locations(self.player):
+                if location.parent_region.name in excluded_regions:
+                    location.progress_type = LocationProgressType.EXCLUDED
+
+    def get_starting_health(self):
+        spawn_id = self.options.spawn_region.current_key
+        if spawn_id == "destel":
+            return 20
+        elif spawn_id == "verla":
+            return 16
+        elif spawn_id in ["waterfall", "mercator", "greenmaze"]:
+            return 10
+        else:
+            return 4
+
+    @classmethod
+    def stage_post_fill(cls, multiworld):
+        # Cache spheres for hint calculation after fill completes.
+        cls.cached_spheres = list(multiworld.get_spheres())
+
+    @classmethod
+    def stage_modify_multidata(cls, *_):
+        # Clean up all references in cached spheres after generation completes.
+        del cls.cached_spheres
+
+    def adjust_shop_prices(self):
+        # Calculate prices for items in shops once all items have their final position
+        unknown_items_price = 250
+        earlygame_price_factor = 1.0
+        endgame_price_factor = 2.0
+        factor_diff = endgame_price_factor - earlygame_price_factor
+
+        global_price_factor = self.options.shop_prices_factor / 100.0
+
+        spheres = self.cached_spheres
+        sphere_count = len(spheres)
+        for sphere_id, sphere in enumerate(spheres):
+            location: LandstalkerLocation  # after conditional, we guarantee it's this kind of location.
+            for location in sphere:
+                if location.player != self.player or location.type_string != "shop":
+                    continue
+
+                current_playthrough_progression = sphere_id / sphere_count
+                progression_price_factor = earlygame_price_factor + (current_playthrough_progression * factor_diff)
+
+                price = location.item.price_in_shops \
+                    if location.item.game == "Landstalker - The Treasures of King Nole" else unknown_items_price
+                price *= progression_price_factor
+                price *= global_price_factor
+                price -= price % 5
+                price = max(price, 5)
+                location.price = int(price)
+
+    @staticmethod
+    def get_jewel_names(count: JewelCount):
+        if count < 6:
+            return ["Red Jewel", "Purple Jewel", "Green Jewel", "Blue Jewel", "Yellow Jewel"][:count]
+
+        return ["Kazalt Jewel"] * count
diff --git a/worlds/landstalker/data/hint_source.py b/worlds/landstalker/data/hint_source.py
new file mode 100644
index 0000000000..4f22cac4bd
--- /dev/null
+++ b/worlds/landstalker/data/hint_source.py
@@ -0,0 +1,1989 @@
+HINT_SOURCES_JSON = [
+    {
+        "description": "Lithograph",
+        "smallTextbox": True
+    },
+    {
+        "description": "Oracle Stone",
+        "smallTextbox": True
+    },
+    {
+        "description": "Mercator fortune teller",
+        "textIds": [
+            654
+        ]
+    },
+    {
+        "description": "King Nole's Cave sign",
+        "textIds": [
+            253
+        ]
+    },
+    {
+        "description": "Foxy (next to Ryuma's mayor house)",
+        "entity": {
+            "mapId": 611,
+            "position": {
+                "x": 47,
+                "y": 25,
+                "z": 3
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "ryuma"
+    },
+    {
+        "description": "Foxy (behind trees in Gumi)",
+        "entity": {
+            "mapId": [602, 603],
+            "position": {
+                "x": 24,
+                "y": 35,
+                "z": 6
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "gumi"
+    },
+    {
+        "description": "Foxy (next to Mercator gates)",
+        "entity": {
+            "mapId": 454,
+            "position": {
+                "x": 18,
+                "y": 46,
+                "z": 0
+            },
+            "orientation": "se"
+        },
+        "nodeId": "route_gumi_ryuma"
+    },
+    {
+        "description": "Foxy (near basin behind Mercator)",
+        "entity": {
+            "mapId": 636,
+            "position": {
+                "x": 18,
+                "y": 27,
+                "z": 1
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "mercator"
+    },
+    {
+        "description": "Foxy (near cabin on Verla Shore)",
+        "entity": {
+            "mapId": 468,
+            "position": {
+                "x": 24,
+                "y": 45,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "verla_shore"
+    },
+    {
+        "description": "Foxy (outside Verla Mines entrance)",
+        "entity": {
+            "mapId": 470,
+            "position": {
+                "x": 24,
+                "y": 29,
+                "z": 5
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "verla_shore"
+    },
+    {
+        "description": "Foxy (room below Thieves Hideout summit)",
+        "entity": {
+            "mapId": 221,
+            "position": {
+                "x": 29,
+                "y": 19,
+                "z": 2
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "thieves_hideout_post_key"
+    },
+    {
+        "description": "Foxy (near waterfall in Mountainous Area)",
+        "entity": {
+            "mapId": 485,
+            "position": {
+                "x": 42,
+                "y": 62,
+                "z": 2
+            },
+            "orientation": "nw",
+            "highPalette": True
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in Mercator Castle left court)",
+        "entity": {
+            "mapId": 32,
+            "position": {
+                "x": 36,
+                "y": 38,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mercator"
+    },
+    {
+        "description": "Foxy (on Mercator inn balcony)",
+        "entity": {
+            "mapId": 632,
+            "position": {
+                "x": 19,
+                "y": 35,
+                "z": 4
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mercator"
+    },
+    {
+        "description": "Foxy (on a beach between Ryuma and Mercator)",
+        "entity": {
+            "mapId": 450,
+            "position": {
+                "x": 18,
+                "y": 28,
+                "z": 0
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "route_gumi_ryuma"
+    },
+    {
+        "description": "Foxy (atop Ryuma's lighthouse)",
+        "entity": {
+            "mapId": [628, 629],
+            "position": {
+                "x": 26,
+                "y": 21,
+                "z": 1
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "ryuma"
+    },
+    {
+        "description": "Foxy (looking at dead man in Thieves Hideout)",
+        "entity": {
+            "mapId": 210,
+            "position": {
+                "x": 25,
+                "y": 20,
+                "z": 2
+            },
+            "orientation": "se"
+        },
+        "nodeId": "thieves_hideout_pre_key"
+    },
+    {
+        "description": "Foxy (contemplating water near goddess statue in Thieves Hideout)",
+        "entity": {
+            "mapId": [219, 220],
+            "position": {
+                "x": 36,
+                "y": 31,
+                "z": 2
+            },
+            "orientation": "se"
+        },
+        "nodeId": "thieves_hideout_pre_key"
+    },
+    {
+        "description": "Foxy (after timed trial in Thieves Hideout)",
+        "entity": {
+            "mapId": 196,
+            "position": {
+                "x": 49,
+                "y": 24,
+                "z": 10
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "thieves_hideout_post_key"
+    },
+    {
+        "description": "Foxy (inside Mercator Castle armory tower)",
+        "entity": {
+            "mapId": 106,
+            "position": {
+                "x": 31,
+                "y": 30,
+                "z": 4
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "mercator"
+    },
+    {
+        "description": "Foxy (near Mercator Castle kitchen)",
+        "entity": {
+            "mapId": 71,
+            "position": {
+                "x": 15,
+                "y": 19,
+                "z": 1
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "mercator"
+    },
+    {
+        "description": "Foxy (in Mercator Castle library)",
+        "entity": {
+            "mapId": 73,
+            "position": {
+                "x": 18,
+                "y": 29,
+                "z": 0
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "mercator"
+    },
+    {
+        "description": "Foxy (in Mercator Dungeon main room)",
+        "entity": {
+            "mapId": 38,
+            "position": {
+                "x": 24,
+                "y": 35,
+                "z": 3
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mercator_dungeon"
+    },
+    {
+        "description": "Foxy (in hallway before tower in Mercator Dungeon)",
+        "entity": {
+            "mapId": 46,
+            "position": {
+                "x": 24,
+                "y": 13,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mercator_dungeon"
+    },
+    {
+        "description": "Foxy (atop Mercator Dungeon tower)",
+        "entity": {
+            "mapId": 35,
+            "position": {
+                "x": 31,
+                "y": 31,
+                "z": 12
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "mercator_dungeon"
+    },
+    {
+        "description": "Foxy (inside Mercator Crypt)",
+        "entity": {
+            "mapId": 647,
+            "position": {
+                "x": 30,
+                "y": 21,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "crypt"
+    },
+    {
+        "description": "Foxy (on Verla beach)",
+        "entity": {
+            "mapId": 474,
+            "position": {
+                "x": 43,
+                "y": 30,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "verla_shore"
+    },
+    {
+        "description": "Foxy (spying on house in Verla)",
+        "entity": {
+            "mapId": [711, 712],
+            "position": {
+                "x": 48,
+                "y": 29,
+                "z": 5
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "verla"
+    },
+    {
+        "description": "Foxy (on upper Verla shore, reachable from Dex exit)",
+        "entity": {
+            "mapId": 530,
+            "position": {
+                "x": 18,
+                "y": 29,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "verla_mines"
+    },
+    {
+        "description": "Foxy (in Verla Mines jar staircase room)",
+        "entity": {
+            "mapId": 235,
+            "position": {
+                "x": 42,
+                "y": 22,
+                "z": 6
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "verla_mines"
+    },
+    {
+        "description": "Foxy (in Verla Mines lizards and crates room)",
+        "entity": {
+            "mapId": 239,
+            "position": {
+                "x": 32,
+                "y": 31,
+                "z": 3,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "verla_mines"
+    },
+    {
+        "description": "Foxy (in Verla Mines lava room in Slasher sector)",
+        "entity": {
+            "mapId": 252,
+            "position": {
+                "x": 16,
+                "y": 13,
+                "z": 1,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "verla_mines"
+    },
+    {
+        "description": "Foxy (in Verla Mines room behind lava)",
+        "entity": {
+            "mapId": 265,
+            "position": {
+                "x": 13,
+                "y": 16,
+                "z": 0
+            },
+            "orientation": "se"
+        },
+        "nodeId": "verla_mines"
+    },
+    {
+        "description": "Foxy (in Verla Mines lava room in Marley sector)",
+        "entity": {
+            "mapId": 264,
+            "position": {
+                "x": 18,
+                "y": 19,
+                "z": 6,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "verla_mines"
+    },
+    {
+        "description": "Foxy (on small rocky ledge in elevator map near Kelketo shop)",
+        "entity": {
+            "mapId": 473,
+            "position": {
+                "x": 35,
+                "y": 25,
+                "z": 8
+            },
+            "orientation": "se"
+        },
+        "nodeId": "route_verla_destel"
+    },
+    {
+        "description": "Foxy (contemplating fast currents below Kelketo shop)",
+        "entity": {
+            "mapId": 481,
+            "position": {
+                "x": 40,
+                "y": 48,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "route_verla_destel"
+    },
+    {
+        "description": "Foxy (in Destel)",
+        "entity": {
+            "mapId": 726,
+            "position": {
+                "x": 48,
+                "y": 55,
+                "z": 5
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "destel"
+    },
+    {
+        "description": "Foxy (contemplating water near boatmaker house in route after Destel)",
+        "entity": {
+            "mapId": 489,
+            "position": {
+                "x": 23,
+                "y": 20,
+                "z": 1
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "route_after_destel"
+    },
+    {
+        "description": "Foxy (looking at Lake Shrine from elevated viewpoint)",
+        "entity": {
+            "mapId": 525,
+            "position": {
+                "x": 53,
+                "y": 45,
+                "z": 5
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "route_after_destel"
+    },
+    {
+        "description": "Foxy (on small floating block in Destel Well)",
+        "entity": {
+            "mapId": 275,
+            "position": {
+                "x": 27,
+                "y": 36,
+                "z": 5
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "destel_well"
+    },
+    {
+        "description": "Foxy (in Destel Well watery hub room)",
+        "entity": {
+            "mapId": 283,
+            "position": {
+                "x": 34,
+                "y": 41,
+                "z": 2
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "destel_well"
+    },
+    {
+        "description": "Foxy (in Destel Well watery room before boss)",
+        "entity": {
+            "mapId": 287,
+            "position": {
+                "x": 50,
+                "y": 46,
+                "z": 8,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "destel_well"
+    },
+    {
+        "description": "Foxy (at Destel Well exit on Lake Shrine side)",
+        "entity": {
+            "mapId": 545,
+            "position": {
+                "x": 58,
+                "y": 18,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "route_lake_shrine"
+    },
+    {
+        "description": "Foxy (at crossroads on route to Lake Shrine)",
+        "entity": {
+            "mapId": 515,
+            "position": {
+                "x": 30,
+                "y": 20,
+                "z": 4
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "route_lake_shrine"
+    },
+    {
+        "description": "Foxy (on mountainous path to Lake Shrine)",
+        "entity": {
+            "mapId": 514,
+            "position": {
+                "x": 57,
+                "y": 24,
+                "z": 1
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "route_lake_shrine"
+    },
+    {
+        "description": "Foxy (in volcano to Lake Shrine)",
+        "entity": {
+            "mapId": 522,
+            "position": {
+                "x": 50,
+                "y": 39,
+                "z": 6,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "route_lake_shrine"
+    },
+    {
+        "description": "Foxy (next to Lake Shrine door)",
+        "entity": {
+            "mapId": 524,
+            "position": {
+                "x": 24,
+                "y": 51,
+                "z": 2,
+                "halfX": True
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "lake_shrine"
+    },
+    {
+        "description": "Foxy (above Greedly's shop)",
+        "entity": {
+            "mapId": 503,
+            "position": {
+                "x": 23,
+                "y": 35,
+                "z": 8
+            },
+            "orientation": "se"
+        },
+        "nodeId": "route_lake_shrine"
+    },
+    {
+        "description": "Foxy (contemplating water near Greedly's teleport tree)",
+        "entity": {
+            "mapId": 501,
+            "position": {
+                "x": 30,
+                "y": 26,
+                "z": 5
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "route_lake_shrine"
+    },
+    {
+        "description": "Foxy (in room after golem hops riddle in Lake Shrine)",
+        "entity": {
+            "mapId": 298,
+            "position": {
+                "x": 21,
+                "y": 19,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "lake_shrine"
+    },
+    {
+        "description": "Foxy (in room next to green golem roundabout in Lake Shrine)",
+        "entity": {
+            "mapId": 293,
+            "position": {
+                "x": 19,
+                "y": 18,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "lake_shrine"
+    },
+    {
+        "description": "Foxy (in Lake Shrine 'throne room')",
+        "entity": {
+            "mapId": 327,
+            "position": {
+                "x": 31,
+                "y": 31,
+                "z": 2
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "lake_shrine"
+    },
+    {
+        "description": "Foxy (in room next to golden golems roundabout in Lake Shrine)",
+        "entity": {
+            "mapId": 353,
+            "position": {
+                "x": 31,
+                "y": 20,
+                "z": 4
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "lake_shrine"
+    },
+    {
+        "description": "Foxy (in room near white golems roundabout in Lake Shrine)",
+        "entity": {
+            "mapId": 329,
+            "position": {
+                "x": 25,
+                "y": 25,
+                "z": 2,
+                "halfY": True
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "lake_shrine"
+    },
+    {
+        "description": "Foxy (next to Mir Tower)",
+        "entity": {
+            "mapId": 475,
+            "position": {
+                "x": 34,
+                "y": 17,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_sector"
+    },
+    {
+        "description": "Foxy (on the way to Mir Tower)",
+        "entity": {
+            "mapId": 464,
+            "position": {
+                "x": 22,
+                "y": 40,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_sector"
+    },
+    {
+        "description": "Foxy (near Twinkle Village)",
+        "entity": {
+            "mapId": 461,
+            "position": {
+                "x": 20,
+                "y": 21,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_sector"
+    },
+    {
+        "description": "Foxy (inside Tibor)",
+        "entity": {
+            "mapId": 813,
+            "position": {
+                "x": 19,
+                "y": 32,
+                "z": 2
+            },
+            "orientation": "se"
+        },
+        "nodeId": "tibor"
+    },
+    {
+        "description": "Foxy (inside Tibor spikeballs room)",
+        "entity": {
+            "mapId": 810,
+            "position": {
+                "x": 21,
+                "y": 33,
+                "z": 2,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "tibor"
+    },
+    {
+        "description": "Foxy (near Kado's house)",
+        "entity": {
+            "mapId": 430,
+            "position": {
+                "x": 24,
+                "y": 27,
+                "z": 11
+            },
+            "orientation": "se"
+        },
+        "nodeId": "route_gumi_ryuma"
+    },
+    {
+        "description": "Foxy (in Gumi boulder map)",
+        "entity": {
+            "mapId": 449,
+            "position": {
+                "x": 48,
+                "y": 20,
+                "z": 1,
+                "halfX": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "route_gumi_ryuma"
+    },
+    {
+        "description": "Foxy (at Waterfall Shrine crossroads)",
+        "entity": {
+            "mapId": 425,
+            "position": {
+                "x": 22,
+                "y": 56,
+                "z": 0,
+                "halfX": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "route_massan_gumi"
+    },
+    {
+        "description": "Foxy (in upstairs room inside Waterfall Shrine)",
+        "entity": {
+            "mapId": 182,
+            "position": {
+                "x": 29,
+                "y": 19,
+                "z": 4
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "waterfall_shrine"
+    },
+    {
+        "description": "Foxy (inside Waterfall Shrine pit)",
+        "entity": {
+            "mapId": 174,
+            "position": {
+                "x": 32,
+                "y": 29,
+                "z": 1
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "waterfall_shrine"
+    },
+    {
+        "description": "Foxy (in Massan)",
+        "entity": {
+            "mapId": 592,
+            "position": {
+                "x": 24,
+                "y": 46,
+                "z": 0,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "massan"
+    },
+    {
+        "description": "Foxy (in room at the bottom of ladders in Massan Cave)",
+        "entity": {
+            "mapId": 805,
+            "position": {
+                "x": 34,
+                "y": 30,
+                "z": 2,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "massan_cave"
+    },
+    {
+        "description": "Foxy (in treasure room of Massan Cave)",
+        "entity": {
+            "mapId": 807,
+            "position": {
+                "x": 28,
+                "y": 22,
+                "z": 1
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "massan_cave"
+    },
+    {
+        "description": "Foxy (bathing in the swamp next to Swamp Shrine entrance)",
+        "entity": {
+            "mapId": 433,
+            "position": {
+                "x": 39,
+                "y": 20,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "massan_cave"
+    },
+    {
+        "description": "Foxy (in side room of Swamp Shrine accessible without Idol Stone)",
+        "entity": {
+            "mapId": 10,
+            "position": {
+                "x": 25,
+                "y": 27,
+                "z": 2,
+                "halfX": True
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "route_massan_gumi"
+    },
+    {
+        "description": "Foxy (in wooden room with falling EkeEke chest in Swamp Shrine)",
+        "entity": {
+            "mapId": 7,
+            "position": {
+                "x": 29,
+                "y": 25,
+                "z": 1,
+                "halfY": True
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "swamp_shrine"
+    },
+    {
+        "description": "Foxy (in Swamp Shrine carpet room)",
+        "entity": {
+            "mapId": 2,
+            "position": {
+                "x": 19,
+                "y": 33,
+                "z": 4
+            },
+            "orientation": "se"
+        },
+        "nodeId": "swamp_shrine"
+    },
+    {
+        "description": "Foxy (in Swamp Shrine spikeball storage room)",
+        "entity": {
+            "mapId": 16,
+            "position": {
+                "x": 25,
+                "y": 24,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "swamp_shrine"
+    },
+    {
+        "description": "Foxy (in Swamp Shrine spiked floor room)",
+        "entity": {
+            "mapId": 21,
+            "position": {
+                "x": 27,
+                "y": 17,
+                "z": 4
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "swamp_shrine"
+    },
+    {
+        "description": "Foxy (in Mercator Castle backdoor court)",
+        "entity": {
+            "mapId": 639,
+            "position": {
+                "x": 23,
+                "y": 15,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mercator"
+    },
+    {
+        "description": "Foxy (on Greenmaze / Mountainous Area crossroad)",
+        "entity": {
+            "mapId": 460,
+            "position": {
+                "x": 16,
+                "y": 27,
+                "z": 4
+            },
+            "orientation": "se"
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (below Mountainous Area bridge)",
+        "entity": {
+            "mapId": 486,
+            "position": {
+                "x": 52,
+                "y": 45,
+                "z": 5
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in Mountainous Area isolated cave)",
+        "entity": {
+            "mapId": 553,
+            "position": {
+                "x": 23,
+                "y": 21,
+                "z": 3
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in access to Zak arena inside Mountainous Area)",
+        "entity": {
+            "mapId": 487,
+            "position": {
+                "x": 44,
+                "y": 51,
+                "z": 3
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in Zak arena inside Mountainous Area)",
+        "entity": {
+            "mapId": 492,
+            "position": {
+                "x": 27,
+                "y": 55,
+                "z": 9
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in empty secret room inside Mountainous Area cave)",
+        "entity": {
+            "mapId": 552,
+            "position": {
+                "x": 24,
+                "y": 27,
+                "z": 0,
+                "halfX": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in empty visible room inside Mountainous Area cave)",
+        "entity": {
+            "mapId": 547,
+            "position": {
+                "x": 23,
+                "y": 23,
+                "z": 0,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in waterfall entrance of Mountainous Area cave)",
+        "entity": {
+            "mapId": 549,
+            "position": {
+                "x": 27,
+                "y": 40,
+                "z": 0
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (on Mir Tower sector crossroads)",
+        "entity": {
+            "mapId": 458,
+            "position": {
+                "x": 21,
+                "y": 21,
+                "z": 1
+            },
+            "orientation": "se",
+            "highPalette": True
+        },
+        "nodeId": "mir_tower_sector"
+    },
+    {
+        "description": "Foxy (near Mountainous Area teleport tree)",
+        "entity": {
+            "mapId": 484,
+            "position": {
+                "x": 38,
+                "y": 57,
+                "z": 0
+            },
+            "orientation": "sw",
+            "highPalette": True
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (on route to Mountainous Area, in rocky arch map)",
+        "entity": {
+            "mapId": 500,
+            "position": {
+                "x": 19,
+                "y": 19,
+                "z": 7
+            },
+            "orientation": "sw",
+            "highPalette": True
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (on route to Mountainous Area, in L-shaped turn map)",
+        "entity": {
+            "mapId": 540,
+            "position": {
+                "x": 16,
+                "y": 23,
+                "z": 3
+            },
+            "orientation": "se",
+            "halfY": True,
+            "highPalette": True
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in map next to Mountainous Area goddess statue)",
+        "entity": {
+            "mapId": 518,
+            "position": {
+                "x": 38,
+                "y": 33,
+                "z": 12
+            },
+            "orientation": "sw",
+            "highPalette": True
+        },
+        "nodeId": "mountainous_area"
+    },
+    {
+        "description": "Foxy (in King Nole's Cave isolated chest room)",
+        "entity": {
+            "mapId": 156,
+            "position": {
+                "x": 21,
+                "y": 27,
+                "z": 0,
+                "halfX": True
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "king_nole_cave"
+    },
+    {
+        "description": "Foxy (in King Nole's Cave crate stairway room)",
+        "entity": {
+            "mapId": 158,
+            "position": {
+                "x": 29,
+                "y": 26,
+                "z": 6
+            },
+            "orientation": "sw",
+            "highPalette": True
+        },
+        "nodeId": "king_nole_cave"
+    },
+    {
+        "description": "Foxy (in room before boulder hallway inside King Nole's Cave)",
+        "entity": {
+            "mapId": 147,
+            "position": {
+                "x": 26,
+                "y": 23,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "king_nole_cave"
+    },
+    {
+        "description": "Foxy (in empty isolated room inside King Nole's Cave)",
+        "entity": {
+            "mapId": 162,
+            "position": {
+                "x": 26,
+                "y": 17,
+                "z": 0,
+                "halfX": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "king_nole_cave"
+    },
+    {
+        "description": "Foxy (looking at the waterfall in King Nole's Cave)",
+        "entity": {
+            "mapId": 164,
+            "position": {
+                "x": 22,
+                "y": 48,
+                "z": 1
+            },
+            "orientation": "sw",
+            "highPalette": True
+        },
+        "nodeId": "king_nole_cave"
+    },
+    {
+        "description": "Foxy (in King Nole's Cave teleporter to Kazalt)",
+        "entity": {
+            "mapId": 170,
+            "position": {
+                "x": 22,
+                "y": 27,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "king_nole_cave"
+    },
+    {
+        "description": "Foxy (in access to Kazalt)",
+        "entity": {
+            "mapId": 739,
+            "position": {
+                "x": 17,
+                "y": 28,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "kazalt"
+    },
+    {
+        "description": "Foxy (on Kazalt bridge)",
+        "entity": {
+            "mapId": 737,
+            "position": {
+                "x": 46,
+                "y": 34,
+                "z": 7
+            },
+            "orientation": "se"
+        },
+        "nodeId": "kazalt"
+    },
+    {
+        "description": "Foxy (in Mir Tower 0F isolated chest room)",
+        "entity": {
+            "mapId": 757,
+            "position": {
+                "x": 19,
+                "y": 24,
+                "z": 0
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_pre_garlic"
+    },
+    {
+        "description": "Foxy (in Mir Tower activatable bridge room)",
+        "entity": {
+            "mapId": [752, 753],
+            "position": {
+                "x": 29,
+                "y": 34,
+                "z": 3,
+                "halfX": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mir_tower_pre_garlic"
+    },
+    {
+        "description": "Foxy (in Garlic trial room inside Mir Tower)",
+        "entity": {
+            "mapId": 750,
+            "position": {
+                "x": 22,
+                "y": 21,
+                "z": 4
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mir_tower_pre_garlic"
+    },
+    {
+        "description": "Foxy (in Mir Tower library)",
+        "entity": {
+            "mapId": 759,
+            "position": {
+                "x": 38,
+                "y": 29,
+                "z": 4
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (in Mir Tower priest room)",
+        "entity": {
+            "mapId": 775,
+            "position": {
+                "x": 23,
+                "y": 22,
+                "z": 1,
+                "halfX": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (right after making Miro flee with Garlic in Mir Tower)",
+        "entity": {
+            "mapId": 758,
+            "position": {
+                "x": 14,
+                "y": 34,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (in falling spikeballs room inside Mir Tower)",
+        "entity": {
+            "mapId": 761,
+            "position": {
+                "x": 14,
+                "y": 24,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (in first room of Mir Tower teleporter maze)",
+        "entity": {
+            "mapId": 767,
+            "position": {
+                "x": 18,
+                "y": 18,
+                "z": 2
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (in small spikeballs room of Mir Tower teleporter maze)",
+        "entity": {
+            "mapId": 771,
+            "position": {
+                "x": 18,
+                "y": 18,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (in wooden elevators room after Mir Tower teleporter maze)",
+        "entity": {
+            "mapId": 779,
+            "position": {
+                "x": 32,
+                "y": 20,
+                "z": 7,
+                "halfY": True
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (in room before Mir Tower boss room)",
+        "entity": {
+            "mapId": 783,
+            "position": {
+                "x": 32,
+                "y": 19,
+                "z": 2
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (in Mir Tower treasure room)",
+        "entity": {
+            "mapId": 781,
+            "position": {
+                "x": 53,
+                "y": 26,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "mir_tower_post_garlic"
+    },
+    {
+        "description": "Foxy (next to Waterfall Shrine entrance)",
+        "entity": {
+            "mapId": 426,
+            "position": {
+                "x": 46,
+                "y": 31,
+                "z": 0,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "route_massan_gumi"
+    },
+    {
+        "description": "Foxy (looking at river next to Massan teleport tree)",
+        "entity": {
+            "mapId": 424,
+            "position": {
+                "x": 44,
+                "y": 35,
+                "z": 0
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "route_massan_gumi"
+    },
+    {
+        "description": "Foxy (looking at bush at Swamp Shrine crossroads)",
+        "entity": {
+            "mapId": 440,
+            "position": {
+                "x": 25,
+                "y": 42,
+                "z": 4
+            },
+            "orientation": "nw",
+            "highPalette": True
+        },
+        "nodeId": "route_massan_gumi"
+    },
+    {
+        "description": "Foxy (at Helga's Hut crossroads)",
+        "entity": {
+            "mapId": 447,
+            "position": {
+                "x": 24,
+                "y": 17,
+                "z": 1
+            },
+            "orientation": "se",
+            "highPalette": True
+        },
+        "nodeId": "route_gumi_ryuma"
+    },
+    {
+        "description": "Foxy (near Helga's Hut)",
+        "entity": {
+            "mapId": 444,
+            "position": {
+                "x": 25,
+                "y": 26,
+                "z": 7
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "route_gumi_ryuma"
+    },
+    {
+        "description": "Foxy (in reapers room at Greenmaze entrance)",
+        "entity": {
+            "mapId": 571,
+            "position": {
+                "x": 31,
+                "y": 20,
+                "z": 6
+            },
+            "orientation": "nw",
+            "highPalette": True
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (near Greenmaze swamp)",
+        "entity": {
+            "mapId": 566,
+            "position": {
+                "x": 53,
+                "y": 51,
+                "z": 1
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (spying on Cutter in Greenmaze)",
+        "entity": {
+            "mapId": 560,
+            "position": {
+                "x": 31,
+                "y": 52,
+                "z": 9
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (in sector with red orcs making an elevator appear in Greenmaze)",
+        "entity": {
+            "mapId": 565,
+            "position": {
+                "x": 50,
+                "y": 30,
+                "z": 1
+            },
+            "orientation": "se"
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (in center of Greenmaze)",
+        "entity": {
+            "mapId": 576,
+            "position": {
+                "x": 32,
+                "y": 38,
+                "z": 5,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (in waterfall sector of Greenmaze)",
+        "entity": {
+            "mapId": 568,
+            "position": {
+                "x": 29,
+                "y": 41,
+                "z": 7,
+                "halfX": True
+            },
+            "orientation": "ne",
+            "highPalette": True
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (in ropes sector of Greenmaze)",
+        "entity": {
+            "mapId": 567,
+            "position": {
+                "x": 38,
+                "y": 28,
+                "z": 0
+            },
+            "orientation": "se"
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (in Sun Stone sector of Greenmaze)",
+        "entity": {
+            "mapId": 564,
+            "position": {
+                "x": 30,
+                "y": 35,
+                "z": 1
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "greenmaze_pre_whistle"
+    },
+    {
+        "description": "Foxy (in first chest map of Greenmaze after cutting trees)",
+        "entity": {
+            "mapId": 570,
+            "position": {
+                "x": 26,
+                "y": 15,
+                "z": 1
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "greenmaze_post_whistle"
+    },
+    {
+        "description": "Foxy (near shortcut cavern entrance in Greenmaze after cutting trees)",
+        "entity": {
+            "mapId": 569,
+            "position": {
+                "x": 20,
+                "y": 24,
+                "z": 6,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "greenmaze_post_whistle"
+    },
+    {
+        "description": "Foxy (in room next to spiked floor and keydoor room in King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 380,
+            "position": {
+                "x": 17,
+                "y": 18,
+                "z": 0
+            },
+            "orientation": "se"
+        },
+        "nodeId": "king_nole_labyrinth_pre_door"
+    },
+    {
+        "description": "Foxy (in ice shortcut room in King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 390,
+            "position": {
+                "x": 19,
+                "y": 41,
+                "z": 2
+            },
+            "orientation": "se"
+        },
+        "nodeId": "king_nole_labyrinth_pre_door"
+    },
+    {
+        "description": "Foxy (in exterior room of King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 362,
+            "position": {
+                "x": 35,
+                "y": 21,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "king_nole_labyrinth_pre_door"
+    },
+    {
+        "description": "Foxy (in room above Iron Boots in King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 373,
+            "position": {
+                "x": 26,
+                "y": 30,
+                "z": 2
+            },
+            "orientation": "se"
+        },
+        "nodeId": "king_nole_labyrinth_post_door"
+    },
+    {
+        "description": "Foxy (next to raft starting point in King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 406,
+            "position": {
+                "x": 46,
+                "y": 40,
+                "z": 7
+            },
+            "orientation": "nw",
+            "highPalette": True
+        },
+        "nodeId": "king_nole_labyrinth_raft_entrance"
+    },
+    {
+        "description": "Foxy (in fast boulder room in King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 382,
+            "position": {
+                "x": 30,
+                "y": 30,
+                "z": 7,
+                "halfX": True
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "king_nole_labyrinth_post_door"
+    },
+    {
+        "description": "Foxy (in first maze room inside King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 367,
+            "position": {
+                "x": 43,
+                "y": 38,
+                "z": 1
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "king_nole_labyrinth_post_door"
+    },
+    {
+        "description": "Foxy (in lava sector of King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 399,
+            "position": {
+                "x": 23,
+                "y": 19,
+                "z": 2,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "king_nole_labyrinth_post_door"
+    },
+    {
+        "description": "Foxy (in hands room inside King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 418,
+            "position": {
+                "x": 41,
+                "y": 31,
+                "z": 7
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "king_nole_labyrinth_post_door"
+    },
+    {
+        "description": "Foxy (next to King Nole's Palace entrance)",
+        "entity": {
+            "mapId": 422,
+            "position": {
+                "x": 27,
+                "y": 25,
+                "z": 2
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "king_nole_labyrinth_path_to_palace"
+    },
+    {
+        "description": "Foxy (in King Nole's Palace entrance room)",
+        "entity": {
+            "mapId": 122,
+            "position": {
+                "x": 30,
+                "y": 35,
+                "z": 8
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "king_nole_palace"
+    },
+    {
+        "description": "Foxy (in King Nole's Palace jar and moving platforms room)",
+        "entity": {
+            "mapId": 126,
+            "position": {
+                "x": 27,
+                "y": 37,
+                "z": 6
+            },
+            "orientation": "se"
+        },
+        "nodeId": "king_nole_palace"
+    },
+    {
+        "description": "Foxy (in King Nole's Palace last chest room)",
+        "entity": {
+            "mapId": 125,
+            "position": {
+                "x": 25,
+                "y": 39,
+                "z": 2
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "king_nole_palace"
+    },
+    {
+        "description": "Foxy (in Mercator casino)",
+        "entity": {
+            "mapId": 663,
+            "position": {
+                "x": 16,
+                "y": 58,
+                "z": 0,
+                "halfX": True,
+                "halfY": True
+            },
+            "orientation": "ne"
+        },
+        "nodeId": "mercator_casino"
+    },
+    {
+        "description": "Foxy (in Helga's hut basement)",
+        "entity": {
+            "mapId": 479,
+            "position": {
+                "x": 20,
+                "y": 33,
+                "z": 0,
+                "halfX": True
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "helga_hut"
+    },
+    {
+        "description": "Foxy (in Helga's hut dungeon deepest room)",
+        "entity": {
+            "mapId": 802,
+            "position": {
+                "x": 28,
+                "y": 19,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "helga_hut"
+    },
+    {
+        "description": "Foxy (in Helga's hut dungeon topmost room)",
+        "entity": {
+            "mapId": 786,
+            "position": {
+                "x": 25,
+                "y": 23,
+                "z": 2,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "helga_hut"
+    },
+    {
+        "description": "Foxy (in Swamp Shrine right aisle room)",
+        "entity": {
+            "mapId": 1,
+            "position": {
+                "x": 34,
+                "y": 20,
+                "z": 2
+            },
+            "orientation": "se",
+            "highPalette": True
+        },
+        "nodeId": "swamp_shrine"
+    },
+    {
+        "description": "Foxy (upstairs in Swamp Shrine main hall)",
+        "entity": {
+            "mapId": [5, 15],
+            "position": {
+                "x": 45,
+                "y": 24,
+                "z": 8,
+                "halfY": True
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "swamp_shrine"
+    },
+    {
+        "description": "Foxy (in room before boss inside Swamp Shrine)",
+        "entity": {
+            "mapId": 30,
+            "position": {
+                "x": 19,
+                "y": 25,
+                "z": 2,
+                "halfY": True
+            },
+            "orientation": "se"
+        },
+        "nodeId": "swamp_shrine"
+    },
+    {
+        "description": "Foxy (in Thieves Hideout entrance room)",
+        "entity": {
+            "mapId": [185, 186],
+            "position": {
+                "x": 40,
+                "y": 35,
+                "z": 2
+            },
+            "orientation": "se",
+            "highPalette": True
+        },
+        "nodeId": "thieves_hideout_pre_key"
+    },
+    {
+        "description": "Foxy (in Thieves Hideout room with hidden door behind waterfall)",
+        "entity": {
+            "mapId": [192, 193],
+            "position": {
+                "x": 30,
+                "y": 34,
+                "z": 1
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "thieves_hideout_pre_key"
+    },
+    {
+        "description": "Foxy (in Thieves Hideout double chest room before goddess statue)",
+        "entity": {
+            "mapId": 215,
+            "position": {
+                "x": 17,
+                "y": 17,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "thieves_hideout_pre_key"
+    },
+    {
+        "description": "Foxy (in hub room after Thieves Hideout keydoor)",
+        "entity": {
+            "mapId": 199,
+            "position": {
+                "x": 24,
+                "y": 52,
+                "z": 2
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "thieves_hideout_post_key"
+    },
+    {
+        "description": "Foxy (in reward room after Thieves Hideout moving balls riddle)",
+        "entity": {
+            "mapId": 205,
+            "position": {
+                "x": 32,
+                "y": 24,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "thieves_hideout_post_key"
+    },
+    {
+        "description": "Foxy (in Lake Shrine main hallway)",
+        "entity": {
+            "mapId": 302,
+            "position": {
+                "x": 20,
+                "y": 19,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "lake_shrine"
+    },
+    {
+        "description": "Foxy (in triple chest room in Slasher sector of Verla Mines)",
+        "entity": {
+            "mapId": 256,
+            "position": {
+                "x": 23,
+                "y": 23,
+                "z": 0
+            },
+            "orientation": "sw"
+        },
+        "nodeId": "verla_mines"
+    },
+    {
+        "description": "Foxy (near teleport tree after Destel)",
+        "entity": {
+            "mapId": 488,
+            "position": {
+                "x": 28,
+                "y": 53,
+                "z": 0
+            },
+            "orientation": "se"
+        },
+        "nodeId": "route_after_destel"
+    },
+    {
+        "description": "Foxy (in lower half of mimics room in King Nole's Labyrinth)",
+        "entity": {
+            "mapId": 383,
+            "position": {
+                "x": 26,
+                "y": 26,
+                "z": 2
+            },
+            "orientation": "nw"
+        },
+        "nodeId": "king_nole_labyrinth_pre_door"
+    }
+]
diff --git a/worlds/landstalker/data/item_source.py b/worlds/landstalker/data/item_source.py
new file mode 100644
index 0000000000..e0a2d701f4
--- /dev/null
+++ b/worlds/landstalker/data/item_source.py
@@ -0,0 +1,2017 @@
+ITEM_SOURCES_JSON = [
+    {
+        "name": "Swamp Shrine (0F): chest in room to the right",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 0
+    },
+    {
+        "name": "Swamp Shrine (0F): chest in carpet room",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 1
+    },
+    {
+        "name": "Swamp Shrine (0F): chest in left hallway (accessed by falling from upstairs)",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 2
+    },
+    {
+        "name": "Swamp Shrine (0F): falling chest after beating orc",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 3
+    },
+    {
+        "name": "Swamp Shrine (0F): chest in room visible from second entrance",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 4
+    },
+    {
+        "name": "Swamp Shrine (1F): lower chest in wooden bridges room",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 5
+    },
+    {
+        "name": "Swamp Shrine (2F): upper chest in wooden bridges room",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 6
+    },
+    {
+        "name": "Swamp Shrine (2F): chest on spiked floor room balcony",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 7
+    },
+    {
+        "name": "Swamp Shrine (3F): chest in boss arena",
+        "type": "chest",
+        "nodeId": "swamp_shrine",
+        "chestId": 8
+    },
+    {
+        "name": "Mercator Dungeon (-1F): chest on elevated path near entrance",
+        "type": "chest",
+        "nodeId": "mercator_dungeon",
+        "hints": [
+            "hidden in the depths of Mercator"
+        ],
+        "chestId": 9
+    },
+    {
+        "name": "Mercator Dungeon (-1F): chest in Moralis's cell",
+        "type": "chest",
+        "nodeId": "mercator_dungeon",
+        "hints": [
+            "hidden in the depths of Mercator"
+        ],
+        "chestId": 10
+    },
+    {
+        "name": "Mercator Dungeon (-1F): left chest in undeground double chest room",
+        "type": "chest",
+        "nodeId": "mercator_dungeon",
+        "hints": [
+            "hidden in the depths of Mercator"
+        ],
+        "chestId": 11
+    },
+    {
+        "name": "Mercator Dungeon (-1F): right chest in undeground double chest room",
+        "type": "chest",
+        "nodeId": "mercator_dungeon",
+        "hints": [
+            "hidden in the depths of Mercator"
+        ],
+        "chestId": 12
+    },
+    {
+        "name": "Mercator: castle kitchen chest",
+        "type": "chest",
+        "nodeId": "mercator",
+        "chestId": 13
+    },
+    {
+        "name": "Mercator: chest in special shop backroom",
+        "type": "chest",
+        "nodeId": "mercator",
+        "chestId": 14
+    },
+    {
+        "name": "Mercator Dungeon (1F): left chest in tower double chest room",
+        "type": "chest",
+        "nodeId": "mercator_dungeon",
+        "hints": [
+            "inside a tower"
+        ],
+        "chestId": 15
+    },
+    {
+        "name": "Mercator Dungeon (1F): right chest in tower double chest room",
+        "type": "chest",
+        "nodeId": "mercator_dungeon",
+        "hints": [
+            "inside a tower"
+        ],
+        "chestId": 16
+    },
+    {
+        "name": "Mercator: chest in castle tower (ladder revealed by slashing armor)",
+        "type": "chest",
+        "nodeId": "mercator",
+        "hints": [
+            "inside a tower"
+        ],
+        "chestId": 17
+    },
+    {
+        "name": "Mercator Dungeon (4F): chest in topmost tower room",
+        "type": "chest",
+        "nodeId": "mercator_dungeon",
+        "hints": [
+            "inside a tower"
+        ],
+        "chestId": 18
+    },
+    {
+        "name": "King Nole's Palace: chest at entrance",
+        "type": "chest",
+        "nodeId": "king_nole_palace",
+        "chestId": 19
+    },
+    {
+        "name": "King Nole's Palace: chest along central pit",
+        "type": "chest",
+        "nodeId": "king_nole_palace",
+        "chestId": 20
+    },
+    {
+        "name": "King Nole's Palace: chest in floating button room",
+        "type": "chest",
+        "nodeId": "king_nole_palace",
+        "chestId": 21
+    },
+    {
+        "name": "King Nole's Cave: chest in second room",
+        "type": "chest",
+        "nodeId": "king_nole_cave",
+        "chestId": 22
+    },
+    {
+        "name": "King Nole's Cave: first chest in third room",
+        "type": "chest",
+        "nodeId": "king_nole_cave",
+        "chestId": 24
+    },
+    {
+        "name": "King Nole's Cave: second chest in third room",
+        "type": "chest",
+        "nodeId": "king_nole_cave",
+        "chestId": 25
+    },
+    {
+        "name": "King Nole's Cave: chest in isolated room",
+        "type": "chest",
+        "nodeId": "king_nole_cave",
+        "chestId": 28
+    },
+    {
+        "name": "King Nole's Cave: chest in crate room",
+        "type": "chest",
+        "nodeId": "king_nole_cave",
+        "chestId": 29
+    },
+    {
+        "name": "King Nole's Cave: boulder chase hallway chest",
+        "type": "chest",
+        "nodeId": "king_nole_cave",
+        "chestId": 31
+    },
+    {
+        "name": "Waterfall Shrine: chest under entrance hallway",
+        "type": "chest",
+        "nodeId": "waterfall_shrine",
+        "chestId": 33
+    },
+    {
+        "name": "Waterfall Shrine: chest near Prospero",
+        "type": "chest",
+        "nodeId": "waterfall_shrine",
+        "chestId": 34
+    },
+    {
+        "name": "Waterfall Shrine: chest on right branch of biggest room",
+        "type": "chest",
+        "nodeId": "waterfall_shrine",
+        "chestId": 35
+    },
+    {
+        "name": "Waterfall Shrine: upstairs chest",
+        "type": "chest",
+        "nodeId": "waterfall_shrine",
+        "chestId": 36
+    },
+    {
+        "name": "Thieves Hideout: chest under water in entrance room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_pre_key",
+        "chestId": 38
+    },
+    {
+        "name": "Thieves Hideout (back): right chest after teal knight mini-boss",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 41
+    },
+    {
+        "name": "Thieves Hideout (back): left chest after teal knight mini-boss",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 42
+    },
+    {
+        "name": "Thieves Hideout: left chest in Pockets cell",
+        "type": "chest",
+        "nodeId": "thieves_hideout_pre_key",
+        "chestId": 43
+    },
+    {
+        "name": "Thieves Hideout: right chest in Pockets cell",
+        "type": "chest",
+        "nodeId": "thieves_hideout_pre_key",
+        "chestId": 44
+    },
+    {
+        "name": "Thieves Hideout (back): second chest in hallway after quick climb trial",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 45
+    },
+    {
+        "name": "Thieves Hideout (back): first chest in hallway after quick climb trial",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 46
+    },
+    {
+        "name": "Thieves Hideout (back): chest in moving platforms room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 47
+    },
+    {
+        "name": "Thieves Hideout (back): chest in falling platforms room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 48
+    },
+    {
+        "name": "Thieves Hideout (back): reward chest after moving balls room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 49
+    },
+    {
+        "name": "Thieves Hideout: rolling boulder chest near entrance",
+        "type": "chest",
+        "nodeId": "thieves_hideout_pre_key",
+        "chestId": 50
+    },
+    {
+        "name": "Thieves Hideout: left chest in room on the way to goddess statue",
+        "type": "chest",
+        "nodeId": "thieves_hideout_pre_key",
+        "chestId": 52
+    },
+    {
+        "name": "Thieves Hideout: right chest in room on the way to goddess statue",
+        "type": "chest",
+        "nodeId": "thieves_hideout_pre_key",
+        "chestId": 53
+    },
+    {
+        "name": "Thieves Hideout (back): left chest in room before boss",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 54
+    },
+    {
+        "name": "Thieves Hideout (back): right chest in room before boss",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 55
+    },
+    {
+        "name": "Thieves Hideout (back): chest #1 in boss reward room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 56
+    },
+    {
+        "name": "Thieves Hideout (back): chest #2 in boss reward room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 57
+    },
+    {
+        "name": "Thieves Hideout (back): chest #3 in boss reward room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 58
+    },
+    {
+        "name": "Thieves Hideout (back): chest #4 in boss reward room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 59
+    },
+    {
+        "name": "Thieves Hideout (back): chest #5 in boss reward room",
+        "type": "chest",
+        "nodeId": "thieves_hideout_post_key",
+        "chestId": 60
+    },
+    {
+        "name": "Verla Mines: right chest in double chest room near entrance",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 66
+    },
+    {
+        "name": "Verla Mines: left chest in double chest room near entrance",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 67
+    },
+    {
+        "name": "Verla Mines: chest on jar staircase room balcony",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 68
+    },
+    {
+        "name": "Verla Mines: Dex reward chest",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 69
+    },
+    {
+        "name": "Verla Mines: Slasher reward chest",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 70
+    },
+    {
+        "name": "Verla Mines: left chest in 3-chests room near Slasher",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 71
+    },
+    {
+        "name": "Verla Mines: middle chest in 3-chests room near Slasher",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 72
+    },
+    {
+        "name": "Verla Mines: right chest in 3-chests room near Slasher",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 73
+    },
+    {
+        "name": "Verla Mines: right chest in button room near elevator shaft leading to Marley",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 74
+    },
+    {
+        "name": "Verla Mines: left chest in button room near elevator shaft leading to Marley",
+        "type": "chest",
+        "nodeId": "verla_mines",
+        "chestId": 75
+    },
+    {
+        "name": "Verla Mines: chest in hidden room accessed by walking on lava",
+        "type": "chest",
+        "nodeId": "verla_mines_behind_lava",
+        "hints": [
+            "in a very hot place"
+        ],
+        "chestId": 76
+    },
+    {
+        "name": "Destel Well (0F): 4 crates puzzle room chest",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 77
+    },
+    {
+        "name": "Destel Well (1F): chest on small stairs",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 78
+    },
+    {
+        "name": "Destel Well (1F): chest on narrow floating ground",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 79
+    },
+    {
+        "name": "Destel Well (1F): chest in spiky hallway",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 80
+    },
+    {
+        "name": "Destel Well (2F): chest in ghosts room",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 81
+    },
+    {
+        "name": "Destel Well (2F): chest in falling platforms room",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 82
+    },
+    {
+        "name": "Destel Well (2F): right chest in Pockets room",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 83
+    },
+    {
+        "name": "Destel Well (2F): left chest in Pockets room",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 84
+    },
+    {
+        "name": "Destel Well (3F): chest in first trapped arena",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 85
+    },
+    {
+        "name": "Destel Well (3F): chest in trapped giants room",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 86
+    },
+    {
+        "name": "Destel Well (3F): chest in second trapped arena",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 87
+    },
+    {
+        "name": "Destel Well (4F): top chest in room before boss",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 88
+    },
+    {
+        "name": "Destel Well (4F): left chest in room before boss",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 89
+    },
+    {
+        "name": "Destel Well (4F): bottom chest in room before boss",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 90
+    },
+    {
+        "name": "Destel Well (4F): right chest in room before boss",
+        "type": "chest",
+        "nodeId": "destel_well",
+        "chestId": 91
+    },
+    {
+        "name": "Lake Shrine (-1F): chest in crate room near green golem spinner",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 92
+    },
+    {
+        "name": "Lake Shrine (-1F): chest in hallway with hole leading downstairs",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 93
+    },
+    {
+        "name": "Lake Shrine (-1F): chest in spikeballs hallway near green golem spinner",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 94
+    },
+    {
+        "name": "Lake Shrine (-1F): reward chest for golem hopping puzzle",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 95
+    },
+    {
+        "name": "Lake Shrine (-2F): chest on room corner accessed by falling from above",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 96
+    },
+    {
+        "name": "Lake Shrine (-2F): lower chest in throne room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 97
+    },
+    {
+        "name": "Lake Shrine (-2F): upper chest in throne room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 98
+    },
+    {
+        "name": "Lake Shrine (-3F): chest on floating platform in white golems room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 99
+    },
+    {
+        "name": "Lake Shrine (-3F): chest near Sword of Ice",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 100
+    },
+    {
+        "name": "Lake Shrine (-3F): chest in snake trapping puzzle room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 101
+    },
+    {
+        "name": "Lake Shrine (-3F): chest on cube accessed by falling from upstairs",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 102
+    },
+    {
+        "name": "Lake Shrine (-3F): chest in watery archway room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 103
+    },
+    {
+        "name": "Lake Shrine (-3F): left reward chest in boss room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 104
+    },
+    {
+        "name": "Lake Shrine (-3F): middle reward chest in boss room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 105
+    },
+    {
+        "name": "Lake Shrine (-3F): right reward chest in boss room",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 106
+    },
+    {
+        "name": "Lake Shrine (-3F): chest near golden golems spinner",
+        "type": "chest",
+        "nodeId": "lake_shrine",
+        "chestId": 107
+    },
+    {
+        "name": "King Nole's Labyrinth (0F): chest in exterior room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_exterior",
+        "chestId": 108
+    },
+    {
+        "name": "King Nole's Labyrinth (0F): left chest in room after key door",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 109
+    },
+    {
+        "name": "King Nole's Labyrinth (0F): right chest in room after key door",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 110
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): chest in maze room with healing tile",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 111
+    },
+    {
+        "name": "King Nole's Labyrinth (0F): chest in spike balls room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_pre_door",
+        "chestId": 112
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): right chest in 3-chest dark room (left side)",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 113
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): chest in 3-chest dark room (right side)",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_pre_door",
+        "chestId": 114
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): left chest in 3-chest dark room (left side)",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 115
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): chest in maze room with two buttons",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 116
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): upper chest in lantern room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_pre_door",
+        "chestId": 117
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): lower chest in lantern room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_pre_door",
+        "chestId": 118
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): chest in ice shortcut room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_pre_door",
+        "chestId": 119
+    },
+    {
+        "name": "King Nole's Labyrinth (-2F): chest in save room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 120
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): chest in room with button and crates stairway",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 121
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): first chest before Firedemon",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "hints": [
+            "in a very hot place"
+        ],
+        "chestId": 122
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): second chest before Firedemon",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "hints": [
+            "in a very hot place"
+        ],
+        "chestId": 123
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): reward chest for beating Firedemon",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "hints": [
+            "kept by a threatening guardian",
+            "in a very hot place"
+        ],
+        "chestId": 124
+    },
+    {
+        "name": "King Nole's Labyrinth (-2F): chest in four buttons room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 125
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): first chest after falling from raft",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_raft",
+        "chestId": 126
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): left chest in room before Spinner",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_raft",
+        "chestId": 127
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): right chest in room before Spinner",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_raft",
+        "chestId": 128
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): reward chest for beating Spinner",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_raft",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 129
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): chest in room after Spinner",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_raft",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 130
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): chest in room before Miro",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_path_to_palace",
+        "hints": [
+            "close to a waterfall"
+        ],
+        "chestId": 131
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): reward chest for beating Miro",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_path_to_palace",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 132
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): chest in hands room",
+        "type": "chest",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "chestId": 133
+    },
+    {
+        "name": "Route between Gumi and Ryuma: chest on the way to Swordsman Kado",
+        "type": "chest",
+        "nodeId": "route_gumi_ryuma",
+        "chestId": 134
+    },
+    {
+        "name": "Route between Massan and Gumi: chest on cliff",
+        "type": "chest",
+        "nodeId": "route_massan_gumi",
+        "hints": [
+            "near a swamp"
+        ],
+        "chestId": 135
+    },
+    {
+        "name": "Route between Mercator and Verla: chest on cliff next to tree",
+        "type": "chest",
+        "nodeId": "mir_tower_sector",
+        "chestId": 136
+    },
+    {
+        "name": "Route between Mercator and Verla: chest on cliff next to blocked cave",
+        "type": "chest",
+        "nodeId": "mir_tower_sector",
+        "chestId": 137
+    },
+    {
+        "name": "Route between Mercator and Verla: chest near Twinkle village",
+        "type": "chest",
+        "nodeId": "mir_tower_sector",
+        "chestId": 138
+    },
+    {
+        "name": "Verla Shore: chest on corner cliff after Verla tunnel",
+        "type": "chest",
+        "nodeId": "verla_shore",
+        "chestId": 139
+    },
+    {
+        "name": "Verla Shore: chest on highest cliff after Verla tunnel (accessible through Verla mines)",
+        "type": "chest",
+        "nodeId": "verla_shore_cliff",
+        "chestId": 140
+    },
+    {
+        "name": "Route to Mir Tower: chest on cliff accessed by pressing hidden switch",
+        "type": "chest",
+        "nodeId": "mir_tower_sector",
+        "chestId": 141
+    },
+    {
+        "name": "Route to Mir Tower: chest behind first sacred tree",
+        "type": "chest",
+        "nodeId": "mir_tower_sector_tree_ledge",
+        "chestId": 142
+    },
+    {
+        "name": "Verla Shore: chest behind cabin",
+        "type": "chest",
+        "nodeId": "verla_shore",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 143
+    },
+    {
+        "name": "Route to Destel: chest in map right after Verla mines exit",
+        "type": "chest",
+        "nodeId": "route_verla_destel",
+        "chestId": 144
+    },
+    {
+        "name": "Route to Destel: chest in small platform elevator map",
+        "type": "chest",
+        "nodeId": "route_verla_destel",
+        "chestId": 145
+    },
+    {
+        "name": "Route to Mir Tower: chest behind second sacred tree",
+        "type": "chest",
+        "nodeId": "mir_tower_sector_tree_coast",
+        "chestId": 146
+    },
+    {
+        "name": "Route to Destel: hidden chest in map right before Destel",
+        "type": "chest",
+        "nodeId": "route_verla_destel",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 147
+    },
+    {
+        "name": "Mountainous Area: chest near teleport tree",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 148
+    },
+    {
+        "name": "Mountainous Area: chest on right side of map before the bridge",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 149
+    },
+    {
+        "name": "Mountainous Area: hidden chest in L-shaped path",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 150
+    },
+    {
+        "name": "Mountainous Area: hidden chest in uppermost path",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 151
+    },
+    {
+        "name": "Mountainous Area: isolated chest on cliff in bridge map",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 152
+    },
+    {
+        "name": "Mountainous Area: left chest on wall in bridge map",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 153
+    },
+    {
+        "name": "Mountainous Area: right chest on wall in bridge map",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 154
+    },
+    {
+        "name": "Mountainous Area: right chest in map before Zak arena",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 155
+    },
+    {
+        "name": "Mountainous Area: left chest in map before Zak arena",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 156
+    },
+    {
+        "name": "Route after Destel: chest on tiny cliff",
+        "type": "chest",
+        "nodeId": "route_after_destel",
+        "chestId": 157
+    },
+    {
+        "name": "Route after Destel: hidden chest in map after seeing Duke raft",
+        "type": "chest",
+        "nodeId": "route_after_destel",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 158
+    },
+    {
+        "name": "Route after Destel: visible chest in map after seeing Duke raft",
+        "type": "chest",
+        "nodeId": "route_after_destel",
+        "chestId": 159
+    },
+    {
+        "name": "Mountainous Area: chest hidden under rocky arch",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 160
+    },
+    {
+        "name": "Route to Lake Shrine: chest on long cliff in crossroads map",
+        "type": "chest",
+        "nodeId": "route_lake_shrine",
+        "chestId": 161
+    },
+    {
+        "name": "Route to Lake Shrine: chest on middle cliff in crossroads map (reached from Mountainous Area)",
+        "type": "chest",
+        "nodeId": "route_lake_shrine_cliff",
+        "chestId": 162
+    },
+    {
+        "name": "Mountainous Area: chest in map in front of bridge statue",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "chestId": 163
+    },
+    {
+        "name": "Route to Lake Shrine: right chest in volcano",
+        "type": "chest",
+        "nodeId": "route_lake_shrine",
+        "chestId": 164
+    },
+    {
+        "name": "Route to Lake Shrine: left chest in volcano",
+        "type": "chest",
+        "nodeId": "route_lake_shrine",
+        "chestId": 165
+    },
+    {
+        "name": "Mountainous Area Cave: chest in small hidden room",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "hints": [
+            "in a small cave",
+            "in a well-hidden chest",
+            "in a cave in the mountains"
+        ],
+        "chestId": 166
+    },
+    {
+        "name": "Mountainous Area Cave: chest in small visible room",
+        "type": "chest",
+        "nodeId": "mountainous_area",
+        "hints": [
+            "in a small cave",
+            "in a cave in the mountains"
+        ],
+        "chestId": 167
+    },
+    {
+        "name": "Greenmaze: chest on path to Cutter",
+        "type": "chest",
+        "nodeId": "greenmaze_cutter",
+        "chestId": 168
+    },
+    {
+        "name": "Greenmaze: chest on cliff near the swamp",
+        "type": "chest",
+        "nodeId": "greenmaze_pre_whistle",
+        "chestId": 169
+    },
+    {
+        "name": "Greenmaze: chest between Sunstone and Massan shortcut",
+        "type": "chest",
+        "nodeId": "greenmaze_post_whistle",
+        "chestId": 170
+    },
+    {
+        "name": "Greenmaze: chest in mages room",
+        "type": "chest",
+        "nodeId": "greenmaze_pre_whistle",
+        "chestId": 171
+    },
+    {
+        "name": "Greenmaze: left chest in elbow cave",
+        "type": "chest",
+        "nodeId": "greenmaze_pre_whistle",
+        "chestId": 172
+    },
+    {
+        "name": "Greenmaze: right chest in elbow cave",
+        "type": "chest",
+        "nodeId": "greenmaze_pre_whistle",
+        "chestId": 173
+    },
+    {
+        "name": "Greenmaze: chest in waterfall cave",
+        "type": "chest",
+        "nodeId": "greenmaze_pre_whistle",
+        "hints": [
+            "close to a waterfall"
+        ],
+        "chestId": 174
+    },
+    {
+        "name": "Greenmaze: left chest in hidden room behind waterfall",
+        "type": "chest",
+        "nodeId": "greenmaze_pre_whistle",
+        "hints": [
+            "close to a waterfall"
+        ],
+        "chestId": 175
+    },
+    {
+        "name": "Greenmaze: right chest in hidden room behind waterfall",
+        "type": "chest",
+        "nodeId": "greenmaze_pre_whistle",
+        "hints": [
+            "close to a waterfall"
+        ],
+        "chestId": 176
+    },
+    {
+        "name": "Massan: chest triggered by dog statue",
+        "type": "chest",
+        "nodeId": "massan",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 177
+    },
+    {
+        "name": "Massan: chest in house nearest to elder house",
+        "type": "chest",
+        "nodeId": "massan",
+        "chestId": 178
+    },
+    {
+        "name": "Massan: chest in middle house",
+        "type": "chest",
+        "nodeId": "massan",
+        "chestId": 179
+    },
+    {
+        "name": "Massan: chest in house farthest from elder house",
+        "type": "chest",
+        "nodeId": "massan",
+        "chestId": 180
+    },
+    {
+        "name": "Gumi: chest on top of bed in house",
+        "type": "chest",
+        "nodeId": "gumi",
+        "chestId": 181
+    },
+    {
+        "name": "Gumi: chest in elder house after saving Fara",
+        "type": "chest",
+        "nodeId": "gumi_after_swamp_shrine",
+        "chestId": 182
+    },
+    {
+        "name": "Ryuma: chest in mayor's house",
+        "type": "chest",
+        "nodeId": "ryuma",
+        "chestId": 183
+    },
+    {
+        "name": "Ryuma: chest in repaired lighthouse",
+        "type": "chest",
+        "nodeId": "ryuma_lighthouse_repaired",
+        "chestId": 184
+    },
+    {
+        "name": "Crypt: chest in main room",
+        "type": "chest",
+        "nodeId": "crypt",
+        "chestId": 185
+    },
+    {
+        "name": "Crypt: reward chest",
+        "type": "chest",
+        "nodeId": "crypt",
+        "chestId": 186
+    },
+    {
+        "name": "Mercator: hidden casino chest",
+        "type": "chest",
+        "nodeId": "mercator_casino",
+        "hints": [
+            "hidden in the depths of Mercator",
+            "in a well-hidden chest"
+        ],
+        "chestId": 191
+    },
+    {
+        "name": "Mercator: chest in Greenpea's house",
+        "type": "chest",
+        "nodeId": "mercator",
+        "chestId": 192
+    },
+    {
+        "name": "Mercator: chest in grandma's house (pot shelving trial)",
+        "type": "chest",
+        "nodeId": "mercator",
+        "chestId": 193
+    },
+    {
+        "name": "Verla: chest in well after beating Marley",
+        "type": "chest",
+        "nodeId": "verla_after_mines",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 194
+    },
+    {
+        "name": "Destel: chest in inn next to innkeeper",
+        "type": "chest",
+        "nodeId": "destel",
+        "chestId": 196
+    },
+    {
+        "name": "Mir Tower: timed jump trial chest",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 197
+    },
+    {
+        "name": "Mir Tower: chest after mimic room",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 198
+    },
+    {
+        "name": "Mir Tower: mimic room chest #1",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 199
+    },
+    {
+        "name": "Mir Tower: mimic room chest #2",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 200
+    },
+    {
+        "name": "Mir Tower: mimic room chest #3",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 201
+    },
+    {
+        "name": "Mir Tower: mimic room chest #4",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 202
+    },
+    {
+        "name": "Mir Tower: chest in mushroom pit room",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 203
+    },
+    {
+        "name": "Mir Tower: chest in room next to mummy switch room",
+        "type": "chest",
+        "nodeId": "mir_tower_pre_garlic",
+        "chestId": 204
+    },
+    {
+        "name": "Mir Tower: chest in library accessible from teleporter maze",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "chestId": 205
+    },
+    {
+        "name": "Mir Tower: hidden chest in room before library",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "hints": [
+            "in a well-hidden chest"
+        ],
+        "chestId": 206
+    },
+    {
+        "name": "Mir Tower: chest in falling spikeballs room",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "chestId": 207
+    },
+    {
+        "name": "Mir Tower: chest in timed challenge room",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "chestId": 208
+    },
+    {
+        "name": "Mir Tower: chest in room where Miro closes the door",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "chestId": 209
+    },
+    {
+        "name": "Mir Tower: chest after room where Miro closes the door",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "chestId": 210
+    },
+    {
+        "name": "Mir Tower: reward chest",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 211
+    },
+    {
+        "name": "Mir Tower: right chest in reward room",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 212
+    },
+    {
+        "name": "Mir Tower: left chest in reward room",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 213
+    },
+    {
+        "name": "Mir Tower: chest behind wall accessible after beating Mir",
+        "type": "chest",
+        "nodeId": "mir_tower_post_garlic",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "chestId": 214
+    },
+    {
+        "name": "Witch Helga's Hut: end chest",
+        "type": "chest",
+        "nodeId": "helga_hut",
+        "chestId": 215
+    },
+    {
+        "name": "Massan Cave: right chest",
+        "type": "chest",
+        "nodeId": "massan_cave",
+        "chestId": 216
+    },
+    {
+        "name": "Massan Cave: left chest",
+        "type": "chest",
+        "nodeId": "massan_cave",
+        "chestId": 217
+    },
+    {
+        "name": "Tibor: reward chest after boss",
+        "type": "chest",
+        "nodeId": "tibor",
+        "chestId": 218
+    },
+    {
+        "name": "Tibor: chest in spike balls room",
+        "type": "chest",
+        "nodeId": "tibor",
+        "chestId": 219
+    },
+    {
+        "name": "Tibor: left chest on 2 chest group",
+        "type": "chest",
+        "nodeId": "tibor",
+        "chestId": 220
+    },
+    {
+        "name": "Tibor: right chest on 2 chest group",
+        "type": "chest",
+        "nodeId": "tibor",
+        "chestId": 221
+    },
+    {
+        "name": "Gumi: item on furniture in elder's house",
+        "type": "ground",
+        "nodeId": "gumi",
+        "entity": {"mapId": 605, "entityId": 2},
+        "groundItemId": 1
+    },
+    {
+        "name": "Greenmaze: item behind trees requiring Cutter",
+        "type": "ground",
+        "nodeId": "greenmaze_post_whistle",
+        "entity": {"mapId": 564, "entityId": 0},
+        "groundItemId": 2
+    },
+    {
+        "name": "Verla Mines: item in the corner of lava filled room",
+        "type": "ground",
+        "nodeId": "verla_mines",
+        "hints": [
+            "in a very hot place"
+        ],
+        "entity": {"mapId": 263, "entityId": 7},
+        "groundItemId": 3
+    },
+    {
+        "name": "Lake Shrine (-3F): item on ground at the SE exit of the golden golems roundabout",
+        "type": "ground",
+        "nodeId": "lake_shrine",
+        "entity": {"mapId": 333, "entityId": 0},
+        "groundItemId": 4
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): item on ground behind waterfall after beating Spinner",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_raft",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "entity": {"mapId": 411, "entityId": 0},
+        "groundItemId": 5
+    },
+    {
+        "name": "Destel Well: item on platform revealed after beating Quake",
+        "type": "ground",
+        "nodeId": "destel_well",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "entity": {"mapId": 288, "entityId": 0},
+        "groundItemId": 6
+    },
+    {
+        "name": "King Nole's Labyrinth (-1F): item on ground in ninjas room",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "entity": {"mapId": 374, "entityId": 3},
+        "groundItemId": 7
+    },
+    {
+        "name": "Massan Cave: item on ground in treasure room",
+        "type": "ground",
+        "nodeId": "massan_cave",
+        "entity": {"mapId": 807, "entityId": 4},
+        "groundItemId": 8
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): item on floating hands",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "entity": {"mapId": 418, "entityId": 0},
+        "groundItemId": 9
+    },
+    {
+        "name": "Lake Shrine (-3F): isolated item on ground requiring raised platform to reach",
+        "type": "ground",
+        "nodeId": "lake_shrine",
+        "entities": [
+            {"mapId": 344, "entityId": 0},
+            {"mapId": 345, "entityId": 0}
+        ],
+        "groundItemId": 10
+    },
+    {
+        "name": "King Nole's Labyrinth (-2F): item on ground after falling from exterior room",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_fall_from_exterior",
+        "entity": {"mapId": 363, "entityId": 0},
+        "groundItemId": 11
+    },
+    {
+        "name": "Route after Destel: item on ground on the cliff",
+        "type": "ground",
+        "nodeId": "route_after_destel",
+        "entity": {"mapId": 483, "entityId": 0},
+        "groundItemId": 12
+    },
+    {
+        "name": "Mountainous Area cave: item on ground behind hidden path",
+        "type": "ground",
+        "nodeId": "mountainous_area",
+        "hints": [
+            "in a small cave",
+            "in a cave in the mountains"
+        ],
+        "entity": {"mapId": 553, "entityId": 0},
+        "groundItemId": 13
+    },
+    {
+        "name": "Witch Helga's Hut: item on furniture",
+        "type": "ground",
+        "nodeId": "helga_hut",
+        "entity": {"mapId": 479, "entityId": 1},
+        "groundItemId": 14
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): item on ground climbing back from Firedemon",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "hints": [
+            "in a very hot place"
+        ],
+        "entity": {"mapId": 399, "entityId": 0},
+        "groundItemId": 15
+    },
+    {
+        "name": "Mercator: falling item in castle court",
+        "type": "ground",
+        "nodeId": "mercator",
+        "entity": {"mapId": 32, "entityId": 2},
+        "groundItemId": 16
+    },
+    {
+        "name": "Lake Shrine (-2F): north item on ground in quadruple items room",
+        "type": "ground",
+        "nodeId": "lake_shrine",
+        "entity": {"mapId": 318, "entityId": 0},
+        "groundItemId": 17
+    },
+    {
+        "name": "Lake Shrine (-2F): south item on ground in quadruple items room",
+        "type": "ground",
+        "nodeId": "lake_shrine",
+        "entity": {"mapId": 318, "entityId": 1},
+        "groundItemId": 18
+    },
+    {
+        "name": "Lake Shrine (-2F): west item on ground in quadruple items room",
+        "type": "ground",
+        "nodeId": "lake_shrine",
+        "entity": {"mapId": 318, "entityId": 2},
+        "groundItemId": 19
+    },
+    {
+        "name": "Lake Shrine (-2F): east item on ground in quadruple items room",
+        "type": "ground",
+        "nodeId": "lake_shrine",
+        "entity": {"mapId": 318, "entityId": 3},
+        "groundItemId": 20
+    },
+    {
+        "name": "Twinkle Village: first item on ground",
+        "type": "ground",
+        "nodeId": "twinkle_village",
+        "entity": {"mapId": 462, "entityId": 5},
+        "groundItemId": 21
+    },
+    {
+        "name": "Twinkle Village: second item on ground",
+        "type": "ground",
+        "nodeId": "twinkle_village",
+        "entity": {"mapId": 462, "entityId": 4},
+        "groundItemId": 22
+    },
+    {
+        "name": "Twinkle Village: third item on ground",
+        "type": "ground",
+        "nodeId": "twinkle_village",
+        "entity": {"mapId": 462, "entityId": 3},
+        "groundItemId": 23
+    },
+    {
+        "name": "Mir Tower: Priest room item #1",
+        "type": "ground",
+        "nodeId": "mir_tower_post_garlic",
+        "entity": {"mapId": 775, "entityId": 7},
+        "groundItemId": 24
+    },
+    {
+        "name": "Mir Tower: Priest room item #2",
+        "type": "ground",
+        "nodeId": "mir_tower_post_garlic",
+        "entity": {"mapId": 775, "entityId": 6},
+        "groundItemId": 25
+    },
+    {
+        "name": "Mir Tower: Priest room item #3",
+        "type": "ground",
+        "nodeId": "mir_tower_post_garlic",
+        "entity": {"mapId": 775, "entityId": 1},
+        "groundItemId": 26
+    },
+    {
+        "name": "King Nole's Labyrinth (-2F): Left item dropped by sacred tree",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_sacred_tree",
+        "entity": {"mapId": 415, "entityId": 2},
+        "groundItemId": 27
+    },
+    {
+        "name": "King Nole's Labyrinth (-2F): Right item dropped by sacred tree",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_sacred_tree",
+        "entity": {"mapId": 415, "entityId": 1},
+        "groundItemId": 28
+    },
+    {
+        "name": "King Nole's Labyrinth (-3F): First item on ground before Firedemon",
+        "type": "ground",
+        "nodeId": "king_nole_labyrinth_post_door",
+        "hints": [
+            "in a very hot place"
+        ],
+        "entity": {"mapId": 400, "entityId": 0},
+        "groundItemId": 29
+    },
+    {
+        "name": "Massan: Shop item #1",
+        "type": "shop",
+        "nodeId": "massan",
+        "entity": {"mapId": 596, "entityId": 1},
+        "shopItemId": 1
+    },
+    {
+        "name": "Massan: Shop item #2",
+        "type": "shop",
+        "nodeId": "massan",
+        "entity": {"mapId": 596, "entityId": 2},
+        "shopItemId": 2
+    },
+    {
+        "name": "Massan: Shop item #3",
+        "type": "shop",
+        "nodeId": "massan",
+        "entity": {"mapId": 596, "entityId": 3},
+        "shopItemId": 3
+    },
+    {
+        "name": "Gumi: Inn item #1",
+        "type": "shop",
+        "nodeId": "gumi",
+        "entity": {"mapId": 608, "entityId": 4},
+        "shopItemId": 4
+    },
+    {
+        "name": "Gumi: Inn item #2",
+        "type": "shop",
+        "nodeId": "gumi",
+        "entity": {"mapId": 608, "entityId": 2},
+        "shopItemId": 5
+    },
+    {
+        "name": "Ryuma: Shop item #1",
+        "type": "shop",
+        "nodeId": "ryuma_after_thieves_hideout",
+        "entity": {"mapId": 615, "entityId": 2},
+        "shopItemId": 6
+    },
+    {
+        "name": "Ryuma: Shop item #2",
+        "type": "shop",
+        "nodeId": "ryuma_after_thieves_hideout",
+        "entity": {"mapId": 615, "entityId": 3},
+        "shopItemId": 7
+    },
+    {
+        "name": "Ryuma: Shop item #3",
+        "type": "shop",
+        "nodeId": "ryuma_after_thieves_hideout",
+        "entity": {"mapId": 615, "entityId": 4},
+        "shopItemId": 8
+    },
+    {
+        "name": "Ryuma: Shop item #4",
+        "type": "shop",
+        "nodeId": "ryuma_after_thieves_hideout",
+        "entity": {"mapId": 615, "entityId": 5},
+        "shopItemId": 9
+    },
+    {
+        "name": "Ryuma: Shop item #5",
+        "type": "shop",
+        "nodeId": "ryuma_after_thieves_hideout",
+        "entity": {"mapId": 615, "entityId": 6},
+        "shopItemId": 10
+    },
+    {
+        "name": "Ryuma: Inn item",
+        "type": "shop",
+        "nodeId": "ryuma",
+        "entity": {"mapId": 624, "entityId": 3},
+        "shopItemId": 11
+    },
+    {
+        "name": "Mercator: Shop item #1",
+        "type": "shop",
+        "nodeId": "mercator",
+        "entity": {"mapId": 679, "entityId": 1},
+        "shopItemId": 12
+    },
+    {
+        "name": "Mercator: Shop item #2",
+        "type": "shop",
+        "nodeId": "mercator",
+        "entity": {"mapId": 679, "entityId": 2},
+        "shopItemId": 13
+    },
+    {
+        "name": "Mercator: Shop item #3",
+        "type": "shop",
+        "nodeId": "mercator",
+        "entity": {"mapId": 679, "entityId": 3},
+        "shopItemId": 14
+    },
+    {
+        "name": "Mercator: Shop item #4",
+        "type": "shop",
+        "nodeId": "mercator",
+        "entity": {"mapId": 679, "entityId": 4},
+        "shopItemId": 15
+    },
+    {
+        "name": "Mercator: Shop item #5",
+        "type": "shop",
+        "nodeId": "mercator",
+        "entity": {"mapId": 679, "entityId": 5},
+        "shopItemId": 16
+    },
+    {
+        "name": "Mercator: Shop item #6",
+        "type": "shop",
+        "nodeId": "mercator",
+        "entity": {"mapId": 679, "entityId": 6},
+        "shopItemId": 17
+    },
+    {
+        "name": "Mercator: Special shop item #1",
+        "type": "shop",
+        "nodeId": "mercator_special_shop",
+        "entity": {"mapId": 696, "entityId": 1},
+        "shopItemId": 18
+    },
+    {
+        "name": "Mercator: Special shop item #2",
+        "type": "shop",
+        "nodeId": "mercator_special_shop",
+        "entity": {"mapId": 696, "entityId": 2},
+        "shopItemId": 19
+    },
+    {
+        "name": "Mercator: Special shop item #3",
+        "type": "shop",
+        "nodeId": "mercator_special_shop",
+        "entity": {"mapId": 696, "entityId": 3},
+        "shopItemId": 20
+    },
+    {
+        "name": "Mercator: Special shop item #4",
+        "type": "shop",
+        "nodeId": "mercator_special_shop",
+        "entity": {"mapId": 696, "entityId": 4},
+        "shopItemId": 21
+    },
+    {
+        "name": "Mercator: Docks shop item #1",
+        "type": "shop",
+        "nodeId": "mercator_repaired_docks",
+        "entities": [
+            {"mapId": 644, "entityId": 3},
+            {"mapId": 643, "entityId": 9}
+        ],
+        "shopItemId": 22
+    },
+    {
+        "name": "Mercator: Docks shop item #2",
+        "type": "shop",
+        "nodeId": "mercator_repaired_docks",
+        "entities": [
+            {"mapId": 644, "entityId": 4},
+            {"mapId": 643, "entityId": 10}
+        ],
+        "shopItemId": 23
+    },
+    {
+        "name": "Mercator: Docks shop item #3",
+        "type": "shop",
+        "nodeId": "mercator_repaired_docks",
+        "entities": [
+            {"mapId": 644, "entityId": 5},
+            {"mapId": 643, "entityId": 11}
+        ],
+        "shopItemId": 24
+    },
+    {
+        "name": "Verla: Shop item #1",
+        "type": "shop",
+        "nodeId": "verla",
+        "entities": [
+            {"mapId": 719, "entityId": 0},
+            {"mapId": 720, "entityId": 1}
+        ],
+        "shopItemId": 25
+    },
+    {
+        "name": "Verla: Shop item #2",
+        "type": "shop",
+        "nodeId": "verla",
+        "entities": [
+            {"mapId": 719, "entityId": 1},
+            {"mapId": 720, "entityId": 2}
+        ],
+        "shopItemId": 26
+    },
+    {
+        "name": "Verla: Shop item #3",
+        "type": "shop",
+        "nodeId": "verla",
+        "entities": [
+            {"mapId": 719, "entityId": 2},
+            {"mapId": 720, "entityId": 3}
+        ],
+        "shopItemId": 27
+    },
+    {
+        "name": "Verla: Shop item #4",
+        "type": "shop",
+        "nodeId": "verla",
+        "entities": [
+            {"mapId": 719, "entityId": 4},
+            {"mapId": 720, "entityId": 4}
+        ],
+        "shopItemId": 28
+    },
+    {
+        "name": "Verla: Shop item #5 (extra item after saving town)",
+        "type": "shop",
+        "nodeId": "verla_after_mines",
+        "entity": {"mapId": 720, "entityId": 5},
+        "shopItemId": 29
+    },
+    {
+        "name": "Route from Verla to Destel: Kelketo shop item #1",
+        "type": "shop",
+        "nodeId": "route_verla_destel",
+        "entity": {"mapId": 517, "entityId": 1},
+        "shopItemId": 30
+    },
+    {
+        "name": "Route from Verla to Destel: Kelketo shop item #2",
+        "type": "shop",
+        "nodeId": "route_verla_destel",
+        "entity": {"mapId": 517, "entityId": 2},
+        "shopItemId": 31
+    },
+    {
+        "name": "Route from Verla to Destel: Kelketo shop item #3",
+        "type": "shop",
+        "nodeId": "route_verla_destel",
+        "entity": {"mapId": 517, "entityId": 3},
+        "shopItemId": 32
+    },
+    {
+        "name": "Route from Verla to Destel: Kelketo shop item #4",
+        "type": "shop",
+        "nodeId": "route_verla_destel",
+        "entity": {"mapId": 517, "entityId": 4},
+        "shopItemId": 33
+    },
+    {
+        "name": "Route from Verla to Destel: Kelketo shop item #5",
+        "type": "shop",
+        "nodeId": "route_verla_destel",
+        "entity": {"mapId": 517, "entityId": 5},
+        "shopItemId": 34
+    },
+    {
+        "name": "Destel: Inn item",
+        "type": "shop",
+        "nodeId": "destel",
+        "entity": {"mapId": 729, "entityId": 2},
+        "shopItemId": 35
+    },
+    {
+        "name": "Destel: Shop item #1",
+        "type": "shop",
+        "nodeId": "destel",
+        "entity": {"mapId": 733, "entityId": 1},
+        "shopItemId": 36
+    },
+    {
+        "name": "Destel: Shop item #2",
+        "type": "shop",
+        "nodeId": "destel",
+        "entity": {"mapId": 733, "entityId": 2},
+        "shopItemId": 37
+    },
+    {
+        "name": "Destel: Shop item #3",
+        "type": "shop",
+        "nodeId": "destel",
+        "entity": {"mapId": 733, "entityId": 3},
+        "shopItemId": 38
+    },
+    {
+        "name": "Destel: Shop item #4",
+        "type": "shop",
+        "nodeId": "destel",
+        "entity": {"mapId": 733, "entityId": 4},
+        "shopItemId": 39
+    },
+    {
+        "name": "Destel: Shop item #5",
+        "type": "shop",
+        "nodeId": "destel",
+        "entity": {"mapId": 733, "entityId": 5},
+        "shopItemId": 40
+    },
+    {
+        "name": "Route to Lake Shrine: Greedly's shop item #1",
+        "type": "shop",
+        "nodeId": "route_lake_shrine",
+        "entity": {"mapId": 526, "entityId": 0},
+        "shopItemId": 41
+    },
+    {
+        "name": "Route to Lake Shrine: Greedly's shop item #2",
+        "type": "shop",
+        "nodeId": "route_lake_shrine",
+        "entity": {"mapId": 526, "entityId": 2},
+        "shopItemId": 42
+    },
+    {
+        "name": "Route to Lake Shrine: Greedly's shop item #3",
+        "type": "shop",
+        "nodeId": "route_lake_shrine",
+        "entity": {"mapId": 526, "entityId": 3},
+        "shopItemId": 43
+    },
+    {
+        "name": "Route to Lake Shrine: Greedly's shop item #4",
+        "type": "shop",
+        "nodeId": "route_lake_shrine",
+        "entity": {"mapId": 526, "entityId": 4},
+        "shopItemId": 44
+    },
+    {
+        "name": "Kazalt: Shop item #1",
+        "type": "shop",
+        "nodeId": "kazalt",
+        "entity": {"mapId": 747, "entityId": 0},
+        "shopItemId": 45
+    },
+    {
+        "name": "Kazalt: Shop item #2",
+        "type": "shop",
+        "nodeId": "kazalt",
+        "entity": {"mapId": 747, "entityId": 2},
+        "shopItemId": 46
+    },
+    {
+        "name": "Kazalt: Shop item #3",
+        "type": "shop",
+        "nodeId": "kazalt",
+        "entity": {"mapId": 747, "entityId": 3},
+        "shopItemId": 47
+    },
+    {
+        "name": "Kazalt: Shop item #4",
+        "type": "shop",
+        "nodeId": "kazalt",
+        "entity": {"mapId": 747, "entityId": 4},
+        "shopItemId": 48
+    },
+    {
+        "name": "Kazalt: Shop item #5",
+        "type": "shop",
+        "nodeId": "kazalt",
+        "entity": {"mapId": 747, "entityId": 5},
+        "shopItemId": 49
+    },
+    {
+        "name": "Massan: Elder reward after freeing Fara in Swamp Shrine",
+        "type": "reward",
+        "nodeId": "massan_after_swamp_shrine",
+        "address": 162337,
+        "flag": {"byte": "0x1004", "bit": 2},
+        "rewardId": 0
+    },
+    {
+        "name": "Lake Shrine: Mir reward after beating Duke",
+        "type": "reward",
+        "nodeId": "lake_shrine",
+        "address": 166463,
+        "flag": {"byte": "0x1003", "bit": 0},
+        "rewardId": 1
+    },
+    {
+        "name": "Greenmaze: Cutter reward for saving Einstein",
+        "type": "reward",
+        "nodeId": "greenmaze_cutter",
+        "address": 166021,
+        "flag": {"byte": "0x1024", "bit": 4},
+        "rewardId": 2
+    },
+    {
+        "name": "Mountainous Area: Zak reward after fighting",
+        "type": "reward",
+        "nodeId": "mountainous_area",
+        "hints": [
+            "kept by a threatening guardian"
+        ],
+        "address": 166515,
+        "flag": {"byte": "0x1027", "bit": 0},
+        "rewardId": 3
+    },
+    {
+        "name": "Route between Gumi and Ryuma: Swordsman Kado reward",
+        "type": "reward",
+        "nodeId": "route_gumi_ryuma",
+        "address": 166219,
+        "flag": {"byte": "0x101B", "bit": 7},
+        "rewardId": 4
+    },
+    {
+        "name": "Greenmaze: dwarf hidden in the trees",
+        "type": "reward",
+        "nodeId": "greenmaze_pre_whistle",
+        "address": 166111,
+        "flag": {"byte": "0x1022", "bit": 7},
+        "rewardId": 5
+    },
+    {
+        "name": "Mercator: Arthur reward (in castle throne room)",
+        "type": "reward",
+        "nodeId": "mercator",
+        "address": 164191,
+        "flag": {"byte": "0x101B", "bit": 6},
+        "rewardId": 6
+    },
+    {
+        "name": "Mercator: Fahl's dojo challenge reward",
+        "type": "reward",
+        "nodeId": "mercator",
+        "address": 165029,
+        "flag": {"byte": "0x101C", "bit": 4},
+        "rewardId": 7
+    },
+    {
+        "name": "Ryuma: Mayor's first reward",
+        "type": "reward",
+        "nodeId": "ryuma_after_thieves_hideout",
+        "address": 164731,
+        "flag": {"byte": "0x1004", "bit": 3},
+        "rewardId": 8
+    },
+    {
+        "name": "Ryuma: Mayor's second reward",
+        "type": "reward",
+        "nodeId": "ryuma_after_thieves_hideout",
+        "address": 164735,
+        "flag": {"byte": "0x1004", "bit": 3},
+        "rewardId": 9
+    }
+]
diff --git a/worlds/landstalker/data/world_node.py b/worlds/landstalker/data/world_node.py
new file mode 100644
index 0000000000..f786f9613f
--- /dev/null
+++ b/worlds/landstalker/data/world_node.py
@@ -0,0 +1,411 @@
+WORLD_NODES_JSON = {
+    "massan": {
+        "name": "Massan",
+        "hints": [
+            "in a village",
+            "in a region inhabited by bears",
+            "in the village of Massan"
+        ]
+    },
+    "massan_cave": {
+        "name": "Massan Cave",
+        "hints": [
+            "in a large cave",
+            "in a region inhabited by bears",
+            "in Massan cave"
+        ]
+    },
+    "route_massan_gumi": {
+        "name": "Route between Massan and Gumi",
+        "hints": [
+            "on a route",
+            "in a region inhabited by bears",
+            "between Massan and Gumi"
+        ]
+    },
+    "waterfall_shrine": {
+        "name": "Waterfall Shrine",
+        "hints": [
+            "in a shrine",
+            "close to a waterfall",
+            "in a region inhabited by bears",
+            "in Waterfall Shrine"
+        ]
+    },
+    "swamp_shrine": {
+        "name": "Swamp Shrine",
+        "hints": [
+            "in a shrine",
+            "near a swamp",
+            "in a region inhabited by bears",
+            "in Swamp Shrine"
+        ]
+    },
+    "massan_after_swamp_shrine": {
+        "name": "Massan (after Swamp Shrine)",
+        "hints": [
+            "in a village",
+            "in a region inhabited by bears",
+            "in the village of Massan"
+        ]
+    },
+    "gumi_after_swamp_shrine": {
+        "name": "Gumi (after Swamp Shrine)",
+        "hints": [
+            "in a village",
+            "in a region inhabited by bears",
+            "in the village of Gumi"
+        ]
+    },
+    "gumi": {
+        "name": "Gumi",
+        "hints": [
+            "in a village",
+            "in a region inhabited by bears",
+            "in the village of Gumi"
+        ]
+    },
+    "route_gumi_ryuma": {
+        "name": "Route from Gumi to Ryuma",
+        "hints": [
+            "on a route",
+            "in a region inhabited by bears",
+            "between Gumi and Ryuma"
+        ]
+    },
+    "tibor": {
+        "name": "Tibor",
+        "hints": [
+            "among the trees",
+            "inside the elder tree called Tibor"
+        ]
+    },
+    "ryuma": {
+        "name": "Ryuma",
+        "hints": [
+            "in a town",
+            "in the town of Ryuma"
+        ]
+    },
+    "ryuma_after_thieves_hideout": {
+        "name": "Ryuma (after Thieves Hideout)",
+        "hints": [
+            "in a town",
+            "in the town of Ryuma"
+        ]
+    },
+    "ryuma_lighthouse_repaired": {
+        "name": "Ryuma (repaired lighthouse)",
+        "hints": [
+            "in a town",
+            "in the town of Ryuma"
+        ]
+    },
+    "thieves_hideout_pre_key": {
+        "name": "Thieves Hideout (before keydoor)",
+        "hints": [
+            "close to a waterfall",
+            "in a large cave",
+            "in the Thieves' Hideout"
+        ]
+    },
+    "thieves_hideout_post_key": {
+        "name": "Thieves Hideout (after keydoor)",
+        "hints": [
+            "close to a waterfall",
+            "in a large cave",
+            "in the Thieves' Hideout"
+        ]
+    },
+    "helga_hut": {
+        "name": "Witch Helga's Hut",
+        "hints": [
+            "near a swamp",
+            "in the hut of a witch called Helga"
+        ]
+    },
+    "mercator": {
+        "name": "Mercator",
+        "hints": [
+            "in a town",
+            "in the town of Mercator"
+        ]
+    },
+    "mercator_repaired_docks": {
+        "name": "Mercator (docks with repaired lighthouse)",
+        "hints": [
+            "in a town",
+            "in the town of Mercator"
+        ]
+    },
+    "mercator_casino": {
+        "name": "Mercator casino"
+    },
+    "mercator_dungeon": {
+        "name": "Mercator Dungeon"
+    },
+    "crypt": {
+        "name": "Crypt",
+        "hints": [
+            "hidden in the depths of Mercator",
+            "in Mercator crypt"
+        ]
+    },
+    "mercator_special_shop": {
+        "name": "Mercator special shop",
+        "hints": [
+            "in a town",
+            "in the town of Mercator"
+        ]
+    },
+    "mir_tower_sector": {
+        "name": "Mir Tower sector",
+        "hints": [
+            "on a route",
+            "near Mir Tower"
+        ]
+    },
+    "mir_tower_sector_tree_ledge": {
+        "name": "Mir Tower sector (ledge behind sacred tree)",
+        "hints": [
+            "on a route",
+            "among the trees",
+            "near Mir Tower"
+        ]
+    },
+    "mir_tower_sector_tree_coast": {
+        "name": "Mir Tower sector (coast behind sacred tree)",
+        "hints": [
+            "on a route",
+            "among the trees",
+            "near Mir Tower"
+        ]
+    },
+    "twinkle_village": {
+        "name": "Twinkle village",
+        "hints": [
+            "in a village",
+            "in Twinkle village"
+        ]
+    },
+    "mir_tower_pre_garlic": {
+        "name": "Mir Tower (pre-garlic)",
+        "hints": [
+            "inside a tower",
+            "in Mir Tower"
+        ]
+    },
+    "mir_tower_post_garlic": {
+        "name": "Mir Tower (post-garlic)",
+        "hints": [
+            "inside a tower",
+            "in Mir Tower"
+        ]
+    },
+    "greenmaze_pre_whistle": {
+        "name": "Greenmaze (pre-whistle)",
+        "hints": [
+            "among the trees",
+            "in the infamous Greenmaze"
+        ]
+    },
+    "greenmaze_cutter": {
+        "name": "Greenmaze (Cutter hidden sector)",
+        "hints": [
+            "among the trees",
+            "in the infamous Greenmaze"
+        ]
+    },
+    "greenmaze_post_whistle": {
+        "name": "Greenmaze (post-whistle)",
+        "hints": [
+            "among the trees",
+            "in the infamous Greenmaze"
+        ]
+    },
+    "verla_shore": {
+        "name": "Verla shore",
+        "hints": [
+            "on a route",
+            "near the town of Verla"
+        ]
+    },
+    "verla_shore_cliff": {
+        "name": "Verla shore cliff (accessible from Verla Mines)",
+        "hints": [
+            "on a route",
+            "near the town of Verla"
+        ]
+    },
+    "verla": {
+        "name": "Verla",
+        "hints": [
+            "in a town",
+            "in the town of Verla"
+        ]
+    },
+    "verla_after_mines": {
+        "name": "Verla (after mines)",
+        "hints": [
+            "in a town",
+            "in the town of Verla"
+        ]
+    },
+    "verla_mines": {
+        "name": "Verla Mines",
+        "hints": [
+            "in Verla Mines"
+        ]
+    },
+    "verla_mines_behind_lava": {
+        "name": "Verla Mines (behind lava)",
+        "hints": [
+            "in Verla Mines"
+        ]
+    },
+    "route_verla_destel": {
+        "name": "Route between Verla and Destel",
+        "hints": [
+            "on a route",
+            "in Destel region",
+            "between Verla and Destel"
+        ]
+    },
+    "destel": {
+        "name": "Destel",
+        "hints": [
+            "in a village",
+            "in Destel region",
+            "in the village of Destel"
+        ]
+    },
+    "route_after_destel": {
+        "name": "Route after Destel",
+        "hints": [
+            "on a route",
+            "near a lake",
+            "in Destel region",
+            "on the route to the lake after Destel"
+        ]
+    },
+    "destel_well": {
+        "name": "Destel Well",
+        "hints": [
+            "in Destel region",
+            "in a large cave",
+            "in Destel Well"
+        ]
+    },
+    "route_lake_shrine": {
+        "name": "Route to Lake Shrine",
+        "hints": [
+            "on a route",
+            "near a lake",
+            "on the mountainous path to Lake Shrine"
+        ]
+    },
+    "route_lake_shrine_cliff": {
+        "name": "Route to Lake Shrine cliff",
+        "hints": [
+            "on a route",
+            "near a lake",
+            "on the mountainous path to Lake Shrine"
+        ]
+    },
+    "lake_shrine": {
+        "name": "Lake Shrine",
+        "hints": [
+            "in a shrine",
+            "near a lake",
+            "in Lake Shrine"
+        ]
+    },
+    "mountainous_area": {
+        "name": "Mountainous Area",
+        "hints": [
+            "in a mountainous area"
+        ]
+    },
+    "king_nole_cave": {
+        "name": "King Nole's Cave",
+        "hints": [
+            "in a large cave",
+            "in King Nole's cave"
+        ]
+    },
+    "kazalt": {
+        "name": "Kazalt",
+        "hints": [
+            "in King Nole's domain",
+            "in Kazalt"
+        ]
+    },
+    "king_nole_labyrinth_pre_door": {
+        "name": "King Nole's Labyrinth (before door)",
+        "hints": [
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_labyrinth_post_door": {
+        "name": "King Nole's Labyrinth (after door)",
+        "hints": [
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_labyrinth_exterior": {
+        "name": "King Nole's Labyrinth (exterior)",
+        "hints": [
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_labyrinth_fall_from_exterior": {
+        "name": "King Nole's Labyrinth (fall from exterior)",
+        "hints": [
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_labyrinth_raft_entrance": {
+        "name": "King Nole's Labyrinth (raft entrance)",
+        "hints": [
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_labyrinth_raft": {
+        "name": "King Nole's Labyrinth (raft)",
+        "hints": [
+            "close to a waterfall",
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_labyrinth_sacred_tree": {
+        "name": "King Nole's Labyrinth (sacred tree)",
+        "hints": [
+            "among the trees",
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_labyrinth_path_to_palace": {
+        "name": "King Nole's Labyrinth (path to palace)",
+        "hints": [
+            "in King Nole's domain",
+            "in King Nole's labyrinth"
+        ]
+    },
+    "king_nole_palace": {
+        "name": "King Nole's Palace",
+        "hints": [
+            "in King Nole's domain",
+            "in King Nole's palace"
+        ]
+    },
+    "end": {
+        "name": "The End"
+    }
+}
diff --git a/worlds/landstalker/data/world_path.py b/worlds/landstalker/data/world_path.py
new file mode 100644
index 0000000000..f7baba358a
--- /dev/null
+++ b/worlds/landstalker/data/world_path.py
@@ -0,0 +1,446 @@
+WORLD_PATHS_JSON = [
+    {
+        "fromId": "massan",
+        "toId": "massan_cave",
+        "twoWay": True,
+        "requiredItems": [
+            "Axe Magic"
+        ]
+    },
+    {
+        "fromId": "massan",
+        "toId": "massan_after_swamp_shrine",
+        "requiredNodes": [
+            "swamp_shrine"
+        ]
+    },
+    {
+        "fromId": "massan",
+        "toId": "route_massan_gumi",
+        "twoWay": True
+    },
+    {
+        "fromId": "route_massan_gumi",
+        "toId": "waterfall_shrine",
+        "twoWay": True
+    },
+    {
+        "fromId": "route_massan_gumi",
+        "toId": "swamp_shrine",
+        "twoWay": True,
+        "weight": 2,
+        "requiredItems": [
+            "Idol Stone"
+        ]
+    },
+    {
+        "fromId": "route_massan_gumi",
+        "toId": "gumi",
+        "twoWay": True
+    },
+    {
+        "fromId": "gumi",
+        "toId": "gumi_after_swamp_shrine",
+        "requiredNodes": [
+            "swamp_shrine"
+        ]
+    },
+    {
+        "fromId": "gumi",
+        "toId": "route_gumi_ryuma"
+    },
+    {
+        "fromId": "route_gumi_ryuma",
+        "toId": "ryuma",
+        "twoWay": True
+    },
+    {
+        "fromId": "ryuma",
+        "toId": "ryuma_after_thieves_hideout",
+        "requiredNodes": [
+            "thieves_hideout_post_key"
+        ]
+    },
+    {
+        "fromId": "ryuma",
+        "toId": "ryuma_lighthouse_repaired",
+        "twoWay": True,
+        "requiredItems": [
+            "Sun Stone"
+        ]
+    },
+    {
+        "fromId": "ryuma",
+        "toId": "thieves_hideout_pre_key",
+        "twoWay": True
+    },
+    {
+        "fromId": "thieves_hideout_pre_key",
+        "toId": "thieves_hideout_post_key",
+        "requiredItems": [
+            "Key"
+        ]
+    },
+    {
+        "fromId": "thieves_hideout_post_key",
+        "toId": "thieves_hideout_pre_key"
+    },
+    {
+        "fromId": "route_gumi_ryuma",
+        "toId": "tibor",
+        "twoWay": True
+    },
+    {
+        "fromId": "route_gumi_ryuma",
+        "toId": "helga_hut",
+        "twoWay": True,
+        "requiredItems": [
+            "Einstein Whistle"
+        ],
+        "requiredNodes": [
+            "massan"
+        ]
+    },
+    {
+        "fromId": "route_gumi_ryuma",
+        "toId": "mercator",
+        "twoWay": True,
+        "weight": 2,
+        "requiredItems": [
+            "Safety Pass"
+        ]
+    },
+    {
+        "fromId": "mercator",
+        "toId": "mercator_dungeon",
+        "twoWay": True
+    },
+    {
+        "fromId": "mercator",
+        "toId": "crypt",
+        "twoWay": True
+    },
+    {
+        "fromId": "mercator",
+        "toId": "mercator_special_shop",
+        "twoWay": True,
+        "requiredItems": [
+            "Buyer Card"
+        ]
+    },
+    {
+        "fromId": "mercator",
+        "toId": "mercator_casino",
+        "twoWay": True,
+        "requiredItems": [
+            "Casino Ticket"
+        ]
+    },
+    {
+        "fromId": "mercator",
+        "toId": "mir_tower_sector",
+        "twoWay": True
+    },
+    {
+        "fromId": "mir_tower_sector",
+        "toId": "twinkle_village",
+        "twoWay": True
+    },
+    {
+        "fromId": "mir_tower_sector",
+        "toId": "mir_tower_sector_tree_ledge",
+        "twoWay": True,
+        "requiredItems": [
+            "Axe Magic"
+        ]
+    },
+    {
+        "fromId": "mir_tower_sector",
+        "toId": "mir_tower_sector_tree_coast",
+        "twoWay": True,
+        "requiredItems": [
+            "Axe Magic"
+        ]
+    },
+    {
+        "fromId": "mir_tower_sector",
+        "toId": "mir_tower_pre_garlic",
+        "requiredItems": [
+            "Armlet"
+        ]
+    },
+    {
+        "fromId": "mir_tower_pre_garlic",
+        "toId": "mir_tower_sector"
+    },
+    {
+        "fromId": "mir_tower_pre_garlic",
+        "toId": "mir_tower_post_garlic",
+        "requiredItems": [
+            "Garlic"
+        ]
+    },
+    {
+        "fromId": "mir_tower_post_garlic",
+        "toId": "mir_tower_pre_garlic"
+    },
+    {
+        "fromId": "mir_tower_post_garlic",
+        "toId": "mir_tower_sector"
+    },
+    {
+        "fromId": "mercator",
+        "toId": "greenmaze_pre_whistle",
+        "weight": 2,
+        "requiredItems": [
+            "Key"
+        ]
+    },
+    {
+        "fromId": "greenmaze_pre_whistle",
+        "toId": "greenmaze_post_whistle",
+        "requiredItems": [
+            "Einstein Whistle"
+        ]
+    },
+    {
+        "fromId": "greenmaze_pre_whistle",
+        "toId": "greenmaze_cutter",
+        "requiredItems": [
+            "EkeEke"
+        ],
+        "twoWay": True
+    },
+    {
+        "fromId": "greenmaze_post_whistle",
+        "toId": "route_massan_gumi"
+    },
+    {
+        "fromId": "mercator",
+        "toId": "mercator_repaired_docks",
+        "requiredNodes": [
+            "ryuma_lighthouse_repaired"
+        ]
+    },
+    {
+        "fromId": "mercator_repaired_docks",
+        "toId": "verla_shore"
+    },
+    {
+        "fromId": "verla_shore",
+        "toId": "verla",
+        "twoWay": True
+    },
+    {
+        "fromId": "verla",
+        "toId": "verla_after_mines",
+        "requiredNodes": [
+            "verla_mines"
+        ],
+        "twoWay": True
+    },
+    {
+        "fromId": "verla_shore",
+        "toId": "verla_mines",
+        "twoWay": True
+    },
+    {
+        "fromId": "verla_mines",
+        "toId": "verla_shore_cliff",
+        "twoWay": True
+    },
+    {
+        "fromId": "verla_shore_cliff",
+        "toId": "verla_shore"
+    },
+    {
+        "fromId": "verla_shore",
+        "toId": "mir_tower_sector",
+        "requiredNodes": [
+            "verla_mines"
+        ],
+        "twoWay": True
+    },
+    {
+        "fromId": "verla_mines",
+        "toId": "route_verla_destel"
+    },
+    {
+        "fromId": "verla_mines",
+        "toId": "verla_mines_behind_lava",
+        "twoWay": True,
+        "requiredItems": [
+            "Fireproof"
+        ]
+    },
+    {
+        "fromId": "route_verla_destel",
+        "toId": "destel",
+        "twoWay": True
+    },
+    {
+        "fromId": "destel",
+        "toId": "route_after_destel",
+        "twoWay": True
+    },
+    {
+        "fromId": "destel",
+        "toId": "destel_well",
+        "twoWay": True
+    },
+    {
+        "fromId": "destel_well",
+        "toId": "route_lake_shrine",
+        "twoWay": True
+    },
+    {
+        "fromId": "route_lake_shrine",
+        "toId": "lake_shrine",
+        "itemsPlacedWhenCrossing": [
+            "Sword of Gaia"
+        ]
+    },
+    {
+        "fromId": "lake_shrine",
+        "toId": "route_lake_shrine"
+    },
+    {
+        "fromId": "lake_shrine",
+        "toId": "mir_tower_sector"
+    },
+    {
+        "fromId": "greenmaze_pre_whistle",
+        "toId": "mountainous_area",
+        "twoWay": True,
+        "requiredItems": [
+            "Axe Magic"
+        ]
+    },
+    {
+        "fromId": "mountainous_area",
+        "toId": "route_lake_shrine_cliff",
+        "twoWay": True,
+        "requiredItems": [
+            "Axe Magic"
+        ]
+    },
+    {
+        "fromId": "route_lake_shrine_cliff",
+        "toId": "route_lake_shrine"
+    },
+    {
+        "fromId": "mountainous_area",
+        "toId": "king_nole_cave",
+        "twoWay": True,
+        "weight": 2,
+        "requiredItems": [
+            "Gola's Eye"
+        ]
+    },
+    {
+        "fromId": "king_nole_cave",
+        "toId": "mercator"
+    },
+    {
+        "fromId": "king_nole_cave",
+        "toId": "kazalt",
+        "itemsPlacedWhenCrossing": [
+            "Lithograph"
+        ]
+    },
+    {
+        "fromId": "kazalt",
+        "toId": "king_nole_cave"
+    },
+    {
+        "fromId": "kazalt",
+        "toId": "king_nole_labyrinth_pre_door",
+        "twoWay": True
+    },
+    {
+        "fromId": "king_nole_labyrinth_pre_door",
+        "toId": "king_nole_labyrinth_post_door",
+        "requiredItems": [
+            "Key"
+        ]
+    },
+    {
+        "fromId": "king_nole_labyrinth_post_door",
+        "toId": "king_nole_labyrinth_pre_door"
+    },
+    {
+        "fromId": "king_nole_labyrinth_pre_door",
+        "toId": "king_nole_labyrinth_exterior",
+        "requiredItems": [
+            "Iron Boots"
+        ]
+    },
+    {
+        "fromId": "king_nole_labyrinth_exterior",
+        "toId": "king_nole_labyrinth_fall_from_exterior",
+        "requiredItems": [
+            "Axe Magic"
+        ]
+    },
+    {
+        "fromId": "king_nole_labyrinth_fall_from_exterior",
+        "toId": "king_nole_labyrinth_pre_door"
+    },
+    {
+        "fromId": "king_nole_labyrinth_post_door",
+        "toId": "king_nole_labyrinth_raft_entrance",
+        "requiredItems": [
+            "Snow Spikes"
+        ]
+    },
+    {
+        "fromId": "king_nole_labyrinth_raft_entrance",
+        "toId": "king_nole_labyrinth_post_door"
+    },
+    {
+        "fromId": "king_nole_labyrinth_raft_entrance",
+        "toId": "king_nole_labyrinth_raft",
+        "requiredItems": [
+            "Logs"
+        ]
+    },
+    {
+        "fromId": "king_nole_labyrinth_raft",
+        "toId": "king_nole_labyrinth_raft_entrance"
+    },
+    {
+        "fromId": "king_nole_labyrinth_post_door",
+        "toId": "king_nole_labyrinth_path_to_palace",
+        "requiredItems": [
+            "Snow Spikes"
+        ]
+    },
+    {
+        "fromId": "king_nole_labyrinth_path_to_palace",
+        "toId": "king_nole_labyrinth_post_door"
+    },
+    {
+        "fromId": "king_nole_labyrinth_post_door",
+        "toId": "king_nole_labyrinth_sacred_tree",
+        "requiredItems": [
+            "Axe Magic"
+        ],
+        "requiredNodes": [
+            "king_nole_labyrinth_raft_entrance"
+        ]
+    },
+    {
+        "fromId": "king_nole_labyrinth_path_to_palace",
+        "toId": "king_nole_palace",
+        "twoWay": True
+    },
+    {
+        "fromId": "king_nole_palace",
+        "toId": "end",
+        "requiredItems": [
+            "Gola's Fang",
+            "Gola's Horn",
+            "Gola's Nail"
+        ]
+    }
+]
\ No newline at end of file
diff --git a/worlds/landstalker/data/world_region.py b/worlds/landstalker/data/world_region.py
new file mode 100644
index 0000000000..3365a9dfa9
--- /dev/null
+++ b/worlds/landstalker/data/world_region.py
@@ -0,0 +1,299 @@
+WORLD_REGIONS_JSON = [
+    {
+        "name": "Massan",
+        "hintName": "in the village of Massan",
+        "nodeIds": [
+            "massan",
+            "massan_after_swamp_shrine"
+        ]
+    },
+    {
+        "name": "Massan Cave",
+        "hintName": "in the cave near Massan",
+        "nodeIds": [
+            "massan_cave"
+        ],
+        "darkMapIds": [
+            803, 804, 805, 806, 807
+        ]
+    },
+    {
+        "name": "Route between Massan and Gumi",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "route_massan_gumi"
+        ]
+    },
+    {
+        "name": "Waterfall Shrine",
+        "hintName": "in the waterfall shrine",
+        "nodeIds": [
+            "waterfall_shrine"
+        ],
+        "darkMapIds": [
+            174, 175, 176, 177, 178, 179, 180, 181, 182
+        ]
+    },
+    {
+        "name": "Swamp Shrine",
+        "hintName": "in the swamp shrine",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "swamp_shrine"
+        ],
+        "darkMapIds": [
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 27, 30
+        ]
+    },
+    {
+        "name": "Gumi",
+        "hintName": "in the village of Gumi",
+        "nodeIds": [
+            "gumi",
+            "gumi_after_swamp_shrine"
+        ]
+    },
+    {
+        "name": "Route between Gumi and Ryuma",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "route_gumi_ryuma"
+        ]
+    },
+    {
+        "name": "Tibor",
+        "hintName": "inside Tibor",
+        "nodeIds": [
+            "tibor"
+        ],
+        "darkMapIds": [
+            808, 809, 810, 811, 812, 813, 814, 815
+        ]
+    },
+    {
+        "name": "Ryuma",
+        "hintName": "in the town of Ryuma",
+        "nodeIds": [
+            "ryuma",
+            "ryuma_after_thieves_hideout",
+            "ryuma_lighthouse_repaired"
+        ]
+    },
+    {
+        "name": "Thieves Hideout",
+        "hintName": "in the thieves' hideout",
+        "nodeIds": [
+            "thieves_hideout_pre_key",
+            "thieves_hideout_post_key"
+        ],
+        "darkMapIds": [
+            185, 186, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 
+            203, 204, 205, 206, 207, 208, 210, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222
+        ]
+    },
+    {
+        "name": "Witch Helga's Hut",
+        "hintName": "in witch Helga's hut",
+        "nodeIds": [
+            "helga_hut"
+        ]
+    },
+    {
+        "name": "Mercator",
+        "hintName": "in the town of Mercator",
+        "nodeIds": [
+            "mercator",
+            "mercator_repaired_docks",
+            "mercator_casino",
+            "mercator_special_shop"
+        ]
+    },
+    {
+        "name": "Crypt",
+        "hintName": "in the crypt of Mercator",
+        "nodeIds": [
+            "crypt"
+        ],
+        "darkMapIds": [
+            646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659
+        ]
+    },
+    {
+        "name": "Mercator Dungeon",
+        "hintName": "in the dungeon of Mercator",
+        "nodeIds": [
+            "mercator_dungeon"
+        ],
+        "darkMapIds": [
+            37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 76, 80, 81, 82, 91, 92
+        ]
+    },
+    {
+        "name": "Mir Tower sector",
+        "hintName": "near Mir Tower",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "mir_tower_sector",
+            "mir_tower_sector_tree_ledge",
+            "mir_tower_sector_tree_coast",
+            "twinkle_village"
+        ]
+    },
+    {
+        "name": "Mir Tower",
+        "hintName": "inside Mir Tower",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "mir_tower_pre_garlic",
+            "mir_tower_post_garlic"
+        ],
+        "darkMapIds": [
+            750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 
+            767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784
+        ]
+    },
+    {
+        "name": "Greenmaze",
+        "hintName": "in Greenmaze",
+        "nodeIds": [
+            "greenmaze_pre_whistle",
+            "greenmaze_post_whistle"
+        ]
+    },
+    {
+        "name": "Verla Shore",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "verla_shore",
+            "verla_shore_cliff"
+        ]
+    },
+    {
+        "name": "Verla",
+        "hintName": "in the town of Verla",
+        "nodeIds": [
+            "verla",
+            "verla_after_mines"
+        ]
+    },
+    {
+        "name": "Verla Mines",
+        "hintName": "in the mines near Verla",
+        "nodeIds": [
+            "verla_mines",
+            "verla_mines_behind_lava"
+        ],
+        "darkMapIds": [
+            227, 228, 229, 230, 231, 232, 233, 234, 235, 237, 239, 240, 241, 242, 243, 244, 246,
+            247, 248, 250, 253, 254, 255, 256, 258, 259, 266, 268, 269, 471
+        ]
+    },
+    {
+        "name": "Route between Verla and Destel",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "route_verla_destel"
+        ]
+    },
+    {
+        "name": "Destel",
+        "hintName": "in the village of Destel",
+        "nodeIds": [
+            "destel"
+        ]
+    },
+    {
+        "name": "Route after Destel",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "route_after_destel"
+        ]
+    },
+    {
+        "name": "Destel Well",
+        "hintName": "in Destel well",
+        "nodeIds": [
+            "destel_well"
+        ],
+        "darkMapIds": [
+            270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290
+        ]
+    },
+    {
+        "name": "Route to Lake Shrine",
+        "canBeHintedAsRequired": False,
+        "nodeIds": [
+            "route_lake_shrine",
+            "route_lake_shrine_cliff"
+        ]
+    },
+    {
+        "name": "Lake Shrine",
+        "hintName": "in the lake shrine",
+        "nodeIds": [
+            "lake_shrine"
+        ],
+        "darkMapIds": [
+            291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 
+            307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 
+            323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 
+            339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354
+        ]
+    },
+    {
+        "name": "Mountainous Area",
+        "hintName": "in the mountainous area",
+        "nodeIds": [
+            "mountainous_area"
+        ]
+    },
+    {
+        "name": "King Nole's Cave",
+        "hintName": "in King Nole's cave",
+        "nodeIds": [
+            "king_nole_cave"
+        ],
+        "darkMapIds": [
+            145, 147, 150, 152, 154, 155, 156, 158, 160, 161, 162, 164, 166, 170, 171, 172
+        ]
+    },
+    {
+        "name": "Kazalt",
+        "hintName": "in the hidden town of Kazalt",
+        "nodeIds": [
+            "kazalt"
+        ]
+    },
+    {
+        "name": "King Nole's Labyrinth",
+        "hintName": "in King Nole's labyrinth",
+        "nodeIds": [
+            "king_nole_labyrinth_pre_door",
+            "king_nole_labyrinth_post_door",
+            "king_nole_labyrinth_exterior",
+            "king_nole_labyrinth_fall_from_exterior",
+            "king_nole_labyrinth_path_to_palace",
+            "king_nole_labyrinth_raft_entrance",
+            "king_nole_labyrinth_raft",
+            "king_nole_labyrinth_sacred_tree"
+        ],
+        "darkMapIds": [
+            355, 356, 357, 358, 359, 360, 361, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 
+            373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 
+            390, 391, 392, 393, 394, 395, 396, 397, 398, 405, 406, 408, 409, 410, 411, 412, 413, 
+            414, 415, 416, 417, 418, 419, 420, 422, 423
+        ]
+    },
+    {
+        "name": "King Nole's Palace",
+        "hintName": "in King Nole's palace",
+        "nodeIds": [
+            "king_nole_palace",
+            "end"
+        ],
+        "darkMapIds": [
+            115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 
+            131, 132, 133, 134, 135, 136, 137, 138
+        ]
+    }
+]
\ No newline at end of file
diff --git a/worlds/landstalker/data/world_teleport_tree.py b/worlds/landstalker/data/world_teleport_tree.py
new file mode 100644
index 0000000000..830f554720
--- /dev/null
+++ b/worlds/landstalker/data/world_teleport_tree.py
@@ -0,0 +1,62 @@
+WORLD_TELEPORT_TREES_JSON = [
+    [
+        {
+            "name": "Massan tree",
+            "treeMapId": 512,
+            "nodeId": "route_massan_gumi"
+        },
+        {
+            "name": "Tibor tree",
+            "treeMapId": 534,
+            "nodeId": "route_gumi_ryuma"
+        }
+    ],
+    [
+        {
+            "name": "Mercator front gate tree",
+            "treeMapId": 539,
+            "nodeId": "route_gumi_ryuma"
+        },
+        {
+            "name": "Verla shore tree",
+            "treeMapId": 537,
+            "nodeId": "verla_shore"
+        }
+    ],
+    [
+        {
+            "name": "Destel sector tree",
+            "treeMapId": 536,
+            "nodeId": "route_after_destel"
+        },
+        {
+            "name": "Lake Shrine sector tree",
+            "treeMapId": 513,
+            "nodeId": "route_lake_shrine"
+        }
+    ],
+    [
+        {
+            "name": "Mir Tower sector tree",
+            "treeMapId": 538,
+            "nodeId": "mir_tower_sector"
+        },
+        {
+            "name": "Mountainous area tree",
+            "treeMapId": 535,
+            "nodeId": "mountainous_area"
+        }
+    ],
+    [
+        {
+            "name": "Greenmaze entrance tree",
+            "treeMapId": 510,
+            "nodeId": "greenmaze_pre_whistle"
+        },
+        {
+            "name": "Greenmaze end tree",
+            "treeMapId": 511,
+            "nodeId": "greenmaze_post_whistle"
+        }
+    ]
+]
\ No newline at end of file
diff --git a/worlds/landstalker/docs/en_Landstalker - The Treasures of King Nole.md b/worlds/landstalker/docs/en_Landstalker - The Treasures of King Nole.md
new file mode 100644
index 0000000000..90a79f8bd9
--- /dev/null
+++ b/worlds/landstalker/docs/en_Landstalker - The Treasures of King Nole.md	
@@ -0,0 +1,60 @@
+# Landstalker: The Treasures of King Nole
+
+## Where is the settings page?
+
+The [player settings page for this game](../player-settings) contains most of the options you need to 
+configure and export a config file.
+
+## What does randomization do to this game?
+
+All items are shuffled while keeping a logic to make every seed completable.
+
+Some key items could be obtained in a very different order compared to the vanilla game, leading to very unusual situations.
+
+The world is made as open as possible while keeping the original locks behind the same items & triggers as vanilla 
+when that makes sense logic-wise. This puts the emphasis on exploration and gameplay by removing all the scenario
+and story-related triggers, giving a wide open world to explore.
+
+## What items and locations get shuffled?
+
+All items and locations are shuffled. This includes **chests**, items on **ground**, in **shops**, and given by **NPCs**.
+
+It's also worth noting that all of these items are shuffled among all worlds, meaning every item can be sent to you 
+by other players.
+
+## What are the main differences compared to the vanilla game?
+
+The **Key** is now a unique item and can open several doors without being consumed, making it a standard progression item. 
+All key doors are gone, except three of them :
+  - the Mercator castle backdoor (giving access to Greenmaze sector)
+  - Thieves Hideout middle door (cutting the level in half)
+  - King Nole's Labyrinth door near entrance
+
+---
+
+The secondary shop of Mercator requiring to do the traders sidequest in the original game is now unlocked by having
+**Buyer Card** in your inventory.
+
+You will need as many **jewels** as specified in the settings to use the teleporter to go to Kazalt and the final dungeon.
+If you find and use the **Lithograph**, it will tell you in which world are each one of your jewels.
+
+Each seed, there is a random dungeon which is chosen to be the "dark dungeon" where you won't see anything unless you
+have the **Lantern** in your inventory. Unlike vanilla, King Nole's Labyrinth no longer has the few dark rooms the lantern
+was originally intended for.
+
+The **Statue of Jypta** is introduced as a real item (instead of just being an intro gimmick) and gives you gold over 
+time while you're walking, the same way Healing Boots heal you when you walk.
+
+
+## What do I need to know for my first seed?
+
+It's advised you keep Massan as your starting region for your first seed, since taking another starting region might 
+be significantly harder, both combat-wise and logic-wise.
+
+Having fully open & shuffled teleportation trees is an interesting way to play, but is discouraged for beginners 
+as well since it can force you to go in late-game zones with few Life Stocks.
+
+Overall, the default settings are good for a beginner-friendly seed, and if you don't feel too confident, you can also
+lower the combat difficulty to make it more forgiving.
+
+*Have fun on your adventure!*
diff --git a/worlds/landstalker/docs/landstalker_setup_en.md b/worlds/landstalker/docs/landstalker_setup_en.md
new file mode 100644
index 0000000000..9f453c146d
--- /dev/null
+++ b/worlds/landstalker/docs/landstalker_setup_en.md
@@ -0,0 +1,119 @@
+# Landstalker Setup Guide
+
+## Required Software
+
+- [Landstalker Archipelago Client](https://github.com/Dinopony/randstalker-archipelago/releases) (only available on Windows)
+- A compatible emulator to run the game
+  - [RetroArch](https://retroarch.com?page=platforms) with the Genesis Plus GX core
+  - [Bizhawk 2.9.1 (x64)](https://tasvideos.org/BizHawk/ReleaseHistory) with the Genesis Plus GX core
+- Your legally obtained Landstalker US ROM file (which can be acquired on [Steam](https://store.steampowered.com/app/71118/Landstalker_The_Treasures_of_King_Nole/))
+
+## Installation Instructions
+
+- Unzip the Landstalker Archipelago Client archive into its own folder
+- Put your Landstalker ROM (`LandStalker_USA.SGD` on the Steam release) inside this folder
+- To launch the client, launch `randstalker_archipelago.exe` inside that folder
+
+Be aware that you might get antivirus warnings about the client program because one of its main features is to spy
+on another process's memory (your emulator). This is something antiviruses obviously dislike, and sometimes mistake
+for malicious software. 
+
+If you're not trusting the program, you can check its [source code](https://github.com/Dinopony/randstalker-archipelago/)
+or test it on a service like Virustotal.
+
+## 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 Settings Page](../player-settings) on the website allows you to easily configure your personal settings 
+and export a config file from them.
+
+## How-to-play
+
+### Connecting to the Archipelago Server
+
+Once the game has been created, you need to connect to the server using the Landstalker Archipelago Client.
+
+To do so, run `randstalker_archipelago.exe` inside the folder you created while installing the software.
+
+A window will open with a few settings to enter:
+- **Host**: Put the server address and port in this field (e.g. `archipelago.gg:12345`)
+- **Slot name**: Put the player name you specified in your YAML config file in this field.
+- **Password**: If the server has a password, put it there.
+
+![Landstalker Archipelago Client user interface](/static/generated/docs/Landstalker%20-%20The%20Treasures%20of%20King%20Nole/ls_guide_ap.png)
+
+Once all those fields were filled appropriately, click on the `Connect to Archipelago` button below to try connecting to
+the Archipelago server.
+
+If this didn't work, double-check your credentials. An error message should be displayed on the console log to the 
+right that might help you find the cause of the issue.
+
+### ROM Generation
+
+When you connected to the Archipelago server, the client fetched all the required data from the server to be able to
+build a randomized ROM.
+
+You should see a window with settings to fill:
+- **Input ROM file**: This is the path to your original ROM file for the game. If you are using the Steam release ROM 
+  and placed it inside the client's folder as mentioned above, you don't need to change anything.
+- **Output ROM directory**: This is where the randomized ROMs will be put. No need to change this unless you want them 
+  to be created in a very specific folder.
+
+![Landstalker Archipelago Client user interface](/static/generated/docs/Landstalker%20-%20The%20Treasures%20of%20King%20Nole/ls_guide_rom.png)
+
+There also a few cosmetic options you can fill before clicking the `Build ROM` button which should create your 
+randomized seed if everything went right.
+
+If it didn't, double-check your `Input ROM file` and `Output ROM path`, then retry building the ROM by clicking 
+the same button again.
+
+### Connecting to the emulator
+
+Now that you're connected to the Archipelago server and have a randomized ROM, all we need is to get the client 
+connected to the emulator. This way, the client will be able to see what's happening while you play and give you in-game
+the items you have received from other players.
+
+You should see the following window:
+
+![Landstalker Archipelago Client user interface](/static/generated/docs/Landstalker%20-%20The%20Treasures%20of%20King%20Nole/ls_guide_emu.png)
+
+As written, you have to open the newly generated ROM inside either Retroarch or Bizhawk using the Genesis Plus GX core. 
+Be careful to select that core, because any other core (e.g. BlastEm) won't work.
+
+The easiest way to do so is to:
+- open the emu of your choice
+- if you're using Retroarch and it's your first time, download the Genesis Plus GX core through Retroarch user interface
+- click the `Show ROM file in explorer` button
+- drag-and-drop the shown ROM file on the emulator window
+- press Start to reach file select screen (to ensure game RAM is properly set-up)
+
+Then, you can click on the `Connect to emulator` button below and it should work.
+
+If this didn't work, try the following:
+- ensure you have loaded your ROM and reached the save select screen
+- ensure you are using Genesis Plus GX and not another core (e.g. BlastEm will not work)
+- try launching the client in Administrator Mode (right-click on `randstalker_archipelago.exe`, then 
+ `Run as administrator`)
+- if all else fails, try using one of those specific emulator versions:
+  - RetroArch 1.9.0 and Genesis Plus GX 1.7.4
+  - Bizhawk 2.9.1 (x64)
+
+### Play the game
+
+If all indicators are green and show "Connected," you're good to go! Play the game and enjoy the wonders of isometric 
+perspective. 
+
+The client is packaged with both an **automatic item tracker** and an **automatic map tracker** for your comfort. 
+
+If you don't know all checks in the game, don't be afraid: you can click the `Where is it?` button that will show 
+you a screenshot of where the location actually is.
+
+![Landstalker Archipelago Client user interface](/static/generated/docs/Landstalker%20-%20The%20Treasures%20of%20King%20Nole/ls_guide_client.png)
+
+Have fun!
\ No newline at end of file
diff --git a/worlds/landstalker/docs/ls_guide_ap.png b/worlds/landstalker/docs/ls_guide_ap.png
new file mode 100644
index 0000000000..674938ce67
Binary files /dev/null and b/worlds/landstalker/docs/ls_guide_ap.png differ
diff --git a/worlds/landstalker/docs/ls_guide_client.png b/worlds/landstalker/docs/ls_guide_client.png
new file mode 100644
index 0000000000..a4e0f1ccf3
Binary files /dev/null and b/worlds/landstalker/docs/ls_guide_client.png differ
diff --git a/worlds/landstalker/docs/ls_guide_emu.png b/worlds/landstalker/docs/ls_guide_emu.png
new file mode 100644
index 0000000000..ff9218de12
Binary files /dev/null and b/worlds/landstalker/docs/ls_guide_emu.png differ
diff --git a/worlds/landstalker/docs/ls_guide_rom.png b/worlds/landstalker/docs/ls_guide_rom.png
new file mode 100644
index 0000000000..c57554ab43
Binary files /dev/null and b/worlds/landstalker/docs/ls_guide_rom.png differ
diff --git a/worlds/lingo/__init__.py b/worlds/lingo/__init__.py
new file mode 100644
index 0000000000..0889674450
--- /dev/null
+++ b/worlds/lingo/__init__.py
@@ -0,0 +1,132 @@
+"""
+Archipelago init file for Lingo
+"""
+from logging import warning
+
+from BaseClasses import Item, ItemClassification, Tutorial
+from worlds.AutoWorld import WebWorld, World
+from .items import ALL_ITEM_TABLE, LingoItem
+from .locations import ALL_LOCATION_TABLE
+from .options import LingoOptions
+from .player_logic import LingoPlayerLogic
+from .regions import create_regions
+from .static_logic import Room, RoomEntrance
+
+
+class LingoWebWorld(WebWorld):
+    theme = "grass"
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to playing Lingo with Archipelago.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["hatkirby"]
+    )]
+
+
+class LingoWorld(World):
+    """
+    Lingo is a first person indie puzzle game in the vein of The Witness. You find yourself in a mazelike, non-Euclidean
+    world filled with 800 word puzzles that use a variety of different mechanics.
+    """
+    game = "Lingo"
+    web = LingoWebWorld()
+
+    base_id = 444400
+    topology_present = True
+    data_version = 1
+
+    options_dataclass = LingoOptions
+    options: LingoOptions
+
+    item_name_to_id = {
+        name: data.code for name, data in ALL_ITEM_TABLE.items()
+    }
+    location_name_to_id = {
+        name: data.code for name, data in ALL_LOCATION_TABLE.items()
+    }
+
+    player_logic: LingoPlayerLogic
+
+    def generate_early(self):
+        if not (self.options.shuffle_doors or self.options.shuffle_colors):
+            if self.multiworld.players == 1:
+                warning(f"{self.multiworld.get_player_name(self.player)}'s Lingo world doesn't have any progression"
+                        f" items. Please turn on Door Shuffle or Color Shuffle if that doesn't seem right.")
+            else:
+                raise Exception(f"{self.multiworld.get_player_name(self.player)}'s Lingo world doesn't have any"
+                                f" progression items. Please turn on Door Shuffle or Color Shuffle.")
+
+        self.player_logic = LingoPlayerLogic(self)
+
+    def create_regions(self):
+        create_regions(self, self.player_logic)
+
+    def create_items(self):
+        pool = [self.create_item(name) for name in self.player_logic.real_items]
+
+        if self.player_logic.forced_good_item != "":
+            new_item = self.create_item(self.player_logic.forced_good_item)
+            location_obj = self.multiworld.get_location("Second Room - Good Luck", self.player)
+            location_obj.place_locked_item(new_item)
+
+        item_difference = len(self.player_logic.real_locations) - len(pool)
+        if item_difference:
+            trap_percentage = self.options.trap_percentage
+            traps = int(item_difference * trap_percentage / 100.0)
+            non_traps = item_difference - traps
+
+            if non_traps:
+                skip_percentage = self.options.puzzle_skip_percentage
+                skips = int(non_traps * skip_percentage / 100.0)
+                non_skips = non_traps - skips
+
+                filler_list = [":)", "The Feeling of Being Lost", "Wanderlust", "Empty White Hallways"]
+                for i in range(0, non_skips):
+                    pool.append(self.create_item(filler_list[i % len(filler_list)]))
+
+                for i in range(0, skips):
+                    pool.append(self.create_item("Puzzle Skip"))
+
+            if traps:
+                traps_list = ["Slowness Trap", "Iceland Trap", "Atbash Trap"]
+
+                for i in range(0, traps):
+                    pool.append(self.create_item(traps_list[i % len(traps_list)]))
+
+        self.multiworld.itempool += pool
+
+    def create_item(self, name: str) -> Item:
+        item = ALL_ITEM_TABLE[name]
+
+        classification = item.classification
+        if hasattr(self, "options") and self.options.shuffle_paintings and len(item.painting_ids) > 0\
+                and len(item.door_ids) == 0 and all(painting_id not in self.player_logic.painting_mapping
+                                                    for painting_id in item.painting_ids)\
+                and "pilgrim_painting2" not in item.painting_ids:
+            # If this is a "door" that just moves one or more paintings, and painting shuffle is on and those paintings
+            # go nowhere, then this item should not be progression. The Pilgrim Room painting is special and needs to be
+            # excluded from this.
+            classification = ItemClassification.filler
+
+        return LingoItem(name, classification, item.code, self.player)
+
+    def set_rules(self):
+        self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
+
+    def fill_slot_data(self):
+        slot_options = [
+            "death_link", "victory_condition", "shuffle_colors", "shuffle_doors", "shuffle_paintings", "shuffle_panels",
+            "mastery_achievements", "level_2_requirement", "location_checks", "early_color_hallways"
+        ]
+
+        slot_data = {
+            "seed": self.random.randint(0, 1000000),
+            **self.options.as_dict(*slot_options),
+        }
+
+        if self.options.shuffle_paintings:
+            slot_data["painting_entrance_to_exit"] = self.player_logic.painting_mapping
+
+        return slot_data
diff --git a/worlds/lingo/data/LL1.yaml b/worlds/lingo/data/LL1.yaml
new file mode 100644
index 0000000000..ea5886fea0
--- /dev/null
+++ b/worlds/lingo/data/LL1.yaml
@@ -0,0 +1,7657 @@
+---
+  # This file is an associative array where the keys are region names. Rooms
+  # have four properties: entrances, panels, doors, and paintings.
+  #
+  # entrances is an array of regions from which this room can be accessed. The
+  # key of each entry is the room that can access this one. The value is a list
+  # of OR'd requirements for being able to access this room from the other one,
+  # although the list can be elided if there is only one requirement, and the
+  # value True can be used if there are no requirements (i.e. you always have
+  # access to this room if you have access to the other). Each requirement
+  # describes a door that must be opened in order to access this room from the
+  # other. The door is described by both the door's name and the name of the
+  # room that the door is in. The room name may be omitted if the door is
+  # located in the current room.
+  #
+  # panels is an array of panels in the room. The key of the array is an
+  # arbitrary name for the panel. Panels can have the following fields:
+  # - id:            The internal ID of the panel in the LINGO map
+  # - required_room: In addition to having access to this room, the player must
+  #                  also have access to this other room in order to solve this
+  #                  panel.
+  # - required_door: In addition to having access to this room, the player must
+  #                  also have this door opened in order to solve this panel.
+  # - required_panel: In addition to having access to this room, the player must
+  #                   also be able to access this other panel in order to solve
+  #                   this panel.
+  # - colors:        A list of colors that are required to be unlocked in order
+  #                  to solve this panel
+  # - check:         A location check will be created for this individual panel.
+  # - exclude_reduce: Panel checks are assumed to be INCLUDED when reduce checks
+  #                   is on. This option excludes the check anyway.
+  # - tag:           Label that describes how panel randomization should be
+  #                  done. In reorder mode, panels with the same tag can be
+  #                  shuffled amongst themselves. "forbid" is a special value
+  #                  meaning that no randomization should be done. This field is
+  #                  mandatory.
+  # - link:          Panels with the same link label are randomized as a group.
+  # - subtag:        Used to identify the separate parts of a linked group.
+  # - copy_to_sign:  When randomizing this panel, the hint should be copied to
+  #                  the specified sign(s).
+  # - achievement:   The name of the achievement that is received upon solving
+  #                  this panel.
+  # - non_counting:  If True, this panel does not contribute to the total needed
+  #                  to unlock Level 2.
+  # - hunt:          If True, the tracker will show this panel even when it is
+  #                  not a check. Used for hunts like the Number Hunt.
+  #
+  # doors is an array of doors associated with this room. When door
+  # randomization is enabled, each of these is an item. The key is a name that
+  # will be displayed as part of the item's name. Doors can have the following
+  # fields:
+  # - id:             A string or list of internal door IDs from the LINGO map.
+  #                   In door shuffle mode, collecting the item generated for
+  #                   this door will open the doors listed here.
+  # - painting_id:    An internal ID of a painting that should be moved upon
+  #                   receiving this door.
+  # - panels:         These are the panels that canonically open this door. If
+  #                   there is only one panel for the door, then that panel is a
+  #                   check. If there is more than one panel, then that entire
+  #                   set of panels must be solved for a check. Panels can
+  #                   either be a string (representing a panel in this room) or
+  #                   a dict containing "room" and "panel".
+  # - item_name:      Overrides the name of the item generated for this door.
+  #                   If not specified, the item name will be generated from
+  #                   the room name and the door name.
+  # - location_name:  Overrides the name of the location generated for this
+  #                   door. If not specified, the location name will be
+  #                   generated using the names of the panels.
+  # - skip_location:  If true, no location is generated for this door.
+  # - skip_item:      If true, no item is generated for this door.
+  # - group:          When simple doors is used, all doors with the same group
+  #                   will be covered by a single item.
+  # - include_reduce: Door checks are assumed to be EXCLUDED when reduce checks
+  #                   is on. This option includes the check anyway.
+  # - junk_item:      If on, the item for this door will be considered a junk
+  #                   item instead of a progression item. Only use this for
+  #                   doors that could never gate progression regardless of
+  #                   options and state.
+  # - event:          Denotes that the door is event only. This is similar to
+  #                   setting both skip_location and skip_item.
+  #
+  # paintings is an array of paintings in the room. This is used for painting
+  # shuffling.
+  # - id:             The internal painting ID from the LINGO map.
+  # - enter_only:     If true, painting shuffling will not place a warp exit on
+  #                   this painting.
+  # - exit_only:      If true, painting shuffling will not place a warp entrance
+  #                   on this painting.
+  # - orientation:    One of north/south/east/west. This is the direction that
+  #                   the player is facing when they are interacting with it,
+  #                   not the orientation of the painting itself. "North" is
+  #                   the direction the player faces at a new game, with the
+  #                   positive X axis to the right.
+  # - required_door:  This door must be open for the painting to be usable as an
+  #                   entrance. If required_door is set, enter_only must be
+  #                   True.
+  # - required:       Marks a painting as being the only entrance for a room,
+  #                   and thus it is required to be an exit when randomized.
+  #                   Use "required_when_no_doors" instead if it would be
+  #                   possible to enter the room without the painting in door
+  #                   shuffle mode.
+  # - req_blocked:    Marks that a painting cannot be an entrance leading to a
+  #                   required painting. Paintings within a room that has a
+  #                   required painting are automatically req blocked.
+  #                   Use "req_blocked_when_no_doors" instead if it would be
+  #                   fine in door shuffle mode.
+  # - move:           Denotes that the painting is able to move.
+  Starting Room:
+    entrances:
+      Menu: True
+    panels:
+      HI:
+        id: Entry Room/Panel_hi_hi
+        tag: midwhite
+      HIDDEN:
+        id: Entry Room/Panel_hidden_hidden
+        tag: midwhite
+      TYPE:
+        id: Entry Room/Panel_type_type
+        tag: midwhite
+      THIS:
+        id: Entry Room/Panel_this_this
+        tag: midwhite
+      WRITE:
+        id: Entry Room/Panel_write_write
+        tag: midwhite
+      SAME:
+        id: Entry Room/Panel_same_same
+        tag: midwhite
+    doors:
+      Main Door:
+        event: True
+        panels:
+          - HI
+      Back Right Door:
+        id: Entry Room Area Doors/Door_hidden_hidden
+        include_reduce: True
+        panels:
+          - HIDDEN
+      Rhyme Room Entrance:
+        id:
+          - Palindrome Room Area Doors/Door_level_level_2
+          - Palindrome Room Area Doors/Door_racecar_racecar_2
+          - Palindrome Room Area Doors/Door_solos_solos_2
+        skip_location: True
+        group: Rhyme Room Doors
+        panels:
+          - room: The Tenacious
+            panel: LEVEL (Black)
+          - room: The Tenacious
+            panel: RACECAR (Black)
+          - room: The Tenacious
+            panel: SOLOS (Black)
+    paintings:
+      - id: arrows_painting
+        exit_only: True
+        orientation: south
+      - id: arrows_painting2
+        disable: True
+        move: True
+      - id: arrows_painting3
+        disable: True
+        move: True
+      - id: garden_painting_tower2
+        enter_only: True
+        orientation: north
+        move: True
+        required_door:
+          room: Hedge Maze
+          door: Painting Shortcut
+      - id: flower_painting_8
+        enter_only: True
+        orientation: north
+        move: True
+        required_door:
+          room: Courtyard
+          door: Painting Shortcut
+      - id: symmetry_painting_a_starter
+        enter_only: True
+        orientation: west
+        move: True
+        required_door:
+          room: The Wondrous (Doorknob)
+          door: Painting Shortcut
+      - id: pencil_painting6
+        enter_only: True
+        orientation: east
+        move: True
+        required_door:
+          room: Outside The Bold
+          door: Painting Shortcut
+      - id: blueman_painting_3
+        enter_only: True
+        orientation: east
+        move: True
+        required_door:
+          room: Outside The Undeterred
+          door: Painting Shortcut
+      - id: eyes_yellow_painting2
+        enter_only: True
+        orientation: west
+        move: True
+        required_door:
+          room: Outside The Agreeable
+          door: Painting Shortcut
+  Hidden Room:
+    entrances:
+      Starting Room:
+        room: Starting Room
+        door: Back Right Door
+      The Seeker:
+        door: Seeker Entrance
+      Dead End Area:
+        door: Dead End Door
+      Knight Night (Outer Ring):
+        door: Knight Night Entrance
+    panels:
+      DEAD END:
+        id: Appendix Room/Panel_deadend_deadened
+        check: True
+        exclude_reduce: True
+        tag: topwhite
+      OPEN:
+        id: Heteronym Room/Panel_entrance_entrance
+        tag: midwhite
+      LIES:
+        id: Appendix Room/Panel_lies_lies
+        tag: midwhite
+    doors:
+      Dead End Door:
+        id: Appendix Room Area Doors/Door_rat_tar_2
+        skip_location: true
+        group: Dead End Area Access
+        panels:
+          - room: Hub Room
+            panel: RAT
+      Knight Night Entrance:
+        id: Appendix Room Area Doors/Door_rat_tar_4
+        skip_location: true
+        panels:
+          - room: Hub Room
+            panel: RAT
+      Seeker Entrance:
+        id: Entry Room Area Doors/Door_entrance_entrance
+        item_name: The Seeker - Entrance
+        panels:
+          - OPEN
+      Rhyme Room Entrance:
+        id:
+          - Appendix Room Area Doors/Door_rat_tar_3
+          - Double Room Area Doors/Door_room_entry_stairs
+        skip_location: True
+        group: Rhyme Room Doors
+        panels:
+          - room: The Tenacious
+            panel: LEVEL (Black)
+          - room: The Tenacious
+            panel: RACECAR (Black)
+          - room: The Tenacious
+            panel: SOLOS (Black)
+          - room: Hub Room
+            panel: RAT
+    paintings:
+      - id: owl_painting
+        orientation: north
+  The Seeker:
+    entrances:
+      Hidden Room:
+        room: Hidden Room
+        door: Seeker Entrance
+      Pilgrim Room:
+        room: Pilgrim Room
+        door: Shortcut to The Seeker
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_seeker_seeker
+        required_room: Hidden Room
+        tag: forbid
+        check: True
+        achievement: The Seeker
+      BEAR:
+        id: Heteronym Room/Panel_bear_bear
+        tag: midwhite
+      MINE:
+        id: Heteronym Room/Panel_mine_mine
+        tag: double midwhite
+        subtag: left
+        link: exact MINE
+      MINE (2):
+        id: Heteronym Room/Panel_mine_mine_2
+        tag: double midwhite
+        subtag: right
+        link: exact MINE
+      BOW:
+        id: Heteronym Room/Panel_bow_bow
+        tag: midwhite
+      DOES:
+        id: Heteronym Room/Panel_does_does
+        tag: midwhite
+      MOBILE:
+        id: Heteronym Room/Panel_mobile_mobile
+        tag: double midwhite
+        subtag: left
+        link: exact MOBILE
+      MOBILE (2):
+        id: Heteronym Room/Panel_mobile_mobile_2
+        tag: double midwhite
+        subtag: right
+        link: exact MOBILE
+      DESERT:
+        id: Heteronym Room/Panel_desert_desert
+        tag: topmid white stack
+        subtag: mid
+        link: topmid DESERT
+      DESSERT:
+        id: Heteronym Room/Panel_desert_dessert
+        tag: topmid white stack
+        subtag: top
+        link: topmid DESERT
+      SOW:
+        id: Heteronym Room/Panel_sow_sow
+        tag: topmid white stack
+        subtag: mid
+        link: topmid SOW
+      SEW:
+        id: Heteronym Room/Panel_sow_so
+        tag: topmid white stack
+        subtag: top
+        link: topmid SOW
+      TO:
+        id: Heteronym Room/Panel_two_to
+        tag: double topwhite
+        subtag: left
+        link: hp TWO
+      TOO:
+        id: Heteronym Room/Panel_two_too
+        tag: double topwhite
+        subtag: right
+        link: hp TWO
+      WRITE:
+        id: Heteronym Room/Panel_write_right
+        tag: topwhite
+      EWE:
+        id: Heteronym Room/Panel_you_ewe
+        tag: topwhite
+      KNOT:
+        id: Heteronym Room/Panel_not_knot
+        tag: double topwhite
+        subtag: left
+        link: hp NOT
+      NAUGHT:
+        id: Heteronym Room/Panel_not_naught
+        tag: double topwhite
+        subtag: right
+        link: hp NOT
+      BEAR (2):
+        id: Heteronym Room/Panel_bear_bare
+        tag: topwhite
+  Second Room:
+    entrances:
+      Starting Room:
+        room: Starting Room
+        door: Main Door
+      Hub Room:
+        door: Exit Door
+    panels:
+      HI:
+        id: Entry Room/Panel_hi_high
+        tag: topwhite
+      LOW:
+        id: Entry Room/Panel_low_low
+        tag: forbid # This is a midwhite pretending to be a botwhite
+      ANOTHER TRY:
+        id: Entry Room/Panel_advance
+        tag: topwhite
+        non_counting: True # This is a counting panel in-game, but it can never count towards the LEVEL 2 panel hunt.
+      LEVEL 2:
+        # We will set up special rules for this in code.
+        id: EndPanel/Panel_level_2
+        tag: forbid
+        non_counting: True
+        check: True
+    doors:
+      Exit Door:
+        id: Entry Room Area Doors/Door_hi_high
+        location_name: Second Room - Good Luck
+        include_reduce: True
+        panels:
+          - HI
+          - LOW
+  Hub Room:
+    entrances:
+      Second Room:
+        room: Second Room
+        door: Exit Door
+      Dead End Area:
+        door: Near RAT Door
+      Crossroads:
+        door: Crossroads Entrance
+      The Tenacious:
+        door: Tenacious Entrance
+      Warts Straw Area:
+        door: Symmetry Door
+      Hedge Maze:
+        door: Shortcut to Hedge Maze
+      Orange Tower First Floor:
+        room: Orange Tower First Floor
+        door: Shortcut to Hub Room
+      Owl Hallway:
+        painting: True
+      Outside The Initiated:
+        room: Outside The Initiated
+        door: Shortcut to Hub Room
+      The Traveled:
+        door: Traveled Entrance
+      Roof: True # through the sunwarp
+      Outside The Undeterred: # (NOTE: used in hardcoded pilgrimage)
+        room: Outside The Undeterred
+        door: Green Painting
+        painting: True
+    panels:
+      ORDER:
+        id: Shuffle Room/Panel_order_chaos
+        colors: black
+        tag: botblack
+      SLAUGHTER:
+        id: Palindrome Room/Panel_slaughter_laughter
+        colors: red
+        tag: midred
+      NEAR:
+        id: Symmetry Room/Panel_near_far
+        colors: black
+        tag: botblack
+      FAR:
+        id: Symmetry Room/Panel_far_near
+        colors: black
+        tag: botblack
+      TRACE:
+        id: Maze Room/Panel_trace_trace
+        tag: midwhite
+      RAT:
+        id: Appendix Room/Panel_rat_tar
+        colors: black
+        check: True
+        exclude_reduce: True
+        tag: midblack
+      OPEN:
+        id: Synonym Room/Panel_open_open
+        tag: midwhite
+      FOUR:
+        id: Backside Room/Panel_four_four_3
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Outside The Undeterred
+          door: Fours
+      LOST:
+        id: Shuffle Room/Panel_lost_found
+        colors: black
+        tag: botblack
+      FORWARD:
+        id: Entry Room/Panel_forward_forward
+        tag: midwhite
+      BETWEEN:
+        id: Entry Room/Panel_between_between
+        tag: midwhite
+      BACKWARD:
+        id: Entry Room/Panel_backward_backward
+        tag: midwhite
+    doors:
+      Crossroads Entrance:
+        id: Shuffle Room Area Doors/Door_chaos
+        panels:
+          - ORDER
+      Tenacious Entrance:
+        id: Palindrome Room Area Doors/Door_slaughter_laughter
+        group: Entrances to The Tenacious
+        panels:
+          - SLAUGHTER
+      Symmetry Door:
+        id:
+          - Symmetry Room Area Doors/Door_near_far
+          - Symmetry Room Area Doors/Door_far_near
+        group: Symmetry Doors
+        panels:
+          - NEAR
+          - FAR
+      Shortcut to Hedge Maze:
+        id: Maze Area Doors/Door_trace_trace
+        group: Hedge Maze Doors
+        panels:
+          - TRACE
+      Near RAT Door:
+        id: Appendix Room Area Doors/Door_deadend_deadened
+        skip_location: True
+        group: Dead End Area Access
+        panels:
+          - room: Hidden Room
+            panel: DEAD END
+      Traveled Entrance:
+        id: Appendix Room Area Doors/Door_open_open
+        item_name: The Traveled - Entrance
+        group: Entrance to The Traveled
+        panels:
+          - OPEN
+      Lost Door:
+        id: Shuffle Room Area Doors/Door_lost_found
+        junk_item: True
+        panels:
+          - LOST
+    paintings:
+      - id: maze_painting
+        orientation: west
+  Dead End Area:
+    entrances:
+      Hidden Room:
+        room: Hidden Room
+        door: Dead End Door
+      Hub Room:
+        room: Hub Room
+        door: Near RAT Door
+    panels:
+      FOUR:
+        id: Backside Room/Panel_four_four_2
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Outside The Undeterred
+          door: Fours
+      EIGHT:
+        id: Backside Room/Panel_eight_eight_8
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Eights
+    paintings:
+      - id: smile_painting_6
+        orientation: north
+  Pilgrim Antechamber:
+    # Let's not shuffle the paintings yet.
+    entrances:
+      # The pilgrimage is hardcoded in rules.py
+      Starting Room:
+        door: Sun Painting
+    panels:
+      HOT CRUST:
+        id: Lingo Room/Panel_shortcut
+        colors: yellow
+        tag: midyellow
+      PILGRIMAGE:
+        id: Lingo Room/Panel_pilgrim
+        colors: blue
+        tag: midblue
+      MASTERY:
+        id: Master Room/Panel_mastery_mastery14
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+    doors:
+      Sun Painting:
+        item_name: Pilgrim Room - Sun Painting
+        location_name: Pilgrim Room - HOT CRUST
+        painting_id: pilgrim_painting2
+        panels:
+          - HOT CRUST
+      Exit:
+        event: True
+        panels:
+          - PILGRIMAGE
+  Pilgrim Room:
+    entrances:
+      The Seeker:
+        door: Shortcut to The Seeker
+      Pilgrim Antechamber:
+        room: Pilgrim Antechamber
+        door: Exit
+    panels:
+      THIS:
+        id: Lingo Room/Panel_lingo_9
+        colors: gray
+        tag: forbid
+      TIME ROOM:
+        id: Lingo Room/Panel_lingo_1
+        colors: purple
+        tag: toppurp
+      SCIENCE ROOM:
+        id: Lingo Room/Panel_lingo_2
+        tag: botwhite
+      SHINY ROCK ROOM:
+        id: Lingo Room/Panel_lingo_3
+        tag: botwhite
+      ANGRY POWER:
+        id: Lingo Room/Panel_lingo_4
+        colors:
+          - purple
+        tag: forbid
+      MICRO LEGION:
+        id: Lingo Room/Panel_lingo_5
+        colors: yellow
+        tag: midyellow
+      LOSERS RELAX:
+        id: Lingo Room/Panel_lingo_6
+        colors:
+          - black
+        tag: forbid
+      "906234":
+        id: Lingo Room/Panel_lingo_7
+        colors:
+          - orange
+          - blue
+        tag: forbid
+      MOOR EMORDNILAP:
+        id: Lingo Room/Panel_lingo_8
+        colors: black
+        tag: midblack
+      HALL ROOMMATE:
+        id: Lingo Room/Panel_lingo_10
+        colors:
+          - red
+          - blue
+        tag: forbid
+      ALL GREY:
+        id: Lingo Room/Panel_lingo_11
+        colors: yellow
+        tag: midyellow
+      PLUNDER ISLAND:
+        id: Lingo Room/Panel_lingo_12
+        colors:
+          - purple
+          - red
+        tag: forbid
+      FLOSS PATHS:
+        id: Lingo Room/Panel_lingo_13
+        colors:
+          - purple
+          - brown
+        tag: forbid
+    doors:
+      Shortcut to The Seeker:
+        id: Master Room Doors/Door_pilgrim_shortcut
+        include_reduce: True
+        panels:
+          - THIS
+  Crossroads:
+    entrances:
+      Hub Room: True # The sunwarp means that we never need the ORDER door
+      Color Hallways: True
+      The Tenacious:
+        door: Tenacious Entrance
+      Orange Tower Fourth Floor: True # through IRK HORN
+      Amen Name Area:
+        room: Lost Area
+        door: Exit
+      Roof: True # through the sunwarp
+    panels:
+      DECAY:
+        id: Palindrome Room/Panel_decay_day
+        colors: red
+        tag: midred
+      NOPE:
+        id: Sun Room/Panel_nope_open
+        colors: yellow
+        tag: midyellow
+      EIGHT:
+        id: Backside Room/Panel_eight_eight_5
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Eights
+      WE ROT:
+        id: Shuffle Room/Panel_tower
+        colors: yellow
+        tag: midyellow
+      WORDS:
+        id: Shuffle Room/Panel_words_sword
+        colors: yellow
+        tag: midyellow
+      SWORD:
+        id: Shuffle Room/Panel_sword_words
+        colors: yellow
+        tag: midyellow
+      TURN:
+        id: Shuffle Room/Panel_turn_runt
+        colors: yellow
+        tag: midyellow
+      BEND HI:
+        id: Shuffle Room/Panel_behind
+        colors: yellow
+        tag: midyellow
+      THE EYES:
+        id: Shuffle Room/Panel_eyes_see_shuffle
+        colors: yellow
+        check: True
+        exclude_reduce: True
+        required_door:
+          door: Hollow Hallway
+        tag: midyellow
+      CORNER:
+        id: Shuffle Room/Panel_corner_corner
+        required_door:
+          door: Hollow Hallway
+        tag: midwhite
+      HOLLOW:
+        id: Shuffle Room/Panel_hollow_hollow
+        required_door:
+          door: Hollow Hallway
+        tag: midwhite
+      SWAP:
+        id: Shuffle Room/Panel_swap_wasp
+        colors: yellow
+        tag: midyellow
+      GEL:
+        id: Shuffle Room/Panel_gel
+        colors: yellow
+        tag: topyellow
+        required_door:
+          door: Tower Entrance
+      THOUGH:
+        id: Shuffle Room/Panel_though
+        colors: yellow
+        tag: topyellow
+        required_door:
+          door: Tower Entrance
+      CROSSROADS:
+        id: Shuffle Room/Panel_crossroads_crossroads
+        tag: midwhite
+    doors:
+      Tenacious Entrance:
+        id: Palindrome Room Area Doors/Door_decay_day
+        group: Entrances to The Tenacious
+        panels:
+          - DECAY
+      Discerning Entrance:
+        id: Shuffle Room Area Doors/Door_nope_open
+        item_name: The Discerning - Entrance
+        panels:
+          - NOPE
+      Tower Entrance:
+        id:
+          - Shuffle Room Area Doors/Door_tower
+          - Shuffle Room Area Doors/Door_tower2
+          - Shuffle Room Area Doors/Door_tower3
+          - Shuffle Room Area Doors/Door_tower4
+        group: Crossroads - Tower Entrances
+        panels:
+          - WE ROT
+      Tower Back Entrance:
+        id: Shuffle Room Area Doors/Door_runt
+        location_name: Crossroads - TURN/RUNT
+        group: Crossroads - Tower Entrances
+        panels:
+          - TURN
+          - room: Orange Tower Fourth Floor
+            panel: RUNT
+      Words Sword Door:
+        id:
+          - Shuffle Room Area Doors/Door_words_shuffle_3
+          - Shuffle Room Area Doors/Door_words_shuffle_4
+        group: Crossroads Doors
+        panels:
+          - WORDS
+          - SWORD
+      Eye Wall:
+        id: Shuffle Room Area Doors/Door_behind
+        junk_item: True
+        group: Crossroads Doors
+        panels:
+          - BEND HI
+      Hollow Hallway:
+        id: Shuffle Room Area Doors/Door_crossroads6
+        skip_location: True
+        group: Crossroads Doors
+        panels:
+          - BEND HI
+      Roof Access:
+        id: Tower Room Area Doors/Door_level_6_2
+        skip_location: True
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+          - room: Outside The Undeterred
+            panel: ART + ART
+          - room: Orange Tower Third Floor
+            panel: DEER + WREN
+          - room: Orange Tower Fourth Floor
+            panel: LEARNS + UNSEW
+          - room: Orange Tower Fifth Floor
+            panel: DRAWL + RUNS
+          - room: Owl Hallway
+            panel: READS + RUST
+    paintings:
+      - id: eye_painting
+        disable: True
+        orientation: east
+        move: True
+        required_door:
+          door: Eye Wall
+      - id: smile_painting_4
+        orientation: south
+  Lost Area:
+    entrances:
+      Outside The Agreeable:
+        door: Exit
+      Crossroads:
+        room: Crossroads
+        door: Words Sword Door
+    panels:
+      LOST (1):
+        id: Shuffle Room/Panel_lost_lots
+        colors: yellow
+        tag: midyellow
+      LOST (2):
+        id: Shuffle Room/Panel_lost_slot
+        colors: yellow
+        tag: midyellow
+    doors:
+      Exit:
+        id:
+          - Shuffle Room Area Doors/Door_lost_shuffle_1
+          - Shuffle Room Area Doors/Door_lost_shuffle_2
+        location_name: Crossroads - LOST Pair
+        panels:
+          - LOST (1)
+          - LOST (2)
+  Amen Name Area:
+    entrances:
+      Crossroads:
+        room: Lost Area
+        door: Exit
+      Suits Area:
+        door: Exit
+    panels:
+      AMEN:
+        id: Shuffle Room/Panel_amen_mean
+        colors: yellow
+        tag: double midyellow
+        subtag: left
+        link: ana MEAN
+      NAME:
+        id: Shuffle Room/Panel_name_mean
+        colors: yellow
+        tag: double midyellow
+        subtag: right
+        link: ana MEAN
+      NINE:
+        id: Backside Room/Panel_nine_nine_3
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+    doors:
+      Exit:
+        id: Shuffle Room Area Doors/Door_mean
+        panels:
+          - AMEN
+          - NAME
+  Suits Area:
+    entrances:
+      Amen Name Area:
+        room: Amen Name Area
+        door: Exit
+      Roof: True
+    panels:
+      SPADES:
+        id: Cross Room/Panel_spades_spades
+        tag: midwhite
+      CLUBS:
+        id: Cross Room/Panel_clubs_clubs
+        tag: midwhite
+      HEARTS:
+        id: Cross Room/Panel_hearts_hearts
+        tag: midwhite
+    paintings:
+      - id: west_afar
+        orientation: south
+  The Tenacious:
+    entrances:
+      Hub Room:
+        - room: Hub Room
+          door: Tenacious Entrance
+        - door: Shortcut to Hub Room
+      Crossroads:
+        room: Crossroads
+        door: Tenacious Entrance
+      Outside The Agreeable:
+        room: Outside The Agreeable
+        door: Tenacious Entrance
+      Dread Hallway:
+        room: Dread Hallway
+        door: Tenacious Entrance
+    panels:
+      LEVEL (Black):
+        id: Palindrome Room/Panel_level_level
+        colors: black
+        tag: midblack
+      RACECAR (Black):
+        id: Palindrome Room/Panel_racecar_racecar
+        colors: black
+        tag: palindrome
+        copy_to_sign: sign4
+      SOLOS (Black):
+        id: Palindrome Room/Panel_solos_solos
+        colors: black
+        tag: palindrome
+        copy_to_sign:
+          - sign5
+          - sign6
+      LEVEL (White):
+        id: Palindrome Room/Panel_level_level_2
+        tag: midwhite
+      RACECAR (White):
+        id: Palindrome Room/Panel_racecar_racecar_2
+        tag: midwhite
+        copy_to_sign: sign3
+      SOLOS (White):
+        id: Palindrome Room/Panel_solos_solos_2
+        tag: midwhite
+        copy_to_sign:
+          - sign1
+          - sign2
+      Achievement:
+        id: Countdown Panels/Panel_tenacious_tenacious
+        check: True
+        tag: forbid
+        required_panel:
+          - panel: LEVEL (Black)
+          - panel: RACECAR (Black)
+          - panel: SOLOS (Black)
+          - panel: LEVEL (White)
+          - panel: RACECAR (White)
+          - panel: SOLOS (White)
+          - room: Hub Room
+            panel: SLAUGHTER
+          - room: Crossroads
+            panel: DECAY
+          - room: Outside The Agreeable
+            panel: MASSACRED
+          - room: Dread Hallway
+            panel: DREAD
+        achievement: The Tenacious
+    doors:
+      Shortcut to Hub Room:
+        id:
+          - Palindrome Room Area Doors/Door_level_level_1
+          - Palindrome Room Area Doors/Door_racecar_racecar_1
+          - Palindrome Room Area Doors/Door_solos_solos_1
+        location_name: The Tenacious - Palindromes
+        group: Entrances to The Tenacious
+        panels:
+          - LEVEL (Black)
+          - RACECAR (Black)
+          - SOLOS (Black)
+      White Palindromes:
+        location_name: The Tenacious - White Palindromes
+        skip_item: True
+        panels:
+          - LEVEL (White)
+          - RACECAR (White)
+          - SOLOS (White)
+  Warts Straw Area:
+    entrances:
+      Hub Room:
+        room: Hub Room
+        door: Symmetry Door
+      Leaf Feel Area:
+        door: Door
+    panels:
+      WARTS:
+        id: Symmetry Room/Panel_warts_straw
+        colors: black
+        tag: midblack
+      STRAW:
+        id: Symmetry Room/Panel_straw_warts
+        colors: black
+        tag: midblack
+    doors:
+      Door:
+        id:
+          - Symmetry Room Area Doors/Door_warts_straw
+          - Symmetry Room Area Doors/Door_straw_warts
+        group: Symmetry Doors
+        panels:
+          - WARTS
+          - STRAW
+  Leaf Feel Area:
+    entrances:
+      Warts Straw Area:
+        room: Warts Straw Area
+        door: Door
+      Outside The Agreeable:
+        door: Door
+    panels:
+      LEAF:
+        id: Symmetry Room/Panel_leaf_feel
+        colors: black
+        tag: topblack
+      FEEL:
+        id: Symmetry Room/Panel_feel_leaf
+        colors: black
+        tag: topblack
+    doors:
+      Door:
+        id:
+          - Symmetry Room Area Doors/Door_leaf_feel
+          - Symmetry Room Area Doors/Door_feel_leaf
+        group: Symmetry Doors
+        panels:
+          - LEAF
+          - FEEL
+  Outside The Agreeable:
+    # Let's ignore the blue warp thing for now because the lookout is a dead
+    # end. Later on it could be filler checks.
+    entrances:
+      # We don't have to list Lost Area because of Crossroads.
+      Crossroads: True
+      The Tenacious:
+        door: Tenacious Entrance
+      The Agreeable:
+        door: Agreeable Entrance
+      Dread Hallway:
+        door: Black Door
+      Leaf Feel Area:
+        room: Leaf Feel Area
+        door: Door
+      Starting Room:
+        door: Painting Shortcut
+        painting: True
+      Hallway Room (2): True
+      Hallway Room (3): True
+      Hallway Room (4): True
+      Hedge Maze: True # through the door to the sectioned-off part of the hedge maze
+      Cellar:
+        door: Lookout Entrance
+    panels:
+      MASSACRED:
+        id: Palindrome Room/Panel_massacred_sacred
+        colors: red
+        tag: midred
+      BLACK:
+        id: Symmetry Room/Panel_black_white
+        colors: black
+        tag: botblack
+      CLOSE:
+        id: Antonym Room/Panel_close_open
+        colors: black
+        tag: botblack
+      LEFT:
+        id: Symmetry Room/Panel_left_right
+        colors: black
+        tag: botblack
+      LEFT (2):
+        id: Symmetry Room/Panel_left_wrong
+        colors: black
+        tag: bot black black
+      RIGHT:
+        id: Symmetry Room/Panel_right_left
+        colors: black
+        tag: botblack
+      PURPLE:
+        id: Color Arrow Room/Panel_purple_afar
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Purple Barrier
+      FIVE (1):
+        id: Backside Room/Panel_five_five_5
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Outside The Undeterred
+          door: Fives
+      FIVE (2):
+        id: Backside Room/Panel_five_five_4
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Outside The Undeterred
+          door: Fives
+      OUT:
+        id: Hallway Room/Panel_out_out
+        check: True
+        exclude_reduce: True
+        tag: midwhite
+      HIDE:
+        id: Maze Room/Panel_hide_seek_4
+        colors: black
+        tag: botblack
+      DAZE:
+        id: Maze Room/Panel_daze_maze
+        colors: purple
+        tag: midpurp
+      WALL:
+        id: Hallway Room/Panel_castle_1
+        colors: blue
+        tag: quad bot blue
+        link: qbb CASTLE
+      KEEP:
+        id: Hallway Room/Panel_castle_2
+        colors: blue
+        tag: quad bot blue
+        link: qbb CASTLE
+      BAILEY:
+        id: Hallway Room/Panel_castle_3
+        colors: blue
+        tag: quad bot blue
+        link: qbb CASTLE
+      TOWER:
+        id: Hallway Room/Panel_castle_4
+        colors: blue
+        tag: quad bot blue
+        link: qbb CASTLE
+      NORTH:
+        id: Cross Room/Panel_north_missing
+        colors: green
+        tag: forbid
+        required_room: Outside The Bold
+      DIAMONDS:
+        id: Cross Room/Panel_diamonds_missing
+        colors: green
+        tag: forbid
+        required_room: Suits Area
+      FIRE:
+        id: Cross Room/Panel_fire_missing
+        colors: green
+        tag: forbid
+        required_room: Elements Area
+      WINTER:
+        id: Cross Room/Panel_winter_missing
+        colors: green
+        tag: forbid
+        required_room: Orange Tower Fifth Floor
+    doors:
+      Tenacious Entrance:
+        id: Palindrome Room Area Doors/Door_massacred_sacred
+        group: Entrances to The Tenacious
+        panels:
+          - MASSACRED
+      Black Door:
+        id: Symmetry Room Area Doors/Door_black_white
+        group: Entrances to The Tenacious
+        panels:
+          - BLACK
+      Agreeable Entrance:
+        id: Symmetry Room Area Doors/Door_close_open
+        item_name: The Agreeable - Entrance
+        panels:
+          - CLOSE
+      Painting Shortcut:
+        item_name: Starting Room - Street Painting
+        painting_id: eyes_yellow_painting2
+        panels:
+          - RIGHT
+      Purple Barrier:
+        id: Color Arrow Room Doors/Door_purple_3
+        group: Color Hunt Barriers
+        skip_location: True
+        panels:
+          - room: Champion's Rest
+            panel: PURPLE
+      Hallway Door:
+        id: Red Blue Purple Room Area Doors/Door_room_2
+        group: Hallway Room Doors
+        location_name: Hallway Room - First Room
+        panels:
+          - WALL
+          - KEEP
+          - BAILEY
+          - TOWER
+      Lookout Entrance:
+        id: Cross Room Doors/Door_missing
+        location_name: Outside The Agreeable - Lookout Panels
+        panels:
+          - NORTH
+          - WINTER
+          - DIAMONDS
+          - FIRE
+    paintings:
+      - id: panda_painting
+        orientation: south
+      - id: eyes_yellow_painting
+        orientation: east
+      - id: pencil_painting7
+        orientation: north
+    progression:
+      Progressive Hallway Room:
+        - Hallway Door
+        - room: Hallway Room (2)
+          door: Exit
+        - room: Hallway Room (3)
+          door: Exit
+        - room: Hallway Room (4)
+          door: Exit
+  Dread Hallway:
+    entrances:
+      Outside The Agreeable:
+        room: Outside The Agreeable
+        door: Black Door
+      The Tenacious:
+        door: Tenacious Entrance
+    panels:
+      DREAD:
+        id: Palindrome Room/Panel_dread_dead
+        colors: red
+        tag: midred
+    doors:
+      Tenacious Entrance:
+        id: Palindrome Room Area Doors/Door_dread_dead
+        group: Entrances to The Tenacious
+        panels:
+          - DREAD
+  The Agreeable:
+    entrances:
+      Outside The Agreeable:
+        room: Outside The Agreeable
+        door: Agreeable Entrance
+      Hedge Maze:
+        door: Shortcut to Hedge Maze
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_disagreeable_agreeable
+        colors: black
+        tag: forbid
+        required_room: Outside The Agreeable
+        check: True
+        achievement: The Agreeable
+      BYE:
+        id: Antonym Room/Panel_bye_hi
+        colors: black
+        tag: botblack
+      RETOOL:
+        id: Antonym Room/Panel_retool_looter
+        colors: black
+        tag: midblack
+      DRAWER:
+        id: Antonym Room/Panel_drawer_reward
+        colors: black
+        tag: midblack
+      READ:
+        id: Antonym Room/Panel_read_write
+        colors: black
+        tag: botblack
+      DIFFERENT:
+        id: Antonym Room/Panel_different_same
+        colors: black
+        tag: botblack
+      LOW:
+        id: Antonym Room/Panel_low_high
+        colors: black
+        tag: botblack
+      ALIVE:
+        id: Antonym Room/Panel_alive_dead
+        colors: black
+        tag: botblack
+      THAT:
+        id: Antonym Room/Panel_that_this
+        colors: black
+        tag: botblack
+      STRESSED:
+        id: Antonym Room/Panel_stressed_desserts
+        colors: black
+        tag: midblack
+      STAR:
+        id: Antonym Room/Panel_star_rats
+        colors: black
+        tag: midblack
+      TAME:
+        id: Antonym Room/Panel_tame_mate
+        colors: black
+        tag: topblack
+      CAT:
+        id: Antonym Room/Panel_cat_tack
+        colors: black
+        tag: topblack
+    doors:
+      Shortcut to Hedge Maze:
+        id: Symmetry Room Area Doors/Door_bye_hi
+        group: Hedge Maze Doors
+        panels:
+          - BYE
+  Hedge Maze:
+    entrances:
+      Hub Room:
+        room: Hub Room
+        door: Shortcut to Hedge Maze
+      Color Hallways: True
+      The Agreeable:
+        room: The Agreeable
+        door: Shortcut to Hedge Maze
+      The Perceptive: True
+      The Observant:
+        door: Observant Entrance
+      Owl Hallway:
+        room: Owl Hallway
+        door: Shortcut to Hedge Maze
+      Roof: True
+    panels:
+      DOWN:
+        id: Maze Room/Panel_down_up
+        colors: black
+        tag: botblack
+      HIDE (1):
+        id: Maze Room/Panel_hide_seek
+        colors: black
+        tag: botblack
+      HIDE (2):
+        id: Maze Room/Panel_hide_seek_2
+        colors: black
+        tag: botblack
+      HIDE (3):
+        id: Maze Room/Panel_hide_seek_3
+        colors: black
+        tag: botblack
+      MASTERY (1):
+        id: Master Room/Panel_mastery_mastery5
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      MASTERY (2):
+        id: Master Room/Panel_mastery_mastery9
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      PATH (1):
+        id: Maze Room/Panel_path_lock
+        colors: green
+        tag: forbid
+      PATH (2):
+        id: Maze Room/Panel_path_knot
+        colors: green
+        tag: forbid
+      PATH (3):
+        id: Maze Room/Panel_path_lost
+        colors: green
+        tag: forbid
+      PATH (4):
+        id: Maze Room/Panel_path_open
+        colors: green
+        tag: forbid
+      PATH (5):
+        id: Maze Room/Panel_path_help
+        colors: green
+        tag: forbid
+      PATH (6):
+        id: Maze Room/Panel_path_hunt
+        colors: green
+        tag: forbid
+      PATH (7):
+        id: Maze Room/Panel_path_nest
+        colors: green
+        tag: forbid
+      PATH (8):
+        id: Maze Room/Panel_path_look
+        colors: green
+        tag: forbid
+      REFLOW:
+        id: Maze Room/Panel_reflow_flower
+        colors: yellow
+        tag: midyellow
+      LEAP:
+        id: Maze Room/Panel_leap_jump
+        tag: botwhite
+    doors:
+      Perceptive Entrance:
+        id: Maze Area Doors/Door_maze_maze
+        item_name: The Perceptive - Entrance
+        group: Hedge Maze Doors
+        panels:
+          - DOWN
+      Painting Shortcut:
+        painting_id: garden_painting_tower2
+        item_name: Starting Room - Hedge Maze Painting
+        skip_location: True
+        panels:
+          - DOWN
+      Observant Entrance:
+        id:
+          - Maze Area Doors/Door_look_room_1
+          - Maze Area Doors/Door_look_room_2
+          - Maze Area Doors/Door_look_room_3
+        skip_location: True
+        item_name: The Observant - Entrance
+        group: Observant Doors
+        panels:
+          - room: The Perceptive
+            panel: GAZE
+      Hide and Seek:
+        skip_item: True
+        location_name: Hedge Maze - Hide and Seek
+        include_reduce: True
+        panels:
+          - HIDE (1)
+          - HIDE (2)
+          - HIDE (3)
+          - room: Outside The Agreeable
+            panel: HIDE
+  The Perceptive:
+    entrances:
+      Starting Room:
+        room: Hedge Maze
+        door: Painting Shortcut
+        painting: True
+      Hedge Maze:
+        room: Hedge Maze
+        door: Perceptive Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_perceptive_perceptive
+        colors: green
+        tag: forbid
+        check: True
+        achievement: The Perceptive
+      GAZE:
+        id: Maze Room/Panel_look_look
+        check: True
+        exclude_reduce: True
+        tag: botwhite
+    paintings:
+      - id: garden_painting_tower
+        orientation: north
+  The Fearless (First Floor):
+    entrances:
+      The Perceptive: True
+    panels:
+      NAPS:
+        id: Naps Room/Panel_naps_span
+        colors: black
+        tag: midblack
+      TEAM:
+        id: Naps Room/Panel_team_meet
+        colors: black
+        tag: topblack
+      TEEM:
+        id: Naps Room/Panel_teem_meat
+        colors: black
+        tag: topblack
+      IMPATIENT:
+        id: Naps Room/Panel_impatient_doctor
+        colors: black
+        tag: bot black black
+      EAT:
+        id: Naps Room/Panel_eat_tea
+        colors: black
+        tag: topblack
+    doors:
+      Second Floor:
+        id: Naps Room Doors/Door_hider_5
+        location_name: The Fearless - First Floor Puzzles
+        group: Fearless Doors
+        panels:
+          - NAPS
+          - TEAM
+          - TEEM
+          - IMPATIENT
+          - EAT
+    progression:
+      Progressive Fearless:
+        - Second Floor
+        - room: The Fearless (Second Floor)
+          door: Third Floor
+  The Fearless (Second Floor):
+    entrances:
+      The Fearless (First Floor):
+        room: The Fearless (First Floor)
+        door: Second Floor
+    panels:
+      NONE:
+        id: Naps Room/Panel_one_many
+        colors: black
+        tag: bot black top white
+      SUM:
+        id: Naps Room/Panel_one_none
+        colors: black
+        tag: top white bot black
+      FUNNY:
+        id: Naps Room/Panel_funny_enough
+        colors: black
+        tag: topblack
+      MIGHT:
+        id: Naps Room/Panel_might_time
+        colors: black
+        tag: topblack
+      SAFE:
+        id: Naps Room/Panel_safe_face
+        colors: black
+        tag: topblack
+      SAME:
+        id: Naps Room/Panel_same_mace
+        colors: black
+        tag: topblack
+      CAME:
+        id: Naps Room/Panel_came_make
+        colors: black
+        tag: topblack
+    doors:
+      Third Floor:
+        id:
+          - Naps Room Doors/Door_hider_1b2
+          - Naps Room Doors/Door_hider_new1
+        location_name: The Fearless - Second Floor Puzzles
+        group: Fearless Doors
+        panels:
+          - NONE
+          - SUM
+          - FUNNY
+          - MIGHT
+          - SAFE
+          - SAME
+          - CAME
+  The Fearless:
+    entrances:
+      The Fearless (First Floor):
+        room: The Fearless (Second Floor)
+        door: Third Floor
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_fearless_fearless
+        colors: black
+        tag: forbid
+        check: True
+        achievement: The Fearless
+      EASY:
+        id: Naps Room/Panel_easy_soft
+        colors: black
+        tag: bot black black
+      SOMETIMES:
+        id: Naps Room/Panel_sometimes_always
+        colors: black
+        tag: bot black black
+      DARK:
+        id: Naps Room/Panel_dark_extinguish
+        colors: black
+        tag: bot black black
+      EVEN:
+        id: Naps Room/Panel_even_ordinary
+        colors: black
+        tag: bot black black
+  The Observant:
+    entrances:
+      Hedge Maze:
+        room: Hedge Maze
+        door: Observant Entrance
+      The Incomparable: True
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_observant_observant
+        colors: green
+        check: True
+        tag: forbid
+        required_door:
+          door: Stairs
+        achievement: The Observant
+      BACK:
+        id: Look Room/Panel_four_back
+        colors: green
+        tag: forbid
+      SIDE:
+        id: Look Room/Panel_four_side
+        colors: green
+        tag: forbid
+      BACKSIDE:
+        id: Backside Room/Panel_backside_2
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Backside Door
+      STAIRS:
+        id: Look Room/Panel_six_stairs
+        colors: green
+        tag: forbid
+      WAYS:
+        id: Look Room/Panel_four_ways
+        colors: green
+        tag: forbid
+      "ON":
+        id: Look Room/Panel_two_on
+        colors: green
+        tag: forbid
+      UP:
+        id: Look Room/Panel_two_up
+        colors: green
+        tag: forbid
+      SWIMS:
+        id: Look Room/Panel_five_swims
+        colors: green
+        tag: forbid
+      UPSTAIRS:
+        id: Look Room/Panel_eight_upstairs
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      TOIL:
+        id: Look Room/Panel_blue_toil
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      STOP:
+        id: Look Room/Panel_four_stop
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      TOP:
+        id: Look Room/Panel_aqua_top
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      HI:
+        id: Look Room/Panel_blue_hi
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      HI (2):
+        id: Look Room/Panel_blue_hi2
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      "31":
+        id: Look Room/Panel_numbers_31
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      "52":
+        id: Look Room/Panel_numbers_52
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      OIL:
+        id: Look Room/Panel_aqua_oil
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      BACKSIDE (GREEN):
+        id: Look Room/Panel_eight_backside
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+      SIDEWAYS:
+        id: Look Room/Panel_eight_sideways
+        colors: green
+        tag: forbid
+        required_door:
+          door: Stairs
+    doors:
+      Backside Door:
+        id: Maze Area Doors/Door_backside
+        group: Backside Doors
+        panels:
+          - BACK
+          - SIDE
+      Stairs:
+        id: Maze Area Doors/Door_stairs
+        group: Observant Doors
+        panels:
+          - STAIRS
+  The Incomparable:
+    entrances:
+      The Observant: True # Assuming that access to The Observant includes access to the right entrance
+      Eight Room: True
+      Eight Alcove:
+        door: Eight Door
+      Orange Tower Sixth Floor:
+        painting: True
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_incomparable_incomparable
+        colors: blue
+        check: True
+        tag: forbid
+        required_room:
+          - Elements Area
+          - Courtyard
+          - Eight Room
+        achievement: The Incomparable
+      A (One):
+        id: Strand Room/Panel_blank_a
+        colors: blue
+        tag: forbid
+      A (Two):
+        id: Strand Room/Panel_a_an
+        colors: blue
+        tag: forbid
+      A (Three):
+        id: Strand Room/Panel_a_and
+        colors: blue
+        tag: forbid
+      A (Four):
+        id: Strand Room/Panel_a_sand
+        colors: blue
+        tag: forbid
+      A (Five):
+        id: Strand Room/Panel_a_stand
+        colors: blue
+        tag: forbid
+      A (Six):
+        id: Strand Room/Panel_a_strand
+        colors: blue
+        tag: forbid
+      I (One):
+        id: Strand Room/Panel_blank_i
+        colors: blue
+        tag: forbid
+      I (Two):
+        id: Strand Room/Panel_i_in
+        colors: blue
+        tag: forbid
+      I (Three):
+        id: Strand Room/Panel_i_sin
+        colors: blue
+        tag: forbid
+      I (Four):
+        id: Strand Room/Panel_i_sing
+        colors: blue
+        tag: forbid
+      I (Five):
+        id: Strand Room/Panel_i_sting
+        colors: blue
+        tag: forbid
+      I (Six):
+        id: Strand Room/Panel_i_string
+        colors: blue
+        tag: forbid
+      I (Seven):
+        id: Strand Room/Panel_i_strings
+        colors: blue
+        tag: forbid
+    doors:
+      Eight Door:
+        id: Red Blue Purple Room Area Doors/Door_a_strands
+        location_name: Giant Sevens
+        group: Observant Doors
+        panels:
+          - I (Seven)
+          - room: Courtyard
+            panel: I
+          - room: Elements Area
+            panel: A
+    paintings:
+      - id: crown_painting
+        orientation: east
+  Eight Alcove:
+    entrances:
+      The Incomparable:
+        room: The Incomparable
+        door: Eight Door
+      Outside The Initiated:
+        room: Outside The Initiated
+        door: Eight Door
+    paintings:
+      - id: eight_painting2
+        orientation: north
+  Eight Room:
+    entrances:
+      Eight Alcove:
+        painting: True
+    panels:
+      Eight Back:
+        id: Strand Room/Panel_i_starling
+        colors: blue
+        tag: forbid
+      Eight Front:
+        id: Strand Room/Panel_i_starting
+        colors: blue
+        tag: forbid
+      Nine:
+        id: Strand Room/Panel_i_startling
+        colors: blue
+        tag: forbid
+    paintings:
+      - id: eight_painting
+        orientation: south
+        exit_only: True
+        required: True
+  Orange Tower:
+    # This is a special, meta-ish room.
+    entrances:
+      Menu: True
+    doors:
+      Second Floor:
+        id: Tower Room Area Doors/Door_level_1
+        skip_location: True
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+      Third Floor:
+        id: Tower Room Area Doors/Door_level_2
+        skip_location: True
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+          - room: Outside The Undeterred
+            panel: ART + ART
+      Fourth Floor:
+        id: Tower Room Area Doors/Door_level_3
+        skip_location: True
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+          - room: Outside The Undeterred
+            panel: ART + ART
+          - room: Orange Tower Third Floor
+            panel: DEER + WREN
+      Fifth Floor:
+        id: Tower Room Area Doors/Door_level_4
+        skip_location: True
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+          - room: Outside The Undeterred
+            panel: ART + ART
+          - room: Orange Tower Third Floor
+            panel: DEER + WREN
+          - room: Orange Tower Fourth Floor
+            panel: LEARNS + UNSEW
+      Sixth Floor:
+        id: Tower Room Area Doors/Door_level_5
+        skip_location: True
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+          - room: Outside The Undeterred
+            panel: ART + ART
+          - room: Orange Tower Third Floor
+            panel: DEER + WREN
+          - room: Orange Tower Fourth Floor
+            panel: LEARNS + UNSEW
+          - room: Orange Tower Fifth Floor
+            panel: DRAWL + RUNS
+      Seventh Floor:
+        id: Tower Room Area Doors/Door_level_6
+        skip_location: True
+        panels:
+          - room: Orange Tower First Floor
+            panel: DADS + ALE
+          - room: Outside The Undeterred
+            panel: ART + ART
+          - room: Orange Tower Third Floor
+            panel: DEER + WREN
+          - room: Orange Tower Fourth Floor
+            panel: LEARNS + UNSEW
+          - room: Orange Tower Fifth Floor
+            panel: DRAWL + RUNS
+          - room: Owl Hallway
+            panel: READS + RUST
+    progression:
+      Progressive Orange Tower:
+        - Second Floor
+        - Third Floor
+        - Fourth Floor
+        - Fifth Floor
+        - Sixth Floor
+        - Seventh Floor
+  Orange Tower First Floor:
+    entrances:
+      Hub Room:
+        door: Shortcut to Hub Room
+      Outside The Wanderer:
+        room: Outside The Wanderer
+        door: Tower Entrance
+      Orange Tower Second Floor:
+        room: Orange Tower
+        door: Second Floor
+      Directional Gallery:
+        door: Salt Pepper Door
+      Roof: True # through the sunwarp
+    panels:
+      SECRET:
+        id: Shuffle Room/Panel_secret_secret
+        tag: midwhite
+      DADS + ALE:
+        id: Tower Room/Panel_dads_ale_dead_1
+        colors: orange
+        check: True
+        tag: midorange
+      SALT:
+        id: Backside Room/Panel_salt_pepper
+        colors: black
+        tag: botblack
+    doors:
+      Shortcut to Hub Room:
+        id: Shuffle Room Area Doors/Door_secret_secret
+        group: Orange Tower First Floor - Shortcuts
+        panels:
+          - SECRET
+      Salt Pepper Door:
+        id: Count Up Room Area Doors/Door_salt_pepper
+        location_name: Orange Tower First Floor - Salt Pepper Door
+        group: Orange Tower First Floor - Shortcuts
+        panels:
+          - SALT
+          - room: Directional Gallery
+            panel: PEPPER
+  Orange Tower Second Floor:
+    entrances:
+      Orange Tower First Floor:
+        room: Orange Tower
+        door: Second Floor
+      Orange Tower Third Floor:
+        room: Orange Tower
+        door: Third Floor
+      Outside The Undeterred: True
+  Orange Tower Third Floor:
+    entrances:
+      Knight Night Exit:
+        room: Knight Night (Final)
+        door: Exit
+      Orange Tower Second Floor:
+        room: Orange Tower
+        door: Third Floor
+      Orange Tower Fourth Floor:
+        room: Orange Tower
+        door: Fourth Floor
+      Hot Crusts Area: True # sunwarp
+      Bearer Side Area: # This is complicated because of The Bearer's topology
+        room: Bearer Side Area
+        door: Shortcut to Tower
+      Rhyme Room (Smiley):
+        door: Rhyme Room Entrance
+    panels:
+      RED:
+        id: Color Arrow Room/Panel_red_afar
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Red Barrier
+      DEER + WREN:
+        id: Tower Room/Panel_deer_wren_rats_3
+        colors: orange
+        check: True
+        tag: midorange
+    doors:
+      Red Barrier:
+        id: Color Arrow Room Doors/Door_red_6
+        group: Color Hunt Barriers
+        skip_location: True
+        panels:
+          - room: Champion's Rest
+            panel: RED
+      Rhyme Room Entrance:
+        id: Double Room Area Doors/Door_room_entry_stairs2
+        skip_location: True
+        group: Rhyme Room Doors
+        panels:
+          - room: The Tenacious
+            panel: LEVEL (Black)
+          - room: The Tenacious
+            panel: RACECAR (Black)
+          - room: The Tenacious
+            panel: SOLOS (Black)
+      Orange Barrier: # see note in Outside The Initiated
+        id:
+          - Color Arrow Room Doors/Door_orange_hider_1
+          - Color Arrow Room Doors/Door_orange_hider_2
+          - Color Arrow Room Doors/Door_orange_hider_3
+        location_name: Color Hunt - RED and YELLOW
+        group: Champion's Rest - Color Barriers
+        item_name: Champion's Rest - Orange Barrier
+        panels:
+          - RED
+          - room: Directional Gallery
+            panel: YELLOW
+    paintings:
+      - id: arrows_painting_6
+        orientation: east
+      - id: flower_painting_5
+        orientation: south
+  Orange Tower Fourth Floor:
+    entrances:
+      Orange Tower Third Floor:
+        room: Orange Tower
+        door: Fourth Floor
+      Orange Tower Fifth Floor:
+        room: Orange Tower
+        door: Fifth Floor
+      Hot Crusts Area:
+        door: Hot Crusts Door
+      Crossroads:
+        - room: Crossroads
+          door: Tower Entrance
+        - room: Crossroads
+          door: Tower Back Entrance
+      Courtyard: True
+      Roof: True # through the sunwarp
+    panels:
+      RUNT:
+        id: Shuffle Room/Panel_turn_runt2
+        colors: yellow
+        tag: midyellow
+      RUNT (2):
+        id: Shuffle Room/Panel_runt3
+        colors:
+          - yellow
+          - blue
+        tag: mid yellow blue
+      LEARNS + UNSEW:
+        id: Tower Room/Panel_learns_unsew_unrest_4
+        colors: orange
+        check: True
+        tag: midorange
+      HOT CRUSTS:
+        id: Shuffle Room/Panel_shortcuts
+        colors: yellow
+        tag: midyellow
+      IRK HORN:
+        id: Shuffle Room/Panel_corner
+        colors: yellow
+        check: True
+        exclude_reduce: True
+        tag: topyellow
+    doors:
+      Hot Crusts Door:
+        id: Shuffle Room Area Doors/Door_hotcrust_shortcuts
+        panels:
+          - HOT CRUSTS
+  Hot Crusts Area:
+    entrances:
+      Orange Tower Fourth Floor:
+        room: Orange Tower Fourth Floor
+        door: Hot Crusts Door
+      Roof: True # through the sunwarp
+    panels:
+      EIGHT:
+        id: Backside Room/Panel_eight_eight_3
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Eights
+    paintings:
+      - id: smile_painting_8
+        orientation: north
+  Orange Tower Fifth Floor:
+    entrances:
+      Orange Tower Fourth Floor:
+        room: Orange Tower
+        door: Fifth Floor
+      Orange Tower Sixth Floor:
+        room: Orange Tower
+        door: Sixth Floor
+      Cellar:
+        room: Room Room
+        door: Cellar Exit
+      Welcome Back Area:
+        door: Welcome Back
+      Art Gallery:
+        room: Art Gallery
+        door: Exit
+      The Bearer:
+        room: Art Gallery
+        door: Exit
+      Outside The Initiated:
+        room: Art Gallery
+        door: Exit
+    panels:
+      SIZE (Small):
+        id: Entry Room/Panel_size_small
+        colors: gray
+        tag: forbid
+      SIZE (Big):
+        id: Entry Room/Panel_size_big
+        colors: gray
+        tag: forbid
+      DRAWL + RUNS:
+        id: Tower Room/Panel_drawl_runs_enter_5
+        colors: orange
+        check: True
+        tag: midorange
+      NINE:
+        id: Backside Room/Panel_nine_nine_2
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+      SUMMER:
+        id: Entry Room/Panel_summer_summer
+        tag: midwhite
+      AUTUMN:
+        id: Entry Room/Panel_autumn_autumn
+        tag: midwhite
+      SPRING:
+        id: Entry Room/Panel_spring_spring
+        tag: midwhite
+      PAINTING (1):
+        id: Panel Room/Panel_painting_flower
+        colors: green
+        tag: forbid
+        required_room: Cellar
+      PAINTING (2):
+        id: Panel Room/Panel_painting_eye
+        colors: green
+        tag: forbid
+        required_room: Cellar
+      PAINTING (3):
+        id: Panel Room/Panel_painting_snowman
+        colors: green
+        tag: forbid
+        required_room: Cellar
+      PAINTING (4):
+        id: Panel Room/Panel_painting_owl
+        colors: green
+        tag: forbid
+        required_room: Cellar
+      PAINTING (5):
+        id: Panel Room/Panel_painting_panda
+        colors: green
+        tag: forbid
+        required_room: Cellar
+      ROOM:
+        id: Panel Room/Panel_room_stairs
+        colors: gray
+        tag: forbid
+        required_room: Cellar
+    doors:
+      Welcome Back:
+        id: Entry Room Area Doors/Door_sizes
+        group: Welcome Back Doors
+        panels:
+          - SIZE (Small)
+          - SIZE (Big)
+    paintings:
+      - id: hi_solved_painting3
+        orientation: south
+      - id: hi_solved_painting2
+        orientation: south
+      - id: east_afar
+        orientation: north
+  Orange Tower Sixth Floor:
+    entrances:
+      Orange Tower Fifth Floor:
+        room: Orange Tower
+        door: Sixth Floor
+      The Scientific:
+        painting: True
+    paintings:
+      - id: arrows_painting_10
+        orientation: east
+      - id: owl_painting_3
+        orientation: north
+      - id: clock_painting
+        orientation: west
+      - id: scenery_painting_5d_2
+        orientation: south
+      - id: symmetry_painting_b_7
+        orientation: north
+      - id: panda_painting_2
+        orientation: south
+      - id: crown_painting2
+        orientation: north
+      - id: colors_painting2
+        orientation: south
+      - id: cherry_painting2
+        orientation: east
+      - id: hi_solved_painting
+        orientation: west
+  Orange Tower Seventh Floor:
+    entrances:
+      Orange Tower Sixth Floor:
+        room: Orange Tower
+        door: Seventh Floor
+    panels:
+      THE END:
+        id: EndPanel/Panel_end_end
+        check: True
+        tag: forbid
+        non_counting: True
+      THE MASTER:
+        # We will set up special rules for this in code.
+        id: Countdown Panels/Panel_master_master
+        check: True
+        tag: forbid
+      MASTERY:
+        # This is the MASTERY on the other side of THE FEARLESS. It can only be
+        # accessed by jumping from the top of the tower.
+        id: Master Room/Panel_mastery_mastery8
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Mastery
+    doors:
+      Mastery:
+        id:
+          - Master Room Doors/Door_tower_down
+          - Master Room Doors/Door_master_master
+          - Master Room Doors/Door_master_master_2
+          - Master Room Doors/Door_master_master_3
+          - Master Room Doors/Door_master_master_4
+          - Master Room Doors/Door_master_master_5
+          - Master Room Doors/Door_master_master_6
+          - Master Room Doors/Door_master_master_10
+          - Master Room Doors/Door_master_master_11
+          - Master Room Doors/Door_master_master_12
+          - Master Room Doors/Door_master_master_13
+          - Master Room Doors/Door_master_master_14
+          - Master Room Doors/Door_master_master_15
+          - Master Room Doors/Door_master_down
+          - Master Room Doors/Door_master_down2
+        skip_location: True
+        panels:
+          - THE MASTER
+      Mastery Panels:
+        skip_item: True
+        location_name: Mastery Panels
+        panels:
+          - room: Room Room
+            panel: MASTERY
+          - room: The Steady (Topaz)
+            panel: MASTERY
+          - room: Orange Tower Basement
+            panel: MASTERY
+          - room: Arrow Garden
+            panel: MASTERY
+          - room: Hedge Maze
+            panel: MASTERY (1)
+          - room: Roof
+            panel: MASTERY (1)
+          - room: Roof
+            panel: MASTERY (2)
+          - MASTERY
+          - room: Hedge Maze
+            panel: MASTERY (2)
+          - room: Roof
+            panel: MASTERY (3)
+          - room: Roof
+            panel: MASTERY (4)
+          - room: Roof
+            panel: MASTERY (5)
+          - room: Elements Area
+            panel: MASTERY
+          - room: Pilgrim Antechamber
+            panel: MASTERY
+          - room: Roof
+            panel: MASTERY (6)
+    paintings:
+      - id: map_painting2
+        orientation: north
+        enter_only: True # otherwise you might just skip the whole game!
+        req_blocked_when_no_doors: True # owl hallway in vanilla doors
+  Roof:
+    entrances:
+      Orange Tower Seventh Floor: True
+      Crossroads:
+        room: Crossroads
+        door: Roof Access
+    panels:
+      MASTERY (1):
+        id: Master Room/Panel_mastery_mastery6
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      MASTERY (2):
+        id: Master Room/Panel_mastery_mastery7
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      MASTERY (3):
+        id: Master Room/Panel_mastery_mastery10
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      MASTERY (4):
+        id: Master Room/Panel_mastery_mastery11
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      MASTERY (5):
+        id: Master Room/Panel_mastery_mastery12
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      MASTERY (6):
+        id: Master Room/Panel_mastery_mastery15
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      STAIRCASE:
+        id: Open Areas/Panel_staircase
+        tag: midwhite
+  Orange Tower Basement:
+    entrances:
+      Orange Tower Sixth Floor:
+        room: Orange Tower Seventh Floor
+        door: Mastery
+    panels:
+      MASTERY:
+        id: Master Room/Panel_mastery_mastery3
+        tag: midwhite
+        hunt: True
+      THE LIBRARY:
+        id: EndPanel/Panel_library
+        check: True
+        tag: forbid
+        non_counting: True
+    paintings:
+      - id: arrows_painting_11
+        orientation: east
+        req_blocked_when_no_doors: True # owl hallway in vanilla doors
+  Courtyard:
+    entrances:
+      Roof: True
+      Orange Tower Fourth Floor: True
+      Arrow Garden:
+        painting: True
+      Starting Room:
+        door: Painting Shortcut
+        painting: True
+      Yellow Backside Area:
+        room: First Second Third Fourth
+        door: Backside Door
+      The Colorful (White): True
+    panels:
+      I:
+        id: Strand Room/Panel_i_staring
+        colors: blue
+        tag: forbid
+        hunt: True
+      GREEN:
+        id: Color Arrow Room/Panel_green_afar
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Green Barrier
+      PINECONE:
+        id: Shuffle Room/Panel_pinecone_pine
+        colors: brown
+        tag: botbrown
+      ACORN:
+        id: Shuffle Room/Panel_acorn_oak
+        colors: brown
+        tag: botbrown
+    doors:
+      Painting Shortcut:
+        painting_id: flower_painting_8
+        item_name: Starting Room - Flower Painting
+        skip_location: True
+        panels:
+          - room: First Second Third Fourth
+            panel: FIRST
+          - room: First Second Third Fourth
+            panel: SECOND
+          - room: First Second Third Fourth
+            panel: THIRD
+          - room: First Second Third Fourth
+            panel: FOURTH
+      Green Barrier:
+        id: Color Arrow Room Doors/Door_green_5
+        group: Color Hunt Barriers
+        skip_location: True
+        panels:
+          - room: Champion's Rest
+            panel: GREEN
+    paintings:
+      - id: flower_painting_7
+        orientation: north
+  Yellow Backside Area:
+    entrances:
+      Courtyard:
+        room: First Second Third Fourth
+        door: Backside Door
+      Roof: True
+    panels:
+      BACKSIDE:
+        id: Backside Room/Panel_backside_3
+        tag: midwhite
+        hunt: True
+      NINE:
+        id: Backside Room/Panel_nine_nine_8
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+    paintings:
+      - id: blueman_painting
+        orientation: east
+  First Second Third Fourth:
+    # We are separating this door + its panels into its own room because they
+    # are accessible from two distinct regions (Courtyard and Yellow Backside
+    # Area). We need to do this because painting shuffle makes it possible to
+    # have access to Yellow Backside Area without having access to Courtyard,
+    # and we want it to still be in logic to solve these panels.
+    entrances:
+      Courtyard: True
+      Yellow Backside Area: True
+    panels:
+      FIRST:
+        id: Backside Room/Panel_first_first
+        tag: midwhite
+      SECOND:
+        id: Backside Room/Panel_second_second
+        tag: midwhite
+      THIRD:
+        id: Backside Room/Panel_third_third
+        tag: midwhite
+      FOURTH:
+        id: Backside Room/Panel_fourth_fourth
+        tag: midwhite
+    doors:
+      Backside Door:
+        id: Count Up Room Area Doors/Door_yellow_backside
+        group: Backside Doors
+        location_name: Courtyard - FIRST, SECOND, THIRD, FOURTH
+        item_name: Courtyard - Backside Door
+        panels:
+          - FIRST
+          - SECOND
+          - THIRD
+          - FOURTH
+  The Colorful (White):
+    entrances:
+      Courtyard: True
+      The Colorful (Black):
+        door: Progress Door
+    panels:
+      BEGIN:
+        id: Doorways Room/Panel_begin_start
+        tag: botwhite
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_white
+        item_name: The Colorful - White Door
+        group: Colorful Doors
+        location_name: The Colorful - White
+        panels:
+          - BEGIN
+  The Colorful (Black):
+    entrances:
+      The Colorful (White):
+        room: The Colorful (White)
+        door: Progress Door
+      The Colorful (Red):
+        door: Progress Door
+    panels:
+      FOUND:
+        id: Doorways Room/Panel_found_lost
+        colors: black
+        tag: botblack
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_black
+        item_name: The Colorful - Black Door
+        location_name: The Colorful - Black
+        group: Colorful Doors
+        panels:
+          - FOUND
+  The Colorful (Red):
+    entrances:
+      The Colorful (Black):
+        room: The Colorful (Black)
+        door: Progress Door
+      The Colorful (Yellow):
+        door: Progress Door
+    panels:
+      LOAF:
+        id: Doorways Room/Panel_loaf_crust
+        colors: red
+        tag: botred
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_red
+        item_name: The Colorful - Red Door
+        location_name: The Colorful - Red
+        group: Colorful Doors
+        panels:
+          - LOAF
+  The Colorful (Yellow):
+    entrances:
+      The Colorful (Red):
+        room: The Colorful (Red)
+        door: Progress Door
+      The Colorful (Blue):
+        door: Progress Door
+    panels:
+      CREAM:
+        id: Doorways Room/Panel_eggs_breakfast
+        colors: yellow
+        tag: botyellow
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_yellow
+        item_name: The Colorful - Yellow Door
+        location_name: The Colorful - Yellow
+        group: Colorful Doors
+        panels:
+          - CREAM
+  The Colorful (Blue):
+    entrances:
+      The Colorful (Yellow):
+        room: The Colorful (Yellow)
+        door: Progress Door
+      The Colorful (Purple):
+        door: Progress Door
+    panels:
+      SUN:
+        id: Doorways Room/Panel_sun_sky
+        colors: blue
+        tag: botblue
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_blue
+        item_name: The Colorful - Blue Door
+        location_name: The Colorful - Blue
+        group: Colorful Doors
+        panels:
+          - SUN
+  The Colorful (Purple):
+    entrances:
+      The Colorful (Blue):
+        room: The Colorful (Blue)
+        door: Progress Door
+      The Colorful (Orange):
+        door: Progress Door
+    panels:
+      SPOON:
+        id: Doorways Room/Panel_teacher_substitute
+        colors: purple
+        tag: botpurple
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_purple
+        item_name: The Colorful - Purple Door
+        location_name: The Colorful - Purple
+        group: Colorful Doors
+        panels:
+          - SPOON
+  The Colorful (Orange):
+    entrances:
+      The Colorful (Purple):
+        room: The Colorful (Purple)
+        door: Progress Door
+      The Colorful (Green):
+        door: Progress Door
+    panels:
+      LETTERS:
+        id: Doorways Room/Panel_walnuts_orange
+        colors: orange
+        tag: botorange
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_orange
+        item_name: The Colorful - Orange Door
+        location_name: The Colorful - Orange
+        group: Colorful Doors
+        panels:
+          - LETTERS
+  The Colorful (Green):
+    entrances:
+      The Colorful (Orange):
+        room: The Colorful (Orange)
+        door: Progress Door
+      The Colorful (Brown):
+        door: Progress Door
+    panels:
+      WALLS:
+        id: Doorways Room/Panel_path_i
+        colors: green
+        tag: forbid
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_green
+        item_name: The Colorful - Green Door
+        location_name: The Colorful - Green
+        group: Colorful Doors
+        panels:
+          - WALLS
+  The Colorful (Brown):
+    entrances:
+      The Colorful (Green):
+        room: The Colorful (Green)
+        door: Progress Door
+      The Colorful (Gray):
+        door: Progress Door
+    panels:
+      IRON:
+        id: Doorways Room/Panel_iron_rust
+        colors: brown
+        tag: botbrown
+    doors:
+      Progress Door:
+        id: Doorway Room Doors/Door_brown
+        item_name: The Colorful - Brown Door
+        location_name: The Colorful - Brown
+        group: Colorful Doors
+        panels:
+          - IRON
+  The Colorful (Gray):
+    entrances:
+      The Colorful (Brown):
+        room: The Colorful (Brown)
+        door: Progress Door
+      The Colorful:
+        door: Progress Door
+    panels:
+      OBSTACLE:
+        id: Doorways Room/Panel_obstacle_door
+        colors: gray
+        tag: forbid
+    doors:
+      Progress Door:
+        id:
+          - Doorway Room Doors/Door_gray
+          - Doorway Room Doors/Door_gray2 # See comment below
+        item_name: The Colorful - Gray Door
+        location_name: The Colorful - Gray
+        group: Colorful Doors
+        panels:
+          - OBSTACLE
+  The Colorful:
+    # The set of required_doors in the achievement panel should prevent
+    # generation from asking you to solve The Colorful before opening all of the
+    # doors. Access from the roof is included so that the painting here could be
+    # an entrance. The client will have to be hardcoded to not open the door to
+    # the achievement until all of the doors are open, whether by solving the
+    # panels or through receiving items.
+    entrances:
+      The Colorful (Gray):
+        room: The Colorful (Gray)
+        door: Progress Door
+      Roof: True
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_colorful_colorful
+        check: True
+        tag: forbid
+        required_door:
+          - room: The Colorful (White)
+            door: Progress Door
+          - room: The Colorful (Black)
+            door: Progress Door
+          - room: The Colorful (Red)
+            door: Progress Door
+          - room: The Colorful (Yellow)
+            door: Progress Door
+          - room: The Colorful (Blue)
+            door: Progress Door
+          - room: The Colorful (Purple)
+            door: Progress Door
+          - room: The Colorful (Orange)
+            door: Progress Door
+          - room: The Colorful (Green)
+            door: Progress Door
+          - room: The Colorful (Brown)
+            door: Progress Door
+          - room: The Colorful (Gray)
+            door: Progress Door
+        achievement: The Colorful
+    paintings:
+      - id: arrows_painting_12
+        orientation: north
+  Welcome Back Area:
+    entrances:
+      Starting Room:
+        door: Shortcut to Starting Room
+      Hub Room: True
+      Outside The Wondrous: True
+      Outside The Undeterred: True
+      Outside The Agreeable: True
+      Outside The Wanderer: True
+      The Observant: True
+      Art Gallery: True
+      The Scientific: True
+      Cellar: True
+      Orange Tower Fifth Floor:
+        room: Orange Tower Fifth Floor
+        door: Welcome Back
+      Challenge Room:
+        room: Challenge Room
+        door: Welcome Door
+    panels:
+      WELCOME BACK:
+        id: Entry Room/Panel_return_return
+        tag: midwhite
+      SECRET:
+        id: Entry Room/Panel_secret_secret
+        tag: midwhite
+      CLOCKWISE:
+        id: Shuffle Room/Panel_clockwise_counterclockwise
+        colors: black
+        check: True
+        exclude_reduce: True
+        tag: botblack
+    doors:
+      Shortcut to Starting Room:
+        id: Entry Room Area Doors/Door_return_return
+        group: Welcome Back Doors
+        include_reduce: True
+        panels:
+          - WELCOME BACK
+  Owl Hallway:
+    entrances:
+      Hidden Room:
+        painting: True
+      Hedge Maze:
+        door: Shortcut to Hedge Maze
+      Orange Tower Sixth Floor:
+        painting: True
+    panels:
+      STRAYS:
+        id: Maze Room/Panel_strays_maze
+        colors: purple
+        tag: toppurp
+      READS + RUST:
+        id: Tower Room/Panel_reads_rust_lawns_6
+        colors: orange
+        check: True
+        tag: midorange
+    doors:
+      Shortcut to Hedge Maze:
+        id: Maze Area Doors/Door_strays_maze
+        group: Hedge Maze Doors
+        panels:
+          - STRAYS
+    paintings:
+      - id: arrows_painting_8
+        orientation: south
+      - id: maze_painting_2
+        orientation: north
+      - id: owl_painting_2
+        orientation: south
+        required_when_no_doors: True
+      - id: clock_painting_4
+        orientation: north
+  Outside The Initiated:
+    entrances:
+      Hub Room:
+        door: Shortcut to Hub Room
+      Knight Night Exit:
+        room: Knight Night (Final)
+        door: Exit
+      Orange Tower Third Floor: True # sunwarp
+      Orange Tower Fifth Floor:
+        room: Art Gallery
+        door: Exit
+      Eight Alcove:
+        door: Eight Door
+    panels:
+      SEVEN (1):
+        id: Backside Room/Panel_seven_seven_5
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sevens
+      SEVEN (2):
+        id: Backside Room/Panel_seven_seven_6
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sevens
+      EIGHT:
+        id: Backside Room/Panel_eight_eight_7
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Eights
+      NINE:
+        id: Backside Room/Panel_nine_nine_4
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+      BLUE:
+        id: Color Arrow Room/Panel_blue_afar
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Blue Barrier
+      ORANGE:
+        id: Color Arrow Room/Panel_orange_afar
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Orange Barrier
+      UNCOVER:
+        id: Appendix Room/Panel_discover_recover
+        colors: purple
+        tag: midpurp
+      OXEN:
+        id: Rhyme Room/Panel_locked_knocked
+        colors: purple
+        tag: midpurp
+      BACKSIDE:
+        id: Backside Room/Panel_backside_1
+        tag: midwhite
+      The Optimistic:
+        id: Countdown Panels/Panel_optimistic_optimistic
+        check: True
+        tag: forbid
+        required_door:
+          door: Backsides
+        achievement: The Optimistic
+      PAST:
+        id: Shuffle Room/Panel_past_present
+        colors: brown
+        tag: botbrown
+      FUTURE:
+        id: Shuffle Room/Panel_future_present
+        colors:
+          - brown
+          - black
+        tag: bot brown black
+      FUTURE (2):
+        id: Shuffle Room/Panel_future_past
+        colors: black
+        tag: botblack
+      PAST (2):
+        id: Shuffle Room/Panel_past_future
+        colors: black
+        tag: botblack
+      PRESENT:
+        id: Shuffle Room/Panel_past_past
+        colors:
+          - brown
+          - black
+        tag: bot brown black
+      SMILE:
+        id: Open Areas/Panel_smile_smile
+        tag: midwhite
+      ANGERED:
+        id: Open Areas/Panel_angered_enraged
+        colors:
+          - yellow
+        tag: syn anagram
+        copy_to_sign: sign18
+      VOTE:
+        id: Open Areas/Panel_vote_veto
+        colors:
+          - yellow
+          - black
+        tag: ant anagram
+        copy_to_sign: sign17
+    doors:
+      Shortcut to Hub Room:
+        id: Appendix Room Area Doors/Door_recover_discover
+        panels:
+          - UNCOVER
+      Blue Barrier:
+        id: Color Arrow Room Doors/Door_blue_3
+        group: Color Hunt Barriers
+        skip_location: True
+        panels:
+          - room: Champion's Rest
+            panel: BLUE
+      Orange Barrier:
+        id: Color Arrow Room Doors/Door_orange_3
+        group: Color Hunt Barriers
+        skip_location: True
+        panels:
+          - room: Champion's Rest
+            panel: ORANGE
+      Initiated Entrance:
+        id: Red Blue Purple Room Area Doors/Door_locked_knocked
+        item_name: The Initiated - Entrance
+        panels:
+          - OXEN
+      # These would be more appropriate in Champion's Rest, but as currently
+      # implemented, locations need to include at least one panel from the
+      # containing region.
+      Green Barrier:
+        id: Color Arrow Room Doors/Door_green_hider_1
+        location_name: Color Hunt - BLUE and YELLOW
+        item_name: Champion's Rest - Green Barrier
+        group: Champion's Rest - Color Barriers
+        panels:
+          - BLUE
+          - room: Directional Gallery
+            panel: YELLOW
+      Purple Barrier:
+        id:
+          - Color Arrow Room Doors/Door_purple_hider_1
+          - Color Arrow Room Doors/Door_purple_hider_2
+          - Color Arrow Room Doors/Door_purple_hider_3
+        location_name: Color Hunt - RED and BLUE
+        item_name: Champion's Rest - Purple Barrier
+        group: Champion's Rest - Color Barriers
+        panels:
+          - BLUE
+          - room: Orange Tower Third Floor
+            panel: RED
+      Entrance:
+        id:
+          - Color Arrow Room Doors/Door_all_hider_1
+          - Color Arrow Room Doors/Door_all_hider_2
+          - Color Arrow Room Doors/Door_all_hider_3
+        location_name: Color Hunt - GREEN, ORANGE and PURPLE
+        item_name: Champion's Rest - Entrance
+        panels:
+          - ORANGE
+          - room: Courtyard
+            panel: GREEN
+          - room: Outside The Agreeable
+            panel: PURPLE
+      Backsides:
+        event: True
+        panels:
+          - room: The Observant
+            panel: BACKSIDE
+          - room: Yellow Backside Area
+            panel: BACKSIDE
+          - room: Directional Gallery
+            panel: BACKSIDE
+          - room: The Bearer
+            panel: BACKSIDE
+      Eight Door:
+        id: Red Blue Purple Room Area Doors/Door_a_strands2
+        skip_location: True
+        panels:
+          - room: The Incomparable
+            panel: I (Seven)
+          - room: Courtyard
+            panel: I
+          - room: Elements Area
+            panel: A
+    paintings:
+      - id: clock_painting_5
+        orientation: east
+      - id: smile_painting_1
+        orientation: north
+  The Initiated:
+    entrances:
+      Outside The Initiated:
+        room: Outside The Initiated
+        door: Initiated Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_illuminated_initiated
+        colors: purple
+        tag: forbid
+        check: True
+        achievement: The Initiated
+      DAUGHTER:
+        id: Rhyme Room/Panel_daughter_laughter
+        colors: purple
+        tag: midpurp
+      START:
+        id: Rhyme Room/Panel_move_love
+        colors: purple
+        tag: double midpurp
+        subtag: left
+        link: change STARS
+      STARE:
+        id: Rhyme Room/Panel_stove_love
+        colors: purple
+        tag: double midpurp
+        subtag: right
+        link: change STARS
+      HYPE:
+        id: Rhyme Room/Panel_scope_type
+        colors: purple
+        tag: midpurp and rhyme
+        copy_to_sign: sign16
+      ABYSS:
+        id: Rhyme Room/Panel_abyss_this
+        colors: purple
+        tag: toppurp
+      SWEAT:
+        id: Rhyme Room/Panel_sweat_great
+        colors: purple
+        tag: double midpurp
+        subtag: left
+        link: change GREAT
+      BEAT:
+        id: Rhyme Room/Panel_beat_great
+        colors: purple
+        tag: double midpurp
+        subtag: right
+        link: change GREAT
+      ALUMNI:
+        id: Rhyme Room/Panel_alumni_hi
+        colors: purple
+        tag: midpurp and rhyme
+        copy_to_sign: sign14
+      PATS:
+        id: Rhyme Room/Panel_wrath_path
+        colors: purple
+        tag: forbid
+      KNIGHT:
+        id: Rhyme Room/Panel_knight_write
+        colors: purple
+        tag: double toppurp
+        subtag: left
+        link: change WRITE
+      BYTE:
+        id: Rhyme Room/Panel_byte_write
+        colors: purple
+        tag: double toppurp
+        subtag: right
+        link: change WRITE
+      MAIM:
+        id: Rhyme Room/Panel_maim_same
+        colors: purple
+        tag: toppurp
+      MORGUE:
+        id: Rhyme Room/Panel_chair_bear
+        colors: purple
+        tag: purple rhyme change stack
+        subtag: top
+        link: prcs CYBORG
+      CHAIR:
+        id: Rhyme Room/Panel_bare_bear
+        colors: purple
+        tag: toppurp
+      HUMAN:
+        id: Rhyme Room/Panel_cost_most
+        colors: purple
+        tag: purple rhyme change stack
+        subtag: bot
+        link: prcs CYBORG
+      BED:
+        id: Rhyme Room/Panel_bed_dead
+        colors: purple
+        tag: toppurp
+  The Traveled:
+    entrances:
+      Hub Room:
+        room: Hub Room
+        door: Traveled Entrance
+      Color Hallways:
+        door: Color Hallways Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_traveled_traveled
+        required_room: Hub Room
+        tag: forbid
+        check: True
+        achievement: The Traveled
+      CLOSE:
+        id: Synonym Room/Panel_close_near
+        tag: botwhite
+      COMPOSE:
+        id: Synonym Room/Panel_compose_write
+        tag: double botwhite
+        subtag: left
+        link: syn WRITE
+      RECORD:
+        id: Synonym Room/Panel_record_write
+        tag: double botwhite
+        subtag: right
+        link: syn WRITE
+      CATEGORY:
+        id: Synonym Room/Panel_category_type
+        tag: botwhite
+      HELLO:
+        id: Synonym Room/Panel_hello_hi
+        tag: botwhite
+      DUPLICATE:
+        id: Synonym Room/Panel_duplicate_same
+        tag: double botwhite
+        subtag: left
+        link: syn SAME
+      IDENTICAL:
+        id: Synonym Room/Panel_identical_same
+        tag: double botwhite
+        subtag: right
+        link: syn SAME
+      DISTANT:
+        id: Synonym Room/Panel_distant_far
+        tag: botwhite
+      HAY:
+        id: Synonym Room/Panel_hay_straw
+        tag: botwhite
+      GIGGLE:
+        id: Synonym Room/Panel_giggle_laugh
+        tag: double botwhite
+        subtag: left
+        link: syn LAUGH
+      CHUCKLE:
+        id: Synonym Room/Panel_chuckle_laugh
+        tag: double botwhite
+        subtag: right
+        link: syn LAUGH
+      SNITCH:
+        id: Synonym Room/Panel_snitch_rat
+        tag: botwhite
+      CONCEALED:
+        id: Synonym Room/Panel_concealed_hidden
+        tag: botwhite
+      PLUNGE:
+        id: Synonym Room/Panel_plunge_fall
+        tag: double botwhite
+        subtag: left
+        link: syn FALL
+      AUTUMN:
+        id: Synonym Room/Panel_autumn_fall
+        tag: double botwhite
+        subtag: right
+        link: syn FALL
+      ROAD:
+        id: Synonym Room/Panel_growths_warts
+        tag: botwhite
+      FOUR:
+        id: Backside Room/Panel_four_four_4
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Outside The Undeterred
+          door: Fours
+    doors:
+      Color Hallways Entrance:
+        id: Appendix Room Area Doors/Door_hello_hi
+        group: Entrance to The Traveled
+        panels:
+          - HELLO
+  Color Hallways:
+    entrances:
+      The Traveled:
+        room: The Traveled
+        door: Color Hallways Entrance
+      Outside The Bold: True
+      Outside The Undeterred: True
+      Crossroads: True
+      Hedge Maze: True
+      Outside The Initiated: True # backside
+      Directional Gallery: True # backside
+      Yellow Backside Area: True
+      The Bearer:
+        room: The Bearer
+        door: Backside Door
+      The Observant:
+        room: The Observant
+        door: Backside Door
+  Outside The Bold:
+    entrances:
+      Color Hallways: True
+      Champion's Rest:
+        room: Champion's Rest
+        door: Shortcut to The Steady
+      The Bearer:
+        room: The Bearer
+        door: Shortcut to The Bold
+      Directional Gallery:
+        # There is a painting warp here from the Directional Gallery, but it
+        # only appears when the sixes are revealed. It could be its own item if
+        # we wanted.
+        room: Number Hunt
+        door: Sixes
+        painting: True
+      Starting Room:
+        door: Painting Shortcut
+        painting: True
+      Room Room: True # trapdoor
+      Outside The Agreeable:
+        painting: True
+    panels:
+      UNOPEN:
+        id: Truncate Room/Panel_unopened_open
+        colors: red
+        tag: midred
+      BEGIN:
+        id: Rock Room/Panel_begin_begin
+        tag: midwhite
+      SIX:
+        id: Backside Room/Panel_six_six_4
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      NINE:
+        id: Backside Room/Panel_nine_nine_5
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+      LEFT:
+        id: Shuffle Room/Panel_left_left_2
+        tag: midwhite
+      RIGHT:
+        id: Shuffle Room/Panel_right_right_2
+        tag: midwhite
+      RISE (Horizon):
+        id: Open Areas/Panel_rise_horizon
+        colors: blue
+        tag: double topblue
+        subtag: left
+        link: expand HORIZON
+      RISE (Sunrise):
+        id: Open Areas/Panel_rise_sunrise
+        colors: blue
+        tag: double topblue
+        subtag: left
+        link: expand SUNRISE
+      ZEN:
+        id: Open Areas/Panel_son_horizon
+        colors: blue
+        tag: double topblue
+        subtag: right
+        link: expand HORIZON
+      SON:
+        id: Open Areas/Panel_son_sunrise
+        colors: blue
+        tag: double topblue
+        subtag: right
+        link: expand SUNRISE
+      STARGAZER:
+        id: Open Areas/Panel_stargazer_stargazer
+        tag: midwhite
+        required_door:
+          door: Stargazer Door
+      MOUTH:
+        id: Cross Room/Panel_mouth_south
+        colors: purple
+        tag: midpurp
+      YEAST:
+        id: Cross Room/Panel_yeast_east
+        colors: red
+        tag: midred
+      WET:
+        id: Cross Room/Panel_wet_west
+        colors: blue
+        tag: midblue
+    doors:
+      Bold Entrance:
+        id: Red Blue Purple Room Area Doors/Door_unopened_open
+        item_name: The Bold - Entrance
+        panels:
+          - UNOPEN
+      Painting Shortcut:
+        painting_id: pencil_painting6
+        skip_location: True
+        item_name: Starting Room - Pencil Painting
+        panels:
+          - UNOPEN
+      Steady Entrance:
+        id: Rock Room Doors/Door_2
+        item_name: The Steady - Entrance
+        panels:
+          - BEGIN
+      Lilac Entrance:
+        event: True
+        panels:
+          - room: The Steady (Rose)
+            panel: SOAR
+      Stargazer Door:
+        event: True
+        panels:
+          - RISE (Horizon)
+          - RISE (Sunrise)
+          - ZEN
+          - SON
+    paintings:
+      - id: pencil_painting2
+        orientation: west
+      - id: north_missing2
+        orientation: north
+  The Bold:
+    entrances:
+      Outside The Bold:
+        room: Outside The Bold
+        door: Bold Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_emboldened_bold
+        colors: red
+        tag: forbid
+        check: True
+        achievement: The Bold
+      FOOT:
+        id: Truncate Room/Panel_foot_toe
+        colors: red
+        tag: botred
+      NEEDLE:
+        id: Truncate Room/Panel_needle_eye
+        colors: red
+        tag: double botred
+        subtag: left
+        link: mero EYE
+      FACE:
+        id: Truncate Room/Panel_face_eye
+        colors: red
+        tag: double botred
+        subtag: right
+        link: mero EYE
+      SIGN:
+        id: Truncate Room/Panel_sign_sigh
+        colors: red
+        tag: topred
+      HEARTBREAK:
+        id: Truncate Room/Panel_heartbreak_brake
+        colors: red
+        tag: topred
+      UNDEAD:
+        id: Truncate Room/Panel_undead_dead
+        colors: red
+        tag: double midred
+        subtag: left
+        link: trunc DEAD
+      DEADLINE:
+        id: Truncate Room/Panel_deadline_dead
+        colors: red
+        tag: double midred
+        subtag: right
+        link: trunc DEAD
+      SUSHI:
+        id: Truncate Room/Panel_sushi_hi
+        colors: red
+        tag: midred
+      THISTLE:
+        id: Truncate Room/Panel_thistle_this
+        colors: red
+        tag: midred
+      LANDMASS:
+        id: Truncate Room/Panel_landmass_mass
+        colors: red
+        tag: double midred
+        subtag: left
+        link: trunc MASS
+      MASSACRED:
+        id: Truncate Room/Panel_massacred_mass
+        colors: red
+        tag: double midred
+        subtag: right
+        link: trunc MASS
+      AIRPLANE:
+        id: Truncate Room/Panel_airplane_plain
+        colors: red
+        tag: topred
+      NIGHTMARE:
+        id: Truncate Room/Panel_nightmare_knight
+        colors: red
+        tag: topred
+      MOUTH:
+        id: Truncate Room/Panel_mouth_teeth
+        colors: red
+        tag: double botred
+        subtag: left
+        link: mero TEETH
+      SAW:
+        id: Truncate Room/Panel_saw_teeth
+        colors: red
+        tag: double botred
+        subtag: right
+        link: mero TEETH
+      HAND:
+        id: Truncate Room/Panel_hand_finger
+        colors: red
+        tag: botred
+  Outside The Undeterred:
+    entrances:
+      Color Hallways: True
+      Orange Tower First Floor: True # sunwarp
+      Orange Tower Second Floor: True
+      The Artistic (Smiley): True
+      The Artistic (Panda): True
+      The Artistic (Apple): True
+      The Artistic (Lattice): True
+      Yellow Backside Area:
+        painting: True
+      Number Hunt:
+        door: Number Hunt
+      Directional Gallery:
+        room: Directional Gallery
+        door: Shortcut to The Undeterred
+      Starting Room:
+        door: Painting Shortcut
+        painting: True
+    panels:
+      HOLLOW:
+        id: Hallway Room/Panel_hollow_hollow
+        tag: midwhite
+      ART + ART:
+        id: Tower Room/Panel_art_art_eat_2
+        colors: orange
+        check: True
+        tag: midorange
+      PEN:
+        id: Blue Room/Panel_pen_open
+        colors: blue
+        tag: midblue
+      HUSTLING:
+        id: Open Areas/Panel_hustling_sunlight
+        colors: yellow
+        tag: midyellow
+      SUNLIGHT:
+        id: Open Areas/Panel_sunlight_light
+        colors: red
+        tag: midred
+        required_panel:
+          panel: HUSTLING
+      LIGHT:
+        id: Open Areas/Panel_light_bright
+        colors: purple
+        tag: midpurp
+        required_panel:
+          panel: SUNLIGHT
+      BRIGHT:
+        id: Open Areas/Panel_bright_sunny
+        tag: botwhite
+        required_panel:
+          panel: LIGHT
+      SUNNY:
+        id: Open Areas/Panel_sunny_rainy
+        colors: black
+        tag: botblack
+        required_panel:
+          panel: BRIGHT
+      RAINY:
+        id: Open Areas/Panel_rainy_rainbow
+        colors: brown
+        tag: botbrown
+        required_panel:
+          panel: SUNNY
+        check: True
+      ZERO:
+        id: Backside Room/Panel_zero_zero
+        tag: midwhite
+        required_door:
+          room: Number Hunt
+          door: Zero Door
+      ONE:
+        id: Backside Room/Panel_one_one
+        tag: midwhite
+      TWO (1):
+        id: Backside Room/Panel_two_two
+        tag: midwhite
+        required_door:
+          door: Twos
+      TWO (2):
+        id: Backside Room/Panel_two_two_2
+        tag: midwhite
+        required_door:
+          door: Twos
+      THREE (1):
+        id: Backside Room/Panel_three_three
+        tag: midwhite
+        required_door:
+          door: Threes
+      THREE (2):
+        id: Backside Room/Panel_three_three_2
+        tag: midwhite
+        required_door:
+          door: Threes
+      THREE (3):
+        id: Backside Room/Panel_three_three_3
+        tag: midwhite
+        required_door:
+          door: Threes
+      FOUR:
+        id: Backside Room/Panel_four_four
+        tag: midwhite
+        required_door:
+          door: Fours
+    doors:
+      Undeterred Entrance:
+        id: Red Blue Purple Room Area Doors/Door_pen_open
+        item_name: The Undeterred - Entrance
+        panels:
+          - PEN
+      Painting Shortcut:
+        painting_id:
+          - blueman_painting_3
+          - arrows_painting3
+        skip_location: True
+        item_name: Starting Room - Blue Painting
+        panels:
+          - PEN
+      Green Painting:
+        painting_id: maze_painting_3
+        skip_location: True
+        panels:
+          - FOUR
+      Twos:
+        id:
+          - Count Up Room Area Doors/Door_two_hider
+          - Count Up Room Area Doors/Door_two_hider_2
+        include_reduce: True
+        panels:
+          - ONE
+      Threes:
+        id:
+          - Count Up Room Area Doors/Door_three_hider
+          - Count Up Room Area Doors/Door_three_hider_2
+          - Count Up Room Area Doors/Door_three_hider_3
+        location_name: Twos
+        include_reduce: True
+        panels:
+          - TWO (1)
+          - TWO (2)
+      Number Hunt:
+        id: Count Up Room Area Doors/Door_three_unlocked
+        location_name: Threes
+        include_reduce: True
+        panels:
+          - THREE (1)
+          - THREE (2)
+          - THREE (3)
+      Fours:
+        id:
+          - Count Up Room Area Doors/Door_four_hider
+          - Count Up Room Area Doors/Door_four_hider_2
+          - Count Up Room Area Doors/Door_four_hider_3
+          - Count Up Room Area Doors/Door_four_hider_4
+        skip_location: True
+        panels:
+          - THREE (1)
+          - THREE (2)
+          - THREE (3)
+      Fives:
+        id:
+          - Count Up Room Area Doors/Door_five_hider
+          - Count Up Room Area Doors/Door_five_hider_4
+          - Count Up Room Area Doors/Door_five_hider_5
+        location_name: Fours
+        item_name: Number Hunt - Fives
+        include_reduce: True
+        panels:
+          - FOUR
+          - room: Hub Room
+            panel: FOUR
+          - room: Dead End Area
+            panel: FOUR
+          - room: The Traveled
+            panel: FOUR
+      Challenge Entrance:
+        id: Count Up Room Area Doors/Door_zero_unlocked
+        item_name: Number Hunt - Challenge Entrance
+        panels:
+          - ZERO
+    paintings:
+      - id: maze_painting_3
+        enter_only: True
+        orientation: north
+        move: True
+        required_door:
+          door: Green Painting
+      - id: blueman_painting_2
+        orientation: east
+  The Undeterred:
+    entrances:
+      Outside The Undeterred:
+        room: Outside The Undeterred
+        door: Undeterred Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_deterred_undeterred
+        colors: blue
+        tag: forbid
+        check: True
+        achievement: The Undeterred
+      BONE:
+        id: Blue Room/Panel_bone_skeleton
+        colors: blue
+        tag: botblue
+      EYE:
+        id: Blue Room/Panel_mouth_face
+        colors: blue
+        tag: double botblue
+        subtag: left
+        link: holo FACE
+      MOUTH:
+        id: Blue Room/Panel_eye_face
+        colors: blue
+        tag: double botblue
+        subtag: right
+        link: holo FACE
+      IRIS:
+        id: Blue Room/Panel_toucan_bird
+        colors: blue
+        tag: botblue
+      EYE (2):
+        id: Blue Room/Panel_two_toucan
+        colors: blue
+        tag: topblue
+      ICE:
+        id: Blue Room/Panel_ice_eyesight
+        colors: blue
+        tag: double topblue
+        subtag: left
+        link: hex EYESIGHT
+      HEIGHT:
+        id: Blue Room/Panel_height_eyesight
+        colors: blue
+        tag: double topblue
+        subtag: right
+        link: hex EYESIGHT
+      EYE (3):
+        id: Blue Room/Panel_eye_hi
+        colors: blue
+        tag: topblue
+      NOT:
+        id: Blue Room/Panel_not_notice
+        colors: blue
+        tag: midblue
+      JUST:
+        id: Blue Room/Panel_just_readjust
+        colors: blue
+        tag: double midblue
+        subtag: left
+        link: exp READJUST
+      READ:
+        id: Blue Room/Panel_read_readjust
+        colors: blue
+        tag: double midblue
+        subtag: right
+        link: exp READJUST
+      FATHER:
+        id: Blue Room/Panel_ate_primate
+        colors: blue
+        tag: midblue
+      FEATHER:
+        id: Blue Room/Panel_primate_mammal
+        colors: blue
+        tag: botblue
+      CONTINENT:
+        id: Blue Room/Panel_continent_planet
+        colors: blue
+        tag: double botblue
+        subtag: left
+        link: holo PLANET
+      OCEAN:
+        id: Blue Room/Panel_ocean_planet
+        colors: blue
+        tag: double botblue
+        subtag: right
+        link: holo PLANET
+      WALL:
+        id: Blue Room/Panel_wall_room
+        colors: blue
+        tag: botblue
+  Number Hunt:
+    # This works a little differently than in the base game. The door to the
+    # initial number in each set opens at the same time as the rest of the doors
+    # in that set.
+    entrances:
+      Outside The Undeterred:
+        room: Outside The Undeterred
+        door: Number Hunt
+      Directional Gallery:
+        door: Door to Directional Gallery
+      Challenge Room:
+        room: Outside The Undeterred
+        door: Challenge Entrance
+    panels:
+      FIVE:
+        id: Backside Room/Panel_five_five
+        tag: midwhite
+        required_door:
+          room: Outside The Undeterred
+          door: Fives
+      SIX:
+        id: Backside Room/Panel_six_six
+        tag: midwhite
+        required_door:
+          door: Sixes
+      SEVEN:
+        id: Backside Room/Panel_seven_seven
+        tag: midwhite
+        required_door:
+          door: Sevens
+      EIGHT:
+        id: Backside Room/Panel_eight_eight
+        tag: midwhite
+        required_door:
+          door: Eights
+      NINE:
+        id: Backside Room/Panel_nine_nine
+        tag: midwhite
+        required_door:
+          door: Nines
+    doors:
+      Door to Directional Gallery:
+        id: Count Up Room Area Doors/Door_five_unlocked
+        group: Directional Gallery Doors
+        skip_location: True
+        panels:
+          - FIVE
+      Sixes:
+        id:
+          - Count Up Room Area Doors/Door_six_hider
+          - Count Up Room Area Doors/Door_six_hider_2
+          - Count Up Room Area Doors/Door_six_hider_3
+          - Count Up Room Area Doors/Door_six_hider_4
+          - Count Up Room Area Doors/Door_six_hider_5
+          - Count Up Room Area Doors/Door_six_hider_6
+        painting_id: pencil_painting3 # See note in Outside The Bold
+        location_name: Fives
+        include_reduce: True
+        panels:
+          - FIVE
+          - room: Outside The Agreeable
+            panel: FIVE (1)
+          - room: Outside The Agreeable
+            panel: FIVE (2)
+          - room: Directional Gallery
+            panel: FIVE (1)
+          - room: Directional Gallery
+            panel: FIVE (2)
+      Sevens:
+        id:
+          - Count Up Room Area Doors/Door_seven_hider
+          - Count Up Room Area Doors/Door_seven_unlocked
+          - Count Up Room Area Doors/Door_seven_hider_2
+          - Count Up Room Area Doors/Door_seven_hider_3
+          - Count Up Room Area Doors/Door_seven_hider_4
+          - Count Up Room Area Doors/Door_seven_hider_5
+          - Count Up Room Area Doors/Door_seven_hider_6
+          - Count Up Room Area Doors/Door_seven_hider_7
+        location_name: Sixes
+        include_reduce: True
+        panels:
+          - SIX
+          - room: Outside The Bold
+            panel: SIX
+          - room: Directional Gallery
+            panel: SIX (1)
+          - room: Directional Gallery
+            panel: SIX (2)
+          - room: The Bearer (East)
+            panel: SIX
+          - room: The Bearer (South)
+            panel: SIX
+      Eights:
+        id:
+          - Count Up Room Area Doors/Door_eight_hider
+          - Count Up Room Area Doors/Door_eight_unlocked
+          - Count Up Room Area Doors/Door_eight_hider_2
+          - Count Up Room Area Doors/Door_eight_hider_3
+          - Count Up Room Area Doors/Door_eight_hider_4
+          - Count Up Room Area Doors/Door_eight_hider_5
+          - Count Up Room Area Doors/Door_eight_hider_6
+          - Count Up Room Area Doors/Door_eight_hider_7
+          - Count Up Room Area Doors/Door_eight_hider_8
+        location_name: Sevens
+        include_reduce: True
+        panels:
+          - SEVEN
+          - room: Directional Gallery
+            panel: SEVEN
+          - room: Knight Night Exit
+            panel: SEVEN (1)
+          - room: Knight Night Exit
+            panel: SEVEN (2)
+          - room: Knight Night Exit
+            panel: SEVEN (3)
+          - room: Outside The Initiated
+            panel: SEVEN (1)
+          - room: Outside The Initiated
+            panel: SEVEN (2)
+      Nines:
+        id:
+          - Count Up Room Area Doors/Door_nine_hider
+          - Count Up Room Area Doors/Door_nine_hider_2
+          - Count Up Room Area Doors/Door_nine_hider_3
+          - Count Up Room Area Doors/Door_nine_hider_4
+          - Count Up Room Area Doors/Door_nine_hider_5
+          - Count Up Room Area Doors/Door_nine_hider_6
+          - Count Up Room Area Doors/Door_nine_hider_7
+          - Count Up Room Area Doors/Door_nine_hider_8
+          - Count Up Room Area Doors/Door_nine_hider_9
+        location_name: Eights
+        include_reduce: True
+        panels:
+          - EIGHT
+          - room: Directional Gallery
+            panel: EIGHT
+          - room: The Eyes They See
+            panel: EIGHT
+          - room: Dead End Area
+            panel: EIGHT
+          - room: Crossroads
+            panel: EIGHT
+          - room: Hot Crusts Area
+            panel: EIGHT
+          - room: Art Gallery
+            panel: EIGHT
+          - room: Outside The Initiated
+            panel: EIGHT
+      Zero Door:
+        # The black wall isn't a door, so we can't ever hide it.
+        id: Count Up Room Area Doors/Door_zero_hider_2
+        location_name: Nines
+        item_name: Outside The Undeterred - Zero Door
+        include_reduce: True
+        panels:
+          - NINE
+          - room: Directional Gallery
+            panel: NINE
+          - room: Amen Name Area
+            panel: NINE
+          - room: Yellow Backside Area
+            panel: NINE
+          - room: Outside The Initiated
+            panel: NINE
+          - room: Outside The Bold
+            panel: NINE
+          - room: Rhyme Room (Cross)
+            panel: NINE
+          - room: Orange Tower Fifth Floor
+            panel: NINE
+          - room: Elements Area
+            panel: NINE
+    paintings:
+      - id: smile_painting_5
+        enter_only: True
+        orientation: east
+        required_door:
+          door: Eights
+  Directional Gallery:
+    entrances:
+      Outside The Agreeable: True # sunwarp
+      Orange Tower First Floor:
+        room: Orange Tower First Floor
+        door: Salt Pepper Door
+      Outside The Undeterred:
+        door: Shortcut to The Undeterred
+      Number Hunt:
+        room: Number Hunt
+        door: Door to Directional Gallery
+    panels:
+      PEPPER:
+        id: Backside Room/Panel_pepper_salt
+        colors: black
+        tag: botblack
+      TURN:
+        id: Backside Room/Panel_turn_return
+        colors: blue
+        tag: midblue
+      LEARN:
+        id: Backside Room/Panel_learn_return
+        colors: purple
+        tag: midpurp
+      FIVE (1):
+        id: Backside Room/Panel_five_five_3
+        tag: midwhite
+        hunt: True
+        required_panel:
+          panel: LIGHT
+      FIVE (2):
+        id: Backside Room/Panel_five_five_2
+        tag: midwhite
+        hunt: True
+        required_panel:
+          panel: WARD
+      SIX (1):
+        id: Backside Room/Panel_six_six_3
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      SIX (2):
+        id: Backside Room/Panel_six_six_2
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      SEVEN:
+        id: Backside Room/Panel_seven_seven_2
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sevens
+      EIGHT:
+        id: Backside Room/Panel_eight_eight_2
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Eights
+      NINE:
+        id: Backside Room/Panel_nine_nine_6
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+      BACKSIDE:
+        id: Backside Room/Panel_backside_4
+        tag: midwhite
+        hunt: True
+      "834283054":
+        id: Tower Room/Panel_834283054_undaunted
+        colors: orange
+        check: True
+        exclude_reduce: True
+        tag: midorange
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      PARANOID:
+        id: Backside Room/Panel_paranoid_paranoid
+        tag: midwhite
+        check: True
+        exclude_reduce: True
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      YELLOW:
+        id: Color Arrow Room/Panel_yellow_afar
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Yellow Barrier
+      WADED + WEE:
+        id: Tower Room/Panel_waded_wee_warts_7
+        colors: orange
+        check: True
+        exclude_reduce: True
+        tag: midorange
+      THE EYES:
+        id: Shuffle Room/Panel_theeyes_theeyes
+        tag: midwhite
+      LEFT:
+        id: Shuffle Room/Panel_left_left
+        tag: midwhite
+      RIGHT:
+        id: Shuffle Room/Panel_right_right
+        tag: midwhite
+      MIDDLE:
+        id: Shuffle Room/Panel_middle_middle
+        tag: midwhite
+      WARD:
+        id: Backside Room/Panel_ward_forward
+        colors: blue
+        tag: midblue
+      HIND:
+        id: Backside Room/Panel_hind_behind
+        colors: blue
+        tag: midblue
+      RIG:
+        id: Backside Room/Panel_rig_right
+        colors: blue
+        tag: midblue
+      WINDWARD:
+        id: Backside Room/Panel_windward_forward
+        colors: purple
+        tag: midpurp
+      LIGHT:
+        id: Backside Room/Panel_light_right
+        colors: purple
+        tag: midpurp
+      REWIND:
+        id: Backside Room/Panel_rewind_behind
+        colors: purple
+        tag: midpurp
+    doors:
+      Shortcut to The Undeterred:
+        id: Count Up Room Area Doors/Door_return_double
+        group: Directional Gallery Doors
+        panels:
+          - TURN
+          - LEARN
+      Yellow Barrier:
+        id: Color Arrow Room Doors/Door_yellow_4
+        group: Color Hunt Barriers
+        skip_location: True
+        panels:
+          - room: Champion's Rest
+            panel: YELLOW
+    paintings:
+      - id: smile_painting_7
+        orientation: south
+      - id: flower_painting_4
+        orientation: south
+      - id: pencil_painting3
+        enter_only: True
+        orientation: east
+        move: True
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      - id: boxes_painting
+        orientation: south
+      - id: cherry_painting
+        orientation: east
+  Champion's Rest:
+    entrances:
+      Outside The Bold:
+        door: Shortcut to The Steady
+      Orange Tower Fourth Floor: True # sunwarp
+      Roof: True # through ceiling of sunwarp
+    panels:
+      EXIT:
+        id: Rock Room/Panel_red_red
+        tag: midwhite
+      HUES:
+        id: Color Arrow Room/Panel_hues_colors
+        tag: botwhite
+      RED:
+        id: Color Arrow Room/Panel_red_near
+        check: True
+        tag: midwhite
+      BLUE:
+        id: Color Arrow Room/Panel_blue_near
+        check: True
+        tag: midwhite
+      YELLOW:
+        id: Color Arrow Room/Panel_yellow_near
+        check: True
+        tag: midwhite
+      GREEN:
+        id: Color Arrow Room/Panel_green_near
+        check: True
+        tag: midwhite
+        required_door:
+          room: Outside The Initiated
+          door: Green Barrier
+      PURPLE:
+        id: Color Arrow Room/Panel_purple_near
+        check: True
+        tag: midwhite
+        required_door:
+          room: Outside The Initiated
+          door: Purple Barrier
+      ORANGE:
+        id: Color Arrow Room/Panel_orange_near
+        check: True
+        tag: midwhite
+        required_door:
+          room: Orange Tower Third Floor
+          door: Orange Barrier
+      YOU:
+        id: Color Arrow Room/Panel_you
+        required_door:
+          room: Outside The Initiated
+          door: Entrance
+        check: True
+        colors: gray
+        tag: forbid
+      ME:
+        id: Color Arrow Room/Panel_me
+        colors: gray
+        tag: forbid
+        required_door:
+          room: Outside The Initiated
+          door: Entrance
+      SECRET BLUE:
+        # Pretend this and the other two are white, because they are snipes.
+        # TODO: Extract them and randomize them?
+        id: Color Arrow Room/Panel_secret_blue
+        tag: forbid
+        required_door:
+          room: Outside The Initiated
+          door: Entrance
+      SECRET YELLOW:
+        id: Color Arrow Room/Panel_secret_yellow
+        tag: forbid
+        required_door:
+          room: Outside The Initiated
+          door: Entrance
+      SECRET RED:
+        id: Color Arrow Room/Panel_secret_red
+        tag: forbid
+        required_door:
+          room: Outside The Initiated
+          door: Entrance
+    doors:
+      Shortcut to The Steady:
+        id: Rock Room Doors/Door_hint
+        panels:
+          - EXIT
+    paintings:
+      - id: arrows_painting_7
+        orientation: east
+      - id: fruitbowl_painting3
+        orientation: west
+        enter_only: True
+        required_door:
+          room: Outside The Initiated
+          door: Entrance
+      - id: colors_painting
+        orientation: south
+        enter_only: True
+        required_door:
+          room: Outside The Initiated
+          door: Entrance
+  The Bearer:
+    entrances:
+      Outside The Bold:
+        door: Shortcut to The Bold
+      Orange Tower Fifth Floor:
+        room: Art Gallery
+        door: Exit
+      The Bearer (East): True
+      The Bearer (North): True
+      The Bearer (South): True
+      The Bearer (West): True
+      Roof: True
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_bearer_bearer
+        check: True
+        tag: forbid
+        required_panel:
+          - panel: PART
+          - panel: HEART
+          - room: Cross Tower (East)
+            panel: WINTER
+          - room: The Bearer (East)
+            panel: PEACE
+          - room: Cross Tower (North)
+            panel: NORTH
+          - room: The Bearer (North)
+            panel: SILENT (1)
+          - room: The Bearer (North)
+            panel: SILENT (2)
+          - room: The Bearer (North)
+            panel: SPACE
+          - room: The Bearer (North)
+            panel: WARTS
+          - room: Cross Tower (South)
+            panel: FIRE
+          - room: The Bearer (South)
+            panel: TENT
+          - room: The Bearer (South)
+            panel: BOWL
+          - room: Cross Tower (West)
+            panel: DIAMONDS
+          - room: The Bearer (West)
+            panel: SNOW
+          - room: The Bearer (West)
+            panel: SMILE
+          - room: Bearer Side Area
+            panel: SHORTCUT
+          - room: Bearer Side Area
+            panel: POTS
+        achievement: The Bearer
+      MIDDLE:
+        id: Shuffle Room/Panel_middle_middle_2
+        tag: midwhite
+      FARTHER:
+        id: Backside Room/Panel_farther_far
+        colors: red
+        tag: midred
+      BACKSIDE:
+        id: Backside Room/Panel_backside_5
+        tag: midwhite
+        hunt: True
+        required_door:
+          door: Backside Door
+      PART:
+        id: Cross Room/Panel_part_rap
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+        required_panel:
+          room: The Bearer (East)
+          panel: PEACE
+      HEART:
+        id: Cross Room/Panel_heart_tar
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+    doors:
+      Shortcut to The Bold:
+        id: Red Blue Purple Room Area Doors/Door_middle_middle
+        panels:
+          - MIDDLE
+      Backside Door:
+        id: Red Blue Purple Room Area Doors/Door_locked_knocked2 # yeah...
+        group: Backside Doors
+        panels:
+          - FARTHER
+      East Entrance:
+        event: True
+        panels:
+          - HEART
+  The Bearer (East):
+    entrances:
+      Cross Tower (East): True
+      Bearer Side Area:
+        door: Side Area Access
+      Roof: True
+    panels:
+      SIX:
+        id: Backside Room/Panel_six_six_5
+        tag: midwhite
+        colors:
+          - red
+          - yellow
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      PEACE:
+        id: Cross Room/Panel_peace_ape
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+    doors:
+      North Entrance:
+        event: True
+        panels:
+          - room: The Bearer
+            panel: PART
+      Side Area Access:
+        event: True
+        panels:
+          - room: The Bearer (North)
+            panel: SPACE
+  The Bearer (North):
+    entrances:
+      Cross Tower (East): True
+      Roof: True
+    panels:
+      SILENT (1):
+        id: Cross Room/Panel_silent_list
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+        required_panel:
+          room: The Bearer (West)
+          panel: SMILE
+      SILENT (2):
+        id: Cross Room/Panel_silent_list_2
+        colors:
+          - red
+          - yellow
+        tag: mid yellow red
+        required_panel:
+          room: The Bearer (West)
+          panel: SMILE
+      SPACE:
+        id: Cross Room/Panel_space_cape
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+      WARTS:
+        id: Cross Room/Panel_warts_star
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+        required_panel:
+          room: The Bearer (West)
+          panel: SNOW
+    doors:
+      South Entrance:
+        event: True
+        panels:
+          - room: Bearer Side Area
+            panel: POTS
+  The Bearer (South):
+    entrances:
+      Cross Tower (North): True
+      Bearer Side Area:
+        door: Side Area Shortcut
+      Roof: True
+    panels:
+      SIX:
+        id: Backside Room/Panel_six_six_6
+        tag: midwhite
+        colors:
+          - red
+          - yellow
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Sixes
+      TENT:
+        id: Cross Room/Panel_tent_net
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+      BOWL:
+        id: Cross Room/Panel_bowl_low
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+        required_panel:
+          panel: TENT
+    doors:
+      Side Area Shortcut:
+        event: True
+        panels:
+          - room: The Bearer (North)
+            panel: SILENT (1)
+  The Bearer (West):
+    entrances:
+      Cross Tower (West): True
+      Bearer Side Area:
+        door: Side Area Shortcut
+      Roof: True
+    panels:
+      SNOW:
+        id: Cross Room/Panel_smile_lime
+        colors:
+          - red
+          - yellow
+        tag: mid yellow red
+      SMILE:
+        id: Cross Room/Panel_snow_won
+        colors:
+          - red
+          - yellow
+        tag: mid red yellow
+        required_panel:
+          room: The Bearer (North)
+          panel: WARTS
+    doors:
+      Side Area Shortcut:
+        event: True
+        panels:
+          - room: Cross Tower (East)
+            panel: WINTER
+          - room: Cross Tower (North)
+            panel: NORTH
+          - room: Cross Tower (South)
+            panel: FIRE
+          - room: Cross Tower (West)
+            panel: DIAMONDS
+  Bearer Side Area:
+    entrances:
+      The Bearer (East):
+        room: The Bearer (East)
+        door: Side Area Access
+      The Bearer (South):
+        room: The Bearer (South)
+        door: Side Area Shortcut
+      The Bearer (West):
+        room: The Bearer (West)
+        door: Side Area Shortcut
+      Orange Tower Third Floor:
+        door: Shortcut to Tower
+      Roof: True
+    panels:
+      SHORTCUT:
+        id: Cross Room/Panel_shortcut_shortcut
+        tag: midwhite
+      POTS:
+        id: Cross Room/Panel_pots_top
+        colors:
+          - red
+          - yellow
+        tag: mid yellow red
+    doors:
+      Shortcut to Tower:
+        id: Cross Room Doors/Door_shortcut
+        item_name: The Bearer - Shortcut to Tower
+        location_name: The Bearer - SHORTCUT
+        panels:
+          - SHORTCUT
+      West Entrance:
+        event: True
+        panels:
+          - room: The Bearer (South)
+            panel: BOWL
+  Cross Tower (East):
+    entrances:
+      The Bearer:
+        room: The Bearer
+        door: East Entrance
+      Roof: True
+    panels:
+      WINTER:
+        id: Cross Room/Panel_winter_winter
+        colors: blue
+        tag: forbid
+        required_panel:
+          room: The Bearer (North)
+          panel: SPACE
+        required_room: Orange Tower Fifth Floor
+  Cross Tower (North):
+    entrances:
+      The Bearer (East):
+        room: The Bearer (East)
+        door: North Entrance
+      Roof: True
+    panels:
+      NORTH:
+        id: Cross Room/Panel_north_north
+        colors: blue
+        tag: forbid
+        required_panel:
+          room: The Bearer (West)
+          panel: SMILE
+        required_room: Outside The Bold
+  Cross Tower (South):
+    entrances: # No roof access
+      The Bearer (North):
+        room: The Bearer (North)
+        door: South Entrance
+    panels:
+      FIRE:
+        id: Cross Room/Panel_fire_fire
+        colors: blue
+        tag: forbid
+        required_panel:
+          room: The Bearer (North)
+          panel: SILENT (1)
+        required_room: Elements Area
+  Cross Tower (West):
+    entrances:
+      Bearer Side Area:
+        room: Bearer Side Area
+        door: West Entrance
+      Roof: True
+    panels:
+      DIAMONDS:
+        id: Cross Room/Panel_diamonds_diamonds
+        colors: blue
+        tag: forbid
+        required_panel:
+          room: The Bearer (North)
+          panel: WARTS
+        required_room: Suits Area
+  The Steady (Rose):
+    entrances:
+      Outside The Bold:
+        room: Outside The Bold
+        door: Steady Entrance
+      The Steady (Lilac):
+        room: The Steady
+        door: Reveal
+      The Steady (Ruby):
+        door: Forward Exit
+      The Steady (Carnation):
+        door: Right Exit
+    panels:
+      SOAR:
+        id: Rock Room/Panel_soar_rose
+        colors: black
+        tag: topblack
+    doors:
+      Forward Exit:
+        event: True
+        panels:
+          - SOAR
+      Right Exit:
+        event: True
+        panels:
+          - room: The Steady (Lilac)
+            panel: LIE LACK
+  The Steady (Ruby):
+    entrances:
+      The Steady (Rose):
+        room: The Steady (Rose)
+        door: Forward Exit
+      The Steady (Amethyst):
+        room: The Steady
+        door: Reveal
+      The Steady (Cherry):
+        door: Forward Exit
+      The Steady (Amber):
+        door: Right Exit
+    panels:
+      BURY:
+        id: Rock Room/Panel_bury_ruby
+        colors: yellow
+        tag: midyellow
+    doors:
+      Forward Exit:
+        event: True
+        panels:
+          - room: The Steady (Lime)
+            panel: LIMELIGHT
+      Right Exit:
+        event: True
+        panels:
+          - room: The Steady (Carnation)
+            panel: INCARNATION
+  The Steady (Carnation):
+    entrances:
+      The Steady (Rose):
+        room: The Steady (Rose)
+        door: Right Exit
+      Outside The Bold:
+        room: The Steady
+        door: Reveal
+      The Steady (Amber):
+        room: The Steady
+        door: Reveal
+      The Steady (Sunflower):
+        door: Right Exit
+    panels:
+      INCARNATION:
+        id: Rock Room/Panel_incarnation_carnation
+        colors: red
+        tag: midred
+    doors:
+      Right Exit:
+        event: True
+        panels:
+          - room: The Steady (Amethyst)
+            panel: PACIFIST
+  The Steady (Sunflower):
+    entrances:
+      The Steady (Carnation):
+        room: The Steady (Carnation)
+        door: Right Exit
+      The Steady (Topaz):
+        room: The Steady (Topaz)
+        door: Back Exit
+    panels:
+      SUN:
+        id: Rock Room/Panel_sun_sunflower
+        colors: blue
+        tag: midblue
+    doors:
+      Back Exit:
+        event: True
+        panels:
+          - SUN
+  The Steady (Plum):
+    entrances:
+      The Steady (Amethyst):
+        room: The Steady
+        door: Reveal
+      The Steady (Blueberry):
+        room: The Steady
+        door: Reveal
+      The Steady (Cherry):
+        room: The Steady (Cherry)
+        door: Left Exit
+    panels:
+      LUMP:
+        id: Rock Room/Panel_lump_plum
+        colors: yellow
+        tag: midyellow
+  The Steady (Lime):
+    entrances:
+      The Steady (Sunflower): True
+      The Steady (Emerald):
+        room: The Steady
+        door: Reveal
+      The Steady (Blueberry):
+        door: Right Exit
+    panels:
+      LIMELIGHT:
+        id: Rock Room/Panel_limelight_lime
+        colors: red
+        tag: midred
+    doors:
+      Right Exit:
+        event: True
+        panels:
+          - room: The Steady (Amber)
+            panel: ANTECHAMBER
+    paintings:
+      - id: pencil_painting5
+        orientation: south
+  The Steady (Lemon):
+    entrances:
+      The Steady (Emerald): True
+      The Steady (Orange):
+        room: The Steady
+        door: Reveal
+      The Steady (Topaz):
+        door: Back Exit
+    panels:
+      MELON:
+        id: Rock Room/Panel_melon_lemon
+        colors: yellow
+        tag: midyellow
+    doors:
+      Back Exit:
+        event: True
+        panels:
+          - MELON
+    paintings:
+      - id: pencil_painting4
+        orientation: south
+  The Steady (Topaz):
+    entrances:
+      The Steady (Lemon):
+        room: The Steady (Lemon)
+        door: Back Exit
+      The Steady (Amber):
+        room: The Steady
+        door: Reveal
+      The Steady (Sunflower):
+        door: Back Exit
+    panels:
+      TOP:
+        id: Rock Room/Panel_top_topaz
+        colors: blue
+        tag: midblue
+      MASTERY:
+        id: Master Room/Panel_mastery_mastery2
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+    doors:
+      Back Exit:
+        event: True
+        panels:
+          - TOP
+  The Steady (Orange):
+    entrances:
+      The Steady (Cherry):
+        room: The Steady
+        door: Reveal
+      The Steady (Lemon):
+        room: The Steady
+        door: Reveal
+      The Steady (Amber):
+        room: The Steady (Amber)
+        door: Forward Exit
+    panels:
+      BLUE:
+        id: Rock Room/Panel_blue_orange
+        colors: black
+        tag: botblack
+  The Steady (Sapphire):
+    entrances:
+      The Steady (Emerald):
+        door: Left Exit
+      The Steady (Blueberry):
+        room: The Steady
+        door: Reveal
+      The Steady (Amethyst):
+        room: The Steady (Amethyst)
+        door: Left Exit
+    panels:
+      SAP:
+        id: Rock Room/Panel_sap_sapphire
+        colors: blue
+        tag: midblue
+    doors:
+      Left Exit:
+        event: True
+        panels:
+          - room: The Steady (Plum)
+            panel: LUMP
+          - room: The Steady (Orange)
+            panel: BLUE
+  The Steady (Blueberry):
+    entrances:
+      The Steady (Lime):
+        room: The Steady (Lime)
+        door: Right Exit
+      The Steady (Sapphire):
+        room: The Steady
+        door: Reveal
+      The Steady (Plum):
+        room: The Steady
+        door: Reveal
+    panels:
+      BLUE:
+        id: Rock Room/Panel_blue_blueberry
+        colors: blue
+        tag: midblue
+  The Steady (Amber):
+    entrances:
+      The Steady (Ruby):
+        room: The Steady (Ruby)
+        door: Right Exit
+      The Steady (Carnation):
+        room: The Steady
+        door: Reveal
+      The Steady (Orange):
+        door: Forward Exit
+      The Steady (Topaz):
+        room: The Steady
+        door: Reveal
+    panels:
+      ANTECHAMBER:
+        id: Rock Room/Panel_antechamber_amber
+        colors: red
+        tag: midred
+    doors:
+      Forward Exit:
+        event: True
+        panels:
+          - room: The Steady (Blueberry)
+            panel: BLUE
+  The Steady (Emerald):
+    entrances:
+      The Steady (Sapphire):
+        room: The Steady (Sapphire)
+        door: Left Exit
+      The Steady (Lime):
+        room: The Steady
+        door: Reveal
+    panels:
+      HERALD:
+        id: Rock Room/Panel_herald_emerald
+        colors: purple
+        tag: midpurp
+  The Steady (Amethyst):
+    entrances:
+      The Steady (Lilac):
+        room: The Steady (Lilac)
+        door: Forward Exit
+      The Steady (Sapphire):
+        door: Left Exit
+      The Steady (Plum):
+        room: The Steady
+        door: Reveal
+      The Steady (Ruby):
+        room: The Steady
+        door: Reveal
+    panels:
+      PACIFIST:
+        id: Rock Room/Panel_thistle_amethyst
+        colors: purple
+        tag: toppurp
+    doors:
+      Left Exit:
+        event: True
+        panels:
+          - room: The Steady (Sunflower)
+            panel: SUN
+  The Steady (Lilac):
+    entrances:
+      Outside The Bold:
+        room: Outside The Bold
+        door: Lilac Entrance
+      The Steady (Amethyst):
+        door: Forward Exit
+      The Steady (Rose):
+        room: The Steady
+        door: Reveal
+    panels:
+      LIE LACK:
+        id: Rock Room/Panel_lielack_lilac
+        tag: topwhite
+    doors:
+      Forward Exit:
+        event: True
+        panels:
+          - room: The Steady (Ruby)
+            panel: BURY
+  The Steady (Cherry):
+    entrances:
+      The Steady (Plum):
+        door: Left Exit
+      The Steady (Orange):
+        room: The Steady
+        door: Reveal
+      The Steady (Ruby):
+        room: The Steady (Ruby)
+        door: Forward Exit
+    panels:
+      HAIRY:
+        id: Rock Room/Panel_hairy_cherry
+        colors: blue
+        tag: topblue
+    doors:
+      Left Exit:
+        event: True
+        panels:
+          - room: The Steady (Sapphire)
+            panel: SAP
+  The Steady:
+    entrances:
+      The Steady (Sunflower):
+        room: The Steady (Sunflower)
+        door: Back Exit
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_steady_steady
+        required_panel:
+          - room: The Steady (Rose)
+            panel: SOAR
+          - room: The Steady (Carnation)
+            panel: INCARNATION
+          - room: The Steady (Sunflower)
+            panel: SUN
+          - room: The Steady (Ruby)
+            panel: BURY
+          - room: The Steady (Plum)
+            panel: LUMP
+          - room: The Steady (Lime)
+            panel: LIMELIGHT
+          - room: The Steady (Lemon)
+            panel: MELON
+          - room: The Steady (Topaz)
+            panel: TOP
+          - room: The Steady (Orange)
+            panel: BLUE
+          - room: The Steady (Sapphire)
+            panel: SAP
+          - room: The Steady (Blueberry)
+            panel: BLUE
+          - room: The Steady (Amber)
+            panel: ANTECHAMBER
+          - room: The Steady (Emerald)
+            panel: HERALD
+          - room: The Steady (Amethyst)
+            panel: PACIFIST
+          - room: The Steady (Lilac)
+            panel: LIE LACK
+          - room: The Steady (Cherry)
+            panel: HAIRY
+        tag: forbid
+        check: True
+        achievement: The Steady
+    doors:
+      Reveal:
+        event: True
+        panels:
+          - Achievement
+  Knight Night (Outer Ring):
+    entrances:
+      Hidden Room:
+        room: Hidden Room
+        door: Knight Night Entrance
+      Knight Night Exit: True
+    panels:
+      NIGHT:
+        id: Appendix Room/Panel_night_knight
+        colors: blue
+        tag: homophone midblue
+        copy_to_sign: sign7
+      KNIGHT:
+        id: Appendix Room/Panel_knight_night
+        colors: red
+        tag: homophone midred
+        copy_to_sign: sign8
+      BEE:
+        id: Appendix Room/Panel_bee_be
+        colors: red
+        tag: homophone midred
+        copy_to_sign: sign9
+      NEW:
+        id: Appendix Room/Panel_new_knew
+        colors: blue
+        tag: homophone midblue
+        copy_to_sign: sign11
+      FORE:
+        id: Appendix Room/Panel_fore_for
+        colors: red
+        tag: homophone midred
+        copy_to_sign: sign10
+      TRUSTED (1):
+        id: Appendix Room/Panel_trusted_trust
+        colors: red
+        tag: midred
+        required_panel:
+          room: Knight Night (Right Lower Segment)
+          panel: BEFORE
+      TRUSTED (2):
+        id: Appendix Room/Panel_trusted_rusted
+        colors: red
+        tag: midred
+        required_panel:
+          room: Knight Night (Right Lower Segment)
+          panel: BEFORE
+      ENCRUSTED:
+        id: Appendix Room/Panel_encrusted_rust
+        colors: red
+        tag: midred
+        required_panel:
+          - panel: TRUSTED (1)
+          - panel: TRUSTED (2)
+      ADJUST (1):
+        id: Appendix Room/Panel_adjust_readjust
+        colors: blue
+        tag: midblue and phone
+        required_panel:
+          room: Knight Night (Right Lower Segment)
+          panel: BE
+      ADJUST (2):
+        id: Appendix Room/Panel_adjust_adjusted
+        colors: blue
+        tag: midblue and phone
+        required_panel:
+          room: Knight Night (Right Lower Segment)
+          panel: BE
+      RIGHT:
+        id: Appendix Room/Panel_right_right
+        tag: midwhite
+        required_panel:
+          room: Knight Night (Right Lower Segment)
+          panel: ADJUST
+      TRUST:
+        id: Appendix Room/Panel_trust_crust
+        colors:
+          - red
+          - blue
+        tag: mid red blue
+        required_panel:
+          - room: Knight Night (Right Lower Segment)
+            panel: ADJUST
+          - room: Knight Night (Right Lower Segment)
+            panel: LEFT
+    doors:
+      Fore Door:
+        event: True
+        panels:
+          - FORE
+      New Door:
+        event: True
+        panels:
+          - NEW
+      To End:
+        event: True
+        panels:
+          - RIGHT
+          - room: Knight Night (Right Lower Segment)
+            panel: LEFT
+  Knight Night (Right Upper Segment):
+    entrances:
+      Knight Night Exit: True
+      Knight Night (Outer Ring):
+        room: Knight Night (Outer Ring)
+        door: Fore Door
+      Knight Night (Right Lower Segment):
+        door: Segment Door
+    panels:
+      RUST (1):
+        id: Appendix Room/Panel_rust_trust
+        colors: blue
+        tag: midblue
+        required_panel:
+          room: Knight Night (Outer Ring)
+          panel: BEE
+      RUST (2):
+        id: Appendix Room/Panel_rust_crust
+        colors: blue
+        tag: midblue
+        required_panel:
+          room: Knight Night (Outer Ring)
+          panel: BEE
+    doors:
+      Segment Door:
+        event: True
+        panels:
+          - RUST (2)
+          - room: Knight Night (Right Lower Segment)
+            panel: BEFORE
+  Knight Night (Right Lower Segment):
+    entrances:
+      Knight Night Exit: True
+      Knight Night (Right Upper Segment):
+        room: Knight Night (Right Upper Segment)
+        door: Segment Door
+      Knight Night (Outer Ring):
+        room: Knight Night (Outer Ring)
+        door: New Door
+    panels:
+      ADJUST:
+        id: Appendix Room/Panel_adjust_readjusted
+        colors: blue
+        tag: midblue
+        required_panel:
+          - room: Knight Night (Outer Ring)
+            panel: ADJUST (1)
+          - room: Knight Night (Outer Ring)
+            panel: ADJUST (2)
+      BEFORE:
+        id: Appendix Room/Panel_before_fore
+        colors: red
+        tag: midred and phone
+        required_panel:
+          room: Knight Night (Right Upper Segment)
+          panel: RUST (1)
+      BE:
+        id: Appendix Room/Panel_be_before
+        colors: blue
+        tag: midblue and phone
+        required_panel:
+          room: Knight Night (Right Upper Segment)
+          panel: RUST (1)
+      LEFT:
+        id: Appendix Room/Panel_left_left
+        tag: midwhite
+        required_panel:
+          room: Knight Night (Outer Ring)
+          panel: ENCRUSTED
+      TRUST:
+        id: Appendix Room/Panel_trust_crust_2
+        colors: purple
+        tag: midpurp
+        required_panel:
+          - room: Knight Night (Outer Ring)
+            panel: ENCRUSTED
+          - room: Knight Night (Outer Ring)
+            panel: RIGHT
+  Knight Night (Final):
+    entrances:
+      Knight Night Exit: True
+      Knight Night (Outer Ring):
+        room: Knight Night (Outer Ring)
+        door: To End
+      Knight Night (Right Upper Segment):
+        room: Knight Night (Outer Ring)
+        door: To End
+    panels:
+      TRUSTED:
+        id: Appendix Room/Panel_trusted_readjusted
+        colors: purple
+        tag: midpurp
+    doors:
+      Exit:
+        id:
+          - Appendix Room Area Doors/Door_trusted_readjusted
+          - Appendix Room Area Doors/Door_trusted_readjusted2
+          - Appendix Room Area Doors/Door_trusted_readjusted3
+          - Appendix Room Area Doors/Door_trusted_readjusted4
+          - Appendix Room Area Doors/Door_trusted_readjusted5
+          - Appendix Room Area Doors/Door_trusted_readjusted6
+          - Appendix Room Area Doors/Door_trusted_readjusted7
+          - Appendix Room Area Doors/Door_trusted_readjusted8
+          - Appendix Room Area Doors/Door_trusted_readjusted9
+          - Appendix Room Area Doors/Door_trusted_readjusted10
+          - Appendix Room Area Doors/Door_trusted_readjusted11
+          - Appendix Room Area Doors/Door_trusted_readjusted12
+          - Appendix Room Area Doors/Door_trusted_readjusted13
+        include_reduce: True
+        location_name: Knight Night Room - TRUSTED
+        item_name: Knight Night Room - Exit
+        panels:
+          - TRUSTED
+  Knight Night Exit:
+    entrances:
+      Knight Night (Outer Ring):
+        room: Knight Night (Final)
+        door: Exit
+      Orange Tower Third Floor:
+        room: Knight Night (Final)
+        door: Exit
+      Outside The Initiated:
+        room: Knight Night (Final)
+        door: Exit
+    panels:
+      SEVEN (1):
+        id: Backside Room/Panel_seven_seven_7
+        tag: midwhite
+        hunt: True
+        required_door:
+          - room: Number Hunt
+            door: Sevens
+      SEVEN (2):
+        id: Backside Room/Panel_seven_seven_3
+        tag: midwhite
+        hunt: True
+        required_door:
+          - room: Number Hunt
+            door: Sevens
+      SEVEN (3):
+        id: Backside Room/Panel_seven_seven_4
+        tag: midwhite
+        hunt: True
+        required_door:
+          - room: Number Hunt
+            door: Sevens
+      DEAD END:
+        id: Appendix Room/Panel_deadend_deadend
+        tag: midwhite
+      WARNER:
+        id: Appendix Room/Panel_warner_corner
+        colors: purple
+        tag: toppurp
+  The Artistic (Smiley):
+    entrances:
+      Dead End Area:
+        painting: True
+      Crossroads:
+        painting: True
+      Hot Crusts Area:
+        painting: True
+      Outside The Initiated:
+        painting: True
+      Directional Gallery:
+        painting: True
+      Number Hunt:
+        room: Number Hunt
+        door: Eights
+        painting: True
+      Art Gallery:
+        painting: True
+      The Eyes They See:
+        painting: True
+      The Artistic (Panda):
+        door: Door to Panda
+      The Artistic (Apple):
+        room: The Artistic (Apple)
+        door: Door to Smiley
+      Elements Area:
+        room: Hallway Room (4)
+        door: Exit
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_artistic_artistic
+        colors:
+          - red
+          - black
+          - yellow
+          - blue
+        tag: forbid
+        required_room:
+          - The Artistic (Panda)
+          - The Artistic (Apple)
+          - The Artistic (Lattice)
+        check: True
+        achievement: The Artistic
+      FINE:
+        id: Ceiling Room/Panel_yellow_top_5
+        colors:
+          - yellow
+          - blue
+        tag: yellow top blue bot
+        subtag: top
+        link: yxu KNIFE
+      BLADE:
+        id: Ceiling Room/Panel_blue_bot_5
+        colors:
+          - blue
+          - yellow
+        tag: yellow top blue bot
+        subtag: bot
+        link: yxu KNIFE
+      RED:
+        id: Ceiling Room/Panel_blue_top_6
+        colors:
+          - blue
+          - yellow
+        tag: blue top yellow mid
+        subtag: top
+        link: uyx BREAD
+      BEARD:
+        id: Ceiling Room/Panel_yellow_mid_6
+        colors:
+          - yellow
+          - blue
+        tag: blue top yellow mid
+        subtag: mid
+        link: uyx BREAD
+      ICE:
+        id: Ceiling Room/Panel_blue_mid_7
+        colors:
+          - blue
+          - yellow
+        tag: blue mid yellow bot
+        subtag: mid
+        link: xuy SPICE
+      ROOT:
+        id: Ceiling Room/Panel_yellow_bot_7
+        colors:
+          - yellow
+          - blue
+        tag: blue mid yellow bot
+        subtag: bot
+        link: xuy SPICE
+    doors:
+      Door to Panda:
+        id:
+          - Ceiling Room Doors/Door_blue
+          - Ceiling Room Doors/Door_blue2
+        location_name: The Artistic - Smiley and Panda
+        group: Artistic Doors
+        panels:
+          - FINE
+          - BLADE
+          - RED
+          - BEARD
+          - ICE
+          - ROOT
+          - room: The Artistic (Panda)
+            panel: EYE (Top)
+          - room: The Artistic (Panda)
+            panel: EYE (Bottom)
+          - room: The Artistic (Panda)
+            panel: LADYLIKE
+          - room: The Artistic (Panda)
+            panel: WATER
+          - room: The Artistic (Panda)
+            panel: OURS
+          - room: The Artistic (Panda)
+            panel: DAYS
+          - room: The Artistic (Panda)
+            panel: NIGHTTIME
+          - room: The Artistic (Panda)
+            panel: NIGHT
+    paintings:
+      - id: smile_painting_9
+        orientation: north
+        exit_only: True
+  The Artistic (Panda):
+    entrances:
+      Orange Tower Sixth Floor:
+        painting: True
+      Outside The Agreeable:
+        painting: True
+      The Artistic (Smiley):
+        room: The Artistic (Smiley)
+        door: Door to Panda
+      The Artistic (Lattice):
+        door: Door to Lattice
+    panels:
+      EYE (Top):
+        id: Ceiling Room/Panel_blue_top_1
+        colors:
+          - blue
+          - red
+        tag: blue top red bot
+        subtag: top
+        link: uxr IRIS
+      EYE (Bottom):
+        id: Ceiling Room/Panel_red_bot_1
+        colors:
+          - red
+          - blue
+        tag: blue top red bot
+        subtag: bot
+        link: uxr IRIS
+      LADYLIKE:
+        id: Ceiling Room/Panel_red_mid_2
+        colors:
+          - red
+          - blue
+        tag: red mid blue bot
+        subtag: mid
+        link: xru LAKE
+      WATER:
+        id: Ceiling Room/Panel_blue_bot_2
+        colors:
+          - blue
+          - red
+        tag: red mid blue bot
+        subtag: bot
+        link: xru LAKE
+      OURS:
+        id: Ceiling Room/Panel_blue_mid_3
+        colors:
+          - blue
+          - red
+        tag: blue mid red bot
+        subtag: mid
+        link: xur HOURS
+      DAYS:
+        id: Ceiling Room/Panel_red_bot_3
+        colors:
+          - red
+          - blue
+        tag: blue mid red bot
+        subtag: bot
+        link: xur HOURS
+      NIGHTTIME:
+        id: Ceiling Room/Panel_red_top_4
+        colors:
+          - red
+          - blue
+        tag: red top mid blue
+        subtag: top
+        link: rux KNIGHT
+      NIGHT:
+        id: Ceiling Room/Panel_blue_mid_4
+        colors:
+          - blue
+          - red
+        tag: red top mid blue
+        subtag: mid
+        link: rux KNIGHT
+    doors:
+      Door to Lattice:
+        id:
+          - Ceiling Room Doors/Door_red
+          - Ceiling Room Doors/Door_red2
+        location_name: The Artistic - Panda and Lattice
+        group: Artistic Doors
+        panels:
+          - EYE (Top)
+          - EYE (Bottom)
+          - LADYLIKE
+          - WATER
+          - OURS
+          - DAYS
+          - NIGHTTIME
+          - NIGHT
+          - room: The Artistic (Lattice)
+            panel: POSH
+          - room: The Artistic (Lattice)
+            panel: MALL
+          - room: The Artistic (Lattice)
+            panel: DEICIDE
+          - room: The Artistic (Lattice)
+            panel: WAVER
+          - room: The Artistic (Lattice)
+            panel: REPAID
+          - room: The Artistic (Lattice)
+            panel: BABY
+          - room: The Artistic (Lattice)
+            panel: LOBE
+          - room: The Artistic (Lattice)
+            panel: BOWELS
+    paintings:
+      - id: panda_painting_3
+        exit_only: True
+        orientation: south
+        required_when_no_doors: True
+  The Artistic (Lattice):
+    entrances:
+      Directional Gallery:
+        painting: True
+      The Artistic (Panda):
+        room: The Artistic (Panda)
+        door: Door to Lattice
+      The Artistic (Apple):
+        door: Door to Apple
+    panels:
+      POSH:
+        id: Ceiling Room/Panel_black_top_12
+        colors:
+          - black
+          - red
+        tag: black top red bot
+        subtag: top
+        link: bxr SHOP
+      MALL:
+        id: Ceiling Room/Panel_red_bot_12
+        colors:
+          - red
+          - black
+        tag: black top red bot
+        subtag: bot
+        link: bxr SHOP
+      DEICIDE:
+        id: Ceiling Room/Panel_red_top_13
+        colors:
+          - red
+          - black
+        tag: red top black bot
+        subtag: top
+        link: rxb DECIDE
+      WAVER:
+        id: Ceiling Room/Panel_black_bot_13
+        colors:
+          - black
+          - red
+        tag: red top black bot
+        subtag: bot
+        link: rxb DECIDE
+      REPAID:
+        id: Ceiling Room/Panel_black_mid_14
+        colors:
+          - black
+          - red
+        tag: black mid red bot
+        subtag: mid
+        link: xbr DIAPER
+      BABY:
+        id: Ceiling Room/Panel_red_bot_14
+        colors:
+          - red
+          - black
+        tag: black mid red bot
+        subtag: bot
+        link: xbr DIAPER
+      LOBE:
+        id: Ceiling Room/Panel_black_top_15
+        colors:
+          - black
+          - red
+        tag: black top red mid
+        subtag: top
+        link: brx BOWL
+      BOWELS:
+        id: Ceiling Room/Panel_red_mid_15
+        colors:
+          - red
+          - black
+        tag: black top red mid
+        subtag: mid
+        link: brx BOWL
+    doors:
+      Door to Apple:
+        id:
+          - Ceiling Room Doors/Door_black
+          - Ceiling Room Doors/Door_black2
+        location_name: The Artistic - Lattice and Apple
+        group: Artistic Doors
+        panels:
+          - POSH
+          - MALL
+          - DEICIDE
+          - WAVER
+          - REPAID
+          - BABY
+          - LOBE
+          - BOWELS
+          - room: The Artistic (Apple)
+            panel: SPRIG
+          - room: The Artistic (Apple)
+            panel: RELEASES
+          - room: The Artistic (Apple)
+            panel: MUCH
+          - room: The Artistic (Apple)
+            panel: FISH
+          - room: The Artistic (Apple)
+            panel: MASK
+          - room: The Artistic (Apple)
+            panel: HILL
+          - room: The Artistic (Apple)
+            panel: TINE
+          - room: The Artistic (Apple)
+            panel: THING
+    paintings:
+      - id: boxes_painting2
+        orientation: south
+        exit_only: True
+        required_when_no_doors: True
+  The Artistic (Apple):
+    entrances:
+      Orange Tower Sixth Floor:
+        painting: True
+      Directional Gallery:
+        painting: True
+      The Artistic (Lattice):
+        room: The Artistic (Lattice)
+        door: Door to Apple
+      The Artistic (Smiley):
+        door: Door to Smiley
+    panels:
+      SPRIG:
+        id: Ceiling Room/Panel_yellow_mid_8
+        colors:
+          - yellow
+          - black
+        tag: yellow mid black bot
+        subtag: mid
+        link: xyb GRIPS
+      RELEASES:
+        id: Ceiling Room/Panel_black_bot_8
+        colors:
+          - black
+          - yellow
+        tag: yellow mid black bot
+        subtag: bot
+        link: xyb GRIPS
+      MUCH:
+        id: Ceiling Room/Panel_black_top_9
+        colors:
+          - black
+          - yellow
+        tag: black top yellow bot
+        subtag: top
+        link: bxy CHUM
+      FISH:
+        id: Ceiling Room/Panel_yellow_bot_9
+        colors:
+          - yellow
+          - black
+        tag: black top yellow bot
+        subtag: bot
+        link: bxy CHUM
+      MASK:
+        id: Ceiling Room/Panel_yellow_top_10
+        colors:
+          - yellow
+          - black
+        tag: yellow top black bot
+        subtag: top
+        link: yxb CHASM
+      HILL:
+        id: Ceiling Room/Panel_black_bot_10
+        colors:
+          - black
+          - yellow
+        tag: yellow top black bot
+        subtag: bot
+        link: yxb CHASM
+      TINE:
+        id: Ceiling Room/Panel_black_top_11
+        colors:
+          - black
+          - yellow
+        tag: black top yellow mid
+        subtag: top
+        link: byx NIGHT
+      THING:
+        id: Ceiling Room/Panel_yellow_mid_11
+        colors:
+          - yellow
+          - black
+        tag: black top yellow mid
+        subtag: mid
+        link: byx NIGHT
+    doors:
+      Door to Smiley:
+        id:
+          - Ceiling Room Doors/Door_yellow
+          - Ceiling Room Doors/Door_yellow2
+        location_name: The Artistic - Apple and Smiley
+        group: Artistic Doors
+        panels:
+          - SPRIG
+          - RELEASES
+          - MUCH
+          - FISH
+          - MASK
+          - HILL
+          - TINE
+          - THING
+          - room: The Artistic (Smiley)
+            panel: FINE
+          - room: The Artistic (Smiley)
+            panel: BLADE
+          - room: The Artistic (Smiley)
+            panel: RED
+          - room: The Artistic (Smiley)
+            panel: BEARD
+          - room: The Artistic (Smiley)
+            panel: ICE
+          - room: The Artistic (Smiley)
+            panel: ROOT
+    paintings:
+      - id: cherry_painting3
+        orientation: north
+        exit_only: True
+        required_when_no_doors: True
+  The Artistic (Hint Room):
+    entrances:
+      The Artistic (Lattice):
+        room: The Artistic (Lattice)
+        door: Door to Apple
+    panels:
+      THEME:
+        id: Ceiling Room/Panel_answer_1
+        colors: red
+        tag: midred
+      PAINTS:
+        id: Ceiling Room/Panel_answer_2
+        colors: yellow
+        tag: botyellow
+      I:
+        id: Ceiling Room/Panel_answer_3
+        colors: blue
+        tag: midblue
+      KIT:
+        id: Ceiling Room/Panel_answer_4
+        colors: black
+        tag: topblack
+  The Discerning:
+    entrances:
+      Crossroads:
+        room: Crossroads
+        door: Discerning Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_discerning_scramble
+        colors: yellow
+        tag: forbid
+        check: True
+        achievement: The Discerning
+      HITS:
+        id: Sun Room/Panel_hits_this
+        colors: yellow
+        tag: midyellow
+      WARRED:
+        id: Sun Room/Panel_warred_drawer
+        colors: yellow
+        tag: double midyellow
+        subtag: left
+        link: ana DRAWER
+      REDRAW:
+        id: Sun Room/Panel_redraw_drawer
+        colors: yellow
+        tag: double midyellow
+        subtag: right
+        link: ana DRAWER
+      ADDER:
+        id: Sun Room/Panel_adder_dread
+        colors: yellow
+        tag: midyellow
+      LAUGHTERS:
+        id: Sun Room/Panel_laughters_slaughter
+        colors: yellow
+        tag: midyellow
+      STONE:
+        id: Sun Room/Panel_stone_notes
+        colors: yellow
+        tag: double midyellow
+        subtag: left
+        link: ana NOTES
+      ONSET:
+        id: Sun Room/Panel_onset_notes
+        colors: yellow
+        tag: double midyellow
+        subtag: right
+        link: ana NOTES
+      RAT:
+        id: Sun Room/Panel_rat_art
+        colors: yellow
+        tag: midyellow
+      DUSTY:
+        id: Sun Room/Panel_dusty_study
+        colors: yellow
+        tag: midyellow
+      ARTS:
+        id: Sun Room/Panel_arts_star
+        colors: yellow
+        tag: double midyellow
+        subtag: left
+        link: ana STAR
+      TSAR:
+        id: Sun Room/Panel_tsar_star
+        colors: yellow
+        tag: double midyellow
+        subtag: right
+        link: ana STAR
+      STATE:
+        id: Sun Room/Panel_state_taste
+        colors: yellow
+        tag: midyellow
+      REACT:
+        id: Sun Room/Panel_react_trace
+        colors: yellow
+        tag: midyellow
+      DEAR:
+        id: Sun Room/Panel_dear_read
+        colors: yellow
+        tag: double midyellow
+        subtag: left
+        link: ana READ
+      DARE:
+        id: Sun Room/Panel_dare_read
+        colors: yellow
+        tag: double midyellow
+        subtag: right
+        link: ana READ
+      SEAM:
+        id: Sun Room/Panel_seam_same
+        colors: yellow
+        tag: midyellow
+  The Eyes They See:
+    entrances:
+      Crossroads:
+        room: Crossroads
+        door: Eye Wall
+        painting: True
+      Wondrous Lobby:
+        door: Exit
+      Directional Gallery: True
+    panels:
+      NEAR:
+        id: Shuffle Room/Panel_near_near
+        tag: midwhite
+      EIGHT:
+        id: Backside Room/Panel_eight_eight_4
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Eights
+    doors:
+      Exit:
+        id: Count Up Room Area Doors/Door_near_near
+        group: Crossroads Doors
+        panels:
+          - NEAR
+    paintings:
+      - id: eye_painting_2
+        orientation: west
+      - id: smile_painting_2
+        orientation: north
+  Far Window:
+    entrances:
+      Crossroads:
+        room: Crossroads
+        door: Eye Wall
+      The Eyes They See: True
+    panels:
+      FAR:
+        id: Shuffle Room/Panel_far_far
+        tag: midwhite
+  Wondrous Lobby:
+    entrances:
+      Directional Gallery: True
+      The Eyes They See:
+        room: The Eyes They See
+        door: Exit
+    paintings:
+      - id: arrows_painting_5
+        orientation: east
+  Outside The Wondrous:
+    entrances:
+      Wondrous Lobby: True
+      The Wondrous (Doorknob):
+        door: Wondrous Entrance
+      The Wondrous (Window): True
+    panels:
+      SHRINK:
+        id: Wonderland Room/Panel_shrink_shrink
+        tag: midwhite
+    doors:
+      Wondrous Entrance:
+        id: Red Blue Purple Room Area Doors/Door_wonderland
+        item_name: The Wondrous - Entrance
+        panels:
+          - SHRINK
+  The Wondrous (Doorknob):
+    entrances:
+      Outside The Wondrous:
+        room: Outside The Wondrous
+        door: Wondrous Entrance
+      Starting Room:
+        door: Painting Shortcut
+        painting: True
+      The Wondrous (Chandelier):
+        painting: True
+      The Wondrous (Table): True # There is a way that doesn't use the painting
+    doors:
+      Painting Shortcut:
+        painting_id:
+          - symmetry_painting_a_starter
+          - arrows_painting2
+        skip_location: True
+        item_name: Starting Room - Symmetry Painting
+        panels:
+          - room: Outside The Wondrous
+            panel: SHRINK
+    paintings:
+      - id: symmetry_painting_a_1
+        orientation: east
+        exit_only: True
+      - id: symmetry_painting_b_1
+        orientation: south
+  The Wondrous (Bookcase):
+    entrances:
+      The Wondrous (Doorknob): True
+    panels:
+      CASE:
+        id: Wonderland Room/Panel_case_bookcase
+        colors: blue
+        tag: midblue
+    paintings:
+      - id: symmetry_painting_a_3
+        orientation: west
+        exit_only: True
+      - id: symmetry_painting_b_3
+        disable: True
+  The Wondrous (Chandelier):
+    entrances:
+      The Wondrous (Bookcase): True
+    panels:
+      CANDLE HEIR:
+        id: Wonderland Room/Panel_candleheir_chandelier
+        colors: yellow
+        tag: midyellow
+    paintings:
+      - id: symmetry_painting_a_5
+        orientation: east
+      - id: symmetry_painting_a_5
+        disable: True
+  The Wondrous (Window):
+    entrances:
+      The Wondrous (Bookcase): True
+    panels:
+      GLASS:
+        id: Wonderland Room/Panel_glass_window
+        colors: brown
+        tag: botbrown
+    paintings:
+      - id: symmetry_painting_b_4
+        orientation: north
+        exit_only: True
+      - id: symmetry_painting_a_4
+        disable: True
+  The Wondrous (Table):
+    entrances:
+      The Wondrous (Doorknob):
+        painting: True
+      The Wondrous:
+        painting: True
+    panels:
+      WOOD:
+        id: Wonderland Room/Panel_wood_table
+        colors: brown
+        tag: botbrown
+      BROOK NOD:
+        # This panel, while physically being in the first room, is facing upward
+        # and is only really solvable while standing on the windowsill, which is
+        # a location you can only get to from Table.
+        id: Wonderland Room/Panel_brooknod_doorknob
+        colors: yellow
+        tag: midyellow
+    paintings:
+      - id: symmetry_painting_a_2
+        orientation: west
+      - id: symmetry_painting_b_2
+        orientation: south
+        exit_only: True
+        required: True
+  The Wondrous:
+    entrances:
+      The Wondrous (Table): True
+      Arrow Garden:
+        door: Exit
+    panels:
+      FIREPLACE:
+        id: Wonderland Room/Panel_fireplace_fire
+        colors: red
+        tag: midred
+      Achievement:
+        id: Countdown Panels/Panel_wondrous_wondrous
+        required_panel:
+          - panel: FIREPLACE
+          - room: The Wondrous (Table)
+            panel: BROOK NOD
+          - room: The Wondrous (Bookcase)
+            panel: CASE
+          - room: The Wondrous (Chandelier)
+            panel: CANDLE HEIR
+          - room: The Wondrous (Window)
+            panel: GLASS
+          - room: The Wondrous (Table)
+            panel: WOOD
+        tag: forbid
+        achievement: The Wondrous
+    doors:
+      Exit:
+        id: Red Blue Purple Room Area Doors/Door_wonderland_exit
+        painting_id: arrows_painting_9
+        include_reduce: True
+        panels:
+          - Achievement
+    paintings:
+      - id: arrows_painting_9
+        enter_only: True
+        orientation: south
+        move: True
+        required_door:
+          door: Exit
+        req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors
+      - id: symmetry_painting_a_6
+        orientation: west
+        exit_only: True
+      - id: symmetry_painting_b_6
+        orientation: north
+        req_blocked_when_no_doors: True # the wondrous (table) in vanilla doors
+  Arrow Garden:
+    entrances:
+      The Wondrous:
+        room: The Wondrous
+        door: Exit
+      Roof: True
+    panels:
+      MASTERY:
+        id: Master Room/Panel_mastery_mastery4
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      SHARP:
+        id: Open Areas/Panel_rainy_rainbow2
+        tag: midwhite
+    paintings:
+      - id: flower_painting_6
+        orientation: south
+  Hallway Room (2):
+    entrances:
+      Outside The Agreeable:
+        room: Outside The Agreeable
+        door: Hallway Door
+      Elements Area: True
+    panels:
+      WISE:
+        id: Hallway Room/Panel_counterclockwise_1
+        colors: blue
+        tag: quad mid blue
+        link: qmb COUNTERCLOCKWISE
+      CLOCK:
+        id: Hallway Room/Panel_counterclockwise_2
+        colors: blue
+        tag: quad mid blue
+        link: qmb COUNTERCLOCKWISE
+      ER:
+        id: Hallway Room/Panel_counterclockwise_3
+        colors: blue
+        tag: quad mid blue
+        link: qmb COUNTERCLOCKWISE
+      COUNT:
+        id: Hallway Room/Panel_counterclockwise_4
+        colors: blue
+        tag: quad mid blue
+        link: qmb COUNTERCLOCKWISE
+    doors:
+      Exit:
+        id: Red Blue Purple Room Area Doors/Door_room_3
+        location_name: Hallway Room - Second Room
+        group: Hallway Room Doors
+        panels:
+          - WISE
+          - CLOCK
+          - ER
+          - COUNT
+  Hallway Room (3):
+    entrances:
+      Hallway Room (2):
+        room: Hallway Room (2)
+        door: Exit
+      # No entrance from Elements Area. The winding hallway does not connect.
+    panels:
+      TRANCE:
+        id: Hallway Room/Panel_transformation_1
+        colors: blue
+        tag: quad top blue
+        link: qtb TRANSFORMATION
+      FORM:
+        id: Hallway Room/Panel_transformation_2
+        colors: blue
+        tag: quad top blue
+        link: qtb TRANSFORMATION
+      A:
+        id: Hallway Room/Panel_transformation_3
+        colors: blue
+        tag: quad top blue
+        link: qtb TRANSFORMATION
+      SHUN:
+        id: Hallway Room/Panel_transformation_4
+        colors: blue
+        tag: quad top blue
+        link: qtb TRANSFORMATION
+    doors:
+      Exit:
+        id: Red Blue Purple Room Area Doors/Door_room_4
+        location_name: Hallway Room - Third Room
+        group: Hallway Room Doors
+        panels:
+          - TRANCE
+          - FORM
+          - A
+          - SHUN
+  Hallway Room (4):
+    entrances:
+      Hallway Room (3):
+        room: Hallway Room (3)
+        door: Exit
+      Elements Area: True
+    panels:
+      WHEEL:
+        id: Hallway Room/Panel_room_5
+        colors: blue
+        tag: full stack blue
+    doors:
+      Exit:
+        id:
+          - Red Blue Purple Room Area Doors/Door_room_5
+          - Red Blue Purple Room Area Doors/Door_room_6 # this is the connection to The Artistic
+        group: Hallway Room Doors
+        location_name: Hallway Room - Fourth Room
+        panels:
+          - WHEEL
+        include_reduce: True
+  Elements Area:
+    entrances:
+      Roof: True
+      Hallway Room (4):
+        room: Hallway Room (4)
+        door: Exit
+      The Artistic (Smiley):
+        room: Hallway Room (4)
+        door: Exit
+    panels:
+      A:
+        id: Strand Room/Panel_a_strands
+        colors: blue
+        tag: forbid
+        hunt: True
+      NINE:
+        id: Backside Room/Panel_nine_nine_7
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+      UNDISTRACTED:
+        id: Open Areas/Panel_undistracted
+        check: True
+        exclude_reduce: True
+        tag: midwhite
+      MASTERY:
+        id: Master Room/Panel_mastery_mastery13
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+      EARTH:
+        id: Cross Room/Panel_earth_earth
+        tag: midwhite
+      WATER:
+        id: Cross Room/Panel_water_water
+        tag: midwhite
+      AIR:
+        id: Cross Room/Panel_air_air
+        tag: midwhite
+    paintings:
+      - id: south_afar
+        orientation: south
+  Outside The Wanderer:
+    entrances:
+      Orange Tower First Floor:
+        door: Tower Entrance
+      Rhyme Room (Cross):
+        room: Rhyme Room (Cross)
+        door: Exit
+      Roof: True
+    panels:
+      WANDERLUST:
+        id: Tower Room/Panel_wanderlust_1234567890
+        colors: orange
+        tag: midorange
+    doors:
+      Wanderer Entrance:
+        id: Tower Room Area Doors/Door_wanderer_entrance
+        item_name: The Wanderer - Entrance
+        panels:
+          - WANDERLUST
+      Tower Entrance:
+        id: Tower Room Area Doors/Door_wanderlust_start
+        skip_location: True
+        panels:
+          - room: The Wanderer
+            panel: Achievement
+  The Wanderer:
+    entrances:
+      Outside The Wanderer:
+        room: Outside The Wanderer
+        door: Wanderer Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_1234567890_wanderlust
+        colors: orange
+        check: True
+        tag: forbid
+        achievement: The Wanderer
+      "7890":
+        id: Orange Room/Panel_lust
+        colors: orange
+        tag: midorange
+      "6524":
+        id: Orange Room/Panel_read
+        colors: orange
+        tag: midorange
+      "951":
+        id: Orange Room/Panel_sew
+        colors: orange
+        tag: midorange
+      "4524":
+        id: Orange Room/Panel_dead
+        colors: orange
+        tag: midorange
+      LEARN:
+        id: Orange Room/Panel_learn
+        colors: orange
+        tag: midorange
+      DUST:
+        id: Orange Room/Panel_dust
+        colors: orange
+        tag: midorange
+      STAR:
+        id: Orange Room/Panel_star
+        colors: orange
+        tag: midorange
+      WANDER:
+        id: Orange Room/Panel_wander
+        colors: orange
+        tag: midorange
+  Art Gallery:
+    entrances:
+      Orange Tower Third Floor: True
+      Art Gallery (Second Floor): True
+      Art Gallery (Third Floor): True
+      Art Gallery (Fourth Floor): True
+      Orange Tower Fifth Floor:
+        door: Exit
+    panels:
+      EIGHT:
+        id: Backside Room/Panel_eight_eight_6
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Eights
+      EON:
+        id: Painting Room/Panel_eon_one
+        colors: yellow
+        tag: midyellow
+      TRUSTWORTHY:
+        id: Painting Room/Panel_to_two
+        colors: red
+        tag: midred
+      FREE:
+        id: Painting Room/Panel_free_three
+        colors: purple
+        tag: midpurp
+      OUR:
+        id: Painting Room/Panel_our_four
+        colors: blue
+        tag: midblue
+      ONE ROAD MANY TURNS:
+        id: Painting Room/Panel_order_onepathmanyturns
+        tag: forbid
+        colors:
+          - yellow
+          - blue
+          - gray
+          - brown
+          - orange
+        required_door:
+          door: Fifth Floor
+    doors:
+      Second Floor:
+        painting_id:
+          - scenery_painting_2b
+          - scenery_painting_2c
+        skip_location: True
+        panels:
+          - EON
+      First Floor Puzzles:
+        skip_item: True
+        location_name: Art Gallery - First Floor Puzzles
+        panels:
+          - EON
+          - TRUSTWORTHY
+          - FREE
+          - OUR
+      Third Floor:
+        painting_id:
+          - scenery_painting_3b
+          - scenery_painting_3c
+        skip_location: True
+        panels:
+          - room: Art Gallery (Second Floor)
+            panel: PATH
+      Fourth Floor:
+        painting_id:
+          - scenery_painting_4b
+          - scenery_painting_4c
+        skip_location: True
+        panels:
+          - room: Art Gallery (Third Floor)
+            panel: ANY
+      Fifth Floor:
+        id: Tower Room Area Doors/Door_painting_backroom
+        painting_id:
+          - scenery_painting_5b
+          - scenery_painting_5c
+        skip_location: True
+        panels:
+          - room: Art Gallery (Fourth Floor)
+            panel: SEND - USE
+      Exit:
+        id: Tower Room Area Doors/Door_painting_exit
+        include_reduce: True
+        panels:
+          - ONE ROAD MANY TURNS
+    paintings:
+      - id: smile_painting_3
+        orientation: west
+      - id: flower_painting_2
+        orientation: east
+      - id: scenery_painting_0a
+        orientation: north
+      - id: map_painting
+        orientation: east
+      - id: fruitbowl_painting4
+        orientation: south
+    progression:
+      Progressive Art Gallery:
+        - Second Floor
+        - Third Floor
+        - Fourth Floor
+        - Fifth Floor
+        - Exit
+  Art Gallery (Second Floor):
+    entrances:
+      Art Gallery:
+        room: Art Gallery
+        door: Second Floor
+    panels:
+      HOUSE:
+        id: Painting Room/Panel_house_neighborhood
+        colors: blue
+        tag: botblue
+      PATH:
+        id: Painting Room/Panel_path_road
+        colors: brown
+        tag: botbrown
+      PARK:
+        id: Painting Room/Panel_park_drive
+        colors: black
+        tag: botblack
+      CARRIAGE:
+        id: Painting Room/Panel_carriage_horse
+        colors: red
+        tag: botred
+    doors:
+      Puzzles:
+        skip_item: True
+        location_name: Art Gallery - Second Floor Puzzles
+        panels:
+          - HOUSE
+          - PATH
+          - PARK
+          - CARRIAGE
+  Art Gallery (Third Floor):
+    entrances:
+      Art Gallery:
+        room: Art Gallery
+        door: Third Floor
+    panels:
+      AN:
+        id: Painting Room/Panel_an_many
+        colors: blue
+        tag: midblue
+      MAY:
+        id: Painting Room/Panel_may_many
+        colors: blue
+        tag: midblue
+      ANY:
+        id: Painting Room/Panel_any_many
+        colors: blue
+        tag: midblue
+      MAN:
+        id: Painting Room/Panel_man_many
+        colors: blue
+        tag: midblue
+    doors:
+      Puzzles:
+        skip_item: True
+        location_name: Art Gallery - Third Floor Puzzles
+        panels:
+          - AN
+          - MAY
+          - ANY
+          - MAN
+  Art Gallery (Fourth Floor):
+    entrances:
+      Art Gallery:
+        room: Art Gallery
+        door: Fourth Floor
+    panels:
+      URNS:
+        id: Painting Room/Panel_urns_turns
+        colors: blue
+        tag: midblue
+      LEARNS:
+        id: Painting Room/Panel_learns_turns
+        colors: purple
+        tag: midpurp
+      RUNTS:
+        id: Painting Room/Panel_runts_turns
+        colors: yellow
+        tag: midyellow
+      SEND - USE:
+        id: Painting Room/Panel_send_use_turns
+        colors: orange
+        tag: midorange
+      TRUST:
+        id: Painting Room/Panel_trust_06890
+        colors: orange
+        tag: midorange
+      "062459":
+        id: Painting Room/Panel_06890_trust
+        colors: orange
+        tag: midorange
+    doors:
+      Puzzles:
+        skip_item: True
+        location_name: Art Gallery - Fourth Floor Puzzles
+        panels:
+          - URNS
+          - LEARNS
+          - RUNTS
+          - SEND - USE
+          - TRUST
+          - "062459"
+  Rhyme Room (Smiley):
+    entrances:
+      Orange Tower Third Floor:
+        room: Orange Tower Third Floor
+        door: Rhyme Room Entrance
+      Rhyme Room (Circle):
+        room: Rhyme Room (Circle)
+        door: Door to Smiley
+      Rhyme Room (Cross): True # one-way
+    panels:
+      LOANS:
+        id: Double Room/Panel_bones_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme BONES
+      SKELETON:
+        id: Double Room/Panel_bones_syn
+        tag: syn rhyme
+        colors: purple
+        subtag: bot
+        link: rhyme BONES
+      REPENTANCE:
+        id: Double Room/Panel_sentence_rhyme
+        colors:
+          - purple
+          - blue
+        tag: whole rhyme
+        subtag: top
+        link: rhyme SENTENCE
+      WORD:
+        id: Double Room/Panel_sentence_whole
+        colors:
+          - purple
+          - blue
+        tag: whole rhyme
+        subtag: bot
+        link: rhyme SENTENCE
+      SCHEME:
+        id: Double Room/Panel_dream_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme DREAM
+      FANTASY:
+        id: Double Room/Panel_dream_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme DREAM
+      HISTORY:
+        id: Double Room/Panel_mystery_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme MYSTERY
+      SECRET:
+        id: Double Room/Panel_mystery_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme MYSTERY
+    doors:
+      # This is complicated. I want the location in here to just be the four
+      # panels against the wall toward Target. But in vanilla, you also need to
+      # solve the panels in Circle that are against the Smiley wall. Logic needs
+      # to know this so that it can handle no door shuffle properly. So we split
+      # the item and location up.
+      Door to Target:
+        id:
+          - Double Room Area Doors/Door_room_3a
+          - Double Room Area Doors/Door_room_3bc
+        skip_location: True
+        group: Rhyme Room Doors
+        panels:
+          - SCHEME
+          - FANTASY
+          - HISTORY
+          - SECRET
+          - room: Rhyme Room (Circle)
+            panel: BIRD
+          - room: Rhyme Room (Circle)
+            panel: LETTER
+          - room: Rhyme Room (Circle)
+            panel: VIOLENT
+          - room: Rhyme Room (Circle)
+            panel: MUTE
+      Door to Target (Location):
+        location_name: Rhyme Room (Smiley) - Puzzles Toward Target
+        skip_item: True
+        panels:
+          - SCHEME
+          - FANTASY
+          - HISTORY
+          - SECRET
+  Rhyme Room (Cross):
+    entrances:
+      Rhyme Room (Target): # one-way
+        room: Rhyme Room (Target)
+        door: Door to Cross
+      Rhyme Room (Looped Square):
+        room: Rhyme Room (Looped Square)
+        door: Door to Cross
+    panels:
+      NINE:
+        id: Backside Room/Panel_nine_nine_9
+        tag: midwhite
+        hunt: True
+        required_door:
+          room: Number Hunt
+          door: Nines
+      FERN:
+        id: Double Room/Panel_return_rhyme
+        colors:
+          - purple
+          - black
+        tag: ant rhyme
+        subtag: top
+        link: rhyme RETURN
+      STAY:
+        id: Double Room/Panel_return_ant
+        colors:
+          - purple
+          - black
+        tag: ant rhyme
+        subtag: bot
+        link: rhyme RETURN
+      FRIEND:
+        id: Double Room/Panel_descend_rhyme
+        colors:
+          - purple
+          - black
+        tag: ant rhyme
+        subtag: top
+        link: rhyme DESCEND
+      RISE:
+        id: Double Room/Panel_descend_ant
+        colors:
+          - purple
+          - black
+        tag: ant rhyme
+        subtag: bot
+        link: rhyme DESCEND
+      PLUMP:
+        id: Double Room/Panel_jump_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme JUMP
+      BOUNCE:
+        id: Double Room/Panel_jump_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme JUMP
+      SCRAWL:
+        id: Double Room/Panel_fall_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme FALL
+      PLUNGE:
+        id: Double Room/Panel_fall_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme FALL
+      LEAP:
+        id: Double Room/Panel_leap_leap
+        tag: midwhite
+    doors:
+      Exit:
+        id: Double Room Area Doors/Door_room_exit
+        location_name: Rhyme Room (Cross) - Exit Puzzles
+        group: Rhyme Room Doors
+        panels:
+          - PLUMP
+          - BOUNCE
+          - SCRAWL
+          - PLUNGE
+  Rhyme Room (Circle):
+    entrances:
+      Rhyme Room (Looped Square):
+        room: Rhyme Room (Looped Square)
+        door: Door to Circle
+      Hidden Room:
+        room: Hidden Room
+        door: Rhyme Room Entrance
+      Rhyme Room (Smiley):
+        door: Door to Smiley
+    panels:
+      BIRD:
+        id: Double Room/Panel_word_rhyme
+        colors:
+          - purple
+          - blue
+        tag: whole rhyme
+        subtag: top
+        link: rhyme WORD
+      LETTER:
+        id: Double Room/Panel_word_whole
+        colors:
+          - purple
+          - blue
+        tag: whole rhyme
+        subtag: bot
+        link: rhyme WORD
+      FORBIDDEN:
+        id: Double Room/Panel_hidden_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme HIDDEN
+      CONCEALED:
+        id: Double Room/Panel_hidden_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme HIDDEN
+      VIOLENT:
+        id: Double Room/Panel_silent_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme SILENT
+      MUTE:
+        id: Double Room/Panel_silent_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme SILENT
+    doors:
+      Door to Smiley:
+        id:
+          - Double Room Area Doors/Door_room_2b
+          - Double Room Area Doors/Door_room_3b
+        location_name: Rhyme Room - Circle/Smiley Wall
+        group: Rhyme Room Doors
+        panels:
+          - BIRD
+          - LETTER
+          - VIOLENT
+          - MUTE
+          - room: Rhyme Room (Smiley)
+            panel: LOANS
+          - room: Rhyme Room (Smiley)
+            panel: SKELETON
+          - room: Rhyme Room (Smiley)
+            panel: REPENTANCE
+          - room: Rhyme Room (Smiley)
+            panel: WORD
+    paintings:
+      - id: arrows_painting_3
+        orientation: north
+  Rhyme Room (Looped Square):
+    entrances:
+      Starting Room:
+        room: Starting Room
+        door: Rhyme Room Entrance
+      Rhyme Room (Circle):
+        door: Door to Circle
+      Rhyme Room (Cross):
+        door: Door to Cross
+      Rhyme Room (Target):
+        door: Door to Target
+    panels:
+      WALKED:
+        id: Double Room/Panel_blocked_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme BLOCKED
+      OBSTRUCTED:
+        id: Double Room/Panel_blocked_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme BLOCKED
+      SKIES:
+        id: Double Room/Panel_rise_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme RISE
+      SWELL:
+        id: Double Room/Panel_rise_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme RISE
+      PENNED:
+        id: Double Room/Panel_ascend_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme ASCEND
+      CLIMB:
+        id: Double Room/Panel_ascend_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme ASCEND
+      TROUBLE:
+        id: Double Room/Panel_double_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme DOUBLE
+      DUPLICATE:
+        id: Double Room/Panel_double_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme DOUBLE
+    doors:
+      Door to Circle:
+        id:
+          - Double Room Area Doors/Door_room_2a
+          - Double Room Area Doors/Door_room_1c
+        location_name: Rhyme Room - Circle/Looped Square Wall
+        group: Rhyme Room Doors
+        panels:
+          - WALKED
+          - OBSTRUCTED
+          - SKIES
+          - SWELL
+          - room: Rhyme Room (Circle)
+            panel: BIRD
+          - room: Rhyme Room (Circle)
+            panel: LETTER
+          - room: Rhyme Room (Circle)
+            panel: FORBIDDEN
+          - room: Rhyme Room (Circle)
+            panel: CONCEALED
+      Door to Cross:
+        id:
+          - Double Room Area Doors/Door_room_1a
+          - Double Room Area Doors/Door_room_5a
+        location_name: Rhyme Room - Cross/Looped Square Wall
+        group: Rhyme Room Doors
+        panels:
+          - SKIES
+          - SWELL
+          - PENNED
+          - CLIMB
+          - room: Rhyme Room (Cross)
+            panel: FERN
+          - room: Rhyme Room (Cross)
+            panel: STAY
+          - room: Rhyme Room (Cross)
+            panel: FRIEND
+          - room: Rhyme Room (Cross)
+            panel: RISE
+      Door to Target:
+        id:
+          - Double Room Area Doors/Door_room_1b
+          - Double Room Area Doors/Door_room_4b
+        location_name: Rhyme Room - Target/Looped Square Wall
+        group: Rhyme Room Doors
+        panels:
+          - PENNED
+          - CLIMB
+          - TROUBLE
+          - DUPLICATE
+          - room: Rhyme Room (Target)
+            panel: WILD
+          - room: Rhyme Room (Target)
+            panel: KID
+          - room: Rhyme Room (Target)
+            panel: PISTOL
+          - room: Rhyme Room (Target)
+            panel: QUARTZ
+  Rhyme Room (Target):
+    entrances:
+      Rhyme Room (Smiley): # one-way
+        room: Rhyme Room (Smiley)
+        door: Door to Target
+      Rhyme Room (Looped Square):
+        room: Rhyme Room (Looped Square)
+        door: Door to Target
+    panels:
+      WILD:
+        id: Double Room/Panel_child_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme CHILD
+      KID:
+        id: Double Room/Panel_child_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme CHILD
+      PISTOL:
+        id: Double Room/Panel_crystal_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme CRYSTAL
+      QUARTZ:
+        id: Double Room/Panel_crystal_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme CRYSTAL
+      INNOVATIVE (Top):
+        id: Double Room/Panel_creative_rhyme
+        colors: purple
+        tag: syn rhyme
+        subtag: top
+        link: rhyme CREATIVE
+      INNOVATIVE (Bottom):
+        id: Double Room/Panel_creative_syn
+        colors: purple
+        tag: syn rhyme
+        subtag: bot
+        link: rhyme CREATIVE
+    doors:
+      Door to Cross:
+        id: Double Room Area Doors/Door_room_4a
+        location_name: Rhyme Room (Target) - Puzzles Toward Cross
+        group: Rhyme Room Doors
+        panels:
+          - PISTOL
+          - QUARTZ
+          - INNOVATIVE (Top)
+          - INNOVATIVE (Bottom)
+    paintings:
+      - id: arrows_painting_4
+        orientation: north
+  Room Room:
+    # This is a bit of a weird room. You can't really get to it from the roof.
+    # And even if you were to go through the shortcut on the fifth floor into
+    # the basement and up the stairs, you'd be blocked by the backsides of the
+    # ROOM panels, which isn't ideal. So we will, at least for now, say that
+    # this room is vanilla.
+    #
+    # For pretty much the same reason, I don't want to shuffle the paintings in
+    # here.
+    entrances:
+      Orange Tower Fourth Floor: True
+    panels:
+      DOOR (1):
+        id: Panel Room/Panel_room_door_1
+        colors: gray
+        tag: forbid
+      DOOR (2):
+        id: Panel Room/Panel_room_door_2
+        colors: gray
+        tag: forbid
+      WINDOW:
+        id: Panel Room/Panel_room_window_1
+        colors: gray
+        tag: forbid
+      STAIRS:
+        id: Panel Room/Panel_room_stairs_1
+        colors: gray
+        tag: forbid
+      PAINTING:
+        id: Panel Room/Panel_room_painting_1
+        colors: gray
+        tag: forbid
+      FLOOR (1):
+        id: Panel Room/Panel_room_floor_1
+        colors: gray
+        tag: forbid
+      FLOOR (2):
+        id: Panel Room/Panel_room_floor_2
+        colors: gray
+        tag: forbid
+      FLOOR (3):
+        id: Panel Room/Panel_room_floor_3
+        colors: gray
+        tag: forbid
+      FLOOR (4):
+        id: Panel Room/Panel_room_floor_4
+        colors: gray
+        tag: forbid
+      FLOOR (5):
+        id: Panel Room/Panel_room_floor_5
+        colors: gray
+        tag: forbid
+      FLOOR (7):
+        id: Panel Room/Panel_room_floor_7
+        colors: gray
+        tag: forbid
+      FLOOR (8):
+        id: Panel Room/Panel_room_floor_8
+        colors: gray
+        tag: forbid
+      FLOOR (9):
+        id: Panel Room/Panel_room_floor_9
+        colors: gray
+        tag: forbid
+      FLOOR (10):
+        id: Panel Room/Panel_room_floor_10
+        colors: gray
+        tag: forbid
+      CEILING (1):
+        id: Panel Room/Panel_room_ceiling_1
+        colors: gray
+        tag: forbid
+      CEILING (2):
+        id: Panel Room/Panel_room_ceiling_2
+        colors: gray
+        tag: forbid
+      CEILING (3):
+        id: Panel Room/Panel_room_ceiling_3
+        colors: gray
+        tag: forbid
+      CEILING (4):
+        id: Panel Room/Panel_room_ceiling_4
+        colors: gray
+        tag: forbid
+      CEILING (5):
+        id: Panel Room/Panel_room_ceiling_5
+        colors: gray
+        tag: forbid
+      WALL (1):
+        id: Panel Room/Panel_room_wall_1
+        colors: gray
+        tag: forbid
+      WALL (2):
+        id: Panel Room/Panel_room_wall_2
+        colors: gray
+        tag: forbid
+      WALL (3):
+        id: Panel Room/Panel_room_wall_3
+        colors: gray
+        tag: forbid
+      WALL (4):
+        id: Panel Room/Panel_room_wall_4
+        colors: gray
+        tag: forbid
+      WALL (5):
+        id: Panel Room/Panel_room_wall_5
+        colors: gray
+        tag: forbid
+      WALL (6):
+        id: Panel Room/Panel_room_wall_6
+        colors: gray
+        tag: forbid
+      WALL (7):
+        id: Panel Room/Panel_room_wall_7
+        colors: gray
+        tag: forbid
+      WALL (8):
+        id: Panel Room/Panel_room_wall_8
+        colors: gray
+        tag: forbid
+      WALL (9):
+        id: Panel Room/Panel_room_wall_9
+        colors: gray
+        tag: forbid
+      WALL (10):
+        id: Panel Room/Panel_room_wall_10
+        colors: gray
+        tag: forbid
+      WALL (11):
+        id: Panel Room/Panel_room_wall_11
+        colors: gray
+        tag: forbid
+      WALL (12):
+        id: Panel Room/Panel_room_wall_12
+        colors: gray
+        tag: forbid
+      WALL (13):
+        id: Panel Room/Panel_room_wall_13
+        colors: gray
+        tag: forbid
+      WALL (14):
+        id: Panel Room/Panel_room_wall_14
+        colors: gray
+        tag: forbid
+      WALL (15):
+        id: Panel Room/Panel_room_wall_15
+        colors: gray
+        tag: forbid
+      WALL (16):
+        id: Panel Room/Panel_room_wall_16
+        colors: gray
+        tag: forbid
+      WALL (17):
+        id: Panel Room/Panel_room_wall_17
+        colors: gray
+        tag: forbid
+      WALL (18):
+        id: Panel Room/Panel_room_wall_18
+        colors: gray
+        tag: forbid
+      WALL (19):
+        id: Panel Room/Panel_room_wall_19
+        colors: gray
+        tag: forbid
+      WALL (20):
+        id: Panel Room/Panel_room_wall_20
+        colors: gray
+        tag: forbid
+      WALL (21):
+        id: Panel Room/Panel_room_wall_21
+        colors: gray
+        tag: forbid
+      BROOMED:
+        id: Panel Room/Panel_broomed_bedroom
+        colors: yellow
+        tag: midyellow
+        required_door:
+          door: Excavation
+      LAYS:
+        id: Panel Room/Panel_lays_maze
+        colors: purple
+        tag: toppurp
+        required_panel:
+          panel: BROOMED
+      BASE:
+        id: Panel Room/Panel_base_basement
+        colors: blue
+        tag: midblue
+        required_panel:
+          panel: LAYS
+      MASTERY:
+        id: Master Room/Panel_mastery_mastery
+        tag: midwhite
+        colors: gray
+        required_door:
+          room: Orange Tower Seventh Floor
+          door: Mastery
+    doors:
+      Excavation:
+        event: True
+        panels:
+          - WALL (1)
+      Cellar Exit:
+        id:
+          - Tower Room Area Doors/Door_panel_basement
+          - Tower Room Area Doors/Door_panel_basement2
+        panels:
+          - BASE
+  Cellar:
+    entrances:
+      Room Room:
+        room: Room Room
+        door: Excavation
+      Orange Tower Fifth Floor:
+        room: Room Room
+        door: Cellar Exit
+      Outside The Agreeable:
+        room: Outside The Agreeable
+        door: Lookout Entrance
+  Outside The Wise:
+    entrances:
+      Orange Tower Sixth Floor:
+        painting: True
+      Outside The Initiated:
+        painting: True
+    panels:
+      KITTEN:
+        id: Clock Room/Panel_kitten_cat
+        colors: brown
+        tag: botbrown
+      CAT:
+        id: Clock Room/Panel_cat_kitten
+        tag: bot brown black
+        colors:
+          - brown
+          - black
+    doors:
+      Wise Entrance:
+        id: Clock Room Area Doors/Door_time_start
+        item_name: The Wise - Entrance
+        panels:
+          - KITTEN
+          - CAT
+    paintings:
+      - id: arrows_painting_2
+        orientation: east
+      - id: clock_painting_2
+        orientation: east
+        exit_only: True
+        required: True
+  The Wise:
+    entrances:
+      Outside The Wise:
+        room: Outside The Wise
+        door: Wise Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_intelligent_wise
+        colors:
+          - brown
+          - black
+        tag: forbid
+        check: True
+        achievement: The Wise
+      PUPPY:
+        id: Clock Room/Panel_puppy_dog
+        colors: brown
+        tag: botbrown
+      ADULT:
+        id: Clock Room/Panel_adult_child
+        colors:
+          - brown
+          - black
+        tag: bot brown black
+      BREAD:
+        id: Clock Room/Panel_bread_mold
+        colors: brown
+        tag: botbrown
+      DINOSAUR:
+        id: Clock Room/Panel_dinosaur_fossil
+        colors: brown
+        tag: botbrown
+      OAK:
+        id: Clock Room/Panel_oak_acorn
+        colors:
+          - brown
+          - black
+        tag: bot brown black
+      CORPSE:
+        id: Clock Room/Panel_corpse_skeleton
+        colors: brown
+        tag: botbrown
+      BEFORE:
+        id: Clock Room/Panel_before_ere
+        colors:
+          - brown
+          - black
+        tag: mid brown black
+      YOUR:
+        id: Clock Room/Panel_your_thy
+        colors:
+          - brown
+          - black
+        tag: mid brown black
+      BETWIXT:
+        id: Clock Room/Panel_betwixt_between
+        colors: brown
+        tag: midbrown
+      NIGH:
+        id: Clock Room/Panel_nigh_near
+        colors: brown
+        tag: midbrown
+      CONNEXION:
+        id: Clock Room/Panel_connexion_connection
+        colors: brown
+        tag: midbrown
+      THOU:
+        id: Clock Room/Panel_thou_you
+        colors: brown
+        tag: midbrown
+    paintings:
+      - id: clock_painting_3
+        orientation: east
+        req_blocked: True # outside the wise (with or without door shuffle)
+  The Red:
+    entrances:
+      Roof: True
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_grandfathered_red
+        colors: red
+        tag: forbid
+        check: True
+        achievement: The Red
+      PANDEMIC (1):
+        id: Hangry Room/Panel_red_top_1
+        colors: red
+        tag: topred
+      TRINITY:
+        id: Hangry Room/Panel_red_top_2
+        colors: red
+        tag: topred
+      CHEMISTRY:
+        id: Hangry Room/Panel_red_top_3
+        colors: red
+        tag: topred
+      FLUMMOXED:
+        id: Hangry Room/Panel_red_top_4
+        colors: red
+        tag: topred
+      PANDEMIC (2):
+        id: Hangry Room/Panel_red_mid_1
+        colors: red
+        tag: midred
+      COUNTERCLOCKWISE:
+        id: Hangry Room/Panel_red_mid_2
+        colors: red
+        tag: red top red mid black bot
+      FEARLESS:
+        id: Hangry Room/Panel_red_mid_3
+        colors: red
+        tag: midred
+      DEFORESTATION:
+        id: Hangry Room/Panel_red_mid_4
+        colors: red
+        tag: red mid bot
+        subtag: mid
+        link: rmb FORE
+      CRAFTSMANSHIP:
+        id: Hangry Room/Panel_red_mid_5
+        colors: red
+        tag: red mid bot
+        subtag: mid
+        link: rmb AFT
+      CAMEL:
+        id: Hangry Room/Panel_red_bot_1
+        colors: red
+        tag: botred
+      LION:
+        id: Hangry Room/Panel_red_bot_2
+        colors: red
+        tag: botred
+      TIGER:
+        id: Hangry Room/Panel_red_bot_3
+        colors: red
+        tag: botred
+      SHIP (1):
+        id: Hangry Room/Panel_red_bot_4
+        colors: red
+        tag: red mid bot
+        subtag: bot
+        link: rmb FORE
+      SHIP (2):
+        id: Hangry Room/Panel_red_bot_5
+        colors: red
+        tag: red mid bot
+        subtag: bot
+        link: rmb AFT
+      GIRAFFE:
+        id: Hangry Room/Panel_red_bot_6
+        colors: red
+        tag: botred
+  The Ecstatic:
+    entrances:
+      Roof: True
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_ecstatic_ecstatic
+        colors: yellow
+        tag: forbid
+        check: True
+        achievement: The Ecstatic
+      FORM (1):
+        id: Smiley Room/Panel_soundgram_1
+        colors: yellow
+        tag: yellow top bot
+        subtag: bottom
+        link: ytb FORM
+      WIND:
+        id: Smiley Room/Panel_soundgram_2
+        colors: yellow
+        tag: botyellow
+      EGGS:
+        id: Smiley Room/Panel_scrambled_1
+        colors: yellow
+        tag: botyellow
+      VEGETABLES:
+        id: Smiley Room/Panel_scrambled_2
+        colors: yellow
+        tag: botyellow
+      WATER:
+        id: Smiley Room/Panel_anagram_6_1
+        colors: yellow
+        tag: botyellow
+      FRUITS:
+        id: Smiley Room/Panel_anagram_6_2
+        colors: yellow
+        tag: botyellow
+      LEAVES:
+        id: Smiley Room/Panel_anagram_7_1
+        colors: yellow
+        tag: topyellow
+      VINES:
+        id: Smiley Room/Panel_anagram_7_2
+        colors: yellow
+        tag: topyellow
+      ICE:
+        id: Smiley Room/Panel_anagram_7_3
+        colors: yellow
+        tag: topyellow
+      STYLE:
+        id: Smiley Room/Panel_anagram_7_4
+        colors: yellow
+        tag: topyellow
+      FIR:
+        id: Smiley Room/Panel_anagram_8_1
+        colors: yellow
+        tag: topyellow
+      REEF:
+        id: Smiley Room/Panel_anagram_8_2
+        colors: yellow
+        tag: topyellow
+      ROTS:
+        id: Smiley Room/Panel_anagram_8_3
+        colors: yellow
+        tag: topyellow
+      FORM (2):
+        id: Smiley Room/Panel_anagram_9_1
+        colors: yellow
+        tag: yellow top bot
+        subtag: top
+        link: ytb FORM
+  Outside The Scientific:
+    entrances:
+      Roof: True
+      The Scientific:
+        door: Scientific Entrance
+    panels:
+      OPEN:
+        id: Chemistry Room/Panel_open
+        tag: midwhite
+      CLOSE:
+        id: Chemistry Room/Panel_close
+        colors: black
+        tag: botblack
+      AHEAD:
+        id: Chemistry Room/Panel_ahead
+        colors: black
+        tag: botblack
+    doors:
+      Scientific Entrance:
+        id: Red Blue Purple Room Area Doors/Door_chemistry_lab
+        item_name: The Scientific - Entrance
+        panels:
+          - OPEN
+  The Scientific:
+    entrances:
+      Outside The Scientific:
+        room: Outside The Scientific
+        door: Scientific Entrance
+    panels:
+      Achievement:
+        id: Countdown Panels/Panel_scientific_scientific
+        colors:
+          - yellow
+          - red
+          - blue
+          - brown
+          - black
+          - purple
+        tag: forbid
+        check: True
+        achievement: The Scientific
+      HYDROGEN (1):
+        id: Chemistry Room/Panel_blue_bot_3
+        colors: blue
+        tag: tri botblue
+        link: tbb WATER
+      OXYGEN:
+        id: Chemistry Room/Panel_blue_bot_2
+        colors: blue
+        tag: tri botblue
+        link: tbb WATER
+      HYDROGEN (2):
+        id: Chemistry Room/Panel_blue_bot_4
+        colors: blue
+        tag: tri botblue
+        link: tbb WATER
+      SUGAR (1):
+        id: Chemistry Room/Panel_sugar_1
+        colors: red
+        tag: botred
+      SUGAR (2):
+        id: Chemistry Room/Panel_sugar_2
+        colors: red
+        tag: botred
+      SUGAR (3):
+        id: Chemistry Room/Panel_sugar_3
+        colors: red
+        tag: botred
+      CHLORINE:
+        id: Chemistry Room/Panel_blue_bot_5
+        colors: blue
+        tag: double botblue
+        subtag: left
+        link: holo SALT
+      SODIUM:
+        id: Chemistry Room/Panel_blue_bot_6
+        colors: blue
+        tag: double botblue
+        subtag: right
+        link: holo SALT
+      FOREST:
+        id: Chemistry Room/Panel_long_bot_1
+        colors:
+          - red
+          - blue
+        tag: chain red bot blue top
+      POUND:
+        id: Chemistry Room/Panel_long_top_1
+        colors:
+          - red
+          - blue
+        tag: chain blue mid red bot
+      ICE:
+        id: Chemistry Room/Panel_brown_bot_1
+        colors: brown
+        tag: botbrown
+      FISSION:
+        id: Chemistry Room/Panel_black_bot_1
+        colors: black
+        tag: botblack
+      FUSION:
+        id: Chemistry Room/Panel_black_bot_2
+        colors: black
+        tag: botblack
+      MISS:
+        id: Chemistry Room/Panel_blue_top_1
+        colors: blue
+        tag: double topblue
+        subtag: left
+        link: exp CHEMISTRY
+      TREE (1):
+        id: Chemistry Room/Panel_blue_top_2
+        colors: blue
+        tag: double topblue
+        subtag: right
+        link: exp CHEMISTRY
+      BIOGRAPHY:
+        id: Chemistry Room/Panel_biology_9
+        colors: purple
+        tag: midpurp
+      CACTUS:
+        id: Chemistry Room/Panel_biology_4
+        colors: red
+        tag: double botred
+        subtag: right
+        link: mero SPINE
+      VERTEBRATE:
+        id: Chemistry Room/Panel_biology_8
+        colors: red
+        tag: double botred
+        subtag: left
+        link: mero SPINE
+      ROSE:
+        id: Chemistry Room/Panel_biology_2
+        colors: red
+        tag: botred
+      TREE (2):
+        id: Chemistry Room/Panel_biology_3
+        colors: red
+        tag: botred
+      FRUIT:
+        id: Chemistry Room/Panel_biology_1
+        colors: red
+        tag: botred
+      MAMMAL:
+        id: Chemistry Room/Panel_biology_5
+        colors: red
+        tag: botred
+      BIRD:
+        id: Chemistry Room/Panel_biology_6
+        colors: red
+        tag: botred
+      FISH:
+        id: Chemistry Room/Panel_biology_7
+        colors: red
+        tag: botred
+      GRAVELY:
+        id: Chemistry Room/Panel_physics_9
+        colors: purple
+        tag: double midpurp
+        subtag: left
+        link: change GRAVITY
+      BREVITY:
+        id: Chemistry Room/Panel_biology_10
+        colors: purple
+        tag: double midpurp
+        subtag: right
+        link: change GRAVITY
+      PART:
+        id: Chemistry Room/Panel_physics_2
+        colors:
+          - blue
+          - red
+        tag: blue mid red bot
+        subtag: mid
+        link: xur PARTICLE
+      MATTER:
+        id: Chemistry Room/Panel_physics_1
+        colors:
+          - blue
+          - red
+        tag: blue mid red bot
+        subtag: bot
+        link: xur PARTICLE
+      ELECTRIC:
+        id: Chemistry Room/Panel_physics_6
+        colors:
+          - purple
+          - red
+        tag: purple mid red bot
+        subtag: mid
+        link: xpr ELECTRON
+      ATOM (1):
+        id: Chemistry Room/Panel_physics_3
+        colors:
+          - purple
+          - red
+        tag: purple mid red bot
+        subtag: bot
+        link: xpr ELECTRON
+      NEUTRAL:
+        id: Chemistry Room/Panel_physics_7
+        colors:
+          - purple
+          - red
+        tag: purple mid red bot
+        subtag: mid
+        link: xpr NEUTRON
+      ATOM (2):
+        id: Chemistry Room/Panel_physics_4
+        colors:
+          - purple
+          - red
+        tag: purple mid red bot
+        subtag: bot
+        link: xpr NEUTRON
+      PROPEL:
+        id: Chemistry Room/Panel_physics_8
+        colors:
+          - purple
+          - red
+        tag: purple mid red bot
+        subtag: mid
+        link: xpr PROTON
+      ATOM (3):
+        id: Chemistry Room/Panel_physics_5
+        colors:
+          - purple
+          - red
+        tag: purple mid red bot
+        subtag: bot
+        link: xpr PROTON
+      ORDER:
+        id: Chemistry Room/Panel_physics_11
+        colors: brown
+        tag: botbrown
+      OPTICS:
+        id: Chemistry Room/Panel_physics_10
+        colors: yellow
+        tag: midyellow
+      GRAPHITE:
+        id: Chemistry Room/Panel_yellow_bot_1
+        colors: yellow
+        tag: botyellow
+      HOT RYE:
+        id: Chemistry Room/Panel_anagram_1
+        colors: yellow
+        tag: midyellow
+      SIT SHY HOPE:
+        id: Chemistry Room/Panel_anagram_2
+        colors: yellow
+        tag: midyellow
+      ME NEXT PIER:
+        id: Chemistry Room/Panel_anagram_3
+        colors: yellow
+        tag: midyellow
+      RUT LESS:
+        id: Chemistry Room/Panel_anagram_4
+        colors: yellow
+        tag: midyellow
+      SON COUNCIL:
+        id: Chemistry Room/Panel_anagram_5
+        colors: yellow
+        tag: midyellow
+    doors:
+      Chemistry Puzzles:
+        skip_item: True
+        location_name: The Scientific - Chemistry Puzzles
+        panels:
+          - HYDROGEN (1)
+          - OXYGEN
+          - HYDROGEN (2)
+          - SUGAR (1)
+          - SUGAR (2)
+          - SUGAR (3)
+          - CHLORINE
+          - SODIUM
+          - FOREST
+          - POUND
+          - ICE
+          - FISSION
+          - FUSION
+          - MISS
+          - TREE (1)
+      Biology Puzzles:
+        skip_item: True
+        location_name: The Scientific - Biology Puzzles
+        panels:
+          - BIOGRAPHY
+          - CACTUS
+          - VERTEBRATE
+          - ROSE
+          - TREE (2)
+          - FRUIT
+          - MAMMAL
+          - BIRD
+          - FISH
+      Physics Puzzles:
+        skip_item: True
+        location_name: The Scientific - Physics Puzzles
+        panels:
+          - GRAVELY
+          - BREVITY
+          - PART
+          - MATTER
+          - ELECTRIC
+          - ATOM (1)
+          - NEUTRAL
+          - ATOM (2)
+          - PROPEL
+          - ATOM (3)
+          - ORDER
+          - OPTICS
+    paintings:
+      - id: hi_solved_painting4
+        orientation: south
+        req_blocked_when_no_doors: True # owl hallway in vanilla doors
+  Challenge Room:
+    entrances:
+      Welcome Back Area:
+        door: Welcome Door
+      Number Hunt:
+        room: Outside The Undeterred
+        door: Challenge Entrance
+    panels:
+      WELCOME:
+        id: Challenge Room/Panel_welcome_welcome
+        tag: midwhite
+      CHALLENGE:
+        id: Challenge Room/Panel_challenge_challenge
+        tag: midwhite
+      Achievement:
+        id: Countdown Panels/Panel_challenged_unchallenged
+        check: True
+        colors:
+          - black
+          - gray
+          - red
+          - blue
+          - yellow
+          - purple
+          - brown
+          - orange
+        tag: forbid
+        achievement: The Unchallenged
+      OPEN:
+        id: Challenge Room/Panel_open_nepotism
+        colors:
+          - black
+          - blue
+        tag: chain mid black !!! blue
+      SINGED:
+        id: Challenge Room/Panel_singed_singsong
+        colors:
+          - red
+          - blue
+        tag: chain mid red blue
+      NEVER TRUSTED:
+        id: Challenge Room/Panel_nevertrusted_maladjusted
+        colors: purple
+        tag: midpurp
+      CORNER:
+        id: Challenge Room/Panel_corner_corn
+        colors: red
+        tag: midred
+      STRAWBERRIES:
+        id: Challenge Room/Panel_strawberries_mold
+        colors: brown
+        tag: double botbrown
+        subtag: left
+        link: time MOLD
+      GRUB:
+        id: Challenge Room/Panel_grub_burger
+        colors:
+          - black
+          - blue
+        tag: chain mid black blue
+      BREAD:
+        id: Challenge Room/Panel_bread_mold
+        colors: brown
+        tag: double botbrown
+        subtag: right
+        link: time MOLD
+      COLOR:
+        id: Challenge Room/Panel_color_gray
+        colors: gray
+        tag: forbid
+      WRITER:
+        id: Challenge Room/Panel_writer_songwriter
+        colors: blue
+        tag: midblue
+      "02759":
+        id: Challenge Room/Panel_tales_stale
+        colors:
+          - orange
+          - yellow
+        tag: chain mid orange yellow
+      REAL EYES:
+        id: Challenge Room/Panel_realeyes_realize
+        tag: topwhite
+      LOBS:
+        id: Challenge Room/Panel_lobs_lobster
+        colors: blue
+        tag: midblue
+      PEST ALLY:
+        id: Challenge Room/Panel_double_anagram_1
+        colors: yellow
+        tag: midyellow
+      GENIAL HALO:
+        id: Challenge Room/Panel_double_anagram_2
+        colors: yellow
+        tag: midyellow
+      DUCK LOGO:
+        id: Challenge Room/Panel_double_anagram_3
+        colors: yellow
+        tag: midyellow
+      AVIAN GREEN:
+        id: Challenge Room/Panel_double_anagram_4
+        colors: yellow
+        tag: midyellow
+      FEVER TEAR:
+        id: Challenge Room/Panel_double_anagram_5
+        colors: yellow
+        tag: midyellow
+      FACTS:
+        id: Challenge Room/Panel_facts
+        colors:
+          - red
+          - blue
+        tag: forbid
+      FACTS (1):
+        id: Challenge Room/Panel_facts2
+        colors: red
+        tag: forbid
+      FACTS (3):
+        id: Challenge Room/Panel_facts3
+        tag: forbid
+      FACTS (4):
+        id: Challenge Room/Panel_facts4
+        colors: blue
+        tag: forbid
+      FACTS (5):
+        id: Challenge Room/Panel_facts5
+        colors: blue
+        tag: forbid
+      FACTS (6):
+        id: Challenge Room/Panel_facts6
+        colors: blue
+        tag: forbid
+      LAPEL SHEEP:
+        id: Challenge Room/Panel_double_anagram_6
+        colors: yellow
+        tag: midyellow
+    doors:
+      Welcome Door:
+        id: Entry Room Area Doors/Door_challenge_challenge
+        panels:
+          - WELCOME
diff --git a/worlds/lingo/data/__init__.py b/worlds/lingo/data/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/worlds/lingo/data/ids.yaml b/worlds/lingo/data/ids.yaml
new file mode 100644
index 0000000000..3239f21854
--- /dev/null
+++ b/worlds/lingo/data/ids.yaml
@@ -0,0 +1,1454 @@
+---
+special_items:
+  Black: 444400
+  Red: 444401
+  Blue: 444402
+  Yellow: 444403
+  Green: 444404
+  Orange: 444405
+  Gray: 444406
+  Brown: 444407
+  Purple: 444408
+  ":)": 444409
+  The Feeling of Being Lost: 444575
+  Wanderlust: 444576
+  Empty White Hallways: 444577
+  Slowness Trap: 444410
+  Iceland Trap: 444411
+  Atbash Trap: 444412
+  Puzzle Skip: 444413
+panels:
+  Starting Room:
+    HI: 444400
+    HIDDEN: 444401
+    TYPE: 444402
+    THIS: 444403
+    WRITE: 444404
+    SAME: 444405
+  Hidden Room:
+    DEAD END: 444406
+    OPEN: 444407
+    LIES: 444408
+  The Seeker:
+    Achievement: 444409
+    BEAR: 444410
+    MINE: 444411
+    MINE (2): 444412
+    BOW: 444413
+    DOES: 444414
+    MOBILE: 444415
+    MOBILE (2): 444416
+    DESERT: 444417
+    DESSERT: 444418
+    SOW: 444419
+    SEW: 444420
+    TO: 444421
+    TOO: 444422
+    WRITE: 444423
+    EWE: 444424
+    KNOT: 444425
+    NAUGHT: 444426
+    BEAR (2): 444427
+  Second Room:
+    HI: 444428
+    LOW: 444429
+    ANOTHER TRY: 444430
+    LEVEL 2: 444431
+  Hub Room:
+    ORDER: 444432
+    SLAUGHTER: 444433
+    NEAR: 444434
+    FAR: 444435
+    TRACE: 444436
+    RAT: 444437
+    OPEN: 444438
+    FOUR: 444439
+    LOST: 444440
+    FORWARD: 444441
+    BETWEEN: 444442
+    BACKWARD: 444443
+  Dead End Area:
+    FOUR: 444444
+    EIGHT: 444445
+  Pilgrim Antechamber:
+    HOT CRUST: 444446
+    PILGRIMAGE: 444447
+    MASTERY: 444448
+  Pilgrim Room:
+    THIS: 444449
+    TIME ROOM: 444450
+    SCIENCE ROOM: 444451
+    SHINY ROCK ROOM: 444452
+    ANGRY POWER: 444453
+    MICRO LEGION: 444454
+    LOSERS RELAX: 444455
+    '906234': 444456
+    MOOR EMORDNILAP: 444457
+    HALL ROOMMATE: 444458
+    ALL GREY: 444459
+    PLUNDER ISLAND: 444460
+    FLOSS PATHS: 444461
+  Crossroads:
+    DECAY: 444462
+    NOPE: 444463
+    EIGHT: 444464
+    WE ROT: 444465
+    WORDS: 444466
+    SWORD: 444467
+    TURN: 444468
+    BEND HI: 444469
+    THE EYES: 444470
+    CORNER: 444471
+    HOLLOW: 444472
+    SWAP: 444473
+    GEL: 444474
+    THOUGH: 444475
+    CROSSROADS: 444476
+  Lost Area:
+    LOST (1): 444477
+    LOST (2): 444478
+  Amen Name Area:
+    AMEN: 444479
+    NAME: 444480
+    NINE: 444481
+  Suits Area:
+    SPADES: 444482
+    CLUBS: 444483
+    HEARTS: 444484
+  The Tenacious:
+    LEVEL (Black): 444485
+    RACECAR (Black): 444486
+    SOLOS (Black): 444487
+    LEVEL (White): 444488
+    RACECAR (White): 444489
+    SOLOS (White): 444490
+    Achievement: 444491
+  Warts Straw Area:
+    WARTS: 444492
+    STRAW: 444493
+  Leaf Feel Area:
+    LEAF: 444494
+    FEEL: 444495
+  Outside The Agreeable:
+    MASSACRED: 444496
+    BLACK: 444497
+    CLOSE: 444498
+    LEFT: 444499
+    LEFT (2): 444500
+    RIGHT: 444501
+    PURPLE: 444502
+    FIVE (1): 444503
+    FIVE (2): 444504
+    OUT: 444505
+    HIDE: 444506
+    DAZE: 444507
+    WALL: 444508
+    KEEP: 444509
+    BAILEY: 444510
+    TOWER: 444511
+    NORTH: 444512
+    DIAMONDS: 444513
+    FIRE: 444514
+    WINTER: 444515
+  Dread Hallway:
+    DREAD: 444516
+  The Agreeable:
+    Achievement: 444517
+    BYE: 444518
+    RETOOL: 444519
+    DRAWER: 444520
+    READ: 444521
+    DIFFERENT: 444522
+    LOW: 444523
+    ALIVE: 444524
+    THAT: 444525
+    STRESSED: 444526
+    STAR: 444527
+    TAME: 444528
+    CAT: 444529
+  Hedge Maze:
+    DOWN: 444530
+    HIDE (1): 444531
+    HIDE (2): 444532
+    HIDE (3): 444533
+    MASTERY (1): 444534
+    MASTERY (2): 444535
+    PATH (1): 444536
+    PATH (2): 444537
+    PATH (3): 444538
+    PATH (4): 444539
+    PATH (5): 444540
+    PATH (6): 444541
+    PATH (7): 444542
+    PATH (8): 444543
+    REFLOW: 444544
+    LEAP: 444545
+  The Perceptive:
+    Achievement: 444546
+    GAZE: 444547
+  The Fearless (First Floor):
+    NAPS: 444548
+    TEAM: 444549
+    TEEM: 444550
+    IMPATIENT: 444551
+    EAT: 444552
+  The Fearless (Second Floor):
+    NONE: 444553
+    SUM: 444554
+    FUNNY: 444555
+    MIGHT: 444556
+    SAFE: 444557
+    SAME: 444558
+    CAME: 444559
+  The Fearless:
+    Achievement: 444560
+    EASY: 444561
+    SOMETIMES: 444562
+    DARK: 444563
+    EVEN: 444564
+  The Observant:
+    Achievement: 444565
+    BACK: 444566
+    SIDE: 444567
+    BACKSIDE: 444568
+    STAIRS: 444569
+    WAYS: 444570
+    'ON': 444571
+    UP: 444572
+    SWIMS: 444573
+    UPSTAIRS: 444574
+    TOIL: 444575
+    STOP: 444576
+    TOP: 444577
+    HI: 444578
+    HI (2): 444579
+    '31': 444580
+    '52': 444581
+    OIL: 444582
+    BACKSIDE (GREEN): 444583
+    SIDEWAYS: 444584
+  The Incomparable:
+    Achievement: 444585
+    A (One): 444586
+    A (Two): 444587
+    A (Three): 444588
+    A (Four): 444589
+    A (Five): 444590
+    A (Six): 444591
+    I (One): 444592
+    I (Two): 444593
+    I (Three): 444594
+    I (Four): 444595
+    I (Five): 444596
+    I (Six): 444597
+    I (Seven): 444598
+  Eight Room:
+    Eight Back: 444599
+    Eight Front: 444600
+    Nine: 444601
+  Orange Tower First Floor:
+    SECRET: 444602
+    DADS + ALE: 444603
+    SALT: 444604
+  Orange Tower Third Floor:
+    RED: 444605
+    DEER + WREN: 444606
+  Orange Tower Fourth Floor:
+    RUNT: 444607
+    RUNT (2): 444608
+    LEARNS + UNSEW: 444609
+    HOT CRUSTS: 444610
+    IRK HORN: 444611
+  Hot Crusts Area:
+    EIGHT: 444612
+  Orange Tower Fifth Floor:
+    SIZE (Small): 444613
+    SIZE (Big): 444614
+    DRAWL + RUNS: 444615
+    NINE: 444616
+    SUMMER: 444617
+    AUTUMN: 444618
+    SPRING: 444619
+    PAINTING (1): 445078
+    PAINTING (2): 445079
+    PAINTING (3): 445080
+    PAINTING (4): 445081
+    PAINTING (5): 445082
+    ROOM: 445083
+  Orange Tower Seventh Floor:
+    THE END: 444620
+    THE MASTER: 444621
+    MASTERY: 444622
+  Roof:
+    MASTERY (1): 444623
+    MASTERY (2): 444624
+    MASTERY (3): 444625
+    MASTERY (4): 444626
+    MASTERY (5): 444627
+    MASTERY (6): 444628
+    STAIRCASE: 444629
+  Orange Tower Basement:
+    MASTERY: 444630
+    THE LIBRARY: 444631
+  Courtyard:
+    I: 444632
+    GREEN: 444633
+    PINECONE: 444634
+    ACORN: 444635
+  Yellow Backside Area:
+    BACKSIDE: 444636
+    NINE: 444637
+  First Second Third Fourth:
+    FIRST: 444638
+    SECOND: 444639
+    THIRD: 444640
+    FOURTH: 444641
+  The Colorful (White):
+    BEGIN: 444642
+  The Colorful (Black):
+    FOUND: 444643
+  The Colorful (Red):
+    LOAF: 444644
+  The Colorful (Yellow):
+    CREAM: 444645
+  The Colorful (Blue):
+    SUN: 444646
+  The Colorful (Purple):
+    SPOON: 444647
+  The Colorful (Orange):
+    LETTERS: 444648
+  The Colorful (Green):
+    WALLS: 444649
+  The Colorful (Brown):
+    IRON: 444650
+  The Colorful (Gray):
+    OBSTACLE: 444651
+  The Colorful:
+    Achievement: 444652
+  Welcome Back Area:
+    WELCOME BACK: 444653
+    SECRET: 444654
+    CLOCKWISE: 444655
+  Owl Hallway:
+    STRAYS: 444656
+    READS + RUST: 444657
+  Outside The Initiated:
+    SEVEN (1): 444658
+    SEVEN (2): 444659
+    EIGHT: 444660
+    NINE: 444661
+    BLUE: 444662
+    ORANGE: 444663
+    UNCOVER: 444664
+    OXEN: 444665
+    BACKSIDE: 444666
+    The Optimistic: 444667
+    PAST: 444668
+    FUTURE: 444669
+    FUTURE (2): 444670
+    PAST (2): 444671
+    PRESENT: 444672
+    SMILE: 444673
+    ANGERED: 444674
+    VOTE: 444675
+  The Initiated:
+    Achievement: 444676
+    DAUGHTER: 444677
+    START: 444678
+    STARE: 444679
+    HYPE: 444680
+    ABYSS: 444681
+    SWEAT: 444682
+    BEAT: 444683
+    ALUMNI: 444684
+    PATS: 444685
+    KNIGHT: 444686
+    BYTE: 444687
+    MAIM: 444688
+    MORGUE: 444689
+    CHAIR: 444690
+    HUMAN: 444691
+    BED: 444692
+  The Traveled:
+    Achievement: 444693
+    CLOSE: 444694
+    COMPOSE: 444695
+    RECORD: 444696
+    CATEGORY: 444697
+    HELLO: 444698
+    DUPLICATE: 444699
+    IDENTICAL: 444700
+    DISTANT: 444701
+    HAY: 444702
+    GIGGLE: 444703
+    CHUCKLE: 444704
+    SNITCH: 444705
+    CONCEALED: 444706
+    PLUNGE: 444707
+    AUTUMN: 444708
+    ROAD: 444709
+    FOUR: 444710
+  Outside The Bold:
+    UNOPEN: 444711
+    BEGIN: 444712
+    SIX: 444713
+    NINE: 444714
+    LEFT: 444715
+    RIGHT: 444716
+    RISE (Horizon): 444717
+    RISE (Sunrise): 444718
+    ZEN: 444719
+    SON: 444720
+    STARGAZER: 444721
+    MOUTH: 444722
+    YEAST: 444723
+    WET: 444724
+  The Bold:
+    Achievement: 444725
+    FOOT: 444726
+    NEEDLE: 444727
+    FACE: 444728
+    SIGN: 444729
+    HEARTBREAK: 444730
+    UNDEAD: 444731
+    DEADLINE: 444732
+    SUSHI: 444733
+    THISTLE: 444734
+    LANDMASS: 444735
+    MASSACRED: 444736
+    AIRPLANE: 444737
+    NIGHTMARE: 444738
+    MOUTH: 444739
+    SAW: 444740
+    HAND: 444741
+  Outside The Undeterred:
+    HOLLOW: 444742
+    ART + ART: 444743
+    PEN: 444744
+    HUSTLING: 444745
+    SUNLIGHT: 444746
+    LIGHT: 444747
+    BRIGHT: 444748
+    SUNNY: 444749
+    RAINY: 444750
+    ZERO: 444751
+    ONE: 444752
+    TWO (1): 444753
+    TWO (2): 444754
+    THREE (1): 444755
+    THREE (2): 444756
+    THREE (3): 444757
+    FOUR: 444758
+  The Undeterred:
+    Achievement: 444759
+    BONE: 444760
+    EYE: 444761
+    MOUTH: 444762
+    IRIS: 444763
+    EYE (2): 444764
+    ICE: 444765
+    HEIGHT: 444766
+    EYE (3): 444767
+    NOT: 444768
+    JUST: 444769
+    READ: 444770
+    FATHER: 444771
+    FEATHER: 444772
+    CONTINENT: 444773
+    OCEAN: 444774
+    WALL: 444775
+  Number Hunt:
+    FIVE: 444776
+    SIX: 444777
+    SEVEN: 444778
+    EIGHT: 444779
+    NINE: 444780
+  Directional Gallery:
+    PEPPER: 444781
+    TURN: 444782
+    LEARN: 444783
+    FIVE (1): 444784
+    FIVE (2): 444785
+    SIX (1): 444786
+    SIX (2): 444787
+    SEVEN: 444788
+    EIGHT: 444789
+    NINE: 444790
+    BACKSIDE: 444791
+    '834283054': 444792
+    PARANOID: 444793
+    YELLOW: 444794
+    WADED + WEE: 444795
+    THE EYES: 444796
+    LEFT: 444797
+    RIGHT: 444798
+    MIDDLE: 444799
+    WARD: 444800
+    HIND: 444801
+    RIG: 444802
+    WINDWARD: 444803
+    LIGHT: 444804
+    REWIND: 444805
+  Champion's Rest:
+    EXIT: 444806
+    HUES: 444807
+    RED: 444808
+    BLUE: 444809
+    YELLOW: 444810
+    GREEN: 444811
+    PURPLE: 444812
+    ORANGE: 444813
+    YOU: 444814
+    ME: 444815
+    SECRET BLUE: 444816
+    SECRET YELLOW: 444817
+    SECRET RED: 444818
+  The Bearer:
+    Achievement: 444819
+    MIDDLE: 444820
+    FARTHER: 444821
+    BACKSIDE: 444822
+    PART: 444823
+    HEART: 444824
+  The Bearer (East):
+    SIX: 444825
+    PEACE: 444826
+  The Bearer (North):
+    SILENT (1): 444827
+    SILENT (2): 444828
+    SPACE: 444829
+    WARTS: 444830
+  The Bearer (South):
+    SIX: 444831
+    TENT: 444832
+    BOWL: 444833
+  The Bearer (West):
+    SNOW: 444834
+    SMILE: 444835
+  Bearer Side Area:
+    SHORTCUT: 444836
+    POTS: 444837
+  Cross Tower (East):
+    WINTER: 444838
+  Cross Tower (North):
+    NORTH: 444839
+  Cross Tower (South):
+    FIRE: 444840
+  Cross Tower (West):
+    DIAMONDS: 444841
+  The Steady (Rose):
+    SOAR: 444842
+  The Steady (Ruby):
+    BURY: 444843
+  The Steady (Carnation):
+    INCARNATION: 444844
+  The Steady (Sunflower):
+    SUN: 444845
+  The Steady (Plum):
+    LUMP: 444846
+  The Steady (Lime):
+    LIMELIGHT: 444847
+  The Steady (Lemon):
+    MELON: 444848
+  The Steady (Topaz):
+    TOP: 444849
+    MASTERY: 444850
+  The Steady (Orange):
+    BLUE: 444851
+  The Steady (Sapphire):
+    SAP: 444852
+  The Steady (Blueberry):
+    BLUE: 444853
+  The Steady (Amber):
+    ANTECHAMBER: 444854
+  The Steady (Emerald):
+    HERALD: 444855
+  The Steady (Amethyst):
+    PACIFIST: 444856
+  The Steady (Lilac):
+    LIE LACK: 444857
+  The Steady (Cherry):
+    HAIRY: 444858
+  The Steady:
+    Achievement: 444859
+  Knight Night (Outer Ring):
+    NIGHT: 444860
+    KNIGHT: 444861
+    BEE: 444862
+    NEW: 444863
+    FORE: 444864
+    TRUSTED (1): 444865
+    TRUSTED (2): 444866
+    ENCRUSTED: 444867
+    ADJUST (1): 444868
+    ADJUST (2): 444869
+    RIGHT: 444870
+    TRUST: 444871
+  Knight Night (Right Upper Segment):
+    RUST (1): 444872
+    RUST (2): 444873
+  Knight Night (Right Lower Segment):
+    ADJUST: 444874
+    BEFORE: 444875
+    BE: 444876
+    LEFT: 444877
+    TRUST: 444878
+  Knight Night (Final):
+    TRUSTED: 444879
+  Knight Night Exit:
+    SEVEN (1): 444880
+    SEVEN (2): 444881
+    SEVEN (3): 444882
+    DEAD END: 444883
+    WARNER: 444884
+  The Artistic (Smiley):
+    Achievement: 444885
+    FINE: 444886
+    BLADE: 444887
+    RED: 444888
+    BEARD: 444889
+    ICE: 444890
+    ROOT: 444891
+  The Artistic (Panda):
+    EYE (Top): 444892
+    EYE (Bottom): 444893
+    LADYLIKE: 444894
+    WATER: 444895
+    OURS: 444896
+    DAYS: 444897
+    NIGHTTIME: 444898
+    NIGHT: 444899
+  The Artistic (Lattice):
+    POSH: 444900
+    MALL: 444901
+    DEICIDE: 444902
+    WAVER: 444903
+    REPAID: 444904
+    BABY: 444905
+    LOBE: 444906
+    BOWELS: 444907
+  The Artistic (Apple):
+    SPRIG: 444908
+    RELEASES: 444909
+    MUCH: 444910
+    FISH: 444911
+    MASK: 444912
+    HILL: 444913
+    TINE: 444914
+    THING: 444915
+  The Artistic (Hint Room):
+    THEME: 444916
+    PAINTS: 444917
+    I: 444918
+    KIT: 444919
+  The Discerning:
+    Achievement: 444920
+    HITS: 444921
+    WARRED: 444922
+    REDRAW: 444923
+    ADDER: 444924
+    LAUGHTERS: 444925
+    STONE: 444926
+    ONSET: 444927
+    RAT: 444928
+    DUSTY: 444929
+    ARTS: 444930
+    TSAR: 444931
+    STATE: 444932
+    REACT: 444933
+    DEAR: 444934
+    DARE: 444935
+    SEAM: 444936
+  The Eyes They See:
+    NEAR: 444937
+    EIGHT: 444938
+  Far Window:
+    FAR: 444939
+  Outside The Wondrous:
+    SHRINK: 444940
+  The Wondrous (Bookcase):
+    CASE: 444941
+  The Wondrous (Chandelier):
+    CANDLE HEIR: 444942
+  The Wondrous (Window):
+    GLASS: 444943
+  The Wondrous (Table):
+    WOOD: 444944
+    BROOK NOD: 444945
+  The Wondrous:
+    FIREPLACE: 444946
+    Achievement: 444947
+  Arrow Garden:
+    MASTERY: 444948
+    SHARP: 444949
+  Hallway Room (2):
+    WISE: 444950
+    CLOCK: 444951
+    ER: 444952
+    COUNT: 444953
+  Hallway Room (3):
+    TRANCE: 444954
+    FORM: 444955
+    A: 444956
+    SHUN: 444957
+  Hallway Room (4):
+    WHEEL: 444958
+  Elements Area:
+    A: 444959
+    NINE: 444960
+    UNDISTRACTED: 444961
+    MASTERY: 444962
+    EARTH: 444963
+    WATER: 444964
+    AIR: 444965
+  Outside The Wanderer:
+    WANDERLUST: 444966
+  The Wanderer:
+    Achievement: 444967
+    '7890': 444968
+    '6524': 444969
+    '951': 444970
+    '4524': 444971
+    LEARN: 444972
+    DUST: 444973
+    STAR: 444974
+    WANDER: 444975
+  Art Gallery:
+    EIGHT: 444976
+    EON: 444977
+    TRUSTWORTHY: 444978
+    FREE: 444979
+    OUR: 444980
+    ONE ROAD MANY TURNS: 444981
+  Art Gallery (Second Floor):
+    HOUSE: 444982
+    PATH: 444983
+    PARK: 444984
+    CARRIAGE: 444985
+  Art Gallery (Third Floor):
+    AN: 444986
+    MAY: 444987
+    ANY: 444988
+    MAN: 444989
+  Art Gallery (Fourth Floor):
+    URNS: 444990
+    LEARNS: 444991
+    RUNTS: 444992
+    SEND - USE: 444993
+    TRUST: 444994
+    '062459': 444995
+  Rhyme Room (Smiley):
+    LOANS: 444996
+    SKELETON: 444997
+    REPENTANCE: 444998
+    WORD: 444999
+    SCHEME: 445000
+    FANTASY: 445001
+    HISTORY: 445002
+    SECRET: 445003
+  Rhyme Room (Cross):
+    NINE: 445004
+    FERN: 445005
+    STAY: 445006
+    FRIEND: 445007
+    RISE: 445008
+    PLUMP: 445009
+    BOUNCE: 445010
+    SCRAWL: 445011
+    PLUNGE: 445012
+    LEAP: 445013
+  Rhyme Room (Circle):
+    BIRD: 445014
+    LETTER: 445015
+    FORBIDDEN: 445016
+    CONCEALED: 445017
+    VIOLENT: 445018
+    MUTE: 445019
+  Rhyme Room (Looped Square):
+    WALKED: 445020
+    OBSTRUCTED: 445021
+    SKIES: 445022
+    SWELL: 445023
+    PENNED: 445024
+    CLIMB: 445025
+    TROUBLE: 445026
+    DUPLICATE: 445027
+  Rhyme Room (Target):
+    WILD: 445028
+    KID: 445029
+    PISTOL: 445030
+    QUARTZ: 445031
+    INNOVATIVE (Top): 445032
+    INNOVATIVE (Bottom): 445033
+  Room Room:
+    DOOR (1): 445034
+    DOOR (2): 445035
+    WINDOW: 445036
+    STAIRS: 445037
+    PAINTING: 445038
+    FLOOR (1): 445039
+    FLOOR (2): 445040
+    FLOOR (3): 445041
+    FLOOR (4): 445042
+    FLOOR (5): 445043
+    FLOOR (7): 445044
+    FLOOR (8): 445045
+    FLOOR (9): 445046
+    FLOOR (10): 445047
+    CEILING (1): 445048
+    CEILING (2): 445049
+    CEILING (3): 445050
+    CEILING (4): 445051
+    CEILING (5): 445052
+    WALL (1): 445053
+    WALL (2): 445054
+    WALL (3): 445055
+    WALL (4): 445056
+    WALL (5): 445057
+    WALL (6): 445058
+    WALL (7): 445059
+    WALL (8): 445060
+    WALL (9): 445061
+    WALL (10): 445062
+    WALL (11): 445063
+    WALL (12): 445064
+    WALL (13): 445065
+    WALL (14): 445066
+    WALL (15): 445067
+    WALL (16): 445068
+    WALL (17): 445069
+    WALL (18): 445070
+    WALL (19): 445071
+    WALL (20): 445072
+    WALL (21): 445073
+    BROOMED: 445074
+    LAYS: 445075
+    BASE: 445076
+    MASTERY: 445077
+  Outside The Wise:
+    KITTEN: 445084
+    CAT: 445085
+  The Wise:
+    Achievement: 445086
+    PUPPY: 445087
+    ADULT: 445088
+    BREAD: 445089
+    DINOSAUR: 445090
+    OAK: 445091
+    CORPSE: 445092
+    BEFORE: 445093
+    YOUR: 445094
+    BETWIXT: 445095
+    NIGH: 445096
+    CONNEXION: 445097
+    THOU: 445098
+  The Red:
+    Achievement: 445099
+    PANDEMIC (1): 445100
+    TRINITY: 445101
+    CHEMISTRY: 445102
+    FLUMMOXED: 445103
+    PANDEMIC (2): 445104
+    COUNTERCLOCKWISE: 445105
+    FEARLESS: 445106
+    DEFORESTATION: 445107
+    CRAFTSMANSHIP: 445108
+    CAMEL: 445109
+    LION: 445110
+    TIGER: 445111
+    SHIP (1): 445112
+    SHIP (2): 445113
+    GIRAFFE: 445114
+  The Ecstatic:
+    Achievement: 445115
+    FORM (1): 445116
+    WIND: 445117
+    EGGS: 445118
+    VEGETABLES: 445119
+    WATER: 445120
+    FRUITS: 445121
+    LEAVES: 445122
+    VINES: 445123
+    ICE: 445124
+    STYLE: 445125
+    FIR: 445126
+    REEF: 445127
+    ROTS: 445128
+    FORM (2): 445129
+  Outside The Scientific:
+    OPEN: 445130
+    CLOSE: 445131
+    AHEAD: 445132
+  The Scientific:
+    Achievement: 445133
+    HYDROGEN (1): 445134
+    OXYGEN: 445135
+    HYDROGEN (2): 445136
+    SUGAR (1): 445137
+    SUGAR (2): 445138
+    SUGAR (3): 445139
+    CHLORINE: 445140
+    SODIUM: 445141
+    FOREST: 445142
+    POUND: 445143
+    ICE: 445144
+    FISSION: 445145
+    FUSION: 445146
+    MISS: 445147
+    TREE (1): 445148
+    BIOGRAPHY: 445149
+    CACTUS: 445150
+    VERTEBRATE: 445151
+    ROSE: 445152
+    TREE (2): 445153
+    FRUIT: 445154
+    MAMMAL: 445155
+    BIRD: 445156
+    FISH: 445157
+    GRAVELY: 445158
+    BREVITY: 445159
+    PART: 445160
+    MATTER: 445161
+    ELECTRIC: 445162
+    ATOM (1): 445163
+    NEUTRAL: 445164
+    ATOM (2): 445165
+    PROPEL: 445166
+    ATOM (3): 445167
+    ORDER: 445168
+    OPTICS: 445169
+    GRAPHITE: 445170
+    HOT RYE: 445171
+    SIT SHY HOPE: 445172
+    ME NEXT PIER: 445173
+    RUT LESS: 445174
+    SON COUNCIL: 445175
+  Challenge Room:
+    WELCOME: 445176
+    CHALLENGE: 445177
+    Achievement: 445178
+    OPEN: 445179
+    SINGED: 445180
+    NEVER TRUSTED: 445181
+    CORNER: 445182
+    STRAWBERRIES: 445183
+    GRUB: 445184
+    BREAD: 445185
+    COLOR: 445186
+    WRITER: 445187
+    '02759': 445188
+    REAL EYES: 445189
+    LOBS: 445190
+    PEST ALLY: 445191
+    GENIAL HALO: 445192
+    DUCK LOGO: 445193
+    AVIAN GREEN: 445194
+    FEVER TEAR: 445195
+    FACTS: 445196
+    FACTS (1): 445197
+    FACTS (3): 445198
+    FACTS (4): 445199
+    FACTS (5): 445200
+    FACTS (6): 445201
+    LAPEL SHEEP: 445202
+doors:
+  Starting Room:
+    Back Right Door:
+      item: 444416
+      location: 444401
+    Rhyme Room Entrance:
+      item: 444417
+  Hidden Room:
+    Dead End Door:
+      item: 444419
+    Knight Night Entrance:
+      item: 444421
+    Seeker Entrance:
+      item: 444422
+      location: 444407
+    Rhyme Room Entrance:
+      item: 444423
+  Second Room:
+    Exit Door:
+      item: 444424
+      location: 445203
+  Hub Room:
+    Crossroads Entrance:
+      item: 444425
+      location: 444432
+    Tenacious Entrance:
+      item: 444426
+      location: 444433
+    Symmetry Door:
+      item: 444428
+      location: 445204
+    Shortcut to Hedge Maze:
+      item: 444430
+      location: 444436
+    Near RAT Door:
+      item: 444432
+    Traveled Entrance:
+      item: 444433
+      location: 444438
+    Lost Door:
+      item: 444435
+      location: 444440
+  Pilgrim Antechamber:
+    Sun Painting:
+      item: 444436
+      location: 445205
+  Pilgrim Room:
+    Shortcut to The Seeker:
+      item: 444437
+      location: 444449
+  Crossroads:
+    Tenacious Entrance:
+      item: 444438
+      location: 444462
+    Discerning Entrance:
+      item: 444439
+      location: 444463
+    Tower Entrance:
+      item: 444440
+      location: 444465
+    Tower Back Entrance:
+      item: 444442
+      location: 445206
+    Words Sword Door:
+      item: 444443
+      location: 445207
+    Eye Wall:
+      item: 444445
+      location: 444469
+    Hollow Hallway:
+      item: 444446
+    Roof Access:
+      item: 444447
+  Lost Area:
+    Exit:
+      item: 444448
+      location: 445208
+  Amen Name Area:
+    Exit:
+      item: 444449
+      location: 445209
+  The Tenacious:
+    Shortcut to Hub Room:
+      item: 444450
+      location: 445210
+    White Palindromes:
+      location: 445211
+  Warts Straw Area:
+    Door:
+      item: 444451
+      location: 445212
+  Leaf Feel Area:
+    Door:
+      item: 444452
+      location: 445213
+  Outside The Agreeable:
+    Tenacious Entrance:
+      item: 444453
+      location: 444496
+    Black Door:
+      item: 444454
+      location: 444497
+    Agreeable Entrance:
+      item: 444455
+      location: 444498
+    Painting Shortcut:
+      item: 444456
+      location: 444501
+    Purple Barrier:
+      item: 444457
+    Hallway Door:
+      item: 444459
+      location: 445214
+    Lookout Entrance:
+      item: 444579
+      location: 445271
+  Dread Hallway:
+    Tenacious Entrance:
+      item: 444462
+      location: 444516
+  The Agreeable:
+    Shortcut to Hedge Maze:
+      item: 444463
+      location: 444518
+  Hedge Maze:
+    Perceptive Entrance:
+      item: 444464
+      location: 444530
+    Painting Shortcut:
+      item: 444465
+    Observant Entrance:
+      item: 444466
+    Hide and Seek:
+      location: 445215
+  The Fearless (First Floor):
+    Second Floor:
+      item: 444468
+      location: 445216
+  The Fearless (Second Floor):
+    Third Floor:
+      item: 444471
+      location: 445217
+  The Observant:
+    Backside Door:
+      item: 444472
+      location: 445218
+    Stairs:
+      item: 444474
+      location: 444569
+  The Incomparable:
+    Eight Door:
+      item: 444475
+      location: 445219
+  Orange Tower:
+    Second Floor:
+      item: 444476
+    Third Floor:
+      item: 444477
+    Fourth Floor:
+      item: 444478
+    Fifth Floor:
+      item: 444479
+    Sixth Floor:
+      item: 444480
+    Seventh Floor:
+      item: 444481
+  Orange Tower First Floor:
+    Shortcut to Hub Room:
+      item: 444483
+      location: 444602
+    Salt Pepper Door:
+      item: 444485
+      location: 445220
+  Orange Tower Third Floor:
+    Red Barrier:
+      item: 444486
+    Rhyme Room Entrance:
+      item: 444487
+    Orange Barrier:
+      item: 444488
+      location: 445221
+  Orange Tower Fourth Floor:
+    Hot Crusts Door:
+      item: 444490
+      location: 444610
+  Orange Tower Fifth Floor:
+    Welcome Back:
+      item: 444491
+      location: 445222
+  Orange Tower Seventh Floor:
+    Mastery:
+      item: 444493
+    Mastery Panels:
+      location: 445223
+  Courtyard:
+    Painting Shortcut:
+      item: 444494
+    Green Barrier:
+      item: 444495
+  First Second Third Fourth:
+    Backside Door:
+      item: 444496
+      location: 445224
+  The Colorful (White):
+    Progress Door:
+      item: 444497
+      location: 445225
+  The Colorful (Black):
+    Progress Door:
+      item: 444499
+      location: 445226
+  The Colorful (Red):
+    Progress Door:
+      item: 444500
+      location: 445227
+  The Colorful (Yellow):
+    Progress Door:
+      item: 444501
+      location: 445228
+  The Colorful (Blue):
+    Progress Door:
+      item: 444502
+      location: 445229
+  The Colorful (Purple):
+    Progress Door:
+      item: 444503
+      location: 445230
+  The Colorful (Orange):
+    Progress Door:
+      item: 444504
+      location: 445231
+  The Colorful (Green):
+    Progress Door:
+      item: 444505
+      location: 445232
+  The Colorful (Brown):
+    Progress Door:
+      item: 444506
+      location: 445233
+  The Colorful (Gray):
+    Progress Door:
+      item: 444507
+      location: 445234
+  Welcome Back Area:
+    Shortcut to Starting Room:
+      item: 444508
+      location: 444653
+  Owl Hallway:
+    Shortcut to Hedge Maze:
+      item: 444509
+      location: 444656
+  Outside The Initiated:
+    Shortcut to Hub Room:
+      item: 444510
+      location: 444664
+    Blue Barrier:
+      item: 444511
+    Orange Barrier:
+      item: 444512
+    Initiated Entrance:
+      item: 444513
+      location: 444665
+    Green Barrier:
+      item: 444514
+      location: 445235
+    Purple Barrier:
+      item: 444515
+      location: 445236
+    Entrance:
+      item: 444516
+      location: 445237
+    Eight Door:
+      item: 444578
+  The Traveled:
+    Color Hallways Entrance:
+      item: 444517
+      location: 444698
+  Outside The Bold:
+    Bold Entrance:
+      item: 444518
+      location: 444711
+    Painting Shortcut:
+      item: 444519
+    Steady Entrance:
+      item: 444520
+      location: 444712
+  Outside The Undeterred:
+    Undeterred Entrance:
+      item: 444521
+      location: 444744
+    Painting Shortcut:
+      item: 444522
+    Green Painting:
+      item: 444523
+    Twos:
+      item: 444524
+      location: 444752
+    Threes:
+      item: 444525
+      location: 445238
+    Number Hunt:
+      item: 444526
+      location: 445239
+    Fours:
+      item: 444527
+    Fives:
+      item: 444528
+      location: 445240
+    Challenge Entrance:
+      item: 444529
+      location: 444751
+  Number Hunt:
+    Door to Directional Gallery:
+      item: 444530
+    Sixes:
+      item: 444532
+      location: 445241
+    Sevens:
+      item: 444533
+      location: 445242
+    Eights:
+      item: 444534
+      location: 445243
+    Nines:
+      item: 444535
+      location: 445244
+    Zero Door:
+      item: 444536
+      location: 445245
+  Directional Gallery:
+    Shortcut to The Undeterred:
+      item: 444537
+      location: 445246
+    Yellow Barrier:
+      item: 444538
+  Champion's Rest:
+    Shortcut to The Steady:
+      item: 444539
+      location: 444806
+  The Bearer:
+    Shortcut to The Bold:
+      item: 444540
+      location: 444820
+    Backside Door:
+      item: 444541
+      location: 444821
+  Bearer Side Area:
+    Shortcut to Tower:
+      item: 444542
+      location: 445247
+  Knight Night (Final):
+    Exit:
+      item: 444543
+      location: 445248
+  The Artistic (Smiley):
+    Door to Panda:
+      item: 444544
+      location: 445249
+  The Artistic (Panda):
+    Door to Lattice:
+      item: 444546
+      location: 445250
+  The Artistic (Lattice):
+    Door to Apple:
+      item: 444547
+      location: 445251
+  The Artistic (Apple):
+    Door to Smiley:
+      item: 444548
+      location: 445252
+  The Eyes They See:
+    Exit:
+      item: 444549
+      location: 444937
+  Outside The Wondrous:
+    Wondrous Entrance:
+      item: 444550
+      location: 444940
+  The Wondrous (Doorknob):
+    Painting Shortcut:
+      item: 444551
+  The Wondrous:
+    Exit:
+      item: 444552
+      location: 444947
+  Hallway Room (2):
+    Exit:
+      item: 444553
+      location: 445253
+  Hallway Room (3):
+    Exit:
+      item: 444554
+      location: 445254
+  Hallway Room (4):
+    Exit:
+      item: 444555
+      location: 445255
+  Outside The Wanderer:
+    Wanderer Entrance:
+      item: 444556
+      location: 444966
+    Tower Entrance:
+      item: 444557
+  Art Gallery:
+    Second Floor:
+      item: 444558
+    First Floor Puzzles:
+      location: 445256
+    Third Floor:
+      item: 444559
+    Fourth Floor:
+      item: 444560
+    Fifth Floor:
+      item: 444561
+    Exit:
+      item: 444562
+      location: 444981
+  Art Gallery (Second Floor):
+    Puzzles:
+      location: 445257
+  Art Gallery (Third Floor):
+    Puzzles:
+      location: 445258
+  Art Gallery (Fourth Floor):
+    Puzzles:
+      location: 445259
+  Rhyme Room (Smiley):
+    Door to Target:
+      item: 444564
+    Door to Target (Location):
+      location: 445260
+  Rhyme Room (Cross):
+    Exit:
+      item: 444565
+      location: 445261
+  Rhyme Room (Circle):
+    Door to Smiley:
+      item: 444566
+      location: 445262
+  Rhyme Room (Looped Square):
+    Door to Circle:
+      item: 444567
+      location: 445263
+    Door to Cross:
+      item: 444568
+      location: 445264
+    Door to Target:
+      item: 444569
+      location: 445265
+  Rhyme Room (Target):
+    Door to Cross:
+      item: 444570
+      location: 445266
+  Room Room:
+    Cellar Exit:
+      item: 444571
+      location: 445076
+  Outside The Wise:
+    Wise Entrance:
+      item: 444572
+      location: 445267
+  Outside The Scientific:
+    Scientific Entrance:
+      item: 444573
+      location: 445130
+  The Scientific:
+    Chemistry Puzzles:
+      location: 445268
+    Biology Puzzles:
+      location: 445269
+    Physics Puzzles:
+      location: 445270
+  Challenge Room:
+    Welcome Door:
+      item: 444574
+      location: 445176
+door_groups:
+  Rhyme Room Doors: 444418
+  Dead End Area Access: 444420
+  Entrances to The Tenacious: 444427
+  Symmetry Doors: 444429
+  Hedge Maze Doors: 444431
+  Entrance to The Traveled: 444434
+  Crossroads - Tower Entrances: 444441
+  Crossroads Doors: 444444
+  Color Hunt Barriers: 444458
+  Hallway Room Doors: 444460
+  Observant Doors: 444467
+  Fearless Doors: 444469
+  Backside Doors: 444473
+  Orange Tower First Floor - Shortcuts: 444484
+  Champion's Rest - Color Barriers: 444489
+  Welcome Back Doors: 444492
+  Colorful Doors: 444498
+  Directional Gallery Doors: 444531
+  Artistic Doors: 444545
+progression:
+  Progressive Hallway Room: 444461
+  Progressive Fearless: 444470
+  Progressive Orange Tower: 444482
+  Progressive Art Gallery: 444563
diff --git a/worlds/lingo/docs/en_Lingo.md b/worlds/lingo/docs/en_Lingo.md
new file mode 100644
index 0000000000..cff0581d9b
--- /dev/null
+++ b/worlds/lingo/docs/en_Lingo.md
@@ -0,0 +1,42 @@
+# Lingo
+
+## Where is the settings page?
+
+The [player settings page for this game](../player-settings) contains all the options you need to configure and export a
+config file.
+
+## What does randomization do to this game?
+
+There are a couple of modes of randomization currently available, and you can pick and choose which ones you would like
+to use.
+
+* **Door shuffle**: There are many doors in the game, which are opened by completing a set of panels. With door shuffle
+  on, the doors become items and only open up once you receive the corresponding item. The panel sets that would
+  ordinarily open the doors become locations.
+
+* **Color shuffle**: There are ten different colors of puzzle in the game, each representing a different mechanic. With
+  color shuffle on, you would start with only access to white puzzles. Puzzles of other colors will require you to
+  receive an  item in order to solve them (e.g. you can't solve any red puzzles until you receive the "Red" item).
+
+* **Panel shuffle**: Panel shuffling replaces the puzzles on each panel with different ones. So far, the only mode of
+  panel shuffling is "rearrange" mode, which simply shuffles the already-existing puzzles from the base game onto
+  different panels.
+
+* **Painting shuffle**: This randomizes the appearance of the paintings in the game, as well as which of them are warps,
+  and the locations that they warp you to. It is the equivalent of an entrance randomizer in another game.
+
+## What is a "check" in this game?
+
+Most panels / panel sets that open a door are now location checks, even if door shuffle is not enabled. Various other
+puzzles are also location checks, including the achievement panels for each area.
+
+## What about wall snipes?
+
+"Wall sniping" refers to the fact that you are able to solve puzzles on the other side of opaque walls. This randomizer
+does not change how wall snipes work, but it will never require the use of them. There are three puzzles from the base
+game that you would ordinarily be expected to wall snipe. The randomizer moves these panels out of the wall or otherwise
+reveals them so that a snipe is not necessary.
+
+Because of this, all wall snipes are considered out of logic. This includes sniping The Bearer's MIDDLE while standing
+outside The Bold, sniping The Colorful without opening all of the color doors, and sniping WELCOME from next to WELCOME
+BACK.
diff --git a/worlds/lingo/docs/setup_en.md b/worlds/lingo/docs/setup_en.md
new file mode 100644
index 0000000000..0e68c7ed45
--- /dev/null
+++ b/worlds/lingo/docs/setup_en.md
@@ -0,0 +1,43 @@
+# Lingo Randomizer Setup
+
+## Required Software
+
+- [Lingo](https://store.steampowered.com/app/1814170/Lingo/)
+- [Lingo Archipelago Randomizer](https://steamcommunity.com/sharedfiles/filedetails/?id=3092505110)
+
+## Optional Software
+
+- [Archipelago Text Client](https://github.com/ArchipelagoMW/Archipelago/releases)
+- [Lingo AP Tracker](https://code.fourisland.com/lingo-ap-tracker/about/CHANGELOG.md)
+
+## Installation
+
+You can use the above Steam Workshop link to subscribe to the Lingo Archipelago Randomizer. This will automatically
+download the client, as well as update it whenever an update is available.
+
+If you don't want to use Steam Workshop, you can also
+[download the randomizer manually](https://code.fourisland.com/lingo-archipelago/about/) using the instructions on the
+linked page.
+
+## Joining a Multiworld game
+
+1. Launch Lingo
+2. Click on Settings, and then Level. Choose Archipelago from the list.
+3. Start a new game. Leave the name field blank (anything you type in will be
+   ignored).
+4. Enter the Archipelago address, slot name, and password into the fields.
+5. Press Connect.
+6. Enjoy!
+
+To continue an earlier game, you can perform the exact same steps as above. You
+do not have to re-select Archipelago in the level selection screen if you were
+using Archipelago the last time you launched the game.
+
+In order to play the base game again, simply return to the level selection
+screen and choose Level 1 (or whatever else you want to play). The randomizer
+will not affect gameplay unless you launch it by starting a new game while it is
+selected in the level selection screen, so it is safe to play the game normally
+while the client is installed.
+
+**Note**: Running the randomizer modifies the game's memory. If you want to play
+the base game after playing the randomizer, you need to restart Lingo first.
diff --git a/worlds/lingo/items.py b/worlds/lingo/items.py
new file mode 100644
index 0000000000..af24570f27
--- /dev/null
+++ b/worlds/lingo/items.py
@@ -0,0 +1,106 @@
+from typing import Dict, List, NamedTuple, Optional, TYPE_CHECKING
+
+from BaseClasses import Item, ItemClassification
+from .options import ShuffleDoors
+from .static_logic import DOORS_BY_ROOM, PROGRESSION_BY_ROOM, PROGRESSIVE_ITEMS, get_door_group_item_id, \
+    get_door_item_id, get_progressive_item_id, get_special_item_id
+
+if TYPE_CHECKING:
+    from . import LingoWorld
+
+
+class ItemData(NamedTuple):
+    """
+    ItemData for an item in Lingo
+    """
+    code: int
+    classification: ItemClassification
+    mode: Optional[str]
+    door_ids: List[str]
+    painting_ids: List[str]
+
+    def should_include(self, world: "LingoWorld") -> bool:
+        if self.mode == "colors":
+            return world.options.shuffle_colors > 0
+        elif self.mode == "doors":
+            return world.options.shuffle_doors != ShuffleDoors.option_none
+        elif self.mode == "orange tower":
+            # door shuffle is on and tower isn't progressive
+            return world.options.shuffle_doors != ShuffleDoors.option_none \
+                and not world.options.progressive_orange_tower
+        elif self.mode == "complex door":
+            return world.options.shuffle_doors == ShuffleDoors.option_complex
+        elif self.mode == "door group":
+            return world.options.shuffle_doors == ShuffleDoors.option_simple
+        elif self.mode == "special":
+            return False
+        else:
+            return True
+
+
+class LingoItem(Item):
+    """
+    Item from the game Lingo
+    """
+    game: str = "Lingo"
+
+
+ALL_ITEM_TABLE: Dict[str, ItemData] = {}
+
+
+def load_item_data():
+    global ALL_ITEM_TABLE
+
+    for color in ["Black", "Red", "Blue", "Yellow", "Green", "Orange", "Gray", "Brown", "Purple"]:
+        ALL_ITEM_TABLE[color] = ItemData(get_special_item_id(color), ItemClassification.progression,
+                                         "colors", [], [])
+
+    door_groups: Dict[str, List[str]] = {}
+    for room_name, doors in DOORS_BY_ROOM.items():
+        for door_name, door in doors.items():
+            if door.skip_item is True or door.event is True:
+                continue
+
+            if door.group is None:
+                door_mode = "doors"
+            else:
+                door_mode = "complex door"
+                door_groups.setdefault(door.group, []).extend(door.door_ids)
+
+            if room_name in PROGRESSION_BY_ROOM and door_name in PROGRESSION_BY_ROOM[room_name]:
+                if room_name == "Orange Tower":
+                    door_mode = "orange tower"
+                else:
+                    door_mode = "special"
+
+            ALL_ITEM_TABLE[door.item_name] = \
+                ItemData(get_door_item_id(room_name, door_name),
+                         ItemClassification.filler if door.junk_item else ItemClassification.progression, door_mode,
+                         door.door_ids, door.painting_ids)
+
+    for group, group_door_ids in door_groups.items():
+        ALL_ITEM_TABLE[group] = ItemData(get_door_group_item_id(group),
+                                         ItemClassification.progression, "door group", group_door_ids, [])
+
+    special_items: Dict[str, ItemClassification] = {
+        ":)":                        ItemClassification.filler,
+        "The Feeling of Being Lost": ItemClassification.filler,
+        "Wanderlust":                ItemClassification.filler,
+        "Empty White Hallways":      ItemClassification.filler,
+        "Slowness Trap":             ItemClassification.trap,
+        "Iceland Trap":              ItemClassification.trap,
+        "Atbash Trap":               ItemClassification.trap,
+        "Puzzle Skip":               ItemClassification.useful,
+    }
+
+    for item_name, classification in special_items.items():
+        ALL_ITEM_TABLE[item_name] = ItemData(get_special_item_id(item_name), classification,
+                                             "special", [], [])
+
+    for item_name in PROGRESSIVE_ITEMS:
+        ALL_ITEM_TABLE[item_name] = ItemData(get_progressive_item_id(item_name),
+                                             ItemClassification.progression, "special", [], [])
+
+
+# Initialize the item data at module scope.
+load_item_data()
diff --git a/worlds/lingo/locations.py b/worlds/lingo/locations.py
new file mode 100644
index 0000000000..5903d603ec
--- /dev/null
+++ b/worlds/lingo/locations.py
@@ -0,0 +1,80 @@
+from enum import Flag, auto
+from typing import Dict, List, NamedTuple
+
+from BaseClasses import Location
+from .static_logic import DOORS_BY_ROOM, PANELS_BY_ROOM, RoomAndPanel, get_door_location_id, get_panel_location_id
+
+
+class LocationClassification(Flag):
+    normal = auto()
+    reduced = auto()
+    insanity = auto()
+
+
+class LocationData(NamedTuple):
+    """
+    LocationData for a location in Lingo
+    """
+    code: int
+    room: str
+    panels: List[RoomAndPanel]
+    classification: LocationClassification
+
+    def panel_ids(self):
+        ids = set()
+        for panel in self.panels:
+            effective_room = self.room if panel.room is None else panel.room
+            panel_data = PANELS_BY_ROOM[effective_room][panel.panel]
+            ids = ids | set(panel_data.internal_ids)
+        return ids
+
+
+class LingoLocation(Location):
+    """
+    Location from the game Lingo
+    """
+    game: str = "Lingo"
+
+
+ALL_LOCATION_TABLE: Dict[str, LocationData] = {}
+
+
+def load_location_data():
+    global ALL_LOCATION_TABLE
+
+    for room_name, panels in PANELS_BY_ROOM.items():
+        for panel_name, panel in panels.items():
+            location_name = f"{room_name} - {panel_name}"
+
+            classification = LocationClassification.insanity
+            if panel.check:
+                classification |= LocationClassification.normal
+
+                if not panel.exclude_reduce:
+                    classification |= LocationClassification.reduced
+
+            ALL_LOCATION_TABLE[location_name] = \
+                LocationData(get_panel_location_id(room_name, panel_name), room_name,
+                             [RoomAndPanel(None, panel_name)], classification)
+
+    for room_name, doors in DOORS_BY_ROOM.items():
+        for door_name, door in doors.items():
+            if door.skip_location or door.event or door.panels is None:
+                continue
+
+            location_name = door.location_name
+            classification = LocationClassification.normal
+            if door.include_reduce:
+                classification |= LocationClassification.reduced
+
+            if location_name in ALL_LOCATION_TABLE:
+                new_id = ALL_LOCATION_TABLE[location_name].code
+                classification |= ALL_LOCATION_TABLE[location_name].classification
+            else:
+                new_id = get_door_location_id(room_name, door_name)
+
+            ALL_LOCATION_TABLE[location_name] = LocationData(new_id, room_name, door.panels, classification)
+
+
+# Initialize location data on the module scope.
+load_location_data()
diff --git a/worlds/lingo/options.py b/worlds/lingo/options.py
new file mode 100644
index 0000000000..c00208621f
--- /dev/null
+++ b/worlds/lingo/options.py
@@ -0,0 +1,130 @@
+from dataclasses import dataclass
+
+from Options import Toggle, Choice, DefaultOnToggle, Range, PerGameCommonOptions
+
+
+class ShuffleDoors(Choice):
+    """If on, opening doors will require their respective "keys".
+    In "simple", doors are sorted into logical groups, which are all opened by receiving an item.
+    In "complex", the items are much more granular, and will usually only open a single door each."""
+    display_name = "Shuffle Doors"
+    option_none = 0
+    option_simple = 1
+    option_complex = 2
+
+
+class ProgressiveOrangeTower(DefaultOnToggle):
+    """When "Shuffle Doors" is on, this setting governs the manner in which the Orange Tower floors open up.
+    If off, there is an item for each floor of the tower, and each floor's item is the only one needed to access that floor.
+    If on, there are six progressive items, which open up the tower from the bottom floor upward.
+    """
+    display_name = "Progressive Orange Tower"
+
+
+class LocationChecks(Choice):
+    """On "normal", there will be a location check for each panel set that would ordinarily open a door, as well as for
+    achievement panels and a small handful of other panels.
+    On "reduced", many of the locations that are associated with opening doors are removed.
+    On "insanity", every individual panel in the game is a location check."""
+    display_name = "Location Checks"
+    option_normal = 0
+    option_reduced = 1
+    option_insanity = 2
+
+
+class ShuffleColors(DefaultOnToggle):
+    """If on, an item is added to the pool for every puzzle color (besides White).
+    You will need to unlock the requisite colors in order to be able to solve puzzles of that color."""
+    display_name = "Shuffle Colors"
+
+
+class ShufflePanels(Choice):
+    """If on, the puzzles on each panel are randomized.
+    On "rearrange", the puzzles are the same as the ones in the base game, but are placed in different areas."""
+    display_name = "Shuffle Panels"
+    option_none = 0
+    option_rearrange = 1
+
+
+class ShufflePaintings(Toggle):
+    """If on, the destination, location, and appearance of the painting warps in the game will be randomized."""
+    display_name = "Shuffle Paintings"
+
+
+class VictoryCondition(Choice):
+    """Change the victory condition.
+    On "the_end", the goal is to solve THE END at the top of the tower.
+    On "the_master", the goal is to solve THE MASTER at the top of the tower, after getting the number of achievements specified in the Mastery Achievements option.
+    On "level_2", the goal is to solve LEVEL 2 in the second room, after solving the number of panels specified in the Level 2 Requirement option."""
+    display_name = "Victory Condition"
+    option_the_end = 0
+    option_the_master = 1
+    option_level_2 = 2
+
+
+class MasteryAchievements(Range):
+    """The number of achievements required to unlock THE MASTER.
+    In the base game, 21 achievements are needed.
+    If you include The Scientific and The Unchallenged, which are in the base game but are not counted for mastery, 23 would be required.
+    If you include the custom achievement (The Wanderer), 24 would be required.
+    """
+    display_name = "Mastery Achievements"
+    range_start = 1
+    range_end = 24
+    default = 21
+
+
+class Level2Requirement(Range):
+    """The number of panel solves required to unlock LEVEL 2.
+    In the base game, 223 are needed.
+    Note that this count includes ANOTHER TRY.
+    When set to 1, the panel hunt is disabled, and you can access LEVEL 2 for free.
+    """
+    display_name = "Level 2 Requirement"
+    range_start = 1
+    range_end = 800
+    default = 223
+
+
+class EarlyColorHallways(Toggle):
+    """When on, a painting warp to the color hallways area will appear in the starting room.
+    This lets you avoid being trapped in the starting room for long periods of time when door shuffle is on."""
+    display_name = "Early Color Hallways"
+
+
+class TrapPercentage(Range):
+    """Replaces junk items with traps, at the specified rate."""
+    display_name = "Trap Percentage"
+    range_start = 0
+    range_end = 100
+    default = 20
+
+
+class PuzzleSkipPercentage(Range):
+    """Replaces junk items with puzzle skips, at the specified rate."""
+    display_name = "Puzzle Skip Percentage"
+    range_start = 0
+    range_end = 100
+    default = 20
+
+
+class DeathLink(Toggle):
+    """If on: Whenever another player on death link dies, you will be returned to the starting room."""
+    display_name = "Death Link"
+
+
+@dataclass
+class LingoOptions(PerGameCommonOptions):
+    shuffle_doors: ShuffleDoors
+    progressive_orange_tower: ProgressiveOrangeTower
+    location_checks: LocationChecks
+    shuffle_colors: ShuffleColors
+    shuffle_panels: ShufflePanels
+    shuffle_paintings: ShufflePaintings
+    victory_condition: VictoryCondition
+    mastery_achievements: MasteryAchievements
+    level_2_requirement: Level2Requirement
+    early_color_hallways: EarlyColorHallways
+    trap_percentage: TrapPercentage
+    puzzle_skip_percentage: PuzzleSkipPercentage
+    death_link: DeathLink
diff --git a/worlds/lingo/player_logic.py b/worlds/lingo/player_logic.py
new file mode 100644
index 0000000000..fa497c59bd
--- /dev/null
+++ b/worlds/lingo/player_logic.py
@@ -0,0 +1,440 @@
+from typing import Dict, List, NamedTuple, Optional, Set, Tuple, TYPE_CHECKING
+
+from .items import ALL_ITEM_TABLE
+from .locations import ALL_LOCATION_TABLE, LocationClassification
+from .options import LocationChecks, ShuffleDoors, VictoryCondition
+from .static_logic import DOORS_BY_ROOM, Door, PAINTINGS, PAINTINGS_BY_ROOM, PAINTING_ENTRANCES, PAINTING_EXITS, \
+    PANELS_BY_ROOM, PROGRESSION_BY_ROOM, REQUIRED_PAINTING_ROOMS, REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS, RoomAndDoor, \
+    RoomAndPanel
+
+if TYPE_CHECKING:
+    from . import LingoWorld
+
+
+class AccessRequirements:
+    rooms: Set[str]
+    doors: Set[RoomAndDoor]
+    colors: Set[str]
+
+    def __init__(self):
+        self.rooms = set()
+        self.doors = set()
+        self.colors = set()
+
+    def merge(self, other: "AccessRequirements"):
+        self.rooms |= other.rooms
+        self.doors |= other.doors
+        self.colors |= other.colors
+
+    def __str__(self):
+        return f"AccessRequirements(rooms={self.rooms}, doors={self.doors}, colors={self.colors})"
+
+
+class PlayerLocation(NamedTuple):
+    name: str
+    code: Optional[int]
+    access: AccessRequirements
+
+
+class LingoPlayerLogic:
+    """
+    Defines logic after a player's options have been applied
+    """
+
+    item_by_door: Dict[str, Dict[str, str]]
+
+    locations_by_room: Dict[str, List[PlayerLocation]]
+    real_locations: List[str]
+
+    event_loc_to_item: Dict[str, str]
+    real_items: List[str]
+
+    victory_condition: str
+    mastery_location: str
+    level_2_location: str
+
+    painting_mapping: Dict[str, str]
+
+    forced_good_item: str
+
+    panel_reqs: Dict[str, Dict[str, AccessRequirements]]
+    door_reqs: Dict[str, Dict[str, AccessRequirements]]
+    mastery_reqs: List[AccessRequirements]
+    counting_panel_reqs: Dict[str, List[Tuple[AccessRequirements, int]]]
+
+    def add_location(self, room: str, name: str, code: Optional[int], panels: List[RoomAndPanel], world: "LingoWorld"):
+        """
+        Creates a location. This function determines the access requirements for the location by combining and
+        flattening the requirements for each of the given panels.
+        """
+        access_reqs = AccessRequirements()
+        for panel in panels:
+            if panel.room is not None and panel.room != room:
+                access_reqs.rooms.add(panel.room)
+
+            panel_room = room if panel.room is None else panel.room
+            sub_access_reqs = self.calculate_panel_requirements(panel_room, panel.panel, world)
+            access_reqs.merge(sub_access_reqs)
+
+        self.locations_by_room.setdefault(room, []).append(PlayerLocation(name, code, access_reqs))
+
+    def set_door_item(self, room: str, door: str, item: str):
+        self.item_by_door.setdefault(room, {})[door] = item
+
+    def handle_non_grouped_door(self, room_name: str, door_data: Door, world: "LingoWorld"):
+        if room_name in PROGRESSION_BY_ROOM and door_data.name in PROGRESSION_BY_ROOM[room_name]:
+            if room_name == "Orange Tower" and not world.options.progressive_orange_tower:
+                self.set_door_item(room_name, door_data.name, door_data.item_name)
+            else:
+                progressive_item_name = PROGRESSION_BY_ROOM[room_name][door_data.name].item_name
+                self.set_door_item(room_name, door_data.name, progressive_item_name)
+                self.real_items.append(progressive_item_name)
+        else:
+            self.set_door_item(room_name, door_data.name, door_data.item_name)
+
+    def __init__(self, world: "LingoWorld"):
+        self.item_by_door = {}
+        self.locations_by_room = {}
+        self.real_locations = []
+        self.event_loc_to_item = {}
+        self.real_items = []
+        self.victory_condition = ""
+        self.mastery_location = ""
+        self.level_2_location = ""
+        self.painting_mapping = {}
+        self.forced_good_item = ""
+        self.panel_reqs = {}
+        self.door_reqs = {}
+        self.mastery_reqs = []
+        self.counting_panel_reqs = {}
+
+        door_shuffle = world.options.shuffle_doors
+        color_shuffle = world.options.shuffle_colors
+        painting_shuffle = world.options.shuffle_paintings
+        location_checks = world.options.location_checks
+        victory_condition = world.options.victory_condition
+        early_color_hallways = world.options.early_color_hallways
+
+        if location_checks == LocationChecks.option_reduced and door_shuffle != ShuffleDoors.option_none:
+            raise Exception("You cannot have reduced location checks when door shuffle is on, because there would not "
+                            "be enough locations for all of the door items.")
+
+        # Create door items, where needed.
+        if door_shuffle != ShuffleDoors.option_none:
+            for room_name, room_data in DOORS_BY_ROOM.items():
+                for door_name, door_data in room_data.items():
+                    if door_data.skip_item is False and door_data.event is False:
+                        if door_data.group is not None and door_shuffle == ShuffleDoors.option_simple:
+                            # Grouped doors are handled differently if shuffle doors is on simple.
+                            self.set_door_item(room_name, door_name, door_data.group)
+                        else:
+                            self.handle_non_grouped_door(room_name, door_data, world)
+
+        # Create events for each achievement panel, so that we can determine when THE MASTER is accessible.
+        for room_name, room_data in PANELS_BY_ROOM.items():
+            for panel_name, panel_data in room_data.items():
+                if panel_data.achievement:
+                    access_req = AccessRequirements()
+                    access_req.merge(self.calculate_panel_requirements(room_name, panel_name, world))
+                    access_req.rooms.add(room_name)
+
+                    self.mastery_reqs.append(access_req)
+
+        # Handle the victory condition. Victory conditions other than the chosen one become regular checks, so we need
+        # to prevent the actual victory condition from becoming a check.
+        self.mastery_location = "Orange Tower Seventh Floor - THE MASTER"
+        self.level_2_location = "Second Room - LEVEL 2"
+
+        if victory_condition == VictoryCondition.option_the_end:
+            self.victory_condition = "Orange Tower Seventh Floor - THE END"
+            self.add_location("Orange Tower Seventh Floor", "The End (Solved)", None, [], world)
+            self.event_loc_to_item["The End (Solved)"] = "Victory"
+        elif victory_condition == VictoryCondition.option_the_master:
+            self.victory_condition = "Orange Tower Seventh Floor - THE MASTER"
+            self.mastery_location = "Orange Tower Seventh Floor - Mastery Achievements"
+
+            self.add_location("Orange Tower Seventh Floor", self.mastery_location, None, [], world)
+            self.event_loc_to_item[self.mastery_location] = "Victory"
+        elif victory_condition == VictoryCondition.option_level_2:
+            self.victory_condition = "Second Room - LEVEL 2"
+            self.level_2_location = "Second Room - Unlock Level 2"
+
+            self.add_location("Second Room", self.level_2_location, None, [RoomAndPanel("Second Room", "LEVEL 2")],
+                              world)
+            self.event_loc_to_item[self.level_2_location] = "Victory"
+
+            if world.options.level_2_requirement == 1:
+                raise Exception("The Level 2 requirement must be at least 2 when LEVEL 2 is the victory condition.")
+
+        # Create groups of counting panel access requirements for the LEVEL 2 check.
+        self.create_panel_hunt_events(world)
+
+        # Instantiate all real locations.
+        location_classification = LocationClassification.normal
+        if location_checks == LocationChecks.option_reduced:
+            location_classification = LocationClassification.reduced
+        elif location_checks == LocationChecks.option_insanity:
+            location_classification = LocationClassification.insanity
+
+        for location_name, location_data in ALL_LOCATION_TABLE.items():
+            if location_name != self.victory_condition:
+                if location_classification not in location_data.classification:
+                    continue
+
+                self.add_location(location_data.room, location_name, location_data.code, location_data.panels, world)
+                self.real_locations.append(location_name)
+
+        # Instantiate all real items.
+        for name, item in ALL_ITEM_TABLE.items():
+            if item.should_include(world):
+                self.real_items.append(name)
+
+        # Calculate the requirements for the fake pilgrimage.
+        fake_pilgrimage = [
+            ["Second Room", "Exit Door"], ["Crossroads", "Tower Entrance"],
+            ["Orange Tower Fourth Floor", "Hot Crusts Door"], ["Outside The Initiated", "Shortcut to Hub Room"],
+            ["Orange Tower First Floor", "Shortcut to Hub Room"], ["Directional Gallery", "Shortcut to The Undeterred"],
+            ["Orange Tower First Floor", "Salt Pepper Door"], ["Hub Room", "Crossroads Entrance"],
+            ["Champion's Rest", "Shortcut to The Steady"], ["The Bearer", "Shortcut to The Bold"],
+            ["Art Gallery", "Exit"], ["The Tenacious", "Shortcut to Hub Room"],
+            ["Outside The Agreeable", "Tenacious Entrance"]
+        ]
+        pilgrimage_reqs = AccessRequirements()
+        for door in fake_pilgrimage:
+            door_object = DOORS_BY_ROOM[door[0]][door[1]]
+            if door_object.event or world.options.shuffle_doors == ShuffleDoors.option_none:
+                pilgrimage_reqs.merge(self.calculate_door_requirements(door[0], door[1], world))
+            else:
+                pilgrimage_reqs.doors.add(RoomAndDoor(door[0], door[1]))
+        self.door_reqs.setdefault("Pilgrim Antechamber", {})["Pilgrimage"] = pilgrimage_reqs
+
+        # Create the paintings mapping, if painting shuffle is on.
+        if painting_shuffle:
+            # Shuffle paintings until we get something workable.
+            workable_paintings = False
+            for i in range(0, 20):
+                workable_paintings = self.randomize_paintings(world)
+                if workable_paintings:
+                    break
+
+            if not workable_paintings:
+                raise Exception("This Lingo world was unable to generate a workable painting mapping after 20 "
+                                "iterations. This is very unlikely to happen on its own, and probably indicates some "
+                                "kind of logic error.")
+
+        if door_shuffle != ShuffleDoors.option_none and location_classification != LocationClassification.insanity \
+                and not early_color_hallways is False:
+            # If shuffle doors is on, force a useful item onto the HI panel. This may not necessarily get you out of BK,
+            # but the goal is to allow you to reach at least one more check. The non-painting ones are hardcoded right
+            # now. We only allow the entrance to the Pilgrim Room if color shuffle is off, because otherwise there are
+            # no extra checks in there. We only include the entrance to the Rhyme Room when color shuffle is off and
+            # door shuffle is on simple, because otherwise there are no extra checks in there.
+            good_item_options: List[str] = ["Starting Room - Back Right Door", "Second Room - Exit Door"]
+
+            if not color_shuffle:
+                good_item_options.append("Pilgrim Room - Sun Painting")
+
+            if door_shuffle == ShuffleDoors.option_simple:
+                good_item_options += ["Welcome Back Doors"]
+
+                if not color_shuffle:
+                    good_item_options.append("Rhyme Room Doors")
+            else:
+                good_item_options += ["Welcome Back Area - Shortcut to Starting Room"]
+
+            for painting_obj in PAINTINGS_BY_ROOM["Starting Room"]:
+                if not painting_obj.enter_only or painting_obj.required_door is None:
+                    continue
+
+                # If painting shuffle is on, we only want to consider paintings that actually go somewhere.
+                if painting_shuffle and painting_obj.id not in self.painting_mapping.keys():
+                    continue
+
+                pdoor = DOORS_BY_ROOM[painting_obj.required_door.room][painting_obj.required_door.door]
+                good_item_options.append(pdoor.item_name)
+
+            # Copied from The Witness -- remove any plandoed items from the possible good items set.
+            for v in world.multiworld.plando_items[world.player]:
+                if v.get("from_pool", True):
+                    for item_key in {"item", "items"}:
+                        if item_key in v:
+                            if type(v[item_key]) is str:
+                                if v[item_key] in good_item_options:
+                                    good_item_options.remove(v[item_key])
+                            elif type(v[item_key]) is dict:
+                                for item, weight in v[item_key].items():
+                                    if weight and item in good_item_options:
+                                        good_item_options.remove(item)
+                            else:
+                                # Other type of iterable
+                                for item in v[item_key]:
+                                    if item in good_item_options:
+                                        good_item_options.remove(item)
+
+            if len(good_item_options) > 0:
+                self.forced_good_item = world.random.choice(good_item_options)
+                self.real_items.remove(self.forced_good_item)
+                self.real_locations.remove("Second Room - Good Luck")
+
+    def randomize_paintings(self, world: "LingoWorld") -> bool:
+        self.painting_mapping.clear()
+
+        door_shuffle = world.options.shuffle_doors
+
+        # First, assign mappings to the required-exit paintings. We ensure that req-blocked paintings do not lead to
+        # required paintings.
+        req_exits = []
+        required_painting_rooms = REQUIRED_PAINTING_ROOMS
+        if door_shuffle == ShuffleDoors.option_none:
+            required_painting_rooms += REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS
+            req_exits = [painting_id for painting_id, painting in PAINTINGS.items() if painting.required_when_no_doors]
+            req_enterable = [painting_id for painting_id, painting in PAINTINGS.items()
+                             if not painting.exit_only and not painting.disable and not painting.req_blocked and
+                             not painting.req_blocked_when_no_doors and painting.room not in required_painting_rooms]
+        else:
+            req_enterable = [painting_id for painting_id, painting in PAINTINGS.items()
+                             if not painting.exit_only and not painting.disable and not painting.req_blocked and
+                             painting.room not in required_painting_rooms]
+        req_exits += [painting_id for painting_id, painting in PAINTINGS.items()
+                      if painting.exit_only and painting.required]
+        req_entrances = world.random.sample(req_enterable, len(req_exits))
+
+        self.painting_mapping = dict(zip(req_entrances, req_exits))
+
+        # Next, determine the rest of the exit paintings.
+        exitable = [painting_id for painting_id, painting in PAINTINGS.items()
+                    if not painting.enter_only and not painting.disable and painting_id not in req_exits and
+                    painting_id not in req_entrances]
+        nonreq_exits = world.random.sample(exitable, PAINTING_EXITS - len(req_exits))
+        chosen_exits = req_exits + nonreq_exits
+
+        # Determine the rest of the entrance paintings.
+        enterable = [painting_id for painting_id, painting in PAINTINGS.items()
+                     if not painting.exit_only and not painting.disable and painting_id not in chosen_exits and
+                     painting_id not in req_entrances]
+        chosen_entrances = world.random.sample(enterable, PAINTING_ENTRANCES - len(req_entrances))
+
+        # Assign one entrance to each non-required exit, to ensure that the total number of exits is achieved.
+        for warp_exit in nonreq_exits:
+            warp_enter = world.random.choice(chosen_entrances)
+            chosen_entrances.remove(warp_enter)
+            self.painting_mapping[warp_enter] = warp_exit
+
+        # Assign each of the remaining entrances to any required or non-required exit.
+        for warp_enter in chosen_entrances:
+            warp_exit = world.random.choice(chosen_exits)
+            self.painting_mapping[warp_enter] = warp_exit
+
+        # The Eye Wall painting is unique in that it is both double-sided and also enter only (because it moves).
+        # There is only one eligible double-sided exit painting, which is the vanilla exit for this warp. If the
+        # exit painting is an entrance in the shuffle, we will disable the Eye Wall painting. Otherwise, Eye Wall
+        # is forced to point to the vanilla exit.
+        if "eye_painting_2" not in self.painting_mapping.keys():
+            self.painting_mapping["eye_painting"] = "eye_painting_2"
+
+        # Just for sanity's sake, ensure that all required painting rooms are accessed.
+        for painting_id, painting in PAINTINGS.items():
+            if painting_id not in self.painting_mapping.values() \
+                    and (painting.required or (painting.required_when_no_doors and
+                                               door_shuffle == ShuffleDoors.option_none)):
+                return False
+
+        return True
+
+    def calculate_panel_requirements(self, room: str, panel: str, world: "LingoWorld"):
+        """
+        Calculate and return the access requirements for solving a given panel. The goal is to eliminate recursion in
+        the access rule function by collecting the rooms, doors, and colors needed by this panel and any panel required
+        by this panel. Memoization is used so that no panel is evaluated more than once.
+        """
+        if panel not in self.panel_reqs.setdefault(room, {}):
+            access_reqs = AccessRequirements()
+            panel_object = PANELS_BY_ROOM[room][panel]
+
+            for req_room in panel_object.required_rooms:
+                access_reqs.rooms.add(req_room)
+
+            for req_door in panel_object.required_doors:
+                door_object = DOORS_BY_ROOM[room if req_door.room is None else req_door.room][req_door.door]
+                if door_object.event or world.options.shuffle_doors == ShuffleDoors.option_none:
+                    sub_access_reqs = self.calculate_door_requirements(
+                        room if req_door.room is None else req_door.room, req_door.door, world)
+                    access_reqs.merge(sub_access_reqs)
+                else:
+                    access_reqs.doors.add(RoomAndDoor(room if req_door.room is None else req_door.room, req_door.door))
+
+            for color in panel_object.colors:
+                access_reqs.colors.add(color)
+
+            for req_panel in panel_object.required_panels:
+                if req_panel.room is not None and req_panel.room != room:
+                    access_reqs.rooms.add(req_panel.room)
+
+                sub_access_reqs = self.calculate_panel_requirements(room if req_panel.room is None else req_panel.room,
+                                                                    req_panel.panel, world)
+                access_reqs.merge(sub_access_reqs)
+
+            self.panel_reqs[room][panel] = access_reqs
+
+        return self.panel_reqs[room][panel]
+
+    def calculate_door_requirements(self, room: str, door: str, world: "LingoWorld"):
+        """
+        Similar to calculate_panel_requirements, but for event doors.
+        """
+        if door not in self.door_reqs.setdefault(room, {}):
+            access_reqs = AccessRequirements()
+            door_object = DOORS_BY_ROOM[room][door]
+
+            for req_panel in door_object.panels:
+                panel_room = room if req_panel.room is None else req_panel.room
+                access_reqs.rooms.add(panel_room)
+                sub_access_reqs = self.calculate_panel_requirements(panel_room, req_panel.panel, world)
+                access_reqs.merge(sub_access_reqs)
+
+            self.door_reqs[room][door] = access_reqs
+
+        return self.door_reqs[room][door]
+
+    def create_panel_hunt_events(self, world: "LingoWorld"):
+        """
+        Creates the event locations/items used for determining access to the LEVEL 2 panel. Instead of creating an event
+        for every single counting panel in the game, we try to coalesce panels with identical access rules into the same
+        event. Right now, this means the following:
+
+        When color shuffle is off, panels in a room with no extra access requirements (room, door, or other panel) are
+        all coalesced into one event.
+
+        When color shuffle is on, single-colored panels (including white) in a room are combined into one event per
+        color. Multicolored panels and panels with any extra access requirements are not coalesced, and will each
+        receive their own event.
+        """
+        for room_name, room_data in PANELS_BY_ROOM.items():
+            unhindered_panels_by_color: dict[Optional[str], int] = {}
+
+            for panel_name, panel_data in room_data.items():
+                # We won't count non-counting panels. THE MASTER has special access rules and is handled separately.
+                if panel_data.non_counting or panel_name == "THE MASTER":
+                    continue
+
+                # We won't coalesce any panels that have requirements beyond colors. To simplify things for now, we will
+                # only coalesce single-color panels. Chains/stacks/combo puzzles will be separate.
+                if len(panel_data.required_panels) > 0 or len(panel_data.required_doors) > 0\
+                        or len(panel_data.required_rooms) > 0\
+                        or (world.options.shuffle_colors and len(panel_data.colors) > 1):
+                    self.counting_panel_reqs.setdefault(room_name, []).append(
+                        (self.calculate_panel_requirements(room_name, panel_name, world), 1))
+                else:
+                    if len(panel_data.colors) == 0 or not world.options.shuffle_colors:
+                        color = None
+                    else:
+                        color = panel_data.colors[0]
+
+                    unhindered_panels_by_color[color] = unhindered_panels_by_color.get(color, 0) + 1
+
+            for color, panel_count in unhindered_panels_by_color.items():
+                access_reqs = AccessRequirements()
+                if color is not None:
+                    access_reqs.colors.add(color)
+
+                self.counting_panel_reqs.setdefault(room_name, []).append((access_reqs, panel_count))
diff --git a/worlds/lingo/regions.py b/worlds/lingo/regions.py
new file mode 100644
index 0000000000..bdc42f42f5
--- /dev/null
+++ b/worlds/lingo/regions.py
@@ -0,0 +1,96 @@
+from typing import Dict, Optional, TYPE_CHECKING
+
+from BaseClasses import Entrance, ItemClassification, Region
+from .items import LingoItem
+from .locations import LingoLocation
+from .player_logic import LingoPlayerLogic
+from .rules import lingo_can_use_entrance, make_location_lambda
+from .static_logic import ALL_ROOMS, PAINTINGS, Room, RoomAndDoor
+
+if TYPE_CHECKING:
+    from . import LingoWorld
+
+
+def create_region(room: Room, world: "LingoWorld", player_logic: LingoPlayerLogic) -> Region:
+    new_region = Region(room.name, world.player, world.multiworld)
+    for location in player_logic.locations_by_room.get(room.name, {}):
+        new_location = LingoLocation(world.player, location.name, location.code, new_region)
+        new_location.access_rule = make_location_lambda(location, world, player_logic)
+        new_region.locations.append(new_location)
+        if location.name in player_logic.event_loc_to_item:
+            event_name = player_logic.event_loc_to_item[location.name]
+            event_item = LingoItem(event_name, ItemClassification.progression, None, world.player)
+            new_location.place_locked_item(event_item)
+
+    return new_region
+
+
+def connect_entrance(regions: Dict[str, Region], source_region: Region, target_region: Region, description: str,
+                     door: Optional[RoomAndDoor], world: "LingoWorld", player_logic: LingoPlayerLogic):
+    connection = Entrance(world.player, description, source_region)
+    connection.access_rule = lambda state: lingo_can_use_entrance(state, target_region.name, door, world, player_logic)
+
+    source_region.exits.append(connection)
+    connection.connect(target_region)
+
+    if door is not None:
+        effective_room = target_region.name if door.room is None else door.room
+        if door.door not in player_logic.item_by_door.get(effective_room, {}):
+            for region in player_logic.calculate_door_requirements(effective_room, door.door, world).rooms:
+                world.multiworld.register_indirect_condition(regions[region], connection)
+
+
+def connect_painting(regions: Dict[str, Region], warp_enter: str, warp_exit: str, world: "LingoWorld",
+                     player_logic: LingoPlayerLogic) -> None:
+    source_painting = PAINTINGS[warp_enter]
+    target_painting = PAINTINGS[warp_exit]
+
+    target_region = regions[target_painting.room]
+    source_region = regions[source_painting.room]
+
+    entrance_name = f"{source_painting.room} to {target_painting.room} ({source_painting.id} Painting)"
+    connect_entrance(regions, source_region, target_region, entrance_name, source_painting.required_door, world,
+                     player_logic)
+
+
+def create_regions(world: "LingoWorld", player_logic: LingoPlayerLogic) -> None:
+    regions = {
+        "Menu": Region("Menu", world.player, world.multiworld)
+    }
+
+    painting_shuffle = world.options.shuffle_paintings
+    early_color_hallways = world.options.early_color_hallways
+
+    # Instantiate all rooms as regions with their locations first.
+    for room in ALL_ROOMS:
+        regions[room.name] = create_region(room, world, player_logic)
+
+    # Connect all created regions now that they exist.
+    for room in ALL_ROOMS:
+        for entrance in room.entrances:
+            # Don't use the vanilla painting connections if we are shuffling paintings.
+            if entrance.painting and painting_shuffle:
+                continue
+
+            entrance_name = f"{entrance.room} to {room.name}"
+            if entrance.door is not None:
+                if entrance.door.room is not None:
+                    entrance_name += f" (through {entrance.door.room} - {entrance.door.door})"
+                else:
+                    entrance_name += f" (through {room.name} - {entrance.door.door})"
+
+            connect_entrance(regions, regions[entrance.room], regions[room.name], entrance_name, entrance.door, world,
+                             player_logic)
+
+    # Add the fake pilgrimage.
+    connect_entrance(regions, regions["Outside The Agreeable"], regions["Pilgrim Antechamber"], "Pilgrimage",
+                     RoomAndDoor("Pilgrim Antechamber", "Pilgrimage"), world, player_logic)
+
+    if early_color_hallways:
+        regions["Starting Room"].connect(regions["Outside The Undeterred"], "Early Color Hallways")
+
+    if painting_shuffle:
+        for warp_enter, warp_exit in player_logic.painting_mapping.items():
+            connect_painting(regions, warp_enter, warp_exit, world, player_logic)
+
+    world.multiworld.regions += regions.values()
diff --git a/worlds/lingo/rules.py b/worlds/lingo/rules.py
new file mode 100644
index 0000000000..481fab18b5
--- /dev/null
+++ b/worlds/lingo/rules.py
@@ -0,0 +1,93 @@
+from typing import TYPE_CHECKING
+
+from BaseClasses import CollectionState
+from .player_logic import AccessRequirements, LingoPlayerLogic, PlayerLocation
+from .static_logic import PROGRESSION_BY_ROOM, PROGRESSIVE_ITEMS, RoomAndDoor
+
+if TYPE_CHECKING:
+    from . import LingoWorld
+
+
+def lingo_can_use_entrance(state: CollectionState, room: str, door: RoomAndDoor, world: "LingoWorld",
+                           player_logic: LingoPlayerLogic):
+    if door is None:
+        return True
+
+    effective_room = room if door.room is None else door.room
+    return _lingo_can_open_door(state, effective_room, door.door, world, player_logic)
+
+
+def lingo_can_use_location(state: CollectionState, location: PlayerLocation, world: "LingoWorld",
+                           player_logic: LingoPlayerLogic):
+    return _lingo_can_satisfy_requirements(state, location.access, world, player_logic)
+
+
+def lingo_can_use_mastery_location(state: CollectionState, world: "LingoWorld", player_logic: LingoPlayerLogic):
+    satisfied_count = 0
+    for access_req in player_logic.mastery_reqs:
+        if _lingo_can_satisfy_requirements(state, access_req, world, player_logic):
+            satisfied_count += 1
+    return satisfied_count >= world.options.mastery_achievements.value
+
+
+def lingo_can_use_level_2_location(state: CollectionState, world: "LingoWorld", player_logic: LingoPlayerLogic):
+    counted_panels = 0
+    state.update_reachable_regions(world.player)
+    for region in state.reachable_regions[world.player]:
+        for access_req, panel_count in player_logic.counting_panel_reqs.get(region.name, []):
+            if _lingo_can_satisfy_requirements(state, access_req, world, player_logic):
+                counted_panels += panel_count
+        if counted_panels >= world.options.level_2_requirement.value - 1:
+            return True
+    # THE MASTER has to be handled separately, because it has special access rules.
+    if state.can_reach("Orange Tower Seventh Floor", "Region", world.player)\
+            and lingo_can_use_mastery_location(state, world, player_logic):
+        counted_panels += 1
+    if counted_panels >= world.options.level_2_requirement.value - 1:
+        return True
+    return False
+
+
+def _lingo_can_satisfy_requirements(state: CollectionState, access: AccessRequirements, world: "LingoWorld",
+                                    player_logic: LingoPlayerLogic):
+    for req_room in access.rooms:
+        if not state.can_reach(req_room, "Region", world.player):
+            return False
+
+    for req_door in access.doors:
+        if not _lingo_can_open_door(state, req_door.room, req_door.door, world, player_logic):
+            return False
+
+    if len(access.colors) > 0 and world.options.shuffle_colors:
+        for color in access.colors:
+            if not state.has(color.capitalize(), world.player):
+                return False
+
+    return True
+
+
+def _lingo_can_open_door(state: CollectionState, room: str, door: str, world: "LingoWorld",
+                         player_logic: LingoPlayerLogic):
+    """
+    Determines whether a door can be opened
+    """
+    if door not in player_logic.item_by_door.get(room, {}):
+        return _lingo_can_satisfy_requirements(state, player_logic.door_reqs[room][door], world, player_logic)
+
+    item_name = player_logic.item_by_door[room][door]
+    if item_name in PROGRESSIVE_ITEMS:
+        progression = PROGRESSION_BY_ROOM[room][door]
+        return state.has(item_name, world.player, progression.index)
+
+    return state.has(item_name, world.player)
+
+
+def make_location_lambda(location: PlayerLocation, world: "LingoWorld", player_logic: LingoPlayerLogic):
+    if location.name == player_logic.mastery_location:
+        return lambda state: lingo_can_use_mastery_location(state, world, player_logic)
+
+    if world.options.level_2_requirement > 1\
+            and (location.name == "Second Room - ANOTHER TRY" or location.name == player_logic.level_2_location):
+        return lambda state: lingo_can_use_level_2_location(state, world, player_logic)
+
+    return lambda state: lingo_can_use_location(state, location, world, player_logic)
diff --git a/worlds/lingo/static_logic.py b/worlds/lingo/static_logic.py
new file mode 100644
index 0000000000..e9f82fb751
--- /dev/null
+++ b/worlds/lingo/static_logic.py
@@ -0,0 +1,559 @@
+from typing import Dict, List, NamedTuple, Optional, Set
+
+import Utils
+
+
+class RoomAndDoor(NamedTuple):
+    room: Optional[str]
+    door: str
+
+
+class RoomAndPanel(NamedTuple):
+    room: Optional[str]
+    panel: str
+
+
+class RoomEntrance(NamedTuple):
+    room: str  # source room
+    door: Optional[RoomAndDoor]
+    painting: bool
+
+
+class Room(NamedTuple):
+    name: str
+    entrances: List[RoomEntrance]
+
+
+class Door(NamedTuple):
+    name: str
+    item_name: str
+    location_name: Optional[str]
+    panels: Optional[List[RoomAndPanel]]
+    skip_location: bool
+    skip_item: bool
+    door_ids: List[str]
+    painting_ids: List[str]
+    event: bool
+    group: Optional[str]
+    include_reduce: bool
+    junk_item: bool
+
+
+class Panel(NamedTuple):
+    required_rooms: List[str]
+    required_doors: List[RoomAndDoor]
+    required_panels: List[RoomAndPanel]
+    colors: List[str]
+    check: bool
+    event: bool
+    internal_ids: List[str]
+    exclude_reduce: bool
+    achievement: bool
+    non_counting: bool
+
+
+class Painting(NamedTuple):
+    id: str
+    room: str
+    enter_only: bool
+    exit_only: bool
+    orientation: str
+    required: bool
+    required_when_no_doors: bool
+    required_door: Optional[RoomAndDoor]
+    disable: bool
+    move: bool
+    req_blocked: bool
+    req_blocked_when_no_doors: bool
+
+
+class Progression(NamedTuple):
+    item_name: str
+    index: int
+
+
+ROOMS: Dict[str, Room] = {}
+PANELS: Dict[str, Panel] = {}
+DOORS: Dict[str, Door] = {}
+PAINTINGS: Dict[str, Painting] = {}
+
+ALL_ROOMS: List[Room] = []
+DOORS_BY_ROOM: Dict[str, Dict[str, Door]] = {}
+PANELS_BY_ROOM: Dict[str, Dict[str, Panel]] = {}
+PAINTINGS_BY_ROOM: Dict[str, List[Painting]] = {}
+
+PROGRESSIVE_ITEMS: List[str] = []
+PROGRESSION_BY_ROOM: Dict[str, Dict[str, Progression]] = {}
+
+PAINTING_ENTRANCES: int = 0
+PAINTING_EXIT_ROOMS: Set[str] = set()
+PAINTING_EXITS: int = 0
+REQUIRED_PAINTING_ROOMS: List[str] = []
+REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS: List[str] = []
+
+SPECIAL_ITEM_IDS: Dict[str, int] = {}
+PANEL_LOCATION_IDS: Dict[str, Dict[str, int]] = {}
+DOOR_LOCATION_IDS: Dict[str, Dict[str, int]] = {}
+DOOR_ITEM_IDS: Dict[str, Dict[str, int]] = {}
+DOOR_GROUP_ITEM_IDS: Dict[str, int] = {}
+PROGRESSIVE_ITEM_IDS: Dict[str, int] = {}
+
+
+def load_static_data():
+    global PAINTING_EXITS, SPECIAL_ITEM_IDS, PANEL_LOCATION_IDS, DOOR_LOCATION_IDS, DOOR_ITEM_IDS, \
+        DOOR_GROUP_ITEM_IDS, PROGRESSIVE_ITEM_IDS
+
+    try:
+        from importlib.resources import files
+    except ImportError:
+        from importlib_resources import files
+
+    from . import data
+
+    # Load in all item and location IDs. These are broken up into groups based on the type of item/location.
+    with files(data).joinpath("ids.yaml").open() as file:
+        config = Utils.parse_yaml(file)
+
+        if "special_items" in config:
+            for item_name, item_id in config["special_items"].items():
+                SPECIAL_ITEM_IDS[item_name] = item_id
+
+        if "panels" in config:
+            for room_name in config["panels"].keys():
+                PANEL_LOCATION_IDS[room_name] = {}
+
+                for panel_name, location_id in config["panels"][room_name].items():
+                    PANEL_LOCATION_IDS[room_name][panel_name] = location_id
+
+        if "doors" in config:
+            for room_name in config["doors"].keys():
+                DOOR_LOCATION_IDS[room_name] = {}
+                DOOR_ITEM_IDS[room_name] = {}
+
+                for door_name, door_data in config["doors"][room_name].items():
+                    if "location" in door_data:
+                        DOOR_LOCATION_IDS[room_name][door_name] = door_data["location"]
+
+                    if "item" in door_data:
+                        DOOR_ITEM_IDS[room_name][door_name] = door_data["item"]
+
+        if "door_groups" in config:
+            for item_name, item_id in config["door_groups"].items():
+                DOOR_GROUP_ITEM_IDS[item_name] = item_id
+
+        if "progression" in config:
+            for item_name, item_id in config["progression"].items():
+                PROGRESSIVE_ITEM_IDS[item_name] = item_id
+
+    # Process the main world file.
+    with files(data).joinpath("LL1.yaml").open() as file:
+        config = Utils.parse_yaml(file)
+
+        for room_name, room_data in config.items():
+            process_room(room_name, room_data)
+
+        PAINTING_EXITS = len(PAINTING_EXIT_ROOMS)
+
+
+def get_special_item_id(name: str):
+    if name not in SPECIAL_ITEM_IDS:
+        raise Exception(f"Item ID for special item {name} not found in ids.yaml.")
+
+    return SPECIAL_ITEM_IDS[name]
+
+
+def get_panel_location_id(room: str, name: str):
+    if room not in PANEL_LOCATION_IDS or name not in PANEL_LOCATION_IDS[room]:
+        raise Exception(f"Location ID for panel {room} - {name} not found in ids.yaml.")
+
+    return PANEL_LOCATION_IDS[room][name]
+
+
+def get_door_location_id(room: str, name: str):
+    if room not in DOOR_LOCATION_IDS or name not in DOOR_LOCATION_IDS[room]:
+        raise Exception(f"Location ID for door {room} - {name} not found in ids.yaml.")
+
+    return DOOR_LOCATION_IDS[room][name]
+
+
+def get_door_item_id(room: str, name: str):
+    if room not in DOOR_ITEM_IDS or name not in DOOR_ITEM_IDS[room]:
+        raise Exception(f"Item ID for door {room} - {name} not found in ids.yaml.")
+
+    return DOOR_ITEM_IDS[room][name]
+
+
+def get_door_group_item_id(name: str):
+    if name not in DOOR_GROUP_ITEM_IDS:
+        raise Exception(f"Item ID for door group {name} not found in ids.yaml.")
+
+    return DOOR_GROUP_ITEM_IDS[name]
+
+
+def get_progressive_item_id(name: str):
+    if name not in PROGRESSIVE_ITEM_IDS:
+        raise Exception(f"Item ID for progressive item {name} not found in ids.yaml.")
+
+    return PROGRESSIVE_ITEM_IDS[name]
+
+
+def process_entrance(source_room, doors, room_obj):
+    global PAINTING_ENTRANCES, PAINTING_EXIT_ROOMS
+
+    # If the value of an entrance is just True, that means that the entrance is always accessible.
+    if doors is True:
+        room_obj.entrances.append(RoomEntrance(source_room, None, False))
+    elif isinstance(doors, dict):
+        # If the value of an entrance is a dictionary, that means the entrance requires a door to be accessible, is a
+        # painting-based entrance, or both.
+        if "painting" in doors and "door" not in doors:
+            PAINTING_EXIT_ROOMS.add(room_obj.name)
+            PAINTING_ENTRANCES += 1
+
+            room_obj.entrances.append(RoomEntrance(source_room, None, True))
+        else:
+            if "painting" in doors and doors["painting"]:
+                PAINTING_EXIT_ROOMS.add(room_obj.name)
+                PAINTING_ENTRANCES += 1
+
+            room_obj.entrances.append(RoomEntrance(source_room, RoomAndDoor(
+                doors["room"] if "room" in doors else None,
+                doors["door"]
+            ), doors["painting"] if "painting" in doors else False))
+    else:
+        # If the value of an entrance is a list, then there are multiple possible doors that can give access to the
+        # entrance.
+        for door in doors:
+            if "painting" in door and door["painting"]:
+                PAINTING_EXIT_ROOMS.add(room_obj.name)
+                PAINTING_ENTRANCES += 1
+
+            room_obj.entrances.append(RoomEntrance(source_room, RoomAndDoor(
+                door["room"] if "room" in door else None,
+                door["door"]
+            ), door["painting"] if "painting" in door else False))
+
+
+def process_panel(room_name, panel_name, panel_data):
+    global PANELS, PANELS_BY_ROOM
+
+    full_name = f"{room_name} - {panel_name}"
+
+    # required_room can either be a single room or a list of rooms.
+    if "required_room" in panel_data:
+        if isinstance(panel_data["required_room"], list):
+            required_rooms = panel_data["required_room"]
+        else:
+            required_rooms = [panel_data["required_room"]]
+    else:
+        required_rooms = []
+
+    # required_door can either be a single door or a list of doors. For convenience, the room key for each door does not
+    # need to be specified if the door is in this room.
+    required_doors = list()
+    if "required_door" in panel_data:
+        if isinstance(panel_data["required_door"], dict):
+            door = panel_data["required_door"]
+            required_doors.append(RoomAndDoor(
+                door["room"] if "room" in door else None,
+                door["door"]
+            ))
+        else:
+            for door in panel_data["required_door"]:
+                required_doors.append(RoomAndDoor(
+                    door["room"] if "room" in door else None,
+                    door["door"]
+                ))
+
+    # required_panel can either be a single panel or a list of panels. For convenience, the room key for each panel does
+    # not need to be specified if the panel is in this room.
+    required_panels = list()
+    if "required_panel" in panel_data:
+        if isinstance(panel_data["required_panel"], dict):
+            other_panel = panel_data["required_panel"]
+            required_panels.append(RoomAndPanel(
+                other_panel["room"] if "room" in other_panel else None,
+                other_panel["panel"]
+            ))
+        else:
+            for other_panel in panel_data["required_panel"]:
+                required_panels.append(RoomAndPanel(
+                    other_panel["room"] if "room" in other_panel else None,
+                    other_panel["panel"]
+                ))
+
+    # colors can either be a single color or a list of colors.
+    if "colors" in panel_data:
+        if isinstance(panel_data["colors"], list):
+            colors = panel_data["colors"]
+        else:
+            colors = [panel_data["colors"]]
+    else:
+        colors = []
+
+    if "check" in panel_data:
+        check = panel_data["check"]
+    else:
+        check = False
+
+    if "event" in panel_data:
+        event = panel_data["event"]
+    else:
+        event = False
+
+    if "achievement" in panel_data:
+        achievement = True
+    else:
+        achievement = False
+
+    if "exclude_reduce" in panel_data:
+        exclude_reduce = panel_data["exclude_reduce"]
+    else:
+        exclude_reduce = False
+
+    if "non_counting" in panel_data:
+        non_counting = panel_data["non_counting"]
+    else:
+        non_counting = False
+
+    if "id" in panel_data:
+        if isinstance(panel_data["id"], list):
+            internal_ids = panel_data["id"]
+        else:
+            internal_ids = [panel_data["id"]]
+    else:
+        internal_ids = []
+
+    panel_obj = Panel(required_rooms, required_doors, required_panels, colors, check, event, internal_ids,
+                      exclude_reduce, achievement, non_counting)
+    PANELS[full_name] = panel_obj
+    PANELS_BY_ROOM[room_name][panel_name] = panel_obj
+
+
+def process_door(room_name, door_name, door_data):
+    global DOORS, DOORS_BY_ROOM
+
+    # The item name associated with a door can be explicitly specified in the configuration. If it is not, it is
+    # generated from the room and door name.
+    if "item_name" in door_data:
+        item_name = door_data["item_name"]
+    else:
+        item_name = f"{room_name} - {door_name}"
+
+    if "skip_location" in door_data:
+        skip_location = door_data["skip_location"]
+    else:
+        skip_location = False
+
+    if "skip_item" in door_data:
+        skip_item = door_data["skip_item"]
+    else:
+        skip_item = False
+
+    if "event" in door_data:
+        event = door_data["event"]
+    else:
+        event = False
+
+    if "include_reduce" in door_data:
+        include_reduce = door_data["include_reduce"]
+    else:
+        include_reduce = False
+
+    if "junk_item" in door_data:
+        junk_item = door_data["junk_item"]
+    else:
+        junk_item = False
+
+    if "group" in door_data:
+        group = door_data["group"]
+    else:
+        group = None
+
+    # panels is a list of panels. Each panel can either be a simple string (the name of a panel in the current room) or
+    # a dictionary specifying a panel in a different room.
+    if "panels" in door_data:
+        panels = list()
+        for panel in door_data["panels"]:
+            if isinstance(panel, dict):
+                panels.append(RoomAndPanel(panel["room"], panel["panel"]))
+            else:
+                panels.append(RoomAndPanel(None, panel))
+    else:
+        skip_location = True
+        panels = None
+
+    # The location name associated with a door can be explicitly specified in the configuration. If it is not, then the
+    # name is generated using a combination of all of the panels that would ordinarily open the door. This can get quite
+    # messy if there are a lot of panels, especially if panels from multiple rooms are involved, so in these cases it
+    # would be better to specify a name.
+    if "location_name" in door_data:
+        location_name = door_data["location_name"]
+    elif skip_location is False:
+        panel_per_room = dict()
+        for panel in panels:
+            panel_room_name = room_name if panel.room is None else panel.room
+            panel_per_room.setdefault(panel_room_name, []).append(panel.panel)
+
+        room_strs = list()
+        for door_room_str, door_panels_str in panel_per_room.items():
+            room_strs.append(door_room_str + " - " + ", ".join(door_panels_str))
+
+        location_name = " and ".join(room_strs)
+    else:
+        location_name = None
+
+    # The id field can be a single item, or a list of door IDs, in the event that the item for this logical door should
+    # open more than one actual in-game door.
+    if "id" in door_data:
+        if isinstance(door_data["id"], list):
+            door_ids = door_data["id"]
+        else:
+            door_ids = [door_data["id"]]
+    else:
+        door_ids = []
+
+    # The painting_id field can be a single item, or a list of painting IDs, in the event that the item for this logical
+    # door should move more than one actual in-game painting.
+    if "painting_id" in door_data:
+        if isinstance(door_data["painting_id"], list):
+            painting_ids = door_data["painting_id"]
+        else:
+            painting_ids = [door_data["painting_id"]]
+    else:
+        painting_ids = []
+
+    door_obj = Door(door_name, item_name, location_name, panels, skip_location, skip_item, door_ids,
+                    painting_ids, event, group, include_reduce, junk_item)
+
+    DOORS[door_obj.item_name] = door_obj
+    DOORS_BY_ROOM[room_name][door_name] = door_obj
+
+
+def process_painting(room_name, painting_data):
+    global PAINTINGS, PAINTINGS_BY_ROOM, REQUIRED_PAINTING_ROOMS, REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS
+
+    # Read in information about this painting and store it in an object.
+    painting_id = painting_data["id"]
+
+    if "orientation" in painting_data:
+        orientation = painting_data["orientation"]
+    else:
+        orientation = ""
+
+    if "disable" in painting_data:
+        disable_painting = painting_data["disable"]
+    else:
+        disable_painting = False
+
+    if "required" in painting_data:
+        required_painting = painting_data["required"]
+        if required_painting:
+            REQUIRED_PAINTING_ROOMS.append(room_name)
+    else:
+        required_painting = False
+
+    if "move" in painting_data:
+        move_painting = painting_data["move"]
+    else:
+        move_painting = False
+
+    if "required_when_no_doors" in painting_data:
+        rwnd = painting_data["required_when_no_doors"]
+        if rwnd:
+            REQUIRED_PAINTING_WHEN_NO_DOORS_ROOMS.append(room_name)
+    else:
+        rwnd = False
+
+    if "exit_only" in painting_data:
+        exit_only = painting_data["exit_only"]
+    else:
+        exit_only = False
+
+    if "enter_only" in painting_data:
+        enter_only = painting_data["enter_only"]
+    else:
+        enter_only = False
+
+    if "req_blocked" in painting_data:
+        req_blocked = painting_data["req_blocked"]
+    else:
+        req_blocked = False
+
+    if "req_blocked_when_no_doors" in painting_data:
+        req_blocked_when_no_doors = painting_data["req_blocked_when_no_doors"]
+    else:
+        req_blocked_when_no_doors = False
+
+    required_door = None
+    if "required_door" in painting_data:
+        door = painting_data["required_door"]
+        required_door = RoomAndDoor(
+            door["room"] if "room" in door else room_name,
+            door["door"]
+        )
+
+    painting_obj = Painting(painting_id, room_name, enter_only, exit_only, orientation,
+                            required_painting, rwnd, required_door, disable_painting, move_painting, req_blocked,
+                            req_blocked_when_no_doors)
+    PAINTINGS[painting_id] = painting_obj
+    PAINTINGS_BY_ROOM[room_name].append(painting_obj)
+
+
+def process_progression(room_name, progression_name, progression_doors):
+    global PROGRESSIVE_ITEMS, PROGRESSION_BY_ROOM
+
+    # Progressive items are configured as a list of doors.
+    PROGRESSIVE_ITEMS.append(progression_name)
+
+    progression_index = 1
+    for door in progression_doors:
+        if isinstance(door, Dict):
+            door_room = door["room"]
+            door_door = door["door"]
+        else:
+            door_room = room_name
+            door_door = door
+
+        room_progressions = PROGRESSION_BY_ROOM.setdefault(door_room, {})
+        room_progressions[door_door] = Progression(progression_name, progression_index)
+        progression_index += 1
+
+
+def process_room(room_name, room_data):
+    global ROOMS, ALL_ROOMS
+
+    room_obj = Room(room_name, [])
+
+    if "entrances" in room_data:
+        for source_room, doors in room_data["entrances"].items():
+            process_entrance(source_room, doors, room_obj)
+
+    if "panels" in room_data:
+        PANELS_BY_ROOM[room_name] = dict()
+
+        for panel_name, panel_data in room_data["panels"].items():
+            process_panel(room_name, panel_name, panel_data)
+
+    if "doors" in room_data:
+        DOORS_BY_ROOM[room_name] = dict()
+
+        for door_name, door_data in room_data["doors"].items():
+            process_door(room_name, door_name, door_data)
+
+    if "paintings" in room_data:
+        PAINTINGS_BY_ROOM[room_name] = []
+
+        for painting_data in room_data["paintings"]:
+            process_painting(room_name, painting_data)
+
+    if "progression" in room_data:
+        for progression_name, progression_doors in room_data["progression"].items():
+            process_progression(room_name, progression_name, progression_doors)
+
+    ROOMS[room_name] = room_obj
+    ALL_ROOMS.append(room_obj)
+
+
+# Initialize the static data at module scope.
+load_static_data()
diff --git a/worlds/lingo/test/TestDoors.py b/worlds/lingo/test/TestDoors.py
new file mode 100644
index 0000000000..49a0f9c490
--- /dev/null
+++ b/worlds/lingo/test/TestDoors.py
@@ -0,0 +1,102 @@
+from . import LingoTestBase
+
+
+class TestRequiredRoomLogic(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "shuffle_colors": "false",
+    }
+
+    def test_pilgrim_first(self) -> None:
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("The Seeker", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Pilgrim Antechamber", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Pilgrim Room", "Region", self.player))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Pilgrim Room - Sun Painting")
+        self.assertFalse(self.multiworld.state.can_reach("The Seeker", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Pilgrim Antechamber", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Pilgrim Room", "Region", self.player))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Pilgrim Room - Shortcut to The Seeker")
+        self.assertTrue(self.multiworld.state.can_reach("The Seeker", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Pilgrim Room", "Region", self.player))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Starting Room - Back Right Door")
+        self.assertTrue(self.can_reach_location("The Seeker - Achievement"))
+
+    def test_hidden_first(self) -> None:
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("The Seeker", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Pilgrim Room", "Region", self.player))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Starting Room - Back Right Door")
+        self.assertFalse(self.multiworld.state.can_reach("The Seeker", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Pilgrim Room", "Region", self.player))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Pilgrim Room - Shortcut to The Seeker")
+        self.assertFalse(self.multiworld.state.can_reach("The Seeker", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Pilgrim Room", "Region", self.player))
+        self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
+
+        self.collect_by_name("Pilgrim Room - Sun Painting")
+        self.assertTrue(self.multiworld.state.can_reach("The Seeker", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Pilgrim Room", "Region", self.player))
+        self.assertTrue(self.can_reach_location("The Seeker - Achievement"))
+
+
+class TestRequiredDoorLogic(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "shuffle_colors": "false",
+    }
+
+    def test_through_rhyme(self) -> None:
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.can_reach_location("Rhyme Room - Circle/Looped Square Wall"))
+
+        self.collect_by_name("Starting Room - Rhyme Room Entrance")
+        self.assertFalse(self.can_reach_location("Rhyme Room - Circle/Looped Square Wall"))
+
+        self.collect_by_name("Rhyme Room (Looped Square) - Door to Circle")
+        self.assertTrue(self.can_reach_location("Rhyme Room - Circle/Looped Square Wall"))
+
+    def test_through_hidden(self) -> None:
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.can_reach_location("Rhyme Room - Circle/Looped Square Wall"))
+
+        self.collect_by_name("Starting Room - Rhyme Room Entrance")
+        self.assertFalse(self.can_reach_location("Rhyme Room - Circle/Looped Square Wall"))
+
+        self.collect_by_name("Starting Room - Back Right Door")
+        self.assertFalse(self.can_reach_location("Rhyme Room - Circle/Looped Square Wall"))
+
+        self.collect_by_name("Hidden Room - Rhyme Room Entrance")
+        self.assertTrue(self.can_reach_location("Rhyme Room - Circle/Looped Square Wall"))
+
+
+class TestSimpleDoors(LingoTestBase):
+    options = {
+        "shuffle_doors": "simple",
+        "shuffle_colors": "false",
+    }
+
+    def test_requirement(self):
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("Outside The Wanderer", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+
+        self.collect_by_name("Rhyme Room Doors")
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Wanderer", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+
diff --git a/worlds/lingo/test/TestMastery.py b/worlds/lingo/test/TestMastery.py
new file mode 100644
index 0000000000..3fb3c95a02
--- /dev/null
+++ b/worlds/lingo/test/TestMastery.py
@@ -0,0 +1,39 @@
+from . import LingoTestBase
+
+
+class TestMasteryWhenVictoryIsTheEnd(LingoTestBase):
+    options = {
+        "mastery_achievements": "22",
+        "victory_condition": "the_end",
+        "shuffle_colors": "true"
+    }
+
+    def test_requirement(self):
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect_by_name(["Red", "Blue", "Black", "Purple", "Orange"])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+        self.assertTrue(self.can_reach_location("The End (Solved)"))
+        self.assertFalse(self.can_reach_location("Orange Tower Seventh Floor - THE MASTER"))
+
+        self.collect_by_name(["Green", "Brown", "Yellow"])
+        self.assertTrue(self.can_reach_location("Orange Tower Seventh Floor - THE MASTER"))
+
+
+class TestMasteryWhenVictoryIsTheMaster(LingoTestBase):
+    options = {
+        "mastery_achievements": "24",
+        "victory_condition": "the_master",
+        "shuffle_colors": "true"
+    }
+
+    def test_requirement(self):
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect_by_name(["Red", "Blue", "Black", "Purple", "Orange"])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+        self.assertTrue(self.can_reach_location("Orange Tower Seventh Floor - THE END"))
+        self.assertFalse(self.can_reach_location("Orange Tower Seventh Floor - Mastery Achievements"))
+
+        self.collect_by_name(["Green", "Gray", "Brown", "Yellow"])
+        self.assertTrue(self.can_reach_location("Orange Tower Seventh Floor - Mastery Achievements"))
\ No newline at end of file
diff --git a/worlds/lingo/test/TestOptions.py b/worlds/lingo/test/TestOptions.py
new file mode 100644
index 0000000000..1769677862
--- /dev/null
+++ b/worlds/lingo/test/TestOptions.py
@@ -0,0 +1,31 @@
+from . import LingoTestBase
+
+
+class TestMultiShuffleOptions(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "progressive_orange_tower": "true",
+        "shuffle_colors": "true",
+        "shuffle_paintings": "true",
+        "early_color_hallways": "true"
+    }
+
+
+class TestPanelsanity(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "progressive_orange_tower": "true",
+        "location_checks": "insanity",
+        "shuffle_colors": "true"
+    }
+
+
+class TestAllPanelHunt(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "progressive_orange_tower": "true",
+        "shuffle_colors": "true",
+        "victory_condition": "level_2",
+        "level_2_requirement": "800",
+        "early_color_hallways": "true"
+    }
diff --git a/worlds/lingo/test/TestOrangeTower.py b/worlds/lingo/test/TestOrangeTower.py
new file mode 100644
index 0000000000..9170de108a
--- /dev/null
+++ b/worlds/lingo/test/TestOrangeTower.py
@@ -0,0 +1,179 @@
+from . import LingoTestBase
+
+
+class TestProgressiveOrangeTower(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "progressive_orange_tower": "true"
+    }
+
+    def test_from_welcome_back(self) -> None:
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect_by_name("Welcome Back Area - Shortcut to Starting Room")
+        self.collect_by_name("Orange Tower Fifth Floor - Welcome Back")
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        progressive_tower = self.get_items_by_name("Progressive Orange Tower")
+
+        self.collect(progressive_tower[0])
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[1])
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[2])
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[3])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[4])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[5])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+    def test_from_hub_room(self) -> None:
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect_by_name("Second Room - Exit Door")
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect_by_name("Orange Tower First Floor - Shortcut to Hub Room")
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        progressive_tower = self.get_items_by_name("Progressive Orange Tower")
+
+        self.collect(progressive_tower[0])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.remove(self.get_item_by_name("Orange Tower First Floor - Shortcut to Hub Room"))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[1])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[2])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[3])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[4])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
+
+        self.collect(progressive_tower[5])
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower First Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Second Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fourth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Sixth Floor", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Seventh Floor", "Region", self.player))
diff --git a/worlds/lingo/test/TestPanelsanity.py b/worlds/lingo/test/TestPanelsanity.py
new file mode 100644
index 0000000000..34c1b3815a
--- /dev/null
+++ b/worlds/lingo/test/TestPanelsanity.py
@@ -0,0 +1,19 @@
+from . import LingoTestBase
+
+
+class TestPanelHunt(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "location_checks": "insanity",
+        "victory_condition": "level_2",
+        "level_2_requirement": "15"
+    }
+
+    def test_another_try(self) -> None:
+        self.collect_by_name("The Traveled - Entrance") # idk why this is needed
+        self.assertFalse(self.can_reach_location("Second Room - ANOTHER TRY"))
+        self.assertFalse(self.can_reach_location("Second Room - Unlock Level 2"))
+
+        self.collect_by_name("Second Room - Exit Door")
+        self.assertTrue(self.can_reach_location("Second Room - ANOTHER TRY"))
+        self.assertTrue(self.can_reach_location("Second Room - Unlock Level 2"))
diff --git a/worlds/lingo/test/TestProgressive.py b/worlds/lingo/test/TestProgressive.py
new file mode 100644
index 0000000000..8edc7ce6cc
--- /dev/null
+++ b/worlds/lingo/test/TestProgressive.py
@@ -0,0 +1,198 @@
+from . import LingoTestBase
+
+
+class TestComplexProgressiveHallwayRoom(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex"
+    }
+
+    def test_item(self):
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+        self.collect_by_name(["Second Room - Exit Door", "The Tenacious - Shortcut to Hub Room",
+                              "Outside The Agreeable - Tenacious Entrance"])
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+        progressive_hallway_room = self.get_items_by_name("Progressive Hallway Room")
+
+        self.collect(progressive_hallway_room[0])
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+        self.collect(progressive_hallway_room[1])
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+        self.collect(progressive_hallway_room[2])
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+        self.collect(progressive_hallway_room[3])
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+
+class TestSimpleHallwayRoom(LingoTestBase):
+    options = {
+        "shuffle_doors": "simple"
+    }
+
+    def test_item(self):
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+        self.collect_by_name(["Second Room - Exit Door", "Entrances to The Tenacious"])
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+        self.collect_by_name("Hallway Room Doors")
+        self.assertTrue(self.multiworld.state.can_reach("Outside The Agreeable", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (2)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (3)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Hallway Room (4)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Elements Area", "Region", self.player))
+
+
+class TestProgressiveArtGallery(LingoTestBase):
+    options = {
+        "shuffle_doors": "complex",
+        "shuffle_colors": "false",
+    }
+
+    def test_item(self):
+        self.remove_forced_good_item()
+
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect_by_name(["Second Room - Exit Door", "Crossroads - Tower Entrance",
+                              "Orange Tower Fourth Floor - Hot Crusts Door"])
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        progressive_gallery_room = self.get_items_by_name("Progressive Art Gallery")
+
+        self.collect(progressive_gallery_room[0])
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect(progressive_gallery_room[1])
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect(progressive_gallery_room[2])
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect(progressive_gallery_room[3])
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertTrue(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect(progressive_gallery_room[4])
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertTrue(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+
+class TestNoDoorsArtGallery(LingoTestBase):
+    options = {
+        "shuffle_doors": "none",
+        "shuffle_colors": "true"
+    }
+
+    def test_item(self):
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect_by_name("Yellow")
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect_by_name("Brown")
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertFalse(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect_by_name("Blue")
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertFalse(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertFalse(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
+
+        self.collect_by_name(["Orange", "Gray"])
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Second Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Third Floor)", "Region", self.player))
+        self.assertTrue(self.multiworld.state.can_reach("Art Gallery (Fourth Floor)", "Region", self.player))
+        self.assertTrue(self.can_reach_location("Art Gallery - ONE ROAD MANY TURNS"))
+        self.assertTrue(self.multiworld.state.can_reach("Orange Tower Fifth Floor", "Region", self.player))
diff --git a/worlds/lingo/test/__init__.py b/worlds/lingo/test/__init__.py
new file mode 100644
index 0000000000..7ff456d8fc
--- /dev/null
+++ b/worlds/lingo/test/__init__.py
@@ -0,0 +1,17 @@
+from typing import ClassVar
+
+from test.bases import WorldTestBase
+
+
+class LingoTestBase(WorldTestBase):
+    game = "Lingo"
+    player: ClassVar[int] = 1
+
+    def world_setup(self, *args, **kwargs):
+        super().world_setup(*args, **kwargs)
+
+    def remove_forced_good_item(self):
+        location = self.multiworld.get_location("Second Room - Good Luck", self.player)
+        self.remove(location.item)
+        self.multiworld.itempool.append(location.item)
+        self.multiworld.state.events.add(location)
diff --git a/worlds/lingo/utils/assign_ids.rb b/worlds/lingo/utils/assign_ids.rb
new file mode 100644
index 0000000000..9e1ce67bd2
--- /dev/null
+++ b/worlds/lingo/utils/assign_ids.rb
@@ -0,0 +1,178 @@
+# This utility goes through the provided Lingo config and assigns item and
+# location IDs to entities that require them (such as doors and panels). These
+# IDs are output in a separate yaml file. If the output file already exists,
+# then it will be updated with any newly assigned IDs rather than overwritten.
+# In this event, all new IDs will be greater than any already existing IDs,
+# even if there are gaps in the ID space; this is to prevent collision when IDs
+# are retired.
+#
+# This utility should be run whenever logically new items or locations are
+# required. If an item or location is created that is logically equivalent to
+# one that used to exist, this utility should not be used, and instead the ID
+# file should be manually edited so that the old ID can be reused.
+
+require 'set'
+require 'yaml'
+
+configpath = ARGV[0]
+outputpath = ARGV[1]
+
+next_item_id = 444400
+next_location_id = 444400
+
+location_id_by_name = {}
+
+old_generated = YAML.load_file(outputpath)
+File.write(outputpath + ".old", old_generated.to_yaml)
+
+if old_generated.include? "special_items" then
+  old_generated["special_items"].each do |name, id|
+    if id >= next_item_id then
+      next_item_id = id + 1
+    end
+  end
+end
+if old_generated.include? "special_locations" then
+  old_generated["special_locations"].each do |name, id|
+    if id >= next_location_id then
+      next_location_id = id + 1
+    end
+  end
+end
+if old_generated.include? "panels" then
+  old_generated["panels"].each do |room, panels|
+    panels.each do |name, id|
+      if id >= next_location_id then
+        next_location_id = id + 1
+      end
+      location_name = "#{room} - #{name}"
+      location_id_by_name[location_name] = id
+    end
+  end
+end
+if old_generated.include? "doors" then
+  old_generated["doors"].each do |room, doors|
+    doors.each do |name, ids|
+      if ids.include? "location" then
+        if ids["location"] >= next_location_id then
+          next_location_id = ids["location"] + 1
+        end
+      end
+      if ids.include? "item" then
+        if ids["item"] >= next_item_id then
+          next_item_id = ids["item"] + 1
+        end
+      end
+    end
+  end
+end
+if old_generated.include? "door_groups" then
+  old_generated["door_groups"].each do |name, id|
+    if id >= next_item_id then
+      next_item_id = id + 1
+    end
+  end
+end
+if old_generated.include? "progression" then
+  old_generated["progression"].each do |name, id|
+    if id >= next_item_id then
+      next_item_id = id + 1
+    end
+  end
+end
+
+door_groups = Set[]
+
+config = YAML.load_file(configpath)
+config.each do |room_name, room_data|
+  if room_data.include? "panels"
+    room_data["panels"].each do |panel_name, panel|
+      unless old_generated.include? "panels" and old_generated["panels"].include? room_name and old_generated["panels"][room_name].include? panel_name then
+        old_generated["panels"] ||= {}
+        old_generated["panels"][room_name] ||= {}
+        old_generated["panels"][room_name][panel_name] = next_location_id
+
+        location_name = "#{room_name} - #{panel_name}"
+        location_id_by_name[location_name] = next_location_id
+
+        next_location_id += 1
+      end
+    end
+  end
+end
+
+config.each do |room_name, room_data|
+  if room_data.include? "doors"
+    room_data["doors"].each do |door_name, door|
+      if door.include? "event" and door["event"] then
+        next
+      end
+
+      unless door.include? "skip_item" and door["skip_item"] then
+        unless old_generated.include? "doors" and old_generated["doors"].include? room_name and old_generated["doors"][room_name].include? door_name and old_generated["doors"][room_name][door_name].include? "item" then
+          old_generated["doors"] ||= {}
+          old_generated["doors"][room_name] ||= {}
+          old_generated["doors"][room_name][door_name] ||= {}
+          old_generated["doors"][room_name][door_name]["item"] = next_item_id
+  
+          next_item_id += 1
+        end
+
+        if door.include? "group" and not door_groups.include? door["group"] then
+          door_groups.add(door["group"])
+
+          unless old_generated.include? "door_groups" and old_generated["door_groups"].include? door["group"] then
+            old_generated["door_groups"] ||= {}
+            old_generated["door_groups"][door["group"]] = next_item_id
+    
+            next_item_id += 1
+          end
+        end
+      end
+
+      unless door.include? "skip_location" and door["skip_location"] then
+        location_name = ""
+        if door.include? "location_name" then
+          location_name = door["location_name"]
+        elsif door.include? "panels" then
+          location_name = door["panels"].map do |panel|
+            if panel.kind_of? Hash then
+              panel
+            else
+              {"room" => room_name, "panel" => panel}
+            end
+          end.sort_by {|panel| panel["room"]}.chunk {|panel| panel["room"]}.map do |room_panels|
+            room_panels[0] + " - " + room_panels[1].map{|panel| panel["panel"]}.join(", ")
+          end.join(" and ")
+        end
+
+        if location_id_by_name.has_key? location_name then
+          old_generated["doors"] ||= {}
+          old_generated["doors"][room_name] ||= {}
+          old_generated["doors"][room_name][door_name] ||= {}
+          old_generated["doors"][room_name][door_name]["location"] = location_id_by_name[location_name]
+        elsif not (old_generated.include? "doors" and old_generated["doors"].include? room_name and old_generated["doors"][room_name].include? door_name and old_generated["doors"][room_name][door_name].include? "location") then
+          old_generated["doors"] ||= {}
+          old_generated["doors"][room_name] ||= {}
+          old_generated["doors"][room_name][door_name] ||= {}
+          old_generated["doors"][room_name][door_name]["location"] = next_location_id
+  
+          next_location_id += 1
+        end
+      end
+    end
+  end
+
+  if room_data.include? "progression"
+    room_data["progression"].each do |progression_name, pdata|
+      unless old_generated.include? "progression" and old_generated["progression"].include? progression_name then
+        old_generated["progression"] ||= {}
+        old_generated["progression"][progression_name] = next_item_id
+
+        next_item_id += 1
+      end
+    end
+  end
+end
+
+File.write(outputpath, old_generated.to_yaml)
diff --git a/worlds/lingo/utils/validate_config.rb b/worlds/lingo/utils/validate_config.rb
new file mode 100644
index 0000000000..3ac49dc220
--- /dev/null
+++ b/worlds/lingo/utils/validate_config.rb
@@ -0,0 +1,329 @@
+# Script to validate a level config file. This checks that the names used within
+# the file are consistent. It also checks that the panel and door IDs mentioned
+# all exist in the map file.
+#
+# Usage: validate_config.rb [config file] [map file]
+
+require 'set'
+require 'yaml'
+
+configpath = ARGV[0]
+mappath = ARGV[1]
+
+panels = Set["Countdown Panels/Panel_1234567890_wanderlust"]
+doors = Set["Naps Room Doors/Door_hider_new1", "Tower Room Area Doors/Door_wanderer_entrance"]
+paintings = Set[]
+
+File.readlines(mappath).each do |line|
+  line.match(/node name=\"(.*)\" parent=\"Panels\/(.*)\" instance/) do |m|
+    panels.add(m[2] + "/" + m[1])
+  end
+  line.match(/node name=\"(.*)\" parent=\"Doors\/(.*)\" instance/) do |m|
+    doors.add(m[2] + "/" + m[1])
+  end
+  line.match(/node name=\"(.*)\" parent=\"Decorations\/Paintings\" instance/) do |m|
+    paintings.add(m[1])
+  end
+  line.match(/node name=\"(.*)\" parent=\"Decorations\/EndPanel\" instance/) do |m|
+    panels.add("EndPanel/" + m[1])
+  end
+end
+
+configured_rooms = Set["Menu"]
+configured_doors = Set[]
+configured_panels = Set[]
+
+mentioned_rooms = Set[]
+mentioned_doors = Set[]
+mentioned_panels = Set[]
+
+door_groups = {}
+
+directives = Set["entrances", "panels", "doors", "paintings", "progression"]
+panel_directives = Set["id", "required_room", "required_door", "required_panel", "colors", "check", "exclude_reduce", "tag", "link", "subtag", "achievement", "copy_to_sign", "non_counting", "hunt"]
+door_directives = Set["id", "painting_id", "panels", "item_name", "location_name", "skip_location", "skip_item", "group", "include_reduce", "junk_item", "event"]
+painting_directives = Set["id", "enter_only", "exit_only", "orientation", "required_door", "required", "required_when_no_doors", "move", "req_blocked", "req_blocked_when_no_doors"]
+
+non_counting = 0
+
+config = YAML.load_file(configpath)
+config.each do |room_name, room|
+  configured_rooms.add(room_name)
+
+  used_directives = Set[]
+  room.each_key do |key|
+    used_directives.add(key)
+  end
+  diff_directives = used_directives - directives
+  unless diff_directives.empty? then
+    puts("#{room_name} has the following invalid top-level directives: #{diff_directives.to_s}")
+  end
+
+  (room["entrances"] || {}).each do |source_room, entrance|
+    mentioned_rooms.add(source_room)
+
+    entrances = []
+    if entrance.kind_of? Hash
+      if entrance.keys() != ["painting"] then
+        entrances = [entrance]
+      end
+    elsif entrance.kind_of? Array
+      entrances = entrance
+    end
+
+    entrances.each do |e|
+      entrance_room = e.include?("room") ? e["room"] : room_name
+      mentioned_rooms.add(entrance_room)
+      mentioned_doors.add(entrance_room + " - " + e["door"])
+    end
+  end
+
+  (room["panels"] || {}).each do |panel_name, panel|
+    unless panel_name.kind_of? String then
+      puts "#{room_name} has an invalid panel name"
+    end
+
+    configured_panels.add(room_name + " - " + panel_name)
+
+    if panel.include?("id")
+      panel_ids = []
+      if panel["id"].kind_of? Array
+        panel_ids = panel["id"]
+      else
+        panel_ids = [panel["id"]]
+      end
+
+      panel_ids.each do |panel_id|
+        unless panels.include? panel_id then
+          puts "#{room_name} - #{panel_name} :::: Invalid Panel ID #{panel_id}"
+        end
+      end
+    else
+      puts "#{room_name} - #{panel_name} :::: Panel is missing an ID"
+    end
+
+    if panel.include?("required_room")
+      required_rooms = []
+      if panel["required_room"].kind_of? Array
+        required_rooms = panel["required_room"]
+      else
+        required_rooms = [panel["required_room"]]
+      end
+
+      required_rooms.each do |required_room|
+        mentioned_rooms.add(required_room)
+      end
+    end
+
+    if panel.include?("required_door")
+      required_doors = []
+      if panel["required_door"].kind_of? Array
+        required_doors = panel["required_door"]
+      else
+        required_doors = [panel["required_door"]]
+      end
+
+      required_doors.each do |required_door|
+        other_room = required_door.include?("room") ? required_door["room"] : room_name
+        mentioned_rooms.add(other_room)
+        mentioned_doors.add("#{other_room} - #{required_door["door"]}")
+      end
+    end
+
+    if panel.include?("required_panel")
+      required_panels = []
+      if panel["required_panel"].kind_of? Array
+        required_panels = panel["required_panel"]
+      else
+        required_panels = [panel["required_panel"]]
+      end
+
+      required_panels.each do |required_panel|
+        other_room = required_panel.include?("room") ? required_panel["room"] : room_name
+        mentioned_rooms.add(other_room)
+        mentioned_panels.add("#{other_room} - #{required_panel["panel"]}")
+      end
+    end
+
+    unless panel.include?("tag") then
+      puts "#{room_name} - #{panel_name} :::: Panel is missing a tag"
+    end
+
+    if panel.include?("non_counting") then
+      non_counting += 1
+    end
+
+    bad_subdirectives = []
+    panel.keys.each do |key|
+      unless panel_directives.include?(key) then
+        bad_subdirectives << key
+      end
+    end
+    unless bad_subdirectives.empty? then
+      puts "#{room_name} - #{panel_name} :::: Panel has the following invalid subdirectives: #{bad_subdirectives.join(", ")}"
+    end
+  end
+
+  (room["doors"] || {}).each do |door_name, door|
+    configured_doors.add("#{room_name} - #{door_name}")
+
+    if door.include?("id")
+      door_ids = []
+      if door["id"].kind_of? Array
+        door_ids = door["id"]
+      else
+        door_ids = [door["id"]]
+      end
+
+      door_ids.each do |door_id|
+        unless doors.include? door_id then
+          puts "#{room_name} - #{door_name} :::: Invalid Door ID #{door_id}"
+        end
+      end
+    end
+
+    if door.include?("painting_id")
+      painting_ids = []
+      if door["painting_id"].kind_of? Array
+        painting_ids = door["painting_id"]
+      else
+        painting_ids = [door["painting_id"]]
+      end
+
+      painting_ids.each do |painting_id|
+        unless paintings.include? painting_id then
+          puts "#{room_name} - #{door_name} :::: Invalid Painting ID #{painting_id}"
+        end
+      end
+    end
+
+    if not door.include?("id") and not door.include?("painting_id") and not door["skip_item"] and not door["event"] then
+      puts "#{room_name} - #{door_name} :::: Should be marked skip_item or event if there are no doors or paintings"
+    end
+
+    if door.include?("panels")
+      door["panels"].each do |panel|
+        if panel.kind_of? Hash then
+          other_room = panel.include?("room") ? panel["room"] : room_name
+          mentioned_panels.add("#{other_room} - #{panel["panel"]}")
+        else
+          other_room = panel.include?("room") ? panel["room"] : room_name
+          mentioned_panels.add("#{room_name} - #{panel}")
+        end
+      end
+    elsif not door["skip_location"]
+      puts "#{room_name} - #{door_name} :::: Should be marked skip_location if there are no panels"
+    end
+
+    if door.include?("group")
+      door_groups[door["group"]] ||= 0
+      door_groups[door["group"]] += 1
+    end
+
+    bad_subdirectives = []
+    door.keys.each do |key|
+      unless door_directives.include?(key) then
+        bad_subdirectives << key
+      end
+    end
+    unless bad_subdirectives.empty? then
+      puts "#{room_name} - #{door_name} :::: Door has the following invalid subdirectives: #{bad_subdirectives.join(", ")}"
+    end
+  end
+
+  (room["paintings"] || []).each do |painting|
+    if painting.include?("id") and painting["id"].kind_of? String then
+      unless paintings.include? painting["id"] then
+        puts "#{room_name} :::: Invalid Painting ID #{painting["id"]}"
+      end
+    else
+      puts "#{room_name} :::: Painting is missing an ID"
+    end
+
+    if painting["disable"] then
+      # We're good.
+      next
+    end
+
+    if painting.include?("orientation") then
+      unless ["north", "south", "east", "west"].include? painting["orientation"] then
+        puts "#{room_name} - #{painting["id"] || "painting"} :::: Invalid orientation #{painting["orientation"]}"
+      end
+    else
+      puts "#{room_name} :::: Painting is missing an orientation"
+    end
+
+    if painting.include?("required_door")
+      other_room = painting["required_door"].include?("room") ? painting["required_door"]["room"] : room_name
+      mentioned_doors.add("#{other_room} - #{painting["required_door"]["door"]}")
+
+      unless painting["enter_only"] then
+        puts "#{room_name} - #{painting["id"] || "painting"} :::: Should be marked enter_only if there is a required_door"
+      end
+    end
+
+    bad_subdirectives = []
+    painting.keys.each do |key|
+      unless painting_directives.include?(key) then
+        bad_subdirectives << key
+      end
+    end
+    unless bad_subdirectives.empty? then
+      puts "#{room_name} - #{painting["id"] || "painting"} :::: Painting has the following invalid subdirectives: #{bad_subdirectives.join(", ")}"
+    end
+  end
+
+  (room["progression"] || {}).each do |progression_name, door_list|
+    door_list.each do |door|
+      if door.kind_of? Hash then
+        mentioned_doors.add("#{door["room"]} - #{door["door"]}")
+      else
+        mentioned_doors.add("#{room_name} - #{door}")
+      end
+    end
+  end
+end
+
+errored_rooms = mentioned_rooms - configured_rooms
+unless errored_rooms.empty? then
+  puts "The folloring rooms are mentioned but do not exist: " + errored_rooms.to_s
+end
+
+errored_panels = mentioned_panels - configured_panels
+unless errored_panels.empty? then
+  puts "The folloring panels are mentioned but do not exist: " + errored_panels.to_s
+end
+
+errored_doors = mentioned_doors - configured_doors
+unless errored_doors.empty? then
+  puts "The folloring doors are mentioned but do not exist: " + errored_doors.to_s
+end
+
+door_groups.each do |group,num|
+  if num == 1 then
+    puts "Door group \"#{group}\" only has one door in it"
+  end
+end
+
+slashed_rooms = configured_rooms.select do |room|
+  room.include? "/"
+end
+unless slashed_rooms.empty? then
+  puts "The following rooms have slashes in their names: " + slashed_rooms.to_s
+end
+
+slashed_panels = configured_panels.select do |panel|
+  panel.include? "/"
+end
+unless slashed_panels.empty? then
+  puts "The following panels have slashes in their names: " + slashed_panels.to_s
+end
+
+slashed_doors = configured_doors.select do |door|
+  door.include? "/"
+end
+unless slashed_doors.empty? then
+  puts "The following doors have slashes in their names: " + slashed_doors.to_s
+end
+
+puts "#{configured_panels.size} panels (#{non_counting} non counting)"
diff --git a/worlds/lufia2ac/Client.py b/worlds/lufia2ac/Client.py
index bc0cb6a7d8..ac0de19bfd 100644
--- a/worlds/lufia2ac/Client.py
+++ b/worlds/lufia2ac/Client.py
@@ -113,7 +113,7 @@ class L2ACSNIClient(SNIClient):
                         }],
                     }])
 
-            total_blue_chests_checked: int = min(sum(blue_chests_checked.values()), BlueChestCount.range_end)
+            total_blue_chests_checked: int = min(sum(blue_chests_checked.values()), BlueChestCount.overall_max)
             snes_buffered_write(ctx, L2AC_TX_ADDR + 8, total_blue_chests_checked.to_bytes(2, "little"))
             location_ids: List[int] = [locations_start_id + i for i in range(total_blue_chests_checked)]
 
diff --git a/worlds/lufia2ac/Items.py b/worlds/lufia2ac/Items.py
index 20159f480a..190b913c8e 100644
--- a/worlds/lufia2ac/Items.py
+++ b/worlds/lufia2ac/Items.py
@@ -2,9 +2,8 @@ from enum import auto, Enum
 from typing import Dict, NamedTuple, Optional
 
 from BaseClasses import Item, ItemClassification
-from . import Locations
 
-start_id: int = Locations.start_id
+start_id: int = 0xAC0000
 
 
 class ItemType(Enum):
@@ -500,7 +499,7 @@ l2ac_item_table: Dict[str, ItemData] = {
     # 0x01C8: "Key28"
     # 0x01C9: "Key29"
     # 0x01CA: "AP item"  # replaces "Key30"
-    # 0x01CB: "Crown"
+    # 0x01CB: "SOLD OUT"  # replaces "Crown"
     # 0x01CC: "Ruby apple"
     # 0x01CD: "PURIFIA"
     # 0x01CE: "Tag ring"
diff --git a/worlds/lufia2ac/Locations.py b/worlds/lufia2ac/Locations.py
index 2f433f72e2..510ecbbbf7 100644
--- a/worlds/lufia2ac/Locations.py
+++ b/worlds/lufia2ac/Locations.py
@@ -6,7 +6,7 @@ from .Options import BlueChestCount
 start_id: int = 0xAC0000
 
 l2ac_location_name_to_id: Dict[str, int] = {
-    **{f"Blue chest {i + 1}": (start_id + i) for i in range(BlueChestCount.range_end + 7 + 6)},
+    **{f"Blue chest {i + 1}": (start_id + i) for i in range(BlueChestCount.overall_max)},
     **{f"Iris treasure {i + 1}": (start_id + 0x039C + i) for i in range(9)},
     "Boss": start_id + 0x01C2,
 }
diff --git a/worlds/lufia2ac/Options.py b/worlds/lufia2ac/Options.py
index c3bbadc9ba..5f33d0bd5d 100644
--- a/worlds/lufia2ac/Options.py
+++ b/worlds/lufia2ac/Options.py
@@ -1,12 +1,16 @@
 from __future__ import annotations
 
+import functools
+import numbers
 import random
 from dataclasses import dataclass
 from itertools import accumulate, chain, combinations
 from typing import Any, cast, Dict, Iterator, List, Mapping, Optional, Set, Tuple, Type, TYPE_CHECKING, Union
 
-from Options import AssembleOptions, Choice, DeathLink, ItemDict, Range, SpecialRange, TextChoice, Toggle
+from Options import AssembleOptions, Choice, DeathLink, ItemDict, NamedRange, OptionDict, PerGameCommonOptions, Range, \
+    TextChoice, Toggle
 from .Enemies import enemy_name_to_sprite
+from .Items import ItemType, l2ac_item_table
 
 if TYPE_CHECKING:
     from BaseClasses import PlandoOptions
@@ -117,6 +121,7 @@ class BlueChestCount(Range):
     range_start = 10
     range_end = 100
     default = 25
+    overall_max = range_end + 7 + 6  # Have to account for capsule monster and party member items
 
 
 class Boss(RandomGroupsChoice):
@@ -250,7 +255,7 @@ class CapsuleCravingsJPStyle(Toggle):
     display_name = "Capsule cravings JP style"
 
 
-class CapsuleStartingForm(SpecialRange):
+class CapsuleStartingForm(NamedRange):
     """The starting form of your capsule monsters.
 
     Supported values: 1 – 4, m
@@ -261,7 +266,6 @@ class CapsuleStartingForm(SpecialRange):
     range_start = 1
     range_end = 5
     default = 1
-    special_range_cutoff = 1
     special_range_names = {
         "default": 1,
         "m": 5,
@@ -275,7 +279,7 @@ class CapsuleStartingForm(SpecialRange):
             return self.value - 1
 
 
-class CapsuleStartingLevel(LevelMixin, SpecialRange):
+class CapsuleStartingLevel(LevelMixin, NamedRange):
     """The starting level of your capsule monsters.
 
     Can be set to the special value party_starting_level to make it the same value as the party_starting_level option.
@@ -284,10 +288,9 @@ class CapsuleStartingLevel(LevelMixin, SpecialRange):
     """
 
     display_name = "Capsule monster starting level"
-    range_start = 0
+    range_start = 1
     range_end = 99
     default = 1
-    special_range_cutoff = 1
     special_range_names = {
         "default": 1,
         "party_starting_level": 0,
@@ -557,6 +560,25 @@ class Goal(Choice):
     default = option_boss
 
 
+class GoldModifier(Range):
+    """Percentage modifier for gold gained from enemies.
+
+    Supported values: 25 – 400
+    Default value: 100 (same as in an unmodified game)
+    """
+
+    display_name = "Gold modifier"
+    range_start = 25
+    range_end = 400
+    default = 100
+
+    def __call__(self, gold: bytes) -> bytes:
+        try:
+            return (int.from_bytes(gold, "little") * self.value // 100).to_bytes(2, "little")
+        except OverflowError:
+            return b"\xFF\xFF"
+
+
 class HealingFloorChance(Range):
     """The chance of a floor having a healing tile hidden under a bush.
 
@@ -661,6 +683,104 @@ class RunSpeed(Choice):
     default = option_disabled
 
 
+class ShopInterval(NamedRange):
+    """Place shops after a certain number of floors.
+
+    E.g., if you set this to 5, then you will be given the opportunity to shop after completing B5, B10, B15, etc.,
+    whereas if you set it to 1, then there will be a shop after every single completed floor.
+    Shops will offer a random selection of wares; on deeper floors, more expensive items might appear.
+    You can customize the stock that can appear in shops using the shop_inventory option.
+    You can control how much gold you will be obtaining from enemies using the gold_multiplier option.
+    Supported values: disabled, 1 – 10
+    Default value: disabled (same as in an unmodified game)
+    """
+
+    display_name = "Shop interval"
+    range_start = 1
+    range_end = 10
+    default = 0
+    special_range_names = {
+        "disabled": 0,
+    }
+
+
+class ShopInventory(OptionDict):
+    """Determine the item types that can appear in shops.
+
+    The value of this option should be a mapping of item categories (or individual items) to weights (non-negative
+    integers), which are used as relative probabilities when it comes to including these things in shops. (The actual
+    contents of the generated shops are selected randomly and are subject to additional constraints such as more
+    expensive things being allowed only on later floors.)
+    Supported keys:
+    non_restorative — a selection of mostly non-restorative red chest consumables
+    restorative — all HP- or MP-restoring red chest consumables
+    blue_chest — all blue chest items
+    spell — all red chest spells
+    gear — all red chest armors, shields, headgear, rings, and rocks (this respects the gear_variety_after_b9 option,
+        meaning that you will not encounter any shields, headgear, rings, or rocks in shops from B10 onward unless you
+        also enabled that option)
+    weapon — all red chest weapons
+    Additionally, you can also add extra weights for any specific cave item. If you want your shops to have a
+    higher than normal chance of selling a Dekar blade, you can, e.g., add "Dekar blade: 5".
+    You can even forego the predefined categories entirely and design a custom shop pool from scratch by providing
+    separate weights for each item you want to include.
+    (Spells, however, cannot be weighted individually and are only available as part of the "spell" category.)
+    Default value: {spell: 30, gear: 45, weapon: 82}
+    """
+
+    display_name = "Shop inventory"
+    _special_keys = {"non_restorative", "restorative", "blue_chest", "spell", "gear", "weapon"}
+    valid_keys = _special_keys | {item for item, data in l2ac_item_table.items()
+                                  if data.type in {ItemType.BLUE_CHEST, ItemType.ENEMY_DROP, ItemType.ENTRANCE_CHEST,
+                                                   ItemType.RED_CHEST, ItemType.RED_CHEST_PATCH}}
+    default: Dict[str, int] = {
+        "spell": 30,
+        "gear": 45,
+        "weapon": 82,
+    }
+    value: Dict[str, int]
+
+    def verify(self, world: Type[World], player_name: str, plando_options: PlandoOptions) -> None:
+        super().verify(world, player_name, plando_options)
+        for item, weight in self.value.items():
+            if not isinstance(weight, numbers.Integral) or weight < 0:
+                raise Exception(f"Weight for item \"{item}\" from option {self} must be a non-negative integer, "
+                                f"but was \"{weight}\".")
+
+    @property
+    def total(self) -> int:
+        return sum(self.value.values())
+
+    @property
+    def non_restorative(self) -> int:
+        return self.value.get("non_restorative", 0)
+
+    @property
+    def restorative(self) -> int:
+        return self.value.get("restorative", 0)
+
+    @property
+    def blue_chest(self) -> int:
+        return self.value.get("blue_chest", 0)
+
+    @property
+    def spell(self) -> int:
+        return self.value.get("spell", 0)
+
+    @property
+    def gear(self) -> int:
+        return self.value.get("gear", 0)
+
+    @property
+    def weapon(self) -> int:
+        return self.value.get("weapon", 0)
+
+    @functools.cached_property
+    def custom(self) -> Dict[int, int]:
+        return {l2ac_item_table[item].code & 0x01FF: weight for item, weight in self.value.items()
+                if item not in self._special_keys}
+
+
 class ShuffleCapsuleMonsters(Toggle):
     """Shuffle the capsule monsters into the multiworld.
 
@@ -697,7 +817,7 @@ class ShufflePartyMembers(Toggle):
 
 
 @dataclass
-class L2ACOptions:
+class L2ACOptions(PerGameCommonOptions):
     blue_chest_chance: BlueChestChance
     blue_chest_count: BlueChestCount
     boss: Boss
@@ -716,6 +836,7 @@ class L2ACOptions:
     final_floor: FinalFloor
     gear_variety_after_b9: GearVarietyAfterB9
     goal: Goal
+    gold_modifier: GoldModifier
     healing_floor_chance: HealingFloorChance
     initial_floor: InitialFloor
     iris_floor_chance: IrisFloorChance
@@ -723,5 +844,7 @@ class L2ACOptions:
     master_hp: MasterHp
     party_starting_level: PartyStartingLevel
     run_speed: RunSpeed
+    shop_interval: ShopInterval
+    shop_inventory: ShopInventory
     shuffle_capsule_monsters: ShuffleCapsuleMonsters
     shuffle_party_members: ShufflePartyMembers
diff --git a/worlds/lufia2ac/Rom.py b/worlds/lufia2ac/Rom.py
index 1da8d235a6..446668d392 100644
--- a/worlds/lufia2ac/Rom.py
+++ b/worlds/lufia2ac/Rom.py
@@ -3,7 +3,7 @@ import os
 from typing import Optional
 
 import Utils
-from Utils import OptionsType
+from settings import get_settings
 from worlds.Files import APDeltaPatch
 
 L2USHASH: str = "6efc477d6203ed2b3b9133c1cd9e9c5d"
@@ -35,9 +35,8 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
 
 
 def get_base_rom_path(file_name: str = "") -> str:
-    options: OptionsType = Utils.get_options()
     if not file_name:
-        file_name = options["lufia2ac_options"]["rom_file"]
+        file_name = get_settings()["lufia2ac_options"]["rom_file"]
     if not os.path.exists(file_name):
         file_name = Utils.user_path(file_name)
     return file_name
diff --git a/worlds/lufia2ac/Utils.py b/worlds/lufia2ac/Utils.py
index 6c2e28d137..1fd7e0e171 100644
--- a/worlds/lufia2ac/Utils.py
+++ b/worlds/lufia2ac/Utils.py
@@ -1,5 +1,7 @@
+import itertools
+from operator import itemgetter
 from random import Random
-from typing import Dict, List, MutableSequence, Sequence, Set, Tuple
+from typing import Dict, Iterable, List, MutableSequence, Sequence, Set, Tuple
 
 
 def constrained_choices(population: Sequence[int], d: int, *, k: int, random: Random) -> List[int]:
@@ -19,3 +21,10 @@ def constrained_shuffle(x: MutableSequence[int], d: int, random: Random) -> None
         i, j = random.randrange(n), random.randrange(n)
         if x[i] in constraints[j] and x[j] in constraints[i]:
             x[i], x[j] = x[j], x[i]
+
+
+def weighted_sample(population: Iterable[int], weights: Iterable[float], k: int, *, random: Random) -> List[int]:
+    population, keys = zip(*((item, pow(random.random(), 1 / group_weight))
+                             for item, group in itertools.groupby(sorted(zip(population, weights)), key=itemgetter(0))
+                             if (group_weight := sum(weight for _, weight in group))))
+    return sorted(population, key=dict(zip(population, keys)).__getitem__)[-k:]
diff --git a/worlds/lufia2ac/__init__.py b/worlds/lufia2ac/__init__.py
index f14048a2c4..9bd436fa0d 100644
--- a/worlds/lufia2ac/__init__.py
+++ b/worlds/lufia2ac/__init__.py
@@ -2,21 +2,21 @@ import base64
 import itertools
 import os
 from enum import IntFlag
-from typing import Any, ClassVar, Dict, get_type_hints, Iterator, List, Set, Tuple
+from typing import Any, ClassVar, Dict, Iterator, List, Set, Tuple, Type
 
 import settings
 from BaseClasses import Item, ItemClassification, Location, MultiWorld, Region, Tutorial
-from Options import AssembleOptions
+from Options import PerGameCommonOptions
 from Utils import __version__
 from worlds.AutoWorld import WebWorld, World
-from worlds.generic.Rules import add_rule, set_rule
+from worlds.generic.Rules import add_rule, CollectionRule, set_rule
 from .Client import L2ACSNIClient  # noqa: F401
 from .Items import ItemData, ItemType, l2ac_item_name_to_id, l2ac_item_table, L2ACItem, start_id as items_start_id
 from .Locations import l2ac_location_name_to_id, L2ACLocation
 from .Options import CapsuleStartingLevel, DefaultParty, EnemyFloorNumbers, EnemyMovementPatterns, EnemySprites, \
-    ExpModifier, Goal, L2ACOptions
+    Goal, L2ACOptions
 from .Rom import get_base_rom_bytes, get_base_rom_path, L2ACDeltaPatch
-from .Utils import constrained_choices, constrained_shuffle
+from .Utils import constrained_choices, constrained_shuffle, weighted_sample
 from .basepatch import apply_basepatch
 
 CHESTS_PER_SPHERE: int = 5
@@ -54,7 +54,8 @@ class L2ACWorld(World):
     game: ClassVar[str] = "Lufia II Ancient Cave"
     web: ClassVar[WebWorld] = L2ACWeb()
 
-    option_definitions: ClassVar[Dict[str, AssembleOptions]] = get_type_hints(L2ACOptions)
+    options_dataclass: ClassVar[Type[PerGameCommonOptions]] = L2ACOptions
+    options: L2ACOptions
     settings: ClassVar[L2ACSettings]
     item_name_to_id: ClassVar[Dict[str, int]] = l2ac_item_name_to_id
     location_name_to_id: ClassVar[Dict[str, int]] = l2ac_location_name_to_id
@@ -65,7 +66,7 @@ class L2ACWorld(World):
         "Party members": {name for name, data in l2ac_item_table.items() if data.type is ItemType.PARTY_MEMBER},
     }
     data_version: ClassVar[int] = 2
-    required_client_version: Tuple[int, int, int] = (0, 4, 2)
+    required_client_version: Tuple[int, int, int] = (0, 4, 4)
 
     # L2ACWorld specific properties
     rom_name: bytearray
@@ -87,7 +88,7 @@ class L2ACWorld(World):
             bytearray(f"L2AC{__version__.replace('.', '')[:3]}_{self.player}_{self.multiworld.seed}", "utf8")[:21]
         self.rom_name.extend([0] * (21 - len(self.rom_name)))
 
-        self.o = L2ACOptions(**{opt: getattr(self.multiworld, opt)[self.player] for opt in self.option_definitions})
+        self.o = self.options
 
         if self.o.blue_chest_count < self.o.custom_item_pool.count:
             raise ValueError(f"Number of items in custom_item_pool ({self.o.custom_item_pool.count}) is "
@@ -116,6 +117,7 @@ class L2ACWorld(World):
                 L2ACLocation(self.player, f"Chest access {i + 1}-{i + CHESTS_PER_SPHERE}", None, ancient_dungeon)
             chest_access.place_locked_item(
                 L2ACItem("Progressive chest access", ItemClassification.progression, None, self.player))
+            chest_access.show_in_spoiler = False
             ancient_dungeon.locations.append(chest_access)
         for iris in self.item_name_groups["Iris treasures"]:
             treasure_name: str = f"Iris treasure {self.item_name_to_id[iris] - self.item_name_to_id['Iris sword'] + 1}"
@@ -152,23 +154,23 @@ class L2ACWorld(World):
             self.multiworld.itempool.append(self.create_item(item_name))
 
     def set_rules(self) -> None:
-        for i in range(1, self.o.blue_chest_count):
-            if i % CHESTS_PER_SPHERE == 0:
-                set_rule(self.multiworld.get_location(f"Blue chest {i + 1}", self.player),
-                         lambda state, j=i: state.has("Progressive chest access", self.player, j // CHESTS_PER_SPHERE))
-                set_rule(self.multiworld.get_location(f"Chest access {i + 1}-{i + CHESTS_PER_SPHERE}", self.player),
-                         lambda state, j=i: state.can_reach(f"Blue chest {j}", "Location", self.player))
-            else:
-                set_rule(self.multiworld.get_location(f"Blue chest {i + 1}", self.player),
-                         lambda state, j=i: state.can_reach(f"Blue chest {j}", "Location", self.player))
+        max_sphere: int = (self.o.blue_chest_count - 1) // CHESTS_PER_SPHERE + 1
+        rule_for_sphere: Dict[int, CollectionRule] = \
+            {sphere: lambda state, s=sphere: state.has("Progressive chest access", self.player, s - 1)
+             for sphere in range(2, max_sphere + 1)}
 
-        set_rule(self.multiworld.get_entrance("FinalFloorEntrance", self.player),
-                 lambda state: state.can_reach(f"Blue chest {self.o.blue_chest_count}", "Location", self.player))
+        for i in range(CHESTS_PER_SPHERE * 2, self.o.blue_chest_count, CHESTS_PER_SPHERE):
+            set_rule(self.multiworld.get_location(f"Chest access {i + 1}-{i + CHESTS_PER_SPHERE}", self.player),
+                     rule_for_sphere[i // CHESTS_PER_SPHERE])
+        for i in range(CHESTS_PER_SPHERE, self.o.blue_chest_count):
+            set_rule(self.multiworld.get_location(f"Blue chest {i + 1}", self.player),
+                     rule_for_sphere[i // CHESTS_PER_SPHERE + 1])
+
+        set_rule(self.multiworld.get_entrance("FinalFloorEntrance", self.player), rule_for_sphere[max_sphere])
         for i in range(9):
-            set_rule(self.multiworld.get_location(f"Iris treasure {i + 1}", self.player),
-                     lambda state: state.can_reach(f"Blue chest {self.o.blue_chest_count}", "Location", self.player))
-        set_rule(self.multiworld.get_location("Boss", self.player),
-                 lambda state: state.can_reach(f"Blue chest {self.o.blue_chest_count}", "Location", self.player))
+            set_rule(self.multiworld.get_location(f"Iris treasure {i + 1}", self.player), rule_for_sphere[max_sphere])
+        set_rule(self.multiworld.get_location("Boss", self.player), rule_for_sphere[max_sphere])
+
         if self.o.shuffle_capsule_monsters:
             add_rule(self.multiworld.get_location("Boss", self.player), lambda state: state.has("DARBI", self.player))
         if self.o.shuffle_party_members:
@@ -221,6 +223,7 @@ class L2ACWorld(World):
             rom_bytearray[0x09D59B:0x09D59B + 256] = self.get_node_connection_table()
             rom_bytearray[0x0B05C0:0x0B05C0 + 18843] = self.get_enemy_stats()
             rom_bytearray[0x0B4F02:0x0B4F02 + 2] = self.o.master_hp.value.to_bytes(2, "little")
+            rom_bytearray[0x0BEE9F:0x0BEE9F + 1948] = self.get_shops()
             rom_bytearray[0x280010:0x280010 + 2] = self.o.blue_chest_count.value.to_bytes(2, "little")
             rom_bytearray[0x280012:0x280012 + 3] = self.o.capsule_starting_level.xp.to_bytes(3, "little")
             rom_bytearray[0x280015:0x280015 + 1] = self.o.initial_floor.value.to_bytes(1, "little")
@@ -228,6 +231,7 @@ class L2ACWorld(World):
             rom_bytearray[0x280017:0x280017 + 1] = self.o.iris_treasures_required.value.to_bytes(1, "little")
             rom_bytearray[0x280018:0x280018 + 1] = self.o.shuffle_party_members.unlock.to_bytes(1, "little")
             rom_bytearray[0x280019:0x280019 + 1] = self.o.shuffle_capsule_monsters.unlock.to_bytes(1, "little")
+            rom_bytearray[0x28001A:0x28001A + 1] = self.o.shop_interval.value.to_bytes(1, "little")
             rom_bytearray[0x280030:0x280030 + 1] = self.o.goal.value.to_bytes(1, "little")
             rom_bytearray[0x28003D:0x28003D + 1] = self.o.death_link.value.to_bytes(1, "little")
             rom_bytearray[0x281200:0x281200 + 470] = self.get_capsule_cravings_table()
@@ -356,7 +360,7 @@ class L2ACWorld(World):
     def get_enemy_stats(self) -> bytes:
         rom: bytes = get_base_rom_bytes()
 
-        if self.o.exp_modifier == ExpModifier.default:
+        if self.o.exp_modifier == 100 and self.o.gold_modifier == 100:
             return rom[0x0B05C0:0x0B05C0 + 18843]
 
         number_of_enemies: int = 224
@@ -365,6 +369,7 @@ class L2ACWorld(World):
         for enemy_id in range(number_of_enemies):
             pointer: int = int.from_bytes(enemy_stats[2 * enemy_id:2 * enemy_id + 2], "little")
             enemy_stats[pointer + 29:pointer + 31] = self.o.exp_modifier(enemy_stats[pointer + 29:pointer + 31])
+            enemy_stats[pointer + 31:pointer + 33] = self.o.gold_modifier(enemy_stats[pointer + 31:pointer + 33])
         return enemy_stats
 
     def get_goal_text_bytes(self) -> bytes:
@@ -382,6 +387,90 @@ class L2ACWorld(World):
         goal_text_bytes = bytes((0x08, *b"\x03".join(line.encode("ascii") for line in goal_text), 0x00))
         return goal_text_bytes + b"\x00" * (147 - len(goal_text_bytes))
 
+    def get_shops(self) -> bytes:
+        rom: bytes = get_base_rom_bytes()
+
+        if not self.o.shop_interval:
+            return rom[0x0BEE9F:0x0BEE9F + 1948]
+
+        non_restorative_ids = {int.from_bytes(rom[0x0A713D + 2 * i:0x0A713D + 2 * i + 2], "little") for i in range(31)}
+        restorative_ids = {int.from_bytes(rom[0x08FFDC + 2 * i:0x08FFDC + 2 * i + 2], "little") for i in range(9)}
+        blue_ids = {int.from_bytes(rom[0x0A6EA0 + 2 * i:0x0A6EA0 + 2 * i + 2], "little") for i in range(41)}
+        number_of_spells: int = 35
+        number_of_items: int = 467
+        spells_offset: int = 0x0AFA5B
+        items_offset: int = 0x0B4F69
+        non_restorative_list: List[List[int]] = [list() for _ in range(99)]
+        restorative_list: List[List[int]] = [list() for _ in range(99)]
+        blue_list: List[List[int]] = [list() for _ in range(99)]
+        spell_list: List[List[int]] = [list() for _ in range(99)]
+        gear_list: List[List[int]] = [list() for _ in range(99)]
+        weapon_list: List[List[int]] = [list() for _ in range(99)]
+        custom_list: List[List[int]] = [list() for _ in range(99)]
+
+        for spell_id in range(number_of_spells):
+            pointer: int = int.from_bytes(rom[spells_offset + 2 * spell_id:spells_offset + 2 * spell_id + 2], "little")
+            value: int = int.from_bytes(rom[spells_offset + pointer + 15:spells_offset + pointer + 17], "little")
+            for f in range(value // 1000, 99):
+                spell_list[f].append(spell_id)
+        for item_id in range(number_of_items):
+            pointer = int.from_bytes(rom[items_offset + 2 * item_id:items_offset + 2 * item_id + 2], "little")
+            buckets: List[List[List[int]]] = list()
+            if item_id in non_restorative_ids:
+                buckets.append(non_restorative_list)
+            if item_id in restorative_ids:
+                buckets.append(restorative_list)
+            if item_id in blue_ids:
+                buckets.append(blue_list)
+            if not rom[items_offset + pointer] & 0x20 and not rom[items_offset + pointer + 1] & 0x20:
+                category: int = rom[items_offset + pointer + 7]
+                if category >= 0x02:
+                    buckets.append(gear_list)
+                elif category == 0x01:
+                    buckets.append(weapon_list)
+            if item_id in self.o.shop_inventory.custom:
+                buckets.append(custom_list)
+            value = int.from_bytes(rom[items_offset + pointer + 5:items_offset + pointer + 7], "little")
+            for bucket in buckets:
+                for f in range(value // 1000, 99):
+                    bucket[f].append(item_id)
+
+        if not self.o.gear_variety_after_b9:
+            for f in range(99):
+                del gear_list[f][len(gear_list[f]) % 128:]
+
+        def create_shop(floor: int) -> Tuple[int, ...]:
+            if self.random.randrange(self.o.shop_inventory.total) < self.o.shop_inventory.spell:
+                return create_spell_shop(floor)
+            else:
+                return create_item_shop(floor)
+
+        def create_spell_shop(floor: int) -> Tuple[int, ...]:
+            spells = self.random.sample(spell_list[floor], 3)
+            return 0x03, 0x20, 0x00, *spells, 0xFF
+
+        def create_item_shop(floor: int) -> Tuple[int, ...]:
+            population = non_restorative_list[floor] + restorative_list[floor] + blue_list[floor] \
+                         + gear_list[floor] + weapon_list[floor] + custom_list[floor]
+            weights = itertools.chain(*([weight / len_] * len_ if (len_ := len(list_)) else [] for weight, list_ in
+                                        [(self.o.shop_inventory.non_restorative, non_restorative_list[floor]),
+                                         (self.o.shop_inventory.restorative, restorative_list[floor]),
+                                         (self.o.shop_inventory.blue_chest, blue_list[floor]),
+                                         (self.o.shop_inventory.gear, gear_list[floor]),
+                                         (self.o.shop_inventory.weapon, weapon_list[floor])]),
+                                      (self.o.shop_inventory.custom[item] for item in custom_list[floor]))
+            items = weighted_sample(population, weights, 5, random=self.random)
+            return 0x01, 0x04, 0x00, *(b for item in items for b in item.to_bytes(2, "little")), 0x00, 0x00
+
+        shops = [create_shop(floor)
+                 for floor in range(self.o.shop_interval, 99, self.o.shop_interval)
+                 for _ in range(self.o.shop_interval)]
+        shop_pointers = itertools.accumulate((len(shop) for shop in shops[:-1]), initial=2 * len(shops))
+        shop_bytes = bytes(itertools.chain(*(p.to_bytes(2, "little") for p in shop_pointers), *shops))
+
+        assert len(shop_bytes) <= 1948, shop_bytes
+        return shop_bytes.ljust(1948, b"\x00")
+
     @staticmethod
     def get_node_connection_table() -> bytes:
         class Connect(IntFlag):
diff --git a/worlds/lufia2ac/basepatch/basepatch.asm b/worlds/lufia2ac/basepatch/basepatch.asm
index aeae6846e3..f9c48a5fec 100644
--- a/worlds/lufia2ac/basepatch/basepatch.asm
+++ b/worlds/lufia2ac/basepatch/basepatch.asm
@@ -71,6 +71,11 @@ org $9EDD60  ; name
 org $9FA900  ; sprite
     incbin "ap_logo/ap_logo.bin"
     warnpc $9FA980
+; sold out item
+org $96F9BA  ; properties
+    DB $00,$00,$00,$10,$00,$00,$00,$00,$00,$00,$00,$00,$00
+org $9EDD6C  ; name
+    DB "SOLD OUT    "       ; overwrites "Crown       "
 
 
 org $D08000  ; signature, start of expanded data area
@@ -165,6 +170,9 @@ pullpc
 
 ScriptTX:
     STA $7FD4F1             ; (overwritten instruction)
+    LDA $05AC               ; load map number
+    CMP.b #$F1              ; check if ancient cave final floor
+    BNE +
     REP #$20
     LDA $7FD4EF             ; read script item id
     CMP.w #$01C2            ; test for ancient key
@@ -256,6 +264,9 @@ SpecialItemGet:
     BRA ++
 +:  CMP.w #$01C2            ; ancient key
     BNE +
+    LDA.w #$0008
+    ORA $0796
+    STA $0796               ; set ancient key EV flag ($C3)
     LDA.w #$0200
     ORA $0797
     STA $0797               ; set boss item EV flag ($D1)
@@ -825,6 +836,119 @@ SpellRNG:
 
 
 
+; shops
+pushpc
+org $83B442
+    ; DB=$83, x=1, m=1
+    JSL Shop                ; overwrites STA $7FD0BF
+pullpc
+
+Shop:
+    STA $7FD0BF             ; (overwritten instruction)
+    LDY $05AC               ; load map number
+    CPY.b #$F0              ; check if ancient cave
+    BCC +
+    LDA $05B4               ; check if going to ancient cave entrance
+    BEQ +
+    LDA $7FE696             ; load next to next floor number
+    DEC
+    CPY.b #$F1              ; check if going to final floor
+    BCS ++                  ; skip a decrement because next floor number is not incremented on final floor
+    DEC
+++: CMP $D08015             ; check if past initial floor
+    BCC +
+    STA $4204               ; WRDIVL; dividend = floor number
+    STZ $4205               ; WRDIVH
+    TAX
+    LDA $D0801A
+    STA $4206               ; WRDIVB; divisor = shop_interval
+    STA $211C               ; M7B; second factor = shop_interval
+    JSL $8082C7             ; advance RNG (while waiting for division to complete)
+    LDY $4216               ; RDMPYL; skip if remainder (i.e., floor number mod shop_interval) is not 0
+    BNE +
+    STA $211B
+    STZ $211B               ; M7A; first factor = random number from 0 to 255
+    TXA
+    CLC
+    SBC $2135               ; MPYM; calculate (floor number) - (random number from 0 to shop_interval-1) - 1
+    STA $30                 ; set shop id
+    STZ $05A8               ; initialize variable for sold out item tracking
+    STZ $05A9
+    PHB
+    PHP
+    JML $80A33A             ; open shop menu
++:  RTL
+
+; shop item select
+pushpc
+org $82DF50
+    ; DB=$83, x=0, m=1
+    JML ShopItemSelected    ; overwrites JSR $8B08 : CMP.b #$01
+pullpc
+
+ShopItemSelected:
+    LDA $1548               ; check inventory free space
+    BEQ +
+    JSR LoadShopSlotAsFlag
+    BIT $05A8               ; test item not already sold
+    BNE +
+    JML $82DF79             ; skip quantity selection and go directly to buy/equip
++:  JML $82DF80             ; abort and go back to item selection
+
+; track bought shop items
+pushpc
+org $82E084
+    ; DB=$83, x=0, m=1
+    JSL ShopBuy             ; overwrites LDA.b #$05 : LDX.w #$0007
+    NOP
+org $82E10E
+    ; DB=$83, x=0, m=1
+    JSL ShopEquip           ; overwrites SEP #$10 : LDX $14DC
+    NOP
+pullpc
+
+ShopBuy:
+    JSR LoadShopSlotAsFlag
+    TSB $05A8               ; mark item as sold
+    LDA.b #$05              ; (overwritten instruction)
+    LDX.w #$0007            ; (overwritten instruction)
+    RTL
+
+ShopEquip:
+    JSR LoadShopSlotAsFlag
+    TSB $05A8               ; mark item as sold
+    SEP #$10                ; (overwritten instruction)
+    LDX $14DC               ; (overwritten instruction)
+    RTL
+
+LoadShopSlotAsFlag:
+    TDC
+    LDA $14EC               ; load currently selected shop slot number
+    ASL
+    TAX
+    LDA $8ED8C3,X           ; load predefined bitmask with a single bit set
+    RTS
+
+; mark bought items as sold out
+pushpc
+org $8285EA
+    ; DB=$83, x=0, m=0
+    JSL SoldOut             ; overwrites LDA [$FC],Y : AND #$01FF
+    NOP
+pullpc
+
+SoldOut:
+    LDA $8ED8C3,X           ; load predefined bitmask with a single bit set
+    BIT $05A8               ; test sold items
+    BEQ +
+    LDA.w #$01CB            ; load sold out item id
+    BRA ++
++:  LDA [$FC],Y             ; (overwritten instruction)
+    AND #$01FF              ; (overwritten instruction)
+++: RTL
+
+
+
 ; increase variety of red chest gear after B9
 pushpc
 org $839176
@@ -1009,6 +1133,53 @@ pullpc
 
 
 
+; door stairs fix
+pushpc
+org $839453
+    ; DB=$7F, x=0, m=1
+    JSL DoorStairsFix       ; overwrites JSR $9B18 : JSR $9D11
+    NOP #2
+pullpc
+
+DoorStairsFix:
+    CLC
+    LDY.w #$0000
+--: LDX.w #$00FF            ; loop through floor layout starting from the bottom right
+-:  LDA $EA00,X             ; read node contents
+    BEQ +                   ; always skip empty nodes
+    BCC ++                  ; 1st pass: skip all blocked nodes (would cause door stairs or rare stairs)
+    LDA $E9F0,X             ; 2nd pass: skip only if the one above is also blocked (would cause door stairs)
+++: BMI +
+    INY                     ; count usable nodes
++:  DEX
+    BPL -
+    TYA
+    BNE ++                  ; all nodes blocked?
+    SEC                     ; set up 2nd, less restrictive pass
+    BRA --
+++: JSL $8082C7             ; advance RNG
+    STA $00211B
+    TDC
+    STA $00211B             ; M7A; first factor = random number from 0 to 255
+    TYA
+    STA $00211C             ; M7B; second factor = number of possible stair positions
+    LDA $002135             ; MPYM; calculate random number from 0 to number of possible stair positions - 1
+    TAY
+    LDX.w #$00FF            ; loop through floor layout starting from the bottom right
+-:  LDA $EA00,X             ; read node contents
+    BEQ +                   ; always skip empty nodes
+    BCC ++                  ; if 1st pass was sufficient: skip all blocked nodes (prevent door stairs and rare stairs)
+    LDA $E9F0,X             ; if 2nd pass was needed: skip only if the one above is also blocked (prevent door stairs)
+++: BMI +
+    DEY                     ; count down to locate the (Y+1)th usable node
+    BMI ++
++:  DEX
+    BPL -
+++: TXA                     ; return selected stair node coordinate
+    RTL
+
+
+
 ; equipment text fix
 pushpc
 org $81F2E3
@@ -1054,6 +1225,7 @@ pullpc
 ; $F02017   1   iris treasures required
 ; $F02018   1   party members available
 ; $F02019   1   capsule monsters available
+; $F0201A   1   shop interval
 ; $F02030   1   selected goal
 ; $F02031   1   goal completion: boss
 ; $F02032   1   goal completion: iris_treasure_hunt
diff --git a/worlds/lufia2ac/basepatch/basepatch.bsdiff4 b/worlds/lufia2ac/basepatch/basepatch.bsdiff4
index 51478e5d52..664e197c4a 100644
Binary files a/worlds/lufia2ac/basepatch/basepatch.bsdiff4 and b/worlds/lufia2ac/basepatch/basepatch.bsdiff4 differ
diff --git a/worlds/lufia2ac/docs/en_Lufia II Ancient Cave.md b/worlds/lufia2ac/docs/en_Lufia II Ancient Cave.md
index 64658a7d27..d24c4ef9f9 100644
--- a/worlds/lufia2ac/docs/en_Lufia II Ancient Cave.md	
+++ b/worlds/lufia2ac/docs/en_Lufia II Ancient Cave.md	
@@ -49,8 +49,9 @@ Your Party Leader will hold up the item they received when not in a fight or in
 - Customize the multiworld item pool. (By default, your pool is filled with random blue chest items, but you can place
   any cave item you want instead)
 - Customize start inventory, i.e., begin every run with certain items or spells of your choice
-- Adjust how much EXP is gained from enemies
+- Adjust how much EXP and gold is gained from enemies
 - Randomize enemy movement patterns, enemy sprites, and which enemy types can appear at which floor numbers
+- Option to make shops appear in the cave so that you have a way to spend your hard-earned gold
 - Option to shuffle your party members and/or capsule monsters into the multiworld, meaning that someone will have to
   find them in order to unlock them for you to use. While cave diving, you can add newly unlocked members to your party
   by using the character items from your inventory
@@ -75,7 +76,7 @@ Your Party Leader will hold up the item they received when not in a fight or in
 
 ###### Bug fixes:
 
-- Vanilla game bugs that could result in softlocks or save file corruption have been fixed
+- Vanilla game bugs that could result in anomalous floors, softlocks, or save file corruption have been fixed
 - (optional) Bugfix for the algorithm that determines the item pool for red chest gear. Enabling this allows the cave to
   generate shields, headgear, rings, and jewels in red chests even after floor B9
 - (optional) Bugfix for the outlandish cravings of capsule monsters in the US version. Enabling this makes feeding work
diff --git a/worlds/lufia2ac/docs/setup_en.md b/worlds/lufia2ac/docs/setup_en.md
index 4236c26e8a..3762f32fb4 100644
--- a/worlds/lufia2ac/docs/setup_en.md
+++ b/worlds/lufia2ac/docs/setup_en.md
@@ -44,7 +44,7 @@ your personal settings 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](/mysterycheck) page.
+[YAML Validator](/check) page.
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/meritous/Regions.py b/worlds/meritous/Regions.py
index 2c66a024ca..de34570d02 100644
--- a/worlds/meritous/Regions.py
+++ b/worlds/meritous/Regions.py
@@ -54,12 +54,12 @@ def create_regions(world: MultiWorld, player: int):
         world.regions.append(boss_region)
 
     region_final_boss = Region("Final Boss", player, world)
-    region_final_boss.locations = [MeritousLocation(
+    region_final_boss.locations += [MeritousLocation(
         player, "Wervyn Anixil", None, region_final_boss)]
     world.regions.append(region_final_boss)
 
     region_tfb = Region("True Final Boss", player, world)
-    region_tfb.locations = [MeritousLocation(
+    region_tfb.locations += [MeritousLocation(
         player, "Wervyn Anixil?", None, region_tfb)]
     world.regions.append(region_tfb)
 
diff --git a/worlds/messenger/__init__.py b/worlds/messenger/__init__.py
index b37f23749d..b0d031905c 100644
--- a/worlds/messenger/__init__.py
+++ b/worlds/messenger/__init__.py
@@ -1,14 +1,14 @@
 import logging
-from typing import Dict, Any, List, Optional
+from typing import Any, Dict, List, Optional
 
-from BaseClasses import Tutorial, ItemClassification, CollectionState, Item, MultiWorld
-from worlds.AutoWorld import World, WebWorld
-from .Constants import NOTES, PHOBEKINS, ALL_ITEMS, ALWAYS_LOCATIONS, BOSS_LOCATIONS, FILLER
-from .Options import messenger_options, NotesNeeded, Goal, PowerSeals, Logic
-from .Regions import REGIONS, REGION_CONNECTIONS, SEALS, MEGA_SHARDS
-from .Shop import SHOP_ITEMS, shuffle_shop_prices, FIGURINES
-from .SubClasses import MessengerRegion, MessengerItem
-from . import Rules
+from BaseClasses import CollectionState, Item, ItemClassification, Tutorial
+from worlds.AutoWorld import WebWorld, World
+from .constants import ALL_ITEMS, ALWAYS_LOCATIONS, BOSS_LOCATIONS, FILLER, NOTES, PHOBEKINS
+from .options import Goal, Logic, MessengerOptions, NotesNeeded, PowerSeals
+from .regions import MEGA_SHARDS, REGIONS, REGION_CONNECTIONS, SEALS
+from .rules import MessengerHardRules, MessengerOOBRules, MessengerRules
+from .shop import FIGURINES, SHOP_ITEMS, shuffle_shop_prices
+from .subclasses import MessengerItem, MessengerRegion
 
 
 class MessengerWeb(WebWorld):
@@ -44,7 +44,8 @@ class MessengerWorld(World):
         "Phobekin": set(PHOBEKINS),
     }
 
-    option_definitions = messenger_options
+    options_dataclass = MessengerOptions
+    options: MessengerOptions
 
     base_offset = 0xADD_000
     item_name_to_id = {item: item_id
@@ -61,37 +62,33 @@ class MessengerWorld(World):
                                "Money Wrench",
                            ], base_offset)}
 
-    data_version = 3
-    required_client_version = (0, 4, 0)
+    required_client_version = (0, 4, 2)
 
     web = MessengerWeb()
 
     total_seals: int = 0
     required_seals: int = 0
-    total_shards: int
+    total_shards: int = 0
     shop_prices: Dict[str, int]
     figurine_prices: Dict[str, int]
     _filler_items: List[str]
 
-    def __init__(self, multiworld: MultiWorld, player: int):
-        super().__init__(multiworld, player)
-        self.total_shards = 0
-
     def generate_early(self) -> None:
-        if self.multiworld.goal[self.player] == Goal.option_power_seal_hunt:
-            self.multiworld.shuffle_seals[self.player].value = PowerSeals.option_true
-            self.total_seals = self.multiworld.total_seals[self.player].value
+        if self.options.goal == Goal.option_power_seal_hunt:
+            self.options.shuffle_seals.value = PowerSeals.option_true
+            self.total_seals = self.options.total_seals.value
 
         self.shop_prices, self.figurine_prices = shuffle_shop_prices(self)
 
     def create_regions(self) -> None:
+        # MessengerRegion adds itself to the multiworld
         for region in [MessengerRegion(reg_name, self) for reg_name in REGIONS]:
             if region.name in REGION_CONNECTIONS:
                 region.add_exits(REGION_CONNECTIONS[region.name])
 
     def create_items(self) -> None:
         # create items that are always in the item pool
-        itempool = [
+        itempool: List[MessengerItem] = [
             self.create_item(item)
             for item in self.item_name_to_id
             if item not in
@@ -101,13 +98,13 @@ class MessengerWorld(World):
             } and "Time Shard" not in item
         ]
 
-        if self.multiworld.goal[self.player] == Goal.option_open_music_box:
+        if self.options.goal == Goal.option_open_music_box:
             # make a list of all notes except those in the player's defined starting inventory, and adjust the
             # amount we need to put in the itempool and precollect based on that
             notes = [note for note in NOTES if note not in self.multiworld.precollected_items[self.player]]
             self.random.shuffle(notes)
             precollected_notes_amount = NotesNeeded.range_end - \
-                self.multiworld.notes_needed[self.player] - \
+                self.options.notes_needed - \
                 (len(NOTES) - len(notes))
             if precollected_notes_amount:
                 for note in notes[:precollected_notes_amount]:
@@ -115,15 +112,14 @@ class MessengerWorld(World):
                 notes = notes[precollected_notes_amount:]
             itempool += [self.create_item(note) for note in notes]
 
-        elif self.multiworld.goal[self.player] == Goal.option_power_seal_hunt:
+        elif self.options.goal == Goal.option_power_seal_hunt:
             total_seals = min(len(self.multiworld.get_unfilled_locations(self.player)) - len(itempool),
-                              self.multiworld.total_seals[self.player].value)
+                              self.options.total_seals.value)
             if total_seals < self.total_seals:
                 logging.warning(f"Not enough locations for total seals setting "
-                                f"({self.multiworld.total_seals[self.player].value}). Adjusting to {total_seals}")
+                                f"({self.options.total_seals}). Adjusting to {total_seals}")
                 self.total_seals = total_seals
-            self.required_seals =\
-                int(self.multiworld.percent_seals_required[self.player].value / 100 * self.total_seals)
+            self.required_seals = int(self.options.percent_seals_required.value / 100 * self.total_seals)
 
             seals = [self.create_item("Power Seal") for _ in range(self.total_seals)]
             for i in range(self.required_seals):
@@ -142,28 +138,21 @@ class MessengerWorld(World):
         self.multiworld.itempool += itempool
 
     def set_rules(self) -> None:
-        logic = self.multiworld.logic_level[self.player]
+        logic = self.options.logic_level
         if logic == Logic.option_normal:
-            Rules.MessengerRules(self).set_messenger_rules()
+            MessengerRules(self).set_messenger_rules()
         elif logic == Logic.option_hard:
-            Rules.MessengerHardRules(self).set_messenger_rules()
+            MessengerHardRules(self).set_messenger_rules()
         else:
-            Rules.MessengerOOBRules(self).set_messenger_rules()
+            MessengerOOBRules(self).set_messenger_rules()
 
     def fill_slot_data(self) -> Dict[str, Any]:
-        shop_prices = {SHOP_ITEMS[item].internal_name: price for item, price in self.shop_prices.items()}
-        figure_prices = {FIGURINES[item].internal_name: price for item, price in self.figurine_prices.items()}
-
         return {
-            "deathlink": self.multiworld.death_link[self.player].value,
-            "goal": self.multiworld.goal[self.player].current_key,
-            "music_box": self.multiworld.music_box[self.player].value,
-            "required_seals": self.required_seals,
-            "mega_shards": self.multiworld.shuffle_shards[self.player].value,
-            "logic": self.multiworld.logic_level[self.player].current_key,
-            "shop": shop_prices,
-            "figures": figure_prices,
+            "shop": {SHOP_ITEMS[item].internal_name: price for item, price in self.shop_prices.items()},
+            "figures": {FIGURINES[item].internal_name: price for item, price in self.figurine_prices.items()},
             "max_price": self.total_shards,
+            "required_seals": self.required_seals,
+            **self.options.as_dict("music_box", "death_link", "logic_level"),
         }
 
     def get_filler_item_name(self) -> str:
@@ -179,7 +168,7 @@ class MessengerWorld(World):
         item_id: Optional[int] = self.item_name_to_id.get(name, None)
         override_prog = getattr(self, "multiworld") is not None and \
             name in {"Windmill Shuriken"} and \
-            self.multiworld.logic_level[self.player] > Logic.option_normal
+            self.options.logic_level > Logic.option_normal
         count = 0
         if "Time Shard " in name:
             count = int(name.strip("Time Shard ()"))
@@ -187,11 +176,14 @@ class MessengerWorld(World):
             self.total_shards += count
         return MessengerItem(name, self.player, item_id, override_prog, count)
 
-    def collect_item(self, state: "CollectionState", item: "Item", remove: bool = False) -> Optional[str]:
-        if item.advancement and "Time Shard" in item.name:
-            shard_count = int(item.name.strip("Time Shard ()"))
-            if remove:
-                shard_count = -shard_count
-            state.prog_items["Shards", self.player] += shard_count
+    def collect(self, state: "CollectionState", item: "Item") -> bool:
+        change = super().collect(state, item)
+        if change and "Time Shard" in item.name:
+            state.prog_items[self.player]["Shards"] += int(item.name.strip("Time Shard ()"))
+        return change
 
-        return super().collect_item(state, item, remove)
+    def remove(self, state: "CollectionState", item: "Item") -> bool:
+        change = super().remove(state, item)
+        if change and "Time Shard" in item.name:
+            state.prog_items[self.player]["Shards"] -= int(item.name.strip("Time Shard ()"))
+        return change
diff --git a/worlds/messenger/Constants.py b/worlds/messenger/constants.py
similarity index 98%
rename from worlds/messenger/Constants.py
rename to worlds/messenger/constants.py
index 121584da05..f05d276cea 100644
--- a/worlds/messenger/Constants.py
+++ b/worlds/messenger/constants.py
@@ -1,7 +1,7 @@
+from .shop import FIGURINES, SHOP_ITEMS
+
 # items
 # listing individual groups first for easy lookup
-from .Shop import SHOP_ITEMS, FIGURINES
-
 NOTES = [
     "Key of Hope",
     "Key of Chaos",
diff --git a/worlds/messenger/docs/en_The Messenger.md b/worlds/messenger/docs/en_The Messenger.md
index 4ffe041830..374753b487 100644
--- a/worlds/messenger/docs/en_The Messenger.md	
+++ b/worlds/messenger/docs/en_The Messenger.md	
@@ -1,12 +1,10 @@
 # The Messenger
 
 ## Quick Links
-- [Setup](../../../../tutorial/The%20Messenger/setup/en)
-- [Settings Page](../../../../games/The%20Messenger/player-settings)
+- [Setup](/tutorial/The%20Messenger/setup/en)
+- [Options Page](/games/The%20Messenger/player-options)
 - [Courier Github](https://github.com/Brokemia/Courier)
-- [The Messenger Randomizer Github](https://github.com/minous27/TheMessengerRandomizerMod)
 - [The Messenger Randomizer AP Github](https://github.com/alwaysintreble/TheMessengerRandomizerModAP)
-- [Jacksonbird8237's Item Tracker](https://github.com/Jacksonbird8237/TheMessengerItemTracker)
 - [PopTracker Pack](https://github.com/alwaysintreble/TheMessengerTrackPack)
 
 ## What does randomization do in this game?
diff --git a/worlds/messenger/docs/setup_en.md b/worlds/messenger/docs/setup_en.md
index d93d13b274..9617baf3e0 100644
--- a/worlds/messenger/docs/setup_en.md
+++ b/worlds/messenger/docs/setup_en.md
@@ -1,16 +1,15 @@
 # The Messenger Randomizer Setup Guide
 
 ## Quick Links
-- [Game Info](../../../../games/The%20Messenger/info/en)
-- [Settings Page](../../../../games/The%20Messenger/player-settings)
+- [Game Info](/games/The%20Messenger/info/en)
+- [Options Page](/games/The%20Messenger/player-options)
 - [Courier Github](https://github.com/Brokemia/Courier)
 - [The Messenger Randomizer AP Github](https://github.com/alwaysintreble/TheMessengerRandomizerModAP)
-- [Jacksonbird8237's Item Tracker](https://github.com/Jacksonbird8237/TheMessengerItemTracker)
 - [PopTracker Pack](https://github.com/alwaysintreble/TheMessengerTrackPack)
 
 ## Installation
 
-1. Read the [Game Info Page](../../../../games/The%20Messenger/info/en) for how the game works, caveats and known issues
+1. Read the [Game Info Page](/games/The%20Messenger/info/en) for how the game works, caveats and known issues
 2. Download and install Courier Mod Loader using the instructions on the release page
    * [Latest release is currently 0.7.1](https://github.com/Brokemia/Courier/releases)
 3. Download and install the randomizer mod
diff --git a/worlds/messenger/Options.py b/worlds/messenger/options.py
similarity index 85%
rename from worlds/messenger/Options.py
rename to worlds/messenger/options.py
index 8e8b61a204..1da544bee7 100644
--- a/worlds/messenger/Options.py
+++ b/worlds/messenger/options.py
@@ -1,7 +1,10 @@
+from dataclasses import dataclass
 from typing import Dict
-from schema import Schema, Or, And, Optional
 
-from Options import DefaultOnToggle, DeathLink, Range, Accessibility, Choice, Toggle, OptionDict, StartInventoryPool
+from schema import And, Optional, Or, Schema
+
+from Options import Accessibility, Choice, DeathLink, DefaultOnToggle, OptionDict, PerGameCommonOptions, Range, \
+    StartInventoryPool, Toggle
 
 
 class MessengerAccessibility(Accessibility):
@@ -129,18 +132,19 @@ class PlannedShopPrices(OptionDict):
     })
 
 
-messenger_options = {
-    "accessibility": MessengerAccessibility,
-    "start_inventory": StartInventoryPool,
-    "logic_level": Logic,
-    "shuffle_seals": PowerSeals,
-    "shuffle_shards": MegaShards,
-    "goal": Goal,
-    "music_box": MusicBox,
-    "notes_needed": NotesNeeded,
-    "total_seals": AmountSeals,
-    "percent_seals_required": RequiredSeals,
-    "shop_price": ShopPrices,
-    "shop_price_plan": PlannedShopPrices,
-    "death_link": DeathLink,
-}
+@dataclass
+class MessengerOptions(PerGameCommonOptions):
+    accessibility: MessengerAccessibility
+    start_inventory: StartInventoryPool
+    logic_level: Logic
+    shuffle_seals: PowerSeals
+    shuffle_shards: MegaShards
+    goal: Goal
+    music_box: MusicBox
+    notes_needed: NotesNeeded
+    total_seals: AmountSeals
+    percent_seals_required: RequiredSeals
+    shop_price: ShopPrices
+    shop_price_plan: PlannedShopPrices
+    death_link: DeathLink
+
diff --git a/worlds/messenger/Regions.py b/worlds/messenger/regions.py
similarity index 96%
rename from worlds/messenger/Regions.py
rename to worlds/messenger/regions.py
index 88579a9704..43de4dd1f6 100644
--- a/worlds/messenger/Regions.py
+++ b/worlds/messenger/regions.py
@@ -1,9 +1,10 @@
-from typing import Dict, Set, List
+from typing import Dict, List, Set
 
 REGIONS: Dict[str, List[str]] = {
     "Menu": [],
     "Tower HQ": [],
     "The Shop": [],
+    "The Craftsman's Corner": [],
     "Tower of Time": [],
     "Ninja Village": ["Ninja Village - Candle", "Ninja Village - Astral Seed"],
     "Autumn Hills": ["Autumn Hills - Climbing Claws", "Autumn Hills - Key of Hope", "Autumn Hills - Leaf Golem"],
@@ -68,7 +69,6 @@ MEGA_SHARDS: Dict[str, List[str]] = {
     "Quillshroom Marsh": ["Quillshroom Marsh Mega Shard"],
     "Searing Crags Upper": ["Searing Crags Mega Shard"],
     "Glacial Peak": ["Glacial Peak Mega Shard"],
-    "Tower of Time": [],
     "Cloud Ruins": ["Cloud Entrance Mega Shard", "Time Warp Mega Shard"],
     "Cloud Ruins Right": ["Money Farm Room Mega Shard 1", "Money Farm Room Mega Shard 2"],
     "Underworld": ["Under Entrance Mega Shard", "Hot Tub Mega Shard", "Projectile Pit Mega Shard"],
@@ -83,9 +83,8 @@ MEGA_SHARDS: Dict[str, List[str]] = {
 REGION_CONNECTIONS: Dict[str, Set[str]] = {
     "Menu": {"Tower HQ"},
     "Tower HQ": {"Autumn Hills", "Howling Grotto", "Searing Crags", "Glacial Peak", "Tower of Time",
-                 "Riviere Turquoise Entrance", "Sunken Shrine", "Corrupted Future", "The Shop", "Music Box"},
-    "Tower of Time": set(),
-    "Ninja Village": set(),
+                 "Riviere Turquoise Entrance", "Sunken Shrine", "Corrupted Future", "The Shop",
+                 "The Craftsman's Corner", "Music Box"},
     "Autumn Hills": {"Ninja Village", "Forlorn Temple", "Catacombs"},
     "Forlorn Temple": {"Catacombs", "Bamboo Creek"},
     "Catacombs": {"Autumn Hills", "Bamboo Creek", "Dark Cave"},
@@ -97,11 +96,8 @@ REGION_CONNECTIONS: Dict[str, Set[str]] = {
     "Glacial Peak": {"Searing Crags Upper", "Tower HQ", "Cloud Ruins", "Elemental Skylands"},
     "Cloud Ruins": {"Cloud Ruins Right"},
     "Cloud Ruins Right": {"Underworld"},
-    "Underworld": set(),
     "Dark Cave": {"Catacombs", "Riviere Turquoise Entrance"},
     "Riviere Turquoise Entrance": {"Riviere Turquoise"},
-    "Riviere Turquoise": set(),
     "Sunken Shrine": {"Howling Grotto"},
-    "Elemental Skylands": set(),
 }
 """Vanilla layout mapping with all Tower HQ portals open. from -> to"""
diff --git a/worlds/messenger/Rules.py b/worlds/messenger/rules.py
similarity index 80%
rename from worlds/messenger/Rules.py
rename to worlds/messenger/rules.py
index b72d454a7e..b13a453f7f 100644
--- a/worlds/messenger/Rules.py
+++ b/worlds/messenger/rules.py
@@ -1,27 +1,32 @@
-from typing import Dict, Callable, TYPE_CHECKING
+from typing import Dict, TYPE_CHECKING
 
-from BaseClasses import CollectionState, MultiWorld
-from worlds.generic.Rules import set_rule, allow_self_locking_items, add_rule
-from .Options import MessengerAccessibility, Goal
-from .Constants import NOTES, PHOBEKINS
-from .SubClasses import MessengerShopLocation
+from BaseClasses import CollectionState
+from worlds.generic.Rules import add_rule, allow_self_locking_items, CollectionRule
+from .constants import NOTES, PHOBEKINS
+from .options import MessengerAccessibility
 
 if TYPE_CHECKING:
     from . import MessengerWorld
-else:
-    MessengerWorld = object
 
 
 class MessengerRules:
     player: int
-    world: MessengerWorld
-    region_rules: Dict[str, Callable[[CollectionState], bool]]
-    location_rules: Dict[str, Callable[[CollectionState], bool]]
+    world: "MessengerWorld"
+    region_rules: Dict[str, CollectionRule]
+    location_rules: Dict[str, CollectionRule]
+    maximum_price: int
+    required_seals: int
 
-    def __init__(self, world: MessengerWorld) -> None:
+    def __init__(self, world: "MessengerWorld") -> None:
         self.player = world.player
         self.world = world
 
+        # these locations are at the top of the shop tree, and the entire shop tree needs to be purchased
+        maximum_price = (world.multiworld.get_location("The Shop - Demon's Bane", self.player).cost +
+                         world.multiworld.get_location("The Shop - Focused Power Sense", self.player).cost)
+        self.maximum_price = min(maximum_price, world.total_shards)
+        self.required_seals = max(1, world.required_seals)
+
         self.region_rules = {
             "Ninja Village": self.has_wingsuit,
             "Autumn Hills": self.has_wingsuit,
@@ -37,7 +42,9 @@ class MessengerRules:
             "Forlorn Temple": lambda state: state.has_all({"Wingsuit", *PHOBEKINS}, self.player) and self.can_dboost(state),
             "Glacial Peak": self.has_vertical,
             "Elemental Skylands": lambda state: state.has("Magic Firefly", self.player) and self.has_wingsuit(state),
-            "Music Box": lambda state: state.has_all(set(NOTES), self.player) and self.has_dart(state),
+            "Music Box": lambda state: (state.has_all(NOTES, self.player)
+                                        or self.has_enough_seals(state)) and self.has_dart(state),
+            "The Craftsman's Corner": lambda state: state.has("Money Wrench", self.player) and self.can_shop(state),
         }
 
         self.location_rules = {
@@ -56,7 +63,10 @@ class MessengerRules:
             "Searing Crags Seal - Triple Ball Spinner": self.has_vertical,
             "Searing Crags - Astral Tea Leaves":
                 lambda state: state.can_reach("Ninja Village - Astral Seed", "Location", self.player),
-            "Searing Crags - Key of Strength": lambda state: state.has("Power Thistle", self.player),
+            "Searing Crags - Key of Strength": lambda state: state.has("Power Thistle", self.player)
+                                                             and (self.has_dart(state)
+                                                                  or (self.has_wingsuit(state)
+                                                                      and self.can_destroy_projectiles(state))),
             # glacial peak
             "Glacial Peak Seal - Ice Climbers": self.has_dart,
             "Glacial Peak Seal - Projectile Spike Pit": self.can_destroy_projectiles,
@@ -92,8 +102,6 @@ class MessengerRules:
             # corrupted future
             "Corrupted Future - Key of Courage": lambda state: state.has_all({"Demon King Crown", "Magic Firefly"},
                                                                              self.player),
-            # the shop
-            "Shop Chest": self.has_enough_seals,
             # tower hq
             "Money Wrench": self.can_shop,
         }
@@ -111,7 +119,7 @@ class MessengerRules:
         return self.has_wingsuit(state) or self.has_dart(state)
 
     def has_enough_seals(self, state: CollectionState) -> bool:
-        return not self.world.required_seals or state.has("Power Seal", self.player, self.world.required_seals)
+        return state.has("Power Seal", self.player, self.required_seals)
 
     def can_destroy_projectiles(self, state: CollectionState) -> bool:
         return state.has("Strike of the Ninja", self.player)
@@ -119,7 +127,7 @@ class MessengerRules:
     def can_dboost(self, state: CollectionState) -> bool:
         return state.has_any({"Path of Resilience", "Meditation"}, self.player) and \
             state.has("Second Wind", self.player)
-    
+
     def is_aerobatic(self, state: CollectionState) -> bool:
         return self.has_wingsuit(state) and state.has("Aerobatics Warrior", self.player)
 
@@ -128,9 +136,7 @@ class MessengerRules:
         return True
 
     def can_shop(self, state: CollectionState) -> bool:
-        prices = self.world.shop_prices
-        most_expensive_loc = max(prices, key=prices.get)
-        return state.can_reach(f"The Shop - {most_expensive_loc}", "Location", self.player)
+        return state.has("Shards", self.player, self.maximum_price)
 
     def set_messenger_rules(self) -> None:
         multiworld = self.world.multiworld
@@ -142,22 +148,16 @@ class MessengerRules:
             for loc in region.locations:
                 if loc.name in self.location_rules:
                     loc.access_rule = self.location_rules[loc.name]
-            if region.name == "The Shop":
-                for loc in [location for location in region.locations if isinstance(location, MessengerShopLocation)]:
-                    loc.access_rule = loc.can_afford
-        if multiworld.goal[self.player] == Goal.option_power_seal_hunt:
-            set_rule(multiworld.get_entrance("Tower HQ -> Music Box", self.player),
-                     lambda state: state.has("Shop Chest", self.player))
 
         multiworld.completion_condition[self.player] = lambda state: state.has("Rescue Phantom", self.player)
-        if multiworld.accessibility[self.player] > MessengerAccessibility.option_locations:
-            set_self_locking_items(multiworld, self.player)
+        if multiworld.accessibility[self.player]:  # not locations accessibility
+            set_self_locking_items(self.world, self.player)
 
 
 class MessengerHardRules(MessengerRules):
-    extra_rules: Dict[str, Callable[[CollectionState], bool]]
+    extra_rules: Dict[str, CollectionRule]
 
-    def __init__(self, world: MessengerWorld) -> None:
+    def __init__(self, world: "MessengerWorld") -> None:
         super().__init__(world)
 
         self.region_rules.update({
@@ -166,7 +166,7 @@ class MessengerHardRules(MessengerRules):
             "Catacombs": self.has_vertical,
             "Bamboo Creek": self.has_vertical,
             "Riviere Turquoise": self.true,
-            "Forlorn Temple": lambda state: self.has_vertical(state) and state.has_all(set(PHOBEKINS), self.player),
+            "Forlorn Temple": lambda state: self.has_vertical(state) and state.has_all(PHOBEKINS, self.player),
             "Searing Crags Upper": lambda state: self.can_destroy_projectiles(state) or self.has_windmill(state)
                                                  or self.has_vertical(state),
             "Glacial Peak": lambda state: self.can_destroy_projectiles(state) or self.has_windmill(state)
@@ -182,8 +182,10 @@ class MessengerHardRules(MessengerRules):
             "Searing Crags Seal - Raining Rocks": lambda state: self.has_vertical(state) or self.can_destroy_projectiles(state),
             "Searing Crags Seal - Rhythm Rocks": lambda state: self.has_vertical(state) or self.can_destroy_projectiles(state),
             "Searing Crags - Power Thistle": lambda state: self.has_vertical(state) or self.can_destroy_projectiles(state),
-            "Glacial Peak Seal - Ice Climbers": self.has_vertical,
+            "Glacial Peak Seal - Ice Climbers": lambda state: self.has_vertical(state) or self.can_dboost(state),
             "Glacial Peak Seal - Projectile Spike Pit": self.true,
+            "Glacial Peak Seal - Glacial Air Swag": lambda state: self.has_windmill(state) or self.has_vertical(state),
+            "Glacial Peak Mega Shard": lambda state: self.has_windmill(state) or self.has_vertical(state),
             "Cloud Ruins Seal - Ghost Pit": self.true,
             "Bamboo Creek - Claustro": self.has_wingsuit,
             "Tower of Time Seal - Lantern Climb": self.has_wingsuit,
@@ -199,12 +201,8 @@ class MessengerHardRules(MessengerRules):
         self.extra_rules = {
             "Searing Crags - Key of Strength": lambda state: self.has_dart(state) or self.has_windmill(state),
             "Elemental Skylands - Key of Symbiosis": lambda state: self.has_windmill(state) or self.can_dboost(state),
-            "Autumn Hills Seal - Spike Ball Darts": lambda state: (self.has_dart(state) and self.has_windmill(state))
-                                                                  or self.has_wingsuit(state),
-            "Glacial Peak Seal - Glacial Air Swag": self.has_windmill,
-            "Glacial Peak Seal - Ice Climbers": lambda state: self.has_wingsuit(state) or self.can_dboost(state),
-            "Underworld Seal - Fireball Wave": lambda state: state.has_all({"Lightfoot Tabi", "Windmill Shuriken"},
-                                                                           self.player),
+            "Autumn Hills Seal - Spike Ball Darts": lambda state: self.has_dart(state) or self.has_windmill(state),
+            "Underworld Seal - Fireball Wave": self.has_windmill,
         }
 
     def has_windmill(self, state: CollectionState) -> bool:
@@ -213,22 +211,23 @@ class MessengerHardRules(MessengerRules):
     def set_messenger_rules(self) -> None:
         super().set_messenger_rules()
         for loc, rule in self.extra_rules.items():
-            if not self.world.multiworld.shuffle_seals[self.player] and "Seal" in loc:
+            if not self.world.options.shuffle_seals and "Seal" in loc:
                 continue
-            if not self.world.multiworld.shuffle_shards[self.player] and "Shard" in loc:
+            if not self.world.options.shuffle_shards and "Shard" in loc:
                 continue
             add_rule(self.world.multiworld.get_location(loc, self.player), rule, "or")
 
 
 class MessengerOOBRules(MessengerRules):
-    def __init__(self, world: MessengerWorld) -> None:
+    def __init__(self, world: "MessengerWorld") -> None:
         self.world = world
         self.player = world.player
 
+        self.required_seals = max(1, world.required_seals)
         self.region_rules = {
             "Elemental Skylands":
                 lambda state: state.has_any({"Windmill Shuriken", "Wingsuit", "Rope Dart", "Magic Firefly"}, self.player),
-            "Music Box": lambda state: state.has_all(set(NOTES), self.player)
+            "Music Box": lambda state: state.has_all(set(NOTES), self.player) or self.has_enough_seals(state),
         }
 
         self.location_rules = {
@@ -244,25 +243,26 @@ class MessengerOOBRules(MessengerRules):
             "Underworld Seal - Fireball Wave": lambda state: state.has_any({"Wingsuit", "Windmill Shuriken"},
                                                                            self.player),
             "Tower of Time Seal - Time Waster": self.has_dart,
-            "Shop Chest": self.has_enough_seals
         }
 
     def set_messenger_rules(self) -> None:
         super().set_messenger_rules()
-        self.world.multiworld.completion_condition[self.player] = lambda state: True
-        self.world.multiworld.accessibility[self.player].value = MessengerAccessibility.option_minimal
+        self.world.options.accessibility.value = MessengerAccessibility.option_minimal
 
 
-def set_self_locking_items(multiworld: MultiWorld, player: int) -> None:
+def set_self_locking_items(world: "MessengerWorld", player: int) -> None:
+    multiworld = world.multiworld
+
     # do the ones for seal shuffle on and off first
     allow_self_locking_items(multiworld.get_location("Searing Crags - Key of Strength", player), "Power Thistle")
     allow_self_locking_items(multiworld.get_location("Sunken Shrine - Key of Love", player), "Sun Crest", "Moon Crest")
     allow_self_locking_items(multiworld.get_location("Corrupted Future - Key of Courage", player), "Demon King Crown")
 
     # add these locations when seals are shuffled
-    if multiworld.shuffle_seals[player]:
+    if world.options.shuffle_seals:
         allow_self_locking_items(multiworld.get_location("Elemental Skylands Seal - Water", player), "Currents Master")
     # add these locations when seals and shards aren't shuffled
-    elif not multiworld.shuffle_shards[player]:
-        allow_self_locking_items(multiworld.get_region("Cloud Ruins Right", player), "Ruxxtin's Amulet")
+    elif not world.options.shuffle_shards:
+        for entrance in multiworld.get_region("Cloud Ruins", player).entrances:
+            entrance.access_rule = lambda state: state.has("Wingsuit", player) or state.has("Rope Dart", player)
         allow_self_locking_items(multiworld.get_region("Forlorn Temple", player), *PHOBEKINS)
diff --git a/worlds/messenger/Shop.py b/worlds/messenger/shop.py
similarity index 96%
rename from worlds/messenger/Shop.py
rename to worlds/messenger/shop.py
index f0915f5d02..3c8c7bf6f2 100644
--- a/worlds/messenger/Shop.py
+++ b/worlds/messenger/shop.py
@@ -74,8 +74,8 @@ FIGURINES: Dict[str, ShopData] = {
 
 
 def shuffle_shop_prices(world: MessengerWorld) -> Tuple[Dict[str, int], Dict[str, int]]:
-    shop_price_mod = world.multiworld.shop_price[world.player].value
-    shop_price_planned = world.multiworld.shop_price_plan[world.player]
+    shop_price_mod = world.options.shop_price.value
+    shop_price_planned = world.options.shop_price_plan
 
     shop_prices: Dict[str, int] = {}
     figurine_prices: Dict[str, int] = {}
diff --git a/worlds/messenger/SubClasses.py b/worlds/messenger/subclasses.py
similarity index 63%
rename from worlds/messenger/SubClasses.py
rename to worlds/messenger/subclasses.py
index 717b389878..b6a0b80b21 100644
--- a/worlds/messenger/SubClasses.py
+++ b/worlds/messenger/subclasses.py
@@ -2,36 +2,33 @@ from functools import cached_property
 from typing import Optional, TYPE_CHECKING, cast
 
 from BaseClasses import CollectionState, Item, ItemClassification, Location, Region
-from .Constants import NOTES, PHOBEKINS, PROG_ITEMS, USEFUL_ITEMS
-from .Options import Goal
-from .Regions import MEGA_SHARDS, REGIONS, SEALS
-from .Shop import FIGURINES, PROG_SHOP_ITEMS, SHOP_ITEMS, USEFUL_SHOP_ITEMS
+from .constants import NOTES, PHOBEKINS, PROG_ITEMS, USEFUL_ITEMS
+from .regions import MEGA_SHARDS, REGIONS, SEALS
+from .shop import FIGURINES, PROG_SHOP_ITEMS, SHOP_ITEMS, USEFUL_SHOP_ITEMS
 
 if TYPE_CHECKING:
     from . import MessengerWorld
-else:
-    MessengerWorld = object
 
 
 class MessengerRegion(Region):
-    def __init__(self, name: str, world: MessengerWorld) -> None:
+    
+    def __init__(self, name: str, world: "MessengerWorld") -> None:
         super().__init__(name, world.player, world.multiworld)
         locations = [loc for loc in REGIONS[self.name]]
         if self.name == "The Shop":
-            if self.multiworld.goal[self.player] > Goal.option_open_music_box:
-                locations.append("Shop Chest")
             shop_locations = {f"The Shop - {shop_loc}": world.location_name_to_id[f"The Shop - {shop_loc}"]
                               for shop_loc in SHOP_ITEMS}
-            shop_locations.update(**{figurine: world.location_name_to_id[figurine] for figurine in FIGURINES})
             self.add_locations(shop_locations, MessengerShopLocation)
+        elif self.name == "The Craftsman's Corner":
+            self.add_locations({figurine: world.location_name_to_id[figurine] for figurine in FIGURINES},
+                               MessengerLocation)
         elif self.name == "Tower HQ":
             locations.append("Money Wrench")
-        if self.multiworld.shuffle_seals[self.player] and self.name in SEALS:
+        if world.options.shuffle_seals and self.name in SEALS:
             locations += [seal_loc for seal_loc in SEALS[self.name]]
-        if self.multiworld.shuffle_shards[self.player] and self.name in MEGA_SHARDS:
+        if world.options.shuffle_shards and self.name in MEGA_SHARDS:
             locations += [shard for shard in MEGA_SHARDS[self.name]]
-        loc_dict = {loc: world.location_name_to_id[loc] if loc in world.location_name_to_id else None
-                    for loc in locations}
+        loc_dict = {loc: world.location_name_to_id.get(loc, None) for loc in locations}
         self.add_locations(loc_dict, MessengerLocation)
         world.multiworld.regions.append(self)
 
@@ -49,11 +46,7 @@ class MessengerShopLocation(MessengerLocation):
     @cached_property
     def cost(self) -> int:
         name = self.name.replace("The Shop - ", "")  # TODO use `remove_prefix` when 3.8 finally gets dropped
-        world: MessengerWorld = self.parent_region.multiworld.worlds[self.player]
-        # short circuit figurines which all require demon's bane be purchased, but nothing else
-        if "Figurine" in name:
-            return world.figurine_prices[name] +\
-                cast(MessengerShopLocation, world.multiworld.get_location("The Shop - Demon's Bane", self.player)).cost
+        world = cast("MessengerWorld", self.parent_region.multiworld.worlds[self.player])
         shop_data = SHOP_ITEMS[name]
         if shop_data.prerequisite:
             prereq_cost = 0
@@ -69,13 +62,9 @@ class MessengerShopLocation(MessengerLocation):
             return world.shop_prices[name] + prereq_cost
         return world.shop_prices[name]
 
-    def can_afford(self, state: CollectionState) -> bool:
-        world: MessengerWorld = state.multiworld.worlds[self.player]
-        cost = self.cost
-        can_afford = state.has("Shards", self.player, min(cost, world.total_shards))
-        if "Figurine" in self.name:
-            can_afford = state.has("Money Wrench", self.player) and can_afford\
-                and state.can_reach("Money Wrench", "Location", self.player)
+    def access_rule(self, state: CollectionState) -> bool:
+        world = cast("MessengerWorld", state.multiworld.worlds[self.player])
+        can_afford = state.has("Shards", self.player, min(self.cost, world.total_shards))
         return can_afford
 
 
diff --git a/worlds/messenger/test/TestAccess.py b/worlds/messenger/test/test_access.py
similarity index 94%
rename from worlds/messenger/test/TestAccess.py
rename to worlds/messenger/test/test_access.py
index 452ed1189f..7a77a9b066 100644
--- a/worlds/messenger/test/TestAccess.py
+++ b/worlds/messenger/test/test_access.py
@@ -1,5 +1,5 @@
 from . import MessengerTestBase
-from ..Constants import NOTES, PHOBEKINS
+from ..constants import NOTES, PHOBEKINS
 
 
 class AccessTest(MessengerTestBase):
@@ -7,7 +7,7 @@ class AccessTest(MessengerTestBase):
         "shuffle_shards": "true",
     }
 
-    def testTabi(self) -> None:
+    def test_tabi(self) -> None:
         """locations that hard require the Lightfoot Tabi"""
         locations = [
             "Searing Crags - Pyro", "Underworld - Key of Chaos", "Underworld Seal - Sharp and Windy Climb",
@@ -19,7 +19,7 @@ class AccessTest(MessengerTestBase):
         items = [["Lightfoot Tabi"]]
         self.assertAccessDependency(locations, items)
 
-    def testDart(self) -> None:
+    def test_dart(self) -> None:
         """locations that hard require the Rope Dart"""
         locations = [
             "Ninja Village Seal - Tree House", "Autumn Hills - Key of Hope", "Howling Grotto Seal - Crushing Pits",
@@ -31,7 +31,7 @@ class AccessTest(MessengerTestBase):
         items = [["Rope Dart"]]
         self.assertAccessDependency(locations, items)
 
-    def testWingsuit(self) -> None:
+    def test_wingsuit(self) -> None:
         """locations that hard require the Wingsuit"""
         locations = [
             "Ninja Village - Candle", "Ninja Village Seal - Tree House", "Autumn Hills - Climbing Claws",
@@ -57,7 +57,7 @@ class AccessTest(MessengerTestBase):
         items = [["Wingsuit"]]
         self.assertAccessDependency(locations, items)
 
-    def testVertical(self) -> None:
+    def test_vertical(self) -> None:
         """locations that require either the Rope Dart or the Wingsuit"""
         locations = [
             "Ninja Village Seal - Tree House", "Howling Grotto Seal - Crushing Pits",
@@ -92,7 +92,7 @@ class AccessTest(MessengerTestBase):
         items = [["Wingsuit", "Rope Dart"]]
         self.assertAccessDependency(locations, items)
 
-    def testAmulet(self) -> None:
+    def test_amulet(self) -> None:
         """Locations that require Ruxxtin's Amulet"""
         locations = [
             "Cloud Ruins - Acro", "Cloud Ruins Seal - Ghost Pit", "Cloud Ruins Seal - Toothbrush Alley",
@@ -103,7 +103,7 @@ class AccessTest(MessengerTestBase):
         items = [["Ruxxtin's Amulet"]]
         self.assertAccessDependency(locations, items)
 
-    def testFirefly(self) -> None:
+    def test_firefly(self) -> None:
         """Elemental Skylands and Corrupted Future require the Magic Firefly"""
         locations = [
             "Elemental Skylands - Key of Symbiosis", "Elemental Skylands Seal - Air", "Elemental Skylands Seal - Fire",
@@ -113,7 +113,7 @@ class AccessTest(MessengerTestBase):
         items = [["Magic Firefly"]]
         self.assertAccessDependency(locations, items)
 
-    def testCrests(self) -> None:
+    def test_crests(self) -> None:
         """Test Key of Love nonsense"""
         locations = ["Sunken Shrine - Key of Love"]
         items = [["Sun Crest", "Moon Crest"]]
@@ -124,19 +124,19 @@ class AccessTest(MessengerTestBase):
         self.collect_by_name("Sun Crest")
         self.assertEqual(self.can_reach_location("Sunken Shrine - Key of Love"), False)
 
-    def testThistle(self) -> None:
+    def test_thistle(self) -> None:
         """I'm a chuckster!"""
         locations = ["Searing Crags - Key of Strength"]
         items = [["Power Thistle"]]
         self.assertAccessDependency(locations, items)
 
-    def testCrown(self) -> None:
+    def test_crown(self) -> None:
         """Crocomire but not"""
         locations = ["Corrupted Future - Key of Courage"]
         items = [["Demon King Crown"]]
         self.assertAccessDependency(locations, items)
 
-    def testGoal(self) -> None:
+    def test_goal(self) -> None:
         """Test some different states to verify goal requires the correct items"""
         self.collect_all_but([*NOTES, "Rescue Phantom"])
         self.assertEqual(self.can_reach_location("Rescue Phantom"), False)
@@ -153,7 +153,7 @@ class ItemsAccessTest(MessengerTestBase):
         "accessibility": "items",
     }
 
-    def testSelfLockingItems(self) -> None:
+    def test_self_locking_items(self) -> None:
         """Force items that can be self locked to ensure it's valid placement."""
         location_lock_pairs = {
             "Searing Crags - Key of Strength": ["Power Thistle"],
@@ -163,6 +163,8 @@ class ItemsAccessTest(MessengerTestBase):
             "Forlorn Temple - Demon King": PHOBEKINS
         }
 
+        self.multiworld.state = self.multiworld.get_all_state(True)
+        self.remove_by_name(location_lock_pairs.values())
         for loc in location_lock_pairs:
             for item_name in location_lock_pairs[loc]:
                 item = self.get_item_by_name(item_name)
diff --git a/worlds/messenger/test/TestLocations.py b/worlds/messenger/test/test_locations.py
similarity index 81%
rename from worlds/messenger/test/TestLocations.py
rename to worlds/messenger/test/test_locations.py
index ccb358568c..0c330be4bd 100644
--- a/worlds/messenger/test/TestLocations.py
+++ b/worlds/messenger/test/test_locations.py
@@ -1,5 +1,5 @@
 from . import MessengerTestBase
-from ..SubClasses import MessengerLocation
+from ..subclasses import MessengerLocation
 
 
 class LocationsTest(MessengerTestBase):
@@ -10,7 +10,7 @@ class LocationsTest(MessengerTestBase):
     @property
     def run_default_tests(self) -> bool:
         return False
-    
-    def testLocationsExist(self):
+
+    def test_locations_exist(self) -> None:
         for location in self.multiworld.worlds[1].location_name_to_id:
             self.assertIsInstance(self.multiworld.get_location(location, self.player), MessengerLocation)
diff --git a/worlds/messenger/test/TestLogic.py b/worlds/messenger/test/test_logic.py
similarity index 77%
rename from worlds/messenger/test/TestLogic.py
rename to worlds/messenger/test/test_logic.py
index 45b0d0dab6..15df89b920 100644
--- a/worlds/messenger/test/TestLogic.py
+++ b/worlds/messenger/test/test_logic.py
@@ -5,9 +5,10 @@ from . import MessengerTestBase
 class HardLogicTest(MessengerTestBase):
     options = {
         "logic_level": "hard",
+        "shuffle_shards": "true",
     }
 
-    def testVertical(self) -> None:
+    def test_vertical(self) -> None:
         """Test the locations that still require wingsuit or rope dart."""
         locations = [
             # tower of time
@@ -19,16 +20,20 @@ class HardLogicTest(MessengerTestBase):
             "Autumn Hills - Climbing Claws", "Autumn Hills - Key of Hope", "Autumn Hills - Leaf Golem",
             "Autumn Hills Seal - Trip Saws", "Autumn Hills Seal - Double Swing Saws",
             "Autumn Hills Seal - Spike Ball Swing", "Autumn Hills Seal - Spike Ball Darts",
+            "Autumn Hills Mega Shard", "Hidden Entrance Mega Shard",
             # forlorn temple
             "Forlorn Temple - Demon King",
             "Forlorn Temple Seal - Rocket Maze", "Forlorn Temple Seal - Rocket Sunset",
+            "Sunny Day Mega Shard", "Down Under Mega Shard",
             # catacombs
             "Catacombs - Necro", "Catacombs - Ruxxtin's Amulet", "Catacombs - Ruxxtin",
             "Catacombs Seal - Triple Spike Crushers", "Catacombs Seal - Crusher Gauntlet", "Catacombs Seal - Dirty Pond",
+            "Catacombs Mega Shard",
             # bamboo creek
             "Bamboo Creek - Claustro",
             "Bamboo Creek Seal - Spike Crushers and Doors", "Bamboo Creek Seal - Spike Ball Pits",
             "Bamboo Creek Seal - Spike Crushers and Doors v2",
+            "Above Entrance Mega Shard", "Abandoned Mega Shard", "Time Loop Mega Shard",
             # howling grotto
             "Howling Grotto - Emerald Golem", "Howling Grotto Seal - Crushing Pits", "Howling Grotto Seal - Crushing Pits",
             # searing crags
@@ -36,6 +41,7 @@ class HardLogicTest(MessengerTestBase):
             # cloud ruins
             "Cloud Ruins - Acro", "Cloud Ruins Seal - Ghost Pit",
             "Cloud Ruins Seal - Toothbrush Alley", "Cloud Ruins Seal - Saw Pit", "Cloud Ruins Seal - Money Farm Room",
+            "Cloud Entrance Mega Shard", "Time Warp Mega Shard", "Money Farm Room Mega Shard 1", "Money Farm Room Mega Shard 2",
             # underworld
             "Underworld Seal - Rising Fanta", "Underworld Seal - Sharp and Windy Climb",
             # elemental skylands
@@ -46,7 +52,7 @@ class HardLogicTest(MessengerTestBase):
         items = [["Wingsuit", "Rope Dart"]]
         self.assertAccessDependency(locations, items)
 
-    def testWindmill(self) -> None:
+    def test_windmill(self) -> None:
         """Windmill Shuriken isn't progression on normal difficulty, so test it's marked correctly and required."""
         self.assertEqual(ItemClassification.progression, self.get_item_by_name("Windmill Shuriken").classification)
         windmill_locs = [
@@ -74,13 +80,25 @@ class HardLogicTest(MessengerTestBase):
         self.collect(item)
         self.assertTrue(self.can_reach_location(special_loc))
 
+    def test_glacial(self) -> None:
+        """Test Glacial Peak locations."""
+        self.assertAccessDependency(["Glacial Peak Seal - Ice Climbers"],
+                                    [["Second Wind", "Meditation"], ["Rope Dart"], ["Wingsuit"]],
+                                    True)
+        self.assertAccessDependency(["Glacial Peak Seal - Projectile Spike Pit"],
+                                    [["Strike of the Ninja"], ["Windmill Shuriken"], ["Rope Dart"], ["Wingsuit"]],
+                                    True)
+        self.assertAccessDependency(["Glacial Peak Seal - Glacial Air Swag", "Glacial Peak Mega Shard"],
+                                    [["Windmill Shuriken"], ["Wingsuit"], ["Rope Dart"]],
+                                    True)
+
 
 class NoLogicTest(MessengerTestBase):
     options = {
         "logic_level": "oob",
     }
 
-    def testAccess(self) -> None:
+    def test_access(self) -> None:
         """Test the locations with rules still require things."""
         all_locations = [
             "Bamboo Creek - Claustro", "Searing Crags - Key of Strength", "Elemental Skylands - Key of Symbiosis",
@@ -93,4 +111,3 @@ class NoLogicTest(MessengerTestBase):
         for loc in all_locations:
             with self.subTest("Default unreachables", location=loc):
                 self.assertFalse(self.can_reach_location(loc))
-        self.assertBeatable(True)
diff --git a/worlds/messenger/test/TestNotes.py b/worlds/messenger/test/test_notes.py
similarity index 80%
rename from worlds/messenger/test/TestNotes.py
rename to worlds/messenger/test/test_notes.py
index c4292e4900..46cec5f3c8 100644
--- a/worlds/messenger/test/TestNotes.py
+++ b/worlds/messenger/test/test_notes.py
@@ -1,5 +1,5 @@
 from . import MessengerTestBase
-from ..Constants import NOTES
+from ..constants import NOTES
 
 
 class TwoNoteGoalTest(MessengerTestBase):
@@ -7,7 +7,7 @@ class TwoNoteGoalTest(MessengerTestBase):
         "notes_needed": 2,
     }
 
-    def testPrecollectedNotes(self) -> None:
+    def test_precollected_notes(self) -> None:
         self.assertEqual(self.multiworld.state.count_group("Notes", self.player), 4)
 
 
@@ -16,15 +16,15 @@ class FourNoteGoalTest(MessengerTestBase):
         "notes_needed": 4,
     }
 
-    def testPrecollectedNotes(self) -> None:
+    def test_precollected_notes(self) -> None:
         self.assertEqual(self.multiworld.state.count_group("Notes", self.player), 2)
 
 
 class DefaultGoalTest(MessengerTestBase):
-    def testPrecollectedNotes(self) -> None:
+    def test_precollected_notes(self) -> None:
         self.assertEqual(self.multiworld.state.count_group("Notes", self.player), 0)
 
-    def testGoal(self) -> None:
+    def test_goal(self) -> None:
         self.assertBeatable(False)
         self.collect_by_name(NOTES)
         rope_dart = self.get_item_by_name("Rope Dart")
diff --git a/worlds/messenger/test/TestShop.py b/worlds/messenger/test/test_shop.py
similarity index 87%
rename from worlds/messenger/test/TestShop.py
rename to worlds/messenger/test/test_shop.py
index 89ea93624d..afb1b32b88 100644
--- a/worlds/messenger/test/TestShop.py
+++ b/worlds/messenger/test/test_shop.py
@@ -1,7 +1,7 @@
 from typing import Dict
 
 from . import MessengerTestBase
-from ..Shop import SHOP_ITEMS, FIGURINES
+from ..shop import SHOP_ITEMS, FIGURINES
 
 
 class ShopCostTest(MessengerTestBase):
@@ -10,13 +10,13 @@ class ShopCostTest(MessengerTestBase):
         "shuffle_shards": "true",
     }
 
-    def testShopRules(self) -> None:
+    def test_shop_rules(self) -> None:
         for loc in SHOP_ITEMS:
             loc = f"The Shop - {loc}"
             with self.subTest("has cost", loc=loc):
                 self.assertFalse(self.can_reach_location(loc))
 
-    def testShopPrices(self) -> None:
+    def test_shop_prices(self) -> None:
         prices: Dict[str, int] = self.multiworld.worlds[self.player].shop_prices
         for loc, price in prices.items():
             with self.subTest("prices", loc=loc):
@@ -24,7 +24,7 @@ class ShopCostTest(MessengerTestBase):
                 self.assertTrue(loc in SHOP_ITEMS)
         self.assertEqual(len(prices), len(SHOP_ITEMS))
 
-    def testDBoost(self) -> None:
+    def test_dboost(self) -> None:
         locations = [
             "Riviere Turquoise Seal - Bounces and Balls",
             "Forlorn Temple - Demon King", "Forlorn Temple Seal - Rocket Maze", "Forlorn Temple Seal - Rocket Sunset",
@@ -33,10 +33,10 @@ class ShopCostTest(MessengerTestBase):
         items = [["Path of Resilience", "Meditation", "Second Wind"]]
         self.assertAccessDependency(locations, items)
 
-    def testCurrents(self) -> None:
+    def test_currents(self) -> None:
         self.assertAccessDependency(["Elemental Skylands Seal - Water"], [["Currents Master"]])
 
-    def testStrike(self) -> None:
+    def test_strike(self) -> None:
         locations = [
             "Glacial Peak Seal - Projectile Spike Pit", "Elemental Skylands Seal - Fire",
         ]
@@ -50,22 +50,22 @@ class ShopCostMinTest(ShopCostTest):
         "shuffle_seals": "false",
     }
 
-    def testShopRules(self) -> None:
+    def test_shop_rules(self) -> None:
         if self.multiworld.worlds[self.player].total_shards:
-            super().testShopRules()
+            super().test_shop_rules()
         else:
             for loc in SHOP_ITEMS:
                 loc = f"The Shop - {loc}"
                 with self.subTest("has cost", loc=loc):
                     self.assertTrue(self.can_reach_location(loc))
 
-    def testDBoost(self) -> None:
+    def test_dboost(self) -> None:
         pass
 
-    def testCurrents(self) -> None:
+    def test_currents(self) -> None:
         pass
 
-    def testStrike(self) -> None:
+    def test_strike(self) -> None:
         pass
 
 
@@ -79,7 +79,7 @@ class PlandoTest(MessengerTestBase):
         },
     }
 
-    def testCosts(self) -> None:
+    def test_costs(self) -> None:
         for loc in SHOP_ITEMS:
             loc = f"The Shop - {loc}"
             with self.subTest("has cost", loc=loc):
@@ -106,6 +106,5 @@ class PlandoTest(MessengerTestBase):
                 elif loc == "Demon Hive Figurine":
                     self.assertIn(price, self.options["shop_price_plan"]["Demon Hive Figurine"])
 
-                self.assertLessEqual(price, self.multiworld.get_location(loc, self.player).cost)
                 self.assertTrue(loc in FIGURINES)
         self.assertEqual(len(figures), len(FIGURINES))
diff --git a/worlds/messenger/test/TestShopChest.py b/worlds/messenger/test/test_shop_chest.py
similarity index 86%
rename from worlds/messenger/test/TestShopChest.py
rename to worlds/messenger/test/test_shop_chest.py
index ad4178fbd7..a34fa0fb96 100644
--- a/worlds/messenger/test/TestShopChest.py
+++ b/worlds/messenger/test/test_shop_chest.py
@@ -8,27 +8,27 @@ class AllSealsRequired(MessengerTestBase):
         "goal": "power_seal_hunt",
     }
 
-    def testSealsShuffled(self) -> None:
+    def test_seals_shuffled(self) -> None:
         """Shuffle seals should be forced on when shop chest is the goal so test it."""
         self.assertTrue(self.multiworld.shuffle_seals[self.player])
 
-    def testChestAccess(self) -> None:
+    def test_chest_access(self) -> None:
         """Defaults to a total of 45 power seals in the pool and required."""
         with self.subTest("Access Dependency"):
             self.assertEqual(len([seal for seal in self.multiworld.itempool if seal.name == "Power Seal"]),
                              self.multiworld.total_seals[self.player])
-            locations = ["Shop Chest"]
+            locations = ["Rescue Phantom"]
             items = [["Power Seal"]]
             self.assertAccessDependency(locations, items)
             self.multiworld.state = CollectionState(self.multiworld)
 
-        self.assertEqual(self.can_reach_location("Shop Chest"), False)
+        self.assertEqual(self.can_reach_location("Rescue Phantom"), False)
         self.assertBeatable(False)
-        self.collect_all_but(["Power Seal", "Shop Chest", "Rescue Phantom"])
-        self.assertEqual(self.can_reach_location("Shop Chest"), False)
+        self.collect_all_but(["Power Seal", "Rescue Phantom"])
+        self.assertEqual(self.can_reach_location("Rescue Phantom"), False)
         self.assertBeatable(False)
         self.collect_by_name("Power Seal")
-        self.assertEqual(self.can_reach_location("Shop Chest"), True)
+        self.assertEqual(self.can_reach_location("Rescue Phantom"), True)
         self.assertBeatable(True)
 
 
@@ -38,7 +38,7 @@ class HalfSealsRequired(MessengerTestBase):
         "percent_seals_required": 50,
     }
 
-    def testSealsAmount(self) -> None:
+    def test_seals_amount(self) -> None:
         """Should have 45 power seals in the item pool and half that required"""
         self.assertEqual(self.multiworld.total_seals[self.player], 45)
         self.assertEqual(self.multiworld.worlds[self.player].total_seals, 45)
@@ -57,7 +57,7 @@ class ThirtyThirtySeals(MessengerTestBase):
         "percent_seals_required": 34,
     }
 
-    def testSealsAmount(self) -> None:
+    def test_seals_amount(self) -> None:
         """Should have 30 power seals in the pool and 33 percent of that required."""
         self.assertEqual(self.multiworld.total_seals[self.player], 30)
         self.assertEqual(self.multiworld.worlds[self.player].total_seals, 30)
@@ -75,7 +75,7 @@ class MaxSealsNoShards(MessengerTestBase):
         "total_seals": 85,
     }
 
-    def testSealsAmount(self) -> None:
+    def test_seals_amount(self) -> None:
         """Should set total seals to 70 since shards aren't shuffled."""
         self.assertEqual(self.multiworld.total_seals[self.player], 85)
         self.assertEqual(self.multiworld.worlds[self.player].total_seals, 70)
@@ -88,7 +88,7 @@ class MaxSealsWithShards(MessengerTestBase):
         "shuffle_shards": "true",
     }
 
-    def testSealsAmount(self) -> None:
+    def test_seals_amount(self) -> None:
         """Should have 85 seals in the pool with all required and be a valid seed."""
         self.assertEqual(self.multiworld.total_seals[self.player], 85)
         self.assertEqual(self.multiworld.worlds[self.player].total_seals, 85)
diff --git a/worlds/minecraft/Options.py b/worlds/minecraft/Options.py
index 084a611e44..cdb5bf303f 100644
--- a/worlds/minecraft/Options.py
+++ b/worlds/minecraft/Options.py
@@ -14,7 +14,7 @@ class EggShardsRequired(Range):
     """Number of dragon egg shards to collect to spawn bosses."""
     display_name = "Egg Shards Required"
     range_start = 0
-    range_end = 74
+    range_end = 50
     default = 0
 
 
@@ -22,7 +22,7 @@ class EggShardsAvailable(Range):
     """Number of dragon egg shards available to collect."""
     display_name = "Egg Shards Available"
     range_start = 0
-    range_end = 74
+    range_end = 50
     default = 0
 
 
diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py
index fa992e1e11..187f1fdf19 100644
--- a/worlds/minecraft/__init__.py
+++ b/worlds/minecraft/__init__.py
@@ -173,7 +173,7 @@ class MinecraftWorld(World):
 
     def generate_output(self, output_directory: str) -> None:
         data = self._get_mc_data()
-        filename = f"AP_{self.multiworld.get_out_file_name_base(self.player)}.apmc"
+        filename = f"{self.multiworld.get_out_file_name_base(self.player)}.apmc"
         with open(os.path.join(output_directory, filename), 'wb') as f:
             f.write(b64encode(bytes(json.dumps(data), 'utf-8')))
 
diff --git a/worlds/mmbn3/Locations.py b/worlds/mmbn3/Locations.py
index fc59103340..0e2a1c51d1 100644
--- a/worlds/mmbn3/Locations.py
+++ b/worlds/mmbn3/Locations.py
@@ -208,7 +208,7 @@ overworlds = [
     LocationData(LocationName.ACDC_Class_5B_Bookshelf,            0xb3109e, 0x200024c, 0x40, 0x737634, 235, [5, 6]),
     LocationData(LocationName.SciLab_Garbage_Can,                 0xb3109f, 0x200024c, 0x8, 0x73AC20, 222, [4, 5]),
     LocationData(LocationName.Yoka_Inn_Jars,                      0xb310a0, 0x200024c, 0x80, 0x747B1C, 237, [4, 5]),
-    LocationData(LocationName.Yoka_Zoo_Garbage,                   0xb310a1, 0x200024d, 0x8, 0x749444, 226, [4]),
+    LocationData(LocationName.Yoka_Zoo_Garbage,                   0xb310a1, 0x200024d, 0x8, 0x749444, 226, [5]),
     LocationData(LocationName.Beach_Department_Store,             0xb310a2, 0x2000161, 0x40, 0x74C27C, 196, [0, 1]),
     LocationData(LocationName.Beach_Hospital_Plaque,              0xb310a3, 0x200024c, 0x4, 0x754394, 220, [3, 4]),
     LocationData(LocationName.Beach_Hospital_Pink_Door,           0xb310a4, 0x200024d, 0x4, 0x754D00, 220, [4]),
diff --git a/worlds/mmbn3/__init__.py b/worlds/mmbn3/__init__.py
index ec68825c2d..acf258a730 100644
--- a/worlds/mmbn3/__init__.py
+++ b/worlds/mmbn3/__init__.py
@@ -15,6 +15,7 @@ from .Options import MMBN3Options
 from .Regions import regions, RegionName
 from .Names.ItemName import ItemName
 from .Names.LocationName import LocationName
+from worlds.generic.Rules import add_item_rule
 
 
 class MMBN3Settings(settings.Group):
@@ -91,6 +92,9 @@ class MMBN3World(World):
                 loc = MMBN3Location(self.player, location, self.location_name_to_id.get(location, None), region)
                 if location in self.excluded_locations:
                     loc.progress_type = LocationProgressType.EXCLUDED
+                # Do not place any progression items on WWW Island
+                if region_info.name == RegionName.WWW_Island:
+                    add_item_rule(loc, lambda item: not item.advancement)
                 region.locations.append(loc)
             self.multiworld.regions.append(region)
         for region_info in regions:
diff --git a/worlds/mmbn3/docs/en_MegaMan Battle Network 3.md b/worlds/mmbn3/docs/en_MegaMan Battle Network 3.md
index 854034d5a8..7ffa4665fd 100644
--- a/worlds/mmbn3/docs/en_MegaMan Battle Network 3.md	
+++ b/worlds/mmbn3/docs/en_MegaMan Battle Network 3.md	
@@ -72,3 +72,10 @@ what item and what player is receiving the item
 
 Whenever you have an item pending, the next time you are not in a battle, menu, or dialog box, you will receive a
 message on screen notifying you of the item and sender, and the item will be added directly to your inventory.
+
+## Unique Local Commands
+
+The following commands are only available when using the MMBN3Client to play with Archipelago.
+
+- `/gba` Check GBA Connection State
+- `/debug` Toggle the Debug Text overlay in ROM
diff --git a/worlds/mmbn3/docs/setup_en.md b/worlds/mmbn3/docs/setup_en.md
index 309c07f5cf..b5ff1625c8 100644
--- a/worlds/mmbn3/docs/setup_en.md
+++ b/worlds/mmbn3/docs/setup_en.md
@@ -12,7 +12,8 @@ As we are using Bizhawk, this guide is only applicable to Windows and Linux syst
   - 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)
   (select `MegaMan Battle Network 3 Client` during installation).
-- A US MegaMan Battle Network 3 Blue Rom
+- A US MegaMan Battle Network 3 Blue Rom. If you have the [MegaMan Battle Network Legacy Collection Vol. 1](https://store.steampowered.com/app/1798010/Mega_Man_Battle_Network_Legacy_Collection_Vol_1/)
+on Steam, you can obtain a copy of this ROM from the game's files, see instructions below.
 
 ## Configuring Bizhawk
 
@@ -35,6 +36,14 @@ To do so, we simply have to search any GBA rom we happened to own, right click a
 the list that appears and select the bottom option "Look for another application", then browse to the Bizhawk folder
 and select EmuHawk.exe.
 
+## Extracting a ROM from the Legacy Collection
+
+The Steam version of the Legacy Collection contains unmodified GBA ROMs in its files. You can extract these for use with Archipelago.
+
+1. Open the Legacy Collection Vol. 1's Game Files (Right click on the game in your Library, then open Properties -> Installed Files -> Browse)
+2. Open the file `exe/data/exe3b.dat` in a zip-extracting program such as 7-Zip or WinRAR.
+3. Extract the file `rom_b_e.srl` somewhere and rename it to `Mega Man Battle Network 3 - Blue Version (USA).gba`
+
 ## Configuring your YAML file
 
 ### What is a YAML file and why do I need one?
@@ -76,4 +85,4 @@ Don't forget to start manipulating RNG early by shouting during generation:
 JACK IN!
 [Your name]!   
 EXECUTE!
-```
\ No newline at end of file
+```
diff --git a/worlds/musedash/Items.py b/worlds/musedash/Items.py
index be229228bd..63fd3aa51b 100644
--- a/worlds/musedash/Items.py
+++ b/worlds/musedash/Items.py
@@ -6,7 +6,7 @@ class SongData(NamedTuple):
     """Special data container to contain the metadata of each song to make filtering work."""
 
     code: Optional[int]
-    song_is_free: bool
+    album: str
     streamer_mode: bool
     easy: Optional[int]
     hard: Optional[int]
diff --git a/worlds/musedash/MuseDashCollection.py b/worlds/musedash/MuseDashCollection.py
index 7812e28b7a..55523542d7 100644
--- a/worlds/musedash/MuseDashCollection.py
+++ b/worlds/musedash/MuseDashCollection.py
@@ -1,5 +1,5 @@
 from .Items import SongData, AlbumData
-from typing import Dict, List, Optional
+from typing import Dict, List, Set, Optional
 from collections import ChainMap
 
 
@@ -15,13 +15,21 @@ class MuseDashCollections:
     MUSIC_SHEET_NAME: str = "Music Sheet"
     MUSIC_SHEET_CODE: int = STARTING_CODE
 
-    FREE_ALBUMS = [
+    FREE_ALBUMS: List[str] = [
         "Default Music",
         "Budget Is Burning: Nano Core",
         "Budget Is Burning Vol.1",
     ]
 
-    DIFF_OVERRIDES = [
+    MUSE_PLUS_DLC: str = "Muse Plus"
+    DLC: List[str] = [
+        # MUSE_PLUS_DLC, # To be included when OptionSets are rendered as part of basic settings.
+        # "maimai DX Limited-time Suite", # Part of Muse Plus. Goes away 31st Jan 2026.
+        "Miku in Museland", # Paid DLC not included in Muse Plus
+        "MSR Anthology", # Part of Muse Plus. Goes away 20th Jan 2024.
+    ]
+
+    DIFF_OVERRIDES: List[str] = [
         "MuseDash ka nanika hi",
         "Rush-Hour",
         "Find this Month's Featured Playlist",
@@ -36,8 +44,8 @@ class MuseDashCollections:
     vfx_trap_items: Dict[str, int] = {
         "Bad Apple Trap": STARTING_CODE + 1,
         "Pixelate Trap": STARTING_CODE + 2,
-        "Random Wave Trap": STARTING_CODE + 3,
-        "Shadow Edge Trap": STARTING_CODE + 4,
+        "Ripple Trap": STARTING_CODE + 3,
+        "Vignette Trap": STARTING_CODE + 4,
         "Chromatic Aberration Trap": STARTING_CODE + 5,
         "Background Freeze Trap": STARTING_CODE + 6,
         "Gray Scale Trap": STARTING_CODE + 7,
@@ -48,8 +56,8 @@ class MuseDashCollections:
         "Error SFX Trap": STARTING_CODE + 9,
     }
 
-    item_names_to_id = ChainMap({}, sfx_trap_items, vfx_trap_items)
-    location_names_to_id = ChainMap(song_locations, album_locations)
+    item_names_to_id: ChainMap = ChainMap({}, sfx_trap_items, vfx_trap_items)
+    location_names_to_id: ChainMap = ChainMap(song_locations, album_locations)
 
     def __init__(self) -> None:
         self.item_names_to_id[self.MUSIC_SHEET_NAME] = self.MUSIC_SHEET_CODE
@@ -70,7 +78,6 @@ class MuseDashCollections:
             # Data is in the format 'Song|UID|Album|StreamerMode|EasyDiff|HardDiff|MasterDiff|SecretDiff'
             song_name = sections[0]
             # [1] is used in the client copy to make sure item id's match.
-            song_is_free = album in self.FREE_ALBUMS
             steamer_mode = sections[3] == "True"
 
             if song_name in self.DIFF_OVERRIDES:
@@ -84,7 +91,7 @@ class MuseDashCollections:
                 diff_of_hard = self.parse_song_difficulty(sections[5])
                 diff_of_master = self.parse_song_difficulty(sections[6])
 
-            self.song_items[song_name] = SongData(item_id_index, song_is_free, steamer_mode,
+            self.song_items[song_name] = SongData(item_id_index, album, steamer_mode,
                                                   diff_of_easy, diff_of_hard, diff_of_master)
             item_id_index += 1
 
@@ -102,13 +109,13 @@ class MuseDashCollections:
             self.song_locations[f"{name}-1"] = location_id_index + 1
             location_id_index += 2
 
-    def get_songs_with_settings(self, dlc_songs: bool, streamer_mode_active: bool,
+    def get_songs_with_settings(self, dlc_songs: Set[str], streamer_mode_active: bool,
                                 diff_lower: int, diff_higher: int) -> List[str]:
         """Gets a list of all songs that match the filter settings. Difficulty thresholds are inclusive."""
         filtered_list = []
 
         for songKey, songData in self.song_items.items():
-            if not dlc_songs and not songData.song_is_free:
+            if not self.song_matches_dlc_filter(songData, dlc_songs):
                 continue
 
             if streamer_mode_active and not songData.streamer_mode:
@@ -128,6 +135,19 @@ class MuseDashCollections:
 
         return filtered_list
 
+    def song_matches_dlc_filter(self, song: SongData, dlc_songs: Set[str]) -> bool:
+        if song.album in self.FREE_ALBUMS:
+            return True
+
+        if song.album in dlc_songs:
+            return True
+
+        # Muse Plus provides access to any DLC not included as a seperate pack
+        if song.album not in self.DLC and self.MUSE_PLUS_DLC in dlc_songs:
+            return True
+
+        return False
+
     def parse_song_difficulty(self, difficulty: str) -> Optional[int]:
         """Attempts to parse the song difficulty."""
         if len(difficulty) <= 0 or difficulty == "?" or difficulty == "¿":
diff --git a/worlds/musedash/MuseDashData.txt b/worlds/musedash/MuseDashData.txt
index 8d6c3f3753..54a0124474 100644
--- a/worlds/musedash/MuseDashData.txt
+++ b/worlds/musedash/MuseDashData.txt
@@ -51,42 +51,42 @@ Mujinku-Vacuum|0-28|Default Music|False|5|7|11|
 MilK|0-36|Default Music|False|5|7|9|
 umpopoff|0-41|Default Music|False|0|?|0|
 Mopemope|0-45|Default Music|False|4|7|9|11
-The Happycore Idol|43-0|Just as Planned  Plus|True|2|5|7|
-Amatsumikaboshi|43-1|Just as Planned  Plus|True|4|6|8|10
-ARIGA THESIS|43-2|Just as Planned  Plus|True|3|6|10|
-Night of Nights|43-3|Just as Planned  Plus|False|4|7|10|
-#Psychedelic_Meguro_River|43-4|Just as Planned  Plus|False|3|6|8|
-can you feel it|43-5|Just as Planned  Plus|False|4|6|8|9
-Midnight O'clock|43-6|Just as Planned  Plus|True|3|6|8|
-Rin|43-7|Just as Planned  Plus|True|5|7|10|
-Smile-mileS|43-8|Just as Planned  Plus|False|6|8|10|
-Believing and Being|43-9|Just as Planned  Plus|True|4|6|9|
-Catalyst|43-10|Just as Planned  Plus|False|5|7|9|
-don't!stop!eroero!|43-11|Just as Planned  Plus|True|5|7|9|
-pa pi pu pi pu pi pa|43-12|Just as Planned  Plus|False|6|8|10|
-Sand Maze|43-13|Just as Planned  Plus|True|6|8|10|11
-Diffraction|43-14|Just as Planned  Plus|True|5|8|10|
-AKUMU|43-15|Just as Planned  Plus|False|4|6|8|
-Queen Aluett|43-16|Just as Planned  Plus|True|7|9|11|
-DROPS|43-17|Just as Planned  Plus|False|2|5|8|
-Frightfully-insane Flan-chan's frightful song|43-18|Just as Planned  Plus|False|5|7|10|
-snooze|43-19|Just as Planned  Plus|False|5|7|10|
-Kuishinbo Hacker feat.Kuishinbo Akachan|43-20|Just as Planned  Plus|True|5|7|9|
-Inu no outa|43-21|Just as Planned  Plus|True|3|5|7|
-Prism Fountain|43-22|Just as Planned  Plus|True|7|9|11|
-Gospel|43-23|Just as Planned  Plus|False|4|6|9|
+The Happycore Idol|43-0|MD Plus Project|True|2|5|7|
+Amatsumikaboshi|43-1|MD Plus Project|True|4|6|8|10
+ARIGA THESIS|43-2|MD Plus Project|True|3|6|10|
+Night of Nights|43-3|MD Plus Project|False|4|7|10|
+#Psychedelic_Meguro_River|43-4|MD Plus Project|False|3|6|8|
+can you feel it|43-5|MD Plus Project|False|4|6|8|9
+Midnight O'clock|43-6|MD Plus Project|True|3|6|8|
+Rin|43-7|MD Plus Project|True|5|7|10|
+Smile-mileS|43-8|MD Plus Project|False|6|8|10|
+Believing and Being|43-9|MD Plus Project|True|4|6|9|
+Catalyst|43-10|MD Plus Project|False|5|7|9|
+don't!stop!eroero!|43-11|MD Plus Project|True|5|7|9|
+pa pi pu pi pu pi pa|43-12|MD Plus Project|False|6|8|10|
+Sand Maze|43-13|MD Plus Project|True|6|8|10|11
+Diffraction|43-14|MD Plus Project|True|5|8|10|
+AKUMU|43-15|MD Plus Project|False|4|6|8|
+Queen Aluett|43-16|MD Plus Project|True|7|9|11|
+DROPS|43-17|MD Plus Project|False|2|5|8|
+Frightfully-insane Flan-chan's frightful song|43-18|MD Plus Project|False|5|7|10|
+snooze|43-19|MD Plus Project|False|5|7|10|
+Kuishinbo Hacker feat.Kuishinbo Akachan|43-20|MD Plus Project|True|5|7|9|
+Inu no outa|43-21|MD Plus Project|True|3|5|7|
+Prism Fountain|43-22|MD Plus Project|True|7|9|11|
+Gospel|43-23|MD Plus Project|False|4|6|9|
 East Ai Li Lovely|62-0|Happy Otaku Pack Vol.17|False|2|4|7|
 Mori Umi no Fune|62-1|Happy Otaku Pack Vol.17|True|5|7|9|
 Ooi|62-2|Happy Otaku Pack Vol.17|True|5|7|10|
 Numatta!!|62-3|Happy Otaku Pack Vol.17|True|5|7|9|
-SATELLITE|62-4|Happy Otaku Pack Vol.17|False|5|7|9|
+SATELLITE|62-4|Happy Otaku Pack Vol.17|False|5|7|9|10
 Fantasia Sonata Colorful feat. V!C|62-5|Happy Otaku Pack Vol.17|True|6|8|11|
 MuseDash ka nanika hi|61-0|Ola Dash|True|?|?|¿|
 Aleph-0|61-1|Ola Dash|True|7|9|11|
 Buttoba Supernova|61-2|Ola Dash|False|5|7|10|11
 Rush-Hour|61-3|Ola Dash|False|IG|Jh|a2|Eh
 3rd Avenue|61-4|Ola Dash|False|3|5|〇|
-WORLDINVADER|61-5|Ola Dash|True|5|8|10|
+WORLDINVADER|61-5|Ola Dash|True|5|8|10|11
 N3V3R G3T OV3R|60-0|maimai DX Limited-time Suite|True|4|7|10|
 Oshama Scramble!|60-1|maimai DX Limited-time Suite|True|5|7|10|
 Valsqotch|60-2|maimai DX Limited-time Suite|True|5|9|11|
@@ -404,7 +404,7 @@ trippers feeling!|8-4|Give Up TREATMENT Vol.3|True|5|7|9|11
 Lilith ambivalence lovers|8-5|Give Up TREATMENT Vol.3|False|5|8|10|
 Brave My Soul|7-0|Give Up TREATMENT Vol.2|False|4|6|8|
 Halcyon|7-1|Give Up TREATMENT Vol.2|False|4|7|10|
-Crimson Nightingle|7-2|Give Up TREATMENT Vol.2|True|4|7|10|
+Crimson Nightingale|7-2|Give Up TREATMENT Vol.2|True|4|7|10|
 Invader|7-3|Give Up TREATMENT Vol.2|True|3|7|11|
 Lyrith|7-4|Give Up TREATMENT Vol.2|False|5|7|10|
 GOODBOUNCE|7-5|Give Up TREATMENT Vol.2|False|4|6|9|
@@ -450,13 +450,13 @@ Love Patrol|63-2|MUSE RADIO FM104|True|3|5|7|
 Mahorova|63-3|MUSE RADIO FM104|True|3|5|8|
 Yoru no machi|63-4|MUSE RADIO FM104|True|1|4|7|
 INTERNET YAMERO|63-5|MUSE RADIO FM104|True|6|8|10|
-Abracadabra|43-24|Just as Planned  Plus|False|6|8|10|
-Squalldecimator feat. EZ-Ven|43-25|Just as Planned  Plus|True|5|7|9|
-Amateras Rhythm|43-26|Just as Planned  Plus|True|6|8|11|
-Record one's Dream|43-27|Just as Planned  Plus|False|4|7|10|
-Lunatic|43-28|Just as Planned  Plus|True|5|8|10|
-Jiumeng|43-29|Just as Planned  Plus|True|3|6|8|
-The Day We Become Family|43-30|Just as Planned  Plus|True|3|5|8|
+Abracadabra|43-24|MD Plus Project|False|6|8|10|
+Squalldecimator feat. EZ-Ven|43-25|MD Plus Project|True|5|7|9|
+Amateras Rhythm|43-26|MD Plus Project|True|6|8|11|
+Record one's Dream|43-27|MD Plus Project|False|4|7|10|
+Lunatic|43-28|MD Plus Project|True|5|8|10|
+Jiumeng|43-29|MD Plus Project|True|3|6|8|
+The Day We Become Family|43-30|MD Plus Project|True|3|5|8|
 Sutori ma FIRE!?!?|64-0|COSMIC RADIO PEROLIST|True|3|5|8|
 Tanuki Step|64-1|COSMIC RADIO PEROLIST|True|5|7|10|11
 Space Stationery|64-2|COSMIC RADIO PEROLIST|True|5|7|10|
@@ -465,7 +465,40 @@ Kawai Splendid Space Thief|64-4|COSMIC RADIO PEROLIST|False|6|8|10|11
 Night City Runway|64-5|COSMIC RADIO PEROLIST|True|4|6|8|
 Chaos Shotgun feat. ChumuNote|64-6|COSMIC RADIO PEROLIST|True|6|8|10|
 mew mew magical summer|64-7|COSMIC RADIO PEROLIST|False|5|8|10|11
-BrainDance|65-0|Neon Abyss|True|3|6|9|
-My Focus!|65-1|Neon Abyss|True|5|7|10|
-ABABABA BURST|65-2|Neon Abyss|True|5|7|9|
-ULTRA HIGHER|65-3|Neon Abyss|True|4|7|10|
\ No newline at end of file
+BrainDance|65-0|NeonAbyss|True|3|6|9|
+My Focus!|65-1|NeonAbyss|True|5|7|10|
+ABABABA BURST|65-2|NeonAbyss|True|5|7|9|
+ULTRA HIGHER|65-3|NeonAbyss|True|4|7|10|
+Silver Bullet|43-31|MD Plus Project|True|5|7|10|
+Random|43-32|MD Plus Project|True|4|7|9|
+OTOGE-BOSS-KYOKU-CHAN|43-33|MD Plus Project|False|6|8|10|11
+Crow Rabbit|43-34|MD Plus Project|True|7|9|11|
+SyZyGy|43-35|MD Plus Project|True|6|8|10|11
+Mermaid Radio|43-36|MD Plus Project|True|3|5|7|
+Helixir|43-37|MD Plus Project|False|6|8|10|
+Highway Cruisin'|43-38|MD Plus Project|False|3|5|8|
+JACK PT BOSS|43-39|MD Plus Project|False|6|8|10|
+Time Capsule|43-40|MD Plus Project|False|7|9|11|
+39 Music!|66-0|Miku in Museland|False|3|5|8|
+Hand in Hand|66-1|Miku in Museland|False|1|3|6|
+Cynical Night Plan|66-2|Miku in Museland|False|4|6|8|
+God-ish|66-3|Miku in Museland|False|4|7|10|
+Darling Dance|66-4|Miku in Museland|False|4|7|9|
+Hatsune Creation Myth|66-5|Miku in Museland|False|6|8|10|
+The Vampire|66-6|Miku in Museland|False|4|6|9|
+Future Eve|66-7|Miku in Museland|False|4|8|11|
+Unknown Mother Goose|66-8|Miku in Museland|False|4|8|10|
+Shun-ran|66-9|Miku in Museland|False|4|7|9|
+NICE TYPE feat. monii|43-41|MD Plus Project|True|3|6|8|
+Rainy Angel|67-0|Happy Otaku Pack Vol.18|True|4|6|9|11
+Gullinkambi|67-1|Happy Otaku Pack Vol.18|True|4|7|10|
+RakiRaki Rebuilders!!!|67-2|Happy Otaku Pack Vol.18|True|5|7|10|
+Laniakea|67-3|Happy Otaku Pack Vol.18|False|5|8|10|
+OTTAMA GAZER|67-4|Happy Otaku Pack Vol.18|True|5|8|10|
+Sleep Tight feat.Macoto|67-5|Happy Otaku Pack Vol.18|True|3|5|8|
+New York Back Raise|68-0|Gambler's Tricks|True|6|8|10|
+slic.hertz|68-1|Gambler's Tricks|True|5|7|9|
+Fuzzy-Navel|68-2|Gambler's Tricks|True|6|8|10|11
+Swing Edge|68-3|Gambler's Tricks|True|4|8|10|
+Twisted Escape|68-4|Gambler's Tricks|True|5|8|10|11
+Swing Sweet Twee Dance|68-5|Gambler's Tricks|False|4|7|10|
\ No newline at end of file
diff --git a/worlds/musedash/Options.py b/worlds/musedash/Options.py
index b2f15ecc8e..3fe28187fa 100644
--- a/worlds/musedash/Options.py
+++ b/worlds/musedash/Options.py
@@ -1,10 +1,19 @@
 from typing import Dict
-from Options import Toggle, Option, Range, Choice, DeathLink, ItemSet
+from Options import Toggle, Option, Range, Choice, DeathLink, ItemSet, OptionSet, PerGameCommonOptions
+from dataclasses import dataclass
 
+from .MuseDashCollection import MuseDashCollections
 
 class AllowJustAsPlannedDLCSongs(Toggle):
-    """Whether [Just as Planned]/[Muse Plus] DLC Songs, and all the DLCs along with it, will be included in the randomizer."""
-    display_name = "Allow [Just as Planned]/[Muse Plus] DLC Songs"
+    """Whether [Muse Plus] DLC Songs, and all the albums included in it, can be chosen as randomised songs.
+    Note: The [Just As Planned] DLC contains all [Muse Plus] songs."""
+    display_name = "Allow [Muse Plus] DLC Songs"
+
+class DLCMusicPacks(OptionSet):
+    """Which non-[Muse Plus] DLC packs can be chosen as randomised songs."""
+    display_name = "DLC Packs"
+    default = {}
+    valid_keys = [dlc for dlc in MuseDashCollections.DLC]
 
 
 class StreamerModeEnabled(Toggle):
@@ -159,21 +168,22 @@ class ExcludeSongs(ItemSet):
     display_name = "Exclude Songs"
 
 
-musedash_options: Dict[str, type(Option)] = {
-    "allow_just_as_planned_dlc_songs": AllowJustAsPlannedDLCSongs,
-    "streamer_mode_enabled": StreamerModeEnabled,
-    "starting_song_count": StartingSongs,
-    "additional_song_count": AdditionalSongs,
-    "additional_item_percentage": AdditionalItemPercentage,
-    "song_difficulty_mode": DifficultyMode,
-    "song_difficulty_min": DifficultyModeOverrideMin,
-    "song_difficulty_max": DifficultyModeOverrideMax,
-    "grade_needed": GradeNeeded,
-    "music_sheet_count_percentage": MusicSheetCountPercentage,
-    "music_sheet_win_count_percentage": MusicSheetWinCountPercentage,
-    "available_trap_types": TrapTypes,
-    "trap_count_percentage": TrapCountPercentage,
-    "death_link": DeathLink,
-    "include_songs": IncludeSongs,
-    "exclude_songs": ExcludeSongs
-}
+@dataclass
+class MuseDashOptions(PerGameCommonOptions):
+    allow_just_as_planned_dlc_songs: AllowJustAsPlannedDLCSongs
+    dlc_packs: DLCMusicPacks
+    streamer_mode_enabled: StreamerModeEnabled
+    starting_song_count: StartingSongs
+    additional_song_count: AdditionalSongs
+    additional_item_percentage: AdditionalItemPercentage
+    song_difficulty_mode: DifficultyMode
+    song_difficulty_min: DifficultyModeOverrideMin
+    song_difficulty_max: DifficultyModeOverrideMax
+    grade_needed: GradeNeeded
+    music_sheet_count_percentage: MusicSheetCountPercentage
+    music_sheet_win_count_percentage: MusicSheetWinCountPercentage
+    available_trap_types: TrapTypes
+    trap_count_percentage: TrapCountPercentage
+    death_link: DeathLink
+    include_songs: IncludeSongs
+    exclude_songs: ExcludeSongs
diff --git a/worlds/musedash/Presets.py b/worlds/musedash/Presets.py
new file mode 100644
index 0000000000..6459111802
--- /dev/null
+++ b/worlds/musedash/Presets.py
@@ -0,0 +1,31 @@
+from typing import Any, Dict
+
+MuseDashPresets: Dict[str, Dict[str, Any]] = {
+    # An option to support Short Sync games. 40 songs.
+    "No DLC - Short": {
+        "allow_just_as_planned_dlc_songs": False,
+        "starting_song_count": 5,
+        "additional_song_count": 34,
+        "additional_item_percentage": 80,
+        "music_sheet_count_percentage": 20,
+        "music_sheet_win_count_percentage": 90,
+    },
+    # An option to support Short Sync games but adds variety. 40 songs.
+    "DLC - Short": {
+        "allow_just_as_planned_dlc_songs": True,
+        "starting_song_count": 5,
+        "additional_song_count": 34,
+        "additional_item_percentage": 80,
+        "music_sheet_count_percentage": 20,
+        "music_sheet_win_count_percentage": 90,
+    },
+    # An option to support Longer Sync/Async games. 100 songs.
+    "DLC - Long": {
+        "allow_just_as_planned_dlc_songs": True,
+        "starting_song_count": 8,
+        "additional_song_count": 91,
+        "additional_item_percentage": 80,
+        "music_sheet_count_percentage": 20,
+        "music_sheet_win_count_percentage": 90,
+    },
+}
diff --git a/worlds/musedash/__init__.py b/worlds/musedash/__init__.py
index 78b9c253d5..a68fd2853d 100644
--- a/worlds/musedash/__init__.py
+++ b/worlds/musedash/__init__.py
@@ -1,13 +1,14 @@
 from worlds.AutoWorld import World, WebWorld
-from worlds.generic.Rules import set_rule
 from BaseClasses import Region, Item, ItemClassification, Entrance, Tutorial
-from typing import List
+from typing import List, ClassVar, Type
 from math import floor
+from Options import PerGameCommonOptions
 
-from .Options import musedash_options
+from .Options import MuseDashOptions
 from .Items import MuseDashSongItem, MuseDashFixedItem
 from .Locations import MuseDashLocation
 from .MuseDashCollection import MuseDashCollections
+from .Presets import MuseDashPresets
 
 
 class MuseDashWebWorld(WebWorld):
@@ -23,7 +24,17 @@ class MuseDashWebWorld(WebWorld):
         ["DeamonHunter"]
     )
 
-    tutorials = [setup_en]
+    setup_es = Tutorial(
+        setup_en.tutorial_name,
+        setup_en.description,
+        "Español",
+        "setup_es.md",
+        "setup/es",
+        ["Shiny"]
+    )
+
+    tutorials = [setup_en, setup_es]
+    options_presets = MuseDashPresets
 
 
 class MuseDashWorld(World):
@@ -38,9 +49,10 @@ class MuseDashWorld(World):
 
     # World Options
     game = "Muse Dash"
-    option_definitions = musedash_options
+    options_dataclass: ClassVar[Type[PerGameCommonOptions]] = MuseDashOptions
+    options: MuseDashOptions
+
     topology_present = False
-    data_version = 9
     web = MuseDashWebWorld()
 
     # Necessary Data
@@ -57,14 +69,17 @@ class MuseDashWorld(World):
     location_count: int
 
     def generate_early(self):
-        dlc_songs = self.multiworld.allow_just_as_planned_dlc_songs[self.player]
-        streamer_mode = self.multiworld.streamer_mode_enabled[self.player]
+        dlc_songs = {key for key in self.options.dlc_packs.value}
+        if (self.options.allow_just_as_planned_dlc_songs.value):
+            dlc_songs.add(self.md_collection.MUSE_PLUS_DLC)
+
+        streamer_mode = self.options.streamer_mode_enabled
         (lower_diff_threshold, higher_diff_threshold) = self.get_difficulty_range()
 
         # The minimum amount of songs to make an ok rando would be Starting Songs + 10 interim songs + Goal song.
         # - Interim songs being equal to max starting song count.
         # Note: The worst settings still allow 25 songs (Streamer Mode + No DLC).
-        starter_song_count = self.multiworld.starting_song_count[self.player].value
+        starter_song_count = self.options.starting_song_count.value
 
         while True:
             # In most cases this should only need to run once
@@ -95,9 +110,9 @@ class MuseDashWorld(World):
     def handle_plando(self, available_song_keys: List[str]) -> List[str]:
         song_items = self.md_collection.song_items
 
-        start_items = self.multiworld.start_inventory[self.player].value.keys()
-        include_songs = self.multiworld.include_songs[self.player].value
-        exclude_songs = self.multiworld.exclude_songs[self.player].value
+        start_items = self.options.start_inventory.value.keys()
+        include_songs = self.options.include_songs.value
+        exclude_songs = self.options.exclude_songs.value
 
         self.starting_songs = [s for s in start_items if s in song_items]
         self.included_songs = [s for s in include_songs if s in song_items and s not in self.starting_songs]
@@ -106,8 +121,8 @@ class MuseDashWorld(World):
                 and s not in include_songs and s not in exclude_songs]
 
     def create_song_pool(self, available_song_keys: List[str]):
-        starting_song_count = self.multiworld.starting_song_count[self.player].value
-        additional_song_count = self.multiworld.additional_song_count[self.player].value
+        starting_song_count = self.options.starting_song_count.value
+        additional_song_count = self.options.additional_song_count.value
 
         self.random.shuffle(available_song_keys)
 
@@ -141,7 +156,7 @@ class MuseDashWorld(World):
 
         # Then attempt to fufill any remaining songs for interim songs
         if len(self.included_songs) < additional_song_count:
-            for _ in range(len(self.included_songs), self.multiworld.additional_song_count[self.player]):
+            for _ in range(len(self.included_songs), self.options.additional_song_count):
                 if len(available_song_keys) <= 0:
                     break
                 self.included_songs.append(available_song_keys.pop())
@@ -249,40 +264,40 @@ class MuseDashWorld(World):
             state.has(self.md_collection.MUSIC_SHEET_NAME, self.player, self.get_music_sheet_win_count())
 
     def get_available_traps(self) -> List[str]:
-        dlc_songs = self.multiworld.allow_just_as_planned_dlc_songs[self.player]
+        sfx_traps_available = self.options.allow_just_as_planned_dlc_songs.value
 
         trap_list = []
-        if self.multiworld.available_trap_types[self.player].value & 1 != 0:
+        if self.options.available_trap_types.value & 1 != 0:
             trap_list += self.md_collection.vfx_trap_items.keys()
 
         # SFX options are only available under Just as Planned DLC.
-        if dlc_songs and self.multiworld.available_trap_types[self.player].value & 2 != 0:
+        if sfx_traps_available and self.options.available_trap_types.value & 2 != 0:
             trap_list += self.md_collection.sfx_trap_items.keys()
 
         return trap_list
 
     def get_additional_item_percentage(self) -> int:
-        trap_count = self.multiworld.trap_count_percentage[self.player].value
-        song_count = self.multiworld.music_sheet_count_percentage[self.player].value
-        return max(trap_count + song_count, self.multiworld.additional_item_percentage[self.player].value)
+        trap_count = self.options.trap_count_percentage.value
+        song_count = self.options.music_sheet_count_percentage.value
+        return max(trap_count + song_count, self.options.additional_item_percentage.value)
 
     def get_trap_count(self) -> int:
-        multiplier = self.multiworld.trap_count_percentage[self.player].value / 100.0
+        multiplier = self.options.trap_count_percentage.value / 100.0
         trap_count = (len(self.starting_songs) * 2) + len(self.included_songs)
         return max(0, floor(trap_count * multiplier))
 
     def get_music_sheet_count(self) -> int:
-        multiplier = self.multiworld.music_sheet_count_percentage[self.player].value / 100.0
+        multiplier = self.options.music_sheet_count_percentage.value / 100.0
         song_count = (len(self.starting_songs) * 2) + len(self.included_songs)
         return max(1, floor(song_count * multiplier))
 
     def get_music_sheet_win_count(self) -> int:
-        multiplier = self.multiworld.music_sheet_win_count_percentage[self.player].value / 100.0
+        multiplier = self.options.music_sheet_win_count_percentage.value / 100.0
         sheet_count = self.get_music_sheet_count()
         return max(1, floor(sheet_count * multiplier))
 
     def get_difficulty_range(self) -> List[int]:
-        difficulty_mode = self.multiworld.song_difficulty_mode[self.player]
+        difficulty_mode = self.options.song_difficulty_mode
 
         # Valid difficulties are between 1 and 11. But make it 0 to 12 for safety
         difficulty_bounds = [0, 12]
@@ -300,8 +315,8 @@ class MuseDashWorld(World):
         elif difficulty_mode == 5:
             difficulty_bounds[0] = 10
         elif difficulty_mode == 6:
-            minimum_difficulty = self.multiworld.song_difficulty_min[self.player].value
-            maximum_difficulty = self.multiworld.song_difficulty_max[self.player].value
+            minimum_difficulty = self.options.song_difficulty_min.value
+            maximum_difficulty = self.options.song_difficulty_max.value
 
             difficulty_bounds[0] = min(minimum_difficulty, maximum_difficulty)
             difficulty_bounds[1] = max(minimum_difficulty, maximum_difficulty)
@@ -311,7 +326,7 @@ class MuseDashWorld(World):
     def fill_slot_data(self):
         return {
             "victoryLocation": self.victory_song_name,
-            "deathLink": self.multiworld.death_link[self.player].value,
+            "deathLink": self.options.death_link.value,
             "musicSheetWinCount": self.get_music_sheet_win_count(),
-            "gradeNeeded": self.multiworld.grade_needed[self.player].value
+            "gradeNeeded": self.options.grade_needed.value
         }
diff --git a/worlds/musedash/docs/setup_en.md b/worlds/musedash/docs/setup_en.md
index 1ab61ff22a..ebf165c7dd 100644
--- a/worlds/musedash/docs/setup_en.md
+++ b/worlds/musedash/docs/setup_en.md
@@ -8,10 +8,10 @@
 
 - Windows 8 or Newer.
 - Muse Dash: [Available on Steam](https://store.steampowered.com/app/774171/Muse_Dash/)
-  - \[Optional\] [Just as Planned] DLC: [Also Available on Steam](https://store.steampowered.com/app/1055810/Muse_Dash__Just_as_planned/)
+  - \[Optional\] [Muse Plus] DLC: [Also Available on Steam](https://store.steampowered.com/app/2593750/Muse_Dash__Muse_Plus/)
 - Melon Loader: [GitHub](https://github.com/LavaGang/MelonLoader/releases/latest)
   - .Net Framework 4.8 may be needed for the installer: [Download](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net48)
-- .Net 6.0 (If not already installed): [Download](https://dotnet.microsoft.com/en-us/download/dotnet/6.0#runtime-6.0.15)
+- .NET Desktop Runtime 6.0.XX (If not already installed): [Download](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
 - Muse Dash Archipelago Mod: [GitHub](https://github.com/DeamonHunter/ArchipelagoMuseDash/releases/latest)
 
 ## Installing the Archipelago mod to Muse Dash
diff --git a/worlds/musedash/docs/setup_es.md b/worlds/musedash/docs/setup_es.md
new file mode 100644
index 0000000000..0d737c26d7
--- /dev/null
+++ b/worlds/musedash/docs/setup_es.md
@@ -0,0 +1,48 @@
+# Guía de instalación para Muse Dash: Archipelago
+
+## Enlaces rápidos
+- [Página Principal](../../../../games/Muse%20Dash/info/en)
+- [Página de Configuraciones](../../../../games/Muse%20Dash/player-settings)
+
+## Software Requerido
+
+- Windows 8 o más reciente.
+- Muse Dash: [Disponible en Steam](https://store.steampowered.com/app/774171/Muse_Dash/)
+  - \[Opcional\] [Muse Plus] DLC: [tambien disponible on Steam](https://store.steampowered.com/app/2593750/Muse_Dash__Muse_Plus/)
+- Melon Loader: [GitHub](https://github.com/LavaGang/MelonLoader/releases/latest)
+  - .Net Framework 4.8 podría ser necesario para el instalador: [Descarga](https://dotnet.microsoft.com/es-es/download/dotnet-framework/net48)
+- Entorno de ejecución de escritorio de .NET 6.0.XX (si aún no está instalado): [Descarga](https://dotnet.microsoft.com/es-es/download/dotnet/6.0)
+- Muse Dash Archipelago Mod: [GitHub](https://github.com/DeamonHunter/ArchipelagoMuseDash/releases/latest)
+
+## Instalar el mod de Archipelago en Muse Dash
+
+1. Descarga [MelonLoader.Installer.exe](https://github.com/LavaGang/MelonLoader/releases/latest) y ejecutalo.
+2. Elije la pestaña "automated", haz clic en el botón "select" y busca tu `MuseDash.exe`. Luego haz clic en "install".
+  - Puedes encontrar la carpeta en Steam buscando el juego en tu biblioteca, haciendo clic derecho sobre el y elegir *Administrar→Ver archivos locales*.
+  - Si haces clic en la barra superior que te indica la carpeta en la que estas, te dará la dirección de ésta para que puedas copiarla. Al pegar esa dirección en la ventana que **MelonLoader** abre, irá automaticamente a esa carpeta.
+3. Ejecuta el juego una vez, y espera hasta que aparezca la pantalla de inicio de Muse Dash antes de cerrarlo.
+4. Descarga la última version de [Muse Dash Archipelago Mod](https://github.com/DeamonHunter/ArchipelagoMuseDash/releases/latest) y extraelo en la nueva carpeta creada llamada `/Mods/`, localizada en la carpeta de instalación de Muse Dash.
+  - Todos los archivos deben ir directamente en la carpeta `/Mods/`, y NO en una subcarpeta dentro de la carpeta `/Mods/`
+
+Si todo fue instalado correctamente, un botón aparecerá en la parte inferior derecha del juego una vez abierto, que te permitirá conectarte al servidor de Archipelago.
+
+## Generar un juego MultiWorld
+1. Entra a la página de [configuraciones de jugador](/games/Muse%20Dash/player-settings) y configura las opciones del juego a tu gusto.
+2. Genera tu archivo YAML y úsalo para generar un juego nuevo en el radomizer
+  - (Instrucciones sobre como generar un juego en Archipelago disponibles en la [guía web de Archipelago en Inglés](/tutorial/Archipelago/setup/en))
+
+## Unirse a un juego MultiWorld
+
+1. Ejecuta Muse Dash y pasa por la pantalla de introducción. Haz clic en el botón de la esquina inferior derecha.
+2. Ingresa los detalles de la sesión de archipelago, como la dirección del servidor con el puerto (por ejemplo, archipelago.gg:38381), nombre de usuario y contraseña.
+3. Si todo se ingresó correctamente, el pop-up debería desaparecer y se mostrará el menú principal habitual. Al ingresar a la selección de canciones, deberías ver una cantidad limitada de canciones.
+
+## Solución de problemas
+
+### No Support Module Loaded
+
+Este error ocurre cuando Melon Loader no puede encontrar los archivos necesarios para ejecutar mods. Generalmente, hay dos razones principales de este error: una falla al generar los archivos cuando el juego se ejecutó por primera vez con Melon Loader, o un antivirus que elimina los archivos después de la generación.
+
+Para solucionar este problema, primero debes eliminar Melon Loader de Muse Dash. Puedes hacer esto eliminando la carpeta Melon Loader dentro de la carpeta de Muse Dash. Luego, seguir los pasos de instalación nuevamente.
+
+Si continúas teniendo problemas y estás utilizando un antivirus, es posible que tengas que desactivarlo temporalmente cuando se ejecute Muse Dash por primera vez, o excluir la carpeta Muse Dash de ser escaneada.
diff --git a/worlds/musedash/test/TestCollection.py b/worlds/musedash/test/TestCollection.py
index 23348af104..f9422388ae 100644
--- a/worlds/musedash/test/TestCollection.py
+++ b/worlds/musedash/test/TestCollection.py
@@ -36,14 +36,27 @@ class CollectionsTest(unittest.TestCase):
 
     def test_free_dlc_included_in_base_songs(self) -> None:
         collection = MuseDashCollections()
-        songs = collection.get_songs_with_settings(False, False, 0, 11)
+        songs = collection.get_songs_with_settings(set(), False, 0, 12)
 
         self.assertIn("Glimmer", songs, "Budget Is Burning Vol.1 is not being included in base songs")
         self.assertIn("Out of Sense", songs, "Budget Is Burning: Nano Core is not being included in base songs")
 
+    def test_dlcs(self) -> None:
+        collection = MuseDashCollections()
+        free_song_count = len(collection.get_songs_with_settings(set(), False, 0, 12))
+        known_mp_song = "The Happycore Idol"
+
+        for dlc in collection.DLC:
+            songs_with_dlc = collection.get_songs_with_settings({dlc}, False, 0, 12)
+            self.assertGreater(len(songs_with_dlc), free_song_count, f"DLC {dlc} did not include extra songs.")
+            if dlc == collection.MUSE_PLUS_DLC:
+                self.assertIn(known_mp_song, songs_with_dlc, f"Muse Plus missing muse plus song.")
+            else:
+                self.assertNotIn(known_mp_song, songs_with_dlc, f"DLC {dlc} includes Muse Plus songs.")
+
     def test_remove_songs_are_not_generated(self) -> None:
         collection = MuseDashCollections()
-        songs = collection.get_songs_with_settings(True, False, 0, 11)
+        songs = collection.get_songs_with_settings({x for x in collection.DLC}, False, 0, 12)
 
         for song_name in self.REMOVED_SONGS:
             self.assertNotIn(song_name, songs, f"Song '{song_name}' wasn't removed correctly.")
diff --git a/worlds/musedash/test/TestDifficultyRanges.py b/worlds/musedash/test/TestDifficultyRanges.py
index 58817d0fc3..01420347af 100644
--- a/worlds/musedash/test/TestDifficultyRanges.py
+++ b/worlds/musedash/test/TestDifficultyRanges.py
@@ -4,6 +4,7 @@ from . import MuseDashTestBase
 class DifficultyRanges(MuseDashTestBase):
     def test_all_difficulty_ranges(self) -> None:
         muse_dash_world = self.multiworld.worlds[1]
+        dlc_set = {x for x in muse_dash_world.md_collection.DLC}
         difficulty_choice = self.multiworld.song_difficulty_mode[1]
         difficulty_min = self.multiworld.song_difficulty_min[1]
         difficulty_max = self.multiworld.song_difficulty_max[1]
@@ -12,7 +13,7 @@ class DifficultyRanges(MuseDashTestBase):
             self.assertEqual(inputRange[0], lower)
             self.assertEqual(inputRange[1], upper)
 
-            songs = muse_dash_world.md_collection.get_songs_with_settings(True, False, inputRange[0], inputRange[1])
+            songs = muse_dash_world.md_collection.get_songs_with_settings(dlc_set, False, inputRange[0], inputRange[1])
             for songKey in songs:
                 song = muse_dash_world.md_collection.song_items[songKey]
                 if (song.easy is not None and inputRange[0] <= song.easy <= inputRange[1]):
diff --git a/worlds/noita/Items.py b/worlds/noita/Items.py
index ca53c96233..c859a80394 100644
--- a/worlds/noita/Items.py
+++ b/worlds/noita/Items.py
@@ -44,20 +44,18 @@ def create_kantele(victory_condition: VictoryCondition) -> List[str]:
     return ["Kantele"] if victory_condition.value >= VictoryCondition.option_pure_ending else []
 
 
-def create_random_items(multiworld: MultiWorld, player: int, random_count: int) -> List[str]:
-    filler_pool = filler_weights.copy()
+def create_random_items(multiworld: MultiWorld, player: int, weights: Dict[str, int], count: int) -> List[str]:
+    filler_pool = weights.copy()
     if multiworld.bad_effects[player].value == 0:
         del filler_pool["Trap"]
 
-    return multiworld.random.choices(
-        population=list(filler_pool.keys()),
-        weights=list(filler_pool.values()),
-        k=random_count
-    )
+    return multiworld.random.choices(population=list(filler_pool.keys()),
+                                     weights=list(filler_pool.values()),
+                                     k=count)
 
 
 def create_all_items(multiworld: MultiWorld, player: int) -> None:
-    sum_locations = len(multiworld.get_unfilled_locations(player))
+    locations_to_fill = len(multiworld.get_unfilled_locations(player))
 
     itempool = (
         create_fixed_item_pool()
@@ -66,9 +64,18 @@ def create_all_items(multiworld: MultiWorld, player: int) -> None:
         + create_kantele(multiworld.victory_condition[player])
     )
 
-    random_count = sum_locations - len(itempool)
-    itempool += create_random_items(multiworld, player, random_count)
+    # if there's not enough shop-allowed items in the pool, we can encounter gen issues
+    # 39 is the number of shop-valid items we need to guarantee
+    if len(itempool) < 39:
+        itempool += create_random_items(multiworld, player, shop_only_filler_weights, 39 - len(itempool))
+        # this is so that it passes tests and gens if you have minimal locations and only one player
+        if multiworld.players == 1:
+            for location in multiworld.get_unfilled_locations(player):
+                if "Shop Item" in location.name:
+                    location.item = create_item(player, itempool.pop())
+            locations_to_fill = len(multiworld.get_unfilled_locations(player))
 
+    itempool += create_random_items(multiworld, player, filler_weights, locations_to_fill - len(itempool))
     multiworld.itempool += [create_item(player, name) for name in itempool]
 
 
@@ -84,8 +91,8 @@ item_table: Dict[str, ItemData] = {
     "Wand (Tier 2)":                        ItemData(110007, "Wands", ItemClassification.useful),
     "Wand (Tier 3)":                        ItemData(110008, "Wands", ItemClassification.useful),
     "Wand (Tier 4)":                        ItemData(110009, "Wands", ItemClassification.useful),
-    "Wand (Tier 5)":                        ItemData(110010, "Wands", ItemClassification.useful),
-    "Wand (Tier 6)":                        ItemData(110011, "Wands", ItemClassification.useful),
+    "Wand (Tier 5)":                        ItemData(110010, "Wands", ItemClassification.useful, 1),
+    "Wand (Tier 6)":                        ItemData(110011, "Wands", ItemClassification.useful, 1),
     "Kantele":                              ItemData(110012, "Wands", ItemClassification.useful),
     "Fire Immunity Perk":                   ItemData(110013, "Perks", ItemClassification.progression, 1),
     "Toxic Immunity Perk":                  ItemData(110014, "Perks", ItemClassification.progression, 1),
@@ -95,43 +102,46 @@ item_table: Dict[str, ItemData] = {
     "Tinker with Wands Everywhere Perk":    ItemData(110018, "Perks", ItemClassification.progression, 1),
     "All-Seeing Eye Perk":                  ItemData(110019, "Perks", ItemClassification.progression, 1),
     "Spatial Awareness Perk":               ItemData(110020, "Perks", ItemClassification.progression),
-    "Extra Life Perk":                      ItemData(110021, "Repeatable Perks", ItemClassification.useful),
+    "Extra Life Perk":                      ItemData(110021, "Repeatable Perks", ItemClassification.useful, 1),
     "Orb":                                  ItemData(110022, "Orbs", ItemClassification.progression_skip_balancing),
     "Random Potion":                        ItemData(110023, "Items", ItemClassification.filler),
     "Secret Potion":                        ItemData(110024, "Items", ItemClassification.filler),
     "Powder Pouch":                         ItemData(110025, "Items", ItemClassification.filler),
     "Chaos Die":                            ItemData(110026, "Items", ItemClassification.filler),
     "Greed Die":                            ItemData(110027, "Items", ItemClassification.filler),
-    "Kammi":                                ItemData(110028, "Items", ItemClassification.filler),
-    "Refreshing Gourd":                     ItemData(110029, "Items", ItemClassification.filler),
+    "Kammi":                                ItemData(110028, "Items", ItemClassification.filler, 1),
+    "Refreshing Gourd":                     ItemData(110029, "Items", ItemClassification.filler, 1),
     "Sädekivi":                             ItemData(110030, "Items", ItemClassification.filler),
     "Broken Wand":                          ItemData(110031, "Items", ItemClassification.filler),
+}
 
+shop_only_filler_weights: Dict[str, int] = {
+    "Trap":             15,
+    "Extra Max HP":     25,
+    "Spell Refresher":  20,
+    "Wand (Tier 1)":    10,
+    "Wand (Tier 2)":    8,
+    "Wand (Tier 3)":    7,
+    "Wand (Tier 4)":    6,
+    "Wand (Tier 5)":    5,
+    "Wand (Tier 6)":    4,
+    "Extra Life Perk":  10,
 }
 
 filler_weights: Dict[str, int] = {
-    "Trap":              15,
-    "Extra Max HP":      25,
-    "Spell Refresher":   20,
-    "Potion":            40,
-    "Gold (200)":        15,
-    "Gold (1000)":       6,
-    "Wand (Tier 1)":     10,
-    "Wand (Tier 2)":     8,
-    "Wand (Tier 3)":     7,
-    "Wand (Tier 4)":     6,
-    "Wand (Tier 5)":     5,
-    "Wand (Tier 6)":     4,
-    "Extra Life Perk":   10,
-    "Random Potion":     9,
-    "Secret Potion":     10,
-    "Powder Pouch":      10,
-    "Chaos Die":         4,
-    "Greed Die":         4,
-    "Kammi":             4,
-    "Refreshing Gourd":  4,
-    "Sädekivi":          3,
-    "Broken Wand":       10,
+    **shop_only_filler_weights,
+    "Gold (200)":       15,
+    "Gold (1000)":      6,
+    "Potion":           40,
+    "Random Potion":    9,
+    "Secret Potion":    10,
+    "Powder Pouch":     10,
+    "Chaos Die":        4,
+    "Greed Die":        4,
+    "Kammi":            4,
+    "Refreshing Gourd": 4,
+    "Sädekivi":         3,
+    "Broken Wand":      10,
 }
 
 
diff --git a/worlds/noita/Regions.py b/worlds/noita/Regions.py
index a239b437d7..561d483b48 100644
--- a/worlds/noita/Regions.py
+++ b/worlds/noita/Regions.py
@@ -1,5 +1,5 @@
 # Regions are areas in your game that you travel to.
-from typing import Dict, Set
+from typing import Dict, Set, List
 
 from BaseClasses import Entrance, MultiWorld, Region
 from . import Locations
@@ -79,70 +79,46 @@ def create_all_regions_and_connections(multiworld: MultiWorld, player: int) -> N
 # - Lake is connected to The Laboratory, since the boss is hard without specific set-ups (which means late game)
 # - Snowy Depths connects to Lava Lake orb since you need digging for it, so fairly early is acceptable
 # - Ancient Laboratory is connected to the Coal Pits, so that Ylialkemisti isn't sphere 1
-noita_connections: Dict[str, Set[str]] = {
-    "Menu": {"Forest"},
-    "Forest": {"Mines", "Floating Island", "Desert", "Snowy Wasteland"},
-    "Snowy Wasteland": {"Forest"},
-    "Frozen Vault": {"The Vault"},
-    "Lake": {"The Laboratory"},
-    "Desert": {"Forest"},
-    "Floating Island": {"Forest"},
-    "Pyramid": {"Hiisi Base"},
-    "Overgrown Cavern": {"Sandcave", "Undeground Jungle"},
-    "Sandcave": {"Overgrown Cavern"},
+noita_connections: Dict[str, List[str]] = {
+    "Menu": ["Forest"],
+    "Forest": ["Mines", "Floating Island", "Desert", "Snowy Wasteland"],
+    "Frozen Vault": ["The Vault"],
+    "Overgrown Cavern": ["Sandcave"],
 
     ###
-    "Mines": {"Collapsed Mines", "Coal Pits Holy Mountain", "Lava Lake", "Forest"},
-    "Collapsed Mines": {"Mines", "Dark Cave"},
-    "Lava Lake": {"Mines", "Abyss Orb Room"},
-    "Abyss Orb Room": {"Lava Lake"},
-    "Below Lava Lake": {"Snowy Depths"},
-    "Dark Cave": {"Collapsed Mines"},
-    "Ancient Laboratory": {"Coal Pits"},
+    "Mines": ["Collapsed Mines", "Coal Pits Holy Mountain", "Lava Lake"],
+    "Lava Lake": ["Abyss Orb Room"],
 
     ###
-    "Coal Pits Holy Mountain": {"Coal Pits"},
-    "Coal Pits": {"Coal Pits Holy Mountain", "Fungal Caverns", "Snowy Depths Holy Mountain", "Ancient Laboratory"},
-    "Fungal Caverns": {"Coal Pits"},
+    "Coal Pits Holy Mountain": ["Coal Pits"],
+    "Coal Pits": ["Fungal Caverns", "Snowy Depths Holy Mountain", "Ancient Laboratory"],
 
     ###
-    "Snowy Depths Holy Mountain": {"Snowy Depths"},
-    "Snowy Depths": {"Snowy Depths Holy Mountain", "Hiisi Base Holy Mountain", "Magical Temple", "Below Lava Lake"},
-    "Magical Temple": {"Snowy Depths"},
+    "Snowy Depths Holy Mountain": ["Snowy Depths"],
+    "Snowy Depths": ["Hiisi Base Holy Mountain", "Magical Temple", "Below Lava Lake"],
 
     ###
-    "Hiisi Base Holy Mountain": {"Hiisi Base"},
-    "Hiisi Base": {"Hiisi Base Holy Mountain", "Secret Shop", "Pyramid", "Underground Jungle Holy Mountain"},
-    "Secret Shop": {"Hiisi Base"},
+    "Hiisi Base Holy Mountain": ["Hiisi Base"],
+    "Hiisi Base": ["Secret Shop", "Pyramid", "Underground Jungle Holy Mountain"],
 
     ###
-    "Underground Jungle Holy Mountain": {"Underground Jungle"},
-    "Underground Jungle": {"Underground Jungle Holy Mountain", "Dragoncave", "Overgrown Cavern", "Vault Holy Mountain",
-                           "Lukki Lair"},
-    "Dragoncave": {"Underground Jungle"},
-    "Lukki Lair": {"Underground Jungle", "Snow Chasm", "Frozen Vault"},
-    "Snow Chasm": {},
+    "Underground Jungle Holy Mountain": ["Underground Jungle"],
+    "Underground Jungle": ["Dragoncave", "Overgrown Cavern", "Vault Holy Mountain", "Lukki Lair", "Snow Chasm"],
 
     ###
-    "Vault Holy Mountain": {"The Vault"},
-    "The Vault": {"Vault Holy Mountain", "Frozen Vault", "Temple of the Art Holy Mountain"},
+    "Vault Holy Mountain": ["The Vault"],
+    "The Vault": ["Frozen Vault", "Temple of the Art Holy Mountain"],
 
     ###
-    "Temple of the Art Holy Mountain": {"Temple of the Art"},
-    "Temple of the Art": {"Temple of the Art Holy Mountain", "Laboratory Holy Mountain", "The Tower",
-                          "Wizards' Den"},
-    "Wizards' Den": {"Temple of the Art", "Powerplant"},
-    "Powerplant": {"Wizards' Den", "Deep Underground"},
-    "The Tower": {"Forest"},
-    "Deep Underground": {},
+    "Temple of the Art Holy Mountain": ["Temple of the Art"],
+    "Temple of the Art": ["Laboratory Holy Mountain", "The Tower", "Wizards' Den"],
+    "Wizards' Den": ["Powerplant"],
+    "Powerplant": ["Deep Underground"],
 
     ###
-    "Laboratory Holy Mountain": {"The Laboratory"},
-    "The Laboratory": {"Laboratory Holy Mountain", "The Work", "Friend Cave", "The Work (Hell)", "Lake"},
-    "Friend Cave": {},
-    "The Work": {},
-    "The Work (Hell)": {},
+    "Laboratory Holy Mountain": ["The Laboratory"],
+    "The Laboratory": ["The Work", "Friend Cave", "The Work (Hell)", "Lake"],
     ###
 }
 
-noita_regions: Set[str] = set(noita_connections.keys()).union(*noita_connections.values())
+noita_regions: List[str] = sorted(set(noita_connections.keys()).union(*noita_connections.values()))
diff --git a/worlds/noita/Rules.py b/worlds/noita/Rules.py
index 3eb6be5a7c..8190b80dc7 100644
--- a/worlds/noita/Rules.py
+++ b/worlds/noita/Rules.py
@@ -44,12 +44,10 @@ wand_tiers: List[str] = [
     "Wand (Tier 6)",    # Temple of the Art
 ]
 
-
 items_hidden_from_shops: List[str] = ["Gold (200)", "Gold (1000)", "Potion", "Random Potion", "Secret Potion",
                                       "Chaos Die", "Greed Die", "Kammi", "Refreshing Gourd", "Sädekivi", "Broken Wand",
                                       "Powder Pouch"]
 
-
 perk_list: List[str] = list(filter(Items.item_is_perk, Items.item_table.keys()))
 
 
@@ -59,11 +57,11 @@ perk_list: List[str] = list(filter(Items.item_is_perk, Items.item_table.keys()))
 
 
 def has_perk_count(state: CollectionState, player: int, amount: int) -> bool:
-    return sum(state.item_count(perk, player) for perk in perk_list) >= amount
+    return sum(state.count(perk, player) for perk in perk_list) >= amount
 
 
 def has_orb_count(state: CollectionState, player: int, amount: int) -> bool:
-    return state.item_count("Orb", player) >= amount
+    return state.count("Orb", player) >= amount
 
 
 def forbid_items_at_location(multiworld: MultiWorld, location_name: str, items: Set[str], player: int):
@@ -155,11 +153,12 @@ def victory_unlock_conditions(multiworld: MultiWorld, player: int) -> None:
 
 
 def create_all_rules(multiworld: MultiWorld, player: int) -> None:
-    ban_items_from_shops(multiworld, player)
-    ban_early_high_tier_wands(multiworld, player)
-    lock_holy_mountains_into_spheres(multiworld, player)
-    holy_mountain_unlock_conditions(multiworld, player)
-    biome_unlock_conditions(multiworld, player)
+    if multiworld.players > 1:
+        ban_items_from_shops(multiworld, player)
+        ban_early_high_tier_wands(multiworld, player)
+        lock_holy_mountains_into_spheres(multiworld, player)
+        holy_mountain_unlock_conditions(multiworld, player)
+        biome_unlock_conditions(multiworld, player)
     victory_unlock_conditions(multiworld, player)
 
     # Prevent the Map perk (used to find Toveri) from being on Toveri (boss)
diff --git a/worlds/noita/__init__.py b/worlds/noita/__init__.py
index 499d202a64..792b90e3f5 100644
--- a/worlds/noita/__init__.py
+++ b/worlds/noita/__init__.py
@@ -35,6 +35,10 @@ class NoitaWorld(World):
 
     web = NoitaWeb()
 
+    def generate_early(self):
+        if not self.multiworld.get_player_name(self.player).isascii():
+            raise Exception("Noita yaml's slot name has invalid character(s).")
+    
     # Returned items will be sent over to the client
     def fill_slot_data(self):
         return {name: getattr(self.multiworld, name)[self.player].value for name in self.option_definitions}
diff --git a/worlds/noita/docs/setup_en.md b/worlds/noita/docs/setup_en.md
index bd6a151432..b67e840bb9 100644
--- a/worlds/noita/docs/setup_en.md
+++ b/worlds/noita/docs/setup_en.md
@@ -40,6 +40,8 @@ or try restarting your game.
 ### 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
 about why Archipelago uses YAML files and what they're for.
+Please note that Noita only allows you to type certain characters for your slot name.
+These characters are: `` !#$%&'()+,-.0123456789;=@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{}~<>|\/``
 
 ### Where do I get a YAML?
 You can use the [game settings page for Noita](/games/Noita/player-settings) here on the Archipelago website to
@@ -54,4 +56,4 @@ Place the unzipped pack in the `packs` folder. Then, open Poptracker and open th
 Click on the "AP" symbol at the top, then enter the desired address, slot name, and password.
 
 That's all you need for it. It will provide you with a quick reference to see which checks you've done and
-which checks you still have left.
\ No newline at end of file
+which checks you still have left.
diff --git a/worlds/oot/Entrance.py b/worlds/oot/Entrance.py
index e480c957a6..6c4b6428f5 100644
--- a/worlds/oot/Entrance.py
+++ b/worlds/oot/Entrance.py
@@ -1,6 +1,4 @@
-
 from BaseClasses import Entrance
-from .Regions import TimeOfDay
 
 class OOTEntrance(Entrance): 
     game: str = 'Ocarina of Time'
@@ -29,16 +27,16 @@ class OOTEntrance(Entrance):
         self.connected_region = None
         return previously_connected
 
-    def get_new_target(self):
+    def get_new_target(self, pool_type):
         root = self.multiworld.get_region('Root Exits', self.player)
-        target_entrance = OOTEntrance(self.player, self.multiworld, 'Root -> ' + self.connected_region.name, root)
+        target_entrance = OOTEntrance(self.player, self.multiworld, f'Root -> ({self.name}) ({pool_type})', root)
         target_entrance.connect(self.connected_region)
         target_entrance.replaces = self
         root.exits.append(target_entrance)
         return target_entrance
 
-    def assume_reachable(self):
+    def assume_reachable(self, pool_type):
         if self.assumed == None:
-            self.assumed = self.get_new_target()
+            self.assumed = self.get_new_target(pool_type)
             self.disconnect()
         return self.assumed
diff --git a/worlds/oot/EntranceShuffle.py b/worlds/oot/EntranceShuffle.py
index 3c1b2d78c6..bbdc30490c 100644
--- a/worlds/oot/EntranceShuffle.py
+++ b/worlds/oot/EntranceShuffle.py
@@ -2,6 +2,7 @@ from itertools import chain
 import logging
 
 from worlds.generic.Rules import set_rule, add_rule
+from BaseClasses import CollectionState
 
 from .Hints import get_hint_area, HintAreaNotFound
 from .Regions import TimeOfDay
@@ -25,12 +26,12 @@ def set_all_entrances_data(world, player):
                 return_entrance.data['index'] = 0x7FFF
 
 
-def assume_entrance_pool(entrance_pool, ootworld):
+def assume_entrance_pool(entrance_pool, ootworld, pool_type):
     assumed_pool = []
     for entrance in entrance_pool:
-        assumed_forward = entrance.assume_reachable()
+        assumed_forward = entrance.assume_reachable(pool_type)
         if entrance.reverse != None and not ootworld.decouple_entrances:
-            assumed_return = entrance.reverse.assume_reachable()
+            assumed_return = entrance.reverse.assume_reachable(pool_type)
             if not (ootworld.mix_entrance_pools != 'off' and (ootworld.shuffle_overworld_entrances or ootworld.shuffle_special_interior_entrances)):
                 if (entrance.type in ('Dungeon', 'Grotto', 'Grave') and entrance.reverse.name != 'Spirit Temple Lobby -> Desert Colossus From Spirit Lobby') or \
                    (entrance.type == 'Interior' and ootworld.shuffle_special_interior_entrances):
@@ -41,15 +42,15 @@ def assume_entrance_pool(entrance_pool, ootworld):
     return assumed_pool
 
 
-def build_one_way_targets(world, types_to_include, exclude=(), target_region_names=()):
+def build_one_way_targets(world, pool, types_to_include, exclude=(), target_region_names=()):
     one_way_entrances = []
     for pool_type in types_to_include:
         one_way_entrances += world.get_shufflable_entrances(type=pool_type)
     valid_one_way_entrances = list(filter(lambda entrance: entrance.name not in exclude, one_way_entrances))
     if target_region_names:
-        return [entrance.get_new_target() for entrance in valid_one_way_entrances
+        return [entrance.get_new_target(pool) for entrance in valid_one_way_entrances
                 if entrance.connected_region.name in target_region_names]
-    return [entrance.get_new_target() for entrance in valid_one_way_entrances]
+    return [entrance.get_new_target(pool) for entrance in valid_one_way_entrances]
 
 
 #   Abbreviations
@@ -423,14 +424,14 @@ multi_interior_regions = {
 }
 
 interior_entrance_bias = {
-    'Kakariko Village -> Kak Potion Shop Front': 4,
-    'Kak Backyard -> Kak Potion Shop Back': 4,
-    'Kakariko Village -> Kak Impas House': 3,
-    'Kak Impas Ledge -> Kak Impas House Back': 3,
-    'Goron City -> GC Shop': 2,
-    'Zoras Domain -> ZD Shop': 2,
+    'ToT Entrance -> Temple of Time': 4,
+    'Kakariko Village -> Kak Potion Shop Front': 3,
+    'Kak Backyard -> Kak Potion Shop Back': 3,
+    'Kakariko Village -> Kak Impas House': 2,
+    'Kak Impas Ledge -> Kak Impas House Back': 2,
     'Market Entrance -> Market Guard House': 2,
-    'ToT Entrance -> Temple of Time': 1,
+    'Goron City -> GC Shop': 1,
+    'Zoras Domain -> ZD Shop': 1,
 }
 
 
@@ -443,7 +444,8 @@ def shuffle_random_entrances(ootworld):
     player = ootworld.player
 
     # Gather locations to keep reachable for validation
-    all_state = world.get_all_state(use_cache=True)
+    all_state = ootworld.get_state_with_complete_itempool()
+    all_state.sweep_for_events(locations=ootworld.get_locations())
     locations_to_ensure_reachable = {loc for loc in world.get_reachable_locations(all_state, player) if not (loc.type == 'Drop' or (loc.type == 'Event' and 'Subrule' in loc.name))}
 
     # Set entrance data for all entrances
@@ -523,12 +525,12 @@ def shuffle_random_entrances(ootworld):
     for pool_type, entrance_pool in one_way_entrance_pools.items():
         if pool_type == 'OwlDrop':
             valid_target_types = ('WarpSong', 'OwlDrop', 'Overworld', 'Extra')
-            one_way_target_entrance_pools[pool_type] = build_one_way_targets(ootworld, valid_target_types, exclude=['Prelude of Light Warp -> Temple of Time'])
+            one_way_target_entrance_pools[pool_type] = build_one_way_targets(ootworld, pool_type, valid_target_types, exclude=['Prelude of Light Warp -> Temple of Time'])
             for target in one_way_target_entrance_pools[pool_type]:
                 set_rule(target, lambda state: state._oot_reach_as_age(target.parent_region, 'child', player))
         elif pool_type in {'Spawn', 'WarpSong'}: 
             valid_target_types = ('Spawn', 'WarpSong', 'OwlDrop', 'Overworld', 'Interior', 'SpecialInterior', 'Extra')
-            one_way_target_entrance_pools[pool_type] = build_one_way_targets(ootworld, valid_target_types)
+            one_way_target_entrance_pools[pool_type] = build_one_way_targets(ootworld, pool_type, valid_target_types)
         # Ensure that the last entrance doesn't assume the rest of the targets are reachable
         for target in one_way_target_entrance_pools[pool_type]:
             add_rule(target, (lambda entrances=entrance_pool: (lambda state: any(entrance.connected_region == None for entrance in entrances)))())
@@ -538,14 +540,11 @@ def shuffle_random_entrances(ootworld):
 
     target_entrance_pools = {}
     for pool_type, entrance_pool in entrance_pools.items():
-        target_entrance_pools[pool_type] = assume_entrance_pool(entrance_pool, ootworld)
+        target_entrance_pools[pool_type] = assume_entrance_pool(entrance_pool, ootworld, pool_type)
 
     # Build all_state and none_state
     all_state = ootworld.get_state_with_complete_itempool()
-    none_state = all_state.copy()
-    for item_tuple in none_state.prog_items:
-        if item_tuple[1] == player:
-            none_state.prog_items[item_tuple] = 0
+    none_state = CollectionState(ootworld.multiworld)
 
     # Plando entrances
     if world.plando_connections[player]:
@@ -628,7 +627,7 @@ def shuffle_random_entrances(ootworld):
             logging.getLogger('').error(f'Root Exit: {exit} -> {exit.connected_region}')
         logging.getLogger('').error(f'Root has too many entrances left after shuffling entrances')
     # Game is beatable
-    new_all_state = world.get_all_state(use_cache=False)
+    new_all_state = ootworld.get_state_with_complete_itempool()
     if not world.has_beaten_game(new_all_state, player):
         raise EntranceShuffleError('Cannot beat game')
     # Validate world
@@ -700,7 +699,7 @@ def place_one_way_priority_entrance(ootworld, priority_name, allowed_regions, al
     raise EntranceShuffleError(f'Unable to place priority one-way entrance for {priority_name} in world {ootworld.player}')
 
 
-def shuffle_entrance_pool(ootworld, pool_type, entrance_pool, target_entrances, locations_to_ensure_reachable, all_state, none_state, check_all=False, retry_count=20):
+def shuffle_entrance_pool(ootworld, pool_type, entrance_pool, target_entrances, locations_to_ensure_reachable, all_state, none_state, check_all=False, retry_count=10):
     
     restrictive_entrances, soft_entrances = split_entrances_by_requirements(ootworld, entrance_pool, target_entrances)
 
@@ -745,7 +744,6 @@ def shuffle_entrances(ootworld, pool_type, entrances, target_entrances, rollback
 
 
 def split_entrances_by_requirements(ootworld, entrances_to_split, assumed_entrances):
-    world = ootworld.multiworld
     player = ootworld.player
 
     # Disconnect all root assumed entrances and save original connections
@@ -755,7 +753,7 @@ def split_entrances_by_requirements(ootworld, entrances_to_split, assumed_entran
         if entrance.connected_region:
             original_connected_regions[entrance] = entrance.disconnect()
 
-    all_state = world.get_all_state(use_cache=False)
+    all_state = ootworld.get_state_with_complete_itempool()
 
     restrictive_entrances = []
     soft_entrances = []
@@ -793,8 +791,8 @@ def validate_world(ootworld, entrance_placed, locations_to_ensure_reachable, all
     all_state = all_state_orig.copy()
     none_state = none_state_orig.copy()
 
-    all_state.sweep_for_events()
-    none_state.sweep_for_events()
+    all_state.sweep_for_events(locations=ootworld.get_locations())
+    none_state.sweep_for_events(locations=ootworld.get_locations())
 
     if ootworld.shuffle_interior_entrances or ootworld.shuffle_overworld_entrances or ootworld.spawn_positions:
         time_travel_state = none_state.copy()
diff --git a/worlds/oot/ItemPool.py b/worlds/oot/ItemPool.py
index 94e1011ddc..6ca6bc9268 100644
--- a/worlds/oot/ItemPool.py
+++ b/worlds/oot/ItemPool.py
@@ -350,7 +350,7 @@ def generate_itempool(ootworld):
     ootworld.itempool = [ootworld.create_item(item) for item in pool]
     for (location_name, item) in placed_items.items():
         location = world.get_location(location_name, player)
-        location.place_locked_item(ootworld.create_item(item))
+        location.place_locked_item(ootworld.create_item(item, allow_arbitrary_name=True))
 
 
 def get_pool_core(world):
@@ -675,7 +675,7 @@ def get_pool_core(world):
         world.remove_from_start_inventory.append('Scarecrow Song')
     
     if world.no_epona_race:
-        world.multiworld.push_precollected(world.create_item('Epona'))
+        world.multiworld.push_precollected(world.create_item('Epona', allow_arbitrary_name=True))
         world.remove_from_start_inventory.append('Epona')
 
     if world.shuffle_smallkeys == 'vanilla':
diff --git a/worlds/oot/Location.py b/worlds/oot/Location.py
index e2b0e52e4d..3f7d75517e 100644
--- a/worlds/oot/Location.py
+++ b/worlds/oot/Location.py
@@ -2,6 +2,8 @@ from enum import Enum
 from .LocationList import location_table
 from BaseClasses import Location
 
+non_indexed_location_types = {'Boss', 'Event', 'Drop', 'HintStone', 'Hint'}
+
 location_id_offset = 67000
 locnames_pre_70 = {
     "Gift from Sages",
@@ -18,7 +20,7 @@ new_name_order = sorted(location_table.keys(),
                 else 0)
 
 location_name_to_id = {name: (location_id_offset + index) for (index, name) in enumerate(new_name_order) 
-    if location_table[name][0] not in {'Boss', 'Event', 'Drop', 'HintStone', 'Hint'}}
+    if location_table[name][0] not in non_indexed_location_types}
 
 class DisableType(Enum):
     ENABLED  = 0
@@ -83,3 +85,57 @@ def LocationFactory(locations, player: int):
     return ret
 
 
+def build_location_name_groups() -> dict:
+
+    def fix_sing(t) -> tuple:
+        if isinstance(t, str):
+            return (t,)
+        return t
+
+    def rename(d, k1, k2) -> None:
+        d[k2] = d[k1]
+        del d[k1]
+
+    # whoever wrote the location table didn't realize they need to add a comma to mark a singleton as a tuple
+    # so we have to check types unfortunately
+    tags = set()
+    for v in location_table.values():
+        if v[5] is not None:
+            tags.update(fix_sing(v[5]))
+
+    sorted_tags = sorted(list(tags))
+
+    ret = {
+        tag: {k for k, v in location_table.items()
+        if v[5] is not None
+            and tag in fix_sing(v[5])
+            and v[0] not in non_indexed_location_types}
+        for tag in sorted_tags
+    }
+
+    # Delete tags which are a combination of other tags
+    del ret['Death Mountain']
+    del ret['Forest']
+    del ret['Gerudo']
+    del ret['Kakariko']
+    del ret['Market']
+
+    # Delete Vanilla and MQ tags because they are just way too broad
+    del ret['Vanilla']
+    del ret['Master Quest']
+
+    rename(ret, 'Beehive', 'Beehives')
+    rename(ret, 'Cow', 'Cows')
+    rename(ret, 'Crate', 'Crates')
+    rename(ret, 'Deku Scrub', 'Deku Scrubs')
+    rename(ret, 'FlyingPot', 'Flying Pots')
+    rename(ret, 'Freestanding', 'Freestanding Items')
+    rename(ret, 'Pot', 'Pots')
+    rename(ret, 'RupeeTower', 'Rupee Groups')
+    rename(ret, 'SmallCrate', 'Small Crates')
+    rename(ret, 'the Market', 'Market')
+    rename(ret, 'the Graveyard', 'Graveyard')
+    rename(ret, 'the Lost Woods', 'Lost Woods')
+
+    return ret
+
diff --git a/worlds/oot/LocationList.py b/worlds/oot/LocationList.py
index 3f4602c428..27ad575699 100644
--- a/worlds/oot/LocationList.py
+++ b/worlds/oot/LocationList.py
@@ -238,7 +238,7 @@ location_table = OrderedDict([
     ("Market Night Green Rupee Crate 1",                             ("Crate",        0x21,  (0,0,24), None,                        'Rupee (1)',                             ("the Market", "Market", "Crate"))),
     ("Market Night Green Rupee Crate 2",                             ("Crate",        0x21,  (0,0,25), None,                        'Rupee (1)',                             ("the Market", "Market", "Crate"))),
     ("Market Night Green Rupee Crate 3",                             ("Crate",        0x21,  (0,0,26), None,                        'Rupee (1)',                             ("the Market", "Market", "Crate"))),
-    ("Market Dog Lady House Crate",                                  ("Crate",        0x35,  (0,0,3), None,                         'Rupees (5)',                            ("Market", "Market", "Crate"))),
+    ("Market Dog Lady House Crate",                                  ("Crate",        0x35,  (0,0,3), None,                         'Rupees (5)',                            ("the Market", "Market", "Crate"))),
     ("Market Guard House Child Crate",                               ("Crate",        0x4D,  (0,0,6), None,                         'Rupee (1)',                             ("the Market", "Market", "Crate"))),
     ("Market Guard House Child Pot 1",                               ("Pot",          0x4D,  (0,0,9), None,                         'Rupee (1)',                             ("the Market", "Market", "Pot"))),
     ("Market Guard House Child Pot 2",                               ("Pot",          0x4D,  (0,0,10), None,                        'Rupee (1)',                             ("the Market", "Market", "Pot"))),
diff --git a/worlds/oot/Options.py b/worlds/oot/Options.py
index 03f5346cee..120027e29d 100644
--- a/worlds/oot/Options.py
+++ b/worlds/oot/Options.py
@@ -30,7 +30,17 @@ class TrackRandomRange(Range):
 
 
 class Logic(Choice): 
-    """Set the logic used for the generator."""
+    """Set the logic used for the generator.
+    Glitchless: Normal gameplay. Can enable more difficult logical paths using the Logic Tricks option.
+    Glitched: Many powerful glitches expected, such as bomb hovering and clipping.
+    Glitched is incompatible with the following settings:
+    - All forms of entrance randomizer
+    - MQ dungeons
+    - Pot shuffle
+    - Freestanding item shuffle
+    - Crate shuffle
+    - Beehive shuffle
+    No Logic: No logic is used when placing items. Not recommended for most players."""
     display_name = "Logic Rules"
     option_glitchless = 0
     option_glitched = 1
@@ -38,12 +48,16 @@ class Logic(Choice):
 
 
 class NightTokens(Toggle):
-    """Nighttime skulltulas will logically require Sun's Song."""
+    """When enabled, nighttime skulltulas logically require Sun's Song."""
     display_name = "Nighttime Skulltulas Expect Sun's Song"
 
 
 class Forest(Choice): 
-    """Set the state of Kokiri Forest and the path to Deku Tree."""
+    """Set the state of Kokiri Forest and the path to Deku Tree.
+    Open: Neither the forest exit nor the path to Deku Tree is blocked.
+    Closed Deku: The forest exit is not blocked; the path to Deku Tree requires Kokiri Sword and Deku Shield.
+    Closed: Path to Deku Tree requires sword and shield. The forest exit is blocked until Deku Tree is beaten.
+    Closed forest will force child start, and becomes Closed Deku if interior entrances, overworld entrances, warp songs, or random spawn positions are enabled."""
     display_name = "Forest"
     option_open = 0
     option_closed_deku = 1
@@ -53,7 +67,10 @@ class Forest(Choice):
 
 
 class Gate(Choice): 
-    """Set the state of the Kakariko Village gate."""
+    """Set the state of the Kakariko Village gate for child. The gate is always open as adult.
+    Open: The gate starts open. Happy Mask Shop opens upon receiving Zelda's Letter.
+    Zelda: The gate and Mask Shop open upon receiving Zelda's Letter, without needing to show it to the guard.
+    Closed: Vanilla behavior; the gate and Mask Shop open upon showing Zelda's Letter to the gate guard."""
     display_name = "Kakariko Gate"
     option_open = 0
     option_zelda = 1
@@ -61,12 +78,15 @@ class Gate(Choice):
 
 
 class DoorOfTime(DefaultOnToggle):
-    """Open the Door of Time by default, without the Song of Time."""
+    """When enabled, the Door of Time starts opened, without needing Song of Time."""
     display_name = "Open Door of Time"
 
 
 class Fountain(Choice): 
-    """Set the state of King Zora, blocking the way to Zora's Fountain."""
+    """Set the state of King Zora, blocking the way to Zora's Fountain.
+    Open: King Zora starts moved as both ages. Ruto's Letter is removed.
+    Adult: King Zora must be moved as child, but is always moved for adult.
+    Closed: Vanilla behavior; King Zora must be shown Ruto's Letter as child to move him as both ages."""
     display_name = "Zora's Fountain"
     option_open = 0
     option_adult = 1
@@ -75,7 +95,10 @@ class Fountain(Choice):
 
 
 class Fortress(Choice): 
-    """Set the requirements for access to Gerudo Fortress."""
+    """Set the requirements for access to Gerudo Fortress.
+    Normal: Vanilla behavior; all four carpenters must be rescued.
+    Fast: Only one carpenter must be rescued, which is the one in the bottom-left of the fortress.
+    Open: The Gerudo Valley bridge starts repaired. Gerudo Membership Card is given to start if not shuffled."""
     display_name = "Gerudo Fortress"
     option_normal = 0
     option_fast = 1
@@ -84,7 +107,14 @@ class Fortress(Choice):
 
 
 class Bridge(Choice): 
-    """Set the requirements for the Rainbow Bridge."""
+    """Set the requirements for the Rainbow Bridge.
+    Open: The bridge is always present.
+    Vanilla: Bridge requires Shadow Medallion, Spirit Medallion, and Light Arrows.
+    Stones: Bridge requires a configurable amount of Spiritual Stones.
+    Medallions: Bridge requires a configurable amount of medallions.
+    Dungeons: Bridge requires a configurable amount of rewards (stones + medallions).
+    Tokens: Bridge requires a configurable amount of gold skulltula tokens.
+    Hearts: Bridge requires a configurable amount of hearts."""
     display_name = "Rainbow Bridge Requirement"
     option_open = 0
     option_vanilla = 1
@@ -122,8 +152,9 @@ class StartingAge(Choice):
 
 
 class InteriorEntrances(Choice): 
-    """Shuffles interior entrances. "Simple" shuffles houses and Great Fairies; "All" includes Windmill, Link's House,
-    Temple of Time, and Kak potion shop."""
+    """Shuffles interior entrances.
+    Simple: Houses and Great Fairies are shuffled.
+    All: In addition to Simple, includes Windmill, Link's House, Temple of Time, and the Kakariko potion shop."""
     display_name = "Shuffle Interior Entrances"
     option_off = 0
     option_simple = 1
@@ -137,7 +168,9 @@ class GrottoEntrances(Toggle):
 
 
 class DungeonEntrances(Choice):
-    """Shuffles dungeon entrances. Opens Deku, Fire and BotW to both ages. "All" includes Ganon's Castle."""
+    """Shuffles dungeon entrances. When enabled, both ages will have access to Fire Temple, Bottom of the Well, and Deku Tree.
+    Simple: Shuffle dungeon entrances except for Ganon's Castle.
+    All: Include Ganon's Castle as well."""
     display_name = "Shuffle Dungeon Entrances"
     option_off = 0
     option_simple = 1
@@ -146,7 +179,9 @@ class DungeonEntrances(Choice):
 
 
 class BossEntrances(Choice):
-    """Shuffles boss entrances. "Limited" prevents age-mixing of bosses."""
+    """Shuffles boss entrances.
+    Limited: Bosses will be limited to the ages that typically fight them.
+    Full: Bosses may be fought as different ages than usual. Child can defeat Phantom Ganon and Bongo Bongo."""
     display_name = "Shuffle Boss Entrances"
     option_off = 0
     option_limited = 1
@@ -178,19 +213,19 @@ class SpawnPositions(Choice):
     alias_true = 3
 
 
-class MixEntrancePools(Choice):
-    """Shuffles entrances into a mixed pool instead of separate ones. "indoor" keeps overworld entrances separate; "all"
-     mixes them in."""
-    display_name = "Mix Entrance Pools"
-    option_off = 0
-    option_indoor = 1
-    option_all = 2
+# class MixEntrancePools(Choice):
+#     """Shuffles entrances into a mixed pool instead of separate ones. "indoor" keeps overworld entrances separate; "all"
+#      mixes them in."""
+#     display_name = "Mix Entrance Pools"
+#     option_off = 0
+#     option_indoor = 1
+#     option_all = 2
 
 
-class DecoupleEntrances(Toggle):
-    """Decouple entrances when shuffling them. Also adds the one-way entrance from Gerudo Valley to Lake Hylia if
-    overworld is shuffled."""
-    display_name = "Decouple Entrances"
+# class DecoupleEntrances(Toggle):
+#     """Decouple entrances when shuffling them. Also adds the one-way entrance from Gerudo Valley to Lake Hylia if
+#     overworld is shuffled."""
+#     display_name = "Decouple Entrances"
 
 
 class TriforceHunt(Toggle):
@@ -216,13 +251,17 @@ class ExtraTriforces(Range):
 
 
 class LogicalChus(Toggle):
-    """Bombchus are properly considered in logic. The first found pack will have 20 chus; Kokiri Shop and Bazaar sell
-    refills; bombchus open Bombchu Bowling."""
+    """Bombchus are properly considered in logic.
+    The first found pack will always have 20 chus. 
+    Kokiri Shop and Bazaar will sell refills at reduced cost.
+    Bombchus open Bombchu Bowling."""
     display_name = "Bombchus Considered in Logic"
 
 
 class DungeonShortcuts(Choice):
-    """Shortcuts to dungeon bosses are available without any requirements."""
+    """Shortcuts to dungeon bosses are available without any requirements.
+    If enabled, this will impact the logic of dungeons where shortcuts are available.
+    Choice: Use the option "dungeon_shortcuts_list" to choose shortcuts."""
     display_name = "Dungeon Boss Shortcuts Mode"
     option_off = 0
     option_choice = 1
@@ -246,7 +285,11 @@ class DungeonShortcutsList(OptionSet):
 
 
 class MQDungeons(Choice):
-    """Choose between vanilla and Master Quest dungeon layouts."""
+    """Choose between vanilla and Master Quest dungeon layouts.
+    Vanilla: All layouts are vanilla.
+    MQ: All layouts are Master Quest.
+    Specific: Use the option "mq_dungeons_list" to choose which dungeons are MQ.
+    Count: Use the option "mq_dungeons_count" to choose a number of random dungeons as MQ."""
     display_name = "MQ Dungeon Mode"
     option_vanilla = 0
     option_mq = 1
@@ -255,7 +298,7 @@ class MQDungeons(Choice):
 
 
 class MQDungeonList(OptionSet):
-    """Chosen dungeons to be MQ layout."""
+    """With MQ dungeons as Specific: chosen dungeons to be MQ layout."""
     display_name = "MQ Dungeon List"
     valid_keys = {
         "Deku Tree",
@@ -274,41 +317,41 @@ class MQDungeonList(OptionSet):
 
 
 class MQDungeonCount(TrackRandomRange):
-    """Number of MQ dungeons, chosen randomly."""
+    """With MQ dungeons as Count: number of randomly-selected dungeons to be MQ layout."""
     display_name = "MQ Dungeon Count"
     range_start = 0
     range_end = 12
     default = 0
 
 
-class EmptyDungeons(Choice):
-    """Pre-completed dungeons are barren and rewards are given for free."""
-    display_name = "Pre-completed Dungeons Mode"
-    option_none = 0
-    option_specific = 1
-    option_count = 2
+# class EmptyDungeons(Choice):
+#     """Pre-completed dungeons are barren and rewards are given for free."""
+#     display_name = "Pre-completed Dungeons Mode"
+#     option_none = 0
+#     option_specific = 1
+#     option_count = 2
 
 
-class EmptyDungeonList(OptionSet):
-    """Chosen dungeons to be pre-completed."""
-    display_name = "Pre-completed Dungeon List"
-    valid_keys = {
-        "Deku Tree",
-        "Dodongo's Cavern",
-        "Jabu Jabu's Belly",
-        "Forest Temple",
-        "Fire Temple",
-        "Water Temple",
-        "Shadow Temple",
-        "Spirit Temple",
-    }
+# class EmptyDungeonList(OptionSet):
+#     """Chosen dungeons to be pre-completed."""
+#     display_name = "Pre-completed Dungeon List"
+#     valid_keys = {
+#         "Deku Tree",
+#         "Dodongo's Cavern",
+#         "Jabu Jabu's Belly",
+#         "Forest Temple",
+#         "Fire Temple",
+#         "Water Temple",
+#         "Shadow Temple",
+#         "Spirit Temple",
+#     }
 
 
-class EmptyDungeonCount(Range):
-    display_name = "Pre-completed Dungeon Count"
-    range_start = 1
-    range_end = 8
-    default = 2
+# class EmptyDungeonCount(Range):
+#     display_name = "Pre-completed Dungeon Count"
+#     range_start = 1
+#     range_end = 8
+#     default = 2
 
 
 world_options: typing.Dict[str, type(Option)] = {
@@ -341,59 +384,8 @@ world_options: typing.Dict[str, type(Option)] = {
 }
 
 
-# class LacsCondition(Choice): 
-#     """Set the requirements for the Light Arrow Cutscene in the Temple of Time."""
-#     display_name = "Light Arrow Cutscene Requirement"
-#     option_vanilla = 0
-#     option_stones = 1
-#     option_medallions = 2
-#     option_dungeons = 3
-#     option_tokens = 4
-
-
-# class LacsStones(Range):
-#     """Set the number of Spiritual Stones required for LACS."""
-#     display_name = "Spiritual Stones Required for LACS"
-#     range_start = 0
-#     range_end = 3
-#     default = 3
-
-
-# class LacsMedallions(Range):
-#     """Set the number of medallions required for LACS."""
-#     display_name = "Medallions Required for LACS"
-#     range_start = 0
-#     range_end = 6
-#     default = 6
-
-
-# class LacsRewards(Range):
-#     """Set the number of dungeon rewards required for LACS."""
-#     display_name = "Dungeon Rewards Required for LACS"
-#     range_start = 0
-#     range_end = 9
-#     default = 9
-
-
-# class LacsTokens(Range):
-#     """Set the number of Gold Skulltula Tokens required for LACS."""
-#     display_name = "Tokens Required for LACS"
-#     range_start = 0
-#     range_end = 100
-#     default = 40
-
-
-# lacs_options: typing.Dict[str, type(Option)] = {
-#     "lacs_condition": LacsCondition,
-#     "lacs_stones": LacsStones, 
-#     "lacs_medallions": LacsMedallions, 
-#     "lacs_rewards": LacsRewards, 
-#     "lacs_tokens": LacsTokens,
-# }
-
-
 class BridgeStones(Range):
-    """Set the number of Spiritual Stones required for the rainbow bridge."""
+    """With Stones bridge: set the number of Spiritual Stones required."""
     display_name = "Spiritual Stones Required for Bridge"
     range_start = 0
     range_end = 3
@@ -401,7 +393,7 @@ class BridgeStones(Range):
 
 
 class BridgeMedallions(Range):
-    """Set the number of medallions required for the rainbow bridge."""
+    """With Medallions bridge: set the number of medallions required."""
     display_name = "Medallions Required for Bridge"
     range_start = 0
     range_end = 6
@@ -409,7 +401,7 @@ class BridgeMedallions(Range):
 
 
 class BridgeRewards(Range):
-    """Set the number of dungeon rewards required for the rainbow bridge."""
+    """With Dungeons bridge: set the number of dungeon rewards required."""
     display_name = "Dungeon Rewards Required for Bridge"
     range_start = 0
     range_end = 9
@@ -417,7 +409,7 @@ class BridgeRewards(Range):
 
 
 class BridgeTokens(Range):
-    """Set the number of Gold Skulltula Tokens required for the rainbow bridge."""
+    """With Tokens bridge: set the number of Gold Skulltula Tokens required."""
     display_name = "Tokens Required for Bridge"
     range_start = 0
     range_end = 100
@@ -425,7 +417,7 @@ class BridgeTokens(Range):
 
 
 class BridgeHearts(Range):
-    """Set the number of hearts required for the rainbow bridge."""
+    """With Hearts bridge: set the number of hearts required."""
     display_name = "Hearts Required for Bridge"
     range_start = 4
     range_end = 20
@@ -442,7 +434,15 @@ bridge_options: typing.Dict[str, type(Option)] = {
 
 
 class SongShuffle(Choice): 
-    """Set where songs can appear."""
+    """Set where songs can appear.
+    Song: Songs are shuffled into other song locations.
+    Dungeon: Songs are placed into end-of-dungeon locations:
+    - The 8 boss heart containers
+    - Sheik in Ice Cavern
+    - Lens of Truth chest in Bottom of the Well
+    - Ice Arrows chest in Gerudo Training Ground
+    - Impa at Hyrule Castle
+    Any: Songs can appear anywhere in the multiworld."""
     display_name = "Shuffle Songs"
     option_song = 0
     option_dungeon = 1
@@ -450,8 +450,10 @@ class SongShuffle(Choice):
 
 
 class ShopShuffle(Choice): 
-    """Randomizes shop contents. "fixed_number" randomizes a specific number of items per shop; 
-    "random_number" randomizes the value for each shop. """
+    """Randomizes shop contents.
+    Off: Shops are not randomized at all.
+    Fixed Number: Shop contents are shuffled, and a specific number of multiworld locations exist in each shop, controlled by the "shop_slots" option.
+    Random Number: Same as Fixed Number, but the number of locations per shop is random and may differ between shops."""
     display_name = "Shopsanity"
     option_off = 0
     option_fixed_number = 1
@@ -459,15 +461,20 @@ class ShopShuffle(Choice):
 
 
 class ShopSlots(Range):
-    """Number of items per shop to be randomized into the main itempool. 
-    Only active if Shopsanity is set to "fixed_number." """
+    """With Shopsanity fixed number: quantity of multiworld locations per shop to be randomized."""
     display_name = "Shuffled Shop Slots"
     range_start = 0
     range_end = 4
 
 
 class ShopPrices(Choice):
-    """Controls prices of shop items. "Normal" is a distribution from 0 to 300. "X Wallet" requires that wallet at max. "Affordable" is always 10 rupees."""
+    """Controls prices of shop locations.
+    Normal: Balanced distribution from 0 to 300.
+    Affordable: Every shop location costs 10 rupees.
+    Starting Wallet: Prices capped at 99 rupees.
+    Adult's Wallet: Prices capped at 200 rupees.
+    Giant's Wallet: Prices capped at 500 rupees.
+    Tycoon's Wallet: Prices capped at 999 rupees."""
     display_name = "Shopsanity Prices"
     option_normal = 0
     option_affordable = 1
@@ -478,7 +485,10 @@ class ShopPrices(Choice):
 
 
 class TokenShuffle(Choice): 
-    """Token rewards from Gold Skulltulas are shuffled into the pool."""
+    """Token rewards from Gold Skulltulas can be shuffled into the pool.
+    Dungeons: Only skulltulas in dungeons are shuffled.
+    Overworld: Only skulltulas on the overworld (all skulltulas not in dungeons) are shuffled.
+    All: Every skulltula is shuffled."""
     display_name = "Tokensanity"
     option_off = 0
     option_dungeons = 1
@@ -487,7 +497,11 @@ class TokenShuffle(Choice):
 
 
 class ScrubShuffle(Choice): 
-    """Shuffle the items sold by Business Scrubs, and set the prices."""
+    """Shuffle the items sold by Business Scrubs, and set the prices.
+    Off: Only the three business scrubs that sell one-time upgrades in vanilla will have items at their vanilla prices.
+    Low/"Affordable": All scrub prices are 10 rupees.
+    Regular/"Expensive": All scrub prices are vanilla.
+    Random Prices: All scrub prices are randomized between 0 and 99 rupees."""
     display_name = "Scrub Shuffle"
     option_off = 0
     option_low = 1
@@ -513,7 +527,11 @@ class ShuffleOcarinas(Toggle):
 
 
 class ShuffleChildTrade(Choice):
-    """Controls the behavior of the start of the child trade quest."""
+    """Controls the behavior of the start of the child trade quest.
+    Vanilla: Malon will give you the Weird Egg at Hyrule Castle.
+    Shuffle: Malon will give you a random item, and the Weird Egg is shuffled.
+    Skip Child Zelda: The game starts with Zelda already met, Zelda's Letter obtained, and the item from Impa obtained.
+    """
     display_name = "Shuffle Child Trade Item"
     option_vanilla = 0
     option_shuffle = 1
@@ -538,30 +556,39 @@ class ShuffleMedigoronCarpet(Toggle):
 
 
 class ShuffleFreestanding(Choice):
-    """Shuffles freestanding rupees, recovery hearts, Shadow Temple Spinning Pots, and Goron Pot."""
+    """Shuffles freestanding rupees, recovery hearts, Shadow Temple Spinning Pots, and Goron Pot drops.
+    Dungeons: Only freestanding items in dungeons are shuffled.
+    Overworld: Only freestanding items in the overworld are shuffled.
+    All: All freestanding items are shuffled."""
     display_name = "Shuffle Rupees & Hearts"
     option_off = 0
-    option_all = 1
+    option_dungeons = 1
     option_overworld = 2
-    option_dungeons = 3
+    option_all = 3
 
 
 class ShufflePots(Choice):
-    """Shuffles pots and flying pots which normally contain an item."""
+    """Shuffles pots and flying pots which normally contain an item.
+    Dungeons: Only pots in dungeons are shuffled.
+    Overworld: Only pots in the overworld are shuffled.
+    All: All pots are shuffled."""
     display_name = "Shuffle Pots"
     option_off = 0
-    option_all = 1
+    option_dungeons = 1
     option_overworld = 2
-    option_dungeons = 3
+    option_all = 3
 
 
 class ShuffleCrates(Choice):
-    """Shuffles large and small crates containing an item."""
+    """Shuffles large and small crates containing an item.
+    Dungeons: Only crates in dungeons are shuffled.
+    Overworld: Only crates in the overworld are shuffled.
+    All: All crates are shuffled."""
     display_name = "Shuffle Crates"
     option_off = 0
-    option_all = 1
+    option_dungeons = 1
     option_overworld = 2
-    option_dungeons = 3
+    option_all = 3
 
 
 class ShuffleBeehives(Toggle):
@@ -597,72 +624,113 @@ shuffle_options: typing.Dict[str, type(Option)] = {
 
 
 class ShuffleMapCompass(Choice): 
-    """Control where to shuffle dungeon maps and compasses."""
+    """Control where to shuffle dungeon maps and compasses.
+    Remove: There will be no maps or compasses in the itempool.
+    Startwith: You start with all maps and compasses.
+    Vanilla: Maps and compasses remain vanilla.
+    Dungeon: Maps and compasses are shuffled within their original dungeon.
+    Regional: Maps and compasses are shuffled only in regions near the original dungeon.
+    Overworld: Maps and compasses are shuffled locally outside of dungeons.
+    Any Dungeon: Maps and compasses are shuffled locally in any dungeon.
+    Keysanity: Maps and compasses can be anywhere in the multiworld."""
     display_name = "Maps & Compasses"
     option_remove = 0
     option_startwith = 1
     option_vanilla = 2
     option_dungeon = 3
-    option_overworld = 4
-    option_any_dungeon = 5
-    option_keysanity = 6
-    option_regional = 7
+    option_regional = 4
+    option_overworld = 5
+    option_any_dungeon = 6
+    option_keysanity = 7
     default = 1
-    alias_anywhere = 6
+    alias_anywhere = 7
 
 
 class ShuffleKeys(Choice): 
-    """Control where to shuffle dungeon small keys."""
+    """Control where to shuffle dungeon small keys.
+    Remove/"Keysy": There will be no small keys in the itempool. All small key doors are automatically unlocked.
+    Vanilla: Small keys remain vanilla. You may start with extra small keys in some dungeons to prevent softlocks.
+    Dungeon: Small keys are shuffled within their original dungeon.
+    Regional: Small keys are shuffled only in regions near the original dungeon.
+    Overworld: Small keys are shuffled locally outside of dungeons.
+    Any Dungeon: Small keys are shuffled locally in any dungeon.
+    Keysanity: Small keys can be anywhere in the multiworld."""
     display_name = "Small Keys"
     option_remove = 0
     option_vanilla = 2
     option_dungeon = 3
-    option_overworld = 4
-    option_any_dungeon = 5
-    option_keysanity = 6
-    option_regional = 7
+    option_regional = 4
+    option_overworld = 5
+    option_any_dungeon = 6
+    option_keysanity = 7
     default = 3
     alias_keysy = 0
-    alias_anywhere = 6
+    alias_anywhere = 7
 
 
 class ShuffleGerudoKeys(Choice): 
-    """Control where to shuffle the Thieves' Hideout small keys."""
+    """Control where to shuffle the Thieves' Hideout small keys.
+    Vanilla: Hideout keys remain vanilla.
+    Regional: Hideout keys are shuffled only in the Gerudo Valley/Desert Colossus area.
+    Overworld: Hideout keys are shuffled locally outside of dungeons.
+    Any Dungeon: Hideout keys are shuffled locally in any dungeon.
+    Keysanity: Hideout keys can be anywhere in the multiworld."""
     display_name = "Thieves' Hideout Keys"
     option_vanilla = 0
-    option_overworld = 1
-    option_any_dungeon = 2
-    option_keysanity = 3
-    option_regional = 4
-    alias_anywhere = 3
+    option_regional = 1
+    option_overworld = 2
+    option_any_dungeon = 3
+    option_keysanity = 4
+    alias_anywhere = 4
 
 
 class ShuffleBossKeys(Choice): 
-    """Control where to shuffle boss keys, except the Ganon's Castle Boss Key."""
+    """Control where to shuffle boss keys, except the Ganon's Castle Boss Key.
+    Remove/"Keysy": There will be no boss keys in the itempool. All boss key doors are automatically unlocked.
+    Vanilla: Boss keys remain vanilla. You may start with extra small keys in some dungeons to prevent softlocks.
+    Dungeon: Boss keys are shuffled within their original dungeon.
+    Regional: Boss keys are shuffled only in regions near the original dungeon.
+    Overworld: Boss keys are shuffled locally outside of dungeons.
+    Any Dungeon: Boss keys are shuffled locally in any dungeon.
+    Keysanity: Boss keys can be anywhere in the multiworld."""
     display_name = "Boss Keys"
     option_remove = 0
     option_vanilla = 2
     option_dungeon = 3
-    option_overworld = 4
-    option_any_dungeon = 5
-    option_keysanity = 6
-    option_regional = 7
+    option_regional = 4
+    option_overworld = 5
+    option_any_dungeon = 6
+    option_keysanity = 7
     default = 3
     alias_keysy = 0
-    alias_anywhere = 6
+    alias_anywhere = 7
 
 
 class ShuffleGanonBK(Choice):
-    """Control how to shuffle the Ganon's Castle Boss Key."""
+    """Control how to shuffle the Ganon's Castle Boss Key (GCBK).
+    Remove: GCBK is removed, and the boss key door is automatically unlocked.
+    Vanilla: GCBK remains vanilla.
+    Dungeon: GCBK is shuffled within its original dungeon.
+    Regional: GCBK is shuffled only in Hyrule Field, Market, and Hyrule Castle areas.
+    Overworld: GCBK is shuffled locally outside of dungeons.
+    Any Dungeon: GCBK is shuffled locally in any dungeon.
+    Keysanity: GCBK can be anywhere in the multiworld.
+    On LACS: GCBK is on the Light Arrow Cutscene, which requires Shadow and Spirit Medallions.
+    Stones: GCBK will be awarded when reaching the target number of Spiritual Stones.
+    Medallions: GCBK will be awarded when reaching the target number of medallions.
+    Dungeons: GCBK will be awarded when reaching the target number of dungeon rewards.
+    Tokens: GCBK will be awarded when reaching the target number of Gold Skulltula Tokens.
+    Hearts: GCBK will be awarded when reaching the target number of hearts.
+    """
     display_name = "Ganon's Boss Key"
     option_remove = 0
     option_vanilla = 2
     option_dungeon = 3
-    option_overworld = 4
-    option_any_dungeon = 5
-    option_keysanity = 6
-    option_on_lacs = 7
-    option_regional = 8
+    option_regional = 4
+    option_overworld = 5
+    option_any_dungeon = 6
+    option_keysanity = 7
+    option_on_lacs = 8
     option_stones = 9
     option_medallions = 10
     option_dungeons = 11
@@ -670,7 +738,7 @@ class ShuffleGanonBK(Choice):
     option_hearts = 13
     default = 0
     alias_keysy = 0
-    alias_anywhere = 6
+    alias_anywhere = 7
 
 
 class EnhanceMC(Toggle):
@@ -679,7 +747,7 @@ class EnhanceMC(Toggle):
 
 
 class GanonBKMedallions(Range):
-    """Set how many medallions are required to receive Ganon BK."""
+    """With medallions GCBK: set how many medallions are required to receive GCBK."""
     display_name = "Medallions Required for Ganon's BK"
     range_start = 1
     range_end = 6
@@ -687,7 +755,7 @@ class GanonBKMedallions(Range):
 
 
 class GanonBKStones(Range):
-    """Set how many Spiritual Stones are required to receive Ganon BK."""
+    """With stones GCBK: set how many Spiritual Stones are required to receive GCBK."""
     display_name = "Spiritual Stones Required for Ganon's BK"
     range_start = 1
     range_end = 3
@@ -695,7 +763,7 @@ class GanonBKStones(Range):
 
 
 class GanonBKRewards(Range):
-    """Set how many dungeon rewards are required to receive Ganon BK."""
+    """With dungeons GCBK: set how many dungeon rewards are required to receive GCBK."""
     display_name = "Dungeon Rewards Required for Ganon's BK"
     range_start = 1
     range_end = 9
@@ -703,7 +771,7 @@ class GanonBKRewards(Range):
 
 
 class GanonBKTokens(Range):
-    """Set how many Gold Skulltula Tokens are required to receive Ganon BK."""
+    """With tokens GCBK: set how many Gold Skulltula Tokens are required to receive GCBK."""
     display_name = "Tokens Required for Ganon's BK"
     range_start = 1
     range_end = 100
@@ -711,7 +779,7 @@ class GanonBKTokens(Range):
 
 
 class GanonBKHearts(Range):
-    """Set how many hearts are required to receive Ganon BK."""
+    """With hearts GCBK: set how many hearts are required to receive GCBK."""
     display_name = "Hearts Required for Ganon's BK"
     range_start = 4
     range_end = 20
@@ -719,7 +787,9 @@ class GanonBKHearts(Range):
 
 
 class KeyRings(Choice):
-    """Dungeons have all small keys found at once, rather than individually."""
+    """A key ring grants all dungeon small keys at once, rather than individually.
+    Choose: Use the option "key_rings_list" to choose which dungeons have key rings.
+    All: All dungeons have key rings instead of small keys."""
     display_name = "Key Rings Mode"
     option_off = 0
     option_choose = 1
@@ -728,7 +798,7 @@ class KeyRings(Choice):
 
 
 class KeyRingList(OptionSet):
-    """Select areas with keyrings rather than individual small keys."""
+    """With key rings as Choose: select areas with key rings rather than individual small keys."""
     display_name = "Key Ring Areas"
     valid_keys = {
         "Thieves' Hideout",
@@ -828,7 +898,8 @@ class BigPoeCount(Range):
 
 
 class FAETorchCount(Range):
-    """Number of lit torches required to open Shadow Temple."""
+    """Number of lit torches required to open Shadow Temple.
+    Does not affect logic; use the trick Shadow Temple Entry with Fire Arrows if desired."""
     display_name = "Fire Arrow Entry Torch Count"
     range_start = 1
     range_end = 24
@@ -853,7 +924,11 @@ timesavers_options: typing.Dict[str, type(Option)] = {
 
 
 class CorrectChestAppearance(Choice):
-    """Changes chest textures and/or sizes to match their contents. "Classic" is the old behavior of CSMC."""
+    """Changes chest textures and/or sizes to match their contents.
+    Off: All chests have their vanilla size/appearance.
+    Textures: Chest textures reflect their contents.
+    Both: Like Textures, but progression items and boss keys get big chests, and other items get small chests.
+    Classic: Old behavior of CSMC; textures distinguish keys from non-keys, and size distinguishes importance."""
     display_name = "Chest Appearance Matches Contents"
     option_off = 0
     option_textures = 1
@@ -872,15 +947,24 @@ class InvisibleChests(Toggle):
 
 
 class CorrectPotCrateAppearance(Choice):
-    """Unchecked pots and crates have a different texture; unchecked beehives will wiggle. With textures_content, pots and crates have an appearance based on their contents; with textures_unchecked, all unchecked pots/crates have the same appearance."""
+    """Changes the appearance of pots, crates, and beehives that contain items.
+    Off: Vanilla appearance for all containers.
+    Textures (Content): Unchecked pots and crates have a texture reflecting their contents. Unchecked beehives with progression items will wiggle.
+    Textures (Unchecked): Unchecked pots and crates are golden. Unchecked beehives will wiggle.
+    """
     display_name = "Pot, Crate, and Beehive Appearance"
     option_off = 0
     option_textures_content = 1
     option_textures_unchecked = 2
+    default = 2
 
 
 class Hints(Choice): 
-    """Gossip Stones can give hints about item locations."""
+    """Gossip Stones can give hints about item locations.
+    None: Gossip Stones do not give hints.
+    Mask: Gossip Stones give hints with Mask of Truth.
+    Agony: Gossip Stones give hints wtih Stone of Agony.
+    Always: Gossip Stones always give hints."""
     display_name = "Gossip Stones"
     option_none = 0
     option_mask = 1
@@ -895,7 +979,9 @@ class MiscHints(DefaultOnToggle):
 
 
 class HintDistribution(Choice):
-    """Choose the hint distribution to use. Affects the frequency of strong hints, which items are always hinted, etc."""
+    """Choose the hint distribution to use. Affects the frequency of strong hints, which items are always hinted, etc.
+    Detailed documentation on hint distributions can be found on the Archipelago GitHub or OoTRandomizer.com.
+    The Async hint distribution is intended for async multiworlds. It removes Way of the Hero hints to improve generation times, since they are not very useful in asyncs."""
     display_name = "Hint Distribution"
     option_balanced = 0
     option_ddr = 1
@@ -907,10 +993,13 @@ class HintDistribution(Choice):
     option_useless = 7
     option_very_strong = 8
     option_async = 9
+    default = 9
 
 
 class TextShuffle(Choice): 
-    """Randomizes text in the game for comedic effect."""
+    """Randomizes text in the game for comedic effect.
+    Except Hints: does not randomize important text such as hints, small/boss key information, and item prices.
+    Complete: randomizes every textbox, including the useful ones."""
     display_name = "Text Shuffle"
     option_none = 0
     option_except_hints = 1
@@ -946,7 +1035,8 @@ class HeroMode(Toggle):
 
 
 class StartingToD(Choice):
-    """Change the starting time of day."""
+    """Change the starting time of day.
+    Daytime starts at Sunrise and ends at Sunset. Default is between Morning and Noon."""
     display_name = "Starting Time of Day"
     option_default = 0
     option_sunrise = 1
@@ -999,7 +1089,11 @@ misc_options: typing.Dict[str, type(Option)] = {
 }
 
 class ItemPoolValue(Choice): 
-    """Changes the number of items available in the game."""
+    """Changes the number of items available in the game.
+    Plentiful: One extra copy of every major item.
+    Balanced: Original item pool.
+    Scarce: Extra copies of major items are removed. Heart containers are removed.
+    Minimal: All major item upgrades not used for locations are removed. All health is removed."""
     display_name = "Item Pool"
     option_plentiful = 0
     option_balanced = 1
@@ -1009,7 +1103,12 @@ class ItemPoolValue(Choice):
 
 
 class IceTraps(Choice): 
-    """Adds ice traps to the item pool."""
+    """Adds ice traps to the item pool.
+    Off: All ice traps are removed.
+    Normal: The vanilla quantity of ice traps are placed.
+    On/"Extra": There is a chance for some extra ice traps to be placed.
+    Mayhem: All added junk items are ice traps.
+    Onslaught: All junk items are replaced by ice traps, even those in the base pool."""
     display_name = "Ice Traps"
     option_off = 0
     option_normal = 1
@@ -1021,34 +1120,27 @@ class IceTraps(Choice):
 
 
 class IceTrapVisual(Choice): 
-    """Changes the appearance of ice traps as freestanding items."""
-    display_name = "Ice Trap Appearance"
+    """Changes the appearance of traps, including other games' traps, as freestanding items."""
+    display_name = "Trap Appearance"
     option_major_only = 0
     option_junk_only = 1
     option_anything = 2
 
 
-class AdultTradeStart(OptionSet):
-    """Choose the items that can appear to start the adult trade sequence. By default it is Claim Check only."""
-    display_name = "Adult Trade Sequence Items"
-    default = {"Claim Check"}
-    valid_keys = {
-        "Pocket Egg",
-        "Pocket Cucco",
-        "Cojiro",
-        "Odd Mushroom",
-        "Poachers Saw",
-        "Broken Sword",
-        "Prescription",
-        "Eyeball Frog",
-        "Eyedrops",
-        "Claim Check",
-    }
-
-    def __init__(self, value: typing.Iterable[str]):
-        if not value:
-            value = self.default
-        super().__init__(value)
+class AdultTradeStart(Choice):
+    """Choose the item that starts the adult trade sequence."""
+    display_name = "Adult Trade Sequence Start"
+    option_pocket_egg = 0
+    option_pocket_cucco = 1
+    option_cojiro = 2
+    option_odd_mushroom = 3
+    option_poachers_saw = 4
+    option_broken_sword = 5
+    option_prescription = 6
+    option_eyeball_frog = 7
+    option_eyedrops = 8
+    option_claim_check = 9
+    default = 9
 
 
 itempool_options: typing.Dict[str, type(Option)] = {
@@ -1068,7 +1160,7 @@ class Targeting(Choice):
 
 
 class DisplayDpad(DefaultOnToggle):
-    """Show dpad icon on HUD for quick actions (ocarina, hover boots, iron boots)."""
+    """Show dpad icon on HUD for quick actions (ocarina, hover boots, iron boots, mask)."""
     display_name = "Display D-Pad HUD"
 
 
@@ -1191,7 +1283,6 @@ oot_options: typing.Dict[str, type(Option)] = {
     **world_options, 
     **bridge_options,
     **dungeon_items_options,
-    # **lacs_options,
     **shuffle_options,
     **timesavers_options,
     **misc_options, 
diff --git a/worlds/oot/Patches.py b/worlds/oot/Patches.py
index ab1e75d1b9..0f1d3f4dcb 100644
--- a/worlds/oot/Patches.py
+++ b/worlds/oot/Patches.py
@@ -2094,10 +2094,14 @@ def patch_rom(world, rom):
         if not world.dungeon_mq['Ganons Castle']:
             chest_name = 'Ganons Castle Light Trial Lullaby Chest'
             location = world.get_location(chest_name)
-            if location.item.game == 'Ocarina of Time':
-                item = read_rom_item(rom, location.item.index)
+            if not location.item.trap:
+                if location.item.game == 'Ocarina of Time':
+                    item = read_rom_item(rom, location.item.index)
+                else:
+                    item = read_rom_item(rom, AP_PROGRESSION if location.item.advancement else AP_JUNK)
             else:
-                item = read_rom_item(rom, AP_PROGRESSION if location.item.advancement else AP_JUNK)
+                looks_like_index = get_override_entry(world, location)[5]
+                item = read_rom_item(rom, looks_like_index)
             if item['chest_type'] in (GOLD_CHEST, GILDED_CHEST, SKULL_CHEST_BIG):
                 rom.write_int16(0x321B176, 0xFC40) # original 0xFC48
 
@@ -2106,10 +2110,14 @@ def patch_rom(world, rom):
             chest_name = 'Spirit Temple Compass Chest'
             chest_address = 0x2B6B07C
             location = world.get_location(chest_name)
-            if location.item.game == 'Ocarina of Time':
-                item = read_rom_item(rom, location.item.index)
+            if not location.item.trap:
+                if location.item.game == 'Ocarina of Time':
+                    item = read_rom_item(rom, location.item.index)
+                else:
+                    item = read_rom_item(rom, AP_PROGRESSION if location.item.advancement else AP_JUNK)
             else:
-                item = read_rom_item(rom, AP_PROGRESSION if location.item.advancement else AP_JUNK)
+                looks_like_index = get_override_entry(world, location)[5]
+                item = read_rom_item(rom, looks_like_index)
             if item['chest_type'] in (BROWN_CHEST, SILVER_CHEST, SKULL_CHEST_SMALL):
                 rom.write_int16(chest_address + 2, 0x0190) # X pos
                 rom.write_int16(chest_address + 6, 0xFABC) # Z pos
@@ -2120,10 +2128,14 @@ def patch_rom(world, rom):
             chest_address_0 = 0x21A02D0  # Address in setup 0
             chest_address_2 = 0x21A06E4  # Address in setup 2
             location = world.get_location(chest_name)
-            if location.item.game == 'Ocarina of Time':
-                item = read_rom_item(rom, location.item.index)
+            if not location.item.trap:
+                if location.item.game == 'Ocarina of Time':
+                    item = read_rom_item(rom, location.item.index)
+                else:
+                    item = read_rom_item(rom, AP_PROGRESSION if location.item.advancement else AP_JUNK)
             else:
-                item = read_rom_item(rom, AP_PROGRESSION if location.item.advancement else AP_JUNK)
+                looks_like_index = get_override_entry(world, location)[5]
+                item = read_rom_item(rom, looks_like_index)
             if item['chest_type'] in (BROWN_CHEST, SILVER_CHEST, SKULL_CHEST_SMALL):
                 rom.write_int16(chest_address_0 + 6, 0x0172)  # Z pos
                 rom.write_int16(chest_address_2 + 6, 0x0172)  # Z pos
@@ -2170,7 +2182,7 @@ def patch_rom(world, rom):
             'Shadow Temple':      ("the \x05\x45Shadow Temple",      'Bongo Bongo',   0x7f, 0xa3),
         }
         for dungeon in world.dungeon_mq:
-            if dungeon in ['Gerudo Training Ground', 'Ganons Castle']:
+            if dungeon in ['Thieves Hideout', 'Gerudo Training Ground', 'Ganons Castle']:
                 pass
             elif dungeon in ['Bottom of the Well', 'Ice Cavern']:
                 dungeon_name, boss_name, compass_id, map_id = dungeon_list[dungeon]
diff --git a/worlds/oot/Rules.py b/worlds/oot/Rules.py
index 1f44cebdcf..529411f6fc 100644
--- a/worlds/oot/Rules.py
+++ b/worlds/oot/Rules.py
@@ -1,8 +1,12 @@
 from collections import deque
 import logging
+import typing
 
 from .Regions import TimeOfDay
+from .DungeonList import dungeon_table
+from .Hints import HintArea
 from .Items import oot_is_item_of_type
+from .LocationList import dungeon_song_locations
 
 from BaseClasses import CollectionState
 from worlds.generic.Rules import set_rule, add_rule, add_item_rule, forbid_item
@@ -150,11 +154,16 @@ def set_rules(ootworld):
         location = world.get_location('Forest Temple MQ First Room Chest', player)
         forbid_item(location, 'Boss Key (Forest Temple)', ootworld.player)
 
-    if ootworld.shuffle_song_items == 'song' and not ootworld.songs_as_items:
+    if ootworld.shuffle_song_items in {'song', 'dungeon'} and not ootworld.songs_as_items:
         # Sheik in Ice Cavern is the only song location in a dungeon; need to ensure that it cannot be anything else.
         # This is required if map/compass included, or any_dungeon shuffle.
         location = world.get_location('Sheik in Ice Cavern', player)
-        add_item_rule(location, lambda item: item.player == player and oot_is_item_of_type(item, 'Song'))
+        add_item_rule(location, lambda item: oot_is_item_of_type(item, 'Song'))
+
+    if ootworld.shuffle_child_trade == 'skip_child_zelda':
+        # Song from Impa must be local
+        location = world.get_location('Song from Impa', player)
+        add_item_rule(location, lambda item: item.player == player)
 
     for name in ootworld.always_hints:
         add_rule(world.get_location(name, player), guarantee_hint)
@@ -176,11 +185,6 @@ def create_shop_rule(location, parser):
     return parser.parse_rule('(Progressive_Wallet, %d)' % required_wallets(location.price))
 
 
-def limit_to_itemset(location, itemset):
-    old_rule = location.item_rule
-    location.item_rule = lambda item: item.name in itemset and old_rule(item)
-
-
 # This function should be run once after the shop items are placed in the world.
 # It should be run before other items are placed in the world so that logic has
 # the correct checks for them. This is safe to do since every shop is still
@@ -223,10 +227,8 @@ def set_shop_rules(ootworld):
 # The goal is to automatically set item rules based on age requirements in case entrances were shuffled
 def set_entrances_based_rules(ootworld):
 
-    if ootworld.multiworld.accessibility == 'beatable': 
-        return
-
-    all_state = ootworld.multiworld.get_all_state(False)
+    all_state = ootworld.get_state_with_complete_itempool()
+    all_state.sweep_for_events(locations=ootworld.get_locations())
 
     for location in filter(lambda location: location.type == 'Shop', ootworld.get_locations()):
         # If a shop is not reachable as adult, it can't have Goron Tunic or Zora Tunic as child can't buy these
diff --git a/worlds/oot/Utils.py b/worlds/oot/Utils.py
index c2444cd1fe..9faffbdedd 100644
--- a/worlds/oot/Utils.py
+++ b/worlds/oot/Utils.py
@@ -11,7 +11,7 @@ def data_path(*args):
     return os.path.join(os.path.dirname(__file__), 'data', *args)
 
 
-@lru_cache(maxsize=13)  # Cache Overworld.json and the 12 dungeons
+@lru_cache
 def read_json(file_path):
     json_string = ""
     with io.open(file_path, 'r') as file:
diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py
index 655f4989b2..e9c889d6f6 100644
--- a/worlds/oot/__init__.py
+++ b/worlds/oot/__init__.py
@@ -10,7 +10,7 @@ from string import printable
 
 logger = logging.getLogger("Ocarina of Time")
 
-from .Location import OOTLocation, LocationFactory, location_name_to_id
+from .Location import OOTLocation, LocationFactory, location_name_to_id, build_location_name_groups
 from .Entrance import OOTEntrance
 from .EntranceShuffle import shuffle_random_entrances, entrance_shuffle_table, EntranceShuffleError
 from .HintList import getRequiredHints
@@ -32,7 +32,7 @@ from .Cosmetics import patch_cosmetics
 
 from Utils import get_options
 from BaseClasses import MultiWorld, CollectionState, Tutorial, LocationProgressType
-from Options import Range, Toggle, VerifyKeys
+from Options import Range, Toggle, VerifyKeys, Accessibility
 from Fill import fill_restrictive, fast_fill, FillError
 from worlds.generic.Rules import exclusion_rules, add_item_rule
 from ..AutoWorld import World, AutoLogicRegister, WebWorld
@@ -43,14 +43,14 @@ i_o_limiter = threading.Semaphore(2)
 
 class OOTCollectionState(metaclass=AutoLogicRegister):
     def init_mixin(self, parent: MultiWorld):
-        all_ids = parent.get_all_ids()
-        self.child_reachable_regions = {player: set() for player in all_ids}
-        self.adult_reachable_regions = {player: set() for player in all_ids}
-        self.child_blocked_connections = {player: set() for player in all_ids}
-        self.adult_blocked_connections = {player: set() for player in all_ids}
-        self.day_reachable_regions = {player: set() for player in all_ids}
-        self.dampe_reachable_regions = {player: set() for player in all_ids}
-        self.age = {player: None for player in all_ids}
+        oot_ids = parent.get_game_players(OOTWorld.game) + parent.get_game_groups(OOTWorld.game)
+        self.child_reachable_regions = {player: set() for player in oot_ids}
+        self.adult_reachable_regions = {player: set() for player in oot_ids}
+        self.child_blocked_connections = {player: set() for player in oot_ids}
+        self.adult_blocked_connections = {player: set() for player in oot_ids}
+        self.day_reachable_regions = {player: set() for player in oot_ids}
+        self.dampe_reachable_regions = {player: set() for player in oot_ids}
+        self.age = {player: None for player in oot_ids}
 
     def copy_mixin(self, ret) -> CollectionState:
         ret.child_reachable_regions = {player: copy.copy(self.child_reachable_regions[player]) for player in
@@ -163,20 +163,26 @@ class OOTWorld(World):
             "Bottle with Big Poe", "Bottle with Red Potion", "Bottle with Green Potion",
             "Bottle with Blue Potion", "Bottle with Fairy", "Bottle with Fish",
             "Bottle with Blue Fire", "Bottle with Bugs", "Bottle with Poe"},
-        "Adult Trade Item": {"Pocket Egg", "Pocket Cucco", "Odd Mushroom",
+        "Adult Trade Item": {"Pocket Egg", "Pocket Cucco", "Cojiro", "Odd Mushroom",
             "Odd Potion", "Poachers Saw", "Broken Sword", "Prescription",
-            "Eyeball Frog", "Eyedrops", "Claim Check"}
+            "Eyeball Frog", "Eyedrops", "Claim Check"},
     }
 
+    location_name_groups = build_location_name_groups()
+
+
     def __init__(self, world, player):
         self.hint_data_available = threading.Event()
         self.collectible_flags_available = threading.Event()
         super(OOTWorld, self).__init__(world, player)
 
+
     @classmethod
     def stage_assert_generate(cls, multiworld: MultiWorld):
         rom = Rom(file=get_options()['oot_options']['rom_file'])
 
+
+    # Option parsing, handling incompatible options, building useful-item table
     def generate_early(self):
         self.parser = Rule_AST_Transformer(self, self.player)
 
@@ -192,8 +198,10 @@ class OOTWorld(World):
                 option_value = result.current_key
             setattr(self, option_name, option_value)
 
+        self.regions = []  # internal caches of regions for this world, used later
+        self._regions_cache = {}
+
         self.shop_prices = {}
-        self.regions = []  # internal cache of regions for this world, used later
         self.remove_from_start_inventory = []  # some items will be precollected but not in the inventory
         self.starting_items = Counter()
         self.songs_as_items = False
@@ -286,7 +294,7 @@ class OOTWorld(World):
         # No Logic forces all tricks on, prog balancing off and beatable-only
         elif self.logic_rules == 'no_logic':
             self.multiworld.progression_balancing[self.player].value = False
-            self.multiworld.accessibility[self.player] = self.multiworld.accessibility[self.player].from_text("minimal")
+            self.multiworld.accessibility[self.player].value = Accessibility.option_minimal
             for trick in normalized_name_tricks.values():
                 setattr(self, trick['name'], True)
 
@@ -384,6 +392,7 @@ class OOTWorld(World):
             self.mq_dungeons_mode = 'count'
             self.mq_dungeons_count = 0
         self.dungeon_mq = {item['name']: (item['name'] in mq_dungeons) for item in dungeon_table}
+        self.dungeon_mq['Thieves Hideout'] = False  # fix for bug in SaveContext:287
 
         # Empty dungeon placeholder for the moment
         self.empty_dungeons = {name: False for name in self.dungeon_mq}
@@ -409,6 +418,9 @@ class OOTWorld(World):
         self.starting_tod = self.starting_tod.replace('_', '-')
         self.shuffle_scrubs = self.shuffle_scrubs.replace('_prices', '')
 
+        # Convert adult trade option to expected Set
+        self.adult_trade_start = {self.adult_trade_start.title().replace('_', ' ')}
+
         # Get hint distribution
         self.hint_dist_user = read_json(data_path('Hints', f'{self.hint_dist}.json'))
 
@@ -446,7 +458,7 @@ class OOTWorld(World):
         self.always_hints = [hint.name for hint in getRequiredHints(self)]
 
         # Determine items which are not considered advancement based on settings. They will never be excluded.
-        self.nonadvancement_items = {'Double Defense'}
+        self.nonadvancement_items = {'Double Defense', 'Deku Stick Capacity', 'Deku Nut Capacity'}
         if (self.damage_multiplier != 'ohko' and self.damage_multiplier != 'quadruple' and
                 self.shuffle_scrubs == 'off' and not self.shuffle_grotto_entrances):
             # nayru's love may be required to prevent forced damage
@@ -483,6 +495,8 @@ class OOTWorld(World):
                 # Farore's Wind skippable if not used for this logic trick in Water Temple
                 self.nonadvancement_items.add('Farores Wind')
 
+
+    # Reads a group of regions from the given JSON file.
     def load_regions_from_json(self, file_path):
         region_json = read_json(file_path)
 
@@ -520,6 +534,10 @@ class OOTWorld(World):
                         # We still need to fill the location even if ALR is off.
                         logger.debug('Unreachable location: %s', new_location.name)
                     new_location.player = self.player
+                    # Change some attributes of Drop locations
+                    if new_location.type == 'Drop':
+                        new_location.name = new_region.name + ' ' + new_location.name
+                        new_location.show_in_spoiler = False
                     new_region.locations.append(new_location)
             if 'events' in region:
                 for event, rule in region['events'].items():
@@ -549,8 +567,10 @@ class OOTWorld(World):
 
             self.multiworld.regions.append(new_region)
             self.regions.append(new_region)
-        self.multiworld._recache()
+            self._regions_cache[new_region.name] = new_region
 
+
+    # Sets deku scrub prices
     def set_scrub_prices(self):
         # Get Deku Scrub Locations
         scrub_locations = [location for location in self.get_locations() if location.type in {'Scrub', 'GrottoScrub'}]
@@ -579,6 +599,8 @@ class OOTWorld(World):
                     if location.item is not None:
                         location.item.price = price
 
+
+    # Sets prices for shuffled shop locations
     def random_shop_prices(self):
         shop_item_indexes = ['7', '5', '8', '6']
         self.shop_prices = {}
@@ -604,6 +626,8 @@ class OOTWorld(World):
                         elif self.shopsanity_prices == 'tycoons_wallet':
                             self.shop_prices[location.name] = self.multiworld.random.randrange(0,1000,5)
 
+
+    # Fill boss prizes
     def fill_bosses(self, bossCount=9):
         boss_location_names = (
             'Queen Gohma',
@@ -616,7 +640,7 @@ class OOTWorld(World):
             'Twinrova',
             'Links Pocket'
         )
-        boss_rewards = [item for item in self.itempool if item.type == 'DungeonReward']
+        boss_rewards = sorted(map(self.create_item, self.item_name_groups['rewards']))
         boss_locations = [self.multiworld.get_location(loc, self.player) for loc in boss_location_names]
 
         placed_prizes = [loc.item.name for loc in boss_locations if loc.item is not None]
@@ -630,19 +654,58 @@ class OOTWorld(World):
             item = prizepool.pop()
             loc = prize_locs.pop()
             loc.place_locked_item(item)
-            self.multiworld.itempool.remove(item)
             self.hinted_dungeon_reward_locations[item.name] = loc
 
-    def create_item(self, name: str):
+
+    # Separate the result from generate_itempool into main and prefill pools
+    def divide_itempools(self):
+        prefill_item_types = set()
+        if self.shopsanity != 'off':
+            prefill_item_types.add('Shop')
+        if self.shuffle_song_items != 'any':
+            prefill_item_types.add('Song')
+        if self.shuffle_smallkeys != 'keysanity':
+            prefill_item_types.add('SmallKey')
+        if self.shuffle_bosskeys != 'keysanity':
+            prefill_item_types.add('BossKey')
+        if self.shuffle_hideoutkeys != 'keysanity':
+            prefill_item_types.add('HideoutSmallKey')
+        if self.shuffle_ganon_bosskey != 'keysanity':
+            prefill_item_types.add('GanonBossKey')
+        if self.shuffle_mapcompass != 'keysanity':
+            prefill_item_types.update({'Map', 'Compass'})
+
+        main_items = []
+        prefill_items = []
+        for item in self.itempool:
+            if item.type in prefill_item_types:
+                prefill_items.append(item)
+            else:
+                main_items.append(item)
+        return main_items, prefill_items
+
+
+    # only returns proper result after create_items and divide_itempools are run
+    def get_pre_fill_items(self):
+        return self.pre_fill_items
+
+
+    # Note on allow_arbitrary_name:
+    # OoT defines many helper items and event names that are treated indistinguishably from regular items,
+    #   but are only defined in the logic files. This means we need to create items for any name.
+    # Allowing any item name to be created is dangerous in case of plando, so this is a middle ground.
+    def create_item(self, name: str, allow_arbitrary_name: bool = False):
         if name in item_table:
             return OOTItem(name, self.player, item_table[name], False,
                            (name in self.nonadvancement_items if getattr(self, 'nonadvancement_items',
                                                                          None) else False))
-        return OOTItem(name, self.player, ('Event', True, None, None), True, False)
+        if allow_arbitrary_name:
+            return OOTItem(name, self.player, ('Event', True, None, None), True, False)
+        raise Exception(f"Invalid item name: {name}")
 
     def make_event_item(self, name, location, item=None):
         if item is None:
-            item = self.create_item(name)
+            item = self.create_item(name, allow_arbitrary_name=True)
         self.multiworld.push_item(location, item, collect=False)
         location.locked = True
         location.event = True
@@ -650,7 +713,9 @@ class OOTWorld(World):
             location.internal = True
         return item
 
-    def create_regions(self):  # create and link regions
+
+    # Create regions, locations, and entrances
+    def create_regions(self):
         if self.logic_rules == 'glitchless' or self.logic_rules == 'no_logic':  # enables ER + NL
             world_type = 'World'
         else:
@@ -663,7 +728,7 @@ class OOTWorld(World):
         self.multiworld.regions.append(menu)
         self.load_regions_from_json(overworld_data_path)
         self.load_regions_from_json(bosses_data_path)
-        start.connect(self.multiworld.get_region('Root', self.player))
+        start.connect(self.get_region('Root'))
         create_dungeons(self)
         self.parser.create_delayed_rules()
 
@@ -674,16 +739,13 @@ class OOTWorld(World):
         # Bind entrances to vanilla
         for region in self.regions:
             for exit in region.exits:
-                exit.connect(self.multiworld.get_region(exit.vanilla_connected_region, self.player))
+                exit.connect(self.get_region(exit.vanilla_connected_region))
 
+
+    # Create items, starting item handling, boss prize fill (before entrance randomizer)
     def create_items(self):
-        # Uniquely rename drop locations for each region and erase them from the spoiler
-        set_drop_location_names(self)
         # Generate itempool
         generate_itempool(self)
-        # Add dungeon rewards
-        rewardlist = sorted(list(self.item_name_groups['rewards']))
-        self.itempool += map(self.create_item, rewardlist)
 
         junk_pool = get_junk_pool(self)
         removed_items = []
@@ -706,12 +768,16 @@ class OOTWorld(World):
         if self.start_with_rupees:
             self.starting_items['Rupees'] = 999
 
+        # Divide itempool into prefill and main pools
+        self.itempool, self.pre_fill_items = self.divide_itempools()
+
         self.multiworld.itempool += self.itempool
         self.remove_from_start_inventory.extend(removed_items)
 
         # Fill boss prizes. needs to happen before entrance shuffle
         self.fill_bosses()
 
+
     def set_rules(self):
         # This has to run AFTER creating items but BEFORE set_entrances_based_rules
         if self.entrance_shuffle:
@@ -749,6 +815,7 @@ class OOTWorld(World):
         set_rules(self)
         set_entrances_based_rules(self)
 
+
     def generate_basic(self):  # mostly killing locations that shouldn't exist by settings
 
         # Gather items for ice trap appearances
@@ -761,8 +828,9 @@ class OOTWorld(World):
 
         # Kill unreachable events that can't be gotten even with all items
         # Make sure to only kill actual internal events, not in-game "events"
-        all_state = self.multiworld.get_all_state(False)
+        all_state = self.get_state_with_complete_itempool()
         all_locations = self.get_locations()
+        all_state.sweep_for_events(locations=all_locations)
         reachable = self.multiworld.get_reachable_locations(all_state, self.player)
         unreachable = [loc for loc in all_locations if
                        (loc.internal or loc.type == 'Drop') and loc.event and loc.locked and loc not in reachable]
@@ -773,7 +841,6 @@ class OOTWorld(World):
         bigpoe = self.multiworld.get_location('Sell Big Poe from Market Guard House', self.player)
         if not all_state.has('Bottle with Big Poe', self.player) and bigpoe not in reachable:
             bigpoe.parent_region.locations.remove(bigpoe)
-        self.multiworld.clear_location_cache()
 
         # If fast scarecrow then we need to kill the Pierre location as it will be unreachable
         if self.free_scarecrow:
@@ -784,39 +851,69 @@ class OOTWorld(World):
             loc = self.multiworld.get_location("Deliver Rutos Letter", self.player)
             loc.parent_region.locations.remove(loc)
 
+
     def pre_fill(self):
 
+        def prefill_state(base_state):
+            state = base_state.copy()
+            for item in self.get_pre_fill_items():
+                self.collect(state, item)
+            state.sweep_for_events(locations=self.get_locations())
+            return state
+
+        # Prefill shops, songs, and dungeon items
+        items = self.get_pre_fill_items()
+        locations = list(self.multiworld.get_unfilled_locations(self.player))
+        self.multiworld.random.shuffle(locations)
+
+        # Set up initial state
+        state = CollectionState(self.multiworld)
+        for item in self.itempool:
+            self.collect(state, item)
+        state.sweep_for_events(locations=self.get_locations())
+
         # Place dungeon items
         special_fill_types = ['GanonBossKey', 'BossKey', 'SmallKey', 'HideoutSmallKey', 'Map', 'Compass']
-        world_items = [item for item in self.multiworld.itempool if item.player == self.player]
+        type_to_setting = {
+            'Map': 'shuffle_mapcompass',
+            'Compass': 'shuffle_mapcompass',
+            'SmallKey': 'shuffle_smallkeys',
+            'BossKey': 'shuffle_bosskeys',
+            'HideoutSmallKey': 'shuffle_hideoutkeys',
+            'GanonBossKey': 'shuffle_ganon_bosskey',
+        }
+        special_fill_types.sort(key=lambda x: 0 if getattr(self, type_to_setting[x]) == 'dungeon' else 1)
+
         for fill_stage in special_fill_types:
-            stage_items = list(filter(lambda item: oot_is_item_of_type(item, fill_stage), world_items))
+            stage_items = list(filter(lambda item: oot_is_item_of_type(item, fill_stage), self.pre_fill_items))
             if not stage_items:
                 continue
             if fill_stage in ['GanonBossKey', 'HideoutSmallKey']:
                 locations = gather_locations(self.multiworld, fill_stage, self.player)
                 if isinstance(locations, list):
                     for item in stage_items:
-                        self.multiworld.itempool.remove(item)
+                        self.pre_fill_items.remove(item)
                     self.multiworld.random.shuffle(locations)
-                    fill_restrictive(self.multiworld, self.multiworld.get_all_state(False), locations, stage_items,
-                        single_player_placement=True, lock=True)
+                    fill_restrictive(self.multiworld, prefill_state(state), locations, stage_items,
+                        single_player_placement=True, lock=True, allow_excluded=True)
             else:
                 for dungeon_info in dungeon_table:
                     dungeon_name = dungeon_info['name']
+                    dungeon_items = list(filter(lambda item: dungeon_name in item.name, stage_items))
+                    if not dungeon_items:
+                        continue
                     locations = gather_locations(self.multiworld, fill_stage, self.player, dungeon=dungeon_name)
                     if isinstance(locations, list):
-                        dungeon_items = list(filter(lambda item: dungeon_name in item.name, stage_items))
                         for item in dungeon_items:
-                            self.multiworld.itempool.remove(item)
+                            self.pre_fill_items.remove(item)
                         self.multiworld.random.shuffle(locations)
-                        fill_restrictive(self.multiworld, self.multiworld.get_all_state(False), locations, dungeon_items,
-                            single_player_placement=True, lock=True)
+                        fill_restrictive(self.multiworld, prefill_state(state), locations, dungeon_items,
+                            single_player_placement=True, lock=True, allow_excluded=True)
 
         # Place songs
         # 5 built-in retries because this section can fail sometimes
         if self.shuffle_song_items != 'any':
-            tries = 5
+            tries = 10
             if self.shuffle_song_items == 'song':
                 song_locations = list(filter(lambda location: location.type == 'Song',
                                              self.multiworld.get_unfilled_locations(player=self.player)))
@@ -826,9 +923,9 @@ class OOTWorld(World):
             else:
                 raise Exception(f"Unknown song shuffle type: {self.shuffle_song_items}")
 
-            songs = list(filter(lambda item: item.player == self.player and item.type == 'Song', self.multiworld.itempool))
+            songs = list(filter(lambda item: item.type == 'Song', self.pre_fill_items))
             for song in songs:
-                self.multiworld.itempool.remove(song)
+                self.pre_fill_items.remove(song)
 
             important_warps = (self.shuffle_special_interior_entrances or self.shuffle_overworld_entrances or
                                self.warp_songs or self.spawn_positions)
@@ -851,8 +948,8 @@ class OOTWorld(World):
             while tries:
                 try:
                     self.multiworld.random.shuffle(song_locations)
-                    fill_restrictive(self.multiworld, self.multiworld.get_all_state(False), song_locations[:], songs[:],
-                                     True, True)
+                    fill_restrictive(self.multiworld, prefill_state(state), song_locations[:], songs[:],
+                                     single_player_placement=True, lock=True, allow_excluded=True)
                     logger.debug(f"Successfully placed songs for player {self.player} after {6 - tries} attempt(s)")
                 except FillError as e:
                     tries -= 1
@@ -873,10 +970,8 @@ class OOTWorld(World):
         # Place shop items
         # fast fill will fail because there is some logic on the shop items. we'll gather them up and place the shop items
         if self.shopsanity != 'off':
-            shop_prog = list(filter(lambda item: item.player == self.player and item.type == 'Shop'
-                and item.advancement, self.multiworld.itempool))
-            shop_junk = list(filter(lambda item: item.player == self.player and item.type == 'Shop'
-                and not item.advancement, self.multiworld.itempool))
+            shop_prog = list(filter(lambda item: item.type == 'Shop' and item.advancement, self.pre_fill_items))
+            shop_junk = list(filter(lambda item: item.type == 'Shop' and not item.advancement, self.pre_fill_items))
             shop_locations = list(
                 filter(lambda location: location.type == 'Shop' and location.name not in self.shop_prices,
                        self.multiworld.get_unfilled_locations(player=self.player)))
@@ -886,29 +981,14 @@ class OOTWorld(World):
                 'Buy Zora Tunic': 1,
             }.get(item.name, 0))  # place Deku Shields if needed, then tunics, then other advancement
             self.multiworld.random.shuffle(shop_locations)
-            for item in shop_prog + shop_junk:
-                self.multiworld.itempool.remove(item)
-            fill_restrictive(self.multiworld, self.multiworld.get_all_state(False), shop_locations, shop_prog, True, True)
+            self.pre_fill_items = []  # all prefill should be done
+            fill_restrictive(self.multiworld, prefill_state(state), shop_locations, shop_prog,
+                single_player_placement=True, lock=True, allow_excluded=True)
             fast_fill(self.multiworld, shop_junk, shop_locations)
             for loc in shop_locations:
                 loc.locked = True
         set_shop_rules(self)  # sets wallet requirements on shop items, must be done after they are filled
 
-        # If skip child zelda is active and Song from Impa is unfilled, put a local giveable item into it.
-        impa = self.multiworld.get_location("Song from Impa", self.player)
-        if self.shuffle_child_trade == 'skip_child_zelda':
-            if impa.item is None:
-                candidate_items = list(item for item in self.multiworld.itempool if item.player == self.player)
-                if candidate_items:
-                    item_to_place = self.multiworld.random.choice(candidate_items)
-                    self.multiworld.itempool.remove(item_to_place)
-                else:
-                    item_to_place = self.create_item("Recovery Heart")
-                impa.place_locked_item(item_to_place)
-            # Give items to startinventory
-            self.multiworld.push_precollected(impa.item)
-            self.multiworld.push_precollected(self.create_item("Zeldas Letter"))
-
         # Exclude locations in Ganon's Castle proportional to the number of items required to make the bridge
         # Check for dungeon ER later
         if self.logic_rules == 'glitchless':
@@ -943,48 +1023,6 @@ class OOTWorld(World):
                     or (self.shuffle_child_trade == 'skip_child_zelda' and loc.name in ['HC Zeldas Letter', 'Song from Impa'])):
                 loc.address = None
 
-    # Handle item-linked dungeon items and songs
-    @classmethod
-    def stage_pre_fill(cls, multiworld: MultiWorld):
-        special_fill_types = ['Song', 'GanonBossKey', 'BossKey', 'SmallKey', 'HideoutSmallKey', 'Map', 'Compass']
-        for group_id, group in multiworld.groups.items():
-            if group['game'] != cls.game:
-                continue
-            group_items = [item for item in multiworld.itempool if item.player == group_id]
-            for fill_stage in special_fill_types:
-                group_stage_items = list(filter(lambda item: oot_is_item_of_type(item, fill_stage), group_items))
-                if not group_stage_items:
-                    continue
-                if fill_stage in ['Song', 'GanonBossKey', 'HideoutSmallKey']:
-                    # No need to subdivide by dungeon name
-                    locations = gather_locations(multiworld, fill_stage, group['players'])
-                    if isinstance(locations, list):
-                        for item in group_stage_items:
-                            multiworld.itempool.remove(item)
-                        multiworld.random.shuffle(locations)
-                        fill_restrictive(multiworld, multiworld.get_all_state(False), locations, group_stage_items,
-                            single_player_placement=False, lock=True)
-                        if fill_stage == 'Song':
-                            # We don't want song locations to contain progression unless it's a song
-                            # or it was marked as priority.
-                            # We do this manually because we'd otherwise have to either
-                            # iterate twice or do many function calls.
-                            for loc in locations:
-                                if loc.progress_type == LocationProgressType.DEFAULT:
-                                    loc.progress_type = LocationProgressType.EXCLUDED
-                                    add_item_rule(loc, lambda i: not (i.advancement or i.useful))
-                else:
-                    # Perform the fill task once per dungeon
-                    for dungeon_info in dungeon_table:
-                        dungeon_name = dungeon_info['name']
-                        locations = gather_locations(multiworld, fill_stage, group['players'], dungeon=dungeon_name)
-                        if isinstance(locations, list):
-                            group_dungeon_items = list(filter(lambda item: dungeon_name in item.name, group_stage_items))
-                            for item in group_dungeon_items:
-                                multiworld.itempool.remove(item)
-                            multiworld.random.shuffle(locations)
-                            fill_restrictive(multiworld, multiworld.get_all_state(False), locations, group_dungeon_items,
-                                single_player_placement=False, lock=True)
 
     def generate_output(self, output_directory: str):
         if self.hints != 'none':
@@ -1021,37 +1059,16 @@ class OOTWorld(World):
                 player_name=self.multiworld.get_player_name(self.player))
             apz5.write()
 
-            # Write entrances to spoiler log
-            all_entrances = self.get_shuffled_entrances()
-            all_entrances.sort(reverse=True, key=lambda x: x.name)
-            all_entrances.sort(reverse=True, key=lambda x: x.type)
-            if not self.decouple_entrances:
-                while all_entrances:
-                    loadzone = all_entrances.pop()
-                    if loadzone.type != 'Overworld':
-                        if loadzone.primary:
-                            entrance = loadzone
-                        else:
-                            entrance = loadzone.reverse
-                        if entrance.reverse is not None:
-                            self.multiworld.spoiler.set_entrance(entrance, entrance.replaces.reverse, 'both', self.player)
-                        else:
-                            self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player)
-                    else:
-                        reverse = loadzone.replaces.reverse
-                        if reverse in all_entrances:
-                            all_entrances.remove(reverse)
-                        self.multiworld.spoiler.set_entrance(loadzone, reverse, 'both', self.player)
-            else:
-                for entrance in all_entrances:
-                    self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player)
 
     # Gathers hint data for OoT. Loops over all world locations for woth, barren, and major item locations.
     @classmethod
     def stage_generate_output(cls, multiworld: MultiWorld, output_directory: str):
         def hint_type_players(hint_type: str) -> set:
             return {autoworld.player for autoworld in multiworld.get_game_worlds("Ocarina of Time")
-                    if autoworld.hints != 'none' and autoworld.hint_dist_user['distribution'][hint_type]['copies'] > 0}
+                    if autoworld.hints != 'none' 
+                    and autoworld.hint_dist_user['distribution'][hint_type]['copies'] > 0
+                    and (autoworld.hint_dist_user['distribution'][hint_type]['fixed'] > 0 
+                      or autoworld.hint_dist_user['distribution'][hint_type]['weight'] > 0)}
 
         try:
             item_hint_players = hint_type_players('item')
@@ -1078,10 +1095,10 @@ class OOTWorld(World):
 
                     if loc.game == "Ocarina of Time" and loc.item.code and (not loc.locked or
                         (oot_is_item_of_type(loc.item, 'Song') or
-                            (oot_is_item_of_type(loc.item, 'SmallKey')         and multiworld.worlds[loc.player].shuffle_smallkeys     == 'any_dungeon') or
-                            (oot_is_item_of_type(loc.item, 'HideoutSmallKey')  and multiworld.worlds[loc.player].shuffle_hideoutkeys  == 'any_dungeon') or
-                            (oot_is_item_of_type(loc.item, 'BossKey')          and multiworld.worlds[loc.player].shuffle_bosskeys      == 'any_dungeon') or
-                            (oot_is_item_of_type(loc.item, 'GanonBossKey')     and multiworld.worlds[loc.player].shuffle_ganon_bosskey == 'any_dungeon'))):
+                            (oot_is_item_of_type(loc.item, 'SmallKey')         and multiworld.worlds[loc.player].shuffle_smallkeys     in ('overworld', 'any_dungeon', 'regional')) or
+                            (oot_is_item_of_type(loc.item, 'HideoutSmallKey')  and multiworld.worlds[loc.player].shuffle_hideoutkeys   in ('overworld', 'any_dungeon', 'regional')) or
+                            (oot_is_item_of_type(loc.item, 'BossKey')          and multiworld.worlds[loc.player].shuffle_bosskeys      in ('overworld', 'any_dungeon', 'regional')) or
+                            (oot_is_item_of_type(loc.item, 'GanonBossKey')     and multiworld.worlds[loc.player].shuffle_ganon_bosskey in ('overworld', 'any_dungeon', 'regional')))):
                         if loc.player in barren_hint_players:
                             hint_area = get_hint_area(loc)
                             items_by_region[loc.player][hint_area]['weight'] += 1
@@ -1096,7 +1113,12 @@ class OOTWorld(World):
             elif barren_hint_players or woth_hint_players:  # Check only relevant oot locations for barren/woth
                 for player in (barren_hint_players | woth_hint_players):
                     for loc in multiworld.worlds[player].get_locations():
-                        if loc.item.code and (not loc.locked or oot_is_item_of_type(loc.item, 'Song')):
+                        if loc.item.code and (not loc.locked or
+                            (oot_is_item_of_type(loc.item, 'Song') or
+                                (oot_is_item_of_type(loc.item, 'SmallKey')         and multiworld.worlds[loc.player].shuffle_smallkeys     in ('overworld', 'any_dungeon', 'regional')) or
+                                (oot_is_item_of_type(loc.item, 'HideoutSmallKey')  and multiworld.worlds[loc.player].shuffle_hideoutkeys   in ('overworld', 'any_dungeon', 'regional')) or
+                                (oot_is_item_of_type(loc.item, 'BossKey')          and multiworld.worlds[loc.player].shuffle_bosskeys      in ('overworld', 'any_dungeon', 'regional')) or
+                                (oot_is_item_of_type(loc.item, 'GanonBossKey')     and multiworld.worlds[loc.player].shuffle_ganon_bosskey in ('overworld', 'any_dungeon', 'regional')))):
                             if player in barren_hint_players:
                                 hint_area = get_hint_area(loc)
                                 items_by_region[player][hint_area]['weight'] += 1
@@ -1116,6 +1138,7 @@ class OOTWorld(World):
             for autoworld in multiworld.get_game_worlds("Ocarina of Time"):
                 autoworld.hint_data_available.set()
 
+
     def fill_slot_data(self):
         self.collectible_flags_available.wait()
         return {
@@ -1123,6 +1146,7 @@ class OOTWorld(World):
             'collectible_flag_offsets': self.collectible_flag_offsets
         }
 
+
     def modify_multidata(self, multidata: dict):
 
         # Replace connect name
@@ -1137,6 +1161,16 @@ class OOTWorld(World):
                 continue
             multidata["precollected_items"][self.player].remove(item_id)
 
+        # If skip child zelda, push item onto autotracker
+        if self.shuffle_child_trade == 'skip_child_zelda':
+            impa_item_id = self.item_name_to_id.get(self.get_location('Song from Impa').item.name, None)
+            zelda_item_id = self.item_name_to_id.get(self.get_location('HC Zeldas Letter').item.name, None)
+            if impa_item_id:
+                multidata["precollected_items"][self.player].append(impa_item_id)
+            if zelda_item_id:
+                multidata["precollected_items"][self.player].append(zelda_item_id)
+
+
     def extend_hint_information(self, er_hint_data: dict):
 
         er_hint_data[self.player] = {}
@@ -1183,6 +1217,42 @@ class OOTWorld(World):
                             er_hint_data[self.player][location.address] = main_entrance.name
                             logger.debug(f"Set {location.name} hint data to {main_entrance.name}")
 
+
+    def write_spoiler(self, spoiler_handle: typing.TextIO) -> None:
+        required_trials_str = ", ".join(t for t in self.skipped_trials if not self.skipped_trials[t])
+        spoiler_handle.write(f"\n\nTrials ({self.multiworld.get_player_name(self.player)}): {required_trials_str}\n")
+
+        if self.shopsanity != 'off':
+            spoiler_handle.write(f"\nShop Prices ({self.multiworld.get_player_name(self.player)}):\n")
+            for k, v in self.shop_prices.items():
+                spoiler_handle.write(f"{k}: {v} Rupees\n")
+
+        # Write entrances to spoiler log
+        all_entrances = self.get_shuffled_entrances()
+        all_entrances.sort(reverse=True, key=lambda x: x.name)
+        all_entrances.sort(reverse=True, key=lambda x: x.type)
+        if not self.decouple_entrances:
+            while all_entrances:
+                loadzone = all_entrances.pop()
+                if loadzone.type != 'Overworld':
+                    if loadzone.primary:
+                        entrance = loadzone
+                    else:
+                        entrance = loadzone.reverse
+                    if entrance.reverse is not None:
+                        self.multiworld.spoiler.set_entrance(entrance, entrance.replaces.reverse, 'both', self.player)
+                    else:
+                        self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player)
+                else:
+                    reverse = loadzone.replaces.reverse
+                    if reverse in all_entrances:
+                        all_entrances.remove(reverse)
+                    self.multiworld.spoiler.set_entrance(loadzone, reverse, 'both', self.player)
+        else:
+            for entrance in all_entrances:
+                self.multiworld.spoiler.set_entrance(entrance, entrance.replaces, 'entrance', self.player)
+
+
     # Key ring handling:
     # Key rings are multiple items glued together into one, so we need to give
     # the appropriate number of keys in the collection state when they are
@@ -1190,16 +1260,16 @@ class OOTWorld(World):
     def collect(self, state: CollectionState, item: OOTItem) -> bool:
         if item.advancement and item.special and item.special.get('alias', False):
             alt_item_name, count = item.special.get('alias')
-            state.prog_items[alt_item_name, self.player] += count
+            state.prog_items[self.player][alt_item_name] += count
             return True
         return super().collect(state, item)
 
     def remove(self, state: CollectionState, item: OOTItem) -> bool:
         if item.advancement and item.special and item.special.get('alias', False):
             alt_item_name, count = item.special.get('alias')
-            state.prog_items[alt_item_name, self.player] -= count
-            if state.prog_items[alt_item_name, self.player] < 1:
-                del (state.prog_items[alt_item_name, self.player])
+            state.prog_items[self.player][alt_item_name] -= count
+            if state.prog_items[self.player][alt_item_name] < 1:
+                del (state.prog_items[self.player][alt_item_name])
             return True
         return super().remove(state, item)
 
@@ -1214,24 +1284,29 @@ class OOTWorld(World):
             return False
 
     def get_shufflable_entrances(self, type=None, only_primary=False):
-        return [entrance for entrance in self.multiworld.get_entrances() if (entrance.player == self.player and
-                                                                             (type == None or entrance.type == type) and
-                                                                             (not only_primary or entrance.primary))]
+        return [entrance for entrance in self.get_entrances() if ((type == None or entrance.type == type)
+            and (not only_primary or entrance.primary))]
 
     def get_shuffled_entrances(self, type=None, only_primary=False):
         return [entrance for entrance in self.get_shufflable_entrances(type=type, only_primary=only_primary) if
                 entrance.shuffled]
 
     def get_locations(self):
-        for region in self.regions:
-            for loc in region.locations:
-                yield loc
+        return self.multiworld.get_locations(self.player)
 
     def get_location(self, location):
         return self.multiworld.get_location(location, self.player)
 
-    def get_region(self, region):
-        return self.multiworld.get_region(region, self.player)
+    def get_region(self, region_name):
+        try:
+            return self._regions_cache[region_name]
+        except KeyError:
+            ret = self.multiworld.get_region(region_name, self.player)
+            self._regions_cache[region_name] = ret
+            return ret
+
+    def get_entrances(self):
+        return self.multiworld.get_entrances(self.player)
 
     def get_entrance(self, entrance):
         return self.multiworld.get_entrance(entrance, self.player)
@@ -1265,25 +1340,12 @@ class OOTWorld(World):
     # Specifically ensures that only real items are gotten, not any events.
     # In particular, ensures that Time Travel needs to be found.
     def get_state_with_complete_itempool(self):
-        all_state = self.multiworld.get_all_state(use_cache=False)
-        # Remove event progression items
-        for item, player in all_state.prog_items:
-            if player == self.player and (item not in item_table or item_table[item][2] is None):
-                all_state.prog_items[(item, player)] = 0
-        # Remove all events and checked locations
-        all_state.locations_checked = {loc for loc in all_state.locations_checked if loc.player != self.player}
-        all_state.events = {loc for loc in all_state.events if loc.player != self.player}
+        all_state = CollectionState(self.multiworld)
+        for item in self.itempool + self.pre_fill_items:
+            self.multiworld.worlds[item.player].collect(all_state, item)
         # If free_scarecrow give Scarecrow Song
         if self.free_scarecrow:
             all_state.collect(self.create_item("Scarecrow Song"), event=True)
-
-        # Invalidate caches
-        all_state.child_reachable_regions[self.player] = set()
-        all_state.adult_reachable_regions[self.player] = set()
-        all_state.child_blocked_connections[self.player] = set()
-        all_state.adult_blocked_connections[self.player] = set()
-        all_state.day_reachable_regions[self.player] = set()
-        all_state.dampe_reachable_regions[self.player] = set()
         all_state.stale[self.player] = True
 
         return all_state
@@ -1320,7 +1382,6 @@ def gather_locations(multiworld: MultiWorld,
     dungeon: str = ''
 ) -> Optional[List[OOTLocation]]:
     type_to_setting = {
-        'Song': 'shuffle_song_items',
         'Map': 'shuffle_mapcompass',
         'Compass': 'shuffle_mapcompass',
         'SmallKey': 'shuffle_smallkeys',
@@ -1339,21 +1400,12 @@ def gather_locations(multiworld: MultiWorld,
         players = {players}
     fill_opts = {p: getattr(multiworld.worlds[p], type_to_setting[item_type]) for p in players}
     locations = []
-    if item_type == 'Song':
-        if any(map(lambda v: v == 'any', fill_opts.values())):
-            return None
-        for player, option in fill_opts.items():
-            if option == 'song':
-                condition = lambda location: location.type == 'Song'
-            elif option == 'dungeon':
-                condition = lambda location: location.name in dungeon_song_locations
-            locations += filter(condition, multiworld.get_unfilled_locations(player=player))
-    else:
-        if any(map(lambda v: v in {'keysanity'}, fill_opts.values())):
-            return None
-        for player, option in fill_opts.items():
-            condition = functools.partial(valid_dungeon_item_location,
-                multiworld.worlds[player], option, dungeon)
-            locations += filter(condition, multiworld.get_unfilled_locations(player=player))
+    if any(map(lambda v: v == 'keysanity', fill_opts.values())):
+        return None
+    for player, option in fill_opts.items():
+        condition = functools.partial(valid_dungeon_item_location,
+            multiworld.worlds[player], option, dungeon)
+        locations += filter(condition, multiworld.get_unfilled_locations(player=player))
 
     return locations
+
diff --git a/worlds/oot/docs/en_Ocarina of Time.md b/worlds/oot/docs/en_Ocarina of Time.md
index b4610878b6..fa8e148957 100644
--- a/worlds/oot/docs/en_Ocarina of Time.md	
+++ b/worlds/oot/docs/en_Ocarina of Time.md	
@@ -31,3 +31,10 @@ Items belonging to other worlds are represented by the Zelda's Letter item.
 
 When the player receives an item, Link will hold the item above his head and display it to the world. It's good for
 business!
+
+## Unique Local Commands
+
+The following commands are only available when using the OoTClient to play with Archipelago.
+
+- `/n64` Check N64 Connection State
+- `/deathlink` Toggle deathlink from client. Overrides default setting.
diff --git a/worlds/oot/docs/setup_en.md b/worlds/oot/docs/setup_en.md
index 612c5efd8f..72f15fa6c7 100644
--- a/worlds/oot/docs/setup_en.md
+++ b/worlds/oot/docs/setup_en.md
@@ -42,360 +42,22 @@ and select EmuHawk.exe.
 An alternative BizHawk setup guide as well as various pieces of troubleshooting advice can be found
 [here](https://wiki.ootrandomizer.com/index.php?title=Bizhawk).
 
-## Configuring your YAML file
+## Create a Config (.yaml) File
 
-### What is a YAML file and why do I need one?
+### What is a config file and why do I need one?
 
-Your YAML 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 YAML 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.
+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?
+### Where do I get a config file?
 
-A basic OoT yaml will look like this. There are lots of cosmetic options that have been removed for the sake of this
-tutorial, if you want to see a complete list, download Archipelago from
-the [Archipelago Releases Page](https://github.com/ArchipelagoMW/Archipelago/releases) and look for the sample file in
-the "Players" folder.
+The Player Settings page on the website allows you to configure your personal settings and export a config file from
+them. Player settings page: [Ocarina of Time Player Settings Page](/games/Ocarina%20of%20Time/player-settings)
 
-```yaml
-description: Default Ocarina of Time Template # Used to describe your yaml. Useful if you have multiple files
-# Your name in-game. Spaces will be replaced with underscores and there is a 16 character limit
-name: YourName
-game:
-  Ocarina of Time: 1
-requires:
-  version: 0.1.7 # Version of Archipelago required for this yaml to work as expected.
-# Shared Options supported by all games:
-accessibility:
-  items: 0 # Guarantees you will be able to acquire all items, but you may not be able to access all locations
-  locations: 50 # Guarantees you will be able to access all locations, and therefore all items
-  none: 0 # Guarantees only that the game is beatable. You may not be able to access all locations or acquire all items
-progression_balancing: # A system to reduce BK, as in times during which you can't do anything, by moving your items into an earlier access sphere
-  0: 0 # Choose a lower number if you don't mind a longer multiworld, or can glitch/sequence break around missing items.
-  25: 0
-  50: 50 # Make it likely you have stuff to do.
-  99: 0 # Get important items early, and stay at the front of the progression.
-Ocarina of Time:
-  logic_rules: # Set the logic used for the generator.
-    glitchless: 50
-    glitched: 0
-    no_logic: 0
-  logic_no_night_tokens_without_suns_song: # Nighttime skulltulas will logically require Sun's Song.
-    false: 50
-    true: 0
-  open_forest: # Set the state of Kokiri Forest and the path to Deku Tree.
-    open: 50
-    closed_deku: 0
-    closed: 0
-  open_kakariko: # Set the state of the Kakariko Village gate.
-    open: 50
-    zelda: 0
-    closed: 0
-  open_door_of_time: # Open the Door of Time by default, without the Song of Time.
-    false: 0
-    true: 50
-  zora_fountain: # Set the state of King Zora, blocking the way to Zora's Fountain.
-    open: 0
-    adult: 0
-    closed: 50
-  gerudo_fortress: # Set the requirements for access to Gerudo Fortress.
-    normal: 0
-    fast: 50
-    open: 0
-  bridge: # Set the requirements for the Rainbow Bridge.
-    open: 0
-    vanilla: 0
-    stones: 0
-    medallions: 50
-    dungeons: 0
-    tokens: 0
-  trials: # Set the number of required trials in Ganon's Castle.
-    # you can add additional values between minimum and maximum
-    0: 50 # minimum value
-    6: 0 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  starting_age: # Choose which age Link will start as.
-    child: 50
-    adult: 0
-  triforce_hunt: # Gather pieces of the Triforce scattered around the world to complete the game.
-    false: 50
-    true: 0
-  triforce_goal: # Number of Triforce pieces required to complete the game. Total number placed determined by the Item Pool setting.
-    # you can add additional values between minimum and maximum
-    1: 0 # minimum value
-    50: 0 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-    20: 50
-  bombchus_in_logic: # Bombchus are properly considered in logic. The first found pack will have 20 chus; Kokiri Shop and Bazaar sell refills; bombchus open Bombchu Bowling.
-    false: 50
-    true: 0
-  bridge_stones: # Set the number of Spiritual Stones required for the rainbow bridge.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    3: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  bridge_medallions: # Set the number of medallions required for the rainbow bridge.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    6: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  bridge_rewards: # Set the number of dungeon rewards required for the rainbow bridge.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    9: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  bridge_tokens: # Set the number of Gold Skulltula Tokens required for the rainbow bridge.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    100: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  shuffle_mapcompass: # Control where to shuffle dungeon maps and compasses.
-    remove: 0
-    startwith: 50
-    vanilla: 0
-    dungeon: 0
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_smallkeys: # Control where to shuffle dungeon small keys.
-    remove: 0
-    vanilla: 0
-    dungeon: 50
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_hideoutkeys: # Control where to shuffle the Gerudo Fortress small keys.
-    vanilla: 50
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_bosskeys: # Control where to shuffle boss keys, except the Ganon's Castle Boss Key.
-    remove: 0
-    vanilla: 0
-    dungeon: 50
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_ganon_bosskey: # Control where to shuffle the Ganon's Castle Boss Key.
-    remove: 50
-    vanilla: 0
-    dungeon: 0
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-    on_lacs: 0
-  enhance_map_compass: # Map tells if a dungeon is vanilla or MQ. Compass tells what the dungeon reward is.
-    false: 50
-    true: 0
-  lacs_condition: # Set the requirements for the Light Arrow Cutscene in the Temple of Time.
-    vanilla: 50
-    stones: 0
-    medallions: 0
-    dungeons: 0
-    tokens: 0
-  lacs_stones: # Set the number of Spiritual Stones required for LACS.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    3: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  lacs_medallions: # Set the number of medallions required for LACS.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    6: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  lacs_rewards: # Set the number of dungeon rewards required for LACS.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    9: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  lacs_tokens: # Set the number of Gold Skulltula Tokens required for LACS.
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    100: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  shuffle_song_items: # Set where songs can appear.
-    song: 50
-    dungeon: 0
-    any: 0
-  shopsanity: # Randomizes shop contents. Set to "off" to not shuffle shops; "0" shuffles shops but does not allow multiworld items in shops.
-    0: 0
-    1: 0
-    2: 0
-    3: 0
-    4: 0
-    random_value: 0
-    off: 50
-  tokensanity: # Token rewards from Gold Skulltulas are shuffled into the pool.
-    off: 50
-    dungeons: 0
-    overworld: 0
-    all: 0
-  shuffle_scrubs: # Shuffle the items sold by Business Scrubs, and set the prices.
-    off: 50
-    low: 0
-    regular: 0
-    random_prices: 0
-  shuffle_cows: # Cows give items when Epona's Song is played.
-    false: 50
-    true: 0
-  shuffle_kokiri_sword: # Shuffle Kokiri Sword into the item pool.
-    false: 50
-    true: 0
-  shuffle_ocarinas: # Shuffle the Fairy Ocarina and Ocarina of Time into the item pool.
-    false: 50
-    true: 0
-  shuffle_weird_egg: # Shuffle the Weird Egg from Malon at Hyrule Castle.
-    false: 50
-    true: 0
-  shuffle_gerudo_card: # Shuffle the Gerudo Membership Card into the item pool.
-    false: 50
-    true: 0
-  shuffle_beans: # Adds a pack of 10 beans to the item pool and changes the bean salesman to sell one item for 60 rupees.
-    false: 50
-    true: 0
-  shuffle_medigoron_carpet_salesman: # Shuffle the items sold by Medigoron and the Haunted Wasteland Carpet Salesman.
-    false: 50
-    true: 0
-  skip_child_zelda: # Game starts with Zelda's Letter, the item at Zelda's Lullaby, and the relevant events already completed.
-    false: 50
-    true: 0
-  no_escape_sequence: # Skips the tower collapse sequence between the Ganondorf and Ganon fights.
-    false: 0
-    true: 50
-  no_guard_stealth: # The crawlspace into Hyrule Castle skips straight to Zelda.
-    false: 0
-    true: 50
-  no_epona_race: # Epona can always be summoned with Epona's Song.
-    false: 0
-    true: 50
-  skip_some_minigame_phases: # Dampe Race and Horseback Archery give both rewards if the second condition is met on the first attempt.
-    false: 0
-    true: 50
-  complete_mask_quest: # All masks are immediately available to borrow from the Happy Mask Shop.
-    false: 50
-    true: 0
-  useful_cutscenes: # Reenables the Poe cutscene in Forest Temple, Darunia in Fire Temple, and Twinrova introduction. Mostly useful for glitched.
-    false: 50
-    true: 0
-  fast_chests: # All chest animations are fast. If disabled, major items have a slow animation.
-    false: 0
-    true: 50
-  free_scarecrow: # Pulling out the ocarina near a scarecrow spot spawns Pierre without needing the song.
-    false: 50
-    true: 0
-  fast_bunny_hood: # Bunny Hood lets you move 1.5x faster like in Majora's Mask.
-    false: 50
-    true: 0
-  chicken_count: # Controls the number of Cuccos for Anju to give an item as child.
-    \# you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    7: 50 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-  hints: # Gossip Stones can give hints about item locations.
-    none: 0
-    mask: 0
-    agony: 0
-    always: 50
-  hint_dist: # Choose the hint distribution to use. Affects the frequency of strong hints, which items are always hinted, etc.
-    balanced: 50
-    ddr: 0
-    league: 0
-    mw2: 0
-    scrubs: 0
-    strong: 0
-    tournament: 0
-    useless: 0
-    very_strong: 0
-  text_shuffle: # Randomizes text in the game for comedic effect.
-    none: 50
-    except_hints: 0
-    complete: 0
-  damage_multiplier: # Controls the amount of damage Link takes.
-    half: 0
-    normal: 50
-    double: 0
-    quadruple: 0
-    ohko: 0
-  no_collectible_hearts: # Hearts will not drop from enemies or objects.
-    false: 50
-    true: 0
-  starting_tod: # Change the starting time of day.
-    default: 50
-    sunrise: 0
-    morning: 0
-    noon: 0
-    afternoon: 0
-    sunset: 0
-    evening: 0
-    midnight: 0
-    witching_hour: 0
-  start_with_consumables: # Start the game with full Deku Sticks and Deku Nuts.
-    false: 50
-    true: 0
-  start_with_rupees: # Start with a full wallet. Wallet upgrades will also fill your wallet.
-    false: 50
-    true: 0
-  item_pool_value: # Changes the number of items available in the game.
-    plentiful: 0
-    balanced: 50
-    scarce: 0
-    minimal: 0
-  junk_ice_traps: # Adds ice traps to the item pool.
-    off: 0
-    normal: 50
-    on: 0
-    mayhem: 0
-    onslaught: 0
-  ice_trap_appearance: # Changes the appearance of ice traps as freestanding items.
-    major_only: 50
-    junk_only: 0
-    anything: 0
-  logic_earliest_adult_trade: # Earliest item that can appear in the adult trade sequence.
-    pocket_egg: 0
-    pocket_cucco: 0
-    cojiro: 0
-    odd_mushroom: 0
-    poachers_saw: 0
-    broken_sword: 0
-    prescription: 50
-    eyeball_frog: 0
-    eyedrops: 0
-    claim_check: 0
-  logic_latest_adult_trade: # Latest item that can appear in the adult trade sequence.
-    pocket_egg: 0
-    pocket_cucco: 0
-    cojiro: 0
-    odd_mushroom: 0
-    poachers_saw: 0
-    broken_sword: 0
-    prescription: 0
-    eyeball_frog: 0
-    eyedrops: 0
-    claim_check: 50
+### 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
 
diff --git a/worlds/oot/docs/setup_fr.md b/worlds/oot/docs/setup_fr.md
index 57099cdf2e..f5915e1878 100644
--- a/worlds/oot/docs/setup_fr.md
+++ b/worlds/oot/docs/setup_fr.md
@@ -1,422 +1,70 @@
-# Guide d'installation Archipelago pour Ocarina of Time 
+# Guide de configuration pour Ocarina of Time Archipelago
 
 ## Important
 
-Comme nous utilisons BizHawk, ce guide ne s'applique qu'aux systèmes Windows et Linux.
+Comme nous utilisons BizHawk, ce guide s'applique uniquement aux systèmes Windows et Linux.
 
 ## Logiciel requis
 
-- BizHawk : [BizHawk sort de TASVideos] (https://tasvideos.org/BizHawk/ReleaseHistory)
-   - Les versions 2.3.1 et ultérieures sont prises en charge. La version 2.7 est recommandée pour la stabilité.
+- 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.7 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 prereq, qui peut également être trouvé 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)
-   (sélectionnez `Ocarina of Time Client` lors de l'installation).
+   (sélectionnez « Ocarina of Time Client » lors de l'installation).
 - Une ROM Ocarina of Time v1.0.
 
 ## Configuration de BizHawk
 
-Une fois BizHawk installé, ouvrez BizHawk et modifiez les paramètres suivants :
+Une fois BizHawk installé, ouvrez EmuHawk et modifiez les paramètres suivants :
 
-- Allez dans Config > Personnaliser. Basculez vers l'onglet Avancé, puis basculez le Lua Core de "NLua+KopiLua" vers
-   "Interface Lua+Lua". Redémarrez ensuite BizHawk. 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-le. Nouvelles installations**
-   ** des versions plus récentes de BizHawk ont tendance à afficher "Lua+LuaInterface" comme option sélectionnée par défaut mais se chargent toujours **
-   **"NLua+KopiLua" jusqu'à ce que cette étape soit terminée.**
-- Sous Config > Personnaliser > Avancé, assurez-vous que la case pour 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 plantage 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 de
-   continuer à jouer en arrière-plan, même si une autre fenêtre est sélectionnée.
-- Sous Config> Raccourcis clavier, de nombreux raccourcis clavier sont répertoriés, dont beaucoup sont liés aux touches communes du clavier. Vous voudrez probablement
-   désactiver la plupart d'entre eux, ce que vous pouvez faire rapidement en utilisant `Esc`.
-- Si vous jouez avec une manette, lorsque vous liez les commandes, désactivez "P1 A Up", "P1 A Down", "P1 A Left" et "P1 A Right"
-   car ceux-ci interfèrent avec la visée s'ils sont liés. Définissez l'entrée directionnelle à l'aide de l'onglet Analogique à la place.
-- Sous N64, activez "Utiliser l'emplacement d'extension". Ceci est nécessaire pour que les sauvegardes fonctionnent.
+- (≤ 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.
+- Sous Config > Hotkeys, de nombreux raccourcis clavier sont répertoriés, dont beaucoup sont liés aux touches communes du clavier. Vous voudrez probablement pour désactiver la plupart d'entre eux, ce que vous pouvez faire rapidement en utilisant « Esc ».
+- Si vous jouez avec une manette, lorsque vous associez des commandes, désactivez "P1 A Up", "P1 A Down", "P1 A Left" et "P1 A Right".
+   car ceux-ci interfèrent avec la visée s’ils sont liés. Définissez plutôt l'entrée directionnelle à l'aide de l'onglet Analogique.
+- Sous N64, activez "Utiliser le connecteur d'extension". Ceci est nécessaire pour que les états de sauvegarde fonctionnent.
    (Le menu N64 n'apparaît qu'après le chargement d'une ROM.)
 
-Il est fortement recommandé d'associer les extensions de rom N64 (\*.n64, \*.z64) au BizHawk que nous venons d'installer.
-Pour ce faire, nous devons simplement rechercher n'importe quelle rom N64 que nous possédons, faire un clic droit et sélectionner "Ouvrir avec ...", dépliez
-la liste qui apparaît et sélectionnez l'option du bas "Rechercher une autre application", puis naviguez jusqu'au dossier BizHawk
-et sélectionnez EmuHawk.exe.
+Il est fortement recommandé d'associer les extensions de rom N64 (\*.n64, \*.z64) à l'EmuHawk que nous venons d'installer.
+Pour ce faire, vous devez simplement rechercher n'importe quelle rom N64 que vous possédez, faire un clic droit et sélectionner "Ouvrir avec...", déplier la liste qui apparaît et sélectionnez l'option du bas "Rechercher une autre application", puis accédez au dossier BizHawk et sélectionnez EmuHawk.exe.
 
-Un guide de configuration BizHawk alternatif ainsi que divers conseils de dépannage peuvent être trouvés
+Un guide de configuration BizHawk alternatif ainsi que divers conseils de dépannage sont disponibles
 [ici](https://wiki.ootrandomizer.com/index.php?title=Bizhawk).
 
-## Configuration de votre fichier YAML
+## Créer un fichier de configuration (.yaml)
 
-### Qu'est-ce qu'un fichier YAML et pourquoi en ai-je besoin ?
+### Qu'est-ce qu'un fichier de configuration et pourquoi en ai-je besoin ?
 
-Votre fichier YAML contient un ensemble d'options de configuration qui fournissent au générateur des informations sur la façon dont il doit
-générer votre jeu. Chaque joueur d'un multimonde fournira son propre fichier YAML. Cette configuration permet à chaque joueur de profiter
-d'une expérience personnalisée à leur goût, et différents joueurs dans le même multimonde peuvent tous avoir des options différentes.
+Consultez le guide sur la configuration d'un YAML de base lors de la configuration de l'archipel.
+guide : [Guide de configuration de base de Multiworld](/tutorial/Archipelago/setup/en)
 
-### Où puis-je obtenir un fichier YAML ?
+### Où puis-je obtenir un fichier de configuration (.yaml) ?
 
-Un yaml OoT de base ressemblera à ceci. Il y a beaucoup d'options cosmétiques qui ont été supprimées pour le plaisir de ce
-tutoriel, si vous voulez voir une liste complète, téléchargez Archipelago depuis
-la [Archipelago Releases Page](https://github.com/ArchipelagoMW/Archipelago/releases) et recherchez l'exemple de fichier dans
-le dossier "Lecteurs".
+La page Paramètres du lecteur sur le site Web vous permet de configurer vos paramètres personnels et d'exporter un fichier de configuration depuis eux. Page des paramètres du joueur : [Page des paramètres du joueur d'Ocarina of Time](/games/Ocarina%20of%20Time/player-settings)
 
-``` yaml
-description: Modèle par défaut d'Ocarina of Time # Utilisé pour décrire votre yaml. Utile si vous avez plusieurs fichiers
-# Votre nom dans le jeu. Les espaces seront remplacés par des underscores et il y a une limite de 16 caractères
-name: VotreNom
-game:
-  Ocarina of Time: 1
-requires:
-  version: 0.1.7 # Version d'Archipelago requise pour que ce yaml fonctionne comme prévu.
-# Options partagées prises en charge par tous les jeux :
-accessibility:
-  items: 0 # Garantit que vous pourrez acquérir tous les articles, mais vous ne pourrez peut-être pas accéder à tous les emplacements
-  locations: 50 # Garantit que vous pourrez accéder à tous les emplacements, et donc à tous les articles
-  none: 0 # Garantit seulement que le jeu est battable. Vous ne pourrez peut-être pas accéder à tous les emplacements ou acquérir tous les objets
-progression_balancing: # Un système pour réduire le BK, comme dans les périodes où vous ne pouvez rien faire, en déplaçant vos éléments dans une sphère d'accès antérieure
-  0: 0 # Choisissez un nombre inférieur si cela ne vous dérange pas d'avoir un multimonde plus long, ou si vous pouvez glitch / faire du hors logique.
-  25: 0
-  50: 50 # Faites en sorte que vous ayez probablement des choses à faire.
-  99: 0 # Obtenez les éléments importants tôt et restez en tête de la progression.
-Ocarina of Time:
-  logic_rules: # définit la logique utilisée pour le générateur.
-    glitchless: 50
-    glitched: 0
-    no_logic: 0
-  logic_no_night_tokens_without_suns_song: # Les skulltulas nocturnes nécessiteront logiquement le Chant du soleil.
-    false: 50
-    true: 0
-  open_forest: # Définissez l'état de la forêt de Kokiri et du chemin vers l'arbre Mojo.
-    open: 50
-    closed_deku: 0
-    closed: 0
-  open_kakariko: # Définit l'état de la porte du village de Kakariko.
-    open: 50
-    zelda: 0
-    closed: 0
-  open_door_of_time: # Ouvre la Porte du Temps par défaut, sans le Chant du Temps.
-    false: 0
-    true: 50
-  zora_fountain: # Définit l'état du roi Zora, bloquant le chemin vers la fontaine de Zora.
-    open: 0
-    adult: 0
-    closed: 50
-  gerudo_fortress: # Définit les conditions d'accès à la forteresse Gerudo.
-    normal: 0
-    fast: 50
-    open: 0
-  bridge: # Définit les exigences pour le pont arc-en-ciel.
-    open: 0
-    vanilla: 0
-    stones: 0
-    medallions: 50
-    dungeons: 0
-    tokens: 0
-  trials: # Définit le nombre d'épreuves requises dans le Château de Ganon.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    0: 50 # valeur minimale
-    6: 0 # valeur maximale
-    random: 0
-    random-low: 0
-    random-higt: 0
-  starting_age: # Choisissez l'âge auquel Link commencera.
-    child: 50
-    adult: 0
-  triforce_hunt: # Rassemblez des morceaux de la Triforce dispersés dans le monde entier pour terminer le jeu.
-    false: 50
-    true: 0
-  triforce_goal: # Nombre de pièces Triforce nécessaires pour terminer le jeu. Nombre total placé déterminé par le paramètre Item Pool.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    1: 0 # valeur minimale
-    50: 0 # valeur maximale
-    random: 0
-    random-low: 0
-    random-higt: 0
-    20: 50
-  bombchus_in_logic: # Les Bombchus sont correctement pris en compte dans la logique. Le premier pack trouvé aura 20 chus ; Kokiri Shop et Bazaar vendent des recharges ; bombchus ouvre Bombchu Bowling.
-    false: 50
-    true: 0
-  bridge_stones: # Définissez le nombre de pierres spirituelles requises pour le pont arc-en-ciel.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    0: 0 # valeur minimale
-    3: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  bridge_medallions: # Définissez le nombre de médaillons requis pour le pont arc-en-ciel.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    0: 0 # valeur minimale
-    6: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  bridge_rewards: # Définissez le nombre de récompenses de donjon requises pour le pont arc-en-ciel.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    0: 0 # valeur minimale
-    9: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  bridge_tokens: # Définissez le nombre de jetons Gold Skulltula requis pour le pont arc-en-ciel.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    0: 0 # valeur minimale
-    100: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  shuffle_mapcompass: # Contrôle où mélanger les cartes et boussoles des donjons.
-    remove: 0
-    startwith: 50
-    vanilla: 0
-    dungeon: 0
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_smallkeys: # Contrôle où mélanger les petites clés de donjon.
-    remove: 0
-    vanilla: 0
-    dungeon: 50
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_hideoutkeys: # Contrôle où mélanger les petites clés de la Forteresse Gerudo.
-    vanilla: 50
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_bosskeys: # Contrôle où mélanger les clés du boss, à l'exception de la clé du boss du château de Ganon.
-    remove: 0
-    vanilla: 0
-    dungeon: 50
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-  shuffle_ganon_bosskey: # Contrôle où mélanger la clé du patron du château de Ganon.
-    remove: 50
-    vanilla: 0
-    dungeon: 0
-    overworld: 0
-    any_dungeon: 0
-    keysanity: 0
-    on_lacs: 0
-  enhance_map_compass: # La carte indique si un donjon est vanille ou MQ. La boussole indique quelle est la récompense du donjon.
-    false: 50
-    true: 0
-  lacs_condition: # Définissez les exigences pour la cinématique de la Flèche lumineuse dans le Temple du temps.
-    vanilla: 50
-    stones: 0
-    medallions: 0
-    dungeons: 0
-    tokens: 0
-  lacs_stones: # Définissez le nombre de pierres spirituelles requises pour le LACS.
-     # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-     0: 0 # valeur minimale
-     3: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  lacs_medallions: # Définissez le nombre de médaillons requis pour LACS.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    0: 0 # valeur minimale
-    6: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  lacs_rewards: # Définissez le nombre de récompenses de donjon requises pour LACS.
-    # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-    0: 0 # valeur minimale
-    9: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  lacs_tokens: # Définissez le nombre de jetons Gold Skulltula requis pour le LACS.
-     # vous pouvez ajouter des valeurs supplémentaires entre minimum et maximum
-     0: 0 # valeur minimale
-     100: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  shuffle_song_items: # Définit où les chansons peuvent apparaître.
-    song: 50
-    dungeon: 0
-    any: 0
-  shopsanity: # Randomise le contenu de la boutique. Réglez sur "off" pour ne pas mélanger les magasins ; "0" mélange les magasins mais ne n'autorise pas les articles multimonde dans les magasins.
-    0: 0
-    1: 0
-    2: 0
-    3: 0
-    4: 0
-    random_value: 0
-    off: 50
-  tokensanity : # les récompenses en jetons des Skulltulas dorées sont mélangées dans la réserve.
-    off: 50
-    dungeons: 0
-    overworld: 0
-    all: 0
-  shuffle_scrubs: # Mélangez les articles vendus par Business Scrubs et fixez les prix.
-    off: 50
-    low: 0
-    regular: 0
-    random_prices: 0
-  shuffle_cows: # les vaches donnent des objets lorsque la chanson d'Epona est jouée.
-    false: 50
-    true: 0
-  shuffle_kokiri_sword: # Mélangez l'épée Kokiri dans la réserve d'objets.
-    false: 50
-    true: 0
-  shuffle_ocarinas: # Mélangez l'Ocarina des fées et l'Ocarina du temps dans la réserve d'objets.
-    false: 50
-    true: 0
-  shuffle_weird_egg: # Mélangez l'œuf bizarre de Malon au château d'Hyrule.
-    false: 50
-    true: 0
-  shuffle_gerudo_card: # Mélangez la carte de membre Gerudo dans la réserve d'objets.
-    false: 50
-    true: 0
-  shuffle_beans: # Ajoute un paquet de 10 haricots au pool d'objets et change le vendeur de haricots pour qu'il vende un objet pour 60 roupies.
-    false: 50
-    true: 0
-  shuffle_medigoron_carpet_salesman: # Mélangez les objets vendus par Medigoron et le vendeur de tapis Haunted Wasteland.
-    false: 50
-    true: 0
-  skip_child_zelda: # le jeu commence avec la lettre de Zelda, l'objet de la berceuse de Zelda et les événements pertinents déjà terminés.
-    false: 50
-    true: 0
-  no_escape_sequence: # Ignore la séquence d'effondrement de la tour entre les combats de Ganondorf et de Ganon.
-    false: 50
-    true: 0
-  no_guard_stealth: # Le vide sanitaire du château d'Hyrule passe directement à Zelda.
-    false: 50
-    true: 0
-  no_epona_race: # Epona peut toujours être invoquée avec Epona's Song.
-    false: 50
-    true: 0
-  skip_some_minigame_phases: # Dampe Race et Horseback Archery donnent les deux récompenses si la deuxième condition est remplie lors de la première tentative.
-    false: 50
-    true: 0
-   complete_mask_quest: # Tous les masques sont immédiatement disponibles à l'emprunt dans la boutique Happy Mask.
-    false: 50
-    true: 0
-  useful_cutscenes: # Réactive la cinématique Poe dans le Temple de la forêt, Darunia dans le Temple du feu et l'introduction de Twinrova. Surtout utile pour les pépins.
-    false: 50
-    true: 0
-  fast_chests: # Toutes les animations des coffres sont rapides. Si désactivé, les éléments principaux ont une animation lente.
-    false: 50
-    true: 0
-  free_scarecrow: # Sortir l'ocarina près d'un point d'épouvantail fait apparaître Pierre sans avoir besoin de la chanson.
-    false: 50
-    true: 0
-  fast_bunny_hood: # Bunny Hood vous permet de vous déplacer 1,5 fois plus vite comme dans Majora's Mask.
-    false: 50
-    true: 0
-  chicken_count: # Contrôle le nombre de Cuccos pour qu'Anju donne un objet en tant qu'enfant.
-    \# vous pouvez ajouter des valeurs supplémentaires entre le minimum et le maximum
-    0: 0 # valeur minimale
-    7: 50 # valeur maximale
-    random: 0
-    random-low: 0
-    random-high: 0
-  hints: # les pierres à potins peuvent donner des indices sur l'emplacement des objets.
-    none: 0
-    mask: 0
-    agony: 0
-    always: 50
-  hint_dist: # Choisissez la distribution d'astuces à utiliser. Affecte la fréquence des indices forts, quels éléments sont toujours indiqués, etc.
-    balanced: 50
-    ddr: 0
-    league: 0
-    mw2: 0
-    scrubs: 0
-    strong: 0
-    tournament: 0
-    useless: 0
-    very_strong: 0
-  text_shuffle: # Randomise le texte dans le jeu pour un effet comique.
-    none: 50
-    except_hints: 0
-    complete: 0
-  damage_multiplier: # contrôle la quantité de dégâts subis par Link.
-    half: 0
-    normal: 50
-    double: 0
-    quadruple: 0
-    ohko: 0
-  no_collectible_hearts: # les cœurs ne tomberont pas des ennemis ou des objets.
-    false: 50
-    true: 0
-  starting_tod: # Changer l'heure de début de la journée.
-    default: 50
-    sunrise: 0
-    morning: 0
-    noon: 0
-    afternoon: 0
-    sunset: 0
-    evening: 0
-    midnight: 0
-    witching_hour: 0
-  start_with_consumables: # Démarrez le jeu avec des Deku Sticks et des Deku Nuts pleins.
-    false: 50
-    true: 0
-  start_with_rupees: # Commencez avec un portefeuille plein. Les mises à niveau de portefeuille rempliront également votre portefeuille.
-    false: 50
-    true: 0
-  item_pool_value: # modifie le nombre d'objets disponibles dans le jeu.
-    plentiful: 0
-    balanced: 50
-    scarce: 0
-    minimal: 0
-  junk_ice_traps: # Ajoute des pièges à glace au pool d'objets.
-    off: 0
-    normal: 50
-    on: 0
-    mayhem: 0
-    onslaught: 0
-  ice_trap_appearance: # modifie l'apparence des pièges à glace en tant qu'éléments autonomes.
-    major_only: 50
-    junk_only: 0
-    anything: 0
-  logic_earliest_adult_trade: # premier élément pouvant apparaître dans la séquence d'échange pour adultes.
-    pocket_egg: 0
-    pocket_cucco: 0
-    cojiro: 0
-    odd_mushroom: 0
-    poachers_saw: 0
-    broken_sword: 0
-    prescription: 50
-    eyeball_frog: 0
-    eyedrops: 0
-    claim_check: 0
-  logic_latest_adult_trade: # Dernier élément pouvant apparaître dans la séquence d'échange pour adultes.
-    pocket_egg: 0
-    pocket_cucco: 0
-    cojiro: 0
-    odd_mushroom: 0
-    poachers_saw: 0
-    broken_sword: 0
-    prescription: 0
-    eyeball_frog: 0
-    eyedrops: 0
-    claim_check: 50
+### Vérification de votre fichier de configuration
 
-```
+Si vous souhaitez valider votre fichier de configuration pour vous assurer qu'il fonctionne, vous pouvez le faire sur la page YAML Validator. 
+YAML page du validateur : [page de validation YAML](/mysterycheck)
 
-## Rejoindre une partie MultiWorld
+## Rejoindre un jeu multimonde
 
-### Obtenez votre fichier de correctif OOT
+### Obtenez votre fichier OOT modifié
 
-Lorsque vous rejoignez un jeu multimonde, il vous sera demandé de fournir votre fichier YAML à l'hébergeur. Une fois que c'est Fini,
-l'hébergeur vous fournira soit un lien pour télécharger votre fichier de données, soit un fichier zip contenant les données de chacun
-des dossiers. Votre fichier de données doit avoir une extension `.apz5`.
+Lorsque vous rejoignez un jeu multimonde, il vous sera demandé de fournir votre fichier YAML à celui qui l'héberge. Une fois cela fait, l'hébergeur vous fournira soit un lien pour télécharger votre fichier de données, soit un fichier zip contenant les données de chacun des dossiers. Votre fichier de données doit avoir une extension « .apz5 ».
 
-Double-cliquez sur votre fichier `.apz5` pour démarrer votre client et démarrer le processus de patch ROM. Une fois le processus terminé
-(cela peut prendre un certain temps), le client et l'émulateur seront lancés automatiquement (si vous avez associé l'extension
-à l'émulateur comme recommandé).
+Double-cliquez sur votre fichier « .apz5 » pour démarrer votre client et démarrer le processus de correctif ROM. Une fois le processus terminé (cela peut prendre un certain temps), le client et l'émulateur seront automatiquement démarrés (si vous avez associé l'extension à l'émulateur comme recommandé).
 
 ### Connectez-vous au multiserveur
 
-Une fois le client et l'émulateur démarrés, vous devez les connecter. Dans l'émulateur, cliquez sur "Outils"
-menu et sélectionnez "Console Lua". Cliquez sur le bouton du dossier ou appuyez sur Ctrl+O pour ouvrir un script Lua.
+Une fois le client et l'émulateur démarrés, vous devez les connecter. Accédez à votre dossier d'installation Archipelago, puis vers `data/lua`, et faites glisser et déposez le script `connector_oot.lua` sur la fenêtre principale d'EmuHawk. (Vous pourrez plutôt ouvrir depuis la console Lua manuellement, cliquez sur `Script` 〉 `Open Script` et accédez à `connector_oot.lua` avec le sélecteur de fichiers.)
 
-Accédez à votre dossier d'installation Archipelago et ouvrez `data/lua/connector_oot.lua`.
+Pour connecter le client au multiserveur, mettez simplement `<adresse>:<port>` dans le champ de texte en haut et appuyez sur Entrée (si le serveur utilise un mot de passe, tapez dans le champ de texte inférieur `/connect <adresse>:<port> [mot de passe]`)
 
-Pour connecter le client au multiserveur, mettez simplement `<adresse>:<port>` dans le champ de texte en haut et appuyez sur Entrée (si le
-le serveur utilise un mot de passe, saisissez dans le champ de texte inférieur `/connect <adresse>:<port> [mot de passe]`)
-
-Vous êtes maintenant prêt à commencer votre aventure à Hyrule.
+Vous êtes maintenant prêt à commencer votre aventure dans Hyrule.
\ No newline at end of file
diff --git a/worlds/overcooked2/Logic.py b/worlds/overcooked2/Logic.py
index d8468cb59a..20111aa01d 100644
--- a/worlds/overcooked2/Logic.py
+++ b/worlds/overcooked2/Logic.py
@@ -18,7 +18,7 @@ def has_requirements_for_level_access(state: CollectionState, level_name: str, p
         return state.has(level_name, player)
 
     # Must have enough stars to purchase level
-    star_count = state.item_count("Star", player) + state.item_count("Bonus Star", player)
+    star_count = state.count("Star", player) + state.count("Bonus Star", player)
     if star_count < required_star_count:
         return False
 
@@ -64,7 +64,7 @@ def meets_requirements(state: CollectionState, name: str, stars: int, player: in
 
     total: float = 0.0
     for (item_name, weight) in additive_reqs:
-        for _ in range(0, state.item_count(item_name, player)):
+        for _ in range(0, state.count(item_name, player)):
             total += weight
             if total >= 0.99:  # be nice to rounding errors :)
                 return True
diff --git a/worlds/overcooked2/Options.py b/worlds/overcooked2/Options.py
index 9ddcf5e85f..18a2c18ed4 100644
--- a/worlds/overcooked2/Options.py
+++ b/worlds/overcooked2/Options.py
@@ -1,6 +1,7 @@
+from dataclasses import dataclass
 from enum import IntEnum
 from typing import TypedDict
-from Options import DefaultOnToggle, Toggle, Range, Choice, OptionSet
+from Options import DefaultOnToggle, PerGameCommonOptions, Toggle, Range, Choice, OptionSet
 from .Overcooked2Levels import Overcooked2Dlc
 
 class LocationBalancingMode(IntEnum):
@@ -167,32 +168,30 @@ class StarThresholdScale(Range):
     default = 35
 
 
-overcooked_options = {
+@dataclass
+class OC2Options(PerGameCommonOptions):
     # generator options
-    "location_balancing": LocationBalancing,
-    "ramp_tricks": RampTricks,
-
+    location_balancing: LocationBalancing
+    ramp_tricks: RampTricks
+    
     # deathlink
-    "deathlink": DeathLink,
-
+    deathlink: DeathLink
+    
     # randomization options
-    "shuffle_level_order": ShuffleLevelOrder,
-    "include_dlcs": DLCOptionSet,
-    "include_horde_levels": IncludeHordeLevels,
-    "prep_levels": PrepLevels,
-    "kevin_levels": KevinLevels,
-
+    shuffle_level_order: ShuffleLevelOrder
+    include_dlcs: DLCOptionSet
+    include_horde_levels: IncludeHordeLevels
+    prep_levels: PrepLevels
+    kevin_levels: KevinLevels
+    
     # quality of life options
-    "fix_bugs": FixBugs,
-    "shorter_level_duration": ShorterLevelDuration,
-    "short_horde_levels": ShortHordeLevels,
-    "always_preserve_cooking_progress": AlwaysPreserveCookingProgress,
-    "always_serve_oldest_order": AlwaysServeOldestOrder,
-    "display_leaderboard_scores": DisplayLeaderboardScores,
-
+    fix_bugs: FixBugs
+    shorter_level_duration: ShorterLevelDuration
+    short_horde_levels: ShortHordeLevels
+    always_preserve_cooking_progress: AlwaysPreserveCookingProgress
+    always_serve_oldest_order: AlwaysServeOldestOrder
+    display_leaderboard_scores: DisplayLeaderboardScores
+    
     # difficulty settings
-    "stars_to_win": StarsToWin,
-    "star_threshold_scale": StarThresholdScale,
-}
-
-OC2Options = TypedDict("OC2Options", {option.__name__: option for option in overcooked_options.values()})
+    stars_to_win: StarsToWin
+    star_threshold_scale: StarThresholdScale
diff --git a/worlds/overcooked2/__init__.py b/worlds/overcooked2/__init__.py
index afffa744fa..0451f32bdd 100644
--- a/worlds/overcooked2/__init__.py
+++ b/worlds/overcooked2/__init__.py
@@ -6,7 +6,7 @@ from worlds.AutoWorld import World, WebWorld
 
 from .Overcooked2Levels import Overcooked2Dlc, Overcooked2Level, Overcooked2GenericLevel
 from .Locations import Overcooked2Location, oc2_location_name_to_id, oc2_location_id_to_name
-from .Options import overcooked_options, OC2Options, OC2OnToggle, LocationBalancingMode, DeathLinkMode
+from .Options import OC2Options, OC2OnToggle, LocationBalancingMode, DeathLinkMode
 from .Items import item_table, Overcooked2Item, item_name_to_id, item_id_to_name, item_to_unlock_event, item_frequencies, dlc_exclusives
 from .Logic import has_requirements_for_level_star, has_requirements_for_level_access, level_shuffle_factory, is_item_progression, is_useful
 
@@ -47,7 +47,6 @@ class Overcooked2World(World):
     game = "Overcooked! 2"
     web = Overcooked2Web()
     required_client_version = (0, 3, 8)
-    option_definitions = overcooked_options
     topology_present: bool = False
     data_version = 3
 
@@ -57,13 +56,14 @@ class Overcooked2World(World):
     location_id_to_name = oc2_location_id_to_name
     location_name_to_id = oc2_location_name_to_id
 
-    options: Dict[str, Any]
+    options_dataclass = OC2Options
+    options: OC2Options
     itempool: List[Overcooked2Item]
 
     # Helper Functions
 
     def is_level_horde(self, level_id: int) -> bool:
-        return self.options["IncludeHordeLevels"] and \
+        return self.options.include_horde_levels and \
             (self.level_mapping is not None) and \
             level_id in self.level_mapping.keys() and \
             self.level_mapping[level_id].is_horde
@@ -145,11 +145,6 @@ class Overcooked2World(World):
             location
         )
 
-    def get_options(self) -> Dict[str, Any]:
-        return OC2Options({option.__name__: getattr(self.multiworld, name)[self.player].result
-                          if issubclass(option, OC2OnToggle) else getattr(self.multiworld, name)[self.player].value
-                           for name, option in overcooked_options.items()})
-
     def get_n_random_locations(self, n: int) -> List[int]:
         """Return a list of n random non-repeating level locations"""
         levels = list()
@@ -160,7 +155,7 @@ class Overcooked2World(World):
         for level in Overcooked2Level():
             if level.level_id == 36:
                 continue
-            elif not self.options["KevinLevels"] and level.level_id > 36:
+            elif not self.options.kevin_levels and level.level_id > 36:
                 break
 
             levels.append(level.level_id)
@@ -177,7 +172,7 @@ class Overcooked2World(World):
             # random priority locations have no desirable effect on solo seeds
             return list()
 
-        balancing_mode = self.get_options()["LocationBalancing"]
+        balancing_mode = self.options.location_balancing
 
         if balancing_mode == LocationBalancingMode.disabled:
             # Location balancing is disabled, progression density is purely determined by filler
@@ -231,26 +226,25 @@ class Overcooked2World(World):
 
     def generate_early(self):
         self.player_name = self.multiworld.player_name[self.player]
-        self.options = self.get_options()
 
         # 0.0 to 1.0 where 1.0 is World Record
-        self.star_threshold_scale = self.options["StarThresholdScale"] / 100.0
+        self.star_threshold_scale = self.options.star_threshold_scale / 100.0
 
         # Parse DLCOptionSet back into enums
-        self.enabled_dlc = {Overcooked2Dlc(x) for x in self.options["DLCOptionSet"]}
+        self.enabled_dlc = {Overcooked2Dlc(x) for x in self.options.include_dlcs.value}
 
         # Generate level unlock requirements such that the levels get harder to unlock
         # the further the game has progressed, and levels progress radially rather than linearly
-        self.level_unlock_counts = level_unlock_requirement_factory(self.options["StarsToWin"])
+        self.level_unlock_counts = level_unlock_requirement_factory(self.options.stars_to_win.value)
 
         # Assign new kitchens to each spot on the overworld using pure random chance and nothing else
-        if self.options["ShuffleLevelOrder"]:
+        if self.options.shuffle_level_order:
             self.level_mapping = \
                 level_shuffle_factory(
                     self.multiworld.random,
-                    self.options["PrepLevels"] != PrepLevelMode.excluded,
-                    self.options["IncludeHordeLevels"],
-                    self.options["KevinLevels"],
+                    self.options.prep_levels != PrepLevelMode.excluded,
+                    self.options.include_horde_levels.result,
+                    self.options.kevin_levels.result,
                     self.enabled_dlc,
                     self.player_name,
                 )
@@ -277,7 +271,7 @@ class Overcooked2World(World):
 
         # Create and populate "regions" (a.k.a. levels)
         for level in Overcooked2Level():
-            if not self.options["KevinLevels"] and level.level_id > 36:
+            if not self.options.kevin_levels and level.level_id > 36:
                 break
 
             # Create Region (e.g. "1-1")
@@ -336,7 +330,7 @@ class Overcooked2World(World):
 
             level_access_rule: Callable[[CollectionState], bool] = \
                 lambda state, level_name=level.level_name, previous_level_completed_event_name=previous_level_completed_event_name, required_star_count=required_star_count: \
-                has_requirements_for_level_access(state, level_name, previous_level_completed_event_name, required_star_count, self.options["RampTricks"], self.player)
+                has_requirements_for_level_access(state, level_name, previous_level_completed_event_name, required_star_count, self.options.ramp_tricks.result, self.player)
             self.connect_regions("Overworld", level.level_name, level_access_rule)
 
             # Level --> Overworld
@@ -369,11 +363,11 @@ class Overcooked2World(World):
                     # Item is always useless with these settings
                     continue
 
-            if not self.options["IncludeHordeLevels"] and item_name in ["Calmer Unbread", "Coin Purse"]:
+            if not self.options.include_horde_levels and item_name in ["Calmer Unbread", "Coin Purse"]:
                 # skip horde-specific items if no horde levels
                 continue
 
-            if not self.options["KevinLevels"]:
+            if not self.options.kevin_levels:
                 if item_name.startswith("Kevin"):
                     # skip kevin items if no kevin levels
                     continue
@@ -382,7 +376,7 @@ class Overcooked2World(World):
                     # skip dark green ramp if there's no Kevin-1 to reveal it
                     continue
 
-            if is_item_progression(item_name, self.level_mapping, self.options["KevinLevels"]):
+            if is_item_progression(item_name, self.level_mapping, self.options.kevin_levels):
                 # progression.append(item_name)
                 classification = ItemClassification.progression
             else:
@@ -404,7 +398,7 @@ class Overcooked2World(World):
 
         # Fill any free space with filler
         pool_count = len(oc2_location_name_to_id)
-        if not self.options["KevinLevels"]:
+        if not self.options.kevin_levels:
             pool_count -= 8
 
         while len(self.itempool) < pool_count:
@@ -416,7 +410,7 @@ class Overcooked2World(World):
     def place_events(self):
         # Add Events (Star Acquisition)
         for level in Overcooked2Level():
-            if not self.options["KevinLevels"] and level.level_id > 36:
+            if not self.options.kevin_levels and level.level_id > 36:
                 break
 
             if level.level_id != 36:
@@ -449,7 +443,7 @@ class Overcooked2World(World):
         # Serialize Level Order
         story_level_order = dict()
 
-        if self.options["ShuffleLevelOrder"]:
+        if self.options.shuffle_level_order:
             for level_id in self.level_mapping:
                 level: Overcooked2GenericLevel = self.level_mapping[level_id]
                 story_level_order[str(level_id)] = {
@@ -481,7 +475,7 @@ class Overcooked2World(World):
                 level_unlock_requirements[str(level_id)] = level_id - 1
 
         # Set Kevin Unlock Requirements
-        if self.options["KevinLevels"]:
+        if self.options.kevin_levels:
             def kevin_level_to_keyholder_level_id(level_id: int) -> Optional[int]:
                 location = self.multiworld.find_item(f"Kevin-{level_id-36}", self.player)
                 if location.player != self.player:
@@ -506,7 +500,7 @@ class Overcooked2World(World):
             on_level_completed[level_id] = [item_to_unlock_event(location.item.name)]
 
         # Put it all together
-        star_threshold_scale = self.options["StarThresholdScale"] / 100
+        star_threshold_scale = self.options.star_threshold_scale / 100
 
         base_data = {
             # Changes Inherent to rando
@@ -528,13 +522,13 @@ class Overcooked2World(World):
             "SaveFolderName": mod_name,
             "CustomOrderTimeoutPenalty": 10,
             "LevelForceHide": [37, 38, 39, 40, 41, 42, 43, 44],
-            "LocalDeathLink": self.options["DeathLink"] != DeathLinkMode.disabled,
-            "BurnTriggersDeath": self.options["DeathLink"] == DeathLinkMode.death_and_overcook,
+            "LocalDeathLink": self.options.deathlink != DeathLinkMode.disabled,
+            "BurnTriggersDeath": self.options.deathlink == DeathLinkMode.death_and_overcook,
 
             # Game Modifications
             "LevelPurchaseRequirements": level_purchase_requirements,
             "Custom66TimerScale": max(0.4, 0.25 + (1.0 - star_threshold_scale)*0.6),
-            "ShortHordeLevels": self.options["ShortHordeLevels"],
+            "ShortHordeLevels": self.options.short_horde_levels.result,
             "CustomLevelOrder": custom_level_order,
 
             # Items (Starting Inventory)
@@ -580,28 +574,28 @@ class Overcooked2World(World):
         # Set remaining data in the options dict
         bugs = ["FixDoubleServing", "FixSinkBug", "FixControlStickThrowBug", "FixEmptyBurnerThrow"]
         for bug in bugs:
-            self.options[bug] = self.options["FixBugs"]
-        self.options["PreserveCookingProgress"] = self.options["AlwaysPreserveCookingProgress"]
-        self.options["TimerAlwaysStarts"] = self.options["PrepLevels"] == PrepLevelMode.ayce
-        self.options["LevelTimerScale"] = 0.666 if self.options["ShorterLevelDuration"] else 1.0
-        self.options["LeaderboardScoreScale"] = {
+            base_data[bug] = self.options.fix_bugs.result
+        base_data["PreserveCookingProgress"] = self.options.always_preserve_cooking_progress.result
+        base_data["TimerAlwaysStarts"] = self.options.prep_levels == PrepLevelMode.ayce
+        base_data["LevelTimerScale"] = 0.666 if self.options.shorter_level_duration else 1.0
+        base_data["LeaderboardScoreScale"] = {
             "FourStars": 1.0,
             "ThreeStars": star_threshold_scale,
             "TwoStars": star_threshold_scale * 0.75,
             "OneStar": star_threshold_scale * 0.35,
         }
+        base_data["AlwaysServeOldestOrder"] = self.options.always_serve_oldest_order.result
 
-        base_data.update(self.options)
         return base_data
 
     def fill_slot_data(self) -> Dict[str, Any]:
         return self.fill_json_data()
 
     def write_spoiler(self, spoiler_handle: TextIO) -> None:
-        if not self.options["ShuffleLevelOrder"]:
+        if not self.options.shuffle_level_order:
             return
 
-        world: Overcooked2World = self.multiworld.worlds[self.player]
+        world: Overcooked2World = self
         spoiler_handle.write(f"\n\n{self.player_name}'s Level Order:\n\n")
         for overworld_id in world.level_mapping:
             overworld_name = Overcooked2GenericLevel(overworld_id).shortname.split("Story ")[1]
diff --git a/worlds/pokemon_emerald/LICENSE b/worlds/pokemon_emerald/LICENSE
new file mode 100644
index 0000000000..30b4f413fe
--- /dev/null
+++ b/worlds/pokemon_emerald/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2023 Zunawe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/worlds/pokemon_emerald/README.md b/worlds/pokemon_emerald/README.md
new file mode 100644
index 0000000000..2c1e9e3560
--- /dev/null
+++ b/worlds/pokemon_emerald/README.md
@@ -0,0 +1,58 @@
+# Pokemon Emerald
+
+Version 1.2.1
+
+This README contains general info useful for understanding the world. Pretty much all the long lists of locations,
+regions, and items are stored in `data/` and (mostly) loaded in by `data.py`. Access rules are in `rules.py`. Check
+[data/README.md](data/README.md) for more detailed information on the JSON files holding most of the data.
+
+## Warps
+
+Quick note to start, you should not be defining or modifying encoded warps from this repository. They're encoded in the
+source code repository for the mod, and then assigned to regions in `data/regions/`. All warps in the game already exist
+within `extracted_data.json`, and all relevant warps are already placed in `data/regions/` (unless they were deleted
+accidentally).
+
+Many warps are actually two or three events acting as one logical warp. Doorways, for example, are often 2 tiles wide
+indoors but only 1 tile wide outdoors. Both indoor warps point to the outdoor warp, and the outdoor warp points to only
+one of the indoor warps. We want to describe warps logically in a way that retains information about individual warp
+events. That way a 2-tile-wide doorway doesnt look like a one-way warp next to an unrelated two-way warp, but if we want
+to randomize the destinations of those warps, we can still get back each individual id of the multi-tile warp.
+
+This is how warps are encoded:
+
+`{source_map}:{source_warp_ids}/{dest_map}:{dest_warp_ids}[!]`
+
+- `source_map`: The map the warp events are located in
+- `source_warp_ids`: The ids of all adjacent warp events in source_map which lead to the same destination (these must be
+in ascending order)
+- `dest_map`: The map of the warp event to which this one is connected
+- `dest_warp_ids`: The ids of the warp events in dest_map
+- `[!]`: If the warp expects to lead to a destination which doesnot lead back to it, add a ! to the end
+
+Example: `MAP_LAVARIDGE_TOWN_HOUSE:0,1/MAP_LAVARIDGE_TOWN:4`
+
+Example 2: `MAP_AQUA_HIDEOUT_B1F:14/MAP_AQUA_HIDEOUT_B1F:12!`
+
+Note: A warp must have its destination set to another warp event. However, that does not guarantee that the destination
+warp event will warp back to the source.
+
+Note 2: Some warps _only_ act as destinations and cannot actually be interacted with by the player as sources. These are
+usually places you fall from a hole above. At the time of writing, these are actually not accounted for, but there are
+no instances where it changes logical access.
+
+Note 3: Some warp destinations go to the map `MAP_DYNAMIC` and have a special warp id. These edge cases are:
+
+- The Moving Truck
+- Terra Cave
+- Marine Cave
+- The Department Store Elevator
+- Secret Bases
+- The Trade Center
+- The Union Room
+- The Record Corner
+- 2P/4P Battle Colosseum
+
+Note 4: The trick house on Route 110 changes the warp destinations of its entrance and ending room as you progress
+through the puzzles, but the source code only sets the trick house up for the first puzzle, and I assume the destination
+gets overwritten at run time when certain flags are set.
diff --git a/worlds/pokemon_emerald/__init__.py b/worlds/pokemon_emerald/__init__.py
new file mode 100644
index 0000000000..b7730fbdf7
--- /dev/null
+++ b/worlds/pokemon_emerald/__init__.py
@@ -0,0 +1,882 @@
+"""
+Archipelago World definition for Pokemon Emerald Version
+"""
+from collections import Counter
+import copy
+import logging
+import os
+from typing import Any, Set, List, Dict, Optional, Tuple, ClassVar
+
+from BaseClasses import ItemClassification, MultiWorld, Tutorial
+from Fill import FillError, fill_restrictive
+from Options import Toggle
+import settings
+from worlds.AutoWorld import WebWorld, World
+
+from .client import PokemonEmeraldClient  # Unused, but required to register with BizHawkClient
+from .data import (SpeciesData, MapData, EncounterTableData, LearnsetMove, TrainerPokemonData, StaticEncounterData,
+                   TrainerData, data as emerald_data)
+from .items import (ITEM_GROUPS, PokemonEmeraldItem, create_item_label_to_code_map, get_item_classification,
+                    offset_item_value)
+from .locations import (LOCATION_GROUPS, PokemonEmeraldLocation, create_location_label_to_id_map,
+                        create_locations_with_tags)
+from .options import (ItemPoolType, RandomizeWildPokemon, RandomizeBadges, RandomizeTrainerParties, RandomizeHms,
+                      RandomizeStarters, LevelUpMoves, RandomizeAbilities, RandomizeTypes, TmCompatibility,
+                      HmCompatibility, RandomizeStaticEncounters, NormanRequirement, PokemonEmeraldOptions)
+from .pokemon import get_random_species, get_random_move, get_random_damaging_move, get_random_type
+from .regions import create_regions
+from .rom import PokemonEmeraldDeltaPatch, generate_output, location_visited_event_to_id_map
+from .rules import set_rules
+from .sanity_check import validate_regions
+from .util import int_to_bool_array, bool_array_to_int
+
+
+class PokemonEmeraldWebWorld(WebWorld):
+    """
+    Webhost info for Pokemon Emerald
+    """
+    theme = "ocean"
+    setup_en = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to playing Pokémon Emerald with Archipelago.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Zunawe"]
+    )
+
+    tutorials = [setup_en]
+
+
+class PokemonEmeraldSettings(settings.Group):
+    class PokemonEmeraldRomFile(settings.UserFilePath):
+        """File name of your English Pokemon Emerald ROM"""
+        description = "Pokemon Emerald ROM File"
+        copy_to = "Pokemon - Emerald Version (USA, Europe).gba"
+        md5s = [PokemonEmeraldDeltaPatch.hash]
+
+    rom_file: PokemonEmeraldRomFile = PokemonEmeraldRomFile(PokemonEmeraldRomFile.copy_to)
+
+
+class PokemonEmeraldWorld(World):
+    """
+    Pokémon Emerald is the definitive Gen III Pokémon game and one of the most beloved in the franchise.
+    Catch, train, and battle Pokémon, explore the Hoenn region, thwart the plots
+    of Team Magma and Team Aqua, challenge gyms, and become the Pokémon champion!
+    """
+    game = "Pokemon Emerald"
+    web = PokemonEmeraldWebWorld()
+    topology_present = True
+
+    settings_key = "pokemon_emerald_settings"
+    settings: ClassVar[PokemonEmeraldSettings]
+
+    options_dataclass = PokemonEmeraldOptions
+    options: PokemonEmeraldOptions
+
+    item_name_to_id = create_item_label_to_code_map()
+    location_name_to_id = create_location_label_to_id_map()
+    item_name_groups = ITEM_GROUPS
+    location_name_groups = LOCATION_GROUPS
+
+    data_version = 1
+    required_client_version = (0, 4, 3)
+
+    badge_shuffle_info: Optional[List[Tuple[PokemonEmeraldLocation, PokemonEmeraldItem]]] = None
+    hm_shuffle_info: Optional[List[Tuple[PokemonEmeraldLocation, PokemonEmeraldItem]]] = None
+    free_fly_location_id: int = 0
+
+    modified_species: List[Optional[SpeciesData]]
+    modified_maps: List[MapData]
+    modified_tmhm_moves: List[int]
+    modified_static_encounters: List[int]
+    modified_starters: Tuple[int, int, int]
+    modified_trainers: List[TrainerData]
+
+    @classmethod
+    def stage_assert_generate(cls, multiworld: MultiWorld) -> None:
+        if not os.path.exists(cls.settings.rom_file):
+            raise FileNotFoundError(cls.settings.rom_file)
+
+        assert validate_regions()
+
+    def get_filler_item_name(self) -> str:
+        return "Great Ball"
+
+    def generate_early(self) -> None:
+        # If badges or HMs are vanilla, Norman locks you from using Surf, which means you're not guaranteed to be
+        # able to reach Fortree Gym, Mossdeep Gym, or Sootopolis Gym. So we can't require reaching those gyms to
+        # challenge Norman or it creates a circular dependency.
+        # This is never a problem for completely random badges/hms because the algo will not place Surf/Balance Badge
+        # on Norman on its own. It's never a problem for shuffled badges/hms because there is no scenario where Cut or
+        # the Stone Badge can be a lynchpin for access to any gyms, so they can always be put on Norman in a worst case
+        # scenario.
+        # This will also be a problem in warp rando if direct access to Norman's room requires Surf or if access
+        # any gym leader in general requires Surf. We will probably have to force this to 0 in that case.
+        max_norman_count = 7
+
+        if self.options.badges == RandomizeBadges.option_vanilla:
+            max_norman_count = 4
+
+        if self.options.hms == RandomizeHms.option_vanilla:
+            if self.options.norman_requirement == NormanRequirement.option_badges:
+                if self.options.badges != RandomizeBadges.option_completely_random:
+                    max_norman_count = 4
+            if self.options.norman_requirement == NormanRequirement.option_gyms:
+                max_norman_count = 4
+
+        if self.options.norman_count.value > max_norman_count:
+            logging.warning("Pokemon Emerald: Norman requirements for Player %s (%s) are unsafe in combination with "
+                            "other settings. Reducing to 4.", self.player, self.multiworld.get_player_name(self.player))
+            self.options.norman_count.value = max_norman_count
+
+    def create_regions(self) -> None:
+        regions = create_regions(self)
+
+        tags = {"Badge", "HM", "KeyItem", "Rod", "Bike"}
+        if self.options.overworld_items:
+            tags.add("OverworldItem")
+        if self.options.hidden_items:
+            tags.add("HiddenItem")
+        if self.options.npc_gifts:
+            tags.add("NpcGift")
+        if self.options.enable_ferry:
+            tags.add("Ferry")
+        create_locations_with_tags(self, regions, tags)
+
+        self.multiworld.regions.extend(regions.values())
+
+    def create_items(self) -> None:
+        item_locations: List[PokemonEmeraldLocation] = [
+            location
+            for location in self.multiworld.get_locations(self.player)
+            if location.address is not None
+        ]
+
+        # Filter progression items which shouldn't be shuffled into the itempool. Their locations
+        # still exist, but event items will be placed and locked at their vanilla locations instead.
+        filter_tags = set()
+
+        if not self.options.key_items:
+            filter_tags.add("KeyItem")
+        if not self.options.rods:
+            filter_tags.add("Rod")
+        if not self.options.bikes:
+            filter_tags.add("Bike")
+
+        if self.options.badges in {RandomizeBadges.option_vanilla, RandomizeBadges.option_shuffle}:
+            filter_tags.add("Badge")
+        if self.options.hms in {RandomizeHms.option_vanilla, RandomizeHms.option_shuffle}:
+            filter_tags.add("HM")
+
+        if self.options.badges == RandomizeBadges.option_shuffle:
+            self.badge_shuffle_info = [
+                (location, self.create_item_by_code(location.default_item_code))
+                for location in [l for l in item_locations if "Badge" in l.tags]
+            ]
+        if self.options.hms == RandomizeHms.option_shuffle:
+            self.hm_shuffle_info = [
+                (location, self.create_item_by_code(location.default_item_code))
+                for location in [l for l in item_locations if "HM" in l.tags]
+            ]
+
+        item_locations = [location for location in item_locations if len(filter_tags & location.tags) == 0]
+        default_itempool = [self.create_item_by_code(location.default_item_code) for location in item_locations]
+
+        if self.options.item_pool_type == ItemPoolType.option_shuffled:
+            self.multiworld.itempool += default_itempool
+
+        elif self.options.item_pool_type in {ItemPoolType.option_diverse, ItemPoolType.option_diverse_balanced}:
+            item_categories = ["Ball", "Heal", "Vitamin", "EvoStone", "Money", "TM", "Held", "Misc"]
+
+            # Count occurrences of types of vanilla items in pool
+            item_category_counter = Counter()
+            for item in default_itempool:
+                if not item.advancement:
+                    item_category_counter.update([tag for tag in item.tags if tag in item_categories])
+
+            item_category_weights = [item_category_counter.get(category) for category in item_categories]
+            item_category_weights = [weight if weight is not None else 0 for weight in item_category_weights]
+
+            # Create lists of item codes that can be used to fill
+            fill_item_candidates = emerald_data.items.values()
+
+            fill_item_candidates = [item for item in fill_item_candidates if "Unique" not in item.tags]
+
+            fill_item_candidates_by_category = {category: [] for category in item_categories}
+            for item_data in fill_item_candidates:
+                for category in item_categories:
+                    if category in item_data.tags:
+                        fill_item_candidates_by_category[category].append(offset_item_value(item_data.item_id))
+
+            for category in fill_item_candidates_by_category:
+                fill_item_candidates_by_category[category].sort()
+
+            # Ignore vanilla occurrences and pick completely randomly
+            if self.options.item_pool_type == ItemPoolType.option_diverse:
+                item_category_weights = [
+                    len(category_list)
+                    for category_list in fill_item_candidates_by_category.values()
+                ]
+
+            # TMs should not have duplicates until every TM has been used already
+            all_tm_choices = fill_item_candidates_by_category["TM"].copy()
+
+            def refresh_tm_choices() -> None:
+                fill_item_candidates_by_category["TM"] = all_tm_choices.copy()
+                self.random.shuffle(fill_item_candidates_by_category["TM"])
+
+            # Create items
+            for item in default_itempool:
+                if not item.advancement and "Unique" not in item.tags:
+                    category = self.random.choices(item_categories, item_category_weights)[0]
+                    if category == "TM":
+                        if len(fill_item_candidates_by_category["TM"]) == 0:
+                            refresh_tm_choices()
+                        item_code = fill_item_candidates_by_category["TM"].pop()
+                    else:
+                        item_code = self.random.choice(fill_item_candidates_by_category[category])
+                    item = self.create_item_by_code(item_code)
+
+                self.multiworld.itempool.append(item)
+
+    def set_rules(self) -> None:
+        set_rules(self)
+
+    def generate_basic(self) -> None:
+        locations: List[PokemonEmeraldLocation] = self.multiworld.get_locations(self.player)
+
+        # Set our free fly location
+        # If not enabled, set it to Littleroot Town by default
+        fly_location_name = "EVENT_VISITED_LITTLEROOT_TOWN"
+        if self.options.free_fly_location:
+            fly_location_name = self.random.choice([
+                "EVENT_VISITED_SLATEPORT_CITY",
+                "EVENT_VISITED_MAUVILLE_CITY",
+                "EVENT_VISITED_VERDANTURF_TOWN",
+                "EVENT_VISITED_FALLARBOR_TOWN",
+                "EVENT_VISITED_LAVARIDGE_TOWN",
+                "EVENT_VISITED_FORTREE_CITY",
+                "EVENT_VISITED_LILYCOVE_CITY",
+                "EVENT_VISITED_MOSSDEEP_CITY",
+                "EVENT_VISITED_SOOTOPOLIS_CITY",
+                "EVENT_VISITED_EVER_GRANDE_CITY"
+            ])
+
+        self.free_fly_location_id = location_visited_event_to_id_map[fly_location_name]
+
+        free_fly_location_location = self.multiworld.get_location("FREE_FLY_LOCATION", self.player)
+        free_fly_location_location.item = None
+        free_fly_location_location.place_locked_item(self.create_event(fly_location_name))
+
+        # Key items which are considered in access rules but not randomized are converted to events and placed
+        # in their vanilla locations so that the player can have them in their inventory for logic.
+        def convert_unrandomized_items_to_events(tag: str) -> None:
+            for location in locations:
+                if location.tags is not None and tag in location.tags:
+                    location.place_locked_item(self.create_event(self.item_id_to_name[location.default_item_code]))
+                    location.address = None
+
+        if self.options.badges == RandomizeBadges.option_vanilla:
+            convert_unrandomized_items_to_events("Badge")
+        if self.options.hms == RandomizeHms.option_vanilla:
+            convert_unrandomized_items_to_events("HM")
+        if not self.options.rods:
+            convert_unrandomized_items_to_events("Rod")
+        if not self.options.bikes:
+            convert_unrandomized_items_to_events("Bike")
+        if not self.options.key_items:
+            convert_unrandomized_items_to_events("KeyItem")
+
+    def pre_fill(self) -> None:
+        # Items which are shuffled between their own locations
+        if self.options.badges == RandomizeBadges.option_shuffle:
+            badge_locations: List[PokemonEmeraldLocation]
+            badge_items: List[PokemonEmeraldItem]
+
+            # Sort order makes `fill_restrictive` try to place important badges later, which
+            # makes it less likely to have to swap at all, and more likely for swaps to work.
+            # In the case of vanilla HMs, navigating Granite Cave is required to access more than 2 gyms,
+            # so Knuckle Badge deserves highest priority if Flash is logically required.
+            badge_locations, badge_items = [list(l) for l in zip(*self.badge_shuffle_info)]
+            badge_priority = {
+                "Knuckle Badge": 0 if (self.options.hms == RandomizeHms.option_vanilla and self.options.require_flash) else 3,
+                "Balance Badge": 1,
+                "Dynamo Badge": 1,
+                "Mind Badge": 2,
+                "Heat Badge": 2,
+                "Rain Badge": 3,
+                "Stone Badge": 4,
+                "Feather Badge": 5
+            }
+            badge_items.sort(key=lambda item: badge_priority.get(item.name, 0))
+
+            collection_state = self.multiworld.get_all_state(False)
+            if self.hm_shuffle_info is not None:
+                for _, item in self.hm_shuffle_info:
+                    collection_state.collect(item)
+
+            # In specific very constrained conditions, fill_restrictive may run
+            # out of swaps before it finds a valid solution if it gets unlucky.
+            # This is a band-aid until fill/swap can reliably find those solutions.
+            attempts_remaining = 2
+            while attempts_remaining > 0:
+                attempts_remaining -= 1
+                self.random.shuffle(badge_locations)
+                try:
+                    fill_restrictive(self.multiworld, collection_state, badge_locations, badge_items,
+                                     single_player_placement=True, lock=True, allow_excluded=True)
+                    break
+                except FillError as exc:
+                    if attempts_remaining == 0:
+                        raise exc
+
+                    logging.debug(f"Failed to shuffle badges for player {self.player}. Retrying.")
+                    continue
+
+        if self.options.hms == RandomizeHms.option_shuffle:
+            hm_locations: List[PokemonEmeraldLocation]
+            hm_items: List[PokemonEmeraldItem]
+
+            # Sort order makes `fill_restrictive` try to place important HMs later, which
+            # makes it less likely to have to swap at all, and more likely for swaps to work.
+            # In the case of vanilla badges, navigating Granite Cave is required to access more than 2 gyms,
+            # so Flash deserves highest priority if it's logically required.
+            hm_locations, hm_items = [list(l) for l in zip(*self.hm_shuffle_info)]
+            hm_priority = {
+                "HM05 Flash": 0 if (self.options.badges == RandomizeBadges.option_vanilla and self.options.require_flash) else 3,
+                "HM03 Surf": 1,
+                "HM06 Rock Smash": 1,
+                "HM08 Dive": 2,
+                "HM04 Strength": 2,
+                "HM07 Waterfall": 3,
+                "HM01 Cut": 4,
+                "HM02 Fly": 5
+            }
+            hm_items.sort(key=lambda item: hm_priority.get(item.name, 0))
+
+            collection_state = self.multiworld.get_all_state(False)
+
+            # In specific very constrained conditions, fill_restrictive may run
+            # out of swaps before it finds a valid solution if it gets unlucky.
+            # This is a band-aid until fill/swap can reliably find those solutions.
+            attempts_remaining = 2
+            while attempts_remaining > 0:
+                attempts_remaining -= 1
+                self.random.shuffle(hm_locations)
+                try:
+                    fill_restrictive(self.multiworld, collection_state, hm_locations, hm_items,
+                                     single_player_placement=True, lock=True, allow_excluded=True)
+                    break
+                except FillError as exc:
+                    if attempts_remaining == 0:
+                        raise exc
+
+                    logging.debug(f"Failed to shuffle HMs for player {self.player}. Retrying.")
+                    continue
+
+    def generate_output(self, output_directory: str) -> None:
+        def randomize_abilities() -> None:
+            # Creating list of potential abilities
+            ability_label_to_value = {ability.label.lower(): ability.ability_id for ability in emerald_data.abilities}
+
+            ability_blacklist_labels = {"cacophony"}
+            option_ability_blacklist = self.options.ability_blacklist.value
+            if option_ability_blacklist is not None:
+                ability_blacklist_labels |= {ability_label.lower() for ability_label in option_ability_blacklist}
+
+            ability_blacklist = {ability_label_to_value[label] for label in ability_blacklist_labels}
+            ability_whitelist = [a.ability_id for a in emerald_data.abilities if a.ability_id not in ability_blacklist]
+
+            if self.options.abilities == RandomizeAbilities.option_follow_evolutions:
+                already_modified: Set[int] = set()
+
+                # Loops through species and only tries to modify abilities if the pokemon has no pre-evolution
+                # or if the pre-evolution has already been modified. Then tries to modify all species that evolve
+                # from this one which have the same abilities.
+                # The outer while loop only runs three times for vanilla ordering: Once for a first pass, once for
+                # Hitmonlee/Hitmonchan, and once to verify that there's nothing left to do.
+                while True:
+                    had_clean_pass = True
+                    for species in self.modified_species:
+                        if species is None:
+                            continue
+                        if species.species_id in already_modified:
+                            continue
+                        if species.pre_evolution is not None and species.pre_evolution not in already_modified:
+                            continue
+
+                        had_clean_pass = False
+
+                        old_abilities = species.abilities
+                        new_abilities = (
+                            0 if old_abilities[0] == 0 else self.random.choice(ability_whitelist),
+                            0 if old_abilities[1] == 0 else self.random.choice(ability_whitelist)
+                        )
+
+                        evolutions = [species]
+                        while len(evolutions) > 0:
+                            evolution = evolutions.pop()
+                            if evolution.abilities == old_abilities:
+                                evolution.abilities = new_abilities
+                                already_modified.add(evolution.species_id)
+                                evolutions += [
+                                    self.modified_species[evolution.species_id]
+                                    for evolution in evolution.evolutions
+                                    if evolution.species_id not in already_modified
+                                ]
+
+                    if had_clean_pass:
+                        break
+            else:  # Not following evolutions
+                for species in self.modified_species:
+                    if species is None:
+                        continue
+
+                    old_abilities = species.abilities
+                    new_abilities = (
+                        0 if old_abilities[0] == 0 else self.random.choice(ability_whitelist),
+                        0 if old_abilities[1] == 0 else self.random.choice(ability_whitelist)
+                    )
+
+                    species.abilities = new_abilities
+
+        def randomize_types() -> None:
+            if self.options.types == RandomizeTypes.option_shuffle:
+                type_map = list(range(18))
+                self.random.shuffle(type_map)
+
+                # We never want to map to the ??? type, so swap whatever index maps to ??? with ???
+                # So ??? will always map to itself, and there are no pokemon which have the ??? type
+                mystery_type_index = type_map.index(9)
+                type_map[mystery_type_index], type_map[9] = type_map[9], type_map[mystery_type_index]
+
+                for species in self.modified_species:
+                    if species is not None:
+                        species.types = (type_map[species.types[0]], type_map[species.types[1]])
+            elif self.options.types == RandomizeTypes.option_completely_random:
+                for species in self.modified_species:
+                    if species is not None:
+                        new_type_1 = get_random_type(self.random)
+                        new_type_2 = new_type_1
+                        if species.types[0] != species.types[1]:
+                            while new_type_1 == new_type_2:
+                                new_type_2 = get_random_type(self.random)
+
+                        species.types = (new_type_1, new_type_2)
+            elif self.options.types == RandomizeTypes.option_follow_evolutions:
+                already_modified: Set[int] = set()
+
+                # Similar to follow evolutions for abilities, but only needs to loop through once.
+                # For every pokemon without a pre-evolution, generates a random mapping from old types to new types
+                # and then walks through the evolution tree applying that map. This means that evolutions that share
+                # types will have those types mapped to the same new types, and evolutions with new or diverging types
+                # will still have new or diverging types.
+                # Consider:
+                # - Charmeleon (Fire/Fire) -> Charizard (Fire/Flying)
+                # - Onyx (Rock/Ground) -> Steelix (Steel/Ground)
+                # - Nincada (Bug/Ground) -> Ninjask (Bug/Flying) && Shedinja (Bug/Ghost)
+                # - Azurill (Normal/Normal) -> Marill (Water/Water)
+                for species in self.modified_species:
+                    if species is None:
+                        continue
+                    if species.species_id in already_modified:
+                        continue
+                    if species.pre_evolution is not None and species.pre_evolution not in already_modified:
+                        continue
+
+                    type_map = list(range(18))
+                    self.random.shuffle(type_map)
+
+                    # We never want to map to the ??? type, so swap whatever index maps to ??? with ???
+                    # So ??? will always map to itself, and there are no pokemon which have the ??? type
+                    mystery_type_index = type_map.index(9)
+                    type_map[mystery_type_index], type_map[9] = type_map[9], type_map[mystery_type_index]
+
+                    evolutions = [species]
+                    while len(evolutions) > 0:
+                        evolution = evolutions.pop()
+                        evolution.types = (type_map[evolution.types[0]], type_map[evolution.types[1]])
+                        already_modified.add(evolution.species_id)
+                        evolutions += [self.modified_species[evo.species_id] for evo in evolution.evolutions]
+
+        def randomize_learnsets() -> None:
+            type_bias = self.options.move_match_type_bias.value
+            normal_bias = self.options.move_normal_type_bias.value
+
+            for species in self.modified_species:
+                if species is None:
+                    continue
+
+                old_learnset = species.learnset
+                new_learnset: List[LearnsetMove] = []
+
+                i = 0
+                # Replace filler MOVE_NONEs at start of list
+                while old_learnset[i].move_id == 0:
+                    if self.options.level_up_moves == LevelUpMoves.option_start_with_four_moves:
+                        new_move = get_random_move(self.random, {move.move_id for move in new_learnset}, type_bias,
+                                                   normal_bias, species.types)
+                    else:
+                        new_move = 0
+                    new_learnset.append(LearnsetMove(old_learnset[i].level, new_move))
+                    i += 1
+
+                while i < len(old_learnset):
+                    # Guarantees the starter has a good damaging move
+                    if i == 3:
+                        new_move = get_random_damaging_move(self.random, {move.move_id for move in new_learnset})
+                    else:
+                        new_move = get_random_move(self.random, {move.move_id for move in new_learnset}, type_bias,
+                                                   normal_bias, species.types)
+                    new_learnset.append(LearnsetMove(old_learnset[i].level, new_move))
+                    i += 1
+
+                species.learnset = new_learnset
+
+        def randomize_tm_hm_compatibility() -> None:
+            for species in self.modified_species:
+                if species is None:
+                    continue
+
+                combatibility_array = int_to_bool_array(species.tm_hm_compatibility)
+
+                # TMs
+                for i in range(0, 50):
+                    if self.options.tm_compatibility == TmCompatibility.option_fully_compatible:
+                        combatibility_array[i] = True
+                    elif self.options.tm_compatibility == TmCompatibility.option_completely_random:
+                        combatibility_array[i] = self.random.choice([True, False])
+
+                # HMs
+                for i in range(50, 58):
+                    if self.options.hm_compatibility == HmCompatibility.option_fully_compatible:
+                        combatibility_array[i] = True
+                    elif self.options.hm_compatibility == HmCompatibility.option_completely_random:
+                        combatibility_array[i] = self.random.choice([True, False])
+
+                species.tm_hm_compatibility = bool_array_to_int(combatibility_array)
+
+        def randomize_tm_moves() -> None:
+            new_moves: Set[int] = set()
+
+            for i in range(50):
+                new_move = get_random_move(self.random, new_moves)
+                new_moves.add(new_move)
+                self.modified_tmhm_moves[i] = new_move
+
+        def randomize_wild_encounters() -> None:
+            should_match_bst = self.options.wild_pokemon in {
+                RandomizeWildPokemon.option_match_base_stats,
+                RandomizeWildPokemon.option_match_base_stats_and_type
+            }
+            should_match_type = self.options.wild_pokemon in {
+                RandomizeWildPokemon.option_match_type,
+                RandomizeWildPokemon.option_match_base_stats_and_type
+            }
+            should_allow_legendaries = self.options.allow_wild_legendaries == Toggle.option_true
+
+            for map_data in self.modified_maps:
+                new_encounters: List[Optional[EncounterTableData]] = [None, None, None]
+                old_encounters = [map_data.land_encounters, map_data.water_encounters, map_data.fishing_encounters]
+
+                for i, table in enumerate(old_encounters):
+                    if table is not None:
+                        species_old_to_new_map: Dict[int, int] = {}
+                        for species_id in table.slots:
+                            if species_id not in species_old_to_new_map:
+                                original_species = emerald_data.species[species_id]
+                                target_bst = sum(original_species.base_stats) if should_match_bst else None
+                                target_type = self.random.choice(original_species.types) if should_match_type else None
+
+                                species_old_to_new_map[species_id] = get_random_species(
+                                    self.random,
+                                    self.modified_species,
+                                    target_bst,
+                                    target_type,
+                                    should_allow_legendaries
+                                ).species_id
+
+                        new_slots: List[int] = []
+                        for species_id in table.slots:
+                            new_slots.append(species_old_to_new_map[species_id])
+
+                        new_encounters[i] = EncounterTableData(new_slots, table.rom_address)
+
+                map_data.land_encounters = new_encounters[0]
+                map_data.water_encounters = new_encounters[1]
+                map_data.fishing_encounters = new_encounters[2]
+
+        def randomize_static_encounters() -> None:
+            if self.options.static_encounters == RandomizeStaticEncounters.option_shuffle:
+                shuffled_species = [encounter.species_id for encounter in emerald_data.static_encounters]
+                self.random.shuffle(shuffled_species)
+
+                self.modified_static_encounters = []
+                for i, encounter in enumerate(emerald_data.static_encounters):
+                    self.modified_static_encounters.append(StaticEncounterData(
+                        shuffled_species[i],
+                        encounter.rom_address
+                    ))
+            else:
+                should_match_bst = self.options.static_encounters in {
+                    RandomizeStaticEncounters.option_match_base_stats,
+                    RandomizeStaticEncounters.option_match_base_stats_and_type
+                }
+                should_match_type = self.options.static_encounters in {
+                    RandomizeStaticEncounters.option_match_type,
+                    RandomizeStaticEncounters.option_match_base_stats_and_type
+                }
+
+                for encounter in emerald_data.static_encounters:
+                    original_species = self.modified_species[encounter.species_id]
+                    target_bst = sum(original_species.base_stats) if should_match_bst else None
+                    target_type = self.random.choice(original_species.types) if should_match_type else None
+
+                    self.modified_static_encounters.append(StaticEncounterData(
+                        get_random_species(self.random, self.modified_species, target_bst, target_type).species_id,
+                        encounter.rom_address
+                    ))
+
+        def randomize_opponent_parties() -> None:
+            should_match_bst = self.options.trainer_parties in {
+                RandomizeTrainerParties.option_match_base_stats,
+                RandomizeTrainerParties.option_match_base_stats_and_type
+            }
+            should_match_type = self.options.trainer_parties in {
+                RandomizeTrainerParties.option_match_type,
+                RandomizeTrainerParties.option_match_base_stats_and_type
+            }
+            allow_legendaries = self.options.allow_trainer_legendaries == Toggle.option_true
+
+            per_species_tmhm_moves: Dict[int, List[int]] = {}
+
+            for trainer in self.modified_trainers:
+                new_party = []
+                for pokemon in trainer.party.pokemon:
+                    original_species = emerald_data.species[pokemon.species_id]
+                    target_bst = sum(original_species.base_stats) if should_match_bst else None
+                    target_type = self.random.choice(original_species.types) if should_match_type else None
+
+                    new_species = get_random_species(
+                        self.random,
+                        self.modified_species,
+                        target_bst,
+                        target_type,
+                        allow_legendaries
+                    )
+
+                    if new_species.species_id not in per_species_tmhm_moves:
+                        per_species_tmhm_moves[new_species.species_id] = list({
+                            self.modified_tmhm_moves[i]
+                            for i, is_compatible in enumerate(int_to_bool_array(new_species.tm_hm_compatibility))
+                            if is_compatible
+                        })
+
+                    tm_hm_movepool = per_species_tmhm_moves[new_species.species_id]
+                    level_up_movepool = list({
+                        move.move_id
+                        for move in new_species.learnset
+                        if move.move_id != 0 and move.level <= pokemon.level
+                    })
+
+                    new_moves = (
+                        self.random.choice(tm_hm_movepool if self.random.random() < 0.25 and len(tm_hm_movepool) > 0 else level_up_movepool),
+                        self.random.choice(tm_hm_movepool if self.random.random() < 0.25 and len(tm_hm_movepool) > 0 else level_up_movepool),
+                        self.random.choice(tm_hm_movepool if self.random.random() < 0.25 and len(tm_hm_movepool) > 0 else level_up_movepool),
+                        self.random.choice(tm_hm_movepool if self.random.random() < 0.25 and len(tm_hm_movepool) > 0 else level_up_movepool)
+                    )
+
+                    new_party.append(TrainerPokemonData(new_species.species_id, pokemon.level, new_moves))
+
+                trainer.party.pokemon = new_party
+
+        def randomize_starters() -> None:
+            match_bst = self.options.starters in {
+                RandomizeStarters.option_match_base_stats,
+                RandomizeStarters.option_match_base_stats_and_type
+            }
+            match_type = self.options.starters in {
+                RandomizeStarters.option_match_type,
+                RandomizeStarters.option_match_base_stats_and_type
+            }
+            allow_legendaries = self.options.allow_starter_legendaries == Toggle.option_true
+
+            starter_bsts = (
+                sum(emerald_data.species[emerald_data.starters[0]].base_stats) if match_bst else None,
+                sum(emerald_data.species[emerald_data.starters[1]].base_stats) if match_bst else None,
+                sum(emerald_data.species[emerald_data.starters[2]].base_stats) if match_bst else None
+            )
+
+            starter_types = (
+                self.random.choice(emerald_data.species[emerald_data.starters[0]].types) if match_type else None,
+                self.random.choice(emerald_data.species[emerald_data.starters[1]].types) if match_type else None,
+                self.random.choice(emerald_data.species[emerald_data.starters[2]].types) if match_type else None
+            )
+
+            new_starters = (
+                get_random_species(self.random, self.modified_species,
+                                   starter_bsts[0], starter_types[0], allow_legendaries),
+                get_random_species(self.random, self.modified_species,
+                                   starter_bsts[1], starter_types[1], allow_legendaries),
+                get_random_species(self.random, self.modified_species,
+                                   starter_bsts[2], starter_types[2], allow_legendaries)
+            )
+
+            egg_code = self.options.easter_egg.value
+            egg_check_1 = 0
+            egg_check_2 = 0
+
+            for i in egg_code:
+                egg_check_1 += ord(i)
+                egg_check_2 += egg_check_1 * egg_check_1
+
+            egg = 96 + egg_check_2 - (egg_check_1 * 0x077C)
+            if egg_check_2 == 0x14E03A and egg < 411 and egg > 0 and egg not in range(252, 277):
+                self.modified_starters = (egg, egg, egg)
+            else:
+                self.modified_starters = (
+                    new_starters[0].species_id,
+                    new_starters[1].species_id,
+                    new_starters[2].species_id
+                )
+
+            # Putting the unchosen starter onto the rival's team
+            rival_teams: List[List[Tuple[str, int, bool]]] = [
+                [
+                    ("TRAINER_BRENDAN_ROUTE_103_TREECKO", 0, False),
+                    ("TRAINER_BRENDAN_RUSTBORO_TREECKO",  1, False),
+                    ("TRAINER_BRENDAN_ROUTE_110_TREECKO", 2, True ),
+                    ("TRAINER_BRENDAN_ROUTE_119_TREECKO", 2, True ),
+                    ("TRAINER_BRENDAN_LILYCOVE_TREECKO",  3, True ),
+                    ("TRAINER_MAY_ROUTE_103_TREECKO",     0, False),
+                    ("TRAINER_MAY_RUSTBORO_TREECKO",      1, False),
+                    ("TRAINER_MAY_ROUTE_110_TREECKO",     2, True ),
+                    ("TRAINER_MAY_ROUTE_119_TREECKO",     2, True ),
+                    ("TRAINER_MAY_LILYCOVE_TREECKO",      3, True )
+                ],
+                [
+                    ("TRAINER_BRENDAN_ROUTE_103_TORCHIC", 0, False),
+                    ("TRAINER_BRENDAN_RUSTBORO_TORCHIC",  1, False),
+                    ("TRAINER_BRENDAN_ROUTE_110_TORCHIC", 2, True ),
+                    ("TRAINER_BRENDAN_ROUTE_119_TORCHIC", 2, True ),
+                    ("TRAINER_BRENDAN_LILYCOVE_TORCHIC",  3, True ),
+                    ("TRAINER_MAY_ROUTE_103_TORCHIC",     0, False),
+                    ("TRAINER_MAY_RUSTBORO_TORCHIC",      1, False),
+                    ("TRAINER_MAY_ROUTE_110_TORCHIC",     2, True ),
+                    ("TRAINER_MAY_ROUTE_119_TORCHIC",     2, True ),
+                    ("TRAINER_MAY_LILYCOVE_TORCHIC",      3, True )
+                ],
+                [
+                    ("TRAINER_BRENDAN_ROUTE_103_MUDKIP", 0, False),
+                    ("TRAINER_BRENDAN_RUSTBORO_MUDKIP",  1, False),
+                    ("TRAINER_BRENDAN_ROUTE_110_MUDKIP", 2, True ),
+                    ("TRAINER_BRENDAN_ROUTE_119_MUDKIP", 2, True ),
+                    ("TRAINER_BRENDAN_LILYCOVE_MUDKIP",  3, True ),
+                    ("TRAINER_MAY_ROUTE_103_MUDKIP",     0, False),
+                    ("TRAINER_MAY_RUSTBORO_MUDKIP",      1, False),
+                    ("TRAINER_MAY_ROUTE_110_MUDKIP",     2, True ),
+                    ("TRAINER_MAY_ROUTE_119_MUDKIP",     2, True ),
+                    ("TRAINER_MAY_LILYCOVE_MUDKIP",      3, True )
+                ]
+            ]
+
+            for i, starter in enumerate([new_starters[1], new_starters[2], new_starters[0]]):
+                potential_evolutions = [evolution.species_id for evolution in starter.evolutions]
+                picked_evolution = starter.species_id
+                if len(potential_evolutions) > 0:
+                    picked_evolution = self.random.choice(potential_evolutions)
+
+                for trainer_name, starter_position, is_evolved in rival_teams[i]:
+                    trainer_data = self.modified_trainers[emerald_data.constants[trainer_name]]
+                    trainer_data.party.pokemon[starter_position].species_id = picked_evolution if is_evolved else starter.species_id
+
+        self.modified_species = copy.deepcopy(emerald_data.species)
+        self.modified_trainers = copy.deepcopy(emerald_data.trainers)
+        self.modified_maps = copy.deepcopy(emerald_data.maps)
+        self.modified_tmhm_moves = copy.deepcopy(emerald_data.tmhm_moves)
+        self.modified_static_encounters = copy.deepcopy(emerald_data.static_encounters)
+        self.modified_starters = copy.deepcopy(emerald_data.starters)
+
+        # Randomize species data
+        if self.options.abilities != RandomizeAbilities.option_vanilla:
+            randomize_abilities()
+
+        if self.options.types != RandomizeTypes.option_vanilla:
+            randomize_types()
+
+        if self.options.level_up_moves != LevelUpMoves.option_vanilla:
+            randomize_learnsets()
+
+        randomize_tm_hm_compatibility()  # Options are checked within this function
+
+        min_catch_rate = min(self.options.min_catch_rate.value, 255)
+        for species in self.modified_species:
+            if species is not None:
+                species.catch_rate = max(species.catch_rate, min_catch_rate)
+
+        if self.options.tm_moves:
+            randomize_tm_moves()
+
+        # Randomize wild encounters
+        if self.options.wild_pokemon != RandomizeWildPokemon.option_vanilla:
+            randomize_wild_encounters()
+
+        # Randomize static encounters
+        if self.options.static_encounters != RandomizeStaticEncounters.option_vanilla:
+            randomize_static_encounters()
+
+        # Randomize opponents
+        if self.options.trainer_parties != RandomizeTrainerParties.option_vanilla:
+            randomize_opponent_parties()
+
+        # Randomize starters
+        if self.options.starters != RandomizeStarters.option_vanilla:
+            randomize_starters()
+
+        generate_output(self, output_directory)
+
+    def fill_slot_data(self) -> Dict[str, Any]:
+        slot_data = self.options.as_dict(
+            "goal",
+            "badges",
+            "hms",
+            "key_items",
+            "bikes",
+            "rods",
+            "overworld_items",
+            "hidden_items",
+            "npc_gifts",
+            "require_itemfinder",
+            "require_flash",
+            "enable_ferry",
+            "elite_four_requirement",
+            "elite_four_count",
+            "norman_requirement",
+            "norman_count",
+            "extra_boulders",
+            "remove_roadblocks",
+            "free_fly_location",
+            "fly_without_badge",
+        )
+        slot_data["free_fly_location_id"] = self.free_fly_location_id
+        return slot_data
+
+    def create_item(self, name: str) -> PokemonEmeraldItem:
+        return self.create_item_by_code(self.item_name_to_id[name])
+
+    def create_item_by_code(self, item_code: int) -> PokemonEmeraldItem:
+        return PokemonEmeraldItem(
+            self.item_id_to_name[item_code],
+            get_item_classification(item_code),
+            item_code,
+            self.player
+        )
+
+    def create_event(self, name: str) -> PokemonEmeraldItem:
+        return PokemonEmeraldItem(
+            name,
+            ItemClassification.progression,
+            None,
+            self.player
+        )
diff --git a/worlds/pokemon_emerald/client.py b/worlds/pokemon_emerald/client.py
new file mode 100644
index 0000000000..d8b4b8d587
--- /dev/null
+++ b/worlds/pokemon_emerald/client.py
@@ -0,0 +1,277 @@
+from typing import TYPE_CHECKING, Dict, Set
+
+from NetUtils import ClientStatus
+import worlds._bizhawk as bizhawk
+from worlds._bizhawk.client import BizHawkClient
+
+from .data import BASE_OFFSET, data
+from .options import Goal
+
+if TYPE_CHECKING:
+    from worlds._bizhawk.context import BizHawkClientContext
+
+
+EXPECTED_ROM_NAME = "pokemon emerald version / AP 2"
+
+IS_CHAMPION_FLAG = data.constants["FLAG_IS_CHAMPION"]
+DEFEATED_STEVEN_FLAG = data.constants["TRAINER_FLAGS_START"] + data.constants["TRAINER_STEVEN"]
+DEFEATED_NORMAN_FLAG = data.constants["TRAINER_FLAGS_START"] + data.constants["TRAINER_NORMAN_1"]
+
+# These flags are communicated to the tracker as a bitfield using this order.
+# Modifying the order will cause undetectable autotracking issues.
+TRACKER_EVENT_FLAGS = [
+    "FLAG_DEFEATED_RUSTBORO_GYM",
+    "FLAG_DEFEATED_DEWFORD_GYM",
+    "FLAG_DEFEATED_MAUVILLE_GYM",
+    "FLAG_DEFEATED_LAVARIDGE_GYM",
+    "FLAG_DEFEATED_PETALBURG_GYM",
+    "FLAG_DEFEATED_FORTREE_GYM",
+    "FLAG_DEFEATED_MOSSDEEP_GYM",
+    "FLAG_DEFEATED_SOOTOPOLIS_GYM",
+    "FLAG_RECEIVED_POKENAV",                            # Talk to Mr. Stone
+    "FLAG_DELIVERED_STEVEN_LETTER",
+    "FLAG_DELIVERED_DEVON_GOODS",
+    "FLAG_HIDE_ROUTE_119_TEAM_AQUA",                    # Clear Weather Institute
+    "FLAG_MET_ARCHIE_METEOR_FALLS",                     # Magma steals meteorite
+    "FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT",              # Clear Magma Hideout
+    "FLAG_MET_TEAM_AQUA_HARBOR",                        # Aqua steals submarine
+    "FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE",              # Clear Aqua Hideout
+    "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE",  # Clear Space Center
+    "FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN",
+    "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA",                # Rayquaza departs for Sootopolis
+    "FLAG_OMIT_DIVE_FROM_STEVEN_LETTER",                # Steven gives Dive HM (clears seafloor cavern grunt)
+    "FLAG_IS_CHAMPION",
+    "FLAG_PURCHASED_HARBOR_MAIL"
+]
+EVENT_FLAG_MAP = {data.constants[flag_name]: flag_name for flag_name in TRACKER_EVENT_FLAGS}
+
+KEY_LOCATION_FLAGS = [
+    "NPC_GIFT_RECEIVED_HM01",
+    "NPC_GIFT_RECEIVED_HM02",
+    "NPC_GIFT_RECEIVED_HM03",
+    "NPC_GIFT_RECEIVED_HM04",
+    "NPC_GIFT_RECEIVED_HM05",
+    "NPC_GIFT_RECEIVED_HM06",
+    "NPC_GIFT_RECEIVED_HM07",
+    "NPC_GIFT_RECEIVED_HM08",
+    "NPC_GIFT_RECEIVED_ACRO_BIKE",
+    "NPC_GIFT_RECEIVED_WAILMER_PAIL",
+    "NPC_GIFT_RECEIVED_DEVON_GOODS_RUSTURF_TUNNEL",
+    "NPC_GIFT_RECEIVED_LETTER",
+    "NPC_GIFT_RECEIVED_METEORITE",
+    "NPC_GIFT_RECEIVED_GO_GOGGLES",
+    "NPC_GIFT_GOT_BASEMENT_KEY_FROM_WATTSON",
+    "NPC_GIFT_RECEIVED_ITEMFINDER",
+    "NPC_GIFT_RECEIVED_DEVON_SCOPE",
+    "NPC_GIFT_RECEIVED_MAGMA_EMBLEM",
+    "NPC_GIFT_RECEIVED_POKEBLOCK_CASE",
+    "NPC_GIFT_RECEIVED_SS_TICKET",
+    "HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY",
+    "HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY",
+    "HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY",
+    "HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY",
+    "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER",
+    "ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY",
+    "NPC_GIFT_RECEIVED_OLD_ROD",
+    "NPC_GIFT_RECEIVED_GOOD_ROD",
+    "NPC_GIFT_RECEIVED_SUPER_ROD",
+]
+KEY_LOCATION_FLAG_MAP = {data.locations[location_name].flag: location_name for location_name in KEY_LOCATION_FLAGS}
+
+
+class PokemonEmeraldClient(BizHawkClient):
+    game = "Pokemon Emerald"
+    system = "GBA"
+    patch_suffix = ".apemerald"
+    local_checked_locations: Set[int]
+    local_set_events: Dict[str, bool]
+    local_found_key_items: Dict[str, bool]
+    goal_flag: int
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.local_checked_locations = set()
+        self.local_set_events = {}
+        self.local_found_key_items = {}
+        self.goal_flag = IS_CHAMPION_FLAG
+
+    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, [(0x108, 32, "ROM")]))[0])
+            rom_name = bytes([byte for byte in rom_name_bytes if byte != 0]).decode("ascii")
+            if not rom_name.startswith("pokemon emerald version"):
+                return False
+            if rom_name == "pokemon emerald version":
+                logger.info("ERROR: You appear to be running an unpatched version of Pokemon Emerald. "
+                            "You need to generate a patch file and use it to create a patched ROM.")
+                return False
+            if rom_name != EXPECTED_ROM_NAME:
+                logger.info("ERROR: The patch file used to create this ROM is not compatible with "
+                            "this client. Double check your client version against the version being "
+                            "used by the generator.")
+                return False
+        except UnicodeDecodeError:
+            return False
+        except bizhawk.RequestFailedError:
+            return False  # Should verify on the next pass
+
+        ctx.game = self.game
+        ctx.items_handling = 0b001
+        ctx.want_slot_data = True
+        ctx.watcher_timeout = 0.125
+
+        return True
+
+    async def set_auth(self, ctx: "BizHawkClientContext") -> None:
+        slot_name_bytes = (await bizhawk.read(ctx.bizhawk_ctx, [(data.rom_addresses["gArchipelagoInfo"], 64, "ROM")]))[0]
+        ctx.auth = bytes([byte for byte in slot_name_bytes if byte != 0]).decode("utf-8")
+
+    async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
+        if ctx.slot_data is not None:
+            if ctx.slot_data["goal"] == Goal.option_champion:
+                self.goal_flag = IS_CHAMPION_FLAG
+            elif ctx.slot_data["goal"] == Goal.option_steven:
+                self.goal_flag = DEFEATED_STEVEN_FLAG
+            elif ctx.slot_data["goal"] == Goal.option_norman:
+                self.goal_flag = DEFEATED_NORMAN_FLAG
+
+        try:
+            # Checks that the player is in the overworld
+            overworld_guard = (data.ram_addresses["gMain"] + 4, (data.ram_addresses["CB2_Overworld"] + 1).to_bytes(4, "little"), "System Bus")
+
+            # Read save block address
+            read_result = await bizhawk.guarded_read(
+                ctx.bizhawk_ctx,
+                [(data.ram_addresses["gSaveBlock1Ptr"], 4, "System Bus")],
+                [overworld_guard]
+            )
+            if read_result is None:  # Not in overworld
+                return
+
+            # Checks that the save block hasn't moved
+            save_block_address_guard = (data.ram_addresses["gSaveBlock1Ptr"], read_result[0], "System Bus")
+
+            save_block_address = int.from_bytes(read_result[0], "little")
+
+            # Handle giving the player items
+            read_result = await bizhawk.guarded_read(
+                ctx.bizhawk_ctx,
+                [
+                    (save_block_address + 0x3778, 2, "System Bus"),                        # Number of received items
+                    (data.ram_addresses["gArchipelagoReceivedItem"] + 4, 1, "System Bus")  # Received item struct full?
+                ],
+                [overworld_guard, save_block_address_guard]
+            )
+            if read_result is None:  # Not in overworld, or save block moved
+                return
+
+            num_received_items = int.from_bytes(read_result[0], "little")
+            received_item_is_empty = read_result[1][0] == 0
+
+            # If the game hasn't received all items yet and the received item struct doesn't contain an item, then
+            # fill it with the next item
+            if num_received_items < len(ctx.items_received) and received_item_is_empty:
+                next_item = ctx.items_received[num_received_items]
+                await bizhawk.write(ctx.bizhawk_ctx, [
+                    (data.ram_addresses["gArchipelagoReceivedItem"] + 0, (next_item.item - BASE_OFFSET).to_bytes(2, "little"), "System Bus"),
+                    (data.ram_addresses["gArchipelagoReceivedItem"] + 2, (num_received_items + 1).to_bytes(2, "little"), "System Bus"),
+                    (data.ram_addresses["gArchipelagoReceivedItem"] + 4, [1], "System Bus"),  # Mark struct full
+                    (data.ram_addresses["gArchipelagoReceivedItem"] + 5, [next_item.flags & 1], "System Bus"),
+                ])
+
+            # Read flags in 2 chunks
+            read_result = await bizhawk.guarded_read(
+                ctx.bizhawk_ctx,
+                [(save_block_address + 0x1450, 0x96, "System Bus")],  # Flags
+                [overworld_guard, save_block_address_guard]
+            )
+            if read_result is None:  # Not in overworld, or save block moved
+                return
+
+            flag_bytes = read_result[0]
+
+            read_result = await bizhawk.guarded_read(
+                ctx.bizhawk_ctx,
+                [(save_block_address + 0x14E6, 0x96, "System Bus")],  # Flags
+                [overworld_guard, save_block_address_guard]
+            )
+            if read_result is not None:
+                flag_bytes += read_result[0]
+
+            game_clear = False
+            local_checked_locations = set()
+            local_set_events = {flag_name: False for flag_name in TRACKER_EVENT_FLAGS}
+            local_found_key_items = {location_name: False for location_name in KEY_LOCATION_FLAGS}
+
+            # Check set flags
+            for byte_i, byte in enumerate(flag_bytes):
+                for i in range(8):
+                    if byte & (1 << i) != 0:
+                        flag_id = byte_i * 8 + i
+
+                        location_id = flag_id + BASE_OFFSET
+                        if location_id in ctx.server_locations:
+                            local_checked_locations.add(location_id)
+
+                        if flag_id == self.goal_flag:
+                            game_clear = True
+
+                        if flag_id in EVENT_FLAG_MAP:
+                            local_set_events[EVENT_FLAG_MAP[flag_id]] = True
+
+                        if flag_id in KEY_LOCATION_FLAG_MAP:
+                            local_found_key_items[KEY_LOCATION_FLAG_MAP[flag_id]] = True
+
+            # Send locations
+            if local_checked_locations != self.local_checked_locations:
+                self.local_checked_locations = local_checked_locations
+
+                if local_checked_locations is not None:
+                    await ctx.send_msgs([{
+                        "cmd": "LocationChecks",
+                        "locations": list(local_checked_locations)
+                    }])
+
+            # Send game clear
+            if not ctx.finished_game and game_clear:
+                await ctx.send_msgs([{
+                    "cmd": "StatusUpdate",
+                    "status": ClientStatus.CLIENT_GOAL
+                }])
+
+            # Send tracker event flags
+            if local_set_events != self.local_set_events and ctx.slot is not None:
+                event_bitfield = 0
+                for i, flag_name in enumerate(TRACKER_EVENT_FLAGS):
+                    if local_set_events[flag_name]:
+                        event_bitfield |= 1 << i
+
+                await ctx.send_msgs([{
+                    "cmd": "Set",
+                    "key": f"pokemon_emerald_events_{ctx.team}_{ctx.slot}",
+                    "default": 0,
+                    "want_reply": False,
+                    "operations": [{"operation": "or", "value": event_bitfield}]
+                }])
+                self.local_set_events = local_set_events
+
+            if local_found_key_items != self.local_found_key_items:
+                key_bitfield = 0
+                for i, location_name in enumerate(KEY_LOCATION_FLAGS):
+                    if local_found_key_items[location_name]:
+                        key_bitfield |= 1 << i
+
+                await ctx.send_msgs([{
+                    "cmd": "Set",
+                    "key": f"pokemon_emerald_keys_{ctx.team}_{ctx.slot}",
+                    "default": 0,
+                    "want_reply": False,
+                    "operations": [{"operation": "or", "value": key_bitfield}]
+                }])
+                self.local_found_key_items = local_found_key_items
+        except bizhawk.RequestFailedError:
+            # Exit handler and return to main loop to reconnect
+            pass
diff --git a/worlds/pokemon_emerald/data.py b/worlds/pokemon_emerald/data.py
new file mode 100644
index 0000000000..bc51d84963
--- /dev/null
+++ b/worlds/pokemon_emerald/data.py
@@ -0,0 +1,995 @@
+"""
+Pulls data from JSON files in worlds/pokemon_emerald/data/ into classes.
+This also includes marrying automatically extracted data with manually
+defined data (like location labels or usable pokemon species), some cleanup
+and sorting, and Warp methods.
+"""
+from dataclasses import dataclass
+import copy
+from enum import IntEnum
+import orjson
+from typing import Dict, List, NamedTuple, Optional, Set, FrozenSet, Tuple, Any, Union
+import pkgutil
+import pkg_resources
+
+from BaseClasses import ItemClassification
+
+
+BASE_OFFSET = 3860000
+
+
+class Warp:
+    """
+    Represents warp events in the game like doorways or warp pads
+    """
+    is_one_way: bool
+    source_map: str
+    source_ids: List[int]
+    dest_map: str
+    dest_ids: List[int]
+    parent_region: Optional[str]
+
+    def __init__(self, encoded_string: Optional[str] = None, parent_region: Optional[str] = None) -> None:
+        if encoded_string is not None:
+            decoded_warp = Warp.decode(encoded_string)
+            self.is_one_way = decoded_warp.is_one_way
+            self.source_map = decoded_warp.source_map
+            self.source_ids = decoded_warp.source_ids
+            self.dest_map = decoded_warp.dest_map
+            self.dest_ids = decoded_warp.dest_ids
+        self.parent_region = parent_region
+
+    def encode(self) -> str:
+        """
+        Returns a string encoding of this warp
+        """
+        source_ids_string = ""
+        for source_id in self.source_ids:
+            source_ids_string += str(source_id) + ","
+        source_ids_string = source_ids_string[:-1]  # Remove last ","
+
+        dest_ids_string = ""
+        for dest_id in self.dest_ids:
+            dest_ids_string += str(dest_id) + ","
+        dest_ids_string = dest_ids_string[:-1]  # Remove last ","
+
+        return f"{self.source_map}:{source_ids_string}/{self.dest_map}:{dest_ids_string}{'!' if self.is_one_way else ''}"
+
+    def connects_to(self, other: 'Warp') -> bool:
+        """
+        Returns true if this warp sends the player to `other`
+        """
+        return self.dest_map == other.source_map and set(self.dest_ids) <= set(other.source_ids)
+
+    @staticmethod
+    def decode(encoded_string: str) -> 'Warp':
+        """
+        Create a Warp object from an encoded string
+        """
+        warp = Warp()
+        warp.is_one_way = encoded_string.endswith("!")
+        if warp.is_one_way:
+            encoded_string = encoded_string[:-1]
+
+        warp_source, warp_dest = encoded_string.split("/")
+        warp_source_map, warp_source_indices = warp_source.split(":")
+        warp_dest_map, warp_dest_indices = warp_dest.split(":")
+
+        warp.source_map = warp_source_map
+        warp.dest_map = warp_dest_map
+
+        warp.source_ids = [int(index) for index in warp_source_indices.split(",")]
+        warp.dest_ids = [int(index) for index in warp_dest_indices.split(",")]
+
+        return warp
+
+
+class ItemData(NamedTuple):
+    label: str
+    item_id: int
+    classification: ItemClassification
+    tags: FrozenSet[str]
+
+
+class LocationData(NamedTuple):
+    name: str
+    label: str
+    parent_region: str
+    default_item: int
+    rom_address: int
+    flag: int
+    tags: FrozenSet[str]
+
+
+class EventData(NamedTuple):
+    name: str
+    parent_region: str
+
+
+class RegionData:
+    name: str
+    exits: List[str]
+    warps: List[str]
+    locations: List[str]
+    events: List[EventData]
+
+    def __init__(self, name: str):
+        self.name = name
+        self.exits = []
+        self.warps = []
+        self.locations = []
+        self.events = []
+
+
+class BaseStats(NamedTuple):
+    hp: int
+    attack: int
+    defense: int
+    speed: int
+    special_attack: int
+    special_defense: int
+
+
+class LearnsetMove(NamedTuple):
+    level: int
+    move_id: int
+
+
+class EvolutionMethodEnum(IntEnum):
+    LEVEL = 0
+    LEVEL_ATK_LT_DEF = 1
+    LEVEL_ATK_EQ_DEF = 2
+    LEVEL_ATK_GT_DEF = 3
+    LEVEL_SILCOON = 4
+    LEVEL_CASCOON = 5
+    LEVEL_NINJASK = 6
+    LEVEL_SHEDINJA = 7
+    ITEM = 8
+    FRIENDSHIP = 9
+    FRIENDSHIP_DAY = 10
+    FRIENDSHIP_NIGHT = 11
+
+
+def _str_to_evolution_method(string: str) -> EvolutionMethodEnum:
+    if string == "LEVEL":
+        return EvolutionMethodEnum.LEVEL
+    if string == "LEVEL_ATK_LT_DEF":
+        return EvolutionMethodEnum.LEVEL_ATK_LT_DEF
+    if string == "LEVEL_ATK_EQ_DEF":
+        return EvolutionMethodEnum.LEVEL_ATK_EQ_DEF
+    if string == "LEVEL_ATK_GT_DEF":
+        return EvolutionMethodEnum.LEVEL_ATK_GT_DEF
+    if string == "LEVEL_SILCOON":
+        return EvolutionMethodEnum.LEVEL_SILCOON
+    if string == "LEVEL_CASCOON":
+        return EvolutionMethodEnum.LEVEL_CASCOON
+    if string == "LEVEL_NINJASK":
+        return EvolutionMethodEnum.LEVEL_NINJASK
+    if string == "LEVEL_SHEDINJA":
+        return EvolutionMethodEnum.LEVEL_SHEDINJA
+    if string == "FRIENDSHIP":
+        return EvolutionMethodEnum.FRIENDSHIP
+    if string == "FRIENDSHIP_DAY":
+        return EvolutionMethodEnum.FRIENDSHIP_DAY
+    if string == "FRIENDSHIP_NIGHT":
+        return EvolutionMethodEnum.FRIENDSHIP_NIGHT
+
+
+class EvolutionData(NamedTuple):
+    method: EvolutionMethodEnum
+    param: int
+    species_id: int
+
+
+class StaticEncounterData(NamedTuple):
+    species_id: int
+    rom_address: int
+
+
+@dataclass
+class SpeciesData:
+    name: str
+    label: str
+    species_id: int
+    base_stats: BaseStats
+    types: Tuple[int, int]
+    abilities: Tuple[int, int]
+    evolutions: List[EvolutionData]
+    pre_evolution: Optional[int]
+    catch_rate: int
+    learnset: List[LearnsetMove]
+    tm_hm_compatibility: int
+    learnset_rom_address: int
+    rom_address: int
+
+
+class AbilityData(NamedTuple):
+    ability_id: int
+    label: str
+
+
+class EncounterTableData(NamedTuple):
+    slots: List[int]
+    rom_address: int
+
+
+@dataclass
+class MapData:
+    name: str
+    land_encounters: Optional[EncounterTableData]
+    water_encounters: Optional[EncounterTableData]
+    fishing_encounters: Optional[EncounterTableData]
+
+
+class TrainerPokemonDataTypeEnum(IntEnum):
+    NO_ITEM_DEFAULT_MOVES = 0
+    ITEM_DEFAULT_MOVES = 1
+    NO_ITEM_CUSTOM_MOVES = 2
+    ITEM_CUSTOM_MOVES = 3
+
+
+def _str_to_pokemon_data_type(string: str) -> TrainerPokemonDataTypeEnum:
+    if string == "NO_ITEM_DEFAULT_MOVES":
+        return TrainerPokemonDataTypeEnum.NO_ITEM_DEFAULT_MOVES
+    if string == "ITEM_DEFAULT_MOVES":
+        return TrainerPokemonDataTypeEnum.ITEM_DEFAULT_MOVES
+    if string == "NO_ITEM_CUSTOM_MOVES":
+        return TrainerPokemonDataTypeEnum.NO_ITEM_CUSTOM_MOVES
+    if string == "ITEM_CUSTOM_MOVES":
+        return TrainerPokemonDataTypeEnum.ITEM_CUSTOM_MOVES
+
+
+@dataclass
+class TrainerPokemonData:
+    species_id: int
+    level: int
+    moves: Optional[Tuple[int, int, int, int]]
+
+
+@dataclass
+class TrainerPartyData:
+    pokemon: List[TrainerPokemonData]
+    pokemon_data_type: TrainerPokemonDataTypeEnum
+    rom_address: int
+
+
+@dataclass
+class TrainerData:
+    trainer_id: int
+    party: TrainerPartyData
+    rom_address: int
+    battle_script_rom_address: int
+
+
+class PokemonEmeraldData:
+    starters: Tuple[int, int, int]
+    constants: Dict[str, int]
+    ram_addresses: Dict[str, int]
+    rom_addresses: Dict[str, int]
+    regions: Dict[str, RegionData]
+    locations: Dict[str, LocationData]
+    items: Dict[int, ItemData]
+    species: List[Optional[SpeciesData]]
+    static_encounters: List[StaticEncounterData]
+    tmhm_moves: List[int]
+    abilities: List[AbilityData]
+    maps: List[MapData]
+    warps: Dict[str, Warp]
+    warp_map: Dict[str, Optional[str]]
+    trainers: List[TrainerData]
+
+    def __init__(self) -> None:
+        self.starters = (277, 280, 283)
+        self.constants = {}
+        self.ram_addresses = {}
+        self.rom_addresses = {}
+        self.regions = {}
+        self.locations = {}
+        self.items = {}
+        self.species = []
+        self.static_encounters = []
+        self.tmhm_moves = []
+        self.abilities = []
+        self.maps = []
+        self.warps = {}
+        self.warp_map = {}
+        self.trainers = []
+
+
+def load_json_data(data_name: str) -> Union[List[Any], Dict[str, Any]]:
+    return orjson.loads(pkgutil.get_data(__name__, "data/" + data_name).decode('utf-8-sig'))
+
+
+data = PokemonEmeraldData()
+
+def create_data_copy() -> PokemonEmeraldData:
+    new_copy = PokemonEmeraldData()
+    new_copy.species = copy.deepcopy(data.species)
+    new_copy.tmhm_moves = copy.deepcopy(data.tmhm_moves)
+    new_copy.maps = copy.deepcopy(data.maps)
+    new_copy.static_encounters = copy.deepcopy(data.static_encounters)
+    new_copy.trainers = copy.deepcopy(data.trainers)
+
+
+def _init() -> None:
+    extracted_data: Dict[str, Any] = load_json_data("extracted_data.json")
+    data.constants = extracted_data["constants"]
+    data.ram_addresses = extracted_data["misc_ram_addresses"]
+    data.rom_addresses = extracted_data["misc_rom_addresses"]
+
+    location_attributes_json = load_json_data("locations.json")
+
+    # Load/merge region json files
+    region_json_list = []
+    for file in pkg_resources.resource_listdir(__name__, "data/regions"):
+        if not pkg_resources.resource_isdir(__name__, "data/regions/" + file):
+            region_json_list.append(load_json_data("regions/" + file))
+
+    regions_json = {}
+    for region_subset in region_json_list:
+        for region_name, region_json in region_subset.items():
+            if region_name in regions_json:
+                raise AssertionError("Region [{region_name}] was defined multiple times")
+            regions_json[region_name] = region_json
+
+    # Create region data
+    claimed_locations: Set[str] = set()
+    claimed_warps: Set[str] = set()
+
+    data.regions = {}
+    for region_name, region_json in regions_json.items():
+        new_region = RegionData(region_name)
+
+        # Locations
+        for location_name in region_json["locations"]:
+            if location_name in claimed_locations:
+                raise AssertionError(f"Location [{location_name}] was claimed by multiple regions")
+
+            location_json = extracted_data["locations"][location_name]
+            new_location = LocationData(
+                location_name,
+                location_attributes_json[location_name]["label"],
+                region_name,
+                location_json["default_item"],
+                location_json["rom_address"],
+                location_json["flag"],
+                frozenset(location_attributes_json[location_name]["tags"])
+            )
+            new_region.locations.append(location_name)
+            data.locations[location_name] = new_location
+            claimed_locations.add(location_name)
+
+        new_region.locations.sort()
+
+        # Events
+        for event in region_json["events"]:
+            new_region.events.append(EventData(event, region_name))
+
+        # Exits
+        for region_exit in region_json["exits"]:
+            new_region.exits.append(region_exit)
+
+        # Warps
+        for encoded_warp in region_json["warps"]:
+            if encoded_warp in claimed_warps:
+                raise AssertionError(f"Warp [{encoded_warp}] was claimed by multiple regions")
+            new_region.warps.append(encoded_warp)
+            data.warps[encoded_warp] = Warp(encoded_warp, region_name)
+            claimed_warps.add(encoded_warp)
+
+        new_region.warps.sort()
+
+        data.regions[region_name] = new_region
+
+    # Create item data
+    items_json = load_json_data("items.json")
+
+    data.items = {}
+    for item_constant_name, attributes in items_json.items():
+        item_classification = None
+        if attributes["classification"] == "PROGRESSION":
+            item_classification = ItemClassification.progression
+        elif attributes["classification"] == "USEFUL":
+            item_classification = ItemClassification.useful
+        elif attributes["classification"] == "FILLER":
+            item_classification = ItemClassification.filler
+        elif attributes["classification"] == "TRAP":
+            item_classification = ItemClassification.trap
+        else:
+            raise ValueError(f"Unknown classification {attributes['classification']} for item {item_constant_name}")
+
+        data.items[data.constants[item_constant_name]] = ItemData(
+            attributes["label"],
+            data.constants[item_constant_name],
+            item_classification,
+            frozenset(attributes["tags"])
+        )
+
+    # Create species data
+
+    # Excludes extras like copies of Unown and special species values like SPECIES_EGG.
+    all_species: List[Tuple[str, str]] = [
+        ("SPECIES_BULBASAUR", "Bulbasaur"),
+        ("SPECIES_IVYSAUR", "Ivysaur"),
+        ("SPECIES_VENUSAUR", "Venusaur"),
+        ("SPECIES_CHARMANDER", "Charmander"),
+        ("SPECIES_CHARMELEON", "Charmeleon"),
+        ("SPECIES_CHARIZARD", "Charizard"),
+        ("SPECIES_SQUIRTLE", "Squirtle"),
+        ("SPECIES_WARTORTLE", "Wartortle"),
+        ("SPECIES_BLASTOISE", "Blastoise"),
+        ("SPECIES_CATERPIE", "Caterpie"),
+        ("SPECIES_METAPOD", "Metapod"),
+        ("SPECIES_BUTTERFREE", "Butterfree"),
+        ("SPECIES_WEEDLE", "Weedle"),
+        ("SPECIES_KAKUNA", "Kakuna"),
+        ("SPECIES_BEEDRILL", "Beedrill"),
+        ("SPECIES_PIDGEY", "Pidgey"),
+        ("SPECIES_PIDGEOTTO", "Pidgeotto"),
+        ("SPECIES_PIDGEOT", "Pidgeot"),
+        ("SPECIES_RATTATA", "Rattata"),
+        ("SPECIES_RATICATE", "Raticate"),
+        ("SPECIES_SPEAROW", "Spearow"),
+        ("SPECIES_FEAROW", "Fearow"),
+        ("SPECIES_EKANS", "Ekans"),
+        ("SPECIES_ARBOK", "Arbok"),
+        ("SPECIES_PIKACHU", "Pikachu"),
+        ("SPECIES_RAICHU", "Raichu"),
+        ("SPECIES_SANDSHREW", "Sandshrew"),
+        ("SPECIES_SANDSLASH", "Sandslash"),
+        ("SPECIES_NIDORAN_F", "Nidoran Female"),
+        ("SPECIES_NIDORINA", "Nidorina"),
+        ("SPECIES_NIDOQUEEN", "Nidoqueen"),
+        ("SPECIES_NIDORAN_M", "Nidoran Male"),
+        ("SPECIES_NIDORINO", "Nidorino"),
+        ("SPECIES_NIDOKING", "Nidoking"),
+        ("SPECIES_CLEFAIRY", "Clefairy"),
+        ("SPECIES_CLEFABLE", "Clefable"),
+        ("SPECIES_VULPIX", "Vulpix"),
+        ("SPECIES_NINETALES", "Ninetales"),
+        ("SPECIES_JIGGLYPUFF", "Jigglypuff"),
+        ("SPECIES_WIGGLYTUFF", "Wigglytuff"),
+        ("SPECIES_ZUBAT", "Zubat"),
+        ("SPECIES_GOLBAT", "Golbat"),
+        ("SPECIES_ODDISH", "Oddish"),
+        ("SPECIES_GLOOM", "Gloom"),
+        ("SPECIES_VILEPLUME", "Vileplume"),
+        ("SPECIES_PARAS", "Paras"),
+        ("SPECIES_PARASECT", "Parasect"),
+        ("SPECIES_VENONAT", "Venonat"),
+        ("SPECIES_VENOMOTH", "Venomoth"),
+        ("SPECIES_DIGLETT", "Diglett"),
+        ("SPECIES_DUGTRIO", "Dugtrio"),
+        ("SPECIES_MEOWTH", "Meowth"),
+        ("SPECIES_PERSIAN", "Persian"),
+        ("SPECIES_PSYDUCK", "Psyduck"),
+        ("SPECIES_GOLDUCK", "Golduck"),
+        ("SPECIES_MANKEY", "Mankey"),
+        ("SPECIES_PRIMEAPE", "Primeape"),
+        ("SPECIES_GROWLITHE", "Growlithe"),
+        ("SPECIES_ARCANINE", "Arcanine"),
+        ("SPECIES_POLIWAG", "Poliwag"),
+        ("SPECIES_POLIWHIRL", "Poliwhirl"),
+        ("SPECIES_POLIWRATH", "Poliwrath"),
+        ("SPECIES_ABRA", "Abra"),
+        ("SPECIES_KADABRA", "Kadabra"),
+        ("SPECIES_ALAKAZAM", "Alakazam"),
+        ("SPECIES_MACHOP", "Machop"),
+        ("SPECIES_MACHOKE", "Machoke"),
+        ("SPECIES_MACHAMP", "Machamp"),
+        ("SPECIES_BELLSPROUT", "Bellsprout"),
+        ("SPECIES_WEEPINBELL", "Weepinbell"),
+        ("SPECIES_VICTREEBEL", "Victreebel"),
+        ("SPECIES_TENTACOOL", "Tentacool"),
+        ("SPECIES_TENTACRUEL", "Tentacruel"),
+        ("SPECIES_GEODUDE", "Geodude"),
+        ("SPECIES_GRAVELER", "Graveler"),
+        ("SPECIES_GOLEM", "Golem"),
+        ("SPECIES_PONYTA", "Ponyta"),
+        ("SPECIES_RAPIDASH", "Rapidash"),
+        ("SPECIES_SLOWPOKE", "Slowpoke"),
+        ("SPECIES_SLOWBRO", "Slowbro"),
+        ("SPECIES_MAGNEMITE", "Magnemite"),
+        ("SPECIES_MAGNETON", "Magneton"),
+        ("SPECIES_FARFETCHD", "Farfetch'd"),
+        ("SPECIES_DODUO", "Doduo"),
+        ("SPECIES_DODRIO", "Dodrio"),
+        ("SPECIES_SEEL", "Seel"),
+        ("SPECIES_DEWGONG", "Dewgong"),
+        ("SPECIES_GRIMER", "Grimer"),
+        ("SPECIES_MUK", "Muk"),
+        ("SPECIES_SHELLDER", "Shellder"),
+        ("SPECIES_CLOYSTER", "Cloyster"),
+        ("SPECIES_GASTLY", "Gastly"),
+        ("SPECIES_HAUNTER", "Haunter"),
+        ("SPECIES_GENGAR", "Gengar"),
+        ("SPECIES_ONIX", "Onix"),
+        ("SPECIES_DROWZEE", "Drowzee"),
+        ("SPECIES_HYPNO", "Hypno"),
+        ("SPECIES_KRABBY", "Krabby"),
+        ("SPECIES_KINGLER", "Kingler"),
+        ("SPECIES_VOLTORB", "Voltorb"),
+        ("SPECIES_ELECTRODE", "Electrode"),
+        ("SPECIES_EXEGGCUTE", "Exeggcute"),
+        ("SPECIES_EXEGGUTOR", "Exeggutor"),
+        ("SPECIES_CUBONE", "Cubone"),
+        ("SPECIES_MAROWAK", "Marowak"),
+        ("SPECIES_HITMONLEE", "Hitmonlee"),
+        ("SPECIES_HITMONCHAN", "Hitmonchan"),
+        ("SPECIES_LICKITUNG", "Lickitung"),
+        ("SPECIES_KOFFING", "Koffing"),
+        ("SPECIES_WEEZING", "Weezing"),
+        ("SPECIES_RHYHORN", "Rhyhorn"),
+        ("SPECIES_RHYDON", "Rhydon"),
+        ("SPECIES_CHANSEY", "Chansey"),
+        ("SPECIES_TANGELA", "Tangela"),
+        ("SPECIES_KANGASKHAN", "Kangaskhan"),
+        ("SPECIES_HORSEA", "Horsea"),
+        ("SPECIES_SEADRA", "Seadra"),
+        ("SPECIES_GOLDEEN", "Goldeen"),
+        ("SPECIES_SEAKING", "Seaking"),
+        ("SPECIES_STARYU", "Staryu"),
+        ("SPECIES_STARMIE", "Starmie"),
+        ("SPECIES_MR_MIME", "Mr. Mime"),
+        ("SPECIES_SCYTHER", "Scyther"),
+        ("SPECIES_JYNX", "Jynx"),
+        ("SPECIES_ELECTABUZZ", "Electabuzz"),
+        ("SPECIES_MAGMAR", "Magmar"),
+        ("SPECIES_PINSIR", "Pinsir"),
+        ("SPECIES_TAUROS", "Tauros"),
+        ("SPECIES_MAGIKARP", "Magikarp"),
+        ("SPECIES_GYARADOS", "Gyarados"),
+        ("SPECIES_LAPRAS", "Lapras"),
+        ("SPECIES_DITTO", "Ditto"),
+        ("SPECIES_EEVEE", "Eevee"),
+        ("SPECIES_VAPOREON", "Vaporeon"),
+        ("SPECIES_JOLTEON", "Jolteon"),
+        ("SPECIES_FLAREON", "Flareon"),
+        ("SPECIES_PORYGON", "Porygon"),
+        ("SPECIES_OMANYTE", "Omanyte"),
+        ("SPECIES_OMASTAR", "Omastar"),
+        ("SPECIES_KABUTO", "Kabuto"),
+        ("SPECIES_KABUTOPS", "Kabutops"),
+        ("SPECIES_AERODACTYL", "Aerodactyl"),
+        ("SPECIES_SNORLAX", "Snorlax"),
+        ("SPECIES_ARTICUNO", "Articuno"),
+        ("SPECIES_ZAPDOS", "Zapdos"),
+        ("SPECIES_MOLTRES", "Moltres"),
+        ("SPECIES_DRATINI", "Dratini"),
+        ("SPECIES_DRAGONAIR", "Dragonair"),
+        ("SPECIES_DRAGONITE", "Dragonite"),
+        ("SPECIES_MEWTWO", "Mewtwo"),
+        ("SPECIES_MEW", "Mew"),
+        ("SPECIES_CHIKORITA", "Chikorita"),
+        ("SPECIES_BAYLEEF", "Bayleaf"),
+        ("SPECIES_MEGANIUM", "Meganium"),
+        ("SPECIES_CYNDAQUIL", "Cindaquil"),
+        ("SPECIES_QUILAVA", "Quilava"),
+        ("SPECIES_TYPHLOSION", "Typhlosion"),
+        ("SPECIES_TOTODILE", "Totodile"),
+        ("SPECIES_CROCONAW", "Croconaw"),
+        ("SPECIES_FERALIGATR", "Feraligatr"),
+        ("SPECIES_SENTRET", "Sentret"),
+        ("SPECIES_FURRET", "Furret"),
+        ("SPECIES_HOOTHOOT", "Hoothoot"),
+        ("SPECIES_NOCTOWL", "Noctowl"),
+        ("SPECIES_LEDYBA", "Ledyba"),
+        ("SPECIES_LEDIAN", "Ledian"),
+        ("SPECIES_SPINARAK", "Spinarak"),
+        ("SPECIES_ARIADOS", "Ariados"),
+        ("SPECIES_CROBAT", "Crobat"),
+        ("SPECIES_CHINCHOU", "Chinchou"),
+        ("SPECIES_LANTURN", "Lanturn"),
+        ("SPECIES_PICHU", "Pichu"),
+        ("SPECIES_CLEFFA", "Cleffa"),
+        ("SPECIES_IGGLYBUFF", "Igglybuff"),
+        ("SPECIES_TOGEPI", "Togepi"),
+        ("SPECIES_TOGETIC", "Togetic"),
+        ("SPECIES_NATU", "Natu"),
+        ("SPECIES_XATU", "Xatu"),
+        ("SPECIES_MAREEP", "Mareep"),
+        ("SPECIES_FLAAFFY", "Flaafy"),
+        ("SPECIES_AMPHAROS", "Ampharos"),
+        ("SPECIES_BELLOSSOM", "Bellossom"),
+        ("SPECIES_MARILL", "Marill"),
+        ("SPECIES_AZUMARILL", "Azumarill"),
+        ("SPECIES_SUDOWOODO", "Sudowoodo"),
+        ("SPECIES_POLITOED", "Politoed"),
+        ("SPECIES_HOPPIP", "Hoppip"),
+        ("SPECIES_SKIPLOOM", "Skiploom"),
+        ("SPECIES_JUMPLUFF", "Jumpluff"),
+        ("SPECIES_AIPOM", "Aipom"),
+        ("SPECIES_SUNKERN", "Sunkern"),
+        ("SPECIES_SUNFLORA", "Sunflora"),
+        ("SPECIES_YANMA", "Yanma"),
+        ("SPECIES_WOOPER", "Wooper"),
+        ("SPECIES_QUAGSIRE", "Quagsire"),
+        ("SPECIES_ESPEON", "Espeon"),
+        ("SPECIES_UMBREON", "Umbreon"),
+        ("SPECIES_MURKROW", "Murkrow"),
+        ("SPECIES_SLOWKING", "Slowking"),
+        ("SPECIES_MISDREAVUS", "Misdreavus"),
+        ("SPECIES_UNOWN", "Unown"),
+        ("SPECIES_WOBBUFFET", "Wobbuffet"),
+        ("SPECIES_GIRAFARIG", "Girafarig"),
+        ("SPECIES_PINECO", "Pineco"),
+        ("SPECIES_FORRETRESS", "Forretress"),
+        ("SPECIES_DUNSPARCE", "Dunsparce"),
+        ("SPECIES_GLIGAR", "Gligar"),
+        ("SPECIES_STEELIX", "Steelix"),
+        ("SPECIES_SNUBBULL", "Snubbull"),
+        ("SPECIES_GRANBULL", "Granbull"),
+        ("SPECIES_QWILFISH", "Qwilfish"),
+        ("SPECIES_SCIZOR", "Scizor"),
+        ("SPECIES_SHUCKLE", "Shuckle"),
+        ("SPECIES_HERACROSS", "Heracross"),
+        ("SPECIES_SNEASEL", "Sneasel"),
+        ("SPECIES_TEDDIURSA", "Teddiursa"),
+        ("SPECIES_URSARING", "Ursaring"),
+        ("SPECIES_SLUGMA", "Slugma"),
+        ("SPECIES_MAGCARGO", "Magcargo"),
+        ("SPECIES_SWINUB", "Swinub"),
+        ("SPECIES_PILOSWINE", "Piloswine"),
+        ("SPECIES_CORSOLA", "Corsola"),
+        ("SPECIES_REMORAID", "Remoraid"),
+        ("SPECIES_OCTILLERY", "Octillery"),
+        ("SPECIES_DELIBIRD", "Delibird"),
+        ("SPECIES_MANTINE", "Mantine"),
+        ("SPECIES_SKARMORY", "Skarmory"),
+        ("SPECIES_HOUNDOUR", "Houndour"),
+        ("SPECIES_HOUNDOOM", "Houndoom"),
+        ("SPECIES_KINGDRA", "Kingdra"),
+        ("SPECIES_PHANPY", "Phanpy"),
+        ("SPECIES_DONPHAN", "Donphan"),
+        ("SPECIES_PORYGON2", "Porygon2"),
+        ("SPECIES_STANTLER", "Stantler"),
+        ("SPECIES_SMEARGLE", "Smeargle"),
+        ("SPECIES_TYROGUE", "Tyrogue"),
+        ("SPECIES_HITMONTOP", "Hitmontop"),
+        ("SPECIES_SMOOCHUM", "Smoochum"),
+        ("SPECIES_ELEKID", "Elekid"),
+        ("SPECIES_MAGBY", "Magby"),
+        ("SPECIES_MILTANK", "Miltank"),
+        ("SPECIES_BLISSEY", "Blissey"),
+        ("SPECIES_RAIKOU", "Raikou"),
+        ("SPECIES_ENTEI", "Entei"),
+        ("SPECIES_SUICUNE", "Suicune"),
+        ("SPECIES_LARVITAR", "Larvitar"),
+        ("SPECIES_PUPITAR", "Pupitar"),
+        ("SPECIES_TYRANITAR", "Tyranitar"),
+        ("SPECIES_LUGIA", "Lugia"),
+        ("SPECIES_HO_OH", "Ho-oh"),
+        ("SPECIES_CELEBI", "Celebi"),
+        ("SPECIES_TREECKO", "Treecko"),
+        ("SPECIES_GROVYLE", "Grovyle"),
+        ("SPECIES_SCEPTILE", "Sceptile"),
+        ("SPECIES_TORCHIC", "Torchic"),
+        ("SPECIES_COMBUSKEN", "Combusken"),
+        ("SPECIES_BLAZIKEN", "Blaziken"),
+        ("SPECIES_MUDKIP", "Mudkip"),
+        ("SPECIES_MARSHTOMP", "Marshtomp"),
+        ("SPECIES_SWAMPERT", "Swampert"),
+        ("SPECIES_POOCHYENA", "Poochyena"),
+        ("SPECIES_MIGHTYENA", "Mightyena"),
+        ("SPECIES_ZIGZAGOON", "Zigzagoon"),
+        ("SPECIES_LINOONE", "Linoon"),
+        ("SPECIES_WURMPLE", "Wurmple"),
+        ("SPECIES_SILCOON", "Silcoon"),
+        ("SPECIES_BEAUTIFLY", "Beautifly"),
+        ("SPECIES_CASCOON", "Cascoon"),
+        ("SPECIES_DUSTOX", "Dustox"),
+        ("SPECIES_LOTAD", "Lotad"),
+        ("SPECIES_LOMBRE", "Lombre"),
+        ("SPECIES_LUDICOLO", "Ludicolo"),
+        ("SPECIES_SEEDOT", "Seedot"),
+        ("SPECIES_NUZLEAF", "Nuzleaf"),
+        ("SPECIES_SHIFTRY", "Shiftry"),
+        ("SPECIES_NINCADA", "Nincada"),
+        ("SPECIES_NINJASK", "Ninjask"),
+        ("SPECIES_SHEDINJA", "Shedinja"),
+        ("SPECIES_TAILLOW", "Taillow"),
+        ("SPECIES_SWELLOW", "Swellow"),
+        ("SPECIES_SHROOMISH", "Shroomish"),
+        ("SPECIES_BRELOOM", "Breloom"),
+        ("SPECIES_SPINDA", "Spinda"),
+        ("SPECIES_WINGULL", "Wingull"),
+        ("SPECIES_PELIPPER", "Pelipper"),
+        ("SPECIES_SURSKIT", "Surskit"),
+        ("SPECIES_MASQUERAIN", "Masquerain"),
+        ("SPECIES_WAILMER", "Wailmer"),
+        ("SPECIES_WAILORD", "Wailord"),
+        ("SPECIES_SKITTY", "Skitty"),
+        ("SPECIES_DELCATTY", "Delcatty"),
+        ("SPECIES_KECLEON", "Kecleon"),
+        ("SPECIES_BALTOY", "Baltoy"),
+        ("SPECIES_CLAYDOL", "Claydol"),
+        ("SPECIES_NOSEPASS", "Nosepass"),
+        ("SPECIES_TORKOAL", "Torkoal"),
+        ("SPECIES_SABLEYE", "Sableye"),
+        ("SPECIES_BARBOACH", "Barboach"),
+        ("SPECIES_WHISCASH", "Whiscash"),
+        ("SPECIES_LUVDISC", "Luvdisc"),
+        ("SPECIES_CORPHISH", "Corphish"),
+        ("SPECIES_CRAWDAUNT", "Crawdaunt"),
+        ("SPECIES_FEEBAS", "Feebas"),
+        ("SPECIES_MILOTIC", "Milotic"),
+        ("SPECIES_CARVANHA", "Carvanha"),
+        ("SPECIES_SHARPEDO", "Sharpedo"),
+        ("SPECIES_TRAPINCH", "Trapinch"),
+        ("SPECIES_VIBRAVA", "Vibrava"),
+        ("SPECIES_FLYGON", "Flygon"),
+        ("SPECIES_MAKUHITA", "Makuhita"),
+        ("SPECIES_HARIYAMA", "Hariyama"),
+        ("SPECIES_ELECTRIKE", "Electrike"),
+        ("SPECIES_MANECTRIC", "Manectric"),
+        ("SPECIES_NUMEL", "Numel"),
+        ("SPECIES_CAMERUPT", "Camerupt"),
+        ("SPECIES_SPHEAL", "Spheal"),
+        ("SPECIES_SEALEO", "Sealeo"),
+        ("SPECIES_WALREIN", "Walrein"),
+        ("SPECIES_CACNEA", "Cacnea"),
+        ("SPECIES_CACTURNE", "Cacturne"),
+        ("SPECIES_SNORUNT", "Snorunt"),
+        ("SPECIES_GLALIE", "Glalie"),
+        ("SPECIES_LUNATONE", "Lunatone"),
+        ("SPECIES_SOLROCK", "Solrock"),
+        ("SPECIES_AZURILL", "Azurill"),
+        ("SPECIES_SPOINK", "Spoink"),
+        ("SPECIES_GRUMPIG", "Grumpig"),
+        ("SPECIES_PLUSLE", "Plusle"),
+        ("SPECIES_MINUN", "Minun"),
+        ("SPECIES_MAWILE", "Mawile"),
+        ("SPECIES_MEDITITE", "Meditite"),
+        ("SPECIES_MEDICHAM", "Medicham"),
+        ("SPECIES_SWABLU", "Swablu"),
+        ("SPECIES_ALTARIA", "Altaria"),
+        ("SPECIES_WYNAUT", "Wynaut"),
+        ("SPECIES_DUSKULL", "Duskull"),
+        ("SPECIES_DUSCLOPS", "Dusclops"),
+        ("SPECIES_ROSELIA", "Roselia"),
+        ("SPECIES_SLAKOTH", "Slakoth"),
+        ("SPECIES_VIGOROTH", "Vigoroth"),
+        ("SPECIES_SLAKING", "Slaking"),
+        ("SPECIES_GULPIN", "Gulpin"),
+        ("SPECIES_SWALOT", "Swalot"),
+        ("SPECIES_TROPIUS", "Tropius"),
+        ("SPECIES_WHISMUR", "Whismur"),
+        ("SPECIES_LOUDRED", "Loudred"),
+        ("SPECIES_EXPLOUD", "Exploud"),
+        ("SPECIES_CLAMPERL", "Clamperl"),
+        ("SPECIES_HUNTAIL", "Huntail"),
+        ("SPECIES_GOREBYSS", "Gorebyss"),
+        ("SPECIES_ABSOL", "Absol"),
+        ("SPECIES_SHUPPET", "Shuppet"),
+        ("SPECIES_BANETTE", "Banette"),
+        ("SPECIES_SEVIPER", "Seviper"),
+        ("SPECIES_ZANGOOSE", "Zangoose"),
+        ("SPECIES_RELICANTH", "Relicanth"),
+        ("SPECIES_ARON", "Aron"),
+        ("SPECIES_LAIRON", "Lairon"),
+        ("SPECIES_AGGRON", "Aggron"),
+        ("SPECIES_CASTFORM", "Castform"),
+        ("SPECIES_VOLBEAT", "Volbeat"),
+        ("SPECIES_ILLUMISE", "Illumise"),
+        ("SPECIES_LILEEP", "Lileep"),
+        ("SPECIES_CRADILY", "Cradily"),
+        ("SPECIES_ANORITH", "Anorith"),
+        ("SPECIES_ARMALDO", "Armaldo"),
+        ("SPECIES_RALTS", "Ralts"),
+        ("SPECIES_KIRLIA", "Kirlia"),
+        ("SPECIES_GARDEVOIR", "Gardevoir"),
+        ("SPECIES_BAGON", "Bagon"),
+        ("SPECIES_SHELGON", "Shelgon"),
+        ("SPECIES_SALAMENCE", "Salamence"),
+        ("SPECIES_BELDUM", "Beldum"),
+        ("SPECIES_METANG", "Metang"),
+        ("SPECIES_METAGROSS", "Metagross"),
+        ("SPECIES_REGIROCK", "Regirock"),
+        ("SPECIES_REGICE", "Regice"),
+        ("SPECIES_REGISTEEL", "Registeel"),
+        ("SPECIES_KYOGRE", "Kyogre"),
+        ("SPECIES_GROUDON", "Groudon"),
+        ("SPECIES_RAYQUAZA", "Rayquaza"),
+        ("SPECIES_LATIAS", "Latias"),
+        ("SPECIES_LATIOS", "Latios"),
+        ("SPECIES_JIRACHI", "Jirachi"),
+        ("SPECIES_DEOXYS", "Deoxys"),
+        ("SPECIES_CHIMECHO", "Chimecho")
+    ]
+
+    species_list: List[SpeciesData] = []
+    max_species_id = 0
+    for species_name, species_label in all_species:
+        species_id = data.constants[species_name]
+        max_species_id = max(species_id, max_species_id)
+        species_data = extracted_data["species"][species_id]
+
+        learnset = [LearnsetMove(item["level"], item["move_id"]) for item in species_data["learnset"]["moves"]]
+
+        species_list.append(SpeciesData(
+            species_name,
+            species_label,
+            species_id,
+            BaseStats(
+                species_data["base_stats"][0],
+                species_data["base_stats"][1],
+                species_data["base_stats"][2],
+                species_data["base_stats"][3],
+                species_data["base_stats"][4],
+                species_data["base_stats"][5]
+            ),
+            (species_data["types"][0], species_data["types"][1]),
+            (species_data["abilities"][0], species_data["abilities"][1]),
+            [EvolutionData(
+                _str_to_evolution_method(evolution_json["method"]),
+                evolution_json["param"],
+                evolution_json["species"],
+            ) for evolution_json in species_data["evolutions"]],
+            None,
+            species_data["catch_rate"],
+            learnset,
+            int(species_data["tmhm_learnset"], 16),
+            species_data["learnset"]["rom_address"],
+            species_data["rom_address"]
+        ))
+
+    data.species = [None for i in range(max_species_id + 1)]
+
+    for species_data in species_list:
+        data.species[species_data.species_id] = species_data
+
+    for species in data.species:
+        if species is not None:
+            for evolution in species.evolutions:
+                data.species[evolution.species_id].pre_evolution = species.species_id
+
+    # Create static encounter data
+    for static_encounter_json in extracted_data["static_encounters"]:
+        data.static_encounters.append(StaticEncounterData(
+            static_encounter_json["species"],
+            static_encounter_json["rom_address"]
+        ))
+
+    # TM moves
+    data.tmhm_moves = extracted_data["tmhm_moves"]
+
+    # Create ability data
+    data.abilities = [AbilityData(data.constants[ability_data[0]], ability_data[1]) for ability_data in [
+        ("ABILITY_STENCH", "Stench"),
+        ("ABILITY_DRIZZLE", "Drizzle"),
+        ("ABILITY_SPEED_BOOST", "Speed Boost"),
+        ("ABILITY_BATTLE_ARMOR", "Battle Armor"),
+        ("ABILITY_STURDY", "Sturdy"),
+        ("ABILITY_DAMP", "Damp"),
+        ("ABILITY_LIMBER", "Limber"),
+        ("ABILITY_SAND_VEIL", "Sand Veil"),
+        ("ABILITY_STATIC", "Static"),
+        ("ABILITY_VOLT_ABSORB", "Volt Absorb"),
+        ("ABILITY_WATER_ABSORB", "Water Absorb"),
+        ("ABILITY_OBLIVIOUS", "Oblivious"),
+        ("ABILITY_CLOUD_NINE", "Cloud Nine"),
+        ("ABILITY_COMPOUND_EYES", "Compound Eyes"),
+        ("ABILITY_INSOMNIA", "Insomnia"),
+        ("ABILITY_COLOR_CHANGE", "Color Change"),
+        ("ABILITY_IMMUNITY", "Immunity"),
+        ("ABILITY_FLASH_FIRE", "Flash Fire"),
+        ("ABILITY_SHIELD_DUST", "Shield Dust"),
+        ("ABILITY_OWN_TEMPO", "Own Tempo"),
+        ("ABILITY_SUCTION_CUPS", "Suction Cups"),
+        ("ABILITY_INTIMIDATE", "Intimidate"),
+        ("ABILITY_SHADOW_TAG", "Shadow Tag"),
+        ("ABILITY_ROUGH_SKIN", "Rough Skin"),
+        ("ABILITY_WONDER_GUARD", "Wonder Guard"),
+        ("ABILITY_LEVITATE", "Levitate"),
+        ("ABILITY_EFFECT_SPORE", "Effect Spore"),
+        ("ABILITY_SYNCHRONIZE", "Synchronize"),
+        ("ABILITY_CLEAR_BODY", "Clear Body"),
+        ("ABILITY_NATURAL_CURE", "Natural Cure"),
+        ("ABILITY_LIGHTNING_ROD", "Lightning Rod"),
+        ("ABILITY_SERENE_GRACE", "Serene Grace"),
+        ("ABILITY_SWIFT_SWIM", "Swift Swim"),
+        ("ABILITY_CHLOROPHYLL", "Chlorophyll"),
+        ("ABILITY_ILLUMINATE", "Illuminate"),
+        ("ABILITY_TRACE", "Trace"),
+        ("ABILITY_HUGE_POWER", "Huge Power"),
+        ("ABILITY_POISON_POINT", "Poison Point"),
+        ("ABILITY_INNER_FOCUS", "Inner Focus"),
+        ("ABILITY_MAGMA_ARMOR", "Magma Armor"),
+        ("ABILITY_WATER_VEIL", "Water Veil"),
+        ("ABILITY_MAGNET_PULL", "Magnet Pull"),
+        ("ABILITY_SOUNDPROOF", "Soundproof"),
+        ("ABILITY_RAIN_DISH", "Rain Dish"),
+        ("ABILITY_SAND_STREAM", "Sand Stream"),
+        ("ABILITY_PRESSURE", "Pressure"),
+        ("ABILITY_THICK_FAT", "Thick Fat"),
+        ("ABILITY_EARLY_BIRD", "Early Bird"),
+        ("ABILITY_FLAME_BODY", "Flame Body"),
+        ("ABILITY_RUN_AWAY", "Run Away"),
+        ("ABILITY_KEEN_EYE", "Keen Eye"),
+        ("ABILITY_HYPER_CUTTER", "Hyper Cutter"),
+        ("ABILITY_PICKUP", "Pickup"),
+        ("ABILITY_TRUANT", "Truant"),
+        ("ABILITY_HUSTLE", "Hustle"),
+        ("ABILITY_CUTE_CHARM", "Cute Charm"),
+        ("ABILITY_PLUS", "Plus"),
+        ("ABILITY_MINUS", "Minus"),
+        ("ABILITY_FORECAST", "Forecast"),
+        ("ABILITY_STICKY_HOLD", "Sticky Hold"),
+        ("ABILITY_SHED_SKIN", "Shed Skin"),
+        ("ABILITY_GUTS", "Guts"),
+        ("ABILITY_MARVEL_SCALE", "Marvel Scale"),
+        ("ABILITY_LIQUID_OOZE", "Liquid Ooze"),
+        ("ABILITY_OVERGROW", "Overgrow"),
+        ("ABILITY_BLAZE", "Blaze"),
+        ("ABILITY_TORRENT", "Torrent"),
+        ("ABILITY_SWARM", "Swarm"),
+        ("ABILITY_ROCK_HEAD", "Rock Head"),
+        ("ABILITY_DROUGHT", "Drought"),
+        ("ABILITY_ARENA_TRAP", "Arena Trap"),
+        ("ABILITY_VITAL_SPIRIT", "Vital Spirit"),
+        ("ABILITY_WHITE_SMOKE", "White Smoke"),
+        ("ABILITY_PURE_POWER", "Pure Power"),
+        ("ABILITY_SHELL_ARMOR", "Shell Armor"),
+        ("ABILITY_CACOPHONY", "Cacophony"),
+        ("ABILITY_AIR_LOCK", "Air Lock")
+    ]]
+
+    # Create map data
+    for map_name, map_json in extracted_data["maps"].items():
+        land_encounters = None
+        water_encounters = None
+        fishing_encounters = None
+
+        if map_json["land_encounters"] is not None:
+            land_encounters = EncounterTableData(
+                map_json["land_encounters"]["encounter_slots"],
+                map_json["land_encounters"]["rom_address"]
+            )
+        if map_json["water_encounters"] is not None:
+            water_encounters = EncounterTableData(
+                map_json["water_encounters"]["encounter_slots"],
+                map_json["water_encounters"]["rom_address"]
+            )
+        if map_json["fishing_encounters"] is not None:
+            fishing_encounters = EncounterTableData(
+                map_json["fishing_encounters"]["encounter_slots"],
+                map_json["fishing_encounters"]["rom_address"]
+            )
+
+        data.maps.append(MapData(
+            map_name,
+            land_encounters,
+            water_encounters,
+            fishing_encounters
+        ))
+
+    data.maps.sort(key=lambda map: map.name)
+
+    # Create warp map
+    for warp, destination in extracted_data["warps"].items():
+        data.warp_map[warp] = None if destination == "" else destination
+
+        if encoded_warp not in data.warp_map:
+            data.warp_map[encoded_warp] = None
+
+    # Create trainer data
+    for i, trainer_json in enumerate(extracted_data["trainers"]):
+        party_json = trainer_json["party"]
+        pokemon_data_type = _str_to_pokemon_data_type(trainer_json["pokemon_data_type"])
+        data.trainers.append(TrainerData(
+            i,
+            TrainerPartyData(
+                [TrainerPokemonData(
+                    p["species"],
+                    p["level"],
+                    (p["moves"][0], p["moves"][1], p["moves"][2], p["moves"][3])
+                ) for p in party_json],
+                pokemon_data_type,
+                trainer_json["party_rom_address"]
+            ),
+            trainer_json["rom_address"],
+            trainer_json["battle_script_rom_address"]
+        ))
+
+
+_init()
diff --git a/worlds/pokemon_emerald/data/README.md b/worlds/pokemon_emerald/data/README.md
new file mode 100644
index 0000000000..a7c5d3f293
--- /dev/null
+++ b/worlds/pokemon_emerald/data/README.md
@@ -0,0 +1,99 @@
+## `regions/`
+
+These define regions, connections, and where locations are. If you know what you're doing, it should be pretty clear how
+this works by taking a quick look through the files. The rest of this section is pretty verbose to cover everything. Not
+to say you shouldn't read it, but the tl;dr is:
+
+- Every map, even trivial ones, gets a region definition, and they cannot be coalesced (because of warp rando)
+- Stick to the naming convention for regions and events (look at Route 103 and Petalburg City for guidance)
+- Locations and warps can only be claimed by one region
+- Events are declared here
+
+A `Map`, which you will see referenced in `parent_map` attribute in the region JSON, is an id from the source code.
+`Map`s are sets of tiles, encounters, warps, events, and so on. Route 103, Littleroot Town, the Oldale Town Mart, the
+second floor of Devon Corp, and each level of Victory Road are all examples of `Map`s. You transition between `Map`s by
+stepping on a warp (warp pads, doorways, etc...) or walking over a border between `Map`s in the overworld. Some warps
+don't go to a different `Map`.
+
+Regions usually describe physical areas which are subsets of a `Map`. Every `Map` must have one or more defined regions.
+A region should not contain area from more than one `Map`. We'll need to draw those lines now even when there is no
+logical boundary (like between two the first and second floors of your rival's house), for warp rando.
+
+Most `Map`s have been split into multiple regions. In the example below, `MAP_ROUTE103` was split into
+`REGION_ROUTE_103/WEST`, `REGION_ROUTE_103/WATER`, and `REGION_ROUTE_103/EAST` (this document may be out of date; the
+example is demonstrative). Keeping the name consistent with the `Map` name and adding a label suffix for the subarea
+makes it clearer where we are in the world and where within a `Map` we're describing.
+
+Every region (except `Menu`) is configured here. All files in this directory are combined with each other at runtime,
+and are only split and ordered for organization. Regions defined in `data/regions/unused` are entirely unused because
+they're not yet reachable in the randomizer. They're there for future reference in case we want to pull those maps in
+later. Any locations or warps in here should be ignored. Data for a single region looks like this:
+
+```json
+"REGION_ROUTE103/EAST": {
+  "parent_map": "MAP_ROUTE103",
+  "locations": [
+    "ITEM_ROUTE_103_GUARD_SPEC",
+    "ITEM_ROUTE_103_PP_UP"
+  ],
+  "events": [],
+  "exits": [
+    "REGION_ROUTE103/WATER",
+    "REGION_ROUTE110/MAIN"
+  ],
+  "warps": [
+    "MAP_ROUTE103:0/MAP_ALTERING_CAVE:0"
+  ]
+}
+```
+
+- `[key]`: The name of the object, in this case `REGION_ROUTE103/EAST`, should be the value of `parent_map` where the
+`MAP` prefix is replaced with `REGION`. Then there should be a following `/` and a label describing this specific region
+within the `Map`. This is not enforced or required by the code, but it makes things much more clear.
+- `parent_map`: The name of the `Map` this region exists under. It can relate this region to information like encounter
+tables.
+- `locations`: Locations contained within this region. This can be anything from an item on the ground to a badge to a
+gift from an NPC. Locations themselves are defined in `data/extracted_data.json`, and the names used here should come
+directly from it.
+- `events`: Events that can be completed in this region. Defeating a gym leader or Aqua/Magma team leader, for example,
+can trigger story progression and unblock roads and buildings. Events are defined here and nowhere else, and access
+rules are set in `rules.py`.
+- `exits`: Names of regions that can be directly accessed from this one. Most often regions within the same `Map`,
+neighboring maps in the overworld, or transitions from using HM08 Dive. Most connections between maps/regions come from
+warps. Any region in this list should be defined somewhere in `data/regions`.
+- `warps`: Warp events contained within this region. Warps are defined in `data/extracted_data.json`, and must exist
+there to be referenced here. More on warps in [../README.md](../README.md).
+
+Think of this data as defining which regions are "claiming" a given location, event, or warp. No more than one region
+may claim ownership of a location. Even if some "thing" may happen in two different regions and set the same flag, they
+should be defined as two different events and anything conditional on said "thing" happening can check whether either of
+the two events is accessible. (e.g. Interacting with the Poke Ball in your rival's room and going back downstairs will
+both trigger a conversation with them which enables you to rescue Professor Birch. It's the same "thing" on two
+different `Map`s.)
+
+Conceptually, you shouldn't have to "add" any new regions. You should only have to "split" existing regions. When you
+split a region, make sure to correctly reassign `locations`, `events`, `exits`, and `warps` according to which new
+region they now exist in. Make sure to define new `exits` to link the new regions to each other if applicable. And
+especially remember to rename incoming `exits` defined in other regions which are still pointing to the pre-split
+region. `sanity_check.py` should catch you if there are other regions that point to a region that no longer exists, but
+if one of your newly-split regions still has the same name as the original, it won't be detected and you may find that
+things aren't connected correctly.
+
+## `extracted_data.json`
+
+DO NOT TOUCH
+
+Contains data automatically pulled from the base rom and its source code when it is built. There should be no reason to
+manually modify it. Data from this file is piped through `data.py` to create a data object that's more useful and
+complete.
+
+## `items.json`
+
+A map from items as defined in the `constants` in `extracted_data.json` to useful info like a human-friendly label, the
+type of progression it enables, and tags to associate. There are many unused items and extra helper constants in
+`extracted_data.json`, so this file contains an exhaustive list of items which can actually be found in the modded game.
+
+## `locations.json`
+
+Similar to `items.json`, this associates locations with human-friendly labels and tags that are used for filtering. Any
+locations claimed by any region need an entry here.
diff --git a/worlds/pokemon_emerald/data/base_patch.bsdiff4 b/worlds/pokemon_emerald/data/base_patch.bsdiff4
new file mode 100644
index 0000000000..c1843904a9
Binary files /dev/null and b/worlds/pokemon_emerald/data/base_patch.bsdiff4 differ
diff --git a/worlds/pokemon_emerald/data/extracted_data.json b/worlds/pokemon_emerald/data/extracted_data.json
new file mode 100644
index 0000000000..6174cd4885
--- /dev/null
+++ b/worlds/pokemon_emerald/data/extracted_data.json
@@ -0,0 +1 @@
+{"_comment":"DO NOT MODIFY. This file was auto-generated. Your changes will likely be overwritten.","_rom_name":"pokemon emerald version / AP 2","constants":{"ABILITIES_COUNT":78,"ABILITY_AIR_LOCK":77,"ABILITY_ARENA_TRAP":71,"ABILITY_BATTLE_ARMOR":4,"ABILITY_BLAZE":66,"ABILITY_CACOPHONY":76,"ABILITY_CHLOROPHYLL":34,"ABILITY_CLEAR_BODY":29,"ABILITY_CLOUD_NINE":13,"ABILITY_COLOR_CHANGE":16,"ABILITY_COMPOUND_EYES":14,"ABILITY_CUTE_CHARM":56,"ABILITY_DAMP":6,"ABILITY_DRIZZLE":2,"ABILITY_DROUGHT":70,"ABILITY_EARLY_BIRD":48,"ABILITY_EFFECT_SPORE":27,"ABILITY_FLAME_BODY":49,"ABILITY_FLASH_FIRE":18,"ABILITY_FORECAST":59,"ABILITY_GUTS":62,"ABILITY_HUGE_POWER":37,"ABILITY_HUSTLE":55,"ABILITY_HYPER_CUTTER":52,"ABILITY_ILLUMINATE":35,"ABILITY_IMMUNITY":17,"ABILITY_INNER_FOCUS":39,"ABILITY_INSOMNIA":15,"ABILITY_INTIMIDATE":22,"ABILITY_KEEN_EYE":51,"ABILITY_LEVITATE":26,"ABILITY_LIGHTNING_ROD":31,"ABILITY_LIMBER":7,"ABILITY_LIQUID_OOZE":64,"ABILITY_MAGMA_ARMOR":40,"ABILITY_MAGNET_PULL":42,"ABILITY_MARVEL_SCALE":63,"ABILITY_MINUS":58,"ABILITY_NATURAL_CURE":30,"ABILITY_NONE":0,"ABILITY_OBLIVIOUS":12,"ABILITY_OVERGROW":65,"ABILITY_OWN_TEMPO":20,"ABILITY_PICKUP":53,"ABILITY_PLUS":57,"ABILITY_POISON_POINT":38,"ABILITY_PRESSURE":46,"ABILITY_PURE_POWER":74,"ABILITY_RAIN_DISH":44,"ABILITY_ROCK_HEAD":69,"ABILITY_ROUGH_SKIN":24,"ABILITY_RUN_AWAY":50,"ABILITY_SAND_STREAM":45,"ABILITY_SAND_VEIL":8,"ABILITY_SERENE_GRACE":32,"ABILITY_SHADOW_TAG":23,"ABILITY_SHED_SKIN":61,"ABILITY_SHELL_ARMOR":75,"ABILITY_SHIELD_DUST":19,"ABILITY_SOUNDPROOF":43,"ABILITY_SPEED_BOOST":3,"ABILITY_STATIC":9,"ABILITY_STENCH":1,"ABILITY_STICKY_HOLD":60,"ABILITY_STURDY":5,"ABILITY_SUCTION_CUPS":21,"ABILITY_SWARM":68,"ABILITY_SWIFT_SWIM":33,"ABILITY_SYNCHRONIZE":28,"ABILITY_THICK_FAT":47,"ABILITY_TORRENT":67,"ABILITY_TRACE":36,"ABILITY_TRUANT":54,"ABILITY_VITAL_SPIRIT":72,"ABILITY_VOLT_ABSORB":10,"ABILITY_WATER_ABSORB":11,"ABILITY_WATER_VEIL":41,"ABILITY_WHITE_SMOKE":73,"ABILITY_WONDER_GUARD":25,"ACRO_BIKE":1,"BAG_ITEM_CAPACITY_DIGITS":2,"BERRY_CAPACITY_DIGITS":3,"DAILY_FLAGS_END":2399,"DAILY_FLAGS_START":2336,"FIRST_BALL":1,"FIRST_BERRY_INDEX":133,"FIRST_BERRY_MASTER_BERRY":153,"FIRST_BERRY_MASTER_WIFE_BERRY":133,"FIRST_KIRI_BERRY":153,"FIRST_MAIL_INDEX":121,"FIRST_ROUTE_114_MAN_BERRY":148,"FLAGS_COUNT":2400,"FLAG_ADDED_MATCH_CALL_TO_POKENAV":304,"FLAG_ADVENTURE_STARTED":116,"FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT":2265,"FLAG_ARRIVED_AT_NAVEL_ROCK":2273,"FLAG_ARRIVED_AT_TERRA_CAVE_ENTRANCE":2266,"FLAG_ARRIVED_ON_FARAWAY_ISLAND":2264,"FLAG_BADGE01_GET":2151,"FLAG_BADGE02_GET":2152,"FLAG_BADGE03_GET":2153,"FLAG_BADGE04_GET":2154,"FLAG_BADGE05_GET":2155,"FLAG_BADGE06_GET":2156,"FLAG_BADGE07_GET":2157,"FLAG_BADGE08_GET":2158,"FLAG_BATTLED_DEOXYS":429,"FLAG_BATTLE_FRONTIER_TRADE_DONE":156,"FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS":313,"FLAG_BEAUTY_PAINTING_MADE":161,"FLAG_BETTER_SHOPS_ENABLED":483,"FLAG_BIRCH_AIDE_MET":88,"FLAG_CANCEL_BATTLE_ROOM_CHALLENGE":119,"FLAG_CAUGHT_HO_OH":146,"FLAG_CAUGHT_LATIAS_OR_LATIOS":457,"FLAG_CAUGHT_LUGIA":145,"FLAG_CAUGHT_MEW":458,"FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER":338,"FLAG_CHOSE_CLAW_FOSSIL":336,"FLAG_CHOSE_ROOT_FOSSIL":335,"FLAG_COLLECTED_ALL_GOLD_SYMBOLS":466,"FLAG_COLLECTED_ALL_SILVER_SYMBOLS":92,"FLAG_CONTEST_SKETCH_CREATED":270,"FLAG_COOL_PAINTING_MADE":160,"FLAG_CUTE_PAINTING_MADE":162,"FLAG_DAILY_APPRENTICE_LEAVES":2356,"FLAG_DAILY_BERRY_MASTERS_WIFE":2353,"FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY":2349,"FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY":2337,"FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY":2352,"FLAG_DAILY_LILYCOVE_RECEIVED_BERRY":2351,"FLAG_DAILY_PICKED_LOTO_TICKET":2346,"FLAG_DAILY_ROUTE_111_RECEIVED_BERRY":2348,"FLAG_DAILY_ROUTE_114_RECEIVED_BERRY":2347,"FLAG_DAILY_ROUTE_120_RECEIVED_BERRY":2350,"FLAG_DAILY_SECRET_BASE":2338,"FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY":2354,"FLAG_DECLINED_BIKE":89,"FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE":286,"FLAG_DECLINED_WALLY_BATTLE_MAUVILLE":284,"FLAG_DECORATION_1":174,"FLAG_DECORATION_10":183,"FLAG_DECORATION_11":184,"FLAG_DECORATION_12":185,"FLAG_DECORATION_13":186,"FLAG_DECORATION_14":187,"FLAG_DECORATION_2":175,"FLAG_DECORATION_3":176,"FLAG_DECORATION_4":177,"FLAG_DECORATION_5":178,"FLAG_DECORATION_6":179,"FLAG_DECORATION_7":180,"FLAG_DECORATION_8":181,"FLAG_DECORATION_9":182,"FLAG_DEFEATED_DEOXYS":428,"FLAG_DEFEATED_DEWFORD_GYM":1265,"FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT":452,"FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT":453,"FLAG_DEFEATED_ELITE_4_DRAKE":1278,"FLAG_DEFEATED_ELITE_4_GLACIA":1277,"FLAG_DEFEATED_ELITE_4_PHOEBE":1276,"FLAG_DEFEATED_ELITE_4_SIDNEY":1275,"FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY":139,"FLAG_DEFEATED_FORTREE_GYM":1269,"FLAG_DEFEATED_GROUDON":447,"FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F":191,"FLAG_DEFEATED_HO_OH":476,"FLAG_DEFEATED_KYOGRE":446,"FLAG_DEFEATED_LATIAS_OR_LATIOS":456,"FLAG_DEFEATED_LAVARIDGE_GYM":1267,"FLAG_DEFEATED_LUGIA":477,"FLAG_DEFEATED_MAGMA_SPACE_CENTER":117,"FLAG_DEFEATED_MAUVILLE_GYM":1266,"FLAG_DEFEATED_METEOR_FALLS_STEVEN":1272,"FLAG_DEFEATED_MEW":455,"FLAG_DEFEATED_MOSSDEEP_GYM":1270,"FLAG_DEFEATED_PETALBURG_GYM":1268,"FLAG_DEFEATED_RAYQUAZA":448,"FLAG_DEFEATED_REGICE":444,"FLAG_DEFEATED_REGIROCK":443,"FLAG_DEFEATED_REGISTEEL":445,"FLAG_DEFEATED_RIVAL_ROUTE103":130,"FLAG_DEFEATED_RIVAL_ROUTE_104":125,"FLAG_DEFEATED_RIVAL_RUSTBORO":211,"FLAG_DEFEATED_RUSTBORO_GYM":1264,"FLAG_DEFEATED_SEASHORE_HOUSE":141,"FLAG_DEFEATED_SOOTOPOLIS_GYM":1271,"FLAG_DEFEATED_SS_TIDAL_TRAINERS":247,"FLAG_DEFEATED_SUDOWOODO":454,"FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE":449,"FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE":450,"FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE":451,"FLAG_DEFEATED_WALLY_MAUVILLE":190,"FLAG_DEFEATED_WALLY_VICTORY_ROAD":126,"FLAG_DELIVERED_DEVON_GOODS":149,"FLAG_DELIVERED_STEVEN_LETTER":189,"FLAG_DEOXYS_ROCK_COMPLETE":2260,"FLAG_DEVON_GOODS_STOLEN":142,"FLAG_DOCK_REJECTED_DEVON_GOODS":148,"FLAG_DONT_TRANSITION_MUSIC":16385,"FLAG_DUMMY_LATIAS":33,"FLAG_DUMMY_LATIOS":32,"FLAG_ENABLE_BRAWLY_MATCH_CALL":468,"FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL":136,"FLAG_ENABLE_FLANNERY_MATCH_CALL":470,"FLAG_ENABLE_JUAN_MATCH_CALL":473,"FLAG_ENABLE_MOM_MATCH_CALL":216,"FLAG_ENABLE_MR_STONE_POKENAV":344,"FLAG_ENABLE_MULTI_CORRIDOR_DOOR":16386,"FLAG_ENABLE_NORMAN_MATCH_CALL":306,"FLAG_ENABLE_PROF_BIRCH_MATCH_CALL":281,"FLAG_ENABLE_RIVAL_MATCH_CALL":253,"FLAG_ENABLE_ROXANNE_FIRST_CALL":128,"FLAG_ENABLE_ROXANNE_MATCH_CALL":467,"FLAG_ENABLE_SCOTT_MATCH_CALL":215,"FLAG_ENABLE_SHIP_BIRTH_ISLAND":2261,"FLAG_ENABLE_SHIP_FARAWAY_ISLAND":2262,"FLAG_ENABLE_SHIP_NAVEL_ROCK":2272,"FLAG_ENABLE_SHIP_SOUTHERN_ISLAND":2227,"FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL":472,"FLAG_ENABLE_WALLY_MATCH_CALL":214,"FLAG_ENABLE_WATTSON_MATCH_CALL":469,"FLAG_ENABLE_WINONA_MATCH_CALL":471,"FLAG_ENCOUNTERED_LATIAS_OR_LATIOS":206,"FLAG_ENTERED_CONTEST":341,"FLAG_ENTERED_ELITE_FOUR":263,"FLAG_ENTERED_MIRAGE_TOWER":2268,"FLAG_EVIL_LEADER_PLEASE_STOP":219,"FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE":271,"FLAG_EXCHANGED_SCANNER":294,"FLAG_FAN_CLUB_STRENGTH_SHARED":210,"FLAG_FORCE_MIRAGE_TOWER_VISIBLE":157,"FLAG_FORTREE_NPC_TRADE_COMPLETED":155,"FLAG_GOOD_LUCK_SAFARI_ZONE":93,"FLAG_GOT_BASEMENT_KEY_FROM_WATTSON":208,"FLAG_GOT_TM24_FROM_WATTSON":209,"FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT":111,"FLAG_HAS_MATCH_CALL":303,"FLAG_HIDDEN_ITEMS_START":500,"FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY":531,"FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY":532,"FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY":533,"FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY":534,"FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM":601,"FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON":604,"FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN":603,"FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC":602,"FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET":528,"FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1":548,"FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2":549,"FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL":577,"FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL":576,"FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL":500,"FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE":527,"FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL":575,"FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP":543,"FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER":578,"FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL":529,"FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY":580,"FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC":579,"FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH":609,"FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY":595,"FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL":561,"FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION":558,"FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1":559,"FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2":560,"FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE":585,"FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE":588,"FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL":562,"FLAG_HIDDEN_ITEM_ROUTE_104_POTION":537,"FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION":544,"FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL":611,"FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE":589,"FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE":547,"FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL":563,"FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST":546,"FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY":586,"FLAG_HIDDEN_ITEM_ROUTE_109_ETHER":564,"FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL":551,"FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1":552,"FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2":590,"FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3":591,"FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE":550,"FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL":555,"FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL":553,"FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL":565,"FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE":554,"FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN":556,"FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY":557,"FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST":502,"FLAG_HIDDEN_ITEM_ROUTE_113_ETHER":503,"FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET":598,"FLAG_HIDDEN_ITEM_ROUTE_113_TM32":530,"FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS":504,"FLAG_HIDDEN_ITEM_ROUTE_114_REVIVE":542,"FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE":597,"FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES":596,"FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION":545,"FLAG_HIDDEN_ITEM_ROUTE_117_REPEL":572,"FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE":566,"FLAG_HIDDEN_ITEM_ROUTE_118_IRON":567,"FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM":505,"FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL":568,"FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER":587,"FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL":506,"FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1":571,"FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2":569,"FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE":584,"FLAG_HIDDEN_ITEM_ROUTE_120_ZINC":570,"FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL":573,"FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP":539,"FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE":600,"FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET":540,"FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION":574,"FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP":599,"FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY":610,"FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE":541,"FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL":507,"FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1":592,"FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2":593,"FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3":594,"FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY":606,"FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC":607,"FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE":605,"FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP":608,"FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS":535,"FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET":501,"FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL":511,"FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM":536,"FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS":508,"FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD":509,"FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1":513,"FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2":538,"FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL":510,"FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL":520,"FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD":512,"FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE":514,"FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON":519,"FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL":517,"FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST":516,"FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL":515,"FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD":518,"FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE":523,"FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP":522,"FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD":524,"FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE":521,"FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL":526,"FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN":525,"FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL":581,"FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR":582,"FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL":583,"FLAG_HIDE_APPRENTICE":701,"FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNTS_BLOCKING_ENTRANCE":821,"FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1":977,"FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2":978,"FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW":943,"FLAG_HIDE_AQUA_HIDEOUT_GRUNTS":924,"FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT":836,"FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO":842,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1":711,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2":712,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3":713,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4":714,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5":715,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6":716,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1":864,"FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2":865,"FLAG_HIDE_BATTLE_TOWER_OPPONENT":888,"FLAG_HIDE_BATTLE_TOWER_REPORTER":918,"FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE":764,"FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY":739,"FLAG_HIDE_BRINEYS_HOUSE_PEEKO":881,"FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE":820,"FLAG_HIDE_CHAMPIONS_ROOM_BIRCH":921,"FLAG_HIDE_CHAMPIONS_ROOM_RIVAL":920,"FLAG_HIDE_CONTEST_POKE_BALL":86,"FLAG_HIDE_DEOXYS":763,"FLAG_HIDE_DESERT_UNDERPASS_FOSSIL":874,"FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN":940,"FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT":793,"FLAG_HIDE_FALLARBOR_AZURILL":907,"FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO":928,"FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT":767,"FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE":871,"FLAG_HIDE_FANCLUB_BOY":790,"FLAG_HIDE_FANCLUB_LADY":792,"FLAG_HIDE_FANCLUB_LITTLE_BOY":791,"FLAG_HIDE_FANCLUB_OLD_LADY":789,"FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL":933,"FLAG_HIDE_FORTREE_CITY_KECLEON":969,"FLAG_HIDE_GRANITE_CAVE_STEVEN":833,"FLAG_HIDE_HO_OH":801,"FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD":847,"FLAG_HIDE_LANETTES_HOUSE_LANETTE":870,"FLAG_HIDE_LAVARIDGE_TOWN_RIVAL":929,"FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE":930,"FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN":825,"FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS":852,"FLAG_HIDE_LILYCOVE_CITY_RIVAL":971,"FLAG_HIDE_LILYCOVE_CITY_WAILMER":729,"FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER":832,"FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT":873,"FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1":774,"FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2":895,"FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER":802,"FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN":962,"FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER":730,"FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER":748,"FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT":908,"FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR":909,"FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL":861,"FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS":925,"FLAG_HIDE_LILYCOVE_MOTEL_SCOTT":787,"FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR":775,"FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1":776,"FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2":777,"FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3":778,"FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4":779,"FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS":780,"FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON":993,"FLAG_HIDE_LITTLEROOT_TOWN_BIRCH":795,"FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH":721,"FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA":838,"FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL":811,"FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE":812,"FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL":889,"FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380":896,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL":817,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL":815,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN":745,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM":758,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM":760,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM":784,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING":735,"FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK":761,"FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN":868,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL":849,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL":818,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY":746,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM":759,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM":722,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM":785,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING":736,"FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK":762,"FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE":752,"FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM":757,"FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1":754,"FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2":755,"FLAG_HIDE_LITTLEROOT_TOWN_RIVAL":794,"FLAG_HIDE_LUGIA":800,"FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON":853,"FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_ASLEEP":850,"FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS":857,"FLAG_HIDE_MAP_NAME_POPUP":16384,"FLAG_HIDE_MARINE_CAVE_KYOGRE":782,"FLAG_HIDE_MAUVILLE_CITY_SCOTT":765,"FLAG_HIDE_MAUVILLE_CITY_WALLY":804,"FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE":805,"FLAG_HIDE_MAUVILLE_CITY_WATTSON":912,"FLAG_HIDE_MAUVILLE_GYM_WATTSON":913,"FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO":942,"FLAG_HIDE_METEOR_FALLS_TEAM_AQUA":938,"FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA":939,"FLAG_HIDE_MEW":718,"FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL":964,"FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL":963,"FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL":934,"FLAG_HIDE_MOSSDEEP_CITY_SCOTT":788,"FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN":753,"FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA":756,"FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN":863,"FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA":862,"FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE":737,"FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL":968,"FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY":727,"FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN":967,"FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA":823,"FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN":743,"FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN":740,"FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY":994,"FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA":926,"FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA":927,"FLAG_HIDE_MT_CHIMNEY_TRAINERS":877,"FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE":916,"FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE":856,"FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA":917,"FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1":974,"FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2":975,"FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3":976,"FLAG_HIDE_OLDALE_TOWN_RIVAL":979,"FLAG_HIDE_PETALBURG_CITY_SCOTT":995,"FLAG_HIDE_PETALBURG_CITY_WALLY":726,"FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD":830,"FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM":728,"FLAG_HIDE_PETALBURG_GYM_GREETER":781,"FLAG_HIDE_PETALBURG_GYM_NORMAN":772,"FLAG_HIDE_PETALBURG_GYM_WALLY":866,"FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD":824,"FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT":725,"FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE":724,"FLAG_HIDE_PLAYERS_HOUSE_DAD":734,"FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN":702,"FLAG_HIDE_REGICE":936,"FLAG_HIDE_REGIROCK":935,"FLAG_HIDE_REGISTEEL":937,"FLAG_HIDE_ROUTE_101_BIRCH":897,"FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG":700,"FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE":720,"FLAG_HIDE_ROUTE_101_BOY":991,"FLAG_HIDE_ROUTE_101_ZIGZAGOON":750,"FLAG_HIDE_ROUTE_103_BIRCH":898,"FLAG_HIDE_ROUTE_103_RIVAL":723,"FLAG_HIDE_ROUTE_104_MR_BRINEY":738,"FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT":742,"FLAG_HIDE_ROUTE_104_RIVAL":719,"FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST":906,"FLAG_HIDE_ROUTE_109_MR_BRINEY":741,"FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT":744,"FLAG_HIDE_ROUTE_110_BIRCH":837,"FLAG_HIDE_ROUTE_110_RIVAL":919,"FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE":922,"FLAG_HIDE_ROUTE_110_TEAM_AQUA":900,"FLAG_HIDE_ROUTE_111_DESERT_FOSSIL":876,"FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1":796,"FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2":903,"FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3":799,"FLAG_HIDE_ROUTE_111_PLAYER_DESCENT":875,"FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY":843,"FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN":960,"FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE":771,"FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE":769,"FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE":768,"FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE":770,"FLAG_HIDE_ROUTE_112_TEAM_MAGMA":819,"FLAG_HIDE_ROUTE_115_BOULDERS":482,"FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE":947,"FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN":813,"FLAG_HIDE_ROUTE_116_MR_BRINEY":891,"FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND":894,"FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1":797,"FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2":901,"FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3":904,"FLAG_HIDE_ROUTE_118_STEVEN":966,"FLAG_HIDE_ROUTE_119_KECLEON_1":989,"FLAG_HIDE_ROUTE_119_KECLEON_2":990,"FLAG_HIDE_ROUTE_119_RIVAL":851,"FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE":923,"FLAG_HIDE_ROUTE_119_SCOTT":786,"FLAG_HIDE_ROUTE_119_TEAM_AQUA":890,"FLAG_HIDE_ROUTE_119_TEAM_AQUA_BRIDGE":822,"FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1":798,"FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2":902,"FLAG_HIDE_ROUTE_120_KECLEON_1":982,"FLAG_HIDE_ROUTE_120_KECLEON_2":985,"FLAG_HIDE_ROUTE_120_KECLEON_3":986,"FLAG_HIDE_ROUTE_120_KECLEON_4":987,"FLAG_HIDE_ROUTE_120_KECLEON_5":988,"FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE":970,"FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_SHADOW":981,"FLAG_HIDE_ROUTE_120_STEVEN":972,"FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS":914,"FLAG_HIDE_ROUTE_128_ARCHIE":944,"FLAG_HIDE_ROUTE_128_MAXIE":945,"FLAG_HIDE_ROUTE_128_STEVEN":834,"FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT":731,"FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE":949,"FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1":732,"FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT":999,"FLAG_HIDE_RUSTBORO_CITY_RIVAL":814,"FLAG_HIDE_RUSTBORO_CITY_SCIENTIST":844,"FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT":878,"FLAG_HIDE_RUSTURF_TUNNEL_BRINEY":879,"FLAG_HIDE_RUSTURF_TUNNEL_PEEKO":880,"FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1":931,"FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2":932,"FLAG_HIDE_RUSTURF_TUNNEL_WANDA":983,"FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND":807,"FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS":717,"FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION":747,"FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS":946,"FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT":941,"FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE":828,"FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE":859,"FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_ASLEEP":733,"FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS":831,"FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE":829,"FLAG_HIDE_SECRET_BASE_TRAINER":173,"FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA":773,"FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_STILL":80,"FLAG_HIDE_SKY_PILLAR_WALLACE":855,"FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN":840,"FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER":803,"FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY":835,"FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT":845,"FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE":846,"FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN":841,"FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS":905,"FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL":860,"FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW":848,"FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1":884,"FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2":885,"FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE":886,"FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN":887,"FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS":883,"FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT":965,"FLAG_HIDE_SLATEPORT_CITY_SCOTT":749,"FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY":869,"FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA":882,"FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN":948,"FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION":961,"FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE":826,"FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON":998,"FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE":997,"FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1":839,"FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE":827,"FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA":996,"FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS":854,"FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN":973,"FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE":816,"FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE":910,"FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON":911,"FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY":950,"FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT":810,"FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER":951,"FLAG_HIDE_TERRA_CAVE_GROUDON":783,"FLAG_HIDE_TRICK_HOUSE_END_MAN":899,"FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN":872,"FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE":980,"FLAG_HIDE_UNION_ROOM_PLAYER_1":703,"FLAG_HIDE_UNION_ROOM_PLAYER_2":704,"FLAG_HIDE_UNION_ROOM_PLAYER_3":705,"FLAG_HIDE_UNION_ROOM_PLAYER_4":706,"FLAG_HIDE_UNION_ROOM_PLAYER_5":707,"FLAG_HIDE_UNION_ROOM_PLAYER_6":708,"FLAG_HIDE_UNION_ROOM_PLAYER_7":709,"FLAG_HIDE_UNION_ROOM_PLAYER_8":710,"FLAG_HIDE_VERDANTURF_TOWN_SCOTT":766,"FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY":806,"FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE":809,"FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA":984,"FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND":808,"FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY":858,"FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY":751,"FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS":892,"FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M":992,"FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS":893,"FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN":159,"FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER":205,"FLAG_IS_CHAMPION":2175,"FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY":1100,"FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18":1102,"FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE":1101,"FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER":1078,"FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL":1077,"FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL":1095,"FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE":1099,"FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL":1097,"FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE":1096,"FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13":1098,"FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL":1124,"FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR":1071,"FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET":1132,"FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL":1072,"FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS":1163,"FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP":1162,"FLAG_ITEM_FIERY_PATH_FIRE_STONE":1111,"FLAG_ITEM_FIERY_PATH_TM06":1091,"FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE":1050,"FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL":1051,"FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY":1054,"FLAG_ITEM_GRANITE_CAVE_B2F_REPEL":1053,"FLAG_ITEM_JAGGED_PASS_BURN_HEAL":1070,"FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL":1042,"FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY":1151,"FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE":1165,"FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR":1164,"FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET":1166,"FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX":1167,"FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE":1059,"FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE":1168,"FLAG_ITEM_MAUVILLE_CITY_X_SPEED":1116,"FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL":1045,"FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE":1046,"FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP":1047,"FLAG_ITEM_METEOR_FALLS_1F_1R_TM23":1044,"FLAG_ITEM_METEOR_FALLS_B1F_2R_TM02":1080,"FLAG_ITEM_MOSSDEEP_CITY_NET_BALL":1043,"FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08":1133,"FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL":1129,"FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL":1120,"FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE":1130,"FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE":1052,"FLAG_ITEM_MT_PYRE_6F_TM30":1089,"FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION":1073,"FLAG_ITEM_MT_PYRE_EXTERIOR_TM48":1074,"FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE":1076,"FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL":1122,"FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL":1123,"FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE":1110,"FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL":1075,"FLAG_ITEM_OLD_MAGMA_HIDEOUT_B1F_MASTER_BALL":1125,"FLAG_ITEM_OLD_MAGMA_HIDEOUT_B1F_MAX_ELIXIR":1126,"FLAG_ITEM_OLD_MAGMA_HIDEOUT_B2F_NEST_BALL":1127,"FLAG_ITEM_PETALBURG_CITY_ETHER":1040,"FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE":1039,"FLAG_ITEM_PETALBURG_WOODS_ETHER":1058,"FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL":1056,"FLAG_ITEM_PETALBURG_WOODS_PARALYZE_HEAL":1117,"FLAG_ITEM_PETALBURG_WOODS_X_ATTACK":1055,"FLAG_ITEM_ROUTE_102_POTION":1000,"FLAG_ITEM_ROUTE_103_GUARD_SPEC":1114,"FLAG_ITEM_ROUTE_103_PP_UP":1137,"FLAG_ITEM_ROUTE_104_POKE_BALL":1057,"FLAG_ITEM_ROUTE_104_POTION":1135,"FLAG_ITEM_ROUTE_104_PP_UP":1002,"FLAG_ITEM_ROUTE_104_X_ACCURACY":1115,"FLAG_ITEM_ROUTE_105_IRON":1003,"FLAG_ITEM_ROUTE_106_PROTEIN":1004,"FLAG_ITEM_ROUTE_108_STAR_PIECE":1139,"FLAG_ITEM_ROUTE_109_POTION":1140,"FLAG_ITEM_ROUTE_109_PP_UP":1005,"FLAG_ITEM_ROUTE_110_DIRE_HIT":1007,"FLAG_ITEM_ROUTE_110_ELIXIR":1141,"FLAG_ITEM_ROUTE_110_RARE_CANDY":1006,"FLAG_ITEM_ROUTE_111_ELIXIR":1142,"FLAG_ITEM_ROUTE_111_HP_UP":1010,"FLAG_ITEM_ROUTE_111_STARDUST":1009,"FLAG_ITEM_ROUTE_111_TM37":1008,"FLAG_ITEM_ROUTE_112_NUGGET":1011,"FLAG_ITEM_ROUTE_113_HYPER_POTION":1143,"FLAG_ITEM_ROUTE_113_MAX_ETHER":1012,"FLAG_ITEM_ROUTE_113_SUPER_REPEL":1013,"FLAG_ITEM_ROUTE_114_ENERGY_POWDER":1160,"FLAG_ITEM_ROUTE_114_PROTEIN":1015,"FLAG_ITEM_ROUTE_114_RARE_CANDY":1014,"FLAG_ITEM_ROUTE_115_GREAT_BALL":1118,"FLAG_ITEM_ROUTE_115_HEAL_POWDER":1144,"FLAG_ITEM_ROUTE_115_IRON":1018,"FLAG_ITEM_ROUTE_115_PP_UP":1161,"FLAG_ITEM_ROUTE_115_SUPER_POTION":1016,"FLAG_ITEM_ROUTE_115_TM01":1017,"FLAG_ITEM_ROUTE_116_ETHER":1019,"FLAG_ITEM_ROUTE_116_HP_UP":1021,"FLAG_ITEM_ROUTE_116_POTION":1146,"FLAG_ITEM_ROUTE_116_REPEL":1020,"FLAG_ITEM_ROUTE_116_X_SPECIAL":1001,"FLAG_ITEM_ROUTE_117_GREAT_BALL":1022,"FLAG_ITEM_ROUTE_117_REVIVE":1023,"FLAG_ITEM_ROUTE_118_HYPER_POTION":1121,"FLAG_ITEM_ROUTE_119_ELIXIR_1":1026,"FLAG_ITEM_ROUTE_119_ELIXIR_2":1147,"FLAG_ITEM_ROUTE_119_HYPER_POTION_1":1029,"FLAG_ITEM_ROUTE_119_HYPER_POTION_2":1106,"FLAG_ITEM_ROUTE_119_LEAF_STONE":1027,"FLAG_ITEM_ROUTE_119_NUGGET":1134,"FLAG_ITEM_ROUTE_119_RARE_CANDY":1028,"FLAG_ITEM_ROUTE_119_SUPER_REPEL":1024,"FLAG_ITEM_ROUTE_119_ZINC":1025,"FLAG_ITEM_ROUTE_120_FULL_HEAL":1031,"FLAG_ITEM_ROUTE_120_HYPER_POTION":1107,"FLAG_ITEM_ROUTE_120_NEST_BALL":1108,"FLAG_ITEM_ROUTE_120_NUGGET":1030,"FLAG_ITEM_ROUTE_120_REVIVE":1148,"FLAG_ITEM_ROUTE_121_CARBOS":1103,"FLAG_ITEM_ROUTE_121_REVIVE":1149,"FLAG_ITEM_ROUTE_121_ZINC":1150,"FLAG_ITEM_ROUTE_123_CALCIUM":1032,"FLAG_ITEM_ROUTE_123_ELIXIR":1109,"FLAG_ITEM_ROUTE_123_PP_UP":1152,"FLAG_ITEM_ROUTE_123_RARE_CANDY":1033,"FLAG_ITEM_ROUTE_123_REVIVAL_HERB":1153,"FLAG_ITEM_ROUTE_123_ULTRA_BALL":1104,"FLAG_ITEM_ROUTE_124_BLUE_SHARD":1093,"FLAG_ITEM_ROUTE_124_RED_SHARD":1092,"FLAG_ITEM_ROUTE_124_YELLOW_SHARD":1066,"FLAG_ITEM_ROUTE_125_BIG_PEARL":1154,"FLAG_ITEM_ROUTE_126_GREEN_SHARD":1105,"FLAG_ITEM_ROUTE_127_CARBOS":1035,"FLAG_ITEM_ROUTE_127_RARE_CANDY":1155,"FLAG_ITEM_ROUTE_127_ZINC":1034,"FLAG_ITEM_ROUTE_132_PROTEIN":1156,"FLAG_ITEM_ROUTE_132_RARE_CANDY":1036,"FLAG_ITEM_ROUTE_133_BIG_PEARL":1037,"FLAG_ITEM_ROUTE_133_MAX_REVIVE":1157,"FLAG_ITEM_ROUTE_133_STAR_PIECE":1038,"FLAG_ITEM_ROUTE_134_CARBOS":1158,"FLAG_ITEM_ROUTE_134_STAR_PIECE":1159,"FLAG_ITEM_RUSTBORO_CITY_X_DEFEND":1041,"FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER":1049,"FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL":1048,"FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM":1119,"FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET":1169,"FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM22":1094,"FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL":1170,"FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE":1131,"FLAG_ITEM_SCORCHED_SLAB_TM11":1079,"FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM26":1090,"FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL":1081,"FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE":1113,"FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM07":1112,"FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY":1082,"FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL":1083,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL":1060,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL":1061,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL":1062,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL":1063,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL":1064,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL":1065,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL":1067,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL":1068,"FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL":1069,"FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR":1084,"FLAG_ITEM_VICTORY_ROAD_1F_PP_UP":1085,"FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE":1087,"FLAG_ITEM_VICTORY_ROAD_B1F_TM29":1086,"FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL":1088,"FLAG_KECLEON_FLED_FORTREE":295,"FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN":129,"FLAG_LANDMARK_ABANDONED_SHIP":2206,"FLAG_LANDMARK_ALTERING_CAVE":2269,"FLAG_LANDMARK_ANCIENT_TOMB":2233,"FLAG_LANDMARK_ARTISAN_CAVE":2271,"FLAG_LANDMARK_BATTLE_FRONTIER":2216,"FLAG_LANDMARK_BERRY_MASTERS_HOUSE":2243,"FLAG_LANDMARK_DESERT_RUINS":2230,"FLAG_LANDMARK_DESERT_UNDERPASS":2270,"FLAG_LANDMARK_FIERY_PATH":2218,"FLAG_LANDMARK_FLOWER_SHOP":2204,"FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE":2231,"FLAG_LANDMARK_GLASS_WORKSHOP":2212,"FLAG_LANDMARK_HUNTERS_HOUSE":2235,"FLAG_LANDMARK_ISLAND_CAVE":2229,"FLAG_LANDMARK_LANETTES_HOUSE":2213,"FLAG_LANDMARK_MIRAGE_TOWER":120,"FLAG_LANDMARK_MR_BRINEY_HOUSE":2205,"FLAG_LANDMARK_NEW_MAUVILLE":2208,"FLAG_LANDMARK_OLD_LADY_REST_SHOP":2209,"FLAG_LANDMARK_POKEMON_DAYCARE":2214,"FLAG_LANDMARK_POKEMON_LEAGUE":2228,"FLAG_LANDMARK_SCORCHED_SLAB":2232,"FLAG_LANDMARK_SEAFLOOR_CAVERN":2215,"FLAG_LANDMARK_SEALED_CHAMBER":2236,"FLAG_LANDMARK_SEASHORE_HOUSE":2207,"FLAG_LANDMARK_SKY_PILLAR":2238,"FLAG_LANDMARK_SOUTHERN_ISLAND":2217,"FLAG_LANDMARK_TRAINER_HILL":2274,"FLAG_LANDMARK_TRICK_HOUSE":2210,"FLAG_LANDMARK_TUNNELERS_REST_HOUSE":2234,"FLAG_LANDMARK_WINSTRATE_FAMILY":2211,"FLAG_LATIOS_OR_LATIAS_ROAMING":255,"FLAG_LEGENDARIES_IN_SOOTOPOLIS":83,"FLAG_MAP_SCRIPT_CHECKED_DEOXYS":2259,"FLAG_MATCH_CALL_REGISTERED":348,"FLAG_MAUVILLE_GYM_BARRIERS_STATE":99,"FLAG_MET_ARCHIE_METEOR_FALLS":207,"FLAG_MET_ARCHIE_SOOTOPOLIS":308,"FLAG_MET_BATTLE_FRONTIER_BREEDER":339,"FLAG_MET_BATTLE_FRONTIER_GAMBLER":343,"FLAG_MET_BATTLE_FRONTIER_MANIAC":340,"FLAG_MET_DEVON_EMPLOYEE":287,"FLAG_MET_DIVING_TREASURE_HUNTER":217,"FLAG_MET_FANCLUB_YOUNGER_BROTHER":300,"FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR":346,"FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR":347,"FLAG_MET_HIDDEN_POWER_GIVER":118,"FLAG_MET_MAXIE_SOOTOPOLIS":309,"FLAG_MET_PRETTY_PETAL_SHOP_OWNER":127,"FLAG_MET_PROF_COZMO":244,"FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE":293,"FLAG_MET_RIVAL_LILYCOVE":292,"FLAG_MET_RIVAL_MOM":87,"FLAG_MET_RIVAL_RUSTBORO":288,"FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE":459,"FLAG_MET_SCOTT_IN_EVERGRANDE":463,"FLAG_MET_SCOTT_IN_FALLARBOR":461,"FLAG_MET_SCOTT_IN_LILYCOVE":462,"FLAG_MET_SCOTT_IN_VERDANTURF":460,"FLAG_MET_SCOTT_ON_SS_TIDAL":464,"FLAG_MET_SCOTT_RUSTBORO":310,"FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN":342,"FLAG_MET_TEAM_AQUA_HARBOR":97,"FLAG_MET_WAILMER_TRAINER":218,"FLAG_MIRAGE_TOWER_VISIBLE":334,"FLAG_MOSSDEEP_GYM_SWITCH_1":100,"FLAG_MOSSDEEP_GYM_SWITCH_2":101,"FLAG_MOSSDEEP_GYM_SWITCH_3":102,"FLAG_MOSSDEEP_GYM_SWITCH_4":103,"FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE":441,"FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH":440,"FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION":442,"FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER":435,"FLAG_MOVE_TUTOR_TAUGHT_METRONOME":437,"FLAG_MOVE_TUTOR_TAUGHT_MIMIC":436,"FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT":434,"FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK":438,"FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE":439,"FLAG_MOVE_TUTOR_TAUGHT_SWAGGER":433,"FLAG_MR_BRINEY_SAILING_INTRO":147,"FLAG_MYSTERY_GIFT_1":485,"FLAG_MYSTERY_GIFT_10":494,"FLAG_MYSTERY_GIFT_11":495,"FLAG_MYSTERY_GIFT_12":496,"FLAG_MYSTERY_GIFT_13":497,"FLAG_MYSTERY_GIFT_14":498,"FLAG_MYSTERY_GIFT_15":499,"FLAG_MYSTERY_GIFT_2":486,"FLAG_MYSTERY_GIFT_3":487,"FLAG_MYSTERY_GIFT_4":488,"FLAG_MYSTERY_GIFT_5":489,"FLAG_MYSTERY_GIFT_6":490,"FLAG_MYSTERY_GIFT_7":491,"FLAG_MYSTERY_GIFT_8":492,"FLAG_MYSTERY_GIFT_9":493,"FLAG_MYSTERY_GIFT_DONE":484,"FLAG_NEVER_SET_0x0DC":220,"FLAG_NOT_READY_FOR_BATTLE_ROUTE_120":290,"FLAG_NURSE_MENTIONS_GOLD_CARD":345,"FLAG_NURSE_UNION_ROOM_REMINDER":2176,"FLAG_OCEANIC_MUSEUM_MET_REPORTER":105,"FLAG_OMIT_DIVE_FROM_STEVEN_LETTER":302,"FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED":154,"FLAG_PENDING_DAYCARE_EGG":134,"FLAG_PETALBURG_MART_EXPANDED_ITEMS":296,"FLAG_POKERUS_EXPLAINED":273,"FLAG_PURCHASED_HARBOR_MAIL":104,"FLAG_RECEIVED_20_COINS":225,"FLAG_RECEIVED_6_SODA_POP":140,"FLAG_RECEIVED_ACRO_BIKE":1181,"FLAG_RECEIVED_AMULET_COIN":133,"FLAG_RECEIVED_AURORA_TICKET":314,"FLAG_RECEIVED_BADGE_1":1182,"FLAG_RECEIVED_BADGE_2":1183,"FLAG_RECEIVED_BADGE_3":1184,"FLAG_RECEIVED_BADGE_4":1185,"FLAG_RECEIVED_BADGE_5":1186,"FLAG_RECEIVED_BADGE_6":1187,"FLAG_RECEIVED_BADGE_7":1188,"FLAG_RECEIVED_BADGE_8":1189,"FLAG_RECEIVED_BELDUM":298,"FLAG_RECEIVED_BELUE_BERRY":252,"FLAG_RECEIVED_BIKE":90,"FLAG_RECEIVED_BLUE_SCARF":201,"FLAG_RECEIVED_CASTFORM":151,"FLAG_RECEIVED_CHARCOAL":254,"FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104":246,"FLAG_RECEIVED_CLEANSE_TAG":282,"FLAG_RECEIVED_COIN_CASE":258,"FLAG_RECEIVED_CONTEST_PASS":150,"FLAG_RECEIVED_DEEP_SEA_SCALE":1190,"FLAG_RECEIVED_DEEP_SEA_TOOTH":1191,"FLAG_RECEIVED_DEVON_GOODS_RUSTURF_TUNNEL":1172,"FLAG_RECEIVED_DEVON_SCOPE":285,"FLAG_RECEIVED_DOLL_LANETTE":131,"FLAG_RECEIVED_DURIN_BERRY":251,"FLAG_RECEIVED_EXP_SHARE":272,"FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK":299,"FLAG_RECEIVED_FOCUS_BAND":283,"FLAG_RECEIVED_GLASS_ORNAMENT":236,"FLAG_RECEIVED_GOLD_SHIELD":238,"FLAG_RECEIVED_GOOD_ROD":227,"FLAG_RECEIVED_GO_GOGGLES":221,"FLAG_RECEIVED_GREAT_BALL_PETALBURG_WOODS":1171,"FLAG_RECEIVED_GREAT_BALL_RUSTBORO_CITY":1173,"FLAG_RECEIVED_GREEN_SCARF":203,"FLAG_RECEIVED_HM01":137,"FLAG_RECEIVED_HM02":110,"FLAG_RECEIVED_HM03":122,"FLAG_RECEIVED_HM04":106,"FLAG_RECEIVED_HM05":109,"FLAG_RECEIVED_HM06":107,"FLAG_RECEIVED_HM07":312,"FLAG_RECEIVED_HM08":123,"FLAG_RECEIVED_ITEMFINDER":1176,"FLAG_RECEIVED_KINGS_ROCK":276,"FLAG_RECEIVED_LAVARIDGE_EGG":266,"FLAG_RECEIVED_LETTER":1174,"FLAG_RECEIVED_MACHO_BRACE":277,"FLAG_RECEIVED_MACH_BIKE":1180,"FLAG_RECEIVED_MAGMA_EMBLEM":1177,"FLAG_RECEIVED_MENTAL_HERB":223,"FLAG_RECEIVED_METEORITE":115,"FLAG_RECEIVED_MIRACLE_SEED":297,"FLAG_RECEIVED_MYSTIC_TICKET":315,"FLAG_RECEIVED_OLD_ROD":257,"FLAG_RECEIVED_OLD_SEA_MAP":316,"FLAG_RECEIVED_PAMTRE_BERRY":249,"FLAG_RECEIVED_PINK_SCARF":202,"FLAG_RECEIVED_POKEBLOCK_CASE":95,"FLAG_RECEIVED_POKEDEX_FROM_BIRCH":2276,"FLAG_RECEIVED_POKENAV":188,"FLAG_RECEIVED_POTION_OLDALE":132,"FLAG_RECEIVED_POWDER_JAR":337,"FLAG_RECEIVED_PREMIER_BALL_RUSTBORO":213,"FLAG_RECEIVED_QUICK_CLAW":275,"FLAG_RECEIVED_RED_OR_BLUE_ORB":212,"FLAG_RECEIVED_RED_SCARF":200,"FLAG_RECEIVED_REPEAT_BALL":256,"FLAG_RECEIVED_REVIVED_FOSSIL_MON":267,"FLAG_RECEIVED_RUNNING_SHOES":274,"FLAG_RECEIVED_SECRET_POWER":96,"FLAG_RECEIVED_SHOAL_SALT_1":952,"FLAG_RECEIVED_SHOAL_SALT_2":953,"FLAG_RECEIVED_SHOAL_SALT_3":954,"FLAG_RECEIVED_SHOAL_SALT_4":955,"FLAG_RECEIVED_SHOAL_SHELL_1":956,"FLAG_RECEIVED_SHOAL_SHELL_2":957,"FLAG_RECEIVED_SHOAL_SHELL_3":958,"FLAG_RECEIVED_SHOAL_SHELL_4":959,"FLAG_RECEIVED_SILK_SCARF":289,"FLAG_RECEIVED_SILVER_SHIELD":237,"FLAG_RECEIVED_SOFT_SAND":280,"FLAG_RECEIVED_SOOTHE_BELL":278,"FLAG_RECEIVED_SPELON_BERRY":248,"FLAG_RECEIVED_SS_TICKET":291,"FLAG_RECEIVED_STARTER_DOLL":226,"FLAG_RECEIVED_SUN_STONE_MOSSDEEP":192,"FLAG_RECEIVED_SUPER_ROD":152,"FLAG_RECEIVED_TM03":172,"FLAG_RECEIVED_TM04":171,"FLAG_RECEIVED_TM05":231,"FLAG_RECEIVED_TM08":166,"FLAG_RECEIVED_TM09":262,"FLAG_RECEIVED_TM10":264,"FLAG_RECEIVED_TM19":232,"FLAG_RECEIVED_TM21":1179,"FLAG_RECEIVED_TM27":229,"FLAG_RECEIVED_TM27_2":1178,"FLAG_RECEIVED_TM28":261,"FLAG_RECEIVED_TM31":121,"FLAG_RECEIVED_TM34":167,"FLAG_RECEIVED_TM36":230,"FLAG_RECEIVED_TM39":165,"FLAG_RECEIVED_TM40":170,"FLAG_RECEIVED_TM41":265,"FLAG_RECEIVED_TM42":169,"FLAG_RECEIVED_TM44":234,"FLAG_RECEIVED_TM45":235,"FLAG_RECEIVED_TM46":269,"FLAG_RECEIVED_TM47":1175,"FLAG_RECEIVED_TM49":260,"FLAG_RECEIVED_TM50":168,"FLAG_RECEIVED_WAILMER_DOLL":245,"FLAG_RECEIVED_WAILMER_PAIL":94,"FLAG_RECEIVED_WATMEL_BERRY":250,"FLAG_RECEIVED_WHITE_HERB":279,"FLAG_RECEIVED_YELLOW_SCARF":204,"FLAG_RECOVERED_DEVON_GOODS":143,"FLAG_REGISTERED_STEVEN_POKENAV":305,"FLAG_REGISTER_RIVAL_POKENAV":124,"FLAG_REGI_DOORS_OPENED":228,"FLAG_REMATCH_ABIGAIL":387,"FLAG_REMATCH_AMY_AND_LIV":399,"FLAG_REMATCH_ANDRES":350,"FLAG_REMATCH_ANNA_AND_MEG":378,"FLAG_REMATCH_BENJAMIN":390,"FLAG_REMATCH_BERNIE":369,"FLAG_REMATCH_BRAWLY":415,"FLAG_REMATCH_BROOKE":356,"FLAG_REMATCH_CALVIN":383,"FLAG_REMATCH_CAMERON":373,"FLAG_REMATCH_CATHERINE":406,"FLAG_REMATCH_CINDY":359,"FLAG_REMATCH_CORY":401,"FLAG_REMATCH_CRISTIN":355,"FLAG_REMATCH_CYNDY":395,"FLAG_REMATCH_DALTON":368,"FLAG_REMATCH_DIANA":398,"FLAG_REMATCH_DRAKE":424,"FLAG_REMATCH_DUSTY":351,"FLAG_REMATCH_DYLAN":388,"FLAG_REMATCH_EDWIN":402,"FLAG_REMATCH_ELLIOT":384,"FLAG_REMATCH_ERNEST":400,"FLAG_REMATCH_ETHAN":370,"FLAG_REMATCH_FERNANDO":367,"FLAG_REMATCH_FLANNERY":417,"FLAG_REMATCH_GABRIELLE":405,"FLAG_REMATCH_GLACIA":423,"FLAG_REMATCH_HALEY":408,"FLAG_REMATCH_ISAAC":404,"FLAG_REMATCH_ISABEL":379,"FLAG_REMATCH_ISAIAH":385,"FLAG_REMATCH_JACKI":374,"FLAG_REMATCH_JACKSON":407,"FLAG_REMATCH_JAMES":409,"FLAG_REMATCH_JEFFREY":372,"FLAG_REMATCH_JENNY":397,"FLAG_REMATCH_JERRY":377,"FLAG_REMATCH_JESSICA":361,"FLAG_REMATCH_JOHN_AND_JAY":371,"FLAG_REMATCH_KAREN":376,"FLAG_REMATCH_KATELYN":389,"FLAG_REMATCH_KIRA_AND_DAN":412,"FLAG_REMATCH_KOJI":366,"FLAG_REMATCH_LAO":394,"FLAG_REMATCH_LILA_AND_ROY":354,"FLAG_REMATCH_LOLA":352,"FLAG_REMATCH_LYDIA":403,"FLAG_REMATCH_MADELINE":396,"FLAG_REMATCH_MARIA":386,"FLAG_REMATCH_MIGUEL":380,"FLAG_REMATCH_NICOLAS":392,"FLAG_REMATCH_NOB":365,"FLAG_REMATCH_NORMAN":418,"FLAG_REMATCH_PABLO":391,"FLAG_REMATCH_PHOEBE":422,"FLAG_REMATCH_RICKY":353,"FLAG_REMATCH_ROBERT":393,"FLAG_REMATCH_ROSE":349,"FLAG_REMATCH_ROXANNE":414,"FLAG_REMATCH_SAWYER":411,"FLAG_REMATCH_SHELBY":382,"FLAG_REMATCH_SIDNEY":421,"FLAG_REMATCH_STEVE":363,"FLAG_REMATCH_TATE_AND_LIZA":420,"FLAG_REMATCH_THALIA":360,"FLAG_REMATCH_TIMOTHY":381,"FLAG_REMATCH_TONY":364,"FLAG_REMATCH_TRENT":410,"FLAG_REMATCH_VALERIE":358,"FLAG_REMATCH_WALLACE":425,"FLAG_REMATCH_WALLY":413,"FLAG_REMATCH_WALTER":375,"FLAG_REMATCH_WATTSON":416,"FLAG_REMATCH_WILTON":357,"FLAG_REMATCH_WINONA":419,"FLAG_REMATCH_WINSTON":362,"FLAG_RESCUED_BIRCH":82,"FLAG_RETURNED_DEVON_GOODS":144,"FLAG_RETURNED_RED_OR_BLUE_ORB":259,"FLAG_RIVAL_LEFT_FOR_ROUTE103":301,"FLAG_RUSTBORO_NPC_TRADE_COMPLETED":153,"FLAG_RUSTURF_TUNNEL_OPENED":199,"FLAG_SCOTT_CALL_BATTLE_FRONTIER":114,"FLAG_SCOTT_CALL_FORTREE_GYM":138,"FLAG_SCOTT_GIVES_BATTLE_POINTS":465,"FLAG_SECRET_BASE_REGISTRY_ENABLED":268,"FLAG_SET_WALL_CLOCK":81,"FLAG_SHOWN_AURORA_TICKET":431,"FLAG_SHOWN_BOX_WAS_FULL_MESSAGE":2263,"FLAG_SHOWN_EON_TICKET":430,"FLAG_SHOWN_MYSTIC_TICKET":475,"FLAG_SHOWN_OLD_SEA_MAP":432,"FLAG_SMART_PAINTING_MADE":163,"FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE":158,"FLAG_SPECIAL_FLAG_UNUSED_0x4003":16387,"FLAG_SS_TIDAL_DISABLED":84,"FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN":307,"FLAG_STORING_ITEMS_IN_PYRAMID_BAG":16388,"FLAG_SYS_ARENA_GOLD":2251,"FLAG_SYS_ARENA_SILVER":2250,"FLAG_SYS_BRAILLE_DIG":2223,"FLAG_SYS_BRAILLE_REGICE_COMPLETED":2225,"FLAG_SYS_B_DASH":2240,"FLAG_SYS_CAVE_BATTLE":2201,"FLAG_SYS_CAVE_SHIP":2199,"FLAG_SYS_CAVE_WONDER":2200,"FLAG_SYS_CHANGED_DEWFORD_TREND":2195,"FLAG_SYS_CHAT_USED":2149,"FLAG_SYS_CLOCK_SET":2197,"FLAG_SYS_CRUISE_MODE":2189,"FLAG_SYS_CTRL_OBJ_DELETE":2241,"FLAG_SYS_CYCLING_ROAD":2187,"FLAG_SYS_DOME_GOLD":2247,"FLAG_SYS_DOME_SILVER":2246,"FLAG_SYS_ENC_DOWN_ITEM":2222,"FLAG_SYS_ENC_UP_ITEM":2221,"FLAG_SYS_FACTORY_GOLD":2253,"FLAG_SYS_FACTORY_SILVER":2252,"FLAG_SYS_FRONTIER_PASS":2258,"FLAG_SYS_GAME_CLEAR":2148,"FLAG_SYS_HIPSTER_MEET":2150,"FLAG_SYS_MIX_RECORD":2196,"FLAG_SYS_MYSTERY_EVENT_ENABLE":2220,"FLAG_SYS_MYSTERY_GIFT_ENABLE":2267,"FLAG_SYS_NATIONAL_DEX":2198,"FLAG_SYS_PALACE_GOLD":2249,"FLAG_SYS_PALACE_SILVER":2248,"FLAG_SYS_PC_LANETTE":2219,"FLAG_SYS_PIKE_GOLD":2255,"FLAG_SYS_PIKE_SILVER":2254,"FLAG_SYS_POKEDEX_GET":2145,"FLAG_SYS_POKEMON_GET":2144,"FLAG_SYS_POKENAV_GET":2146,"FLAG_SYS_PYRAMID_GOLD":2257,"FLAG_SYS_PYRAMID_SILVER":2256,"FLAG_SYS_REGIROCK_PUZZLE_COMPLETED":2224,"FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED":2226,"FLAG_SYS_RESET_RTC_ENABLE":2242,"FLAG_SYS_RIBBON_GET":2203,"FLAG_SYS_SAFARI_MODE":2188,"FLAG_SYS_SHOAL_ITEM":2239,"FLAG_SYS_SHOAL_TIDE":2202,"FLAG_SYS_TOWER_GOLD":2245,"FLAG_SYS_TOWER_SILVER":2244,"FLAG_SYS_TV_HOME":2192,"FLAG_SYS_TV_LATIAS_LATIOS":2237,"FLAG_SYS_TV_START":2194,"FLAG_SYS_TV_WATCH":2193,"FLAG_SYS_USE_FLASH":2184,"FLAG_SYS_USE_STRENGTH":2185,"FLAG_SYS_WEATHER_CTRL":2186,"FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE":112,"FLAG_TEMP_1":1,"FLAG_TEMP_10":16,"FLAG_TEMP_11":17,"FLAG_TEMP_12":18,"FLAG_TEMP_13":19,"FLAG_TEMP_14":20,"FLAG_TEMP_15":21,"FLAG_TEMP_16":22,"FLAG_TEMP_17":23,"FLAG_TEMP_18":24,"FLAG_TEMP_19":25,"FLAG_TEMP_1A":26,"FLAG_TEMP_1B":27,"FLAG_TEMP_1C":28,"FLAG_TEMP_1D":29,"FLAG_TEMP_1E":30,"FLAG_TEMP_1F":31,"FLAG_TEMP_2":2,"FLAG_TEMP_3":3,"FLAG_TEMP_4":4,"FLAG_TEMP_5":5,"FLAG_TEMP_6":6,"FLAG_TEMP_7":7,"FLAG_TEMP_8":8,"FLAG_TEMP_9":9,"FLAG_TEMP_A":10,"FLAG_TEMP_B":11,"FLAG_TEMP_C":12,"FLAG_TEMP_D":13,"FLAG_TEMP_E":14,"FLAG_TEMP_F":15,"FLAG_THANKED_FOR_PLAYING_WITH_WALLY":135,"FLAG_TOUGH_PAINTING_MADE":164,"FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1":194,"FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2":195,"FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3":196,"FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4":197,"FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5":198,"FLAG_TV_EXPLAINED":98,"FLAG_UNKNOWN_0x363":867,"FLAG_UNKNOWN_0x393":915,"FLAG_UNUSED_0x022":34,"FLAG_UNUSED_0x023":35,"FLAG_UNUSED_0x024":36,"FLAG_UNUSED_0x025":37,"FLAG_UNUSED_0x026":38,"FLAG_UNUSED_0x027":39,"FLAG_UNUSED_0x028":40,"FLAG_UNUSED_0x029":41,"FLAG_UNUSED_0x02A":42,"FLAG_UNUSED_0x02B":43,"FLAG_UNUSED_0x02C":44,"FLAG_UNUSED_0x02D":45,"FLAG_UNUSED_0x02E":46,"FLAG_UNUSED_0x02F":47,"FLAG_UNUSED_0x030":48,"FLAG_UNUSED_0x031":49,"FLAG_UNUSED_0x032":50,"FLAG_UNUSED_0x033":51,"FLAG_UNUSED_0x034":52,"FLAG_UNUSED_0x035":53,"FLAG_UNUSED_0x036":54,"FLAG_UNUSED_0x037":55,"FLAG_UNUSED_0x038":56,"FLAG_UNUSED_0x039":57,"FLAG_UNUSED_0x03A":58,"FLAG_UNUSED_0x03B":59,"FLAG_UNUSED_0x03C":60,"FLAG_UNUSED_0x03D":61,"FLAG_UNUSED_0x03E":62,"FLAG_UNUSED_0x03F":63,"FLAG_UNUSED_0x040":64,"FLAG_UNUSED_0x041":65,"FLAG_UNUSED_0x042":66,"FLAG_UNUSED_0x043":67,"FLAG_UNUSED_0x044":68,"FLAG_UNUSED_0x045":69,"FLAG_UNUSED_0x046":70,"FLAG_UNUSED_0x047":71,"FLAG_UNUSED_0x048":72,"FLAG_UNUSED_0x049":73,"FLAG_UNUSED_0x04A":74,"FLAG_UNUSED_0x04B":75,"FLAG_UNUSED_0x04C":76,"FLAG_UNUSED_0x04D":77,"FLAG_UNUSED_0x04E":78,"FLAG_UNUSED_0x04F":79,"FLAG_UNUSED_0x055":85,"FLAG_UNUSED_0x0E9":233,"FLAG_UNUSED_0x1AA":426,"FLAG_UNUSED_0x1AB":427,"FLAG_UNUSED_0x1DA":474,"FLAG_UNUSED_0x1DE":478,"FLAG_UNUSED_0x1DF":479,"FLAG_UNUSED_0x1E0":480,"FLAG_UNUSED_0x1E1":481,"FLAG_UNUSED_0x264":612,"FLAG_UNUSED_0x265":613,"FLAG_UNUSED_0x266":614,"FLAG_UNUSED_0x267":615,"FLAG_UNUSED_0x268":616,"FLAG_UNUSED_0x269":617,"FLAG_UNUSED_0x26A":618,"FLAG_UNUSED_0x26B":619,"FLAG_UNUSED_0x26C":620,"FLAG_UNUSED_0x26D":621,"FLAG_UNUSED_0x26E":622,"FLAG_UNUSED_0x26F":623,"FLAG_UNUSED_0x270":624,"FLAG_UNUSED_0x271":625,"FLAG_UNUSED_0x272":626,"FLAG_UNUSED_0x273":627,"FLAG_UNUSED_0x274":628,"FLAG_UNUSED_0x275":629,"FLAG_UNUSED_0x276":630,"FLAG_UNUSED_0x277":631,"FLAG_UNUSED_0x278":632,"FLAG_UNUSED_0x279":633,"FLAG_UNUSED_0x27A":634,"FLAG_UNUSED_0x27B":635,"FLAG_UNUSED_0x27C":636,"FLAG_UNUSED_0x27D":637,"FLAG_UNUSED_0x27E":638,"FLAG_UNUSED_0x27F":639,"FLAG_UNUSED_0x280":640,"FLAG_UNUSED_0x281":641,"FLAG_UNUSED_0x282":642,"FLAG_UNUSED_0x283":643,"FLAG_UNUSED_0x284":644,"FLAG_UNUSED_0x285":645,"FLAG_UNUSED_0x286":646,"FLAG_UNUSED_0x287":647,"FLAG_UNUSED_0x288":648,"FLAG_UNUSED_0x289":649,"FLAG_UNUSED_0x28A":650,"FLAG_UNUSED_0x28B":651,"FLAG_UNUSED_0x28C":652,"FLAG_UNUSED_0x28D":653,"FLAG_UNUSED_0x28E":654,"FLAG_UNUSED_0x28F":655,"FLAG_UNUSED_0x290":656,"FLAG_UNUSED_0x291":657,"FLAG_UNUSED_0x292":658,"FLAG_UNUSED_0x293":659,"FLAG_UNUSED_0x294":660,"FLAG_UNUSED_0x295":661,"FLAG_UNUSED_0x296":662,"FLAG_UNUSED_0x297":663,"FLAG_UNUSED_0x298":664,"FLAG_UNUSED_0x299":665,"FLAG_UNUSED_0x29A":666,"FLAG_UNUSED_0x29B":667,"FLAG_UNUSED_0x29C":668,"FLAG_UNUSED_0x29D":669,"FLAG_UNUSED_0x29E":670,"FLAG_UNUSED_0x29F":671,"FLAG_UNUSED_0x2A0":672,"FLAG_UNUSED_0x2A1":673,"FLAG_UNUSED_0x2A2":674,"FLAG_UNUSED_0x2A3":675,"FLAG_UNUSED_0x2A4":676,"FLAG_UNUSED_0x2A5":677,"FLAG_UNUSED_0x2A6":678,"FLAG_UNUSED_0x2A7":679,"FLAG_UNUSED_0x2A8":680,"FLAG_UNUSED_0x2A9":681,"FLAG_UNUSED_0x2AA":682,"FLAG_UNUSED_0x2AB":683,"FLAG_UNUSED_0x2AC":684,"FLAG_UNUSED_0x2AD":685,"FLAG_UNUSED_0x2AE":686,"FLAG_UNUSED_0x2AF":687,"FLAG_UNUSED_0x2B0":688,"FLAG_UNUSED_0x2B1":689,"FLAG_UNUSED_0x2B2":690,"FLAG_UNUSED_0x2B3":691,"FLAG_UNUSED_0x2B4":692,"FLAG_UNUSED_0x2B5":693,"FLAG_UNUSED_0x2B6":694,"FLAG_UNUSED_0x2B7":695,"FLAG_UNUSED_0x2B8":696,"FLAG_UNUSED_0x2B9":697,"FLAG_UNUSED_0x2BA":698,"FLAG_UNUSED_0x2BB":699,"FLAG_UNUSED_0x468":1128,"FLAG_UNUSED_0x470":1136,"FLAG_UNUSED_0x472":1138,"FLAG_UNUSED_0x479":1145,"FLAG_UNUSED_0x4A8":1192,"FLAG_UNUSED_0x4A9":1193,"FLAG_UNUSED_0x4AA":1194,"FLAG_UNUSED_0x4AB":1195,"FLAG_UNUSED_0x4AC":1196,"FLAG_UNUSED_0x4AD":1197,"FLAG_UNUSED_0x4AE":1198,"FLAG_UNUSED_0x4AF":1199,"FLAG_UNUSED_0x4B0":1200,"FLAG_UNUSED_0x4B1":1201,"FLAG_UNUSED_0x4B2":1202,"FLAG_UNUSED_0x4B3":1203,"FLAG_UNUSED_0x4B4":1204,"FLAG_UNUSED_0x4B5":1205,"FLAG_UNUSED_0x4B6":1206,"FLAG_UNUSED_0x4B7":1207,"FLAG_UNUSED_0x4B8":1208,"FLAG_UNUSED_0x4B9":1209,"FLAG_UNUSED_0x4BA":1210,"FLAG_UNUSED_0x4BB":1211,"FLAG_UNUSED_0x4BC":1212,"FLAG_UNUSED_0x4BD":1213,"FLAG_UNUSED_0x4BE":1214,"FLAG_UNUSED_0x4BF":1215,"FLAG_UNUSED_0x4C0":1216,"FLAG_UNUSED_0x4C1":1217,"FLAG_UNUSED_0x4C2":1218,"FLAG_UNUSED_0x4C3":1219,"FLAG_UNUSED_0x4C4":1220,"FLAG_UNUSED_0x4C5":1221,"FLAG_UNUSED_0x4C6":1222,"FLAG_UNUSED_0x4C7":1223,"FLAG_UNUSED_0x4C8":1224,"FLAG_UNUSED_0x4C9":1225,"FLAG_UNUSED_0x4CA":1226,"FLAG_UNUSED_0x4CB":1227,"FLAG_UNUSED_0x4CC":1228,"FLAG_UNUSED_0x4CD":1229,"FLAG_UNUSED_0x4CE":1230,"FLAG_UNUSED_0x4CF":1231,"FLAG_UNUSED_0x4D0":1232,"FLAG_UNUSED_0x4D1":1233,"FLAG_UNUSED_0x4D2":1234,"FLAG_UNUSED_0x4D3":1235,"FLAG_UNUSED_0x4D4":1236,"FLAG_UNUSED_0x4D5":1237,"FLAG_UNUSED_0x4D6":1238,"FLAG_UNUSED_0x4D7":1239,"FLAG_UNUSED_0x4D8":1240,"FLAG_UNUSED_0x4D9":1241,"FLAG_UNUSED_0x4DA":1242,"FLAG_UNUSED_0x4DB":1243,"FLAG_UNUSED_0x4DC":1244,"FLAG_UNUSED_0x4DD":1245,"FLAG_UNUSED_0x4DE":1246,"FLAG_UNUSED_0x4DF":1247,"FLAG_UNUSED_0x4E0":1248,"FLAG_UNUSED_0x4E1":1249,"FLAG_UNUSED_0x4E2":1250,"FLAG_UNUSED_0x4E3":1251,"FLAG_UNUSED_0x4E4":1252,"FLAG_UNUSED_0x4E5":1253,"FLAG_UNUSED_0x4E6":1254,"FLAG_UNUSED_0x4E7":1255,"FLAG_UNUSED_0x4E8":1256,"FLAG_UNUSED_0x4E9":1257,"FLAG_UNUSED_0x4EA":1258,"FLAG_UNUSED_0x4EB":1259,"FLAG_UNUSED_0x4EC":1260,"FLAG_UNUSED_0x4ED":1261,"FLAG_UNUSED_0x4EE":1262,"FLAG_UNUSED_0x4EF":1263,"FLAG_UNUSED_0x4F9":1273,"FLAG_UNUSED_0x4FA":1274,"FLAG_UNUSED_0x4FF":1279,"FLAG_UNUSED_0x863":2147,"FLAG_UNUSED_0x881":2177,"FLAG_UNUSED_0x882":2178,"FLAG_UNUSED_0x883":2179,"FLAG_UNUSED_0x884":2180,"FLAG_UNUSED_0x885":2181,"FLAG_UNUSED_0x886":2182,"FLAG_UNUSED_0x887":2183,"FLAG_UNUSED_0x88E":2190,"FLAG_UNUSED_0x88F":2191,"FLAG_UNUSED_0x8E3":2275,"FLAG_UNUSED_0x8E5":2277,"FLAG_UNUSED_0x8E6":2278,"FLAG_UNUSED_0x8E7":2279,"FLAG_UNUSED_0x8E8":2280,"FLAG_UNUSED_0x8E9":2281,"FLAG_UNUSED_0x8EA":2282,"FLAG_UNUSED_0x8EB":2283,"FLAG_UNUSED_0x8EC":2284,"FLAG_UNUSED_0x8ED":2285,"FLAG_UNUSED_0x8EE":2286,"FLAG_UNUSED_0x8EF":2287,"FLAG_UNUSED_0x8F0":2288,"FLAG_UNUSED_0x8F1":2289,"FLAG_UNUSED_0x8F2":2290,"FLAG_UNUSED_0x8F3":2291,"FLAG_UNUSED_0x8F4":2292,"FLAG_UNUSED_0x8F5":2293,"FLAG_UNUSED_0x8F6":2294,"FLAG_UNUSED_0x8F7":2295,"FLAG_UNUSED_0x8F8":2296,"FLAG_UNUSED_0x8F9":2297,"FLAG_UNUSED_0x8FA":2298,"FLAG_UNUSED_0x8FB":2299,"FLAG_UNUSED_0x8FC":2300,"FLAG_UNUSED_0x8FD":2301,"FLAG_UNUSED_0x8FE":2302,"FLAG_UNUSED_0x8FF":2303,"FLAG_UNUSED_0x900":2304,"FLAG_UNUSED_0x901":2305,"FLAG_UNUSED_0x902":2306,"FLAG_UNUSED_0x903":2307,"FLAG_UNUSED_0x904":2308,"FLAG_UNUSED_0x905":2309,"FLAG_UNUSED_0x906":2310,"FLAG_UNUSED_0x907":2311,"FLAG_UNUSED_0x908":2312,"FLAG_UNUSED_0x909":2313,"FLAG_UNUSED_0x90A":2314,"FLAG_UNUSED_0x90B":2315,"FLAG_UNUSED_0x90C":2316,"FLAG_UNUSED_0x90D":2317,"FLAG_UNUSED_0x90E":2318,"FLAG_UNUSED_0x90F":2319,"FLAG_UNUSED_0x910":2320,"FLAG_UNUSED_0x911":2321,"FLAG_UNUSED_0x912":2322,"FLAG_UNUSED_0x913":2323,"FLAG_UNUSED_0x914":2324,"FLAG_UNUSED_0x915":2325,"FLAG_UNUSED_0x916":2326,"FLAG_UNUSED_0x917":2327,"FLAG_UNUSED_0x918":2328,"FLAG_UNUSED_0x919":2329,"FLAG_UNUSED_0x91A":2330,"FLAG_UNUSED_0x91B":2331,"FLAG_UNUSED_0x91C":2332,"FLAG_UNUSED_0x91D":2333,"FLAG_UNUSED_0x91E":2334,"FLAG_UNUSED_0x91F":2335,"FLAG_UNUSED_0x920":2336,"FLAG_UNUSED_0x923":2339,"FLAG_UNUSED_0x924":2340,"FLAG_UNUSED_0x925":2341,"FLAG_UNUSED_0x926":2342,"FLAG_UNUSED_0x927":2343,"FLAG_UNUSED_0x928":2344,"FLAG_UNUSED_0x929":2345,"FLAG_UNUSED_0x933":2355,"FLAG_UNUSED_0x935":2357,"FLAG_UNUSED_0x936":2358,"FLAG_UNUSED_0x937":2359,"FLAG_UNUSED_0x938":2360,"FLAG_UNUSED_0x939":2361,"FLAG_UNUSED_0x93A":2362,"FLAG_UNUSED_0x93B":2363,"FLAG_UNUSED_0x93C":2364,"FLAG_UNUSED_0x93D":2365,"FLAG_UNUSED_0x93E":2366,"FLAG_UNUSED_0x93F":2367,"FLAG_UNUSED_0x940":2368,"FLAG_UNUSED_0x941":2369,"FLAG_UNUSED_0x942":2370,"FLAG_UNUSED_0x943":2371,"FLAG_UNUSED_0x944":2372,"FLAG_UNUSED_0x945":2373,"FLAG_UNUSED_0x946":2374,"FLAG_UNUSED_0x947":2375,"FLAG_UNUSED_0x948":2376,"FLAG_UNUSED_0x949":2377,"FLAG_UNUSED_0x94A":2378,"FLAG_UNUSED_0x94B":2379,"FLAG_UNUSED_0x94C":2380,"FLAG_UNUSED_0x94D":2381,"FLAG_UNUSED_0x94E":2382,"FLAG_UNUSED_0x94F":2383,"FLAG_UNUSED_0x950":2384,"FLAG_UNUSED_0x951":2385,"FLAG_UNUSED_0x952":2386,"FLAG_UNUSED_0x953":2387,"FLAG_UNUSED_0x954":2388,"FLAG_UNUSED_0x955":2389,"FLAG_UNUSED_0x956":2390,"FLAG_UNUSED_0x957":2391,"FLAG_UNUSED_0x958":2392,"FLAG_UNUSED_0x959":2393,"FLAG_UNUSED_0x95A":2394,"FLAG_UNUSED_0x95B":2395,"FLAG_UNUSED_0x95C":2396,"FLAG_UNUSED_0x95D":2397,"FLAG_UNUSED_0x95E":2398,"FLAG_UNUSED_0x95F":2399,"FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE":113,"FLAG_USED_ROOM_1_KEY":240,"FLAG_USED_ROOM_2_KEY":241,"FLAG_USED_ROOM_4_KEY":242,"FLAG_USED_ROOM_6_KEY":243,"FLAG_USED_STORAGE_KEY":239,"FLAG_VISITED_DEWFORD_TOWN":2161,"FLAG_VISITED_EVER_GRANDE_CITY":2174,"FLAG_VISITED_FALLARBOR_TOWN":2163,"FLAG_VISITED_FORTREE_CITY":2170,"FLAG_VISITED_LAVARIDGE_TOWN":2162,"FLAG_VISITED_LILYCOVE_CITY":2171,"FLAG_VISITED_LITTLEROOT_TOWN":2159,"FLAG_VISITED_MAUVILLE_CITY":2168,"FLAG_VISITED_MOSSDEEP_CITY":2172,"FLAG_VISITED_OLDALE_TOWN":2160,"FLAG_VISITED_PACIFIDLOG_TOWN":2165,"FLAG_VISITED_PETALBURG_CITY":2166,"FLAG_VISITED_RUSTBORO_CITY":2169,"FLAG_VISITED_SLATEPORT_CITY":2167,"FLAG_VISITED_SOOTOPOLIS_CITY":2173,"FLAG_VISITED_VERDANTURF_TOWN":2164,"FLAG_WALLACE_GOES_TO_SKY_PILLAR":311,"FLAG_WALLY_SPEECH":193,"FLAG_WATTSON_REMATCH_AVAILABLE":91,"FLAG_WHITEOUT_TO_LAVARIDGE":108,"FLAG_WINGULL_DELIVERED_MAIL":224,"FLAG_WINGULL_SENT_ON_ERRAND":222,"FLAG_WONDER_CARD_UNUSED_1":317,"FLAG_WONDER_CARD_UNUSED_10":326,"FLAG_WONDER_CARD_UNUSED_11":327,"FLAG_WONDER_CARD_UNUSED_12":328,"FLAG_WONDER_CARD_UNUSED_13":329,"FLAG_WONDER_CARD_UNUSED_14":330,"FLAG_WONDER_CARD_UNUSED_15":331,"FLAG_WONDER_CARD_UNUSED_16":332,"FLAG_WONDER_CARD_UNUSED_17":333,"FLAG_WONDER_CARD_UNUSED_2":318,"FLAG_WONDER_CARD_UNUSED_3":319,"FLAG_WONDER_CARD_UNUSED_4":320,"FLAG_WONDER_CARD_UNUSED_5":321,"FLAG_WONDER_CARD_UNUSED_6":322,"FLAG_WONDER_CARD_UNUSED_7":323,"FLAG_WONDER_CARD_UNUSED_8":324,"FLAG_WONDER_CARD_UNUSED_9":325,"GOOD_ROD":1,"ITEMS_COUNT":377,"ITEM_034":52,"ITEM_035":53,"ITEM_036":54,"ITEM_037":55,"ITEM_038":56,"ITEM_039":57,"ITEM_03A":58,"ITEM_03B":59,"ITEM_03C":60,"ITEM_03D":61,"ITEM_03E":62,"ITEM_048":72,"ITEM_052":82,"ITEM_057":87,"ITEM_058":88,"ITEM_059":89,"ITEM_05A":90,"ITEM_05B":91,"ITEM_05C":92,"ITEM_063":99,"ITEM_064":100,"ITEM_065":101,"ITEM_066":102,"ITEM_069":105,"ITEM_071":113,"ITEM_072":114,"ITEM_073":115,"ITEM_074":116,"ITEM_075":117,"ITEM_076":118,"ITEM_077":119,"ITEM_078":120,"ITEM_0EA":234,"ITEM_0EB":235,"ITEM_0EC":236,"ITEM_0ED":237,"ITEM_0EE":238,"ITEM_0EF":239,"ITEM_0F0":240,"ITEM_0F1":241,"ITEM_0F2":242,"ITEM_0F3":243,"ITEM_0F4":244,"ITEM_0F5":245,"ITEM_0F6":246,"ITEM_0F7":247,"ITEM_0F8":248,"ITEM_0F9":249,"ITEM_0FA":250,"ITEM_0FB":251,"ITEM_0FC":252,"ITEM_0FD":253,"ITEM_10B":267,"ITEM_15B":347,"ITEM_15C":348,"ITEM_ACRO_BIKE":272,"ITEM_AGUAV_BERRY":146,"ITEM_AMULET_COIN":189,"ITEM_ANTIDOTE":14,"ITEM_APICOT_BERRY":172,"ITEM_ARCHIPELAGO_PROGRESSION":112,"ITEM_ASPEAR_BERRY":137,"ITEM_AURORA_TICKET":371,"ITEM_AWAKENING":17,"ITEM_BADGE_1":226,"ITEM_BADGE_2":227,"ITEM_BADGE_3":228,"ITEM_BADGE_4":229,"ITEM_BADGE_5":230,"ITEM_BADGE_6":231,"ITEM_BADGE_7":232,"ITEM_BADGE_8":233,"ITEM_BASEMENT_KEY":271,"ITEM_BEAD_MAIL":127,"ITEM_BELUE_BERRY":167,"ITEM_BERRY_JUICE":44,"ITEM_BERRY_POUCH":365,"ITEM_BICYCLE":360,"ITEM_BIG_MUSHROOM":104,"ITEM_BIG_PEARL":107,"ITEM_BIKE_VOUCHER":352,"ITEM_BLACK_BELT":207,"ITEM_BLACK_FLUTE":42,"ITEM_BLACK_GLASSES":206,"ITEM_BLUE_FLUTE":39,"ITEM_BLUE_ORB":277,"ITEM_BLUE_SCARF":255,"ITEM_BLUE_SHARD":49,"ITEM_BLUK_BERRY":149,"ITEM_BRIGHT_POWDER":179,"ITEM_BURN_HEAL":15,"ITEM_B_USE_MEDICINE":1,"ITEM_B_USE_OTHER":2,"ITEM_CALCIUM":67,"ITEM_CARBOS":66,"ITEM_CARD_KEY":355,"ITEM_CHARCOAL":215,"ITEM_CHERI_BERRY":133,"ITEM_CHESTO_BERRY":134,"ITEM_CHOICE_BAND":186,"ITEM_CLAW_FOSSIL":287,"ITEM_CLEANSE_TAG":190,"ITEM_COIN_CASE":260,"ITEM_CONTEST_PASS":266,"ITEM_CORNN_BERRY":159,"ITEM_DEEP_SEA_SCALE":193,"ITEM_DEEP_SEA_TOOTH":192,"ITEM_DEVON_GOODS":269,"ITEM_DEVON_SCOPE":288,"ITEM_DIRE_HIT":74,"ITEM_DIVE_BALL":7,"ITEM_DOME_FOSSIL":358,"ITEM_DRAGON_FANG":216,"ITEM_DRAGON_SCALE":201,"ITEM_DREAM_MAIL":130,"ITEM_DURIN_BERRY":166,"ITEM_ELIXIR":36,"ITEM_ENERGY_POWDER":30,"ITEM_ENERGY_ROOT":31,"ITEM_ENIGMA_BERRY":175,"ITEM_EON_TICKET":275,"ITEM_ESCAPE_ROPE":85,"ITEM_ETHER":34,"ITEM_EVERSTONE":195,"ITEM_EXP_SHARE":182,"ITEM_FAB_MAIL":131,"ITEM_FAME_CHECKER":363,"ITEM_FIGY_BERRY":143,"ITEM_FIRE_STONE":95,"ITEM_FLUFFY_TAIL":81,"ITEM_FOCUS_BAND":196,"ITEM_FRESH_WATER":26,"ITEM_FULL_HEAL":23,"ITEM_FULL_RESTORE":19,"ITEM_GANLON_BERRY":169,"ITEM_GLITTER_MAIL":123,"ITEM_GOLD_TEETH":353,"ITEM_GOOD_ROD":263,"ITEM_GO_GOGGLES":279,"ITEM_GREAT_BALL":3,"ITEM_GREEN_SCARF":257,"ITEM_GREEN_SHARD":51,"ITEM_GREPA_BERRY":157,"ITEM_GUARD_SPEC":73,"ITEM_HARBOR_MAIL":122,"ITEM_HARD_STONE":204,"ITEM_HEAL_POWDER":32,"ITEM_HEART_SCALE":111,"ITEM_HELIX_FOSSIL":357,"ITEM_HM01":339,"ITEM_HM01_CUT":339,"ITEM_HM02":340,"ITEM_HM02_FLY":340,"ITEM_HM03":341,"ITEM_HM03_SURF":341,"ITEM_HM04":342,"ITEM_HM04_STRENGTH":342,"ITEM_HM05":343,"ITEM_HM05_FLASH":343,"ITEM_HM06":344,"ITEM_HM06_ROCK_SMASH":344,"ITEM_HM07":345,"ITEM_HM07_WATERFALL":345,"ITEM_HM08":346,"ITEM_HM08_DIVE":346,"ITEM_HONDEW_BERRY":156,"ITEM_HP_UP":63,"ITEM_HYPER_POTION":21,"ITEM_IAPAPA_BERRY":147,"ITEM_ICE_HEAL":16,"ITEM_IRON":65,"ITEM_ITEMFINDER":261,"ITEM_KELPSY_BERRY":154,"ITEM_KINGS_ROCK":187,"ITEM_LANSAT_BERRY":173,"ITEM_LAVA_COOKIE":38,"ITEM_LAX_INCENSE":221,"ITEM_LEAF_STONE":98,"ITEM_LEFTOVERS":200,"ITEM_LEMONADE":28,"ITEM_LEPPA_BERRY":138,"ITEM_LETTER":274,"ITEM_LIECHI_BERRY":168,"ITEM_LIFT_KEY":356,"ITEM_LIGHT_BALL":202,"ITEM_LIST_END":65535,"ITEM_LUCKY_EGG":197,"ITEM_LUCKY_PUNCH":222,"ITEM_LUM_BERRY":141,"ITEM_LUXURY_BALL":11,"ITEM_MACHO_BRACE":181,"ITEM_MACH_BIKE":259,"ITEM_MAGMA_EMBLEM":375,"ITEM_MAGNET":208,"ITEM_MAGOST_BERRY":160,"ITEM_MAGO_BERRY":145,"ITEM_MASTER_BALL":1,"ITEM_MAX_ELIXIR":37,"ITEM_MAX_ETHER":35,"ITEM_MAX_POTION":20,"ITEM_MAX_REPEL":84,"ITEM_MAX_REVIVE":25,"ITEM_MECH_MAIL":124,"ITEM_MENTAL_HERB":185,"ITEM_METAL_COAT":199,"ITEM_METAL_POWDER":223,"ITEM_METEORITE":280,"ITEM_MIRACLE_SEED":205,"ITEM_MOOMOO_MILK":29,"ITEM_MOON_STONE":94,"ITEM_MYSTIC_TICKET":370,"ITEM_MYSTIC_WATER":209,"ITEM_NANAB_BERRY":150,"ITEM_NEST_BALL":8,"ITEM_NET_BALL":6,"ITEM_NEVER_MELT_ICE":212,"ITEM_NOMEL_BERRY":162,"ITEM_NONE":0,"ITEM_NUGGET":110,"ITEM_OAKS_PARCEL":349,"ITEM_OLD_AMBER":354,"ITEM_OLD_ROD":262,"ITEM_OLD_SEA_MAP":376,"ITEM_ORANGE_MAIL":121,"ITEM_ORAN_BERRY":139,"ITEM_PAMTRE_BERRY":164,"ITEM_PARALYZE_HEAL":18,"ITEM_PEARL":106,"ITEM_PECHA_BERRY":135,"ITEM_PERSIM_BERRY":140,"ITEM_PETAYA_BERRY":171,"ITEM_PINAP_BERRY":152,"ITEM_PINK_SCARF":256,"ITEM_POISON_BARB":211,"ITEM_POKEBLOCK_CASE":273,"ITEM_POKE_BALL":4,"ITEM_POKE_DOLL":80,"ITEM_POKE_FLUTE":350,"ITEM_POMEG_BERRY":153,"ITEM_POTION":13,"ITEM_POWDER_JAR":372,"ITEM_PP_MAX":71,"ITEM_PP_UP":69,"ITEM_PREMIER_BALL":12,"ITEM_PROTEIN":64,"ITEM_QUALOT_BERRY":155,"ITEM_QUICK_CLAW":183,"ITEM_RABUTA_BERRY":161,"ITEM_RAINBOW_PASS":368,"ITEM_RARE_CANDY":68,"ITEM_RAWST_BERRY":136,"ITEM_RAZZ_BERRY":148,"ITEM_RED_FLUTE":41,"ITEM_RED_ORB":276,"ITEM_RED_SCARF":254,"ITEM_RED_SHARD":48,"ITEM_REPEAT_BALL":9,"ITEM_REPEL":86,"ITEM_RETRO_MAIL":132,"ITEM_REVIVAL_HERB":33,"ITEM_REVIVE":24,"ITEM_ROOM_1_KEY":281,"ITEM_ROOM_2_KEY":282,"ITEM_ROOM_4_KEY":283,"ITEM_ROOM_6_KEY":284,"ITEM_ROOT_FOSSIL":286,"ITEM_RUBY":373,"ITEM_SACRED_ASH":45,"ITEM_SAFARI_BALL":5,"ITEM_SALAC_BERRY":170,"ITEM_SAPPHIRE":374,"ITEM_SCANNER":278,"ITEM_SCOPE_LENS":198,"ITEM_SEA_INCENSE":220,"ITEM_SECRET_KEY":351,"ITEM_SHADOW_MAIL":128,"ITEM_SHARP_BEAK":210,"ITEM_SHELL_BELL":219,"ITEM_SHOAL_SALT":46,"ITEM_SHOAL_SHELL":47,"ITEM_SILK_SCARF":217,"ITEM_SILPH_SCOPE":359,"ITEM_SILVER_POWDER":188,"ITEM_SITRUS_BERRY":142,"ITEM_SMOKE_BALL":194,"ITEM_SODA_POP":27,"ITEM_SOFT_SAND":203,"ITEM_SOOTHE_BELL":184,"ITEM_SOOT_SACK":270,"ITEM_SOUL_DEW":191,"ITEM_SPELL_TAG":213,"ITEM_SPELON_BERRY":163,"ITEM_SS_TICKET":265,"ITEM_STARDUST":108,"ITEM_STARF_BERRY":174,"ITEM_STAR_PIECE":109,"ITEM_STICK":225,"ITEM_STORAGE_KEY":285,"ITEM_SUN_STONE":93,"ITEM_SUPER_POTION":22,"ITEM_SUPER_REPEL":83,"ITEM_SUPER_ROD":264,"ITEM_TAMATO_BERRY":158,"ITEM_TEA":369,"ITEM_TEACHY_TV":366,"ITEM_THICK_CLUB":224,"ITEM_THUNDER_STONE":96,"ITEM_TIMER_BALL":10,"ITEM_TINY_MUSHROOM":103,"ITEM_TM01":289,"ITEM_TM01_FOCUS_PUNCH":289,"ITEM_TM02":290,"ITEM_TM02_DRAGON_CLAW":290,"ITEM_TM03":291,"ITEM_TM03_WATER_PULSE":291,"ITEM_TM04":292,"ITEM_TM04_CALM_MIND":292,"ITEM_TM05":293,"ITEM_TM05_ROAR":293,"ITEM_TM06":294,"ITEM_TM06_TOXIC":294,"ITEM_TM07":295,"ITEM_TM07_HAIL":295,"ITEM_TM08":296,"ITEM_TM08_BULK_UP":296,"ITEM_TM09":297,"ITEM_TM09_BULLET_SEED":297,"ITEM_TM10":298,"ITEM_TM10_HIDDEN_POWER":298,"ITEM_TM11":299,"ITEM_TM11_SUNNY_DAY":299,"ITEM_TM12":300,"ITEM_TM12_TAUNT":300,"ITEM_TM13":301,"ITEM_TM13_ICE_BEAM":301,"ITEM_TM14":302,"ITEM_TM14_BLIZZARD":302,"ITEM_TM15":303,"ITEM_TM15_HYPER_BEAM":303,"ITEM_TM16":304,"ITEM_TM16_LIGHT_SCREEN":304,"ITEM_TM17":305,"ITEM_TM17_PROTECT":305,"ITEM_TM18":306,"ITEM_TM18_RAIN_DANCE":306,"ITEM_TM19":307,"ITEM_TM19_GIGA_DRAIN":307,"ITEM_TM20":308,"ITEM_TM20_SAFEGUARD":308,"ITEM_TM21":309,"ITEM_TM21_FRUSTRATION":309,"ITEM_TM22":310,"ITEM_TM22_SOLAR_BEAM":310,"ITEM_TM23":311,"ITEM_TM23_IRON_TAIL":311,"ITEM_TM24":312,"ITEM_TM24_THUNDERBOLT":312,"ITEM_TM25":313,"ITEM_TM25_THUNDER":313,"ITEM_TM26":314,"ITEM_TM26_EARTHQUAKE":314,"ITEM_TM27":315,"ITEM_TM27_RETURN":315,"ITEM_TM28":316,"ITEM_TM28_DIG":316,"ITEM_TM29":317,"ITEM_TM29_PSYCHIC":317,"ITEM_TM30":318,"ITEM_TM30_SHADOW_BALL":318,"ITEM_TM31":319,"ITEM_TM31_BRICK_BREAK":319,"ITEM_TM32":320,"ITEM_TM32_DOUBLE_TEAM":320,"ITEM_TM33":321,"ITEM_TM33_REFLECT":321,"ITEM_TM34":322,"ITEM_TM34_SHOCK_WAVE":322,"ITEM_TM35":323,"ITEM_TM35_FLAMETHROWER":323,"ITEM_TM36":324,"ITEM_TM36_SLUDGE_BOMB":324,"ITEM_TM37":325,"ITEM_TM37_SANDSTORM":325,"ITEM_TM38":326,"ITEM_TM38_FIRE_BLAST":326,"ITEM_TM39":327,"ITEM_TM39_ROCK_TOMB":327,"ITEM_TM40":328,"ITEM_TM40_AERIAL_ACE":328,"ITEM_TM41":329,"ITEM_TM41_TORMENT":329,"ITEM_TM42":330,"ITEM_TM42_FACADE":330,"ITEM_TM43":331,"ITEM_TM43_SECRET_POWER":331,"ITEM_TM44":332,"ITEM_TM44_REST":332,"ITEM_TM45":333,"ITEM_TM45_ATTRACT":333,"ITEM_TM46":334,"ITEM_TM46_THIEF":334,"ITEM_TM47":335,"ITEM_TM47_STEEL_WING":335,"ITEM_TM48":336,"ITEM_TM48_SKILL_SWAP":336,"ITEM_TM49":337,"ITEM_TM49_SNATCH":337,"ITEM_TM50":338,"ITEM_TM50_OVERHEAT":338,"ITEM_TM_CASE":364,"ITEM_TOWN_MAP":361,"ITEM_TRI_PASS":367,"ITEM_TROPIC_MAIL":129,"ITEM_TWISTED_SPOON":214,"ITEM_ULTRA_BALL":2,"ITEM_UNUSED_BERRY_1":176,"ITEM_UNUSED_BERRY_2":177,"ITEM_UNUSED_BERRY_3":178,"ITEM_UP_GRADE":218,"ITEM_USE_BAG_MENU":4,"ITEM_USE_FIELD":2,"ITEM_USE_MAIL":0,"ITEM_USE_PARTY_MENU":1,"ITEM_USE_PBLOCK_CASE":3,"ITEM_VS_SEEKER":362,"ITEM_WAILMER_PAIL":268,"ITEM_WATER_STONE":97,"ITEM_WATMEL_BERRY":165,"ITEM_WAVE_MAIL":126,"ITEM_WEPEAR_BERRY":151,"ITEM_WHITE_FLUTE":43,"ITEM_WHITE_HERB":180,"ITEM_WIKI_BERRY":144,"ITEM_WOOD_MAIL":125,"ITEM_X_ACCURACY":78,"ITEM_X_ATTACK":75,"ITEM_X_DEFEND":76,"ITEM_X_SPECIAL":79,"ITEM_X_SPEED":77,"ITEM_YELLOW_FLUTE":40,"ITEM_YELLOW_SCARF":258,"ITEM_YELLOW_SHARD":50,"ITEM_ZINC":70,"LAST_BALL":12,"LAST_BERRY_INDEX":175,"LAST_BERRY_MASTER_BERRY":162,"LAST_BERRY_MASTER_WIFE_BERRY":142,"LAST_KIRI_BERRY":162,"LAST_ROUTE_114_MAN_BERRY":152,"MACH_BIKE":0,"MAIL_NONE":255,"MAP_ABANDONED_SHIP_CAPTAINS_OFFICE":6207,"MAP_ABANDONED_SHIP_CORRIDORS_1F":6199,"MAP_ABANDONED_SHIP_CORRIDORS_B1F":6201,"MAP_ABANDONED_SHIP_DECK":6198,"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS":6209,"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS":6210,"MAP_ABANDONED_SHIP_ROOMS2_1F":6206,"MAP_ABANDONED_SHIP_ROOMS2_B1F":6203,"MAP_ABANDONED_SHIP_ROOMS_1F":6200,"MAP_ABANDONED_SHIP_ROOMS_B1F":6202,"MAP_ABANDONED_SHIP_ROOM_B1F":6205,"MAP_ABANDONED_SHIP_UNDERWATER1":6204,"MAP_ABANDONED_SHIP_UNDERWATER2":6208,"MAP_ALTERING_CAVE":6250,"MAP_ANCIENT_TOMB":6212,"MAP_AQUA_HIDEOUT_1F":6167,"MAP_AQUA_HIDEOUT_B1F":6168,"MAP_AQUA_HIDEOUT_B2F":6169,"MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1":6218,"MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2":6219,"MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3":6220,"MAP_ARTISAN_CAVE_1F":6244,"MAP_ARTISAN_CAVE_B1F":6243,"MAP_BATTLE_COLOSSEUM_2P":6424,"MAP_BATTLE_COLOSSEUM_4P":6427,"MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM":6686,"MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR":6685,"MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY":6684,"MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM":6677,"MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR":6675,"MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY":6674,"MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM":6676,"MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM":6689,"MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY":6687,"MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM":6688,"MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM":6680,"MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR":6679,"MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY":6678,"MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR":6691,"MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY":6690,"MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL":6694,"MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL":6693,"MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS":6695,"MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM":6692,"MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR":6682,"MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY":6681,"MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP":6683,"MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM":6664,"MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR":6663,"MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR":6662,"MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY":6661,"MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM":6673,"MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR":6672,"MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM":6671,"MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER":6698,"MAP_BATTLE_FRONTIER_LOUNGE1":6697,"MAP_BATTLE_FRONTIER_LOUNGE2":6699,"MAP_BATTLE_FRONTIER_LOUNGE3":6700,"MAP_BATTLE_FRONTIER_LOUNGE4":6701,"MAP_BATTLE_FRONTIER_LOUNGE5":6703,"MAP_BATTLE_FRONTIER_LOUNGE6":6704,"MAP_BATTLE_FRONTIER_LOUNGE7":6705,"MAP_BATTLE_FRONTIER_LOUNGE8":6707,"MAP_BATTLE_FRONTIER_LOUNGE9":6708,"MAP_BATTLE_FRONTIER_MART":6711,"MAP_BATTLE_FRONTIER_OUTSIDE_EAST":6670,"MAP_BATTLE_FRONTIER_OUTSIDE_WEST":6660,"MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F":6709,"MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F":6710,"MAP_BATTLE_FRONTIER_RANKING_HALL":6696,"MAP_BATTLE_FRONTIER_RECEPTION_GATE":6706,"MAP_BATTLE_FRONTIER_SCOTTS_HOUSE":6702,"MAP_BATTLE_PYRAMID_SQUARE01":6444,"MAP_BATTLE_PYRAMID_SQUARE02":6445,"MAP_BATTLE_PYRAMID_SQUARE03":6446,"MAP_BATTLE_PYRAMID_SQUARE04":6447,"MAP_BATTLE_PYRAMID_SQUARE05":6448,"MAP_BATTLE_PYRAMID_SQUARE06":6449,"MAP_BATTLE_PYRAMID_SQUARE07":6450,"MAP_BATTLE_PYRAMID_SQUARE08":6451,"MAP_BATTLE_PYRAMID_SQUARE09":6452,"MAP_BATTLE_PYRAMID_SQUARE10":6453,"MAP_BATTLE_PYRAMID_SQUARE11":6454,"MAP_BATTLE_PYRAMID_SQUARE12":6455,"MAP_BATTLE_PYRAMID_SQUARE13":6456,"MAP_BATTLE_PYRAMID_SQUARE14":6457,"MAP_BATTLE_PYRAMID_SQUARE15":6458,"MAP_BATTLE_PYRAMID_SQUARE16":6459,"MAP_BIRTH_ISLAND_EXTERIOR":6714,"MAP_BIRTH_ISLAND_HARBOR":6715,"MAP_CAVE_OF_ORIGIN_1F":6182,"MAP_CAVE_OF_ORIGIN_B1F":6186,"MAP_CAVE_OF_ORIGIN_ENTRANCE":6181,"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1":6183,"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2":6184,"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3":6185,"MAP_CONTEST_HALL":6428,"MAP_CONTEST_HALL_BEAUTY":6435,"MAP_CONTEST_HALL_COOL":6437,"MAP_CONTEST_HALL_CUTE":6439,"MAP_CONTEST_HALL_SMART":6438,"MAP_CONTEST_HALL_TOUGH":6436,"MAP_DESERT_RUINS":6150,"MAP_DESERT_UNDERPASS":6242,"MAP_DEWFORD_TOWN":11,"MAP_DEWFORD_TOWN_GYM":771,"MAP_DEWFORD_TOWN_HALL":772,"MAP_DEWFORD_TOWN_HOUSE1":768,"MAP_DEWFORD_TOWN_HOUSE2":773,"MAP_DEWFORD_TOWN_POKEMON_CENTER_1F":769,"MAP_DEWFORD_TOWN_POKEMON_CENTER_2F":770,"MAP_EVER_GRANDE_CITY":8,"MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM":4100,"MAP_EVER_GRANDE_CITY_DRAKES_ROOM":4099,"MAP_EVER_GRANDE_CITY_GLACIAS_ROOM":4098,"MAP_EVER_GRANDE_CITY_HALL1":4101,"MAP_EVER_GRANDE_CITY_HALL2":4102,"MAP_EVER_GRANDE_CITY_HALL3":4103,"MAP_EVER_GRANDE_CITY_HALL4":4104,"MAP_EVER_GRANDE_CITY_HALL5":4105,"MAP_EVER_GRANDE_CITY_HALL_OF_FAME":4107,"MAP_EVER_GRANDE_CITY_PHOEBES_ROOM":4097,"MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F":4108,"MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F":4109,"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F":4106,"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F":4110,"MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM":4096,"MAP_FALLARBOR_TOWN":13,"MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM":1283,"MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR":1282,"MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY":1281,"MAP_FALLARBOR_TOWN_COZMOS_HOUSE":1286,"MAP_FALLARBOR_TOWN_MART":1280,"MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE":1287,"MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F":1284,"MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F":1285,"MAP_FARAWAY_ISLAND_ENTRANCE":6712,"MAP_FARAWAY_ISLAND_INTERIOR":6713,"MAP_FIERY_PATH":6158,"MAP_FORTREE_CITY":4,"MAP_FORTREE_CITY_DECORATION_SHOP":3081,"MAP_FORTREE_CITY_GYM":3073,"MAP_FORTREE_CITY_HOUSE1":3072,"MAP_FORTREE_CITY_HOUSE2":3077,"MAP_FORTREE_CITY_HOUSE3":3078,"MAP_FORTREE_CITY_HOUSE4":3079,"MAP_FORTREE_CITY_HOUSE5":3080,"MAP_FORTREE_CITY_MART":3076,"MAP_FORTREE_CITY_POKEMON_CENTER_1F":3074,"MAP_FORTREE_CITY_POKEMON_CENTER_2F":3075,"MAP_GRANITE_CAVE_1F":6151,"MAP_GRANITE_CAVE_B1F":6152,"MAP_GRANITE_CAVE_B2F":6153,"MAP_GRANITE_CAVE_STEVENS_ROOM":6154,"MAP_GROUPS_COUNT":34,"MAP_INSIDE_OF_TRUCK":6440,"MAP_ISLAND_CAVE":6211,"MAP_JAGGED_PASS":6157,"MAP_LAVARIDGE_TOWN":12,"MAP_LAVARIDGE_TOWN_GYM_1F":1025,"MAP_LAVARIDGE_TOWN_GYM_B1F":1026,"MAP_LAVARIDGE_TOWN_HERB_SHOP":1024,"MAP_LAVARIDGE_TOWN_HOUSE":1027,"MAP_LAVARIDGE_TOWN_MART":1028,"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F":1029,"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F":1030,"MAP_LILYCOVE_CITY":5,"MAP_LILYCOVE_CITY_CONTEST_HALL":3333,"MAP_LILYCOVE_CITY_CONTEST_LOBBY":3332,"MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F":3328,"MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F":3329,"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F":3344,"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F":3345,"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F":3346,"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F":3347,"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F":3348,"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR":3350,"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP":3349,"MAP_LILYCOVE_CITY_HARBOR":3338,"MAP_LILYCOVE_CITY_HOUSE1":3340,"MAP_LILYCOVE_CITY_HOUSE2":3341,"MAP_LILYCOVE_CITY_HOUSE3":3342,"MAP_LILYCOVE_CITY_HOUSE4":3343,"MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F":3330,"MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F":3331,"MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE":3339,"MAP_LILYCOVE_CITY_POKEMON_CENTER_1F":3334,"MAP_LILYCOVE_CITY_POKEMON_CENTER_2F":3335,"MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB":3337,"MAP_LILYCOVE_CITY_UNUSED_MART":3336,"MAP_LITTLEROOT_TOWN":9,"MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F":256,"MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F":257,"MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F":258,"MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F":259,"MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB":260,"MAP_MAGMA_HIDEOUT_1F":6230,"MAP_MAGMA_HIDEOUT_2F_1R":6231,"MAP_MAGMA_HIDEOUT_2F_2R":6232,"MAP_MAGMA_HIDEOUT_2F_3R":6237,"MAP_MAGMA_HIDEOUT_3F_1R":6233,"MAP_MAGMA_HIDEOUT_3F_2R":6234,"MAP_MAGMA_HIDEOUT_3F_3R":6236,"MAP_MAGMA_HIDEOUT_4F":6235,"MAP_MARINE_CAVE_END":6247,"MAP_MARINE_CAVE_ENTRANCE":6246,"MAP_MAUVILLE_CITY":2,"MAP_MAUVILLE_CITY_BIKE_SHOP":2561,"MAP_MAUVILLE_CITY_GAME_CORNER":2563,"MAP_MAUVILLE_CITY_GYM":2560,"MAP_MAUVILLE_CITY_HOUSE1":2562,"MAP_MAUVILLE_CITY_HOUSE2":2564,"MAP_MAUVILLE_CITY_MART":2567,"MAP_MAUVILLE_CITY_POKEMON_CENTER_1F":2565,"MAP_MAUVILLE_CITY_POKEMON_CENTER_2F":2566,"MAP_METEOR_FALLS_1F_1R":6144,"MAP_METEOR_FALLS_1F_2R":6145,"MAP_METEOR_FALLS_B1F_1R":6146,"MAP_METEOR_FALLS_B1F_2R":6147,"MAP_METEOR_FALLS_STEVENS_CAVE":6251,"MAP_MIRAGE_TOWER_1F":6238,"MAP_MIRAGE_TOWER_2F":6239,"MAP_MIRAGE_TOWER_3F":6240,"MAP_MIRAGE_TOWER_4F":6241,"MAP_MOSSDEEP_CITY":6,"MAP_MOSSDEEP_CITY_GAME_CORNER_1F":3595,"MAP_MOSSDEEP_CITY_GAME_CORNER_B1F":3596,"MAP_MOSSDEEP_CITY_GYM":3584,"MAP_MOSSDEEP_CITY_HOUSE1":3585,"MAP_MOSSDEEP_CITY_HOUSE2":3586,"MAP_MOSSDEEP_CITY_HOUSE3":3590,"MAP_MOSSDEEP_CITY_HOUSE4":3592,"MAP_MOSSDEEP_CITY_MART":3589,"MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F":3587,"MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F":3588,"MAP_MOSSDEEP_CITY_SPACE_CENTER_1F":3593,"MAP_MOSSDEEP_CITY_SPACE_CENTER_2F":3594,"MAP_MOSSDEEP_CITY_STEVENS_HOUSE":3591,"MAP_MT_CHIMNEY":6156,"MAP_MT_CHIMNEY_CABLE_CAR_STATION":4865,"MAP_MT_PYRE_1F":6159,"MAP_MT_PYRE_2F":6160,"MAP_MT_PYRE_3F":6161,"MAP_MT_PYRE_4F":6162,"MAP_MT_PYRE_5F":6163,"MAP_MT_PYRE_6F":6164,"MAP_MT_PYRE_EXTERIOR":6165,"MAP_MT_PYRE_SUMMIT":6166,"MAP_NAVEL_ROCK_B1F":6725,"MAP_NAVEL_ROCK_BOTTOM":6743,"MAP_NAVEL_ROCK_DOWN01":6732,"MAP_NAVEL_ROCK_DOWN02":6733,"MAP_NAVEL_ROCK_DOWN03":6734,"MAP_NAVEL_ROCK_DOWN04":6735,"MAP_NAVEL_ROCK_DOWN05":6736,"MAP_NAVEL_ROCK_DOWN06":6737,"MAP_NAVEL_ROCK_DOWN07":6738,"MAP_NAVEL_ROCK_DOWN08":6739,"MAP_NAVEL_ROCK_DOWN09":6740,"MAP_NAVEL_ROCK_DOWN10":6741,"MAP_NAVEL_ROCK_DOWN11":6742,"MAP_NAVEL_ROCK_ENTRANCE":6724,"MAP_NAVEL_ROCK_EXTERIOR":6722,"MAP_NAVEL_ROCK_FORK":6726,"MAP_NAVEL_ROCK_HARBOR":6723,"MAP_NAVEL_ROCK_TOP":6731,"MAP_NAVEL_ROCK_UP1":6727,"MAP_NAVEL_ROCK_UP2":6728,"MAP_NAVEL_ROCK_UP3":6729,"MAP_NAVEL_ROCK_UP4":6730,"MAP_NEW_MAUVILLE_ENTRANCE":6196,"MAP_NEW_MAUVILLE_INSIDE":6197,"MAP_OLDALE_TOWN":10,"MAP_OLDALE_TOWN_HOUSE1":512,"MAP_OLDALE_TOWN_HOUSE2":513,"MAP_OLDALE_TOWN_MART":516,"MAP_OLDALE_TOWN_POKEMON_CENTER_1F":514,"MAP_OLDALE_TOWN_POKEMON_CENTER_2F":515,"MAP_PACIFIDLOG_TOWN":15,"MAP_PACIFIDLOG_TOWN_HOUSE1":1794,"MAP_PACIFIDLOG_TOWN_HOUSE2":1795,"MAP_PACIFIDLOG_TOWN_HOUSE3":1796,"MAP_PACIFIDLOG_TOWN_HOUSE4":1797,"MAP_PACIFIDLOG_TOWN_HOUSE5":1798,"MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F":1792,"MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F":1793,"MAP_PETALBURG_CITY":0,"MAP_PETALBURG_CITY_GYM":2049,"MAP_PETALBURG_CITY_HOUSE1":2050,"MAP_PETALBURG_CITY_HOUSE2":2051,"MAP_PETALBURG_CITY_MART":2054,"MAP_PETALBURG_CITY_POKEMON_CENTER_1F":2052,"MAP_PETALBURG_CITY_POKEMON_CENTER_2F":2053,"MAP_PETALBURG_CITY_WALLYS_HOUSE":2048,"MAP_PETALBURG_WOODS":6155,"MAP_RECORD_CORNER":6426,"MAP_ROUTE101":16,"MAP_ROUTE102":17,"MAP_ROUTE103":18,"MAP_ROUTE104":19,"MAP_ROUTE104_MR_BRINEYS_HOUSE":4352,"MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP":4353,"MAP_ROUTE104_PROTOTYPE":6912,"MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP":6913,"MAP_ROUTE105":20,"MAP_ROUTE106":21,"MAP_ROUTE107":22,"MAP_ROUTE108":23,"MAP_ROUTE109":24,"MAP_ROUTE109_SEASHORE_HOUSE":7168,"MAP_ROUTE110":25,"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE":7435,"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE":7436,"MAP_ROUTE110_TRICK_HOUSE_CORRIDOR":7426,"MAP_ROUTE110_TRICK_HOUSE_END":7425,"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE":7424,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE1":7427,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE2":7428,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE3":7429,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE4":7430,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE5":7431,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE6":7432,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7":7433,"MAP_ROUTE110_TRICK_HOUSE_PUZZLE8":7434,"MAP_ROUTE111":26,"MAP_ROUTE111_OLD_LADYS_REST_STOP":4609,"MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE":4608,"MAP_ROUTE112":27,"MAP_ROUTE112_CABLE_CAR_STATION":4864,"MAP_ROUTE113":28,"MAP_ROUTE113_GLASS_WORKSHOP":7680,"MAP_ROUTE114":29,"MAP_ROUTE114_FOSSIL_MANIACS_HOUSE":5120,"MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL":5121,"MAP_ROUTE114_LANETTES_HOUSE":5122,"MAP_ROUTE115":30,"MAP_ROUTE116":31,"MAP_ROUTE116_TUNNELERS_REST_HOUSE":5376,"MAP_ROUTE117":32,"MAP_ROUTE117_POKEMON_DAY_CARE":5632,"MAP_ROUTE118":33,"MAP_ROUTE119":34,"MAP_ROUTE119_HOUSE":8194,"MAP_ROUTE119_WEATHER_INSTITUTE_1F":8192,"MAP_ROUTE119_WEATHER_INSTITUTE_2F":8193,"MAP_ROUTE120":35,"MAP_ROUTE121":36,"MAP_ROUTE121_SAFARI_ZONE_ENTRANCE":5888,"MAP_ROUTE122":37,"MAP_ROUTE123":38,"MAP_ROUTE123_BERRY_MASTERS_HOUSE":7936,"MAP_ROUTE124":39,"MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE":8448,"MAP_ROUTE125":40,"MAP_ROUTE126":41,"MAP_ROUTE127":42,"MAP_ROUTE128":43,"MAP_ROUTE129":44,"MAP_ROUTE130":45,"MAP_ROUTE131":46,"MAP_ROUTE132":47,"MAP_ROUTE133":48,"MAP_ROUTE134":49,"MAP_RUSTBORO_CITY":3,"MAP_RUSTBORO_CITY_CUTTERS_HOUSE":2827,"MAP_RUSTBORO_CITY_DEVON_CORP_1F":2816,"MAP_RUSTBORO_CITY_DEVON_CORP_2F":2817,"MAP_RUSTBORO_CITY_DEVON_CORP_3F":2818,"MAP_RUSTBORO_CITY_FLAT1_1F":2824,"MAP_RUSTBORO_CITY_FLAT1_2F":2825,"MAP_RUSTBORO_CITY_FLAT2_1F":2829,"MAP_RUSTBORO_CITY_FLAT2_2F":2830,"MAP_RUSTBORO_CITY_FLAT2_3F":2831,"MAP_RUSTBORO_CITY_GYM":2819,"MAP_RUSTBORO_CITY_HOUSE1":2826,"MAP_RUSTBORO_CITY_HOUSE2":2828,"MAP_RUSTBORO_CITY_HOUSE3":2832,"MAP_RUSTBORO_CITY_MART":2823,"MAP_RUSTBORO_CITY_POKEMON_CENTER_1F":2821,"MAP_RUSTBORO_CITY_POKEMON_CENTER_2F":2822,"MAP_RUSTBORO_CITY_POKEMON_SCHOOL":2820,"MAP_RUSTURF_TUNNEL":6148,"MAP_SAFARI_ZONE_NORTH":6657,"MAP_SAFARI_ZONE_NORTHEAST":6668,"MAP_SAFARI_ZONE_NORTHWEST":6656,"MAP_SAFARI_ZONE_REST_HOUSE":6667,"MAP_SAFARI_ZONE_SOUTH":6659,"MAP_SAFARI_ZONE_SOUTHEAST":6669,"MAP_SAFARI_ZONE_SOUTHWEST":6658,"MAP_SCORCHED_SLAB":6217,"MAP_SEAFLOOR_CAVERN_ENTRANCE":6171,"MAP_SEAFLOOR_CAVERN_ROOM1":6172,"MAP_SEAFLOOR_CAVERN_ROOM2":6173,"MAP_SEAFLOOR_CAVERN_ROOM3":6174,"MAP_SEAFLOOR_CAVERN_ROOM4":6175,"MAP_SEAFLOOR_CAVERN_ROOM5":6176,"MAP_SEAFLOOR_CAVERN_ROOM6":6177,"MAP_SEAFLOOR_CAVERN_ROOM7":6178,"MAP_SEAFLOOR_CAVERN_ROOM8":6179,"MAP_SEAFLOOR_CAVERN_ROOM9":6180,"MAP_SEALED_CHAMBER_INNER_ROOM":6216,"MAP_SEALED_CHAMBER_OUTER_ROOM":6215,"MAP_SECRET_BASE_BLUE_CAVE1":6402,"MAP_SECRET_BASE_BLUE_CAVE2":6408,"MAP_SECRET_BASE_BLUE_CAVE3":6414,"MAP_SECRET_BASE_BLUE_CAVE4":6420,"MAP_SECRET_BASE_BROWN_CAVE1":6401,"MAP_SECRET_BASE_BROWN_CAVE2":6407,"MAP_SECRET_BASE_BROWN_CAVE3":6413,"MAP_SECRET_BASE_BROWN_CAVE4":6419,"MAP_SECRET_BASE_RED_CAVE1":6400,"MAP_SECRET_BASE_RED_CAVE2":6406,"MAP_SECRET_BASE_RED_CAVE3":6412,"MAP_SECRET_BASE_RED_CAVE4":6418,"MAP_SECRET_BASE_SHRUB1":6405,"MAP_SECRET_BASE_SHRUB2":6411,"MAP_SECRET_BASE_SHRUB3":6417,"MAP_SECRET_BASE_SHRUB4":6423,"MAP_SECRET_BASE_TREE1":6404,"MAP_SECRET_BASE_TREE2":6410,"MAP_SECRET_BASE_TREE3":6416,"MAP_SECRET_BASE_TREE4":6422,"MAP_SECRET_BASE_YELLOW_CAVE1":6403,"MAP_SECRET_BASE_YELLOW_CAVE2":6409,"MAP_SECRET_BASE_YELLOW_CAVE3":6415,"MAP_SECRET_BASE_YELLOW_CAVE4":6421,"MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM":6194,"MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM":6195,"MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM":6190,"MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM":6227,"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM":6191,"MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM":6193,"MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM":6192,"MAP_SKY_PILLAR_1F":6223,"MAP_SKY_PILLAR_2F":6224,"MAP_SKY_PILLAR_3F":6225,"MAP_SKY_PILLAR_4F":6226,"MAP_SKY_PILLAR_5F":6228,"MAP_SKY_PILLAR_ENTRANCE":6221,"MAP_SKY_PILLAR_OUTSIDE":6222,"MAP_SKY_PILLAR_TOP":6229,"MAP_SLATEPORT_CITY":1,"MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM":2308,"MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR":2307,"MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY":2306,"MAP_SLATEPORT_CITY_HARBOR":2313,"MAP_SLATEPORT_CITY_HOUSE":2314,"MAP_SLATEPORT_CITY_MART":2317,"MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE":2309,"MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F":2311,"MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F":2312,"MAP_SLATEPORT_CITY_POKEMON_CENTER_1F":2315,"MAP_SLATEPORT_CITY_POKEMON_CENTER_2F":2316,"MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB":2310,"MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F":2304,"MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F":2305,"MAP_SOOTOPOLIS_CITY":7,"MAP_SOOTOPOLIS_CITY_GYM_1F":3840,"MAP_SOOTOPOLIS_CITY_GYM_B1F":3841,"MAP_SOOTOPOLIS_CITY_HOUSE1":3845,"MAP_SOOTOPOLIS_CITY_HOUSE2":3846,"MAP_SOOTOPOLIS_CITY_HOUSE3":3847,"MAP_SOOTOPOLIS_CITY_HOUSE4":3848,"MAP_SOOTOPOLIS_CITY_HOUSE5":3849,"MAP_SOOTOPOLIS_CITY_HOUSE6":3850,"MAP_SOOTOPOLIS_CITY_HOUSE7":3851,"MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE":3852,"MAP_SOOTOPOLIS_CITY_MART":3844,"MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F":3853,"MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F":3854,"MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F":3842,"MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F":3843,"MAP_SOUTHERN_ISLAND_EXTERIOR":6665,"MAP_SOUTHERN_ISLAND_INTERIOR":6666,"MAP_SS_TIDAL_CORRIDOR":6441,"MAP_SS_TIDAL_LOWER_DECK":6442,"MAP_SS_TIDAL_ROOMS":6443,"MAP_TERRA_CAVE_END":6249,"MAP_TERRA_CAVE_ENTRANCE":6248,"MAP_TRADE_CENTER":6425,"MAP_TRAINER_HILL_1F":6717,"MAP_TRAINER_HILL_2F":6718,"MAP_TRAINER_HILL_3F":6719,"MAP_TRAINER_HILL_4F":6720,"MAP_TRAINER_HILL_ELEVATOR":6744,"MAP_TRAINER_HILL_ENTRANCE":6716,"MAP_TRAINER_HILL_ROOF":6721,"MAP_UNDERWATER_MARINE_CAVE":6245,"MAP_UNDERWATER_ROUTE105":55,"MAP_UNDERWATER_ROUTE124":50,"MAP_UNDERWATER_ROUTE125":56,"MAP_UNDERWATER_ROUTE126":51,"MAP_UNDERWATER_ROUTE127":52,"MAP_UNDERWATER_ROUTE128":53,"MAP_UNDERWATER_ROUTE129":54,"MAP_UNDERWATER_ROUTE134":6213,"MAP_UNDERWATER_SEAFLOOR_CAVERN":6170,"MAP_UNDERWATER_SEALED_CHAMBER":6214,"MAP_UNDERWATER_SOOTOPOLIS_CITY":6149,"MAP_UNION_ROOM":6460,"MAP_UNUSED_CONTEST_HALL1":6429,"MAP_UNUSED_CONTEST_HALL2":6430,"MAP_UNUSED_CONTEST_HALL3":6431,"MAP_UNUSED_CONTEST_HALL4":6432,"MAP_UNUSED_CONTEST_HALL5":6433,"MAP_UNUSED_CONTEST_HALL6":6434,"MAP_VERDANTURF_TOWN":14,"MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM":1538,"MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR":1537,"MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY":1536,"MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE":1543,"MAP_VERDANTURF_TOWN_HOUSE":1544,"MAP_VERDANTURF_TOWN_MART":1539,"MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F":1540,"MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F":1541,"MAP_VERDANTURF_TOWN_WANDAS_HOUSE":1542,"MAP_VICTORY_ROAD_1F":6187,"MAP_VICTORY_ROAD_B1F":6188,"MAP_VICTORY_ROAD_B2F":6189,"MAX_BAG_ITEM_CAPACITY":99,"MAX_BERRY_CAPACITY":999,"MAX_BERRY_INDEX":178,"MAX_ITEM_DIGITS":3,"MAX_PC_ITEM_CAPACITY":999,"MAX_TRAINERS_COUNT":864,"MOVES_COUNT":355,"MOVE_ABSORB":71,"MOVE_ACID":51,"MOVE_ACID_ARMOR":151,"MOVE_AERIAL_ACE":332,"MOVE_AEROBLAST":177,"MOVE_AGILITY":97,"MOVE_AIR_CUTTER":314,"MOVE_AMNESIA":133,"MOVE_ANCIENT_POWER":246,"MOVE_ARM_THRUST":292,"MOVE_AROMATHERAPY":312,"MOVE_ASSIST":274,"MOVE_ASTONISH":310,"MOVE_ATTRACT":213,"MOVE_AURORA_BEAM":62,"MOVE_BARRAGE":140,"MOVE_BARRIER":112,"MOVE_BATON_PASS":226,"MOVE_BEAT_UP":251,"MOVE_BELLY_DRUM":187,"MOVE_BIDE":117,"MOVE_BIND":20,"MOVE_BITE":44,"MOVE_BLAST_BURN":307,"MOVE_BLAZE_KICK":299,"MOVE_BLIZZARD":59,"MOVE_BLOCK":335,"MOVE_BODY_SLAM":34,"MOVE_BONEMERANG":155,"MOVE_BONE_CLUB":125,"MOVE_BONE_RUSH":198,"MOVE_BOUNCE":340,"MOVE_BRICK_BREAK":280,"MOVE_BUBBLE":145,"MOVE_BUBBLE_BEAM":61,"MOVE_BULK_UP":339,"MOVE_BULLET_SEED":331,"MOVE_CALM_MIND":347,"MOVE_CAMOUFLAGE":293,"MOVE_CHARGE":268,"MOVE_CHARM":204,"MOVE_CLAMP":128,"MOVE_COMET_PUNCH":4,"MOVE_CONFUSE_RAY":109,"MOVE_CONFUSION":93,"MOVE_CONSTRICT":132,"MOVE_CONVERSION":160,"MOVE_CONVERSION_2":176,"MOVE_COSMIC_POWER":322,"MOVE_COTTON_SPORE":178,"MOVE_COUNTER":68,"MOVE_COVET":343,"MOVE_CRABHAMMER":152,"MOVE_CROSS_CHOP":238,"MOVE_CRUNCH":242,"MOVE_CRUSH_CLAW":306,"MOVE_CURSE":174,"MOVE_CUT":15,"MOVE_DEFENSE_CURL":111,"MOVE_DESTINY_BOND":194,"MOVE_DETECT":197,"MOVE_DIG":91,"MOVE_DISABLE":50,"MOVE_DIVE":291,"MOVE_DIZZY_PUNCH":146,"MOVE_DOOM_DESIRE":353,"MOVE_DOUBLE_EDGE":38,"MOVE_DOUBLE_KICK":24,"MOVE_DOUBLE_SLAP":3,"MOVE_DOUBLE_TEAM":104,"MOVE_DRAGON_BREATH":225,"MOVE_DRAGON_CLAW":337,"MOVE_DRAGON_DANCE":349,"MOVE_DRAGON_RAGE":82,"MOVE_DREAM_EATER":138,"MOVE_DRILL_PECK":65,"MOVE_DYNAMIC_PUNCH":223,"MOVE_EARTHQUAKE":89,"MOVE_EGG_BOMB":121,"MOVE_EMBER":52,"MOVE_ENCORE":227,"MOVE_ENDEAVOR":283,"MOVE_ENDURE":203,"MOVE_ERUPTION":284,"MOVE_EXPLOSION":153,"MOVE_EXTRASENSORY":326,"MOVE_EXTREME_SPEED":245,"MOVE_FACADE":263,"MOVE_FAINT_ATTACK":185,"MOVE_FAKE_OUT":252,"MOVE_FAKE_TEARS":313,"MOVE_FALSE_SWIPE":206,"MOVE_FEATHER_DANCE":297,"MOVE_FIRE_BLAST":126,"MOVE_FIRE_PUNCH":7,"MOVE_FIRE_SPIN":83,"MOVE_FISSURE":90,"MOVE_FLAIL":175,"MOVE_FLAMETHROWER":53,"MOVE_FLAME_WHEEL":172,"MOVE_FLASH":148,"MOVE_FLATTER":260,"MOVE_FLY":19,"MOVE_FOCUS_ENERGY":116,"MOVE_FOCUS_PUNCH":264,"MOVE_FOLLOW_ME":266,"MOVE_FORESIGHT":193,"MOVE_FRENZY_PLANT":338,"MOVE_FRUSTRATION":218,"MOVE_FURY_ATTACK":31,"MOVE_FURY_CUTTER":210,"MOVE_FURY_SWIPES":154,"MOVE_FUTURE_SIGHT":248,"MOVE_GIGA_DRAIN":202,"MOVE_GLARE":137,"MOVE_GRASS_WHISTLE":320,"MOVE_GROWL":45,"MOVE_GROWTH":74,"MOVE_GRUDGE":288,"MOVE_GUILLOTINE":12,"MOVE_GUST":16,"MOVE_HAIL":258,"MOVE_HARDEN":106,"MOVE_HAZE":114,"MOVE_HEADBUTT":29,"MOVE_HEAL_BELL":215,"MOVE_HEAT_WAVE":257,"MOVE_HELPING_HAND":270,"MOVE_HIDDEN_POWER":237,"MOVE_HI_JUMP_KICK":136,"MOVE_HORN_ATTACK":30,"MOVE_HORN_DRILL":32,"MOVE_HOWL":336,"MOVE_HYDRO_CANNON":308,"MOVE_HYDRO_PUMP":56,"MOVE_HYPER_BEAM":63,"MOVE_HYPER_FANG":158,"MOVE_HYPER_VOICE":304,"MOVE_HYPNOSIS":95,"MOVE_ICE_BALL":301,"MOVE_ICE_BEAM":58,"MOVE_ICE_PUNCH":8,"MOVE_ICICLE_SPEAR":333,"MOVE_ICY_WIND":196,"MOVE_IMPRISON":286,"MOVE_INGRAIN":275,"MOVE_IRON_DEFENSE":334,"MOVE_IRON_TAIL":231,"MOVE_JUMP_KICK":26,"MOVE_KARATE_CHOP":2,"MOVE_KINESIS":134,"MOVE_KNOCK_OFF":282,"MOVE_LEAF_BLADE":348,"MOVE_LEECH_LIFE":141,"MOVE_LEECH_SEED":73,"MOVE_LEER":43,"MOVE_LICK":122,"MOVE_LIGHT_SCREEN":113,"MOVE_LOCK_ON":199,"MOVE_LOVELY_KISS":142,"MOVE_LOW_KICK":67,"MOVE_LUSTER_PURGE":295,"MOVE_MACH_PUNCH":183,"MOVE_MAGICAL_LEAF":345,"MOVE_MAGIC_COAT":277,"MOVE_MAGNITUDE":222,"MOVE_MEAN_LOOK":212,"MOVE_MEDITATE":96,"MOVE_MEGAHORN":224,"MOVE_MEGA_DRAIN":72,"MOVE_MEGA_KICK":25,"MOVE_MEGA_PUNCH":5,"MOVE_MEMENTO":262,"MOVE_METAL_CLAW":232,"MOVE_METAL_SOUND":319,"MOVE_METEOR_MASH":309,"MOVE_METRONOME":118,"MOVE_MILK_DRINK":208,"MOVE_MIMIC":102,"MOVE_MIND_READER":170,"MOVE_MINIMIZE":107,"MOVE_MIRROR_COAT":243,"MOVE_MIRROR_MOVE":119,"MOVE_MIST":54,"MOVE_MIST_BALL":296,"MOVE_MOONLIGHT":236,"MOVE_MORNING_SUN":234,"MOVE_MUDDY_WATER":330,"MOVE_MUD_SHOT":341,"MOVE_MUD_SLAP":189,"MOVE_MUD_SPORT":300,"MOVE_NATURE_POWER":267,"MOVE_NEEDLE_ARM":302,"MOVE_NIGHTMARE":171,"MOVE_NIGHT_SHADE":101,"MOVE_NONE":0,"MOVE_OCTAZOOKA":190,"MOVE_ODOR_SLEUTH":316,"MOVE_OUTRAGE":200,"MOVE_OVERHEAT":315,"MOVE_PAIN_SPLIT":220,"MOVE_PAY_DAY":6,"MOVE_PECK":64,"MOVE_PERISH_SONG":195,"MOVE_PETAL_DANCE":80,"MOVE_PIN_MISSILE":42,"MOVE_POISON_FANG":305,"MOVE_POISON_GAS":139,"MOVE_POISON_POWDER":77,"MOVE_POISON_STING":40,"MOVE_POISON_TAIL":342,"MOVE_POUND":1,"MOVE_POWDER_SNOW":181,"MOVE_PRESENT":217,"MOVE_PROTECT":182,"MOVE_PSYBEAM":60,"MOVE_PSYCHIC":94,"MOVE_PSYCHO_BOOST":354,"MOVE_PSYCH_UP":244,"MOVE_PSYWAVE":149,"MOVE_PURSUIT":228,"MOVE_QUICK_ATTACK":98,"MOVE_RAGE":99,"MOVE_RAIN_DANCE":240,"MOVE_RAPID_SPIN":229,"MOVE_RAZOR_LEAF":75,"MOVE_RAZOR_WIND":13,"MOVE_RECOVER":105,"MOVE_RECYCLE":278,"MOVE_REFLECT":115,"MOVE_REFRESH":287,"MOVE_REST":156,"MOVE_RETURN":216,"MOVE_REVENGE":279,"MOVE_REVERSAL":179,"MOVE_ROAR":46,"MOVE_ROCK_BLAST":350,"MOVE_ROCK_SLIDE":157,"MOVE_ROCK_SMASH":249,"MOVE_ROCK_THROW":88,"MOVE_ROCK_TOMB":317,"MOVE_ROLE_PLAY":272,"MOVE_ROLLING_KICK":27,"MOVE_ROLLOUT":205,"MOVE_SACRED_FIRE":221,"MOVE_SAFEGUARD":219,"MOVE_SANDSTORM":201,"MOVE_SAND_ATTACK":28,"MOVE_SAND_TOMB":328,"MOVE_SCARY_FACE":184,"MOVE_SCRATCH":10,"MOVE_SCREECH":103,"MOVE_SECRET_POWER":290,"MOVE_SEISMIC_TOSS":69,"MOVE_SELF_DESTRUCT":120,"MOVE_SHADOW_BALL":247,"MOVE_SHADOW_PUNCH":325,"MOVE_SHARPEN":159,"MOVE_SHEER_COLD":329,"MOVE_SHOCK_WAVE":351,"MOVE_SIGNAL_BEAM":324,"MOVE_SILVER_WIND":318,"MOVE_SING":47,"MOVE_SKETCH":166,"MOVE_SKILL_SWAP":285,"MOVE_SKULL_BASH":130,"MOVE_SKY_ATTACK":143,"MOVE_SKY_UPPERCUT":327,"MOVE_SLACK_OFF":303,"MOVE_SLAM":21,"MOVE_SLASH":163,"MOVE_SLEEP_POWDER":79,"MOVE_SLEEP_TALK":214,"MOVE_SLUDGE":124,"MOVE_SLUDGE_BOMB":188,"MOVE_SMELLING_SALT":265,"MOVE_SMOG":123,"MOVE_SMOKESCREEN":108,"MOVE_SNATCH":289,"MOVE_SNORE":173,"MOVE_SOFT_BOILED":135,"MOVE_SOLAR_BEAM":76,"MOVE_SONIC_BOOM":49,"MOVE_SPARK":209,"MOVE_SPIDER_WEB":169,"MOVE_SPIKES":191,"MOVE_SPIKE_CANNON":131,"MOVE_SPITE":180,"MOVE_SPIT_UP":255,"MOVE_SPLASH":150,"MOVE_SPORE":147,"MOVE_STEEL_WING":211,"MOVE_STOCKPILE":254,"MOVE_STOMP":23,"MOVE_STRENGTH":70,"MOVE_STRING_SHOT":81,"MOVE_STRUGGLE":165,"MOVE_STUN_SPORE":78,"MOVE_SUBMISSION":66,"MOVE_SUBSTITUTE":164,"MOVE_SUNNY_DAY":241,"MOVE_SUPERPOWER":276,"MOVE_SUPERSONIC":48,"MOVE_SUPER_FANG":162,"MOVE_SURF":57,"MOVE_SWAGGER":207,"MOVE_SWALLOW":256,"MOVE_SWEET_KISS":186,"MOVE_SWEET_SCENT":230,"MOVE_SWIFT":129,"MOVE_SWORDS_DANCE":14,"MOVE_SYNTHESIS":235,"MOVE_TACKLE":33,"MOVE_TAIL_GLOW":294,"MOVE_TAIL_WHIP":39,"MOVE_TAKE_DOWN":36,"MOVE_TAUNT":269,"MOVE_TEETER_DANCE":298,"MOVE_TELEPORT":100,"MOVE_THIEF":168,"MOVE_THRASH":37,"MOVE_THUNDER":87,"MOVE_THUNDERBOLT":85,"MOVE_THUNDER_PUNCH":9,"MOVE_THUNDER_SHOCK":84,"MOVE_THUNDER_WAVE":86,"MOVE_TICKLE":321,"MOVE_TORMENT":259,"MOVE_TOXIC":92,"MOVE_TRANSFORM":144,"MOVE_TRICK":271,"MOVE_TRIPLE_KICK":167,"MOVE_TRI_ATTACK":161,"MOVE_TWINEEDLE":41,"MOVE_TWISTER":239,"MOVE_UNAVAILABLE":65535,"MOVE_UPROAR":253,"MOVE_VICE_GRIP":11,"MOVE_VINE_WHIP":22,"MOVE_VITAL_THROW":233,"MOVE_VOLT_TACKLE":344,"MOVE_WATERFALL":127,"MOVE_WATER_GUN":55,"MOVE_WATER_PULSE":352,"MOVE_WATER_SPORT":346,"MOVE_WATER_SPOUT":323,"MOVE_WEATHER_BALL":311,"MOVE_WHIRLPOOL":250,"MOVE_WHIRLWIND":18,"MOVE_WILL_O_WISP":261,"MOVE_WING_ATTACK":17,"MOVE_WISH":273,"MOVE_WITHDRAW":110,"MOVE_WRAP":35,"MOVE_YAWN":281,"MOVE_ZAP_CANNON":192,"NUM_BADGES":8,"NUM_BERRY_MASTER_BERRIES":10,"NUM_BERRY_MASTER_BERRIES_SKIPPED":20,"NUM_BERRY_MASTER_WIFE_BERRIES":10,"NUM_HIDDEN_MACHINES":8,"NUM_KIRI_BERRIES":10,"NUM_KIRI_BERRIES_SKIPPED":20,"NUM_ROUTE_114_MAN_BERRIES":5,"NUM_ROUTE_114_MAN_BERRIES_SKIPPED":15,"NUM_SPECIES":412,"NUM_TECHNICAL_MACHINES":50,"NUM_WONDER_CARD_FLAGS":20,"OLD_ROD":0,"SPECIAL_FLAGS_END":16511,"SPECIAL_FLAGS_START":16384,"SPECIES_ABRA":63,"SPECIES_ABSOL":376,"SPECIES_AERODACTYL":142,"SPECIES_AGGRON":384,"SPECIES_AIPOM":190,"SPECIES_ALAKAZAM":65,"SPECIES_ALTARIA":359,"SPECIES_AMPHAROS":181,"SPECIES_ANORITH":390,"SPECIES_ARBOK":24,"SPECIES_ARCANINE":59,"SPECIES_ARIADOS":168,"SPECIES_ARMALDO":391,"SPECIES_ARON":382,"SPECIES_ARTICUNO":144,"SPECIES_AZUMARILL":184,"SPECIES_AZURILL":350,"SPECIES_BAGON":395,"SPECIES_BALTOY":318,"SPECIES_BANETTE":378,"SPECIES_BARBOACH":323,"SPECIES_BAYLEEF":153,"SPECIES_BEAUTIFLY":292,"SPECIES_BEEDRILL":15,"SPECIES_BELDUM":398,"SPECIES_BELLOSSOM":182,"SPECIES_BELLSPROUT":69,"SPECIES_BLASTOISE":9,"SPECIES_BLAZIKEN":282,"SPECIES_BLISSEY":242,"SPECIES_BRELOOM":307,"SPECIES_BULBASAUR":1,"SPECIES_BUTTERFREE":12,"SPECIES_CACNEA":344,"SPECIES_CACTURNE":345,"SPECIES_CAMERUPT":340,"SPECIES_CARVANHA":330,"SPECIES_CASCOON":293,"SPECIES_CASTFORM":385,"SPECIES_CATERPIE":10,"SPECIES_CELEBI":251,"SPECIES_CHANSEY":113,"SPECIES_CHARIZARD":6,"SPECIES_CHARMANDER":4,"SPECIES_CHARMELEON":5,"SPECIES_CHIKORITA":152,"SPECIES_CHIMECHO":411,"SPECIES_CHINCHOU":170,"SPECIES_CLAMPERL":373,"SPECIES_CLAYDOL":319,"SPECIES_CLEFABLE":36,"SPECIES_CLEFAIRY":35,"SPECIES_CLEFFA":173,"SPECIES_CLOYSTER":91,"SPECIES_COMBUSKEN":281,"SPECIES_CORPHISH":326,"SPECIES_CORSOLA":222,"SPECIES_CRADILY":389,"SPECIES_CRAWDAUNT":327,"SPECIES_CROBAT":169,"SPECIES_CROCONAW":159,"SPECIES_CUBONE":104,"SPECIES_CYNDAQUIL":155,"SPECIES_DELCATTY":316,"SPECIES_DELIBIRD":225,"SPECIES_DEOXYS":410,"SPECIES_DEWGONG":87,"SPECIES_DIGLETT":50,"SPECIES_DITTO":132,"SPECIES_DODRIO":85,"SPECIES_DODUO":84,"SPECIES_DONPHAN":232,"SPECIES_DRAGONAIR":148,"SPECIES_DRAGONITE":149,"SPECIES_DRATINI":147,"SPECIES_DROWZEE":96,"SPECIES_DUGTRIO":51,"SPECIES_DUNSPARCE":206,"SPECIES_DUSCLOPS":362,"SPECIES_DUSKULL":361,"SPECIES_DUSTOX":294,"SPECIES_EEVEE":133,"SPECIES_EGG":412,"SPECIES_EKANS":23,"SPECIES_ELECTABUZZ":125,"SPECIES_ELECTRIKE":337,"SPECIES_ELECTRODE":101,"SPECIES_ELEKID":239,"SPECIES_ENTEI":244,"SPECIES_ESPEON":196,"SPECIES_EXEGGCUTE":102,"SPECIES_EXEGGUTOR":103,"SPECIES_EXPLOUD":372,"SPECIES_FARFETCHD":83,"SPECIES_FEAROW":22,"SPECIES_FEEBAS":328,"SPECIES_FERALIGATR":160,"SPECIES_FLAAFFY":180,"SPECIES_FLAREON":136,"SPECIES_FLYGON":334,"SPECIES_FORRETRESS":205,"SPECIES_FURRET":162,"SPECIES_GARDEVOIR":394,"SPECIES_GASTLY":92,"SPECIES_GENGAR":94,"SPECIES_GEODUDE":74,"SPECIES_GIRAFARIG":203,"SPECIES_GLALIE":347,"SPECIES_GLIGAR":207,"SPECIES_GLOOM":44,"SPECIES_GOLBAT":42,"SPECIES_GOLDEEN":118,"SPECIES_GOLDUCK":55,"SPECIES_GOLEM":76,"SPECIES_GOREBYSS":375,"SPECIES_GRANBULL":210,"SPECIES_GRAVELER":75,"SPECIES_GRIMER":88,"SPECIES_GROUDON":405,"SPECIES_GROVYLE":278,"SPECIES_GROWLITHE":58,"SPECIES_GRUMPIG":352,"SPECIES_GULPIN":367,"SPECIES_GYARADOS":130,"SPECIES_HARIYAMA":336,"SPECIES_HAUNTER":93,"SPECIES_HERACROSS":214,"SPECIES_HITMONCHAN":107,"SPECIES_HITMONLEE":106,"SPECIES_HITMONTOP":237,"SPECIES_HOOTHOOT":163,"SPECIES_HOPPIP":187,"SPECIES_HORSEA":116,"SPECIES_HOUNDOOM":229,"SPECIES_HOUNDOUR":228,"SPECIES_HO_OH":250,"SPECIES_HUNTAIL":374,"SPECIES_HYPNO":97,"SPECIES_IGGLYBUFF":174,"SPECIES_ILLUMISE":387,"SPECIES_IVYSAUR":2,"SPECIES_JIGGLYPUFF":39,"SPECIES_JIRACHI":409,"SPECIES_JOLTEON":135,"SPECIES_JUMPLUFF":189,"SPECIES_JYNX":124,"SPECIES_KABUTO":140,"SPECIES_KABUTOPS":141,"SPECIES_KADABRA":64,"SPECIES_KAKUNA":14,"SPECIES_KANGASKHAN":115,"SPECIES_KECLEON":317,"SPECIES_KINGDRA":230,"SPECIES_KINGLER":99,"SPECIES_KIRLIA":393,"SPECIES_KOFFING":109,"SPECIES_KRABBY":98,"SPECIES_KYOGRE":404,"SPECIES_LAIRON":383,"SPECIES_LANTURN":171,"SPECIES_LAPRAS":131,"SPECIES_LARVITAR":246,"SPECIES_LATIAS":407,"SPECIES_LATIOS":408,"SPECIES_LEDIAN":166,"SPECIES_LEDYBA":165,"SPECIES_LICKITUNG":108,"SPECIES_LILEEP":388,"SPECIES_LINOONE":289,"SPECIES_LOMBRE":296,"SPECIES_LOTAD":295,"SPECIES_LOUDRED":371,"SPECIES_LUDICOLO":297,"SPECIES_LUGIA":249,"SPECIES_LUNATONE":348,"SPECIES_LUVDISC":325,"SPECIES_MACHAMP":68,"SPECIES_MACHOKE":67,"SPECIES_MACHOP":66,"SPECIES_MAGBY":240,"SPECIES_MAGCARGO":219,"SPECIES_MAGIKARP":129,"SPECIES_MAGMAR":126,"SPECIES_MAGNEMITE":81,"SPECIES_MAGNETON":82,"SPECIES_MAKUHITA":335,"SPECIES_MANECTRIC":338,"SPECIES_MANKEY":56,"SPECIES_MANTINE":226,"SPECIES_MAREEP":179,"SPECIES_MARILL":183,"SPECIES_MAROWAK":105,"SPECIES_MARSHTOMP":284,"SPECIES_MASQUERAIN":312,"SPECIES_MAWILE":355,"SPECIES_MEDICHAM":357,"SPECIES_MEDITITE":356,"SPECIES_MEGANIUM":154,"SPECIES_MEOWTH":52,"SPECIES_METAGROSS":400,"SPECIES_METANG":399,"SPECIES_METAPOD":11,"SPECIES_MEW":151,"SPECIES_MEWTWO":150,"SPECIES_MIGHTYENA":287,"SPECIES_MILOTIC":329,"SPECIES_MILTANK":241,"SPECIES_MINUN":354,"SPECIES_MISDREAVUS":200,"SPECIES_MOLTRES":146,"SPECIES_MR_MIME":122,"SPECIES_MUDKIP":283,"SPECIES_MUK":89,"SPECIES_MURKROW":198,"SPECIES_NATU":177,"SPECIES_NIDOKING":34,"SPECIES_NIDOQUEEN":31,"SPECIES_NIDORAN_F":29,"SPECIES_NIDORAN_M":32,"SPECIES_NIDORINA":30,"SPECIES_NIDORINO":33,"SPECIES_NINCADA":301,"SPECIES_NINETALES":38,"SPECIES_NINJASK":302,"SPECIES_NOCTOWL":164,"SPECIES_NONE":0,"SPECIES_NOSEPASS":320,"SPECIES_NUMEL":339,"SPECIES_NUZLEAF":299,"SPECIES_OCTILLERY":224,"SPECIES_ODDISH":43,"SPECIES_OLD_UNOWN_B":252,"SPECIES_OLD_UNOWN_C":253,"SPECIES_OLD_UNOWN_D":254,"SPECIES_OLD_UNOWN_E":255,"SPECIES_OLD_UNOWN_F":256,"SPECIES_OLD_UNOWN_G":257,"SPECIES_OLD_UNOWN_H":258,"SPECIES_OLD_UNOWN_I":259,"SPECIES_OLD_UNOWN_J":260,"SPECIES_OLD_UNOWN_K":261,"SPECIES_OLD_UNOWN_L":262,"SPECIES_OLD_UNOWN_M":263,"SPECIES_OLD_UNOWN_N":264,"SPECIES_OLD_UNOWN_O":265,"SPECIES_OLD_UNOWN_P":266,"SPECIES_OLD_UNOWN_Q":267,"SPECIES_OLD_UNOWN_R":268,"SPECIES_OLD_UNOWN_S":269,"SPECIES_OLD_UNOWN_T":270,"SPECIES_OLD_UNOWN_U":271,"SPECIES_OLD_UNOWN_V":272,"SPECIES_OLD_UNOWN_W":273,"SPECIES_OLD_UNOWN_X":274,"SPECIES_OLD_UNOWN_Y":275,"SPECIES_OLD_UNOWN_Z":276,"SPECIES_OMANYTE":138,"SPECIES_OMASTAR":139,"SPECIES_ONIX":95,"SPECIES_PARAS":46,"SPECIES_PARASECT":47,"SPECIES_PELIPPER":310,"SPECIES_PERSIAN":53,"SPECIES_PHANPY":231,"SPECIES_PICHU":172,"SPECIES_PIDGEOT":18,"SPECIES_PIDGEOTTO":17,"SPECIES_PIDGEY":16,"SPECIES_PIKACHU":25,"SPECIES_PILOSWINE":221,"SPECIES_PINECO":204,"SPECIES_PINSIR":127,"SPECIES_PLUSLE":353,"SPECIES_POLITOED":186,"SPECIES_POLIWAG":60,"SPECIES_POLIWHIRL":61,"SPECIES_POLIWRATH":62,"SPECIES_PONYTA":77,"SPECIES_POOCHYENA":286,"SPECIES_PORYGON":137,"SPECIES_PORYGON2":233,"SPECIES_PRIMEAPE":57,"SPECIES_PSYDUCK":54,"SPECIES_PUPITAR":247,"SPECIES_QUAGSIRE":195,"SPECIES_QUILAVA":156,"SPECIES_QWILFISH":211,"SPECIES_RAICHU":26,"SPECIES_RAIKOU":243,"SPECIES_RALTS":392,"SPECIES_RAPIDASH":78,"SPECIES_RATICATE":20,"SPECIES_RATTATA":19,"SPECIES_RAYQUAZA":406,"SPECIES_REGICE":402,"SPECIES_REGIROCK":401,"SPECIES_REGISTEEL":403,"SPECIES_RELICANTH":381,"SPECIES_REMORAID":223,"SPECIES_RHYDON":112,"SPECIES_RHYHORN":111,"SPECIES_ROSELIA":363,"SPECIES_SABLEYE":322,"SPECIES_SALAMENCE":397,"SPECIES_SANDSHREW":27,"SPECIES_SANDSLASH":28,"SPECIES_SCEPTILE":279,"SPECIES_SCIZOR":212,"SPECIES_SCYTHER":123,"SPECIES_SEADRA":117,"SPECIES_SEAKING":119,"SPECIES_SEALEO":342,"SPECIES_SEEDOT":298,"SPECIES_SEEL":86,"SPECIES_SENTRET":161,"SPECIES_SEVIPER":379,"SPECIES_SHARPEDO":331,"SPECIES_SHEDINJA":303,"SPECIES_SHELGON":396,"SPECIES_SHELLDER":90,"SPECIES_SHIFTRY":300,"SPECIES_SHROOMISH":306,"SPECIES_SHUCKLE":213,"SPECIES_SHUPPET":377,"SPECIES_SILCOON":291,"SPECIES_SKARMORY":227,"SPECIES_SKIPLOOM":188,"SPECIES_SKITTY":315,"SPECIES_SLAKING":366,"SPECIES_SLAKOTH":364,"SPECIES_SLOWBRO":80,"SPECIES_SLOWKING":199,"SPECIES_SLOWPOKE":79,"SPECIES_SLUGMA":218,"SPECIES_SMEARGLE":235,"SPECIES_SMOOCHUM":238,"SPECIES_SNEASEL":215,"SPECIES_SNORLAX":143,"SPECIES_SNORUNT":346,"SPECIES_SNUBBULL":209,"SPECIES_SOLROCK":349,"SPECIES_SPEAROW":21,"SPECIES_SPHEAL":341,"SPECIES_SPINARAK":167,"SPECIES_SPINDA":308,"SPECIES_SPOINK":351,"SPECIES_SQUIRTLE":7,"SPECIES_STANTLER":234,"SPECIES_STARMIE":121,"SPECIES_STARYU":120,"SPECIES_STEELIX":208,"SPECIES_SUDOWOODO":185,"SPECIES_SUICUNE":245,"SPECIES_SUNFLORA":192,"SPECIES_SUNKERN":191,"SPECIES_SURSKIT":311,"SPECIES_SWABLU":358,"SPECIES_SWALOT":368,"SPECIES_SWAMPERT":285,"SPECIES_SWELLOW":305,"SPECIES_SWINUB":220,"SPECIES_TAILLOW":304,"SPECIES_TANGELA":114,"SPECIES_TAUROS":128,"SPECIES_TEDDIURSA":216,"SPECIES_TENTACOOL":72,"SPECIES_TENTACRUEL":73,"SPECIES_TOGEPI":175,"SPECIES_TOGETIC":176,"SPECIES_TORCHIC":280,"SPECIES_TORKOAL":321,"SPECIES_TOTODILE":158,"SPECIES_TRAPINCH":332,"SPECIES_TREECKO":277,"SPECIES_TROPIUS":369,"SPECIES_TYPHLOSION":157,"SPECIES_TYRANITAR":248,"SPECIES_TYROGUE":236,"SPECIES_UMBREON":197,"SPECIES_UNOWN":201,"SPECIES_UNOWN_B":413,"SPECIES_UNOWN_C":414,"SPECIES_UNOWN_D":415,"SPECIES_UNOWN_E":416,"SPECIES_UNOWN_EMARK":438,"SPECIES_UNOWN_F":417,"SPECIES_UNOWN_G":418,"SPECIES_UNOWN_H":419,"SPECIES_UNOWN_I":420,"SPECIES_UNOWN_J":421,"SPECIES_UNOWN_K":422,"SPECIES_UNOWN_L":423,"SPECIES_UNOWN_M":424,"SPECIES_UNOWN_N":425,"SPECIES_UNOWN_O":426,"SPECIES_UNOWN_P":427,"SPECIES_UNOWN_Q":428,"SPECIES_UNOWN_QMARK":439,"SPECIES_UNOWN_R":429,"SPECIES_UNOWN_S":430,"SPECIES_UNOWN_T":431,"SPECIES_UNOWN_U":432,"SPECIES_UNOWN_V":433,"SPECIES_UNOWN_W":434,"SPECIES_UNOWN_X":435,"SPECIES_UNOWN_Y":436,"SPECIES_UNOWN_Z":437,"SPECIES_URSARING":217,"SPECIES_VAPOREON":134,"SPECIES_VENOMOTH":49,"SPECIES_VENONAT":48,"SPECIES_VENUSAUR":3,"SPECIES_VIBRAVA":333,"SPECIES_VICTREEBEL":71,"SPECIES_VIGOROTH":365,"SPECIES_VILEPLUME":45,"SPECIES_VOLBEAT":386,"SPECIES_VOLTORB":100,"SPECIES_VULPIX":37,"SPECIES_WAILMER":313,"SPECIES_WAILORD":314,"SPECIES_WALREIN":343,"SPECIES_WARTORTLE":8,"SPECIES_WEEDLE":13,"SPECIES_WEEPINBELL":70,"SPECIES_WEEZING":110,"SPECIES_WHISCASH":324,"SPECIES_WHISMUR":370,"SPECIES_WIGGLYTUFF":40,"SPECIES_WINGULL":309,"SPECIES_WOBBUFFET":202,"SPECIES_WOOPER":194,"SPECIES_WURMPLE":290,"SPECIES_WYNAUT":360,"SPECIES_XATU":178,"SPECIES_YANMA":193,"SPECIES_ZANGOOSE":380,"SPECIES_ZAPDOS":145,"SPECIES_ZIGZAGOON":288,"SPECIES_ZUBAT":41,"SUPER_ROD":2,"SYSTEM_FLAGS":2144,"TEMP_FLAGS_END":31,"TEMP_FLAGS_START":0,"TRAINERS_COUNT":855,"TRAINER_AARON":397,"TRAINER_ABIGAIL_1":358,"TRAINER_ABIGAIL_2":360,"TRAINER_ABIGAIL_3":361,"TRAINER_ABIGAIL_4":362,"TRAINER_ABIGAIL_5":363,"TRAINER_AIDAN":674,"TRAINER_AISHA":757,"TRAINER_ALAN":630,"TRAINER_ALBERT":80,"TRAINER_ALBERTO":12,"TRAINER_ALEX":413,"TRAINER_ALEXA":670,"TRAINER_ALEXIA":90,"TRAINER_ALEXIS":248,"TRAINER_ALICE":448,"TRAINER_ALIX":750,"TRAINER_ALLEN":333,"TRAINER_ALLISON":387,"TRAINER_ALVARO":849,"TRAINER_ALYSSA":701,"TRAINER_AMY_AND_LIV_1":481,"TRAINER_AMY_AND_LIV_2":482,"TRAINER_AMY_AND_LIV_3":485,"TRAINER_AMY_AND_LIV_4":487,"TRAINER_AMY_AND_LIV_5":488,"TRAINER_AMY_AND_LIV_6":489,"TRAINER_ANABEL":805,"TRAINER_ANDREA":613,"TRAINER_ANDRES_1":737,"TRAINER_ANDRES_2":812,"TRAINER_ANDRES_3":813,"TRAINER_ANDRES_4":814,"TRAINER_ANDRES_5":815,"TRAINER_ANDREW":336,"TRAINER_ANGELICA":436,"TRAINER_ANGELINA":712,"TRAINER_ANGELO":802,"TRAINER_ANNA_AND_MEG_1":287,"TRAINER_ANNA_AND_MEG_2":288,"TRAINER_ANNA_AND_MEG_3":289,"TRAINER_ANNA_AND_MEG_4":290,"TRAINER_ANNA_AND_MEG_5":291,"TRAINER_ANNIKA":502,"TRAINER_ANTHONY":352,"TRAINER_ARCHIE":34,"TRAINER_ASHLEY":655,"TRAINER_ATHENA":577,"TRAINER_ATSUSHI":190,"TRAINER_AURON":506,"TRAINER_AUSTINA":58,"TRAINER_AUTUMN":217,"TRAINER_AXLE":203,"TRAINER_BARNY":343,"TRAINER_BARRY":163,"TRAINER_BEAU":212,"TRAINER_BECK":414,"TRAINER_BECKY":470,"TRAINER_BEN":323,"TRAINER_BENJAMIN_1":353,"TRAINER_BENJAMIN_2":354,"TRAINER_BENJAMIN_3":355,"TRAINER_BENJAMIN_4":356,"TRAINER_BENJAMIN_5":357,"TRAINER_BENNY":407,"TRAINER_BERKE":74,"TRAINER_BERNIE_1":206,"TRAINER_BERNIE_2":207,"TRAINER_BERNIE_3":208,"TRAINER_BERNIE_4":209,"TRAINER_BERNIE_5":210,"TRAINER_BETH":445,"TRAINER_BETHANY":301,"TRAINER_BEVERLY":441,"TRAINER_BIANCA":706,"TRAINER_BILLY":319,"TRAINER_BLAKE":235,"TRAINER_BRANDEN":745,"TRAINER_BRANDI":756,"TRAINER_BRANDON":811,"TRAINER_BRAWLY_1":266,"TRAINER_BRAWLY_2":774,"TRAINER_BRAWLY_3":775,"TRAINER_BRAWLY_4":776,"TRAINER_BRAWLY_5":777,"TRAINER_BRAXTON":75,"TRAINER_BRENDA":454,"TRAINER_BRENDAN_LILYCOVE_MUDKIP":661,"TRAINER_BRENDAN_LILYCOVE_TORCHIC":663,"TRAINER_BRENDAN_LILYCOVE_TREECKO":662,"TRAINER_BRENDAN_PLACEHOLDER":853,"TRAINER_BRENDAN_ROUTE_103_MUDKIP":520,"TRAINER_BRENDAN_ROUTE_103_TORCHIC":526,"TRAINER_BRENDAN_ROUTE_103_TREECKO":523,"TRAINER_BRENDAN_ROUTE_110_MUDKIP":521,"TRAINER_BRENDAN_ROUTE_110_TORCHIC":527,"TRAINER_BRENDAN_ROUTE_110_TREECKO":524,"TRAINER_BRENDAN_ROUTE_119_MUDKIP":522,"TRAINER_BRENDAN_ROUTE_119_TORCHIC":528,"TRAINER_BRENDAN_ROUTE_119_TREECKO":525,"TRAINER_BRENDAN_RUSTBORO_MUDKIP":593,"TRAINER_BRENDAN_RUSTBORO_TORCHIC":599,"TRAINER_BRENDAN_RUSTBORO_TREECKO":592,"TRAINER_BRENDEN":572,"TRAINER_BRENT":223,"TRAINER_BRIANNA":118,"TRAINER_BRICE":626,"TRAINER_BRIDGET":129,"TRAINER_BROOKE_1":94,"TRAINER_BROOKE_2":101,"TRAINER_BROOKE_3":102,"TRAINER_BROOKE_4":103,"TRAINER_BROOKE_5":104,"TRAINER_BRYAN":744,"TRAINER_BRYANT":746,"TRAINER_CALE":764,"TRAINER_CALLIE":763,"TRAINER_CALVIN_1":318,"TRAINER_CALVIN_2":328,"TRAINER_CALVIN_3":329,"TRAINER_CALVIN_4":330,"TRAINER_CALVIN_5":331,"TRAINER_CAMDEN":374,"TRAINER_CAMERON_1":238,"TRAINER_CAMERON_2":239,"TRAINER_CAMERON_3":240,"TRAINER_CAMERON_4":241,"TRAINER_CAMERON_5":242,"TRAINER_CAMRON":739,"TRAINER_CARLEE":464,"TRAINER_CAROL":471,"TRAINER_CAROLINA":741,"TRAINER_CAROLINE":99,"TRAINER_CARTER":345,"TRAINER_CATHERINE_1":559,"TRAINER_CATHERINE_2":562,"TRAINER_CATHERINE_3":563,"TRAINER_CATHERINE_4":564,"TRAINER_CATHERINE_5":565,"TRAINER_CEDRIC":475,"TRAINER_CELIA":743,"TRAINER_CELINA":705,"TRAINER_CHAD":174,"TRAINER_CHANDLER":698,"TRAINER_CHARLIE":66,"TRAINER_CHARLOTTE":714,"TRAINER_CHASE":378,"TRAINER_CHESTER":408,"TRAINER_CHIP":45,"TRAINER_CHRIS":693,"TRAINER_CINDY_1":114,"TRAINER_CINDY_2":117,"TRAINER_CINDY_3":120,"TRAINER_CINDY_4":121,"TRAINER_CINDY_5":122,"TRAINER_CINDY_6":123,"TRAINER_CLARENCE":580,"TRAINER_CLARISSA":435,"TRAINER_CLARK":631,"TRAINER_CLAUDE":338,"TRAINER_CLIFFORD":584,"TRAINER_COBY":709,"TRAINER_COLE":201,"TRAINER_COLIN":405,"TRAINER_COLTON":294,"TRAINER_CONNIE":128,"TRAINER_CONOR":511,"TRAINER_CORA":428,"TRAINER_CORY_1":740,"TRAINER_CORY_2":816,"TRAINER_CORY_3":817,"TRAINER_CORY_4":818,"TRAINER_CORY_5":819,"TRAINER_CRISSY":614,"TRAINER_CRISTIAN":574,"TRAINER_CRISTIN_1":767,"TRAINER_CRISTIN_2":828,"TRAINER_CRISTIN_3":829,"TRAINER_CRISTIN_4":830,"TRAINER_CRISTIN_5":831,"TRAINER_CYNDY_1":427,"TRAINER_CYNDY_2":430,"TRAINER_CYNDY_3":431,"TRAINER_CYNDY_4":432,"TRAINER_CYNDY_5":433,"TRAINER_DAISUKE":189,"TRAINER_DAISY":36,"TRAINER_DALE":341,"TRAINER_DALTON_1":196,"TRAINER_DALTON_2":197,"TRAINER_DALTON_3":198,"TRAINER_DALTON_4":199,"TRAINER_DALTON_5":200,"TRAINER_DANA":458,"TRAINER_DANIELLE":650,"TRAINER_DAPHNE":115,"TRAINER_DARCY":733,"TRAINER_DARIAN":696,"TRAINER_DARIUS":803,"TRAINER_DARRIN":154,"TRAINER_DAVID":158,"TRAINER_DAVIS":539,"TRAINER_DAWSON":694,"TRAINER_DAYTON":760,"TRAINER_DEAN":164,"TRAINER_DEANDRE":715,"TRAINER_DEBRA":460,"TRAINER_DECLAN":15,"TRAINER_DEMETRIUS":375,"TRAINER_DENISE":444,"TRAINER_DEREK":227,"TRAINER_DEVAN":753,"TRAINER_DEZ_AND_LUKE":640,"TRAINER_DIANA_1":474,"TRAINER_DIANA_2":477,"TRAINER_DIANA_3":478,"TRAINER_DIANA_4":479,"TRAINER_DIANA_5":480,"TRAINER_DIANNE":417,"TRAINER_DILLON":327,"TRAINER_DOMINIK":152,"TRAINER_DONALD":224,"TRAINER_DONNY":384,"TRAINER_DOUG":618,"TRAINER_DOUGLAS":153,"TRAINER_DRAKE":264,"TRAINER_DREW":211,"TRAINER_DUDLEY":173,"TRAINER_DUNCAN":496,"TRAINER_DUSTY_1":44,"TRAINER_DUSTY_2":47,"TRAINER_DUSTY_3":48,"TRAINER_DUSTY_4":49,"TRAINER_DUSTY_5":50,"TRAINER_DWAYNE":493,"TRAINER_DYLAN_1":364,"TRAINER_DYLAN_2":365,"TRAINER_DYLAN_3":366,"TRAINER_DYLAN_4":367,"TRAINER_DYLAN_5":368,"TRAINER_ED":13,"TRAINER_EDDIE":332,"TRAINER_EDGAR":79,"TRAINER_EDMOND":491,"TRAINER_EDWARD":232,"TRAINER_EDWARDO":404,"TRAINER_EDWIN_1":512,"TRAINER_EDWIN_2":515,"TRAINER_EDWIN_3":516,"TRAINER_EDWIN_4":517,"TRAINER_EDWIN_5":518,"TRAINER_ELI":501,"TRAINER_ELIJAH":742,"TRAINER_ELLIOT_1":339,"TRAINER_ELLIOT_2":346,"TRAINER_ELLIOT_3":347,"TRAINER_ELLIOT_4":348,"TRAINER_ELLIOT_5":349,"TRAINER_ERIC":632,"TRAINER_ERNEST_1":492,"TRAINER_ERNEST_2":497,"TRAINER_ERNEST_3":498,"TRAINER_ERNEST_4":499,"TRAINER_ERNEST_5":500,"TRAINER_ETHAN_1":216,"TRAINER_ETHAN_2":219,"TRAINER_ETHAN_3":220,"TRAINER_ETHAN_4":221,"TRAINER_ETHAN_5":222,"TRAINER_EVERETT":850,"TRAINER_FABIAN":759,"TRAINER_FELIX":38,"TRAINER_FERNANDO_1":195,"TRAINER_FERNANDO_2":832,"TRAINER_FERNANDO_3":833,"TRAINER_FERNANDO_4":834,"TRAINER_FERNANDO_5":835,"TRAINER_FLAGS_END":2143,"TRAINER_FLAGS_START":1280,"TRAINER_FLANNERY_1":268,"TRAINER_FLANNERY_2":782,"TRAINER_FLANNERY_3":783,"TRAINER_FLANNERY_4":784,"TRAINER_FLANNERY_5":785,"TRAINER_FLINT":654,"TRAINER_FOSTER":46,"TRAINER_FRANKLIN":170,"TRAINER_FREDRICK":29,"TRAINER_GABBY_AND_TY_1":51,"TRAINER_GABBY_AND_TY_2":52,"TRAINER_GABBY_AND_TY_3":53,"TRAINER_GABBY_AND_TY_4":54,"TRAINER_GABBY_AND_TY_5":55,"TRAINER_GABBY_AND_TY_6":56,"TRAINER_GABRIELLE_1":9,"TRAINER_GABRIELLE_2":840,"TRAINER_GABRIELLE_3":841,"TRAINER_GABRIELLE_4":842,"TRAINER_GABRIELLE_5":843,"TRAINER_GARRET":138,"TRAINER_GARRISON":547,"TRAINER_GEORGE":73,"TRAINER_GEORGIA":281,"TRAINER_GERALD":648,"TRAINER_GILBERT":169,"TRAINER_GINA_AND_MIA_1":483,"TRAINER_GINA_AND_MIA_2":486,"TRAINER_GLACIA":263,"TRAINER_GRACE":450,"TRAINER_GREG":619,"TRAINER_GRETA":808,"TRAINER_GRUNT_AQUA_HIDEOUT_1":2,"TRAINER_GRUNT_AQUA_HIDEOUT_2":3,"TRAINER_GRUNT_AQUA_HIDEOUT_3":4,"TRAINER_GRUNT_AQUA_HIDEOUT_4":5,"TRAINER_GRUNT_AQUA_HIDEOUT_5":27,"TRAINER_GRUNT_AQUA_HIDEOUT_6":28,"TRAINER_GRUNT_AQUA_HIDEOUT_7":192,"TRAINER_GRUNT_AQUA_HIDEOUT_8":193,"TRAINER_GRUNT_JAGGED_PASS":570,"TRAINER_GRUNT_MAGMA_HIDEOUT_1":716,"TRAINER_GRUNT_MAGMA_HIDEOUT_10":725,"TRAINER_GRUNT_MAGMA_HIDEOUT_11":726,"TRAINER_GRUNT_MAGMA_HIDEOUT_12":727,"TRAINER_GRUNT_MAGMA_HIDEOUT_13":728,"TRAINER_GRUNT_MAGMA_HIDEOUT_14":729,"TRAINER_GRUNT_MAGMA_HIDEOUT_15":730,"TRAINER_GRUNT_MAGMA_HIDEOUT_16":731,"TRAINER_GRUNT_MAGMA_HIDEOUT_2":717,"TRAINER_GRUNT_MAGMA_HIDEOUT_3":718,"TRAINER_GRUNT_MAGMA_HIDEOUT_4":719,"TRAINER_GRUNT_MAGMA_HIDEOUT_5":720,"TRAINER_GRUNT_MAGMA_HIDEOUT_6":721,"TRAINER_GRUNT_MAGMA_HIDEOUT_7":722,"TRAINER_GRUNT_MAGMA_HIDEOUT_8":723,"TRAINER_GRUNT_MAGMA_HIDEOUT_9":724,"TRAINER_GRUNT_MT_CHIMNEY_1":146,"TRAINER_GRUNT_MT_CHIMNEY_2":579,"TRAINER_GRUNT_MT_PYRE_1":23,"TRAINER_GRUNT_MT_PYRE_2":24,"TRAINER_GRUNT_MT_PYRE_3":25,"TRAINER_GRUNT_MT_PYRE_4":569,"TRAINER_GRUNT_MUSEUM_1":20,"TRAINER_GRUNT_MUSEUM_2":21,"TRAINER_GRUNT_PETALBURG_WOODS":10,"TRAINER_GRUNT_RUSTURF_TUNNEL":16,"TRAINER_GRUNT_SEAFLOOR_CAVERN_1":6,"TRAINER_GRUNT_SEAFLOOR_CAVERN_2":7,"TRAINER_GRUNT_SEAFLOOR_CAVERN_3":8,"TRAINER_GRUNT_SEAFLOOR_CAVERN_4":14,"TRAINER_GRUNT_SEAFLOOR_CAVERN_5":567,"TRAINER_GRUNT_SPACE_CENTER_1":22,"TRAINER_GRUNT_SPACE_CENTER_2":116,"TRAINER_GRUNT_SPACE_CENTER_3":586,"TRAINER_GRUNT_SPACE_CENTER_4":587,"TRAINER_GRUNT_SPACE_CENTER_5":588,"TRAINER_GRUNT_SPACE_CENTER_6":589,"TRAINER_GRUNT_SPACE_CENTER_7":590,"TRAINER_GRUNT_UNUSED":568,"TRAINER_GRUNT_WEATHER_INST_1":17,"TRAINER_GRUNT_WEATHER_INST_2":18,"TRAINER_GRUNT_WEATHER_INST_3":19,"TRAINER_GRUNT_WEATHER_INST_4":26,"TRAINER_GRUNT_WEATHER_INST_5":596,"TRAINER_GWEN":59,"TRAINER_HAILEY":697,"TRAINER_HALEY_1":604,"TRAINER_HALEY_2":607,"TRAINER_HALEY_3":608,"TRAINER_HALEY_4":609,"TRAINER_HALEY_5":610,"TRAINER_HALLE":546,"TRAINER_HANNAH":244,"TRAINER_HARRISON":578,"TRAINER_HAYDEN":707,"TRAINER_HECTOR":513,"TRAINER_HEIDI":469,"TRAINER_HELENE":751,"TRAINER_HENRY":668,"TRAINER_HERMAN":167,"TRAINER_HIDEO":651,"TRAINER_HITOSHI":180,"TRAINER_HOPE":96,"TRAINER_HUDSON":510,"TRAINER_HUEY":490,"TRAINER_HUGH":399,"TRAINER_HUMBERTO":402,"TRAINER_IMANI":442,"TRAINER_IRENE":476,"TRAINER_ISAAC_1":538,"TRAINER_ISAAC_2":541,"TRAINER_ISAAC_3":542,"TRAINER_ISAAC_4":543,"TRAINER_ISAAC_5":544,"TRAINER_ISABELLA":595,"TRAINER_ISABELLE":736,"TRAINER_ISABEL_1":302,"TRAINER_ISABEL_2":303,"TRAINER_ISABEL_3":304,"TRAINER_ISABEL_4":305,"TRAINER_ISABEL_5":306,"TRAINER_ISAIAH_1":376,"TRAINER_ISAIAH_2":379,"TRAINER_ISAIAH_3":380,"TRAINER_ISAIAH_4":381,"TRAINER_ISAIAH_5":382,"TRAINER_ISOBEL":383,"TRAINER_IVAN":337,"TRAINER_JACE":204,"TRAINER_JACK":172,"TRAINER_JACKI_1":249,"TRAINER_JACKI_2":250,"TRAINER_JACKI_3":251,"TRAINER_JACKI_4":252,"TRAINER_JACKI_5":253,"TRAINER_JACKSON_1":552,"TRAINER_JACKSON_2":555,"TRAINER_JACKSON_3":556,"TRAINER_JACKSON_4":557,"TRAINER_JACKSON_5":558,"TRAINER_JACLYN":243,"TRAINER_JACOB":351,"TRAINER_JAIDEN":749,"TRAINER_JAMES_1":621,"TRAINER_JAMES_2":622,"TRAINER_JAMES_3":623,"TRAINER_JAMES_4":624,"TRAINER_JAMES_5":625,"TRAINER_JANI":418,"TRAINER_JANICE":605,"TRAINER_JARED":401,"TRAINER_JASMINE":359,"TRAINER_JAYLEN":326,"TRAINER_JAZMYN":503,"TRAINER_JEFF":202,"TRAINER_JEFFREY_1":226,"TRAINER_JEFFREY_2":228,"TRAINER_JEFFREY_3":229,"TRAINER_JEFFREY_4":230,"TRAINER_JEFFREY_5":231,"TRAINER_JENNA":560,"TRAINER_JENNIFER":95,"TRAINER_JENNY_1":449,"TRAINER_JENNY_2":465,"TRAINER_JENNY_3":466,"TRAINER_JENNY_4":467,"TRAINER_JENNY_5":468,"TRAINER_JEROME":156,"TRAINER_JERRY_1":273,"TRAINER_JERRY_2":276,"TRAINER_JERRY_3":277,"TRAINER_JERRY_4":278,"TRAINER_JERRY_5":279,"TRAINER_JESSICA_1":127,"TRAINER_JESSICA_2":132,"TRAINER_JESSICA_3":133,"TRAINER_JESSICA_4":134,"TRAINER_JESSICA_5":135,"TRAINER_JOCELYN":425,"TRAINER_JODY":91,"TRAINER_JOEY":322,"TRAINER_JOHANNA":647,"TRAINER_JOHNSON":754,"TRAINER_JOHN_AND_JAY_1":681,"TRAINER_JOHN_AND_JAY_2":682,"TRAINER_JOHN_AND_JAY_3":683,"TRAINER_JOHN_AND_JAY_4":684,"TRAINER_JOHN_AND_JAY_5":685,"TRAINER_JONAH":667,"TRAINER_JONAS":504,"TRAINER_JONATHAN":598,"TRAINER_JOSE":617,"TRAINER_JOSEPH":700,"TRAINER_JOSH":320,"TRAINER_JOSHUA":237,"TRAINER_JOSUE":738,"TRAINER_JUAN_1":272,"TRAINER_JUAN_2":798,"TRAINER_JUAN_3":799,"TRAINER_JUAN_4":800,"TRAINER_JUAN_5":801,"TRAINER_JULIE":100,"TRAINER_JULIO":566,"TRAINER_JUSTIN":215,"TRAINER_KAI":713,"TRAINER_KALEB":699,"TRAINER_KARA":457,"TRAINER_KAREN_1":280,"TRAINER_KAREN_2":282,"TRAINER_KAREN_3":283,"TRAINER_KAREN_4":284,"TRAINER_KAREN_5":285,"TRAINER_KATELYNN":325,"TRAINER_KATELYN_1":386,"TRAINER_KATELYN_2":388,"TRAINER_KATELYN_3":389,"TRAINER_KATELYN_4":390,"TRAINER_KATELYN_5":391,"TRAINER_KATE_AND_JOY":286,"TRAINER_KATHLEEN":583,"TRAINER_KATIE":455,"TRAINER_KAYLA":247,"TRAINER_KAYLEE":462,"TRAINER_KAYLEY":505,"TRAINER_KEEGAN":205,"TRAINER_KEIGO":652,"TRAINER_KEIRA":93,"TRAINER_KELVIN":507,"TRAINER_KENT":620,"TRAINER_KEVIN":171,"TRAINER_KIM_AND_IRIS":678,"TRAINER_KINDRA":106,"TRAINER_KIRA_AND_DAN_1":642,"TRAINER_KIRA_AND_DAN_2":643,"TRAINER_KIRA_AND_DAN_3":644,"TRAINER_KIRA_AND_DAN_4":645,"TRAINER_KIRA_AND_DAN_5":646,"TRAINER_KIRK":191,"TRAINER_KIYO":181,"TRAINER_KOICHI":182,"TRAINER_KOJI_1":672,"TRAINER_KOJI_2":824,"TRAINER_KOJI_3":825,"TRAINER_KOJI_4":826,"TRAINER_KOJI_5":827,"TRAINER_KYLA":443,"TRAINER_KYRA":748,"TRAINER_LAO_1":419,"TRAINER_LAO_2":421,"TRAINER_LAO_3":422,"TRAINER_LAO_4":423,"TRAINER_LAO_5":424,"TRAINER_LARRY":213,"TRAINER_LAURA":426,"TRAINER_LAUREL":463,"TRAINER_LAWRENCE":710,"TRAINER_LEAF":852,"TRAINER_LEAH":35,"TRAINER_LEA_AND_JED":641,"TRAINER_LENNY":628,"TRAINER_LEONARD":495,"TRAINER_LEONARDO":576,"TRAINER_LEONEL":762,"TRAINER_LEROY":77,"TRAINER_LILA_AND_ROY_1":687,"TRAINER_LILA_AND_ROY_2":688,"TRAINER_LILA_AND_ROY_3":689,"TRAINER_LILA_AND_ROY_4":690,"TRAINER_LILA_AND_ROY_5":691,"TRAINER_LILITH":573,"TRAINER_LINDA":461,"TRAINER_LISA_AND_RAY":692,"TRAINER_LOLA_1":57,"TRAINER_LOLA_2":60,"TRAINER_LOLA_3":61,"TRAINER_LOLA_4":62,"TRAINER_LOLA_5":63,"TRAINER_LORENZO":553,"TRAINER_LUCAS_1":629,"TRAINER_LUCAS_2":633,"TRAINER_LUCY":810,"TRAINER_LUIS":151,"TRAINER_LUNG":420,"TRAINER_LYDIA_1":545,"TRAINER_LYDIA_2":548,"TRAINER_LYDIA_3":549,"TRAINER_LYDIA_4":550,"TRAINER_LYDIA_5":551,"TRAINER_LYLE":616,"TRAINER_MACEY":591,"TRAINER_MADELINE_1":434,"TRAINER_MADELINE_2":437,"TRAINER_MADELINE_3":438,"TRAINER_MADELINE_4":439,"TRAINER_MADELINE_5":440,"TRAINER_MAKAYLA":758,"TRAINER_MARC":571,"TRAINER_MARCEL":11,"TRAINER_MARCOS":702,"TRAINER_MARIA_1":369,"TRAINER_MARIA_2":370,"TRAINER_MARIA_3":371,"TRAINER_MARIA_4":372,"TRAINER_MARIA_5":373,"TRAINER_MARIELA":848,"TRAINER_MARK":145,"TRAINER_MARLENE":752,"TRAINER_MARLEY":508,"TRAINER_MARTHA":473,"TRAINER_MARY":89,"TRAINER_MATT":30,"TRAINER_MATTHEW":157,"TRAINER_MAURA":246,"TRAINER_MAXIE_MAGMA_HIDEOUT":601,"TRAINER_MAXIE_MOSSDEEP":734,"TRAINER_MAXIE_MT_CHIMNEY":602,"TRAINER_MAY_LILYCOVE_MUDKIP":664,"TRAINER_MAY_LILYCOVE_TORCHIC":666,"TRAINER_MAY_LILYCOVE_TREECKO":665,"TRAINER_MAY_PLACEHOLDER":854,"TRAINER_MAY_ROUTE_103_MUDKIP":529,"TRAINER_MAY_ROUTE_103_TORCHIC":535,"TRAINER_MAY_ROUTE_103_TREECKO":532,"TRAINER_MAY_ROUTE_110_MUDKIP":530,"TRAINER_MAY_ROUTE_110_TORCHIC":536,"TRAINER_MAY_ROUTE_110_TREECKO":533,"TRAINER_MAY_ROUTE_119_MUDKIP":531,"TRAINER_MAY_ROUTE_119_TORCHIC":537,"TRAINER_MAY_ROUTE_119_TREECKO":534,"TRAINER_MAY_RUSTBORO_MUDKIP":600,"TRAINER_MAY_RUSTBORO_TORCHIC":769,"TRAINER_MAY_RUSTBORO_TREECKO":768,"TRAINER_MELINA":755,"TRAINER_MELISSA":124,"TRAINER_MEL_AND_PAUL":680,"TRAINER_MICAH":255,"TRAINER_MICHELLE":98,"TRAINER_MIGUEL_1":293,"TRAINER_MIGUEL_2":295,"TRAINER_MIGUEL_3":296,"TRAINER_MIGUEL_4":297,"TRAINER_MIGUEL_5":298,"TRAINER_MIKE_1":634,"TRAINER_MIKE_2":635,"TRAINER_MISSY":447,"TRAINER_MITCHELL":540,"TRAINER_MIU_AND_YUKI":484,"TRAINER_MOLLIE":137,"TRAINER_MYLES":765,"TRAINER_NANCY":472,"TRAINER_NAOMI":119,"TRAINER_NATE":582,"TRAINER_NED":340,"TRAINER_NICHOLAS":585,"TRAINER_NICOLAS_1":392,"TRAINER_NICOLAS_2":393,"TRAINER_NICOLAS_3":394,"TRAINER_NICOLAS_4":395,"TRAINER_NICOLAS_5":396,"TRAINER_NIKKI":453,"TRAINER_NOB_1":183,"TRAINER_NOB_2":184,"TRAINER_NOB_3":185,"TRAINER_NOB_4":186,"TRAINER_NOB_5":187,"TRAINER_NOLAN":342,"TRAINER_NOLAND":809,"TRAINER_NOLEN":161,"TRAINER_NONE":0,"TRAINER_NORMAN_1":269,"TRAINER_NORMAN_2":786,"TRAINER_NORMAN_3":787,"TRAINER_NORMAN_4":788,"TRAINER_NORMAN_5":789,"TRAINER_OLIVIA":130,"TRAINER_OWEN":83,"TRAINER_PABLO_1":377,"TRAINER_PABLO_2":820,"TRAINER_PABLO_3":821,"TRAINER_PABLO_4":822,"TRAINER_PABLO_5":823,"TRAINER_PARKER":72,"TRAINER_PAT":766,"TRAINER_PATRICIA":105,"TRAINER_PAUL":275,"TRAINER_PAULA":429,"TRAINER_PAXTON":594,"TRAINER_PERRY":398,"TRAINER_PETE":735,"TRAINER_PHIL":400,"TRAINER_PHILLIP":494,"TRAINER_PHOEBE":262,"TRAINER_PRESLEY":403,"TRAINER_PRESTON":233,"TRAINER_QUINCY":324,"TRAINER_RACHEL":761,"TRAINER_RANDALL":71,"TRAINER_RED":851,"TRAINER_REED":675,"TRAINER_RELI_AND_IAN":686,"TRAINER_REYNA":509,"TRAINER_RHETT":703,"TRAINER_RICHARD":166,"TRAINER_RICK":615,"TRAINER_RICKY_1":64,"TRAINER_RICKY_2":67,"TRAINER_RICKY_3":68,"TRAINER_RICKY_4":69,"TRAINER_RICKY_5":70,"TRAINER_RILEY":653,"TRAINER_ROBERT_1":406,"TRAINER_ROBERT_2":409,"TRAINER_ROBERT_3":410,"TRAINER_ROBERT_4":411,"TRAINER_ROBERT_5":412,"TRAINER_ROBIN":612,"TRAINER_RODNEY":165,"TRAINER_ROGER":669,"TRAINER_ROLAND":160,"TRAINER_RONALD":350,"TRAINER_ROSE_1":37,"TRAINER_ROSE_2":40,"TRAINER_ROSE_3":41,"TRAINER_ROSE_4":42,"TRAINER_ROSE_5":43,"TRAINER_ROXANNE_1":265,"TRAINER_ROXANNE_2":770,"TRAINER_ROXANNE_3":771,"TRAINER_ROXANNE_4":772,"TRAINER_ROXANNE_5":773,"TRAINER_RUBEN":671,"TRAINER_SALLY":611,"TRAINER_SAMANTHA":245,"TRAINER_SAMUEL":81,"TRAINER_SANTIAGO":168,"TRAINER_SARAH":695,"TRAINER_SAWYER_1":1,"TRAINER_SAWYER_2":836,"TRAINER_SAWYER_3":837,"TRAINER_SAWYER_4":838,"TRAINER_SAWYER_5":839,"TRAINER_SEBASTIAN":554,"TRAINER_SHANE":214,"TRAINER_SHANNON":97,"TRAINER_SHARON":452,"TRAINER_SHAWN":194,"TRAINER_SHAYLA":747,"TRAINER_SHEILA":125,"TRAINER_SHELBY_1":313,"TRAINER_SHELBY_2":314,"TRAINER_SHELBY_3":315,"TRAINER_SHELBY_4":316,"TRAINER_SHELBY_5":317,"TRAINER_SHELLY_SEAFLOOR_CAVERN":33,"TRAINER_SHELLY_WEATHER_INSTITUTE":32,"TRAINER_SHIRLEY":126,"TRAINER_SIDNEY":261,"TRAINER_SIENNA":459,"TRAINER_SIMON":65,"TRAINER_SOPHIA":561,"TRAINER_SOPHIE":708,"TRAINER_SPENCER":159,"TRAINER_SPENSER":807,"TRAINER_STAN":162,"TRAINER_STEVEN":804,"TRAINER_STEVE_1":143,"TRAINER_STEVE_2":147,"TRAINER_STEVE_3":148,"TRAINER_STEVE_4":149,"TRAINER_STEVE_5":150,"TRAINER_SUSIE":456,"TRAINER_SYLVIA":575,"TRAINER_TABITHA_MAGMA_HIDEOUT":732,"TRAINER_TABITHA_MOSSDEEP":514,"TRAINER_TABITHA_MT_CHIMNEY":597,"TRAINER_TAKAO":179,"TRAINER_TAKASHI":416,"TRAINER_TALIA":385,"TRAINER_TAMMY":107,"TRAINER_TANYA":451,"TRAINER_TARA":446,"TRAINER_TASHA":109,"TRAINER_TATE_AND_LIZA_1":271,"TRAINER_TATE_AND_LIZA_2":794,"TRAINER_TATE_AND_LIZA_3":795,"TRAINER_TATE_AND_LIZA_4":796,"TRAINER_TATE_AND_LIZA_5":797,"TRAINER_TAYLOR":225,"TRAINER_TED":274,"TRAINER_TERRY":581,"TRAINER_THALIA_1":144,"TRAINER_THALIA_2":844,"TRAINER_THALIA_3":845,"TRAINER_THALIA_4":846,"TRAINER_THALIA_5":847,"TRAINER_THOMAS":256,"TRAINER_TIANA":603,"TRAINER_TIFFANY":131,"TRAINER_TIMMY":334,"TRAINER_TIMOTHY_1":307,"TRAINER_TIMOTHY_2":308,"TRAINER_TIMOTHY_3":309,"TRAINER_TIMOTHY_4":310,"TRAINER_TIMOTHY_5":311,"TRAINER_TISHA":676,"TRAINER_TOMMY":321,"TRAINER_TONY_1":155,"TRAINER_TONY_2":175,"TRAINER_TONY_3":176,"TRAINER_TONY_4":177,"TRAINER_TONY_5":178,"TRAINER_TORI_AND_TIA":677,"TRAINER_TRAVIS":218,"TRAINER_TRENT_1":627,"TRAINER_TRENT_2":636,"TRAINER_TRENT_3":637,"TRAINER_TRENT_4":638,"TRAINER_TRENT_5":639,"TRAINER_TUCKER":806,"TRAINER_TYRA_AND_IVY":679,"TRAINER_TYRON":704,"TRAINER_VALERIE_1":108,"TRAINER_VALERIE_2":110,"TRAINER_VALERIE_3":111,"TRAINER_VALERIE_4":112,"TRAINER_VALERIE_5":113,"TRAINER_VANESSA":300,"TRAINER_VICKY":312,"TRAINER_VICTOR":292,"TRAINER_VICTORIA":299,"TRAINER_VINCENT":76,"TRAINER_VIOLET":39,"TRAINER_VIRGIL":234,"TRAINER_VITO":82,"TRAINER_VIVI":606,"TRAINER_VIVIAN":649,"TRAINER_WADE":344,"TRAINER_WALLACE":335,"TRAINER_WALLY_MAUVILLE":656,"TRAINER_WALLY_VR_1":519,"TRAINER_WALLY_VR_2":657,"TRAINER_WALLY_VR_3":658,"TRAINER_WALLY_VR_4":659,"TRAINER_WALLY_VR_5":660,"TRAINER_WALTER_1":254,"TRAINER_WALTER_2":257,"TRAINER_WALTER_3":258,"TRAINER_WALTER_4":259,"TRAINER_WALTER_5":260,"TRAINER_WARREN":88,"TRAINER_WATTSON_1":267,"TRAINER_WATTSON_2":778,"TRAINER_WATTSON_3":779,"TRAINER_WATTSON_4":780,"TRAINER_WATTSON_5":781,"TRAINER_WAYNE":673,"TRAINER_WENDY":92,"TRAINER_WILLIAM":236,"TRAINER_WILTON_1":78,"TRAINER_WILTON_2":84,"TRAINER_WILTON_3":85,"TRAINER_WILTON_4":86,"TRAINER_WILTON_5":87,"TRAINER_WINONA_1":270,"TRAINER_WINONA_2":790,"TRAINER_WINONA_3":791,"TRAINER_WINONA_4":792,"TRAINER_WINONA_5":793,"TRAINER_WINSTON_1":136,"TRAINER_WINSTON_2":139,"TRAINER_WINSTON_3":140,"TRAINER_WINSTON_4":141,"TRAINER_WINSTON_5":142,"TRAINER_WYATT":711,"TRAINER_YASU":415,"TRAINER_YUJI":188,"TRAINER_ZANDER":31},"locations":{"BADGE_1":{"default_item":226,"flag":1182,"rom_address":2181887},"BADGE_2":{"default_item":227,"flag":1183,"rom_address":2089138},"BADGE_3":{"default_item":228,"flag":1184,"rom_address":2161147},"BADGE_4":{"default_item":229,"flag":1185,"rom_address":2097239},"BADGE_5":{"default_item":230,"flag":1186,"rom_address":2123748},"BADGE_6":{"default_item":231,"flag":1187,"rom_address":2195957},"BADGE_7":{"default_item":232,"flag":1188,"rom_address":2237755},"BADGE_8":{"default_item":233,"flag":1189,"rom_address":2256065},"HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY":{"default_item":281,"flag":531,"rom_address":5479240},"HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY":{"default_item":282,"flag":532,"rom_address":5479252},"HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY":{"default_item":283,"flag":533,"rom_address":5479264},"HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY":{"default_item":284,"flag":534,"rom_address":5479276},"HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM":{"default_item":67,"flag":601,"rom_address":5482140},"HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON":{"default_item":65,"flag":604,"rom_address":5482164},"HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN":{"default_item":64,"flag":603,"rom_address":5482152},"HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC":{"default_item":70,"flag":602,"rom_address":5482128},"HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET":{"default_item":110,"flag":528,"rom_address":5417964},"HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1":{"default_item":195,"flag":548,"rom_address":5469412},"HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2":{"default_item":195,"flag":549,"rom_address":5469424},"HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL":{"default_item":23,"flag":577,"rom_address":5471156},"HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL":{"default_item":3,"flag":576,"rom_address":5471168},"HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL":{"default_item":16,"flag":500,"rom_address":5417712},"HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE":{"default_item":111,"flag":527,"rom_address":5414672},"HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL":{"default_item":4,"flag":575,"rom_address":5414696},"HIDDEN_ITEM_LILYCOVE_CITY_PP_UP":{"default_item":69,"flag":543,"rom_address":5414684},"HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER":{"default_item":35,"flag":578,"rom_address":5472480},"HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL":{"default_item":2,"flag":529,"rom_address":5472468},"HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY":{"default_item":68,"flag":580,"rom_address":5472836},"HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC":{"default_item":70,"flag":579,"rom_address":5472824},"HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH":{"default_item":45,"flag":609,"rom_address":5507844},"HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY":{"default_item":68,"flag":595,"rom_address":5411036},"HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL":{"default_item":4,"flag":561,"rom_address":5469948},"HIDDEN_ITEM_PETALBURG_WOODS_POTION":{"default_item":13,"flag":558,"rom_address":5469912},"HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1":{"default_item":103,"flag":559,"rom_address":5469924},"HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2":{"default_item":103,"flag":560,"rom_address":5469936},"HIDDEN_ITEM_ROUTE_104_ANTIDOTE":{"default_item":14,"flag":585,"rom_address":5420532},"HIDDEN_ITEM_ROUTE_104_HEART_SCALE":{"default_item":111,"flag":588,"rom_address":5420544},"HIDDEN_ITEM_ROUTE_104_POKE_BALL":{"default_item":4,"flag":562,"rom_address":5420508},"HIDDEN_ITEM_ROUTE_104_POTION":{"default_item":13,"flag":537,"rom_address":5420520},"HIDDEN_ITEM_ROUTE_104_SUPER_POTION":{"default_item":22,"flag":544,"rom_address":5420496},"HIDDEN_ITEM_ROUTE_105_BIG_PEARL":{"default_item":107,"flag":611,"rom_address":5420788},"HIDDEN_ITEM_ROUTE_105_HEART_SCALE":{"default_item":111,"flag":589,"rom_address":5420776},"HIDDEN_ITEM_ROUTE_106_HEART_SCALE":{"default_item":111,"flag":547,"rom_address":5420972},"HIDDEN_ITEM_ROUTE_106_POKE_BALL":{"default_item":4,"flag":563,"rom_address":5420948},"HIDDEN_ITEM_ROUTE_106_STARDUST":{"default_item":108,"flag":546,"rom_address":5420960},"HIDDEN_ITEM_ROUTE_108_RARE_CANDY":{"default_item":68,"flag":586,"rom_address":5421380},"HIDDEN_ITEM_ROUTE_109_ETHER":{"default_item":34,"flag":564,"rom_address":5422056},"HIDDEN_ITEM_ROUTE_109_GREAT_BALL":{"default_item":3,"flag":551,"rom_address":5422044},"HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1":{"default_item":111,"flag":552,"rom_address":5422032},"HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2":{"default_item":111,"flag":590,"rom_address":5422068},"HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3":{"default_item":111,"flag":591,"rom_address":5422080},"HIDDEN_ITEM_ROUTE_109_REVIVE":{"default_item":24,"flag":550,"rom_address":5422020},"HIDDEN_ITEM_ROUTE_110_FULL_HEAL":{"default_item":23,"flag":555,"rom_address":5423348},"HIDDEN_ITEM_ROUTE_110_GREAT_BALL":{"default_item":3,"flag":553,"rom_address":5423324},"HIDDEN_ITEM_ROUTE_110_POKE_BALL":{"default_item":4,"flag":565,"rom_address":5423336},"HIDDEN_ITEM_ROUTE_110_REVIVE":{"default_item":24,"flag":554,"rom_address":5423312},"HIDDEN_ITEM_ROUTE_111_PROTEIN":{"default_item":64,"flag":556,"rom_address":5425260},"HIDDEN_ITEM_ROUTE_111_RARE_CANDY":{"default_item":68,"flag":557,"rom_address":5425272},"HIDDEN_ITEM_ROUTE_111_STARDUST":{"default_item":108,"flag":502,"rom_address":5425200},"HIDDEN_ITEM_ROUTE_113_ETHER":{"default_item":34,"flag":503,"rom_address":5426528},"HIDDEN_ITEM_ROUTE_113_NUGGET":{"default_item":110,"flag":598,"rom_address":5426552},"HIDDEN_ITEM_ROUTE_113_TM32":{"default_item":320,"flag":530,"rom_address":5426540},"HIDDEN_ITEM_ROUTE_114_CARBOS":{"default_item":66,"flag":504,"rom_address":5427380},"HIDDEN_ITEM_ROUTE_114_REVIVE":{"default_item":24,"flag":542,"rom_address":5427404},"HIDDEN_ITEM_ROUTE_115_HEART_SCALE":{"default_item":111,"flag":597,"rom_address":5428216},"HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES":{"default_item":206,"flag":596,"rom_address":5429096},"HIDDEN_ITEM_ROUTE_116_SUPER_POTION":{"default_item":22,"flag":545,"rom_address":5429084},"HIDDEN_ITEM_ROUTE_117_REPEL":{"default_item":86,"flag":572,"rom_address":5429748},"HIDDEN_ITEM_ROUTE_118_HEART_SCALE":{"default_item":111,"flag":566,"rom_address":5430444},"HIDDEN_ITEM_ROUTE_118_IRON":{"default_item":65,"flag":567,"rom_address":5430432},"HIDDEN_ITEM_ROUTE_119_CALCIUM":{"default_item":67,"flag":505,"rom_address":5432012},"HIDDEN_ITEM_ROUTE_119_FULL_HEAL":{"default_item":23,"flag":568,"rom_address":5432096},"HIDDEN_ITEM_ROUTE_119_MAX_ETHER":{"default_item":35,"flag":587,"rom_address":5432108},"HIDDEN_ITEM_ROUTE_119_ULTRA_BALL":{"default_item":2,"flag":506,"rom_address":5432024},"HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1":{"default_item":68,"flag":571,"rom_address":5433636},"HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2":{"default_item":68,"flag":569,"rom_address":5433660},"HIDDEN_ITEM_ROUTE_120_REVIVE":{"default_item":24,"flag":584,"rom_address":5433648},"HIDDEN_ITEM_ROUTE_120_ZINC":{"default_item":70,"flag":570,"rom_address":5433672},"HIDDEN_ITEM_ROUTE_121_FULL_HEAL":{"default_item":23,"flag":573,"rom_address":5434580},"HIDDEN_ITEM_ROUTE_121_HP_UP":{"default_item":63,"flag":539,"rom_address":5434556},"HIDDEN_ITEM_ROUTE_121_MAX_REVIVE":{"default_item":25,"flag":600,"rom_address":5434592},"HIDDEN_ITEM_ROUTE_121_NUGGET":{"default_item":110,"flag":540,"rom_address":5434568},"HIDDEN_ITEM_ROUTE_123_HYPER_POTION":{"default_item":21,"flag":574,"rom_address":5436140},"HIDDEN_ITEM_ROUTE_123_PP_UP":{"default_item":69,"flag":599,"rom_address":5436152},"HIDDEN_ITEM_ROUTE_123_RARE_CANDY":{"default_item":68,"flag":610,"rom_address":5436164},"HIDDEN_ITEM_ROUTE_123_REVIVE":{"default_item":24,"flag":541,"rom_address":5436128},"HIDDEN_ITEM_ROUTE_123_SUPER_REPEL":{"default_item":83,"flag":507,"rom_address":5436092},"HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1":{"default_item":111,"flag":592,"rom_address":5437660},"HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2":{"default_item":111,"flag":593,"rom_address":5437672},"HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3":{"default_item":111,"flag":594,"rom_address":5437684},"HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY":{"default_item":68,"flag":606,"rom_address":5499296},"HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC":{"default_item":70,"flag":607,"rom_address":5499308},"HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE":{"default_item":19,"flag":605,"rom_address":5499472},"HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP":{"default_item":69,"flag":608,"rom_address":5499460},"HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS":{"default_item":200,"flag":535,"rom_address":5493332},"HIDDEN_ITEM_TRICK_HOUSE_NUGGET":{"default_item":110,"flag":501,"rom_address":5508756},"HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL":{"default_item":107,"flag":511,"rom_address":5439032},"HIDDEN_ITEM_UNDERWATER_124_CALCIUM":{"default_item":67,"flag":536,"rom_address":5439056},"HIDDEN_ITEM_UNDERWATER_124_CARBOS":{"default_item":66,"flag":508,"rom_address":5438996},"HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD":{"default_item":51,"flag":509,"rom_address":5439008},"HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1":{"default_item":111,"flag":513,"rom_address":5439044},"HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2":{"default_item":111,"flag":538,"rom_address":5439068},"HIDDEN_ITEM_UNDERWATER_124_PEARL":{"default_item":106,"flag":510,"rom_address":5439020},"HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL":{"default_item":107,"flag":520,"rom_address":5439180},"HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD":{"default_item":49,"flag":512,"rom_address":5439192},"HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE":{"default_item":111,"flag":514,"rom_address":5439108},"HIDDEN_ITEM_UNDERWATER_126_IRON":{"default_item":65,"flag":519,"rom_address":5439156},"HIDDEN_ITEM_UNDERWATER_126_PEARL":{"default_item":106,"flag":517,"rom_address":5439144},"HIDDEN_ITEM_UNDERWATER_126_STARDUST":{"default_item":108,"flag":516,"rom_address":5439132},"HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL":{"default_item":2,"flag":515,"rom_address":5439120},"HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD":{"default_item":50,"flag":518,"rom_address":5439168},"HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE":{"default_item":111,"flag":523,"rom_address":5439264},"HIDDEN_ITEM_UNDERWATER_127_HP_UP":{"default_item":63,"flag":522,"rom_address":5439252},"HIDDEN_ITEM_UNDERWATER_127_RED_SHARD":{"default_item":48,"flag":524,"rom_address":5439276},"HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE":{"default_item":109,"flag":521,"rom_address":5439240},"HIDDEN_ITEM_UNDERWATER_128_PEARL":{"default_item":106,"flag":526,"rom_address":5439328},"HIDDEN_ITEM_UNDERWATER_128_PROTEIN":{"default_item":64,"flag":525,"rom_address":5439316},"HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL":{"default_item":2,"flag":581,"rom_address":5475972},"HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR":{"default_item":36,"flag":582,"rom_address":5476784},"HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL":{"default_item":84,"flag":583,"rom_address":5476796},"ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY":{"default_item":285,"flag":1100,"rom_address":2701736},"ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18":{"default_item":306,"flag":1102,"rom_address":2701788},"ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE":{"default_item":97,"flag":1101,"rom_address":2701775},"ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER":{"default_item":278,"flag":1078,"rom_address":2701762},"ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL":{"default_item":11,"flag":1077,"rom_address":2701749},"ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL":{"default_item":122,"flag":1095,"rom_address":2701671},"ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE":{"default_item":24,"flag":1099,"rom_address":2701723},"ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL":{"default_item":7,"flag":1097,"rom_address":2701697},"ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE":{"default_item":85,"flag":1096,"rom_address":2701684},"ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13":{"default_item":301,"flag":1098,"rom_address":2701710},"ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL":{"default_item":1,"flag":1124,"rom_address":2701970},"ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR":{"default_item":37,"flag":1071,"rom_address":2701996},"ITEM_AQUA_HIDEOUT_B1F_NUGGET":{"default_item":110,"flag":1132,"rom_address":2701983},"ITEM_AQUA_HIDEOUT_B2F_NEST_BALL":{"default_item":8,"flag":1072,"rom_address":2702009},"ITEM_ARTISAN_CAVE_1F_CARBOS":{"default_item":66,"flag":1163,"rom_address":2702347},"ITEM_ARTISAN_CAVE_B1F_HP_UP":{"default_item":63,"flag":1162,"rom_address":2702334},"ITEM_FIERY_PATH_FIRE_STONE":{"default_item":95,"flag":1111,"rom_address":2701515},"ITEM_FIERY_PATH_TM06":{"default_item":294,"flag":1091,"rom_address":2701528},"ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE":{"default_item":85,"flag":1050,"rom_address":2701450},"ITEM_GRANITE_CAVE_B1F_POKE_BALL":{"default_item":4,"flag":1051,"rom_address":2701463},"ITEM_GRANITE_CAVE_B2F_RARE_CANDY":{"default_item":68,"flag":1054,"rom_address":2701489},"ITEM_GRANITE_CAVE_B2F_REPEL":{"default_item":86,"flag":1053,"rom_address":2701476},"ITEM_JAGGED_PASS_BURN_HEAL":{"default_item":15,"flag":1070,"rom_address":2701502},"ITEM_LILYCOVE_CITY_MAX_REPEL":{"default_item":84,"flag":1042,"rom_address":2701346},"ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY":{"default_item":68,"flag":1151,"rom_address":2702360},"ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE":{"default_item":19,"flag":1165,"rom_address":2702386},"ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR":{"default_item":37,"flag":1164,"rom_address":2702373},"ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET":{"default_item":110,"flag":1166,"rom_address":2702399},"ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX":{"default_item":71,"flag":1167,"rom_address":2702412},"ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE":{"default_item":85,"flag":1059,"rom_address":2702438},"ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE":{"default_item":25,"flag":1168,"rom_address":2702425},"ITEM_MAUVILLE_CITY_X_SPEED":{"default_item":77,"flag":1116,"rom_address":2701320},"ITEM_METEOR_FALLS_1F_1R_FULL_HEAL":{"default_item":23,"flag":1045,"rom_address":2701554},"ITEM_METEOR_FALLS_1F_1R_MOON_STONE":{"default_item":94,"flag":1046,"rom_address":2701567},"ITEM_METEOR_FALLS_1F_1R_PP_UP":{"default_item":69,"flag":1047,"rom_address":2701580},"ITEM_METEOR_FALLS_1F_1R_TM23":{"default_item":311,"flag":1044,"rom_address":2701541},"ITEM_METEOR_FALLS_B1F_2R_TM02":{"default_item":290,"flag":1080,"rom_address":2701593},"ITEM_MOSSDEEP_CITY_NET_BALL":{"default_item":6,"flag":1043,"rom_address":2701359},"ITEM_MT_PYRE_2F_ULTRA_BALL":{"default_item":2,"flag":1129,"rom_address":2701879},"ITEM_MT_PYRE_3F_SUPER_REPEL":{"default_item":83,"flag":1120,"rom_address":2701892},"ITEM_MT_PYRE_4F_SEA_INCENSE":{"default_item":220,"flag":1130,"rom_address":2701905},"ITEM_MT_PYRE_5F_LAX_INCENSE":{"default_item":221,"flag":1052,"rom_address":2701918},"ITEM_MT_PYRE_6F_TM30":{"default_item":318,"flag":1089,"rom_address":2701931},"ITEM_MT_PYRE_EXTERIOR_MAX_POTION":{"default_item":20,"flag":1073,"rom_address":2701944},"ITEM_MT_PYRE_EXTERIOR_TM48":{"default_item":336,"flag":1074,"rom_address":2701957},"ITEM_NEW_MAUVILLE_ESCAPE_ROPE":{"default_item":85,"flag":1076,"rom_address":2701619},"ITEM_NEW_MAUVILLE_FULL_HEAL":{"default_item":23,"flag":1122,"rom_address":2701645},"ITEM_NEW_MAUVILLE_PARALYZE_HEAL":{"default_item":18,"flag":1123,"rom_address":2701658},"ITEM_NEW_MAUVILLE_THUNDER_STONE":{"default_item":96,"flag":1110,"rom_address":2701632},"ITEM_NEW_MAUVILLE_ULTRA_BALL":{"default_item":2,"flag":1075,"rom_address":2701606},"ITEM_PETALBURG_CITY_ETHER":{"default_item":34,"flag":1040,"rom_address":2701307},"ITEM_PETALBURG_CITY_MAX_REVIVE":{"default_item":25,"flag":1039,"rom_address":2701294},"ITEM_PETALBURG_WOODS_ETHER":{"default_item":34,"flag":1058,"rom_address":2701398},"ITEM_PETALBURG_WOODS_GREAT_BALL":{"default_item":3,"flag":1056,"rom_address":2701385},"ITEM_PETALBURG_WOODS_PARALYZE_HEAL":{"default_item":18,"flag":1117,"rom_address":2701411},"ITEM_PETALBURG_WOODS_X_ATTACK":{"default_item":75,"flag":1055,"rom_address":2701372},"ITEM_ROUTE_102_POTION":{"default_item":13,"flag":1000,"rom_address":2700306},"ITEM_ROUTE_103_GUARD_SPEC":{"default_item":73,"flag":1114,"rom_address":2700319},"ITEM_ROUTE_103_PP_UP":{"default_item":69,"flag":1137,"rom_address":2700332},"ITEM_ROUTE_104_POKE_BALL":{"default_item":4,"flag":1057,"rom_address":2700358},"ITEM_ROUTE_104_POTION":{"default_item":13,"flag":1135,"rom_address":2700384},"ITEM_ROUTE_104_PP_UP":{"default_item":69,"flag":1002,"rom_address":2700345},"ITEM_ROUTE_104_X_ACCURACY":{"default_item":78,"flag":1115,"rom_address":2700371},"ITEM_ROUTE_105_IRON":{"default_item":65,"flag":1003,"rom_address":2700397},"ITEM_ROUTE_106_PROTEIN":{"default_item":64,"flag":1004,"rom_address":2700410},"ITEM_ROUTE_108_STAR_PIECE":{"default_item":109,"flag":1139,"rom_address":2700423},"ITEM_ROUTE_109_POTION":{"default_item":13,"flag":1140,"rom_address":2700449},"ITEM_ROUTE_109_PP_UP":{"default_item":69,"flag":1005,"rom_address":2700436},"ITEM_ROUTE_110_DIRE_HIT":{"default_item":74,"flag":1007,"rom_address":2700475},"ITEM_ROUTE_110_ELIXIR":{"default_item":36,"flag":1141,"rom_address":2700488},"ITEM_ROUTE_110_RARE_CANDY":{"default_item":68,"flag":1006,"rom_address":2700462},"ITEM_ROUTE_111_ELIXIR":{"default_item":36,"flag":1142,"rom_address":2700540},"ITEM_ROUTE_111_HP_UP":{"default_item":63,"flag":1010,"rom_address":2700527},"ITEM_ROUTE_111_STARDUST":{"default_item":108,"flag":1009,"rom_address":2700514},"ITEM_ROUTE_111_TM37":{"default_item":325,"flag":1008,"rom_address":2700501},"ITEM_ROUTE_112_NUGGET":{"default_item":110,"flag":1011,"rom_address":2700553},"ITEM_ROUTE_113_HYPER_POTION":{"default_item":21,"flag":1143,"rom_address":2700592},"ITEM_ROUTE_113_MAX_ETHER":{"default_item":35,"flag":1012,"rom_address":2700566},"ITEM_ROUTE_113_SUPER_REPEL":{"default_item":83,"flag":1013,"rom_address":2700579},"ITEM_ROUTE_114_ENERGY_POWDER":{"default_item":30,"flag":1160,"rom_address":2700631},"ITEM_ROUTE_114_PROTEIN":{"default_item":64,"flag":1015,"rom_address":2700618},"ITEM_ROUTE_114_RARE_CANDY":{"default_item":68,"flag":1014,"rom_address":2700605},"ITEM_ROUTE_115_GREAT_BALL":{"default_item":3,"flag":1118,"rom_address":2700683},"ITEM_ROUTE_115_HEAL_POWDER":{"default_item":32,"flag":1144,"rom_address":2700696},"ITEM_ROUTE_115_IRON":{"default_item":65,"flag":1018,"rom_address":2700670},"ITEM_ROUTE_115_PP_UP":{"default_item":69,"flag":1161,"rom_address":2700709},"ITEM_ROUTE_115_SUPER_POTION":{"default_item":22,"flag":1016,"rom_address":2700644},"ITEM_ROUTE_115_TM01":{"default_item":289,"flag":1017,"rom_address":2700657},"ITEM_ROUTE_116_ETHER":{"default_item":34,"flag":1019,"rom_address":2700735},"ITEM_ROUTE_116_HP_UP":{"default_item":63,"flag":1021,"rom_address":2700761},"ITEM_ROUTE_116_POTION":{"default_item":13,"flag":1146,"rom_address":2700774},"ITEM_ROUTE_116_REPEL":{"default_item":86,"flag":1020,"rom_address":2700748},"ITEM_ROUTE_116_X_SPECIAL":{"default_item":79,"flag":1001,"rom_address":2700722},"ITEM_ROUTE_117_GREAT_BALL":{"default_item":3,"flag":1022,"rom_address":2700787},"ITEM_ROUTE_117_REVIVE":{"default_item":24,"flag":1023,"rom_address":2700800},"ITEM_ROUTE_118_HYPER_POTION":{"default_item":21,"flag":1121,"rom_address":2700813},"ITEM_ROUTE_119_ELIXIR_1":{"default_item":36,"flag":1026,"rom_address":2700852},"ITEM_ROUTE_119_ELIXIR_2":{"default_item":36,"flag":1147,"rom_address":2700917},"ITEM_ROUTE_119_HYPER_POTION_1":{"default_item":21,"flag":1029,"rom_address":2700891},"ITEM_ROUTE_119_HYPER_POTION_2":{"default_item":21,"flag":1106,"rom_address":2700904},"ITEM_ROUTE_119_LEAF_STONE":{"default_item":98,"flag":1027,"rom_address":2700865},"ITEM_ROUTE_119_NUGGET":{"default_item":110,"flag":1134,"rom_address":2702035},"ITEM_ROUTE_119_RARE_CANDY":{"default_item":68,"flag":1028,"rom_address":2700878},"ITEM_ROUTE_119_SUPER_REPEL":{"default_item":83,"flag":1024,"rom_address":2700826},"ITEM_ROUTE_119_ZINC":{"default_item":70,"flag":1025,"rom_address":2700839},"ITEM_ROUTE_120_FULL_HEAL":{"default_item":23,"flag":1031,"rom_address":2700943},"ITEM_ROUTE_120_HYPER_POTION":{"default_item":21,"flag":1107,"rom_address":2700956},"ITEM_ROUTE_120_NEST_BALL":{"default_item":8,"flag":1108,"rom_address":2700969},"ITEM_ROUTE_120_NUGGET":{"default_item":110,"flag":1030,"rom_address":2700930},"ITEM_ROUTE_120_REVIVE":{"default_item":24,"flag":1148,"rom_address":2700982},"ITEM_ROUTE_121_CARBOS":{"default_item":66,"flag":1103,"rom_address":2700995},"ITEM_ROUTE_121_REVIVE":{"default_item":24,"flag":1149,"rom_address":2701008},"ITEM_ROUTE_121_ZINC":{"default_item":70,"flag":1150,"rom_address":2701021},"ITEM_ROUTE_123_CALCIUM":{"default_item":67,"flag":1032,"rom_address":2701034},"ITEM_ROUTE_123_ELIXIR":{"default_item":36,"flag":1109,"rom_address":2701060},"ITEM_ROUTE_123_PP_UP":{"default_item":69,"flag":1152,"rom_address":2701073},"ITEM_ROUTE_123_REVIVAL_HERB":{"default_item":33,"flag":1153,"rom_address":2701086},"ITEM_ROUTE_123_ULTRA_BALL":{"default_item":2,"flag":1104,"rom_address":2701047},"ITEM_ROUTE_124_BLUE_SHARD":{"default_item":49,"flag":1093,"rom_address":2701112},"ITEM_ROUTE_124_RED_SHARD":{"default_item":48,"flag":1092,"rom_address":2701099},"ITEM_ROUTE_124_YELLOW_SHARD":{"default_item":50,"flag":1066,"rom_address":2701125},"ITEM_ROUTE_125_BIG_PEARL":{"default_item":107,"flag":1154,"rom_address":2701138},"ITEM_ROUTE_126_GREEN_SHARD":{"default_item":51,"flag":1105,"rom_address":2701151},"ITEM_ROUTE_127_CARBOS":{"default_item":66,"flag":1035,"rom_address":2701177},"ITEM_ROUTE_127_RARE_CANDY":{"default_item":68,"flag":1155,"rom_address":2701190},"ITEM_ROUTE_127_ZINC":{"default_item":70,"flag":1034,"rom_address":2701164},"ITEM_ROUTE_132_PROTEIN":{"default_item":64,"flag":1156,"rom_address":2701216},"ITEM_ROUTE_132_RARE_CANDY":{"default_item":68,"flag":1036,"rom_address":2701203},"ITEM_ROUTE_133_BIG_PEARL":{"default_item":107,"flag":1037,"rom_address":2701229},"ITEM_ROUTE_133_MAX_REVIVE":{"default_item":25,"flag":1157,"rom_address":2701255},"ITEM_ROUTE_133_STAR_PIECE":{"default_item":109,"flag":1038,"rom_address":2701242},"ITEM_ROUTE_134_CARBOS":{"default_item":66,"flag":1158,"rom_address":2701268},"ITEM_ROUTE_134_STAR_PIECE":{"default_item":109,"flag":1159,"rom_address":2701281},"ITEM_RUSTBORO_CITY_X_DEFEND":{"default_item":76,"flag":1041,"rom_address":2701333},"ITEM_RUSTURF_TUNNEL_MAX_ETHER":{"default_item":35,"flag":1049,"rom_address":2701437},"ITEM_RUSTURF_TUNNEL_POKE_BALL":{"default_item":4,"flag":1048,"rom_address":2701424},"ITEM_SAFARI_ZONE_NORTH_CALCIUM":{"default_item":67,"flag":1119,"rom_address":2701827},"ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET":{"default_item":110,"flag":1169,"rom_address":2701853},"ITEM_SAFARI_ZONE_NORTH_WEST_TM22":{"default_item":310,"flag":1094,"rom_address":2701814},"ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL":{"default_item":107,"flag":1170,"rom_address":2701866},"ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE":{"default_item":25,"flag":1131,"rom_address":2701840},"ITEM_SCORCHED_SLAB_TM11":{"default_item":299,"flag":1079,"rom_address":2701801},"ITEM_SEAFLOOR_CAVERN_ROOM_9_TM26":{"default_item":314,"flag":1090,"rom_address":2702139},"ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL":{"default_item":107,"flag":1081,"rom_address":2702074},"ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE":{"default_item":212,"flag":1113,"rom_address":2702126},"ITEM_SHOAL_CAVE_ICE_ROOM_TM07":{"default_item":295,"flag":1112,"rom_address":2702113},"ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY":{"default_item":68,"flag":1082,"rom_address":2702087},"ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL":{"default_item":16,"flag":1083,"rom_address":2702100},"ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL":{"default_item":121,"flag":1060,"rom_address":2702152},"ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL":{"default_item":122,"flag":1061,"rom_address":2702165},"ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL":{"default_item":126,"flag":1062,"rom_address":2702178},"ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL":{"default_item":128,"flag":1063,"rom_address":2702191},"ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL":{"default_item":125,"flag":1064,"rom_address":2702204},"ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL":{"default_item":124,"flag":1065,"rom_address":2702217},"ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL":{"default_item":123,"flag":1067,"rom_address":2702230},"ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL":{"default_item":129,"flag":1068,"rom_address":2702243},"ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL":{"default_item":127,"flag":1069,"rom_address":2702256},"ITEM_VICTORY_ROAD_1F_MAX_ELIXIR":{"default_item":37,"flag":1084,"rom_address":2702269},"ITEM_VICTORY_ROAD_1F_PP_UP":{"default_item":69,"flag":1085,"rom_address":2702282},"ITEM_VICTORY_ROAD_B1F_FULL_RESTORE":{"default_item":19,"flag":1087,"rom_address":2702308},"ITEM_VICTORY_ROAD_B1F_TM29":{"default_item":317,"flag":1086,"rom_address":2702295},"ITEM_VICTORY_ROAD_B2F_FULL_HEAL":{"default_item":23,"flag":1088,"rom_address":2702321},"NPC_GIFT_GOT_BASEMENT_KEY_FROM_WATTSON":{"default_item":271,"flag":208,"rom_address":1967134},"NPC_GIFT_GOT_TM24_FROM_WATTSON":{"default_item":312,"flag":209,"rom_address":1967168},"NPC_GIFT_RECEIVED_6_SODA_POP":{"default_item":27,"flag":140,"rom_address":2537096},"NPC_GIFT_RECEIVED_ACRO_BIKE":{"default_item":272,"flag":1181,"rom_address":2164456},"NPC_GIFT_RECEIVED_AMULET_COIN":{"default_item":189,"flag":133,"rom_address":2708208},"NPC_GIFT_RECEIVED_CHARCOAL":{"default_item":215,"flag":254,"rom_address":2096554},"NPC_GIFT_RECEIVED_CHESTO_BERRY_ROUTE_104":{"default_item":134,"flag":246,"rom_address":2022873},"NPC_GIFT_RECEIVED_CLEANSE_TAG":{"default_item":190,"flag":282,"rom_address":2305748},"NPC_GIFT_RECEIVED_COIN_CASE":{"default_item":260,"flag":258,"rom_address":2172913},"NPC_GIFT_RECEIVED_DEEP_SEA_SCALE":{"default_item":193,"flag":1190,"rom_address":2156474},"NPC_GIFT_RECEIVED_DEEP_SEA_TOOTH":{"default_item":192,"flag":1191,"rom_address":2156462},"NPC_GIFT_RECEIVED_DEVON_GOODS_RUSTURF_TUNNEL":{"default_item":269,"flag":1172,"rom_address":2289508},"NPC_GIFT_RECEIVED_DEVON_SCOPE":{"default_item":288,"flag":285,"rom_address":2059186},"NPC_GIFT_RECEIVED_EXP_SHARE":{"default_item":182,"flag":272,"rom_address":2179378},"NPC_GIFT_RECEIVED_FOCUS_BAND":{"default_item":196,"flag":283,"rom_address":2331353},"NPC_GIFT_RECEIVED_GOOD_ROD":{"default_item":263,"flag":227,"rom_address":2052491},"NPC_GIFT_RECEIVED_GO_GOGGLES":{"default_item":279,"flag":221,"rom_address":2011954},"NPC_GIFT_RECEIVED_GREAT_BALL_PETALBURG_WOODS":{"default_item":3,"flag":1171,"rom_address":2293794},"NPC_GIFT_RECEIVED_GREAT_BALL_RUSTBORO_CITY":{"default_item":3,"flag":1173,"rom_address":1972558},"NPC_GIFT_RECEIVED_HM01":{"default_item":339,"flag":137,"rom_address":2193371},"NPC_GIFT_RECEIVED_HM02":{"default_item":340,"flag":110,"rom_address":2054604},"NPC_GIFT_RECEIVED_HM03":{"default_item":341,"flag":122,"rom_address":2120645},"NPC_GIFT_RECEIVED_HM04":{"default_item":342,"flag":106,"rom_address":2289001},"NPC_GIFT_RECEIVED_HM05":{"default_item":343,"flag":109,"rom_address":2291966},"NPC_GIFT_RECEIVED_HM06":{"default_item":344,"flag":107,"rom_address":2167989},"NPC_GIFT_RECEIVED_HM07":{"default_item":345,"flag":312,"rom_address":1995198},"NPC_GIFT_RECEIVED_HM08":{"default_item":346,"flag":123,"rom_address":2245872},"NPC_GIFT_RECEIVED_ITEMFINDER":{"default_item":261,"flag":1176,"rom_address":2034013},"NPC_GIFT_RECEIVED_KINGS_ROCK":{"default_item":187,"flag":276,"rom_address":1989011},"NPC_GIFT_RECEIVED_LETTER":{"default_item":274,"flag":1174,"rom_address":2179156},"NPC_GIFT_RECEIVED_MACHO_BRACE":{"default_item":181,"flag":277,"rom_address":2278172},"NPC_GIFT_RECEIVED_MACH_BIKE":{"default_item":259,"flag":1180,"rom_address":2164441},"NPC_GIFT_RECEIVED_MAGMA_EMBLEM":{"default_item":375,"flag":1177,"rom_address":2310318},"NPC_GIFT_RECEIVED_MENTAL_HERB":{"default_item":185,"flag":223,"rom_address":2201924},"NPC_GIFT_RECEIVED_METEORITE":{"default_item":280,"flag":115,"rom_address":2297863},"NPC_GIFT_RECEIVED_MIRACLE_SEED":{"default_item":205,"flag":297,"rom_address":2294010},"NPC_GIFT_RECEIVED_OLD_ROD":{"default_item":262,"flag":257,"rom_address":2007886},"NPC_GIFT_RECEIVED_POKEBLOCK_CASE":{"default_item":273,"flag":95,"rom_address":2606136},"NPC_GIFT_RECEIVED_POTION_OLDALE":{"default_item":13,"flag":132,"rom_address":2006235},"NPC_GIFT_RECEIVED_POWDER_JAR":{"default_item":372,"flag":337,"rom_address":1957927},"NPC_GIFT_RECEIVED_PREMIER_BALL_RUSTBORO":{"default_item":12,"flag":213,"rom_address":2194408},"NPC_GIFT_RECEIVED_QUICK_CLAW":{"default_item":183,"flag":275,"rom_address":2186071},"NPC_GIFT_RECEIVED_REPEAT_BALL":{"default_item":9,"flag":256,"rom_address":2047827},"NPC_GIFT_RECEIVED_SECRET_POWER":{"default_item":331,"flag":96,"rom_address":2591201},"NPC_GIFT_RECEIVED_SILK_SCARF":{"default_item":217,"flag":289,"rom_address":2095828},"NPC_GIFT_RECEIVED_SOFT_SAND":{"default_item":203,"flag":280,"rom_address":2029841},"NPC_GIFT_RECEIVED_SOOTHE_BELL":{"default_item":184,"flag":278,"rom_address":2145210},"NPC_GIFT_RECEIVED_SS_TICKET":{"default_item":265,"flag":291,"rom_address":2708464},"NPC_GIFT_RECEIVED_SUN_STONE_MOSSDEEP":{"default_item":93,"flag":192,"rom_address":2248181},"NPC_GIFT_RECEIVED_SUPER_ROD":{"default_item":264,"flag":152,"rom_address":2245339},"NPC_GIFT_RECEIVED_TM03":{"default_item":291,"flag":172,"rom_address":2256148},"NPC_GIFT_RECEIVED_TM04":{"default_item":292,"flag":171,"rom_address":2237855},"NPC_GIFT_RECEIVED_TM05":{"default_item":293,"flag":231,"rom_address":2045877},"NPC_GIFT_RECEIVED_TM08":{"default_item":296,"flag":166,"rom_address":2089212},"NPC_GIFT_RECEIVED_TM09":{"default_item":297,"flag":262,"rom_address":2023076},"NPC_GIFT_RECEIVED_TM10":{"default_item":298,"flag":264,"rom_address":2200728},"NPC_GIFT_RECEIVED_TM19":{"default_item":307,"flag":232,"rom_address":2062050},"NPC_GIFT_RECEIVED_TM21":{"default_item":309,"flag":1179,"rom_address":2118086},"NPC_GIFT_RECEIVED_TM27":{"default_item":315,"flag":229,"rom_address":2107533},"NPC_GIFT_RECEIVED_TM27_2":{"default_item":315,"flag":1178,"rom_address":2118033},"NPC_GIFT_RECEIVED_TM28":{"default_item":316,"flag":261,"rom_address":2280367},"NPC_GIFT_RECEIVED_TM31":{"default_item":319,"flag":121,"rom_address":2262824},"NPC_GIFT_RECEIVED_TM34":{"default_item":322,"flag":167,"rom_address":2161230},"NPC_GIFT_RECEIVED_TM36":{"default_item":324,"flag":230,"rom_address":2093189},"NPC_GIFT_RECEIVED_TM39":{"default_item":327,"flag":165,"rom_address":2181934},"NPC_GIFT_RECEIVED_TM40":{"default_item":328,"flag":170,"rom_address":2196031},"NPC_GIFT_RECEIVED_TM41":{"default_item":329,"flag":265,"rom_address":2139219},"NPC_GIFT_RECEIVED_TM42":{"default_item":330,"flag":169,"rom_address":2123871},"NPC_GIFT_RECEIVED_TM44":{"default_item":332,"flag":234,"rom_address":2230771},"NPC_GIFT_RECEIVED_TM45":{"default_item":333,"flag":235,"rom_address":2110398},"NPC_GIFT_RECEIVED_TM46":{"default_item":334,"flag":269,"rom_address":2148628},"NPC_GIFT_RECEIVED_TM47":{"default_item":335,"flag":1175,"rom_address":2292543},"NPC_GIFT_RECEIVED_TM49":{"default_item":337,"flag":260,"rom_address":2354181},"NPC_GIFT_RECEIVED_TM50":{"default_item":338,"flag":168,"rom_address":2097316},"NPC_GIFT_RECEIVED_WAILMER_PAIL":{"default_item":268,"flag":94,"rom_address":2278027},"NPC_GIFT_RECEIVED_WHITE_HERB":{"default_item":180,"flag":279,"rom_address":2022938}},"maps":{"MAP_ABANDONED_SHIP_CAPTAINS_OFFICE":{"fishing_encounters":null,"header_rom_address":4748492,"land_encounters":null,"warp_table_rom_address":5478884,"water_encounters":null},"MAP_ABANDONED_SHIP_CORRIDORS_1F":{"fishing_encounters":null,"header_rom_address":4748268,"land_encounters":null,"warp_table_rom_address":5477960,"water_encounters":null},"MAP_ABANDONED_SHIP_CORRIDORS_B1F":{"fishing_encounters":null,"header_rom_address":4748324,"land_encounters":null,"warp_table_rom_address":5478288,"water_encounters":null},"MAP_ABANDONED_SHIP_DECK":{"fishing_encounters":null,"header_rom_address":4748240,"land_encounters":null,"warp_table_rom_address":5477852,"water_encounters":null},"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS":{"fishing_encounters":{"encounter_slots":[129,72,129,72,72,72,72,73,73,73],"rom_address":5589416},"header_rom_address":4748548,"land_encounters":null,"warp_table_rom_address":5478948,"water_encounters":{"encounter_slots":[72,72,72,72,73],"rom_address":5589388}},"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS":{"fishing_encounters":null,"header_rom_address":4748576,"land_encounters":null,"warp_table_rom_address":5479160,"water_encounters":null},"MAP_ABANDONED_SHIP_ROOMS2_1F":{"fishing_encounters":null,"header_rom_address":4748464,"land_encounters":null,"warp_table_rom_address":5478792,"water_encounters":null},"MAP_ABANDONED_SHIP_ROOMS2_B1F":{"fishing_encounters":null,"header_rom_address":4748380,"land_encounters":null,"warp_table_rom_address":5478524,"water_encounters":null},"MAP_ABANDONED_SHIP_ROOMS_1F":{"fishing_encounters":null,"header_rom_address":4748296,"land_encounters":null,"warp_table_rom_address":5478172,"water_encounters":null},"MAP_ABANDONED_SHIP_ROOMS_B1F":{"fishing_encounters":{"encounter_slots":[129,72,129,72,72,72,72,73,73,73],"rom_address":5586652},"header_rom_address":4748352,"land_encounters":null,"warp_table_rom_address":5478432,"water_encounters":{"encounter_slots":[72,72,72,72,73],"rom_address":5586624}},"MAP_ABANDONED_SHIP_ROOM_B1F":{"fishing_encounters":null,"header_rom_address":4748436,"land_encounters":null,"warp_table_rom_address":5478636,"water_encounters":null},"MAP_ABANDONED_SHIP_UNDERWATER1":{"fishing_encounters":null,"header_rom_address":4748408,"land_encounters":null,"warp_table_rom_address":5478576,"water_encounters":null},"MAP_ABANDONED_SHIP_UNDERWATER2":{"fishing_encounters":null,"header_rom_address":4748520,"land_encounters":null,"warp_table_rom_address":5478920,"water_encounters":null},"MAP_ALTERING_CAVE":{"fishing_encounters":null,"header_rom_address":4749696,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,41,41,41,41],"rom_address":5593728},"warp_table_rom_address":5482476,"water_encounters":null},"MAP_ANCIENT_TOMB":{"fishing_encounters":null,"header_rom_address":4748632,"land_encounters":null,"warp_table_rom_address":5479500,"water_encounters":null},"MAP_AQUA_HIDEOUT_1F":{"fishing_encounters":null,"header_rom_address":4747372,"land_encounters":null,"warp_table_rom_address":5472932,"water_encounters":null},"MAP_AQUA_HIDEOUT_B1F":{"fishing_encounters":null,"header_rom_address":4747400,"land_encounters":null,"warp_table_rom_address":5473192,"water_encounters":null},"MAP_AQUA_HIDEOUT_B2F":{"fishing_encounters":null,"header_rom_address":4747428,"land_encounters":null,"warp_table_rom_address":5473556,"water_encounters":null},"MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1":{"fishing_encounters":null,"header_rom_address":4748800,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2":{"fishing_encounters":null,"header_rom_address":4748828,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3":{"fishing_encounters":null,"header_rom_address":4748856,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_ARTISAN_CAVE_1F":{"fishing_encounters":null,"header_rom_address":4749528,"land_encounters":{"encounter_slots":[235,235,235,235,235,235,235,235,235,235,235,235],"rom_address":5593672},"warp_table_rom_address":5482212,"water_encounters":null},"MAP_ARTISAN_CAVE_B1F":{"fishing_encounters":null,"header_rom_address":4749500,"land_encounters":{"encounter_slots":[235,235,235,235,235,235,235,235,235,235,235,235],"rom_address":5593616},"warp_table_rom_address":5482104,"water_encounters":null},"MAP_BATTLE_COLOSSEUM_2P":{"fishing_encounters":null,"header_rom_address":4750424,"land_encounters":null,"warp_table_rom_address":5491892,"water_encounters":null},"MAP_BATTLE_COLOSSEUM_4P":{"fishing_encounters":null,"header_rom_address":4750508,"land_encounters":null,"warp_table_rom_address":5492192,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4752300,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4752272,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY":{"fishing_encounters":null,"header_rom_address":4752244,"land_encounters":null,"warp_table_rom_address":5502948,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4752048,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4751992,"land_encounters":null,"warp_table_rom_address":5501116,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY":{"fishing_encounters":null,"header_rom_address":4751964,"land_encounters":null,"warp_table_rom_address":5501008,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4752020,"land_encounters":null,"warp_table_rom_address":5501176,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4752384,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY":{"fishing_encounters":null,"header_rom_address":4752328,"land_encounters":null,"warp_table_rom_address":5503424,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4752356,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4752132,"land_encounters":null,"warp_table_rom_address":5502156,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4752104,"land_encounters":null,"warp_table_rom_address":5501984,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY":{"fishing_encounters":null,"header_rom_address":4752076,"land_encounters":null,"warp_table_rom_address":5501736,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4752440,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY":{"fishing_encounters":null,"header_rom_address":4752412,"land_encounters":null,"warp_table_rom_address":5503848,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL":{"fishing_encounters":null,"header_rom_address":4752524,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL":{"fishing_encounters":null,"header_rom_address":4752496,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS":{"fishing_encounters":null,"header_rom_address":4752552,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM":{"fishing_encounters":null,"header_rom_address":4752468,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR":{"fishing_encounters":null,"header_rom_address":4752188,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY":{"fishing_encounters":null,"header_rom_address":4752160,"land_encounters":null,"warp_table_rom_address":5502288,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP":{"fishing_encounters":null,"header_rom_address":4752216,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4751684,"land_encounters":null,"warp_table_rom_address":5498736,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4751656,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR":{"fishing_encounters":null,"header_rom_address":4751628,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY":{"fishing_encounters":null,"header_rom_address":4751600,"land_encounters":null,"warp_table_rom_address":5498472,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4751936,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4751908,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM":{"fishing_encounters":null,"header_rom_address":4751880,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER":{"fishing_encounters":null,"header_rom_address":4752636,"land_encounters":null,"warp_table_rom_address":5505096,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE1":{"fishing_encounters":null,"header_rom_address":4752608,"land_encounters":null,"warp_table_rom_address":5504852,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE2":{"fishing_encounters":null,"header_rom_address":4752664,"land_encounters":null,"warp_table_rom_address":5505260,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE3":{"fishing_encounters":null,"header_rom_address":4752692,"land_encounters":null,"warp_table_rom_address":5505416,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE4":{"fishing_encounters":null,"header_rom_address":4752720,"land_encounters":null,"warp_table_rom_address":5505516,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE5":{"fishing_encounters":null,"header_rom_address":4752776,"land_encounters":null,"warp_table_rom_address":5505700,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE6":{"fishing_encounters":null,"header_rom_address":4752804,"land_encounters":null,"warp_table_rom_address":5505760,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE7":{"fishing_encounters":null,"header_rom_address":4752832,"land_encounters":null,"warp_table_rom_address":5505884,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE8":{"fishing_encounters":null,"header_rom_address":4752888,"land_encounters":null,"warp_table_rom_address":5506140,"water_encounters":null},"MAP_BATTLE_FRONTIER_LOUNGE9":{"fishing_encounters":null,"header_rom_address":4752916,"land_encounters":null,"warp_table_rom_address":5506192,"water_encounters":null},"MAP_BATTLE_FRONTIER_MART":{"fishing_encounters":null,"header_rom_address":4753000,"land_encounters":null,"warp_table_rom_address":5506628,"water_encounters":null},"MAP_BATTLE_FRONTIER_OUTSIDE_EAST":{"fishing_encounters":null,"header_rom_address":4751852,"land_encounters":null,"warp_table_rom_address":5500120,"water_encounters":null},"MAP_BATTLE_FRONTIER_OUTSIDE_WEST":{"fishing_encounters":null,"header_rom_address":4751572,"land_encounters":null,"warp_table_rom_address":5498088,"water_encounters":null},"MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4752944,"land_encounters":null,"warp_table_rom_address":5506348,"water_encounters":null},"MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4752972,"land_encounters":null,"warp_table_rom_address":5506488,"water_encounters":null},"MAP_BATTLE_FRONTIER_RANKING_HALL":{"fishing_encounters":null,"header_rom_address":4752580,"land_encounters":null,"warp_table_rom_address":5504600,"water_encounters":null},"MAP_BATTLE_FRONTIER_RECEPTION_GATE":{"fishing_encounters":null,"header_rom_address":4752860,"land_encounters":null,"warp_table_rom_address":5506032,"water_encounters":null},"MAP_BATTLE_FRONTIER_SCOTTS_HOUSE":{"fishing_encounters":null,"header_rom_address":4752748,"land_encounters":null,"warp_table_rom_address":5505568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE01":{"fishing_encounters":null,"header_rom_address":4750984,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE02":{"fishing_encounters":null,"header_rom_address":4751012,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE03":{"fishing_encounters":null,"header_rom_address":4751040,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE04":{"fishing_encounters":null,"header_rom_address":4751068,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE05":{"fishing_encounters":null,"header_rom_address":4751096,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE06":{"fishing_encounters":null,"header_rom_address":4751124,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE07":{"fishing_encounters":null,"header_rom_address":4751152,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE08":{"fishing_encounters":null,"header_rom_address":4751180,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE09":{"fishing_encounters":null,"header_rom_address":4751208,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE10":{"fishing_encounters":null,"header_rom_address":4751236,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE11":{"fishing_encounters":null,"header_rom_address":4751264,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE12":{"fishing_encounters":null,"header_rom_address":4751292,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE13":{"fishing_encounters":null,"header_rom_address":4751320,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE14":{"fishing_encounters":null,"header_rom_address":4751348,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE15":{"fishing_encounters":null,"header_rom_address":4751376,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BATTLE_PYRAMID_SQUARE16":{"fishing_encounters":null,"header_rom_address":4751404,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_BIRTH_ISLAND_EXTERIOR":{"fishing_encounters":null,"header_rom_address":4753084,"land_encounters":null,"warp_table_rom_address":5506916,"water_encounters":null},"MAP_BIRTH_ISLAND_HARBOR":{"fishing_encounters":null,"header_rom_address":4753112,"land_encounters":null,"warp_table_rom_address":5506992,"water_encounters":null},"MAP_CAVE_OF_ORIGIN_1F":{"fishing_encounters":null,"header_rom_address":4747792,"land_encounters":{"encounter_slots":[41,41,41,322,322,322,41,41,42,42,42,42],"rom_address":5590196},"warp_table_rom_address":5475480,"water_encounters":null},"MAP_CAVE_OF_ORIGIN_B1F":{"fishing_encounters":null,"header_rom_address":4747904,"land_encounters":null,"warp_table_rom_address":5475648,"water_encounters":null},"MAP_CAVE_OF_ORIGIN_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4747764,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5590140},"warp_table_rom_address":5475444,"water_encounters":null},"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1":{"fishing_encounters":null,"header_rom_address":4747820,"land_encounters":{"encounter_slots":[41,41,41,322,322,322,41,41,42,42,42,42],"rom_address":5590252},"warp_table_rom_address":5475516,"water_encounters":null},"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2":{"fishing_encounters":null,"header_rom_address":4747848,"land_encounters":{"encounter_slots":[41,41,41,322,322,322,41,41,42,42,42,42],"rom_address":5590308},"warp_table_rom_address":5475552,"water_encounters":null},"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3":{"fishing_encounters":null,"header_rom_address":4747876,"land_encounters":{"encounter_slots":[41,41,41,322,322,322,41,41,42,42,42,42],"rom_address":5590364},"warp_table_rom_address":5475588,"water_encounters":null},"MAP_CONTEST_HALL":{"fishing_encounters":null,"header_rom_address":4750536,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_CONTEST_HALL_BEAUTY":{"fishing_encounters":null,"header_rom_address":4750732,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_CONTEST_HALL_COOL":{"fishing_encounters":null,"header_rom_address":4750788,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_CONTEST_HALL_CUTE":{"fishing_encounters":null,"header_rom_address":4750844,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_CONTEST_HALL_SMART":{"fishing_encounters":null,"header_rom_address":4750816,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_CONTEST_HALL_TOUGH":{"fishing_encounters":null,"header_rom_address":4750760,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_DESERT_RUINS":{"fishing_encounters":null,"header_rom_address":4746896,"land_encounters":null,"warp_table_rom_address":5468868,"water_encounters":null},"MAP_DESERT_UNDERPASS":{"fishing_encounters":null,"header_rom_address":4749472,"land_encounters":{"encounter_slots":[132,370,132,371,132,370,371,132,370,132,371,132],"rom_address":5593560},"warp_table_rom_address":5482052,"water_encounters":null},"MAP_DEWFORD_TOWN":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5591916},"header_rom_address":4740372,"land_encounters":null,"warp_table_rom_address":5417220,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5591888}},"MAP_DEWFORD_TOWN_GYM":{"fishing_encounters":null,"header_rom_address":4742024,"land_encounters":null,"warp_table_rom_address":5442380,"water_encounters":null},"MAP_DEWFORD_TOWN_HALL":{"fishing_encounters":null,"header_rom_address":4742052,"land_encounters":null,"warp_table_rom_address":5442680,"water_encounters":null},"MAP_DEWFORD_TOWN_HOUSE1":{"fishing_encounters":null,"header_rom_address":4741940,"land_encounters":null,"warp_table_rom_address":5441896,"water_encounters":null},"MAP_DEWFORD_TOWN_HOUSE2":{"fishing_encounters":null,"header_rom_address":4742080,"land_encounters":null,"warp_table_rom_address":5442788,"water_encounters":null},"MAP_DEWFORD_TOWN_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4741968,"land_encounters":null,"warp_table_rom_address":5442004,"water_encounters":null},"MAP_DEWFORD_TOWN_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4741996,"land_encounters":null,"warp_table_rom_address":5442144,"water_encounters":null},"MAP_EVER_GRANDE_CITY":{"fishing_encounters":{"encounter_slots":[129,72,129,325,313,325,313,222,313,313],"rom_address":5592220},"header_rom_address":4740288,"land_encounters":null,"warp_table_rom_address":5416112,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5592192}},"MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM":{"fishing_encounters":null,"header_rom_address":4746084,"land_encounters":null,"warp_table_rom_address":5465760,"water_encounters":null},"MAP_EVER_GRANDE_CITY_DRAKES_ROOM":{"fishing_encounters":null,"header_rom_address":4746056,"land_encounters":null,"warp_table_rom_address":5465652,"water_encounters":null},"MAP_EVER_GRANDE_CITY_GLACIAS_ROOM":{"fishing_encounters":null,"header_rom_address":4746028,"land_encounters":null,"warp_table_rom_address":5465592,"water_encounters":null},"MAP_EVER_GRANDE_CITY_HALL1":{"fishing_encounters":null,"header_rom_address":4746112,"land_encounters":null,"warp_table_rom_address":5465796,"water_encounters":null},"MAP_EVER_GRANDE_CITY_HALL2":{"fishing_encounters":null,"header_rom_address":4746140,"land_encounters":null,"warp_table_rom_address":5465848,"water_encounters":null},"MAP_EVER_GRANDE_CITY_HALL3":{"fishing_encounters":null,"header_rom_address":4746168,"land_encounters":null,"warp_table_rom_address":5465900,"water_encounters":null},"MAP_EVER_GRANDE_CITY_HALL4":{"fishing_encounters":null,"header_rom_address":4746196,"land_encounters":null,"warp_table_rom_address":5465952,"water_encounters":null},"MAP_EVER_GRANDE_CITY_HALL5":{"fishing_encounters":null,"header_rom_address":4746224,"land_encounters":null,"warp_table_rom_address":5465988,"water_encounters":null},"MAP_EVER_GRANDE_CITY_HALL_OF_FAME":{"fishing_encounters":null,"header_rom_address":4746280,"land_encounters":null,"warp_table_rom_address":5466220,"water_encounters":null},"MAP_EVER_GRANDE_CITY_PHOEBES_ROOM":{"fishing_encounters":null,"header_rom_address":4746000,"land_encounters":null,"warp_table_rom_address":5465532,"water_encounters":null},"MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4746308,"land_encounters":null,"warp_table_rom_address":5466344,"water_encounters":null},"MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4746336,"land_encounters":null,"warp_table_rom_address":5466484,"water_encounters":null},"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F":{"fishing_encounters":null,"header_rom_address":4746252,"land_encounters":null,"warp_table_rom_address":5466136,"water_encounters":null},"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F":{"fishing_encounters":null,"header_rom_address":4746364,"land_encounters":null,"warp_table_rom_address":5466624,"water_encounters":null},"MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM":{"fishing_encounters":null,"header_rom_address":4745972,"land_encounters":null,"warp_table_rom_address":5465472,"water_encounters":null},"MAP_FALLARBOR_TOWN":{"fishing_encounters":null,"header_rom_address":4740428,"land_encounters":null,"warp_table_rom_address":5417832,"water_encounters":null},"MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4742388,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4742360,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY":{"fishing_encounters":null,"header_rom_address":4742332,"land_encounters":null,"warp_table_rom_address":5444416,"water_encounters":null},"MAP_FALLARBOR_TOWN_COZMOS_HOUSE":{"fishing_encounters":null,"header_rom_address":4742472,"land_encounters":null,"warp_table_rom_address":5444928,"water_encounters":null},"MAP_FALLARBOR_TOWN_MART":{"fishing_encounters":null,"header_rom_address":4742304,"land_encounters":null,"warp_table_rom_address":5444260,"water_encounters":null},"MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE":{"fishing_encounters":null,"header_rom_address":4742500,"land_encounters":null,"warp_table_rom_address":5444988,"water_encounters":null},"MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4742416,"land_encounters":null,"warp_table_rom_address":5444696,"water_encounters":null},"MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4742444,"land_encounters":null,"warp_table_rom_address":5444836,"water_encounters":null},"MAP_FARAWAY_ISLAND_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4753028,"land_encounters":null,"warp_table_rom_address":5506712,"water_encounters":null},"MAP_FARAWAY_ISLAND_INTERIOR":{"fishing_encounters":null,"header_rom_address":4753056,"land_encounters":null,"warp_table_rom_address":5506832,"water_encounters":null},"MAP_FIERY_PATH":{"fishing_encounters":null,"header_rom_address":4747120,"land_encounters":{"encounter_slots":[339,109,339,66,321,218,109,66,321,321,88,88],"rom_address":5586784},"warp_table_rom_address":5471384,"water_encounters":null},"MAP_FORTREE_CITY":{"fishing_encounters":null,"header_rom_address":4740176,"land_encounters":null,"warp_table_rom_address":5413740,"water_encounters":null},"MAP_FORTREE_CITY_DECORATION_SHOP":{"fishing_encounters":null,"header_rom_address":4744516,"land_encounters":null,"warp_table_rom_address":5455976,"water_encounters":null},"MAP_FORTREE_CITY_GYM":{"fishing_encounters":null,"header_rom_address":4744292,"land_encounters":null,"warp_table_rom_address":5455024,"water_encounters":null},"MAP_FORTREE_CITY_HOUSE1":{"fishing_encounters":null,"header_rom_address":4744264,"land_encounters":null,"warp_table_rom_address":5454796,"water_encounters":null},"MAP_FORTREE_CITY_HOUSE2":{"fishing_encounters":null,"header_rom_address":4744404,"land_encounters":null,"warp_table_rom_address":5455544,"water_encounters":null},"MAP_FORTREE_CITY_HOUSE3":{"fishing_encounters":null,"header_rom_address":4744432,"land_encounters":null,"warp_table_rom_address":5455628,"water_encounters":null},"MAP_FORTREE_CITY_HOUSE4":{"fishing_encounters":null,"header_rom_address":4744460,"land_encounters":null,"warp_table_rom_address":5455736,"water_encounters":null},"MAP_FORTREE_CITY_HOUSE5":{"fishing_encounters":null,"header_rom_address":4744488,"land_encounters":null,"warp_table_rom_address":5455844,"water_encounters":null},"MAP_FORTREE_CITY_MART":{"fishing_encounters":null,"header_rom_address":4744376,"land_encounters":null,"warp_table_rom_address":5455460,"water_encounters":null},"MAP_FORTREE_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4744320,"land_encounters":null,"warp_table_rom_address":5455180,"water_encounters":null},"MAP_FORTREE_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4744348,"land_encounters":null,"warp_table_rom_address":5455320,"water_encounters":null},"MAP_GRANITE_CAVE_1F":{"fishing_encounters":null,"header_rom_address":4746924,"land_encounters":{"encounter_slots":[41,335,335,41,335,63,335,335,74,74,74,74],"rom_address":5586316},"warp_table_rom_address":5468996,"water_encounters":null},"MAP_GRANITE_CAVE_B1F":{"fishing_encounters":null,"header_rom_address":4746952,"land_encounters":{"encounter_slots":[41,382,382,382,41,63,335,335,322,322,322,322],"rom_address":5586372},"warp_table_rom_address":5469072,"water_encounters":null},"MAP_GRANITE_CAVE_B2F":{"fishing_encounters":null,"header_rom_address":4746980,"land_encounters":{"encounter_slots":[41,382,382,41,382,63,322,322,322,322,322,322],"rom_address":5586700},"warp_table_rom_address":5469364,"water_encounters":null},"MAP_GRANITE_CAVE_STEVENS_ROOM":{"fishing_encounters":null,"header_rom_address":4747008,"land_encounters":{"encounter_slots":[41,335,335,41,335,63,335,335,382,382,382,382],"rom_address":5588516},"warp_table_rom_address":5469472,"water_encounters":null},"MAP_INSIDE_OF_TRUCK":{"fishing_encounters":null,"header_rom_address":4750872,"land_encounters":null,"warp_table_rom_address":5492760,"water_encounters":null},"MAP_ISLAND_CAVE":{"fishing_encounters":null,"header_rom_address":4748604,"land_encounters":null,"warp_table_rom_address":5479396,"water_encounters":null},"MAP_JAGGED_PASS":{"fishing_encounters":null,"header_rom_address":4747092,"land_encounters":{"encounter_slots":[339,339,66,339,351,66,351,66,339,351,339,351],"rom_address":5586972},"warp_table_rom_address":5470948,"water_encounters":null},"MAP_LAVARIDGE_TOWN":{"fishing_encounters":null,"header_rom_address":4740400,"land_encounters":null,"warp_table_rom_address":5417556,"water_encounters":null},"MAP_LAVARIDGE_TOWN_GYM_1F":{"fishing_encounters":null,"header_rom_address":4742136,"land_encounters":null,"warp_table_rom_address":5443076,"water_encounters":null},"MAP_LAVARIDGE_TOWN_GYM_B1F":{"fishing_encounters":null,"header_rom_address":4742164,"land_encounters":null,"warp_table_rom_address":5443424,"water_encounters":null},"MAP_LAVARIDGE_TOWN_HERB_SHOP":{"fishing_encounters":null,"header_rom_address":4742108,"land_encounters":null,"warp_table_rom_address":5442896,"water_encounters":null},"MAP_LAVARIDGE_TOWN_HOUSE":{"fishing_encounters":null,"header_rom_address":4742192,"land_encounters":null,"warp_table_rom_address":5443708,"water_encounters":null},"MAP_LAVARIDGE_TOWN_MART":{"fishing_encounters":null,"header_rom_address":4742220,"land_encounters":null,"warp_table_rom_address":5443816,"water_encounters":null},"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4742248,"land_encounters":null,"warp_table_rom_address":5443948,"water_encounters":null},"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4742276,"land_encounters":null,"warp_table_rom_address":5444096,"water_encounters":null},"MAP_LILYCOVE_CITY":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,120,313,313],"rom_address":5591840},"header_rom_address":4740204,"land_encounters":null,"warp_table_rom_address":5414432,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5591812}},"MAP_LILYCOVE_CITY_CONTEST_HALL":{"fishing_encounters":null,"header_rom_address":4744684,"land_encounters":null,"warp_table_rom_address":5458600,"water_encounters":null},"MAP_LILYCOVE_CITY_CONTEST_LOBBY":{"fishing_encounters":null,"header_rom_address":4744656,"land_encounters":null,"warp_table_rom_address":5457636,"water_encounters":null},"MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F":{"fishing_encounters":null,"header_rom_address":4744544,"land_encounters":null,"warp_table_rom_address":5456036,"water_encounters":null},"MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F":{"fishing_encounters":null,"header_rom_address":4744572,"land_encounters":null,"warp_table_rom_address":5456264,"water_encounters":null},"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F":{"fishing_encounters":null,"header_rom_address":4744992,"land_encounters":null,"warp_table_rom_address":5460084,"water_encounters":null},"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F":{"fishing_encounters":null,"header_rom_address":4745020,"land_encounters":null,"warp_table_rom_address":5460268,"water_encounters":null},"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F":{"fishing_encounters":null,"header_rom_address":4745048,"land_encounters":null,"warp_table_rom_address":5460432,"water_encounters":null},"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F":{"fishing_encounters":null,"header_rom_address":4745076,"land_encounters":null,"warp_table_rom_address":5460596,"water_encounters":null},"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F":{"fishing_encounters":null,"header_rom_address":4745104,"land_encounters":null,"warp_table_rom_address":5460808,"water_encounters":null},"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR":{"fishing_encounters":null,"header_rom_address":4745160,"land_encounters":null,"warp_table_rom_address":5461024,"water_encounters":null},"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP":{"fishing_encounters":null,"header_rom_address":4745132,"land_encounters":null,"warp_table_rom_address":5460948,"water_encounters":null},"MAP_LILYCOVE_CITY_HARBOR":{"fishing_encounters":null,"header_rom_address":4744824,"land_encounters":null,"warp_table_rom_address":5459436,"water_encounters":null},"MAP_LILYCOVE_CITY_HOUSE1":{"fishing_encounters":null,"header_rom_address":4744880,"land_encounters":null,"warp_table_rom_address":5459580,"water_encounters":null},"MAP_LILYCOVE_CITY_HOUSE2":{"fishing_encounters":null,"header_rom_address":4744908,"land_encounters":null,"warp_table_rom_address":5459640,"water_encounters":null},"MAP_LILYCOVE_CITY_HOUSE3":{"fishing_encounters":null,"header_rom_address":4744936,"land_encounters":null,"warp_table_rom_address":5459820,"water_encounters":null},"MAP_LILYCOVE_CITY_HOUSE4":{"fishing_encounters":null,"header_rom_address":4744964,"land_encounters":null,"warp_table_rom_address":5459904,"water_encounters":null},"MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F":{"fishing_encounters":null,"header_rom_address":4744600,"land_encounters":null,"warp_table_rom_address":5456532,"water_encounters":null},"MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F":{"fishing_encounters":null,"header_rom_address":4744628,"land_encounters":null,"warp_table_rom_address":5456864,"water_encounters":null},"MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE":{"fishing_encounters":null,"header_rom_address":4744852,"land_encounters":null,"warp_table_rom_address":5459496,"water_encounters":null},"MAP_LILYCOVE_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4744712,"land_encounters":null,"warp_table_rom_address":5458844,"water_encounters":null},"MAP_LILYCOVE_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4744740,"land_encounters":null,"warp_table_rom_address":5458984,"water_encounters":null},"MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB":{"fishing_encounters":null,"header_rom_address":4744796,"land_encounters":null,"warp_table_rom_address":5459280,"water_encounters":null},"MAP_LILYCOVE_CITY_UNUSED_MART":{"fishing_encounters":null,"header_rom_address":4744768,"land_encounters":null,"warp_table_rom_address":5459028,"water_encounters":null},"MAP_LITTLEROOT_TOWN":{"fishing_encounters":null,"header_rom_address":4740316,"land_encounters":null,"warp_table_rom_address":5416592,"water_encounters":null},"MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F":{"fishing_encounters":null,"header_rom_address":4741660,"land_encounters":null,"warp_table_rom_address":5439628,"water_encounters":null},"MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F":{"fishing_encounters":null,"header_rom_address":4741688,"land_encounters":null,"warp_table_rom_address":5440120,"water_encounters":null},"MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F":{"fishing_encounters":null,"header_rom_address":4741716,"land_encounters":null,"warp_table_rom_address":5440364,"water_encounters":null},"MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F":{"fishing_encounters":null,"header_rom_address":4741744,"land_encounters":null,"warp_table_rom_address":5440856,"water_encounters":null},"MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB":{"fishing_encounters":null,"header_rom_address":4741772,"land_encounters":null,"warp_table_rom_address":5441076,"water_encounters":null},"MAP_MAGMA_HIDEOUT_1F":{"fishing_encounters":null,"header_rom_address":4749136,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5592888},"warp_table_rom_address":5480884,"water_encounters":null},"MAP_MAGMA_HIDEOUT_2F_1R":{"fishing_encounters":null,"header_rom_address":4749164,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5592944},"warp_table_rom_address":5481032,"water_encounters":null},"MAP_MAGMA_HIDEOUT_2F_2R":{"fishing_encounters":null,"header_rom_address":4749192,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5593000},"warp_table_rom_address":5481220,"water_encounters":null},"MAP_MAGMA_HIDEOUT_2F_3R":{"fishing_encounters":null,"header_rom_address":4749332,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5593280},"warp_table_rom_address":5481736,"water_encounters":null},"MAP_MAGMA_HIDEOUT_3F_1R":{"fishing_encounters":null,"header_rom_address":4749220,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5593056},"warp_table_rom_address":5481328,"water_encounters":null},"MAP_MAGMA_HIDEOUT_3F_2R":{"fishing_encounters":null,"header_rom_address":4749248,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5593112},"warp_table_rom_address":5481420,"water_encounters":null},"MAP_MAGMA_HIDEOUT_3F_3R":{"fishing_encounters":null,"header_rom_address":4749304,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5593224},"warp_table_rom_address":5481700,"water_encounters":null},"MAP_MAGMA_HIDEOUT_4F":{"fishing_encounters":null,"header_rom_address":4749276,"land_encounters":{"encounter_slots":[74,321,74,321,74,74,74,75,75,75,75,75],"rom_address":5593168},"warp_table_rom_address":5481640,"water_encounters":null},"MAP_MARINE_CAVE_END":{"fishing_encounters":null,"header_rom_address":4749612,"land_encounters":null,"warp_table_rom_address":5482328,"water_encounters":null},"MAP_MARINE_CAVE_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4749584,"land_encounters":null,"warp_table_rom_address":5482276,"water_encounters":null},"MAP_MAUVILLE_CITY":{"fishing_encounters":null,"header_rom_address":4740120,"land_encounters":null,"warp_table_rom_address":5412444,"water_encounters":null},"MAP_MAUVILLE_CITY_BIKE_SHOP":{"fishing_encounters":null,"header_rom_address":4743592,"land_encounters":null,"warp_table_rom_address":5451272,"water_encounters":null},"MAP_MAUVILLE_CITY_GAME_CORNER":{"fishing_encounters":null,"header_rom_address":4743648,"land_encounters":null,"warp_table_rom_address":5451680,"water_encounters":null},"MAP_MAUVILLE_CITY_GYM":{"fishing_encounters":null,"header_rom_address":4743564,"land_encounters":null,"warp_table_rom_address":5451100,"water_encounters":null},"MAP_MAUVILLE_CITY_HOUSE1":{"fishing_encounters":null,"header_rom_address":4743620,"land_encounters":null,"warp_table_rom_address":5451356,"water_encounters":null},"MAP_MAUVILLE_CITY_HOUSE2":{"fishing_encounters":null,"header_rom_address":4743676,"land_encounters":null,"warp_table_rom_address":5452028,"water_encounters":null},"MAP_MAUVILLE_CITY_MART":{"fishing_encounters":null,"header_rom_address":4743760,"land_encounters":null,"warp_table_rom_address":5452464,"water_encounters":null},"MAP_MAUVILLE_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4743704,"land_encounters":null,"warp_table_rom_address":5452184,"water_encounters":null},"MAP_MAUVILLE_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4743732,"land_encounters":null,"warp_table_rom_address":5452348,"water_encounters":null},"MAP_METEOR_FALLS_1F_1R":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,323,323,323],"rom_address":5591124},"header_rom_address":4746728,"land_encounters":{"encounter_slots":[41,41,41,41,41,349,349,349,41,41,41,41],"rom_address":5591040},"warp_table_rom_address":5468092,"water_encounters":{"encounter_slots":[41,41,349,349,349],"rom_address":5591096}},"MAP_METEOR_FALLS_1F_2R":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,324,324,324],"rom_address":5591256},"header_rom_address":4746756,"land_encounters":{"encounter_slots":[42,42,42,349,349,349,42,349,42,42,42,42],"rom_address":5591172},"warp_table_rom_address":5468260,"water_encounters":{"encounter_slots":[42,42,349,349,349],"rom_address":5591228}},"MAP_METEOR_FALLS_B1F_1R":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,324,324,324],"rom_address":5591388},"header_rom_address":4746784,"land_encounters":{"encounter_slots":[42,42,42,349,349,349,42,349,42,42,42,42],"rom_address":5591304},"warp_table_rom_address":5468324,"water_encounters":{"encounter_slots":[42,42,349,349,349],"rom_address":5591360}},"MAP_METEOR_FALLS_B1F_2R":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,324,324,324],"rom_address":5586924},"header_rom_address":4746812,"land_encounters":{"encounter_slots":[42,42,395,349,395,349,395,349,42,42,42,42],"rom_address":5586840},"warp_table_rom_address":5468416,"water_encounters":{"encounter_slots":[42,42,349,349,349],"rom_address":5586896}},"MAP_METEOR_FALLS_STEVENS_CAVE":{"fishing_encounters":null,"header_rom_address":4749724,"land_encounters":{"encounter_slots":[42,42,42,349,349,349,42,349,42,42,42,42],"rom_address":5594232},"warp_table_rom_address":5482528,"water_encounters":null},"MAP_MIRAGE_TOWER_1F":{"fishing_encounters":null,"header_rom_address":4749360,"land_encounters":{"encounter_slots":[27,332,27,332,27,332,27,332,27,332,27,332],"rom_address":5593336},"warp_table_rom_address":5481772,"water_encounters":null},"MAP_MIRAGE_TOWER_2F":{"fishing_encounters":null,"header_rom_address":4749388,"land_encounters":{"encounter_slots":[27,332,27,332,27,332,27,332,27,332,27,332],"rom_address":5593392},"warp_table_rom_address":5481808,"water_encounters":null},"MAP_MIRAGE_TOWER_3F":{"fishing_encounters":null,"header_rom_address":4749416,"land_encounters":{"encounter_slots":[27,332,27,332,27,332,27,332,27,332,27,332],"rom_address":5593448},"warp_table_rom_address":5481892,"water_encounters":null},"MAP_MIRAGE_TOWER_4F":{"fishing_encounters":null,"header_rom_address":4749444,"land_encounters":{"encounter_slots":[27,332,27,332,27,332,27,332,27,332,27,332],"rom_address":5593504},"warp_table_rom_address":5482000,"water_encounters":null},"MAP_MOSSDEEP_CITY":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5592068},"header_rom_address":4740232,"land_encounters":null,"warp_table_rom_address":5415128,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5592040}},"MAP_MOSSDEEP_CITY_GAME_CORNER_1F":{"fishing_encounters":null,"header_rom_address":4745496,"land_encounters":null,"warp_table_rom_address":5463752,"water_encounters":null},"MAP_MOSSDEEP_CITY_GAME_CORNER_B1F":{"fishing_encounters":null,"header_rom_address":4745524,"land_encounters":null,"warp_table_rom_address":5463856,"water_encounters":null},"MAP_MOSSDEEP_CITY_GYM":{"fishing_encounters":null,"header_rom_address":4745188,"land_encounters":null,"warp_table_rom_address":5461924,"water_encounters":null},"MAP_MOSSDEEP_CITY_HOUSE1":{"fishing_encounters":null,"header_rom_address":4745216,"land_encounters":null,"warp_table_rom_address":5462272,"water_encounters":null},"MAP_MOSSDEEP_CITY_HOUSE2":{"fishing_encounters":null,"header_rom_address":4745244,"land_encounters":null,"warp_table_rom_address":5462380,"water_encounters":null},"MAP_MOSSDEEP_CITY_HOUSE3":{"fishing_encounters":null,"header_rom_address":4745356,"land_encounters":null,"warp_table_rom_address":5462852,"water_encounters":null},"MAP_MOSSDEEP_CITY_HOUSE4":{"fishing_encounters":null,"header_rom_address":4745412,"land_encounters":null,"warp_table_rom_address":5463116,"water_encounters":null},"MAP_MOSSDEEP_CITY_MART":{"fishing_encounters":null,"header_rom_address":4745328,"land_encounters":null,"warp_table_rom_address":5462792,"water_encounters":null},"MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4745272,"land_encounters":null,"warp_table_rom_address":5462488,"water_encounters":null},"MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4745300,"land_encounters":null,"warp_table_rom_address":5462652,"water_encounters":null},"MAP_MOSSDEEP_CITY_SPACE_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4745440,"land_encounters":null,"warp_table_rom_address":5463416,"water_encounters":null},"MAP_MOSSDEEP_CITY_SPACE_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4745468,"land_encounters":null,"warp_table_rom_address":5463676,"water_encounters":null},"MAP_MOSSDEEP_CITY_STEVENS_HOUSE":{"fishing_encounters":null,"header_rom_address":4745384,"land_encounters":null,"warp_table_rom_address":5462960,"water_encounters":null},"MAP_MT_CHIMNEY":{"fishing_encounters":null,"header_rom_address":4747064,"land_encounters":null,"warp_table_rom_address":5470704,"water_encounters":null},"MAP_MT_CHIMNEY_CABLE_CAR_STATION":{"fishing_encounters":null,"header_rom_address":4746532,"land_encounters":null,"warp_table_rom_address":5467184,"water_encounters":null},"MAP_MT_PYRE_1F":{"fishing_encounters":null,"header_rom_address":4747148,"land_encounters":{"encounter_slots":[377,377,377,377,377,377,377,377,377,377,377,377],"rom_address":5586428},"warp_table_rom_address":5471492,"water_encounters":null},"MAP_MT_PYRE_2F":{"fishing_encounters":null,"header_rom_address":4747176,"land_encounters":{"encounter_slots":[377,377,377,377,377,377,377,377,377,377,377,377],"rom_address":5588124},"warp_table_rom_address":5471752,"water_encounters":null},"MAP_MT_PYRE_3F":{"fishing_encounters":null,"header_rom_address":4747204,"land_encounters":{"encounter_slots":[377,377,377,377,377,377,377,377,377,377,377,377],"rom_address":5588180},"warp_table_rom_address":5471908,"water_encounters":null},"MAP_MT_PYRE_4F":{"fishing_encounters":null,"header_rom_address":4747232,"land_encounters":{"encounter_slots":[377,377,377,377,377,377,377,377,361,361,361,361],"rom_address":5588236},"warp_table_rom_address":5472024,"water_encounters":null},"MAP_MT_PYRE_5F":{"fishing_encounters":null,"header_rom_address":4747260,"land_encounters":{"encounter_slots":[377,377,377,377,377,377,377,377,361,361,361,361],"rom_address":5588292},"warp_table_rom_address":5472140,"water_encounters":null},"MAP_MT_PYRE_6F":{"fishing_encounters":null,"header_rom_address":4747288,"land_encounters":{"encounter_slots":[377,377,377,377,377,377,377,377,361,361,361,361],"rom_address":5588348},"warp_table_rom_address":5472272,"water_encounters":null},"MAP_MT_PYRE_EXTERIOR":{"fishing_encounters":null,"header_rom_address":4747316,"land_encounters":{"encounter_slots":[377,377,377,377,37,37,37,37,309,309,309,309],"rom_address":5588404},"warp_table_rom_address":5472356,"water_encounters":null},"MAP_MT_PYRE_SUMMIT":{"fishing_encounters":null,"header_rom_address":4747344,"land_encounters":{"encounter_slots":[377,377,377,377,377,377,377,361,361,361,411,411],"rom_address":5588460},"warp_table_rom_address":5472696,"water_encounters":null},"MAP_NAVEL_ROCK_B1F":{"fishing_encounters":null,"header_rom_address":4753392,"land_encounters":null,"warp_table_rom_address":5507564,"water_encounters":null},"MAP_NAVEL_ROCK_BOTTOM":{"fishing_encounters":null,"header_rom_address":4753896,"land_encounters":null,"warp_table_rom_address":5508288,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN01":{"fishing_encounters":null,"header_rom_address":4753588,"land_encounters":null,"warp_table_rom_address":5507868,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN02":{"fishing_encounters":null,"header_rom_address":4753616,"land_encounters":null,"warp_table_rom_address":5507904,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN03":{"fishing_encounters":null,"header_rom_address":4753644,"land_encounters":null,"warp_table_rom_address":5507940,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN04":{"fishing_encounters":null,"header_rom_address":4753672,"land_encounters":null,"warp_table_rom_address":5507976,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN05":{"fishing_encounters":null,"header_rom_address":4753700,"land_encounters":null,"warp_table_rom_address":5508012,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN06":{"fishing_encounters":null,"header_rom_address":4753728,"land_encounters":null,"warp_table_rom_address":5508048,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN07":{"fishing_encounters":null,"header_rom_address":4753756,"land_encounters":null,"warp_table_rom_address":5508084,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN08":{"fishing_encounters":null,"header_rom_address":4753784,"land_encounters":null,"warp_table_rom_address":5508120,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN09":{"fishing_encounters":null,"header_rom_address":4753812,"land_encounters":null,"warp_table_rom_address":5508156,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN10":{"fishing_encounters":null,"header_rom_address":4753840,"land_encounters":null,"warp_table_rom_address":5508192,"water_encounters":null},"MAP_NAVEL_ROCK_DOWN11":{"fishing_encounters":null,"header_rom_address":4753868,"land_encounters":null,"warp_table_rom_address":5508228,"water_encounters":null},"MAP_NAVEL_ROCK_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4753364,"land_encounters":null,"warp_table_rom_address":5507528,"water_encounters":null},"MAP_NAVEL_ROCK_EXTERIOR":{"fishing_encounters":null,"header_rom_address":4753308,"land_encounters":null,"warp_table_rom_address":5507416,"water_encounters":null},"MAP_NAVEL_ROCK_FORK":{"fishing_encounters":null,"header_rom_address":4753420,"land_encounters":null,"warp_table_rom_address":5507600,"water_encounters":null},"MAP_NAVEL_ROCK_HARBOR":{"fishing_encounters":null,"header_rom_address":4753336,"land_encounters":null,"warp_table_rom_address":5507500,"water_encounters":null},"MAP_NAVEL_ROCK_TOP":{"fishing_encounters":null,"header_rom_address":4753560,"land_encounters":null,"warp_table_rom_address":5507812,"water_encounters":null},"MAP_NAVEL_ROCK_UP1":{"fishing_encounters":null,"header_rom_address":4753448,"land_encounters":null,"warp_table_rom_address":5507644,"water_encounters":null},"MAP_NAVEL_ROCK_UP2":{"fishing_encounters":null,"header_rom_address":4753476,"land_encounters":null,"warp_table_rom_address":5507680,"water_encounters":null},"MAP_NAVEL_ROCK_UP3":{"fishing_encounters":null,"header_rom_address":4753504,"land_encounters":null,"warp_table_rom_address":5507716,"water_encounters":null},"MAP_NAVEL_ROCK_UP4":{"fishing_encounters":null,"header_rom_address":4753532,"land_encounters":null,"warp_table_rom_address":5507752,"water_encounters":null},"MAP_NEW_MAUVILLE_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4748184,"land_encounters":{"encounter_slots":[100,81,100,81,100,81,100,81,100,81,100,81],"rom_address":5590420},"warp_table_rom_address":5477324,"water_encounters":null},"MAP_NEW_MAUVILLE_INSIDE":{"fishing_encounters":null,"header_rom_address":4748212,"land_encounters":{"encounter_slots":[100,81,100,81,100,81,100,81,100,81,101,82],"rom_address":5587464},"warp_table_rom_address":5477568,"water_encounters":null},"MAP_OLDALE_TOWN":{"fishing_encounters":null,"header_rom_address":4740344,"land_encounters":null,"warp_table_rom_address":5416924,"water_encounters":null},"MAP_OLDALE_TOWN_HOUSE1":{"fishing_encounters":null,"header_rom_address":4741800,"land_encounters":null,"warp_table_rom_address":5441316,"water_encounters":null},"MAP_OLDALE_TOWN_HOUSE2":{"fishing_encounters":null,"header_rom_address":4741828,"land_encounters":null,"warp_table_rom_address":5441400,"water_encounters":null},"MAP_OLDALE_TOWN_MART":{"fishing_encounters":null,"header_rom_address":4741912,"land_encounters":null,"warp_table_rom_address":5441788,"water_encounters":null},"MAP_OLDALE_TOWN_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4741856,"land_encounters":null,"warp_table_rom_address":5441532,"water_encounters":null},"MAP_OLDALE_TOWN_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4741884,"land_encounters":null,"warp_table_rom_address":5441672,"water_encounters":null},"MAP_PACIFIDLOG_TOWN":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5592144},"header_rom_address":4740484,"land_encounters":null,"warp_table_rom_address":5418328,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5592116}},"MAP_PACIFIDLOG_TOWN_HOUSE1":{"fishing_encounters":null,"header_rom_address":4742836,"land_encounters":null,"warp_table_rom_address":5446440,"water_encounters":null},"MAP_PACIFIDLOG_TOWN_HOUSE2":{"fishing_encounters":null,"header_rom_address":4742864,"land_encounters":null,"warp_table_rom_address":5446548,"water_encounters":null},"MAP_PACIFIDLOG_TOWN_HOUSE3":{"fishing_encounters":null,"header_rom_address":4742892,"land_encounters":null,"warp_table_rom_address":5446632,"water_encounters":null},"MAP_PACIFIDLOG_TOWN_HOUSE4":{"fishing_encounters":null,"header_rom_address":4742920,"land_encounters":null,"warp_table_rom_address":5446740,"water_encounters":null},"MAP_PACIFIDLOG_TOWN_HOUSE5":{"fishing_encounters":null,"header_rom_address":4742948,"land_encounters":null,"warp_table_rom_address":5446824,"water_encounters":null},"MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4742780,"land_encounters":null,"warp_table_rom_address":5446208,"water_encounters":null},"MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4742808,"land_encounters":null,"warp_table_rom_address":5446348,"water_encounters":null},"MAP_PETALBURG_CITY":{"fishing_encounters":{"encounter_slots":[129,118,129,118,326,326,326,326,326,326],"rom_address":5592296},"header_rom_address":4740064,"land_encounters":null,"warp_table_rom_address":5410768,"water_encounters":{"encounter_slots":[183,183,183,183,183],"rom_address":5592268}},"MAP_PETALBURG_CITY_GYM":{"fishing_encounters":null,"header_rom_address":4743004,"land_encounters":null,"warp_table_rom_address":5447208,"water_encounters":null},"MAP_PETALBURG_CITY_HOUSE1":{"fishing_encounters":null,"header_rom_address":4743032,"land_encounters":null,"warp_table_rom_address":5447748,"water_encounters":null},"MAP_PETALBURG_CITY_HOUSE2":{"fishing_encounters":null,"header_rom_address":4743060,"land_encounters":null,"warp_table_rom_address":5447832,"water_encounters":null},"MAP_PETALBURG_CITY_MART":{"fishing_encounters":null,"header_rom_address":4743144,"land_encounters":null,"warp_table_rom_address":5448268,"water_encounters":null},"MAP_PETALBURG_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4743088,"land_encounters":null,"warp_table_rom_address":5447988,"water_encounters":null},"MAP_PETALBURG_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4743116,"land_encounters":null,"warp_table_rom_address":5448128,"water_encounters":null},"MAP_PETALBURG_CITY_WALLYS_HOUSE":{"fishing_encounters":null,"header_rom_address":4742976,"land_encounters":null,"warp_table_rom_address":5446908,"water_encounters":null},"MAP_PETALBURG_WOODS":{"fishing_encounters":null,"header_rom_address":4747036,"land_encounters":{"encounter_slots":[286,290,306,286,291,293,290,306,304,364,304,364],"rom_address":5586204},"warp_table_rom_address":5469812,"water_encounters":null},"MAP_RECORD_CORNER":{"fishing_encounters":null,"header_rom_address":4750480,"land_encounters":null,"warp_table_rom_address":5492076,"water_encounters":null},"MAP_ROUTE101":{"fishing_encounters":null,"header_rom_address":4740512,"land_encounters":{"encounter_slots":[290,286,290,290,286,286,290,286,288,288,288,288],"rom_address":5584716},"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_ROUTE102":{"fishing_encounters":{"encounter_slots":[129,118,129,118,326,326,326,326,326,326],"rom_address":5584856},"header_rom_address":4740540,"land_encounters":{"encounter_slots":[286,290,286,290,295,295,288,288,288,392,288,298],"rom_address":5584772},"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[183,183,183,183,118],"rom_address":5584828}},"MAP_ROUTE103":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5584988},"header_rom_address":4740568,"land_encounters":{"encounter_slots":[286,286,286,286,309,288,288,288,309,309,309,309],"rom_address":5584904},"warp_table_rom_address":5419492,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5584960}},"MAP_ROUTE104":{"fishing_encounters":{"encounter_slots":[129,129,129,129,129,129,129,129,129,129],"rom_address":5585120},"header_rom_address":4740596,"land_encounters":{"encounter_slots":[286,290,286,183,183,286,304,304,309,309,309,309],"rom_address":5585036},"warp_table_rom_address":5420348,"water_encounters":{"encounter_slots":[309,309,309,310,310],"rom_address":5585092}},"MAP_ROUTE104_MR_BRINEYS_HOUSE":{"fishing_encounters":null,"header_rom_address":4746392,"land_encounters":null,"warp_table_rom_address":5466716,"water_encounters":null},"MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP":{"fishing_encounters":null,"header_rom_address":4746420,"land_encounters":null,"warp_table_rom_address":5466824,"water_encounters":null},"MAP_ROUTE104_PROTOTYPE":{"fishing_encounters":null,"header_rom_address":4753952,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP":{"fishing_encounters":null,"header_rom_address":4753980,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_ROUTE105":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5585196},"header_rom_address":4740624,"land_encounters":null,"warp_table_rom_address":5420760,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5585168}},"MAP_ROUTE106":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5587056},"header_rom_address":4740652,"land_encounters":null,"warp_table_rom_address":5420932,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587028}},"MAP_ROUTE107":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5587132},"header_rom_address":4740680,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587104}},"MAP_ROUTE108":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5587208},"header_rom_address":4740708,"land_encounters":null,"warp_table_rom_address":5421364,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587180}},"MAP_ROUTE109":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5587284},"header_rom_address":4740736,"land_encounters":null,"warp_table_rom_address":5421980,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587256}},"MAP_ROUTE109_SEASHORE_HOUSE":{"fishing_encounters":null,"header_rom_address":4754008,"land_encounters":null,"warp_table_rom_address":5508512,"water_encounters":null},"MAP_ROUTE110":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5585328},"header_rom_address":4740764,"land_encounters":{"encounter_slots":[286,337,367,337,354,43,354,367,309,309,353,353],"rom_address":5585244},"warp_table_rom_address":5422968,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5585300}},"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4754344,"land_encounters":null,"warp_table_rom_address":5511440,"water_encounters":null},"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4754372,"land_encounters":null,"warp_table_rom_address":5511548,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4754092,"land_encounters":null,"warp_table_rom_address":5508780,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_END":{"fishing_encounters":null,"header_rom_address":4754064,"land_encounters":null,"warp_table_rom_address":5508716,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4754036,"land_encounters":null,"warp_table_rom_address":5508572,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE1":{"fishing_encounters":null,"header_rom_address":4754120,"land_encounters":null,"warp_table_rom_address":5509192,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE2":{"fishing_encounters":null,"header_rom_address":4754148,"land_encounters":null,"warp_table_rom_address":5509368,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE3":{"fishing_encounters":null,"header_rom_address":4754176,"land_encounters":null,"warp_table_rom_address":5509656,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE4":{"fishing_encounters":null,"header_rom_address":4754204,"land_encounters":null,"warp_table_rom_address":5510112,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE5":{"fishing_encounters":null,"header_rom_address":4754232,"land_encounters":null,"warp_table_rom_address":5510288,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE6":{"fishing_encounters":null,"header_rom_address":4754260,"land_encounters":null,"warp_table_rom_address":5510792,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7":{"fishing_encounters":null,"header_rom_address":4754288,"land_encounters":null,"warp_table_rom_address":5511064,"water_encounters":null},"MAP_ROUTE110_TRICK_HOUSE_PUZZLE8":{"fishing_encounters":null,"header_rom_address":4754316,"land_encounters":null,"warp_table_rom_address":5511360,"water_encounters":null},"MAP_ROUTE111":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,323,323,323],"rom_address":5585488},"header_rom_address":4740792,"land_encounters":{"encounter_slots":[27,332,27,332,318,318,27,332,318,344,344,344],"rom_address":5585376},"warp_table_rom_address":5424488,"water_encounters":{"encounter_slots":[183,183,183,183,118],"rom_address":5585432}},"MAP_ROUTE111_OLD_LADYS_REST_STOP":{"fishing_encounters":null,"header_rom_address":4746476,"land_encounters":null,"warp_table_rom_address":5467016,"water_encounters":null},"MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE":{"fishing_encounters":null,"header_rom_address":4746448,"land_encounters":null,"warp_table_rom_address":5466956,"water_encounters":null},"MAP_ROUTE112":{"fishing_encounters":null,"header_rom_address":4740820,"land_encounters":{"encounter_slots":[339,339,183,339,339,183,339,183,339,339,339,339],"rom_address":5585536},"warp_table_rom_address":5425644,"water_encounters":null},"MAP_ROUTE112_CABLE_CAR_STATION":{"fishing_encounters":null,"header_rom_address":4746504,"land_encounters":null,"warp_table_rom_address":5467100,"water_encounters":null},"MAP_ROUTE113":{"fishing_encounters":null,"header_rom_address":4740848,"land_encounters":{"encounter_slots":[308,308,218,308,308,218,308,218,308,227,308,227],"rom_address":5585592},"warp_table_rom_address":5426132,"water_encounters":null},"MAP_ROUTE113_GLASS_WORKSHOP":{"fishing_encounters":null,"header_rom_address":4754400,"land_encounters":null,"warp_table_rom_address":5511680,"water_encounters":null},"MAP_ROUTE114":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,323,323,323],"rom_address":5585760},"header_rom_address":4740876,"land_encounters":{"encounter_slots":[358,295,358,358,295,296,296,296,379,379,379,299],"rom_address":5585648},"warp_table_rom_address":5427224,"water_encounters":{"encounter_slots":[183,183,183,183,118],"rom_address":5585704}},"MAP_ROUTE114_FOSSIL_MANIACS_HOUSE":{"fishing_encounters":null,"header_rom_address":4746560,"land_encounters":null,"warp_table_rom_address":5467244,"water_encounters":null},"MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL":{"fishing_encounters":null,"header_rom_address":4746588,"land_encounters":null,"warp_table_rom_address":5467360,"water_encounters":null},"MAP_ROUTE114_LANETTES_HOUSE":{"fishing_encounters":null,"header_rom_address":4746616,"land_encounters":null,"warp_table_rom_address":5467460,"water_encounters":null},"MAP_ROUTE115":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5587416},"header_rom_address":4740904,"land_encounters":{"encounter_slots":[358,304,358,304,304,305,39,39,309,309,309,309],"rom_address":5587332},"warp_table_rom_address":5428028,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587388}},"MAP_ROUTE116":{"fishing_encounters":null,"header_rom_address":4740932,"land_encounters":{"encounter_slots":[286,370,301,63,301,304,304,304,286,286,315,315],"rom_address":5585808},"warp_table_rom_address":5428912,"water_encounters":null},"MAP_ROUTE116_TUNNELERS_REST_HOUSE":{"fishing_encounters":null,"header_rom_address":4746644,"land_encounters":null,"warp_table_rom_address":5467604,"water_encounters":null},"MAP_ROUTE117":{"fishing_encounters":{"encounter_slots":[129,118,129,118,326,326,326,326,326,326],"rom_address":5585948},"header_rom_address":4740960,"land_encounters":{"encounter_slots":[286,43,286,43,183,43,387,387,387,387,386,298],"rom_address":5585864},"warp_table_rom_address":5429696,"water_encounters":{"encounter_slots":[183,183,183,183,118],"rom_address":5585920}},"MAP_ROUTE117_POKEMON_DAY_CARE":{"fishing_encounters":null,"header_rom_address":4746672,"land_encounters":null,"warp_table_rom_address":5467664,"water_encounters":null},"MAP_ROUTE118":{"fishing_encounters":{"encounter_slots":[129,72,129,72,330,331,330,330,330,330],"rom_address":5586080},"header_rom_address":4740988,"land_encounters":{"encounter_slots":[288,337,288,337,289,338,309,309,309,309,309,317],"rom_address":5585996},"warp_table_rom_address":5430276,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5586052}},"MAP_ROUTE119":{"fishing_encounters":{"encounter_slots":[129,72,129,72,330,330,330,330,330,330],"rom_address":5587604},"header_rom_address":4741016,"land_encounters":{"encounter_slots":[288,289,288,43,289,43,43,43,369,369,369,317],"rom_address":5587520},"warp_table_rom_address":5431500,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587576}},"MAP_ROUTE119_HOUSE":{"fishing_encounters":null,"header_rom_address":4754512,"land_encounters":null,"warp_table_rom_address":5512400,"water_encounters":null},"MAP_ROUTE119_WEATHER_INSTITUTE_1F":{"fishing_encounters":null,"header_rom_address":4754456,"land_encounters":null,"warp_table_rom_address":5511920,"water_encounters":null},"MAP_ROUTE119_WEATHER_INSTITUTE_2F":{"fishing_encounters":null,"header_rom_address":4754484,"land_encounters":null,"warp_table_rom_address":5512204,"water_encounters":null},"MAP_ROUTE120":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,323,323,323],"rom_address":5587736},"header_rom_address":4741044,"land_encounters":{"encounter_slots":[286,287,287,43,183,43,43,183,376,376,317,298],"rom_address":5587652},"warp_table_rom_address":5433200,"water_encounters":{"encounter_slots":[183,183,183,183,118],"rom_address":5587708}},"MAP_ROUTE121":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5587868},"header_rom_address":4741072,"land_encounters":{"encounter_slots":[286,377,287,377,287,43,43,44,309,309,309,317],"rom_address":5587784},"warp_table_rom_address":5434404,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587840}},"MAP_ROUTE121_SAFARI_ZONE_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4746700,"land_encounters":null,"warp_table_rom_address":5467772,"water_encounters":null},"MAP_ROUTE122":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5587944},"header_rom_address":4741100,"land_encounters":null,"warp_table_rom_address":5434616,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5587916}},"MAP_ROUTE123":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5588076},"header_rom_address":4741128,"land_encounters":{"encounter_slots":[286,377,287,377,287,43,43,44,309,309,309,317],"rom_address":5587992},"warp_table_rom_address":5435676,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5588048}},"MAP_ROUTE123_BERRY_MASTERS_HOUSE":{"fishing_encounters":null,"header_rom_address":4754428,"land_encounters":null,"warp_table_rom_address":5511764,"water_encounters":null},"MAP_ROUTE124":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5586156},"header_rom_address":4741156,"land_encounters":null,"warp_table_rom_address":5436476,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5586128}},"MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE":{"fishing_encounters":null,"header_rom_address":4754540,"land_encounters":null,"warp_table_rom_address":5512460,"water_encounters":null},"MAP_ROUTE125":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5588600},"header_rom_address":4741184,"land_encounters":null,"warp_table_rom_address":5436756,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5588572}},"MAP_ROUTE126":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5588676},"header_rom_address":4741212,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5588648}},"MAP_ROUTE127":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5588752},"header_rom_address":4741240,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5588724}},"MAP_ROUTE128":{"fishing_encounters":{"encounter_slots":[129,72,129,325,313,325,313,222,313,313],"rom_address":5588828},"header_rom_address":4741268,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5588800}},"MAP_ROUTE129":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5588904},"header_rom_address":4741296,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,314],"rom_address":5588876}},"MAP_ROUTE130":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5589036},"header_rom_address":4741324,"land_encounters":{"encounter_slots":[360,360,360,360,360,360,360,360,360,360,360,360],"rom_address":5588952},"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5589008}},"MAP_ROUTE131":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,313,313,313],"rom_address":5589112},"header_rom_address":4741352,"land_encounters":null,"warp_table_rom_address":5438156,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5589084}},"MAP_ROUTE132":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,116,313,313],"rom_address":5589188},"header_rom_address":4741380,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5589160}},"MAP_ROUTE133":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,116,313,313],"rom_address":5589264},"header_rom_address":4741408,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5589236}},"MAP_ROUTE134":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,331,313,116,313,313],"rom_address":5589340},"header_rom_address":4741436,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5589312}},"MAP_RUSTBORO_CITY":{"fishing_encounters":null,"header_rom_address":4740148,"land_encounters":null,"warp_table_rom_address":5413000,"water_encounters":null},"MAP_RUSTBORO_CITY_CUTTERS_HOUSE":{"fishing_encounters":null,"header_rom_address":4744096,"land_encounters":null,"warp_table_rom_address":5454244,"water_encounters":null},"MAP_RUSTBORO_CITY_DEVON_CORP_1F":{"fishing_encounters":null,"header_rom_address":4743788,"land_encounters":null,"warp_table_rom_address":5452572,"water_encounters":null},"MAP_RUSTBORO_CITY_DEVON_CORP_2F":{"fishing_encounters":null,"header_rom_address":4743816,"land_encounters":null,"warp_table_rom_address":5452784,"water_encounters":null},"MAP_RUSTBORO_CITY_DEVON_CORP_3F":{"fishing_encounters":null,"header_rom_address":4743844,"land_encounters":null,"warp_table_rom_address":5452892,"water_encounters":null},"MAP_RUSTBORO_CITY_FLAT1_1F":{"fishing_encounters":null,"header_rom_address":4744012,"land_encounters":null,"warp_table_rom_address":5453848,"water_encounters":null},"MAP_RUSTBORO_CITY_FLAT1_2F":{"fishing_encounters":null,"header_rom_address":4744040,"land_encounters":null,"warp_table_rom_address":5454084,"water_encounters":null},"MAP_RUSTBORO_CITY_FLAT2_1F":{"fishing_encounters":null,"header_rom_address":4744152,"land_encounters":null,"warp_table_rom_address":5454412,"water_encounters":null},"MAP_RUSTBORO_CITY_FLAT2_2F":{"fishing_encounters":null,"header_rom_address":4744180,"land_encounters":null,"warp_table_rom_address":5454504,"water_encounters":null},"MAP_RUSTBORO_CITY_FLAT2_3F":{"fishing_encounters":null,"header_rom_address":4744208,"land_encounters":null,"warp_table_rom_address":5454588,"water_encounters":null},"MAP_RUSTBORO_CITY_GYM":{"fishing_encounters":null,"header_rom_address":4743872,"land_encounters":null,"warp_table_rom_address":5453064,"water_encounters":null},"MAP_RUSTBORO_CITY_HOUSE1":{"fishing_encounters":null,"header_rom_address":4744068,"land_encounters":null,"warp_table_rom_address":5454160,"water_encounters":null},"MAP_RUSTBORO_CITY_HOUSE2":{"fishing_encounters":null,"header_rom_address":4744124,"land_encounters":null,"warp_table_rom_address":5454328,"water_encounters":null},"MAP_RUSTBORO_CITY_HOUSE3":{"fishing_encounters":null,"header_rom_address":4744236,"land_encounters":null,"warp_table_rom_address":5454688,"water_encounters":null},"MAP_RUSTBORO_CITY_MART":{"fishing_encounters":null,"header_rom_address":4743984,"land_encounters":null,"warp_table_rom_address":5453764,"water_encounters":null},"MAP_RUSTBORO_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4743928,"land_encounters":null,"warp_table_rom_address":5453484,"water_encounters":null},"MAP_RUSTBORO_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4743956,"land_encounters":null,"warp_table_rom_address":5453624,"water_encounters":null},"MAP_RUSTBORO_CITY_POKEMON_SCHOOL":{"fishing_encounters":null,"header_rom_address":4743900,"land_encounters":null,"warp_table_rom_address":5453292,"water_encounters":null},"MAP_RUSTURF_TUNNEL":{"fishing_encounters":null,"header_rom_address":4746840,"land_encounters":{"encounter_slots":[370,370,370,370,370,370,370,370,370,370,370,370],"rom_address":5586260},"warp_table_rom_address":5468684,"water_encounters":null},"MAP_SAFARI_ZONE_NORTH":{"fishing_encounters":null,"header_rom_address":4751488,"land_encounters":{"encounter_slots":[231,43,231,43,177,44,44,177,178,214,178,214],"rom_address":5590608},"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_SAFARI_ZONE_NORTHEAST":{"fishing_encounters":null,"header_rom_address":4751796,"land_encounters":{"encounter_slots":[190,216,190,216,191,165,163,204,228,241,228,241],"rom_address":5592804},"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_SAFARI_ZONE_NORTHWEST":{"fishing_encounters":{"encounter_slots":[129,118,129,118,118,118,118,119,119,119],"rom_address":5590776},"header_rom_address":4751460,"land_encounters":{"encounter_slots":[111,43,111,43,84,44,44,84,85,127,85,127],"rom_address":5590692},"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[54,54,54,55,55],"rom_address":5590748}},"MAP_SAFARI_ZONE_REST_HOUSE":{"fishing_encounters":null,"header_rom_address":4751768,"land_encounters":null,"warp_table_rom_address":5499036,"water_encounters":null},"MAP_SAFARI_ZONE_SOUTH":{"fishing_encounters":null,"header_rom_address":4751544,"land_encounters":{"encounter_slots":[43,43,203,203,177,84,44,202,25,202,25,202],"rom_address":5586540},"warp_table_rom_address":5497484,"water_encounters":null},"MAP_SAFARI_ZONE_SOUTHEAST":{"fishing_encounters":{"encounter_slots":[129,118,129,118,223,118,223,223,223,224],"rom_address":5592756},"header_rom_address":4751824,"land_encounters":{"encounter_slots":[191,179,191,179,190,167,163,209,234,207,234,207],"rom_address":5592672},"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[194,183,183,183,195],"rom_address":5592728}},"MAP_SAFARI_ZONE_SOUTHWEST":{"fishing_encounters":{"encounter_slots":[129,118,129,118,118,118,118,119,119,119],"rom_address":5590560},"header_rom_address":4751516,"land_encounters":{"encounter_slots":[43,43,203,203,177,84,44,202,25,202,25,202],"rom_address":5590476},"warp_table_rom_address":5497300,"water_encounters":{"encounter_slots":[54,54,54,54,54],"rom_address":5590532}},"MAP_SCORCHED_SLAB":{"fishing_encounters":null,"header_rom_address":4748772,"land_encounters":null,"warp_table_rom_address":5480184,"water_encounters":null},"MAP_SEAFLOOR_CAVERN_ENTRANCE":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5590092},"header_rom_address":4747484,"land_encounters":null,"warp_table_rom_address":5473836,"water_encounters":{"encounter_slots":[72,41,41,42,42],"rom_address":5590064}},"MAP_SEAFLOOR_CAVERN_ROOM1":{"fishing_encounters":null,"header_rom_address":4747512,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5589464},"warp_table_rom_address":5473992,"water_encounters":null},"MAP_SEAFLOOR_CAVERN_ROOM2":{"fishing_encounters":null,"header_rom_address":4747540,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5589520},"warp_table_rom_address":5474228,"water_encounters":null},"MAP_SEAFLOOR_CAVERN_ROOM3":{"fishing_encounters":null,"header_rom_address":4747568,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5589576},"warp_table_rom_address":5474496,"water_encounters":null},"MAP_SEAFLOOR_CAVERN_ROOM4":{"fishing_encounters":null,"header_rom_address":4747596,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5589632},"warp_table_rom_address":5474588,"water_encounters":null},"MAP_SEAFLOOR_CAVERN_ROOM5":{"fishing_encounters":null,"header_rom_address":4747624,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5589688},"warp_table_rom_address":5474784,"water_encounters":null},"MAP_SEAFLOOR_CAVERN_ROOM6":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5589828},"header_rom_address":4747652,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5589744},"warp_table_rom_address":5474828,"water_encounters":{"encounter_slots":[72,41,41,42,42],"rom_address":5589800}},"MAP_SEAFLOOR_CAVERN_ROOM7":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5589960},"header_rom_address":4747680,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5589876},"warp_table_rom_address":5474872,"water_encounters":{"encounter_slots":[72,41,41,42,42],"rom_address":5589932}},"MAP_SEAFLOOR_CAVERN_ROOM8":{"fishing_encounters":null,"header_rom_address":4747708,"land_encounters":{"encounter_slots":[41,41,41,41,41,41,41,41,42,42,42,42],"rom_address":5590008},"warp_table_rom_address":5475196,"water_encounters":null},"MAP_SEAFLOOR_CAVERN_ROOM9":{"fishing_encounters":null,"header_rom_address":4747736,"land_encounters":null,"warp_table_rom_address":5475400,"water_encounters":null},"MAP_SEALED_CHAMBER_INNER_ROOM":{"fishing_encounters":null,"header_rom_address":4748744,"land_encounters":null,"warp_table_rom_address":5480024,"water_encounters":null},"MAP_SEALED_CHAMBER_OUTER_ROOM":{"fishing_encounters":null,"header_rom_address":4748716,"land_encounters":null,"warp_table_rom_address":5479648,"water_encounters":null},"MAP_SECRET_BASE_BLUE_CAVE1":{"fishing_encounters":null,"header_rom_address":4749808,"land_encounters":null,"warp_table_rom_address":5483692,"water_encounters":null},"MAP_SECRET_BASE_BLUE_CAVE2":{"fishing_encounters":null,"header_rom_address":4749976,"land_encounters":null,"warp_table_rom_address":5486020,"water_encounters":null},"MAP_SECRET_BASE_BLUE_CAVE3":{"fishing_encounters":null,"header_rom_address":4750144,"land_encounters":null,"warp_table_rom_address":5488348,"water_encounters":null},"MAP_SECRET_BASE_BLUE_CAVE4":{"fishing_encounters":null,"header_rom_address":4750312,"land_encounters":null,"warp_table_rom_address":5490676,"water_encounters":null},"MAP_SECRET_BASE_BROWN_CAVE1":{"fishing_encounters":null,"header_rom_address":4749780,"land_encounters":null,"warp_table_rom_address":5483304,"water_encounters":null},"MAP_SECRET_BASE_BROWN_CAVE2":{"fishing_encounters":null,"header_rom_address":4749948,"land_encounters":null,"warp_table_rom_address":5485632,"water_encounters":null},"MAP_SECRET_BASE_BROWN_CAVE3":{"fishing_encounters":null,"header_rom_address":4750116,"land_encounters":null,"warp_table_rom_address":5487960,"water_encounters":null},"MAP_SECRET_BASE_BROWN_CAVE4":{"fishing_encounters":null,"header_rom_address":4750284,"land_encounters":null,"warp_table_rom_address":5490288,"water_encounters":null},"MAP_SECRET_BASE_RED_CAVE1":{"fishing_encounters":null,"header_rom_address":4749752,"land_encounters":null,"warp_table_rom_address":5482916,"water_encounters":null},"MAP_SECRET_BASE_RED_CAVE2":{"fishing_encounters":null,"header_rom_address":4749920,"land_encounters":null,"warp_table_rom_address":5485244,"water_encounters":null},"MAP_SECRET_BASE_RED_CAVE3":{"fishing_encounters":null,"header_rom_address":4750088,"land_encounters":null,"warp_table_rom_address":5487572,"water_encounters":null},"MAP_SECRET_BASE_RED_CAVE4":{"fishing_encounters":null,"header_rom_address":4750256,"land_encounters":null,"warp_table_rom_address":5489900,"water_encounters":null},"MAP_SECRET_BASE_SHRUB1":{"fishing_encounters":null,"header_rom_address":4749892,"land_encounters":null,"warp_table_rom_address":5484856,"water_encounters":null},"MAP_SECRET_BASE_SHRUB2":{"fishing_encounters":null,"header_rom_address":4750060,"land_encounters":null,"warp_table_rom_address":5487184,"water_encounters":null},"MAP_SECRET_BASE_SHRUB3":{"fishing_encounters":null,"header_rom_address":4750228,"land_encounters":null,"warp_table_rom_address":5489512,"water_encounters":null},"MAP_SECRET_BASE_SHRUB4":{"fishing_encounters":null,"header_rom_address":4750396,"land_encounters":null,"warp_table_rom_address":5491840,"water_encounters":null},"MAP_SECRET_BASE_TREE1":{"fishing_encounters":null,"header_rom_address":4749864,"land_encounters":null,"warp_table_rom_address":5484468,"water_encounters":null},"MAP_SECRET_BASE_TREE2":{"fishing_encounters":null,"header_rom_address":4750032,"land_encounters":null,"warp_table_rom_address":5486796,"water_encounters":null},"MAP_SECRET_BASE_TREE3":{"fishing_encounters":null,"header_rom_address":4750200,"land_encounters":null,"warp_table_rom_address":5489124,"water_encounters":null},"MAP_SECRET_BASE_TREE4":{"fishing_encounters":null,"header_rom_address":4750368,"land_encounters":null,"warp_table_rom_address":5491452,"water_encounters":null},"MAP_SECRET_BASE_YELLOW_CAVE1":{"fishing_encounters":null,"header_rom_address":4749836,"land_encounters":null,"warp_table_rom_address":5484080,"water_encounters":null},"MAP_SECRET_BASE_YELLOW_CAVE2":{"fishing_encounters":null,"header_rom_address":4750004,"land_encounters":null,"warp_table_rom_address":5486408,"water_encounters":null},"MAP_SECRET_BASE_YELLOW_CAVE3":{"fishing_encounters":null,"header_rom_address":4750172,"land_encounters":null,"warp_table_rom_address":5488736,"water_encounters":null},"MAP_SECRET_BASE_YELLOW_CAVE4":{"fishing_encounters":null,"header_rom_address":4750340,"land_encounters":null,"warp_table_rom_address":5491064,"water_encounters":null},"MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM":{"fishing_encounters":null,"header_rom_address":4748128,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM":{"fishing_encounters":null,"header_rom_address":4748156,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5591764},"header_rom_address":4748016,"land_encounters":{"encounter_slots":[41,341,41,341,41,341,41,341,42,341,42,341],"rom_address":5591680},"warp_table_rom_address":5476868,"water_encounters":{"encounter_slots":[72,41,341,341,341],"rom_address":5591736}},"MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM":{"fishing_encounters":null,"header_rom_address":4749052,"land_encounters":{"encounter_slots":[41,341,41,341,41,341,346,341,42,346,42,346],"rom_address":5592372},"warp_table_rom_address":5480584,"water_encounters":null},"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5591632},"header_rom_address":4748044,"land_encounters":{"encounter_slots":[41,341,41,341,41,341,41,341,42,341,42,341],"rom_address":5591548},"warp_table_rom_address":5476944,"water_encounters":{"encounter_slots":[72,41,341,341,341],"rom_address":5591604}},"MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM":{"fishing_encounters":null,"header_rom_address":4748100,"land_encounters":{"encounter_slots":[41,341,41,341,41,341,41,341,42,341,42,341],"rom_address":5591492},"warp_table_rom_address":5477220,"water_encounters":null},"MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM":{"fishing_encounters":null,"header_rom_address":4748072,"land_encounters":{"encounter_slots":[41,341,41,341,41,341,41,341,42,341,42,341],"rom_address":5591436},"warp_table_rom_address":5477124,"water_encounters":null},"MAP_SKY_PILLAR_1F":{"fishing_encounters":null,"header_rom_address":4748940,"land_encounters":{"encounter_slots":[322,42,42,322,319,378,378,319,319,319,319,319],"rom_address":5592428},"warp_table_rom_address":5480368,"water_encounters":null},"MAP_SKY_PILLAR_2F":{"fishing_encounters":null,"header_rom_address":4748968,"land_encounters":null,"warp_table_rom_address":5480412,"water_encounters":null},"MAP_SKY_PILLAR_3F":{"fishing_encounters":null,"header_rom_address":4748996,"land_encounters":{"encounter_slots":[322,42,42,322,319,378,378,319,319,319,319,319],"rom_address":5592560},"warp_table_rom_address":5480448,"water_encounters":null},"MAP_SKY_PILLAR_4F":{"fishing_encounters":null,"header_rom_address":4749024,"land_encounters":null,"warp_table_rom_address":5480492,"water_encounters":null},"MAP_SKY_PILLAR_5F":{"fishing_encounters":null,"header_rom_address":4749080,"land_encounters":{"encounter_slots":[322,42,42,322,319,378,378,319,319,359,359,359],"rom_address":5592616},"warp_table_rom_address":5480612,"water_encounters":null},"MAP_SKY_PILLAR_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4748884,"land_encounters":null,"warp_table_rom_address":5480272,"water_encounters":null},"MAP_SKY_PILLAR_OUTSIDE":{"fishing_encounters":null,"header_rom_address":4748912,"land_encounters":null,"warp_table_rom_address":5480332,"water_encounters":null},"MAP_SKY_PILLAR_TOP":{"fishing_encounters":null,"header_rom_address":4749108,"land_encounters":null,"warp_table_rom_address":5480696,"water_encounters":null},"MAP_SLATEPORT_CITY":{"fishing_encounters":{"encounter_slots":[129,72,129,72,313,313,313,313,313,313],"rom_address":5591992},"header_rom_address":4740092,"land_encounters":null,"warp_table_rom_address":5411900,"water_encounters":{"encounter_slots":[72,309,309,310,310],"rom_address":5591964}},"MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4743284,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4743256,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY":{"fishing_encounters":null,"header_rom_address":4743228,"land_encounters":null,"warp_table_rom_address":5448664,"water_encounters":null},"MAP_SLATEPORT_CITY_HARBOR":{"fishing_encounters":null,"header_rom_address":4743424,"land_encounters":null,"warp_table_rom_address":5450368,"water_encounters":null},"MAP_SLATEPORT_CITY_HOUSE":{"fishing_encounters":null,"header_rom_address":4743452,"land_encounters":null,"warp_table_rom_address":5450532,"water_encounters":null},"MAP_SLATEPORT_CITY_MART":{"fishing_encounters":null,"header_rom_address":4743536,"land_encounters":null,"warp_table_rom_address":5450896,"water_encounters":null},"MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE":{"fishing_encounters":null,"header_rom_address":4743312,"land_encounters":null,"warp_table_rom_address":5448872,"water_encounters":null},"MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F":{"fishing_encounters":null,"header_rom_address":4743368,"land_encounters":null,"warp_table_rom_address":5449496,"water_encounters":null},"MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F":{"fishing_encounters":null,"header_rom_address":4743396,"land_encounters":null,"warp_table_rom_address":5449896,"water_encounters":null},"MAP_SLATEPORT_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4743480,"land_encounters":null,"warp_table_rom_address":5450640,"water_encounters":null},"MAP_SLATEPORT_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4743508,"land_encounters":null,"warp_table_rom_address":5450780,"water_encounters":null},"MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB":{"fishing_encounters":null,"header_rom_address":4743340,"land_encounters":null,"warp_table_rom_address":5449124,"water_encounters":null},"MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F":{"fishing_encounters":null,"header_rom_address":4743172,"land_encounters":null,"warp_table_rom_address":5448400,"water_encounters":null},"MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F":{"fishing_encounters":null,"header_rom_address":4743200,"land_encounters":null,"warp_table_rom_address":5448516,"water_encounters":null},"MAP_SOOTOPOLIS_CITY":{"fishing_encounters":{"encounter_slots":[129,72,129,129,129,129,129,130,130,130],"rom_address":5592512},"header_rom_address":4740260,"land_encounters":null,"warp_table_rom_address":5415916,"water_encounters":{"encounter_slots":[129,129,129,129,129],"rom_address":5592484}},"MAP_SOOTOPOLIS_CITY_GYM_1F":{"fishing_encounters":null,"header_rom_address":4745552,"land_encounters":null,"warp_table_rom_address":5463932,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_GYM_B1F":{"fishing_encounters":null,"header_rom_address":4745580,"land_encounters":null,"warp_table_rom_address":5464240,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_HOUSE1":{"fishing_encounters":null,"header_rom_address":4745692,"land_encounters":null,"warp_table_rom_address":5464704,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_HOUSE2":{"fishing_encounters":null,"header_rom_address":4745720,"land_encounters":null,"warp_table_rom_address":5464764,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_HOUSE3":{"fishing_encounters":null,"header_rom_address":4745748,"land_encounters":null,"warp_table_rom_address":5464848,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_HOUSE4":{"fishing_encounters":null,"header_rom_address":4745776,"land_encounters":null,"warp_table_rom_address":5464956,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_HOUSE5":{"fishing_encounters":null,"header_rom_address":4745804,"land_encounters":null,"warp_table_rom_address":5465040,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_HOUSE6":{"fishing_encounters":null,"header_rom_address":4745832,"land_encounters":null,"warp_table_rom_address":5465100,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_HOUSE7":{"fishing_encounters":null,"header_rom_address":4745860,"land_encounters":null,"warp_table_rom_address":5465184,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE":{"fishing_encounters":null,"header_rom_address":4745888,"land_encounters":null,"warp_table_rom_address":5465268,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_MART":{"fishing_encounters":null,"header_rom_address":4745664,"land_encounters":null,"warp_table_rom_address":5464620,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F":{"fishing_encounters":null,"header_rom_address":4745916,"land_encounters":null,"warp_table_rom_address":5465352,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F":{"fishing_encounters":null,"header_rom_address":4745944,"land_encounters":null,"warp_table_rom_address":5465420,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4745608,"land_encounters":null,"warp_table_rom_address":5464364,"water_encounters":null},"MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4745636,"land_encounters":null,"warp_table_rom_address":5464504,"water_encounters":null},"MAP_SOUTHERN_ISLAND_EXTERIOR":{"fishing_encounters":null,"header_rom_address":4751712,"land_encounters":null,"warp_table_rom_address":5498820,"water_encounters":null},"MAP_SOUTHERN_ISLAND_INTERIOR":{"fishing_encounters":null,"header_rom_address":4751740,"land_encounters":null,"warp_table_rom_address":5498916,"water_encounters":null},"MAP_SS_TIDAL_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4750900,"land_encounters":null,"warp_table_rom_address":5493032,"water_encounters":null},"MAP_SS_TIDAL_LOWER_DECK":{"fishing_encounters":null,"header_rom_address":4750928,"land_encounters":null,"warp_table_rom_address":5493316,"water_encounters":null},"MAP_SS_TIDAL_ROOMS":{"fishing_encounters":null,"header_rom_address":4750956,"land_encounters":null,"warp_table_rom_address":5493548,"water_encounters":null},"MAP_TERRA_CAVE_END":{"fishing_encounters":null,"header_rom_address":4749668,"land_encounters":null,"warp_table_rom_address":5482432,"water_encounters":null},"MAP_TERRA_CAVE_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4749640,"land_encounters":null,"warp_table_rom_address":5482372,"water_encounters":null},"MAP_TRADE_CENTER":{"fishing_encounters":null,"header_rom_address":4750452,"land_encounters":null,"warp_table_rom_address":5491984,"water_encounters":null},"MAP_TRAINER_HILL_1F":{"fishing_encounters":null,"header_rom_address":4753168,"land_encounters":null,"warp_table_rom_address":5507212,"water_encounters":null},"MAP_TRAINER_HILL_2F":{"fishing_encounters":null,"header_rom_address":4753196,"land_encounters":null,"warp_table_rom_address":5507248,"water_encounters":null},"MAP_TRAINER_HILL_3F":{"fishing_encounters":null,"header_rom_address":4753224,"land_encounters":null,"warp_table_rom_address":5507284,"water_encounters":null},"MAP_TRAINER_HILL_4F":{"fishing_encounters":null,"header_rom_address":4753252,"land_encounters":null,"warp_table_rom_address":5507320,"water_encounters":null},"MAP_TRAINER_HILL_ELEVATOR":{"fishing_encounters":null,"header_rom_address":4753924,"land_encounters":null,"warp_table_rom_address":5508340,"water_encounters":null},"MAP_TRAINER_HILL_ENTRANCE":{"fishing_encounters":null,"header_rom_address":4753140,"land_encounters":null,"warp_table_rom_address":5507140,"water_encounters":null},"MAP_TRAINER_HILL_ROOF":{"fishing_encounters":null,"header_rom_address":4753280,"land_encounters":null,"warp_table_rom_address":5507380,"water_encounters":null},"MAP_UNDERWATER_MARINE_CAVE":{"fishing_encounters":null,"header_rom_address":4749556,"land_encounters":null,"warp_table_rom_address":5482248,"water_encounters":null},"MAP_UNDERWATER_ROUTE105":{"fishing_encounters":null,"header_rom_address":4741604,"land_encounters":null,"warp_table_rom_address":5439388,"water_encounters":null},"MAP_UNDERWATER_ROUTE124":{"fishing_encounters":null,"header_rom_address":4741464,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":{"encounter_slots":[373,170,373,381,381],"rom_address":5592344}},"MAP_UNDERWATER_ROUTE125":{"fishing_encounters":null,"header_rom_address":4741632,"land_encounters":null,"warp_table_rom_address":5439424,"water_encounters":null},"MAP_UNDERWATER_ROUTE126":{"fishing_encounters":null,"header_rom_address":4741492,"land_encounters":null,"warp_table_rom_address":5439092,"water_encounters":{"encounter_slots":[373,170,373,381,381],"rom_address":5586596}},"MAP_UNDERWATER_ROUTE127":{"fishing_encounters":null,"header_rom_address":4741520,"land_encounters":null,"warp_table_rom_address":5439216,"water_encounters":null},"MAP_UNDERWATER_ROUTE128":{"fishing_encounters":null,"header_rom_address":4741548,"land_encounters":null,"warp_table_rom_address":5439300,"water_encounters":null},"MAP_UNDERWATER_ROUTE129":{"fishing_encounters":null,"header_rom_address":4741576,"land_encounters":null,"warp_table_rom_address":5439352,"water_encounters":null},"MAP_UNDERWATER_ROUTE134":{"fishing_encounters":null,"header_rom_address":4748660,"land_encounters":null,"warp_table_rom_address":5479580,"water_encounters":null},"MAP_UNDERWATER_SEAFLOOR_CAVERN":{"fishing_encounters":null,"header_rom_address":4747456,"land_encounters":null,"warp_table_rom_address":5473784,"water_encounters":null},"MAP_UNDERWATER_SEALED_CHAMBER":{"fishing_encounters":null,"header_rom_address":4748688,"land_encounters":null,"warp_table_rom_address":5479608,"water_encounters":null},"MAP_UNDERWATER_SOOTOPOLIS_CITY":{"fishing_encounters":null,"header_rom_address":4746868,"land_encounters":null,"warp_table_rom_address":5468808,"water_encounters":null},"MAP_UNION_ROOM":{"fishing_encounters":null,"header_rom_address":4751432,"land_encounters":null,"warp_table_rom_address":5496912,"water_encounters":null},"MAP_UNUSED_CONTEST_HALL1":{"fishing_encounters":null,"header_rom_address":4750564,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_UNUSED_CONTEST_HALL2":{"fishing_encounters":null,"header_rom_address":4750592,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_UNUSED_CONTEST_HALL3":{"fishing_encounters":null,"header_rom_address":4750620,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_UNUSED_CONTEST_HALL4":{"fishing_encounters":null,"header_rom_address":4750648,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_UNUSED_CONTEST_HALL5":{"fishing_encounters":null,"header_rom_address":4750676,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_UNUSED_CONTEST_HALL6":{"fishing_encounters":null,"header_rom_address":4750704,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_VERDANTURF_TOWN":{"fishing_encounters":null,"header_rom_address":4740456,"land_encounters":null,"warp_table_rom_address":5418084,"water_encounters":null},"MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM":{"fishing_encounters":null,"header_rom_address":4742584,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR":{"fishing_encounters":null,"header_rom_address":4742556,"land_encounters":null,"warp_table_rom_address":4160749568,"water_encounters":null},"MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY":{"fishing_encounters":null,"header_rom_address":4742528,"land_encounters":null,"warp_table_rom_address":5445168,"water_encounters":null},"MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE":{"fishing_encounters":null,"header_rom_address":4742724,"land_encounters":null,"warp_table_rom_address":5445968,"water_encounters":null},"MAP_VERDANTURF_TOWN_HOUSE":{"fishing_encounters":null,"header_rom_address":4742752,"land_encounters":null,"warp_table_rom_address":5446052,"water_encounters":null},"MAP_VERDANTURF_TOWN_MART":{"fishing_encounters":null,"header_rom_address":4742612,"land_encounters":null,"warp_table_rom_address":5445448,"water_encounters":null},"MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F":{"fishing_encounters":null,"header_rom_address":4742640,"land_encounters":null,"warp_table_rom_address":5445580,"water_encounters":null},"MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F":{"fishing_encounters":null,"header_rom_address":4742668,"land_encounters":null,"warp_table_rom_address":5445720,"water_encounters":null},"MAP_VERDANTURF_TOWN_WANDAS_HOUSE":{"fishing_encounters":null,"header_rom_address":4742696,"land_encounters":null,"warp_table_rom_address":5445884,"water_encounters":null},"MAP_VICTORY_ROAD_1F":{"fishing_encounters":null,"header_rom_address":4747932,"land_encounters":{"encounter_slots":[42,336,383,371,41,335,42,336,382,370,382,370],"rom_address":5586484},"warp_table_rom_address":5475892,"water_encounters":null},"MAP_VICTORY_ROAD_B1F":{"fishing_encounters":null,"header_rom_address":4747960,"land_encounters":{"encounter_slots":[42,336,383,383,42,336,42,336,383,355,383,355],"rom_address":5590824},"warp_table_rom_address":5476500,"water_encounters":null},"MAP_VICTORY_ROAD_B2F":{"fishing_encounters":{"encounter_slots":[129,118,129,118,323,323,323,324,324,324],"rom_address":5590992},"header_rom_address":4747988,"land_encounters":{"encounter_slots":[42,322,383,383,42,322,42,322,383,355,383,355],"rom_address":5590908},"warp_table_rom_address":5476744,"water_encounters":{"encounter_slots":[42,42,42,42,42],"rom_address":5590964}}},"misc_ram_addresses":{"CB2_Overworld":134766684,"gArchipelagoReceivedItem":33792044,"gMain":50340544,"gSaveBlock1Ptr":50355596},"misc_rom_addresses":{"gArchipelagoInfo":5874864,"gArchipelagoOptions":5874840,"gEvolutionTable":3310148,"gLevelUpLearnsets":3326628,"gSpeciesInfo":3288488,"gTMHMLearnsets":3281524,"gTrainers":3221820,"sNewGamePCItems":6172396,"sStarterMon":5983704,"sTMHMMoves":6393984},"species":[{"abilities":[0,0],"base_stats":[0,0,0,0,0,0],"catch_rate":0,"evolutions":[],"friendship":0,"id":0,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":45},{"level":7,"move_id":73},{"level":10,"move_id":22},{"level":15,"move_id":77},{"level":15,"move_id":79},{"level":20,"move_id":75},{"level":25,"move_id":230},{"level":32,"move_id":74},{"level":39,"move_id":235},{"level":46,"move_id":76}],"rom_address":3300024},"rom_address":3288488,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[65,0],"base_stats":[45,49,49,45,65,65],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":16,"species":2}],"friendship":70,"id":1,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":45},{"level":7,"move_id":73},{"level":10,"move_id":22},{"level":15,"move_id":77},{"level":15,"move_id":79},{"level":20,"move_id":75},{"level":25,"move_id":230},{"level":32,"move_id":74},{"level":39,"move_id":235},{"level":46,"move_id":76}],"rom_address":3300024},"rom_address":3288516,"tmhm_learnset":"00E41E0884350720","types":[12,3]},{"abilities":[65,0],"base_stats":[60,62,63,60,80,80],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":32,"species":3}],"friendship":70,"id":2,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":73},{"level":4,"move_id":45},{"level":7,"move_id":73},{"level":10,"move_id":22},{"level":15,"move_id":77},{"level":15,"move_id":79},{"level":22,"move_id":75},{"level":29,"move_id":230},{"level":38,"move_id":74},{"level":47,"move_id":235},{"level":56,"move_id":76}],"rom_address":3300052},"rom_address":3288544,"tmhm_learnset":"00E41E0884350720","types":[12,3]},{"abilities":[65,0],"base_stats":[80,82,83,80,100,100],"catch_rate":45,"evolutions":[],"friendship":70,"id":3,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":73},{"level":1,"move_id":22},{"level":4,"move_id":45},{"level":7,"move_id":73},{"level":10,"move_id":22},{"level":15,"move_id":77},{"level":15,"move_id":79},{"level":22,"move_id":75},{"level":29,"move_id":230},{"level":41,"move_id":74},{"level":53,"move_id":235},{"level":65,"move_id":76}],"rom_address":3300082},"rom_address":3288572,"tmhm_learnset":"00E41E0886354730","types":[12,3]},{"abilities":[66,0],"base_stats":[39,52,43,65,60,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":16,"species":5}],"friendship":70,"id":4,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":7,"move_id":52},{"level":13,"move_id":108},{"level":19,"move_id":99},{"level":25,"move_id":184},{"level":31,"move_id":53},{"level":37,"move_id":163},{"level":43,"move_id":82},{"level":49,"move_id":83}],"rom_address":3300112},"rom_address":3288600,"tmhm_learnset":"00A61EA4CC510623","types":[10,10]},{"abilities":[66,0],"base_stats":[58,64,58,80,80,65],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":36,"species":6}],"friendship":70,"id":5,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":1,"move_id":52},{"level":7,"move_id":52},{"level":13,"move_id":108},{"level":20,"move_id":99},{"level":27,"move_id":184},{"level":34,"move_id":53},{"level":41,"move_id":163},{"level":48,"move_id":82},{"level":55,"move_id":83}],"rom_address":3300138},"rom_address":3288628,"tmhm_learnset":"00A61EA4CC510623","types":[10,10]},{"abilities":[66,0],"base_stats":[78,84,78,100,109,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":6,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":1,"move_id":52},{"level":1,"move_id":108},{"level":7,"move_id":52},{"level":13,"move_id":108},{"level":20,"move_id":99},{"level":27,"move_id":184},{"level":34,"move_id":53},{"level":36,"move_id":17},{"level":44,"move_id":163},{"level":54,"move_id":82},{"level":64,"move_id":83}],"rom_address":3300164},"rom_address":3288656,"tmhm_learnset":"00AE5EA4CE514633","types":[10,2]},{"abilities":[67,0],"base_stats":[44,48,65,43,50,64],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":16,"species":8}],"friendship":70,"id":7,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":39},{"level":7,"move_id":145},{"level":10,"move_id":110},{"level":13,"move_id":55},{"level":18,"move_id":44},{"level":23,"move_id":229},{"level":28,"move_id":182},{"level":33,"move_id":240},{"level":40,"move_id":130},{"level":47,"move_id":56}],"rom_address":3300192},"rom_address":3288684,"tmhm_learnset":"03B01E00CC533265","types":[11,11]},{"abilities":[67,0],"base_stats":[59,63,80,58,65,80],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":36,"species":9}],"friendship":70,"id":8,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":145},{"level":4,"move_id":39},{"level":7,"move_id":145},{"level":10,"move_id":110},{"level":13,"move_id":55},{"level":19,"move_id":44},{"level":25,"move_id":229},{"level":31,"move_id":182},{"level":37,"move_id":240},{"level":45,"move_id":130},{"level":53,"move_id":56}],"rom_address":3300222},"rom_address":3288712,"tmhm_learnset":"03B01E00CC533265","types":[11,11]},{"abilities":[67,0],"base_stats":[79,83,100,78,85,105],"catch_rate":45,"evolutions":[],"friendship":70,"id":9,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":145},{"level":1,"move_id":110},{"level":4,"move_id":39},{"level":7,"move_id":145},{"level":10,"move_id":110},{"level":13,"move_id":55},{"level":19,"move_id":44},{"level":25,"move_id":229},{"level":31,"move_id":182},{"level":42,"move_id":240},{"level":55,"move_id":130},{"level":68,"move_id":56}],"rom_address":3300252},"rom_address":3288740,"tmhm_learnset":"03B01E00CE537275","types":[11,11]},{"abilities":[19,0],"base_stats":[45,30,35,45,20,20],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":7,"species":11}],"friendship":70,"id":10,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":81}],"rom_address":3300282},"rom_address":3288768,"tmhm_learnset":"0000000000000000","types":[6,6]},{"abilities":[61,0],"base_stats":[50,20,55,30,25,25],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":10,"species":12}],"friendship":70,"id":11,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":7,"move_id":106}],"rom_address":3300292},"rom_address":3288796,"tmhm_learnset":"0000000000000000","types":[6,6]},{"abilities":[14,0],"base_stats":[60,45,50,70,80,80],"catch_rate":45,"evolutions":[],"friendship":70,"id":12,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":93},{"level":10,"move_id":93},{"level":13,"move_id":77},{"level":14,"move_id":78},{"level":15,"move_id":79},{"level":18,"move_id":48},{"level":23,"move_id":18},{"level":28,"move_id":16},{"level":34,"move_id":60},{"level":40,"move_id":219},{"level":47,"move_id":318}],"rom_address":3300304},"rom_address":3288824,"tmhm_learnset":"0040BE80B43F4620","types":[6,2]},{"abilities":[19,0],"base_stats":[40,35,30,50,20,20],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":7,"species":14}],"friendship":70,"id":13,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":40},{"level":1,"move_id":81}],"rom_address":3300334},"rom_address":3288852,"tmhm_learnset":"0000000000000000","types":[6,3]},{"abilities":[61,0],"base_stats":[45,25,50,35,25,25],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":10,"species":15}],"friendship":70,"id":14,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":7,"move_id":106}],"rom_address":3300344},"rom_address":3288880,"tmhm_learnset":"0000000000000000","types":[6,3]},{"abilities":[68,0],"base_stats":[65,80,40,75,45,80],"catch_rate":45,"evolutions":[],"friendship":70,"id":15,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":31},{"level":10,"move_id":31},{"level":15,"move_id":116},{"level":20,"move_id":41},{"level":25,"move_id":99},{"level":30,"move_id":228},{"level":35,"move_id":42},{"level":40,"move_id":97},{"level":45,"move_id":283}],"rom_address":3300356},"rom_address":3288908,"tmhm_learnset":"00843E88C4354620","types":[6,3]},{"abilities":[51,0],"base_stats":[40,45,40,56,35,35],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":18,"species":17}],"friendship":70,"id":16,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":5,"move_id":28},{"level":9,"move_id":16},{"level":13,"move_id":98},{"level":19,"move_id":18},{"level":25,"move_id":17},{"level":31,"move_id":297},{"level":39,"move_id":97},{"level":47,"move_id":119}],"rom_address":3300382},"rom_address":3288936,"tmhm_learnset":"00087E8084130620","types":[0,2]},{"abilities":[51,0],"base_stats":[63,60,55,71,50,50],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":36,"species":18}],"friendship":70,"id":17,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":28},{"level":1,"move_id":16},{"level":5,"move_id":28},{"level":9,"move_id":16},{"level":13,"move_id":98},{"level":20,"move_id":18},{"level":27,"move_id":17},{"level":34,"move_id":297},{"level":43,"move_id":97},{"level":52,"move_id":119}],"rom_address":3300408},"rom_address":3288964,"tmhm_learnset":"00087E8084130620","types":[0,2]},{"abilities":[51,0],"base_stats":[83,80,75,91,70,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":18,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":28},{"level":1,"move_id":16},{"level":1,"move_id":98},{"level":5,"move_id":28},{"level":9,"move_id":16},{"level":13,"move_id":98},{"level":20,"move_id":18},{"level":27,"move_id":17},{"level":34,"move_id":297},{"level":48,"move_id":97},{"level":62,"move_id":119}],"rom_address":3300434},"rom_address":3288992,"tmhm_learnset":"00087E8084134620","types":[0,2]},{"abilities":[50,62],"base_stats":[30,56,35,72,25,35],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":20,"species":20}],"friendship":70,"id":19,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":7,"move_id":98},{"level":13,"move_id":158},{"level":20,"move_id":116},{"level":27,"move_id":228},{"level":34,"move_id":162},{"level":41,"move_id":283}],"rom_address":3300460},"rom_address":3289020,"tmhm_learnset":"00843E02ADD33E20","types":[0,0]},{"abilities":[50,62],"base_stats":[55,81,60,97,50,70],"catch_rate":127,"evolutions":[],"friendship":70,"id":20,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":98},{"level":7,"move_id":98},{"level":13,"move_id":158},{"level":20,"move_id":184},{"level":30,"move_id":228},{"level":40,"move_id":162},{"level":50,"move_id":283}],"rom_address":3300482},"rom_address":3289048,"tmhm_learnset":"00A43E02ADD37E30","types":[0,0]},{"abilities":[51,0],"base_stats":[40,60,30,70,31,31],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":20,"species":22}],"friendship":70,"id":21,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":7,"move_id":43},{"level":13,"move_id":31},{"level":19,"move_id":228},{"level":25,"move_id":332},{"level":31,"move_id":119},{"level":37,"move_id":65},{"level":43,"move_id":97}],"rom_address":3300504},"rom_address":3289076,"tmhm_learnset":"00087E8084130620","types":[0,2]},{"abilities":[51,0],"base_stats":[65,90,65,100,61,61],"catch_rate":90,"evolutions":[],"friendship":70,"id":22,"learnset":{"moves":[{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":1,"move_id":43},{"level":1,"move_id":31},{"level":7,"move_id":43},{"level":13,"move_id":31},{"level":26,"move_id":228},{"level":32,"move_id":119},{"level":40,"move_id":65},{"level":47,"move_id":97}],"rom_address":3300528},"rom_address":3289104,"tmhm_learnset":"00087E8084134620","types":[0,2]},{"abilities":[22,61],"base_stats":[35,60,44,55,40,54],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":22,"species":24}],"friendship":70,"id":23,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":35},{"level":1,"move_id":43},{"level":8,"move_id":40},{"level":13,"move_id":44},{"level":20,"move_id":137},{"level":25,"move_id":103},{"level":32,"move_id":51},{"level":37,"move_id":254},{"level":37,"move_id":256},{"level":37,"move_id":255},{"level":44,"move_id":114}],"rom_address":3300550},"rom_address":3289132,"tmhm_learnset":"00213F088E570620","types":[3,3]},{"abilities":[22,61],"base_stats":[60,85,69,80,65,79],"catch_rate":90,"evolutions":[],"friendship":70,"id":24,"learnset":{"moves":[{"level":1,"move_id":35},{"level":1,"move_id":43},{"level":1,"move_id":40},{"level":1,"move_id":44},{"level":8,"move_id":40},{"level":13,"move_id":44},{"level":20,"move_id":137},{"level":28,"move_id":103},{"level":38,"move_id":51},{"level":46,"move_id":254},{"level":46,"move_id":256},{"level":46,"move_id":255},{"level":56,"move_id":114}],"rom_address":3300578},"rom_address":3289160,"tmhm_learnset":"00213F088E574620","types":[3,3]},{"abilities":[9,0],"base_stats":[35,55,30,90,50,40],"catch_rate":190,"evolutions":[{"method":"ITEM","param":96,"species":26}],"friendship":70,"id":25,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":84},{"level":1,"move_id":45},{"level":6,"move_id":39},{"level":8,"move_id":86},{"level":11,"move_id":98},{"level":15,"move_id":104},{"level":20,"move_id":21},{"level":26,"move_id":85},{"level":33,"move_id":97},{"level":41,"move_id":87},{"level":50,"move_id":113}],"rom_address":3300606},"rom_address":3289188,"tmhm_learnset":"00E01E02CDD38221","types":[13,13]},{"abilities":[9,0],"base_stats":[60,90,55,100,90,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":26,"learnset":{"moves":[{"level":1,"move_id":84},{"level":1,"move_id":39},{"level":1,"move_id":98},{"level":1,"move_id":85}],"rom_address":3300634},"rom_address":3289216,"tmhm_learnset":"00E03E02CDD3C221","types":[13,13]},{"abilities":[8,0],"base_stats":[50,75,85,40,20,30],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":22,"species":28}],"friendship":70,"id":27,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":6,"move_id":111},{"level":11,"move_id":28},{"level":17,"move_id":40},{"level":23,"move_id":163},{"level":30,"move_id":129},{"level":37,"move_id":154},{"level":45,"move_id":328},{"level":53,"move_id":201}],"rom_address":3300644},"rom_address":3289244,"tmhm_learnset":"00A43ED0CE510621","types":[4,4]},{"abilities":[8,0],"base_stats":[75,100,110,65,45,55],"catch_rate":90,"evolutions":[],"friendship":70,"id":28,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":111},{"level":1,"move_id":28},{"level":6,"move_id":111},{"level":11,"move_id":28},{"level":17,"move_id":40},{"level":24,"move_id":163},{"level":33,"move_id":129},{"level":42,"move_id":154},{"level":52,"move_id":328},{"level":62,"move_id":201}],"rom_address":3300670},"rom_address":3289272,"tmhm_learnset":"00A43ED0CE514621","types":[4,4]},{"abilities":[38,0],"base_stats":[55,47,52,41,40,40],"catch_rate":235,"evolutions":[{"method":"LEVEL","param":16,"species":30}],"friendship":70,"id":29,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":45},{"level":1,"move_id":10},{"level":8,"move_id":39},{"level":12,"move_id":24},{"level":17,"move_id":40},{"level":20,"move_id":44},{"level":23,"move_id":270},{"level":30,"move_id":154},{"level":38,"move_id":260},{"level":47,"move_id":242}],"rom_address":3300696},"rom_address":3289300,"tmhm_learnset":"00A43E8A8DD33624","types":[3,3]},{"abilities":[38,0],"base_stats":[70,62,67,56,55,55],"catch_rate":120,"evolutions":[{"method":"ITEM","param":94,"species":31}],"friendship":70,"id":30,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":45},{"level":1,"move_id":10},{"level":8,"move_id":39},{"level":12,"move_id":24},{"level":18,"move_id":40},{"level":22,"move_id":44},{"level":26,"move_id":270},{"level":34,"move_id":154},{"level":43,"move_id":260},{"level":53,"move_id":242}],"rom_address":3300722},"rom_address":3289328,"tmhm_learnset":"00A43E8A8DD33624","types":[3,3]},{"abilities":[38,0],"base_stats":[90,82,87,76,75,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":31,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":39},{"level":1,"move_id":24},{"level":1,"move_id":40},{"level":23,"move_id":34}],"rom_address":3300748},"rom_address":3289356,"tmhm_learnset":"00B43FFEEFD37E35","types":[3,4]},{"abilities":[38,0],"base_stats":[46,57,40,50,40,40],"catch_rate":235,"evolutions":[{"method":"LEVEL","param":16,"species":33}],"friendship":70,"id":32,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":64},{"level":8,"move_id":116},{"level":12,"move_id":24},{"level":17,"move_id":40},{"level":20,"move_id":30},{"level":23,"move_id":270},{"level":30,"move_id":31},{"level":38,"move_id":260},{"level":47,"move_id":32}],"rom_address":3300760},"rom_address":3289384,"tmhm_learnset":"00A43E0A8DD33624","types":[3,3]},{"abilities":[38,0],"base_stats":[61,72,57,65,55,55],"catch_rate":120,"evolutions":[{"method":"ITEM","param":94,"species":34}],"friendship":70,"id":33,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":64},{"level":8,"move_id":116},{"level":12,"move_id":24},{"level":18,"move_id":40},{"level":22,"move_id":30},{"level":26,"move_id":270},{"level":34,"move_id":31},{"level":43,"move_id":260},{"level":53,"move_id":32}],"rom_address":3300786},"rom_address":3289412,"tmhm_learnset":"00A43E0A8DD33624","types":[3,3]},{"abilities":[38,0],"base_stats":[81,92,77,85,85,75],"catch_rate":45,"evolutions":[],"friendship":70,"id":34,"learnset":{"moves":[{"level":1,"move_id":64},{"level":1,"move_id":116},{"level":1,"move_id":24},{"level":1,"move_id":40},{"level":23,"move_id":37}],"rom_address":3300812},"rom_address":3289440,"tmhm_learnset":"00B43F7EEFD37E35","types":[3,4]},{"abilities":[56,0],"base_stats":[70,45,48,35,60,65],"catch_rate":150,"evolutions":[{"method":"ITEM","param":94,"species":36}],"friendship":140,"id":35,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":45},{"level":5,"move_id":227},{"level":9,"move_id":47},{"level":13,"move_id":3},{"level":17,"move_id":266},{"level":21,"move_id":107},{"level":25,"move_id":111},{"level":29,"move_id":118},{"level":33,"move_id":322},{"level":37,"move_id":236},{"level":41,"move_id":113},{"level":45,"move_id":309}],"rom_address":3300824},"rom_address":3289468,"tmhm_learnset":"00611E27FDFBB62D","types":[0,0]},{"abilities":[56,0],"base_stats":[95,70,73,60,85,90],"catch_rate":25,"evolutions":[],"friendship":140,"id":36,"learnset":{"moves":[{"level":1,"move_id":47},{"level":1,"move_id":3},{"level":1,"move_id":107},{"level":1,"move_id":118}],"rom_address":3300856},"rom_address":3289496,"tmhm_learnset":"00611E27FDFBF62D","types":[0,0]},{"abilities":[18,0],"base_stats":[38,41,40,65,50,65],"catch_rate":190,"evolutions":[{"method":"ITEM","param":95,"species":38}],"friendship":70,"id":37,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":52},{"level":5,"move_id":39},{"level":9,"move_id":46},{"level":13,"move_id":98},{"level":17,"move_id":261},{"level":21,"move_id":109},{"level":25,"move_id":286},{"level":29,"move_id":53},{"level":33,"move_id":219},{"level":37,"move_id":288},{"level":41,"move_id":83}],"rom_address":3300866},"rom_address":3289524,"tmhm_learnset":"00021E248C590630","types":[10,10]},{"abilities":[18,0],"base_stats":[73,76,75,100,81,100],"catch_rate":75,"evolutions":[],"friendship":70,"id":38,"learnset":{"moves":[{"level":1,"move_id":52},{"level":1,"move_id":98},{"level":1,"move_id":109},{"level":1,"move_id":219},{"level":45,"move_id":83}],"rom_address":3300896},"rom_address":3289552,"tmhm_learnset":"00021E248C594630","types":[10,10]},{"abilities":[56,0],"base_stats":[115,45,20,20,45,25],"catch_rate":170,"evolutions":[{"method":"ITEM","param":94,"species":40}],"friendship":70,"id":39,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":47},{"level":4,"move_id":111},{"level":9,"move_id":1},{"level":14,"move_id":50},{"level":19,"move_id":205},{"level":24,"move_id":3},{"level":29,"move_id":156},{"level":34,"move_id":34},{"level":39,"move_id":102},{"level":44,"move_id":304},{"level":49,"move_id":38}],"rom_address":3300908},"rom_address":3289580,"tmhm_learnset":"00611E27FDBBB625","types":[0,0]},{"abilities":[56,0],"base_stats":[140,70,45,45,75,50],"catch_rate":50,"evolutions":[],"friendship":70,"id":40,"learnset":{"moves":[{"level":1,"move_id":47},{"level":1,"move_id":50},{"level":1,"move_id":111},{"level":1,"move_id":3}],"rom_address":3300938},"rom_address":3289608,"tmhm_learnset":"00611E27FDBBF625","types":[0,0]},{"abilities":[39,0],"base_stats":[40,45,35,55,30,40],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":22,"species":42}],"friendship":70,"id":41,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":141},{"level":6,"move_id":48},{"level":11,"move_id":310},{"level":16,"move_id":44},{"level":21,"move_id":17},{"level":26,"move_id":109},{"level":31,"move_id":314},{"level":36,"move_id":212},{"level":41,"move_id":305},{"level":46,"move_id":114}],"rom_address":3300948},"rom_address":3289636,"tmhm_learnset":"00017F88A4170E20","types":[3,2]},{"abilities":[39,0],"base_stats":[75,80,70,90,65,75],"catch_rate":90,"evolutions":[{"method":"FRIENDSHIP","param":0,"species":169}],"friendship":70,"id":42,"learnset":{"moves":[{"level":1,"move_id":103},{"level":1,"move_id":141},{"level":1,"move_id":48},{"level":1,"move_id":310},{"level":6,"move_id":48},{"level":11,"move_id":310},{"level":16,"move_id":44},{"level":21,"move_id":17},{"level":28,"move_id":109},{"level":35,"move_id":314},{"level":42,"move_id":212},{"level":49,"move_id":305},{"level":56,"move_id":114}],"rom_address":3300976},"rom_address":3289664,"tmhm_learnset":"00017F88A4174E20","types":[3,2]},{"abilities":[34,0],"base_stats":[45,50,55,30,75,65],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":21,"species":44}],"friendship":70,"id":43,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":71},{"level":7,"move_id":230},{"level":14,"move_id":77},{"level":16,"move_id":78},{"level":18,"move_id":79},{"level":23,"move_id":51},{"level":32,"move_id":236},{"level":39,"move_id":80}],"rom_address":3301004},"rom_address":3289692,"tmhm_learnset":"00441E0884350720","types":[12,3]},{"abilities":[34,0],"base_stats":[60,65,70,40,85,75],"catch_rate":120,"evolutions":[{"method":"ITEM","param":98,"species":45},{"method":"ITEM","param":93,"species":182}],"friendship":70,"id":44,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":71},{"level":1,"move_id":230},{"level":1,"move_id":77},{"level":7,"move_id":230},{"level":14,"move_id":77},{"level":16,"move_id":78},{"level":18,"move_id":79},{"level":24,"move_id":51},{"level":35,"move_id":236},{"level":44,"move_id":80}],"rom_address":3301028},"rom_address":3289720,"tmhm_learnset":"00441E0884350720","types":[12,3]},{"abilities":[34,0],"base_stats":[75,80,85,50,100,90],"catch_rate":45,"evolutions":[],"friendship":70,"id":45,"learnset":{"moves":[{"level":1,"move_id":71},{"level":1,"move_id":312},{"level":1,"move_id":78},{"level":1,"move_id":72},{"level":44,"move_id":80}],"rom_address":3301052},"rom_address":3289748,"tmhm_learnset":"00441E0884354720","types":[12,3]},{"abilities":[27,0],"base_stats":[35,70,55,25,45,55],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":24,"species":47}],"friendship":70,"id":46,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":7,"move_id":78},{"level":13,"move_id":77},{"level":19,"move_id":141},{"level":25,"move_id":147},{"level":31,"move_id":163},{"level":37,"move_id":74},{"level":43,"move_id":202},{"level":49,"move_id":312}],"rom_address":3301064},"rom_address":3289776,"tmhm_learnset":"00C43E888C350720","types":[6,12]},{"abilities":[27,0],"base_stats":[60,95,80,30,60,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":47,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":78},{"level":1,"move_id":77},{"level":7,"move_id":78},{"level":13,"move_id":77},{"level":19,"move_id":141},{"level":27,"move_id":147},{"level":35,"move_id":163},{"level":43,"move_id":74},{"level":51,"move_id":202},{"level":59,"move_id":312}],"rom_address":3301090},"rom_address":3289804,"tmhm_learnset":"00C43E888C354720","types":[6,12]},{"abilities":[14,0],"base_stats":[60,55,50,45,40,55],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":31,"species":49}],"friendship":70,"id":48,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":50},{"level":1,"move_id":193},{"level":9,"move_id":48},{"level":17,"move_id":93},{"level":20,"move_id":77},{"level":25,"move_id":141},{"level":28,"move_id":78},{"level":33,"move_id":60},{"level":36,"move_id":79},{"level":41,"move_id":94}],"rom_address":3301116},"rom_address":3289832,"tmhm_learnset":"0040BE0894350620","types":[6,3]},{"abilities":[19,0],"base_stats":[70,65,60,90,90,75],"catch_rate":75,"evolutions":[],"friendship":70,"id":49,"learnset":{"moves":[{"level":1,"move_id":318},{"level":1,"move_id":33},{"level":1,"move_id":50},{"level":1,"move_id":193},{"level":1,"move_id":48},{"level":9,"move_id":48},{"level":17,"move_id":93},{"level":20,"move_id":77},{"level":25,"move_id":141},{"level":28,"move_id":78},{"level":31,"move_id":16},{"level":36,"move_id":60},{"level":42,"move_id":79},{"level":52,"move_id":94}],"rom_address":3301142},"rom_address":3289860,"tmhm_learnset":"0040BE8894354620","types":[6,3]},{"abilities":[8,71],"base_stats":[10,55,25,95,35,45],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":26,"species":51}],"friendship":70,"id":50,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":28},{"level":5,"move_id":45},{"level":9,"move_id":222},{"level":17,"move_id":91},{"level":25,"move_id":189},{"level":33,"move_id":163},{"level":41,"move_id":89},{"level":49,"move_id":90}],"rom_address":3301172},"rom_address":3289888,"tmhm_learnset":"00843EC88E110620","types":[4,4]},{"abilities":[8,71],"base_stats":[35,80,50,120,50,70],"catch_rate":50,"evolutions":[],"friendship":70,"id":51,"learnset":{"moves":[{"level":1,"move_id":161},{"level":1,"move_id":10},{"level":1,"move_id":28},{"level":1,"move_id":45},{"level":5,"move_id":45},{"level":9,"move_id":222},{"level":17,"move_id":91},{"level":25,"move_id":189},{"level":26,"move_id":328},{"level":38,"move_id":163},{"level":51,"move_id":89},{"level":64,"move_id":90}],"rom_address":3301196},"rom_address":3289916,"tmhm_learnset":"00843EC88E114620","types":[4,4]},{"abilities":[53,0],"base_stats":[40,45,35,90,40,40],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":28,"species":53}],"friendship":70,"id":52,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":11,"move_id":44},{"level":20,"move_id":6},{"level":28,"move_id":185},{"level":35,"move_id":103},{"level":41,"move_id":154},{"level":46,"move_id":163},{"level":50,"move_id":252}],"rom_address":3301222},"rom_address":3289944,"tmhm_learnset":"00453F82ADD30E24","types":[0,0]},{"abilities":[7,0],"base_stats":[65,70,60,115,65,65],"catch_rate":90,"evolutions":[],"friendship":70,"id":53,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":1,"move_id":44},{"level":11,"move_id":44},{"level":20,"move_id":6},{"level":29,"move_id":185},{"level":38,"move_id":103},{"level":46,"move_id":154},{"level":53,"move_id":163},{"level":59,"move_id":252}],"rom_address":3301246},"rom_address":3289972,"tmhm_learnset":"00453F82ADD34E34","types":[0,0]},{"abilities":[6,13],"base_stats":[50,52,48,55,65,50],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":33,"species":55}],"friendship":70,"id":54,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":346},{"level":1,"move_id":10},{"level":5,"move_id":39},{"level":10,"move_id":50},{"level":16,"move_id":93},{"level":23,"move_id":103},{"level":31,"move_id":244},{"level":40,"move_id":154},{"level":50,"move_id":56}],"rom_address":3301270},"rom_address":3290000,"tmhm_learnset":"03F01E80CC53326D","types":[11,11]},{"abilities":[6,13],"base_stats":[80,82,78,85,95,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":55,"learnset":{"moves":[{"level":1,"move_id":346},{"level":1,"move_id":10},{"level":1,"move_id":39},{"level":1,"move_id":50},{"level":5,"move_id":39},{"level":10,"move_id":50},{"level":16,"move_id":93},{"level":23,"move_id":103},{"level":31,"move_id":244},{"level":44,"move_id":154},{"level":58,"move_id":56}],"rom_address":3301294},"rom_address":3290028,"tmhm_learnset":"03F01E80CC53726D","types":[11,11]},{"abilities":[72,0],"base_stats":[40,80,35,70,35,45],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":28,"species":57}],"friendship":70,"id":56,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":9,"move_id":67},{"level":15,"move_id":2},{"level":21,"move_id":154},{"level":27,"move_id":116},{"level":33,"move_id":69},{"level":39,"move_id":238},{"level":45,"move_id":103},{"level":51,"move_id":37}],"rom_address":3301318},"rom_address":3290056,"tmhm_learnset":"00A23EC0CFD30EA1","types":[1,1]},{"abilities":[72,0],"base_stats":[65,105,60,95,60,70],"catch_rate":75,"evolutions":[],"friendship":70,"id":57,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":1,"move_id":67},{"level":1,"move_id":99},{"level":9,"move_id":67},{"level":15,"move_id":2},{"level":21,"move_id":154},{"level":27,"move_id":116},{"level":28,"move_id":99},{"level":36,"move_id":69},{"level":45,"move_id":238},{"level":54,"move_id":103},{"level":63,"move_id":37}],"rom_address":3301344},"rom_address":3290084,"tmhm_learnset":"00A23EC0CFD34EA1","types":[1,1]},{"abilities":[22,18],"base_stats":[55,70,45,60,70,50],"catch_rate":190,"evolutions":[{"method":"ITEM","param":95,"species":59}],"friendship":70,"id":58,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":44},{"level":1,"move_id":46},{"level":7,"move_id":52},{"level":13,"move_id":43},{"level":19,"move_id":316},{"level":25,"move_id":36},{"level":31,"move_id":172},{"level":37,"move_id":270},{"level":43,"move_id":97},{"level":49,"move_id":53}],"rom_address":3301372},"rom_address":3290112,"tmhm_learnset":"00A23EA48C510630","types":[10,10]},{"abilities":[22,18],"base_stats":[90,110,80,95,100,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":59,"learnset":{"moves":[{"level":1,"move_id":44},{"level":1,"move_id":46},{"level":1,"move_id":52},{"level":1,"move_id":316},{"level":49,"move_id":245}],"rom_address":3301398},"rom_address":3290140,"tmhm_learnset":"00A23EA48C514630","types":[10,10]},{"abilities":[11,6],"base_stats":[40,50,40,90,40,40],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":25,"species":61}],"friendship":70,"id":60,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":7,"move_id":95},{"level":13,"move_id":55},{"level":19,"move_id":3},{"level":25,"move_id":240},{"level":31,"move_id":34},{"level":37,"move_id":187},{"level":43,"move_id":56}],"rom_address":3301410},"rom_address":3290168,"tmhm_learnset":"03103E009C133264","types":[11,11]},{"abilities":[11,6],"base_stats":[65,65,65,90,50,50],"catch_rate":120,"evolutions":[{"method":"ITEM","param":97,"species":62},{"method":"ITEM","param":187,"species":186}],"friendship":70,"id":61,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":1,"move_id":95},{"level":1,"move_id":55},{"level":7,"move_id":95},{"level":13,"move_id":55},{"level":19,"move_id":3},{"level":27,"move_id":240},{"level":35,"move_id":34},{"level":43,"move_id":187},{"level":51,"move_id":56}],"rom_address":3301434},"rom_address":3290196,"tmhm_learnset":"03B03E00DE133265","types":[11,11]},{"abilities":[11,6],"base_stats":[90,85,95,70,70,90],"catch_rate":45,"evolutions":[],"friendship":70,"id":62,"learnset":{"moves":[{"level":1,"move_id":55},{"level":1,"move_id":95},{"level":1,"move_id":3},{"level":1,"move_id":66},{"level":35,"move_id":66},{"level":51,"move_id":170}],"rom_address":3301458},"rom_address":3290224,"tmhm_learnset":"03B03E40DE1372E5","types":[11,1]},{"abilities":[28,39],"base_stats":[25,20,15,90,105,55],"catch_rate":200,"evolutions":[{"method":"LEVEL","param":16,"species":64}],"friendship":70,"id":63,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":93},{"level":1,"move_id":100}],"rom_address":3301472},"rom_address":3290252,"tmhm_learnset":"0041BF03B45B8E29","types":[14,14]},{"abilities":[28,39],"base_stats":[40,35,30,105,120,70],"catch_rate":100,"evolutions":[{"method":"LEVEL","param":37,"species":65}],"friendship":70,"id":64,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":100},{"level":1,"move_id":134},{"level":1,"move_id":93},{"level":16,"move_id":93},{"level":18,"move_id":50},{"level":21,"move_id":60},{"level":23,"move_id":115},{"level":25,"move_id":105},{"level":30,"move_id":248},{"level":33,"move_id":272},{"level":36,"move_id":94},{"level":43,"move_id":271}],"rom_address":3301482},"rom_address":3290280,"tmhm_learnset":"0041BF03B45B8E29","types":[14,14]},{"abilities":[28,39],"base_stats":[55,50,45,120,135,85],"catch_rate":50,"evolutions":[],"friendship":70,"id":65,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":100},{"level":1,"move_id":134},{"level":1,"move_id":93},{"level":16,"move_id":93},{"level":18,"move_id":50},{"level":21,"move_id":60},{"level":23,"move_id":115},{"level":25,"move_id":105},{"level":30,"move_id":248},{"level":33,"move_id":347},{"level":36,"move_id":94},{"level":43,"move_id":271}],"rom_address":3301510},"rom_address":3290308,"tmhm_learnset":"0041BF03B45BCE29","types":[14,14]},{"abilities":[62,0],"base_stats":[70,80,50,35,35,35],"catch_rate":180,"evolutions":[{"method":"LEVEL","param":28,"species":67}],"friendship":70,"id":66,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":67},{"level":1,"move_id":43},{"level":7,"move_id":116},{"level":13,"move_id":2},{"level":19,"move_id":69},{"level":22,"move_id":193},{"level":25,"move_id":279},{"level":31,"move_id":233},{"level":37,"move_id":66},{"level":40,"move_id":238},{"level":43,"move_id":184},{"level":49,"move_id":223}],"rom_address":3301538},"rom_address":3290336,"tmhm_learnset":"00A03E64CE1306A1","types":[1,1]},{"abilities":[62,0],"base_stats":[80,100,70,45,50,60],"catch_rate":90,"evolutions":[{"method":"LEVEL","param":37,"species":68}],"friendship":70,"id":67,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":67},{"level":1,"move_id":43},{"level":1,"move_id":116},{"level":7,"move_id":116},{"level":13,"move_id":2},{"level":19,"move_id":69},{"level":22,"move_id":193},{"level":25,"move_id":279},{"level":33,"move_id":233},{"level":41,"move_id":66},{"level":46,"move_id":238},{"level":51,"move_id":184},{"level":59,"move_id":223}],"rom_address":3301568},"rom_address":3290364,"tmhm_learnset":"00A03E64CE1306A1","types":[1,1]},{"abilities":[62,0],"base_stats":[90,130,80,55,65,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":68,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":67},{"level":1,"move_id":43},{"level":1,"move_id":116},{"level":7,"move_id":116},{"level":13,"move_id":2},{"level":19,"move_id":69},{"level":22,"move_id":193},{"level":25,"move_id":279},{"level":33,"move_id":233},{"level":41,"move_id":66},{"level":46,"move_id":238},{"level":51,"move_id":184},{"level":59,"move_id":223}],"rom_address":3301598},"rom_address":3290392,"tmhm_learnset":"00A03E64CE1346A1","types":[1,1]},{"abilities":[34,0],"base_stats":[50,75,35,40,70,30],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":21,"species":70}],"friendship":70,"id":69,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":22},{"level":6,"move_id":74},{"level":11,"move_id":35},{"level":15,"move_id":79},{"level":17,"move_id":77},{"level":19,"move_id":78},{"level":23,"move_id":51},{"level":30,"move_id":230},{"level":37,"move_id":75},{"level":45,"move_id":21}],"rom_address":3301628},"rom_address":3290420,"tmhm_learnset":"00443E0884350720","types":[12,3]},{"abilities":[34,0],"base_stats":[65,90,50,55,85,45],"catch_rate":120,"evolutions":[{"method":"ITEM","param":98,"species":71}],"friendship":70,"id":70,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":22},{"level":1,"move_id":74},{"level":1,"move_id":35},{"level":6,"move_id":74},{"level":11,"move_id":35},{"level":15,"move_id":79},{"level":17,"move_id":77},{"level":19,"move_id":78},{"level":24,"move_id":51},{"level":33,"move_id":230},{"level":42,"move_id":75},{"level":54,"move_id":21}],"rom_address":3301656},"rom_address":3290448,"tmhm_learnset":"00443E0884350720","types":[12,3]},{"abilities":[34,0],"base_stats":[80,105,65,70,100,60],"catch_rate":45,"evolutions":[],"friendship":70,"id":71,"learnset":{"moves":[{"level":1,"move_id":22},{"level":1,"move_id":79},{"level":1,"move_id":230},{"level":1,"move_id":75}],"rom_address":3301684},"rom_address":3290476,"tmhm_learnset":"00443E0884354720","types":[12,3]},{"abilities":[29,64],"base_stats":[40,40,35,70,50,100],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":30,"species":73}],"friendship":70,"id":72,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":40},{"level":6,"move_id":48},{"level":12,"move_id":132},{"level":19,"move_id":51},{"level":25,"move_id":61},{"level":30,"move_id":35},{"level":36,"move_id":112},{"level":43,"move_id":103},{"level":49,"move_id":56}],"rom_address":3301694},"rom_address":3290504,"tmhm_learnset":"03143E0884173264","types":[11,3]},{"abilities":[29,64],"base_stats":[80,70,65,100,80,120],"catch_rate":60,"evolutions":[],"friendship":70,"id":73,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":40},{"level":1,"move_id":48},{"level":1,"move_id":132},{"level":6,"move_id":48},{"level":12,"move_id":132},{"level":19,"move_id":51},{"level":25,"move_id":61},{"level":30,"move_id":35},{"level":38,"move_id":112},{"level":47,"move_id":103},{"level":55,"move_id":56}],"rom_address":3301720},"rom_address":3290532,"tmhm_learnset":"03143E0884177264","types":[11,3]},{"abilities":[69,5],"base_stats":[40,80,100,20,30,30],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":25,"species":75}],"friendship":70,"id":74,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":111},{"level":6,"move_id":300},{"level":11,"move_id":88},{"level":16,"move_id":222},{"level":21,"move_id":120},{"level":26,"move_id":205},{"level":31,"move_id":350},{"level":36,"move_id":89},{"level":41,"move_id":153},{"level":46,"move_id":38}],"rom_address":3301746},"rom_address":3290560,"tmhm_learnset":"00A01E74CE110621","types":[5,4]},{"abilities":[69,5],"base_stats":[55,95,115,35,45,45],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":37,"species":76}],"friendship":70,"id":75,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":111},{"level":1,"move_id":300},{"level":1,"move_id":88},{"level":6,"move_id":300},{"level":11,"move_id":88},{"level":16,"move_id":222},{"level":21,"move_id":120},{"level":29,"move_id":205},{"level":37,"move_id":350},{"level":45,"move_id":89},{"level":53,"move_id":153},{"level":62,"move_id":38}],"rom_address":3301774},"rom_address":3290588,"tmhm_learnset":"00A01E74CE110621","types":[5,4]},{"abilities":[69,5],"base_stats":[80,110,130,45,55,65],"catch_rate":45,"evolutions":[],"friendship":70,"id":76,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":111},{"level":1,"move_id":300},{"level":1,"move_id":88},{"level":6,"move_id":300},{"level":11,"move_id":88},{"level":16,"move_id":222},{"level":21,"move_id":120},{"level":29,"move_id":205},{"level":37,"move_id":350},{"level":45,"move_id":89},{"level":53,"move_id":153},{"level":62,"move_id":38}],"rom_address":3301802},"rom_address":3290616,"tmhm_learnset":"00A01E74CE114631","types":[5,4]},{"abilities":[50,18],"base_stats":[50,85,55,90,65,65],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":40,"species":78}],"friendship":70,"id":77,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":5,"move_id":45},{"level":9,"move_id":39},{"level":14,"move_id":52},{"level":19,"move_id":23},{"level":25,"move_id":83},{"level":31,"move_id":36},{"level":38,"move_id":97},{"level":45,"move_id":340},{"level":53,"move_id":126}],"rom_address":3301830},"rom_address":3290644,"tmhm_learnset":"00221E2484710620","types":[10,10]},{"abilities":[50,18],"base_stats":[65,100,70,105,80,80],"catch_rate":60,"evolutions":[],"friendship":70,"id":78,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":39},{"level":1,"move_id":52},{"level":5,"move_id":45},{"level":9,"move_id":39},{"level":14,"move_id":52},{"level":19,"move_id":23},{"level":25,"move_id":83},{"level":31,"move_id":36},{"level":38,"move_id":97},{"level":40,"move_id":31},{"level":50,"move_id":340},{"level":63,"move_id":126}],"rom_address":3301858},"rom_address":3290672,"tmhm_learnset":"00221E2484714620","types":[10,10]},{"abilities":[12,20],"base_stats":[90,65,65,15,40,40],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":37,"species":80},{"method":"ITEM","param":187,"species":199}],"friendship":70,"id":79,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":174},{"level":1,"move_id":281},{"level":1,"move_id":33},{"level":6,"move_id":45},{"level":15,"move_id":55},{"level":20,"move_id":93},{"level":29,"move_id":50},{"level":34,"move_id":29},{"level":43,"move_id":133},{"level":48,"move_id":94}],"rom_address":3301888},"rom_address":3290700,"tmhm_learnset":"02709E24BE5B366C","types":[11,14]},{"abilities":[12,20],"base_stats":[95,75,110,30,100,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":80,"learnset":{"moves":[{"level":1,"move_id":174},{"level":1,"move_id":281},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":6,"move_id":45},{"level":15,"move_id":55},{"level":20,"move_id":93},{"level":29,"move_id":50},{"level":34,"move_id":29},{"level":37,"move_id":110},{"level":46,"move_id":133},{"level":54,"move_id":94}],"rom_address":3301912},"rom_address":3290728,"tmhm_learnset":"02F09E24FE5B766D","types":[11,14]},{"abilities":[42,5],"base_stats":[25,35,70,45,95,55],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":30,"species":82}],"friendship":70,"id":81,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":319},{"level":1,"move_id":33},{"level":6,"move_id":84},{"level":11,"move_id":48},{"level":16,"move_id":49},{"level":21,"move_id":86},{"level":26,"move_id":209},{"level":32,"move_id":199},{"level":38,"move_id":129},{"level":44,"move_id":103},{"level":50,"move_id":192}],"rom_address":3301938},"rom_address":3290756,"tmhm_learnset":"00400E0385930620","types":[13,8]},{"abilities":[42,5],"base_stats":[50,60,95,70,120,70],"catch_rate":60,"evolutions":[],"friendship":70,"id":82,"learnset":{"moves":[{"level":1,"move_id":319},{"level":1,"move_id":33},{"level":1,"move_id":84},{"level":1,"move_id":48},{"level":6,"move_id":84},{"level":11,"move_id":48},{"level":16,"move_id":49},{"level":21,"move_id":86},{"level":26,"move_id":209},{"level":35,"move_id":199},{"level":44,"move_id":161},{"level":53,"move_id":103},{"level":62,"move_id":192}],"rom_address":3301966},"rom_address":3290784,"tmhm_learnset":"00400E0385934620","types":[13,8]},{"abilities":[51,39],"base_stats":[52,65,55,60,58,62],"catch_rate":45,"evolutions":[],"friendship":70,"id":83,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":6,"move_id":28},{"level":11,"move_id":43},{"level":16,"move_id":31},{"level":21,"move_id":282},{"level":26,"move_id":210},{"level":31,"move_id":14},{"level":36,"move_id":97},{"level":41,"move_id":163},{"level":46,"move_id":206}],"rom_address":3301994},"rom_address":3290812,"tmhm_learnset":"000C7E8084510620","types":[0,2]},{"abilities":[50,48],"base_stats":[35,85,45,75,35,35],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":31,"species":85}],"friendship":70,"id":84,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":9,"move_id":228},{"level":13,"move_id":31},{"level":21,"move_id":161},{"level":25,"move_id":99},{"level":33,"move_id":253},{"level":37,"move_id":65},{"level":45,"move_id":97}],"rom_address":3302022},"rom_address":3290840,"tmhm_learnset":"00087E8084110620","types":[0,2]},{"abilities":[50,48],"base_stats":[60,110,70,100,60,60],"catch_rate":45,"evolutions":[],"friendship":70,"id":85,"learnset":{"moves":[{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":1,"move_id":228},{"level":1,"move_id":31},{"level":9,"move_id":228},{"level":13,"move_id":31},{"level":21,"move_id":161},{"level":25,"move_id":99},{"level":38,"move_id":253},{"level":47,"move_id":65},{"level":60,"move_id":97}],"rom_address":3302046},"rom_address":3290868,"tmhm_learnset":"00087F8084114E20","types":[0,2]},{"abilities":[47,0],"base_stats":[65,45,55,45,45,70],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":34,"species":87}],"friendship":70,"id":86,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":29},{"level":9,"move_id":45},{"level":17,"move_id":196},{"level":21,"move_id":62},{"level":29,"move_id":156},{"level":37,"move_id":36},{"level":41,"move_id":58},{"level":49,"move_id":219}],"rom_address":3302070},"rom_address":3290896,"tmhm_learnset":"03103E00841B3264","types":[11,11]},{"abilities":[47,0],"base_stats":[90,70,80,70,70,95],"catch_rate":75,"evolutions":[],"friendship":70,"id":87,"learnset":{"moves":[{"level":1,"move_id":29},{"level":1,"move_id":45},{"level":1,"move_id":196},{"level":1,"move_id":62},{"level":9,"move_id":45},{"level":17,"move_id":196},{"level":21,"move_id":62},{"level":29,"move_id":156},{"level":34,"move_id":329},{"level":42,"move_id":36},{"level":51,"move_id":58},{"level":64,"move_id":219}],"rom_address":3302094},"rom_address":3290924,"tmhm_learnset":"03103E00841B7264","types":[11,15]},{"abilities":[1,60],"base_stats":[80,80,50,25,40,50],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":38,"species":89}],"friendship":70,"id":88,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":139},{"level":1,"move_id":1},{"level":4,"move_id":106},{"level":8,"move_id":50},{"level":13,"move_id":124},{"level":19,"move_id":107},{"level":26,"move_id":103},{"level":34,"move_id":151},{"level":43,"move_id":188},{"level":53,"move_id":262}],"rom_address":3302120},"rom_address":3290952,"tmhm_learnset":"00003F6E8D970E20","types":[3,3]},{"abilities":[1,60],"base_stats":[105,105,75,50,65,100],"catch_rate":75,"evolutions":[],"friendship":70,"id":89,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":139},{"level":1,"move_id":1},{"level":1,"move_id":106},{"level":4,"move_id":106},{"level":8,"move_id":50},{"level":13,"move_id":124},{"level":19,"move_id":107},{"level":26,"move_id":103},{"level":34,"move_id":151},{"level":47,"move_id":188},{"level":61,"move_id":262}],"rom_address":3302146},"rom_address":3290980,"tmhm_learnset":"00A03F6ECD974E21","types":[3,3]},{"abilities":[75,0],"base_stats":[30,65,100,40,45,25],"catch_rate":190,"evolutions":[{"method":"ITEM","param":97,"species":91}],"friendship":70,"id":90,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":110},{"level":9,"move_id":48},{"level":17,"move_id":62},{"level":25,"move_id":182},{"level":33,"move_id":43},{"level":41,"move_id":128},{"level":49,"move_id":58}],"rom_address":3302172},"rom_address":3291008,"tmhm_learnset":"02101E0084133264","types":[11,11]},{"abilities":[75,0],"base_stats":[50,95,180,70,85,45],"catch_rate":60,"evolutions":[],"friendship":70,"id":91,"learnset":{"moves":[{"level":1,"move_id":110},{"level":1,"move_id":48},{"level":1,"move_id":62},{"level":1,"move_id":182},{"level":33,"move_id":191},{"level":41,"move_id":131}],"rom_address":3302194},"rom_address":3291036,"tmhm_learnset":"02101F0084137264","types":[11,15]},{"abilities":[26,0],"base_stats":[30,35,30,80,100,35],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":25,"species":93}],"friendship":70,"id":92,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":95},{"level":1,"move_id":122},{"level":8,"move_id":180},{"level":13,"move_id":212},{"level":16,"move_id":174},{"level":21,"move_id":101},{"level":28,"move_id":109},{"level":33,"move_id":138},{"level":36,"move_id":194}],"rom_address":3302208},"rom_address":3291064,"tmhm_learnset":"0001BF08B4970E20","types":[7,3]},{"abilities":[26,0],"base_stats":[45,50,45,95,115,55],"catch_rate":90,"evolutions":[{"method":"LEVEL","param":37,"species":94}],"friendship":70,"id":93,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":95},{"level":1,"move_id":122},{"level":1,"move_id":180},{"level":8,"move_id":180},{"level":13,"move_id":212},{"level":16,"move_id":174},{"level":21,"move_id":101},{"level":25,"move_id":325},{"level":31,"move_id":109},{"level":39,"move_id":138},{"level":48,"move_id":194}],"rom_address":3302232},"rom_address":3291092,"tmhm_learnset":"0001BF08B4970E20","types":[7,3]},{"abilities":[26,0],"base_stats":[60,65,60,110,130,75],"catch_rate":45,"evolutions":[],"friendship":70,"id":94,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":95},{"level":1,"move_id":122},{"level":1,"move_id":180},{"level":8,"move_id":180},{"level":13,"move_id":212},{"level":16,"move_id":174},{"level":21,"move_id":101},{"level":25,"move_id":325},{"level":31,"move_id":109},{"level":39,"move_id":138},{"level":48,"move_id":194}],"rom_address":3302258},"rom_address":3291120,"tmhm_learnset":"00A1BF08F5974E21","types":[7,3]},{"abilities":[69,5],"base_stats":[35,45,160,70,30,45],"catch_rate":45,"evolutions":[{"method":"ITEM","param":199,"species":208}],"friendship":70,"id":95,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":103},{"level":9,"move_id":20},{"level":13,"move_id":88},{"level":21,"move_id":106},{"level":25,"move_id":99},{"level":33,"move_id":201},{"level":37,"move_id":21},{"level":45,"move_id":231},{"level":49,"move_id":328},{"level":57,"move_id":38}],"rom_address":3302284},"rom_address":3291148,"tmhm_learnset":"00A01F508E510E30","types":[5,4]},{"abilities":[15,0],"base_stats":[60,48,45,42,43,90],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":26,"species":97}],"friendship":70,"id":96,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":95},{"level":10,"move_id":50},{"level":18,"move_id":93},{"level":25,"move_id":29},{"level":31,"move_id":139},{"level":36,"move_id":96},{"level":40,"move_id":94},{"level":43,"move_id":244},{"level":45,"move_id":248}],"rom_address":3302312},"rom_address":3291176,"tmhm_learnset":"0041BF01F41B8E29","types":[14,14]},{"abilities":[15,0],"base_stats":[85,73,70,67,73,115],"catch_rate":75,"evolutions":[],"friendship":70,"id":97,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":95},{"level":1,"move_id":50},{"level":1,"move_id":93},{"level":10,"move_id":50},{"level":18,"move_id":93},{"level":25,"move_id":29},{"level":33,"move_id":139},{"level":40,"move_id":96},{"level":49,"move_id":94},{"level":55,"move_id":244},{"level":60,"move_id":248}],"rom_address":3302338},"rom_address":3291204,"tmhm_learnset":"0041BF01F41BCE29","types":[14,14]},{"abilities":[52,75],"base_stats":[30,105,90,50,25,25],"catch_rate":225,"evolutions":[{"method":"LEVEL","param":28,"species":99}],"friendship":70,"id":98,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":5,"move_id":43},{"level":12,"move_id":11},{"level":16,"move_id":106},{"level":23,"move_id":341},{"level":27,"move_id":23},{"level":34,"move_id":12},{"level":41,"move_id":182},{"level":45,"move_id":152}],"rom_address":3302364},"rom_address":3291232,"tmhm_learnset":"02B43E408C133264","types":[11,11]},{"abilities":[52,75],"base_stats":[55,130,115,75,50,50],"catch_rate":60,"evolutions":[],"friendship":70,"id":99,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":1,"move_id":43},{"level":1,"move_id":11},{"level":5,"move_id":43},{"level":12,"move_id":11},{"level":16,"move_id":106},{"level":23,"move_id":341},{"level":27,"move_id":23},{"level":38,"move_id":12},{"level":49,"move_id":182},{"level":57,"move_id":152}],"rom_address":3302390},"rom_address":3291260,"tmhm_learnset":"02B43E408C137264","types":[11,11]},{"abilities":[43,9],"base_stats":[40,30,50,100,55,55],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":30,"species":101}],"friendship":70,"id":100,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":268},{"level":1,"move_id":33},{"level":8,"move_id":103},{"level":15,"move_id":49},{"level":21,"move_id":209},{"level":27,"move_id":120},{"level":32,"move_id":205},{"level":37,"move_id":113},{"level":42,"move_id":129},{"level":46,"move_id":153},{"level":49,"move_id":243}],"rom_address":3302416},"rom_address":3291288,"tmhm_learnset":"00402F0285938A20","types":[13,13]},{"abilities":[43,9],"base_stats":[60,50,70,140,80,80],"catch_rate":60,"evolutions":[],"friendship":70,"id":101,"learnset":{"moves":[{"level":1,"move_id":268},{"level":1,"move_id":33},{"level":1,"move_id":103},{"level":1,"move_id":49},{"level":8,"move_id":103},{"level":15,"move_id":49},{"level":21,"move_id":209},{"level":27,"move_id":120},{"level":34,"move_id":205},{"level":41,"move_id":113},{"level":48,"move_id":129},{"level":54,"move_id":153},{"level":59,"move_id":243}],"rom_address":3302444},"rom_address":3291316,"tmhm_learnset":"00402F028593CA20","types":[13,13]},{"abilities":[34,0],"base_stats":[60,40,80,40,60,45],"catch_rate":90,"evolutions":[{"method":"ITEM","param":98,"species":103}],"friendship":70,"id":102,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":140},{"level":1,"move_id":253},{"level":1,"move_id":95},{"level":7,"move_id":115},{"level":13,"move_id":73},{"level":19,"move_id":93},{"level":25,"move_id":78},{"level":31,"move_id":77},{"level":37,"move_id":79},{"level":43,"move_id":76}],"rom_address":3302472},"rom_address":3291344,"tmhm_learnset":"0060BE0994358720","types":[12,14]},{"abilities":[34,0],"base_stats":[95,95,85,55,125,65],"catch_rate":45,"evolutions":[],"friendship":70,"id":103,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":140},{"level":1,"move_id":95},{"level":1,"move_id":93},{"level":19,"move_id":23},{"level":31,"move_id":121}],"rom_address":3302496},"rom_address":3291372,"tmhm_learnset":"0060BE099435C720","types":[12,14]},{"abilities":[69,31],"base_stats":[50,50,95,35,40,50],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":28,"species":105}],"friendship":70,"id":104,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":125},{"level":1,"move_id":45},{"level":5,"move_id":39},{"level":9,"move_id":125},{"level":13,"move_id":29},{"level":17,"move_id":43},{"level":21,"move_id":116},{"level":25,"move_id":155},{"level":29,"move_id":99},{"level":33,"move_id":206},{"level":37,"move_id":37},{"level":41,"move_id":198},{"level":45,"move_id":38}],"rom_address":3302510},"rom_address":3291400,"tmhm_learnset":"00A03EF4CE513621","types":[4,4]},{"abilities":[69,31],"base_stats":[60,80,110,45,50,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":105,"learnset":{"moves":[{"level":1,"move_id":45},{"level":1,"move_id":39},{"level":1,"move_id":125},{"level":1,"move_id":29},{"level":5,"move_id":39},{"level":9,"move_id":125},{"level":13,"move_id":29},{"level":17,"move_id":43},{"level":21,"move_id":116},{"level":25,"move_id":155},{"level":32,"move_id":99},{"level":39,"move_id":206},{"level":46,"move_id":37},{"level":53,"move_id":198},{"level":61,"move_id":38}],"rom_address":3302542},"rom_address":3291428,"tmhm_learnset":"00A03EF4CE517621","types":[4,4]},{"abilities":[7,0],"base_stats":[50,120,53,87,35,110],"catch_rate":45,"evolutions":[],"friendship":70,"id":106,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":279},{"level":1,"move_id":24},{"level":6,"move_id":96},{"level":11,"move_id":27},{"level":16,"move_id":26},{"level":20,"move_id":280},{"level":21,"move_id":116},{"level":26,"move_id":136},{"level":31,"move_id":170},{"level":36,"move_id":193},{"level":41,"move_id":203},{"level":46,"move_id":25},{"level":51,"move_id":179}],"rom_address":3302574},"rom_address":3291456,"tmhm_learnset":"00A03E40C61306A1","types":[1,1]},{"abilities":[51,0],"base_stats":[50,105,79,76,35,110],"catch_rate":45,"evolutions":[],"friendship":70,"id":107,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":279},{"level":1,"move_id":4},{"level":7,"move_id":97},{"level":13,"move_id":228},{"level":20,"move_id":183},{"level":26,"move_id":9},{"level":26,"move_id":8},{"level":26,"move_id":7},{"level":32,"move_id":327},{"level":38,"move_id":5},{"level":44,"move_id":197},{"level":50,"move_id":68}],"rom_address":3302606},"rom_address":3291484,"tmhm_learnset":"00A03E40C61306A1","types":[1,1]},{"abilities":[20,12],"base_stats":[90,55,75,30,60,75],"catch_rate":45,"evolutions":[],"friendship":70,"id":108,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":122},{"level":7,"move_id":48},{"level":12,"move_id":111},{"level":18,"move_id":282},{"level":23,"move_id":23},{"level":29,"move_id":35},{"level":34,"move_id":50},{"level":40,"move_id":21},{"level":45,"move_id":103},{"level":51,"move_id":287}],"rom_address":3302636},"rom_address":3291512,"tmhm_learnset":"00B43E76EFF37625","types":[0,0]},{"abilities":[26,0],"base_stats":[40,65,95,35,60,45],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":35,"species":110}],"friendship":70,"id":109,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":139},{"level":1,"move_id":33},{"level":9,"move_id":123},{"level":17,"move_id":120},{"level":21,"move_id":124},{"level":25,"move_id":108},{"level":33,"move_id":114},{"level":41,"move_id":153},{"level":45,"move_id":194},{"level":49,"move_id":262}],"rom_address":3302664},"rom_address":3291540,"tmhm_learnset":"00403F2EA5930E20","types":[3,3]},{"abilities":[26,0],"base_stats":[65,90,120,60,85,70],"catch_rate":60,"evolutions":[],"friendship":70,"id":110,"learnset":{"moves":[{"level":1,"move_id":139},{"level":1,"move_id":33},{"level":1,"move_id":123},{"level":1,"move_id":120},{"level":9,"move_id":123},{"level":17,"move_id":120},{"level":21,"move_id":124},{"level":25,"move_id":108},{"level":33,"move_id":114},{"level":44,"move_id":153},{"level":51,"move_id":194},{"level":58,"move_id":262}],"rom_address":3302690},"rom_address":3291568,"tmhm_learnset":"00403F2EA5934E20","types":[3,3]},{"abilities":[31,69],"base_stats":[80,85,95,25,30,30],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":42,"species":112}],"friendship":70,"id":111,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":30},{"level":1,"move_id":39},{"level":10,"move_id":23},{"level":15,"move_id":31},{"level":24,"move_id":184},{"level":29,"move_id":350},{"level":38,"move_id":32},{"level":43,"move_id":36},{"level":52,"move_id":89},{"level":57,"move_id":224}],"rom_address":3302716},"rom_address":3291596,"tmhm_learnset":"00A03E768FD33630","types":[4,5]},{"abilities":[31,69],"base_stats":[105,130,120,40,45,45],"catch_rate":60,"evolutions":[],"friendship":70,"id":112,"learnset":{"moves":[{"level":1,"move_id":30},{"level":1,"move_id":39},{"level":1,"move_id":23},{"level":1,"move_id":31},{"level":10,"move_id":23},{"level":15,"move_id":31},{"level":24,"move_id":184},{"level":29,"move_id":350},{"level":38,"move_id":32},{"level":46,"move_id":36},{"level":58,"move_id":89},{"level":66,"move_id":224}],"rom_address":3302742},"rom_address":3291624,"tmhm_learnset":"00B43E76CFD37631","types":[4,5]},{"abilities":[30,32],"base_stats":[250,5,5,50,35,105],"catch_rate":30,"evolutions":[{"method":"FRIENDSHIP","param":0,"species":242}],"friendship":140,"id":113,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":45},{"level":5,"move_id":39},{"level":9,"move_id":287},{"level":13,"move_id":135},{"level":17,"move_id":3},{"level":23,"move_id":107},{"level":29,"move_id":47},{"level":35,"move_id":121},{"level":41,"move_id":111},{"level":49,"move_id":113},{"level":57,"move_id":38}],"rom_address":3302768},"rom_address":3291652,"tmhm_learnset":"00E19E76F7FBF66D","types":[0,0]},{"abilities":[34,0],"base_stats":[65,55,115,60,100,40],"catch_rate":45,"evolutions":[],"friendship":70,"id":114,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":275},{"level":1,"move_id":132},{"level":4,"move_id":79},{"level":10,"move_id":71},{"level":13,"move_id":74},{"level":19,"move_id":77},{"level":22,"move_id":22},{"level":28,"move_id":20},{"level":31,"move_id":72},{"level":37,"move_id":78},{"level":40,"move_id":21},{"level":46,"move_id":321}],"rom_address":3302798},"rom_address":3291680,"tmhm_learnset":"00C43E0884354720","types":[12,12]},{"abilities":[48,0],"base_stats":[105,95,80,90,40,80],"catch_rate":45,"evolutions":[],"friendship":70,"id":115,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":4},{"level":1,"move_id":43},{"level":7,"move_id":44},{"level":13,"move_id":39},{"level":19,"move_id":252},{"level":25,"move_id":5},{"level":31,"move_id":99},{"level":37,"move_id":203},{"level":43,"move_id":146},{"level":49,"move_id":179}],"rom_address":3302828},"rom_address":3291708,"tmhm_learnset":"00B43EF6EFF37675","types":[0,0]},{"abilities":[33,0],"base_stats":[30,40,70,60,70,25],"catch_rate":225,"evolutions":[{"method":"LEVEL","param":32,"species":117}],"friendship":70,"id":116,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":8,"move_id":108},{"level":15,"move_id":43},{"level":22,"move_id":55},{"level":29,"move_id":239},{"level":36,"move_id":97},{"level":43,"move_id":56},{"level":50,"move_id":349}],"rom_address":3302854},"rom_address":3291736,"tmhm_learnset":"03101E0084133264","types":[11,11]},{"abilities":[38,0],"base_stats":[55,65,95,85,95,45],"catch_rate":75,"evolutions":[{"method":"ITEM","param":201,"species":230}],"friendship":70,"id":117,"learnset":{"moves":[{"level":1,"move_id":145},{"level":1,"move_id":108},{"level":1,"move_id":43},{"level":1,"move_id":55},{"level":8,"move_id":108},{"level":15,"move_id":43},{"level":22,"move_id":55},{"level":29,"move_id":239},{"level":40,"move_id":97},{"level":51,"move_id":56},{"level":62,"move_id":349}],"rom_address":3302878},"rom_address":3291764,"tmhm_learnset":"03101E0084137264","types":[11,11]},{"abilities":[33,41],"base_stats":[45,67,60,63,35,50],"catch_rate":225,"evolutions":[{"method":"LEVEL","param":33,"species":119}],"friendship":70,"id":118,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":39},{"level":1,"move_id":346},{"level":10,"move_id":48},{"level":15,"move_id":30},{"level":24,"move_id":175},{"level":29,"move_id":31},{"level":38,"move_id":127},{"level":43,"move_id":32},{"level":52,"move_id":97}],"rom_address":3302902},"rom_address":3291792,"tmhm_learnset":"03101E0084133264","types":[11,11]},{"abilities":[33,41],"base_stats":[80,92,65,68,65,80],"catch_rate":60,"evolutions":[],"friendship":70,"id":119,"learnset":{"moves":[{"level":1,"move_id":64},{"level":1,"move_id":39},{"level":1,"move_id":346},{"level":1,"move_id":48},{"level":10,"move_id":48},{"level":15,"move_id":30},{"level":24,"move_id":175},{"level":29,"move_id":31},{"level":41,"move_id":127},{"level":49,"move_id":32},{"level":61,"move_id":97}],"rom_address":3302926},"rom_address":3291820,"tmhm_learnset":"03101E0084137264","types":[11,11]},{"abilities":[35,30],"base_stats":[30,45,55,85,70,55],"catch_rate":225,"evolutions":[{"method":"ITEM","param":97,"species":121}],"friendship":70,"id":120,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":6,"move_id":55},{"level":10,"move_id":229},{"level":15,"move_id":105},{"level":19,"move_id":293},{"level":24,"move_id":129},{"level":28,"move_id":61},{"level":33,"move_id":107},{"level":37,"move_id":113},{"level":42,"move_id":322},{"level":46,"move_id":56}],"rom_address":3302950},"rom_address":3291848,"tmhm_learnset":"03500E019593B264","types":[11,11]},{"abilities":[35,30],"base_stats":[60,75,85,115,100,85],"catch_rate":60,"evolutions":[],"friendship":70,"id":121,"learnset":{"moves":[{"level":1,"move_id":55},{"level":1,"move_id":229},{"level":1,"move_id":105},{"level":1,"move_id":129},{"level":33,"move_id":109}],"rom_address":3302980},"rom_address":3291876,"tmhm_learnset":"03508E019593F264","types":[11,14]},{"abilities":[43,0],"base_stats":[40,45,65,90,100,120],"catch_rate":45,"evolutions":[],"friendship":70,"id":122,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":112},{"level":5,"move_id":93},{"level":9,"move_id":164},{"level":13,"move_id":96},{"level":17,"move_id":3},{"level":21,"move_id":113},{"level":21,"move_id":115},{"level":25,"move_id":227},{"level":29,"move_id":60},{"level":33,"move_id":278},{"level":37,"move_id":271},{"level":41,"move_id":272},{"level":45,"move_id":94},{"level":49,"move_id":226},{"level":53,"move_id":219}],"rom_address":3302992},"rom_address":3291904,"tmhm_learnset":"0041BF03F5BBCE29","types":[14,14]},{"abilities":[68,0],"base_stats":[70,110,80,105,55,80],"catch_rate":45,"evolutions":[{"method":"ITEM","param":199,"species":212}],"friendship":70,"id":123,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":98},{"level":1,"move_id":43},{"level":6,"move_id":116},{"level":11,"move_id":228},{"level":16,"move_id":206},{"level":21,"move_id":97},{"level":26,"move_id":17},{"level":31,"move_id":163},{"level":36,"move_id":14},{"level":41,"move_id":104},{"level":46,"move_id":210}],"rom_address":3303030},"rom_address":3291932,"tmhm_learnset":"00847E8084134620","types":[6,2]},{"abilities":[12,0],"base_stats":[65,50,35,95,115,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":124,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":122},{"level":1,"move_id":142},{"level":1,"move_id":181},{"level":9,"move_id":142},{"level":13,"move_id":181},{"level":21,"move_id":3},{"level":25,"move_id":8},{"level":35,"move_id":212},{"level":41,"move_id":313},{"level":51,"move_id":34},{"level":57,"move_id":195},{"level":67,"move_id":59}],"rom_address":3303058},"rom_address":3291960,"tmhm_learnset":"0040BF01F413FA6D","types":[15,14]},{"abilities":[9,0],"base_stats":[65,83,57,105,95,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":125,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":98},{"level":1,"move_id":43},{"level":1,"move_id":9},{"level":9,"move_id":9},{"level":17,"move_id":113},{"level":25,"move_id":129},{"level":36,"move_id":103},{"level":47,"move_id":85},{"level":58,"move_id":87}],"rom_address":3303086},"rom_address":3291988,"tmhm_learnset":"00E03E02D5D3C221","types":[13,13]},{"abilities":[49,0],"base_stats":[65,95,57,93,100,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":126,"learnset":{"moves":[{"level":1,"move_id":52},{"level":1,"move_id":43},{"level":1,"move_id":123},{"level":1,"move_id":7},{"level":7,"move_id":43},{"level":13,"move_id":123},{"level":19,"move_id":7},{"level":25,"move_id":108},{"level":33,"move_id":241},{"level":41,"move_id":53},{"level":49,"move_id":109},{"level":57,"move_id":126}],"rom_address":3303108},"rom_address":3292016,"tmhm_learnset":"00A03E24D4514621","types":[10,10]},{"abilities":[52,0],"base_stats":[65,125,100,85,55,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":127,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":11},{"level":1,"move_id":116},{"level":7,"move_id":20},{"level":13,"move_id":69},{"level":19,"move_id":106},{"level":25,"move_id":279},{"level":31,"move_id":280},{"level":37,"move_id":12},{"level":43,"move_id":66},{"level":49,"move_id":14}],"rom_address":3303134},"rom_address":3292044,"tmhm_learnset":"00A43E40CE1346A1","types":[6,6]},{"abilities":[22,0],"base_stats":[75,100,95,110,40,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":128,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":39},{"level":8,"move_id":99},{"level":13,"move_id":30},{"level":19,"move_id":184},{"level":26,"move_id":228},{"level":34,"move_id":156},{"level":43,"move_id":37},{"level":53,"move_id":36}],"rom_address":3303160},"rom_address":3292072,"tmhm_learnset":"00B01E7687F37624","types":[0,0]},{"abilities":[33,0],"base_stats":[20,10,55,80,15,20],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":20,"species":130}],"friendship":70,"id":129,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":150},{"level":15,"move_id":33},{"level":30,"move_id":175}],"rom_address":3303186},"rom_address":3292100,"tmhm_learnset":"0000000000000000","types":[11,11]},{"abilities":[22,0],"base_stats":[95,125,79,81,60,100],"catch_rate":45,"evolutions":[],"friendship":70,"id":130,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":37},{"level":20,"move_id":44},{"level":25,"move_id":82},{"level":30,"move_id":43},{"level":35,"move_id":239},{"level":40,"move_id":56},{"level":45,"move_id":240},{"level":50,"move_id":349},{"level":55,"move_id":63}],"rom_address":3303200},"rom_address":3292128,"tmhm_learnset":"03B01F3487937A74","types":[11,2]},{"abilities":[11,75],"base_stats":[130,85,80,60,85,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":131,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":55},{"level":1,"move_id":45},{"level":1,"move_id":47},{"level":7,"move_id":54},{"level":13,"move_id":34},{"level":19,"move_id":109},{"level":25,"move_id":195},{"level":31,"move_id":58},{"level":37,"move_id":240},{"level":43,"move_id":219},{"level":49,"move_id":56},{"level":55,"move_id":329}],"rom_address":3303226},"rom_address":3292156,"tmhm_learnset":"03B01E0295DB7274","types":[11,15]},{"abilities":[7,0],"base_stats":[48,48,48,48,48,48],"catch_rate":35,"evolutions":[],"friendship":70,"id":132,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":144}],"rom_address":3303254},"rom_address":3292184,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[50,0],"base_stats":[55,55,50,55,45,65],"catch_rate":45,"evolutions":[{"method":"ITEM","param":96,"species":135},{"method":"ITEM","param":97,"species":134},{"method":"ITEM","param":95,"species":136},{"method":"FRIENDSHIP_DAY","param":0,"species":196},{"method":"FRIENDSHIP_NIGHT","param":0,"species":197}],"friendship":70,"id":133,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":270},{"level":8,"move_id":28},{"level":16,"move_id":45},{"level":23,"move_id":98},{"level":30,"move_id":44},{"level":36,"move_id":226},{"level":42,"move_id":36}],"rom_address":3303264},"rom_address":3292212,"tmhm_learnset":"00001E00AC530620","types":[0,0]},{"abilities":[11,0],"base_stats":[130,65,60,65,110,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":134,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":270},{"level":8,"move_id":28},{"level":16,"move_id":55},{"level":23,"move_id":98},{"level":30,"move_id":44},{"level":36,"move_id":62},{"level":42,"move_id":114},{"level":47,"move_id":151},{"level":52,"move_id":56}],"rom_address":3303286},"rom_address":3292240,"tmhm_learnset":"03101E00AC537674","types":[11,11]},{"abilities":[10,0],"base_stats":[65,65,60,130,110,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":135,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":270},{"level":8,"move_id":28},{"level":16,"move_id":84},{"level":23,"move_id":98},{"level":30,"move_id":24},{"level":36,"move_id":42},{"level":42,"move_id":86},{"level":47,"move_id":97},{"level":52,"move_id":87}],"rom_address":3303312},"rom_address":3292268,"tmhm_learnset":"00401E02ADD34630","types":[13,13]},{"abilities":[18,0],"base_stats":[65,130,60,65,95,110],"catch_rate":45,"evolutions":[],"friendship":70,"id":136,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":270},{"level":8,"move_id":28},{"level":16,"move_id":52},{"level":23,"move_id":98},{"level":30,"move_id":44},{"level":36,"move_id":83},{"level":42,"move_id":123},{"level":47,"move_id":43},{"level":52,"move_id":53}],"rom_address":3303338},"rom_address":3292296,"tmhm_learnset":"00021E24AC534630","types":[10,10]},{"abilities":[36,0],"base_stats":[65,60,70,40,85,75],"catch_rate":45,"evolutions":[{"method":"ITEM","param":218,"species":233}],"friendship":70,"id":137,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":176},{"level":1,"move_id":33},{"level":1,"move_id":160},{"level":9,"move_id":97},{"level":12,"move_id":60},{"level":20,"move_id":105},{"level":24,"move_id":159},{"level":32,"move_id":199},{"level":36,"move_id":161},{"level":44,"move_id":278},{"level":48,"move_id":192}],"rom_address":3303364},"rom_address":3292324,"tmhm_learnset":"00402E82B5F37620","types":[0,0]},{"abilities":[33,75],"base_stats":[35,40,100,35,90,55],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":40,"species":139}],"friendship":70,"id":138,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":132},{"level":1,"move_id":110},{"level":13,"move_id":44},{"level":19,"move_id":55},{"level":25,"move_id":341},{"level":31,"move_id":43},{"level":37,"move_id":182},{"level":43,"move_id":321},{"level":49,"move_id":246},{"level":55,"move_id":56}],"rom_address":3303390},"rom_address":3292352,"tmhm_learnset":"03903E5084133264","types":[5,11]},{"abilities":[33,75],"base_stats":[70,60,125,55,115,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":139,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":132},{"level":1,"move_id":110},{"level":1,"move_id":44},{"level":13,"move_id":44},{"level":19,"move_id":55},{"level":25,"move_id":341},{"level":31,"move_id":43},{"level":37,"move_id":182},{"level":40,"move_id":131},{"level":46,"move_id":321},{"level":55,"move_id":246},{"level":65,"move_id":56}],"rom_address":3303416},"rom_address":3292380,"tmhm_learnset":"03903E5084137264","types":[5,11]},{"abilities":[33,4],"base_stats":[30,80,90,55,55,45],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":40,"species":141}],"friendship":70,"id":140,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":106},{"level":13,"move_id":71},{"level":19,"move_id":43},{"level":25,"move_id":341},{"level":31,"move_id":28},{"level":37,"move_id":203},{"level":43,"move_id":319},{"level":49,"move_id":72},{"level":55,"move_id":246}],"rom_address":3303444},"rom_address":3292408,"tmhm_learnset":"01903ED08C173264","types":[5,11]},{"abilities":[33,4],"base_stats":[60,115,105,80,65,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":141,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":106},{"level":1,"move_id":71},{"level":13,"move_id":71},{"level":19,"move_id":43},{"level":25,"move_id":341},{"level":31,"move_id":28},{"level":37,"move_id":203},{"level":40,"move_id":163},{"level":46,"move_id":319},{"level":55,"move_id":72},{"level":65,"move_id":246}],"rom_address":3303470},"rom_address":3292436,"tmhm_learnset":"03943ED0CC177264","types":[5,11]},{"abilities":[69,46],"base_stats":[80,105,65,130,60,75],"catch_rate":45,"evolutions":[],"friendship":70,"id":142,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":17},{"level":8,"move_id":97},{"level":15,"move_id":44},{"level":22,"move_id":48},{"level":29,"move_id":246},{"level":36,"move_id":184},{"level":43,"move_id":36},{"level":50,"move_id":63}],"rom_address":3303498},"rom_address":3292464,"tmhm_learnset":"00A87FF486534E32","types":[5,2]},{"abilities":[17,47],"base_stats":[160,110,65,30,65,110],"catch_rate":25,"evolutions":[],"friendship":70,"id":143,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":6,"move_id":133},{"level":10,"move_id":111},{"level":15,"move_id":187},{"level":19,"move_id":29},{"level":24,"move_id":281},{"level":28,"move_id":156},{"level":28,"move_id":173},{"level":33,"move_id":34},{"level":37,"move_id":335},{"level":42,"move_id":343},{"level":46,"move_id":205},{"level":51,"move_id":63}],"rom_address":3303522},"rom_address":3292492,"tmhm_learnset":"00301E76F7B37625","types":[0,0]},{"abilities":[46,0],"base_stats":[90,85,100,85,95,125],"catch_rate":3,"evolutions":[],"friendship":35,"id":144,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":16},{"level":1,"move_id":181},{"level":13,"move_id":54},{"level":25,"move_id":97},{"level":37,"move_id":170},{"level":49,"move_id":58},{"level":61,"move_id":115},{"level":73,"move_id":59},{"level":85,"move_id":329}],"rom_address":3303556},"rom_address":3292520,"tmhm_learnset":"00884E9184137674","types":[15,2]},{"abilities":[46,0],"base_stats":[90,90,85,100,125,90],"catch_rate":3,"evolutions":[],"friendship":35,"id":145,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":84},{"level":13,"move_id":86},{"level":25,"move_id":97},{"level":37,"move_id":197},{"level":49,"move_id":65},{"level":61,"move_id":268},{"level":73,"move_id":113},{"level":85,"move_id":87}],"rom_address":3303580},"rom_address":3292548,"tmhm_learnset":"00C84E928593C630","types":[13,2]},{"abilities":[46,0],"base_stats":[90,100,90,90,125,85],"catch_rate":3,"evolutions":[],"friendship":35,"id":146,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":17},{"level":1,"move_id":52},{"level":13,"move_id":83},{"level":25,"move_id":97},{"level":37,"move_id":203},{"level":49,"move_id":53},{"level":61,"move_id":219},{"level":73,"move_id":257},{"level":85,"move_id":143}],"rom_address":3303604},"rom_address":3292576,"tmhm_learnset":"008A4EB4841B4630","types":[10,2]},{"abilities":[61,0],"base_stats":[41,64,45,50,50,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":30,"species":148}],"friendship":35,"id":147,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":35},{"level":1,"move_id":43},{"level":8,"move_id":86},{"level":15,"move_id":239},{"level":22,"move_id":82},{"level":29,"move_id":21},{"level":36,"move_id":97},{"level":43,"move_id":219},{"level":50,"move_id":200},{"level":57,"move_id":63}],"rom_address":3303628},"rom_address":3292604,"tmhm_learnset":"01101E2685DB7664","types":[16,16]},{"abilities":[61,0],"base_stats":[61,84,65,70,70,70],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":55,"species":149}],"friendship":35,"id":148,"learnset":{"moves":[{"level":1,"move_id":35},{"level":1,"move_id":43},{"level":1,"move_id":86},{"level":1,"move_id":239},{"level":8,"move_id":86},{"level":15,"move_id":239},{"level":22,"move_id":82},{"level":29,"move_id":21},{"level":38,"move_id":97},{"level":47,"move_id":219},{"level":56,"move_id":200},{"level":65,"move_id":63}],"rom_address":3303654},"rom_address":3292632,"tmhm_learnset":"01101E2685DB7664","types":[16,16]},{"abilities":[39,0],"base_stats":[91,134,95,80,100,100],"catch_rate":45,"evolutions":[],"friendship":35,"id":149,"learnset":{"moves":[{"level":1,"move_id":35},{"level":1,"move_id":43},{"level":1,"move_id":86},{"level":1,"move_id":239},{"level":8,"move_id":86},{"level":15,"move_id":239},{"level":22,"move_id":82},{"level":29,"move_id":21},{"level":38,"move_id":97},{"level":47,"move_id":219},{"level":55,"move_id":17},{"level":61,"move_id":200},{"level":75,"move_id":63}],"rom_address":3303680},"rom_address":3292660,"tmhm_learnset":"03BC5EF6C7DB7677","types":[16,2]},{"abilities":[46,0],"base_stats":[106,110,90,130,154,90],"catch_rate":3,"evolutions":[],"friendship":0,"id":150,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":93},{"level":1,"move_id":50},{"level":11,"move_id":112},{"level":22,"move_id":129},{"level":33,"move_id":244},{"level":44,"move_id":248},{"level":55,"move_id":54},{"level":66,"move_id":94},{"level":77,"move_id":133},{"level":88,"move_id":105},{"level":99,"move_id":219}],"rom_address":3303708},"rom_address":3292688,"tmhm_learnset":"00E18FF7F7FBFEED","types":[14,14]},{"abilities":[28,0],"base_stats":[100,100,100,100,100,100],"catch_rate":45,"evolutions":[],"friendship":100,"id":151,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":10,"move_id":144},{"level":20,"move_id":5},{"level":30,"move_id":118},{"level":40,"move_id":94},{"level":50,"move_id":246}],"rom_address":3303736},"rom_address":3292716,"tmhm_learnset":"03FFFFFFFFFFFFFF","types":[14,14]},{"abilities":[65,0],"base_stats":[45,49,65,45,49,65],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":16,"species":153}],"friendship":70,"id":152,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":8,"move_id":75},{"level":12,"move_id":115},{"level":15,"move_id":77},{"level":22,"move_id":235},{"level":29,"move_id":34},{"level":36,"move_id":113},{"level":43,"move_id":219},{"level":50,"move_id":76}],"rom_address":3303756},"rom_address":3292744,"tmhm_learnset":"00441E01847D8720","types":[12,12]},{"abilities":[65,0],"base_stats":[60,62,80,60,63,80],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":32,"species":154}],"friendship":70,"id":153,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":75},{"level":1,"move_id":115},{"level":8,"move_id":75},{"level":12,"move_id":115},{"level":15,"move_id":77},{"level":23,"move_id":235},{"level":31,"move_id":34},{"level":39,"move_id":113},{"level":47,"move_id":219},{"level":55,"move_id":76}],"rom_address":3303782},"rom_address":3292772,"tmhm_learnset":"00E41E01847D8720","types":[12,12]},{"abilities":[65,0],"base_stats":[80,82,100,80,83,100],"catch_rate":45,"evolutions":[],"friendship":70,"id":154,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":75},{"level":1,"move_id":115},{"level":8,"move_id":75},{"level":12,"move_id":115},{"level":15,"move_id":77},{"level":23,"move_id":235},{"level":31,"move_id":34},{"level":41,"move_id":113},{"level":51,"move_id":219},{"level":61,"move_id":76}],"rom_address":3303808},"rom_address":3292800,"tmhm_learnset":"00E41E01867DC720","types":[12,12]},{"abilities":[66,0],"base_stats":[39,52,43,65,60,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":14,"species":156}],"friendship":70,"id":155,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":43},{"level":6,"move_id":108},{"level":12,"move_id":52},{"level":19,"move_id":98},{"level":27,"move_id":172},{"level":36,"move_id":129},{"level":46,"move_id":53}],"rom_address":3303834},"rom_address":3292828,"tmhm_learnset":"00061EA48C110620","types":[10,10]},{"abilities":[66,0],"base_stats":[58,64,58,80,80,65],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":36,"species":157}],"friendship":70,"id":156,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":43},{"level":1,"move_id":108},{"level":6,"move_id":108},{"level":12,"move_id":52},{"level":21,"move_id":98},{"level":31,"move_id":172},{"level":42,"move_id":129},{"level":54,"move_id":53}],"rom_address":3303856},"rom_address":3292856,"tmhm_learnset":"00A61EA4CC110631","types":[10,10]},{"abilities":[66,0],"base_stats":[78,84,78,100,109,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":157,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":43},{"level":1,"move_id":108},{"level":1,"move_id":52},{"level":6,"move_id":108},{"level":12,"move_id":52},{"level":21,"move_id":98},{"level":31,"move_id":172},{"level":45,"move_id":129},{"level":60,"move_id":53}],"rom_address":3303878},"rom_address":3292884,"tmhm_learnset":"00A61EA4CE114631","types":[10,10]},{"abilities":[67,0],"base_stats":[50,65,64,43,44,48],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":18,"species":159}],"friendship":70,"id":158,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":7,"move_id":99},{"level":13,"move_id":55},{"level":20,"move_id":44},{"level":27,"move_id":184},{"level":35,"move_id":163},{"level":43,"move_id":103},{"level":52,"move_id":56}],"rom_address":3303900},"rom_address":3292912,"tmhm_learnset":"03141E80CC533265","types":[11,11]},{"abilities":[67,0],"base_stats":[65,80,80,58,59,63],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":30,"species":160}],"friendship":70,"id":159,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":1,"move_id":99},{"level":7,"move_id":99},{"level":13,"move_id":55},{"level":21,"move_id":44},{"level":28,"move_id":184},{"level":37,"move_id":163},{"level":45,"move_id":103},{"level":55,"move_id":56}],"rom_address":3303924},"rom_address":3292940,"tmhm_learnset":"03B41E80CC533275","types":[11,11]},{"abilities":[67,0],"base_stats":[85,105,100,78,79,83],"catch_rate":45,"evolutions":[],"friendship":70,"id":160,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":1,"move_id":99},{"level":1,"move_id":55},{"level":7,"move_id":99},{"level":13,"move_id":55},{"level":21,"move_id":44},{"level":28,"move_id":184},{"level":38,"move_id":163},{"level":47,"move_id":103},{"level":58,"move_id":56}],"rom_address":3303948},"rom_address":3292968,"tmhm_learnset":"03B41E80CE537277","types":[11,11]},{"abilities":[50,51],"base_stats":[35,46,34,20,35,45],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":15,"species":162}],"friendship":70,"id":161,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":4,"move_id":111},{"level":7,"move_id":98},{"level":12,"move_id":154},{"level":17,"move_id":270},{"level":24,"move_id":21},{"level":31,"move_id":266},{"level":40,"move_id":156},{"level":49,"move_id":133}],"rom_address":3303972},"rom_address":3292996,"tmhm_learnset":"00143E06ECF31625","types":[0,0]},{"abilities":[50,51],"base_stats":[85,76,64,90,45,55],"catch_rate":90,"evolutions":[],"friendship":70,"id":162,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":111},{"level":1,"move_id":98},{"level":4,"move_id":111},{"level":7,"move_id":98},{"level":12,"move_id":154},{"level":19,"move_id":270},{"level":28,"move_id":21},{"level":37,"move_id":266},{"level":48,"move_id":156},{"level":59,"move_id":133}],"rom_address":3303998},"rom_address":3293024,"tmhm_learnset":"00B43E06EDF37625","types":[0,0]},{"abilities":[15,51],"base_stats":[60,30,30,50,36,56],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":20,"species":164}],"friendship":70,"id":163,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":6,"move_id":193},{"level":11,"move_id":64},{"level":16,"move_id":95},{"level":22,"move_id":115},{"level":28,"move_id":36},{"level":34,"move_id":93},{"level":48,"move_id":138}],"rom_address":3304024},"rom_address":3293052,"tmhm_learnset":"00487E81B4130620","types":[0,2]},{"abilities":[15,51],"base_stats":[100,50,50,70,76,96],"catch_rate":90,"evolutions":[],"friendship":70,"id":164,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":193},{"level":1,"move_id":64},{"level":6,"move_id":193},{"level":11,"move_id":64},{"level":16,"move_id":95},{"level":25,"move_id":115},{"level":33,"move_id":36},{"level":41,"move_id":93},{"level":57,"move_id":138}],"rom_address":3304048},"rom_address":3293080,"tmhm_learnset":"00487E81B4134620","types":[0,2]},{"abilities":[68,48],"base_stats":[40,20,30,55,40,80],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":18,"species":166}],"friendship":70,"id":165,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":8,"move_id":48},{"level":15,"move_id":4},{"level":22,"move_id":113},{"level":22,"move_id":115},{"level":22,"move_id":219},{"level":29,"move_id":226},{"level":36,"move_id":129},{"level":43,"move_id":97},{"level":50,"move_id":38}],"rom_address":3304072},"rom_address":3293108,"tmhm_learnset":"00403E81CC3D8621","types":[6,2]},{"abilities":[68,48],"base_stats":[55,35,50,85,55,110],"catch_rate":90,"evolutions":[],"friendship":70,"id":166,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":48},{"level":8,"move_id":48},{"level":15,"move_id":4},{"level":24,"move_id":113},{"level":24,"move_id":115},{"level":24,"move_id":219},{"level":33,"move_id":226},{"level":42,"move_id":129},{"level":51,"move_id":97},{"level":60,"move_id":38}],"rom_address":3304100},"rom_address":3293136,"tmhm_learnset":"00403E81CC3DC621","types":[6,2]},{"abilities":[68,15],"base_stats":[40,60,40,30,40,40],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":22,"species":168}],"friendship":70,"id":167,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":40},{"level":1,"move_id":81},{"level":6,"move_id":184},{"level":11,"move_id":132},{"level":17,"move_id":101},{"level":23,"move_id":141},{"level":30,"move_id":154},{"level":37,"move_id":169},{"level":45,"move_id":97},{"level":53,"move_id":94}],"rom_address":3304128},"rom_address":3293164,"tmhm_learnset":"00403E089C350620","types":[6,3]},{"abilities":[68,15],"base_stats":[70,90,70,40,60,60],"catch_rate":90,"evolutions":[],"friendship":70,"id":168,"learnset":{"moves":[{"level":1,"move_id":40},{"level":1,"move_id":81},{"level":1,"move_id":184},{"level":1,"move_id":132},{"level":6,"move_id":184},{"level":11,"move_id":132},{"level":17,"move_id":101},{"level":25,"move_id":141},{"level":34,"move_id":154},{"level":43,"move_id":169},{"level":53,"move_id":97},{"level":63,"move_id":94}],"rom_address":3304154},"rom_address":3293192,"tmhm_learnset":"00403E089C354620","types":[6,3]},{"abilities":[39,0],"base_stats":[85,90,80,130,70,80],"catch_rate":90,"evolutions":[],"friendship":70,"id":169,"learnset":{"moves":[{"level":1,"move_id":103},{"level":1,"move_id":141},{"level":1,"move_id":48},{"level":1,"move_id":310},{"level":6,"move_id":48},{"level":11,"move_id":310},{"level":16,"move_id":44},{"level":21,"move_id":17},{"level":28,"move_id":109},{"level":35,"move_id":314},{"level":42,"move_id":212},{"level":49,"move_id":305},{"level":56,"move_id":114}],"rom_address":3304180},"rom_address":3293220,"tmhm_learnset":"00097F88A4174E20","types":[3,2]},{"abilities":[10,35],"base_stats":[75,38,38,67,56,56],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":27,"species":171}],"friendship":70,"id":170,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":1,"move_id":86},{"level":5,"move_id":48},{"level":13,"move_id":175},{"level":17,"move_id":55},{"level":25,"move_id":209},{"level":29,"move_id":109},{"level":37,"move_id":36},{"level":41,"move_id":56},{"level":49,"move_id":268}],"rom_address":3304208},"rom_address":3293248,"tmhm_learnset":"03501E0285933264","types":[11,13]},{"abilities":[10,35],"base_stats":[125,58,58,67,76,76],"catch_rate":75,"evolutions":[],"friendship":70,"id":171,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":1,"move_id":86},{"level":1,"move_id":48},{"level":5,"move_id":48},{"level":13,"move_id":175},{"level":17,"move_id":55},{"level":25,"move_id":209},{"level":32,"move_id":109},{"level":43,"move_id":36},{"level":50,"move_id":56},{"level":61,"move_id":268}],"rom_address":3304234},"rom_address":3293276,"tmhm_learnset":"03501E0285937264","types":[11,13]},{"abilities":[9,0],"base_stats":[20,40,15,60,35,35],"catch_rate":190,"evolutions":[{"method":"FRIENDSHIP","param":0,"species":25}],"friendship":70,"id":172,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":84},{"level":1,"move_id":204},{"level":6,"move_id":39},{"level":8,"move_id":86},{"level":11,"move_id":186}],"rom_address":3304260},"rom_address":3293304,"tmhm_learnset":"00401E0285D38220","types":[13,13]},{"abilities":[56,0],"base_stats":[50,25,28,15,45,55],"catch_rate":150,"evolutions":[{"method":"FRIENDSHIP","param":0,"species":35}],"friendship":140,"id":173,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":204},{"level":4,"move_id":227},{"level":8,"move_id":47},{"level":13,"move_id":186}],"rom_address":3304276},"rom_address":3293332,"tmhm_learnset":"00401E27BC7B8624","types":[0,0]},{"abilities":[56,0],"base_stats":[90,30,15,15,40,20],"catch_rate":170,"evolutions":[{"method":"FRIENDSHIP","param":0,"species":39}],"friendship":70,"id":174,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":47},{"level":1,"move_id":204},{"level":4,"move_id":111},{"level":9,"move_id":1},{"level":14,"move_id":186}],"rom_address":3304292},"rom_address":3293360,"tmhm_learnset":"00401E27BC3B8624","types":[0,0]},{"abilities":[55,32],"base_stats":[35,20,65,20,40,65],"catch_rate":190,"evolutions":[{"method":"FRIENDSHIP","param":0,"species":176}],"friendship":70,"id":175,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":118},{"level":1,"move_id":45},{"level":1,"move_id":204},{"level":6,"move_id":118},{"level":11,"move_id":186},{"level":16,"move_id":281},{"level":21,"move_id":227},{"level":26,"move_id":266},{"level":31,"move_id":273},{"level":36,"move_id":219},{"level":41,"move_id":38}],"rom_address":3304308},"rom_address":3293388,"tmhm_learnset":"00C01E27B43B8624","types":[0,0]},{"abilities":[55,32],"base_stats":[55,40,85,40,80,105],"catch_rate":75,"evolutions":[],"friendship":70,"id":176,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":118},{"level":1,"move_id":45},{"level":1,"move_id":204},{"level":6,"move_id":118},{"level":11,"move_id":186},{"level":16,"move_id":281},{"level":21,"move_id":227},{"level":26,"move_id":266},{"level":31,"move_id":273},{"level":36,"move_id":219},{"level":41,"move_id":38}],"rom_address":3304334},"rom_address":3293416,"tmhm_learnset":"00C85EA7F43BC625","types":[0,2]},{"abilities":[28,48],"base_stats":[40,50,45,70,70,45],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":25,"species":178}],"friendship":70,"id":177,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":43},{"level":10,"move_id":101},{"level":20,"move_id":100},{"level":30,"move_id":273},{"level":30,"move_id":248},{"level":40,"move_id":109},{"level":50,"move_id":94}],"rom_address":3304360},"rom_address":3293444,"tmhm_learnset":"0040FE81B4378628","types":[14,2]},{"abilities":[28,48],"base_stats":[65,75,70,95,95,70],"catch_rate":75,"evolutions":[],"friendship":70,"id":178,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":43},{"level":10,"move_id":101},{"level":20,"move_id":100},{"level":35,"move_id":273},{"level":35,"move_id":248},{"level":50,"move_id":109},{"level":65,"move_id":94}],"rom_address":3304382},"rom_address":3293472,"tmhm_learnset":"0048FE81B437C628","types":[14,2]},{"abilities":[9,0],"base_stats":[55,40,40,35,65,45],"catch_rate":235,"evolutions":[{"method":"LEVEL","param":15,"species":180}],"friendship":70,"id":179,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":9,"move_id":84},{"level":16,"move_id":86},{"level":23,"move_id":178},{"level":30,"move_id":113},{"level":37,"move_id":87}],"rom_address":3304404},"rom_address":3293500,"tmhm_learnset":"00401E0285D38220","types":[13,13]},{"abilities":[9,0],"base_stats":[70,55,55,45,80,60],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":30,"species":181}],"friendship":70,"id":180,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":84},{"level":9,"move_id":84},{"level":18,"move_id":86},{"level":27,"move_id":178},{"level":36,"move_id":113},{"level":45,"move_id":87}],"rom_address":3304424},"rom_address":3293528,"tmhm_learnset":"00E01E02C5D38221","types":[13,13]},{"abilities":[9,0],"base_stats":[90,75,75,55,115,90],"catch_rate":45,"evolutions":[],"friendship":70,"id":181,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":84},{"level":1,"move_id":86},{"level":9,"move_id":84},{"level":18,"move_id":86},{"level":27,"move_id":178},{"level":30,"move_id":9},{"level":42,"move_id":113},{"level":57,"move_id":87}],"rom_address":3304444},"rom_address":3293556,"tmhm_learnset":"00E01E02C5D3C221","types":[13,13]},{"abilities":[34,0],"base_stats":[75,80,85,50,90,100],"catch_rate":45,"evolutions":[],"friendship":70,"id":182,"learnset":{"moves":[{"level":1,"move_id":71},{"level":1,"move_id":230},{"level":1,"move_id":78},{"level":1,"move_id":345},{"level":44,"move_id":80},{"level":55,"move_id":76}],"rom_address":3304466},"rom_address":3293584,"tmhm_learnset":"00441E08843D4720","types":[12,12]},{"abilities":[47,37],"base_stats":[70,20,50,40,20,50],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":18,"species":184}],"friendship":70,"id":183,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":3,"move_id":111},{"level":6,"move_id":39},{"level":10,"move_id":55},{"level":15,"move_id":205},{"level":21,"move_id":61},{"level":28,"move_id":38},{"level":36,"move_id":240},{"level":45,"move_id":56}],"rom_address":3304480},"rom_address":3293612,"tmhm_learnset":"03B01E00CC533265","types":[11,11]},{"abilities":[47,37],"base_stats":[100,50,80,50,50,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":184,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":111},{"level":1,"move_id":39},{"level":1,"move_id":55},{"level":3,"move_id":111},{"level":6,"move_id":39},{"level":10,"move_id":55},{"level":15,"move_id":205},{"level":24,"move_id":61},{"level":34,"move_id":38},{"level":45,"move_id":240},{"level":57,"move_id":56}],"rom_address":3304506},"rom_address":3293640,"tmhm_learnset":"03B01E00CC537265","types":[11,11]},{"abilities":[5,69],"base_stats":[70,100,115,30,30,65],"catch_rate":65,"evolutions":[],"friendship":70,"id":185,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":88},{"level":1,"move_id":102},{"level":9,"move_id":175},{"level":17,"move_id":67},{"level":25,"move_id":157},{"level":33,"move_id":335},{"level":41,"move_id":185},{"level":49,"move_id":21},{"level":57,"move_id":38}],"rom_address":3304532},"rom_address":3293668,"tmhm_learnset":"00A03E50CE110E29","types":[5,5]},{"abilities":[11,6],"base_stats":[90,75,75,70,90,100],"catch_rate":45,"evolutions":[],"friendship":70,"id":186,"learnset":{"moves":[{"level":1,"move_id":55},{"level":1,"move_id":95},{"level":1,"move_id":3},{"level":1,"move_id":195},{"level":35,"move_id":195},{"level":51,"move_id":207}],"rom_address":3304556},"rom_address":3293696,"tmhm_learnset":"03B03E00DE137265","types":[11,11]},{"abilities":[34,0],"base_stats":[35,35,40,50,35,55],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":18,"species":188}],"friendship":70,"id":187,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":150},{"level":5,"move_id":235},{"level":5,"move_id":39},{"level":10,"move_id":33},{"level":13,"move_id":77},{"level":15,"move_id":78},{"level":17,"move_id":79},{"level":20,"move_id":73},{"level":25,"move_id":178},{"level":30,"move_id":72}],"rom_address":3304570},"rom_address":3293724,"tmhm_learnset":"00401E8084350720","types":[12,2]},{"abilities":[34,0],"base_stats":[55,45,50,80,45,65],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":27,"species":189}],"friendship":70,"id":188,"learnset":{"moves":[{"level":1,"move_id":150},{"level":1,"move_id":235},{"level":1,"move_id":39},{"level":1,"move_id":33},{"level":5,"move_id":235},{"level":5,"move_id":39},{"level":10,"move_id":33},{"level":13,"move_id":77},{"level":15,"move_id":78},{"level":17,"move_id":79},{"level":22,"move_id":73},{"level":29,"move_id":178},{"level":36,"move_id":72}],"rom_address":3304598},"rom_address":3293752,"tmhm_learnset":"00401E8084350720","types":[12,2]},{"abilities":[34,0],"base_stats":[75,55,70,110,55,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":189,"learnset":{"moves":[{"level":1,"move_id":150},{"level":1,"move_id":235},{"level":1,"move_id":39},{"level":1,"move_id":33},{"level":5,"move_id":235},{"level":5,"move_id":39},{"level":10,"move_id":33},{"level":13,"move_id":77},{"level":15,"move_id":78},{"level":17,"move_id":79},{"level":22,"move_id":73},{"level":33,"move_id":178},{"level":44,"move_id":72}],"rom_address":3304626},"rom_address":3293780,"tmhm_learnset":"00401E8084354720","types":[12,2]},{"abilities":[50,53],"base_stats":[55,70,55,85,40,55],"catch_rate":45,"evolutions":[],"friendship":70,"id":190,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":39},{"level":6,"move_id":28},{"level":13,"move_id":310},{"level":18,"move_id":226},{"level":25,"move_id":321},{"level":31,"move_id":154},{"level":38,"move_id":129},{"level":43,"move_id":103},{"level":50,"move_id":97}],"rom_address":3304654},"rom_address":3293808,"tmhm_learnset":"00A53E82EDF30E25","types":[0,0]},{"abilities":[34,0],"base_stats":[30,30,30,30,30,30],"catch_rate":235,"evolutions":[{"method":"ITEM","param":93,"species":192}],"friendship":70,"id":191,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":71},{"level":6,"move_id":74},{"level":13,"move_id":72},{"level":18,"move_id":275},{"level":25,"move_id":283},{"level":30,"move_id":241},{"level":37,"move_id":235},{"level":42,"move_id":202}],"rom_address":3304680},"rom_address":3293836,"tmhm_learnset":"00441E08843D8720","types":[12,12]},{"abilities":[34,0],"base_stats":[75,75,55,30,105,85],"catch_rate":120,"evolutions":[],"friendship":70,"id":192,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":71},{"level":1,"move_id":1},{"level":6,"move_id":74},{"level":13,"move_id":75},{"level":18,"move_id":275},{"level":25,"move_id":331},{"level":30,"move_id":241},{"level":37,"move_id":80},{"level":42,"move_id":76}],"rom_address":3304704},"rom_address":3293864,"tmhm_learnset":"00441E08843DC720","types":[12,12]},{"abilities":[3,14],"base_stats":[65,65,45,95,75,45],"catch_rate":75,"evolutions":[],"friendship":70,"id":193,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":193},{"level":7,"move_id":98},{"level":13,"move_id":104},{"level":19,"move_id":49},{"level":25,"move_id":197},{"level":31,"move_id":48},{"level":37,"move_id":253},{"level":43,"move_id":17},{"level":49,"move_id":103}],"rom_address":3304728},"rom_address":3293892,"tmhm_learnset":"00407E80B4350620","types":[6,2]},{"abilities":[6,11],"base_stats":[55,45,45,15,25,25],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":20,"species":195}],"friendship":70,"id":194,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":55},{"level":1,"move_id":39},{"level":11,"move_id":21},{"level":16,"move_id":341},{"level":21,"move_id":133},{"level":31,"move_id":281},{"level":36,"move_id":89},{"level":41,"move_id":240},{"level":51,"move_id":54},{"level":51,"move_id":114}],"rom_address":3304754},"rom_address":3293920,"tmhm_learnset":"03D01E188E533264","types":[11,4]},{"abilities":[6,11],"base_stats":[95,85,85,35,65,65],"catch_rate":90,"evolutions":[],"friendship":70,"id":195,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":55},{"level":1,"move_id":39},{"level":11,"move_id":21},{"level":16,"move_id":341},{"level":23,"move_id":133},{"level":35,"move_id":281},{"level":42,"move_id":89},{"level":49,"move_id":240},{"level":61,"move_id":54},{"level":61,"move_id":114}],"rom_address":3304780},"rom_address":3293948,"tmhm_learnset":"03F01E58CE537265","types":[11,4]},{"abilities":[28,0],"base_stats":[65,65,60,110,130,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":196,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":270},{"level":8,"move_id":28},{"level":16,"move_id":93},{"level":23,"move_id":98},{"level":30,"move_id":129},{"level":36,"move_id":60},{"level":42,"move_id":244},{"level":47,"move_id":94},{"level":52,"move_id":234}],"rom_address":3304806},"rom_address":3293976,"tmhm_learnset":"00449E01BC53C628","types":[14,14]},{"abilities":[28,0],"base_stats":[95,65,110,65,60,130],"catch_rate":45,"evolutions":[],"friendship":35,"id":197,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":39},{"level":1,"move_id":270},{"level":8,"move_id":28},{"level":16,"move_id":228},{"level":23,"move_id":98},{"level":30,"move_id":109},{"level":36,"move_id":185},{"level":42,"move_id":212},{"level":47,"move_id":103},{"level":52,"move_id":236}],"rom_address":3304832},"rom_address":3294004,"tmhm_learnset":"00451F00BC534E20","types":[17,17]},{"abilities":[15,0],"base_stats":[60,85,42,91,85,42],"catch_rate":30,"evolutions":[],"friendship":35,"id":198,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":9,"move_id":310},{"level":14,"move_id":228},{"level":22,"move_id":114},{"level":27,"move_id":101},{"level":35,"move_id":185},{"level":40,"move_id":269},{"level":48,"move_id":212}],"rom_address":3304858},"rom_address":3294032,"tmhm_learnset":"00097F80A4130E28","types":[17,2]},{"abilities":[12,20],"base_stats":[95,75,80,30,100,110],"catch_rate":70,"evolutions":[],"friendship":70,"id":199,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":174},{"level":1,"move_id":281},{"level":1,"move_id":33},{"level":6,"move_id":45},{"level":15,"move_id":55},{"level":20,"move_id":93},{"level":29,"move_id":50},{"level":34,"move_id":29},{"level":43,"move_id":207},{"level":48,"move_id":94}],"rom_address":3304882},"rom_address":3294060,"tmhm_learnset":"02F09E24FE5B766D","types":[11,14]},{"abilities":[26,0],"base_stats":[60,60,60,85,85,85],"catch_rate":45,"evolutions":[],"friendship":35,"id":200,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":45},{"level":1,"move_id":149},{"level":6,"move_id":180},{"level":11,"move_id":310},{"level":17,"move_id":109},{"level":23,"move_id":212},{"level":30,"move_id":60},{"level":37,"move_id":220},{"level":45,"move_id":195},{"level":53,"move_id":288}],"rom_address":3304906},"rom_address":3294088,"tmhm_learnset":"0041BF82B5930E28","types":[7,7]},{"abilities":[26,0],"base_stats":[48,72,48,48,72,48],"catch_rate":225,"evolutions":[],"friendship":70,"id":201,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":237}],"rom_address":3304932},"rom_address":3294116,"tmhm_learnset":"0000000000000000","types":[14,14]},{"abilities":[23,0],"base_stats":[190,33,58,33,33,58],"catch_rate":45,"evolutions":[],"friendship":70,"id":202,"learnset":{"moves":[{"level":1,"move_id":68},{"level":1,"move_id":243},{"level":1,"move_id":219},{"level":1,"move_id":194}],"rom_address":3304942},"rom_address":3294144,"tmhm_learnset":"0000000000000000","types":[14,14]},{"abilities":[39,48],"base_stats":[70,80,65,85,90,65],"catch_rate":60,"evolutions":[],"friendship":70,"id":203,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":7,"move_id":310},{"level":13,"move_id":93},{"level":19,"move_id":23},{"level":25,"move_id":316},{"level":31,"move_id":97},{"level":37,"move_id":226},{"level":43,"move_id":60},{"level":49,"move_id":242}],"rom_address":3304952},"rom_address":3294172,"tmhm_learnset":"00E0BE03B7D38628","types":[0,14]},{"abilities":[5,0],"base_stats":[50,65,90,15,35,35],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":31,"species":205}],"friendship":70,"id":204,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":182},{"level":8,"move_id":120},{"level":15,"move_id":36},{"level":22,"move_id":229},{"level":29,"move_id":117},{"level":36,"move_id":153},{"level":43,"move_id":191},{"level":50,"move_id":38}],"rom_address":3304978},"rom_address":3294200,"tmhm_learnset":"00A01E118E358620","types":[6,6]},{"abilities":[5,0],"base_stats":[75,90,140,40,60,60],"catch_rate":75,"evolutions":[],"friendship":70,"id":205,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":182},{"level":1,"move_id":120},{"level":8,"move_id":120},{"level":15,"move_id":36},{"level":22,"move_id":229},{"level":29,"move_id":117},{"level":39,"move_id":153},{"level":49,"move_id":191},{"level":59,"move_id":38}],"rom_address":3305002},"rom_address":3294228,"tmhm_learnset":"00A01E118E35C620","types":[6,8]},{"abilities":[32,50],"base_stats":[100,70,70,45,65,65],"catch_rate":190,"evolutions":[],"friendship":70,"id":206,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":99},{"level":4,"move_id":111},{"level":11,"move_id":281},{"level":14,"move_id":137},{"level":21,"move_id":180},{"level":24,"move_id":228},{"level":31,"move_id":103},{"level":34,"move_id":36},{"level":41,"move_id":283}],"rom_address":3305026},"rom_address":3294256,"tmhm_learnset":"00A03E66AFF3362C","types":[0,0]},{"abilities":[52,8],"base_stats":[65,75,105,85,35,65],"catch_rate":60,"evolutions":[],"friendship":70,"id":207,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":40},{"level":6,"move_id":28},{"level":13,"move_id":106},{"level":20,"move_id":98},{"level":28,"move_id":185},{"level":36,"move_id":163},{"level":44,"move_id":103},{"level":52,"move_id":12}],"rom_address":3305052},"rom_address":3294284,"tmhm_learnset":"00A47ED88E530620","types":[4,2]},{"abilities":[69,5],"base_stats":[75,85,200,30,55,65],"catch_rate":25,"evolutions":[],"friendship":70,"id":208,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":103},{"level":9,"move_id":20},{"level":13,"move_id":88},{"level":21,"move_id":106},{"level":25,"move_id":99},{"level":33,"move_id":201},{"level":37,"move_id":21},{"level":45,"move_id":231},{"level":49,"move_id":242},{"level":57,"move_id":38}],"rom_address":3305076},"rom_address":3294312,"tmhm_learnset":"00A41F508E514E30","types":[8,4]},{"abilities":[22,50],"base_stats":[60,80,50,30,40,40],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":23,"species":210}],"friendship":70,"id":209,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":184},{"level":4,"move_id":39},{"level":8,"move_id":204},{"level":13,"move_id":44},{"level":19,"move_id":122},{"level":26,"move_id":46},{"level":34,"move_id":99},{"level":43,"move_id":36},{"level":53,"move_id":242}],"rom_address":3305104},"rom_address":3294340,"tmhm_learnset":"00A23F2EEFB30EB5","types":[0,0]},{"abilities":[22,22],"base_stats":[90,120,75,45,60,60],"catch_rate":75,"evolutions":[],"friendship":70,"id":210,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":184},{"level":4,"move_id":39},{"level":8,"move_id":204},{"level":13,"move_id":44},{"level":19,"move_id":122},{"level":28,"move_id":46},{"level":38,"move_id":99},{"level":49,"move_id":36},{"level":61,"move_id":242}],"rom_address":3305130},"rom_address":3294368,"tmhm_learnset":"00A23F6EEFF34EB5","types":[0,0]},{"abilities":[38,33],"base_stats":[65,95,75,85,55,55],"catch_rate":45,"evolutions":[],"friendship":70,"id":211,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":191},{"level":1,"move_id":33},{"level":1,"move_id":40},{"level":10,"move_id":106},{"level":10,"move_id":107},{"level":19,"move_id":55},{"level":28,"move_id":42},{"level":37,"move_id":36},{"level":46,"move_id":56}],"rom_address":3305156},"rom_address":3294396,"tmhm_learnset":"03101E0AA4133264","types":[11,3]},{"abilities":[68,0],"base_stats":[70,130,100,65,55,80],"catch_rate":25,"evolutions":[],"friendship":70,"id":212,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":98},{"level":1,"move_id":43},{"level":6,"move_id":116},{"level":11,"move_id":228},{"level":16,"move_id":206},{"level":21,"move_id":97},{"level":26,"move_id":232},{"level":31,"move_id":163},{"level":36,"move_id":14},{"level":41,"move_id":104},{"level":46,"move_id":210}],"rom_address":3305178},"rom_address":3294424,"tmhm_learnset":"00A47E9084134620","types":[6,8]},{"abilities":[5,0],"base_stats":[20,10,230,5,10,230],"catch_rate":190,"evolutions":[],"friendship":70,"id":213,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":132},{"level":1,"move_id":110},{"level":9,"move_id":35},{"level":14,"move_id":227},{"level":23,"move_id":219},{"level":28,"move_id":117},{"level":37,"move_id":156}],"rom_address":3305206},"rom_address":3294452,"tmhm_learnset":"00E01E588E190620","types":[6,5]},{"abilities":[68,62],"base_stats":[80,125,75,85,40,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":214,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":43},{"level":6,"move_id":30},{"level":11,"move_id":203},{"level":17,"move_id":31},{"level":23,"move_id":280},{"level":30,"move_id":68},{"level":37,"move_id":36},{"level":45,"move_id":179},{"level":53,"move_id":224}],"rom_address":3305226},"rom_address":3294480,"tmhm_learnset":"00A43E40CE1346A1","types":[6,1]},{"abilities":[39,51],"base_stats":[55,95,55,115,35,75],"catch_rate":60,"evolutions":[],"friendship":35,"id":215,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":1,"move_id":269},{"level":8,"move_id":98},{"level":15,"move_id":103},{"level":22,"move_id":185},{"level":29,"move_id":154},{"level":36,"move_id":97},{"level":43,"move_id":196},{"level":50,"move_id":163},{"level":57,"move_id":251},{"level":64,"move_id":232}],"rom_address":3305252},"rom_address":3294508,"tmhm_learnset":"00B53F80EC533E69","types":[17,15]},{"abilities":[53,0],"base_stats":[60,80,50,40,50,50],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":30,"species":217}],"friendship":70,"id":216,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":7,"move_id":122},{"level":13,"move_id":154},{"level":19,"move_id":313},{"level":25,"move_id":185},{"level":31,"move_id":156},{"level":37,"move_id":163},{"level":43,"move_id":173},{"level":49,"move_id":37}],"rom_address":3305280},"rom_address":3294536,"tmhm_learnset":"00A43F80CE130EB1","types":[0,0]},{"abilities":[62,0],"base_stats":[90,130,75,55,75,75],"catch_rate":60,"evolutions":[],"friendship":70,"id":217,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":43},{"level":1,"move_id":122},{"level":1,"move_id":154},{"level":7,"move_id":122},{"level":13,"move_id":154},{"level":19,"move_id":313},{"level":25,"move_id":185},{"level":31,"move_id":156},{"level":37,"move_id":163},{"level":43,"move_id":173},{"level":49,"move_id":37}],"rom_address":3305306},"rom_address":3294564,"tmhm_learnset":"00A43FC0CE134EB1","types":[0,0]},{"abilities":[40,49],"base_stats":[40,40,40,20,70,40],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":38,"species":219}],"friendship":70,"id":218,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":281},{"level":1,"move_id":123},{"level":8,"move_id":52},{"level":15,"move_id":88},{"level":22,"move_id":106},{"level":29,"move_id":133},{"level":36,"move_id":53},{"level":43,"move_id":157},{"level":50,"move_id":34}],"rom_address":3305332},"rom_address":3294592,"tmhm_learnset":"00821E2584118620","types":[10,10]},{"abilities":[40,49],"base_stats":[50,50,120,30,80,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":219,"learnset":{"moves":[{"level":1,"move_id":281},{"level":1,"move_id":123},{"level":1,"move_id":52},{"level":1,"move_id":88},{"level":8,"move_id":52},{"level":15,"move_id":88},{"level":22,"move_id":106},{"level":29,"move_id":133},{"level":36,"move_id":53},{"level":48,"move_id":157},{"level":60,"move_id":34}],"rom_address":3305356},"rom_address":3294620,"tmhm_learnset":"00A21E758611C620","types":[10,5]},{"abilities":[12,0],"base_stats":[50,50,40,50,30,30],"catch_rate":225,"evolutions":[{"method":"LEVEL","param":33,"species":221}],"friendship":70,"id":220,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":316},{"level":10,"move_id":181},{"level":19,"move_id":203},{"level":28,"move_id":36},{"level":37,"move_id":54},{"level":46,"move_id":59},{"level":55,"move_id":133}],"rom_address":3305380},"rom_address":3294648,"tmhm_learnset":"00A01E518E13B270","types":[15,4]},{"abilities":[12,0],"base_stats":[100,100,80,50,60,60],"catch_rate":75,"evolutions":[],"friendship":70,"id":221,"learnset":{"moves":[{"level":1,"move_id":30},{"level":1,"move_id":316},{"level":1,"move_id":181},{"level":1,"move_id":203},{"level":10,"move_id":181},{"level":19,"move_id":203},{"level":28,"move_id":36},{"level":33,"move_id":31},{"level":42,"move_id":54},{"level":56,"move_id":59},{"level":70,"move_id":133}],"rom_address":3305402},"rom_address":3294676,"tmhm_learnset":"00A01E518E13F270","types":[15,4]},{"abilities":[55,30],"base_stats":[55,55,85,35,65,85],"catch_rate":60,"evolutions":[],"friendship":70,"id":222,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":6,"move_id":106},{"level":12,"move_id":145},{"level":17,"move_id":105},{"level":17,"move_id":287},{"level":23,"move_id":61},{"level":28,"move_id":131},{"level":34,"move_id":350},{"level":39,"move_id":243},{"level":45,"move_id":246}],"rom_address":3305426},"rom_address":3294704,"tmhm_learnset":"00B01E51BE1BB66C","types":[11,5]},{"abilities":[55,0],"base_stats":[35,65,35,65,65,35],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":25,"species":224}],"friendship":70,"id":223,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":55},{"level":11,"move_id":199},{"level":22,"move_id":60},{"level":22,"move_id":62},{"level":22,"move_id":61},{"level":33,"move_id":116},{"level":44,"move_id":58},{"level":55,"move_id":63}],"rom_address":3305454},"rom_address":3294732,"tmhm_learnset":"03103E2494137624","types":[11,11]},{"abilities":[21,0],"base_stats":[75,105,75,45,105,75],"catch_rate":75,"evolutions":[],"friendship":70,"id":224,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":55},{"level":11,"move_id":132},{"level":22,"move_id":60},{"level":22,"move_id":62},{"level":22,"move_id":61},{"level":25,"move_id":190},{"level":38,"move_id":116},{"level":54,"move_id":58},{"level":70,"move_id":63}],"rom_address":3305478},"rom_address":3294760,"tmhm_learnset":"03103E2C94137724","types":[11,11]},{"abilities":[72,55],"base_stats":[45,55,45,75,65,45],"catch_rate":45,"evolutions":[],"friendship":70,"id":225,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":217}],"rom_address":3305504},"rom_address":3294788,"tmhm_learnset":"00083E8084133265","types":[15,2]},{"abilities":[33,11],"base_stats":[65,40,70,70,80,140],"catch_rate":25,"evolutions":[],"friendship":70,"id":226,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":145},{"level":8,"move_id":48},{"level":15,"move_id":61},{"level":22,"move_id":36},{"level":29,"move_id":97},{"level":36,"move_id":17},{"level":43,"move_id":352},{"level":50,"move_id":109}],"rom_address":3305514},"rom_address":3294816,"tmhm_learnset":"03101E8086133264","types":[11,2]},{"abilities":[51,5],"base_stats":[65,80,140,70,40,70],"catch_rate":25,"evolutions":[],"friendship":70,"id":227,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":64},{"level":10,"move_id":28},{"level":13,"move_id":129},{"level":16,"move_id":97},{"level":26,"move_id":31},{"level":29,"move_id":314},{"level":32,"move_id":211},{"level":42,"move_id":191},{"level":45,"move_id":319}],"rom_address":3305538},"rom_address":3294844,"tmhm_learnset":"008C7F9084110E30","types":[8,2]},{"abilities":[48,18],"base_stats":[45,60,30,65,80,50],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":24,"species":229}],"friendship":35,"id":228,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":52},{"level":7,"move_id":336},{"level":13,"move_id":123},{"level":19,"move_id":46},{"level":25,"move_id":44},{"level":31,"move_id":316},{"level":37,"move_id":185},{"level":43,"move_id":53},{"level":49,"move_id":242}],"rom_address":3305564},"rom_address":3294872,"tmhm_learnset":"00833F2CA4710E30","types":[17,10]},{"abilities":[48,18],"base_stats":[75,90,50,95,110,80],"catch_rate":45,"evolutions":[],"friendship":35,"id":229,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":52},{"level":1,"move_id":336},{"level":7,"move_id":336},{"level":13,"move_id":123},{"level":19,"move_id":46},{"level":27,"move_id":44},{"level":35,"move_id":316},{"level":43,"move_id":185},{"level":51,"move_id":53},{"level":59,"move_id":242}],"rom_address":3305590},"rom_address":3294900,"tmhm_learnset":"00A33F2CA4714E30","types":[17,10]},{"abilities":[33,0],"base_stats":[75,95,95,85,95,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":230,"learnset":{"moves":[{"level":1,"move_id":145},{"level":1,"move_id":108},{"level":1,"move_id":43},{"level":1,"move_id":55},{"level":8,"move_id":108},{"level":15,"move_id":43},{"level":22,"move_id":55},{"level":29,"move_id":239},{"level":40,"move_id":97},{"level":51,"move_id":56},{"level":62,"move_id":349}],"rom_address":3305616},"rom_address":3294928,"tmhm_learnset":"03101E0084137264","types":[11,16]},{"abilities":[53,0],"base_stats":[90,60,60,40,40,40],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":25,"species":232}],"friendship":70,"id":231,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":316},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":9,"move_id":111},{"level":17,"move_id":175},{"level":25,"move_id":36},{"level":33,"move_id":205},{"level":41,"move_id":203},{"level":49,"move_id":38}],"rom_address":3305640},"rom_address":3294956,"tmhm_learnset":"00A01E5086510630","types":[4,4]},{"abilities":[5,0],"base_stats":[90,120,120,50,60,60],"catch_rate":60,"evolutions":[],"friendship":70,"id":232,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":316},{"level":1,"move_id":30},{"level":1,"move_id":45},{"level":9,"move_id":111},{"level":17,"move_id":175},{"level":25,"move_id":31},{"level":33,"move_id":205},{"level":41,"move_id":229},{"level":49,"move_id":89}],"rom_address":3305662},"rom_address":3294984,"tmhm_learnset":"00A01E5086514630","types":[4,4]},{"abilities":[36,0],"base_stats":[85,80,90,60,105,95],"catch_rate":45,"evolutions":[],"friendship":70,"id":233,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":176},{"level":1,"move_id":33},{"level":1,"move_id":160},{"level":9,"move_id":97},{"level":12,"move_id":60},{"level":20,"move_id":105},{"level":24,"move_id":111},{"level":32,"move_id":199},{"level":36,"move_id":161},{"level":44,"move_id":278},{"level":48,"move_id":192}],"rom_address":3305684},"rom_address":3295012,"tmhm_learnset":"00402E82B5F37620","types":[0,0]},{"abilities":[22,0],"base_stats":[73,95,62,85,85,65],"catch_rate":45,"evolutions":[],"friendship":70,"id":234,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":7,"move_id":43},{"level":13,"move_id":310},{"level":19,"move_id":95},{"level":25,"move_id":23},{"level":31,"move_id":28},{"level":37,"move_id":36},{"level":43,"move_id":109},{"level":49,"move_id":347}],"rom_address":3305710},"rom_address":3295040,"tmhm_learnset":"0040BE03B7F38638","types":[0,0]},{"abilities":[20,0],"base_stats":[55,20,35,75,20,45],"catch_rate":45,"evolutions":[],"friendship":70,"id":235,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":166},{"level":11,"move_id":166},{"level":21,"move_id":166},{"level":31,"move_id":166},{"level":41,"move_id":166},{"level":51,"move_id":166},{"level":61,"move_id":166},{"level":71,"move_id":166},{"level":81,"move_id":166},{"level":91,"move_id":166}],"rom_address":3305736},"rom_address":3295068,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[62,0],"base_stats":[35,35,35,35,35,35],"catch_rate":75,"evolutions":[{"method":"LEVEL_ATK_LT_DEF","param":20,"species":107},{"method":"LEVEL_ATK_GT_DEF","param":20,"species":106},{"method":"LEVEL_ATK_EQ_DEF","param":20,"species":237}],"friendship":70,"id":236,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3305764},"rom_address":3295096,"tmhm_learnset":"00A03E00C61306A0","types":[1,1]},{"abilities":[22,0],"base_stats":[50,95,95,70,35,110],"catch_rate":45,"evolutions":[],"friendship":70,"id":237,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":279},{"level":1,"move_id":27},{"level":7,"move_id":116},{"level":13,"move_id":228},{"level":19,"move_id":98},{"level":20,"move_id":167},{"level":25,"move_id":229},{"level":31,"move_id":68},{"level":37,"move_id":97},{"level":43,"move_id":197},{"level":49,"move_id":283}],"rom_address":3305774},"rom_address":3295124,"tmhm_learnset":"00A03E10CE1306A0","types":[1,1]},{"abilities":[12,0],"base_stats":[45,30,15,65,85,65],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":30,"species":124}],"friendship":70,"id":238,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":122},{"level":9,"move_id":186},{"level":13,"move_id":181},{"level":21,"move_id":93},{"level":25,"move_id":47},{"level":33,"move_id":212},{"level":37,"move_id":313},{"level":45,"move_id":94},{"level":49,"move_id":195},{"level":57,"move_id":59}],"rom_address":3305802},"rom_address":3295152,"tmhm_learnset":"0040BE01B413B26C","types":[15,14]},{"abilities":[9,0],"base_stats":[45,63,37,95,65,55],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":30,"species":125}],"friendship":70,"id":239,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":98},{"level":1,"move_id":43},{"level":9,"move_id":9},{"level":17,"move_id":113},{"level":25,"move_id":129},{"level":33,"move_id":103},{"level":41,"move_id":85},{"level":49,"move_id":87}],"rom_address":3305830},"rom_address":3295180,"tmhm_learnset":"00C03E02D5938221","types":[13,13]},{"abilities":[49,0],"base_stats":[45,75,37,83,70,55],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":30,"species":126}],"friendship":70,"id":240,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":52},{"level":7,"move_id":43},{"level":13,"move_id":123},{"level":19,"move_id":7},{"level":25,"move_id":108},{"level":31,"move_id":241},{"level":37,"move_id":53},{"level":43,"move_id":109},{"level":49,"move_id":126}],"rom_address":3305852},"rom_address":3295208,"tmhm_learnset":"00803E24D4510621","types":[10,10]},{"abilities":[47,0],"base_stats":[95,80,105,100,40,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":241,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":45},{"level":8,"move_id":111},{"level":13,"move_id":23},{"level":19,"move_id":208},{"level":26,"move_id":117},{"level":34,"move_id":205},{"level":43,"move_id":34},{"level":53,"move_id":215}],"rom_address":3305878},"rom_address":3295236,"tmhm_learnset":"00B01E52E7F37625","types":[0,0]},{"abilities":[30,32],"base_stats":[255,10,10,55,75,135],"catch_rate":30,"evolutions":[],"friendship":140,"id":242,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":45},{"level":4,"move_id":39},{"level":7,"move_id":287},{"level":10,"move_id":135},{"level":13,"move_id":3},{"level":18,"move_id":107},{"level":23,"move_id":47},{"level":28,"move_id":121},{"level":33,"move_id":111},{"level":40,"move_id":113},{"level":47,"move_id":38}],"rom_address":3305904},"rom_address":3295264,"tmhm_learnset":"00E19E76F7FBF66D","types":[0,0]},{"abilities":[46,0],"base_stats":[90,85,75,115,115,100],"catch_rate":3,"evolutions":[],"friendship":35,"id":243,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":11,"move_id":84},{"level":21,"move_id":46},{"level":31,"move_id":98},{"level":41,"move_id":209},{"level":51,"move_id":115},{"level":61,"move_id":242},{"level":71,"move_id":87},{"level":81,"move_id":347}],"rom_address":3305934},"rom_address":3295292,"tmhm_learnset":"00E40E138DD34638","types":[13,13]},{"abilities":[46,0],"base_stats":[115,115,85,100,90,75],"catch_rate":3,"evolutions":[],"friendship":35,"id":244,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":11,"move_id":52},{"level":21,"move_id":46},{"level":31,"move_id":83},{"level":41,"move_id":23},{"level":51,"move_id":53},{"level":61,"move_id":207},{"level":71,"move_id":126},{"level":81,"move_id":347}],"rom_address":3305960},"rom_address":3295320,"tmhm_learnset":"00E40E358C734638","types":[10,10]},{"abilities":[46,0],"base_stats":[100,75,115,85,90,115],"catch_rate":3,"evolutions":[],"friendship":35,"id":245,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":11,"move_id":61},{"level":21,"move_id":240},{"level":31,"move_id":16},{"level":41,"move_id":62},{"level":51,"move_id":54},{"level":61,"move_id":243},{"level":71,"move_id":56},{"level":81,"move_id":347}],"rom_address":3305986},"rom_address":3295348,"tmhm_learnset":"03940E118C53767C","types":[11,11]},{"abilities":[62,0],"base_stats":[50,64,50,41,45,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":30,"species":247}],"friendship":35,"id":246,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":8,"move_id":201},{"level":15,"move_id":103},{"level":22,"move_id":157},{"level":29,"move_id":37},{"level":36,"move_id":184},{"level":43,"move_id":242},{"level":50,"move_id":89},{"level":57,"move_id":63}],"rom_address":3306012},"rom_address":3295376,"tmhm_learnset":"00801F10CE134E20","types":[5,4]},{"abilities":[61,0],"base_stats":[70,84,70,51,65,70],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":55,"species":248}],"friendship":35,"id":247,"learnset":{"moves":[{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":1,"move_id":201},{"level":1,"move_id":103},{"level":8,"move_id":201},{"level":15,"move_id":103},{"level":22,"move_id":157},{"level":29,"move_id":37},{"level":38,"move_id":184},{"level":47,"move_id":242},{"level":56,"move_id":89},{"level":65,"move_id":63}],"rom_address":3306038},"rom_address":3295404,"tmhm_learnset":"00801F10CE134E20","types":[5,4]},{"abilities":[45,0],"base_stats":[100,134,110,61,95,100],"catch_rate":45,"evolutions":[],"friendship":35,"id":248,"learnset":{"moves":[{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":1,"move_id":201},{"level":1,"move_id":103},{"level":8,"move_id":201},{"level":15,"move_id":103},{"level":22,"move_id":157},{"level":29,"move_id":37},{"level":38,"move_id":184},{"level":47,"move_id":242},{"level":61,"move_id":89},{"level":75,"move_id":63}],"rom_address":3306064},"rom_address":3295432,"tmhm_learnset":"00B41FF6CFD37E37","types":[5,17]},{"abilities":[46,0],"base_stats":[106,90,130,110,90,154],"catch_rate":3,"evolutions":[],"friendship":0,"id":249,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":16},{"level":1,"move_id":18},{"level":11,"move_id":219},{"level":22,"move_id":16},{"level":33,"move_id":105},{"level":44,"move_id":56},{"level":55,"move_id":240},{"level":66,"move_id":129},{"level":77,"move_id":177},{"level":88,"move_id":246},{"level":99,"move_id":248}],"rom_address":3306090},"rom_address":3295460,"tmhm_learnset":"03B8CE93B7DFF67C","types":[14,2]},{"abilities":[46,0],"base_stats":[106,130,90,90,110,154],"catch_rate":3,"evolutions":[],"friendship":0,"id":250,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":18},{"level":11,"move_id":219},{"level":22,"move_id":16},{"level":33,"move_id":105},{"level":44,"move_id":126},{"level":55,"move_id":241},{"level":66,"move_id":129},{"level":77,"move_id":221},{"level":88,"move_id":246},{"level":99,"move_id":248}],"rom_address":3306118},"rom_address":3295488,"tmhm_learnset":"00EA4EB7B7BFC638","types":[10,2]},{"abilities":[30,0],"base_stats":[100,100,100,100,100,100],"catch_rate":45,"evolutions":[],"friendship":100,"id":251,"learnset":{"moves":[{"level":1,"move_id":73},{"level":1,"move_id":93},{"level":1,"move_id":105},{"level":1,"move_id":215},{"level":10,"move_id":219},{"level":20,"move_id":246},{"level":30,"move_id":248},{"level":40,"move_id":226},{"level":50,"move_id":195}],"rom_address":3306146},"rom_address":3295516,"tmhm_learnset":"00448E93B43FC62C","types":[14,12]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":252,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306166},"rom_address":3295544,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":253,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306176},"rom_address":3295572,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":254,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306186},"rom_address":3295600,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":255,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306196},"rom_address":3295628,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":256,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306206},"rom_address":3295656,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":257,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306216},"rom_address":3295684,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":258,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306226},"rom_address":3295712,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":259,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306236},"rom_address":3295740,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":260,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306246},"rom_address":3295768,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":261,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306256},"rom_address":3295796,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":262,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306266},"rom_address":3295824,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":263,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306276},"rom_address":3295852,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":264,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306286},"rom_address":3295880,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":265,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306296},"rom_address":3295908,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":266,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306306},"rom_address":3295936,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":267,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306316},"rom_address":3295964,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":268,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306326},"rom_address":3295992,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":269,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306336},"rom_address":3296020,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":270,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306346},"rom_address":3296048,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":271,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306356},"rom_address":3296076,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":272,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306366},"rom_address":3296104,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":273,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306376},"rom_address":3296132,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":274,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306386},"rom_address":3296160,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":275,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306396},"rom_address":3296188,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[0,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":276,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33}],"rom_address":3306406},"rom_address":3296216,"tmhm_learnset":"0000000000000000","types":[0,0]},{"abilities":[65,0],"base_stats":[40,45,35,70,65,55],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":16,"species":278}],"friendship":70,"id":277,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":1,"move_id":43},{"level":6,"move_id":71},{"level":11,"move_id":98},{"level":16,"move_id":228},{"level":21,"move_id":103},{"level":26,"move_id":72},{"level":31,"move_id":97},{"level":36,"move_id":21},{"level":41,"move_id":197},{"level":46,"move_id":202}],"rom_address":3306416},"rom_address":3296244,"tmhm_learnset":"00E41EC0CC7D0721","types":[12,12]},{"abilities":[65,0],"base_stats":[50,65,45,95,85,65],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":36,"species":279}],"friendship":70,"id":278,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":43},{"level":1,"move_id":71},{"level":1,"move_id":98},{"level":6,"move_id":71},{"level":11,"move_id":98},{"level":16,"move_id":210},{"level":17,"move_id":228},{"level":23,"move_id":103},{"level":29,"move_id":348},{"level":35,"move_id":97},{"level":41,"move_id":21},{"level":47,"move_id":197},{"level":53,"move_id":206}],"rom_address":3306444},"rom_address":3296272,"tmhm_learnset":"00E41EC0CC7D0721","types":[12,12]},{"abilities":[65,0],"base_stats":[70,85,65,120,105,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":279,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":43},{"level":1,"move_id":71},{"level":1,"move_id":98},{"level":6,"move_id":71},{"level":11,"move_id":98},{"level":16,"move_id":210},{"level":17,"move_id":228},{"level":23,"move_id":103},{"level":29,"move_id":348},{"level":35,"move_id":97},{"level":43,"move_id":21},{"level":51,"move_id":197},{"level":59,"move_id":206}],"rom_address":3306474},"rom_address":3296300,"tmhm_learnset":"00E41EC0CE7D4733","types":[12,12]},{"abilities":[66,0],"base_stats":[45,60,40,45,70,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":16,"species":281}],"friendship":70,"id":280,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":7,"move_id":116},{"level":10,"move_id":52},{"level":16,"move_id":64},{"level":19,"move_id":28},{"level":25,"move_id":83},{"level":28,"move_id":98},{"level":34,"move_id":163},{"level":37,"move_id":119},{"level":43,"move_id":53}],"rom_address":3306504},"rom_address":3296328,"tmhm_learnset":"00A61EE48C110620","types":[10,10]},{"abilities":[66,0],"base_stats":[60,85,60,55,85,60],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":36,"species":282}],"friendship":70,"id":281,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":1,"move_id":116},{"level":1,"move_id":52},{"level":7,"move_id":116},{"level":13,"move_id":52},{"level":16,"move_id":24},{"level":17,"move_id":64},{"level":21,"move_id":28},{"level":28,"move_id":339},{"level":32,"move_id":98},{"level":39,"move_id":163},{"level":43,"move_id":119},{"level":50,"move_id":327}],"rom_address":3306532},"rom_address":3296356,"tmhm_learnset":"00A61EE4CC1106A1","types":[10,1]},{"abilities":[66,0],"base_stats":[80,120,70,80,110,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":282,"learnset":{"moves":[{"level":1,"move_id":7},{"level":1,"move_id":10},{"level":1,"move_id":45},{"level":1,"move_id":116},{"level":1,"move_id":52},{"level":7,"move_id":116},{"level":13,"move_id":52},{"level":16,"move_id":24},{"level":17,"move_id":64},{"level":21,"move_id":28},{"level":28,"move_id":339},{"level":32,"move_id":98},{"level":36,"move_id":299},{"level":42,"move_id":163},{"level":49,"move_id":119},{"level":59,"move_id":327}],"rom_address":3306562},"rom_address":3296384,"tmhm_learnset":"00A61EE4CE1146B1","types":[10,1]},{"abilities":[67,0],"base_stats":[50,70,50,40,50,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":16,"species":284}],"friendship":70,"id":283,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":6,"move_id":189},{"level":10,"move_id":55},{"level":15,"move_id":117},{"level":19,"move_id":193},{"level":24,"move_id":300},{"level":28,"move_id":36},{"level":33,"move_id":250},{"level":37,"move_id":182},{"level":42,"move_id":56},{"level":46,"move_id":283}],"rom_address":3306596},"rom_address":3296412,"tmhm_learnset":"03B01E408C533264","types":[11,11]},{"abilities":[67,0],"base_stats":[70,85,70,50,60,70],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":36,"species":285}],"friendship":70,"id":284,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":189},{"level":1,"move_id":55},{"level":6,"move_id":189},{"level":10,"move_id":55},{"level":15,"move_id":117},{"level":16,"move_id":341},{"level":20,"move_id":193},{"level":25,"move_id":300},{"level":31,"move_id":36},{"level":37,"move_id":330},{"level":42,"move_id":182},{"level":46,"move_id":89},{"level":53,"move_id":283}],"rom_address":3306626},"rom_address":3296440,"tmhm_learnset":"03B01E408E533264","types":[11,4]},{"abilities":[67,0],"base_stats":[100,110,90,60,85,90],"catch_rate":45,"evolutions":[],"friendship":70,"id":285,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":189},{"level":1,"move_id":55},{"level":6,"move_id":189},{"level":10,"move_id":55},{"level":15,"move_id":117},{"level":16,"move_id":341},{"level":20,"move_id":193},{"level":25,"move_id":300},{"level":31,"move_id":36},{"level":39,"move_id":330},{"level":46,"move_id":182},{"level":52,"move_id":89},{"level":61,"move_id":283}],"rom_address":3306658},"rom_address":3296468,"tmhm_learnset":"03B01E40CE537275","types":[11,4]},{"abilities":[50,0],"base_stats":[35,55,35,35,30,30],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":18,"species":287}],"friendship":70,"id":286,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":5,"move_id":336},{"level":9,"move_id":28},{"level":13,"move_id":44},{"level":17,"move_id":316},{"level":21,"move_id":46},{"level":25,"move_id":207},{"level":29,"move_id":184},{"level":33,"move_id":36},{"level":37,"move_id":269},{"level":41,"move_id":242},{"level":45,"move_id":168}],"rom_address":3306690},"rom_address":3296496,"tmhm_learnset":"00813F00AC530E30","types":[17,17]},{"abilities":[22,0],"base_stats":[70,90,70,70,60,60],"catch_rate":127,"evolutions":[],"friendship":70,"id":287,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":336},{"level":1,"move_id":28},{"level":1,"move_id":44},{"level":5,"move_id":336},{"level":9,"move_id":28},{"level":13,"move_id":44},{"level":17,"move_id":316},{"level":22,"move_id":46},{"level":27,"move_id":207},{"level":32,"move_id":184},{"level":37,"move_id":36},{"level":42,"move_id":269},{"level":47,"move_id":242},{"level":52,"move_id":168}],"rom_address":3306722},"rom_address":3296524,"tmhm_learnset":"00A13F00AC534E30","types":[17,17]},{"abilities":[53,0],"base_stats":[38,30,41,60,30,41],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":20,"species":289}],"friendship":70,"id":288,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":5,"move_id":39},{"level":9,"move_id":29},{"level":13,"move_id":28},{"level":17,"move_id":316},{"level":21,"move_id":300},{"level":25,"move_id":42},{"level":29,"move_id":343},{"level":33,"move_id":175},{"level":37,"move_id":156},{"level":41,"move_id":187}],"rom_address":3306754},"rom_address":3296552,"tmhm_learnset":"00943E02ADD33624","types":[0,0]},{"abilities":[53,0],"base_stats":[78,70,61,100,50,61],"catch_rate":90,"evolutions":[],"friendship":70,"id":289,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":45},{"level":1,"move_id":39},{"level":1,"move_id":29},{"level":5,"move_id":39},{"level":9,"move_id":29},{"level":13,"move_id":28},{"level":17,"move_id":316},{"level":23,"move_id":300},{"level":29,"move_id":154},{"level":35,"move_id":343},{"level":41,"move_id":163},{"level":47,"move_id":156},{"level":53,"move_id":187}],"rom_address":3306784},"rom_address":3296580,"tmhm_learnset":"00B43E02ADD37634","types":[0,0]},{"abilities":[19,0],"base_stats":[45,45,35,20,20,30],"catch_rate":255,"evolutions":[{"method":"LEVEL_SILCOON","param":7,"species":291},{"method":"LEVEL_CASCOON","param":7,"species":293}],"friendship":70,"id":290,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":81},{"level":5,"move_id":40}],"rom_address":3306814},"rom_address":3296608,"tmhm_learnset":"0000000000000000","types":[6,6]},{"abilities":[61,0],"base_stats":[50,35,55,15,25,25],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":10,"species":292}],"friendship":70,"id":291,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":7,"move_id":106}],"rom_address":3306826},"rom_address":3296636,"tmhm_learnset":"0000000000000000","types":[6,6]},{"abilities":[68,0],"base_stats":[60,70,50,65,90,50],"catch_rate":45,"evolutions":[],"friendship":70,"id":292,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":71},{"level":10,"move_id":71},{"level":13,"move_id":16},{"level":17,"move_id":78},{"level":20,"move_id":234},{"level":24,"move_id":72},{"level":27,"move_id":18},{"level":31,"move_id":213},{"level":34,"move_id":318},{"level":38,"move_id":202}],"rom_address":3306838},"rom_address":3296664,"tmhm_learnset":"00403E80B43D4620","types":[6,2]},{"abilities":[61,0],"base_stats":[50,35,55,15,25,25],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":10,"species":294}],"friendship":70,"id":293,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":7,"move_id":106}],"rom_address":3306866},"rom_address":3296692,"tmhm_learnset":"0000000000000000","types":[6,6]},{"abilities":[19,0],"base_stats":[60,50,70,65,50,90],"catch_rate":45,"evolutions":[],"friendship":70,"id":294,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":93},{"level":10,"move_id":93},{"level":13,"move_id":16},{"level":17,"move_id":182},{"level":20,"move_id":236},{"level":24,"move_id":60},{"level":27,"move_id":18},{"level":31,"move_id":113},{"level":34,"move_id":318},{"level":38,"move_id":92}],"rom_address":3306878},"rom_address":3296720,"tmhm_learnset":"00403E88B435C620","types":[6,3]},{"abilities":[33,44],"base_stats":[40,30,30,30,40,50],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":14,"species":296}],"friendship":70,"id":295,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":310},{"level":3,"move_id":45},{"level":7,"move_id":71},{"level":13,"move_id":267},{"level":21,"move_id":54},{"level":31,"move_id":240},{"level":43,"move_id":72}],"rom_address":3306906},"rom_address":3296748,"tmhm_learnset":"00503E0084373764","types":[11,12]},{"abilities":[33,44],"base_stats":[60,50,50,50,60,70],"catch_rate":120,"evolutions":[{"method":"ITEM","param":97,"species":297}],"friendship":70,"id":296,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":310},{"level":3,"move_id":45},{"level":7,"move_id":71},{"level":13,"move_id":267},{"level":19,"move_id":252},{"level":25,"move_id":154},{"level":31,"move_id":346},{"level":37,"move_id":168},{"level":43,"move_id":253},{"level":49,"move_id":56}],"rom_address":3306928},"rom_address":3296776,"tmhm_learnset":"03F03E00C4373764","types":[11,12]},{"abilities":[33,44],"base_stats":[80,70,70,70,90,100],"catch_rate":45,"evolutions":[],"friendship":70,"id":297,"learnset":{"moves":[{"level":1,"move_id":310},{"level":1,"move_id":45},{"level":1,"move_id":71},{"level":1,"move_id":267}],"rom_address":3306956},"rom_address":3296804,"tmhm_learnset":"03F03E00C4377765","types":[11,12]},{"abilities":[34,48],"base_stats":[40,40,50,30,30,30],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":14,"species":299}],"friendship":70,"id":298,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":117},{"level":3,"move_id":106},{"level":7,"move_id":74},{"level":13,"move_id":267},{"level":21,"move_id":235},{"level":31,"move_id":241},{"level":43,"move_id":153}],"rom_address":3306966},"rom_address":3296832,"tmhm_learnset":"00C01E00AC350720","types":[12,12]},{"abilities":[34,48],"base_stats":[70,70,40,60,60,40],"catch_rate":120,"evolutions":[{"method":"ITEM","param":98,"species":300}],"friendship":70,"id":299,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":3,"move_id":106},{"level":7,"move_id":74},{"level":13,"move_id":267},{"level":19,"move_id":252},{"level":25,"move_id":259},{"level":31,"move_id":185},{"level":37,"move_id":13},{"level":43,"move_id":207},{"level":49,"move_id":326}],"rom_address":3306988},"rom_address":3296860,"tmhm_learnset":"00E43F40EC354720","types":[12,17]},{"abilities":[34,48],"base_stats":[90,100,60,80,90,60],"catch_rate":45,"evolutions":[],"friendship":70,"id":300,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":106},{"level":1,"move_id":74},{"level":1,"move_id":267}],"rom_address":3307016},"rom_address":3296888,"tmhm_learnset":"00E43FC0EC354720","types":[12,17]},{"abilities":[14,0],"base_stats":[31,45,90,40,30,30],"catch_rate":255,"evolutions":[{"method":"LEVEL_NINJASK","param":20,"species":302},{"method":"LEVEL_SHEDINJA","param":20,"species":303}],"friendship":70,"id":301,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":106},{"level":5,"move_id":141},{"level":9,"move_id":28},{"level":14,"move_id":154},{"level":19,"move_id":170},{"level":25,"move_id":206},{"level":31,"move_id":189},{"level":38,"move_id":232},{"level":45,"move_id":91}],"rom_address":3307026},"rom_address":3296916,"tmhm_learnset":"00440E90AC350620","types":[6,4]},{"abilities":[3,0],"base_stats":[61,90,45,160,50,50],"catch_rate":120,"evolutions":[],"friendship":70,"id":302,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":106},{"level":1,"move_id":141},{"level":1,"move_id":28},{"level":5,"move_id":141},{"level":9,"move_id":28},{"level":14,"move_id":154},{"level":19,"move_id":170},{"level":20,"move_id":104},{"level":20,"move_id":210},{"level":20,"move_id":103},{"level":25,"move_id":14},{"level":31,"move_id":163},{"level":38,"move_id":97},{"level":45,"move_id":226}],"rom_address":3307052},"rom_address":3296944,"tmhm_learnset":"00443E90AC354620","types":[6,2]},{"abilities":[25,0],"base_stats":[1,90,45,40,30,30],"catch_rate":45,"evolutions":[],"friendship":70,"id":303,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":106},{"level":5,"move_id":141},{"level":9,"move_id":28},{"level":14,"move_id":154},{"level":19,"move_id":170},{"level":25,"move_id":180},{"level":31,"move_id":109},{"level":38,"move_id":247},{"level":45,"move_id":288}],"rom_address":3307084},"rom_address":3296972,"tmhm_learnset":"00442E90AC354620","types":[6,7]},{"abilities":[62,0],"base_stats":[40,55,30,85,30,30],"catch_rate":200,"evolutions":[{"method":"LEVEL","param":22,"species":305}],"friendship":70,"id":304,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":4,"move_id":116},{"level":8,"move_id":98},{"level":13,"move_id":17},{"level":19,"move_id":104},{"level":26,"move_id":283},{"level":34,"move_id":332},{"level":43,"move_id":97}],"rom_address":3307110},"rom_address":3297000,"tmhm_learnset":"00087E8084130620","types":[0,2]},{"abilities":[62,0],"base_stats":[60,85,60,125,50,50],"catch_rate":45,"evolutions":[],"friendship":70,"id":305,"learnset":{"moves":[{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":1,"move_id":116},{"level":1,"move_id":98},{"level":4,"move_id":116},{"level":8,"move_id":98},{"level":13,"move_id":17},{"level":19,"move_id":104},{"level":28,"move_id":283},{"level":38,"move_id":332},{"level":49,"move_id":97}],"rom_address":3307134},"rom_address":3297028,"tmhm_learnset":"00087E8084134620","types":[0,2]},{"abilities":[27,0],"base_stats":[60,40,60,35,40,60],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":23,"species":307}],"friendship":70,"id":306,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":71},{"level":4,"move_id":33},{"level":7,"move_id":78},{"level":10,"move_id":73},{"level":16,"move_id":72},{"level":22,"move_id":29},{"level":28,"move_id":77},{"level":36,"move_id":74},{"level":45,"move_id":202},{"level":54,"move_id":147}],"rom_address":3307158},"rom_address":3297056,"tmhm_learnset":"00411E08843D0720","types":[12,12]},{"abilities":[27,0],"base_stats":[60,130,80,70,60,60],"catch_rate":90,"evolutions":[],"friendship":70,"id":307,"learnset":{"moves":[{"level":1,"move_id":71},{"level":1,"move_id":33},{"level":1,"move_id":78},{"level":1,"move_id":73},{"level":4,"move_id":33},{"level":7,"move_id":78},{"level":10,"move_id":73},{"level":16,"move_id":72},{"level":22,"move_id":29},{"level":23,"move_id":183},{"level":28,"move_id":68},{"level":36,"move_id":327},{"level":45,"move_id":170},{"level":54,"move_id":223}],"rom_address":3307186},"rom_address":3297084,"tmhm_learnset":"00E51E08C47D47A1","types":[12,1]},{"abilities":[20,0],"base_stats":[60,60,60,60,60,60],"catch_rate":255,"evolutions":[],"friendship":70,"id":308,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":5,"move_id":253},{"level":12,"move_id":185},{"level":16,"move_id":60},{"level":23,"move_id":95},{"level":27,"move_id":146},{"level":34,"move_id":298},{"level":38,"move_id":244},{"level":45,"move_id":38},{"level":49,"move_id":175},{"level":56,"move_id":37}],"rom_address":3307216},"rom_address":3297112,"tmhm_learnset":"00E1BE42FC1B062D","types":[0,0]},{"abilities":[51,0],"base_stats":[40,30,30,85,55,30],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":25,"species":310}],"friendship":70,"id":309,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":45},{"level":1,"move_id":55},{"level":7,"move_id":48},{"level":13,"move_id":17},{"level":21,"move_id":54},{"level":31,"move_id":98},{"level":43,"move_id":228},{"level":55,"move_id":97}],"rom_address":3307246},"rom_address":3297140,"tmhm_learnset":"00087E8284133264","types":[11,2]},{"abilities":[51,0],"base_stats":[60,50,100,65,85,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":310,"learnset":{"moves":[{"level":1,"move_id":45},{"level":1,"move_id":55},{"level":1,"move_id":346},{"level":1,"move_id":17},{"level":3,"move_id":55},{"level":7,"move_id":48},{"level":13,"move_id":17},{"level":21,"move_id":54},{"level":25,"move_id":182},{"level":33,"move_id":254},{"level":33,"move_id":256},{"level":47,"move_id":255},{"level":61,"move_id":56}],"rom_address":3307268},"rom_address":3297168,"tmhm_learnset":"00187E8284137264","types":[11,2]},{"abilities":[33,0],"base_stats":[40,30,32,65,50,52],"catch_rate":200,"evolutions":[{"method":"LEVEL","param":22,"species":312}],"friendship":70,"id":311,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":7,"move_id":98},{"level":13,"move_id":230},{"level":19,"move_id":346},{"level":25,"move_id":61},{"level":31,"move_id":97},{"level":37,"move_id":54},{"level":37,"move_id":114}],"rom_address":3307296},"rom_address":3297196,"tmhm_learnset":"00403E00A4373624","types":[6,11]},{"abilities":[22,0],"base_stats":[70,60,62,60,80,82],"catch_rate":75,"evolutions":[],"friendship":70,"id":312,"learnset":{"moves":[{"level":1,"move_id":145},{"level":1,"move_id":98},{"level":1,"move_id":230},{"level":1,"move_id":346},{"level":7,"move_id":98},{"level":13,"move_id":230},{"level":19,"move_id":346},{"level":26,"move_id":16},{"level":33,"move_id":184},{"level":40,"move_id":78},{"level":47,"move_id":318},{"level":53,"move_id":18}],"rom_address":3307320},"rom_address":3297224,"tmhm_learnset":"00403E80A4377624","types":[6,2]},{"abilities":[41,12],"base_stats":[130,70,35,60,70,35],"catch_rate":125,"evolutions":[{"method":"LEVEL","param":40,"species":314}],"friendship":70,"id":313,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":55},{"level":1,"move_id":150},{"level":5,"move_id":45},{"level":10,"move_id":55},{"level":14,"move_id":205},{"level":19,"move_id":250},{"level":23,"move_id":310},{"level":28,"move_id":352},{"level":32,"move_id":54},{"level":37,"move_id":156},{"level":41,"move_id":323},{"level":46,"move_id":133},{"level":50,"move_id":56}],"rom_address":3307346},"rom_address":3297252,"tmhm_learnset":"03B01E4086133274","types":[11,11]},{"abilities":[41,12],"base_stats":[170,90,45,60,90,45],"catch_rate":60,"evolutions":[],"friendship":70,"id":314,"learnset":{"moves":[{"level":1,"move_id":150},{"level":1,"move_id":45},{"level":1,"move_id":55},{"level":1,"move_id":205},{"level":5,"move_id":45},{"level":10,"move_id":55},{"level":14,"move_id":205},{"level":19,"move_id":250},{"level":23,"move_id":310},{"level":28,"move_id":352},{"level":32,"move_id":54},{"level":37,"move_id":156},{"level":44,"move_id":323},{"level":52,"move_id":133},{"level":59,"move_id":56}],"rom_address":3307378},"rom_address":3297280,"tmhm_learnset":"03B01E4086137274","types":[11,11]},{"abilities":[56,0],"base_stats":[50,45,45,50,35,35],"catch_rate":255,"evolutions":[{"method":"ITEM","param":94,"species":316}],"friendship":70,"id":315,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":45},{"level":1,"move_id":33},{"level":3,"move_id":39},{"level":7,"move_id":213},{"level":13,"move_id":47},{"level":15,"move_id":3},{"level":19,"move_id":274},{"level":25,"move_id":204},{"level":27,"move_id":185},{"level":31,"move_id":343},{"level":37,"move_id":215},{"level":39,"move_id":38}],"rom_address":3307410},"rom_address":3297308,"tmhm_learnset":"00401E02ADFB362C","types":[0,0]},{"abilities":[56,0],"base_stats":[70,65,65,70,55,55],"catch_rate":60,"evolutions":[],"friendship":70,"id":316,"learnset":{"moves":[{"level":1,"move_id":45},{"level":1,"move_id":213},{"level":1,"move_id":47},{"level":1,"move_id":3}],"rom_address":3307440},"rom_address":3297336,"tmhm_learnset":"00E01E02ADFB762C","types":[0,0]},{"abilities":[16,0],"base_stats":[60,90,70,40,60,120],"catch_rate":200,"evolutions":[],"friendship":70,"id":317,"learnset":{"moves":[{"level":1,"move_id":168},{"level":1,"move_id":39},{"level":1,"move_id":310},{"level":1,"move_id":122},{"level":1,"move_id":10},{"level":4,"move_id":20},{"level":7,"move_id":185},{"level":12,"move_id":154},{"level":17,"move_id":60},{"level":24,"move_id":103},{"level":31,"move_id":163},{"level":40,"move_id":164},{"level":49,"move_id":246}],"rom_address":3307450},"rom_address":3297364,"tmhm_learnset":"00E5BEE6EDF33625","types":[0,0]},{"abilities":[26,0],"base_stats":[40,40,55,55,40,70],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":36,"species":319}],"friendship":70,"id":318,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":93},{"level":3,"move_id":106},{"level":5,"move_id":229},{"level":7,"move_id":189},{"level":11,"move_id":60},{"level":15,"move_id":317},{"level":19,"move_id":120},{"level":25,"move_id":246},{"level":31,"move_id":201},{"level":37,"move_id":322},{"level":45,"move_id":153}],"rom_address":3307478},"rom_address":3297392,"tmhm_learnset":"00408E51BE339620","types":[4,14]},{"abilities":[26,0],"base_stats":[60,70,105,75,70,120],"catch_rate":90,"evolutions":[],"friendship":70,"id":319,"learnset":{"moves":[{"level":1,"move_id":100},{"level":1,"move_id":93},{"level":1,"move_id":106},{"level":1,"move_id":229},{"level":3,"move_id":106},{"level":5,"move_id":229},{"level":7,"move_id":189},{"level":11,"move_id":60},{"level":15,"move_id":317},{"level":19,"move_id":120},{"level":25,"move_id":246},{"level":31,"move_id":201},{"level":36,"move_id":63},{"level":42,"move_id":322},{"level":55,"move_id":153}],"rom_address":3307508},"rom_address":3297420,"tmhm_learnset":"00E08E51BE33D620","types":[4,14]},{"abilities":[5,42],"base_stats":[30,45,135,30,45,90],"catch_rate":255,"evolutions":[],"friendship":70,"id":320,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":7,"move_id":106},{"level":13,"move_id":88},{"level":16,"move_id":335},{"level":22,"move_id":86},{"level":28,"move_id":157},{"level":31,"move_id":201},{"level":37,"move_id":156},{"level":43,"move_id":192},{"level":46,"move_id":199}],"rom_address":3307540},"rom_address":3297448,"tmhm_learnset":"00A01F5287910E20","types":[5,5]},{"abilities":[73,0],"base_stats":[70,85,140,20,85,70],"catch_rate":90,"evolutions":[],"friendship":70,"id":321,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":52},{"level":4,"move_id":123},{"level":7,"move_id":174},{"level":14,"move_id":108},{"level":17,"move_id":83},{"level":20,"move_id":34},{"level":27,"move_id":182},{"level":30,"move_id":53},{"level":33,"move_id":334},{"level":40,"move_id":133},{"level":43,"move_id":175},{"level":46,"move_id":257}],"rom_address":3307568},"rom_address":3297476,"tmhm_learnset":"00A21E2C84510620","types":[10,10]},{"abilities":[51,0],"base_stats":[50,75,75,50,65,65],"catch_rate":45,"evolutions":[],"friendship":35,"id":322,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":10},{"level":5,"move_id":193},{"level":9,"move_id":101},{"level":13,"move_id":310},{"level":17,"move_id":154},{"level":21,"move_id":252},{"level":25,"move_id":197},{"level":29,"move_id":185},{"level":33,"move_id":282},{"level":37,"move_id":109},{"level":41,"move_id":247},{"level":45,"move_id":212}],"rom_address":3307600},"rom_address":3297504,"tmhm_learnset":"00C53FC2FC130E2D","types":[17,7]},{"abilities":[12,0],"base_stats":[50,48,43,60,46,41],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":30,"species":324}],"friendship":70,"id":323,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":189},{"level":6,"move_id":300},{"level":6,"move_id":346},{"level":11,"move_id":55},{"level":16,"move_id":222},{"level":21,"move_id":133},{"level":26,"move_id":156},{"level":26,"move_id":173},{"level":31,"move_id":89},{"level":36,"move_id":248},{"level":41,"move_id":90}],"rom_address":3307632},"rom_address":3297532,"tmhm_learnset":"03101E5086133264","types":[11,4]},{"abilities":[12,0],"base_stats":[110,78,73,60,76,71],"catch_rate":75,"evolutions":[],"friendship":70,"id":324,"learnset":{"moves":[{"level":1,"move_id":321},{"level":1,"move_id":189},{"level":1,"move_id":300},{"level":1,"move_id":346},{"level":6,"move_id":300},{"level":6,"move_id":346},{"level":11,"move_id":55},{"level":16,"move_id":222},{"level":21,"move_id":133},{"level":26,"move_id":156},{"level":26,"move_id":173},{"level":36,"move_id":89},{"level":46,"move_id":248},{"level":56,"move_id":90}],"rom_address":3307662},"rom_address":3297560,"tmhm_learnset":"03B01E5086137264","types":[11,4]},{"abilities":[33,0],"base_stats":[43,30,55,97,40,65],"catch_rate":225,"evolutions":[],"friendship":70,"id":325,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":204},{"level":12,"move_id":55},{"level":16,"move_id":97},{"level":24,"move_id":36},{"level":28,"move_id":213},{"level":36,"move_id":186},{"level":40,"move_id":175},{"level":48,"move_id":219}],"rom_address":3307692},"rom_address":3297588,"tmhm_learnset":"03101E00841B3264","types":[11,11]},{"abilities":[52,75],"base_stats":[43,80,65,35,50,35],"catch_rate":205,"evolutions":[{"method":"LEVEL","param":30,"species":327}],"friendship":70,"id":326,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":7,"move_id":106},{"level":10,"move_id":11},{"level":13,"move_id":43},{"level":20,"move_id":61},{"level":23,"move_id":182},{"level":26,"move_id":282},{"level":32,"move_id":269},{"level":35,"move_id":152},{"level":38,"move_id":14},{"level":44,"move_id":12}],"rom_address":3307718},"rom_address":3297616,"tmhm_learnset":"01B41EC8CC133A64","types":[11,11]},{"abilities":[52,75],"base_stats":[63,120,85,55,90,55],"catch_rate":155,"evolutions":[],"friendship":70,"id":327,"learnset":{"moves":[{"level":1,"move_id":145},{"level":1,"move_id":106},{"level":1,"move_id":11},{"level":1,"move_id":43},{"level":7,"move_id":106},{"level":10,"move_id":11},{"level":13,"move_id":43},{"level":20,"move_id":61},{"level":23,"move_id":182},{"level":26,"move_id":282},{"level":34,"move_id":269},{"level":39,"move_id":152},{"level":44,"move_id":14},{"level":52,"move_id":12}],"rom_address":3307748},"rom_address":3297644,"tmhm_learnset":"03B41EC8CC137A64","types":[11,17]},{"abilities":[33,0],"base_stats":[20,15,20,80,10,55],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":30,"species":329}],"friendship":70,"id":328,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":150},{"level":15,"move_id":33},{"level":30,"move_id":175}],"rom_address":3307778},"rom_address":3297672,"tmhm_learnset":"03101E0084133264","types":[11,11]},{"abilities":[63,0],"base_stats":[95,60,79,81,100,125],"catch_rate":60,"evolutions":[],"friendship":70,"id":329,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":55},{"level":5,"move_id":35},{"level":10,"move_id":346},{"level":15,"move_id":287},{"level":20,"move_id":352},{"level":25,"move_id":239},{"level":30,"move_id":105},{"level":35,"move_id":240},{"level":40,"move_id":56},{"level":45,"move_id":213},{"level":50,"move_id":219}],"rom_address":3307792},"rom_address":3297700,"tmhm_learnset":"03101E00845B7264","types":[11,11]},{"abilities":[24,0],"base_stats":[45,90,20,65,65,20],"catch_rate":225,"evolutions":[{"method":"LEVEL","param":30,"species":331}],"friendship":35,"id":330,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":44},{"level":7,"move_id":99},{"level":13,"move_id":116},{"level":16,"move_id":184},{"level":22,"move_id":242},{"level":28,"move_id":103},{"level":31,"move_id":36},{"level":37,"move_id":207},{"level":43,"move_id":97}],"rom_address":3307822},"rom_address":3297728,"tmhm_learnset":"03103F0084133A64","types":[11,17]},{"abilities":[24,0],"base_stats":[70,120,40,95,95,40],"catch_rate":60,"evolutions":[],"friendship":35,"id":331,"learnset":{"moves":[{"level":1,"move_id":43},{"level":1,"move_id":44},{"level":1,"move_id":99},{"level":1,"move_id":116},{"level":7,"move_id":99},{"level":13,"move_id":116},{"level":16,"move_id":184},{"level":22,"move_id":242},{"level":28,"move_id":103},{"level":33,"move_id":163},{"level":38,"move_id":269},{"level":43,"move_id":207},{"level":48,"move_id":130},{"level":53,"move_id":97}],"rom_address":3307848},"rom_address":3297756,"tmhm_learnset":"03B03F4086137A74","types":[11,17]},{"abilities":[52,71],"base_stats":[45,100,45,10,45,45],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":35,"species":333}],"friendship":70,"id":332,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":44},{"level":9,"move_id":28},{"level":17,"move_id":185},{"level":25,"move_id":328},{"level":33,"move_id":242},{"level":41,"move_id":91},{"level":49,"move_id":201},{"level":57,"move_id":63}],"rom_address":3307878},"rom_address":3297784,"tmhm_learnset":"00A01E508E354620","types":[4,4]},{"abilities":[26,26],"base_stats":[50,70,50,70,50,50],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":45,"species":334}],"friendship":70,"id":333,"learnset":{"moves":[{"level":1,"move_id":44},{"level":1,"move_id":28},{"level":1,"move_id":185},{"level":1,"move_id":328},{"level":9,"move_id":28},{"level":17,"move_id":185},{"level":25,"move_id":328},{"level":33,"move_id":242},{"level":35,"move_id":225},{"level":41,"move_id":103},{"level":49,"move_id":201},{"level":57,"move_id":63}],"rom_address":3307902},"rom_address":3297812,"tmhm_learnset":"00A85E508E354620","types":[4,16]},{"abilities":[26,26],"base_stats":[80,100,80,100,80,80],"catch_rate":45,"evolutions":[],"friendship":70,"id":334,"learnset":{"moves":[{"level":1,"move_id":44},{"level":1,"move_id":28},{"level":1,"move_id":185},{"level":1,"move_id":328},{"level":9,"move_id":28},{"level":17,"move_id":185},{"level":25,"move_id":328},{"level":33,"move_id":242},{"level":35,"move_id":225},{"level":41,"move_id":103},{"level":53,"move_id":201},{"level":65,"move_id":63}],"rom_address":3307928},"rom_address":3297840,"tmhm_learnset":"00A85E748E754622","types":[4,16]},{"abilities":[47,62],"base_stats":[72,60,30,25,20,30],"catch_rate":180,"evolutions":[{"method":"LEVEL","param":24,"species":336}],"friendship":70,"id":335,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":116},{"level":4,"move_id":28},{"level":10,"move_id":292},{"level":13,"move_id":233},{"level":19,"move_id":252},{"level":22,"move_id":18},{"level":28,"move_id":282},{"level":31,"move_id":265},{"level":37,"move_id":187},{"level":40,"move_id":203},{"level":46,"move_id":69},{"level":49,"move_id":179}],"rom_address":3307954},"rom_address":3297868,"tmhm_learnset":"00B01E40CE1306A1","types":[1,1]},{"abilities":[47,62],"base_stats":[144,120,60,50,40,60],"catch_rate":200,"evolutions":[],"friendship":70,"id":336,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":116},{"level":1,"move_id":28},{"level":1,"move_id":292},{"level":4,"move_id":28},{"level":10,"move_id":292},{"level":13,"move_id":233},{"level":19,"move_id":252},{"level":22,"move_id":18},{"level":29,"move_id":282},{"level":33,"move_id":265},{"level":40,"move_id":187},{"level":44,"move_id":203},{"level":51,"move_id":69},{"level":55,"move_id":179}],"rom_address":3307986},"rom_address":3297896,"tmhm_learnset":"00B01E40CE1346A1","types":[1,1]},{"abilities":[9,31],"base_stats":[40,45,40,65,65,40],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":26,"species":338}],"friendship":70,"id":337,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":86},{"level":9,"move_id":43},{"level":12,"move_id":336},{"level":17,"move_id":98},{"level":20,"move_id":209},{"level":25,"move_id":316},{"level":28,"move_id":46},{"level":33,"move_id":44},{"level":36,"move_id":87},{"level":41,"move_id":268}],"rom_address":3308018},"rom_address":3297924,"tmhm_learnset":"00603E0285D30230","types":[13,13]},{"abilities":[9,31],"base_stats":[70,75,60,105,105,60],"catch_rate":45,"evolutions":[],"friendship":70,"id":338,"learnset":{"moves":[{"level":1,"move_id":86},{"level":1,"move_id":43},{"level":1,"move_id":336},{"level":1,"move_id":33},{"level":4,"move_id":86},{"level":9,"move_id":43},{"level":12,"move_id":336},{"level":17,"move_id":98},{"level":20,"move_id":209},{"level":25,"move_id":316},{"level":31,"move_id":46},{"level":39,"move_id":44},{"level":45,"move_id":87},{"level":53,"move_id":268}],"rom_address":3308048},"rom_address":3297952,"tmhm_learnset":"00603E0285D34230","types":[13,13]},{"abilities":[12,0],"base_stats":[60,60,40,35,65,45],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":33,"species":340}],"friendship":70,"id":339,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":45},{"level":1,"move_id":33},{"level":11,"move_id":52},{"level":19,"move_id":222},{"level":25,"move_id":116},{"level":29,"move_id":36},{"level":31,"move_id":133},{"level":35,"move_id":89},{"level":41,"move_id":53},{"level":49,"move_id":38}],"rom_address":3308078},"rom_address":3297980,"tmhm_learnset":"00A21E748E110620","types":[10,4]},{"abilities":[40,0],"base_stats":[70,100,70,40,105,75],"catch_rate":150,"evolutions":[],"friendship":70,"id":340,"learnset":{"moves":[{"level":1,"move_id":45},{"level":1,"move_id":33},{"level":1,"move_id":52},{"level":1,"move_id":222},{"level":11,"move_id":52},{"level":19,"move_id":222},{"level":25,"move_id":116},{"level":29,"move_id":36},{"level":31,"move_id":133},{"level":33,"move_id":157},{"level":37,"move_id":89},{"level":45,"move_id":284},{"level":55,"move_id":90}],"rom_address":3308104},"rom_address":3298008,"tmhm_learnset":"00A21E748E114630","types":[10,4]},{"abilities":[47,0],"base_stats":[70,40,50,25,55,50],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":32,"species":342}],"friendship":70,"id":341,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":181},{"level":1,"move_id":45},{"level":1,"move_id":55},{"level":7,"move_id":227},{"level":13,"move_id":301},{"level":19,"move_id":34},{"level":25,"move_id":62},{"level":31,"move_id":258},{"level":37,"move_id":156},{"level":37,"move_id":173},{"level":43,"move_id":59},{"level":49,"move_id":329}],"rom_address":3308132},"rom_address":3298036,"tmhm_learnset":"03B01E4086533264","types":[15,11]},{"abilities":[47,0],"base_stats":[90,60,70,45,75,70],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":44,"species":343}],"friendship":70,"id":342,"learnset":{"moves":[{"level":1,"move_id":181},{"level":1,"move_id":45},{"level":1,"move_id":55},{"level":1,"move_id":227},{"level":7,"move_id":227},{"level":13,"move_id":301},{"level":19,"move_id":34},{"level":25,"move_id":62},{"level":31,"move_id":258},{"level":39,"move_id":156},{"level":39,"move_id":173},{"level":47,"move_id":59},{"level":55,"move_id":329}],"rom_address":3308160},"rom_address":3298064,"tmhm_learnset":"03B01E4086533274","types":[15,11]},{"abilities":[47,0],"base_stats":[110,80,90,65,95,90],"catch_rate":45,"evolutions":[],"friendship":70,"id":343,"learnset":{"moves":[{"level":1,"move_id":181},{"level":1,"move_id":45},{"level":1,"move_id":55},{"level":1,"move_id":227},{"level":7,"move_id":227},{"level":13,"move_id":301},{"level":19,"move_id":34},{"level":25,"move_id":62},{"level":31,"move_id":258},{"level":39,"move_id":156},{"level":39,"move_id":173},{"level":50,"move_id":59},{"level":61,"move_id":329}],"rom_address":3308188},"rom_address":3298092,"tmhm_learnset":"03B01E4086537274","types":[15,11]},{"abilities":[8,0],"base_stats":[50,85,40,35,85,40],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":32,"species":345}],"friendship":35,"id":344,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":40},{"level":1,"move_id":43},{"level":5,"move_id":71},{"level":9,"move_id":74},{"level":13,"move_id":73},{"level":17,"move_id":28},{"level":21,"move_id":42},{"level":25,"move_id":275},{"level":29,"move_id":185},{"level":33,"move_id":191},{"level":37,"move_id":302},{"level":41,"move_id":178},{"level":45,"move_id":201}],"rom_address":3308216},"rom_address":3298120,"tmhm_learnset":"00441E1084350721","types":[12,12]},{"abilities":[8,0],"base_stats":[70,115,60,55,115,60],"catch_rate":60,"evolutions":[],"friendship":35,"id":345,"learnset":{"moves":[{"level":1,"move_id":40},{"level":1,"move_id":43},{"level":1,"move_id":71},{"level":1,"move_id":74},{"level":5,"move_id":71},{"level":9,"move_id":74},{"level":13,"move_id":73},{"level":17,"move_id":28},{"level":21,"move_id":42},{"level":25,"move_id":275},{"level":29,"move_id":185},{"level":35,"move_id":191},{"level":41,"move_id":302},{"level":47,"move_id":178},{"level":53,"move_id":201}],"rom_address":3308248},"rom_address":3298148,"tmhm_learnset":"00641E1084354721","types":[12,17]},{"abilities":[39,0],"base_stats":[50,50,50,50,50,50],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":42,"species":347}],"friendship":70,"id":346,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":181},{"level":1,"move_id":43},{"level":7,"move_id":104},{"level":10,"move_id":44},{"level":16,"move_id":196},{"level":19,"move_id":29},{"level":25,"move_id":182},{"level":28,"move_id":242},{"level":34,"move_id":58},{"level":37,"move_id":258},{"level":43,"move_id":59}],"rom_address":3308280},"rom_address":3298176,"tmhm_learnset":"00401E00A41BB264","types":[15,15]},{"abilities":[39,0],"base_stats":[80,80,80,80,80,80],"catch_rate":75,"evolutions":[],"friendship":70,"id":347,"learnset":{"moves":[{"level":1,"move_id":181},{"level":1,"move_id":43},{"level":1,"move_id":104},{"level":1,"move_id":44},{"level":7,"move_id":104},{"level":10,"move_id":44},{"level":16,"move_id":196},{"level":19,"move_id":29},{"level":25,"move_id":182},{"level":28,"move_id":242},{"level":34,"move_id":58},{"level":42,"move_id":258},{"level":53,"move_id":59},{"level":61,"move_id":329}],"rom_address":3308308},"rom_address":3298204,"tmhm_learnset":"00401F00A61BFA64","types":[15,15]},{"abilities":[26,0],"base_stats":[70,55,65,70,95,85],"catch_rate":45,"evolutions":[],"friendship":70,"id":348,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":7,"move_id":93},{"level":13,"move_id":88},{"level":19,"move_id":95},{"level":25,"move_id":149},{"level":31,"move_id":322},{"level":37,"move_id":94},{"level":43,"move_id":248},{"level":49,"move_id":153}],"rom_address":3308338},"rom_address":3298232,"tmhm_learnset":"00408E51B61BD228","types":[5,14]},{"abilities":[26,0],"base_stats":[70,95,85,70,55,65],"catch_rate":45,"evolutions":[],"friendship":70,"id":349,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":7,"move_id":93},{"level":13,"move_id":88},{"level":19,"move_id":83},{"level":25,"move_id":149},{"level":31,"move_id":322},{"level":37,"move_id":157},{"level":43,"move_id":76},{"level":49,"move_id":153}],"rom_address":3308364},"rom_address":3298260,"tmhm_learnset":"00428E75B639C628","types":[5,14]},{"abilities":[47,37],"base_stats":[50,20,40,20,20,40],"catch_rate":150,"evolutions":[{"method":"FRIENDSHIP","param":0,"species":183}],"friendship":70,"id":350,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":145},{"level":1,"move_id":150},{"level":3,"move_id":204},{"level":6,"move_id":39},{"level":10,"move_id":145},{"level":15,"move_id":21},{"level":21,"move_id":55}],"rom_address":3308390},"rom_address":3298288,"tmhm_learnset":"01101E0084533264","types":[0,0]},{"abilities":[47,20],"base_stats":[60,25,35,60,70,80],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":32,"species":352}],"friendship":70,"id":351,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":149},{"level":1,"move_id":150},{"level":7,"move_id":149},{"level":10,"move_id":316},{"level":16,"move_id":60},{"level":19,"move_id":244},{"level":25,"move_id":109},{"level":28,"move_id":277},{"level":34,"move_id":94},{"level":37,"move_id":156},{"level":37,"move_id":173},{"level":43,"move_id":340}],"rom_address":3308410},"rom_address":3298316,"tmhm_learnset":"0041BF03B4538E28","types":[14,14]},{"abilities":[47,20],"base_stats":[80,45,65,80,90,110],"catch_rate":60,"evolutions":[],"friendship":70,"id":352,"learnset":{"moves":[{"level":1,"move_id":150},{"level":1,"move_id":149},{"level":1,"move_id":316},{"level":1,"move_id":60},{"level":7,"move_id":149},{"level":10,"move_id":316},{"level":16,"move_id":60},{"level":19,"move_id":244},{"level":25,"move_id":109},{"level":28,"move_id":277},{"level":37,"move_id":94},{"level":43,"move_id":156},{"level":43,"move_id":173},{"level":55,"move_id":340}],"rom_address":3308440},"rom_address":3298344,"tmhm_learnset":"0041BF03B453CE29","types":[14,14]},{"abilities":[57,0],"base_stats":[60,50,40,95,85,75],"catch_rate":200,"evolutions":[],"friendship":70,"id":353,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":98},{"level":1,"move_id":45},{"level":4,"move_id":86},{"level":10,"move_id":98},{"level":13,"move_id":270},{"level":19,"move_id":209},{"level":22,"move_id":227},{"level":28,"move_id":313},{"level":31,"move_id":268},{"level":37,"move_id":87},{"level":40,"move_id":226},{"level":47,"move_id":97}],"rom_address":3308470},"rom_address":3298372,"tmhm_learnset":"00401E0285D38220","types":[13,13]},{"abilities":[58,0],"base_stats":[60,40,50,95,75,85],"catch_rate":200,"evolutions":[],"friendship":70,"id":354,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":98},{"level":1,"move_id":45},{"level":4,"move_id":86},{"level":10,"move_id":98},{"level":13,"move_id":270},{"level":19,"move_id":209},{"level":22,"move_id":227},{"level":28,"move_id":204},{"level":31,"move_id":268},{"level":37,"move_id":87},{"level":40,"move_id":226},{"level":47,"move_id":97}],"rom_address":3308500},"rom_address":3298400,"tmhm_learnset":"00401E0285D38220","types":[13,13]},{"abilities":[52,22],"base_stats":[50,85,85,50,55,55],"catch_rate":45,"evolutions":[],"friendship":70,"id":355,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":310},{"level":6,"move_id":313},{"level":11,"move_id":44},{"level":16,"move_id":230},{"level":21,"move_id":11},{"level":26,"move_id":185},{"level":31,"move_id":226},{"level":36,"move_id":242},{"level":41,"move_id":334},{"level":46,"move_id":254},{"level":46,"move_id":256},{"level":46,"move_id":255}],"rom_address":3308530},"rom_address":3298428,"tmhm_learnset":"00A01F7CC4335E21","types":[8,8]},{"abilities":[74,0],"base_stats":[30,40,55,60,40,55],"catch_rate":180,"evolutions":[{"method":"LEVEL","param":37,"species":357}],"friendship":70,"id":356,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":117},{"level":4,"move_id":96},{"level":9,"move_id":93},{"level":12,"move_id":197},{"level":18,"move_id":237},{"level":22,"move_id":170},{"level":28,"move_id":347},{"level":32,"move_id":136},{"level":38,"move_id":244},{"level":42,"move_id":179},{"level":48,"move_id":105}],"rom_address":3308562},"rom_address":3298456,"tmhm_learnset":"00E01E41F41386A9","types":[1,14]},{"abilities":[74,0],"base_stats":[60,60,75,80,60,75],"catch_rate":90,"evolutions":[],"friendship":70,"id":357,"learnset":{"moves":[{"level":1,"move_id":7},{"level":1,"move_id":9},{"level":1,"move_id":8},{"level":1,"move_id":117},{"level":1,"move_id":96},{"level":1,"move_id":93},{"level":1,"move_id":197},{"level":4,"move_id":96},{"level":9,"move_id":93},{"level":12,"move_id":197},{"level":18,"move_id":237},{"level":22,"move_id":170},{"level":28,"move_id":347},{"level":32,"move_id":136},{"level":40,"move_id":244},{"level":46,"move_id":179},{"level":54,"move_id":105}],"rom_address":3308592},"rom_address":3298484,"tmhm_learnset":"00E01E41F413C6A9","types":[1,14]},{"abilities":[30,0],"base_stats":[45,40,60,50,40,75],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":35,"species":359}],"friendship":70,"id":358,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":8,"move_id":310},{"level":11,"move_id":47},{"level":18,"move_id":31},{"level":21,"move_id":219},{"level":28,"move_id":54},{"level":31,"move_id":36},{"level":38,"move_id":119},{"level":41,"move_id":287},{"level":48,"move_id":195}],"rom_address":3308628},"rom_address":3298512,"tmhm_learnset":"00087E80843B1620","types":[0,2]},{"abilities":[30,0],"base_stats":[75,70,90,80,70,105],"catch_rate":45,"evolutions":[],"friendship":70,"id":359,"learnset":{"moves":[{"level":1,"move_id":64},{"level":1,"move_id":45},{"level":1,"move_id":310},{"level":1,"move_id":47},{"level":8,"move_id":310},{"level":11,"move_id":47},{"level":18,"move_id":31},{"level":21,"move_id":219},{"level":28,"move_id":54},{"level":31,"move_id":36},{"level":35,"move_id":225},{"level":40,"move_id":349},{"level":45,"move_id":287},{"level":54,"move_id":195},{"level":59,"move_id":143}],"rom_address":3308656},"rom_address":3298540,"tmhm_learnset":"00887EA4867B5632","types":[16,2]},{"abilities":[23,0],"base_stats":[95,23,48,23,23,48],"catch_rate":125,"evolutions":[{"method":"LEVEL","param":15,"species":202}],"friendship":70,"id":360,"learnset":{"moves":[{"level":1,"move_id":68},{"level":1,"move_id":150},{"level":1,"move_id":204},{"level":1,"move_id":227},{"level":15,"move_id":68},{"level":15,"move_id":243},{"level":15,"move_id":219},{"level":15,"move_id":194}],"rom_address":3308688},"rom_address":3298568,"tmhm_learnset":"0000000000000000","types":[14,14]},{"abilities":[26,0],"base_stats":[20,40,90,25,30,90],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":37,"species":362}],"friendship":35,"id":361,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":101},{"level":5,"move_id":50},{"level":12,"move_id":193},{"level":16,"move_id":310},{"level":23,"move_id":109},{"level":27,"move_id":228},{"level":34,"move_id":174},{"level":38,"move_id":261},{"level":45,"move_id":212},{"level":49,"move_id":248}],"rom_address":3308706},"rom_address":3298596,"tmhm_learnset":"0041BF00B4133E28","types":[7,7]},{"abilities":[46,0],"base_stats":[40,70,130,25,60,130],"catch_rate":90,"evolutions":[],"friendship":35,"id":362,"learnset":{"moves":[{"level":1,"move_id":20},{"level":1,"move_id":43},{"level":1,"move_id":101},{"level":1,"move_id":50},{"level":5,"move_id":50},{"level":12,"move_id":193},{"level":16,"move_id":310},{"level":23,"move_id":109},{"level":27,"move_id":228},{"level":34,"move_id":174},{"level":37,"move_id":325},{"level":41,"move_id":261},{"level":51,"move_id":212},{"level":58,"move_id":248}],"rom_address":3308734},"rom_address":3298624,"tmhm_learnset":"00E1BF40B6137E29","types":[7,7]},{"abilities":[30,38],"base_stats":[50,60,45,65,100,80],"catch_rate":150,"evolutions":[],"friendship":70,"id":363,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":71},{"level":5,"move_id":74},{"level":9,"move_id":40},{"level":13,"move_id":78},{"level":17,"move_id":72},{"level":21,"move_id":73},{"level":25,"move_id":345},{"level":29,"move_id":320},{"level":33,"move_id":202},{"level":37,"move_id":230},{"level":41,"move_id":275},{"level":45,"move_id":92},{"level":49,"move_id":80},{"level":53,"move_id":312},{"level":57,"move_id":235}],"rom_address":3308764},"rom_address":3298652,"tmhm_learnset":"00441E08A4350720","types":[12,3]},{"abilities":[54,0],"base_stats":[60,60,60,30,35,35],"catch_rate":255,"evolutions":[{"method":"LEVEL","param":18,"species":365}],"friendship":70,"id":364,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":1,"move_id":281},{"level":7,"move_id":227},{"level":13,"move_id":303},{"level":19,"move_id":185},{"level":25,"move_id":133},{"level":31,"move_id":343},{"level":37,"move_id":68},{"level":43,"move_id":175}],"rom_address":3308802},"rom_address":3298680,"tmhm_learnset":"00A41EA6E5B336A5","types":[0,0]},{"abilities":[72,0],"base_stats":[80,80,80,90,55,55],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":36,"species":366}],"friendship":70,"id":365,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":116},{"level":1,"move_id":227},{"level":1,"move_id":253},{"level":7,"move_id":227},{"level":13,"move_id":253},{"level":19,"move_id":154},{"level":25,"move_id":203},{"level":31,"move_id":163},{"level":37,"move_id":68},{"level":43,"move_id":264},{"level":49,"move_id":179}],"rom_address":3308826},"rom_address":3298708,"tmhm_learnset":"00A41EA6E7B33EB5","types":[0,0]},{"abilities":[54,0],"base_stats":[150,160,100,100,95,65],"catch_rate":45,"evolutions":[],"friendship":70,"id":366,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":281},{"level":1,"move_id":227},{"level":1,"move_id":303},{"level":7,"move_id":227},{"level":13,"move_id":303},{"level":19,"move_id":185},{"level":25,"move_id":133},{"level":31,"move_id":343},{"level":36,"move_id":207},{"level":37,"move_id":68},{"level":43,"move_id":175}],"rom_address":3308852},"rom_address":3298736,"tmhm_learnset":"00A41EA6E7B37EB5","types":[0,0]},{"abilities":[64,60],"base_stats":[70,43,53,40,43,53],"catch_rate":225,"evolutions":[{"method":"LEVEL","param":26,"species":368}],"friendship":70,"id":367,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":6,"move_id":281},{"level":9,"move_id":139},{"level":14,"move_id":124},{"level":17,"move_id":133},{"level":23,"move_id":227},{"level":28,"move_id":92},{"level":34,"move_id":254},{"level":34,"move_id":255},{"level":34,"move_id":256},{"level":39,"move_id":188}],"rom_address":3308878},"rom_address":3298764,"tmhm_learnset":"00A11E0AA4371724","types":[3,3]},{"abilities":[64,60],"base_stats":[100,73,83,55,73,83],"catch_rate":75,"evolutions":[],"friendship":70,"id":368,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":281},{"level":1,"move_id":139},{"level":1,"move_id":124},{"level":6,"move_id":281},{"level":9,"move_id":139},{"level":14,"move_id":124},{"level":17,"move_id":133},{"level":23,"move_id":227},{"level":26,"move_id":34},{"level":31,"move_id":92},{"level":40,"move_id":254},{"level":40,"move_id":255},{"level":40,"move_id":256},{"level":48,"move_id":188}],"rom_address":3308908},"rom_address":3298792,"tmhm_learnset":"00A11E0AA4375724","types":[3,3]},{"abilities":[34,0],"base_stats":[99,68,83,51,72,87],"catch_rate":200,"evolutions":[],"friendship":70,"id":369,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":16},{"level":7,"move_id":74},{"level":11,"move_id":75},{"level":17,"move_id":23},{"level":21,"move_id":230},{"level":27,"move_id":18},{"level":31,"move_id":345},{"level":37,"move_id":34},{"level":41,"move_id":76},{"level":47,"move_id":235}],"rom_address":3308940},"rom_address":3298820,"tmhm_learnset":"00EC5E80863D4730","types":[12,2]},{"abilities":[43,0],"base_stats":[64,51,23,28,51,23],"catch_rate":190,"evolutions":[{"method":"LEVEL","param":20,"species":371}],"friendship":70,"id":370,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":1},{"level":5,"move_id":253},{"level":11,"move_id":310},{"level":15,"move_id":336},{"level":21,"move_id":48},{"level":25,"move_id":23},{"level":31,"move_id":103},{"level":35,"move_id":46},{"level":41,"move_id":156},{"level":41,"move_id":214},{"level":45,"move_id":304}],"rom_address":3308968},"rom_address":3298848,"tmhm_learnset":"00001E26A4333634","types":[0,0]},{"abilities":[43,0],"base_stats":[84,71,43,48,71,43],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":40,"species":372}],"friendship":70,"id":371,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":253},{"level":1,"move_id":310},{"level":1,"move_id":336},{"level":5,"move_id":253},{"level":11,"move_id":310},{"level":15,"move_id":336},{"level":23,"move_id":48},{"level":29,"move_id":23},{"level":37,"move_id":103},{"level":43,"move_id":46},{"level":51,"move_id":156},{"level":51,"move_id":214},{"level":57,"move_id":304}],"rom_address":3308998},"rom_address":3298876,"tmhm_learnset":"00A21F26E6333E34","types":[0,0]},{"abilities":[43,0],"base_stats":[104,91,63,68,91,63],"catch_rate":45,"evolutions":[],"friendship":70,"id":372,"learnset":{"moves":[{"level":1,"move_id":1},{"level":1,"move_id":253},{"level":1,"move_id":310},{"level":1,"move_id":336},{"level":5,"move_id":253},{"level":11,"move_id":310},{"level":15,"move_id":336},{"level":23,"move_id":48},{"level":29,"move_id":23},{"level":37,"move_id":103},{"level":40,"move_id":63},{"level":45,"move_id":46},{"level":55,"move_id":156},{"level":55,"move_id":214},{"level":63,"move_id":304}],"rom_address":3309028},"rom_address":3298904,"tmhm_learnset":"00A21F26E6337E34","types":[0,0]},{"abilities":[75,0],"base_stats":[35,64,85,32,74,55],"catch_rate":255,"evolutions":[{"method":"ITEM","param":192,"species":374},{"method":"ITEM","param":193,"species":375}],"friendship":70,"id":373,"learnset":{"moves":[{"level":1,"move_id":128},{"level":1,"move_id":55},{"level":1,"move_id":250},{"level":1,"move_id":334}],"rom_address":3309060},"rom_address":3298932,"tmhm_learnset":"03101E0084133264","types":[11,11]},{"abilities":[33,0],"base_stats":[55,104,105,52,94,75],"catch_rate":60,"evolutions":[],"friendship":70,"id":374,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":250},{"level":8,"move_id":44},{"level":15,"move_id":103},{"level":22,"move_id":352},{"level":29,"move_id":184},{"level":36,"move_id":242},{"level":43,"move_id":226},{"level":50,"move_id":56}],"rom_address":3309070},"rom_address":3298960,"tmhm_learnset":"03111E4084137264","types":[11,11]},{"abilities":[33,0],"base_stats":[55,84,105,52,114,75],"catch_rate":60,"evolutions":[],"friendship":70,"id":375,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":250},{"level":8,"move_id":93},{"level":15,"move_id":97},{"level":22,"move_id":352},{"level":29,"move_id":133},{"level":36,"move_id":94},{"level":43,"move_id":226},{"level":50,"move_id":56}],"rom_address":3309094},"rom_address":3298988,"tmhm_learnset":"03101E00B41B7264","types":[11,11]},{"abilities":[46,0],"base_stats":[65,130,60,75,75,60],"catch_rate":30,"evolutions":[],"friendship":35,"id":376,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":5,"move_id":43},{"level":9,"move_id":269},{"level":13,"move_id":98},{"level":17,"move_id":13},{"level":21,"move_id":44},{"level":26,"move_id":14},{"level":31,"move_id":104},{"level":36,"move_id":163},{"level":41,"move_id":248},{"level":46,"move_id":195}],"rom_address":3309118},"rom_address":3299016,"tmhm_learnset":"00E53FB6A5D37E6C","types":[17,17]},{"abilities":[15,0],"base_stats":[44,75,35,45,63,33],"catch_rate":225,"evolutions":[{"method":"LEVEL","param":37,"species":378}],"friendship":35,"id":377,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":282},{"level":8,"move_id":103},{"level":13,"move_id":101},{"level":20,"move_id":174},{"level":25,"move_id":180},{"level":32,"move_id":261},{"level":37,"move_id":185},{"level":44,"move_id":247},{"level":49,"move_id":289},{"level":56,"move_id":288}],"rom_address":3309148},"rom_address":3299044,"tmhm_learnset":"0041BF02B5930E28","types":[7,7]},{"abilities":[15,0],"base_stats":[64,115,65,65,83,63],"catch_rate":45,"evolutions":[],"friendship":35,"id":378,"learnset":{"moves":[{"level":1,"move_id":282},{"level":1,"move_id":103},{"level":1,"move_id":101},{"level":1,"move_id":174},{"level":8,"move_id":103},{"level":13,"move_id":101},{"level":20,"move_id":174},{"level":25,"move_id":180},{"level":32,"move_id":261},{"level":39,"move_id":185},{"level":48,"move_id":247},{"level":55,"move_id":289},{"level":64,"move_id":288}],"rom_address":3309176},"rom_address":3299072,"tmhm_learnset":"0041BF02B5934E28","types":[7,7]},{"abilities":[61,0],"base_stats":[73,100,60,65,100,60],"catch_rate":90,"evolutions":[],"friendship":70,"id":379,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":35},{"level":7,"move_id":122},{"level":10,"move_id":44},{"level":16,"move_id":342},{"level":19,"move_id":103},{"level":25,"move_id":137},{"level":28,"move_id":242},{"level":34,"move_id":305},{"level":37,"move_id":207},{"level":43,"move_id":114}],"rom_address":3309204},"rom_address":3299100,"tmhm_learnset":"00A13E0C8E570E20","types":[3,3]},{"abilities":[17,0],"base_stats":[73,115,60,90,60,60],"catch_rate":90,"evolutions":[],"friendship":70,"id":380,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":4,"move_id":43},{"level":7,"move_id":98},{"level":10,"move_id":14},{"level":13,"move_id":210},{"level":19,"move_id":163},{"level":25,"move_id":228},{"level":31,"move_id":306},{"level":37,"move_id":269},{"level":46,"move_id":197},{"level":55,"move_id":206}],"rom_address":3309232},"rom_address":3299128,"tmhm_learnset":"00A03EA6EDF73E35","types":[0,0]},{"abilities":[33,69],"base_stats":[100,90,130,55,45,65],"catch_rate":25,"evolutions":[],"friendship":70,"id":381,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":8,"move_id":55},{"level":15,"move_id":317},{"level":22,"move_id":281},{"level":29,"move_id":36},{"level":36,"move_id":300},{"level":43,"move_id":246},{"level":50,"move_id":156},{"level":57,"move_id":38},{"level":64,"move_id":56}],"rom_address":3309262},"rom_address":3299156,"tmhm_learnset":"03901E50861B726C","types":[11,5]},{"abilities":[5,69],"base_stats":[50,70,100,30,40,40],"catch_rate":180,"evolutions":[{"method":"LEVEL","param":32,"species":383}],"friendship":35,"id":382,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":4,"move_id":106},{"level":7,"move_id":189},{"level":10,"move_id":29},{"level":13,"move_id":232},{"level":17,"move_id":334},{"level":21,"move_id":46},{"level":25,"move_id":36},{"level":29,"move_id":231},{"level":34,"move_id":182},{"level":39,"move_id":319},{"level":44,"move_id":38}],"rom_address":3309290},"rom_address":3299184,"tmhm_learnset":"00A41ED28E530634","types":[8,5]},{"abilities":[5,69],"base_stats":[60,90,140,40,50,50],"catch_rate":90,"evolutions":[{"method":"LEVEL","param":42,"species":384}],"friendship":35,"id":383,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":1,"move_id":189},{"level":1,"move_id":29},{"level":4,"move_id":106},{"level":7,"move_id":189},{"level":10,"move_id":29},{"level":13,"move_id":232},{"level":17,"move_id":334},{"level":21,"move_id":46},{"level":25,"move_id":36},{"level":29,"move_id":231},{"level":37,"move_id":182},{"level":45,"move_id":319},{"level":53,"move_id":38}],"rom_address":3309322},"rom_address":3299212,"tmhm_learnset":"00A41ED28E530634","types":[8,5]},{"abilities":[5,69],"base_stats":[70,110,180,50,60,60],"catch_rate":45,"evolutions":[],"friendship":35,"id":384,"learnset":{"moves":[{"level":1,"move_id":33},{"level":1,"move_id":106},{"level":1,"move_id":189},{"level":1,"move_id":29},{"level":4,"move_id":106},{"level":7,"move_id":189},{"level":10,"move_id":29},{"level":13,"move_id":232},{"level":17,"move_id":334},{"level":21,"move_id":46},{"level":25,"move_id":36},{"level":29,"move_id":231},{"level":37,"move_id":182},{"level":50,"move_id":319},{"level":63,"move_id":38}],"rom_address":3309354},"rom_address":3299240,"tmhm_learnset":"00B41EF6CFF37E37","types":[8,5]},{"abilities":[59,0],"base_stats":[70,70,70,70,70,70],"catch_rate":45,"evolutions":[],"friendship":70,"id":385,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":10,"move_id":55},{"level":10,"move_id":52},{"level":10,"move_id":181},{"level":20,"move_id":240},{"level":20,"move_id":241},{"level":20,"move_id":258},{"level":30,"move_id":311}],"rom_address":3309386},"rom_address":3299268,"tmhm_learnset":"00403E36A5B33664","types":[0,0]},{"abilities":[35,68],"base_stats":[65,73,55,85,47,75],"catch_rate":150,"evolutions":[],"friendship":70,"id":386,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":5,"move_id":109},{"level":9,"move_id":104},{"level":13,"move_id":236},{"level":17,"move_id":98},{"level":21,"move_id":294},{"level":25,"move_id":324},{"level":29,"move_id":182},{"level":33,"move_id":270},{"level":37,"move_id":38}],"rom_address":3309410},"rom_address":3299296,"tmhm_learnset":"00403E82E5B78625","types":[6,6]},{"abilities":[12,0],"base_stats":[65,47,55,85,73,75],"catch_rate":150,"evolutions":[],"friendship":70,"id":387,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":33},{"level":5,"move_id":230},{"level":9,"move_id":204},{"level":13,"move_id":236},{"level":17,"move_id":98},{"level":21,"move_id":273},{"level":25,"move_id":227},{"level":29,"move_id":260},{"level":33,"move_id":270},{"level":37,"move_id":343}],"rom_address":3309438},"rom_address":3299324,"tmhm_learnset":"00403E82E5B78625","types":[6,6]},{"abilities":[21,0],"base_stats":[66,41,77,23,61,87],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":40,"species":389}],"friendship":70,"id":388,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":310},{"level":8,"move_id":132},{"level":15,"move_id":51},{"level":22,"move_id":275},{"level":29,"move_id":109},{"level":36,"move_id":133},{"level":43,"move_id":246},{"level":50,"move_id":254},{"level":50,"move_id":255},{"level":50,"move_id":256}],"rom_address":3309466},"rom_address":3299352,"tmhm_learnset":"00001E1884350720","types":[5,12]},{"abilities":[21,0],"base_stats":[86,81,97,43,81,107],"catch_rate":45,"evolutions":[],"friendship":70,"id":389,"learnset":{"moves":[{"level":1,"move_id":310},{"level":1,"move_id":132},{"level":1,"move_id":51},{"level":1,"move_id":275},{"level":8,"move_id":132},{"level":15,"move_id":51},{"level":22,"move_id":275},{"level":29,"move_id":109},{"level":36,"move_id":133},{"level":48,"move_id":246},{"level":60,"move_id":254},{"level":60,"move_id":255},{"level":60,"move_id":256}],"rom_address":3309494},"rom_address":3299380,"tmhm_learnset":"00A01E5886354720","types":[5,12]},{"abilities":[4,0],"base_stats":[45,95,50,75,40,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":40,"species":391}],"friendship":70,"id":390,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":10},{"level":7,"move_id":106},{"level":13,"move_id":300},{"level":19,"move_id":55},{"level":25,"move_id":232},{"level":31,"move_id":182},{"level":37,"move_id":246},{"level":43,"move_id":210},{"level":49,"move_id":163},{"level":55,"move_id":350}],"rom_address":3309522},"rom_address":3299408,"tmhm_learnset":"00841ED0CC110624","types":[5,6]},{"abilities":[4,0],"base_stats":[75,125,100,45,70,80],"catch_rate":45,"evolutions":[],"friendship":70,"id":391,"learnset":{"moves":[{"level":1,"move_id":10},{"level":1,"move_id":106},{"level":1,"move_id":300},{"level":1,"move_id":55},{"level":7,"move_id":106},{"level":13,"move_id":300},{"level":19,"move_id":55},{"level":25,"move_id":232},{"level":31,"move_id":182},{"level":37,"move_id":246},{"level":46,"move_id":210},{"level":55,"move_id":163},{"level":64,"move_id":350}],"rom_address":3309550},"rom_address":3299436,"tmhm_learnset":"00A41ED0CE514624","types":[5,6]},{"abilities":[28,36],"base_stats":[28,25,25,40,45,35],"catch_rate":235,"evolutions":[{"method":"LEVEL","param":20,"species":393}],"friendship":35,"id":392,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":93},{"level":1,"move_id":45},{"level":6,"move_id":93},{"level":11,"move_id":104},{"level":16,"move_id":100},{"level":21,"move_id":347},{"level":26,"move_id":94},{"level":31,"move_id":286},{"level":36,"move_id":248},{"level":41,"move_id":95},{"level":46,"move_id":138}],"rom_address":3309578},"rom_address":3299464,"tmhm_learnset":"0041BF03B49B8E28","types":[14,14]},{"abilities":[28,36],"base_stats":[38,35,35,50,65,55],"catch_rate":120,"evolutions":[{"method":"LEVEL","param":30,"species":394}],"friendship":35,"id":393,"learnset":{"moves":[{"level":1,"move_id":45},{"level":1,"move_id":93},{"level":1,"move_id":104},{"level":1,"move_id":100},{"level":6,"move_id":93},{"level":11,"move_id":104},{"level":16,"move_id":100},{"level":21,"move_id":347},{"level":26,"move_id":94},{"level":33,"move_id":286},{"level":40,"move_id":248},{"level":47,"move_id":95},{"level":54,"move_id":138}],"rom_address":3309606},"rom_address":3299492,"tmhm_learnset":"0041BF03B49B8E28","types":[14,14]},{"abilities":[28,36],"base_stats":[68,65,65,80,125,115],"catch_rate":45,"evolutions":[],"friendship":35,"id":394,"learnset":{"moves":[{"level":1,"move_id":45},{"level":1,"move_id":93},{"level":1,"move_id":104},{"level":1,"move_id":100},{"level":6,"move_id":93},{"level":11,"move_id":104},{"level":16,"move_id":100},{"level":21,"move_id":347},{"level":26,"move_id":94},{"level":33,"move_id":286},{"level":42,"move_id":248},{"level":51,"move_id":95},{"level":60,"move_id":138}],"rom_address":3309634},"rom_address":3299520,"tmhm_learnset":"0041BF03B49BCE28","types":[14,14]},{"abilities":[69,0],"base_stats":[45,75,60,50,40,30],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":30,"species":396}],"friendship":35,"id":395,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":99},{"level":5,"move_id":44},{"level":9,"move_id":43},{"level":17,"move_id":29},{"level":21,"move_id":116},{"level":25,"move_id":52},{"level":33,"move_id":225},{"level":37,"move_id":184},{"level":41,"move_id":242},{"level":49,"move_id":337},{"level":53,"move_id":38}],"rom_address":3309662},"rom_address":3299548,"tmhm_learnset":"00A41EE4C4130632","types":[16,16]},{"abilities":[69,0],"base_stats":[65,95,100,50,60,50],"catch_rate":45,"evolutions":[{"method":"LEVEL","param":50,"species":397}],"friendship":35,"id":396,"learnset":{"moves":[{"level":1,"move_id":99},{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":1,"move_id":29},{"level":5,"move_id":44},{"level":9,"move_id":43},{"level":17,"move_id":29},{"level":21,"move_id":116},{"level":25,"move_id":52},{"level":30,"move_id":182},{"level":38,"move_id":225},{"level":47,"move_id":184},{"level":56,"move_id":242},{"level":69,"move_id":337},{"level":78,"move_id":38}],"rom_address":3309692},"rom_address":3299576,"tmhm_learnset":"00A41EE4C4130632","types":[16,16]},{"abilities":[22,0],"base_stats":[95,135,80,100,110,80],"catch_rate":45,"evolutions":[],"friendship":35,"id":397,"learnset":{"moves":[{"level":1,"move_id":99},{"level":1,"move_id":44},{"level":1,"move_id":43},{"level":1,"move_id":29},{"level":5,"move_id":44},{"level":9,"move_id":43},{"level":17,"move_id":29},{"level":21,"move_id":116},{"level":25,"move_id":52},{"level":30,"move_id":182},{"level":38,"move_id":225},{"level":47,"move_id":184},{"level":50,"move_id":19},{"level":61,"move_id":242},{"level":79,"move_id":337},{"level":93,"move_id":38}],"rom_address":3309724},"rom_address":3299604,"tmhm_learnset":"00AC5EE4C6534632","types":[16,2]},{"abilities":[29,0],"base_stats":[40,55,80,30,35,60],"catch_rate":3,"evolutions":[{"method":"LEVEL","param":20,"species":399}],"friendship":35,"id":398,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":36}],"rom_address":3309758},"rom_address":3299632,"tmhm_learnset":"0000000000000000","types":[8,14]},{"abilities":[29,0],"base_stats":[60,75,100,50,55,80],"catch_rate":3,"evolutions":[{"method":"LEVEL","param":45,"species":400}],"friendship":35,"id":399,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":36},{"level":20,"move_id":93},{"level":20,"move_id":232},{"level":26,"move_id":184},{"level":32,"move_id":228},{"level":38,"move_id":94},{"level":44,"move_id":334},{"level":50,"move_id":309},{"level":56,"move_id":97},{"level":62,"move_id":63}],"rom_address":3309768},"rom_address":3299660,"tmhm_learnset":"00E40ED9F613C620","types":[8,14]},{"abilities":[29,0],"base_stats":[80,135,130,70,95,90],"catch_rate":3,"evolutions":[],"friendship":35,"id":400,"learnset":{"moves":[{"level":1,"move_id":36},{"level":1,"move_id":93},{"level":1,"move_id":232},{"level":1,"move_id":184},{"level":20,"move_id":93},{"level":20,"move_id":232},{"level":26,"move_id":184},{"level":32,"move_id":228},{"level":38,"move_id":94},{"level":44,"move_id":334},{"level":55,"move_id":309},{"level":66,"move_id":97},{"level":77,"move_id":63}],"rom_address":3309796},"rom_address":3299688,"tmhm_learnset":"00E40ED9F613C620","types":[8,14]},{"abilities":[29,0],"base_stats":[80,100,200,50,50,100],"catch_rate":3,"evolutions":[],"friendship":35,"id":401,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":88},{"level":1,"move_id":153},{"level":9,"move_id":88},{"level":17,"move_id":174},{"level":25,"move_id":276},{"level":33,"move_id":246},{"level":41,"move_id":334},{"level":49,"move_id":192},{"level":57,"move_id":199},{"level":65,"move_id":63}],"rom_address":3309824},"rom_address":3299716,"tmhm_learnset":"00A00E52CF994621","types":[5,5]},{"abilities":[29,0],"base_stats":[80,50,100,50,100,200],"catch_rate":3,"evolutions":[],"friendship":35,"id":402,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":196},{"level":1,"move_id":153},{"level":9,"move_id":196},{"level":17,"move_id":174},{"level":25,"move_id":276},{"level":33,"move_id":246},{"level":41,"move_id":133},{"level":49,"move_id":192},{"level":57,"move_id":199},{"level":65,"move_id":63}],"rom_address":3309850},"rom_address":3299744,"tmhm_learnset":"00A00E02C79B7261","types":[15,15]},{"abilities":[29,0],"base_stats":[80,75,150,50,75,150],"catch_rate":3,"evolutions":[],"friendship":35,"id":403,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":232},{"level":1,"move_id":153},{"level":9,"move_id":232},{"level":17,"move_id":174},{"level":25,"move_id":276},{"level":33,"move_id":246},{"level":41,"move_id":334},{"level":41,"move_id":133},{"level":49,"move_id":192},{"level":57,"move_id":199},{"level":65,"move_id":63}],"rom_address":3309876},"rom_address":3299772,"tmhm_learnset":"00A00ED2C79B4621","types":[8,8]},{"abilities":[2,0],"base_stats":[100,100,90,90,150,140],"catch_rate":5,"evolutions":[],"friendship":0,"id":404,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":352},{"level":5,"move_id":184},{"level":15,"move_id":246},{"level":20,"move_id":34},{"level":30,"move_id":347},{"level":35,"move_id":58},{"level":45,"move_id":56},{"level":50,"move_id":156},{"level":60,"move_id":329},{"level":65,"move_id":38},{"level":75,"move_id":323}],"rom_address":3309904},"rom_address":3299800,"tmhm_learnset":"03B00E42C79B727C","types":[11,11]},{"abilities":[70,0],"base_stats":[100,150,140,90,100,90],"catch_rate":5,"evolutions":[],"friendship":0,"id":405,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":341},{"level":5,"move_id":184},{"level":15,"move_id":246},{"level":20,"move_id":163},{"level":30,"move_id":339},{"level":35,"move_id":89},{"level":45,"move_id":126},{"level":50,"move_id":156},{"level":60,"move_id":90},{"level":65,"move_id":76},{"level":75,"move_id":284}],"rom_address":3309934},"rom_address":3299828,"tmhm_learnset":"00A60EF6CFF946B2","types":[4,4]},{"abilities":[77,0],"base_stats":[105,150,90,95,150,90],"catch_rate":3,"evolutions":[],"friendship":0,"id":406,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":239},{"level":5,"move_id":184},{"level":15,"move_id":246},{"level":20,"move_id":337},{"level":30,"move_id":349},{"level":35,"move_id":242},{"level":45,"move_id":19},{"level":50,"move_id":156},{"level":60,"move_id":245},{"level":65,"move_id":200},{"level":75,"move_id":63}],"rom_address":3309964},"rom_address":3299856,"tmhm_learnset":"03BA0EB6C7F376B6","types":[16,2]},{"abilities":[26,0],"base_stats":[80,80,90,110,110,130],"catch_rate":3,"evolutions":[],"friendship":90,"id":407,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":149},{"level":5,"move_id":273},{"level":10,"move_id":270},{"level":15,"move_id":219},{"level":20,"move_id":225},{"level":25,"move_id":346},{"level":30,"move_id":287},{"level":35,"move_id":296},{"level":40,"move_id":94},{"level":45,"move_id":105},{"level":50,"move_id":204}],"rom_address":3309994},"rom_address":3299884,"tmhm_learnset":"035C5E93B7BBD63E","types":[16,14]},{"abilities":[26,0],"base_stats":[80,90,80,110,130,110],"catch_rate":3,"evolutions":[],"friendship":90,"id":408,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":149},{"level":5,"move_id":262},{"level":10,"move_id":270},{"level":15,"move_id":219},{"level":20,"move_id":225},{"level":25,"move_id":182},{"level":30,"move_id":287},{"level":35,"move_id":295},{"level":40,"move_id":94},{"level":45,"move_id":105},{"level":50,"move_id":349}],"rom_address":3310024},"rom_address":3299912,"tmhm_learnset":"035C5E93B7BBD63E","types":[16,14]},{"abilities":[32,0],"base_stats":[100,100,100,100,100,100],"catch_rate":3,"evolutions":[],"friendship":100,"id":409,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":273},{"level":1,"move_id":93},{"level":5,"move_id":156},{"level":10,"move_id":129},{"level":15,"move_id":270},{"level":20,"move_id":94},{"level":25,"move_id":287},{"level":30,"move_id":156},{"level":35,"move_id":38},{"level":40,"move_id":248},{"level":45,"move_id":322},{"level":50,"move_id":353}],"rom_address":3310054},"rom_address":3299940,"tmhm_learnset":"00408E93B59BC62C","types":[8,14]},{"abilities":[46,0],"base_stats":[50,150,50,150,150,50],"catch_rate":3,"evolutions":[],"friendship":0,"id":410,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":43},{"level":1,"move_id":35},{"level":5,"move_id":101},{"level":10,"move_id":104},{"level":15,"move_id":282},{"level":20,"move_id":228},{"level":25,"move_id":94},{"level":30,"move_id":129},{"level":35,"move_id":97},{"level":40,"move_id":105},{"level":45,"move_id":354},{"level":50,"move_id":245}],"rom_address":3310084},"rom_address":3299968,"tmhm_learnset":"00E58FC3F5BBDE2D","types":[14,14]},{"abilities":[26,0],"base_stats":[65,50,70,65,95,80],"catch_rate":45,"evolutions":[],"friendship":70,"id":411,"learnset":{"moves":[{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":0},{"level":1,"move_id":35},{"level":6,"move_id":45},{"level":9,"move_id":310},{"level":14,"move_id":93},{"level":17,"move_id":36},{"level":22,"move_id":253},{"level":25,"move_id":281},{"level":30,"move_id":149},{"level":33,"move_id":38},{"level":38,"move_id":215},{"level":41,"move_id":219},{"level":46,"move_id":94}],"rom_address":3310114},"rom_address":3299996,"tmhm_learnset":"00419F03B41B8E28","types":[14,14]}],"static_encounters":[{"flag":33,"level":50,"rom_address":2379222,"species":407},{"flag":32,"level":50,"rom_address":2379215,"species":408},{"flag":977,"level":30,"rom_address":2316785,"species":101},{"flag":978,"level":30,"rom_address":2316862,"species":101},{"flag":842,"level":40,"rom_address":2379579,"species":185},{"flag":763,"level":30,"rom_address":2531937,"species":410},{"flag":801,"level":70,"rom_address":2536492,"species":250},{"flag":800,"level":70,"rom_address":2536772,"species":249},{"flag":782,"level":70,"rom_address":2347550,"species":404},{"flag":718,"level":30,"rom_address":2531517,"species":151},{"flag":974,"level":25,"rom_address":2332864,"species":100},{"flag":975,"level":25,"rom_address":2332941,"species":100},{"flag":976,"level":25,"rom_address":2333018,"species":100},{"flag":936,"level":40,"rom_address":2338991,"species":402},{"flag":935,"level":40,"rom_address":2291862,"species":401},{"flag":937,"level":40,"rom_address":2339249,"species":403},{"flag":989,"level":30,"rom_address":2573968,"species":317},{"flag":990,"level":30,"rom_address":2573987,"species":317},{"flag":982,"level":30,"rom_address":2573873,"species":317},{"flag":985,"level":30,"rom_address":2573892,"species":317},{"flag":986,"level":30,"rom_address":2573911,"species":317},{"flag":987,"level":30,"rom_address":2573930,"species":317},{"flag":988,"level":30,"rom_address":2573949,"species":317},{"flag":970,"level":30,"rom_address":2059073,"species":317},{"flag":80,"level":70,"rom_address":2340984,"species":406},{"flag":783,"level":70,"rom_address":2347759,"species":405}],"tmhm_moves":[264,337,352,347,46,92,258,339,331,237,241,269,58,59,63,113,182,240,202,219,218,76,231,85,87,89,216,91,94,247,280,104,115,351,53,188,201,126,317,332,259,263,290,156,213,168,211,285,289,315,15,19,57,70,148,249,127,291],"trainers":[{"battle_script_rom_address":0,"party":[],"party_rom_address":4160749568,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3221820},{"battle_script_rom_address":2298147,"party":[{"level":21,"moves":[0,0,0,0],"species":74}],"party_rom_address":3202872,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3221860},{"battle_script_rom_address":2315511,"party":[{"level":32,"moves":[0,0,0,0],"species":286}],"party_rom_address":3202880,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3221900},{"battle_script_rom_address":2316936,"party":[{"level":31,"moves":[0,0,0,0],"species":41},{"level":31,"moves":[0,0,0,0],"species":330}],"party_rom_address":3202888,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3221940},{"battle_script_rom_address":2316983,"party":[{"level":32,"moves":[0,0,0,0],"species":41}],"party_rom_address":3202904,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3221980},{"battle_script_rom_address":2317996,"party":[{"level":32,"moves":[0,0,0,0],"species":330}],"party_rom_address":3202912,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222020},{"battle_script_rom_address":2320418,"party":[{"level":36,"moves":[0,0,0,0],"species":286}],"party_rom_address":3202920,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222060},{"battle_script_rom_address":2320449,"party":[{"level":36,"moves":[0,0,0,0],"species":330}],"party_rom_address":3202928,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222100},{"battle_script_rom_address":2321650,"party":[{"level":36,"moves":[0,0,0,0],"species":41}],"party_rom_address":3202936,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222140},{"battle_script_rom_address":2307885,"party":[{"level":26,"moves":[0,0,0,0],"species":315},{"level":26,"moves":[0,0,0,0],"species":286},{"level":26,"moves":[0,0,0,0],"species":288},{"level":26,"moves":[0,0,0,0],"species":295},{"level":26,"moves":[0,0,0,0],"species":298},{"level":26,"moves":[0,0,0,0],"species":304}],"party_rom_address":3202944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222180},{"battle_script_rom_address":0,"party":[{"level":9,"moves":[0,0,0,0],"species":286}],"party_rom_address":3202992,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222220},{"battle_script_rom_address":2061615,"party":[{"level":29,"moves":[0,0,0,0],"species":338},{"level":29,"moves":[0,0,0,0],"species":300}],"party_rom_address":3203000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222260},{"battle_script_rom_address":2062556,"party":[{"level":30,"moves":[0,0,0,0],"species":310},{"level":30,"moves":[0,0,0,0],"species":178}],"party_rom_address":3203016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222300},{"battle_script_rom_address":2062587,"party":[{"level":30,"moves":[0,0,0,0],"species":380},{"level":30,"moves":[0,0,0,0],"species":379}],"party_rom_address":3203032,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222340},{"battle_script_rom_address":2321681,"party":[{"level":36,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203048,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222380},{"battle_script_rom_address":2063653,"party":[{"level":34,"moves":[0,0,0,0],"species":130}],"party_rom_address":3203056,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222420},{"battle_script_rom_address":0,"party":[{"level":11,"moves":[0,0,0,0],"species":286}],"party_rom_address":3203064,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222460},{"battle_script_rom_address":2563645,"party":[{"level":27,"moves":[0,0,0,0],"species":41},{"level":27,"moves":[0,0,0,0],"species":286}],"party_rom_address":3203072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222500},{"battle_script_rom_address":2564779,"party":[{"level":27,"moves":[0,0,0,0],"species":286},{"level":27,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203088,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222540},{"battle_script_rom_address":2564810,"party":[{"level":26,"moves":[0,0,0,0],"species":286},{"level":26,"moves":[0,0,0,0],"species":41},{"level":26,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203104,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222580},{"battle_script_rom_address":2151814,"party":[{"level":15,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203128,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222620},{"battle_script_rom_address":2151873,"party":[{"level":14,"moves":[0,0,0,0],"species":41},{"level":14,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203136,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222660},{"battle_script_rom_address":2248406,"party":[{"level":32,"moves":[0,0,0,0],"species":339}],"party_rom_address":3203152,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222700},{"battle_script_rom_address":2311132,"party":[{"level":32,"moves":[0,0,0,0],"species":41}],"party_rom_address":3203160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222740},{"battle_script_rom_address":2311163,"party":[{"level":32,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203168,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222780},{"battle_script_rom_address":2311194,"party":[{"level":30,"moves":[0,0,0,0],"species":286},{"level":30,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222820},{"battle_script_rom_address":2563676,"party":[{"level":28,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203192,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222860},{"battle_script_rom_address":2317024,"party":[{"level":32,"moves":[0,0,0,0],"species":330}],"party_rom_address":3203200,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222900},{"battle_script_rom_address":2318037,"party":[{"level":32,"moves":[0,0,0,0],"species":41}],"party_rom_address":3203208,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222940},{"battle_script_rom_address":2062525,"party":[{"level":30,"moves":[0,0,0,0],"species":335},{"level":30,"moves":[0,0,0,0],"species":67}],"party_rom_address":3203216,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3222980},{"battle_script_rom_address":2317860,"party":[{"level":34,"moves":[0,0,0,0],"species":287},{"level":34,"moves":[0,0,0,0],"species":42}],"party_rom_address":3203232,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223020},{"battle_script_rom_address":2306336,"party":[{"level":31,"moves":[0,0,0,0],"species":336}],"party_rom_address":3203248,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223060},{"battle_script_rom_address":2564841,"party":[{"level":28,"moves":[0,0,0,0],"species":330},{"level":28,"moves":[0,0,0,0],"species":287}],"party_rom_address":3203256,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223100},{"battle_script_rom_address":2320766,"party":[{"level":37,"moves":[0,0,0,0],"species":331},{"level":37,"moves":[0,0,0,0],"species":287}],"party_rom_address":3203272,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223140},{"battle_script_rom_address":2322088,"party":[{"level":41,"moves":[0,0,0,0],"species":287},{"level":41,"moves":[0,0,0,0],"species":169},{"level":43,"moves":[0,0,0,0],"species":331}],"party_rom_address":3203288,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223180},{"battle_script_rom_address":2306305,"party":[{"level":31,"moves":[0,0,0,0],"species":351}],"party_rom_address":3203312,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223220},{"battle_script_rom_address":2020252,"party":[{"level":14,"moves":[0,0,0,0],"species":306},{"level":14,"moves":[0,0,0,0],"species":363}],"party_rom_address":3203320,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223260},{"battle_script_rom_address":2052806,"party":[{"level":14,"moves":[0,0,0,0],"species":363},{"level":14,"moves":[0,0,0,0],"species":306},{"level":14,"moves":[0,0,0,0],"species":363}],"party_rom_address":3203336,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223300},{"battle_script_rom_address":2329135,"party":[{"level":43,"moves":[94,0,0,0],"species":357},{"level":43,"moves":[29,89,0,0],"species":319}],"party_rom_address":3203360,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223340},{"battle_script_rom_address":2062181,"party":[{"level":26,"moves":[0,0,0,0],"species":363},{"level":26,"moves":[0,0,0,0],"species":44}],"party_rom_address":3203392,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223380},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":306},{"level":26,"moves":[0,0,0,0],"species":363}],"party_rom_address":3203408,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223420},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":306},{"level":28,"moves":[0,0,0,0],"species":44},{"level":28,"moves":[0,0,0,0],"species":363}],"party_rom_address":3203424,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223460},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":306},{"level":31,"moves":[0,0,0,0],"species":44},{"level":31,"moves":[0,0,0,0],"species":363}],"party_rom_address":3203448,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223500},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":307},{"level":34,"moves":[0,0,0,0],"species":44},{"level":34,"moves":[0,0,0,0],"species":363}],"party_rom_address":3203472,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223540},{"battle_script_rom_address":2040619,"party":[{"level":23,"moves":[91,163,28,40],"species":28}],"party_rom_address":3203496,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223580},{"battle_script_rom_address":2059717,"party":[{"level":27,"moves":[60,120,201,246],"species":318},{"level":27,"moves":[91,163,28,40],"species":27},{"level":27,"moves":[91,163,28,40],"species":28}],"party_rom_address":3203512,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223620},{"battle_script_rom_address":2027714,"party":[{"level":25,"moves":[91,163,28,40],"species":27},{"level":25,"moves":[91,163,28,40],"species":28}],"party_rom_address":3203560,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223660},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[91,163,28,40],"species":28}],"party_rom_address":3203592,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223700},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[91,163,28,40],"species":28}],"party_rom_address":3203608,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223740},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[91,163,28,40],"species":28}],"party_rom_address":3203624,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223780},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[91,163,28,40],"species":28}],"party_rom_address":3203640,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3223820},{"battle_script_rom_address":0,"party":[{"level":17,"moves":[0,0,0,0],"species":81},{"level":17,"moves":[0,0,0,0],"species":370}],"party_rom_address":3203656,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223860},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":81},{"level":27,"moves":[0,0,0,0],"species":371}],"party_rom_address":3203672,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223900},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":82},{"level":30,"moves":[0,0,0,0],"species":371}],"party_rom_address":3203688,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223940},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":82},{"level":33,"moves":[0,0,0,0],"species":371}],"party_rom_address":3203704,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3223980},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":82},{"level":36,"moves":[0,0,0,0],"species":371}],"party_rom_address":3203720,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224020},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[49,86,63,85],"species":82},{"level":39,"moves":[54,23,48,48],"species":372}],"party_rom_address":3203736,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3224060},{"battle_script_rom_address":2030183,"party":[{"level":12,"moves":[0,0,0,0],"species":350},{"level":12,"moves":[0,0,0,0],"species":350}],"party_rom_address":3203768,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224100},{"battle_script_rom_address":2030293,"party":[{"level":26,"moves":[0,0,0,0],"species":183}],"party_rom_address":3203784,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224140},{"battle_script_rom_address":2030324,"party":[{"level":26,"moves":[0,0,0,0],"species":183}],"party_rom_address":3203792,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224180},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":183},{"level":26,"moves":[0,0,0,0],"species":183}],"party_rom_address":3203800,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224220},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":183},{"level":29,"moves":[0,0,0,0],"species":183}],"party_rom_address":3203816,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224260},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":183},{"level":32,"moves":[0,0,0,0],"species":183}],"party_rom_address":3203832,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224300},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":184},{"level":35,"moves":[0,0,0,0],"species":184}],"party_rom_address":3203848,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224340},{"battle_script_rom_address":2030073,"party":[{"level":13,"moves":[28,29,39,57],"species":288}],"party_rom_address":3203864,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3224380},{"battle_script_rom_address":2537320,"party":[{"level":12,"moves":[0,0,0,0],"species":350},{"level":12,"moves":[0,0,0,0],"species":183}],"party_rom_address":3203880,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224420},{"battle_script_rom_address":2333372,"party":[{"level":26,"moves":[0,0,0,0],"species":183}],"party_rom_address":3203896,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224460},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[28,42,39,57],"species":289}],"party_rom_address":3203904,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3224500},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[28,42,39,57],"species":289}],"party_rom_address":3203920,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3224540},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[28,42,39,57],"species":289}],"party_rom_address":3203936,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3224580},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[28,42,39,57],"species":289}],"party_rom_address":3203952,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3224620},{"battle_script_rom_address":2125121,"party":[{"level":26,"moves":[98,97,17,0],"species":305}],"party_rom_address":3203968,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3224660},{"battle_script_rom_address":2125185,"party":[{"level":26,"moves":[42,146,8,0],"species":308}],"party_rom_address":3203984,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3224700},{"battle_script_rom_address":2125249,"party":[{"level":26,"moves":[47,68,247,0],"species":364}],"party_rom_address":3204000,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3224740},{"battle_script_rom_address":2125313,"party":[{"level":26,"moves":[116,163,0,0],"species":365}],"party_rom_address":3204016,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3224780},{"battle_script_rom_address":2062150,"party":[{"level":28,"moves":[116,98,17,27],"species":305},{"level":28,"moves":[44,91,185,72],"species":332},{"level":28,"moves":[205,250,54,96],"species":313},{"level":28,"moves":[85,48,86,49],"species":82},{"level":28,"moves":[202,185,104,207],"species":300}],"party_rom_address":3204032,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3224820},{"battle_script_rom_address":2558747,"party":[{"level":44,"moves":[0,0,0,0],"species":322},{"level":44,"moves":[0,0,0,0],"species":357},{"level":44,"moves":[0,0,0,0],"species":331}],"party_rom_address":3204112,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224860},{"battle_script_rom_address":2558809,"party":[{"level":46,"moves":[0,0,0,0],"species":355},{"level":46,"moves":[0,0,0,0],"species":121}],"party_rom_address":3204136,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224900},{"battle_script_rom_address":2040822,"party":[{"level":17,"moves":[0,0,0,0],"species":337},{"level":17,"moves":[0,0,0,0],"species":313},{"level":17,"moves":[0,0,0,0],"species":335}],"party_rom_address":3204152,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224940},{"battle_script_rom_address":2326273,"party":[{"level":43,"moves":[0,0,0,0],"species":345},{"level":43,"moves":[0,0,0,0],"species":310}],"party_rom_address":3204176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3224980},{"battle_script_rom_address":2326304,"party":[{"level":43,"moves":[0,0,0,0],"species":82},{"level":43,"moves":[0,0,0,0],"species":89}],"party_rom_address":3204192,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225020},{"battle_script_rom_address":2327963,"party":[{"level":42,"moves":[0,0,0,0],"species":305},{"level":42,"moves":[0,0,0,0],"species":355},{"level":42,"moves":[0,0,0,0],"species":64}],"party_rom_address":3204208,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225060},{"battle_script_rom_address":2329011,"party":[{"level":42,"moves":[0,0,0,0],"species":85},{"level":42,"moves":[0,0,0,0],"species":64},{"level":42,"moves":[0,0,0,0],"species":101},{"level":42,"moves":[0,0,0,0],"species":300}],"party_rom_address":3204232,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225100},{"battle_script_rom_address":2329042,"party":[{"level":42,"moves":[0,0,0,0],"species":317},{"level":42,"moves":[0,0,0,0],"species":75},{"level":42,"moves":[0,0,0,0],"species":314}],"party_rom_address":3204264,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225140},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":337},{"level":26,"moves":[0,0,0,0],"species":313},{"level":26,"moves":[0,0,0,0],"species":335}],"party_rom_address":3204288,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225180},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":338},{"level":29,"moves":[0,0,0,0],"species":313},{"level":29,"moves":[0,0,0,0],"species":335}],"party_rom_address":3204312,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225220},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":338},{"level":32,"moves":[0,0,0,0],"species":313},{"level":32,"moves":[0,0,0,0],"species":335}],"party_rom_address":3204336,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225260},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":338},{"level":35,"moves":[0,0,0,0],"species":313},{"level":35,"moves":[0,0,0,0],"species":336}],"party_rom_address":3204360,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225300},{"battle_script_rom_address":2067950,"party":[{"level":33,"moves":[0,0,0,0],"species":75},{"level":33,"moves":[0,0,0,0],"species":297}],"party_rom_address":3204384,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225340},{"battle_script_rom_address":2125377,"party":[{"level":26,"moves":[185,95,0,0],"species":316}],"party_rom_address":3204400,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3225380},{"battle_script_rom_address":2125441,"party":[{"level":26,"moves":[111,38,247,0],"species":40}],"party_rom_address":3204416,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3225420},{"battle_script_rom_address":2125505,"party":[{"level":26,"moves":[14,163,0,0],"species":380}],"party_rom_address":3204432,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3225460},{"battle_script_rom_address":2062119,"party":[{"level":29,"moves":[226,185,57,44],"species":355},{"level":29,"moves":[72,89,64,73],"species":363},{"level":29,"moves":[19,55,54,182],"species":310}],"party_rom_address":3204448,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3225500},{"battle_script_rom_address":2558778,"party":[{"level":45,"moves":[0,0,0,0],"species":383},{"level":45,"moves":[0,0,0,0],"species":338}],"party_rom_address":3204496,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225540},{"battle_script_rom_address":2040932,"party":[{"level":17,"moves":[0,0,0,0],"species":309},{"level":17,"moves":[0,0,0,0],"species":339},{"level":17,"moves":[0,0,0,0],"species":363}],"party_rom_address":3204512,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225580},{"battle_script_rom_address":2059686,"party":[{"level":30,"moves":[0,0,0,0],"species":322}],"party_rom_address":3204536,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225620},{"battle_script_rom_address":2326335,"party":[{"level":45,"moves":[0,0,0,0],"species":363}],"party_rom_address":3204544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225660},{"battle_script_rom_address":2327994,"party":[{"level":45,"moves":[0,0,0,0],"species":319}],"party_rom_address":3204552,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225700},{"battle_script_rom_address":2328025,"party":[{"level":42,"moves":[0,0,0,0],"species":321},{"level":42,"moves":[0,0,0,0],"species":357},{"level":42,"moves":[0,0,0,0],"species":297}],"party_rom_address":3204560,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225740},{"battle_script_rom_address":2329073,"party":[{"level":43,"moves":[0,0,0,0],"species":227},{"level":43,"moves":[0,0,0,0],"species":322}],"party_rom_address":3204584,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225780},{"battle_script_rom_address":2329104,"party":[{"level":42,"moves":[0,0,0,0],"species":28},{"level":42,"moves":[0,0,0,0],"species":38},{"level":42,"moves":[0,0,0,0],"species":369}],"party_rom_address":3204600,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225820},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":309},{"level":26,"moves":[0,0,0,0],"species":339},{"level":26,"moves":[0,0,0,0],"species":363}],"party_rom_address":3204624,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225860},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":310},{"level":29,"moves":[0,0,0,0],"species":339},{"level":29,"moves":[0,0,0,0],"species":363}],"party_rom_address":3204648,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225900},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":310},{"level":32,"moves":[0,0,0,0],"species":339},{"level":32,"moves":[0,0,0,0],"species":363}],"party_rom_address":3204672,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225940},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":310},{"level":34,"moves":[0,0,0,0],"species":340},{"level":34,"moves":[0,0,0,0],"species":363}],"party_rom_address":3204696,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3225980},{"battle_script_rom_address":2557556,"party":[{"level":41,"moves":[0,0,0,0],"species":378},{"level":41,"moves":[0,0,0,0],"species":348}],"party_rom_address":3204720,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226020},{"battle_script_rom_address":2062494,"party":[{"level":30,"moves":[0,0,0,0],"species":361},{"level":30,"moves":[0,0,0,0],"species":377}],"party_rom_address":3204736,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226060},{"battle_script_rom_address":2061319,"party":[{"level":29,"moves":[0,0,0,0],"species":361},{"level":29,"moves":[0,0,0,0],"species":377}],"party_rom_address":3204752,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226100},{"battle_script_rom_address":2309379,"party":[{"level":32,"moves":[0,0,0,0],"species":322}],"party_rom_address":3204768,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226140},{"battle_script_rom_address":2309166,"party":[{"level":32,"moves":[0,0,0,0],"species":377}],"party_rom_address":3204776,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226180},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":322},{"level":31,"moves":[0,0,0,0],"species":351}],"party_rom_address":3204784,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226220},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":351},{"level":35,"moves":[0,0,0,0],"species":322}],"party_rom_address":3204800,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226260},{"battle_script_rom_address":0,"party":[{"level":40,"moves":[0,0,0,0],"species":351},{"level":40,"moves":[0,0,0,0],"species":322}],"party_rom_address":3204816,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226300},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[0,0,0,0],"species":361},{"level":42,"moves":[0,0,0,0],"species":322},{"level":42,"moves":[0,0,0,0],"species":352}],"party_rom_address":3204832,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226340},{"battle_script_rom_address":2024261,"party":[{"level":7,"moves":[0,0,0,0],"species":288}],"party_rom_address":3204856,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3226380},{"battle_script_rom_address":2259635,"party":[{"level":39,"moves":[213,186,175,96],"species":325},{"level":39,"moves":[213,219,36,96],"species":325}],"party_rom_address":3204864,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3226420},{"battle_script_rom_address":2248487,"party":[{"level":26,"moves":[0,0,0,0],"species":287},{"level":28,"moves":[0,0,0,0],"species":287},{"level":30,"moves":[0,0,0,0],"species":339}],"party_rom_address":3204896,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226460},{"battle_script_rom_address":0,"party":[{"level":11,"moves":[33,39,0,0],"species":288}],"party_rom_address":3204920,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3226500},{"battle_script_rom_address":2259418,"party":[{"level":40,"moves":[0,0,0,0],"species":119}],"party_rom_address":3204936,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3226540},{"battle_script_rom_address":2354429,"party":[{"level":45,"moves":[0,0,0,0],"species":363}],"party_rom_address":3204944,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3226580},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":289}],"party_rom_address":3204952,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3226620},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":289}],"party_rom_address":3204960,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3226660},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":289}],"party_rom_address":3204968,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3226700},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[154,44,60,28],"species":289}],"party_rom_address":3204976,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3226740},{"battle_script_rom_address":2298023,"party":[{"level":21,"moves":[0,0,0,0],"species":183}],"party_rom_address":3204992,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226780},{"battle_script_rom_address":2298054,"party":[{"level":21,"moves":[0,0,0,0],"species":306}],"party_rom_address":3205000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226820},{"battle_script_rom_address":2298085,"party":[{"level":21,"moves":[0,0,0,0],"species":339}],"party_rom_address":3205008,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226860},{"battle_script_rom_address":2061412,"party":[{"level":29,"moves":[20,122,154,185],"species":317},{"level":29,"moves":[86,103,137,242],"species":379}],"party_rom_address":3205016,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3226900},{"battle_script_rom_address":2259449,"party":[{"level":40,"moves":[0,0,0,0],"species":118}],"party_rom_address":3205048,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226940},{"battle_script_rom_address":2259480,"party":[{"level":40,"moves":[0,0,0,0],"species":184}],"party_rom_address":3205056,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3226980},{"battle_script_rom_address":2259511,"party":[{"level":35,"moves":[78,250,240,96],"species":373},{"level":37,"moves":[13,152,96,0],"species":326},{"level":39,"moves":[253,154,252,96],"species":296}],"party_rom_address":3205064,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3227020},{"battle_script_rom_address":2259542,"party":[{"level":39,"moves":[0,0,0,0],"species":330},{"level":39,"moves":[0,0,0,0],"species":331}],"party_rom_address":3205112,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227060},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[20,122,154,185],"species":317},{"level":35,"moves":[86,103,137,242],"species":379}],"party_rom_address":3205128,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3227100},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[20,122,154,185],"species":317},{"level":38,"moves":[86,103,137,242],"species":379}],"party_rom_address":3205160,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3227140},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[20,122,154,185],"species":317},{"level":41,"moves":[86,103,137,242],"species":379}],"party_rom_address":3205192,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3227180},{"battle_script_rom_address":0,"party":[{"level":44,"moves":[20,122,154,185],"species":317},{"level":44,"moves":[86,103,137,242],"species":379}],"party_rom_address":3205224,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3227220},{"battle_script_rom_address":2024075,"party":[{"level":7,"moves":[0,0,0,0],"species":288}],"party_rom_address":3205256,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3227260},{"battle_script_rom_address":2068012,"party":[{"level":33,"moves":[0,0,0,0],"species":324},{"level":33,"moves":[0,0,0,0],"species":356}],"party_rom_address":3205264,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227300},{"battle_script_rom_address":2354398,"party":[{"level":45,"moves":[0,0,0,0],"species":184}],"party_rom_address":3205280,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3227340},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":289}],"party_rom_address":3205288,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3227380},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":289}],"party_rom_address":3205296,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3227420},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":289}],"party_rom_address":3205304,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3227460},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[154,44,60,28],"species":289}],"party_rom_address":3205312,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3227500},{"battle_script_rom_address":2046087,"party":[{"level":19,"moves":[0,0,0,0],"species":382}],"party_rom_address":3205328,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227540},{"battle_script_rom_address":2333649,"party":[{"level":25,"moves":[0,0,0,0],"species":313},{"level":25,"moves":[0,0,0,0],"species":116}],"party_rom_address":3205336,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227580},{"battle_script_rom_address":2306212,"party":[{"level":31,"moves":[0,0,0,0],"species":111}],"party_rom_address":3205352,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227620},{"battle_script_rom_address":2298116,"party":[{"level":20,"moves":[0,0,0,0],"species":339}],"party_rom_address":3205360,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227660},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":383}],"party_rom_address":3205368,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227700},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":383},{"level":29,"moves":[0,0,0,0],"species":111}],"party_rom_address":3205376,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227740},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":383},{"level":32,"moves":[0,0,0,0],"species":111}],"party_rom_address":3205392,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227780},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":384},{"level":35,"moves":[0,0,0,0],"species":112}],"party_rom_address":3205408,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227820},{"battle_script_rom_address":2027745,"party":[{"level":26,"moves":[0,0,0,0],"species":330}],"party_rom_address":3205424,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227860},{"battle_script_rom_address":2027776,"party":[{"level":26,"moves":[0,0,0,0],"species":72}],"party_rom_address":3205432,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227900},{"battle_script_rom_address":2028359,"party":[{"level":24,"moves":[0,0,0,0],"species":72},{"level":24,"moves":[0,0,0,0],"species":72}],"party_rom_address":3205440,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227940},{"battle_script_rom_address":2028653,"party":[{"level":24,"moves":[0,0,0,0],"species":72},{"level":24,"moves":[0,0,0,0],"species":309},{"level":24,"moves":[0,0,0,0],"species":72}],"party_rom_address":3205456,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3227980},{"battle_script_rom_address":2028684,"party":[{"level":26,"moves":[0,0,0,0],"species":330}],"party_rom_address":3205480,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228020},{"battle_script_rom_address":2028950,"party":[{"level":26,"moves":[0,0,0,0],"species":73}],"party_rom_address":3205488,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228060},{"battle_script_rom_address":2028981,"party":[{"level":26,"moves":[0,0,0,0],"species":330}],"party_rom_address":3205496,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228100},{"battle_script_rom_address":2029949,"party":[{"level":25,"moves":[0,0,0,0],"species":72},{"level":25,"moves":[0,0,0,0],"species":330}],"party_rom_address":3205504,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228140},{"battle_script_rom_address":2063211,"party":[{"level":33,"moves":[0,0,0,0],"species":72},{"level":33,"moves":[0,0,0,0],"species":309}],"party_rom_address":3205520,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228180},{"battle_script_rom_address":2063242,"party":[{"level":34,"moves":[0,0,0,0],"species":330}],"party_rom_address":3205536,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228220},{"battle_script_rom_address":2063822,"party":[{"level":34,"moves":[0,0,0,0],"species":73}],"party_rom_address":3205544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228260},{"battle_script_rom_address":2063853,"party":[{"level":34,"moves":[0,0,0,0],"species":116}],"party_rom_address":3205552,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228300},{"battle_script_rom_address":2064196,"party":[{"level":34,"moves":[0,0,0,0],"species":130}],"party_rom_address":3205560,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228340},{"battle_script_rom_address":2064227,"party":[{"level":31,"moves":[0,0,0,0],"species":330},{"level":31,"moves":[0,0,0,0],"species":309},{"level":31,"moves":[0,0,0,0],"species":330}],"party_rom_address":3205568,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228380},{"battle_script_rom_address":2067229,"party":[{"level":34,"moves":[0,0,0,0],"species":130}],"party_rom_address":3205592,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228420},{"battle_script_rom_address":2067359,"party":[{"level":34,"moves":[0,0,0,0],"species":310}],"party_rom_address":3205600,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228460},{"battle_script_rom_address":2067390,"party":[{"level":33,"moves":[0,0,0,0],"species":309},{"level":33,"moves":[0,0,0,0],"species":73}],"party_rom_address":3205608,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228500},{"battle_script_rom_address":2067291,"party":[{"level":33,"moves":[0,0,0,0],"species":73},{"level":33,"moves":[0,0,0,0],"species":313}],"party_rom_address":3205624,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228540},{"battle_script_rom_address":2067608,"party":[{"level":34,"moves":[0,0,0,0],"species":331}],"party_rom_address":3205640,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228580},{"battle_script_rom_address":2067857,"party":[{"level":34,"moves":[0,0,0,0],"species":342}],"party_rom_address":3205648,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228620},{"battle_script_rom_address":2067576,"party":[{"level":34,"moves":[0,0,0,0],"species":341}],"party_rom_address":3205656,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228660},{"battle_script_rom_address":2068089,"party":[{"level":34,"moves":[0,0,0,0],"species":130}],"party_rom_address":3205664,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228700},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":72},{"level":33,"moves":[0,0,0,0],"species":309},{"level":33,"moves":[0,0,0,0],"species":73}],"party_rom_address":3205672,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228740},{"battle_script_rom_address":2063414,"party":[{"level":33,"moves":[0,0,0,0],"species":72},{"level":33,"moves":[0,0,0,0],"species":313}],"party_rom_address":3205696,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228780},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":331}],"party_rom_address":3205712,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228820},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":331}],"party_rom_address":3205720,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228860},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":120},{"level":36,"moves":[0,0,0,0],"species":331}],"party_rom_address":3205728,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228900},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":121},{"level":39,"moves":[0,0,0,0],"species":331}],"party_rom_address":3205744,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228940},{"battle_script_rom_address":2089272,"party":[{"level":13,"moves":[0,0,0,0],"species":66}],"party_rom_address":3205760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3228980},{"battle_script_rom_address":2068213,"party":[{"level":32,"moves":[0,0,0,0],"species":66},{"level":32,"moves":[0,0,0,0],"species":67}],"party_rom_address":3205768,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229020},{"battle_script_rom_address":2067701,"party":[{"level":34,"moves":[0,0,0,0],"species":336}],"party_rom_address":3205784,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229060},{"battle_script_rom_address":2047023,"party":[{"level":24,"moves":[0,0,0,0],"species":66},{"level":28,"moves":[0,0,0,0],"species":67}],"party_rom_address":3205792,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229100},{"battle_script_rom_address":2047054,"party":[{"level":19,"moves":[0,0,0,0],"species":66}],"party_rom_address":3205808,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229140},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":67}],"party_rom_address":3205816,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229180},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":66},{"level":29,"moves":[0,0,0,0],"species":67}],"party_rom_address":3205824,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229220},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":66},{"level":31,"moves":[0,0,0,0],"species":67},{"level":31,"moves":[0,0,0,0],"species":67}],"party_rom_address":3205840,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229260},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":66},{"level":33,"moves":[0,0,0,0],"species":67},{"level":33,"moves":[0,0,0,0],"species":67},{"level":33,"moves":[0,0,0,0],"species":68}],"party_rom_address":3205864,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3229300},{"battle_script_rom_address":2550585,"party":[{"level":26,"moves":[0,0,0,0],"species":335},{"level":26,"moves":[0,0,0,0],"species":67}],"party_rom_address":3205896,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229340},{"battle_script_rom_address":2040791,"party":[{"level":19,"moves":[0,0,0,0],"species":66}],"party_rom_address":3205912,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229380},{"battle_script_rom_address":2308993,"party":[{"level":32,"moves":[0,0,0,0],"species":336}],"party_rom_address":3205920,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229420},{"battle_script_rom_address":2161493,"party":[{"level":17,"moves":[98,86,209,43],"species":337},{"level":17,"moves":[12,95,103,0],"species":100}],"party_rom_address":3205928,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3229460},{"battle_script_rom_address":2317055,"party":[{"level":31,"moves":[0,0,0,0],"species":286},{"level":31,"moves":[0,0,0,0],"species":41}],"party_rom_address":3205960,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229500},{"battle_script_rom_address":2318068,"party":[{"level":32,"moves":[0,0,0,0],"species":330}],"party_rom_address":3205976,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229540},{"battle_script_rom_address":2161524,"party":[{"level":17,"moves":[0,0,0,0],"species":100},{"level":17,"moves":[0,0,0,0],"species":81}],"party_rom_address":3205984,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229580},{"battle_script_rom_address":2062742,"party":[{"level":30,"moves":[0,0,0,0],"species":337},{"level":30,"moves":[0,0,0,0],"species":371}],"party_rom_address":3206000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229620},{"battle_script_rom_address":2052978,"party":[{"level":15,"moves":[0,0,0,0],"species":81},{"level":15,"moves":[0,0,0,0],"species":370}],"party_rom_address":3206016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229660},{"battle_script_rom_address":0,"party":[{"level":25,"moves":[0,0,0,0],"species":81},{"level":25,"moves":[0,0,0,0],"species":370},{"level":25,"moves":[0,0,0,0],"species":81}],"party_rom_address":3206032,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229700},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":81},{"level":28,"moves":[0,0,0,0],"species":371},{"level":28,"moves":[0,0,0,0],"species":81}],"party_rom_address":3206056,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229740},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":82},{"level":31,"moves":[0,0,0,0],"species":371},{"level":31,"moves":[0,0,0,0],"species":82}],"party_rom_address":3206080,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229780},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":82},{"level":34,"moves":[0,0,0,0],"species":372},{"level":34,"moves":[0,0,0,0],"species":82}],"party_rom_address":3206104,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229820},{"battle_script_rom_address":2097377,"party":[{"level":23,"moves":[0,0,0,0],"species":339}],"party_rom_address":3206128,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229860},{"battle_script_rom_address":2097584,"party":[{"level":22,"moves":[0,0,0,0],"species":218},{"level":22,"moves":[0,0,0,0],"species":218}],"party_rom_address":3206136,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229900},{"battle_script_rom_address":2097429,"party":[{"level":23,"moves":[0,0,0,0],"species":339}],"party_rom_address":3206152,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229940},{"battle_script_rom_address":2097553,"party":[{"level":23,"moves":[0,0,0,0],"species":218}],"party_rom_address":3206160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3229980},{"battle_script_rom_address":2097460,"party":[{"level":23,"moves":[0,0,0,0],"species":218}],"party_rom_address":3206168,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230020},{"battle_script_rom_address":2046197,"party":[{"level":18,"moves":[0,0,0,0],"species":218},{"level":18,"moves":[0,0,0,0],"species":309}],"party_rom_address":3206176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230060},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":218},{"level":26,"moves":[0,0,0,0],"species":309}],"party_rom_address":3206192,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230100},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":218},{"level":29,"moves":[0,0,0,0],"species":310}],"party_rom_address":3206208,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230140},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":218},{"level":32,"moves":[0,0,0,0],"species":310}],"party_rom_address":3206224,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230180},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":219},{"level":35,"moves":[0,0,0,0],"species":310}],"party_rom_address":3206240,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230220},{"battle_script_rom_address":2040495,"party":[{"level":23,"moves":[91,28,40,163],"species":27}],"party_rom_address":3206256,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3230260},{"battle_script_rom_address":2040557,"party":[{"level":21,"moves":[229,189,60,61],"species":318},{"level":21,"moves":[40,28,10,91],"species":27},{"level":21,"moves":[229,189,60,61],"species":318}],"party_rom_address":3206272,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3230300},{"battle_script_rom_address":2043958,"party":[{"level":18,"moves":[0,0,0,0],"species":299}],"party_rom_address":3206320,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230340},{"battle_script_rom_address":2046025,"party":[{"level":18,"moves":[0,0,0,0],"species":27},{"level":18,"moves":[0,0,0,0],"species":299}],"party_rom_address":3206328,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230380},{"battle_script_rom_address":2549832,"party":[{"level":24,"moves":[0,0,0,0],"species":317}],"party_rom_address":3206344,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230420},{"battle_script_rom_address":2303835,"party":[{"level":20,"moves":[0,0,0,0],"species":288},{"level":20,"moves":[0,0,0,0],"species":304}],"party_rom_address":3206352,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230460},{"battle_script_rom_address":2303973,"party":[{"level":21,"moves":[0,0,0,0],"species":306}],"party_rom_address":3206368,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230500},{"battle_script_rom_address":2040729,"party":[{"level":18,"moves":[0,0,0,0],"species":27}],"party_rom_address":3206376,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230540},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":288},{"level":26,"moves":[0,0,0,0],"species":304}],"party_rom_address":3206384,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230580},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":289},{"level":29,"moves":[0,0,0,0],"species":305}],"party_rom_address":3206400,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230620},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":27},{"level":31,"moves":[0,0,0,0],"species":305},{"level":31,"moves":[0,0,0,0],"species":289}],"party_rom_address":3206416,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230660},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":305},{"level":34,"moves":[0,0,0,0],"species":28},{"level":34,"moves":[0,0,0,0],"species":289}],"party_rom_address":3206440,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230700},{"battle_script_rom_address":2054989,"party":[{"level":26,"moves":[0,0,0,0],"species":311}],"party_rom_address":3206464,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230740},{"battle_script_rom_address":2055020,"party":[{"level":24,"moves":[0,0,0,0],"species":290},{"level":24,"moves":[0,0,0,0],"species":291},{"level":24,"moves":[0,0,0,0],"species":292}],"party_rom_address":3206472,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230780},{"battle_script_rom_address":2055051,"party":[{"level":27,"moves":[0,0,0,0],"species":290},{"level":27,"moves":[0,0,0,0],"species":293},{"level":27,"moves":[0,0,0,0],"species":294}],"party_rom_address":3206496,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230820},{"battle_script_rom_address":2059576,"party":[{"level":27,"moves":[0,0,0,0],"species":311},{"level":27,"moves":[0,0,0,0],"species":311},{"level":27,"moves":[0,0,0,0],"species":311}],"party_rom_address":3206520,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230860},{"battle_script_rom_address":2051695,"party":[{"level":16,"moves":[0,0,0,0],"species":294},{"level":16,"moves":[0,0,0,0],"species":292}],"party_rom_address":3206544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230900},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":311},{"level":31,"moves":[0,0,0,0],"species":311},{"level":31,"moves":[0,0,0,0],"species":311}],"party_rom_address":3206560,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230940},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":311},{"level":34,"moves":[0,0,0,0],"species":311},{"level":34,"moves":[0,0,0,0],"species":312}],"party_rom_address":3206584,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3230980},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":311},{"level":36,"moves":[0,0,0,0],"species":290},{"level":36,"moves":[0,0,0,0],"species":311},{"level":36,"moves":[0,0,0,0],"species":312}],"party_rom_address":3206608,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231020},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[0,0,0,0],"species":311},{"level":38,"moves":[0,0,0,0],"species":294},{"level":38,"moves":[0,0,0,0],"species":311},{"level":38,"moves":[0,0,0,0],"species":312},{"level":38,"moves":[0,0,0,0],"species":292}],"party_rom_address":3206640,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3231060},{"battle_script_rom_address":2032546,"party":[{"level":15,"moves":[237,0,0,0],"species":63}],"party_rom_address":3206680,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3231100},{"battle_script_rom_address":2238272,"party":[{"level":36,"moves":[0,0,0,0],"species":393}],"party_rom_address":3206696,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231140},{"battle_script_rom_address":2238303,"party":[{"level":36,"moves":[0,0,0,0],"species":392}],"party_rom_address":3206704,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231180},{"battle_script_rom_address":2238334,"party":[{"level":36,"moves":[0,0,0,0],"species":203}],"party_rom_address":3206712,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231220},{"battle_script_rom_address":2307823,"party":[{"level":26,"moves":[0,0,0,0],"species":392},{"level":26,"moves":[0,0,0,0],"species":392},{"level":26,"moves":[0,0,0,0],"species":393}],"party_rom_address":3206720,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231260},{"battle_script_rom_address":2557525,"party":[{"level":41,"moves":[0,0,0,0],"species":64},{"level":41,"moves":[0,0,0,0],"species":349}],"party_rom_address":3206744,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231300},{"battle_script_rom_address":2062212,"party":[{"level":31,"moves":[0,0,0,0],"species":349}],"party_rom_address":3206760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231340},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":64},{"level":33,"moves":[0,0,0,0],"species":349}],"party_rom_address":3206768,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231380},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[0,0,0,0],"species":64},{"level":38,"moves":[0,0,0,0],"species":349}],"party_rom_address":3206784,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231420},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":64},{"level":41,"moves":[0,0,0,0],"species":349}],"party_rom_address":3206800,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231460},{"battle_script_rom_address":0,"party":[{"level":45,"moves":[0,0,0,0],"species":349},{"level":45,"moves":[0,0,0,0],"species":65}],"party_rom_address":3206816,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231500},{"battle_script_rom_address":2032577,"party":[{"level":16,"moves":[237,0,0,0],"species":63}],"party_rom_address":3206832,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3231540},{"battle_script_rom_address":2238365,"party":[{"level":36,"moves":[0,0,0,0],"species":393}],"party_rom_address":3206848,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231580},{"battle_script_rom_address":2238396,"party":[{"level":36,"moves":[0,0,0,0],"species":178}],"party_rom_address":3206856,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231620},{"battle_script_rom_address":2238427,"party":[{"level":36,"moves":[0,0,0,0],"species":64}],"party_rom_address":3206864,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231660},{"battle_script_rom_address":2307854,"party":[{"level":26,"moves":[0,0,0,0],"species":202},{"level":26,"moves":[0,0,0,0],"species":177},{"level":26,"moves":[0,0,0,0],"species":64}],"party_rom_address":3206872,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231700},{"battle_script_rom_address":2557587,"party":[{"level":41,"moves":[0,0,0,0],"species":393},{"level":41,"moves":[0,0,0,0],"species":178}],"party_rom_address":3206896,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231740},{"battle_script_rom_address":2062322,"party":[{"level":30,"moves":[0,0,0,0],"species":64},{"level":30,"moves":[0,0,0,0],"species":348}],"party_rom_address":3206912,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231780},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":64},{"level":34,"moves":[0,0,0,0],"species":348}],"party_rom_address":3206928,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231820},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":64},{"level":37,"moves":[0,0,0,0],"species":348}],"party_rom_address":3206944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231860},{"battle_script_rom_address":0,"party":[{"level":40,"moves":[0,0,0,0],"species":64},{"level":40,"moves":[0,0,0,0],"species":348}],"party_rom_address":3206960,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231900},{"battle_script_rom_address":0,"party":[{"level":43,"moves":[0,0,0,0],"species":348},{"level":43,"moves":[0,0,0,0],"species":65}],"party_rom_address":3206976,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231940},{"battle_script_rom_address":2061209,"party":[{"level":29,"moves":[0,0,0,0],"species":338}],"party_rom_address":3206992,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3231980},{"battle_script_rom_address":2354274,"party":[{"level":44,"moves":[0,0,0,0],"species":338},{"level":44,"moves":[0,0,0,0],"species":338}],"party_rom_address":3207000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232020},{"battle_script_rom_address":2354305,"party":[{"level":45,"moves":[0,0,0,0],"species":380}],"party_rom_address":3207016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232060},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":338}],"party_rom_address":3207024,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232100},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[29,28,60,154],"species":289},{"level":36,"moves":[98,209,60,46],"species":338}],"party_rom_address":3207032,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3232140},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[29,28,60,154],"species":289},{"level":39,"moves":[98,209,60,0],"species":338}],"party_rom_address":3207064,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3232180},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[29,28,60,154],"species":289},{"level":41,"moves":[154,50,93,244],"species":55},{"level":41,"moves":[98,209,60,46],"species":338}],"party_rom_address":3207096,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3232220},{"battle_script_rom_address":2268477,"party":[{"level":46,"moves":[46,38,28,242],"species":287},{"level":48,"moves":[3,104,207,70],"species":300},{"level":46,"moves":[73,185,46,178],"species":345},{"level":48,"moves":[57,14,70,7],"species":327},{"level":49,"moves":[76,157,14,163],"species":376}],"party_rom_address":3207144,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232260},{"battle_script_rom_address":2269104,"party":[{"level":48,"moves":[69,109,174,182],"species":362},{"level":49,"moves":[247,32,5,185],"species":378},{"level":50,"moves":[247,104,101,185],"species":322},{"level":49,"moves":[247,94,85,7],"species":378},{"level":51,"moves":[247,58,157,89],"species":362}],"party_rom_address":3207224,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232300},{"battle_script_rom_address":2269786,"party":[{"level":50,"moves":[227,34,2,45],"species":342},{"level":50,"moves":[113,242,196,58],"species":347},{"level":52,"moves":[213,38,2,59],"species":342},{"level":52,"moves":[247,153,2,58],"species":347},{"level":53,"moves":[57,34,58,73],"species":343}],"party_rom_address":3207304,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232340},{"battle_script_rom_address":2270448,"party":[{"level":52,"moves":[61,81,182,38],"species":396},{"level":54,"moves":[38,225,93,76],"species":359},{"level":53,"moves":[108,93,57,34],"species":230},{"level":53,"moves":[53,242,225,89],"species":334},{"level":55,"moves":[53,81,157,242],"species":397}],"party_rom_address":3207384,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232380},{"battle_script_rom_address":2181824,"party":[{"level":12,"moves":[33,111,88,61],"species":74},{"level":12,"moves":[33,111,88,61],"species":74},{"level":15,"moves":[79,106,33,61],"species":320}],"party_rom_address":3207464,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232420},{"battle_script_rom_address":2089070,"party":[{"level":16,"moves":[2,67,69,83],"species":66},{"level":16,"moves":[8,113,115,83],"species":356},{"level":19,"moves":[36,233,179,83],"species":335}],"party_rom_address":3207512,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232460},{"battle_script_rom_address":2161073,"party":[{"level":20,"moves":[205,209,120,95],"species":100},{"level":20,"moves":[95,43,98,80],"species":337},{"level":22,"moves":[48,95,86,49],"species":82},{"level":24,"moves":[98,86,95,80],"species":338}],"party_rom_address":3207560,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232500},{"battle_script_rom_address":2097176,"party":[{"level":24,"moves":[59,36,222,241],"species":339},{"level":24,"moves":[59,123,113,241],"species":218},{"level":26,"moves":[59,33,241,213],"species":340},{"level":29,"moves":[59,241,34,213],"species":321}],"party_rom_address":3207624,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232540},{"battle_script_rom_address":2123720,"party":[{"level":27,"moves":[42,60,7,227],"species":308},{"level":27,"moves":[163,7,227,185],"species":365},{"level":29,"moves":[163,187,7,29],"species":289},{"level":31,"moves":[68,25,7,185],"species":366}],"party_rom_address":3207688,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232580},{"battle_script_rom_address":2195894,"party":[{"level":29,"moves":[195,119,219,76],"species":358},{"level":29,"moves":[241,76,76,235],"species":369},{"level":30,"moves":[55,48,182,76],"species":310},{"level":31,"moves":[28,31,211,76],"species":227},{"level":33,"moves":[89,225,93,76],"species":359}],"party_rom_address":3207752,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232620},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[89,246,94,113],"species":319},{"level":41,"moves":[94,241,109,91],"species":178},{"level":42,"moves":[113,94,95,91],"species":348},{"level":42,"moves":[241,76,94,53],"species":349}],"party_rom_address":3207832,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232660},{"battle_script_rom_address":2255993,"party":[{"level":41,"moves":[96,213,186,175],"species":325},{"level":41,"moves":[240,96,133,89],"species":324},{"level":43,"moves":[227,34,62,96],"species":342},{"level":43,"moves":[96,152,13,43],"species":327},{"level":46,"moves":[96,104,58,156],"species":230}],"party_rom_address":3207896,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3232700},{"battle_script_rom_address":2048342,"party":[{"level":9,"moves":[0,0,0,0],"species":392}],"party_rom_address":3207976,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232740},{"battle_script_rom_address":2547425,"party":[{"level":17,"moves":[0,0,0,0],"species":392}],"party_rom_address":3207984,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232780},{"battle_script_rom_address":2547456,"party":[{"level":15,"moves":[0,0,0,0],"species":339},{"level":15,"moves":[0,0,0,0],"species":43},{"level":15,"moves":[0,0,0,0],"species":309}],"party_rom_address":3207992,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232820},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":392},{"level":26,"moves":[0,0,0,0],"species":356}],"party_rom_address":3208016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232860},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":393},{"level":29,"moves":[0,0,0,0],"species":356}],"party_rom_address":3208032,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232900},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":393},{"level":32,"moves":[0,0,0,0],"species":357}],"party_rom_address":3208048,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232940},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":393},{"level":34,"moves":[0,0,0,0],"species":378},{"level":34,"moves":[0,0,0,0],"species":357}],"party_rom_address":3208064,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3232980},{"battle_script_rom_address":2048590,"party":[{"level":9,"moves":[0,0,0,0],"species":306}],"party_rom_address":3208088,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3233020},{"battle_script_rom_address":2547487,"party":[{"level":16,"moves":[0,0,0,0],"species":306},{"level":16,"moves":[0,0,0,0],"species":292}],"party_rom_address":3208096,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3233060},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":306},{"level":26,"moves":[0,0,0,0],"species":370}],"party_rom_address":3208112,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3233100},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":306},{"level":29,"moves":[0,0,0,0],"species":371}],"party_rom_address":3208128,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3233140},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":307},{"level":32,"moves":[0,0,0,0],"species":371}],"party_rom_address":3208144,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3233180},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":307},{"level":35,"moves":[0,0,0,0],"species":372}],"party_rom_address":3208160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3233220},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[95,60,146,42],"species":308},{"level":32,"moves":[8,25,47,185],"species":366}],"party_rom_address":3208176,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3233260},{"battle_script_rom_address":0,"party":[{"level":15,"moves":[45,39,29,60],"species":288},{"level":17,"moves":[33,116,36,0],"species":335}],"party_rom_address":3208208,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3233300},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[45,39,29,60],"species":288},{"level":30,"moves":[33,116,36,0],"species":335}],"party_rom_address":3208240,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3233340},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[45,39,29,60],"species":288},{"level":33,"moves":[33,116,36,0],"species":335}],"party_rom_address":3208272,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3233380},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[45,39,29,60],"species":289},{"level":36,"moves":[33,116,36,0],"species":335}],"party_rom_address":3208304,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3233420},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[45,39,29,60],"species":289},{"level":38,"moves":[33,116,36,0],"species":336}],"party_rom_address":3208336,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3233460},{"battle_script_rom_address":2039914,"party":[{"level":16,"moves":[0,0,0,0],"species":304},{"level":16,"moves":[0,0,0,0],"species":288}],"party_rom_address":3208368,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233500},{"battle_script_rom_address":2020520,"party":[{"level":15,"moves":[0,0,0,0],"species":315}],"party_rom_address":3208384,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233540},{"battle_script_rom_address":2354243,"party":[{"level":22,"moves":[18,204,185,215],"species":315},{"level":36,"moves":[18,204,185,215],"species":315},{"level":40,"moves":[18,204,185,215],"species":315},{"level":12,"moves":[18,204,185,215],"species":315},{"level":30,"moves":[18,204,185,215],"species":315},{"level":42,"moves":[18,204,185,215],"species":316}],"party_rom_address":3208392,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3233580},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":315}],"party_rom_address":3208488,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233620},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":315}],"party_rom_address":3208496,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233660},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":316}],"party_rom_address":3208504,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233700},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[0,0,0,0],"species":316}],"party_rom_address":3208512,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233740},{"battle_script_rom_address":2040019,"party":[{"level":17,"moves":[0,0,0,0],"species":363}],"party_rom_address":3208520,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233780},{"battle_script_rom_address":2061178,"party":[{"level":30,"moves":[0,0,0,0],"species":25}],"party_rom_address":3208528,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233820},{"battle_script_rom_address":2259573,"party":[{"level":35,"moves":[0,0,0,0],"species":350},{"level":37,"moves":[0,0,0,0],"species":183},{"level":39,"moves":[0,0,0,0],"species":184}],"party_rom_address":3208536,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233860},{"battle_script_rom_address":2033062,"party":[{"level":14,"moves":[0,0,0,0],"species":353},{"level":14,"moves":[0,0,0,0],"species":354}],"party_rom_address":3208560,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233900},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":353},{"level":26,"moves":[0,0,0,0],"species":354}],"party_rom_address":3208576,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233940},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":353},{"level":29,"moves":[0,0,0,0],"species":354}],"party_rom_address":3208592,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3233980},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":353},{"level":32,"moves":[0,0,0,0],"species":354}],"party_rom_address":3208608,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3234020},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":353},{"level":35,"moves":[0,0,0,0],"species":354}],"party_rom_address":3208624,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3234060},{"battle_script_rom_address":2046913,"party":[{"level":27,"moves":[0,0,0,0],"species":336}],"party_rom_address":3208640,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234100},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[36,26,28,91],"species":336}],"party_rom_address":3208648,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234140},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[36,26,28,91],"species":336}],"party_rom_address":3208664,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234180},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[36,187,28,91],"species":336}],"party_rom_address":3208680,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234220},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[36,187,28,91],"species":336}],"party_rom_address":3208696,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234260},{"battle_script_rom_address":2040229,"party":[{"level":18,"moves":[136,96,93,197],"species":356}],"party_rom_address":3208712,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234300},{"battle_script_rom_address":2297913,"party":[{"level":21,"moves":[0,0,0,0],"species":356},{"level":21,"moves":[0,0,0,0],"species":335}],"party_rom_address":3208728,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234340},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":356},{"level":30,"moves":[0,0,0,0],"species":335}],"party_rom_address":3208744,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234380},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":357},{"level":33,"moves":[0,0,0,0],"species":336}],"party_rom_address":3208760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234420},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":357},{"level":36,"moves":[0,0,0,0],"species":336}],"party_rom_address":3208776,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234460},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":357},{"level":39,"moves":[0,0,0,0],"species":336}],"party_rom_address":3208792,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234500},{"battle_script_rom_address":2018881,"party":[{"level":5,"moves":[0,0,0,0],"species":286}],"party_rom_address":3208808,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234540},{"battle_script_rom_address":2023858,"party":[{"level":5,"moves":[0,0,0,0],"species":288},{"level":7,"moves":[0,0,0,0],"species":298}],"party_rom_address":3208816,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234580},{"battle_script_rom_address":2181995,"party":[{"level":10,"moves":[33,0,0,0],"species":74}],"party_rom_address":3208832,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234620},{"battle_script_rom_address":2182026,"party":[{"level":8,"moves":[0,0,0,0],"species":74},{"level":8,"moves":[0,0,0,0],"species":74}],"party_rom_address":3208848,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234660},{"battle_script_rom_address":2048280,"party":[{"level":9,"moves":[0,0,0,0],"species":66}],"party_rom_address":3208864,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234700},{"battle_script_rom_address":2161555,"party":[{"level":17,"moves":[29,28,45,85],"species":288},{"level":17,"moves":[133,124,25,1],"species":367}],"party_rom_address":3208872,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234740},{"battle_script_rom_address":2326366,"party":[{"level":43,"moves":[213,58,85,53],"species":366},{"level":43,"moves":[29,182,5,92],"species":362}],"party_rom_address":3208904,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234780},{"battle_script_rom_address":2326397,"party":[{"level":43,"moves":[29,94,85,91],"species":394},{"level":43,"moves":[89,247,76,24],"species":366}],"party_rom_address":3208936,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3234820},{"battle_script_rom_address":2044723,"party":[{"level":19,"moves":[0,0,0,0],"species":332}],"party_rom_address":3208968,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234860},{"battle_script_rom_address":2044754,"party":[{"level":19,"moves":[0,0,0,0],"species":382}],"party_rom_address":3208976,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234900},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":287}],"party_rom_address":3208984,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234940},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":305},{"level":30,"moves":[0,0,0,0],"species":287}],"party_rom_address":3208992,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3234980},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":305},{"level":29,"moves":[0,0,0,0],"species":289},{"level":33,"moves":[0,0,0,0],"species":287}],"party_rom_address":3209008,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235020},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":305},{"level":32,"moves":[0,0,0,0],"species":289},{"level":36,"moves":[0,0,0,0],"species":287}],"party_rom_address":3209032,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235060},{"battle_script_rom_address":2546619,"party":[{"level":14,"moves":[0,0,0,0],"species":288},{"level":16,"moves":[0,0,0,0],"species":288}],"party_rom_address":3209056,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235100},{"battle_script_rom_address":2019129,"party":[{"level":4,"moves":[0,0,0,0],"species":288},{"level":3,"moves":[0,0,0,0],"species":304}],"party_rom_address":3209072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235140},{"battle_script_rom_address":2033172,"party":[{"level":15,"moves":[0,0,0,0],"species":382},{"level":13,"moves":[0,0,0,0],"species":337}],"party_rom_address":3209088,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235180},{"battle_script_rom_address":2271299,"party":[{"level":57,"moves":[240,67,38,59],"species":314},{"level":55,"moves":[92,56,188,58],"species":73},{"level":56,"moves":[202,57,73,104],"species":297},{"level":56,"moves":[89,57,133,63],"species":324},{"level":56,"moves":[93,89,63,57],"species":130},{"level":58,"moves":[105,57,58,92],"species":329}],"party_rom_address":3209104,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3235220},{"battle_script_rom_address":2020489,"party":[{"level":5,"moves":[0,0,0,0],"species":129},{"level":10,"moves":[0,0,0,0],"species":72},{"level":15,"moves":[0,0,0,0],"species":129}],"party_rom_address":3209200,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235260},{"battle_script_rom_address":2023827,"party":[{"level":5,"moves":[0,0,0,0],"species":129},{"level":6,"moves":[0,0,0,0],"species":129},{"level":7,"moves":[0,0,0,0],"species":129}],"party_rom_address":3209224,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235300},{"battle_script_rom_address":2046307,"party":[{"level":16,"moves":[0,0,0,0],"species":129},{"level":17,"moves":[0,0,0,0],"species":118},{"level":18,"moves":[0,0,0,0],"species":323}],"party_rom_address":3209248,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235340},{"battle_script_rom_address":2028421,"party":[{"level":10,"moves":[0,0,0,0],"species":129},{"level":7,"moves":[0,0,0,0],"species":72},{"level":10,"moves":[0,0,0,0],"species":129}],"party_rom_address":3209272,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235380},{"battle_script_rom_address":2028531,"party":[{"level":11,"moves":[0,0,0,0],"species":72}],"party_rom_address":3209296,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235420},{"battle_script_rom_address":2032718,"party":[{"level":11,"moves":[0,0,0,0],"species":72},{"level":14,"moves":[0,0,0,0],"species":313},{"level":11,"moves":[0,0,0,0],"species":72},{"level":14,"moves":[0,0,0,0],"species":313}],"party_rom_address":3209304,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235460},{"battle_script_rom_address":2046338,"party":[{"level":19,"moves":[0,0,0,0],"species":323}],"party_rom_address":3209336,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235500},{"battle_script_rom_address":2052916,"party":[{"level":25,"moves":[0,0,0,0],"species":72},{"level":25,"moves":[0,0,0,0],"species":330}],"party_rom_address":3209344,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235540},{"battle_script_rom_address":2052947,"party":[{"level":16,"moves":[0,0,0,0],"species":72}],"party_rom_address":3209360,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235580},{"battle_script_rom_address":2030355,"party":[{"level":25,"moves":[0,0,0,0],"species":313},{"level":25,"moves":[0,0,0,0],"species":73}],"party_rom_address":3209368,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235620},{"battle_script_rom_address":0,"party":[{"level":24,"moves":[0,0,0,0],"species":72},{"level":27,"moves":[0,0,0,0],"species":130},{"level":27,"moves":[0,0,0,0],"species":130}],"party_rom_address":3209384,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235660},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":130},{"level":26,"moves":[0,0,0,0],"species":330},{"level":26,"moves":[0,0,0,0],"species":72},{"level":29,"moves":[0,0,0,0],"species":130}],"party_rom_address":3209408,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235700},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":130},{"level":30,"moves":[0,0,0,0],"species":330},{"level":30,"moves":[0,0,0,0],"species":73},{"level":31,"moves":[0,0,0,0],"species":130}],"party_rom_address":3209440,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235740},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":130},{"level":33,"moves":[0,0,0,0],"species":331},{"level":33,"moves":[0,0,0,0],"species":130},{"level":35,"moves":[0,0,0,0],"species":73}],"party_rom_address":3209472,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235780},{"battle_script_rom_address":2067670,"party":[{"level":19,"moves":[0,0,0,0],"species":129},{"level":21,"moves":[0,0,0,0],"species":130},{"level":23,"moves":[0,0,0,0],"species":130},{"level":26,"moves":[0,0,0,0],"species":130},{"level":30,"moves":[0,0,0,0],"species":130},{"level":35,"moves":[0,0,0,0],"species":130}],"party_rom_address":3209504,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235820},{"battle_script_rom_address":2032749,"party":[{"level":6,"moves":[0,0,0,0],"species":100},{"level":6,"moves":[0,0,0,0],"species":100},{"level":14,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209552,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235860},{"battle_script_rom_address":2032780,"party":[{"level":14,"moves":[0,0,0,0],"species":81},{"level":14,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209576,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235900},{"battle_script_rom_address":2032811,"party":[{"level":16,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209592,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235940},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209600,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3235980},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209608,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236020},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":82}],"party_rom_address":3209616,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236060},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":82}],"party_rom_address":3209624,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236100},{"battle_script_rom_address":2032952,"party":[{"level":16,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209632,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236140},{"battle_script_rom_address":2032921,"party":[{"level":14,"moves":[0,0,0,0],"species":81},{"level":14,"moves":[0,0,0,0],"species":81},{"level":6,"moves":[0,0,0,0],"species":100}],"party_rom_address":3209640,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236180},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209664,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236220},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":81}],"party_rom_address":3209672,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236260},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":82}],"party_rom_address":3209680,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236300},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":82}],"party_rom_address":3209688,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236340},{"battle_script_rom_address":2051475,"party":[{"level":17,"moves":[0,0,0,0],"species":84}],"party_rom_address":3209696,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236380},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":84}],"party_rom_address":3209704,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236420},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":84}],"party_rom_address":3209712,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236460},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":85}],"party_rom_address":3209720,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236500},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":85}],"party_rom_address":3209728,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236540},{"battle_script_rom_address":2051585,"party":[{"level":17,"moves":[0,0,0,0],"species":84}],"party_rom_address":3209736,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236580},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":84}],"party_rom_address":3209744,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236620},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":84}],"party_rom_address":3209752,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236660},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":85}],"party_rom_address":3209760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236700},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":85}],"party_rom_address":3209768,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236740},{"battle_script_rom_address":2064615,"party":[{"level":33,"moves":[0,0,0,0],"species":120},{"level":33,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209776,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236780},{"battle_script_rom_address":2333618,"party":[{"level":25,"moves":[0,0,0,0],"species":288},{"level":25,"moves":[0,0,0,0],"species":337}],"party_rom_address":3209792,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236820},{"battle_script_rom_address":2065332,"party":[{"level":35,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209808,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236860},{"battle_script_rom_address":2064413,"party":[{"level":33,"moves":[0,0,0,0],"species":120},{"level":33,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209816,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236900},{"battle_script_rom_address":2066978,"party":[{"level":26,"moves":[0,0,0,0],"species":309},{"level":34,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209832,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236940},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209848,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3236980},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209856,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237020},{"battle_script_rom_address":0,"party":[{"level":45,"moves":[0,0,0,0],"species":121}],"party_rom_address":3209864,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237060},{"battle_script_rom_address":0,"party":[{"level":48,"moves":[0,0,0,0],"species":121}],"party_rom_address":3209872,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237100},{"battle_script_rom_address":2064351,"party":[{"level":34,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209880,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237140},{"battle_script_rom_address":2064646,"party":[{"level":26,"moves":[0,0,0,0],"species":309},{"level":34,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209888,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237180},{"battle_script_rom_address":2067545,"party":[{"level":34,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209904,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237220},{"battle_script_rom_address":2065442,"party":[{"level":35,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209912,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237260},{"battle_script_rom_address":2067009,"party":[{"level":27,"moves":[0,0,0,0],"species":309},{"level":33,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209920,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237300},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209936,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237340},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[0,0,0,0],"species":120}],"party_rom_address":3209944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237380},{"battle_script_rom_address":0,"party":[{"level":45,"moves":[0,0,0,0],"species":121}],"party_rom_address":3209952,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237420},{"battle_script_rom_address":0,"party":[{"level":48,"moves":[0,0,0,0],"species":121}],"party_rom_address":3209960,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237460},{"battle_script_rom_address":2286394,"party":[{"level":37,"moves":[0,0,0,0],"species":359},{"level":37,"moves":[0,0,0,0],"species":359}],"party_rom_address":3209968,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237500},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":359},{"level":41,"moves":[0,0,0,0],"species":359}],"party_rom_address":3209984,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237540},{"battle_script_rom_address":0,"party":[{"level":44,"moves":[0,0,0,0],"species":359},{"level":44,"moves":[0,0,0,0],"species":359}],"party_rom_address":3210000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237580},{"battle_script_rom_address":0,"party":[{"level":46,"moves":[0,0,0,0],"species":395},{"level":46,"moves":[0,0,0,0],"species":359},{"level":46,"moves":[0,0,0,0],"species":359}],"party_rom_address":3210016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237620},{"battle_script_rom_address":0,"party":[{"level":49,"moves":[0,0,0,0],"species":359},{"level":49,"moves":[0,0,0,0],"species":359},{"level":49,"moves":[0,0,0,0],"species":396}],"party_rom_address":3210040,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3237660},{"battle_script_rom_address":2068182,"party":[{"level":34,"moves":[225,29,116,52],"species":395}],"party_rom_address":3210064,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3237700},{"battle_script_rom_address":2053088,"party":[{"level":26,"moves":[0,0,0,0],"species":309}],"party_rom_address":3210080,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237740},{"battle_script_rom_address":2055395,"party":[{"level":25,"moves":[0,0,0,0],"species":309},{"level":25,"moves":[0,0,0,0],"species":369}],"party_rom_address":3210088,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237780},{"battle_script_rom_address":2055426,"party":[{"level":26,"moves":[0,0,0,0],"species":305}],"party_rom_address":3210104,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237820},{"battle_script_rom_address":2196092,"party":[{"level":27,"moves":[0,0,0,0],"species":84},{"level":27,"moves":[0,0,0,0],"species":227},{"level":27,"moves":[0,0,0,0],"species":369}],"party_rom_address":3210112,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237860},{"battle_script_rom_address":2196216,"party":[{"level":30,"moves":[0,0,0,0],"species":227}],"party_rom_address":3210136,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237900},{"battle_script_rom_address":2064118,"party":[{"level":33,"moves":[0,0,0,0],"species":369},{"level":33,"moves":[0,0,0,0],"species":178}],"party_rom_address":3210144,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237940},{"battle_script_rom_address":2196123,"party":[{"level":29,"moves":[0,0,0,0],"species":84},{"level":29,"moves":[0,0,0,0],"species":310}],"party_rom_address":3210160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3237980},{"battle_script_rom_address":2059373,"party":[{"level":28,"moves":[0,0,0,0],"species":309},{"level":28,"moves":[0,0,0,0],"species":177}],"party_rom_address":3210176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238020},{"battle_script_rom_address":2059404,"party":[{"level":29,"moves":[0,0,0,0],"species":358}],"party_rom_address":3210192,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238060},{"battle_script_rom_address":2556084,"party":[{"level":36,"moves":[0,0,0,0],"species":305},{"level":36,"moves":[0,0,0,0],"species":310},{"level":36,"moves":[0,0,0,0],"species":178}],"party_rom_address":3210200,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238100},{"battle_script_rom_address":2053119,"party":[{"level":25,"moves":[0,0,0,0],"species":304},{"level":25,"moves":[0,0,0,0],"species":305}],"party_rom_address":3210224,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238140},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":177},{"level":32,"moves":[0,0,0,0],"species":358}],"party_rom_address":3210240,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238180},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":177},{"level":35,"moves":[0,0,0,0],"species":359}],"party_rom_address":3210256,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238220},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[0,0,0,0],"species":177},{"level":38,"moves":[0,0,0,0],"species":359}],"party_rom_address":3210272,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238260},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":359},{"level":41,"moves":[0,0,0,0],"species":178}],"party_rom_address":3210288,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238300},{"battle_script_rom_address":2068151,"party":[{"level":33,"moves":[0,0,0,0],"species":177},{"level":33,"moves":[0,0,0,0],"species":305}],"party_rom_address":3210304,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238340},{"battle_script_rom_address":2067981,"party":[{"level":34,"moves":[0,0,0,0],"species":369}],"party_rom_address":3210320,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238380},{"battle_script_rom_address":2055457,"party":[{"level":26,"moves":[0,0,0,0],"species":302}],"party_rom_address":3210328,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238420},{"battle_script_rom_address":2055488,"party":[{"level":25,"moves":[0,0,0,0],"species":302},{"level":25,"moves":[0,0,0,0],"species":109}],"party_rom_address":3210336,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238460},{"battle_script_rom_address":2329166,"party":[{"level":43,"moves":[29,89,0,0],"species":319},{"level":43,"moves":[85,89,0,0],"species":171}],"party_rom_address":3210352,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3238500},{"battle_script_rom_address":2335401,"party":[{"level":26,"moves":[0,0,0,0],"species":183}],"party_rom_address":3210384,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238540},{"battle_script_rom_address":2044895,"party":[{"level":17,"moves":[139,33,123,120],"species":109},{"level":17,"moves":[139,33,123,120],"species":109},{"level":17,"moves":[139,33,124,120],"species":109}],"party_rom_address":3210392,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3238580},{"battle_script_rom_address":2045005,"party":[{"level":18,"moves":[0,0,0,0],"species":109},{"level":18,"moves":[0,0,0,0],"species":302}],"party_rom_address":3210440,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238620},{"battle_script_rom_address":0,"party":[{"level":24,"moves":[139,33,124,120],"species":109},{"level":24,"moves":[139,33,124,0],"species":109},{"level":24,"moves":[139,33,124,120],"species":109},{"level":26,"moves":[33,124,0,0],"species":109}],"party_rom_address":3210456,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3238660},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[139,33,124,120],"species":109},{"level":27,"moves":[139,33,124,120],"species":109},{"level":27,"moves":[139,33,124,0],"species":109},{"level":29,"moves":[33,124,0,0],"species":109}],"party_rom_address":3210520,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3238700},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[139,33,124,0],"species":109},{"level":30,"moves":[139,33,124,0],"species":109},{"level":30,"moves":[139,33,124,0],"species":109},{"level":32,"moves":[33,124,0,0],"species":109}],"party_rom_address":3210584,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3238740},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[139,33,124,0],"species":109},{"level":33,"moves":[139,33,124,120],"species":109},{"level":33,"moves":[139,33,124,120],"species":109},{"level":35,"moves":[33,124,0,0],"species":110}],"party_rom_address":3210648,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3238780},{"battle_script_rom_address":2089310,"party":[{"level":13,"moves":[0,0,0,0],"species":356}],"party_rom_address":3210712,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238820},{"battle_script_rom_address":2089348,"party":[{"level":13,"moves":[0,0,0,0],"species":356}],"party_rom_address":3210720,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238860},{"battle_script_rom_address":2047164,"party":[{"level":18,"moves":[0,0,0,0],"species":356},{"level":18,"moves":[0,0,0,0],"species":335}],"party_rom_address":3210728,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238900},{"battle_script_rom_address":2550554,"party":[{"level":27,"moves":[0,0,0,0],"species":356}],"party_rom_address":3210744,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238940},{"battle_script_rom_address":2550616,"party":[{"level":27,"moves":[0,0,0,0],"species":307}],"party_rom_address":3210752,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3238980},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":356},{"level":26,"moves":[0,0,0,0],"species":335}],"party_rom_address":3210760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239020},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":356},{"level":29,"moves":[0,0,0,0],"species":335}],"party_rom_address":3210776,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239060},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":357},{"level":32,"moves":[0,0,0,0],"species":336}],"party_rom_address":3210792,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239100},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":357},{"level":35,"moves":[0,0,0,0],"species":336}],"party_rom_address":3210808,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239140},{"battle_script_rom_address":2044785,"party":[{"level":19,"moves":[52,33,222,241],"species":339}],"party_rom_address":3210824,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3239180},{"battle_script_rom_address":2059748,"party":[{"level":28,"moves":[0,0,0,0],"species":363},{"level":28,"moves":[0,0,0,0],"species":313}],"party_rom_address":3210840,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239220},{"battle_script_rom_address":2059779,"party":[{"level":30,"moves":[240,55,87,96],"species":385}],"party_rom_address":3210856,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3239260},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[52,33,222,241],"species":339}],"party_rom_address":3210872,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3239300},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[52,36,222,241],"species":339}],"party_rom_address":3210888,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3239340},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[73,72,64,241],"species":363},{"level":34,"moves":[53,36,222,241],"species":339}],"party_rom_address":3210904,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3239380},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[73,202,76,241],"species":363},{"level":37,"moves":[53,36,89,241],"species":340}],"party_rom_address":3210936,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3239420},{"battle_script_rom_address":2027807,"party":[{"level":25,"moves":[0,0,0,0],"species":309},{"level":25,"moves":[0,0,0,0],"species":313}],"party_rom_address":3210968,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239460},{"battle_script_rom_address":2027838,"party":[{"level":26,"moves":[0,0,0,0],"species":183}],"party_rom_address":3210984,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239500},{"battle_script_rom_address":2028390,"party":[{"level":26,"moves":[0,0,0,0],"species":313}],"party_rom_address":3210992,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239540},{"battle_script_rom_address":2028794,"party":[{"level":25,"moves":[0,0,0,0],"species":309},{"level":25,"moves":[0,0,0,0],"species":118}],"party_rom_address":3211000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239580},{"battle_script_rom_address":2028825,"party":[{"level":26,"moves":[0,0,0,0],"species":118}],"party_rom_address":3211016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239620},{"battle_script_rom_address":2029012,"party":[{"level":25,"moves":[0,0,0,0],"species":116},{"level":25,"moves":[0,0,0,0],"species":183}],"party_rom_address":3211024,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239660},{"battle_script_rom_address":2029043,"party":[{"level":26,"moves":[0,0,0,0],"species":118}],"party_rom_address":3211040,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239700},{"battle_script_rom_address":2029980,"party":[{"level":24,"moves":[0,0,0,0],"species":118},{"level":24,"moves":[0,0,0,0],"species":309},{"level":24,"moves":[0,0,0,0],"species":118}],"party_rom_address":3211048,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239740},{"battle_script_rom_address":2063273,"party":[{"level":34,"moves":[0,0,0,0],"species":313}],"party_rom_address":3211072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239780},{"battle_script_rom_address":2063383,"party":[{"level":34,"moves":[0,0,0,0],"species":183}],"party_rom_address":3211080,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239820},{"battle_script_rom_address":2063884,"party":[{"level":34,"moves":[0,0,0,0],"species":325}],"party_rom_address":3211088,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239860},{"battle_script_rom_address":2063915,"party":[{"level":34,"moves":[0,0,0,0],"species":119}],"party_rom_address":3211096,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239900},{"battle_script_rom_address":2064258,"party":[{"level":33,"moves":[0,0,0,0],"species":183},{"level":33,"moves":[0,0,0,0],"species":341}],"party_rom_address":3211104,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239940},{"battle_script_rom_address":2064289,"party":[{"level":34,"moves":[0,0,0,0],"species":118}],"party_rom_address":3211120,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3239980},{"battle_script_rom_address":2067260,"party":[{"level":33,"moves":[0,0,0,0],"species":118},{"level":33,"moves":[0,0,0,0],"species":341}],"party_rom_address":3211128,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240020},{"battle_script_rom_address":2067421,"party":[{"level":34,"moves":[0,0,0,0],"species":325}],"party_rom_address":3211144,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240060},{"battle_script_rom_address":2067452,"party":[{"level":34,"moves":[0,0,0,0],"species":119}],"party_rom_address":3211152,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240100},{"battle_script_rom_address":2067639,"party":[{"level":34,"moves":[0,0,0,0],"species":184}],"party_rom_address":3211160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240140},{"battle_script_rom_address":2064382,"party":[{"level":33,"moves":[0,0,0,0],"species":325},{"level":33,"moves":[0,0,0,0],"species":325}],"party_rom_address":3211168,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240180},{"battle_script_rom_address":2067888,"party":[{"level":34,"moves":[0,0,0,0],"species":119}],"party_rom_address":3211184,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240220},{"battle_script_rom_address":2067919,"party":[{"level":33,"moves":[0,0,0,0],"species":116},{"level":33,"moves":[0,0,0,0],"species":117}],"party_rom_address":3211192,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240260},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":171},{"level":34,"moves":[0,0,0,0],"species":310}],"party_rom_address":3211208,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240300},{"battle_script_rom_address":2068120,"party":[{"level":33,"moves":[0,0,0,0],"species":325},{"level":33,"moves":[0,0,0,0],"species":325}],"party_rom_address":3211224,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240340},{"battle_script_rom_address":2065676,"party":[{"level":35,"moves":[0,0,0,0],"species":119}],"party_rom_address":3211240,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240380},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[0,0,0,0],"species":313}],"party_rom_address":3211248,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240420},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":313}],"party_rom_address":3211256,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240460},{"battle_script_rom_address":0,"party":[{"level":43,"moves":[0,0,0,0],"species":120},{"level":43,"moves":[0,0,0,0],"species":313}],"party_rom_address":3211264,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240500},{"battle_script_rom_address":0,"party":[{"level":45,"moves":[0,0,0,0],"species":325},{"level":45,"moves":[0,0,0,0],"species":313},{"level":45,"moves":[0,0,0,0],"species":121}],"party_rom_address":3211280,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240540},{"battle_script_rom_address":2040526,"party":[{"level":22,"moves":[91,28,40,163],"species":27},{"level":22,"moves":[229,189,60,61],"species":318}],"party_rom_address":3211304,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3240580},{"battle_script_rom_address":2040588,"party":[{"level":22,"moves":[28,40,163,91],"species":27},{"level":22,"moves":[205,61,39,111],"species":183}],"party_rom_address":3211336,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3240620},{"battle_script_rom_address":2043989,"party":[{"level":17,"moves":[0,0,0,0],"species":304},{"level":17,"moves":[0,0,0,0],"species":296}],"party_rom_address":3211368,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240660},{"battle_script_rom_address":2046056,"party":[{"level":18,"moves":[0,0,0,0],"species":183},{"level":18,"moves":[0,0,0,0],"species":296}],"party_rom_address":3211384,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240700},{"battle_script_rom_address":2549863,"party":[{"level":23,"moves":[0,0,0,0],"species":315},{"level":23,"moves":[0,0,0,0],"species":358}],"party_rom_address":3211400,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240740},{"battle_script_rom_address":2303728,"party":[{"level":19,"moves":[0,0,0,0],"species":306},{"level":19,"moves":[0,0,0,0],"species":43},{"level":19,"moves":[0,0,0,0],"species":358}],"party_rom_address":3211416,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240780},{"battle_script_rom_address":2309489,"party":[{"level":32,"moves":[194,219,68,243],"species":202}],"party_rom_address":3211440,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3240820},{"battle_script_rom_address":2040760,"party":[{"level":17,"moves":[0,0,0,0],"species":306},{"level":17,"moves":[0,0,0,0],"species":183}],"party_rom_address":3211456,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240860},{"battle_script_rom_address":0,"party":[{"level":25,"moves":[0,0,0,0],"species":306},{"level":25,"moves":[0,0,0,0],"species":44},{"level":25,"moves":[0,0,0,0],"species":358}],"party_rom_address":3211472,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240900},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":307},{"level":28,"moves":[0,0,0,0],"species":44},{"level":28,"moves":[0,0,0,0],"species":358}],"party_rom_address":3211496,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240940},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":307},{"level":31,"moves":[0,0,0,0],"species":44},{"level":31,"moves":[0,0,0,0],"species":358}],"party_rom_address":3211520,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3240980},{"battle_script_rom_address":0,"party":[{"level":40,"moves":[0,0,0,0],"species":307},{"level":40,"moves":[0,0,0,0],"species":45},{"level":40,"moves":[0,0,0,0],"species":359}],"party_rom_address":3211544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241020},{"battle_script_rom_address":0,"party":[{"level":15,"moves":[0,0,0,0],"species":353},{"level":15,"moves":[0,0,0,0],"species":354}],"party_rom_address":3211568,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241060},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":353},{"level":27,"moves":[0,0,0,0],"species":354}],"party_rom_address":3211584,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241100},{"battle_script_rom_address":0,"party":[{"level":6,"moves":[0,0,0,0],"species":298},{"level":6,"moves":[0,0,0,0],"species":295}],"party_rom_address":3211600,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241140},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":292},{"level":26,"moves":[0,0,0,0],"species":294}],"party_rom_address":3211616,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241180},{"battle_script_rom_address":0,"party":[{"level":9,"moves":[0,0,0,0],"species":353},{"level":9,"moves":[0,0,0,0],"species":354}],"party_rom_address":3211632,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241220},{"battle_script_rom_address":0,"party":[{"level":10,"moves":[101,50,0,0],"species":361},{"level":10,"moves":[71,73,0,0],"species":306}],"party_rom_address":3211648,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3241260},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":353},{"level":30,"moves":[0,0,0,0],"species":354}],"party_rom_address":3211680,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241300},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[209,12,57,14],"species":353},{"level":33,"moves":[209,12,204,14],"species":354}],"party_rom_address":3211696,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3241340},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[87,12,57,14],"species":353},{"level":36,"moves":[87,12,204,14],"species":354}],"party_rom_address":3211728,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3241380},{"battle_script_rom_address":2030011,"party":[{"level":12,"moves":[0,0,0,0],"species":309},{"level":12,"moves":[0,0,0,0],"species":66}],"party_rom_address":3211760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241420},{"battle_script_rom_address":2030042,"party":[{"level":13,"moves":[0,0,0,0],"species":309}],"party_rom_address":3211776,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241460},{"battle_script_rom_address":2063946,"party":[{"level":33,"moves":[0,0,0,0],"species":309},{"level":33,"moves":[0,0,0,0],"species":67}],"party_rom_address":3211784,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241500},{"battle_script_rom_address":2537258,"party":[{"level":11,"moves":[0,0,0,0],"species":309},{"level":11,"moves":[0,0,0,0],"species":66},{"level":11,"moves":[0,0,0,0],"species":72}],"party_rom_address":3211800,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241540},{"battle_script_rom_address":2353667,"party":[{"level":44,"moves":[0,0,0,0],"species":73},{"level":44,"moves":[0,0,0,0],"species":67}],"party_rom_address":3211824,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241580},{"battle_script_rom_address":2353698,"party":[{"level":43,"moves":[0,0,0,0],"species":66},{"level":43,"moves":[0,0,0,0],"species":310},{"level":43,"moves":[0,0,0,0],"species":67}],"party_rom_address":3211840,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241620},{"battle_script_rom_address":2334525,"party":[{"level":25,"moves":[0,0,0,0],"species":341},{"level":25,"moves":[0,0,0,0],"species":67}],"party_rom_address":3211864,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241660},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":309},{"level":36,"moves":[0,0,0,0],"species":72},{"level":36,"moves":[0,0,0,0],"species":67}],"party_rom_address":3211880,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241700},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":310},{"level":39,"moves":[0,0,0,0],"species":72},{"level":39,"moves":[0,0,0,0],"species":67}],"party_rom_address":3211904,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241740},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[0,0,0,0],"species":310},{"level":42,"moves":[0,0,0,0],"species":72},{"level":42,"moves":[0,0,0,0],"species":67}],"party_rom_address":3211928,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241780},{"battle_script_rom_address":0,"party":[{"level":45,"moves":[0,0,0,0],"species":310},{"level":45,"moves":[0,0,0,0],"species":67},{"level":45,"moves":[0,0,0,0],"species":73}],"party_rom_address":3211952,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241820},{"battle_script_rom_address":2097615,"party":[{"level":23,"moves":[0,0,0,0],"species":339}],"party_rom_address":3211976,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241860},{"battle_script_rom_address":2259604,"party":[{"level":39,"moves":[175,96,216,213],"species":328},{"level":39,"moves":[175,96,216,213],"species":328}],"party_rom_address":3211984,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3241900},{"battle_script_rom_address":2062680,"party":[{"level":27,"moves":[0,0,0,0],"species":376}],"party_rom_address":3212016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3241940},{"battle_script_rom_address":2062649,"party":[{"level":31,"moves":[92,87,120,188],"species":109}],"party_rom_address":3212024,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3241980},{"battle_script_rom_address":2062618,"party":[{"level":31,"moves":[241,55,53,76],"species":385}],"party_rom_address":3212040,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3242020},{"battle_script_rom_address":2064149,"party":[{"level":33,"moves":[0,0,0,0],"species":338},{"level":33,"moves":[0,0,0,0],"species":68}],"party_rom_address":3212056,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242060},{"battle_script_rom_address":2068337,"party":[{"level":33,"moves":[0,0,0,0],"species":67},{"level":33,"moves":[0,0,0,0],"species":341}],"party_rom_address":3212072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242100},{"battle_script_rom_address":2068306,"party":[{"level":34,"moves":[44,46,86,85],"species":338}],"party_rom_address":3212088,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3242140},{"battle_script_rom_address":2068275,"party":[{"level":33,"moves":[0,0,0,0],"species":356},{"level":33,"moves":[0,0,0,0],"species":336}],"party_rom_address":3212104,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242180},{"battle_script_rom_address":2068244,"party":[{"level":34,"moves":[0,0,0,0],"species":313}],"party_rom_address":3212120,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242220},{"battle_script_rom_address":2068043,"party":[{"level":33,"moves":[0,0,0,0],"species":170},{"level":33,"moves":[0,0,0,0],"species":336}],"party_rom_address":3212128,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242260},{"battle_script_rom_address":2032608,"party":[{"level":14,"moves":[0,0,0,0],"species":296},{"level":14,"moves":[0,0,0,0],"species":299}],"party_rom_address":3212144,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242300},{"battle_script_rom_address":2047274,"party":[{"level":18,"moves":[0,0,0,0],"species":380},{"level":18,"moves":[0,0,0,0],"species":379}],"party_rom_address":3212160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242340},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":340},{"level":38,"moves":[0,0,0,0],"species":287},{"level":40,"moves":[0,0,0,0],"species":42}],"party_rom_address":3212176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242380},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":296},{"level":26,"moves":[0,0,0,0],"species":299}],"party_rom_address":3212200,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242420},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":296},{"level":29,"moves":[0,0,0,0],"species":299}],"party_rom_address":3212216,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242460},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":296},{"level":32,"moves":[0,0,0,0],"species":299}],"party_rom_address":3212232,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242500},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":297},{"level":35,"moves":[0,0,0,0],"species":300}],"party_rom_address":3212248,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242540},{"battle_script_rom_address":2326117,"party":[{"level":44,"moves":[76,219,225,93],"species":359},{"level":43,"moves":[47,18,204,185],"species":316},{"level":44,"moves":[89,73,202,92],"species":363},{"level":41,"moves":[48,85,161,103],"species":82},{"level":45,"moves":[104,91,94,248],"species":394}],"party_rom_address":3212264,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3242580},{"battle_script_rom_address":2019962,"party":[{"level":5,"moves":[0,0,0,0],"species":277}],"party_rom_address":3212344,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242620},{"battle_script_rom_address":2033952,"party":[{"level":18,"moves":[0,0,0,0],"species":218},{"level":18,"moves":[0,0,0,0],"species":309},{"level":20,"moves":[0,0,0,0],"species":278}],"party_rom_address":3212352,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242660},{"battle_script_rom_address":2054543,"party":[{"level":29,"moves":[0,0,0,0],"species":218},{"level":29,"moves":[0,0,0,0],"species":310},{"level":31,"moves":[0,0,0,0],"species":278}],"party_rom_address":3212376,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242700},{"battle_script_rom_address":2019906,"party":[{"level":5,"moves":[0,0,0,0],"species":280}],"party_rom_address":3212400,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242740},{"battle_script_rom_address":2033896,"party":[{"level":18,"moves":[0,0,0,0],"species":309},{"level":18,"moves":[0,0,0,0],"species":296},{"level":20,"moves":[0,0,0,0],"species":281}],"party_rom_address":3212408,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242780},{"battle_script_rom_address":2054487,"party":[{"level":29,"moves":[0,0,0,0],"species":310},{"level":29,"moves":[0,0,0,0],"species":296},{"level":31,"moves":[0,0,0,0],"species":281}],"party_rom_address":3212432,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242820},{"battle_script_rom_address":2019934,"party":[{"level":5,"moves":[0,0,0,0],"species":283}],"party_rom_address":3212456,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242860},{"battle_script_rom_address":2033924,"party":[{"level":18,"moves":[0,0,0,0],"species":296},{"level":18,"moves":[0,0,0,0],"species":218},{"level":20,"moves":[0,0,0,0],"species":284}],"party_rom_address":3212464,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242900},{"battle_script_rom_address":2054515,"party":[{"level":29,"moves":[0,0,0,0],"species":296},{"level":29,"moves":[0,0,0,0],"species":218},{"level":31,"moves":[0,0,0,0],"species":284}],"party_rom_address":3212488,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242940},{"battle_script_rom_address":2019878,"party":[{"level":5,"moves":[0,0,0,0],"species":277}],"party_rom_address":3212512,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3242980},{"battle_script_rom_address":2033794,"party":[{"level":18,"moves":[0,0,0,0],"species":309},{"level":18,"moves":[0,0,0,0],"species":218},{"level":20,"moves":[0,0,0,0],"species":278}],"party_rom_address":3212520,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243020},{"battle_script_rom_address":2054385,"party":[{"level":29,"moves":[0,0,0,0],"species":218},{"level":29,"moves":[0,0,0,0],"species":296},{"level":31,"moves":[0,0,0,0],"species":278}],"party_rom_address":3212544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243060},{"battle_script_rom_address":2019822,"party":[{"level":5,"moves":[0,0,0,0],"species":280}],"party_rom_address":3212568,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243100},{"battle_script_rom_address":2033738,"party":[{"level":18,"moves":[0,0,0,0],"species":309},{"level":18,"moves":[0,0,0,0],"species":296},{"level":20,"moves":[0,0,0,0],"species":281}],"party_rom_address":3212576,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243140},{"battle_script_rom_address":2054329,"party":[{"level":29,"moves":[0,0,0,0],"species":310},{"level":29,"moves":[0,0,0,0],"species":296},{"level":31,"moves":[0,0,0,0],"species":281}],"party_rom_address":3212600,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243180},{"battle_script_rom_address":2019850,"party":[{"level":5,"moves":[0,0,0,0],"species":283}],"party_rom_address":3212624,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243220},{"battle_script_rom_address":2033766,"party":[{"level":18,"moves":[0,0,0,0],"species":296},{"level":18,"moves":[0,0,0,0],"species":218},{"level":20,"moves":[0,0,0,0],"species":284}],"party_rom_address":3212632,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243260},{"battle_script_rom_address":2054357,"party":[{"level":29,"moves":[0,0,0,0],"species":296},{"level":29,"moves":[0,0,0,0],"species":218},{"level":31,"moves":[0,0,0,0],"species":284}],"party_rom_address":3212656,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243300},{"battle_script_rom_address":2051255,"party":[{"level":11,"moves":[0,0,0,0],"species":370},{"level":11,"moves":[0,0,0,0],"species":288},{"level":11,"moves":[0,0,0,0],"species":382},{"level":11,"moves":[0,0,0,0],"species":286},{"level":11,"moves":[0,0,0,0],"species":304},{"level":11,"moves":[0,0,0,0],"species":335}],"party_rom_address":3212680,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243340},{"battle_script_rom_address":2062711,"party":[{"level":27,"moves":[0,0,0,0],"species":127}],"party_rom_address":3212728,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243380},{"battle_script_rom_address":2328056,"party":[{"level":43,"moves":[153,115,113,94],"species":348},{"level":43,"moves":[153,115,113,247],"species":349}],"party_rom_address":3212736,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3243420},{"battle_script_rom_address":0,"party":[{"level":22,"moves":[0,0,0,0],"species":371},{"level":22,"moves":[0,0,0,0],"species":289},{"level":22,"moves":[0,0,0,0],"species":382},{"level":22,"moves":[0,0,0,0],"species":287},{"level":22,"moves":[0,0,0,0],"species":305},{"level":22,"moves":[0,0,0,0],"species":335}],"party_rom_address":3212768,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243460},{"battle_script_rom_address":0,"party":[{"level":25,"moves":[0,0,0,0],"species":371},{"level":25,"moves":[0,0,0,0],"species":289},{"level":25,"moves":[0,0,0,0],"species":382},{"level":25,"moves":[0,0,0,0],"species":287},{"level":25,"moves":[0,0,0,0],"species":305},{"level":25,"moves":[0,0,0,0],"species":336}],"party_rom_address":3212816,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243500},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":371},{"level":28,"moves":[0,0,0,0],"species":289},{"level":28,"moves":[0,0,0,0],"species":382},{"level":28,"moves":[0,0,0,0],"species":287},{"level":28,"moves":[0,0,0,0],"species":305},{"level":28,"moves":[0,0,0,0],"species":336}],"party_rom_address":3212864,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243540},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":371},{"level":31,"moves":[0,0,0,0],"species":289},{"level":31,"moves":[0,0,0,0],"species":383},{"level":31,"moves":[0,0,0,0],"species":287},{"level":31,"moves":[0,0,0,0],"species":305},{"level":31,"moves":[0,0,0,0],"species":336}],"party_rom_address":3212912,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243580},{"battle_script_rom_address":2051365,"party":[{"level":11,"moves":[0,0,0,0],"species":309},{"level":11,"moves":[0,0,0,0],"species":306},{"level":11,"moves":[0,0,0,0],"species":183},{"level":11,"moves":[0,0,0,0],"species":363},{"level":11,"moves":[0,0,0,0],"species":315},{"level":11,"moves":[0,0,0,0],"species":118}],"party_rom_address":3212960,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243620},{"battle_script_rom_address":2328087,"party":[{"level":43,"moves":[0,0,0,0],"species":322},{"level":43,"moves":[0,0,0,0],"species":376}],"party_rom_address":3213008,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243660},{"battle_script_rom_address":2335432,"party":[{"level":26,"moves":[0,0,0,0],"species":28}],"party_rom_address":3213024,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243700},{"battle_script_rom_address":0,"party":[{"level":22,"moves":[0,0,0,0],"species":309},{"level":22,"moves":[0,0,0,0],"species":306},{"level":22,"moves":[0,0,0,0],"species":183},{"level":22,"moves":[0,0,0,0],"species":363},{"level":22,"moves":[0,0,0,0],"species":315},{"level":22,"moves":[0,0,0,0],"species":118}],"party_rom_address":3213032,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243740},{"battle_script_rom_address":0,"party":[{"level":25,"moves":[0,0,0,0],"species":310},{"level":25,"moves":[0,0,0,0],"species":307},{"level":25,"moves":[0,0,0,0],"species":183},{"level":25,"moves":[0,0,0,0],"species":363},{"level":25,"moves":[0,0,0,0],"species":316},{"level":25,"moves":[0,0,0,0],"species":118}],"party_rom_address":3213080,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243780},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":310},{"level":28,"moves":[0,0,0,0],"species":307},{"level":28,"moves":[0,0,0,0],"species":183},{"level":28,"moves":[0,0,0,0],"species":363},{"level":28,"moves":[0,0,0,0],"species":316},{"level":28,"moves":[0,0,0,0],"species":118}],"party_rom_address":3213128,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243820},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":310},{"level":31,"moves":[0,0,0,0],"species":307},{"level":31,"moves":[0,0,0,0],"species":184},{"level":31,"moves":[0,0,0,0],"species":363},{"level":31,"moves":[0,0,0,0],"species":316},{"level":31,"moves":[0,0,0,0],"species":119}],"party_rom_address":3213176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243860},{"battle_script_rom_address":2055175,"party":[{"level":27,"moves":[0,0,0,0],"species":307}],"party_rom_address":3213224,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243900},{"battle_script_rom_address":2059514,"party":[{"level":28,"moves":[0,0,0,0],"species":298},{"level":28,"moves":[0,0,0,0],"species":299},{"level":28,"moves":[0,0,0,0],"species":296}],"party_rom_address":3213232,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243940},{"battle_script_rom_address":2556115,"party":[{"level":39,"moves":[0,0,0,0],"species":345}],"party_rom_address":3213256,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3243980},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":307}],"party_rom_address":3213264,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244020},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":307}],"party_rom_address":3213272,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244060},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":307}],"party_rom_address":3213280,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244100},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":317},{"level":39,"moves":[0,0,0,0],"species":307}],"party_rom_address":3213288,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244140},{"battle_script_rom_address":2055285,"party":[{"level":26,"moves":[0,0,0,0],"species":44},{"level":26,"moves":[0,0,0,0],"species":363}],"party_rom_address":3213304,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244180},{"battle_script_rom_address":2059545,"party":[{"level":28,"moves":[0,0,0,0],"species":295},{"level":28,"moves":[0,0,0,0],"species":296},{"level":28,"moves":[0,0,0,0],"species":299}],"party_rom_address":3213320,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244220},{"battle_script_rom_address":2556053,"party":[{"level":38,"moves":[0,0,0,0],"species":358},{"level":38,"moves":[0,0,0,0],"species":363}],"party_rom_address":3213344,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244260},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":44},{"level":30,"moves":[0,0,0,0],"species":363}],"party_rom_address":3213360,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244300},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":44},{"level":33,"moves":[0,0,0,0],"species":363}],"party_rom_address":3213376,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244340},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":44},{"level":36,"moves":[0,0,0,0],"species":363}],"party_rom_address":3213392,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244380},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":182},{"level":39,"moves":[0,0,0,0],"species":363}],"party_rom_address":3213408,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244420},{"battle_script_rom_address":2303942,"party":[{"level":21,"moves":[0,0,0,0],"species":81}],"party_rom_address":3213424,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244460},{"battle_script_rom_address":2320797,"party":[{"level":35,"moves":[0,0,0,0],"species":287},{"level":35,"moves":[0,0,0,0],"species":42}],"party_rom_address":3213432,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244500},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":313},{"level":31,"moves":[0,0,0,0],"species":41}],"party_rom_address":3213448,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244540},{"battle_script_rom_address":2311225,"party":[{"level":30,"moves":[0,0,0,0],"species":313},{"level":30,"moves":[0,0,0,0],"species":41}],"party_rom_address":3213464,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244580},{"battle_script_rom_address":2303629,"party":[{"level":22,"moves":[0,0,0,0],"species":286},{"level":22,"moves":[0,0,0,0],"species":339}],"party_rom_address":3213480,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244620},{"battle_script_rom_address":2182057,"party":[{"level":8,"moves":[0,0,0,0],"species":74},{"level":8,"moves":[0,0,0,0],"species":74}],"party_rom_address":3213496,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244660},{"battle_script_rom_address":2089386,"party":[{"level":13,"moves":[0,0,0,0],"species":66}],"party_rom_address":3213512,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244700},{"battle_script_rom_address":2089462,"party":[{"level":13,"moves":[0,0,0,0],"species":356}],"party_rom_address":3213520,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244740},{"battle_script_rom_address":2089424,"party":[{"level":13,"moves":[0,0,0,0],"species":335}],"party_rom_address":3213528,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244780},{"battle_script_rom_address":2238458,"party":[{"level":36,"moves":[0,0,0,0],"species":356}],"party_rom_address":3213536,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244820},{"battle_script_rom_address":2064320,"party":[{"level":34,"moves":[0,0,0,0],"species":330}],"party_rom_address":3213544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244860},{"battle_script_rom_address":2064801,"party":[{"level":32,"moves":[87,86,98,0],"species":338},{"level":32,"moves":[57,168,0,0],"species":289}],"party_rom_address":3213552,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3244900},{"battle_script_rom_address":2065645,"party":[{"level":35,"moves":[0,0,0,0],"species":73}],"party_rom_address":3213584,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244940},{"battle_script_rom_address":2297708,"party":[{"level":20,"moves":[0,0,0,0],"species":41}],"party_rom_address":3213592,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3244980},{"battle_script_rom_address":2067102,"party":[{"level":34,"moves":[0,0,0,0],"species":331}],"party_rom_address":3213600,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245020},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":203}],"party_rom_address":3213608,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245060},{"battle_script_rom_address":2238489,"party":[{"level":36,"moves":[0,0,0,0],"species":351}],"party_rom_address":3213616,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245100},{"battle_script_rom_address":2238613,"party":[{"level":36,"moves":[0,0,0,0],"species":64}],"party_rom_address":3213624,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245140},{"battle_script_rom_address":2238551,"party":[{"level":36,"moves":[0,0,0,0],"species":203}],"party_rom_address":3213632,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245180},{"battle_script_rom_address":2238582,"party":[{"level":36,"moves":[0,0,0,0],"species":202}],"party_rom_address":3213640,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245220},{"battle_script_rom_address":2248375,"party":[{"level":31,"moves":[0,0,0,0],"species":41},{"level":31,"moves":[0,0,0,0],"species":286}],"party_rom_address":3213648,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245260},{"battle_script_rom_address":2248437,"party":[{"level":32,"moves":[0,0,0,0],"species":318}],"party_rom_address":3213664,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245300},{"battle_script_rom_address":2251538,"party":[{"level":32,"moves":[0,0,0,0],"species":41}],"party_rom_address":3213672,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245340},{"battle_script_rom_address":2251588,"party":[{"level":32,"moves":[0,0,0,0],"species":287}],"party_rom_address":3213680,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245380},{"battle_script_rom_address":2251638,"party":[{"level":32,"moves":[0,0,0,0],"species":318}],"party_rom_address":3213688,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245420},{"battle_script_rom_address":2238520,"party":[{"level":36,"moves":[0,0,0,0],"species":177}],"party_rom_address":3213696,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245460},{"battle_script_rom_address":1973930,"party":[{"level":13,"moves":[0,0,0,0],"species":295},{"level":15,"moves":[0,0,0,0],"species":280}],"party_rom_address":3213704,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245500},{"battle_script_rom_address":1973992,"party":[{"level":13,"moves":[0,0,0,0],"species":309},{"level":15,"moves":[0,0,0,0],"species":277}],"party_rom_address":3213720,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245540},{"battle_script_rom_address":2067732,"party":[{"level":33,"moves":[0,0,0,0],"species":305},{"level":33,"moves":[0,0,0,0],"species":307}],"party_rom_address":3213736,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245580},{"battle_script_rom_address":2063684,"party":[{"level":34,"moves":[0,0,0,0],"species":120}],"party_rom_address":3213752,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245620},{"battle_script_rom_address":2564748,"party":[{"level":27,"moves":[0,0,0,0],"species":41},{"level":27,"moves":[0,0,0,0],"species":286}],"party_rom_address":3213760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245660},{"battle_script_rom_address":2297677,"party":[{"level":18,"moves":[0,0,0,0],"species":339},{"level":20,"moves":[0,0,0,0],"species":286},{"level":22,"moves":[0,0,0,0],"species":339},{"level":22,"moves":[0,0,0,0],"species":41}],"party_rom_address":3213776,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245700},{"battle_script_rom_address":2067794,"party":[{"level":33,"moves":[0,0,0,0],"species":317},{"level":33,"moves":[0,0,0,0],"species":371}],"party_rom_address":3213808,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245740},{"battle_script_rom_address":1973961,"party":[{"level":13,"moves":[0,0,0,0],"species":218},{"level":15,"moves":[0,0,0,0],"species":283}],"party_rom_address":3213824,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245780},{"battle_script_rom_address":1973706,"party":[{"level":13,"moves":[0,0,0,0],"species":309},{"level":15,"moves":[0,0,0,0],"species":277}],"party_rom_address":3213840,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245820},{"battle_script_rom_address":2344934,"party":[{"level":37,"moves":[0,0,0,0],"species":287},{"level":38,"moves":[0,0,0,0],"species":169},{"level":39,"moves":[0,0,0,0],"species":340}],"party_rom_address":3213856,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245860},{"battle_script_rom_address":2297108,"party":[{"level":24,"moves":[0,0,0,0],"species":287},{"level":24,"moves":[0,0,0,0],"species":41},{"level":25,"moves":[0,0,0,0],"species":340}],"party_rom_address":3213880,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245900},{"battle_script_rom_address":2019098,"party":[{"level":4,"moves":[0,0,0,0],"species":288},{"level":4,"moves":[0,0,0,0],"species":306}],"party_rom_address":3213904,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245940},{"battle_script_rom_address":2023889,"party":[{"level":6,"moves":[0,0,0,0],"species":295},{"level":6,"moves":[0,0,0,0],"species":306}],"party_rom_address":3213920,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3245980},{"battle_script_rom_address":2048559,"party":[{"level":9,"moves":[0,0,0,0],"species":183}],"party_rom_address":3213936,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246020},{"battle_script_rom_address":2040124,"party":[{"level":15,"moves":[0,0,0,0],"species":183},{"level":15,"moves":[0,0,0,0],"species":306},{"level":15,"moves":[0,0,0,0],"species":339}],"party_rom_address":3213944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246060},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":296},{"level":26,"moves":[0,0,0,0],"species":306}],"party_rom_address":3213968,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246100},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":296},{"level":29,"moves":[0,0,0,0],"species":307}],"party_rom_address":3213984,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246140},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":296},{"level":32,"moves":[0,0,0,0],"species":307}],"party_rom_address":3214000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246180},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":305},{"level":34,"moves":[0,0,0,0],"species":296},{"level":34,"moves":[0,0,0,0],"species":307}],"party_rom_address":3214016,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246220},{"battle_script_rom_address":2546588,"party":[{"level":16,"moves":[0,0,0,0],"species":43}],"party_rom_address":3214040,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246260},{"battle_script_rom_address":2546650,"party":[{"level":14,"moves":[0,0,0,0],"species":315},{"level":14,"moves":[0,0,0,0],"species":306},{"level":14,"moves":[0,0,0,0],"species":183}],"party_rom_address":3214048,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246300},{"battle_script_rom_address":2259356,"party":[{"level":40,"moves":[0,0,0,0],"species":325}],"party_rom_address":3214072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246340},{"battle_script_rom_address":2259387,"party":[{"level":39,"moves":[0,0,0,0],"species":118},{"level":39,"moves":[0,0,0,0],"species":313}],"party_rom_address":3214080,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246380},{"battle_script_rom_address":2019067,"party":[{"level":4,"moves":[0,0,0,0],"species":290},{"level":4,"moves":[0,0,0,0],"species":290}],"party_rom_address":3214096,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246420},{"battle_script_rom_address":2294060,"party":[{"level":3,"moves":[0,0,0,0],"species":290},{"level":3,"moves":[0,0,0,0],"species":290},{"level":3,"moves":[0,0,0,0],"species":290},{"level":3,"moves":[0,0,0,0],"species":290}],"party_rom_address":3214112,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246460},{"battle_script_rom_address":2048311,"party":[{"level":8,"moves":[0,0,0,0],"species":290},{"level":8,"moves":[0,0,0,0],"species":301}],"party_rom_address":3214144,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246500},{"battle_script_rom_address":2055082,"party":[{"level":28,"moves":[0,0,0,0],"species":301},{"level":28,"moves":[0,0,0,0],"species":302}],"party_rom_address":3214160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246540},{"battle_script_rom_address":2055113,"party":[{"level":25,"moves":[0,0,0,0],"species":386},{"level":25,"moves":[0,0,0,0],"species":387}],"party_rom_address":3214176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246580},{"battle_script_rom_address":2055144,"party":[{"level":25,"moves":[0,0,0,0],"species":302}],"party_rom_address":3214192,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246620},{"battle_script_rom_address":2294091,"party":[{"level":6,"moves":[0,0,0,0],"species":301},{"level":6,"moves":[0,0,0,0],"species":301}],"party_rom_address":3214200,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246660},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":302}],"party_rom_address":3214216,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246700},{"battle_script_rom_address":0,"party":[{"level":29,"moves":[0,0,0,0],"species":294},{"level":29,"moves":[0,0,0,0],"species":302}],"party_rom_address":3214224,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246740},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":311},{"level":31,"moves":[0,0,0,0],"species":294},{"level":31,"moves":[0,0,0,0],"species":302}],"party_rom_address":3214240,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246780},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":311},{"level":33,"moves":[0,0,0,0],"species":302},{"level":33,"moves":[0,0,0,0],"species":294},{"level":33,"moves":[0,0,0,0],"species":302}],"party_rom_address":3214264,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246820},{"battle_script_rom_address":2043817,"party":[{"level":17,"moves":[0,0,0,0],"species":339},{"level":17,"moves":[0,0,0,0],"species":66}],"party_rom_address":3214296,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246860},{"battle_script_rom_address":2043848,"party":[{"level":16,"moves":[0,0,0,0],"species":74},{"level":17,"moves":[0,0,0,0],"species":74},{"level":16,"moves":[0,0,0,0],"species":74}],"party_rom_address":3214312,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246900},{"battle_script_rom_address":2045963,"party":[{"level":18,"moves":[0,0,0,0],"species":74},{"level":18,"moves":[0,0,0,0],"species":66}],"party_rom_address":3214336,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246940},{"battle_script_rom_address":2045994,"party":[{"level":18,"moves":[0,0,0,0],"species":74},{"level":18,"moves":[0,0,0,0],"species":339}],"party_rom_address":3214352,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3246980},{"battle_script_rom_address":2549894,"party":[{"level":22,"moves":[0,0,0,0],"species":74},{"level":22,"moves":[0,0,0,0],"species":320},{"level":22,"moves":[0,0,0,0],"species":75}],"party_rom_address":3214368,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247020},{"battle_script_rom_address":2048528,"party":[{"level":8,"moves":[0,0,0,0],"species":74}],"party_rom_address":3214392,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247060},{"battle_script_rom_address":2303697,"party":[{"level":20,"moves":[0,0,0,0],"species":74},{"level":20,"moves":[0,0,0,0],"species":318}],"party_rom_address":3214400,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247100},{"battle_script_rom_address":0,"party":[{"level":9,"moves":[150,55,0,0],"species":313}],"party_rom_address":3214416,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247140},{"battle_script_rom_address":0,"party":[{"level":10,"moves":[16,45,0,0],"species":310},{"level":10,"moves":[44,184,0,0],"species":286}],"party_rom_address":3214432,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247180},{"battle_script_rom_address":2289712,"party":[{"level":16,"moves":[0,0,0,0],"species":74},{"level":16,"moves":[0,0,0,0],"species":74},{"level":16,"moves":[0,0,0,0],"species":66}],"party_rom_address":3214464,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247220},{"battle_script_rom_address":0,"party":[{"level":24,"moves":[0,0,0,0],"species":74},{"level":24,"moves":[0,0,0,0],"species":74},{"level":24,"moves":[0,0,0,0],"species":74},{"level":24,"moves":[0,0,0,0],"species":75}],"party_rom_address":3214488,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247260},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":74},{"level":27,"moves":[0,0,0,0],"species":74},{"level":27,"moves":[0,0,0,0],"species":75},{"level":27,"moves":[0,0,0,0],"species":75}],"party_rom_address":3214520,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247300},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":74},{"level":30,"moves":[0,0,0,0],"species":75},{"level":30,"moves":[0,0,0,0],"species":75},{"level":30,"moves":[0,0,0,0],"species":75}],"party_rom_address":3214552,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247340},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":75},{"level":33,"moves":[0,0,0,0],"species":75},{"level":33,"moves":[0,0,0,0],"species":75},{"level":33,"moves":[0,0,0,0],"species":76}],"party_rom_address":3214584,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247380},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":316},{"level":31,"moves":[0,0,0,0],"species":338}],"party_rom_address":3214616,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247420},{"battle_script_rom_address":0,"party":[{"level":45,"moves":[0,0,0,0],"species":325},{"level":45,"moves":[0,0,0,0],"species":325}],"party_rom_address":3214632,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247460},{"battle_script_rom_address":0,"party":[{"level":25,"moves":[0,0,0,0],"species":386},{"level":25,"moves":[0,0,0,0],"species":387}],"party_rom_address":3214648,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247500},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":386},{"level":30,"moves":[0,0,0,0],"species":387}],"party_rom_address":3214664,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247540},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":386},{"level":33,"moves":[0,0,0,0],"species":387}],"party_rom_address":3214680,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247580},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":386},{"level":36,"moves":[0,0,0,0],"species":387}],"party_rom_address":3214696,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247620},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":386},{"level":39,"moves":[0,0,0,0],"species":387}],"party_rom_address":3214712,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247660},{"battle_script_rom_address":2537289,"party":[{"level":13,"moves":[0,0,0,0],"species":118}],"party_rom_address":3214728,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247700},{"battle_script_rom_address":2097522,"party":[{"level":23,"moves":[53,154,185,20],"species":317}],"party_rom_address":3214736,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247740},{"battle_script_rom_address":2161586,"party":[{"level":17,"moves":[117,197,93,9],"species":356},{"level":17,"moves":[9,197,93,96],"species":356}],"party_rom_address":3214752,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247780},{"battle_script_rom_address":2097491,"party":[{"level":23,"moves":[117,197,93,7],"species":356}],"party_rom_address":3214784,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247820},{"battle_script_rom_address":2055519,"party":[{"level":25,"moves":[33,120,124,108],"species":109},{"level":25,"moves":[33,139,124,108],"species":109}],"party_rom_address":3214800,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247860},{"battle_script_rom_address":2059810,"party":[{"level":28,"moves":[139,120,124,108],"species":109},{"level":28,"moves":[28,104,210,14],"species":302}],"party_rom_address":3214832,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247900},{"battle_script_rom_address":2059841,"party":[{"level":28,"moves":[141,154,170,91],"species":301},{"level":28,"moves":[33,120,124,108],"species":109}],"party_rom_address":3214864,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3247940},{"battle_script_rom_address":2196154,"party":[{"level":29,"moves":[0,0,0,0],"species":305},{"level":29,"moves":[0,0,0,0],"species":178}],"party_rom_address":3214896,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3247980},{"battle_script_rom_address":2196185,"party":[{"level":27,"moves":[0,0,0,0],"species":358},{"level":27,"moves":[0,0,0,0],"species":358},{"level":27,"moves":[0,0,0,0],"species":358}],"party_rom_address":3214912,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248020},{"battle_script_rom_address":1966818,"party":[{"level":16,"moves":[0,0,0,0],"species":392}],"party_rom_address":3214936,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248060},{"battle_script_rom_address":2326195,"party":[{"level":47,"moves":[76,219,225,93],"species":359},{"level":46,"moves":[47,18,204,185],"species":316},{"level":47,"moves":[89,73,202,92],"species":363},{"level":44,"moves":[48,85,161,103],"species":82},{"level":48,"moves":[104,91,94,248],"species":394}],"party_rom_address":3214944,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3248100},{"battle_script_rom_address":0,"party":[{"level":50,"moves":[76,219,225,93],"species":359},{"level":49,"moves":[47,18,204,185],"species":316},{"level":50,"moves":[89,73,202,92],"species":363},{"level":47,"moves":[48,85,161,103],"species":82},{"level":51,"moves":[104,91,94,248],"species":394}],"party_rom_address":3215024,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3248140},{"battle_script_rom_address":0,"party":[{"level":53,"moves":[76,219,225,93],"species":359},{"level":52,"moves":[47,18,204,185],"species":316},{"level":53,"moves":[89,73,202,92],"species":363},{"level":50,"moves":[48,85,161,103],"species":82},{"level":54,"moves":[104,91,94,248],"species":394}],"party_rom_address":3215104,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3248180},{"battle_script_rom_address":0,"party":[{"level":56,"moves":[76,219,225,93],"species":359},{"level":55,"moves":[47,18,204,185],"species":316},{"level":56,"moves":[89,73,202,92],"species":363},{"level":53,"moves":[48,85,161,103],"species":82},{"level":57,"moves":[104,91,94,248],"species":394}],"party_rom_address":3215184,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3248220},{"battle_script_rom_address":1981539,"party":[{"level":31,"moves":[0,0,0,0],"species":369},{"level":32,"moves":[0,0,0,0],"species":218},{"level":32,"moves":[0,0,0,0],"species":310},{"level":34,"moves":[0,0,0,0],"species":278}],"party_rom_address":3215264,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248260},{"battle_script_rom_address":1981483,"party":[{"level":31,"moves":[0,0,0,0],"species":369},{"level":32,"moves":[0,0,0,0],"species":310},{"level":32,"moves":[0,0,0,0],"species":297},{"level":34,"moves":[0,0,0,0],"species":281}],"party_rom_address":3215296,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248300},{"battle_script_rom_address":1981511,"party":[{"level":31,"moves":[0,0,0,0],"species":369},{"level":32,"moves":[0,0,0,0],"species":297},{"level":32,"moves":[0,0,0,0],"species":218},{"level":34,"moves":[0,0,0,0],"species":284}],"party_rom_address":3215328,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248340},{"battle_script_rom_address":1981455,"party":[{"level":31,"moves":[0,0,0,0],"species":369},{"level":32,"moves":[0,0,0,0],"species":218},{"level":32,"moves":[0,0,0,0],"species":310},{"level":34,"moves":[0,0,0,0],"species":278}],"party_rom_address":3215360,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248380},{"battle_script_rom_address":1981399,"party":[{"level":31,"moves":[0,0,0,0],"species":369},{"level":32,"moves":[0,0,0,0],"species":310},{"level":32,"moves":[0,0,0,0],"species":297},{"level":34,"moves":[0,0,0,0],"species":281}],"party_rom_address":3215392,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248420},{"battle_script_rom_address":1981427,"party":[{"level":31,"moves":[0,0,0,0],"species":369},{"level":32,"moves":[0,0,0,0],"species":297},{"level":32,"moves":[0,0,0,0],"species":218},{"level":34,"moves":[0,0,0,0],"species":284}],"party_rom_address":3215424,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248460},{"battle_script_rom_address":2064677,"party":[{"level":30,"moves":[0,0,0,0],"species":313},{"level":31,"moves":[0,0,0,0],"species":72},{"level":32,"moves":[0,0,0,0],"species":331}],"party_rom_address":3215456,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248500},{"battle_script_rom_address":2064708,"party":[{"level":31,"moves":[0,0,0,0],"species":330},{"level":34,"moves":[0,0,0,0],"species":73}],"party_rom_address":3215480,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248540},{"battle_script_rom_address":2064739,"party":[{"level":15,"moves":[0,0,0,0],"species":129},{"level":25,"moves":[0,0,0,0],"species":129},{"level":35,"moves":[0,0,0,0],"species":130}],"party_rom_address":3215496,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248580},{"battle_script_rom_address":2065552,"party":[{"level":34,"moves":[0,0,0,0],"species":44},{"level":34,"moves":[0,0,0,0],"species":184}],"party_rom_address":3215520,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248620},{"battle_script_rom_address":2065583,"party":[{"level":34,"moves":[0,0,0,0],"species":300},{"level":34,"moves":[0,0,0,0],"species":320}],"party_rom_address":3215536,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248660},{"battle_script_rom_address":2064832,"party":[{"level":34,"moves":[0,0,0,0],"species":67}],"party_rom_address":3215552,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248700},{"battle_script_rom_address":2065614,"party":[{"level":31,"moves":[0,0,0,0],"species":72},{"level":31,"moves":[0,0,0,0],"species":72},{"level":36,"moves":[0,0,0,0],"species":313}],"party_rom_address":3215560,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248740},{"battle_script_rom_address":2064770,"party":[{"level":32,"moves":[0,0,0,0],"species":305},{"level":32,"moves":[0,0,0,0],"species":227}],"party_rom_address":3215584,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248780},{"battle_script_rom_address":2067040,"party":[{"level":33,"moves":[0,0,0,0],"species":341},{"level":33,"moves":[0,0,0,0],"species":331}],"party_rom_address":3215600,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248820},{"battle_script_rom_address":2067071,"party":[{"level":34,"moves":[0,0,0,0],"species":170}],"party_rom_address":3215616,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248860},{"battle_script_rom_address":0,"party":[{"level":19,"moves":[0,0,0,0],"species":308},{"level":19,"moves":[0,0,0,0],"species":308}],"party_rom_address":3215624,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3248900},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[47,31,219,76],"species":358},{"level":35,"moves":[53,36,156,89],"species":339}],"party_rom_address":3215640,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3248940},{"battle_script_rom_address":0,"party":[{"level":18,"moves":[74,78,72,73],"species":363},{"level":20,"moves":[111,205,44,88],"species":75}],"party_rom_address":3215672,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3248980},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[16,60,92,182],"species":294},{"level":27,"moves":[16,72,213,78],"species":292}],"party_rom_address":3215704,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3249020},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[94,7,244,182],"species":357},{"level":39,"moves":[8,61,156,187],"species":336}],"party_rom_address":3215736,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3249060},{"battle_script_rom_address":0,"party":[{"level":43,"moves":[94,7,244,182],"species":357},{"level":43,"moves":[8,61,156,187],"species":336}],"party_rom_address":3215768,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3249100},{"battle_script_rom_address":0,"party":[{"level":46,"moves":[94,7,244,182],"species":357},{"level":46,"moves":[8,61,156,187],"species":336}],"party_rom_address":3215800,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3249140},{"battle_script_rom_address":0,"party":[{"level":49,"moves":[94,7,244,182],"species":357},{"level":49,"moves":[8,61,156,187],"species":336}],"party_rom_address":3215832,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3249180},{"battle_script_rom_address":0,"party":[{"level":52,"moves":[94,7,244,182],"species":357},{"level":52,"moves":[8,61,156,187],"species":336}],"party_rom_address":3215864,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3249220},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":184},{"level":33,"moves":[0,0,0,0],"species":309}],"party_rom_address":3215896,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249260},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":170},{"level":33,"moves":[0,0,0,0],"species":330}],"party_rom_address":3215912,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249300},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[0,0,0,0],"species":170},{"level":40,"moves":[0,0,0,0],"species":330}],"party_rom_address":3215928,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249340},{"battle_script_rom_address":0,"party":[{"level":45,"moves":[0,0,0,0],"species":171},{"level":43,"moves":[0,0,0,0],"species":330}],"party_rom_address":3215944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249380},{"battle_script_rom_address":0,"party":[{"level":48,"moves":[0,0,0,0],"species":171},{"level":46,"moves":[0,0,0,0],"species":331}],"party_rom_address":3215960,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249420},{"battle_script_rom_address":0,"party":[{"level":51,"moves":[0,0,0,0],"species":171},{"level":49,"moves":[0,0,0,0],"species":331}],"party_rom_address":3215976,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249460},{"battle_script_rom_address":0,"party":[{"level":27,"moves":[0,0,0,0],"species":118},{"level":25,"moves":[0,0,0,0],"species":72}],"party_rom_address":3215992,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249500},{"battle_script_rom_address":2055550,"party":[{"level":29,"moves":[0,0,0,0],"species":129},{"level":20,"moves":[0,0,0,0],"species":72},{"level":26,"moves":[0,0,0,0],"species":328},{"level":23,"moves":[0,0,0,0],"species":330}],"party_rom_address":3216008,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249540},{"battle_script_rom_address":2048807,"party":[{"level":8,"moves":[0,0,0,0],"species":288},{"level":8,"moves":[0,0,0,0],"species":286}],"party_rom_address":3216040,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3249580},{"battle_script_rom_address":2048776,"party":[{"level":8,"moves":[0,0,0,0],"species":295},{"level":8,"moves":[0,0,0,0],"species":288}],"party_rom_address":3216056,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3249620},{"battle_script_rom_address":2024517,"party":[{"level":9,"moves":[0,0,0,0],"species":129}],"party_rom_address":3216072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249660},{"battle_script_rom_address":2030479,"party":[{"level":13,"moves":[0,0,0,0],"species":183}],"party_rom_address":3216080,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249700},{"battle_script_rom_address":2030448,"party":[{"level":12,"moves":[0,0,0,0],"species":72},{"level":12,"moves":[0,0,0,0],"species":72}],"party_rom_address":3216088,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249740},{"battle_script_rom_address":2033204,"party":[{"level":14,"moves":[0,0,0,0],"species":354},{"level":14,"moves":[0,0,0,0],"species":353}],"party_rom_address":3216104,"pokemon_data_type":"ITEM_DEFAULT_MOVES","rom_address":3249780},{"battle_script_rom_address":2033235,"party":[{"level":14,"moves":[0,0,0,0],"species":337},{"level":14,"moves":[0,0,0,0],"species":100}],"party_rom_address":3216120,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249820},{"battle_script_rom_address":2033266,"party":[{"level":15,"moves":[0,0,0,0],"species":81}],"party_rom_address":3216136,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249860},{"battle_script_rom_address":2020630,"party":[{"level":15,"moves":[0,0,0,0],"species":100}],"party_rom_address":3216144,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249900},{"battle_script_rom_address":2020661,"party":[{"level":15,"moves":[0,0,0,0],"species":335}],"party_rom_address":3216152,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249940},{"battle_script_rom_address":2041104,"party":[{"level":19,"moves":[0,0,0,0],"species":27}],"party_rom_address":3216160,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3249980},{"battle_script_rom_address":2041135,"party":[{"level":18,"moves":[0,0,0,0],"species":363}],"party_rom_address":3216168,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250020},{"battle_script_rom_address":2041073,"party":[{"level":18,"moves":[0,0,0,0],"species":306}],"party_rom_address":3216176,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250060},{"battle_script_rom_address":2041042,"party":[{"level":18,"moves":[0,0,0,0],"species":339}],"party_rom_address":3216184,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250100},{"battle_script_rom_address":2045098,"party":[{"level":17,"moves":[0,0,0,0],"species":183},{"level":19,"moves":[0,0,0,0],"species":296}],"party_rom_address":3216192,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250140},{"battle_script_rom_address":2045129,"party":[{"level":17,"moves":[0,0,0,0],"species":227},{"level":19,"moves":[0,0,0,0],"species":305}],"party_rom_address":3216208,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250180},{"battle_script_rom_address":2045160,"party":[{"level":18,"moves":[0,0,0,0],"species":318},{"level":18,"moves":[0,0,0,0],"species":27}],"party_rom_address":3216224,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250220},{"battle_script_rom_address":2045191,"party":[{"level":18,"moves":[0,0,0,0],"species":382},{"level":18,"moves":[0,0,0,0],"species":382}],"party_rom_address":3216240,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250260},{"battle_script_rom_address":2046431,"party":[{"level":18,"moves":[0,0,0,0],"species":296},{"level":18,"moves":[0,0,0,0],"species":183}],"party_rom_address":3216256,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250300},{"battle_script_rom_address":2046493,"party":[{"level":19,"moves":[0,0,0,0],"species":323}],"party_rom_address":3216272,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250340},{"battle_script_rom_address":2046462,"party":[{"level":19,"moves":[0,0,0,0],"species":299}],"party_rom_address":3216280,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250380},{"battle_script_rom_address":2053150,"party":[{"level":14,"moves":[0,0,0,0],"species":288},{"level":14,"moves":[0,0,0,0],"species":382},{"level":14,"moves":[0,0,0,0],"species":337}],"party_rom_address":3216288,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250420},{"battle_script_rom_address":2341334,"party":[{"level":29,"moves":[0,0,0,0],"species":41}],"party_rom_address":3216312,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250460},{"battle_script_rom_address":2341365,"party":[{"level":29,"moves":[0,0,0,0],"species":286}],"party_rom_address":3216320,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250500},{"battle_script_rom_address":2342090,"party":[{"level":29,"moves":[0,0,0,0],"species":339}],"party_rom_address":3216328,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250540},{"battle_script_rom_address":2342121,"party":[{"level":28,"moves":[0,0,0,0],"species":318},{"level":28,"moves":[0,0,0,0],"species":41}],"party_rom_address":3216336,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250580},{"battle_script_rom_address":2342152,"party":[{"level":28,"moves":[0,0,0,0],"species":318},{"level":28,"moves":[0,0,0,0],"species":339}],"party_rom_address":3216352,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250620},{"battle_script_rom_address":2342817,"party":[{"level":29,"moves":[0,0,0,0],"species":287}],"party_rom_address":3216368,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250660},{"battle_script_rom_address":2342848,"party":[{"level":29,"moves":[0,0,0,0],"species":41}],"party_rom_address":3216376,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250700},{"battle_script_rom_address":2342879,"party":[{"level":29,"moves":[0,0,0,0],"species":286}],"party_rom_address":3216384,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250740},{"battle_script_rom_address":2343757,"party":[{"level":29,"moves":[0,0,0,0],"species":41}],"party_rom_address":3216392,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250780},{"battle_script_rom_address":2344319,"party":[{"level":29,"moves":[0,0,0,0],"species":287}],"party_rom_address":3216400,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250820},{"battle_script_rom_address":2345034,"party":[{"level":29,"moves":[0,0,0,0],"species":318}],"party_rom_address":3216408,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250860},{"battle_script_rom_address":2345065,"party":[{"level":29,"moves":[0,0,0,0],"species":339}],"party_rom_address":3216416,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250900},{"battle_script_rom_address":2345096,"party":[{"level":29,"moves":[0,0,0,0],"species":41}],"party_rom_address":3216424,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250940},{"battle_script_rom_address":2342059,"party":[{"level":29,"moves":[0,0,0,0],"species":287}],"party_rom_address":3216432,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3250980},{"battle_script_rom_address":2342786,"party":[{"level":29,"moves":[0,0,0,0],"species":339}],"party_rom_address":3216440,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251020},{"battle_script_rom_address":2343788,"party":[{"level":29,"moves":[0,0,0,0],"species":318}],"party_rom_address":3216448,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251060},{"battle_script_rom_address":2345127,"party":[{"level":26,"moves":[0,0,0,0],"species":339},{"level":28,"moves":[0,0,0,0],"species":287},{"level":30,"moves":[0,0,0,0],"species":41},{"level":33,"moves":[0,0,0,0],"species":340}],"party_rom_address":3216456,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251100},{"battle_script_rom_address":2067763,"party":[{"level":33,"moves":[0,0,0,0],"species":310},{"level":33,"moves":[0,0,0,0],"species":340}],"party_rom_address":3216488,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251140},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[0,0,0,0],"species":287},{"level":43,"moves":[0,0,0,0],"species":169},{"level":44,"moves":[0,0,0,0],"species":340}],"party_rom_address":3216504,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251180},{"battle_script_rom_address":2020692,"party":[{"level":15,"moves":[0,0,0,0],"species":72}],"party_rom_address":3216528,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251220},{"battle_script_rom_address":2020723,"party":[{"level":15,"moves":[0,0,0,0],"species":183}],"party_rom_address":3216536,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251260},{"battle_script_rom_address":2027900,"party":[{"level":25,"moves":[0,0,0,0],"species":27},{"level":25,"moves":[0,0,0,0],"species":27}],"party_rom_address":3216544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251300},{"battle_script_rom_address":2027869,"party":[{"level":25,"moves":[0,0,0,0],"species":304},{"level":25,"moves":[0,0,0,0],"species":309}],"party_rom_address":3216560,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251340},{"battle_script_rom_address":2028918,"party":[{"level":26,"moves":[0,0,0,0],"species":120}],"party_rom_address":3216576,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251380},{"battle_script_rom_address":2029105,"party":[{"level":24,"moves":[0,0,0,0],"species":309},{"level":24,"moves":[0,0,0,0],"species":66},{"level":24,"moves":[0,0,0,0],"species":72}],"party_rom_address":3216584,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251420},{"battle_script_rom_address":2029074,"party":[{"level":24,"moves":[0,0,0,0],"species":338},{"level":24,"moves":[0,0,0,0],"species":305},{"level":24,"moves":[0,0,0,0],"species":338}],"party_rom_address":3216608,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251460},{"battle_script_rom_address":2030510,"party":[{"level":25,"moves":[0,0,0,0],"species":227},{"level":25,"moves":[0,0,0,0],"species":227}],"party_rom_address":3216632,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251500},{"battle_script_rom_address":2041166,"party":[{"level":22,"moves":[0,0,0,0],"species":183},{"level":22,"moves":[0,0,0,0],"species":296}],"party_rom_address":3216648,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251540},{"battle_script_rom_address":2041197,"party":[{"level":22,"moves":[0,0,0,0],"species":27},{"level":22,"moves":[0,0,0,0],"species":28}],"party_rom_address":3216664,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251580},{"battle_script_rom_address":2041228,"party":[{"level":22,"moves":[0,0,0,0],"species":304},{"level":22,"moves":[0,0,0,0],"species":299}],"party_rom_address":3216680,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251620},{"battle_script_rom_address":2044020,"party":[{"level":18,"moves":[0,0,0,0],"species":339},{"level":18,"moves":[0,0,0,0],"species":218}],"party_rom_address":3216696,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251660},{"battle_script_rom_address":2044051,"party":[{"level":18,"moves":[0,0,0,0],"species":306},{"level":18,"moves":[0,0,0,0],"species":363}],"party_rom_address":3216712,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251700},{"battle_script_rom_address":2047305,"party":[{"level":26,"moves":[0,0,0,0],"species":84},{"level":26,"moves":[0,0,0,0],"species":85}],"party_rom_address":3216728,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251740},{"battle_script_rom_address":2047336,"party":[{"level":26,"moves":[0,0,0,0],"species":302},{"level":26,"moves":[0,0,0,0],"species":367}],"party_rom_address":3216744,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251780},{"battle_script_rom_address":2047367,"party":[{"level":26,"moves":[0,0,0,0],"species":64},{"level":26,"moves":[0,0,0,0],"species":393}],"party_rom_address":3216760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251820},{"battle_script_rom_address":2047398,"party":[{"level":26,"moves":[0,0,0,0],"species":356},{"level":26,"moves":[0,0,0,0],"species":335}],"party_rom_address":3216776,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251860},{"battle_script_rom_address":2047429,"party":[{"level":18,"moves":[0,0,0,0],"species":356},{"level":18,"moves":[0,0,0,0],"species":351}],"party_rom_address":3216792,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251900},{"battle_script_rom_address":2048838,"party":[{"level":8,"moves":[0,0,0,0],"species":74},{"level":8,"moves":[0,0,0,0],"species":74}],"party_rom_address":3216808,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251940},{"battle_script_rom_address":2048869,"party":[{"level":8,"moves":[0,0,0,0],"species":306},{"level":8,"moves":[0,0,0,0],"species":295}],"party_rom_address":3216824,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3251980},{"battle_script_rom_address":2051934,"party":[{"level":17,"moves":[0,0,0,0],"species":84}],"party_rom_address":3216840,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252020},{"battle_script_rom_address":2051965,"party":[{"level":17,"moves":[0,0,0,0],"species":392}],"party_rom_address":3216848,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252060},{"battle_script_rom_address":2051996,"party":[{"level":17,"moves":[0,0,0,0],"species":356}],"party_rom_address":3216856,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252100},{"battle_script_rom_address":2067825,"party":[{"level":33,"moves":[0,0,0,0],"species":363},{"level":33,"moves":[0,0,0,0],"species":357}],"party_rom_address":3216864,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252140},{"battle_script_rom_address":2055581,"party":[{"level":26,"moves":[0,0,0,0],"species":338}],"party_rom_address":3216880,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252180},{"battle_script_rom_address":2055612,"party":[{"level":25,"moves":[0,0,0,0],"species":218},{"level":25,"moves":[0,0,0,0],"species":339}],"party_rom_address":3216888,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252220},{"battle_script_rom_address":2055643,"party":[{"level":26,"moves":[0,0,0,0],"species":118}],"party_rom_address":3216904,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252260},{"battle_script_rom_address":2059872,"party":[{"level":30,"moves":[87,98,86,0],"species":338}],"party_rom_address":3216912,"pokemon_data_type":"NO_ITEM_CUSTOM_MOVES","rom_address":3252300},{"battle_script_rom_address":2059903,"party":[{"level":28,"moves":[0,0,0,0],"species":356},{"level":28,"moves":[0,0,0,0],"species":335}],"party_rom_address":3216928,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252340},{"battle_script_rom_address":2061522,"party":[{"level":29,"moves":[0,0,0,0],"species":294},{"level":29,"moves":[0,0,0,0],"species":292}],"party_rom_address":3216944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252380},{"battle_script_rom_address":2061553,"party":[{"level":25,"moves":[0,0,0,0],"species":335},{"level":25,"moves":[0,0,0,0],"species":309},{"level":25,"moves":[0,0,0,0],"species":369},{"level":25,"moves":[0,0,0,0],"species":288},{"level":25,"moves":[0,0,0,0],"species":337},{"level":25,"moves":[0,0,0,0],"species":339}],"party_rom_address":3216960,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252420},{"battle_script_rom_address":2061584,"party":[{"level":25,"moves":[0,0,0,0],"species":286},{"level":25,"moves":[0,0,0,0],"species":306},{"level":25,"moves":[0,0,0,0],"species":337},{"level":25,"moves":[0,0,0,0],"species":183},{"level":25,"moves":[0,0,0,0],"species":27},{"level":25,"moves":[0,0,0,0],"species":367}],"party_rom_address":3217008,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252460},{"battle_script_rom_address":2061646,"party":[{"level":29,"moves":[0,0,0,0],"species":371},{"level":29,"moves":[0,0,0,0],"species":365}],"party_rom_address":3217056,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252500},{"battle_script_rom_address":1973644,"party":[{"level":13,"moves":[0,0,0,0],"species":295},{"level":15,"moves":[0,0,0,0],"species":280}],"party_rom_address":3217072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252540},{"battle_script_rom_address":1973675,"party":[{"level":13,"moves":[0,0,0,0],"species":321},{"level":15,"moves":[0,0,0,0],"species":283}],"party_rom_address":3217088,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3252580},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[182,205,222,153],"species":76},{"level":35,"moves":[14,58,57,157],"species":140},{"level":35,"moves":[231,153,46,157],"species":95},{"level":37,"moves":[104,153,182,157],"species":320}],"party_rom_address":3217104,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252620},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[182,58,157,57],"species":138},{"level":37,"moves":[182,205,222,153],"species":76},{"level":40,"moves":[14,58,57,157],"species":141},{"level":40,"moves":[231,153,46,157],"species":95},{"level":42,"moves":[104,153,182,157],"species":320}],"party_rom_address":3217168,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252660},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[182,58,157,57],"species":139},{"level":42,"moves":[182,205,89,153],"species":76},{"level":45,"moves":[14,58,57,157],"species":141},{"level":45,"moves":[231,153,46,157],"species":95},{"level":47,"moves":[104,153,182,157],"species":320}],"party_rom_address":3217248,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252700},{"battle_script_rom_address":0,"party":[{"level":47,"moves":[157,63,48,182],"species":142},{"level":47,"moves":[8,205,89,153],"species":76},{"level":47,"moves":[182,58,157,57],"species":139},{"level":50,"moves":[14,58,57,157],"species":141},{"level":50,"moves":[231,153,46,157],"species":208},{"level":52,"moves":[104,153,182,157],"species":320}],"party_rom_address":3217328,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252740},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[2,157,8,83],"species":68},{"level":33,"moves":[94,113,115,8],"species":356},{"level":35,"moves":[228,68,182,167],"species":237},{"level":37,"moves":[252,8,187,89],"species":336}],"party_rom_address":3217424,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252780},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[2,157,8,83],"species":68},{"level":38,"moves":[94,113,115,8],"species":357},{"level":40,"moves":[228,68,182,167],"species":237},{"level":42,"moves":[252,8,187,89],"species":336}],"party_rom_address":3217488,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252820},{"battle_script_rom_address":0,"party":[{"level":40,"moves":[71,182,7,8],"species":107},{"level":43,"moves":[2,157,8,83],"species":68},{"level":43,"moves":[8,113,115,94],"species":357},{"level":45,"moves":[228,68,182,167],"species":237},{"level":47,"moves":[252,8,187,89],"species":336}],"party_rom_address":3217552,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252860},{"battle_script_rom_address":0,"party":[{"level":46,"moves":[25,8,89,83],"species":106},{"level":46,"moves":[71,182,7,8],"species":107},{"level":48,"moves":[238,157,8,83],"species":68},{"level":48,"moves":[8,113,115,94],"species":357},{"level":50,"moves":[228,68,182,167],"species":237},{"level":52,"moves":[252,8,187,89],"species":336}],"party_rom_address":3217632,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252900},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[87,182,86,113],"species":179},{"level":36,"moves":[205,87,153,240],"species":101},{"level":38,"moves":[48,182,87,240],"species":82},{"level":40,"moves":[44,86,87,182],"species":338}],"party_rom_address":3217728,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252940},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[87,21,240,95],"species":25},{"level":41,"moves":[87,182,86,113],"species":180},{"level":41,"moves":[205,87,153,240],"species":101},{"level":43,"moves":[48,182,87,240],"species":82},{"level":45,"moves":[44,86,87,182],"species":338}],"party_rom_address":3217792,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3252980},{"battle_script_rom_address":0,"party":[{"level":44,"moves":[87,21,240,182],"species":26},{"level":46,"moves":[87,182,86,113],"species":181},{"level":46,"moves":[205,87,153,240],"species":101},{"level":48,"moves":[48,182,87,240],"species":82},{"level":50,"moves":[44,86,87,182],"species":338}],"party_rom_address":3217872,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253020},{"battle_script_rom_address":0,"party":[{"level":50,"moves":[129,8,9,113],"species":125},{"level":51,"moves":[87,21,240,182],"species":26},{"level":51,"moves":[87,182,86,113],"species":181},{"level":53,"moves":[205,87,153,240],"species":101},{"level":53,"moves":[48,182,87,240],"species":82},{"level":55,"moves":[44,86,87,182],"species":338}],"party_rom_address":3217952,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253060},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[59,213,113,157],"species":219},{"level":36,"moves":[53,213,76,84],"species":77},{"level":38,"moves":[59,241,89,213],"species":340},{"level":40,"moves":[59,241,153,213],"species":321}],"party_rom_address":3218048,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253100},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[14,53,46,241],"species":58},{"level":43,"moves":[59,213,113,157],"species":219},{"level":41,"moves":[53,213,76,84],"species":77},{"level":43,"moves":[59,241,89,213],"species":340},{"level":45,"moves":[59,241,153,213],"species":321}],"party_rom_address":3218112,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253140},{"battle_script_rom_address":0,"party":[{"level":46,"moves":[46,76,13,241],"species":228},{"level":46,"moves":[14,53,241,46],"species":58},{"level":48,"moves":[59,213,113,157],"species":219},{"level":46,"moves":[53,213,76,84],"species":78},{"level":48,"moves":[59,241,89,213],"species":340},{"level":50,"moves":[59,241,153,213],"species":321}],"party_rom_address":3218192,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253180},{"battle_script_rom_address":0,"party":[{"level":51,"moves":[14,53,241,46],"species":59},{"level":53,"moves":[59,213,113,157],"species":219},{"level":51,"moves":[46,76,13,241],"species":229},{"level":51,"moves":[53,213,76,84],"species":78},{"level":53,"moves":[59,241,89,213],"species":340},{"level":55,"moves":[59,241,153,213],"species":321}],"party_rom_address":3218288,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253220},{"battle_script_rom_address":0,"party":[{"level":42,"moves":[113,47,29,8],"species":113},{"level":42,"moves":[59,247,38,126],"species":366},{"level":43,"moves":[42,29,7,95],"species":308},{"level":45,"moves":[63,53,85,247],"species":366}],"party_rom_address":3218384,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253260},{"battle_script_rom_address":0,"party":[{"level":47,"moves":[59,247,38,126],"species":366},{"level":47,"moves":[113,47,29,8],"species":113},{"level":45,"moves":[252,146,203,179],"species":115},{"level":48,"moves":[42,29,7,95],"species":308},{"level":50,"moves":[63,53,85,247],"species":366}],"party_rom_address":3218448,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253300},{"battle_script_rom_address":0,"party":[{"level":52,"moves":[59,247,38,126],"species":366},{"level":52,"moves":[113,47,29,8],"species":242},{"level":50,"moves":[252,146,203,179],"species":115},{"level":53,"moves":[42,29,7,95],"species":308},{"level":55,"moves":[63,53,85,247],"species":366}],"party_rom_address":3218528,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253340},{"battle_script_rom_address":0,"party":[{"level":57,"moves":[59,247,38,126],"species":366},{"level":57,"moves":[182,47,29,8],"species":242},{"level":55,"moves":[252,146,203,179],"species":115},{"level":57,"moves":[36,182,126,89],"species":128},{"level":58,"moves":[42,29,7,95],"species":308},{"level":60,"moves":[63,53,85,247],"species":366}],"party_rom_address":3218608,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253380},{"battle_script_rom_address":0,"party":[{"level":40,"moves":[86,85,182,58],"species":147},{"level":38,"moves":[241,76,76,89],"species":369},{"level":41,"moves":[57,48,182,76],"species":310},{"level":43,"moves":[18,191,211,76],"species":227},{"level":45,"moves":[76,156,93,89],"species":359}],"party_rom_address":3218704,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253420},{"battle_script_rom_address":0,"party":[{"level":43,"moves":[95,94,115,138],"species":163},{"level":43,"moves":[241,76,76,89],"species":369},{"level":45,"moves":[86,85,182,58],"species":148},{"level":46,"moves":[57,48,182,76],"species":310},{"level":48,"moves":[18,191,211,76],"species":227},{"level":50,"moves":[76,156,93,89],"species":359}],"party_rom_address":3218784,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253460},{"battle_script_rom_address":0,"party":[{"level":48,"moves":[95,94,115,138],"species":164},{"level":49,"moves":[241,76,76,89],"species":369},{"level":50,"moves":[86,85,182,58],"species":148},{"level":51,"moves":[57,48,182,76],"species":310},{"level":53,"moves":[18,191,211,76],"species":227},{"level":55,"moves":[76,156,93,89],"species":359}],"party_rom_address":3218880,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253500},{"battle_script_rom_address":0,"party":[{"level":53,"moves":[95,94,115,138],"species":164},{"level":54,"moves":[241,76,76,89],"species":369},{"level":55,"moves":[57,48,182,76],"species":310},{"level":55,"moves":[63,85,89,58],"species":149},{"level":58,"moves":[18,191,211,76],"species":227},{"level":60,"moves":[143,156,93,89],"species":359}],"party_rom_address":3218976,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253540},{"battle_script_rom_address":0,"party":[{"level":48,"moves":[25,94,91,182],"species":79},{"level":49,"moves":[89,246,94,113],"species":319},{"level":49,"moves":[94,156,109,91],"species":178},{"level":50,"moves":[89,94,156,91],"species":348},{"level":50,"moves":[241,76,94,53],"species":349}],"party_rom_address":3219072,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253580},{"battle_script_rom_address":0,"party":[{"level":53,"moves":[95,138,29,182],"species":96},{"level":53,"moves":[25,94,91,182],"species":79},{"level":54,"moves":[89,153,94,113],"species":319},{"level":54,"moves":[94,156,109,91],"species":178},{"level":55,"moves":[89,94,156,91],"species":348},{"level":55,"moves":[241,76,94,53],"species":349}],"party_rom_address":3219152,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253620},{"battle_script_rom_address":0,"party":[{"level":58,"moves":[95,138,29,182],"species":97},{"level":59,"moves":[89,153,94,113],"species":319},{"level":58,"moves":[25,94,91,182],"species":79},{"level":59,"moves":[94,156,109,91],"species":178},{"level":60,"moves":[89,94,156,91],"species":348},{"level":60,"moves":[241,76,94,53],"species":349}],"party_rom_address":3219248,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253660},{"battle_script_rom_address":0,"party":[{"level":63,"moves":[95,138,29,182],"species":97},{"level":64,"moves":[89,153,94,113],"species":319},{"level":63,"moves":[25,94,91,182],"species":199},{"level":64,"moves":[94,156,109,91],"species":178},{"level":65,"moves":[89,94,156,91],"species":348},{"level":65,"moves":[241,76,94,53],"species":349}],"party_rom_address":3219344,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253700},{"battle_script_rom_address":0,"party":[{"level":46,"moves":[95,240,182,56],"species":60},{"level":46,"moves":[240,96,104,90],"species":324},{"level":48,"moves":[96,34,182,58],"species":343},{"level":48,"moves":[156,152,13,104],"species":327},{"level":51,"moves":[96,104,58,156],"species":230}],"party_rom_address":3219440,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253740},{"battle_script_rom_address":0,"party":[{"level":50,"moves":[95,240,182,56],"species":61},{"level":51,"moves":[240,96,104,90],"species":324},{"level":53,"moves":[96,34,182,58],"species":343},{"level":53,"moves":[156,12,13,104],"species":327},{"level":56,"moves":[96,104,58,156],"species":230}],"party_rom_address":3219520,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253780},{"battle_script_rom_address":0,"party":[{"level":56,"moves":[56,195,58,109],"species":131},{"level":58,"moves":[240,96,104,90],"species":324},{"level":56,"moves":[95,240,182,56],"species":61},{"level":58,"moves":[96,34,182,58],"species":343},{"level":58,"moves":[156,12,13,104],"species":327},{"level":61,"moves":[96,104,58,156],"species":230}],"party_rom_address":3219600,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253820},{"battle_script_rom_address":0,"party":[{"level":61,"moves":[56,195,58,109],"species":131},{"level":63,"moves":[240,96,104,90],"species":324},{"level":61,"moves":[95,240,56,195],"species":186},{"level":63,"moves":[96,34,182,73],"species":343},{"level":63,"moves":[156,12,13,104],"species":327},{"level":66,"moves":[96,104,58,156],"species":230}],"party_rom_address":3219696,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253860},{"battle_script_rom_address":2161617,"party":[{"level":17,"moves":[95,98,204,0],"species":387},{"level":17,"moves":[95,98,109,0],"species":386}],"party_rom_address":3219792,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253900},{"battle_script_rom_address":2196247,"party":[{"level":30,"moves":[0,0,0,0],"species":369}],"party_rom_address":3219824,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3253940},{"battle_script_rom_address":2347924,"party":[{"level":77,"moves":[92,76,191,211],"species":227},{"level":75,"moves":[115,113,246,89],"species":319},{"level":76,"moves":[87,89,76,81],"species":384},{"level":76,"moves":[202,246,19,109],"species":389},{"level":76,"moves":[96,246,76,163],"species":391},{"level":78,"moves":[89,94,53,247],"species":400}],"party_rom_address":3219832,"pokemon_data_type":"ITEM_CUSTOM_MOVES","rom_address":3253980},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":398}],"party_rom_address":3219928,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254020},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":398}],"party_rom_address":3219936,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254060},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":398}],"party_rom_address":3219944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254100},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":398}],"party_rom_address":3219952,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254140},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":398}],"party_rom_address":3219960,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254180},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":398}],"party_rom_address":3219968,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254220},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":398}],"party_rom_address":3219976,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254260},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":27},{"level":31,"moves":[0,0,0,0],"species":27}],"party_rom_address":3219984,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254300},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":320},{"level":33,"moves":[0,0,0,0],"species":27},{"level":33,"moves":[0,0,0,0],"species":27}],"party_rom_address":3220000,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254340},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":320},{"level":35,"moves":[0,0,0,0],"species":27},{"level":35,"moves":[0,0,0,0],"species":27}],"party_rom_address":3220024,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254380},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":320},{"level":37,"moves":[0,0,0,0],"species":28},{"level":37,"moves":[0,0,0,0],"species":28}],"party_rom_address":3220048,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254420},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":309},{"level":30,"moves":[0,0,0,0],"species":66},{"level":30,"moves":[0,0,0,0],"species":72}],"party_rom_address":3220072,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254460},{"battle_script_rom_address":0,"party":[{"level":32,"moves":[0,0,0,0],"species":310},{"level":32,"moves":[0,0,0,0],"species":66},{"level":32,"moves":[0,0,0,0],"species":72}],"party_rom_address":3220096,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254500},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":310},{"level":34,"moves":[0,0,0,0],"species":66},{"level":34,"moves":[0,0,0,0],"species":73}],"party_rom_address":3220120,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254540},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":310},{"level":36,"moves":[0,0,0,0],"species":67},{"level":36,"moves":[0,0,0,0],"species":73}],"party_rom_address":3220144,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254580},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":120},{"level":37,"moves":[0,0,0,0],"species":120}],"party_rom_address":3220168,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254620},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":309},{"level":39,"moves":[0,0,0,0],"species":120},{"level":39,"moves":[0,0,0,0],"species":120}],"party_rom_address":3220184,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254660},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":310},{"level":41,"moves":[0,0,0,0],"species":120},{"level":41,"moves":[0,0,0,0],"species":120}],"party_rom_address":3220208,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254700},{"battle_script_rom_address":0,"party":[{"level":43,"moves":[0,0,0,0],"species":310},{"level":43,"moves":[0,0,0,0],"species":121},{"level":43,"moves":[0,0,0,0],"species":121}],"party_rom_address":3220232,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254740},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":67},{"level":37,"moves":[0,0,0,0],"species":67}],"party_rom_address":3220256,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254780},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":335},{"level":39,"moves":[0,0,0,0],"species":67},{"level":39,"moves":[0,0,0,0],"species":67}],"party_rom_address":3220272,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254820},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":336},{"level":41,"moves":[0,0,0,0],"species":67},{"level":41,"moves":[0,0,0,0],"species":67}],"party_rom_address":3220296,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254860},{"battle_script_rom_address":0,"party":[{"level":43,"moves":[0,0,0,0],"species":336},{"level":43,"moves":[0,0,0,0],"species":68},{"level":43,"moves":[0,0,0,0],"species":68}],"party_rom_address":3220320,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254900},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":371},{"level":35,"moves":[0,0,0,0],"species":365}],"party_rom_address":3220344,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254940},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":308},{"level":37,"moves":[0,0,0,0],"species":371},{"level":37,"moves":[0,0,0,0],"species":365}],"party_rom_address":3220360,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3254980},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":308},{"level":39,"moves":[0,0,0,0],"species":371},{"level":39,"moves":[0,0,0,0],"species":365}],"party_rom_address":3220384,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255020},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":308},{"level":41,"moves":[0,0,0,0],"species":372},{"level":41,"moves":[0,0,0,0],"species":366}],"party_rom_address":3220408,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255060},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":337},{"level":35,"moves":[0,0,0,0],"species":337},{"level":35,"moves":[0,0,0,0],"species":371}],"party_rom_address":3220432,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255100},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":337},{"level":37,"moves":[0,0,0,0],"species":338},{"level":37,"moves":[0,0,0,0],"species":371}],"party_rom_address":3220456,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255140},{"battle_script_rom_address":0,"party":[{"level":39,"moves":[0,0,0,0],"species":338},{"level":39,"moves":[0,0,0,0],"species":338},{"level":39,"moves":[0,0,0,0],"species":371}],"party_rom_address":3220480,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255180},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":338},{"level":41,"moves":[0,0,0,0],"species":338},{"level":41,"moves":[0,0,0,0],"species":372}],"party_rom_address":3220504,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255220},{"battle_script_rom_address":0,"party":[{"level":26,"moves":[0,0,0,0],"species":74},{"level":26,"moves":[0,0,0,0],"species":339}],"party_rom_address":3220528,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255260},{"battle_script_rom_address":0,"party":[{"level":28,"moves":[0,0,0,0],"species":66},{"level":28,"moves":[0,0,0,0],"species":339},{"level":28,"moves":[0,0,0,0],"species":75}],"party_rom_address":3220544,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255300},{"battle_script_rom_address":0,"party":[{"level":30,"moves":[0,0,0,0],"species":66},{"level":30,"moves":[0,0,0,0],"species":339},{"level":30,"moves":[0,0,0,0],"species":75}],"party_rom_address":3220568,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255340},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":67},{"level":33,"moves":[0,0,0,0],"species":340},{"level":33,"moves":[0,0,0,0],"species":76}],"party_rom_address":3220592,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255380},{"battle_script_rom_address":0,"party":[{"level":31,"moves":[0,0,0,0],"species":315},{"level":31,"moves":[0,0,0,0],"species":287},{"level":31,"moves":[0,0,0,0],"species":288},{"level":31,"moves":[0,0,0,0],"species":295},{"level":31,"moves":[0,0,0,0],"species":298},{"level":31,"moves":[0,0,0,0],"species":304}],"party_rom_address":3220616,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255420},{"battle_script_rom_address":0,"party":[{"level":33,"moves":[0,0,0,0],"species":315},{"level":33,"moves":[0,0,0,0],"species":287},{"level":33,"moves":[0,0,0,0],"species":289},{"level":33,"moves":[0,0,0,0],"species":296},{"level":33,"moves":[0,0,0,0],"species":299},{"level":33,"moves":[0,0,0,0],"species":304}],"party_rom_address":3220664,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255460},{"battle_script_rom_address":0,"party":[{"level":35,"moves":[0,0,0,0],"species":316},{"level":35,"moves":[0,0,0,0],"species":287},{"level":35,"moves":[0,0,0,0],"species":289},{"level":35,"moves":[0,0,0,0],"species":296},{"level":35,"moves":[0,0,0,0],"species":299},{"level":35,"moves":[0,0,0,0],"species":305}],"party_rom_address":3220712,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255500},{"battle_script_rom_address":0,"party":[{"level":37,"moves":[0,0,0,0],"species":316},{"level":37,"moves":[0,0,0,0],"species":287},{"level":37,"moves":[0,0,0,0],"species":289},{"level":37,"moves":[0,0,0,0],"species":297},{"level":37,"moves":[0,0,0,0],"species":300},{"level":37,"moves":[0,0,0,0],"species":305}],"party_rom_address":3220760,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255540},{"battle_script_rom_address":0,"party":[{"level":34,"moves":[0,0,0,0],"species":313},{"level":34,"moves":[0,0,0,0],"species":116}],"party_rom_address":3220808,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255580},{"battle_script_rom_address":0,"party":[{"level":36,"moves":[0,0,0,0],"species":325},{"level":36,"moves":[0,0,0,0],"species":313},{"level":36,"moves":[0,0,0,0],"species":117}],"party_rom_address":3220824,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255620},{"battle_script_rom_address":0,"party":[{"level":38,"moves":[0,0,0,0],"species":325},{"level":38,"moves":[0,0,0,0],"species":313},{"level":38,"moves":[0,0,0,0],"species":117}],"party_rom_address":3220848,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255660},{"battle_script_rom_address":0,"party":[{"level":40,"moves":[0,0,0,0],"species":325},{"level":40,"moves":[0,0,0,0],"species":314},{"level":40,"moves":[0,0,0,0],"species":230}],"party_rom_address":3220872,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255700},{"battle_script_rom_address":2557618,"party":[{"level":41,"moves":[0,0,0,0],"species":411}],"party_rom_address":3220896,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255740},{"battle_script_rom_address":2557649,"party":[{"level":41,"moves":[0,0,0,0],"species":378},{"level":41,"moves":[0,0,0,0],"species":64}],"party_rom_address":3220904,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255780},{"battle_script_rom_address":0,"party":[{"level":41,"moves":[0,0,0,0],"species":202}],"party_rom_address":3220920,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255820},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":4}],"party_rom_address":3220928,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255860},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":1}],"party_rom_address":3220936,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255900},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":405}],"party_rom_address":3220944,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255940},{"battle_script_rom_address":0,"party":[{"level":5,"moves":[0,0,0,0],"species":404}],"party_rom_address":3220952,"pokemon_data_type":"NO_ITEM_DEFAULT_MOVES","rom_address":3255980}],"warps":{"MAP_ABANDONED_SHIP_CAPTAINS_OFFICE:0,1/MAP_ABANDONED_SHIP_DECK:4":"MAP_ABANDONED_SHIP_DECK:4/MAP_ABANDONED_SHIP_CAPTAINS_OFFICE:0","MAP_ABANDONED_SHIP_CORRIDORS_1F:0,1/MAP_ABANDONED_SHIP_DECK:2":"MAP_ABANDONED_SHIP_DECK:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:1","MAP_ABANDONED_SHIP_CORRIDORS_1F:10/MAP_ABANDONED_SHIP_CORRIDORS_B1F:6":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:6/MAP_ABANDONED_SHIP_CORRIDORS_1F:10","MAP_ABANDONED_SHIP_CORRIDORS_1F:11/MAP_ABANDONED_SHIP_ROOMS2_1F:2":"MAP_ABANDONED_SHIP_ROOMS2_1F:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:11","MAP_ABANDONED_SHIP_CORRIDORS_1F:2,3/MAP_ABANDONED_SHIP_DECK:3":"MAP_ABANDONED_SHIP_DECK:3/MAP_ABANDONED_SHIP_CORRIDORS_1F:2","MAP_ABANDONED_SHIP_CORRIDORS_1F:4/MAP_ABANDONED_SHIP_ROOMS_1F:0":"MAP_ABANDONED_SHIP_ROOMS_1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_1F:4","MAP_ABANDONED_SHIP_CORRIDORS_1F:5/MAP_ABANDONED_SHIP_ROOMS_1F:3":"MAP_ABANDONED_SHIP_ROOMS_1F:3,5/MAP_ABANDONED_SHIP_CORRIDORS_1F:5","MAP_ABANDONED_SHIP_CORRIDORS_1F:6/MAP_ABANDONED_SHIP_ROOMS_1F:2":"MAP_ABANDONED_SHIP_ROOMS_1F:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:6","MAP_ABANDONED_SHIP_CORRIDORS_1F:7/MAP_ABANDONED_SHIP_ROOMS_1F:4":"MAP_ABANDONED_SHIP_ROOMS_1F:4/MAP_ABANDONED_SHIP_CORRIDORS_1F:7","MAP_ABANDONED_SHIP_CORRIDORS_1F:8/MAP_ABANDONED_SHIP_ROOMS2_1F:0":"MAP_ABANDONED_SHIP_ROOMS2_1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_1F:8","MAP_ABANDONED_SHIP_CORRIDORS_1F:9/MAP_ABANDONED_SHIP_CORRIDORS_B1F:7":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:7/MAP_ABANDONED_SHIP_CORRIDORS_1F:9","MAP_ABANDONED_SHIP_CORRIDORS_B1F:0/MAP_ABANDONED_SHIP_ROOMS2_B1F:2":"MAP_ABANDONED_SHIP_ROOMS2_B1F:2,3/MAP_ABANDONED_SHIP_CORRIDORS_B1F:0","MAP_ABANDONED_SHIP_CORRIDORS_B1F:1/MAP_ABANDONED_SHIP_ROOMS2_B1F:0":"MAP_ABANDONED_SHIP_ROOMS2_B1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:1","MAP_ABANDONED_SHIP_CORRIDORS_B1F:2/MAP_ABANDONED_SHIP_ROOMS_B1F:0":"MAP_ABANDONED_SHIP_ROOMS_B1F:0/MAP_ABANDONED_SHIP_CORRIDORS_B1F:2","MAP_ABANDONED_SHIP_CORRIDORS_B1F:3/MAP_ABANDONED_SHIP_ROOMS_B1F:1":"MAP_ABANDONED_SHIP_ROOMS_B1F:1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:3","MAP_ABANDONED_SHIP_CORRIDORS_B1F:4/MAP_ABANDONED_SHIP_ROOMS_B1F:2":"MAP_ABANDONED_SHIP_ROOMS_B1F:2/MAP_ABANDONED_SHIP_CORRIDORS_B1F:4","MAP_ABANDONED_SHIP_CORRIDORS_B1F:5/MAP_ABANDONED_SHIP_ROOM_B1F:0":"MAP_ABANDONED_SHIP_ROOM_B1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:5","MAP_ABANDONED_SHIP_CORRIDORS_B1F:6/MAP_ABANDONED_SHIP_CORRIDORS_1F:10":"MAP_ABANDONED_SHIP_CORRIDORS_1F:10/MAP_ABANDONED_SHIP_CORRIDORS_B1F:6","MAP_ABANDONED_SHIP_CORRIDORS_B1F:7/MAP_ABANDONED_SHIP_CORRIDORS_1F:9":"MAP_ABANDONED_SHIP_CORRIDORS_1F:9/MAP_ABANDONED_SHIP_CORRIDORS_B1F:7","MAP_ABANDONED_SHIP_DECK:0,1/MAP_ROUTE108:0":"MAP_ROUTE108:0/MAP_ABANDONED_SHIP_DECK:0","MAP_ABANDONED_SHIP_DECK:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:1":"MAP_ABANDONED_SHIP_CORRIDORS_1F:0,1/MAP_ABANDONED_SHIP_DECK:2","MAP_ABANDONED_SHIP_DECK:3/MAP_ABANDONED_SHIP_CORRIDORS_1F:2":"MAP_ABANDONED_SHIP_CORRIDORS_1F:2,3/MAP_ABANDONED_SHIP_DECK:3","MAP_ABANDONED_SHIP_DECK:4/MAP_ABANDONED_SHIP_CAPTAINS_OFFICE:0":"MAP_ABANDONED_SHIP_CAPTAINS_OFFICE:0,1/MAP_ABANDONED_SHIP_DECK:4","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:0/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:0":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:0,1/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:0","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:1/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:2":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:2,3/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:1","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:2/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:4":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:4,5/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:2","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:3/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:6":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:6/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:3","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:4/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:7":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:7/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:4","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:5/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:8":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:8/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:5","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:0,1/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:0":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:0/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:0","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:2,3/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:1":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:1/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:2","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:4,5/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:2":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:2/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:4","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:6/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:3":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:3/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:6","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:7/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:4":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:4/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:7","MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:8/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:5":"MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:5/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:8","MAP_ABANDONED_SHIP_ROOMS2_1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_1F:8":"MAP_ABANDONED_SHIP_CORRIDORS_1F:8/MAP_ABANDONED_SHIP_ROOMS2_1F:0","MAP_ABANDONED_SHIP_ROOMS2_1F:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:11":"MAP_ABANDONED_SHIP_CORRIDORS_1F:11/MAP_ABANDONED_SHIP_ROOMS2_1F:2","MAP_ABANDONED_SHIP_ROOMS2_B1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:1":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:1/MAP_ABANDONED_SHIP_ROOMS2_B1F:0","MAP_ABANDONED_SHIP_ROOMS2_B1F:2,3/MAP_ABANDONED_SHIP_CORRIDORS_B1F:0":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:0/MAP_ABANDONED_SHIP_ROOMS2_B1F:2","MAP_ABANDONED_SHIP_ROOMS_1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_1F:4":"MAP_ABANDONED_SHIP_CORRIDORS_1F:4/MAP_ABANDONED_SHIP_ROOMS_1F:0","MAP_ABANDONED_SHIP_ROOMS_1F:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:6":"MAP_ABANDONED_SHIP_CORRIDORS_1F:6/MAP_ABANDONED_SHIP_ROOMS_1F:2","MAP_ABANDONED_SHIP_ROOMS_1F:3,5/MAP_ABANDONED_SHIP_CORRIDORS_1F:5":"MAP_ABANDONED_SHIP_CORRIDORS_1F:5/MAP_ABANDONED_SHIP_ROOMS_1F:3","MAP_ABANDONED_SHIP_ROOMS_1F:4/MAP_ABANDONED_SHIP_CORRIDORS_1F:7":"MAP_ABANDONED_SHIP_CORRIDORS_1F:7/MAP_ABANDONED_SHIP_ROOMS_1F:4","MAP_ABANDONED_SHIP_ROOMS_B1F:0/MAP_ABANDONED_SHIP_CORRIDORS_B1F:2":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:2/MAP_ABANDONED_SHIP_ROOMS_B1F:0","MAP_ABANDONED_SHIP_ROOMS_B1F:1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:3":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:3/MAP_ABANDONED_SHIP_ROOMS_B1F:1","MAP_ABANDONED_SHIP_ROOMS_B1F:2/MAP_ABANDONED_SHIP_CORRIDORS_B1F:4":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:4/MAP_ABANDONED_SHIP_ROOMS_B1F:2","MAP_ABANDONED_SHIP_ROOM_B1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:5":"MAP_ABANDONED_SHIP_CORRIDORS_B1F:5/MAP_ABANDONED_SHIP_ROOM_B1F:0","MAP_ABANDONED_SHIP_UNDERWATER1:0,1/MAP_ABANDONED_SHIP_UNDERWATER2:0":"MAP_ABANDONED_SHIP_UNDERWATER2:0/MAP_ABANDONED_SHIP_UNDERWATER1:0","MAP_ABANDONED_SHIP_UNDERWATER2:0/MAP_ABANDONED_SHIP_UNDERWATER1:0":"MAP_ABANDONED_SHIP_UNDERWATER1:0,1/MAP_ABANDONED_SHIP_UNDERWATER2:0","MAP_ALTERING_CAVE:0/MAP_ROUTE103:0":"MAP_ROUTE103:0/MAP_ALTERING_CAVE:0","MAP_ANCIENT_TOMB:0/MAP_ROUTE120:0":"MAP_ROUTE120:0/MAP_ANCIENT_TOMB:0","MAP_ANCIENT_TOMB:1/MAP_ANCIENT_TOMB:2":"MAP_ANCIENT_TOMB:2/MAP_ANCIENT_TOMB:1","MAP_ANCIENT_TOMB:2/MAP_ANCIENT_TOMB:1":"MAP_ANCIENT_TOMB:1/MAP_ANCIENT_TOMB:2","MAP_AQUA_HIDEOUT_1F:0,1/MAP_LILYCOVE_CITY:6":"MAP_LILYCOVE_CITY:6/MAP_AQUA_HIDEOUT_1F:0","MAP_AQUA_HIDEOUT_1F:2/MAP_AQUA_HIDEOUT_B1F:0":"MAP_AQUA_HIDEOUT_B1F:0/MAP_AQUA_HIDEOUT_1F:2","MAP_AQUA_HIDEOUT_B1F:0/MAP_AQUA_HIDEOUT_1F:2":"MAP_AQUA_HIDEOUT_1F:2/MAP_AQUA_HIDEOUT_B1F:0","MAP_AQUA_HIDEOUT_B1F:1/MAP_AQUA_HIDEOUT_B2F:0":"MAP_AQUA_HIDEOUT_B2F:0/MAP_AQUA_HIDEOUT_B1F:1","MAP_AQUA_HIDEOUT_B1F:10/MAP_AQUA_HIDEOUT_B1F:6":"MAP_AQUA_HIDEOUT_B1F:6/MAP_AQUA_HIDEOUT_B1F:10","MAP_AQUA_HIDEOUT_B1F:11/MAP_AQUA_HIDEOUT_B1F:22":"MAP_AQUA_HIDEOUT_B1F:22/MAP_AQUA_HIDEOUT_B1F:11","MAP_AQUA_HIDEOUT_B1F:12/MAP_AQUA_HIDEOUT_B1F:9":"MAP_AQUA_HIDEOUT_B1F:9/MAP_AQUA_HIDEOUT_B1F:12","MAP_AQUA_HIDEOUT_B1F:13/MAP_AQUA_HIDEOUT_B1F:18":"MAP_AQUA_HIDEOUT_B1F:18/MAP_AQUA_HIDEOUT_B1F:13","MAP_AQUA_HIDEOUT_B1F:14/MAP_AQUA_HIDEOUT_B1F:12!":"MAP_AQUA_HIDEOUT_B1F:12/MAP_AQUA_HIDEOUT_B1F:9","MAP_AQUA_HIDEOUT_B1F:15/MAP_AQUA_HIDEOUT_B1F:16":"MAP_AQUA_HIDEOUT_B1F:16/MAP_AQUA_HIDEOUT_B1F:15","MAP_AQUA_HIDEOUT_B1F:16/MAP_AQUA_HIDEOUT_B1F:15":"MAP_AQUA_HIDEOUT_B1F:15/MAP_AQUA_HIDEOUT_B1F:16","MAP_AQUA_HIDEOUT_B1F:17/MAP_AQUA_HIDEOUT_B1F:20":"MAP_AQUA_HIDEOUT_B1F:20/MAP_AQUA_HIDEOUT_B1F:17","MAP_AQUA_HIDEOUT_B1F:18/MAP_AQUA_HIDEOUT_B1F:13":"MAP_AQUA_HIDEOUT_B1F:13/MAP_AQUA_HIDEOUT_B1F:18","MAP_AQUA_HIDEOUT_B1F:19/MAP_AQUA_HIDEOUT_B1F:24":"MAP_AQUA_HIDEOUT_B1F:24/MAP_AQUA_HIDEOUT_B1F:19","MAP_AQUA_HIDEOUT_B1F:2/MAP_AQUA_HIDEOUT_B2F:1":"MAP_AQUA_HIDEOUT_B2F:1/MAP_AQUA_HIDEOUT_B1F:2","MAP_AQUA_HIDEOUT_B1F:20/MAP_AQUA_HIDEOUT_B1F:17":"MAP_AQUA_HIDEOUT_B1F:17/MAP_AQUA_HIDEOUT_B1F:20","MAP_AQUA_HIDEOUT_B1F:21/MAP_AQUA_HIDEOUT_B1F:12!":"MAP_AQUA_HIDEOUT_B1F:12/MAP_AQUA_HIDEOUT_B1F:9","MAP_AQUA_HIDEOUT_B1F:22/MAP_AQUA_HIDEOUT_B1F:11":"MAP_AQUA_HIDEOUT_B1F:11/MAP_AQUA_HIDEOUT_B1F:22","MAP_AQUA_HIDEOUT_B1F:23/MAP_AQUA_HIDEOUT_B1F:17!":"MAP_AQUA_HIDEOUT_B1F:17/MAP_AQUA_HIDEOUT_B1F:20","MAP_AQUA_HIDEOUT_B1F:24/MAP_AQUA_HIDEOUT_B1F:19":"MAP_AQUA_HIDEOUT_B1F:19/MAP_AQUA_HIDEOUT_B1F:24","MAP_AQUA_HIDEOUT_B1F:3/MAP_AQUA_HIDEOUT_B2F:2":"MAP_AQUA_HIDEOUT_B2F:2/MAP_AQUA_HIDEOUT_B1F:3","MAP_AQUA_HIDEOUT_B1F:4/MAP_AQUA_HIDEOUT_B1F:7":"MAP_AQUA_HIDEOUT_B1F:7/MAP_AQUA_HIDEOUT_B1F:4","MAP_AQUA_HIDEOUT_B1F:5/MAP_AQUA_HIDEOUT_B1F:8":"MAP_AQUA_HIDEOUT_B1F:8/MAP_AQUA_HIDEOUT_B1F:5","MAP_AQUA_HIDEOUT_B1F:6/MAP_AQUA_HIDEOUT_B1F:10":"MAP_AQUA_HIDEOUT_B1F:10/MAP_AQUA_HIDEOUT_B1F:6","MAP_AQUA_HIDEOUT_B1F:7/MAP_AQUA_HIDEOUT_B1F:4":"MAP_AQUA_HIDEOUT_B1F:4/MAP_AQUA_HIDEOUT_B1F:7","MAP_AQUA_HIDEOUT_B1F:8/MAP_AQUA_HIDEOUT_B1F:5":"MAP_AQUA_HIDEOUT_B1F:5/MAP_AQUA_HIDEOUT_B1F:8","MAP_AQUA_HIDEOUT_B1F:9/MAP_AQUA_HIDEOUT_B1F:12":"MAP_AQUA_HIDEOUT_B1F:12/MAP_AQUA_HIDEOUT_B1F:9","MAP_AQUA_HIDEOUT_B2F:0/MAP_AQUA_HIDEOUT_B1F:1":"MAP_AQUA_HIDEOUT_B1F:1/MAP_AQUA_HIDEOUT_B2F:0","MAP_AQUA_HIDEOUT_B2F:1/MAP_AQUA_HIDEOUT_B1F:2":"MAP_AQUA_HIDEOUT_B1F:2/MAP_AQUA_HIDEOUT_B2F:1","MAP_AQUA_HIDEOUT_B2F:2/MAP_AQUA_HIDEOUT_B1F:3":"MAP_AQUA_HIDEOUT_B1F:3/MAP_AQUA_HIDEOUT_B2F:2","MAP_AQUA_HIDEOUT_B2F:3/MAP_AQUA_HIDEOUT_B2F:5":"MAP_AQUA_HIDEOUT_B2F:5/MAP_AQUA_HIDEOUT_B2F:3","MAP_AQUA_HIDEOUT_B2F:4/MAP_AQUA_HIDEOUT_B2F:8":"MAP_AQUA_HIDEOUT_B2F:8/MAP_AQUA_HIDEOUT_B2F:4","MAP_AQUA_HIDEOUT_B2F:5/MAP_AQUA_HIDEOUT_B2F:3":"MAP_AQUA_HIDEOUT_B2F:3/MAP_AQUA_HIDEOUT_B2F:5","MAP_AQUA_HIDEOUT_B2F:6/MAP_AQUA_HIDEOUT_B2F:7":"MAP_AQUA_HIDEOUT_B2F:7/MAP_AQUA_HIDEOUT_B2F:6","MAP_AQUA_HIDEOUT_B2F:7/MAP_AQUA_HIDEOUT_B2F:6":"MAP_AQUA_HIDEOUT_B2F:6/MAP_AQUA_HIDEOUT_B2F:7","MAP_AQUA_HIDEOUT_B2F:8/MAP_AQUA_HIDEOUT_B2F:4":"MAP_AQUA_HIDEOUT_B2F:4/MAP_AQUA_HIDEOUT_B2F:8","MAP_AQUA_HIDEOUT_B2F:9/MAP_AQUA_HIDEOUT_B1F:4!":"MAP_AQUA_HIDEOUT_B1F:4/MAP_AQUA_HIDEOUT_B1F:7","MAP_ARTISAN_CAVE_1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13/MAP_ARTISAN_CAVE_1F:0","MAP_ARTISAN_CAVE_1F:1/MAP_ARTISAN_CAVE_B1F:1":"MAP_ARTISAN_CAVE_B1F:1/MAP_ARTISAN_CAVE_1F:1","MAP_ARTISAN_CAVE_B1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10/MAP_ARTISAN_CAVE_B1F:0","MAP_ARTISAN_CAVE_B1F:1/MAP_ARTISAN_CAVE_1F:1":"MAP_ARTISAN_CAVE_1F:1/MAP_ARTISAN_CAVE_B1F:1","MAP_BATTLE_COLOSSEUM_2P:0,1/MAP_DYNAMIC:-1!":"","MAP_BATTLE_COLOSSEUM_4P:0,1,2,3/MAP_DYNAMIC:-1!":"","MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1/MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1!":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1/MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1/MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1!":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1/MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2/MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2":"MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0","MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2":"MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0","MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0":"MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2","MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:3/MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0!":"MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2","MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0":"MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2","MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0/MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3/MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2":"MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0","MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0","MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0":"MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2","MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6/MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0","MAP_BATTLE_FRONTIER_LOUNGE1:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5/MAP_BATTLE_FRONTIER_LOUNGE1:0","MAP_BATTLE_FRONTIER_LOUNGE2:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3/MAP_BATTLE_FRONTIER_LOUNGE2:0","MAP_BATTLE_FRONTIER_LOUNGE3:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9/MAP_BATTLE_FRONTIER_LOUNGE3:0","MAP_BATTLE_FRONTIER_LOUNGE4:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6/MAP_BATTLE_FRONTIER_LOUNGE4:0","MAP_BATTLE_FRONTIER_LOUNGE5:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7/MAP_BATTLE_FRONTIER_LOUNGE5:0","MAP_BATTLE_FRONTIER_LOUNGE6:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8/MAP_BATTLE_FRONTIER_LOUNGE6:0","MAP_BATTLE_FRONTIER_LOUNGE7:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7/MAP_BATTLE_FRONTIER_LOUNGE7:0","MAP_BATTLE_FRONTIER_LOUNGE8:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10/MAP_BATTLE_FRONTIER_LOUNGE8:0","MAP_BATTLE_FRONTIER_LOUNGE9:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11/MAP_BATTLE_FRONTIER_LOUNGE9:0","MAP_BATTLE_FRONTIER_MART:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4/MAP_BATTLE_FRONTIER_MART:0","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0":"MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1/MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0":"MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10/MAP_BATTLE_FRONTIER_LOUNGE8:0":"MAP_BATTLE_FRONTIER_LOUNGE8:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11/MAP_BATTLE_FRONTIER_LOUNGE9:0":"MAP_BATTLE_FRONTIER_LOUNGE9:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0":"MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13/MAP_ARTISAN_CAVE_1F:0":"MAP_ARTISAN_CAVE_1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0":"MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3/MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0":"MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4/MAP_BATTLE_FRONTIER_RANKING_HALL:0":"MAP_BATTLE_FRONTIER_RANKING_HALL:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5/MAP_BATTLE_FRONTIER_LOUNGE1:0":"MAP_BATTLE_FRONTIER_LOUNGE1:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6/MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0":"MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7/MAP_BATTLE_FRONTIER_LOUNGE5:0":"MAP_BATTLE_FRONTIER_LOUNGE5:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8/MAP_BATTLE_FRONTIER_LOUNGE6:0":"MAP_BATTLE_FRONTIER_LOUNGE6:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8","MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9/MAP_BATTLE_FRONTIER_LOUNGE3:0":"MAP_BATTLE_FRONTIER_LOUNGE3:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0/MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0":"MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1/MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0":"MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10/MAP_ARTISAN_CAVE_B1F:0":"MAP_ARTISAN_CAVE_B1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2/MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0":"MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3/MAP_BATTLE_FRONTIER_LOUNGE2:0":"MAP_BATTLE_FRONTIER_LOUNGE2:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4/MAP_BATTLE_FRONTIER_MART:0":"MAP_BATTLE_FRONTIER_MART:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5/MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0":"MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6/MAP_BATTLE_FRONTIER_LOUNGE4:0":"MAP_BATTLE_FRONTIER_LOUNGE4:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7/MAP_BATTLE_FRONTIER_LOUNGE7:0":"MAP_BATTLE_FRONTIER_LOUNGE7:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8/MAP_BATTLE_FRONTIER_RECEPTION_GATE:0":"MAP_BATTLE_FRONTIER_RECEPTION_GATE:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8","MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9/MAP_BATTLE_FRONTIER_RECEPTION_GATE:1":"MAP_BATTLE_FRONTIER_RECEPTION_GATE:1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9","MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0","MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2/MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0":"MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2","MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2":"MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2/MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0","MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_BATTLE_FRONTIER_RANKING_HALL:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4":"MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4/MAP_BATTLE_FRONTIER_RANKING_HALL:0","MAP_BATTLE_FRONTIER_RECEPTION_GATE:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8/MAP_BATTLE_FRONTIER_RECEPTION_GATE:0","MAP_BATTLE_FRONTIER_RECEPTION_GATE:1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9/MAP_BATTLE_FRONTIER_RECEPTION_GATE:1","MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5":"MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5/MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0","MAP_BIRTH_ISLAND_EXTERIOR:0/MAP_BIRTH_ISLAND_HARBOR:0":"MAP_BIRTH_ISLAND_HARBOR:0/MAP_BIRTH_ISLAND_EXTERIOR:0","MAP_BIRTH_ISLAND_HARBOR:0/MAP_BIRTH_ISLAND_EXTERIOR:0":"MAP_BIRTH_ISLAND_EXTERIOR:0/MAP_BIRTH_ISLAND_HARBOR:0","MAP_CAVE_OF_ORIGIN_1F:0/MAP_CAVE_OF_ORIGIN_ENTRANCE:1":"MAP_CAVE_OF_ORIGIN_ENTRANCE:1/MAP_CAVE_OF_ORIGIN_1F:0","MAP_CAVE_OF_ORIGIN_1F:1/MAP_CAVE_OF_ORIGIN_B1F:0":"MAP_CAVE_OF_ORIGIN_B1F:0/MAP_CAVE_OF_ORIGIN_1F:1","MAP_CAVE_OF_ORIGIN_B1F:0/MAP_CAVE_OF_ORIGIN_1F:1":"MAP_CAVE_OF_ORIGIN_1F:1/MAP_CAVE_OF_ORIGIN_B1F:0","MAP_CAVE_OF_ORIGIN_ENTRANCE:0/MAP_SOOTOPOLIS_CITY:3":"MAP_SOOTOPOLIS_CITY:3/MAP_CAVE_OF_ORIGIN_ENTRANCE:0","MAP_CAVE_OF_ORIGIN_ENTRANCE:1/MAP_CAVE_OF_ORIGIN_1F:0":"MAP_CAVE_OF_ORIGIN_1F:0/MAP_CAVE_OF_ORIGIN_ENTRANCE:1","MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:0/MAP_CAVE_OF_ORIGIN_1F:1!":"MAP_CAVE_OF_ORIGIN_1F:1/MAP_CAVE_OF_ORIGIN_B1F:0","MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:1/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:0":"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:0/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:1","MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:0/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:1":"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:1/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:0","MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:1/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:0":"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:0/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:1","MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:0/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:1":"MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:1/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:0","MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:1/MAP_CAVE_OF_ORIGIN_B1F:0!":"MAP_CAVE_OF_ORIGIN_B1F:0/MAP_CAVE_OF_ORIGIN_1F:1","MAP_DESERT_RUINS:0/MAP_ROUTE111:1":"MAP_ROUTE111:1/MAP_DESERT_RUINS:0","MAP_DESERT_RUINS:1/MAP_DESERT_RUINS:2":"MAP_DESERT_RUINS:2/MAP_DESERT_RUINS:1","MAP_DESERT_RUINS:2/MAP_DESERT_RUINS:1":"MAP_DESERT_RUINS:1/MAP_DESERT_RUINS:2","MAP_DESERT_UNDERPASS:0/MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:2":"MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:2/MAP_DESERT_UNDERPASS:0","MAP_DEWFORD_TOWN:0/MAP_DEWFORD_TOWN_HALL:0":"MAP_DEWFORD_TOWN_HALL:0,1/MAP_DEWFORD_TOWN:0","MAP_DEWFORD_TOWN:1/MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:0":"MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:0,1/MAP_DEWFORD_TOWN:1","MAP_DEWFORD_TOWN:2/MAP_DEWFORD_TOWN_GYM:0":"MAP_DEWFORD_TOWN_GYM:0,1/MAP_DEWFORD_TOWN:2","MAP_DEWFORD_TOWN:3/MAP_DEWFORD_TOWN_HOUSE1:0":"MAP_DEWFORD_TOWN_HOUSE1:0,1/MAP_DEWFORD_TOWN:3","MAP_DEWFORD_TOWN:4/MAP_DEWFORD_TOWN_HOUSE2:0":"MAP_DEWFORD_TOWN_HOUSE2:0,1/MAP_DEWFORD_TOWN:4","MAP_DEWFORD_TOWN_GYM:0,1/MAP_DEWFORD_TOWN:2":"MAP_DEWFORD_TOWN:2/MAP_DEWFORD_TOWN_GYM:0","MAP_DEWFORD_TOWN_HALL:0,1/MAP_DEWFORD_TOWN:0":"MAP_DEWFORD_TOWN:0/MAP_DEWFORD_TOWN_HALL:0","MAP_DEWFORD_TOWN_HOUSE1:0,1/MAP_DEWFORD_TOWN:3":"MAP_DEWFORD_TOWN:3/MAP_DEWFORD_TOWN_HOUSE1:0","MAP_DEWFORD_TOWN_HOUSE2:0,1/MAP_DEWFORD_TOWN:4":"MAP_DEWFORD_TOWN:4/MAP_DEWFORD_TOWN_HOUSE2:0","MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:0,1/MAP_DEWFORD_TOWN:1":"MAP_DEWFORD_TOWN:1/MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:0","MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:2/MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:0":"MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:0/MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:2","MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:0/MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:2":"MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:2/MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:0","MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_EVER_GRANDE_CITY:0/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:0":"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:0,1/MAP_EVER_GRANDE_CITY:0","MAP_EVER_GRANDE_CITY:1/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:0":"MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:0,1/MAP_EVER_GRANDE_CITY:1","MAP_EVER_GRANDE_CITY:2/MAP_VICTORY_ROAD_1F:0":"MAP_VICTORY_ROAD_1F:0/MAP_EVER_GRANDE_CITY:2","MAP_EVER_GRANDE_CITY:3/MAP_VICTORY_ROAD_1F:1":"MAP_VICTORY_ROAD_1F:1/MAP_EVER_GRANDE_CITY:3","MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL4:1":"MAP_EVER_GRANDE_CITY_HALL4:1/MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:0","MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL_OF_FAME:0":"MAP_EVER_GRANDE_CITY_HALL_OF_FAME:0/MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:1","MAP_EVER_GRANDE_CITY_DRAKES_ROOM:0/MAP_EVER_GRANDE_CITY_HALL3:1":"MAP_EVER_GRANDE_CITY_HALL3:1/MAP_EVER_GRANDE_CITY_DRAKES_ROOM:0","MAP_EVER_GRANDE_CITY_DRAKES_ROOM:1/MAP_EVER_GRANDE_CITY_HALL4:0":"MAP_EVER_GRANDE_CITY_HALL4:0/MAP_EVER_GRANDE_CITY_DRAKES_ROOM:1","MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL2:1":"MAP_EVER_GRANDE_CITY_HALL2:1/MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:0","MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL3:0":"MAP_EVER_GRANDE_CITY_HALL3:0,2,3/MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:1","MAP_EVER_GRANDE_CITY_HALL1:0,2,3/MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:1":"MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL1:0","MAP_EVER_GRANDE_CITY_HALL1:1/MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:0":"MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:0/MAP_EVER_GRANDE_CITY_HALL1:1","MAP_EVER_GRANDE_CITY_HALL2:0,2,3/MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:1":"MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:1/MAP_EVER_GRANDE_CITY_HALL2:0","MAP_EVER_GRANDE_CITY_HALL2:1/MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:0":"MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL2:1","MAP_EVER_GRANDE_CITY_HALL3:0,2,3/MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:1":"MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL3:0","MAP_EVER_GRANDE_CITY_HALL3:1/MAP_EVER_GRANDE_CITY_DRAKES_ROOM:0":"MAP_EVER_GRANDE_CITY_DRAKES_ROOM:0/MAP_EVER_GRANDE_CITY_HALL3:1","MAP_EVER_GRANDE_CITY_HALL4:0/MAP_EVER_GRANDE_CITY_DRAKES_ROOM:1":"MAP_EVER_GRANDE_CITY_DRAKES_ROOM:1/MAP_EVER_GRANDE_CITY_HALL4:0","MAP_EVER_GRANDE_CITY_HALL4:1/MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:0":"MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL4:1","MAP_EVER_GRANDE_CITY_HALL5:0,2,3/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:2":"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:2,3/MAP_EVER_GRANDE_CITY_HALL5:0","MAP_EVER_GRANDE_CITY_HALL5:1/MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:0":"MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL5:1","MAP_EVER_GRANDE_CITY_HALL_OF_FAME:0/MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:1":"MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL_OF_FAME:0","MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:0/MAP_EVER_GRANDE_CITY_HALL1:1":"MAP_EVER_GRANDE_CITY_HALL1:1/MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:0","MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:1/MAP_EVER_GRANDE_CITY_HALL2:0":"MAP_EVER_GRANDE_CITY_HALL2:0,2,3/MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:1","MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:0,1/MAP_EVER_GRANDE_CITY:1":"MAP_EVER_GRANDE_CITY:1/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:0","MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:2/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:0":"MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:0/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:2","MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:0/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:2":"MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:2/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:0","MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:0,1/MAP_EVER_GRANDE_CITY:0":"MAP_EVER_GRANDE_CITY:0/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:0","MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:2,3/MAP_EVER_GRANDE_CITY_HALL5:0":"MAP_EVER_GRANDE_CITY_HALL5:0,2,3/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:2","MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:4/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:0":"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:0/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:4","MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:0/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:4":"MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:4/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:0","MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL5:1":"MAP_EVER_GRANDE_CITY_HALL5:1/MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:0","MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL1:0":"MAP_EVER_GRANDE_CITY_HALL1:0,2,3/MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:1","MAP_FALLARBOR_TOWN:0/MAP_FALLARBOR_TOWN_MART:0":"MAP_FALLARBOR_TOWN_MART:0,1/MAP_FALLARBOR_TOWN:0","MAP_FALLARBOR_TOWN:1/MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY:0":"MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY:0,1/MAP_FALLARBOR_TOWN:1","MAP_FALLARBOR_TOWN:2/MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:0":"MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:0,1/MAP_FALLARBOR_TOWN:2","MAP_FALLARBOR_TOWN:3/MAP_FALLARBOR_TOWN_COZMOS_HOUSE:0":"MAP_FALLARBOR_TOWN_COZMOS_HOUSE:0,1/MAP_FALLARBOR_TOWN:3","MAP_FALLARBOR_TOWN:4/MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE:0":"MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE:0,1/MAP_FALLARBOR_TOWN:4","MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY:0,1/MAP_FALLARBOR_TOWN:1":"MAP_FALLARBOR_TOWN:1/MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY:0","MAP_FALLARBOR_TOWN_COZMOS_HOUSE:0,1/MAP_FALLARBOR_TOWN:3":"MAP_FALLARBOR_TOWN:3/MAP_FALLARBOR_TOWN_COZMOS_HOUSE:0","MAP_FALLARBOR_TOWN_MART:0,1/MAP_FALLARBOR_TOWN:0":"MAP_FALLARBOR_TOWN:0/MAP_FALLARBOR_TOWN_MART:0","MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE:0,1/MAP_FALLARBOR_TOWN:4":"MAP_FALLARBOR_TOWN:4/MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE:0","MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:0,1/MAP_FALLARBOR_TOWN:2":"MAP_FALLARBOR_TOWN:2/MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:0","MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:2/MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:0":"MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:0/MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:2","MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:0/MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:2":"MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:2/MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:0","MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_FARAWAY_ISLAND_ENTRANCE:0,1/MAP_FARAWAY_ISLAND_INTERIOR:0,1":"MAP_FARAWAY_ISLAND_INTERIOR:0,1/MAP_FARAWAY_ISLAND_ENTRANCE:0,1","MAP_FARAWAY_ISLAND_INTERIOR:0,1/MAP_FARAWAY_ISLAND_ENTRANCE:0,1":"MAP_FARAWAY_ISLAND_ENTRANCE:0,1/MAP_FARAWAY_ISLAND_INTERIOR:0,1","MAP_FIERY_PATH:0/MAP_ROUTE112:4":"MAP_ROUTE112:4/MAP_FIERY_PATH:0","MAP_FIERY_PATH:1/MAP_ROUTE112:5":"MAP_ROUTE112:5/MAP_FIERY_PATH:1","MAP_FORTREE_CITY:0/MAP_FORTREE_CITY_POKEMON_CENTER_1F:0":"MAP_FORTREE_CITY_POKEMON_CENTER_1F:0,1/MAP_FORTREE_CITY:0","MAP_FORTREE_CITY:1/MAP_FORTREE_CITY_HOUSE1:0":"MAP_FORTREE_CITY_HOUSE1:0,1/MAP_FORTREE_CITY:1","MAP_FORTREE_CITY:2/MAP_FORTREE_CITY_GYM:0":"MAP_FORTREE_CITY_GYM:0,1/MAP_FORTREE_CITY:2","MAP_FORTREE_CITY:3/MAP_FORTREE_CITY_MART:0":"MAP_FORTREE_CITY_MART:0,1/MAP_FORTREE_CITY:3","MAP_FORTREE_CITY:4/MAP_FORTREE_CITY_HOUSE2:0":"MAP_FORTREE_CITY_HOUSE2:0,1/MAP_FORTREE_CITY:4","MAP_FORTREE_CITY:5/MAP_FORTREE_CITY_HOUSE3:0":"MAP_FORTREE_CITY_HOUSE3:0,1/MAP_FORTREE_CITY:5","MAP_FORTREE_CITY:6/MAP_FORTREE_CITY_HOUSE4:0":"MAP_FORTREE_CITY_HOUSE4:0,1/MAP_FORTREE_CITY:6","MAP_FORTREE_CITY:7/MAP_FORTREE_CITY_HOUSE5:0":"MAP_FORTREE_CITY_HOUSE5:0,1/MAP_FORTREE_CITY:7","MAP_FORTREE_CITY:8/MAP_FORTREE_CITY_DECORATION_SHOP:0":"MAP_FORTREE_CITY_DECORATION_SHOP:0,1/MAP_FORTREE_CITY:8","MAP_FORTREE_CITY_DECORATION_SHOP:0,1/MAP_FORTREE_CITY:8":"MAP_FORTREE_CITY:8/MAP_FORTREE_CITY_DECORATION_SHOP:0","MAP_FORTREE_CITY_GYM:0,1/MAP_FORTREE_CITY:2":"MAP_FORTREE_CITY:2/MAP_FORTREE_CITY_GYM:0","MAP_FORTREE_CITY_HOUSE1:0,1/MAP_FORTREE_CITY:1":"MAP_FORTREE_CITY:1/MAP_FORTREE_CITY_HOUSE1:0","MAP_FORTREE_CITY_HOUSE2:0,1/MAP_FORTREE_CITY:4":"MAP_FORTREE_CITY:4/MAP_FORTREE_CITY_HOUSE2:0","MAP_FORTREE_CITY_HOUSE3:0,1/MAP_FORTREE_CITY:5":"MAP_FORTREE_CITY:5/MAP_FORTREE_CITY_HOUSE3:0","MAP_FORTREE_CITY_HOUSE4:0,1/MAP_FORTREE_CITY:6":"MAP_FORTREE_CITY:6/MAP_FORTREE_CITY_HOUSE4:0","MAP_FORTREE_CITY_HOUSE5:0,1/MAP_FORTREE_CITY:7":"MAP_FORTREE_CITY:7/MAP_FORTREE_CITY_HOUSE5:0","MAP_FORTREE_CITY_MART:0,1/MAP_FORTREE_CITY:3":"MAP_FORTREE_CITY:3/MAP_FORTREE_CITY_MART:0","MAP_FORTREE_CITY_POKEMON_CENTER_1F:0,1/MAP_FORTREE_CITY:0":"MAP_FORTREE_CITY:0/MAP_FORTREE_CITY_POKEMON_CENTER_1F:0","MAP_FORTREE_CITY_POKEMON_CENTER_1F:2/MAP_FORTREE_CITY_POKEMON_CENTER_2F:0":"MAP_FORTREE_CITY_POKEMON_CENTER_2F:0/MAP_FORTREE_CITY_POKEMON_CENTER_1F:2","MAP_FORTREE_CITY_POKEMON_CENTER_2F:0/MAP_FORTREE_CITY_POKEMON_CENTER_1F:2":"MAP_FORTREE_CITY_POKEMON_CENTER_1F:2/MAP_FORTREE_CITY_POKEMON_CENTER_2F:0","MAP_FORTREE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_FORTREE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_GRANITE_CAVE_1F:0/MAP_ROUTE106:0":"MAP_ROUTE106:0/MAP_GRANITE_CAVE_1F:0","MAP_GRANITE_CAVE_1F:1/MAP_GRANITE_CAVE_B1F:0":"MAP_GRANITE_CAVE_B1F:0/MAP_GRANITE_CAVE_1F:1","MAP_GRANITE_CAVE_1F:2/MAP_GRANITE_CAVE_B1F:1":"MAP_GRANITE_CAVE_B1F:1/MAP_GRANITE_CAVE_1F:2","MAP_GRANITE_CAVE_1F:3/MAP_GRANITE_CAVE_STEVENS_ROOM:0":"MAP_GRANITE_CAVE_STEVENS_ROOM:0/MAP_GRANITE_CAVE_1F:3","MAP_GRANITE_CAVE_B1F:0/MAP_GRANITE_CAVE_1F:1":"MAP_GRANITE_CAVE_1F:1/MAP_GRANITE_CAVE_B1F:0","MAP_GRANITE_CAVE_B1F:1/MAP_GRANITE_CAVE_1F:2":"MAP_GRANITE_CAVE_1F:2/MAP_GRANITE_CAVE_B1F:1","MAP_GRANITE_CAVE_B1F:2/MAP_GRANITE_CAVE_B2F:0":"MAP_GRANITE_CAVE_B2F:0/MAP_GRANITE_CAVE_B1F:2","MAP_GRANITE_CAVE_B1F:3/MAP_GRANITE_CAVE_B2F:1":"MAP_GRANITE_CAVE_B2F:1/MAP_GRANITE_CAVE_B1F:3","MAP_GRANITE_CAVE_B1F:4/MAP_GRANITE_CAVE_B2F:2":"MAP_GRANITE_CAVE_B2F:2/MAP_GRANITE_CAVE_B1F:4","MAP_GRANITE_CAVE_B1F:5/MAP_GRANITE_CAVE_B2F:3":"MAP_GRANITE_CAVE_B2F:3/MAP_GRANITE_CAVE_B1F:5","MAP_GRANITE_CAVE_B1F:6/MAP_GRANITE_CAVE_B2F:4":"MAP_GRANITE_CAVE_B2F:4/MAP_GRANITE_CAVE_B1F:6","MAP_GRANITE_CAVE_B2F:0/MAP_GRANITE_CAVE_B1F:2":"MAP_GRANITE_CAVE_B1F:2/MAP_GRANITE_CAVE_B2F:0","MAP_GRANITE_CAVE_B2F:1/MAP_GRANITE_CAVE_B1F:3":"MAP_GRANITE_CAVE_B1F:3/MAP_GRANITE_CAVE_B2F:1","MAP_GRANITE_CAVE_B2F:2/MAP_GRANITE_CAVE_B1F:4":"MAP_GRANITE_CAVE_B1F:4/MAP_GRANITE_CAVE_B2F:2","MAP_GRANITE_CAVE_B2F:3/MAP_GRANITE_CAVE_B1F:5":"MAP_GRANITE_CAVE_B1F:5/MAP_GRANITE_CAVE_B2F:3","MAP_GRANITE_CAVE_B2F:4/MAP_GRANITE_CAVE_B1F:6":"MAP_GRANITE_CAVE_B1F:6/MAP_GRANITE_CAVE_B2F:4","MAP_GRANITE_CAVE_STEVENS_ROOM:0/MAP_GRANITE_CAVE_1F:3":"MAP_GRANITE_CAVE_1F:3/MAP_GRANITE_CAVE_STEVENS_ROOM:0","MAP_INSIDE_OF_TRUCK:0,1,2/MAP_DYNAMIC:-1!":"","MAP_ISLAND_CAVE:0/MAP_ROUTE105:0":"MAP_ROUTE105:0/MAP_ISLAND_CAVE:0","MAP_ISLAND_CAVE:1/MAP_ISLAND_CAVE:2":"MAP_ISLAND_CAVE:2/MAP_ISLAND_CAVE:1","MAP_ISLAND_CAVE:2/MAP_ISLAND_CAVE:1":"MAP_ISLAND_CAVE:1/MAP_ISLAND_CAVE:2","MAP_JAGGED_PASS:0,1/MAP_ROUTE112:2,3":"MAP_ROUTE112:2,3/MAP_JAGGED_PASS:0,1","MAP_JAGGED_PASS:2,3/MAP_MT_CHIMNEY:2,3":"MAP_MT_CHIMNEY:2,3/MAP_JAGGED_PASS:2,3","MAP_JAGGED_PASS:4/MAP_MAGMA_HIDEOUT_1F:0":"MAP_MAGMA_HIDEOUT_1F:0/MAP_JAGGED_PASS:4","MAP_LAVARIDGE_TOWN:0/MAP_LAVARIDGE_TOWN_HERB_SHOP:0":"MAP_LAVARIDGE_TOWN_HERB_SHOP:0,1/MAP_LAVARIDGE_TOWN:0","MAP_LAVARIDGE_TOWN:1/MAP_LAVARIDGE_TOWN_GYM_1F:0":"MAP_LAVARIDGE_TOWN_GYM_1F:0,1/MAP_LAVARIDGE_TOWN:1","MAP_LAVARIDGE_TOWN:2/MAP_LAVARIDGE_TOWN_MART:0":"MAP_LAVARIDGE_TOWN_MART:0,1/MAP_LAVARIDGE_TOWN:2","MAP_LAVARIDGE_TOWN:3/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:0":"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:0,1/MAP_LAVARIDGE_TOWN:3","MAP_LAVARIDGE_TOWN:4/MAP_LAVARIDGE_TOWN_HOUSE:0":"MAP_LAVARIDGE_TOWN_HOUSE:0,1/MAP_LAVARIDGE_TOWN:4","MAP_LAVARIDGE_TOWN:5/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:3":"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:3/MAP_LAVARIDGE_TOWN:5","MAP_LAVARIDGE_TOWN_GYM_1F:0,1/MAP_LAVARIDGE_TOWN:1":"MAP_LAVARIDGE_TOWN:1/MAP_LAVARIDGE_TOWN_GYM_1F:0","MAP_LAVARIDGE_TOWN_GYM_1F:10/MAP_LAVARIDGE_TOWN_GYM_B1F:8":"MAP_LAVARIDGE_TOWN_GYM_B1F:8/MAP_LAVARIDGE_TOWN_GYM_1F:10","MAP_LAVARIDGE_TOWN_GYM_1F:11/MAP_LAVARIDGE_TOWN_GYM_B1F:9":"MAP_LAVARIDGE_TOWN_GYM_B1F:9/MAP_LAVARIDGE_TOWN_GYM_1F:11","MAP_LAVARIDGE_TOWN_GYM_1F:12/MAP_LAVARIDGE_TOWN_GYM_B1F:10":"MAP_LAVARIDGE_TOWN_GYM_B1F:10/MAP_LAVARIDGE_TOWN_GYM_1F:12","MAP_LAVARIDGE_TOWN_GYM_1F:13/MAP_LAVARIDGE_TOWN_GYM_B1F:11":"MAP_LAVARIDGE_TOWN_GYM_B1F:11/MAP_LAVARIDGE_TOWN_GYM_1F:13","MAP_LAVARIDGE_TOWN_GYM_1F:14/MAP_LAVARIDGE_TOWN_GYM_B1F:12":"MAP_LAVARIDGE_TOWN_GYM_B1F:12/MAP_LAVARIDGE_TOWN_GYM_1F:14","MAP_LAVARIDGE_TOWN_GYM_1F:15/MAP_LAVARIDGE_TOWN_GYM_B1F:13":"MAP_LAVARIDGE_TOWN_GYM_B1F:13/MAP_LAVARIDGE_TOWN_GYM_1F:15","MAP_LAVARIDGE_TOWN_GYM_1F:16/MAP_LAVARIDGE_TOWN_GYM_B1F:14":"MAP_LAVARIDGE_TOWN_GYM_B1F:14/MAP_LAVARIDGE_TOWN_GYM_1F:16","MAP_LAVARIDGE_TOWN_GYM_1F:17/MAP_LAVARIDGE_TOWN_GYM_B1F:15":"MAP_LAVARIDGE_TOWN_GYM_B1F:15/MAP_LAVARIDGE_TOWN_GYM_1F:17","MAP_LAVARIDGE_TOWN_GYM_1F:18/MAP_LAVARIDGE_TOWN_GYM_B1F:16":"MAP_LAVARIDGE_TOWN_GYM_B1F:16/MAP_LAVARIDGE_TOWN_GYM_1F:18","MAP_LAVARIDGE_TOWN_GYM_1F:19/MAP_LAVARIDGE_TOWN_GYM_B1F:17":"MAP_LAVARIDGE_TOWN_GYM_B1F:17/MAP_LAVARIDGE_TOWN_GYM_1F:19","MAP_LAVARIDGE_TOWN_GYM_1F:2/MAP_LAVARIDGE_TOWN_GYM_B1F:0":"MAP_LAVARIDGE_TOWN_GYM_B1F:0/MAP_LAVARIDGE_TOWN_GYM_1F:2","MAP_LAVARIDGE_TOWN_GYM_1F:20/MAP_LAVARIDGE_TOWN_GYM_B1F:18":"MAP_LAVARIDGE_TOWN_GYM_B1F:18/MAP_LAVARIDGE_TOWN_GYM_1F:20","MAP_LAVARIDGE_TOWN_GYM_1F:21/MAP_LAVARIDGE_TOWN_GYM_B1F:20":"MAP_LAVARIDGE_TOWN_GYM_B1F:20/MAP_LAVARIDGE_TOWN_GYM_1F:21","MAP_LAVARIDGE_TOWN_GYM_1F:22/MAP_LAVARIDGE_TOWN_GYM_B1F:19":"MAP_LAVARIDGE_TOWN_GYM_B1F:19/MAP_LAVARIDGE_TOWN_GYM_1F:22","MAP_LAVARIDGE_TOWN_GYM_1F:23/MAP_LAVARIDGE_TOWN_GYM_B1F:21":"MAP_LAVARIDGE_TOWN_GYM_B1F:21/MAP_LAVARIDGE_TOWN_GYM_1F:23","MAP_LAVARIDGE_TOWN_GYM_1F:24/MAP_LAVARIDGE_TOWN_GYM_B1F:22":"MAP_LAVARIDGE_TOWN_GYM_B1F:22/MAP_LAVARIDGE_TOWN_GYM_1F:24","MAP_LAVARIDGE_TOWN_GYM_1F:25/MAP_LAVARIDGE_TOWN_GYM_B1F:23":"MAP_LAVARIDGE_TOWN_GYM_B1F:23/MAP_LAVARIDGE_TOWN_GYM_1F:25","MAP_LAVARIDGE_TOWN_GYM_1F:3/MAP_LAVARIDGE_TOWN_GYM_B1F:2":"MAP_LAVARIDGE_TOWN_GYM_B1F:2/MAP_LAVARIDGE_TOWN_GYM_1F:3","MAP_LAVARIDGE_TOWN_GYM_1F:4/MAP_LAVARIDGE_TOWN_GYM_B1F:4":"MAP_LAVARIDGE_TOWN_GYM_B1F:4/MAP_LAVARIDGE_TOWN_GYM_1F:4","MAP_LAVARIDGE_TOWN_GYM_1F:5/MAP_LAVARIDGE_TOWN_GYM_B1F:3":"MAP_LAVARIDGE_TOWN_GYM_B1F:3/MAP_LAVARIDGE_TOWN_GYM_1F:5","MAP_LAVARIDGE_TOWN_GYM_1F:6/MAP_LAVARIDGE_TOWN_GYM_B1F:1":"MAP_LAVARIDGE_TOWN_GYM_B1F:1/MAP_LAVARIDGE_TOWN_GYM_1F:6","MAP_LAVARIDGE_TOWN_GYM_1F:7/MAP_LAVARIDGE_TOWN_GYM_B1F:5":"MAP_LAVARIDGE_TOWN_GYM_B1F:5/MAP_LAVARIDGE_TOWN_GYM_1F:7","MAP_LAVARIDGE_TOWN_GYM_1F:8/MAP_LAVARIDGE_TOWN_GYM_B1F:6":"MAP_LAVARIDGE_TOWN_GYM_B1F:6/MAP_LAVARIDGE_TOWN_GYM_1F:8","MAP_LAVARIDGE_TOWN_GYM_1F:9/MAP_LAVARIDGE_TOWN_GYM_B1F:7":"MAP_LAVARIDGE_TOWN_GYM_B1F:7/MAP_LAVARIDGE_TOWN_GYM_1F:9","MAP_LAVARIDGE_TOWN_GYM_B1F:0/MAP_LAVARIDGE_TOWN_GYM_1F:2":"MAP_LAVARIDGE_TOWN_GYM_1F:2/MAP_LAVARIDGE_TOWN_GYM_B1F:0","MAP_LAVARIDGE_TOWN_GYM_B1F:1/MAP_LAVARIDGE_TOWN_GYM_1F:6":"MAP_LAVARIDGE_TOWN_GYM_1F:6/MAP_LAVARIDGE_TOWN_GYM_B1F:1","MAP_LAVARIDGE_TOWN_GYM_B1F:10/MAP_LAVARIDGE_TOWN_GYM_1F:12":"MAP_LAVARIDGE_TOWN_GYM_1F:12/MAP_LAVARIDGE_TOWN_GYM_B1F:10","MAP_LAVARIDGE_TOWN_GYM_B1F:11/MAP_LAVARIDGE_TOWN_GYM_1F:13":"MAP_LAVARIDGE_TOWN_GYM_1F:13/MAP_LAVARIDGE_TOWN_GYM_B1F:11","MAP_LAVARIDGE_TOWN_GYM_B1F:12/MAP_LAVARIDGE_TOWN_GYM_1F:14":"MAP_LAVARIDGE_TOWN_GYM_1F:14/MAP_LAVARIDGE_TOWN_GYM_B1F:12","MAP_LAVARIDGE_TOWN_GYM_B1F:13/MAP_LAVARIDGE_TOWN_GYM_1F:15":"MAP_LAVARIDGE_TOWN_GYM_1F:15/MAP_LAVARIDGE_TOWN_GYM_B1F:13","MAP_LAVARIDGE_TOWN_GYM_B1F:14/MAP_LAVARIDGE_TOWN_GYM_1F:16":"MAP_LAVARIDGE_TOWN_GYM_1F:16/MAP_LAVARIDGE_TOWN_GYM_B1F:14","MAP_LAVARIDGE_TOWN_GYM_B1F:15/MAP_LAVARIDGE_TOWN_GYM_1F:17":"MAP_LAVARIDGE_TOWN_GYM_1F:17/MAP_LAVARIDGE_TOWN_GYM_B1F:15","MAP_LAVARIDGE_TOWN_GYM_B1F:16/MAP_LAVARIDGE_TOWN_GYM_1F:18":"MAP_LAVARIDGE_TOWN_GYM_1F:18/MAP_LAVARIDGE_TOWN_GYM_B1F:16","MAP_LAVARIDGE_TOWN_GYM_B1F:17/MAP_LAVARIDGE_TOWN_GYM_1F:19":"MAP_LAVARIDGE_TOWN_GYM_1F:19/MAP_LAVARIDGE_TOWN_GYM_B1F:17","MAP_LAVARIDGE_TOWN_GYM_B1F:18/MAP_LAVARIDGE_TOWN_GYM_1F:20":"MAP_LAVARIDGE_TOWN_GYM_1F:20/MAP_LAVARIDGE_TOWN_GYM_B1F:18","MAP_LAVARIDGE_TOWN_GYM_B1F:19/MAP_LAVARIDGE_TOWN_GYM_1F:22":"MAP_LAVARIDGE_TOWN_GYM_1F:22/MAP_LAVARIDGE_TOWN_GYM_B1F:19","MAP_LAVARIDGE_TOWN_GYM_B1F:2/MAP_LAVARIDGE_TOWN_GYM_1F:3":"MAP_LAVARIDGE_TOWN_GYM_1F:3/MAP_LAVARIDGE_TOWN_GYM_B1F:2","MAP_LAVARIDGE_TOWN_GYM_B1F:20/MAP_LAVARIDGE_TOWN_GYM_1F:21":"MAP_LAVARIDGE_TOWN_GYM_1F:21/MAP_LAVARIDGE_TOWN_GYM_B1F:20","MAP_LAVARIDGE_TOWN_GYM_B1F:21/MAP_LAVARIDGE_TOWN_GYM_1F:23":"MAP_LAVARIDGE_TOWN_GYM_1F:23/MAP_LAVARIDGE_TOWN_GYM_B1F:21","MAP_LAVARIDGE_TOWN_GYM_B1F:22/MAP_LAVARIDGE_TOWN_GYM_1F:24":"MAP_LAVARIDGE_TOWN_GYM_1F:24/MAP_LAVARIDGE_TOWN_GYM_B1F:22","MAP_LAVARIDGE_TOWN_GYM_B1F:23/MAP_LAVARIDGE_TOWN_GYM_1F:25":"MAP_LAVARIDGE_TOWN_GYM_1F:25/MAP_LAVARIDGE_TOWN_GYM_B1F:23","MAP_LAVARIDGE_TOWN_GYM_B1F:3/MAP_LAVARIDGE_TOWN_GYM_1F:5":"MAP_LAVARIDGE_TOWN_GYM_1F:5/MAP_LAVARIDGE_TOWN_GYM_B1F:3","MAP_LAVARIDGE_TOWN_GYM_B1F:4/MAP_LAVARIDGE_TOWN_GYM_1F:4":"MAP_LAVARIDGE_TOWN_GYM_1F:4/MAP_LAVARIDGE_TOWN_GYM_B1F:4","MAP_LAVARIDGE_TOWN_GYM_B1F:5/MAP_LAVARIDGE_TOWN_GYM_1F:7":"MAP_LAVARIDGE_TOWN_GYM_1F:7/MAP_LAVARIDGE_TOWN_GYM_B1F:5","MAP_LAVARIDGE_TOWN_GYM_B1F:6/MAP_LAVARIDGE_TOWN_GYM_1F:8":"MAP_LAVARIDGE_TOWN_GYM_1F:8/MAP_LAVARIDGE_TOWN_GYM_B1F:6","MAP_LAVARIDGE_TOWN_GYM_B1F:7/MAP_LAVARIDGE_TOWN_GYM_1F:9":"MAP_LAVARIDGE_TOWN_GYM_1F:9/MAP_LAVARIDGE_TOWN_GYM_B1F:7","MAP_LAVARIDGE_TOWN_GYM_B1F:8/MAP_LAVARIDGE_TOWN_GYM_1F:10":"MAP_LAVARIDGE_TOWN_GYM_1F:10/MAP_LAVARIDGE_TOWN_GYM_B1F:8","MAP_LAVARIDGE_TOWN_GYM_B1F:9/MAP_LAVARIDGE_TOWN_GYM_1F:11":"MAP_LAVARIDGE_TOWN_GYM_1F:11/MAP_LAVARIDGE_TOWN_GYM_B1F:9","MAP_LAVARIDGE_TOWN_HERB_SHOP:0,1/MAP_LAVARIDGE_TOWN:0":"MAP_LAVARIDGE_TOWN:0/MAP_LAVARIDGE_TOWN_HERB_SHOP:0","MAP_LAVARIDGE_TOWN_HOUSE:0,1/MAP_LAVARIDGE_TOWN:4":"MAP_LAVARIDGE_TOWN:4/MAP_LAVARIDGE_TOWN_HOUSE:0","MAP_LAVARIDGE_TOWN_MART:0,1/MAP_LAVARIDGE_TOWN:2":"MAP_LAVARIDGE_TOWN:2/MAP_LAVARIDGE_TOWN_MART:0","MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:0,1/MAP_LAVARIDGE_TOWN:3":"MAP_LAVARIDGE_TOWN:3/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:0","MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:2/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:0":"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:0/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:2","MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:3/MAP_LAVARIDGE_TOWN:5":"MAP_LAVARIDGE_TOWN:5/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:3","MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:0/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:2":"MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:2/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:0","MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:0":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:0,1/MAP_LILYCOVE_CITY:0","MAP_LILYCOVE_CITY:1/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:0":"MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:0,1/MAP_LILYCOVE_CITY:1","MAP_LILYCOVE_CITY:10/MAP_LILYCOVE_CITY_HOUSE3:0":"MAP_LILYCOVE_CITY_HOUSE3:0,1/MAP_LILYCOVE_CITY:10","MAP_LILYCOVE_CITY:11/MAP_LILYCOVE_CITY_HOUSE4:0":"MAP_LILYCOVE_CITY_HOUSE4:0,1/MAP_LILYCOVE_CITY:11","MAP_LILYCOVE_CITY:12/MAP_LILYCOVE_CITY_HARBOR:0":"MAP_LILYCOVE_CITY_HARBOR:0,1/MAP_LILYCOVE_CITY:12","MAP_LILYCOVE_CITY:2/MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:0":"MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:0,1/MAP_LILYCOVE_CITY:2","MAP_LILYCOVE_CITY:3,13/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:0,1":"MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:0,1/MAP_LILYCOVE_CITY:3,13","MAP_LILYCOVE_CITY:4/MAP_LILYCOVE_CITY_CONTEST_LOBBY:0":"MAP_LILYCOVE_CITY_CONTEST_LOBBY:0,1/MAP_LILYCOVE_CITY:4","MAP_LILYCOVE_CITY:5/MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB:1":"MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB:0,1/MAP_LILYCOVE_CITY:5","MAP_LILYCOVE_CITY:6/MAP_AQUA_HIDEOUT_1F:0":"MAP_AQUA_HIDEOUT_1F:0,1/MAP_LILYCOVE_CITY:6","MAP_LILYCOVE_CITY:7/MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE:0":"MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE:0,1/MAP_LILYCOVE_CITY:7","MAP_LILYCOVE_CITY:8/MAP_LILYCOVE_CITY_HOUSE1:0":"MAP_LILYCOVE_CITY_HOUSE1:0,1/MAP_LILYCOVE_CITY:8","MAP_LILYCOVE_CITY:9/MAP_LILYCOVE_CITY_HOUSE2:0":"MAP_LILYCOVE_CITY_HOUSE2:0,1/MAP_LILYCOVE_CITY:9","MAP_LILYCOVE_CITY_CONTEST_HALL:0,2/MAP_LILYCOVE_CITY_CONTEST_LOBBY:2":"MAP_LILYCOVE_CITY_CONTEST_LOBBY:2/MAP_LILYCOVE_CITY_CONTEST_HALL:0","MAP_LILYCOVE_CITY_CONTEST_HALL:1,3/MAP_LILYCOVE_CITY_CONTEST_LOBBY:3":"MAP_LILYCOVE_CITY_CONTEST_LOBBY:3/MAP_LILYCOVE_CITY_CONTEST_HALL:1","MAP_LILYCOVE_CITY_CONTEST_LOBBY:0,1/MAP_LILYCOVE_CITY:4":"MAP_LILYCOVE_CITY:4/MAP_LILYCOVE_CITY_CONTEST_LOBBY:0","MAP_LILYCOVE_CITY_CONTEST_LOBBY:2/MAP_LILYCOVE_CITY_CONTEST_HALL:0":"MAP_LILYCOVE_CITY_CONTEST_HALL:0,2/MAP_LILYCOVE_CITY_CONTEST_LOBBY:2","MAP_LILYCOVE_CITY_CONTEST_LOBBY:3/MAP_LILYCOVE_CITY_CONTEST_HALL:1":"MAP_LILYCOVE_CITY_CONTEST_HALL:1,3/MAP_LILYCOVE_CITY_CONTEST_LOBBY:3","MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:0,1/MAP_LILYCOVE_CITY:1":"MAP_LILYCOVE_CITY:1/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:0","MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:2/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F:0":"MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F:0/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:2","MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F:0/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:2":"MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:2/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F:0","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:0,1/MAP_LILYCOVE_CITY:0":"MAP_LILYCOVE_CITY:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:0","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:0":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:2","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:3/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:2":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:0","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:0":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:1","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:1":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:0","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:0":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:1","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:1":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:0","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:0":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:1","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:1":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:0","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP:0":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:2","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0,1/MAP_DYNAMIC:-1!":"","MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:2":"MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP:0","MAP_LILYCOVE_CITY_HARBOR:0,1/MAP_LILYCOVE_CITY:12":"MAP_LILYCOVE_CITY:12/MAP_LILYCOVE_CITY_HARBOR:0","MAP_LILYCOVE_CITY_HOUSE1:0,1/MAP_LILYCOVE_CITY:8":"MAP_LILYCOVE_CITY:8/MAP_LILYCOVE_CITY_HOUSE1:0","MAP_LILYCOVE_CITY_HOUSE2:0,1/MAP_LILYCOVE_CITY:9":"MAP_LILYCOVE_CITY:9/MAP_LILYCOVE_CITY_HOUSE2:0","MAP_LILYCOVE_CITY_HOUSE3:0,1/MAP_LILYCOVE_CITY:10":"MAP_LILYCOVE_CITY:10/MAP_LILYCOVE_CITY_HOUSE3:0","MAP_LILYCOVE_CITY_HOUSE4:0,1/MAP_LILYCOVE_CITY:11":"MAP_LILYCOVE_CITY:11/MAP_LILYCOVE_CITY_HOUSE4:0","MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:0,1/MAP_LILYCOVE_CITY:3,13":"MAP_LILYCOVE_CITY:3,13/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:0,1","MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:2/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F:0":"MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F:0/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:2","MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F:0/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:2":"MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:2/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F:0","MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE:0,1/MAP_LILYCOVE_CITY:7":"MAP_LILYCOVE_CITY:7/MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE:0","MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:0,1/MAP_LILYCOVE_CITY:2":"MAP_LILYCOVE_CITY:2/MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:0","MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:2/MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:0":"MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:0/MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:2","MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:0/MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:2":"MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:2/MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:0","MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB:0,1/MAP_LILYCOVE_CITY:5":"MAP_LILYCOVE_CITY:5/MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB:1","MAP_LILYCOVE_CITY_UNUSED_MART:0,1/MAP_LILYCOVE_CITY:0!":"MAP_LILYCOVE_CITY:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:0","MAP_LITTLEROOT_TOWN:0/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:1":"MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:0,1/MAP_LITTLEROOT_TOWN:0","MAP_LITTLEROOT_TOWN:1/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:1":"MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:0,1/MAP_LITTLEROOT_TOWN:1","MAP_LITTLEROOT_TOWN:2/MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB:0":"MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB:0,1/MAP_LITTLEROOT_TOWN:2","MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:0,1/MAP_LITTLEROOT_TOWN:1":"MAP_LITTLEROOT_TOWN:1/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:1","MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:2/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F:0":"MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F:0/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:2","MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F:0/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:2":"MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:2/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F:0","MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:0,1/MAP_LITTLEROOT_TOWN:0":"MAP_LITTLEROOT_TOWN:0/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:1","MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:2/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F:0":"MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F:0/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:2","MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F:0/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:2":"MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:2/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F:0","MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB:0,1/MAP_LITTLEROOT_TOWN:2":"MAP_LITTLEROOT_TOWN:2/MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB:0","MAP_MAGMA_HIDEOUT_1F:0/MAP_JAGGED_PASS:4":"MAP_JAGGED_PASS:4/MAP_MAGMA_HIDEOUT_1F:0","MAP_MAGMA_HIDEOUT_1F:1/MAP_MAGMA_HIDEOUT_2F_1R:1":"MAP_MAGMA_HIDEOUT_2F_1R:1/MAP_MAGMA_HIDEOUT_1F:1","MAP_MAGMA_HIDEOUT_1F:2/MAP_MAGMA_HIDEOUT_2F_2R:1":"MAP_MAGMA_HIDEOUT_2F_2R:1/MAP_MAGMA_HIDEOUT_1F:2","MAP_MAGMA_HIDEOUT_1F:3/MAP_MAGMA_HIDEOUT_2F_3R:0":"MAP_MAGMA_HIDEOUT_2F_3R:0/MAP_MAGMA_HIDEOUT_1F:3","MAP_MAGMA_HIDEOUT_2F_1R:0/MAP_MAGMA_HIDEOUT_2F_2R:0":"MAP_MAGMA_HIDEOUT_2F_2R:0/MAP_MAGMA_HIDEOUT_2F_1R:0","MAP_MAGMA_HIDEOUT_2F_1R:1/MAP_MAGMA_HIDEOUT_1F:1":"MAP_MAGMA_HIDEOUT_1F:1/MAP_MAGMA_HIDEOUT_2F_1R:1","MAP_MAGMA_HIDEOUT_2F_1R:2/MAP_MAGMA_HIDEOUT_3F_1R:2":"MAP_MAGMA_HIDEOUT_3F_1R:2/MAP_MAGMA_HIDEOUT_2F_1R:2","MAP_MAGMA_HIDEOUT_2F_2R:0/MAP_MAGMA_HIDEOUT_2F_1R:0":"MAP_MAGMA_HIDEOUT_2F_1R:0/MAP_MAGMA_HIDEOUT_2F_2R:0","MAP_MAGMA_HIDEOUT_2F_2R:1/MAP_MAGMA_HIDEOUT_1F:2":"MAP_MAGMA_HIDEOUT_1F:2/MAP_MAGMA_HIDEOUT_2F_2R:1","MAP_MAGMA_HIDEOUT_2F_3R:0/MAP_MAGMA_HIDEOUT_1F:3":"MAP_MAGMA_HIDEOUT_1F:3/MAP_MAGMA_HIDEOUT_2F_3R:0","MAP_MAGMA_HIDEOUT_2F_3R:1/MAP_MAGMA_HIDEOUT_3F_3R:0":"MAP_MAGMA_HIDEOUT_3F_3R:0/MAP_MAGMA_HIDEOUT_2F_3R:1","MAP_MAGMA_HIDEOUT_3F_1R:0/MAP_MAGMA_HIDEOUT_4F:0":"MAP_MAGMA_HIDEOUT_4F:0/MAP_MAGMA_HIDEOUT_3F_1R:0","MAP_MAGMA_HIDEOUT_3F_1R:1/MAP_MAGMA_HIDEOUT_3F_2R:0":"MAP_MAGMA_HIDEOUT_3F_2R:0/MAP_MAGMA_HIDEOUT_3F_1R:1","MAP_MAGMA_HIDEOUT_3F_1R:2/MAP_MAGMA_HIDEOUT_2F_1R:2":"MAP_MAGMA_HIDEOUT_2F_1R:2/MAP_MAGMA_HIDEOUT_3F_1R:2","MAP_MAGMA_HIDEOUT_3F_2R:0/MAP_MAGMA_HIDEOUT_3F_1R:1":"MAP_MAGMA_HIDEOUT_3F_1R:1/MAP_MAGMA_HIDEOUT_3F_2R:0","MAP_MAGMA_HIDEOUT_3F_3R:0/MAP_MAGMA_HIDEOUT_2F_3R:1":"MAP_MAGMA_HIDEOUT_2F_3R:1/MAP_MAGMA_HIDEOUT_3F_3R:0","MAP_MAGMA_HIDEOUT_3F_3R:1/MAP_MAGMA_HIDEOUT_4F:1":"MAP_MAGMA_HIDEOUT_4F:1/MAP_MAGMA_HIDEOUT_3F_3R:1","MAP_MAGMA_HIDEOUT_4F:0/MAP_MAGMA_HIDEOUT_3F_1R:0":"MAP_MAGMA_HIDEOUT_3F_1R:0/MAP_MAGMA_HIDEOUT_4F:0","MAP_MAGMA_HIDEOUT_4F:1/MAP_MAGMA_HIDEOUT_3F_3R:1":"MAP_MAGMA_HIDEOUT_3F_3R:1/MAP_MAGMA_HIDEOUT_4F:1","MAP_MARINE_CAVE_END:0/MAP_MARINE_CAVE_ENTRANCE:0":"MAP_MARINE_CAVE_ENTRANCE:0/MAP_MARINE_CAVE_END:0","MAP_MARINE_CAVE_ENTRANCE:0/MAP_MARINE_CAVE_END:0":"MAP_MARINE_CAVE_END:0/MAP_MARINE_CAVE_ENTRANCE:0","MAP_MAUVILLE_CITY:0/MAP_MAUVILLE_CITY_GYM:0":"MAP_MAUVILLE_CITY_GYM:0,1/MAP_MAUVILLE_CITY:0","MAP_MAUVILLE_CITY:1/MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:0":"MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:0,1/MAP_MAUVILLE_CITY:1","MAP_MAUVILLE_CITY:2/MAP_MAUVILLE_CITY_BIKE_SHOP:0":"MAP_MAUVILLE_CITY_BIKE_SHOP:0,1/MAP_MAUVILLE_CITY:2","MAP_MAUVILLE_CITY:3/MAP_MAUVILLE_CITY_MART:0":"MAP_MAUVILLE_CITY_MART:0,1/MAP_MAUVILLE_CITY:3","MAP_MAUVILLE_CITY:4/MAP_MAUVILLE_CITY_HOUSE1:0":"MAP_MAUVILLE_CITY_HOUSE1:0,1/MAP_MAUVILLE_CITY:4","MAP_MAUVILLE_CITY:5/MAP_MAUVILLE_CITY_GAME_CORNER:0":"MAP_MAUVILLE_CITY_GAME_CORNER:0,1/MAP_MAUVILLE_CITY:5","MAP_MAUVILLE_CITY:6/MAP_MAUVILLE_CITY_HOUSE2:0":"MAP_MAUVILLE_CITY_HOUSE2:0,1/MAP_MAUVILLE_CITY:6","MAP_MAUVILLE_CITY_BIKE_SHOP:0,1/MAP_MAUVILLE_CITY:2":"MAP_MAUVILLE_CITY:2/MAP_MAUVILLE_CITY_BIKE_SHOP:0","MAP_MAUVILLE_CITY_GAME_CORNER:0,1/MAP_MAUVILLE_CITY:5":"MAP_MAUVILLE_CITY:5/MAP_MAUVILLE_CITY_GAME_CORNER:0","MAP_MAUVILLE_CITY_GYM:0,1/MAP_MAUVILLE_CITY:0":"MAP_MAUVILLE_CITY:0/MAP_MAUVILLE_CITY_GYM:0","MAP_MAUVILLE_CITY_HOUSE1:0,1/MAP_MAUVILLE_CITY:4":"MAP_MAUVILLE_CITY:4/MAP_MAUVILLE_CITY_HOUSE1:0","MAP_MAUVILLE_CITY_HOUSE2:0,1/MAP_MAUVILLE_CITY:6":"MAP_MAUVILLE_CITY:6/MAP_MAUVILLE_CITY_HOUSE2:0","MAP_MAUVILLE_CITY_MART:0,1/MAP_MAUVILLE_CITY:3":"MAP_MAUVILLE_CITY:3/MAP_MAUVILLE_CITY_MART:0","MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:0,1/MAP_MAUVILLE_CITY:1":"MAP_MAUVILLE_CITY:1/MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:0","MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:2/MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:0":"MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:0/MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:2","MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:0/MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:2":"MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:2/MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:0","MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_METEOR_FALLS_1F_1R:0/MAP_ROUTE114:0":"MAP_ROUTE114:0/MAP_METEOR_FALLS_1F_1R:0","MAP_METEOR_FALLS_1F_1R:1/MAP_ROUTE115:0":"MAP_ROUTE115:0/MAP_METEOR_FALLS_1F_1R:1","MAP_METEOR_FALLS_1F_1R:2/MAP_METEOR_FALLS_1F_2R:0":"MAP_METEOR_FALLS_1F_2R:0/MAP_METEOR_FALLS_1F_1R:2","MAP_METEOR_FALLS_1F_1R:3/MAP_METEOR_FALLS_B1F_1R:4":"MAP_METEOR_FALLS_B1F_1R:4/MAP_METEOR_FALLS_1F_1R:3","MAP_METEOR_FALLS_1F_1R:4/MAP_METEOR_FALLS_B1F_1R:5":"MAP_METEOR_FALLS_B1F_1R:5/MAP_METEOR_FALLS_1F_1R:4","MAP_METEOR_FALLS_1F_1R:5/MAP_METEOR_FALLS_STEVENS_CAVE:0":"MAP_METEOR_FALLS_STEVENS_CAVE:0/MAP_METEOR_FALLS_1F_1R:5","MAP_METEOR_FALLS_1F_2R:0/MAP_METEOR_FALLS_1F_1R:2":"MAP_METEOR_FALLS_1F_1R:2/MAP_METEOR_FALLS_1F_2R:0","MAP_METEOR_FALLS_1F_2R:1/MAP_METEOR_FALLS_B1F_1R:0":"MAP_METEOR_FALLS_B1F_1R:0/MAP_METEOR_FALLS_1F_2R:1","MAP_METEOR_FALLS_1F_2R:2/MAP_METEOR_FALLS_B1F_1R:1":"MAP_METEOR_FALLS_B1F_1R:1/MAP_METEOR_FALLS_1F_2R:2","MAP_METEOR_FALLS_1F_2R:3/MAP_METEOR_FALLS_B1F_1R:2":"MAP_METEOR_FALLS_B1F_1R:2/MAP_METEOR_FALLS_1F_2R:3","MAP_METEOR_FALLS_B1F_1R:0/MAP_METEOR_FALLS_1F_2R:1":"MAP_METEOR_FALLS_1F_2R:1/MAP_METEOR_FALLS_B1F_1R:0","MAP_METEOR_FALLS_B1F_1R:1/MAP_METEOR_FALLS_1F_2R:2":"MAP_METEOR_FALLS_1F_2R:2/MAP_METEOR_FALLS_B1F_1R:1","MAP_METEOR_FALLS_B1F_1R:2/MAP_METEOR_FALLS_1F_2R:3":"MAP_METEOR_FALLS_1F_2R:3/MAP_METEOR_FALLS_B1F_1R:2","MAP_METEOR_FALLS_B1F_1R:3/MAP_METEOR_FALLS_B1F_2R:0":"MAP_METEOR_FALLS_B1F_2R:0/MAP_METEOR_FALLS_B1F_1R:3","MAP_METEOR_FALLS_B1F_1R:4/MAP_METEOR_FALLS_1F_1R:3":"MAP_METEOR_FALLS_1F_1R:3/MAP_METEOR_FALLS_B1F_1R:4","MAP_METEOR_FALLS_B1F_1R:5/MAP_METEOR_FALLS_1F_1R:4":"MAP_METEOR_FALLS_1F_1R:4/MAP_METEOR_FALLS_B1F_1R:5","MAP_METEOR_FALLS_B1F_2R:0/MAP_METEOR_FALLS_B1F_1R:3":"MAP_METEOR_FALLS_B1F_1R:3/MAP_METEOR_FALLS_B1F_2R:0","MAP_METEOR_FALLS_STEVENS_CAVE:0/MAP_METEOR_FALLS_1F_1R:5":"MAP_METEOR_FALLS_1F_1R:5/MAP_METEOR_FALLS_STEVENS_CAVE:0","MAP_MIRAGE_TOWER_1F:0/MAP_ROUTE111:3":"MAP_ROUTE111:3/MAP_MIRAGE_TOWER_1F:0","MAP_MIRAGE_TOWER_1F:1/MAP_MIRAGE_TOWER_2F:1":"MAP_MIRAGE_TOWER_2F:1/MAP_MIRAGE_TOWER_1F:1","MAP_MIRAGE_TOWER_2F:0/MAP_MIRAGE_TOWER_3F:0":"MAP_MIRAGE_TOWER_3F:0/MAP_MIRAGE_TOWER_2F:0","MAP_MIRAGE_TOWER_2F:1/MAP_MIRAGE_TOWER_1F:1":"MAP_MIRAGE_TOWER_1F:1/MAP_MIRAGE_TOWER_2F:1","MAP_MIRAGE_TOWER_3F:0/MAP_MIRAGE_TOWER_2F:0":"MAP_MIRAGE_TOWER_2F:0/MAP_MIRAGE_TOWER_3F:0","MAP_MIRAGE_TOWER_3F:1/MAP_MIRAGE_TOWER_4F:0":"MAP_MIRAGE_TOWER_4F:0/MAP_MIRAGE_TOWER_3F:1","MAP_MIRAGE_TOWER_4F:0/MAP_MIRAGE_TOWER_3F:1":"MAP_MIRAGE_TOWER_3F:1/MAP_MIRAGE_TOWER_4F:0","MAP_MOSSDEEP_CITY:0/MAP_MOSSDEEP_CITY_HOUSE1:0":"MAP_MOSSDEEP_CITY_HOUSE1:0,1/MAP_MOSSDEEP_CITY:0","MAP_MOSSDEEP_CITY:1/MAP_MOSSDEEP_CITY_GYM:0":"MAP_MOSSDEEP_CITY_GYM:0,1/MAP_MOSSDEEP_CITY:1","MAP_MOSSDEEP_CITY:2/MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:0":"MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:0,1/MAP_MOSSDEEP_CITY:2","MAP_MOSSDEEP_CITY:3/MAP_MOSSDEEP_CITY_HOUSE2:0":"MAP_MOSSDEEP_CITY_HOUSE2:0,1/MAP_MOSSDEEP_CITY:3","MAP_MOSSDEEP_CITY:4/MAP_MOSSDEEP_CITY_MART:0":"MAP_MOSSDEEP_CITY_MART:0,1/MAP_MOSSDEEP_CITY:4","MAP_MOSSDEEP_CITY:5/MAP_MOSSDEEP_CITY_HOUSE3:0":"MAP_MOSSDEEP_CITY_HOUSE3:0,1/MAP_MOSSDEEP_CITY:5","MAP_MOSSDEEP_CITY:6/MAP_MOSSDEEP_CITY_STEVENS_HOUSE:0":"MAP_MOSSDEEP_CITY_STEVENS_HOUSE:0,1/MAP_MOSSDEEP_CITY:6","MAP_MOSSDEEP_CITY:7/MAP_MOSSDEEP_CITY_HOUSE4:1":"MAP_MOSSDEEP_CITY_HOUSE4:0,1/MAP_MOSSDEEP_CITY:7","MAP_MOSSDEEP_CITY:8/MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:0":"MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:0,1/MAP_MOSSDEEP_CITY:8","MAP_MOSSDEEP_CITY:9/MAP_MOSSDEEP_CITY_GAME_CORNER_1F:0":"MAP_MOSSDEEP_CITY_GAME_CORNER_1F:0,1/MAP_MOSSDEEP_CITY:9","MAP_MOSSDEEP_CITY_GAME_CORNER_1F:0,1/MAP_MOSSDEEP_CITY:9":"MAP_MOSSDEEP_CITY:9/MAP_MOSSDEEP_CITY_GAME_CORNER_1F:0","MAP_MOSSDEEP_CITY_GAME_CORNER_1F:2/MAP_MOSSDEEP_CITY_GAME_CORNER_B1F:0":"MAP_MOSSDEEP_CITY_GAME_CORNER_B1F:0/MAP_MOSSDEEP_CITY_GAME_CORNER_1F:2","MAP_MOSSDEEP_CITY_GAME_CORNER_B1F:0/MAP_MOSSDEEP_CITY_GAME_CORNER_1F:2":"MAP_MOSSDEEP_CITY_GAME_CORNER_1F:2/MAP_MOSSDEEP_CITY_GAME_CORNER_B1F:0","MAP_MOSSDEEP_CITY_GYM:0,1/MAP_MOSSDEEP_CITY:1":"MAP_MOSSDEEP_CITY:1/MAP_MOSSDEEP_CITY_GYM:0","MAP_MOSSDEEP_CITY_GYM:10/MAP_MOSSDEEP_CITY_GYM:11":"MAP_MOSSDEEP_CITY_GYM:11/MAP_MOSSDEEP_CITY_GYM:10","MAP_MOSSDEEP_CITY_GYM:11/MAP_MOSSDEEP_CITY_GYM:10":"MAP_MOSSDEEP_CITY_GYM:10/MAP_MOSSDEEP_CITY_GYM:11","MAP_MOSSDEEP_CITY_GYM:12/MAP_MOSSDEEP_CITY_GYM:13":"MAP_MOSSDEEP_CITY_GYM:13/MAP_MOSSDEEP_CITY_GYM:12","MAP_MOSSDEEP_CITY_GYM:13/MAP_MOSSDEEP_CITY_GYM:12":"MAP_MOSSDEEP_CITY_GYM:12/MAP_MOSSDEEP_CITY_GYM:13","MAP_MOSSDEEP_CITY_GYM:2/MAP_MOSSDEEP_CITY_GYM:3":"MAP_MOSSDEEP_CITY_GYM:3/MAP_MOSSDEEP_CITY_GYM:2","MAP_MOSSDEEP_CITY_GYM:3/MAP_MOSSDEEP_CITY_GYM:2":"MAP_MOSSDEEP_CITY_GYM:2/MAP_MOSSDEEP_CITY_GYM:3","MAP_MOSSDEEP_CITY_GYM:4/MAP_MOSSDEEP_CITY_GYM:5":"MAP_MOSSDEEP_CITY_GYM:5/MAP_MOSSDEEP_CITY_GYM:4","MAP_MOSSDEEP_CITY_GYM:5/MAP_MOSSDEEP_CITY_GYM:4":"MAP_MOSSDEEP_CITY_GYM:4/MAP_MOSSDEEP_CITY_GYM:5","MAP_MOSSDEEP_CITY_GYM:6/MAP_MOSSDEEP_CITY_GYM:7":"MAP_MOSSDEEP_CITY_GYM:7/MAP_MOSSDEEP_CITY_GYM:6","MAP_MOSSDEEP_CITY_GYM:7/MAP_MOSSDEEP_CITY_GYM:6":"MAP_MOSSDEEP_CITY_GYM:6/MAP_MOSSDEEP_CITY_GYM:7","MAP_MOSSDEEP_CITY_GYM:8/MAP_MOSSDEEP_CITY_GYM:9":"MAP_MOSSDEEP_CITY_GYM:9/MAP_MOSSDEEP_CITY_GYM:8","MAP_MOSSDEEP_CITY_GYM:9/MAP_MOSSDEEP_CITY_GYM:8":"MAP_MOSSDEEP_CITY_GYM:8/MAP_MOSSDEEP_CITY_GYM:9","MAP_MOSSDEEP_CITY_HOUSE1:0,1/MAP_MOSSDEEP_CITY:0":"MAP_MOSSDEEP_CITY:0/MAP_MOSSDEEP_CITY_HOUSE1:0","MAP_MOSSDEEP_CITY_HOUSE2:0,1/MAP_MOSSDEEP_CITY:3":"MAP_MOSSDEEP_CITY:3/MAP_MOSSDEEP_CITY_HOUSE2:0","MAP_MOSSDEEP_CITY_HOUSE3:0,1/MAP_MOSSDEEP_CITY:5":"MAP_MOSSDEEP_CITY:5/MAP_MOSSDEEP_CITY_HOUSE3:0","MAP_MOSSDEEP_CITY_HOUSE4:0,1/MAP_MOSSDEEP_CITY:7":"MAP_MOSSDEEP_CITY:7/MAP_MOSSDEEP_CITY_HOUSE4:1","MAP_MOSSDEEP_CITY_MART:0,1/MAP_MOSSDEEP_CITY:4":"MAP_MOSSDEEP_CITY:4/MAP_MOSSDEEP_CITY_MART:0","MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:0,1/MAP_MOSSDEEP_CITY:2":"MAP_MOSSDEEP_CITY:2/MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:0","MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:2/MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:0":"MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:0/MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:2","MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:0/MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:2":"MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:2/MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:0","MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:0,1/MAP_MOSSDEEP_CITY:8":"MAP_MOSSDEEP_CITY:8/MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:0","MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:2/MAP_MOSSDEEP_CITY_SPACE_CENTER_2F:0":"MAP_MOSSDEEP_CITY_SPACE_CENTER_2F:0/MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:2","MAP_MOSSDEEP_CITY_SPACE_CENTER_2F:0/MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:2":"MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:2/MAP_MOSSDEEP_CITY_SPACE_CENTER_2F:0","MAP_MOSSDEEP_CITY_STEVENS_HOUSE:0,1/MAP_MOSSDEEP_CITY:6":"MAP_MOSSDEEP_CITY:6/MAP_MOSSDEEP_CITY_STEVENS_HOUSE:0","MAP_MT_CHIMNEY:0,1/MAP_MT_CHIMNEY_CABLE_CAR_STATION:0,1":"MAP_MT_CHIMNEY_CABLE_CAR_STATION:0,1/MAP_MT_CHIMNEY:0,1","MAP_MT_CHIMNEY:2,3/MAP_JAGGED_PASS:2,3":"MAP_JAGGED_PASS:2,3/MAP_MT_CHIMNEY:2,3","MAP_MT_CHIMNEY_CABLE_CAR_STATION:0,1/MAP_MT_CHIMNEY:0,1":"MAP_MT_CHIMNEY:0,1/MAP_MT_CHIMNEY_CABLE_CAR_STATION:0,1","MAP_MT_PYRE_1F:0,2/MAP_ROUTE122:0":"MAP_ROUTE122:0/MAP_MT_PYRE_1F:0","MAP_MT_PYRE_1F:1,3/MAP_MT_PYRE_EXTERIOR:0":"MAP_MT_PYRE_EXTERIOR:0/MAP_MT_PYRE_1F:1","MAP_MT_PYRE_1F:4/MAP_MT_PYRE_2F:0":"MAP_MT_PYRE_2F:0/MAP_MT_PYRE_1F:4","MAP_MT_PYRE_1F:5/MAP_MT_PYRE_2F:4":"MAP_MT_PYRE_2F:4/MAP_MT_PYRE_1F:5","MAP_MT_PYRE_2F:0/MAP_MT_PYRE_1F:4":"MAP_MT_PYRE_1F:4/MAP_MT_PYRE_2F:0","MAP_MT_PYRE_2F:1/MAP_MT_PYRE_3F:0":"MAP_MT_PYRE_3F:0/MAP_MT_PYRE_2F:1","MAP_MT_PYRE_2F:2/MAP_MT_PYRE_3F:4":"MAP_MT_PYRE_3F:4/MAP_MT_PYRE_2F:2","MAP_MT_PYRE_2F:3/MAP_MT_PYRE_3F:5":"MAP_MT_PYRE_3F:5/MAP_MT_PYRE_2F:3","MAP_MT_PYRE_2F:4/MAP_MT_PYRE_1F:5":"MAP_MT_PYRE_1F:5/MAP_MT_PYRE_2F:4","MAP_MT_PYRE_3F:0/MAP_MT_PYRE_2F:1":"MAP_MT_PYRE_2F:1/MAP_MT_PYRE_3F:0","MAP_MT_PYRE_3F:1/MAP_MT_PYRE_4F:1":"MAP_MT_PYRE_4F:1/MAP_MT_PYRE_3F:1","MAP_MT_PYRE_3F:2/MAP_MT_PYRE_4F:4":"MAP_MT_PYRE_4F:4/MAP_MT_PYRE_3F:2","MAP_MT_PYRE_3F:3/MAP_MT_PYRE_4F:5":"MAP_MT_PYRE_4F:5/MAP_MT_PYRE_3F:3","MAP_MT_PYRE_3F:4/MAP_MT_PYRE_2F:2":"MAP_MT_PYRE_2F:2/MAP_MT_PYRE_3F:4","MAP_MT_PYRE_3F:5/MAP_MT_PYRE_2F:3":"MAP_MT_PYRE_2F:3/MAP_MT_PYRE_3F:5","MAP_MT_PYRE_4F:0/MAP_MT_PYRE_5F:1":"MAP_MT_PYRE_5F:1/MAP_MT_PYRE_4F:0","MAP_MT_PYRE_4F:1/MAP_MT_PYRE_3F:1":"MAP_MT_PYRE_3F:1/MAP_MT_PYRE_4F:1","MAP_MT_PYRE_4F:2/MAP_MT_PYRE_5F:3":"MAP_MT_PYRE_5F:3/MAP_MT_PYRE_4F:2","MAP_MT_PYRE_4F:3/MAP_MT_PYRE_5F:4":"MAP_MT_PYRE_5F:4/MAP_MT_PYRE_4F:3","MAP_MT_PYRE_4F:4/MAP_MT_PYRE_3F:2":"MAP_MT_PYRE_3F:2/MAP_MT_PYRE_4F:4","MAP_MT_PYRE_4F:5/MAP_MT_PYRE_3F:3":"MAP_MT_PYRE_3F:3/MAP_MT_PYRE_4F:5","MAP_MT_PYRE_5F:0/MAP_MT_PYRE_6F:0":"MAP_MT_PYRE_6F:0/MAP_MT_PYRE_5F:0","MAP_MT_PYRE_5F:1/MAP_MT_PYRE_4F:0":"MAP_MT_PYRE_4F:0/MAP_MT_PYRE_5F:1","MAP_MT_PYRE_5F:2/MAP_MT_PYRE_6F:1":"MAP_MT_PYRE_6F:1/MAP_MT_PYRE_5F:2","MAP_MT_PYRE_5F:3/MAP_MT_PYRE_4F:2":"MAP_MT_PYRE_4F:2/MAP_MT_PYRE_5F:3","MAP_MT_PYRE_5F:4/MAP_MT_PYRE_4F:3":"MAP_MT_PYRE_4F:3/MAP_MT_PYRE_5F:4","MAP_MT_PYRE_6F:0/MAP_MT_PYRE_5F:0":"MAP_MT_PYRE_5F:0/MAP_MT_PYRE_6F:0","MAP_MT_PYRE_6F:1/MAP_MT_PYRE_5F:2":"MAP_MT_PYRE_5F:2/MAP_MT_PYRE_6F:1","MAP_MT_PYRE_EXTERIOR:0/MAP_MT_PYRE_1F:1":"MAP_MT_PYRE_1F:1,3/MAP_MT_PYRE_EXTERIOR:0","MAP_MT_PYRE_EXTERIOR:1,2/MAP_MT_PYRE_SUMMIT:1":"MAP_MT_PYRE_SUMMIT:0,1,2/MAP_MT_PYRE_EXTERIOR:1","MAP_MT_PYRE_SUMMIT:0,1,2/MAP_MT_PYRE_EXTERIOR:1":"MAP_MT_PYRE_EXTERIOR:1,2/MAP_MT_PYRE_SUMMIT:1","MAP_NAVEL_ROCK_B1F:0/MAP_NAVEL_ROCK_ENTRANCE:0":"MAP_NAVEL_ROCK_ENTRANCE:0/MAP_NAVEL_ROCK_B1F:0","MAP_NAVEL_ROCK_B1F:1/MAP_NAVEL_ROCK_FORK:1":"MAP_NAVEL_ROCK_FORK:1/MAP_NAVEL_ROCK_B1F:1","MAP_NAVEL_ROCK_BOTTOM:0/MAP_NAVEL_ROCK_DOWN11:0":"MAP_NAVEL_ROCK_DOWN11:0/MAP_NAVEL_ROCK_BOTTOM:0","MAP_NAVEL_ROCK_DOWN01:0/MAP_NAVEL_ROCK_FORK:2":"MAP_NAVEL_ROCK_FORK:2/MAP_NAVEL_ROCK_DOWN01:0","MAP_NAVEL_ROCK_DOWN01:1/MAP_NAVEL_ROCK_DOWN02:0":"MAP_NAVEL_ROCK_DOWN02:0/MAP_NAVEL_ROCK_DOWN01:1","MAP_NAVEL_ROCK_DOWN02:0/MAP_NAVEL_ROCK_DOWN01:1":"MAP_NAVEL_ROCK_DOWN01:1/MAP_NAVEL_ROCK_DOWN02:0","MAP_NAVEL_ROCK_DOWN02:1/MAP_NAVEL_ROCK_DOWN03:0":"MAP_NAVEL_ROCK_DOWN03:0/MAP_NAVEL_ROCK_DOWN02:1","MAP_NAVEL_ROCK_DOWN03:0/MAP_NAVEL_ROCK_DOWN02:1":"MAP_NAVEL_ROCK_DOWN02:1/MAP_NAVEL_ROCK_DOWN03:0","MAP_NAVEL_ROCK_DOWN03:1/MAP_NAVEL_ROCK_DOWN04:0":"MAP_NAVEL_ROCK_DOWN04:0/MAP_NAVEL_ROCK_DOWN03:1","MAP_NAVEL_ROCK_DOWN04:0/MAP_NAVEL_ROCK_DOWN03:1":"MAP_NAVEL_ROCK_DOWN03:1/MAP_NAVEL_ROCK_DOWN04:0","MAP_NAVEL_ROCK_DOWN04:1/MAP_NAVEL_ROCK_DOWN05:0":"MAP_NAVEL_ROCK_DOWN05:0/MAP_NAVEL_ROCK_DOWN04:1","MAP_NAVEL_ROCK_DOWN05:0/MAP_NAVEL_ROCK_DOWN04:1":"MAP_NAVEL_ROCK_DOWN04:1/MAP_NAVEL_ROCK_DOWN05:0","MAP_NAVEL_ROCK_DOWN05:1/MAP_NAVEL_ROCK_DOWN06:0":"MAP_NAVEL_ROCK_DOWN06:0/MAP_NAVEL_ROCK_DOWN05:1","MAP_NAVEL_ROCK_DOWN06:0/MAP_NAVEL_ROCK_DOWN05:1":"MAP_NAVEL_ROCK_DOWN05:1/MAP_NAVEL_ROCK_DOWN06:0","MAP_NAVEL_ROCK_DOWN06:1/MAP_NAVEL_ROCK_DOWN07:0":"MAP_NAVEL_ROCK_DOWN07:0/MAP_NAVEL_ROCK_DOWN06:1","MAP_NAVEL_ROCK_DOWN07:0/MAP_NAVEL_ROCK_DOWN06:1":"MAP_NAVEL_ROCK_DOWN06:1/MAP_NAVEL_ROCK_DOWN07:0","MAP_NAVEL_ROCK_DOWN07:1/MAP_NAVEL_ROCK_DOWN08:0":"MAP_NAVEL_ROCK_DOWN08:0/MAP_NAVEL_ROCK_DOWN07:1","MAP_NAVEL_ROCK_DOWN08:0/MAP_NAVEL_ROCK_DOWN07:1":"MAP_NAVEL_ROCK_DOWN07:1/MAP_NAVEL_ROCK_DOWN08:0","MAP_NAVEL_ROCK_DOWN08:1/MAP_NAVEL_ROCK_DOWN09:0":"MAP_NAVEL_ROCK_DOWN09:0/MAP_NAVEL_ROCK_DOWN08:1","MAP_NAVEL_ROCK_DOWN09:0/MAP_NAVEL_ROCK_DOWN08:1":"MAP_NAVEL_ROCK_DOWN08:1/MAP_NAVEL_ROCK_DOWN09:0","MAP_NAVEL_ROCK_DOWN09:1/MAP_NAVEL_ROCK_DOWN10:0":"MAP_NAVEL_ROCK_DOWN10:0/MAP_NAVEL_ROCK_DOWN09:1","MAP_NAVEL_ROCK_DOWN10:0/MAP_NAVEL_ROCK_DOWN09:1":"MAP_NAVEL_ROCK_DOWN09:1/MAP_NAVEL_ROCK_DOWN10:0","MAP_NAVEL_ROCK_DOWN10:1/MAP_NAVEL_ROCK_DOWN11:1":"MAP_NAVEL_ROCK_DOWN11:1/MAP_NAVEL_ROCK_DOWN10:1","MAP_NAVEL_ROCK_DOWN11:0/MAP_NAVEL_ROCK_BOTTOM:0":"MAP_NAVEL_ROCK_BOTTOM:0/MAP_NAVEL_ROCK_DOWN11:0","MAP_NAVEL_ROCK_DOWN11:1/MAP_NAVEL_ROCK_DOWN10:1":"MAP_NAVEL_ROCK_DOWN10:1/MAP_NAVEL_ROCK_DOWN11:1","MAP_NAVEL_ROCK_ENTRANCE:0/MAP_NAVEL_ROCK_B1F:0":"MAP_NAVEL_ROCK_B1F:0/MAP_NAVEL_ROCK_ENTRANCE:0","MAP_NAVEL_ROCK_ENTRANCE:1/MAP_NAVEL_ROCK_EXTERIOR:1":"MAP_NAVEL_ROCK_EXTERIOR:1/MAP_NAVEL_ROCK_ENTRANCE:1","MAP_NAVEL_ROCK_EXTERIOR:0/MAP_NAVEL_ROCK_HARBOR:0":"MAP_NAVEL_ROCK_HARBOR:0/MAP_NAVEL_ROCK_EXTERIOR:0","MAP_NAVEL_ROCK_EXTERIOR:1/MAP_NAVEL_ROCK_ENTRANCE:1":"MAP_NAVEL_ROCK_ENTRANCE:1/MAP_NAVEL_ROCK_EXTERIOR:1","MAP_NAVEL_ROCK_FORK:0/MAP_NAVEL_ROCK_UP1:0":"MAP_NAVEL_ROCK_UP1:0/MAP_NAVEL_ROCK_FORK:0","MAP_NAVEL_ROCK_FORK:1/MAP_NAVEL_ROCK_B1F:1":"MAP_NAVEL_ROCK_B1F:1/MAP_NAVEL_ROCK_FORK:1","MAP_NAVEL_ROCK_FORK:2/MAP_NAVEL_ROCK_DOWN01:0":"MAP_NAVEL_ROCK_DOWN01:0/MAP_NAVEL_ROCK_FORK:2","MAP_NAVEL_ROCK_HARBOR:0/MAP_NAVEL_ROCK_EXTERIOR:0":"MAP_NAVEL_ROCK_EXTERIOR:0/MAP_NAVEL_ROCK_HARBOR:0","MAP_NAVEL_ROCK_TOP:0/MAP_NAVEL_ROCK_UP4:1":"MAP_NAVEL_ROCK_UP4:1/MAP_NAVEL_ROCK_TOP:0","MAP_NAVEL_ROCK_UP1:0/MAP_NAVEL_ROCK_FORK:0":"MAP_NAVEL_ROCK_FORK:0/MAP_NAVEL_ROCK_UP1:0","MAP_NAVEL_ROCK_UP1:1/MAP_NAVEL_ROCK_UP2:0":"MAP_NAVEL_ROCK_UP2:0/MAP_NAVEL_ROCK_UP1:1","MAP_NAVEL_ROCK_UP2:0/MAP_NAVEL_ROCK_UP1:1":"MAP_NAVEL_ROCK_UP1:1/MAP_NAVEL_ROCK_UP2:0","MAP_NAVEL_ROCK_UP2:1/MAP_NAVEL_ROCK_UP3:0":"MAP_NAVEL_ROCK_UP3:0/MAP_NAVEL_ROCK_UP2:1","MAP_NAVEL_ROCK_UP3:0/MAP_NAVEL_ROCK_UP2:1":"MAP_NAVEL_ROCK_UP2:1/MAP_NAVEL_ROCK_UP3:0","MAP_NAVEL_ROCK_UP3:1/MAP_NAVEL_ROCK_UP4:0":"MAP_NAVEL_ROCK_UP4:0/MAP_NAVEL_ROCK_UP3:1","MAP_NAVEL_ROCK_UP4:0/MAP_NAVEL_ROCK_UP3:1":"MAP_NAVEL_ROCK_UP3:1/MAP_NAVEL_ROCK_UP4:0","MAP_NAVEL_ROCK_UP4:1/MAP_NAVEL_ROCK_TOP:0":"MAP_NAVEL_ROCK_TOP:0/MAP_NAVEL_ROCK_UP4:1","MAP_NEW_MAUVILLE_ENTRANCE:0/MAP_ROUTE110:0":"MAP_ROUTE110:0/MAP_NEW_MAUVILLE_ENTRANCE:0","MAP_NEW_MAUVILLE_ENTRANCE:1/MAP_NEW_MAUVILLE_INSIDE:0":"MAP_NEW_MAUVILLE_INSIDE:0/MAP_NEW_MAUVILLE_ENTRANCE:1","MAP_NEW_MAUVILLE_INSIDE:0/MAP_NEW_MAUVILLE_ENTRANCE:1":"MAP_NEW_MAUVILLE_ENTRANCE:1/MAP_NEW_MAUVILLE_INSIDE:0","MAP_OLDALE_TOWN:0/MAP_OLDALE_TOWN_HOUSE1:0":"MAP_OLDALE_TOWN_HOUSE1:0,1/MAP_OLDALE_TOWN:0","MAP_OLDALE_TOWN:1/MAP_OLDALE_TOWN_HOUSE2:0":"MAP_OLDALE_TOWN_HOUSE2:0,1/MAP_OLDALE_TOWN:1","MAP_OLDALE_TOWN:2/MAP_OLDALE_TOWN_POKEMON_CENTER_1F:0":"MAP_OLDALE_TOWN_POKEMON_CENTER_1F:0,1/MAP_OLDALE_TOWN:2","MAP_OLDALE_TOWN:3/MAP_OLDALE_TOWN_MART:0":"MAP_OLDALE_TOWN_MART:0,1/MAP_OLDALE_TOWN:3","MAP_OLDALE_TOWN_HOUSE1:0,1/MAP_OLDALE_TOWN:0":"MAP_OLDALE_TOWN:0/MAP_OLDALE_TOWN_HOUSE1:0","MAP_OLDALE_TOWN_HOUSE2:0,1/MAP_OLDALE_TOWN:1":"MAP_OLDALE_TOWN:1/MAP_OLDALE_TOWN_HOUSE2:0","MAP_OLDALE_TOWN_MART:0,1/MAP_OLDALE_TOWN:3":"MAP_OLDALE_TOWN:3/MAP_OLDALE_TOWN_MART:0","MAP_OLDALE_TOWN_POKEMON_CENTER_1F:0,1/MAP_OLDALE_TOWN:2":"MAP_OLDALE_TOWN:2/MAP_OLDALE_TOWN_POKEMON_CENTER_1F:0","MAP_OLDALE_TOWN_POKEMON_CENTER_1F:2/MAP_OLDALE_TOWN_POKEMON_CENTER_2F:0":"MAP_OLDALE_TOWN_POKEMON_CENTER_2F:0/MAP_OLDALE_TOWN_POKEMON_CENTER_1F:2","MAP_OLDALE_TOWN_POKEMON_CENTER_2F:0/MAP_OLDALE_TOWN_POKEMON_CENTER_1F:2":"MAP_OLDALE_TOWN_POKEMON_CENTER_1F:2/MAP_OLDALE_TOWN_POKEMON_CENTER_2F:0","MAP_OLDALE_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_OLDALE_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_PACIFIDLOG_TOWN:0/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:0":"MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:0,1/MAP_PACIFIDLOG_TOWN:0","MAP_PACIFIDLOG_TOWN:1/MAP_PACIFIDLOG_TOWN_HOUSE1:0":"MAP_PACIFIDLOG_TOWN_HOUSE1:0,1/MAP_PACIFIDLOG_TOWN:1","MAP_PACIFIDLOG_TOWN:2/MAP_PACIFIDLOG_TOWN_HOUSE2:0":"MAP_PACIFIDLOG_TOWN_HOUSE2:0,1/MAP_PACIFIDLOG_TOWN:2","MAP_PACIFIDLOG_TOWN:3/MAP_PACIFIDLOG_TOWN_HOUSE3:0":"MAP_PACIFIDLOG_TOWN_HOUSE3:0,1/MAP_PACIFIDLOG_TOWN:3","MAP_PACIFIDLOG_TOWN:4/MAP_PACIFIDLOG_TOWN_HOUSE4:0":"MAP_PACIFIDLOG_TOWN_HOUSE4:0,1/MAP_PACIFIDLOG_TOWN:4","MAP_PACIFIDLOG_TOWN:5/MAP_PACIFIDLOG_TOWN_HOUSE5:0":"MAP_PACIFIDLOG_TOWN_HOUSE5:0,1/MAP_PACIFIDLOG_TOWN:5","MAP_PACIFIDLOG_TOWN_HOUSE1:0,1/MAP_PACIFIDLOG_TOWN:1":"MAP_PACIFIDLOG_TOWN:1/MAP_PACIFIDLOG_TOWN_HOUSE1:0","MAP_PACIFIDLOG_TOWN_HOUSE2:0,1/MAP_PACIFIDLOG_TOWN:2":"MAP_PACIFIDLOG_TOWN:2/MAP_PACIFIDLOG_TOWN_HOUSE2:0","MAP_PACIFIDLOG_TOWN_HOUSE3:0,1/MAP_PACIFIDLOG_TOWN:3":"MAP_PACIFIDLOG_TOWN:3/MAP_PACIFIDLOG_TOWN_HOUSE3:0","MAP_PACIFIDLOG_TOWN_HOUSE4:0,1/MAP_PACIFIDLOG_TOWN:4":"MAP_PACIFIDLOG_TOWN:4/MAP_PACIFIDLOG_TOWN_HOUSE4:0","MAP_PACIFIDLOG_TOWN_HOUSE5:0,1/MAP_PACIFIDLOG_TOWN:5":"MAP_PACIFIDLOG_TOWN:5/MAP_PACIFIDLOG_TOWN_HOUSE5:0","MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:0,1/MAP_PACIFIDLOG_TOWN:0":"MAP_PACIFIDLOG_TOWN:0/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:0","MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:2/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:0":"MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:0/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:2","MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:0/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:2":"MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:2/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:0","MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_PETALBURG_CITY:0/MAP_PETALBURG_CITY_HOUSE1:0":"MAP_PETALBURG_CITY_HOUSE1:0,1/MAP_PETALBURG_CITY:0","MAP_PETALBURG_CITY:1/MAP_PETALBURG_CITY_WALLYS_HOUSE:0":"MAP_PETALBURG_CITY_WALLYS_HOUSE:0,1/MAP_PETALBURG_CITY:1","MAP_PETALBURG_CITY:2/MAP_PETALBURG_CITY_GYM:0":"MAP_PETALBURG_CITY_GYM:0,1/MAP_PETALBURG_CITY:2","MAP_PETALBURG_CITY:3/MAP_PETALBURG_CITY_POKEMON_CENTER_1F:0":"MAP_PETALBURG_CITY_POKEMON_CENTER_1F:0,1/MAP_PETALBURG_CITY:3","MAP_PETALBURG_CITY:4/MAP_PETALBURG_CITY_HOUSE2:0":"MAP_PETALBURG_CITY_HOUSE2:0,1/MAP_PETALBURG_CITY:4","MAP_PETALBURG_CITY:5/MAP_PETALBURG_CITY_MART:0":"MAP_PETALBURG_CITY_MART:0,1/MAP_PETALBURG_CITY:5","MAP_PETALBURG_CITY_GYM:0,1/MAP_PETALBURG_CITY:2":"MAP_PETALBURG_CITY:2/MAP_PETALBURG_CITY_GYM:0","MAP_PETALBURG_CITY_GYM:10,11/MAP_PETALBURG_CITY_GYM:8":"MAP_PETALBURG_CITY_GYM:8/MAP_PETALBURG_CITY_GYM:10","MAP_PETALBURG_CITY_GYM:12,13/MAP_PETALBURG_CITY_GYM:9":"MAP_PETALBURG_CITY_GYM:9/MAP_PETALBURG_CITY_GYM:12","MAP_PETALBURG_CITY_GYM:14/MAP_PETALBURG_CITY_GYM:16":"MAP_PETALBURG_CITY_GYM:16,17/MAP_PETALBURG_CITY_GYM:14","MAP_PETALBURG_CITY_GYM:15/MAP_PETALBURG_CITY_GYM:18":"MAP_PETALBURG_CITY_GYM:18,19/MAP_PETALBURG_CITY_GYM:15","MAP_PETALBURG_CITY_GYM:16,17/MAP_PETALBURG_CITY_GYM:14":"MAP_PETALBURG_CITY_GYM:14/MAP_PETALBURG_CITY_GYM:16","MAP_PETALBURG_CITY_GYM:18,19/MAP_PETALBURG_CITY_GYM:15":"MAP_PETALBURG_CITY_GYM:15/MAP_PETALBURG_CITY_GYM:18","MAP_PETALBURG_CITY_GYM:2/MAP_PETALBURG_CITY_GYM:3":"MAP_PETALBURG_CITY_GYM:3,4/MAP_PETALBURG_CITY_GYM:2","MAP_PETALBURG_CITY_GYM:20/MAP_PETALBURG_CITY_GYM:24":"MAP_PETALBURG_CITY_GYM:24,25/MAP_PETALBURG_CITY_GYM:20","MAP_PETALBURG_CITY_GYM:21/MAP_PETALBURG_CITY_GYM:26":"MAP_PETALBURG_CITY_GYM:26,27/MAP_PETALBURG_CITY_GYM:21","MAP_PETALBURG_CITY_GYM:22/MAP_PETALBURG_CITY_GYM:28":"MAP_PETALBURG_CITY_GYM:28,29/MAP_PETALBURG_CITY_GYM:22","MAP_PETALBURG_CITY_GYM:23/MAP_PETALBURG_CITY_GYM:30":"MAP_PETALBURG_CITY_GYM:30,31/MAP_PETALBURG_CITY_GYM:23","MAP_PETALBURG_CITY_GYM:24,25/MAP_PETALBURG_CITY_GYM:20":"MAP_PETALBURG_CITY_GYM:20/MAP_PETALBURG_CITY_GYM:24","MAP_PETALBURG_CITY_GYM:26,27/MAP_PETALBURG_CITY_GYM:21":"MAP_PETALBURG_CITY_GYM:21/MAP_PETALBURG_CITY_GYM:26","MAP_PETALBURG_CITY_GYM:28,29/MAP_PETALBURG_CITY_GYM:22":"MAP_PETALBURG_CITY_GYM:22/MAP_PETALBURG_CITY_GYM:28","MAP_PETALBURG_CITY_GYM:3,4/MAP_PETALBURG_CITY_GYM:2":"MAP_PETALBURG_CITY_GYM:2/MAP_PETALBURG_CITY_GYM:3","MAP_PETALBURG_CITY_GYM:30,31/MAP_PETALBURG_CITY_GYM:23":"MAP_PETALBURG_CITY_GYM:23/MAP_PETALBURG_CITY_GYM:30","MAP_PETALBURG_CITY_GYM:32/MAP_PETALBURG_CITY_GYM:34":"MAP_PETALBURG_CITY_GYM:34,35/MAP_PETALBURG_CITY_GYM:32","MAP_PETALBURG_CITY_GYM:33/MAP_PETALBURG_CITY_GYM:36":"MAP_PETALBURG_CITY_GYM:36,37/MAP_PETALBURG_CITY_GYM:33","MAP_PETALBURG_CITY_GYM:34,35/MAP_PETALBURG_CITY_GYM:32":"MAP_PETALBURG_CITY_GYM:32/MAP_PETALBURG_CITY_GYM:34","MAP_PETALBURG_CITY_GYM:36,37/MAP_PETALBURG_CITY_GYM:33":"MAP_PETALBURG_CITY_GYM:33/MAP_PETALBURG_CITY_GYM:36","MAP_PETALBURG_CITY_GYM:5/MAP_PETALBURG_CITY_GYM:6":"MAP_PETALBURG_CITY_GYM:6,7/MAP_PETALBURG_CITY_GYM:5","MAP_PETALBURG_CITY_GYM:6,7/MAP_PETALBURG_CITY_GYM:5":"MAP_PETALBURG_CITY_GYM:5/MAP_PETALBURG_CITY_GYM:6","MAP_PETALBURG_CITY_GYM:8/MAP_PETALBURG_CITY_GYM:10":"MAP_PETALBURG_CITY_GYM:10,11/MAP_PETALBURG_CITY_GYM:8","MAP_PETALBURG_CITY_GYM:9/MAP_PETALBURG_CITY_GYM:12":"MAP_PETALBURG_CITY_GYM:12,13/MAP_PETALBURG_CITY_GYM:9","MAP_PETALBURG_CITY_HOUSE1:0,1/MAP_PETALBURG_CITY:0":"MAP_PETALBURG_CITY:0/MAP_PETALBURG_CITY_HOUSE1:0","MAP_PETALBURG_CITY_HOUSE2:0,1/MAP_PETALBURG_CITY:4":"MAP_PETALBURG_CITY:4/MAP_PETALBURG_CITY_HOUSE2:0","MAP_PETALBURG_CITY_MART:0,1/MAP_PETALBURG_CITY:5":"MAP_PETALBURG_CITY:5/MAP_PETALBURG_CITY_MART:0","MAP_PETALBURG_CITY_POKEMON_CENTER_1F:0,1/MAP_PETALBURG_CITY:3":"MAP_PETALBURG_CITY:3/MAP_PETALBURG_CITY_POKEMON_CENTER_1F:0","MAP_PETALBURG_CITY_POKEMON_CENTER_1F:2/MAP_PETALBURG_CITY_POKEMON_CENTER_2F:0":"MAP_PETALBURG_CITY_POKEMON_CENTER_2F:0/MAP_PETALBURG_CITY_POKEMON_CENTER_1F:2","MAP_PETALBURG_CITY_POKEMON_CENTER_2F:0/MAP_PETALBURG_CITY_POKEMON_CENTER_1F:2":"MAP_PETALBURG_CITY_POKEMON_CENTER_1F:2/MAP_PETALBURG_CITY_POKEMON_CENTER_2F:0","MAP_PETALBURG_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_PETALBURG_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_PETALBURG_CITY_WALLYS_HOUSE:0,1/MAP_PETALBURG_CITY:1":"MAP_PETALBURG_CITY:1/MAP_PETALBURG_CITY_WALLYS_HOUSE:0","MAP_PETALBURG_WOODS:0,1/MAP_ROUTE104:2,3":"MAP_ROUTE104:2,3/MAP_PETALBURG_WOODS:0,1","MAP_PETALBURG_WOODS:2,3/MAP_ROUTE104:4,5":"MAP_ROUTE104:4,5/MAP_PETALBURG_WOODS:2,3","MAP_PETALBURG_WOODS:4,5/MAP_ROUTE104:6,7":"MAP_ROUTE104:6,7/MAP_PETALBURG_WOODS:4,5","MAP_RECORD_CORNER:0,1,2,3/MAP_DYNAMIC:-1!":"","MAP_ROUTE103:0/MAP_ALTERING_CAVE:0":"MAP_ALTERING_CAVE:0/MAP_ROUTE103:0","MAP_ROUTE104:0/MAP_ROUTE104_MR_BRINEYS_HOUSE:0":"MAP_ROUTE104_MR_BRINEYS_HOUSE:0,1/MAP_ROUTE104:0","MAP_ROUTE104:1/MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP:0":"MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP:0,1/MAP_ROUTE104:1","MAP_ROUTE104:2,3/MAP_PETALBURG_WOODS:0,1":"MAP_PETALBURG_WOODS:0,1/MAP_ROUTE104:2,3","MAP_ROUTE104:4,5/MAP_PETALBURG_WOODS:2,3":"MAP_PETALBURG_WOODS:2,3/MAP_ROUTE104:4,5","MAP_ROUTE104:6,7/MAP_PETALBURG_WOODS:4,5":"MAP_PETALBURG_WOODS:4,5/MAP_ROUTE104:6,7","MAP_ROUTE104_MR_BRINEYS_HOUSE:0,1/MAP_ROUTE104:0":"MAP_ROUTE104:0/MAP_ROUTE104_MR_BRINEYS_HOUSE:0","MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP:0,1/MAP_ROUTE104:1":"MAP_ROUTE104:1/MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP:0","MAP_ROUTE105:0/MAP_ISLAND_CAVE:0":"MAP_ISLAND_CAVE:0/MAP_ROUTE105:0","MAP_ROUTE106:0/MAP_GRANITE_CAVE_1F:0":"MAP_GRANITE_CAVE_1F:0/MAP_ROUTE106:0","MAP_ROUTE108:0/MAP_ABANDONED_SHIP_DECK:0":"MAP_ABANDONED_SHIP_DECK:0,1/MAP_ROUTE108:0","MAP_ROUTE109:0/MAP_ROUTE109_SEASHORE_HOUSE:0":"MAP_ROUTE109_SEASHORE_HOUSE:0,1/MAP_ROUTE109:0","MAP_ROUTE109_SEASHORE_HOUSE:0,1/MAP_ROUTE109:0":"MAP_ROUTE109:0/MAP_ROUTE109_SEASHORE_HOUSE:0","MAP_ROUTE110:0/MAP_NEW_MAUVILLE_ENTRANCE:0":"MAP_NEW_MAUVILLE_ENTRANCE:0/MAP_ROUTE110:0","MAP_ROUTE110:1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:0":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:0,1/MAP_ROUTE110:1","MAP_ROUTE110:2/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:0":"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:0,1/MAP_ROUTE110:2","MAP_ROUTE110:3/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:2":"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:2,3/MAP_ROUTE110:3","MAP_ROUTE110:4/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:0":"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:0,1/MAP_ROUTE110:4","MAP_ROUTE110:5/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:2":"MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:2,3/MAP_ROUTE110:5","MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:0,1/MAP_ROUTE110:4":"MAP_ROUTE110:4/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:0","MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:2,3/MAP_ROUTE110:5":"MAP_ROUTE110:5/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:2","MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:0,1/MAP_ROUTE110:2":"MAP_ROUTE110:2/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:0","MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:2,3/MAP_ROUTE110:3":"MAP_ROUTE110:3/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:2","MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:0,1/MAP_ROUTE110_TRICK_HOUSE_END:1":"MAP_ROUTE110_TRICK_HOUSE_END:1/MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:0","MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:2,3/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2/MAP_ROUTE110_TRICK_HOUSE_END:0","MAP_ROUTE110_TRICK_HOUSE_END:1/MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:0":"MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:0,1/MAP_ROUTE110_TRICK_HOUSE_END:1","MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:0,1/MAP_ROUTE110:1":"MAP_ROUTE110:1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:0","MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2/MAP_ROUTE110_TRICK_HOUSE_END:0":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE2:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE2:2/MAP_ROUTE110_TRICK_HOUSE_END:0!":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE3:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE3:2/MAP_ROUTE110_TRICK_HOUSE_END:0!":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE4:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE4:2/MAP_ROUTE110_TRICK_HOUSE_END:0!":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE5:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE5:2/MAP_ROUTE110_TRICK_HOUSE_END:0!":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE6:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE6:2/MAP_ROUTE110_TRICK_HOUSE_END:0!":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:2/MAP_ROUTE110_TRICK_HOUSE_END:0!":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8","MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10":"MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9","MAP_ROUTE110_TRICK_HOUSE_PUZZLE8:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!":"MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0","MAP_ROUTE110_TRICK_HOUSE_PUZZLE8:2/MAP_ROUTE110_TRICK_HOUSE_END:0!":"MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2","MAP_ROUTE111:0/MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE:0":"MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE:0,1/MAP_ROUTE111:0","MAP_ROUTE111:1/MAP_DESERT_RUINS:0":"MAP_DESERT_RUINS:0/MAP_ROUTE111:1","MAP_ROUTE111:2/MAP_ROUTE111_OLD_LADYS_REST_STOP:0":"MAP_ROUTE111_OLD_LADYS_REST_STOP:0,1/MAP_ROUTE111:2","MAP_ROUTE111:3/MAP_MIRAGE_TOWER_1F:0":"MAP_MIRAGE_TOWER_1F:0/MAP_ROUTE111:3","MAP_ROUTE111:4/MAP_TRAINER_HILL_ENTRANCE:0":"MAP_TRAINER_HILL_ENTRANCE:0,1/MAP_ROUTE111:4","MAP_ROUTE111_OLD_LADYS_REST_STOP:0,1/MAP_ROUTE111:2":"MAP_ROUTE111:2/MAP_ROUTE111_OLD_LADYS_REST_STOP:0","MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE:0,1/MAP_ROUTE111:0":"MAP_ROUTE111:0/MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE:0","MAP_ROUTE112:0,1/MAP_ROUTE112_CABLE_CAR_STATION:0,1":"MAP_ROUTE112_CABLE_CAR_STATION:0,1/MAP_ROUTE112:0,1","MAP_ROUTE112:2,3/MAP_JAGGED_PASS:0,1":"MAP_JAGGED_PASS:0,1/MAP_ROUTE112:2,3","MAP_ROUTE112:4/MAP_FIERY_PATH:0":"MAP_FIERY_PATH:0/MAP_ROUTE112:4","MAP_ROUTE112:5/MAP_FIERY_PATH:1":"MAP_FIERY_PATH:1/MAP_ROUTE112:5","MAP_ROUTE112_CABLE_CAR_STATION:0,1/MAP_ROUTE112:0,1":"MAP_ROUTE112:0,1/MAP_ROUTE112_CABLE_CAR_STATION:0,1","MAP_ROUTE113:0/MAP_ROUTE113_GLASS_WORKSHOP:0":"MAP_ROUTE113_GLASS_WORKSHOP:0,1/MAP_ROUTE113:0","MAP_ROUTE113:1/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE113:2/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE113_GLASS_WORKSHOP:0,1/MAP_ROUTE113:0":"MAP_ROUTE113:0/MAP_ROUTE113_GLASS_WORKSHOP:0","MAP_ROUTE114:0/MAP_METEOR_FALLS_1F_1R:0":"MAP_METEOR_FALLS_1F_1R:0/MAP_ROUTE114:0","MAP_ROUTE114:1/MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:0":"MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:0,1/MAP_ROUTE114:1","MAP_ROUTE114:2/MAP_ROUTE114_LANETTES_HOUSE:0":"MAP_ROUTE114_LANETTES_HOUSE:0,1/MAP_ROUTE114:2","MAP_ROUTE114:3/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE114:4/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:0,1/MAP_ROUTE114:1":"MAP_ROUTE114:1/MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:0","MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:2/MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:0":"MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:0,1/MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:2","MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:0,1/MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:2":"MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:2/MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:0","MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:2/MAP_DESERT_UNDERPASS:0":"MAP_DESERT_UNDERPASS:0/MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:2","MAP_ROUTE114_LANETTES_HOUSE:0,1/MAP_ROUTE114:2":"MAP_ROUTE114:2/MAP_ROUTE114_LANETTES_HOUSE:0","MAP_ROUTE115:0/MAP_METEOR_FALLS_1F_1R:1":"MAP_METEOR_FALLS_1F_1R:1/MAP_ROUTE115:0","MAP_ROUTE115:1/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE115:2/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE116:0/MAP_RUSTURF_TUNNEL:0":"MAP_RUSTURF_TUNNEL:0/MAP_ROUTE116:0","MAP_ROUTE116:1/MAP_ROUTE116_TUNNELERS_REST_HOUSE:0":"MAP_ROUTE116_TUNNELERS_REST_HOUSE:0,1/MAP_ROUTE116:1","MAP_ROUTE116:2/MAP_RUSTURF_TUNNEL:2":"MAP_RUSTURF_TUNNEL:2/MAP_ROUTE116:2","MAP_ROUTE116:3/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE116:4/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE116_TUNNELERS_REST_HOUSE:0,1/MAP_ROUTE116:1":"MAP_ROUTE116:1/MAP_ROUTE116_TUNNELERS_REST_HOUSE:0","MAP_ROUTE117:0/MAP_ROUTE117_POKEMON_DAY_CARE:0":"MAP_ROUTE117_POKEMON_DAY_CARE:0,1/MAP_ROUTE117:0","MAP_ROUTE117_POKEMON_DAY_CARE:0,1/MAP_ROUTE117:0":"MAP_ROUTE117:0/MAP_ROUTE117_POKEMON_DAY_CARE:0","MAP_ROUTE118:0/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE118:1/MAP_TERRA_CAVE_ENTRANCE:0!":"MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!","MAP_ROUTE119:0/MAP_ROUTE119_WEATHER_INSTITUTE_1F:0":"MAP_ROUTE119_WEATHER_INSTITUTE_1F:0,1/MAP_ROUTE119:0","MAP_ROUTE119:1/MAP_ROUTE119_HOUSE:0":"MAP_ROUTE119_HOUSE:0,1/MAP_ROUTE119:1","MAP_ROUTE119_HOUSE:0,1/MAP_ROUTE119:1":"MAP_ROUTE119:1/MAP_ROUTE119_HOUSE:0","MAP_ROUTE119_WEATHER_INSTITUTE_1F:0,1/MAP_ROUTE119:0":"MAP_ROUTE119:0/MAP_ROUTE119_WEATHER_INSTITUTE_1F:0","MAP_ROUTE119_WEATHER_INSTITUTE_1F:2/MAP_ROUTE119_WEATHER_INSTITUTE_2F:0":"MAP_ROUTE119_WEATHER_INSTITUTE_2F:0/MAP_ROUTE119_WEATHER_INSTITUTE_1F:2","MAP_ROUTE119_WEATHER_INSTITUTE_2F:0/MAP_ROUTE119_WEATHER_INSTITUTE_1F:2":"MAP_ROUTE119_WEATHER_INSTITUTE_1F:2/MAP_ROUTE119_WEATHER_INSTITUTE_2F:0","MAP_ROUTE120:0/MAP_ANCIENT_TOMB:0":"MAP_ANCIENT_TOMB:0/MAP_ROUTE120:0","MAP_ROUTE120:1/MAP_SCORCHED_SLAB:0":"MAP_SCORCHED_SLAB:0/MAP_ROUTE120:1","MAP_ROUTE121:0/MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:2":"MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:2,3/MAP_ROUTE121:0","MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:0,1/MAP_SAFARI_ZONE_SOUTH:0":"MAP_SAFARI_ZONE_SOUTH:0/MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:0","MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:2,3/MAP_ROUTE121:0":"MAP_ROUTE121:0/MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:2","MAP_ROUTE122:0/MAP_MT_PYRE_1F:0":"MAP_MT_PYRE_1F:0,2/MAP_ROUTE122:0","MAP_ROUTE123:0/MAP_ROUTE123_BERRY_MASTERS_HOUSE:0":"MAP_ROUTE123_BERRY_MASTERS_HOUSE:0,1/MAP_ROUTE123:0","MAP_ROUTE123_BERRY_MASTERS_HOUSE:0,1/MAP_ROUTE123:0":"MAP_ROUTE123:0/MAP_ROUTE123_BERRY_MASTERS_HOUSE:0","MAP_ROUTE124:0/MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE:0":"MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE:0,1/MAP_ROUTE124:0","MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE:0,1/MAP_ROUTE124:0":"MAP_ROUTE124:0/MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE:0","MAP_ROUTE125:0/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:0":"MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:0/MAP_ROUTE125:0","MAP_ROUTE131:0/MAP_SKY_PILLAR_ENTRANCE:0":"MAP_SKY_PILLAR_ENTRANCE:0/MAP_ROUTE131:0","MAP_RUSTBORO_CITY:0/MAP_RUSTBORO_CITY_GYM:0":"MAP_RUSTBORO_CITY_GYM:0,1/MAP_RUSTBORO_CITY:0","MAP_RUSTBORO_CITY:1/MAP_RUSTBORO_CITY_FLAT1_1F:0":"MAP_RUSTBORO_CITY_FLAT1_1F:0,1/MAP_RUSTBORO_CITY:1","MAP_RUSTBORO_CITY:10/MAP_RUSTBORO_CITY_FLAT2_1F:0":"MAP_RUSTBORO_CITY_FLAT2_1F:0,1/MAP_RUSTBORO_CITY:10","MAP_RUSTBORO_CITY:11/MAP_RUSTBORO_CITY_HOUSE3:0":"MAP_RUSTBORO_CITY_HOUSE3:0,1/MAP_RUSTBORO_CITY:11","MAP_RUSTBORO_CITY:2/MAP_RUSTBORO_CITY_MART:0":"MAP_RUSTBORO_CITY_MART:0,1/MAP_RUSTBORO_CITY:2","MAP_RUSTBORO_CITY:3/MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:0":"MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:0,1/MAP_RUSTBORO_CITY:3","MAP_RUSTBORO_CITY:4/MAP_RUSTBORO_CITY_POKEMON_SCHOOL:0":"MAP_RUSTBORO_CITY_POKEMON_SCHOOL:0,1/MAP_RUSTBORO_CITY:4","MAP_RUSTBORO_CITY:5,6/MAP_RUSTBORO_CITY_DEVON_CORP_1F:0,1":"MAP_RUSTBORO_CITY_DEVON_CORP_1F:0,1/MAP_RUSTBORO_CITY:5,6","MAP_RUSTBORO_CITY:7/MAP_RUSTBORO_CITY_HOUSE1:0":"MAP_RUSTBORO_CITY_HOUSE1:0,1/MAP_RUSTBORO_CITY:7","MAP_RUSTBORO_CITY:8/MAP_RUSTBORO_CITY_CUTTERS_HOUSE:0":"MAP_RUSTBORO_CITY_CUTTERS_HOUSE:0,1/MAP_RUSTBORO_CITY:8","MAP_RUSTBORO_CITY:9/MAP_RUSTBORO_CITY_HOUSE2:0":"MAP_RUSTBORO_CITY_HOUSE2:0,1/MAP_RUSTBORO_CITY:9","MAP_RUSTBORO_CITY_CUTTERS_HOUSE:0,1/MAP_RUSTBORO_CITY:8":"MAP_RUSTBORO_CITY:8/MAP_RUSTBORO_CITY_CUTTERS_HOUSE:0","MAP_RUSTBORO_CITY_DEVON_CORP_1F:0,1/MAP_RUSTBORO_CITY:5,6":"MAP_RUSTBORO_CITY:5,6/MAP_RUSTBORO_CITY_DEVON_CORP_1F:0,1","MAP_RUSTBORO_CITY_DEVON_CORP_1F:2/MAP_RUSTBORO_CITY_DEVON_CORP_2F:0":"MAP_RUSTBORO_CITY_DEVON_CORP_2F:0/MAP_RUSTBORO_CITY_DEVON_CORP_1F:2","MAP_RUSTBORO_CITY_DEVON_CORP_2F:0/MAP_RUSTBORO_CITY_DEVON_CORP_1F:2":"MAP_RUSTBORO_CITY_DEVON_CORP_1F:2/MAP_RUSTBORO_CITY_DEVON_CORP_2F:0","MAP_RUSTBORO_CITY_DEVON_CORP_2F:1/MAP_RUSTBORO_CITY_DEVON_CORP_3F:0":"MAP_RUSTBORO_CITY_DEVON_CORP_3F:0/MAP_RUSTBORO_CITY_DEVON_CORP_2F:1","MAP_RUSTBORO_CITY_DEVON_CORP_3F:0/MAP_RUSTBORO_CITY_DEVON_CORP_2F:1":"MAP_RUSTBORO_CITY_DEVON_CORP_2F:1/MAP_RUSTBORO_CITY_DEVON_CORP_3F:0","MAP_RUSTBORO_CITY_FLAT1_1F:0,1/MAP_RUSTBORO_CITY:1":"MAP_RUSTBORO_CITY:1/MAP_RUSTBORO_CITY_FLAT1_1F:0","MAP_RUSTBORO_CITY_FLAT1_1F:2/MAP_RUSTBORO_CITY_FLAT1_2F:0":"MAP_RUSTBORO_CITY_FLAT1_2F:0/MAP_RUSTBORO_CITY_FLAT1_1F:2","MAP_RUSTBORO_CITY_FLAT1_2F:0/MAP_RUSTBORO_CITY_FLAT1_1F:2":"MAP_RUSTBORO_CITY_FLAT1_1F:2/MAP_RUSTBORO_CITY_FLAT1_2F:0","MAP_RUSTBORO_CITY_FLAT2_1F:0,1/MAP_RUSTBORO_CITY:10":"MAP_RUSTBORO_CITY:10/MAP_RUSTBORO_CITY_FLAT2_1F:0","MAP_RUSTBORO_CITY_FLAT2_1F:2/MAP_RUSTBORO_CITY_FLAT2_2F:0":"MAP_RUSTBORO_CITY_FLAT2_2F:0/MAP_RUSTBORO_CITY_FLAT2_1F:2","MAP_RUSTBORO_CITY_FLAT2_2F:0/MAP_RUSTBORO_CITY_FLAT2_1F:2":"MAP_RUSTBORO_CITY_FLAT2_1F:2/MAP_RUSTBORO_CITY_FLAT2_2F:0","MAP_RUSTBORO_CITY_FLAT2_2F:1/MAP_RUSTBORO_CITY_FLAT2_3F:0":"MAP_RUSTBORO_CITY_FLAT2_3F:0/MAP_RUSTBORO_CITY_FLAT2_2F:1","MAP_RUSTBORO_CITY_FLAT2_3F:0/MAP_RUSTBORO_CITY_FLAT2_2F:1":"MAP_RUSTBORO_CITY_FLAT2_2F:1/MAP_RUSTBORO_CITY_FLAT2_3F:0","MAP_RUSTBORO_CITY_GYM:0,1/MAP_RUSTBORO_CITY:0":"MAP_RUSTBORO_CITY:0/MAP_RUSTBORO_CITY_GYM:0","MAP_RUSTBORO_CITY_HOUSE1:0,1/MAP_RUSTBORO_CITY:7":"MAP_RUSTBORO_CITY:7/MAP_RUSTBORO_CITY_HOUSE1:0","MAP_RUSTBORO_CITY_HOUSE2:0,1/MAP_RUSTBORO_CITY:9":"MAP_RUSTBORO_CITY:9/MAP_RUSTBORO_CITY_HOUSE2:0","MAP_RUSTBORO_CITY_HOUSE3:0,1/MAP_RUSTBORO_CITY:11":"MAP_RUSTBORO_CITY:11/MAP_RUSTBORO_CITY_HOUSE3:0","MAP_RUSTBORO_CITY_MART:0,1/MAP_RUSTBORO_CITY:2":"MAP_RUSTBORO_CITY:2/MAP_RUSTBORO_CITY_MART:0","MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:0,1/MAP_RUSTBORO_CITY:3":"MAP_RUSTBORO_CITY:3/MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:0","MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:2/MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:0":"MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:0/MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:2","MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:0/MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:2":"MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:2/MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:0","MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_RUSTBORO_CITY_POKEMON_SCHOOL:0,1/MAP_RUSTBORO_CITY:4":"MAP_RUSTBORO_CITY:4/MAP_RUSTBORO_CITY_POKEMON_SCHOOL:0","MAP_RUSTURF_TUNNEL:0/MAP_ROUTE116:0":"MAP_ROUTE116:0/MAP_RUSTURF_TUNNEL:0","MAP_RUSTURF_TUNNEL:1/MAP_VERDANTURF_TOWN:4":"MAP_VERDANTURF_TOWN:4/MAP_RUSTURF_TUNNEL:1","MAP_RUSTURF_TUNNEL:2/MAP_ROUTE116:2":"MAP_ROUTE116:2/MAP_RUSTURF_TUNNEL:2","MAP_SAFARI_ZONE_REST_HOUSE:0,1/MAP_SAFARI_ZONE_SOUTHWEST:0":"MAP_SAFARI_ZONE_SOUTHWEST:0/MAP_SAFARI_ZONE_REST_HOUSE:0","MAP_SAFARI_ZONE_SOUTH:0/MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:0":"MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:0,1/MAP_SAFARI_ZONE_SOUTH:0","MAP_SAFARI_ZONE_SOUTHWEST:0/MAP_SAFARI_ZONE_REST_HOUSE:0":"MAP_SAFARI_ZONE_REST_HOUSE:0,1/MAP_SAFARI_ZONE_SOUTHWEST:0","MAP_SCORCHED_SLAB:0/MAP_ROUTE120:1":"MAP_ROUTE120:1/MAP_SCORCHED_SLAB:0","MAP_SEAFLOOR_CAVERN_ENTRANCE:0/MAP_UNDERWATER_ROUTE128:0!":"MAP_UNDERWATER_ROUTE128:0/MAP_UNDERWATER_SEAFLOOR_CAVERN:0","MAP_SEAFLOOR_CAVERN_ENTRANCE:1/MAP_SEAFLOOR_CAVERN_ROOM1:0":"MAP_SEAFLOOR_CAVERN_ROOM1:0/MAP_SEAFLOOR_CAVERN_ENTRANCE:1","MAP_SEAFLOOR_CAVERN_ROOM1:0/MAP_SEAFLOOR_CAVERN_ENTRANCE:1":"MAP_SEAFLOOR_CAVERN_ENTRANCE:1/MAP_SEAFLOOR_CAVERN_ROOM1:0","MAP_SEAFLOOR_CAVERN_ROOM1:1/MAP_SEAFLOOR_CAVERN_ROOM5:0":"MAP_SEAFLOOR_CAVERN_ROOM5:0/MAP_SEAFLOOR_CAVERN_ROOM1:1","MAP_SEAFLOOR_CAVERN_ROOM1:2/MAP_SEAFLOOR_CAVERN_ROOM2:0":"MAP_SEAFLOOR_CAVERN_ROOM2:0/MAP_SEAFLOOR_CAVERN_ROOM1:2","MAP_SEAFLOOR_CAVERN_ROOM2:0/MAP_SEAFLOOR_CAVERN_ROOM1:2":"MAP_SEAFLOOR_CAVERN_ROOM1:2/MAP_SEAFLOOR_CAVERN_ROOM2:0","MAP_SEAFLOOR_CAVERN_ROOM2:1/MAP_SEAFLOOR_CAVERN_ROOM4:0":"MAP_SEAFLOOR_CAVERN_ROOM4:0/MAP_SEAFLOOR_CAVERN_ROOM2:1","MAP_SEAFLOOR_CAVERN_ROOM2:2/MAP_SEAFLOOR_CAVERN_ROOM6:0":"MAP_SEAFLOOR_CAVERN_ROOM6:0/MAP_SEAFLOOR_CAVERN_ROOM2:2","MAP_SEAFLOOR_CAVERN_ROOM2:3/MAP_SEAFLOOR_CAVERN_ROOM7:0":"MAP_SEAFLOOR_CAVERN_ROOM7:0/MAP_SEAFLOOR_CAVERN_ROOM2:3","MAP_SEAFLOOR_CAVERN_ROOM3:0/MAP_SEAFLOOR_CAVERN_ROOM8:1":"MAP_SEAFLOOR_CAVERN_ROOM8:1/MAP_SEAFLOOR_CAVERN_ROOM3:0","MAP_SEAFLOOR_CAVERN_ROOM3:1/MAP_SEAFLOOR_CAVERN_ROOM7:1":"MAP_SEAFLOOR_CAVERN_ROOM7:1/MAP_SEAFLOOR_CAVERN_ROOM3:1","MAP_SEAFLOOR_CAVERN_ROOM3:2/MAP_SEAFLOOR_CAVERN_ROOM6:1":"MAP_SEAFLOOR_CAVERN_ROOM6:1/MAP_SEAFLOOR_CAVERN_ROOM3:2","MAP_SEAFLOOR_CAVERN_ROOM4:0/MAP_SEAFLOOR_CAVERN_ROOM2:1":"MAP_SEAFLOOR_CAVERN_ROOM2:1/MAP_SEAFLOOR_CAVERN_ROOM4:0","MAP_SEAFLOOR_CAVERN_ROOM4:1/MAP_SEAFLOOR_CAVERN_ROOM5:1":"MAP_SEAFLOOR_CAVERN_ROOM5:1/MAP_SEAFLOOR_CAVERN_ROOM4:1","MAP_SEAFLOOR_CAVERN_ROOM4:2/MAP_SEAFLOOR_CAVERN_ROOM5:2":"MAP_SEAFLOOR_CAVERN_ROOM5:2/MAP_SEAFLOOR_CAVERN_ROOM4:2","MAP_SEAFLOOR_CAVERN_ROOM4:3/MAP_SEAFLOOR_CAVERN_ENTRANCE:1!":"MAP_SEAFLOOR_CAVERN_ENTRANCE:1/MAP_SEAFLOOR_CAVERN_ROOM1:0","MAP_SEAFLOOR_CAVERN_ROOM5:0/MAP_SEAFLOOR_CAVERN_ROOM1:1":"MAP_SEAFLOOR_CAVERN_ROOM1:1/MAP_SEAFLOOR_CAVERN_ROOM5:0","MAP_SEAFLOOR_CAVERN_ROOM5:1/MAP_SEAFLOOR_CAVERN_ROOM4:1":"MAP_SEAFLOOR_CAVERN_ROOM4:1/MAP_SEAFLOOR_CAVERN_ROOM5:1","MAP_SEAFLOOR_CAVERN_ROOM5:2/MAP_SEAFLOOR_CAVERN_ROOM4:2":"MAP_SEAFLOOR_CAVERN_ROOM4:2/MAP_SEAFLOOR_CAVERN_ROOM5:2","MAP_SEAFLOOR_CAVERN_ROOM6:0/MAP_SEAFLOOR_CAVERN_ROOM2:2":"MAP_SEAFLOOR_CAVERN_ROOM2:2/MAP_SEAFLOOR_CAVERN_ROOM6:0","MAP_SEAFLOOR_CAVERN_ROOM6:1/MAP_SEAFLOOR_CAVERN_ROOM3:2":"MAP_SEAFLOOR_CAVERN_ROOM3:2/MAP_SEAFLOOR_CAVERN_ROOM6:1","MAP_SEAFLOOR_CAVERN_ROOM6:2/MAP_SEAFLOOR_CAVERN_ENTRANCE:1!":"MAP_SEAFLOOR_CAVERN_ENTRANCE:1/MAP_SEAFLOOR_CAVERN_ROOM1:0","MAP_SEAFLOOR_CAVERN_ROOM7:0/MAP_SEAFLOOR_CAVERN_ROOM2:3":"MAP_SEAFLOOR_CAVERN_ROOM2:3/MAP_SEAFLOOR_CAVERN_ROOM7:0","MAP_SEAFLOOR_CAVERN_ROOM7:1/MAP_SEAFLOOR_CAVERN_ROOM3:1":"MAP_SEAFLOOR_CAVERN_ROOM3:1/MAP_SEAFLOOR_CAVERN_ROOM7:1","MAP_SEAFLOOR_CAVERN_ROOM8:0/MAP_SEAFLOOR_CAVERN_ROOM9:0":"MAP_SEAFLOOR_CAVERN_ROOM9:0/MAP_SEAFLOOR_CAVERN_ROOM8:0","MAP_SEAFLOOR_CAVERN_ROOM8:1/MAP_SEAFLOOR_CAVERN_ROOM3:0":"MAP_SEAFLOOR_CAVERN_ROOM3:0/MAP_SEAFLOOR_CAVERN_ROOM8:1","MAP_SEAFLOOR_CAVERN_ROOM9:0/MAP_SEAFLOOR_CAVERN_ROOM8:0":"MAP_SEAFLOOR_CAVERN_ROOM8:0/MAP_SEAFLOOR_CAVERN_ROOM9:0","MAP_SEALED_CHAMBER_INNER_ROOM:0/MAP_SEALED_CHAMBER_OUTER_ROOM:0":"MAP_SEALED_CHAMBER_OUTER_ROOM:0/MAP_SEALED_CHAMBER_INNER_ROOM:0","MAP_SEALED_CHAMBER_OUTER_ROOM:0/MAP_SEALED_CHAMBER_INNER_ROOM:0":"MAP_SEALED_CHAMBER_INNER_ROOM:0/MAP_SEALED_CHAMBER_OUTER_ROOM:0","MAP_SECRET_BASE_BLUE_CAVE1:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_BLUE_CAVE2:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_BLUE_CAVE3:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_BLUE_CAVE4:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_BROWN_CAVE1:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_BROWN_CAVE2:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_BROWN_CAVE3:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_BROWN_CAVE4:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_RED_CAVE1:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_RED_CAVE2:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_RED_CAVE3:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_RED_CAVE4:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_SHRUB1:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_SHRUB2:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_SHRUB3:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_SHRUB4:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_TREE1:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_TREE2:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_TREE3:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_TREE4:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_YELLOW_CAVE1:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_YELLOW_CAVE2:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_YELLOW_CAVE3:0/MAP_DYNAMIC:-2!":"","MAP_SECRET_BASE_YELLOW_CAVE4:0/MAP_DYNAMIC:-2!":"","MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:0/MAP_ROUTE125:0":"MAP_ROUTE125:0/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:0","MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:0":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:1","MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:6":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:6/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:2","MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:7":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:7/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:3","MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:3":"MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM:0","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:1":"MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:0","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:0":"MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:1","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:1":"MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:2","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:0":"MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:3","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:4/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:1":"MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:4","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:5/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:2":"MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:5","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:6/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:2":"MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:6","MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:7/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:3":"MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:7","MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:3":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:0","MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:4":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:4/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:1","MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:5":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:5/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:2","MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM:0":"MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:3","MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:1":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:0","MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:2":"MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:1","MAP_SKY_PILLAR_1F:0,1/MAP_SKY_PILLAR_OUTSIDE:1":"MAP_SKY_PILLAR_OUTSIDE:1/MAP_SKY_PILLAR_1F:0","MAP_SKY_PILLAR_1F:2/MAP_SKY_PILLAR_2F:0":"MAP_SKY_PILLAR_2F:0/MAP_SKY_PILLAR_1F:2","MAP_SKY_PILLAR_2F:0/MAP_SKY_PILLAR_1F:2":"MAP_SKY_PILLAR_1F:2/MAP_SKY_PILLAR_2F:0","MAP_SKY_PILLAR_2F:1/MAP_SKY_PILLAR_3F:0":"MAP_SKY_PILLAR_3F:0/MAP_SKY_PILLAR_2F:1","MAP_SKY_PILLAR_3F:0/MAP_SKY_PILLAR_2F:1":"MAP_SKY_PILLAR_2F:1/MAP_SKY_PILLAR_3F:0","MAP_SKY_PILLAR_3F:1/MAP_SKY_PILLAR_4F:0":"MAP_SKY_PILLAR_4F:0/MAP_SKY_PILLAR_3F:1","MAP_SKY_PILLAR_3F:2/MAP_SKY_PILLAR_4F:1":"MAP_SKY_PILLAR_4F:1/MAP_SKY_PILLAR_3F:2","MAP_SKY_PILLAR_4F:0/MAP_SKY_PILLAR_3F:1":"MAP_SKY_PILLAR_3F:1/MAP_SKY_PILLAR_4F:0","MAP_SKY_PILLAR_4F:1/MAP_SKY_PILLAR_3F:2":"MAP_SKY_PILLAR_3F:2/MAP_SKY_PILLAR_4F:1","MAP_SKY_PILLAR_4F:2/MAP_SKY_PILLAR_5F:0":"MAP_SKY_PILLAR_5F:0/MAP_SKY_PILLAR_4F:2","MAP_SKY_PILLAR_5F:0/MAP_SKY_PILLAR_4F:2":"MAP_SKY_PILLAR_4F:2/MAP_SKY_PILLAR_5F:0","MAP_SKY_PILLAR_5F:1/MAP_SKY_PILLAR_TOP:0":"MAP_SKY_PILLAR_TOP:0/MAP_SKY_PILLAR_5F:1","MAP_SKY_PILLAR_ENTRANCE:0/MAP_ROUTE131:0":"MAP_ROUTE131:0/MAP_SKY_PILLAR_ENTRANCE:0","MAP_SKY_PILLAR_ENTRANCE:1/MAP_SKY_PILLAR_OUTSIDE:0":"MAP_SKY_PILLAR_OUTSIDE:0/MAP_SKY_PILLAR_ENTRANCE:1","MAP_SKY_PILLAR_OUTSIDE:0/MAP_SKY_PILLAR_ENTRANCE:1":"MAP_SKY_PILLAR_ENTRANCE:1/MAP_SKY_PILLAR_OUTSIDE:0","MAP_SKY_PILLAR_OUTSIDE:1/MAP_SKY_PILLAR_1F:0":"MAP_SKY_PILLAR_1F:0,1/MAP_SKY_PILLAR_OUTSIDE:1","MAP_SKY_PILLAR_TOP:0/MAP_SKY_PILLAR_5F:1":"MAP_SKY_PILLAR_5F:1/MAP_SKY_PILLAR_TOP:0","MAP_SLATEPORT_CITY:0/MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:0":"MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:0,1/MAP_SLATEPORT_CITY:0","MAP_SLATEPORT_CITY:1/MAP_SLATEPORT_CITY_MART:0":"MAP_SLATEPORT_CITY_MART:0,1/MAP_SLATEPORT_CITY:1","MAP_SLATEPORT_CITY:10/MAP_SLATEPORT_CITY_HOUSE:0":"MAP_SLATEPORT_CITY_HOUSE:0,1/MAP_SLATEPORT_CITY:10","MAP_SLATEPORT_CITY:2/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:0":"MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:0,1/MAP_SLATEPORT_CITY:2","MAP_SLATEPORT_CITY:3/MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY:0":"MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY:0,1/MAP_SLATEPORT_CITY:3","MAP_SLATEPORT_CITY:4/MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB:0":"MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB:0,1/MAP_SLATEPORT_CITY:4","MAP_SLATEPORT_CITY:5,7/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:0,1":"MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:0,1/MAP_SLATEPORT_CITY:5,7","MAP_SLATEPORT_CITY:6/MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE:0":"MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE:0,1/MAP_SLATEPORT_CITY:6","MAP_SLATEPORT_CITY:8/MAP_SLATEPORT_CITY_HARBOR:0":"MAP_SLATEPORT_CITY_HARBOR:0,1/MAP_SLATEPORT_CITY:8","MAP_SLATEPORT_CITY:9/MAP_SLATEPORT_CITY_HARBOR:2":"MAP_SLATEPORT_CITY_HARBOR:2,3/MAP_SLATEPORT_CITY:9","MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY:0,1/MAP_SLATEPORT_CITY:3":"MAP_SLATEPORT_CITY:3/MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY:0","MAP_SLATEPORT_CITY_HARBOR:0,1/MAP_SLATEPORT_CITY:8":"MAP_SLATEPORT_CITY:8/MAP_SLATEPORT_CITY_HARBOR:0","MAP_SLATEPORT_CITY_HARBOR:2,3/MAP_SLATEPORT_CITY:9":"MAP_SLATEPORT_CITY:9/MAP_SLATEPORT_CITY_HARBOR:2","MAP_SLATEPORT_CITY_HOUSE:0,1/MAP_SLATEPORT_CITY:10":"MAP_SLATEPORT_CITY:10/MAP_SLATEPORT_CITY_HOUSE:0","MAP_SLATEPORT_CITY_MART:0,1/MAP_SLATEPORT_CITY:1":"MAP_SLATEPORT_CITY:1/MAP_SLATEPORT_CITY_MART:0","MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE:0,1/MAP_SLATEPORT_CITY:6":"MAP_SLATEPORT_CITY:6/MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE:0","MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:0,1/MAP_SLATEPORT_CITY:5,7":"MAP_SLATEPORT_CITY:5,7/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:0,1","MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:2/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F:0":"MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F:0/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:2","MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F:0/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:2":"MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:2/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F:0","MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:0,1/MAP_SLATEPORT_CITY:0":"MAP_SLATEPORT_CITY:0/MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:0","MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:2/MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:0":"MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:0/MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:2","MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:0/MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:2":"MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:2/MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:0","MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB:0,1/MAP_SLATEPORT_CITY:4":"MAP_SLATEPORT_CITY:4/MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB:0","MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:0,1/MAP_SLATEPORT_CITY:2":"MAP_SLATEPORT_CITY:2/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:0","MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:2/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F:0":"MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F:0/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:2","MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F:0/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:2":"MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:2/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F:0","MAP_SOOTOPOLIS_CITY:0/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:0":"MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:0,1/MAP_SOOTOPOLIS_CITY:0","MAP_SOOTOPOLIS_CITY:1/MAP_SOOTOPOLIS_CITY_MART:0":"MAP_SOOTOPOLIS_CITY_MART:0,1/MAP_SOOTOPOLIS_CITY:1","MAP_SOOTOPOLIS_CITY:10/MAP_SOOTOPOLIS_CITY_HOUSE7:0":"MAP_SOOTOPOLIS_CITY_HOUSE7:0,1/MAP_SOOTOPOLIS_CITY:10","MAP_SOOTOPOLIS_CITY:11/MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE:0":"MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE:0,1/MAP_SOOTOPOLIS_CITY:11","MAP_SOOTOPOLIS_CITY:12/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:0":"MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:0,1/MAP_SOOTOPOLIS_CITY:12","MAP_SOOTOPOLIS_CITY:2/MAP_SOOTOPOLIS_CITY_GYM_1F:0":"MAP_SOOTOPOLIS_CITY_GYM_1F:0,1/MAP_SOOTOPOLIS_CITY:2","MAP_SOOTOPOLIS_CITY:3/MAP_CAVE_OF_ORIGIN_ENTRANCE:0":"MAP_CAVE_OF_ORIGIN_ENTRANCE:0/MAP_SOOTOPOLIS_CITY:3","MAP_SOOTOPOLIS_CITY:4/MAP_SOOTOPOLIS_CITY_HOUSE1:0":"MAP_SOOTOPOLIS_CITY_HOUSE1:0,1/MAP_SOOTOPOLIS_CITY:4","MAP_SOOTOPOLIS_CITY:5/MAP_SOOTOPOLIS_CITY_HOUSE2:0":"MAP_SOOTOPOLIS_CITY_HOUSE2:0,1/MAP_SOOTOPOLIS_CITY:5","MAP_SOOTOPOLIS_CITY:6/MAP_SOOTOPOLIS_CITY_HOUSE3:0":"MAP_SOOTOPOLIS_CITY_HOUSE3:0,1/MAP_SOOTOPOLIS_CITY:6","MAP_SOOTOPOLIS_CITY:7/MAP_SOOTOPOLIS_CITY_HOUSE4:0":"MAP_SOOTOPOLIS_CITY_HOUSE4:0,1/MAP_SOOTOPOLIS_CITY:7","MAP_SOOTOPOLIS_CITY:8/MAP_SOOTOPOLIS_CITY_HOUSE5:0":"MAP_SOOTOPOLIS_CITY_HOUSE5:0,1/MAP_SOOTOPOLIS_CITY:8","MAP_SOOTOPOLIS_CITY:9/MAP_SOOTOPOLIS_CITY_HOUSE6:0":"MAP_SOOTOPOLIS_CITY_HOUSE6:0,1/MAP_SOOTOPOLIS_CITY:9","MAP_SOOTOPOLIS_CITY_GYM_1F:0,1/MAP_SOOTOPOLIS_CITY:2":"MAP_SOOTOPOLIS_CITY:2/MAP_SOOTOPOLIS_CITY_GYM_1F:0","MAP_SOOTOPOLIS_CITY_GYM_1F:2/MAP_SOOTOPOLIS_CITY_GYM_B1F:0":"MAP_SOOTOPOLIS_CITY_GYM_B1F:0/MAP_SOOTOPOLIS_CITY_GYM_1F:2","MAP_SOOTOPOLIS_CITY_GYM_B1F:0/MAP_SOOTOPOLIS_CITY_GYM_1F:2":"MAP_SOOTOPOLIS_CITY_GYM_1F:2/MAP_SOOTOPOLIS_CITY_GYM_B1F:0","MAP_SOOTOPOLIS_CITY_HOUSE1:0,1/MAP_SOOTOPOLIS_CITY:4":"MAP_SOOTOPOLIS_CITY:4/MAP_SOOTOPOLIS_CITY_HOUSE1:0","MAP_SOOTOPOLIS_CITY_HOUSE2:0,1/MAP_SOOTOPOLIS_CITY:5":"MAP_SOOTOPOLIS_CITY:5/MAP_SOOTOPOLIS_CITY_HOUSE2:0","MAP_SOOTOPOLIS_CITY_HOUSE3:0,1/MAP_SOOTOPOLIS_CITY:6":"MAP_SOOTOPOLIS_CITY:6/MAP_SOOTOPOLIS_CITY_HOUSE3:0","MAP_SOOTOPOLIS_CITY_HOUSE4:0,1/MAP_SOOTOPOLIS_CITY:7":"MAP_SOOTOPOLIS_CITY:7/MAP_SOOTOPOLIS_CITY_HOUSE4:0","MAP_SOOTOPOLIS_CITY_HOUSE5:0,1/MAP_SOOTOPOLIS_CITY:8":"MAP_SOOTOPOLIS_CITY:8/MAP_SOOTOPOLIS_CITY_HOUSE5:0","MAP_SOOTOPOLIS_CITY_HOUSE6:0,1/MAP_SOOTOPOLIS_CITY:9":"MAP_SOOTOPOLIS_CITY:9/MAP_SOOTOPOLIS_CITY_HOUSE6:0","MAP_SOOTOPOLIS_CITY_HOUSE7:0,1/MAP_SOOTOPOLIS_CITY:10":"MAP_SOOTOPOLIS_CITY:10/MAP_SOOTOPOLIS_CITY_HOUSE7:0","MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE:0,1/MAP_SOOTOPOLIS_CITY:11":"MAP_SOOTOPOLIS_CITY:11/MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE:0","MAP_SOOTOPOLIS_CITY_MART:0,1/MAP_SOOTOPOLIS_CITY:1":"MAP_SOOTOPOLIS_CITY:1/MAP_SOOTOPOLIS_CITY_MART:0","MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:0,1/MAP_SOOTOPOLIS_CITY:12":"MAP_SOOTOPOLIS_CITY:12/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:0","MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:2/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F:0":"MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F:0/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:2","MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F:0/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:2":"MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:2/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F:0","MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:0,1/MAP_SOOTOPOLIS_CITY:0":"MAP_SOOTOPOLIS_CITY:0/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:0","MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:2/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:0":"MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:0/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:2","MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:0/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:2":"MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:2/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:0","MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_SOUTHERN_ISLAND_EXTERIOR:0,1/MAP_SOUTHERN_ISLAND_INTERIOR:0,1":"MAP_SOUTHERN_ISLAND_INTERIOR:0,1/MAP_SOUTHERN_ISLAND_EXTERIOR:0,1","MAP_SOUTHERN_ISLAND_INTERIOR:0,1/MAP_SOUTHERN_ISLAND_EXTERIOR:0,1":"MAP_SOUTHERN_ISLAND_EXTERIOR:0,1/MAP_SOUTHERN_ISLAND_INTERIOR:0,1","MAP_SS_TIDAL_CORRIDOR:0/MAP_SS_TIDAL_ROOMS:0":"MAP_SS_TIDAL_ROOMS:0,1/MAP_SS_TIDAL_CORRIDOR:0","MAP_SS_TIDAL_CORRIDOR:1/MAP_SS_TIDAL_ROOMS:2":"MAP_SS_TIDAL_ROOMS:2,3/MAP_SS_TIDAL_CORRIDOR:1","MAP_SS_TIDAL_CORRIDOR:2/MAP_SS_TIDAL_ROOMS:4":"MAP_SS_TIDAL_ROOMS:4,5/MAP_SS_TIDAL_CORRIDOR:2","MAP_SS_TIDAL_CORRIDOR:3/MAP_SS_TIDAL_ROOMS:6":"MAP_SS_TIDAL_ROOMS:6,7/MAP_SS_TIDAL_CORRIDOR:3","MAP_SS_TIDAL_CORRIDOR:4/MAP_SS_TIDAL_ROOMS:8":"MAP_SS_TIDAL_ROOMS:8/MAP_SS_TIDAL_CORRIDOR:4","MAP_SS_TIDAL_CORRIDOR:5/MAP_SS_TIDAL_ROOMS:9":"MAP_SS_TIDAL_ROOMS:9/MAP_SS_TIDAL_CORRIDOR:5","MAP_SS_TIDAL_CORRIDOR:6/MAP_SS_TIDAL_ROOMS:10":"MAP_SS_TIDAL_ROOMS:10/MAP_SS_TIDAL_CORRIDOR:6","MAP_SS_TIDAL_CORRIDOR:7/MAP_SS_TIDAL_ROOMS:11":"MAP_SS_TIDAL_ROOMS:11/MAP_SS_TIDAL_CORRIDOR:7","MAP_SS_TIDAL_CORRIDOR:8/MAP_SS_TIDAL_LOWER_DECK:0":"MAP_SS_TIDAL_LOWER_DECK:0/MAP_SS_TIDAL_CORRIDOR:8","MAP_SS_TIDAL_LOWER_DECK:0/MAP_SS_TIDAL_CORRIDOR:8":"MAP_SS_TIDAL_CORRIDOR:8/MAP_SS_TIDAL_LOWER_DECK:0","MAP_SS_TIDAL_ROOMS:0,1/MAP_SS_TIDAL_CORRIDOR:0":"MAP_SS_TIDAL_CORRIDOR:0/MAP_SS_TIDAL_ROOMS:0","MAP_SS_TIDAL_ROOMS:10/MAP_SS_TIDAL_CORRIDOR:6":"MAP_SS_TIDAL_CORRIDOR:6/MAP_SS_TIDAL_ROOMS:10","MAP_SS_TIDAL_ROOMS:11/MAP_SS_TIDAL_CORRIDOR:7":"MAP_SS_TIDAL_CORRIDOR:7/MAP_SS_TIDAL_ROOMS:11","MAP_SS_TIDAL_ROOMS:2,3/MAP_SS_TIDAL_CORRIDOR:1":"MAP_SS_TIDAL_CORRIDOR:1/MAP_SS_TIDAL_ROOMS:2","MAP_SS_TIDAL_ROOMS:4,5/MAP_SS_TIDAL_CORRIDOR:2":"MAP_SS_TIDAL_CORRIDOR:2/MAP_SS_TIDAL_ROOMS:4","MAP_SS_TIDAL_ROOMS:6,7/MAP_SS_TIDAL_CORRIDOR:3":"MAP_SS_TIDAL_CORRIDOR:3/MAP_SS_TIDAL_ROOMS:6","MAP_SS_TIDAL_ROOMS:8/MAP_SS_TIDAL_CORRIDOR:4":"MAP_SS_TIDAL_CORRIDOR:4/MAP_SS_TIDAL_ROOMS:8","MAP_SS_TIDAL_ROOMS:9/MAP_SS_TIDAL_CORRIDOR:5":"MAP_SS_TIDAL_CORRIDOR:5/MAP_SS_TIDAL_ROOMS:9","MAP_TERRA_CAVE_END:0/MAP_TERRA_CAVE_ENTRANCE:1":"MAP_TERRA_CAVE_ENTRANCE:1/MAP_TERRA_CAVE_END:0","MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!":"","MAP_TERRA_CAVE_ENTRANCE:1/MAP_TERRA_CAVE_END:0":"MAP_TERRA_CAVE_END:0/MAP_TERRA_CAVE_ENTRANCE:1","MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!":"","MAP_TRAINER_HILL_1F:0/MAP_TRAINER_HILL_ENTRANCE:2":"MAP_TRAINER_HILL_ENTRANCE:2/MAP_TRAINER_HILL_1F:0","MAP_TRAINER_HILL_1F:1/MAP_TRAINER_HILL_2F:0":"MAP_TRAINER_HILL_2F:0/MAP_TRAINER_HILL_1F:1","MAP_TRAINER_HILL_2F:0/MAP_TRAINER_HILL_1F:1":"MAP_TRAINER_HILL_1F:1/MAP_TRAINER_HILL_2F:0","MAP_TRAINER_HILL_2F:1/MAP_TRAINER_HILL_3F:0":"MAP_TRAINER_HILL_3F:0/MAP_TRAINER_HILL_2F:1","MAP_TRAINER_HILL_3F:0/MAP_TRAINER_HILL_2F:1":"MAP_TRAINER_HILL_2F:1/MAP_TRAINER_HILL_3F:0","MAP_TRAINER_HILL_3F:1/MAP_TRAINER_HILL_4F:0":"MAP_TRAINER_HILL_4F:0/MAP_TRAINER_HILL_3F:1","MAP_TRAINER_HILL_4F:0/MAP_TRAINER_HILL_3F:1":"MAP_TRAINER_HILL_3F:1/MAP_TRAINER_HILL_4F:0","MAP_TRAINER_HILL_4F:1/MAP_TRAINER_HILL_ROOF:0":"MAP_TRAINER_HILL_ROOF:0/MAP_TRAINER_HILL_4F:1","MAP_TRAINER_HILL_ELEVATOR:0,1/MAP_TRAINER_HILL_ROOF:1":"MAP_TRAINER_HILL_ROOF:1/MAP_TRAINER_HILL_ELEVATOR:1","MAP_TRAINER_HILL_ENTRANCE:0,1/MAP_ROUTE111:4":"MAP_ROUTE111:4/MAP_TRAINER_HILL_ENTRANCE:0","MAP_TRAINER_HILL_ENTRANCE:2/MAP_TRAINER_HILL_1F:0":"MAP_TRAINER_HILL_1F:0/MAP_TRAINER_HILL_ENTRANCE:2","MAP_TRAINER_HILL_ROOF:0/MAP_TRAINER_HILL_4F:1":"MAP_TRAINER_HILL_4F:1/MAP_TRAINER_HILL_ROOF:0","MAP_TRAINER_HILL_ROOF:1/MAP_TRAINER_HILL_ELEVATOR:1":"MAP_TRAINER_HILL_ELEVATOR:0,1/MAP_TRAINER_HILL_ROOF:1","MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!":"","MAP_UNDERWATER_ROUTE105:0/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE105:1/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE125:0/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE125:1/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE126:0/MAP_UNDERWATER_SOOTOPOLIS_CITY:0":"MAP_UNDERWATER_SOOTOPOLIS_CITY:0,1/MAP_UNDERWATER_ROUTE126:0","MAP_UNDERWATER_ROUTE127:0/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE127:1/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE128:0/MAP_UNDERWATER_SEAFLOOR_CAVERN:0":"MAP_UNDERWATER_SEAFLOOR_CAVERN:0/MAP_UNDERWATER_ROUTE128:0","MAP_UNDERWATER_ROUTE129:0/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE129:1/MAP_UNDERWATER_MARINE_CAVE:0!":"MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!","MAP_UNDERWATER_ROUTE134:0/MAP_UNDERWATER_SEALED_CHAMBER:0":"MAP_UNDERWATER_SEALED_CHAMBER:0/MAP_UNDERWATER_ROUTE134:0","MAP_UNDERWATER_SEAFLOOR_CAVERN:0/MAP_UNDERWATER_ROUTE128:0":"MAP_UNDERWATER_ROUTE128:0/MAP_UNDERWATER_SEAFLOOR_CAVERN:0","MAP_UNDERWATER_SEALED_CHAMBER:0/MAP_UNDERWATER_ROUTE134:0":"MAP_UNDERWATER_ROUTE134:0/MAP_UNDERWATER_SEALED_CHAMBER:0","MAP_UNDERWATER_SOOTOPOLIS_CITY:0,1/MAP_UNDERWATER_ROUTE126:0":"MAP_UNDERWATER_ROUTE126:0/MAP_UNDERWATER_SOOTOPOLIS_CITY:0","MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!":"","MAP_VERDANTURF_TOWN:0/MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY:0":"MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY:0,1/MAP_VERDANTURF_TOWN:0","MAP_VERDANTURF_TOWN:1/MAP_VERDANTURF_TOWN_MART:0":"MAP_VERDANTURF_TOWN_MART:0,1/MAP_VERDANTURF_TOWN:1","MAP_VERDANTURF_TOWN:2/MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:0":"MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:0,1/MAP_VERDANTURF_TOWN:2","MAP_VERDANTURF_TOWN:3/MAP_VERDANTURF_TOWN_WANDAS_HOUSE:0":"MAP_VERDANTURF_TOWN_WANDAS_HOUSE:0,1/MAP_VERDANTURF_TOWN:3","MAP_VERDANTURF_TOWN:4/MAP_RUSTURF_TUNNEL:1":"MAP_RUSTURF_TUNNEL:1/MAP_VERDANTURF_TOWN:4","MAP_VERDANTURF_TOWN:5/MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE:0":"MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE:0,1/MAP_VERDANTURF_TOWN:5","MAP_VERDANTURF_TOWN:6/MAP_VERDANTURF_TOWN_HOUSE:0":"MAP_VERDANTURF_TOWN_HOUSE:0,1/MAP_VERDANTURF_TOWN:6","MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY:0,1/MAP_VERDANTURF_TOWN:0":"MAP_VERDANTURF_TOWN:0/MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY:0","MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE:0,1/MAP_VERDANTURF_TOWN:5":"MAP_VERDANTURF_TOWN:5/MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE:0","MAP_VERDANTURF_TOWN_HOUSE:0,1/MAP_VERDANTURF_TOWN:6":"MAP_VERDANTURF_TOWN:6/MAP_VERDANTURF_TOWN_HOUSE:0","MAP_VERDANTURF_TOWN_MART:0,1/MAP_VERDANTURF_TOWN:1":"MAP_VERDANTURF_TOWN:1/MAP_VERDANTURF_TOWN_MART:0","MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:0,1/MAP_VERDANTURF_TOWN:2":"MAP_VERDANTURF_TOWN:2/MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:0","MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:2/MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:0":"MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:0/MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:2","MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:0/MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:2":"MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:2/MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:0","MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!":"MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!","MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!":"MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!","MAP_VERDANTURF_TOWN_WANDAS_HOUSE:0,1/MAP_VERDANTURF_TOWN:3":"MAP_VERDANTURF_TOWN:3/MAP_VERDANTURF_TOWN_WANDAS_HOUSE:0","MAP_VICTORY_ROAD_1F:0/MAP_EVER_GRANDE_CITY:2":"MAP_EVER_GRANDE_CITY:2/MAP_VICTORY_ROAD_1F:0","MAP_VICTORY_ROAD_1F:1/MAP_EVER_GRANDE_CITY:3":"MAP_EVER_GRANDE_CITY:3/MAP_VICTORY_ROAD_1F:1","MAP_VICTORY_ROAD_1F:2/MAP_VICTORY_ROAD_B1F:5":"MAP_VICTORY_ROAD_B1F:5/MAP_VICTORY_ROAD_1F:2","MAP_VICTORY_ROAD_1F:3/MAP_VICTORY_ROAD_B1F:2":"MAP_VICTORY_ROAD_B1F:2/MAP_VICTORY_ROAD_1F:3","MAP_VICTORY_ROAD_1F:4/MAP_VICTORY_ROAD_B1F:4":"MAP_VICTORY_ROAD_B1F:4/MAP_VICTORY_ROAD_1F:4","MAP_VICTORY_ROAD_B1F:0/MAP_VICTORY_ROAD_B2F:0":"MAP_VICTORY_ROAD_B2F:0/MAP_VICTORY_ROAD_B1F:0","MAP_VICTORY_ROAD_B1F:1/MAP_VICTORY_ROAD_B2F:2":"MAP_VICTORY_ROAD_B2F:2/MAP_VICTORY_ROAD_B1F:1","MAP_VICTORY_ROAD_B1F:2/MAP_VICTORY_ROAD_1F:3":"MAP_VICTORY_ROAD_1F:3/MAP_VICTORY_ROAD_B1F:2","MAP_VICTORY_ROAD_B1F:3/MAP_VICTORY_ROAD_B2F:1":"MAP_VICTORY_ROAD_B2F:1/MAP_VICTORY_ROAD_B1F:3","MAP_VICTORY_ROAD_B1F:4/MAP_VICTORY_ROAD_1F:4":"MAP_VICTORY_ROAD_1F:4/MAP_VICTORY_ROAD_B1F:4","MAP_VICTORY_ROAD_B1F:5/MAP_VICTORY_ROAD_1F:2":"MAP_VICTORY_ROAD_1F:2/MAP_VICTORY_ROAD_B1F:5","MAP_VICTORY_ROAD_B1F:6/MAP_VICTORY_ROAD_B2F:3":"MAP_VICTORY_ROAD_B2F:3/MAP_VICTORY_ROAD_B1F:6","MAP_VICTORY_ROAD_B2F:0/MAP_VICTORY_ROAD_B1F:0":"MAP_VICTORY_ROAD_B1F:0/MAP_VICTORY_ROAD_B2F:0","MAP_VICTORY_ROAD_B2F:1/MAP_VICTORY_ROAD_B1F:3":"MAP_VICTORY_ROAD_B1F:3/MAP_VICTORY_ROAD_B2F:1","MAP_VICTORY_ROAD_B2F:2/MAP_VICTORY_ROAD_B1F:1":"MAP_VICTORY_ROAD_B1F:1/MAP_VICTORY_ROAD_B2F:2","MAP_VICTORY_ROAD_B2F:3/MAP_VICTORY_ROAD_B1F:6":"MAP_VICTORY_ROAD_B1F:6/MAP_VICTORY_ROAD_B2F:3"}}
diff --git a/worlds/pokemon_emerald/data/items.json b/worlds/pokemon_emerald/data/items.json
new file mode 100644
index 0000000000..cea72eb650
--- /dev/null
+++ b/worlds/pokemon_emerald/data/items.json
@@ -0,0 +1,1481 @@
+{
+  "ITEM_BADGE_1": {
+    "label": "Stone Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+  "ITEM_BADGE_2": {
+    "label": "Knuckle Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+  "ITEM_BADGE_3": {
+    "label": "Dynamo Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+  "ITEM_BADGE_4": {
+    "label": "Heat Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+  "ITEM_BADGE_5": {
+    "label": "Balance Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+  "ITEM_BADGE_6": {
+    "label": "Feather Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+  "ITEM_BADGE_7": {
+    "label": "Mind Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+  "ITEM_BADGE_8": {
+    "label": "Rain Badge",
+    "classification": "PROGRESSION",
+    "tags": ["Badge", "Unique"]
+  },
+
+
+  "ITEM_HM01_CUT": {
+    "label": "HM01 Cut",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+  "ITEM_HM02_FLY": {
+    "label": "HM02 Fly",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+  "ITEM_HM03_SURF": {
+    "label": "HM03 Surf",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+  "ITEM_HM04_STRENGTH": {
+    "label": "HM04 Strength",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+  "ITEM_HM05_FLASH": {
+    "label": "HM05 Flash",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+  "ITEM_HM06_ROCK_SMASH": {
+    "label": "HM06 Rock Smash",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+  "ITEM_HM07_WATERFALL": {
+    "label": "HM07 Waterfall",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+  "ITEM_HM08_DIVE": {
+    "label": "HM08 Dive",
+    "classification": "PROGRESSION",
+    "tags": ["HM", "Unique"]
+  },
+
+
+  "ITEM_MACH_BIKE": {
+    "label": "Mach Bike",
+    "classification": "PROGRESSION",
+    "tags": ["Bike", "Unique"]
+  },
+  "ITEM_ACRO_BIKE": {
+    "label": "Acro Bike",
+    "classification": "PROGRESSION",
+    "tags": ["Bike", "Unique"]
+  },
+
+
+  "ITEM_DEVON_GOODS": {
+    "label": "Devon Goods",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_LETTER": {
+    "label": "Letter",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_ITEMFINDER": {
+    "label": "Itemfinder",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_METEORITE": {
+    "label": "Meteorite",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_GO_GOGGLES": {
+    "label": "Go Goggles",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_ROOM_1_KEY": {
+    "label": "Room 1 Key",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_ROOM_2_KEY": {
+    "label": "Room 2 Key",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_ROOM_4_KEY": {
+    "label": "Room 4 Key",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_ROOM_6_KEY": {
+    "label": "Room 6 Key",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_STORAGE_KEY": {
+    "label": "Storage Key",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_SCANNER": {
+    "label": "Scanner",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_BASEMENT_KEY": {
+    "label": "Basement Key",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_DEVON_SCOPE": {
+    "label": "Devon Scope",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_MAGMA_EMBLEM": {
+    "label": "Magma Emblem",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_POKEBLOCK_CASE": {
+    "label": "Pokeblock Case",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_SS_TICKET": {
+    "label": "S.S. Ticket",
+    "classification": "PROGRESSION",
+    "tags": ["Unique"]
+  },
+  "ITEM_WAILMER_PAIL": {
+    "label": "Wailmer Pail",
+    "classification": "USEFUL",
+    "tags": ["Unique"]
+  },
+
+
+  "ITEM_POWDER_JAR": {
+    "label": "Powder Jar",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+  "ITEM_COIN_CASE": {
+    "label": "Coin Case",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+  "ITEM_CONTEST_PASS": {
+    "label": "Contest Pass",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+  "ITEM_SOOT_SACK": {
+    "label": "Soot Sack",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+  "ITEM_ROOT_FOSSIL": {
+    "label": "Root Fossil",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+  "ITEM_CLAW_FOSSIL": {
+    "label": "Claw Fossil",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+  "ITEM_EON_TICKET": {
+    "label": "Eon Ticket",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+  "ITEM_OLD_SEA_MAP": {
+    "label": "Old Sea Map",
+    "classification": "FILLER",
+    "tags": ["Unique"]
+  },
+
+
+  "ITEM_OLD_ROD": {
+    "label": "Old Rod",
+    "classification": "USEFUL",
+    "tags": ["Rod", "Unique"]
+  },
+  "ITEM_GOOD_ROD": {
+    "label": "Good Rod",
+    "classification": "USEFUL",
+    "tags": ["Rod", "Unique"]
+  },
+  "ITEM_SUPER_ROD": {
+    "label": "Super Rod",
+    "classification": "USEFUL",
+    "tags": ["Rod", "Unique"]
+  },
+
+
+  "ITEM_MASTER_BALL": {
+    "label": "Master Ball",
+    "classification": "USEFUL",
+    "tags": ["Ball"]
+  },
+  "ITEM_ULTRA_BALL": {
+    "label": "Ultra Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_GREAT_BALL": {
+    "label": "Great Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_POKE_BALL": {
+    "label": "Poke Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_SAFARI_BALL": {
+    "label": "Safari Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_NET_BALL": {
+    "label": "Net Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_DIVE_BALL": {
+    "label": "Dive Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_NEST_BALL": {
+    "label": "Nest Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_REPEAT_BALL": {
+    "label": "Repeat Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_TIMER_BALL": {
+    "label": "Timer Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_LUXURY_BALL": {
+    "label": "Luxury Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+  "ITEM_PREMIER_BALL": {
+    "label": "Premier Ball",
+    "classification": "FILLER",
+    "tags": ["Ball"]
+  },
+
+
+  "ITEM_POTION": {
+    "label": "Potion",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_ANTIDOTE": {
+    "label": "Antidote",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_BURN_HEAL": {
+    "label": "Burn Heal",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_ICE_HEAL": {
+    "label": "Ice Heal",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_AWAKENING": {
+    "label": "Awakening",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_PARALYZE_HEAL": {
+    "label": "Paralyze Heal",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_FULL_RESTORE": {
+    "label": "Full Restore",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_MAX_POTION": {
+    "label": "Max Potion",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_HYPER_POTION": {
+    "label": "Hyper Potion",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_SUPER_POTION": {
+    "label": "Super Potion",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_FULL_HEAL": {
+    "label": "Full Heal",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_REVIVE": {
+    "label": "Revive",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_MAX_REVIVE": {
+    "label": "Max Revive",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_FRESH_WATER": {
+    "label": "Fresh Water",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_SODA_POP": {
+    "label": "Soda Pop",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_LEMONADE": {
+    "label": "Lemonade",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_MOOMOO_MILK": {
+    "label": "Moomoo Milk",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_ENERGY_POWDER": {
+    "label": "Energy Powder",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_ENERGY_ROOT": {
+    "label": "Energy Root",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_HEAL_POWDER": {
+    "label": "Heal Powder",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_REVIVAL_HERB": {
+    "label": "Revival Herb",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_ETHER": {
+    "label": "Ether",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_MAX_ETHER": {
+    "label": "Max Ether",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_ELIXIR": {
+    "label": "Elixir",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_MAX_ELIXIR": {
+    "label": "Max Elixir",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_LAVA_COOKIE": {
+    "label": "Lava Cookie",
+    "classification": "FILLER",
+    "tags": ["Heal"]
+  },
+  "ITEM_SACRED_ASH": {
+    "label": "Sacred Ash",
+    "classification": "USEFUL",
+    "tags": ["Heal"]
+  },
+
+
+  "ITEM_BERRY_JUICE": {
+    "label": "Berry Juice",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_SHOAL_SALT": {
+    "label": "Shoal Salt",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_SHOAL_SHELL": {
+    "label": "Shoal Shell",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_RED_SHARD": {
+    "label": "Red Shard",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_BLUE_SHARD": {
+    "label": "Blue Shard",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_YELLOW_SHARD": {
+    "label": "Yellow Shard",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_GREEN_SHARD": {
+    "label": "Green Shard",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+
+
+  "ITEM_HP_UP": {
+    "label": "HP Up",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_PROTEIN": {
+    "label": "Protein",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_IRON": {
+    "label": "Iron",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_CARBOS": {
+    "label": "Carbos",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_CALCIUM": {
+    "label": "Calcium",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_ZINC": {
+    "label": "Zinc",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_PP_UP": {
+    "label": "PP Up",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_PP_MAX": {
+    "label": "PP Max",
+    "classification": "FILLER",
+    "tags": ["Vitamin"]
+  },
+  "ITEM_RARE_CANDY": {
+    "label": "Rare Candy",
+    "classification": "USEFUL",
+    "tags": ["Vitamin"]
+  },
+
+
+  "ITEM_GUARD_SPEC": {
+    "label": "Guard Spec",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_DIRE_HIT": {
+    "label": "Dire Hit",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_X_ATTACK": {
+    "label": "X Attack",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_X_DEFEND": {
+    "label": "X Defend",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_X_SPEED": {
+    "label": "X Speed",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_X_ACCURACY": {
+    "label": "X Accuracy",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_X_SPECIAL": {
+    "label": "X Special",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+
+
+  "ITEM_REPEL": {
+    "label": "Repel",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_SUPER_REPEL": {
+    "label": "Super Repel",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_MAX_REPEL": {
+    "label": "Max Repel",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_POKE_DOLL": {
+    "label": "Poke Doll",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_FLUFFY_TAIL": {
+    "label": "Fluffy Tail",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_ESCAPE_ROPE": {
+    "label": "Escape Rope",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_BLUE_FLUTE": {
+    "label": "Blue Flute",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_YELLOW_FLUTE": {
+    "label": "Yellow Flute",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_RED_FLUTE": {
+    "label": "Red Flute",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_BLACK_FLUTE": {
+    "label": "Black Flute",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_WHITE_FLUTE": {
+    "label": "White Flute",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+  "ITEM_HEART_SCALE": {
+    "label": "Heart Scale",
+    "classification": "FILLER",
+    "tags": ["Misc"]
+  },
+
+
+  "ITEM_SUN_STONE": {
+    "label": "Sun Stone",
+    "classification": "USEFUL",
+    "tags": ["EvoStone"]
+  },
+  "ITEM_MOON_STONE": {
+    "label": "Moon Stone",
+    "classification": "USEFUL",
+    "tags": ["EvoStone"]
+  },
+  "ITEM_FIRE_STONE": {
+    "label": "Fire Stone",
+    "classification": "USEFUL",
+    "tags": ["EvoStone"]
+  },
+  "ITEM_THUNDER_STONE": {
+    "label": "Thunder Stone",
+    "classification": "USEFUL",
+    "tags": ["EvoStone"]
+  },
+  "ITEM_WATER_STONE": {
+    "label": "Water Stone",
+    "classification": "USEFUL",
+    "tags": ["EvoStone"]
+  },
+  "ITEM_LEAF_STONE": {
+    "label": "Leaf Stone",
+    "classification": "USEFUL",
+    "tags": ["EvoStone"]
+  },
+
+
+  "ITEM_TINY_MUSHROOM": {
+    "label": "Tiny Mushroom",
+    "classification": "FILLER",
+    "tags": ["Money"]
+  },
+  "ITEM_BIG_MUSHROOM": {
+    "label": "Big Mushroom",
+    "classification": "FILLER",
+    "tags": ["Money"]
+  },
+  "ITEM_PEARL": {
+    "label": "Pearl",
+    "classification": "FILLER",
+    "tags": ["Money"]
+  },
+  "ITEM_BIG_PEARL": {
+    "label": "Big Pearl",
+    "classification": "FILLER",
+    "tags": ["Money"]
+  },
+  "ITEM_STARDUST": {
+    "label": "Stardust",
+    "classification": "FILLER",
+    "tags": ["Money"]
+  },
+  "ITEM_STAR_PIECE": {
+    "label": "Star Piece",
+    "classification": "FILLER",
+    "tags": ["Money"]
+  },
+  "ITEM_NUGGET": {
+    "label": "Nugget",
+    "classification": "FILLER",
+    "tags": ["Money"]
+  },
+
+
+  "ITEM_ORANGE_MAIL": {
+    "label": "Orange Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_HARBOR_MAIL": {
+    "label": "Harbor Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_GLITTER_MAIL": {
+    "label": "Glitter Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_MECH_MAIL": {
+    "label": "Mech Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_WOOD_MAIL": {
+    "label": "Wood Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_WAVE_MAIL": {
+    "label": "Wave Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_BEAD_MAIL": {
+    "label": "Bead Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_SHADOW_MAIL": {
+    "label": "Shadow Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_TROPIC_MAIL": {
+    "label": "Tropic Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_DREAM_MAIL": {
+    "label": "Dream Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_FAB_MAIL": {
+    "label": "Fab Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+  "ITEM_RETRO_MAIL": {
+    "label": "Retro Mail",
+    "classification": "FILLER",
+    "tags": ["Mail"]
+  },
+
+
+  "ITEM_CHERI_BERRY": {
+    "label": "Cheri Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_CHESTO_BERRY": {
+    "label": "Chesto Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_PECHA_BERRY": {
+    "label": "Pecha Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_RAWST_BERRY": {
+    "label": "Rawst Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_ASPEAR_BERRY": {
+    "label": "Aspear Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_LEPPA_BERRY": {
+    "label": "Leppa Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_ORAN_BERRY": {
+    "label": "Oran Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_PERSIM_BERRY": {
+    "label": "Persim Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_LUM_BERRY": {
+    "label": "Lum Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_SITRUS_BERRY": {
+    "label": "Sitrus Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_FIGY_BERRY": {
+    "label": "Figy Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_WIKI_BERRY": {
+    "label": "Wiki Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_MAGO_BERRY": {
+    "label": "Mago Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_AGUAV_BERRY": {
+    "label": "Aguav Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_IAPAPA_BERRY": {
+    "label": "Iapapa Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_RAZZ_BERRY": {
+    "label": "Razz Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_BLUK_BERRY": {
+    "label": "Bluk Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_NANAB_BERRY": {
+    "label": "Nanab Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_WEPEAR_BERRY": {
+    "label": "Wepear Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_PINAP_BERRY": {
+    "label": "Pinap Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_POMEG_BERRY": {
+    "label": "Pomeg Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_KELPSY_BERRY": {
+    "label": "Kelpsy Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_QUALOT_BERRY": {
+    "label": "Qualot Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_HONDEW_BERRY": {
+    "label": "Hondew Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_GREPA_BERRY": {
+    "label": "Grepa Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_TAMATO_BERRY": {
+    "label": "Tamato Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_CORNN_BERRY": {
+    "label": "Cornn Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_MAGOST_BERRY": {
+    "label": "Magost Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_RABUTA_BERRY": {
+    "label": "Rabuta Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_NOMEL_BERRY": {
+    "label": "Nomel Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_SPELON_BERRY": {
+    "label": "Spelon Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_PAMTRE_BERRY": {
+    "label": "Pamtre Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_WATMEL_BERRY": {
+    "label": "Watmel Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_DURIN_BERRY": {
+    "label": "Durin Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_BELUE_BERRY": {
+    "label": "Belue Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_LIECHI_BERRY": {
+    "label": "Liechi Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_GANLON_BERRY": {
+    "label": "Ganlon Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_SALAC_BERRY": {
+    "label": "Salac Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_PETAYA_BERRY": {
+    "label": "Petaya Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_APICOT_BERRY": {
+    "label": "Apicot Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_LANSAT_BERRY": {
+    "label": "Lansat Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+  "ITEM_STARF_BERRY": {
+    "label": "Starf Berry",
+    "classification": "FILLER",
+    "tags": ["Berry"]
+  },
+
+
+  "ITEM_BRIGHT_POWDER": {
+    "label": "Bright Powder",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_WHITE_HERB": {
+    "label": "White Herb",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_MACHO_BRACE": {
+    "label": "Macho Brace",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_EXP_SHARE": {
+    "label": "Exp. Share",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_QUICK_CLAW": {
+    "label": "Quick Claw",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SOOTHE_BELL": {
+    "label": "Soothe Bell",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_MENTAL_HERB": {
+    "label": "Mental Herb",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_CHOICE_BAND": {
+    "label": "Choice Band",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_KINGS_ROCK": {
+    "label": "King's Rock",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SILVER_POWDER": {
+    "label": "Silver Powder",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_AMULET_COIN": {
+    "label": "Amulet Coin",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_CLEANSE_TAG": {
+    "label": "Cleanse Tag",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SOUL_DEW": {
+    "label": "Soul Dew",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_DEEP_SEA_TOOTH": {
+    "label": "Deep Sea Tooth",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_DEEP_SEA_SCALE": {
+    "label": "Deep Sea Scale",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SMOKE_BALL": {
+    "label": "Smoke Ball",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_EVERSTONE": {
+    "label": "Everstone",
+    "classification": "FILLER",
+    "tags": ["Held"]
+  },
+  "ITEM_FOCUS_BAND": {
+    "label": "Focus Band",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_LUCKY_EGG": {
+    "label": "Lucky Egg",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SCOPE_LENS": {
+    "label": "Scope Lens",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_METAL_COAT": {
+    "label": "Metal Coat",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_LEFTOVERS": {
+    "label": "Leftovers",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_DRAGON_SCALE": {
+    "label": "Dragon Scale",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_LIGHT_BALL": {
+    "label": "Light Ball",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SOFT_SAND": {
+    "label": "Soft Sand",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_HARD_STONE": {
+    "label": "Hard Stone",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_MIRACLE_SEED": {
+    "label": "Miracle Seed",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_BLACK_GLASSES": {
+    "label": "Black Glasses",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_BLACK_BELT": {
+    "label": "Black Belt",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_MAGNET": {
+    "label": "Magnet",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_MYSTIC_WATER": {
+    "label": "Mystic Water",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SHARP_BEAK": {
+    "label": "Sharp Beak",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_POISON_BARB": {
+    "label": "Poison Barb",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_NEVER_MELT_ICE": {
+    "label": "Never-Melt Ice",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SPELL_TAG": {
+    "label": "Spell Tag",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_TWISTED_SPOON": {
+    "label": "Twisted Spoon",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_CHARCOAL": {
+    "label": "Charcoal",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_DRAGON_FANG": {
+    "label": "Dragon Fang",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SILK_SCARF": {
+    "label": "Silk Scarf",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_UP_GRADE": {
+    "label": "Up-Grade",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SHELL_BELL": {
+    "label": "Shell Bell",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_SEA_INCENSE": {
+    "label": "Sea Incense",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_LAX_INCENSE": {
+    "label": "Lax Incense",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_LUCKY_PUNCH": {
+    "label": "Lucky Punch",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_METAL_POWDER": {
+    "label": "Metal Powder",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_THICK_CLUB": {
+    "label": "Thick Club",
+    "classification": "USEFUL",
+    "tags": ["Held"]
+  },
+  "ITEM_STICK": {
+    "label": "Stick",
+    "classification": "FILLER",
+    "tags": ["Held"]
+  },
+  "ITEM_RED_SCARF": {
+    "label": "Red Scarf",
+    "classification": "FILLER",
+    "tags": ["Held"]
+  },
+  "ITEM_BLUE_SCARF": {
+    "label": "Blue Scarf",
+    "classification": "FILLER",
+    "tags": ["Held"]
+  },
+  "ITEM_PINK_SCARF": {
+    "label": "Pink Scarf",
+    "classification": "FILLER",
+    "tags": ["Held"]
+  },
+  "ITEM_GREEN_SCARF": {
+    "label": "Green Scarf",
+    "classification": "FILLER",
+    "tags": ["Held"]
+  },
+  "ITEM_YELLOW_SCARF": {
+    "label": "Yellow Scarf",
+    "classification": "FILLER",
+    "tags": ["Held"]
+  },
+
+
+  "ITEM_TM01_FOCUS_PUNCH": {
+    "label": "TM01",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM02_DRAGON_CLAW": {
+    "label": "TM02",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM03_WATER_PULSE": {
+    "label": "TM03",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM04_CALM_MIND": {
+    "label": "TM04",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM05_ROAR": {
+    "label": "TM05",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM06_TOXIC": {
+    "label": "TM06",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM07_HAIL": {
+    "label": "TM07",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM08_BULK_UP": {
+    "label": "TM08",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM09_BULLET_SEED": {
+    "label": "TM09",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM10_HIDDEN_POWER": {
+    "label": "TM10",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM11_SUNNY_DAY": {
+    "label": "TM11",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM12_TAUNT": {
+    "label": "TM12",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM13_ICE_BEAM": {
+    "label": "TM13",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM14_BLIZZARD": {
+    "label": "TM14",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM15_HYPER_BEAM": {
+    "label": "TM15",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM16_LIGHT_SCREEN": {
+    "label": "TM16",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM17_PROTECT": {
+    "label": "TM17",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM18_RAIN_DANCE": {
+    "label": "TM18",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM19_GIGA_DRAIN": {
+    "label": "TM19",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM20_SAFEGUARD": {
+    "label": "TM20",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM21_FRUSTRATION": {
+    "label": "TM21",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM22_SOLAR_BEAM": {
+    "label": "TM22",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM23_IRON_TAIL": {
+    "label": "TM23",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM24_THUNDERBOLT": {
+    "label": "TM24",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM25_THUNDER": {
+    "label": "TM25",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM26_EARTHQUAKE": {
+    "label": "TM26",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM27_RETURN": {
+    "label": "TM27",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM28_DIG": {
+    "label": "TM28",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM29_PSYCHIC": {
+    "label": "TM29",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM30_SHADOW_BALL": {
+    "label": "TM30",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM31_BRICK_BREAK": {
+    "label": "TM31",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM32_DOUBLE_TEAM": {
+    "label": "TM32",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM33_REFLECT": {
+    "label": "TM33",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM34_SHOCK_WAVE": {
+    "label": "TM34",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM35_FLAMETHROWER": {
+    "label": "TM35",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM36_SLUDGE_BOMB": {
+    "label": "TM36",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM37_SANDSTORM": {
+    "label": "TM37",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM38_FIRE_BLAST": {
+    "label": "TM38",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM39_ROCK_TOMB": {
+    "label": "TM39",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM40_AERIAL_ACE": {
+    "label": "TM40",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM41_TORMENT": {
+    "label": "TM41",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM42_FACADE": {
+    "label": "TM42",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM43_SECRET_POWER": {
+    "label": "TM43",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM44_REST": {
+    "label": "TM44",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM45_ATTRACT": {
+    "label": "TM45",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM46_THIEF": {
+    "label": "TM46",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM47_STEEL_WING": {
+    "label": "TM47",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM48_SKILL_SWAP": {
+    "label": "TM48",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM49_SNATCH": {
+    "label": "TM49",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  },
+  "ITEM_TM50_OVERHEAT": {
+    "label": "TM50",
+    "classification": "USEFUL",
+    "tags": ["TM"]
+  }
+}
diff --git a/worlds/pokemon_emerald/data/locations.json b/worlds/pokemon_emerald/data/locations.json
new file mode 100644
index 0000000000..a44ec204a0
--- /dev/null
+++ b/worlds/pokemon_emerald/data/locations.json
@@ -0,0 +1,1441 @@
+{
+  "BADGE_1": {
+    "label": "Rustboro Gym - Stone Badge",
+    "tags": ["Badge"]
+  },
+  "BADGE_2": {
+    "label": "Dewford Gym - Knuckle Badge",
+    "tags": ["Badge"]
+  },
+  "BADGE_3": {
+    "label": "Mauville Gym - Dynamo Badge",
+    "tags": ["Badge"]
+  },
+  "BADGE_4": {
+    "label": "Lavaridge Gym - Heat Badge",
+    "tags": ["Badge"]
+  },
+  "BADGE_5": {
+    "label": "Petalburg Gym - Balance Badge",
+    "tags": ["Badge"]
+  },
+  "BADGE_6": {
+    "label": "Fortree Gym - Feather Badge",
+    "tags": ["Badge"]
+  },
+  "BADGE_7": {
+    "label": "Mossdeep Gym - Mind Badge",
+    "tags": ["Badge"]
+  },
+  "BADGE_8": {
+    "label": "Sootopolis Gym - Rain Badge",
+    "tags": ["Badge"]
+  },
+
+  "NPC_GIFT_RECEIVED_HM01": {
+    "label": "Rustboro City - HM01 from Cutter's House",
+    "tags": ["HM"]
+  },
+  "NPC_GIFT_RECEIVED_HM02": {
+    "label": "Route 119 - HM02 from Rival Battle",
+    "tags": ["HM"]
+  },
+  "NPC_GIFT_RECEIVED_HM03": {
+    "label": "Petalburg City - HM03 from Wally's Uncle",
+    "tags": ["HM"]
+  },
+  "NPC_GIFT_RECEIVED_HM04": {
+    "label": "Rusturf Tunnel - HM04 from Tunneler",
+    "tags": ["HM"]
+  },
+  "NPC_GIFT_RECEIVED_HM05": {
+    "label": "Granite Cave 1F - HM05 from Hiker",
+    "tags": ["HM"]
+  },
+  "NPC_GIFT_RECEIVED_HM06": {
+    "label": "Mauville City - HM06 from Rock Smash Guy",
+    "tags": ["HM"]
+  },
+  "NPC_GIFT_RECEIVED_HM07": {
+    "label": "Sootopolis City - HM07 from Wallace",
+    "tags": ["HM"]
+  },
+  "NPC_GIFT_RECEIVED_HM08": {
+    "label": "Mossdeep City - HM08 from Steven's House",
+    "tags": ["HM"]
+  },
+
+  "NPC_GIFT_RECEIVED_ACRO_BIKE": {
+    "label": "Mauville City - Acro Bike",
+    "tags": ["Bike"]
+  },
+  "NPC_GIFT_RECEIVED_MACH_BIKE": {
+    "label": "Mauville City - Mach Bike",
+    "tags": ["Bike"]
+  },
+
+  "NPC_GIFT_RECEIVED_WAILMER_PAIL": {
+    "label": "Route 104 - Wailmer Pail from Flower Shop Lady",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_DEVON_GOODS_RUSTURF_TUNNEL": {
+    "label": "Rusturf Tunnel - Recover Devon Goods",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_LETTER": {
+    "label": "Devon Corp 3F - Letter from Mr. Stone",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_COIN_CASE": {
+    "label": "Mauville City - Coin Case from Lady in House",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_METEORITE": {
+    "label": "Mt Chimney - Meteorite from Machine",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_GO_GOGGLES": {
+    "label": "Lavaridge Town - Go Goggles from Rival",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_GOT_BASEMENT_KEY_FROM_WATTSON": {
+    "label": "Mauville City - Basement Key from Wattson",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_ITEMFINDER": {
+    "label": "Route 110 - Itemfinder from Rival",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_DEVON_SCOPE": {
+    "label": "Route 120 - Devon Scope from Steven",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_MAGMA_EMBLEM": {
+    "label": "Mt Pyre Summit - Magma Emblem from Old Lady",
+    "tags": ["KeyItem"]
+  },
+  "ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY": {
+    "label": "Abandoned Ship - Captain's Office Key",
+    "tags": ["KeyItem"]
+  },
+  "HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY": {
+    "label": "Abandoned Ship HF - Hidden Item in Room 1",
+    "tags": ["KeyItem"]
+  },
+  "HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY": {
+    "label": "Abandoned Ship HF - Hidden Item in Room 3",
+    "tags": ["KeyItem"]
+  },
+  "HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY": {
+    "label": "Abandoned Ship HF - Hidden Item in Room 4",
+    "tags": ["KeyItem"]
+  },
+  "HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY": {
+    "label": "Abandoned Ship HF - Hidden Item in Room 5",
+    "tags": ["KeyItem"]
+  },
+  "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER": {
+    "label": "Abandoned Ship HF - Item in Room 2",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_POKEBLOCK_CASE": {
+    "label": "Lilycove City - Pokeblock Case from Contest Hall",
+    "tags": ["KeyItem"]
+  },
+  "NPC_GIFT_RECEIVED_SS_TICKET": {
+    "label": "Littleroot Town - S.S. Ticket from Norman",
+    "tags": ["Ferry"]
+  },
+
+  "NPC_GIFT_RECEIVED_OLD_ROD": {
+    "label": "Dewford Town - Old Rod from Fisherman",
+    "tags": ["Rod"]
+  },
+  "NPC_GIFT_RECEIVED_GOOD_ROD": {
+    "label": "Route 118 - Good Rod from Fisherman",
+    "tags": ["Rod"]
+  },
+  "NPC_GIFT_RECEIVED_SUPER_ROD": {
+    "label": "Mossdeep City - Super Rod from Fisherman in House",
+    "tags": ["Rod"]
+  },
+
+  "HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM": {
+    "label": "Artisan Cave B1F - Hidden Item 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON": {
+    "label": "Artisan Cave B1F - Hidden Item 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN": {
+    "label": "Artisan Cave B1F - Hidden Item 3",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC": {
+    "label": "Artisan Cave B1F - Hidden Item 4",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET": {
+    "label": "Fallarbor Town - Hidden Item in Crater",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1": {
+    "label": "Granite Cave B2F - Hidden Item After Crumbling Floor",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2": {
+    "label": "Granite Cave B2F - Hidden Item on Platform",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL": {
+    "label": "Jagged Pass - Hidden Item in Grass",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL": {
+    "label": "Jagged Pass - Hidden Item in Corner",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL": {
+    "label": "Lavaridge Town - Hidden Item in Springs",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE": {
+    "label": "Lilycove City - Hidden Item on Beach West",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL": {
+    "label": "Lilycove City - Hidden Item on Beach East",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_LILYCOVE_CITY_PP_UP": {
+    "label": "Lilycove City - Hidden Item on Beach North",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER": {
+    "label": "Mt Pyre Exterior - Hidden Item First Grave",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL": {
+    "label": "Mt Pyre Exterior - Hidden Item Second Grave",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY": {
+    "label": "Mt Pyre Summit - Hidden Item in Grass",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC": {
+    "label": "Mt Pyre Summit - Hidden Item Grave",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH": {
+    "label": "Navel Rock Top - Hidden Item Sacred Ash",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY": {
+    "label": "Petalburg City - Hidden Item Past Pond South",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL": {
+    "label": "Petalburg Woods - Hidden Item After Grunt",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_PETALBURG_WOODS_POTION": {
+    "label": "Petalburg Woods - Hidden Item Southeast",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1": {
+    "label": "Petalburg Woods - Hidden Item Past Tree North",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2": {
+    "label": "Petalburg Woods - Hidden Item Past Tree South",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_104_ANTIDOTE": {
+    "label": "Route 104 - Hidden Item on Beach 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_104_HEART_SCALE": {
+    "label": "Route 104 - Hidden Item on Beach 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_104_POTION": {
+    "label": "Route 104 - Hidden Item on Beach 3",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_104_POKE_BALL": {
+    "label": "Route 104 - Hidden Item Behind Flower Shop 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_104_SUPER_POTION": {
+    "label": "Route 104 - Hidden Item Behind Flower Shop 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_105_BIG_PEARL": {
+    "label": "Route 105 - Hidden Item Between Trainers",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_105_HEART_SCALE": {
+    "label": "Route 105 - Hidden Item on Small Island",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_106_HEART_SCALE": {
+    "label": "Route 106 - Hidden Item on Beach 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_106_STARDUST": {
+    "label": "Route 106 - Hidden Item on Beach 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_106_POKE_BALL": {
+    "label": "Route 106 - Hidden Item on Beach 3",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_108_RARE_CANDY": {
+    "label": "Route 108 - Hidden Item on Rock",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_109_REVIVE": {
+    "label": "Route 109 - Hidden Item on Beach Southwest",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_109_ETHER": {
+    "label": "Route 109 - Hidden Item on Beach Southeast",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2": {
+    "label": "Route 109 - Hidden Item on Beach Under Umbrella",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_109_GREAT_BALL": {
+    "label": "Route 109 - Hidden Item on Beach West",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1": {
+    "label": "Route 109 - Hidden Item on Beach Behind Old Man",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3": {
+    "label": "Route 109 - Hidden Item in Front of Couple",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_110_FULL_HEAL": {
+    "label": "Route 110 - Hidden Item South of Rival",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_110_GREAT_BALL": {
+    "label": "Route 110 - Hidden Item North of Rival",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_110_REVIVE": {
+    "label": "Route 110 - Hidden Item Behind Two Trainers",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_110_POKE_BALL": {
+    "label": "Route 110 - Hidden Item South of Berries",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_111_PROTEIN": {
+    "label": "Route 111 - Hidden Item Desert Behind Tower",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_111_RARE_CANDY": {
+    "label": "Route 111 - Hidden Item Desert on Rock 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_111_STARDUST": {
+    "label": "Route 111 - Hidden Item Desert on Rock 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_113_ETHER": {
+    "label": "Route 113 - Hidden Item Mound West of Three Trainers",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_113_NUGGET": {
+    "label": "Route 113 - Hidden Item Mound Between Trainers",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_113_TM32": {
+    "label": "Route 113 - Hidden Item Mound West of Workshop",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_114_CARBOS": {
+    "label": "Route 114 - Hidden Item Rock in Grass",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_114_REVIVE": {
+    "label": "Route 114 - Hidden Item West of Bridge",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_115_HEART_SCALE": {
+    "label": "Route 115 - Hidden Item Behind Trainer on Beach",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES": {
+    "label": "Route 116 - Hidden Item in East",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_116_SUPER_POTION": {
+    "label": "Route 116 - Hidden Item in Tree Maze",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_117_REPEL": {
+    "label": "Route 117 - Hidden Item Behind Flower Patch",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_118_HEART_SCALE": {
+    "label": "Route 118 - Hidden Item West on Rock",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_118_IRON": {
+    "label": "Route 118 - Hidden Item East on Rock",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_119_FULL_HEAL": {
+    "label": "Route 119 - Hidden Item in South Tall Grass",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_119_CALCIUM": {
+    "label": "Route 119 - Hidden Item Across South Rail",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_119_ULTRA_BALL": {
+    "label": "Route 119 - Hidden Item in East Tall Grass",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_119_MAX_ETHER": {
+    "label": "Route 119 - Hidden Item Next to Waterfall",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1": {
+    "label": "Route 120 - Hidden Item Behind Trees",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_120_REVIVE": {
+    "label": "Route 120 - Hidden Item in North Tall Grass",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_120_ZINC": {
+    "label": "Route 120 - Hidden Item in Tall Grass Maze",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2": {
+    "label": "Route 120 - Hidden Item Behind Southwest Pool",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_121_HP_UP": {
+    "label": "Route 121 - Hidden Item West of Grunts",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_121_FULL_HEAL": {
+    "label": "Route 121 - Hidden Item in Maze 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_121_MAX_REVIVE": {
+    "label": "Route 121 - Hidden Item in Maze 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_121_NUGGET": {
+    "label": "Route 121 - Hidden Item Behind Tree",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_123_PP_UP": {
+    "label": "Route 123 - Hidden Item East Behind Tree 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_123_RARE_CANDY": {
+    "label": "Route 123 - Hidden Item East Behind Tree 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_123_HYPER_POTION": {
+    "label": "Route 123 - Hidden Item on Rock Before Ledges",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_123_SUPER_REPEL": {
+    "label": "Route 123 - Hidden Item in North Path Grass",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_123_REVIVE": {
+    "label": "Route 123 - Hidden Item Behind House",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1": {
+    "label": "Route 128 - Hidden Item North Island",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2": {
+    "label": "Route 128 - Hidden Item Center Island",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3": {
+    "label": "Route 128 - Hidden Item Southwest Island",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC": {
+    "label": "Safari Zone NE - Hidden Item North",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY": {
+    "label": "Safari Zone NE - Hidden Item East",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE": {
+    "label": "Safari Zone SE - Hidden Item in South Grass 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP": {
+    "label": "Safari Zone SE - Hidden Item in South Grass 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS": {
+    "label": "SS Tidal - Hidden Item in Lower Deck Trash Can",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_TRICK_HOUSE_NUGGET": {
+    "label": "Trick House - Hidden Item",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD": {
+    "label": "Route 124 UW - Hidden Item in Big Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_124_CARBOS": {
+    "label": "Route 124 UW - Hidden Item in Tunnel Alcove",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_124_CALCIUM": {
+    "label": "Route 124 UW - Hidden Item in North Tunnel 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2": {
+    "label": "Route 124 UW - Hidden Item in North Tunnel 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_124_PEARL": {
+    "label": "Route 124 UW - Hidden Item in Small Area North",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL": {
+    "label": "Route 124 UW - Hidden Item in Small Area Middle",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1": {
+    "label": "Route 124 UW - Hidden Item in Small Area South",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_STARDUST": {
+    "label": "Route 126 UW - Hidden Item Northeast",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL": {
+    "label": "Route 126 UW - Hidden Item in North Alcove",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL": {
+    "label": "Route 126 UW - Hidden Item in Southeast",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE": {
+    "label": "Route 126 UW - Hidden Item in Northwest Alcove",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD": {
+    "label": "Route 126 UW - Hidden Item in Southwest Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_IRON": {
+    "label": "Route 126 UW - Hidden Item in West Area 1",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_PEARL": {
+    "label": "Route 126 UW - Hidden Item in West Area 2",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD": {
+    "label": "Route 126 UW - Hidden Item in West Area 3",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE": {
+    "label": "Route 127 UW - Hidden Item in West Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE": {
+    "label": "Route 127 UW - Hidden Item in Center Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_127_HP_UP": {
+    "label": "Route 127 UW - Hidden Item in East Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_127_RED_SHARD": {
+    "label": "Route 127 UW - Hidden Item in Northeast Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_128_PEARL": {
+    "label": "Route 128 UW - Hidden Item in East Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_UNDERWATER_128_PROTEIN": {
+    "label": "Route 128 UW - Hidden Item in Small Area",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL": {
+    "label": "Victory Road 1F - Hidden Item on Southeast Ledge",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR": {
+    "label": "Victory Road B2F - Hidden Item Above Waterfall",
+    "tags": ["HiddenItem"]
+  },
+  "HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL": {
+    "label": "Victory Road B2F - Hidden Item in Northeast Corner",
+    "tags": ["HiddenItem"]
+  },
+
+  "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18": {
+    "label": "Abandoned Ship HF - Item in Room 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE": {
+    "label": "Abandoned Ship HF - Item in Room 3",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL": {
+    "label": "Abandoned Ship HF - Item in Room 6",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL": {
+    "label": "Abandoned Ship 1F - Item in East Side Northwest Room",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE": {
+    "label": "Abandoned Ship 1F - Item in West Side North Room",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE": {
+    "label": "Abandoned Ship B1F - Item in South Rooms",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13": {
+    "label": "Abandoned Ship B1F - Item in Storage Room",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL": {
+    "label": "Abandoned Ship B1F - Item in North Rooms",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL": {
+    "label": "Aqua Hideout B1F - Item in Center Room 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_AQUA_HIDEOUT_B1F_NUGGET": {
+    "label": "Aqua Hideout B1F - Item in Center Room 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR": {
+    "label": "Aqua Hideout B1F - Item in East Room",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_AQUA_HIDEOUT_B2F_NEST_BALL": {
+    "label": "Aqua Hideout B2F - Item in Long Hallway",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ARTISAN_CAVE_1F_CARBOS": {
+    "label": "Artisan Cave 1F - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ARTISAN_CAVE_B1F_HP_UP": {
+    "label": "Artisan Cave B1F - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_FIERY_PATH_FIRE_STONE": {
+    "label": "Fiery Path - Item Behind Boulders 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_FIERY_PATH_TM06": {
+    "label": "Fiery Path - Item Behind Boulders 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE": {
+    "label": "Granite Cave 1F - Item Before Ladder",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_GRANITE_CAVE_B1F_POKE_BALL": {
+    "label": "Granite Cave B1F - Item in Alcove",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_GRANITE_CAVE_B2F_RARE_CANDY": {
+    "label": "Granite Cave B2F - Item After Crumbling Floor",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_GRANITE_CAVE_B2F_REPEL": {
+    "label": "Granite Cave B2F - Item After Mud Slope",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_JAGGED_PASS_BURN_HEAL": {
+    "label": "Jagged Pass - Item Below Hideout",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_LILYCOVE_CITY_MAX_REPEL": {
+    "label": "Lilycove City - Item on Peninsula",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY": {
+    "label": "Magma Hideout 1F - Item on Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE": {
+    "label": "Magma Hideout 2F - Item on West Platform",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR": {
+    "label": "Magma Hideout 2F - Item on East Platform",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET": {
+    "label": "Magma Hideout 3F - Item Before Last Floor",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX": {
+    "label": "Magma Hideout 3F - Item in Drill Room",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE": {
+    "label": "Magma Hideout 3F - Item After Groudon",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE": {
+    "label": "Magma Hideout 4F - Item Before Groudon",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MAUVILLE_CITY_X_SPEED": {
+    "label": "Mauville City - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_METEOR_FALLS_1F_1R_FULL_HEAL": {
+    "label": "Meteor Falls 1F - Item Northeast",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_METEOR_FALLS_1F_1R_MOON_STONE": {
+    "label": "Meteor Falls 1F - Item West",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_METEOR_FALLS_1F_1R_PP_UP": {
+    "label": "Meteor Falls 1F - Item Below Waterfall",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_METEOR_FALLS_1F_1R_TM23": {
+    "label": "Meteor Falls 1F - Item Before Steven's Cave",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_METEOR_FALLS_B1F_2R_TM02": {
+    "label": "Meteor Falls B1F - Item in North Cave",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MOSSDEEP_CITY_NET_BALL": {
+    "label": "Mossdeep City - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MT_PYRE_2F_ULTRA_BALL": {
+    "label": "Mt Pyre 2F - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MT_PYRE_3F_SUPER_REPEL": {
+    "label": "Mt Pyre 3F - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MT_PYRE_4F_SEA_INCENSE": {
+    "label": "Mt Pyre 4F - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MT_PYRE_5F_LAX_INCENSE": {
+    "label": "Mt Pyre 5F - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MT_PYRE_6F_TM30": {
+    "label": "Mt Pyre 6F - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MT_PYRE_EXTERIOR_TM48": {
+    "label": "Mt Pyre Exterior - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_MT_PYRE_EXTERIOR_MAX_POTION": {
+    "label": "Mt Pyre Exterior - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_NEW_MAUVILLE_ESCAPE_ROPE": {
+    "label": "New Mauville - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_NEW_MAUVILLE_PARALYZE_HEAL": {
+    "label": "New Mauville - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_NEW_MAUVILLE_FULL_HEAL": {
+    "label": "New Mauville - Item 3",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_NEW_MAUVILLE_THUNDER_STONE": {
+    "label": "New Mauville - Item 4",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_NEW_MAUVILLE_ULTRA_BALL": {
+    "label": "New Mauville - Item 5",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_PETALBURG_CITY_ETHER": {
+    "label": "Petalburg City - Item Past Pond South",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_PETALBURG_CITY_MAX_REVIVE": {
+    "label": "Petalburg City - Item Past Pond North",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_PETALBURG_WOODS_ETHER": {
+    "label": "Petalburg Woods - Item Northwest",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_PETALBURG_WOODS_PARALYZE_HEAL": {
+    "label": "Petalburg Woods - Item Southwest",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_PETALBURG_WOODS_GREAT_BALL": {
+    "label": "Petalburg Woods - Item Past Tree Northeast",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_PETALBURG_WOODS_X_ATTACK": {
+    "label": "Petalburg Woods - Item Past Tree South",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_102_POTION": {
+    "label": "Route 102 - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_103_GUARD_SPEC": {
+    "label": "Route 103 - Item Near Berries",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_103_PP_UP": {
+    "label": "Route 103 - Item in Tree Maze",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_104_POKE_BALL": {
+    "label": "Route 104 - Item Near Briney on Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_104_POTION": {
+    "label": "Route 104 - Item Behind Flower Shop",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_104_X_ACCURACY": {
+    "label": "Route 104 - Item Behind Tree",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_104_PP_UP": {
+    "label": "Route 104 - Item East Past Pond",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_105_IRON": {
+    "label": "Route 105 - Item on Island",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_106_PROTEIN": {
+    "label": "Route 106 - Item on West Beach",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_108_STAR_PIECE": {
+    "label": "Route 108 - Item Between Trainers",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_109_POTION": {
+    "label": "Route 109 - Item on Beach",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_109_PP_UP": {
+    "label": "Route 109 - Item on Island",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_110_DIRE_HIT": {
+    "label": "Route 110 - Item South of Rival",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_110_ELIXIR": {
+    "label": "Route 110 - Item South of Berries",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_110_RARE_CANDY": {
+    "label": "Route 110 - Item on Island",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_111_ELIXIR": {
+    "label": "Route 111 - Item Near Winstrates",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_111_HP_UP": {
+    "label": "Route 111 - Item West of Pond Near Winstrates",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_111_STARDUST": {
+    "label": "Route 111 - Item Desert Near Tower",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_111_TM37": {
+    "label": "Route 111 - Item Desert South",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_112_NUGGET": {
+    "label": "Route 112 - Item on Ledges",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_113_SUPER_REPEL": {
+    "label": "Route 113 - Item Past Three Trainers",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_113_MAX_ETHER": {
+    "label": "Route 113 - Item on Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_113_HYPER_POTION": {
+    "label": "Route 113 - Item Near Fallarbor South",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_114_ENERGY_POWDER": {
+    "label": "Route 114 - Item Between Trainers",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_114_PROTEIN": {
+    "label": "Route 114 - Item Behind Smashable Rock",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_114_RARE_CANDY": {
+    "label": "Route 114 - Item Above Waterfall",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_115_SUPER_POTION": {
+    "label": "Route 115 - Item on Beach",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_115_PP_UP": {
+    "label": "Route 115 - Item on Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_115_GREAT_BALL": {
+    "label": "Route 115 - Item Behind Smashable Rock",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_115_HEAL_POWDER": {
+    "label": "Route 115 - Item North Near Trainers",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_115_TM01": {
+    "label": "Route 115 - Item Near Mud Slope",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_115_IRON": {
+    "label": "Route 115 - Item Past Mud Slope",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_116_REPEL": {
+    "label": "Route 116 - Item in Grass",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_116_X_SPECIAL": {
+    "label": "Route 116 - Item Near Tunnel",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_116_POTION": {
+    "label": "Route 116 - Item in Tree Maze 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_116_ETHER": {
+    "label": "Route 116 - Item in Tree Maze 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_116_HP_UP": {
+    "label": "Route 116 - Item in East",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_117_GREAT_BALL": {
+    "label": "Route 117 - Item Behind Flower Patch",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_117_REVIVE": {
+    "label": "Route 117 - Item Behind Tree",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_118_HYPER_POTION": {
+    "label": "Route 118 - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_SUPER_REPEL": {
+    "label": "Route 119 - Item in South Tall Grass 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_HYPER_POTION_1": {
+    "label": "Route 119 - Item in South Tall Grass 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_ZINC": {
+    "label": "Route 119 - Item Across River South",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_HYPER_POTION_2": {
+    "label": "Route 119 - Item Near Mud Slope",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_ELIXIR_1": {
+    "label": "Route 119 - Item East of Mud Slope",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_ELIXIR_2": {
+    "label": "Route 119 - Item on River Bank",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_LEAF_STONE": {
+    "label": "Route 119 - Item Near South Waterfall",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_NUGGET": {
+    "label": "Route 119 - Item Above North Waterfall 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_119_RARE_CANDY": {
+    "label": "Route 119 - Item Above North Waterfall 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_120_NEST_BALL": {
+    "label": "Route 120 - Item Near North Pond",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_120_REVIVE": {
+    "label": "Route 120 - Item in North Puddles",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_120_NUGGET": {
+    "label": "Route 120 - Item in Tall Grass Maze",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_120_HYPER_POTION": {
+    "label": "Route 120 - Item in Tall Grass South",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_120_FULL_HEAL": {
+    "label": "Route 120 - Item Behind Southwest Pool",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_121_ZINC": {
+    "label": "Route 121 - Item Near Safari Zone",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_121_REVIVE": {
+    "label": "Route 121 - Item in Maze 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_121_CARBOS": {
+    "label": "Route 121 - Item in Maze 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_123_ULTRA_BALL": {
+    "label": "Route 123 - Item Below Ledges",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_123_ELIXIR": {
+    "label": "Route 123 - Item on Ledges 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_123_REVIVAL_HERB": {
+    "label": "Route 123 - Item on Ledges 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_123_PP_UP": {
+    "label": "Route 123 - Item on Ledges 3",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_123_CALCIUM": {
+    "label": "Route 123 - Item on Ledges 4",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_124_RED_SHARD": {
+    "label": "Route 124 - Item in Northwest Area",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_124_YELLOW_SHARD": {
+    "label": "Route 124 - Item in Northeast Area",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_124_BLUE_SHARD": {
+    "label": "Route 124 - Item in Southwest Area",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_125_BIG_PEARL": {
+    "label": "Route 125 - Item Between Trainers",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_126_GREEN_SHARD": {
+    "label": "Route 126 - Item in Separated Area",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_127_ZINC": {
+    "label": "Route 127 - Item North",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_127_CARBOS": {
+    "label": "Route 127 - Item East",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_127_RARE_CANDY": {
+    "label": "Route 127 - Item Between Trainers",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_132_PROTEIN": {
+    "label": "Route 132 - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_132_RARE_CANDY": {
+    "label": "Route 132 - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_133_BIG_PEARL": {
+    "label": "Route 133 - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_133_MAX_REVIVE": {
+    "label": "Route 133 - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_133_STAR_PIECE": {
+    "label": "Route 133 - Item 3",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_134_CARBOS": {
+    "label": "Route 134 - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_ROUTE_134_STAR_PIECE": {
+    "label": "Route 134 - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_RUSTBORO_CITY_X_DEFEND": {
+    "label": "Rustboro City - Item Behind Fences",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_RUSTURF_TUNNEL_POKE_BALL": {
+    "label": "Rusturf Tunnel - Item West",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_RUSTURF_TUNNEL_MAX_ETHER": {
+    "label": "Rusturf Tunnel - Item East",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SAFARI_ZONE_NORTH_CALCIUM": {
+    "label": "Safari Zone N - Item in Grass",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET": {
+    "label": "Safari Zone NE - Item on Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SAFARI_ZONE_NORTH_WEST_TM22": {
+    "label": "Safari Zone NW - Item Behind Pond",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL": {
+    "label": "Safari Zone SE - Item in Grass",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE": {
+    "label": "Safari Zone SW - Item Behind Pond",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SCORCHED_SLAB_TM11": {
+    "label": "Scorched Slab - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SEAFLOOR_CAVERN_ROOM_9_TM26": {
+    "label": "Seafloor Cavern Room 9 - Item Before Kyogre",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL": {
+    "label": "Shoal Cave Entrance - Item on Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE": {
+    "label": "Shoal Cave Ice Room - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SHOAL_CAVE_ICE_ROOM_TM07": {
+    "label": "Shoal Cave Ice Room - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY": {
+    "label": "Shoal Cave Inner Room - Item in Center",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL": {
+    "label": "Shoal Cave Stairs Room - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL": {
+    "label": "Trick House Puzzle 1 - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL": {
+    "label": "Trick House Puzzle 2 - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL": {
+    "label": "Trick House Puzzle 2 - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL": {
+    "label": "Trick House Puzzle 3 - Item 1",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL": {
+    "label": "Trick House Puzzle 3 - Item 2",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL": {
+    "label": "Trick House Puzzle 4 - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL": {
+    "label": "Trick House Puzzle 6 - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL": {
+    "label": "Trick House Puzzle 7 - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL": {
+    "label": "Trick House Puzzle 8 - Item",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_VICTORY_ROAD_1F_MAX_ELIXIR": {
+    "label": "Victory Road 1F - Item East",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_VICTORY_ROAD_1F_PP_UP": {
+    "label": "Victory Road 1F - Item on Southeast Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_VICTORY_ROAD_B1F_FULL_RESTORE": {
+    "label": "Victory Road B1F - Item Behind Boulders",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_VICTORY_ROAD_B1F_TM29": {
+    "label": "Victory Road B1F - Item on Northeast Ledge",
+    "tags": ["OverworldItem"]
+  },
+  "ITEM_VICTORY_ROAD_B2F_FULL_HEAL": {
+    "label": "Victory Road B2F - Item Above Waterfall",
+    "tags": ["OverworldItem"]
+  },
+
+  "NPC_GIFT_GOT_TM24_FROM_WATTSON": {
+    "label": "Mauville City - TM24 from Wattson",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_6_SODA_POP": {
+    "label": "Route 109 - Seashore House Reward",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_AMULET_COIN": {
+    "label": "Littleroot Town - Amulet Coin from Mom",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_CHARCOAL": {
+    "label": "Lavaridge Town Herb Shop - Charcoal from Man",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_CHESTO_BERRY_ROUTE_104": {
+    "label": "Route 104 - Gift from Woman Near Berries",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_CLEANSE_TAG": {
+    "label": "Mt Pyre 1F - Cleanse Tag from Woman in NE Corner",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_EXP_SHARE": {
+    "label": "Devon Corp 3F - Exp. Share from Mr. Stone",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_FOCUS_BAND": {
+    "label": "Shoal Cave Lower Room - Focus Band from Black Belt",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_GREAT_BALL_PETALBURG_WOODS": {
+    "label": "Petalburg Woods - Gift from Devon Employee",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_GREAT_BALL_RUSTBORO_CITY": {
+    "label": "Rustboro City - Gift from Devon Employee",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_KINGS_ROCK": {
+    "label": "Mossdeep City - King's Rock from Kid",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_MACHO_BRACE": {
+    "label": "Route 111 - Winstrate Family Reward",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_MENTAL_HERB": {
+    "label": "Fortree City - Wingull Delivery Reward",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_MIRACLE_SEED": {
+    "label": "Petalburg Woods - Miracle Seed from Lady",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_POTION_OLDALE": {
+    "label": "Oldale Town - Gift from Shop Tutorial",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_POWDER_JAR": {
+    "label": "Slateport City - Powder Jar from Lady in Market",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_PREMIER_BALL_RUSTBORO": {
+    "label": "Rustboro City - Gift from Boy in Apartments",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_QUICK_CLAW": {
+    "label": "Rustboro City - Quick Claw from School Teacher",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_REPEAT_BALL": {
+    "label": "Route 116 - Gift from Devon Researcher",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_SECRET_POWER": {
+    "label": "Route 111 - Secret Power from Man Near Tree",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_SILK_SCARF": {
+    "label": "Dewford Town - Silk Scarf from Man in House",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_SOFT_SAND": {
+    "label": "Route 109 - Soft Sand from Tuber",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_SOOTHE_BELL": {
+    "label": "Slateport City - Soothe Bell from Woman in Fan Club",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_SUN_STONE_MOSSDEEP": {
+    "label": "Mossdeep City - Gift from Man in Museum",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM03": {
+    "label": "Sootopolis Gym - TM03 from Juan",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM04": {
+    "label": "Mossdeep Gym - TM04 from Tate and Liza",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM05": {
+    "label": "Route 114 - TM05 from Roaring Man",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM08": {
+    "label": "Dewford Gym - TM08 from Brawly",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM09": {
+    "label": "Route 104 - TM09 from Boy",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM10": {
+    "label": "Fortree City - TM10 from Hidden Power Lady",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM19": {
+    "label": "Route 123 - TM19 from Girl near Berries",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM21": {
+    "label": "Pacifidlog Town - TM21 from Man in House",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM27": {
+    "label": "Fallarbor Town - TM27 from Cozmo",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM27_2": {
+    "label": "Pacifidlog Town - TM27 from Man in House",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM28": {
+    "label": "Route 114 - TM28 from Fossil Maniac",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM31": {
+    "label": "Sootopolis City - TM31 from Black Belt in House",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM34": {
+    "label": "Mauville Gym - TM34 from Wattson",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM36": {
+    "label": "Dewford Town - TM36 from Sludge Bomb Man",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM39": {
+    "label": "Rustboro Gym - TM39 from Roxanne",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM40": {
+    "label": "Fortree Gym - TM40 from Winona",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM41": {
+    "label": "Slateport City - TM41 from Sailor in Battle Tent",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM42": {
+    "label": "Petalburg Gym - TM42 from Norman",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM44": {
+    "label": "Lilycove City - TM44 from Man in House",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM45": {
+    "label": "Verdanturf Town - TM45 from Woman in Battle Tent",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM46": {
+    "label": "Slateport City - TM46 from Aqua Grunt in Museum",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM47": {
+    "label": "Granite Cave 1F - TM47 from Steven",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM49": {
+    "label": "SS Tidal - TM49 from Thief",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_TM50": {
+    "label": "Lavaridge Gym - TM50 from Flannery",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_WHITE_HERB": {
+    "label": "Route 104 - White Herb from Lady Near Flower Shop",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_DEEP_SEA_SCALE": {
+    "label": "Slateport City - Deep Sea Scale from Capt. Stern",
+    "tags": ["NpcGift"]
+  },
+  "NPC_GIFT_RECEIVED_DEEP_SEA_TOOTH": {
+    "label": "Slateport City - Deep Sea Tooth from Capt. Stern",
+    "tags": ["NpcGift"]
+  }
+}
diff --git a/worlds/pokemon_emerald/data/regions/cities.json b/worlds/pokemon_emerald/data/regions/cities.json
new file mode 100644
index 0000000000..d39c0cc847
--- /dev/null
+++ b/worlds/pokemon_emerald/data/regions/cities.json
@@ -0,0 +1,2604 @@
+{
+  "REGION_SKY": {
+    "parent_map": null,
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LITTLEROOT_TOWN/MAIN",
+      "REGION_OLDALE_TOWN/MAIN",
+      "REGION_PETALBURG_CITY/MAIN",
+      "REGION_RUSTBORO_CITY/MAIN",
+      "REGION_DEWFORD_TOWN/MAIN",
+      "REGION_SLATEPORT_CITY/MAIN",
+      "REGION_MAUVILLE_CITY/MAIN",
+      "REGION_VERDANTURF_TOWN/MAIN",
+      "REGION_FALLARBOR_TOWN/MAIN",
+      "REGION_LAVARIDGE_TOWN/MAIN",
+      "REGION_FORTREE_CITY/MAIN",
+      "REGION_LILYCOVE_CITY/MAIN",
+      "REGION_MOSSDEEP_CITY/MAIN",
+      "REGION_SOOTOPOLIS_CITY/EAST",
+      "REGION_EVER_GRANDE_CITY/SOUTH"
+    ],
+    "warps": []
+  },
+
+  "REGION_LITTLEROOT_TOWN/MAIN": {
+    "parent_map": "MAP_LITTLEROOT_TOWN",
+    "locations": [],
+    "events": [
+      "EVENT_VISITED_LITTLEROOT_TOWN",
+      "FREE_FLY_LOCATION"
+    ],
+    "exits": [
+      "REGION_ROUTE101/MAIN",
+      "REGION_SKY"
+    ],
+    "warps": [
+      "MAP_LITTLEROOT_TOWN:0/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:1",
+      "MAP_LITTLEROOT_TOWN:1/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:1",
+      "MAP_LITTLEROOT_TOWN:2/MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB:0"
+    ]
+  },
+  "REGION_LITTLEROOT_TOWN_MAYS_HOUSE_1F/MAIN": {
+    "parent_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:0,1/MAP_LITTLEROOT_TOWN:0",
+      "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:2/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F:0"
+    ]
+  },
+  "REGION_LITTLEROOT_TOWN_MAYS_HOUSE_2F/MAIN": {
+    "parent_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F:0/MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F:2"
+    ]
+  },
+  "REGION_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F/MAIN": {
+    "parent_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_AMULET_COIN",
+      "NPC_GIFT_RECEIVED_SS_TICKET"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:0,1/MAP_LITTLEROOT_TOWN:1",
+      "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:2/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F:0"
+    ]
+  },
+  "REGION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F/MAIN": {
+    "parent_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F:0/MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F:2"
+    ]
+  },
+  "REGION_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB/MAIN": {
+    "parent_map": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB:0,1/MAP_LITTLEROOT_TOWN:2"
+    ]
+  },
+
+  "REGION_OLDALE_TOWN/MAIN": {
+    "parent_map": "MAP_OLDALE_TOWN",
+    "locations": [
+      "NPC_GIFT_RECEIVED_POTION_OLDALE"
+    ],
+    "events": [
+      "EVENT_VISITED_OLDALE_TOWN"
+    ],
+    "exits": [
+      "REGION_ROUTE101/MAIN",
+      "REGION_ROUTE102/MAIN",
+      "REGION_ROUTE103/WEST"
+    ],
+    "warps": [
+      "MAP_OLDALE_TOWN:0/MAP_OLDALE_TOWN_HOUSE1:0",
+      "MAP_OLDALE_TOWN:1/MAP_OLDALE_TOWN_HOUSE2:0",
+      "MAP_OLDALE_TOWN:2/MAP_OLDALE_TOWN_POKEMON_CENTER_1F:0",
+      "MAP_OLDALE_TOWN:3/MAP_OLDALE_TOWN_MART:0"
+    ]
+  },
+  "REGION_OLDALE_TOWN_HOUSE1/MAIN": {
+    "parent_map": "MAP_OLDALE_TOWN_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_OLDALE_TOWN_HOUSE1:0,1/MAP_OLDALE_TOWN:0"
+    ]
+  },
+  "REGION_OLDALE_TOWN_HOUSE2/MAIN": {
+    "parent_map": "MAP_OLDALE_TOWN_HOUSE2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_OLDALE_TOWN_HOUSE2:0,1/MAP_OLDALE_TOWN:1"
+    ]
+  },
+  "REGION_OLDALE_TOWN_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_OLDALE_TOWN_POKEMON_CENTER_1F:0,1/MAP_OLDALE_TOWN:2",
+      "MAP_OLDALE_TOWN_POKEMON_CENTER_1F:2/MAP_OLDALE_TOWN_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_OLDALE_TOWN_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_OLDALE_TOWN_POKEMON_CENTER_2F:0/MAP_OLDALE_TOWN_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_OLDALE_TOWN_MART/MAIN": {
+    "parent_map": "MAP_OLDALE_TOWN_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_OLDALE_TOWN_MART:0,1/MAP_OLDALE_TOWN:3"
+    ]
+  },
+
+  "REGION_PETALBURG_CITY/MAIN": {
+    "parent_map": "MAP_PETALBURG_CITY",
+    "locations": [],
+    "events": [
+      "EVENT_VISITED_PETALBURG_CITY"
+    ],
+    "exits": [
+      "REGION_PETALBURG_CITY/SOUTH_POND",
+      "REGION_PETALBURG_CITY/NORTH_POND",
+      "REGION_ROUTE102/MAIN",
+      "REGION_ROUTE104/SOUTH"
+    ],
+    "warps": [
+      "MAP_PETALBURG_CITY:0/MAP_PETALBURG_CITY_HOUSE1:0",
+      "MAP_PETALBURG_CITY:1/MAP_PETALBURG_CITY_WALLYS_HOUSE:0",
+      "MAP_PETALBURG_CITY:2/MAP_PETALBURG_CITY_GYM:0",
+      "MAP_PETALBURG_CITY:3/MAP_PETALBURG_CITY_POKEMON_CENTER_1F:0",
+      "MAP_PETALBURG_CITY:4/MAP_PETALBURG_CITY_HOUSE2:0",
+      "MAP_PETALBURG_CITY:5/MAP_PETALBURG_CITY_MART:0"
+    ]
+  },
+  "REGION_PETALBURG_CITY/NORTH_POND": {
+    "parent_map": "MAP_PETALBURG_CITY",
+    "locations": [
+      "ITEM_PETALBURG_CITY_MAX_REVIVE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_PETALBURG_CITY/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_PETALBURG_CITY/SOUTH_POND": {
+    "parent_map": "MAP_PETALBURG_CITY",
+    "locations": [
+      "ITEM_PETALBURG_CITY_ETHER",
+      "HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_PETALBURG_CITY/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_PETALBURG_CITY_HOUSE1/MAIN": {
+    "parent_map": "MAP_PETALBURG_CITY_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_HOUSE1:0,1/MAP_PETALBURG_CITY:0"
+    ]
+  },
+  "REGION_PETALBURG_CITY_HOUSE2/MAIN": {
+    "parent_map": "MAP_PETALBURG_CITY_HOUSE2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_HOUSE2:0,1/MAP_PETALBURG_CITY:4"
+    ]
+  },
+  "REGION_PETALBURG_CITY_WALLYS_HOUSE/MAIN": {
+    "parent_map": "MAP_PETALBURG_CITY_WALLYS_HOUSE",
+    "locations": [
+      "NPC_GIFT_RECEIVED_HM03"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_WALLYS_HOUSE:0,1/MAP_PETALBURG_CITY:1"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_1": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:0,1/MAP_PETALBURG_CITY:2",
+      "MAP_PETALBURG_CITY_GYM:2/MAP_PETALBURG_CITY_GYM:3",
+      "MAP_PETALBURG_CITY_GYM:5/MAP_PETALBURG_CITY_GYM:6"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_2": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:6,7/MAP_PETALBURG_CITY_GYM:5",
+      "MAP_PETALBURG_CITY_GYM:14/MAP_PETALBURG_CITY_GYM:16",
+      "MAP_PETALBURG_CITY_GYM:15/MAP_PETALBURG_CITY_GYM:18"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_3": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:3,4/MAP_PETALBURG_CITY_GYM:2",
+      "MAP_PETALBURG_CITY_GYM:8/MAP_PETALBURG_CITY_GYM:10",
+      "MAP_PETALBURG_CITY_GYM:9/MAP_PETALBURG_CITY_GYM:12"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_4": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:18,19/MAP_PETALBURG_CITY_GYM:15",
+      "MAP_PETALBURG_CITY_GYM:23/MAP_PETALBURG_CITY_GYM:30"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_5": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:12,13/MAP_PETALBURG_CITY_GYM:9",
+      "MAP_PETALBURG_CITY_GYM:16,17/MAP_PETALBURG_CITY_GYM:14",
+      "MAP_PETALBURG_CITY_GYM:21/MAP_PETALBURG_CITY_GYM:26",
+      "MAP_PETALBURG_CITY_GYM:22/MAP_PETALBURG_CITY_GYM:28"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_6": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:10,11/MAP_PETALBURG_CITY_GYM:8",
+      "MAP_PETALBURG_CITY_GYM:20/MAP_PETALBURG_CITY_GYM:24"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_7": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:28,29/MAP_PETALBURG_CITY_GYM:22",
+      "MAP_PETALBURG_CITY_GYM:30,31/MAP_PETALBURG_CITY_GYM:23",
+      "MAP_PETALBURG_CITY_GYM:33/MAP_PETALBURG_CITY_GYM:36"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_8": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:24,25/MAP_PETALBURG_CITY_GYM:20",
+      "MAP_PETALBURG_CITY_GYM:26,27/MAP_PETALBURG_CITY_GYM:21",
+      "MAP_PETALBURG_CITY_GYM:32/MAP_PETALBURG_CITY_GYM:34"
+    ]
+  },
+  "REGION_PETALBURG_CITY_GYM/ROOM_9": {
+    "parent_map": "MAP_PETALBURG_CITY_GYM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM42",
+      "BADGE_5"
+    ],
+    "events": [
+      "EVENT_DEFEAT_NORMAN"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_GYM:34,35/MAP_PETALBURG_CITY_GYM:32",
+      "MAP_PETALBURG_CITY_GYM:36,37/MAP_PETALBURG_CITY_GYM:33"
+    ]
+  },
+  "REGION_PETALBURG_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_POKEMON_CENTER_1F:0,1/MAP_PETALBURG_CITY:3",
+      "MAP_PETALBURG_CITY_POKEMON_CENTER_1F:2/MAP_PETALBURG_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_PETALBURG_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_POKEMON_CENTER_2F:0/MAP_PETALBURG_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_PETALBURG_CITY_MART/MAIN": {
+    "parent_map": "MAP_PETALBURG_CITY_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PETALBURG_CITY_MART:0,1/MAP_PETALBURG_CITY:5"
+    ]
+  },
+
+  "REGION_RUSTBORO_CITY/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY",
+    "locations": [
+      "ITEM_RUSTBORO_CITY_X_DEFEND",
+      "NPC_GIFT_RECEIVED_GREAT_BALL_RUSTBORO_CITY"
+    ],
+    "events": [
+      "EVENT_RETURN_DEVON_GOODS",
+      "EVENT_VISITED_RUSTBORO_CITY"
+    ],
+    "exits": [
+      "REGION_ROUTE104/NORTH",
+      "REGION_ROUTE115/SOUTH_BELOW_LEDGE",
+      "REGION_ROUTE116/WEST"
+    ],
+    "warps": [
+      "MAP_RUSTBORO_CITY:0/MAP_RUSTBORO_CITY_GYM:0",
+      "MAP_RUSTBORO_CITY:1/MAP_RUSTBORO_CITY_FLAT1_1F:0",
+      "MAP_RUSTBORO_CITY:2/MAP_RUSTBORO_CITY_MART:0",
+      "MAP_RUSTBORO_CITY:3/MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:0",
+      "MAP_RUSTBORO_CITY:4/MAP_RUSTBORO_CITY_POKEMON_SCHOOL:0",
+      "MAP_RUSTBORO_CITY:5,6/MAP_RUSTBORO_CITY_DEVON_CORP_1F:0,1",
+      "MAP_RUSTBORO_CITY:7/MAP_RUSTBORO_CITY_HOUSE1:0",
+      "MAP_RUSTBORO_CITY:8/MAP_RUSTBORO_CITY_CUTTERS_HOUSE:0",
+      "MAP_RUSTBORO_CITY:9/MAP_RUSTBORO_CITY_HOUSE2:0",
+      "MAP_RUSTBORO_CITY:10/MAP_RUSTBORO_CITY_FLAT2_1F:0",
+      "MAP_RUSTBORO_CITY:11/MAP_RUSTBORO_CITY_HOUSE3:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_GYM/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_GYM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM39",
+      "BADGE_1"
+    ],
+    "events": [
+      "EVENT_DEFEAT_ROXANNE"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_GYM:0,1/MAP_RUSTBORO_CITY:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_MART/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_MART:0,1/MAP_RUSTBORO_CITY:2"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:0,1/MAP_RUSTBORO_CITY:3",
+      "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:2/MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:0/MAP_RUSTBORO_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_POKEMON_SCHOOL/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL",
+    "locations": [
+      "NPC_GIFT_RECEIVED_QUICK_CLAW"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_POKEMON_SCHOOL:0,1/MAP_RUSTBORO_CITY:4"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_DEVON_CORP_1F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_DEVON_CORP_1F:0,1/MAP_RUSTBORO_CITY:5,6",
+      "MAP_RUSTBORO_CITY_DEVON_CORP_1F:2/MAP_RUSTBORO_CITY_DEVON_CORP_2F:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_DEVON_CORP_2F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_DEVON_CORP_2F:0/MAP_RUSTBORO_CITY_DEVON_CORP_1F:2",
+      "MAP_RUSTBORO_CITY_DEVON_CORP_2F:1/MAP_RUSTBORO_CITY_DEVON_CORP_3F:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_DEVON_CORP_3F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_DEVON_CORP_3F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_LETTER",
+      "NPC_GIFT_RECEIVED_EXP_SHARE"
+    ],
+    "events": [
+      "EVENT_TALK_TO_MR_STONE"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_DEVON_CORP_3F:0/MAP_RUSTBORO_CITY_DEVON_CORP_2F:1"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_FLAT1_1F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_FLAT1_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_FLAT1_1F:0,1/MAP_RUSTBORO_CITY:1",
+      "MAP_RUSTBORO_CITY_FLAT1_1F:2/MAP_RUSTBORO_CITY_FLAT1_2F:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_FLAT1_2F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_FLAT1_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_FLAT1_2F:0/MAP_RUSTBORO_CITY_FLAT1_1F:2"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_FLAT2_1F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_FLAT2_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_FLAT2_1F:0,1/MAP_RUSTBORO_CITY:10",
+      "MAP_RUSTBORO_CITY_FLAT2_1F:2/MAP_RUSTBORO_CITY_FLAT2_2F:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_FLAT2_2F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_FLAT2_2F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_PREMIER_BALL_RUSTBORO"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_FLAT2_2F:0/MAP_RUSTBORO_CITY_FLAT2_1F:2",
+      "MAP_RUSTBORO_CITY_FLAT2_2F:1/MAP_RUSTBORO_CITY_FLAT2_3F:0"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_FLAT2_3F/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_FLAT2_3F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_FLAT2_3F:0/MAP_RUSTBORO_CITY_FLAT2_2F:1"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_HOUSE1/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_HOUSE1:0,1/MAP_RUSTBORO_CITY:7"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_HOUSE2/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_HOUSE2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_HOUSE2:0,1/MAP_RUSTBORO_CITY:9"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_HOUSE3/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_HOUSE3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_HOUSE3:0,1/MAP_RUSTBORO_CITY:11"
+    ]
+  },
+  "REGION_RUSTBORO_CITY_CUTTERS_HOUSE/MAIN": {
+    "parent_map": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE",
+    "locations": [
+      "NPC_GIFT_RECEIVED_HM01"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_RUSTBORO_CITY_CUTTERS_HOUSE:0,1/MAP_RUSTBORO_CITY:8"
+    ]
+  },
+
+  "REGION_DEWFORD_TOWN/MAIN": {
+    "parent_map": "MAP_DEWFORD_TOWN",
+    "locations": [
+      "NPC_GIFT_RECEIVED_OLD_ROD"
+    ],
+    "events": [
+      "EVENT_VISITED_DEWFORD_TOWN"
+    ],
+    "exits": [
+      "REGION_ROUTE106/EAST",
+      "REGION_ROUTE107/MAIN",
+      "REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN",
+      "REGION_ROUTE109/BEACH"
+    ],
+    "warps": [
+      "MAP_DEWFORD_TOWN:0/MAP_DEWFORD_TOWN_HALL:0",
+      "MAP_DEWFORD_TOWN:1/MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:0",
+      "MAP_DEWFORD_TOWN:2/MAP_DEWFORD_TOWN_GYM:0",
+      "MAP_DEWFORD_TOWN:3/MAP_DEWFORD_TOWN_HOUSE1:0",
+      "MAP_DEWFORD_TOWN:4/MAP_DEWFORD_TOWN_HOUSE2:0"
+    ]
+  },
+  "REGION_DEWFORD_TOWN_HALL/MAIN": {
+    "parent_map": "MAP_DEWFORD_TOWN_HALL",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM36"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_DEWFORD_TOWN_HALL:0,1/MAP_DEWFORD_TOWN:0"
+    ]
+  },
+  "REGION_DEWFORD_TOWN_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:0,1/MAP_DEWFORD_TOWN:1",
+      "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:2/MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_DEWFORD_TOWN_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:0/MAP_DEWFORD_TOWN_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_DEWFORD_TOWN_GYM/MAIN": {
+    "parent_map": "MAP_DEWFORD_TOWN_GYM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM08",
+      "BADGE_2"
+    ],
+    "events": [
+      "EVENT_DEFEAT_BRAWLY"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_DEWFORD_TOWN_GYM:0,1/MAP_DEWFORD_TOWN:2"
+    ]
+  },
+  "REGION_DEWFORD_TOWN_HOUSE1/MAIN": {
+    "parent_map": "MAP_DEWFORD_TOWN_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_DEWFORD_TOWN_HOUSE1:0,1/MAP_DEWFORD_TOWN:3"
+    ]
+  },
+  "REGION_DEWFORD_TOWN_HOUSE2/MAIN": {
+    "parent_map": "MAP_DEWFORD_TOWN_HOUSE2",
+    "locations": [
+      "NPC_GIFT_RECEIVED_SILK_SCARF"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_DEWFORD_TOWN_HOUSE2:0,1/MAP_DEWFORD_TOWN:4"
+    ]
+  },
+
+  "REGION_SLATEPORT_CITY/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY",
+    "locations": [
+      "NPC_GIFT_RECEIVED_POWDER_JAR"
+    ],
+    "events": [
+      "EVENT_AQUA_STEALS_SUBMARINE",
+      "EVENT_VISITED_SLATEPORT_CITY"
+    ],
+    "exits": [
+      "REGION_ROUTE109/BEACH",
+      "REGION_ROUTE110/SOUTH",
+      "REGION_ROUTE134/WEST"
+    ],
+    "warps": [
+      "MAP_SLATEPORT_CITY:0/MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:0",
+      "MAP_SLATEPORT_CITY:1/MAP_SLATEPORT_CITY_MART:0",
+      "MAP_SLATEPORT_CITY:2/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:0",
+      "MAP_SLATEPORT_CITY:3/MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY:0",
+      "MAP_SLATEPORT_CITY:4/MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB:0",
+      "MAP_SLATEPORT_CITY:5,7/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:0,1",
+      "MAP_SLATEPORT_CITY:6/MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE:0",
+      "MAP_SLATEPORT_CITY:8/MAP_SLATEPORT_CITY_HARBOR:0",
+      "MAP_SLATEPORT_CITY:9/MAP_SLATEPORT_CITY_HARBOR:2",
+      "MAP_SLATEPORT_CITY:10/MAP_SLATEPORT_CITY_HOUSE:0"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:0/MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:0,1/MAP_SLATEPORT_CITY:0",
+      "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F:2/MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_MART/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_MART",
+    "locations": [],
+    "events": [
+      "EVENT_BUY_HARBOR_MAIL"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_MART:0,1/MAP_SLATEPORT_CITY:1"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_STERNS_SHIPYARD_1F/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
+    "locations": [],
+    "events": [
+      "EVENT_TALK_TO_DOCK"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:0,1/MAP_SLATEPORT_CITY:2",
+      "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:2/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F:0"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_STERNS_SHIPYARD_2F/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F:0/MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F:2"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_BATTLE_TENT_LOBBY/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM41"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY:0,1/MAP_SLATEPORT_CITY:3"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_POKEMON_FAN_CLUB/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB",
+    "locations": [
+      "NPC_GIFT_RECEIVED_SOOTHE_BELL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB:0,1/MAP_SLATEPORT_CITY:4"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_OCEANIC_MUSEUM_1F/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM46"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:0,1/MAP_SLATEPORT_CITY:5,7",
+      "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:2/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F:0"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_OCEANIC_MUSEUM_2F/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
+    "locations": [],
+    "events": [
+      "EVENT_RESCUE_CAPT_STERN"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F:0/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:2"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_NAME_RATERS_HOUSE/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE:0,1/MAP_SLATEPORT_CITY:6"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_HARBOR/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_HARBOR",
+    "locations": [
+      "NPC_GIFT_RECEIVED_DEEP_SEA_TOOTH",
+      "NPC_GIFT_RECEIVED_DEEP_SEA_SCALE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SS_TIDAL_CORRIDOR/MAIN"
+    ],
+    "warps": [
+      "MAP_SLATEPORT_CITY_HARBOR:0,1/MAP_SLATEPORT_CITY:8",
+      "MAP_SLATEPORT_CITY_HARBOR:2,3/MAP_SLATEPORT_CITY:9"
+    ]
+  },
+  "REGION_SLATEPORT_CITY_HOUSE/MAIN": {
+    "parent_map": "MAP_SLATEPORT_CITY_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SLATEPORT_CITY_HOUSE:0,1/MAP_SLATEPORT_CITY:10"
+    ]
+  },
+
+  "REGION_MAUVILLE_CITY/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY",
+    "locations": [
+      "ITEM_MAUVILLE_CITY_X_SPEED",
+      "NPC_GIFT_GOT_BASEMENT_KEY_FROM_WATTSON",
+      "NPC_GIFT_GOT_TM24_FROM_WATTSON"
+    ],
+    "events": [
+      "EVENT_VISITED_MAUVILLE_CITY"
+    ],
+    "exits": [
+      "REGION_ROUTE111/SOUTH",
+      "REGION_ROUTE117/MAIN",
+      "REGION_ROUTE110/MAIN",
+      "REGION_ROUTE118/WEST"
+    ],
+    "warps": [
+      "MAP_MAUVILLE_CITY:0/MAP_MAUVILLE_CITY_GYM:0",
+      "MAP_MAUVILLE_CITY:1/MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:0",
+      "MAP_MAUVILLE_CITY:2/MAP_MAUVILLE_CITY_BIKE_SHOP:0",
+      "MAP_MAUVILLE_CITY:3/MAP_MAUVILLE_CITY_MART:0",
+      "MAP_MAUVILLE_CITY:4/MAP_MAUVILLE_CITY_HOUSE1:0",
+      "MAP_MAUVILLE_CITY:5/MAP_MAUVILLE_CITY_GAME_CORNER:0",
+      "MAP_MAUVILLE_CITY:6/MAP_MAUVILLE_CITY_HOUSE2:0"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_GYM/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_GYM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM34",
+      "BADGE_3"
+    ],
+    "events": [
+      "EVENT_DEFEAT_WATTSON"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_GYM:0,1/MAP_MAUVILLE_CITY:0"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:0,1/MAP_MAUVILLE_CITY:1",
+      "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:2/MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:0/MAP_MAUVILLE_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_BIKE_SHOP/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_BIKE_SHOP",
+    "locations": [
+      "NPC_GIFT_RECEIVED_ACRO_BIKE",
+      "NPC_GIFT_RECEIVED_MACH_BIKE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_BIKE_SHOP:0,1/MAP_MAUVILLE_CITY:2"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_MART/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_MART:0,1/MAP_MAUVILLE_CITY:3"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_HOUSE1/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_HOUSE1",
+    "locations": [
+      "NPC_GIFT_RECEIVED_HM06"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_HOUSE1:0,1/MAP_MAUVILLE_CITY:4"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_HOUSE2/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_HOUSE2",
+    "locations": [
+      "NPC_GIFT_RECEIVED_COIN_CASE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_HOUSE2:0,1/MAP_MAUVILLE_CITY:6"
+    ]
+  },
+  "REGION_MAUVILLE_CITY_GAME_CORNER/MAIN": {
+    "parent_map": "MAP_MAUVILLE_CITY_GAME_CORNER",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAUVILLE_CITY_GAME_CORNER:0,1/MAP_MAUVILLE_CITY:5"
+    ]
+  },
+
+  "REGION_VERDANTURF_TOWN/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN",
+    "locations": [],
+    "events": [
+      "EVENT_VISITED_VERDANTURF_TOWN"
+    ],
+    "exits": [
+      "REGION_ROUTE117/MAIN"
+    ],
+    "warps": [
+      "MAP_VERDANTURF_TOWN:0/MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY:0",
+      "MAP_VERDANTURF_TOWN:1/MAP_VERDANTURF_TOWN_MART:0",
+      "MAP_VERDANTURF_TOWN:2/MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:0",
+      "MAP_VERDANTURF_TOWN:3/MAP_VERDANTURF_TOWN_WANDAS_HOUSE:0",
+      "MAP_VERDANTURF_TOWN:4/MAP_RUSTURF_TUNNEL:1",
+      "MAP_VERDANTURF_TOWN:5/MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE:0",
+      "MAP_VERDANTURF_TOWN:6/MAP_VERDANTURF_TOWN_HOUSE:0"
+    ]
+  },
+  "REGION_VERDANTURF_TOWN_BATTLE_TENT_LOBBY/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM45"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY:0,1/MAP_VERDANTURF_TOWN:0"
+    ]
+  },
+  "REGION_VERDANTURF_TOWN_MART/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VERDANTURF_TOWN_MART:0,1/MAP_VERDANTURF_TOWN:1"
+    ]
+  },
+  "REGION_VERDANTURF_TOWN_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:0,1/MAP_VERDANTURF_TOWN:2",
+      "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:2/MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_VERDANTURF_TOWN_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:0/MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_VERDANTURF_TOWN_WANDAS_HOUSE/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VERDANTURF_TOWN_WANDAS_HOUSE:0,1/MAP_VERDANTURF_TOWN:3"
+    ]
+  },
+  "REGION_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE:0,1/MAP_VERDANTURF_TOWN:5"
+    ]
+  },
+  "REGION_VERDANTURF_TOWN_HOUSE/MAIN": {
+    "parent_map": "MAP_VERDANTURF_TOWN_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VERDANTURF_TOWN_HOUSE:0,1/MAP_VERDANTURF_TOWN:6"
+    ]
+  },
+
+  "REGION_FALLARBOR_TOWN/MAIN": {
+    "parent_map": "MAP_FALLARBOR_TOWN",
+    "locations": [
+      "HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET"
+    ],
+    "events": [
+      "EVENT_VISITED_FALLARBOR_TOWN"
+    ],
+    "exits": [
+      "REGION_ROUTE114/MAIN",
+      "REGION_ROUTE113/MAIN"
+    ],
+    "warps": [
+      "MAP_FALLARBOR_TOWN:0/MAP_FALLARBOR_TOWN_MART:0",
+      "MAP_FALLARBOR_TOWN:1/MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY:0",
+      "MAP_FALLARBOR_TOWN:2/MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:0",
+      "MAP_FALLARBOR_TOWN:3/MAP_FALLARBOR_TOWN_COZMOS_HOUSE:0",
+      "MAP_FALLARBOR_TOWN:4/MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE:0"
+    ]
+  },
+  "REGION_FALLARBOR_TOWN_MART/MAIN": {
+    "parent_map": "MAP_FALLARBOR_TOWN_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FALLARBOR_TOWN_MART:0,1/MAP_FALLARBOR_TOWN:0"
+    ]
+  },
+  "REGION_FALLARBOR_TOWN_BATTLE_TENT_LOBBY/MAIN": {
+    "parent_map": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY:0,1/MAP_FALLARBOR_TOWN:1"
+    ]
+  },
+  "REGION_FALLARBOR_TOWN_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:0,1/MAP_FALLARBOR_TOWN:2",
+      "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:2/MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_FALLARBOR_TOWN_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:0/MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_FALLARBOR_TOWN_COZMOS_HOUSE/MAIN": {
+    "parent_map": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM27"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FALLARBOR_TOWN_COZMOS_HOUSE:0,1/MAP_FALLARBOR_TOWN:3"
+    ]
+  },
+  "REGION_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE/MAIN": {
+    "parent_map": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE:0,1/MAP_FALLARBOR_TOWN:4"
+    ]
+  },
+
+  "REGION_LAVARIDGE_TOWN/MAIN": {
+    "parent_map": "MAP_LAVARIDGE_TOWN",
+    "locations": [
+      "NPC_GIFT_RECEIVED_GO_GOGGLES"
+    ],
+    "events": [
+      "EVENT_VISITED_LAVARIDGE_TOWN"
+    ],
+    "exits": [
+      "REGION_ROUTE112/SOUTH_WEST"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN:0/MAP_LAVARIDGE_TOWN_HERB_SHOP:0",
+      "MAP_LAVARIDGE_TOWN:1/MAP_LAVARIDGE_TOWN_GYM_1F:0",
+      "MAP_LAVARIDGE_TOWN:2/MAP_LAVARIDGE_TOWN_MART:0",
+      "MAP_LAVARIDGE_TOWN:3/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:0",
+      "MAP_LAVARIDGE_TOWN:4/MAP_LAVARIDGE_TOWN_HOUSE:0"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN/SPRINGS": {
+    "parent_map": "MAP_LAVARIDGE_TOWN",
+    "locations": [
+      "HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN:5/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:3"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_HERB_SHOP/MAIN": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_HERB_SHOP",
+    "locations": [
+      "NPC_GIFT_RECEIVED_CHARCOAL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_HERB_SHOP:0,1/MAP_LAVARIDGE_TOWN:0"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_1F/ENTRANCE": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_1F:0,1/MAP_LAVARIDGE_TOWN:1",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:2/MAP_LAVARIDGE_TOWN_GYM_B1F:0",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:3/MAP_LAVARIDGE_TOWN_GYM_B1F:2",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:24/MAP_LAVARIDGE_TOWN_GYM_B1F:22"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_1F/BOTTOM_LEFT_LOWER": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_1F:4/MAP_LAVARIDGE_TOWN_GYM_B1F:4",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:6/MAP_LAVARIDGE_TOWN_GYM_B1F:1",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:8/MAP_LAVARIDGE_TOWN_GYM_B1F:6",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:9/MAP_LAVARIDGE_TOWN_GYM_B1F:7",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:10/MAP_LAVARIDGE_TOWN_GYM_B1F:8",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:11/MAP_LAVARIDGE_TOWN_GYM_B1F:9",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:12/MAP_LAVARIDGE_TOWN_GYM_B1F:10",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:21/MAP_LAVARIDGE_TOWN_GYM_B1F:20"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_1F/BOTTOM_LEFT_UPPER": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LAVARIDGE_TOWN_GYM_1F/BOTTOM_LEFT_LOWER"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_1F:5/MAP_LAVARIDGE_TOWN_GYM_B1F:3",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:7/MAP_LAVARIDGE_TOWN_GYM_B1F:5"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_1F/TOP_LEFT": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_1F:13/MAP_LAVARIDGE_TOWN_GYM_B1F:11",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:14/MAP_LAVARIDGE_TOWN_GYM_B1F:12",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:15/MAP_LAVARIDGE_TOWN_GYM_B1F:13",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:16/MAP_LAVARIDGE_TOWN_GYM_B1F:14",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:17/MAP_LAVARIDGE_TOWN_GYM_B1F:15"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_1F/TOP_CENTER": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_1F:18/MAP_LAVARIDGE_TOWN_GYM_B1F:16",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:19/MAP_LAVARIDGE_TOWN_GYM_B1F:17",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:20/MAP_LAVARIDGE_TOWN_GYM_B1F:18"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_1F/TOP_RIGHT": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_1F:22/MAP_LAVARIDGE_TOWN_GYM_B1F:19",
+      "MAP_LAVARIDGE_TOWN_GYM_1F:23/MAP_LAVARIDGE_TOWN_GYM_B1F:21"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_1F/FLANNERY": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_1F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM50",
+      "BADGE_4"
+    ],
+    "events": [
+      "EVENT_DEFEAT_FLANNERY"
+    ],
+    "exits": [
+      "REGION_LAVARIDGE_TOWN_GYM_1F/ENTRANCE"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_1F:25/MAP_LAVARIDGE_TOWN_GYM_B1F:23"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/TOP": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:14/MAP_LAVARIDGE_TOWN_GYM_1F:16",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:15/MAP_LAVARIDGE_TOWN_GYM_1F:17",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:16/MAP_LAVARIDGE_TOWN_GYM_1F:18",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:19/MAP_LAVARIDGE_TOWN_GYM_1F:22"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_LEFT_LOWER": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:1/MAP_LAVARIDGE_TOWN_GYM_1F:6",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:2/MAP_LAVARIDGE_TOWN_GYM_1F:3",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:3/MAP_LAVARIDGE_TOWN_GYM_1F:5",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:4/MAP_LAVARIDGE_TOWN_GYM_1F:4",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:6/MAP_LAVARIDGE_TOWN_GYM_1F:8",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:7/MAP_LAVARIDGE_TOWN_GYM_1F:9",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:8/MAP_LAVARIDGE_TOWN_GYM_1F:10",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:17/MAP_LAVARIDGE_TOWN_GYM_1F:19",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:20/MAP_LAVARIDGE_TOWN_GYM_1F:21"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_LEFT_UPPER_1": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_LEFT_LOWER"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:9/MAP_LAVARIDGE_TOWN_GYM_1F:11",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:10/MAP_LAVARIDGE_TOWN_GYM_1F:12",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:11/MAP_LAVARIDGE_TOWN_GYM_1F:13",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:12/MAP_LAVARIDGE_TOWN_GYM_1F:14"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_LEFT_UPPER_2": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_LEFT_LOWER"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:5/MAP_LAVARIDGE_TOWN_GYM_1F:7",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:13/MAP_LAVARIDGE_TOWN_GYM_1F:15"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_RIGHT_LOWER": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:0/MAP_LAVARIDGE_TOWN_GYM_1F:2",
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:22/MAP_LAVARIDGE_TOWN_GYM_1F:24"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_RIGHT_MIDDLE": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_RIGHT_LOWER"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:23/MAP_LAVARIDGE_TOWN_GYM_1F:25"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_RIGHT_UPPER_1": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_RIGHT_MIDDLE"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:18/MAP_LAVARIDGE_TOWN_GYM_1F:20"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_RIGHT_UPPER_2": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LAVARIDGE_TOWN_GYM_B1F/BOTTOM_RIGHT_LOWER"
+    ],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_GYM_B1F:21/MAP_LAVARIDGE_TOWN_GYM_1F:23"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_MART/MAIN": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_MART:0,1/MAP_LAVARIDGE_TOWN:2"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:0,1/MAP_LAVARIDGE_TOWN:3",
+      "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:2/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:0",
+      "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:3/MAP_LAVARIDGE_TOWN:5"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:0/MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_LAVARIDGE_TOWN_HOUSE/MAIN": {
+    "parent_map": "MAP_LAVARIDGE_TOWN_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LAVARIDGE_TOWN_HOUSE:0,1/MAP_LAVARIDGE_TOWN:4"
+    ]
+  },
+
+  "REGION_FORTREE_CITY/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY",
+    "locations": [],
+    "events": [
+      "EVENT_VISITED_FORTREE_CITY"
+    ],
+    "exits": [
+      "REGION_FORTREE_CITY/BEFORE_GYM",
+      "REGION_ROUTE119/UPPER",
+      "REGION_ROUTE120/NORTH"
+    ],
+    "warps": [
+      "MAP_FORTREE_CITY:0/MAP_FORTREE_CITY_POKEMON_CENTER_1F:0",
+      "MAP_FORTREE_CITY:1/MAP_FORTREE_CITY_HOUSE1:0",
+      "MAP_FORTREE_CITY:3/MAP_FORTREE_CITY_MART:0",
+      "MAP_FORTREE_CITY:4/MAP_FORTREE_CITY_HOUSE2:0",
+      "MAP_FORTREE_CITY:5/MAP_FORTREE_CITY_HOUSE3:0",
+      "MAP_FORTREE_CITY:6/MAP_FORTREE_CITY_HOUSE4:0",
+      "MAP_FORTREE_CITY:7/MAP_FORTREE_CITY_HOUSE5:0",
+      "MAP_FORTREE_CITY:8/MAP_FORTREE_CITY_DECORATION_SHOP:0"
+    ]
+  },
+  "REGION_FORTREE_CITY/BEFORE_GYM": {
+    "parent_map": "MAP_FORTREE_CITY",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_FORTREE_CITY/MAIN"
+    ],
+    "warps": [
+      "MAP_FORTREE_CITY:2/MAP_FORTREE_CITY_GYM:0"
+    ]
+  },
+  "REGION_FORTREE_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_POKEMON_CENTER_1F:0,1/MAP_FORTREE_CITY:0",
+      "MAP_FORTREE_CITY_POKEMON_CENTER_1F:2/MAP_FORTREE_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_FORTREE_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_POKEMON_CENTER_2F:0/MAP_FORTREE_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_FORTREE_CITY_HOUSE1/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_HOUSE1:0,1/MAP_FORTREE_CITY:1"
+    ]
+  },
+  "REGION_FORTREE_CITY_HOUSE2/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_HOUSE2",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM10"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_HOUSE2:0,1/MAP_FORTREE_CITY:4"
+    ]
+  },
+  "REGION_FORTREE_CITY_HOUSE3/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_HOUSE3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_HOUSE3:0,1/MAP_FORTREE_CITY:5"
+    ]
+  },
+  "REGION_FORTREE_CITY_HOUSE4/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_HOUSE4",
+    "locations": [
+      "NPC_GIFT_RECEIVED_MENTAL_HERB"
+    ],
+    "events": [
+      "EVENT_WINGULL_QUEST_1"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_HOUSE4:0,1/MAP_FORTREE_CITY:6"
+    ]
+  },
+  "REGION_FORTREE_CITY_HOUSE5/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_HOUSE5",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_HOUSE5:0,1/MAP_FORTREE_CITY:7"
+    ]
+  },
+  "REGION_FORTREE_CITY_GYM/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_GYM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM40",
+      "BADGE_6"
+    ],
+    "events": [
+      "EVENT_DEFEAT_WINONA"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_GYM:0,1/MAP_FORTREE_CITY:2"
+    ]
+  },
+  "REGION_FORTREE_CITY_MART/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_MART:0,1/MAP_FORTREE_CITY:3"
+    ]
+  },
+  "REGION_FORTREE_CITY_DECORATION_SHOP/MAIN": {
+    "parent_map": "MAP_FORTREE_CITY_DECORATION_SHOP",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FORTREE_CITY_DECORATION_SHOP:0,1/MAP_FORTREE_CITY:8"
+    ]
+  },
+
+  "REGION_LILYCOVE_CITY/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY",
+    "locations": [
+      "ITEM_LILYCOVE_CITY_MAX_REPEL",
+      "HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE",
+      "HIDDEN_ITEM_LILYCOVE_CITY_PP_UP",
+      "HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL"
+    ],
+    "events": [
+      "EVENT_VISITED_LILYCOVE_CITY"
+    ],
+    "exits": [
+      "REGION_ROUTE121/EAST",
+      "REGION_LILYCOVE_CITY/SEA"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:0",
+      "MAP_LILYCOVE_CITY:1/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:0",
+      "MAP_LILYCOVE_CITY:2/MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:0",
+      "MAP_LILYCOVE_CITY:3,13/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:0,1",
+      "MAP_LILYCOVE_CITY:4/MAP_LILYCOVE_CITY_CONTEST_LOBBY:0",
+      "MAP_LILYCOVE_CITY:5/MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB:1",
+      "MAP_LILYCOVE_CITY:7/MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE:0",
+      "MAP_LILYCOVE_CITY:8/MAP_LILYCOVE_CITY_HOUSE1:0",
+      "MAP_LILYCOVE_CITY:9/MAP_LILYCOVE_CITY_HOUSE2:0",
+      "MAP_LILYCOVE_CITY:10/MAP_LILYCOVE_CITY_HOUSE3:0",
+      "MAP_LILYCOVE_CITY:11/MAP_LILYCOVE_CITY_HOUSE4:0",
+      "MAP_LILYCOVE_CITY:12/MAP_LILYCOVE_CITY_HARBOR:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY/SEA": {
+    "parent_map": "MAP_LILYCOVE_CITY",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY/MAIN",
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY:6/MAP_AQUA_HIDEOUT_1F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_1F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR/MAIN"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:0,1/MAP_LILYCOVE_CITY:0",
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_2F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR/MAIN"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:2",
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_3F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR/MAIN"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:1",
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_4F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR/MAIN"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:1",
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_5F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR/MAIN"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:1",
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP:0/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:2"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_1F/MAIN",
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_2F/MAIN",
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_3F/MAIN",
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_4F/MAIN",
+      "REGION_LILYCOVE_CITY_DEPARTMENT_STORE_5F/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_LILYCOVE_CITY_COVE_LILY_MOTEL_1F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:0,1/MAP_LILYCOVE_CITY:1",
+      "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:2/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_COVE_LILY_MOTEL_2F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F:0/MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F:2"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:0,1/MAP_LILYCOVE_CITY:2",
+      "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:2/MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:0/MAP_LILYCOVE_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:0,1/MAP_LILYCOVE_CITY:3,13",
+      "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:2/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F:0"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F:0/MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F:2"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_CONTEST_LOBBY/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
+    "locations": [
+      "NPC_GIFT_RECEIVED_POKEBLOCK_CASE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_CONTEST_LOBBY:0,1/MAP_LILYCOVE_CITY:4",
+      "MAP_LILYCOVE_CITY_CONTEST_LOBBY:2/MAP_LILYCOVE_CITY_CONTEST_HALL:0",
+      "MAP_LILYCOVE_CITY_CONTEST_LOBBY:3/MAP_LILYCOVE_CITY_CONTEST_HALL:1"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_CONTEST_HALL/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_CONTEST_HALL",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_CONTEST_HALL:0,2/MAP_LILYCOVE_CITY_CONTEST_LOBBY:2",
+      "MAP_LILYCOVE_CITY_CONTEST_HALL:1,3/MAP_LILYCOVE_CITY_CONTEST_LOBBY:3"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB:0,1/MAP_LILYCOVE_CITY:5"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_MOVE_DELETERS_HOUSE/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE:0,1/MAP_LILYCOVE_CITY:7"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_HOUSE1/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_HOUSE1:0,1/MAP_LILYCOVE_CITY:8"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_HOUSE2/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_HOUSE2",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM44"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_HOUSE2:0,1/MAP_LILYCOVE_CITY:9"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_HOUSE3/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_HOUSE3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_HOUSE3:0,1/MAP_LILYCOVE_CITY:10"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_HOUSE4/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_HOUSE4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_LILYCOVE_CITY_HOUSE4:0,1/MAP_LILYCOVE_CITY:11"
+    ]
+  },
+  "REGION_LILYCOVE_CITY_HARBOR/MAIN": {
+    "parent_map": "MAP_LILYCOVE_CITY_HARBOR",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SS_TIDAL_CORRIDOR/MAIN"
+    ],
+    "warps": [
+      "MAP_LILYCOVE_CITY_HARBOR:0,1/MAP_LILYCOVE_CITY:12"
+    ]
+  },
+  "REGION_SS_TIDAL_CORRIDOR/MAIN": {
+    "parent_map": "MAP_SS_TIDAL_CORRIDOR",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SLATEPORT_CITY_HARBOR/MAIN",
+      "REGION_LILYCOVE_CITY_HARBOR/MAIN"
+    ],
+    "warps": [
+      "MAP_SS_TIDAL_CORRIDOR:0/MAP_SS_TIDAL_ROOMS:0",
+      "MAP_SS_TIDAL_CORRIDOR:4/MAP_SS_TIDAL_ROOMS:8",
+      "MAP_SS_TIDAL_CORRIDOR:1/MAP_SS_TIDAL_ROOMS:2",
+      "MAP_SS_TIDAL_CORRIDOR:5/MAP_SS_TIDAL_ROOMS:9",
+      "MAP_SS_TIDAL_CORRIDOR:2/MAP_SS_TIDAL_ROOMS:4",
+      "MAP_SS_TIDAL_CORRIDOR:6/MAP_SS_TIDAL_ROOMS:10",
+      "MAP_SS_TIDAL_CORRIDOR:3/MAP_SS_TIDAL_ROOMS:6",
+      "MAP_SS_TIDAL_CORRIDOR:7/MAP_SS_TIDAL_ROOMS:11",
+      "MAP_SS_TIDAL_CORRIDOR:8/MAP_SS_TIDAL_LOWER_DECK:0"
+    ]
+  },
+  "REGION_SS_TIDAL_ROOMS/MAIN": {
+    "parent_map": "MAP_SS_TIDAL_ROOMS",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM49"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SS_TIDAL_ROOMS:0,1/MAP_SS_TIDAL_CORRIDOR:0",
+      "MAP_SS_TIDAL_ROOMS:8/MAP_SS_TIDAL_CORRIDOR:4",
+      "MAP_SS_TIDAL_ROOMS:2,3/MAP_SS_TIDAL_CORRIDOR:1",
+      "MAP_SS_TIDAL_ROOMS:9/MAP_SS_TIDAL_CORRIDOR:5",
+      "MAP_SS_TIDAL_ROOMS:4,5/MAP_SS_TIDAL_CORRIDOR:2",
+      "MAP_SS_TIDAL_ROOMS:10/MAP_SS_TIDAL_CORRIDOR:6",
+      "MAP_SS_TIDAL_ROOMS:6,7/MAP_SS_TIDAL_CORRIDOR:3",
+      "MAP_SS_TIDAL_ROOMS:11/MAP_SS_TIDAL_CORRIDOR:7"
+    ]
+  },
+  "REGION_SS_TIDAL_LOWER_DECK/MAIN": {
+    "parent_map": "MAP_SS_TIDAL_LOWER_DECK",
+    "locations": [
+      "HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SS_TIDAL_LOWER_DECK:0/MAP_SS_TIDAL_CORRIDOR:8"
+    ]
+  },
+
+  "REGION_MOSSDEEP_CITY/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY",
+    "locations": [
+      "ITEM_MOSSDEEP_CITY_NET_BALL",
+      "NPC_GIFT_RECEIVED_KINGS_ROCK"
+    ],
+    "events": [
+      "EVENT_VISITED_MOSSDEEP_CITY"
+    ],
+    "exits": [
+      "REGION_ROUTE124/MAIN",
+      "REGION_ROUTE125/SEA",
+      "REGION_ROUTE127/MAIN"
+    ],
+    "warps": [
+      "MAP_MOSSDEEP_CITY:0/MAP_MOSSDEEP_CITY_HOUSE1:0",
+      "MAP_MOSSDEEP_CITY:1/MAP_MOSSDEEP_CITY_GYM:0",
+      "MAP_MOSSDEEP_CITY:2/MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:0",
+      "MAP_MOSSDEEP_CITY:3/MAP_MOSSDEEP_CITY_HOUSE2:0",
+      "MAP_MOSSDEEP_CITY:4/MAP_MOSSDEEP_CITY_MART:0",
+      "MAP_MOSSDEEP_CITY:5/MAP_MOSSDEEP_CITY_HOUSE3:0",
+      "MAP_MOSSDEEP_CITY:6/MAP_MOSSDEEP_CITY_STEVENS_HOUSE:0",
+      "MAP_MOSSDEEP_CITY:7/MAP_MOSSDEEP_CITY_HOUSE4:1",
+      "MAP_MOSSDEEP_CITY:8/MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:0",
+      "MAP_MOSSDEEP_CITY:9/MAP_MOSSDEEP_CITY_GAME_CORNER_1F:0"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GYM/ROOM_1": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GYM:0,1/MAP_MOSSDEEP_CITY:1",
+      "MAP_MOSSDEEP_CITY_GYM:2/MAP_MOSSDEEP_CITY_GYM:3",
+      "MAP_MOSSDEEP_CITY_GYM:8/MAP_MOSSDEEP_CITY_GYM:9"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GYM/ROOM_2": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GYM:3/MAP_MOSSDEEP_CITY_GYM:2",
+      "MAP_MOSSDEEP_CITY_GYM:4/MAP_MOSSDEEP_CITY_GYM:5",
+      "MAP_MOSSDEEP_CITY_GYM:6/MAP_MOSSDEEP_CITY_GYM:7"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GYM/ROOM_3": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GYM:5/MAP_MOSSDEEP_CITY_GYM:4",
+      "MAP_MOSSDEEP_CITY_GYM:10/MAP_MOSSDEEP_CITY_GYM:11"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GYM/ROOM_4": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GYM:11/MAP_MOSSDEEP_CITY_GYM:10",
+      "MAP_MOSSDEEP_CITY_GYM:12/MAP_MOSSDEEP_CITY_GYM:13"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GYM/ROOM_5": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GYM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GYM:7/MAP_MOSSDEEP_CITY_GYM:6",
+      "MAP_MOSSDEEP_CITY_GYM:9/MAP_MOSSDEEP_CITY_GYM:8"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GYM/ROOM_6": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GYM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM04",
+      "BADGE_7"
+    ],
+    "events": [
+      "EVENT_DEFEAT_TATE_AND_LIZA"
+    ],
+    "exits": [
+      "REGION_MOSSDEEP_CITY_GYM/ROOM_1"
+    ],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GYM:13/MAP_MOSSDEEP_CITY_GYM:12"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:0,1/MAP_MOSSDEEP_CITY:2",
+      "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:2/MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_MART/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_MART:0,1/MAP_MOSSDEEP_CITY:4"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:0/MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_SPACE_CENTER_1F/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_SUN_STONE_MOSSDEEP"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:0,1/MAP_MOSSDEEP_CITY:8",
+      "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:2/MAP_MOSSDEEP_CITY_SPACE_CENTER_2F:0"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_SPACE_CENTER_2F/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F",
+    "locations": [],
+    "events": [
+      "EVENT_DEFEAT_MAXIE_AT_SPACE_STATION"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F:0/MAP_MOSSDEEP_CITY_SPACE_CENTER_1F:2"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GAME_CORNER_1F/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GAME_CORNER_1F:0,1/MAP_MOSSDEEP_CITY:9",
+      "MAP_MOSSDEEP_CITY_GAME_CORNER_1F:2/MAP_MOSSDEEP_CITY_GAME_CORNER_B1F:0"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_GAME_CORNER_B1F/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F:0/MAP_MOSSDEEP_CITY_GAME_CORNER_1F:2"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_STEVENS_HOUSE/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE",
+    "locations": [
+      "NPC_GIFT_RECEIVED_HM08"
+    ],
+    "events": [
+      "EVENT_STEVEN_GIVES_DIVE"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_STEVENS_HOUSE:0,1/MAP_MOSSDEEP_CITY:6"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_HOUSE1/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_HOUSE1:0,1/MAP_MOSSDEEP_CITY:0"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_HOUSE2/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_HOUSE2",
+    "locations": [],
+    "events": [
+      "EVENT_WINGULL_QUEST_2"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_HOUSE2:0,1/MAP_MOSSDEEP_CITY:3"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_HOUSE3/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_HOUSE3",
+    "locations": [
+      "NPC_GIFT_RECEIVED_SUPER_ROD"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_HOUSE3:0,1/MAP_MOSSDEEP_CITY:5"
+    ]
+  },
+  "REGION_MOSSDEEP_CITY_HOUSE4/MAIN": {
+    "parent_map": "MAP_MOSSDEEP_CITY_HOUSE4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MOSSDEEP_CITY_HOUSE4:0,1/MAP_MOSSDEEP_CITY:7"
+    ]
+  },
+
+  "REGION_UNDERWATER_SOOTOPOLIS_CITY/MAIN": {
+    "parent_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY/WATER"
+    ],
+    "warps": [
+      "MAP_UNDERWATER_SOOTOPOLIS_CITY:0,1/MAP_UNDERWATER_ROUTE126:0"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY/WATER": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_SOOTOPOLIS_CITY/MAIN",
+      "REGION_SOOTOPOLIS_CITY/EAST",
+      "REGION_SOOTOPOLIS_CITY/WEST",
+      "REGION_SOOTOPOLIS_CITY/ISLAND"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY/EAST": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY",
+    "locations": [],
+    "events": [
+      "EVENT_VISITED_SOOTOPOLIS_CITY"
+    ],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY/WATER"
+    ],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY:0/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:0",
+      "MAP_SOOTOPOLIS_CITY:5/MAP_SOOTOPOLIS_CITY_HOUSE2:0",
+      "MAP_SOOTOPOLIS_CITY:7/MAP_SOOTOPOLIS_CITY_HOUSE4:0",
+      "MAP_SOOTOPOLIS_CITY:9/MAP_SOOTOPOLIS_CITY_HOUSE6:0",
+      "MAP_SOOTOPOLIS_CITY:11/MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE:0",
+      "MAP_SOOTOPOLIS_CITY:12/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:0"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY/WEST": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY/WATER"
+    ],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY:1/MAP_SOOTOPOLIS_CITY_MART:0",
+      "MAP_SOOTOPOLIS_CITY:6/MAP_SOOTOPOLIS_CITY_HOUSE3:0",
+      "MAP_SOOTOPOLIS_CITY:3/MAP_CAVE_OF_ORIGIN_ENTRANCE:0",
+      "MAP_SOOTOPOLIS_CITY:4/MAP_SOOTOPOLIS_CITY_HOUSE1:0",
+      "MAP_SOOTOPOLIS_CITY:8/MAP_SOOTOPOLIS_CITY_HOUSE5:0",
+      "MAP_SOOTOPOLIS_CITY:10/MAP_SOOTOPOLIS_CITY_HOUSE7:0"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY/ISLAND": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY",
+    "locations": [
+      "NPC_GIFT_RECEIVED_HM07"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY/WATER"
+    ],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY:2/MAP_SOOTOPOLIS_CITY_GYM_1F:0"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:0,1/MAP_SOOTOPOLIS_CITY:0",
+      "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:2/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:0/MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_MART/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_MART:0,1/MAP_SOOTOPOLIS_CITY:1"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_1F/ENTRANCE": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_1"
+    ],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_GYM_1F:0,1/MAP_SOOTOPOLIS_CITY:2",
+      "MAP_SOOTOPOLIS_CITY_GYM_1F:2/MAP_SOOTOPOLIS_CITY_GYM_B1F:0"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_1": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/ENTRANCE",
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_2",
+      "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_2"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_2": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_1",
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_3",
+      "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_3"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_3": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_2",
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/TOP",
+      "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_4"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_1F/TOP": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_1F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM03",
+      "BADGE_8"
+    ],
+    "events": [
+      "EVENT_DEFEAT_JUAN"
+    ],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_1F/PUZZLE_3"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_1": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_GYM_B1F:0/MAP_SOOTOPOLIS_CITY_GYM_1F:2"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_2": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_1"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_3": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_2"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_4": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SOOTOPOLIS_CITY_GYM_B1F/LEVEL_3"
+    ],
+    "warps": []
+  },
+  "REGION_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:0,1/MAP_SOOTOPOLIS_CITY:12",
+      "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:2/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F:0"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F:0/MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F:2"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE:0,1/MAP_SOOTOPOLIS_CITY:11"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_HOUSE1/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_HOUSE1",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM31"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_HOUSE1:0,1/MAP_SOOTOPOLIS_CITY:4"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_HOUSE2/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_HOUSE2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_HOUSE2:0,1/MAP_SOOTOPOLIS_CITY:5"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_HOUSE3/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_HOUSE3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_HOUSE3:0,1/MAP_SOOTOPOLIS_CITY:6"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_HOUSE4/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_HOUSE4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_HOUSE4:0,1/MAP_SOOTOPOLIS_CITY:7"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_HOUSE5/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_HOUSE5",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_HOUSE5:0,1/MAP_SOOTOPOLIS_CITY:8"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_HOUSE6/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_HOUSE6",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_HOUSE6:0,1/MAP_SOOTOPOLIS_CITY:9"
+    ]
+  },
+  "REGION_SOOTOPOLIS_CITY_HOUSE7/MAIN": {
+    "parent_map": "MAP_SOOTOPOLIS_CITY_HOUSE7",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOOTOPOLIS_CITY_HOUSE7:0,1/MAP_SOOTOPOLIS_CITY:10"
+    ]
+  },
+
+  "REGION_PACIFIDLOG_TOWN/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN",
+    "locations": [],
+    "events": [
+      "EVENT_VISITED_PACIFIDLOG_TOWN"
+    ],
+    "exits": [
+      "REGION_ROUTE131/MAIN",
+      "REGION_ROUTE132/EAST"
+    ],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN:0/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:0",
+      "MAP_PACIFIDLOG_TOWN:1/MAP_PACIFIDLOG_TOWN_HOUSE1:0",
+      "MAP_PACIFIDLOG_TOWN:2/MAP_PACIFIDLOG_TOWN_HOUSE2:0",
+      "MAP_PACIFIDLOG_TOWN:3/MAP_PACIFIDLOG_TOWN_HOUSE3:0",
+      "MAP_PACIFIDLOG_TOWN:4/MAP_PACIFIDLOG_TOWN_HOUSE4:0",
+      "MAP_PACIFIDLOG_TOWN:5/MAP_PACIFIDLOG_TOWN_HOUSE5:0"
+    ]
+  },
+  "REGION_PACIFIDLOG_TOWN_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:0,1/MAP_PACIFIDLOG_TOWN:0",
+      "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:2/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_PACIFIDLOG_TOWN_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:0/MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_PACIFIDLOG_TOWN_HOUSE1/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN_HOUSE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN_HOUSE1:0,1/MAP_PACIFIDLOG_TOWN:1"
+    ]
+  },
+  "REGION_PACIFIDLOG_TOWN_HOUSE2/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN_HOUSE2",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM27_2",
+      "NPC_GIFT_RECEIVED_TM21"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN_HOUSE2:0,1/MAP_PACIFIDLOG_TOWN:2"
+    ]
+  },
+  "REGION_PACIFIDLOG_TOWN_HOUSE3/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN_HOUSE3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN_HOUSE3:0,1/MAP_PACIFIDLOG_TOWN:3"
+    ]
+  },
+  "REGION_PACIFIDLOG_TOWN_HOUSE4/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN_HOUSE4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN_HOUSE4:0,1/MAP_PACIFIDLOG_TOWN:4"
+    ]
+  },
+  "REGION_PACIFIDLOG_TOWN_HOUSE5/MAIN": {
+    "parent_map": "MAP_PACIFIDLOG_TOWN_HOUSE5",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_PACIFIDLOG_TOWN_HOUSE5:0,1/MAP_PACIFIDLOG_TOWN:5"
+    ]
+  },
+
+  "REGION_EVER_GRANDE_CITY/SEA": {
+    "parent_map": "MAP_EVER_GRANDE_CITY",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_EVER_GRANDE_CITY/SOUTH",
+      "REGION_ROUTE128/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_EVER_GRANDE_CITY/SOUTH": {
+    "parent_map": "MAP_EVER_GRANDE_CITY",
+    "locations": [],
+    "events": [
+      "EVENT_VISITED_EVER_GRANDE_CITY"
+    ],
+    "exits": [
+      "REGION_EVER_GRANDE_CITY/SEA"
+    ],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY:1/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:0",
+      "MAP_EVER_GRANDE_CITY:2/MAP_VICTORY_ROAD_1F:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY/NORTH": {
+    "parent_map": "MAP_EVER_GRANDE_CITY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY:0/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:0",
+      "MAP_EVER_GRANDE_CITY:3/MAP_VICTORY_ROAD_1F:1"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:0,1/MAP_EVER_GRANDE_CITY:1",
+      "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:2/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:0/MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/BEHIND_BADGE_CHECKERS"
+    ],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:0,1/MAP_EVER_GRANDE_CITY:0",
+      "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:4/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/BEHIND_BADGE_CHECKERS": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:2,3/MAP_EVER_GRANDE_CITY_HALL5:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:0/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:4"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_HALL5/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_HALL5",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_HALL5:0,2,3/MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F:2",
+      "MAP_EVER_GRANDE_CITY_HALL5:1/MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_SIDNEYS_ROOM/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL5:1",
+      "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL1:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_HALL1/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_HALL1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_HALL1:0,2,3/MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM:1",
+      "MAP_EVER_GRANDE_CITY_HALL1:1/MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_PHOEBES_ROOM/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:0/MAP_EVER_GRANDE_CITY_HALL1:1",
+      "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:1/MAP_EVER_GRANDE_CITY_HALL2:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_HALL2/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_HALL2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_HALL2:0,2,3/MAP_EVER_GRANDE_CITY_PHOEBES_ROOM:1",
+      "MAP_EVER_GRANDE_CITY_HALL2:1/MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_GLACIAS_ROOM/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL2:1",
+      "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL3:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_HALL3/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_HALL3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_HALL3:0,2,3/MAP_EVER_GRANDE_CITY_GLACIAS_ROOM:1",
+      "MAP_EVER_GRANDE_CITY_HALL3:1/MAP_EVER_GRANDE_CITY_DRAKES_ROOM:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_DRAKES_ROOM/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_DRAKES_ROOM:0/MAP_EVER_GRANDE_CITY_HALL3:1",
+      "MAP_EVER_GRANDE_CITY_DRAKES_ROOM:1/MAP_EVER_GRANDE_CITY_HALL4:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_CHAMPIONS_ROOM/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
+    "locations": [],
+    "events": [
+      "EVENT_DEFEAT_CHAMPION"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:0/MAP_EVER_GRANDE_CITY_HALL4:1",
+      "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:1/MAP_EVER_GRANDE_CITY_HALL_OF_FAME:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_HALL4/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_HALL4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_HALL4:0/MAP_EVER_GRANDE_CITY_DRAKES_ROOM:1",
+      "MAP_EVER_GRANDE_CITY_HALL4:1/MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:0"
+    ]
+  },
+  "REGION_EVER_GRANDE_CITY_HALL_OF_FAME/MAIN": {
+    "parent_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_EVER_GRANDE_CITY_HALL_OF_FAME:0/MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM:1"
+    ]
+  }
+}
diff --git a/worlds/pokemon_emerald/data/regions/dungeons.json b/worlds/pokemon_emerald/data/regions/dungeons.json
new file mode 100644
index 0000000000..1da5e325ba
--- /dev/null
+++ b/worlds/pokemon_emerald/data/regions/dungeons.json
@@ -0,0 +1,2231 @@
+{
+  "REGION_PETALBURG_WOODS/WEST_PATH": {
+    "parent_map": "MAP_PETALBURG_WOODS",
+    "locations": [
+      "ITEM_PETALBURG_WOODS_ETHER",
+      "ITEM_PETALBURG_WOODS_PARALYZE_HEAL",
+      "HIDDEN_ITEM_PETALBURG_WOODS_POTION",
+      "HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL",
+      "NPC_GIFT_RECEIVED_GREAT_BALL_PETALBURG_WOODS"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_PETALBURG_WOODS/EAST_PATH"
+    ],
+    "warps": [
+      "MAP_PETALBURG_WOODS:0,1/MAP_ROUTE104:2,3",
+      "MAP_PETALBURG_WOODS:2,3/MAP_ROUTE104:4,5",
+      "MAP_PETALBURG_WOODS:4,5/MAP_ROUTE104:6,7"
+    ]
+  },
+  "REGION_PETALBURG_WOODS/EAST_PATH": {
+    "parent_map": "MAP_PETALBURG_WOODS",
+    "locations": [
+      "ITEM_PETALBURG_WOODS_GREAT_BALL",
+      "ITEM_PETALBURG_WOODS_X_ATTACK",
+      "HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1",
+      "HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2",
+      "NPC_GIFT_RECEIVED_MIRACLE_SEED"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_PETALBURG_WOODS/WEST_PATH"
+    ],
+    "warps": []
+  },
+  "REGION_RUSTURF_TUNNEL/WEST": {
+    "parent_map": "MAP_RUSTURF_TUNNEL",
+    "locations": [
+      "ITEM_RUSTURF_TUNNEL_POKE_BALL",
+      "NPC_GIFT_RECEIVED_DEVON_GOODS_RUSTURF_TUNNEL"
+    ],
+    "events": [
+      "EVENT_RECOVER_DEVON_GOODS"
+    ],
+    "exits": [
+      "REGION_RUSTURF_TUNNEL/EAST"
+    ],
+    "warps": [
+      "MAP_RUSTURF_TUNNEL:0/MAP_ROUTE116:0"
+    ]
+  },
+  "REGION_RUSTURF_TUNNEL/EAST": {
+    "parent_map": "MAP_RUSTURF_TUNNEL",
+    "locations": [
+      "ITEM_RUSTURF_TUNNEL_MAX_ETHER",
+      "NPC_GIFT_RECEIVED_HM04"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_RUSTURF_TUNNEL/WEST"
+    ],
+    "warps": [
+      "MAP_RUSTURF_TUNNEL:1/MAP_VERDANTURF_TOWN:4",
+      "MAP_RUSTURF_TUNNEL:2/MAP_ROUTE116:2"
+    ]
+  },
+  "REGION_GRANITE_CAVE_1F/LOWER": {
+    "parent_map": "MAP_GRANITE_CAVE_1F",
+    "locations": [
+      "ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE",
+      "NPC_GIFT_RECEIVED_HM05"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_GRANITE_CAVE_1F:0/MAP_ROUTE106:0",
+      "MAP_GRANITE_CAVE_1F:2/MAP_GRANITE_CAVE_B1F:1"
+    ]
+  },
+  "REGION_GRANITE_CAVE_1F/UPPER": {
+    "parent_map": "MAP_GRANITE_CAVE_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_GRANITE_CAVE_1F/LOWER"
+    ],
+    "warps": [
+      "MAP_GRANITE_CAVE_1F:1/MAP_GRANITE_CAVE_B1F:0",
+      "MAP_GRANITE_CAVE_1F:3/MAP_GRANITE_CAVE_STEVENS_ROOM:0"
+    ]
+  },
+  "REGION_GRANITE_CAVE_B1F/LOWER": {
+    "parent_map": "MAP_GRANITE_CAVE_B1F",
+    "locations": [
+      "ITEM_GRANITE_CAVE_B1F_POKE_BALL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_GRANITE_CAVE_B1F/UPPER"
+    ],
+    "warps": [
+      "MAP_GRANITE_CAVE_B1F:1/MAP_GRANITE_CAVE_1F:2",
+      "MAP_GRANITE_CAVE_B1F:3/MAP_GRANITE_CAVE_B2F:1"
+    ]
+  },
+  "REGION_GRANITE_CAVE_B1F/LOWER_PLATFORM": {
+    "parent_map": "MAP_GRANITE_CAVE_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_GRANITE_CAVE_B1F:0/MAP_GRANITE_CAVE_1F:1",
+      "MAP_GRANITE_CAVE_B1F:2/MAP_GRANITE_CAVE_B2F:0"
+    ]
+  },
+  "REGION_GRANITE_CAVE_B1F/UPPER": {
+    "parent_map": "MAP_GRANITE_CAVE_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_GRANITE_CAVE_B1F/UPPER"
+    ],
+    "warps": [
+      "MAP_GRANITE_CAVE_B1F:4/MAP_GRANITE_CAVE_B2F:2",
+      "MAP_GRANITE_CAVE_B1F:5/MAP_GRANITE_CAVE_B2F:3",
+      "MAP_GRANITE_CAVE_B1F:6/MAP_GRANITE_CAVE_B2F:4"
+    ]
+  },
+  "REGION_GRANITE_CAVE_B2F/NORTH_LOWER_LANDING": {
+    "parent_map": "MAP_GRANITE_CAVE_B2F",
+    "locations": [
+      "ITEM_GRANITE_CAVE_B2F_REPEL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_GRANITE_CAVE_B2F:2/MAP_GRANITE_CAVE_B1F:4"
+    ]
+  },
+  "REGION_GRANITE_CAVE_B2F/NORTH_UPPER_LANDING": {
+    "parent_map": "MAP_GRANITE_CAVE_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_GRANITE_CAVE_B2F/NORTH_LOWER_LANDING"
+    ],
+    "warps": [
+      "MAP_GRANITE_CAVE_B2F:3/MAP_GRANITE_CAVE_B1F:5"
+    ]
+  },
+  "REGION_GRANITE_CAVE_B2F/NORTH_EAST_ROOM": {
+    "parent_map": "MAP_GRANITE_CAVE_B2F",
+    "locations": [
+      "ITEM_GRANITE_CAVE_B2F_RARE_CANDY",
+      "HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_GRANITE_CAVE_B2F:4/MAP_GRANITE_CAVE_B1F:6"
+    ]
+  },
+  "REGION_GRANITE_CAVE_B2F/LOWER": {
+    "parent_map": "MAP_GRANITE_CAVE_B2F",
+    "locations": [
+      "HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_GRANITE_CAVE_B2F:0/MAP_GRANITE_CAVE_B1F:2",
+      "MAP_GRANITE_CAVE_B2F:1/MAP_GRANITE_CAVE_B1F:3"
+    ]
+  },
+  "REGION_GRANITE_CAVE_STEVENS_ROOM/MAIN": {
+    "parent_map": "MAP_GRANITE_CAVE_STEVENS_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_GRANITE_CAVE_STEVENS_ROOM/LETTER_DELIVERED"
+    ],
+    "warps": [
+      "MAP_GRANITE_CAVE_STEVENS_ROOM:0/MAP_GRANITE_CAVE_1F:3"
+    ]
+  },
+  "REGION_GRANITE_CAVE_STEVENS_ROOM/LETTER_DELIVERED": {
+    "parent_map": "MAP_GRANITE_CAVE_STEVENS_ROOM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM47"
+    ],
+    "events": [
+      "EVENT_DELIVER_LETTER"
+    ],
+    "exits": [],
+    "warps": []
+  },
+  "REGION_TRAINER_HILL_ENTRANCE/MAIN": {
+    "parent_map": "MAP_TRAINER_HILL_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TRAINER_HILL_ENTRANCE:0,1/MAP_ROUTE111:4",
+      "MAP_TRAINER_HILL_ENTRANCE:2/MAP_TRAINER_HILL_1F:0"
+    ]
+  },
+  "REGION_TRAINER_HILL_1F/MAIN": {
+    "parent_map": "MAP_TRAINER_HILL_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TRAINER_HILL_1F:0/MAP_TRAINER_HILL_ENTRANCE:2",
+      "MAP_TRAINER_HILL_1F:1/MAP_TRAINER_HILL_2F:0"
+    ]
+  },
+  "REGION_TRAINER_HILL_2F/MAIN": {
+    "parent_map": "MAP_TRAINER_HILL_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TRAINER_HILL_2F:0/MAP_TRAINER_HILL_1F:1",
+      "MAP_TRAINER_HILL_2F:1/MAP_TRAINER_HILL_3F:0"
+    ]
+  },
+  "REGION_TRAINER_HILL_3F/MAIN": {
+    "parent_map": "MAP_TRAINER_HILL_3F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TRAINER_HILL_3F:0/MAP_TRAINER_HILL_2F:1",
+      "MAP_TRAINER_HILL_3F:1/MAP_TRAINER_HILL_4F:0"
+    ]
+  },
+  "REGION_TRAINER_HILL_4F/MAIN": {
+    "parent_map": "MAP_TRAINER_HILL_4F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TRAINER_HILL_4F:0/MAP_TRAINER_HILL_3F:1",
+      "MAP_TRAINER_HILL_4F:1/MAP_TRAINER_HILL_ROOF:0"
+    ]
+  },
+  "REGION_TRAINER_HILL_ROOF/MAIN": {
+    "parent_map": "MAP_TRAINER_HILL_ROOF",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TRAINER_HILL_ROOF:0/MAP_TRAINER_HILL_4F:1",
+      "MAP_TRAINER_HILL_ROOF:1/MAP_TRAINER_HILL_ELEVATOR:1"
+    ]
+  },
+  "REGION_TRAINER_HILL_ELEVATOR/MAIN": {
+    "parent_map": "MAP_TRAINER_HILL_ELEVATOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TRAINER_HILL_ELEVATOR:0,1/MAP_TRAINER_HILL_ROOF:1"
+    ]
+  },
+  "REGION_FIERY_PATH/MAIN": {
+    "parent_map": "MAP_FIERY_PATH",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_FIERY_PATH/BEHIND_BOULDER"
+    ],
+    "warps": [
+      "MAP_FIERY_PATH:0/MAP_ROUTE112:4",
+      "MAP_FIERY_PATH:1/MAP_ROUTE112:5"
+    ]
+  },
+  "REGION_FIERY_PATH/BEHIND_BOULDER": {
+    "parent_map": "MAP_FIERY_PATH",
+    "locations": [
+      "ITEM_FIERY_PATH_TM06",
+      "ITEM_FIERY_PATH_FIRE_STONE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_FIERY_PATH/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_MAGMA_HIDEOUT_1F/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MAGMA_HIDEOUT_1F/ENTRANCE"
+    ],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_1F:1/MAP_MAGMA_HIDEOUT_2F_1R:1"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_1F/CENTER_EXIT": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MAGMA_HIDEOUT_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_1F:3/MAP_MAGMA_HIDEOUT_2F_3R:0"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_1F/LEDGE": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_1F",
+    "locations": [
+      "ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_1F:2/MAP_MAGMA_HIDEOUT_2F_2R:1"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_1F/ENTRANCE": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MAGMA_HIDEOUT_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_1F:0/MAP_JAGGED_PASS:4"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_2F_1R/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_2F_1R",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_2F_1R:0/MAP_MAGMA_HIDEOUT_2F_2R:0",
+      "MAP_MAGMA_HIDEOUT_2F_1R:1/MAP_MAGMA_HIDEOUT_1F:1",
+      "MAP_MAGMA_HIDEOUT_2F_1R:2/MAP_MAGMA_HIDEOUT_3F_1R:2"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_2F_2R/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_2F_2R",
+    "locations": [
+      "ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR",
+      "ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_2F_2R:0/MAP_MAGMA_HIDEOUT_2F_1R:0",
+      "MAP_MAGMA_HIDEOUT_2F_2R:1/MAP_MAGMA_HIDEOUT_1F:2"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_2F_3R/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_2F_3R",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_2F_3R:0/MAP_MAGMA_HIDEOUT_1F:3",
+      "MAP_MAGMA_HIDEOUT_2F_3R:1/MAP_MAGMA_HIDEOUT_3F_3R:0"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_3F_1R/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_3F_1R",
+    "locations": [
+      "ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_3F_1R:0/MAP_MAGMA_HIDEOUT_4F:0",
+      "MAP_MAGMA_HIDEOUT_3F_1R:1/MAP_MAGMA_HIDEOUT_3F_2R:0",
+      "MAP_MAGMA_HIDEOUT_3F_1R:2/MAP_MAGMA_HIDEOUT_2F_1R:2"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_3F_2R/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_3F_2R",
+    "locations": [
+      "ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_3F_2R:0/MAP_MAGMA_HIDEOUT_3F_1R:1"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_3F_3R/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_3F_3R",
+    "locations": [
+      "ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_3F_3R:0/MAP_MAGMA_HIDEOUT_2F_3R:1",
+      "MAP_MAGMA_HIDEOUT_3F_3R:1/MAP_MAGMA_HIDEOUT_4F:1"
+    ]
+  },
+  "REGION_MAGMA_HIDEOUT_4F/MAIN": {
+    "parent_map": "MAP_MAGMA_HIDEOUT_4F",
+    "locations": [
+      "ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
+    ],
+    "events": [
+      "EVENT_RELEASE_GROUDON"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_MAGMA_HIDEOUT_4F:0/MAP_MAGMA_HIDEOUT_3F_1R:0",
+      "MAP_MAGMA_HIDEOUT_4F:1/MAP_MAGMA_HIDEOUT_3F_3R:1"
+    ]
+  },
+  "REGION_MIRAGE_TOWER_1F/MAIN": {
+    "parent_map": "MAP_MIRAGE_TOWER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MIRAGE_TOWER_1F:0/MAP_ROUTE111:3",
+      "MAP_MIRAGE_TOWER_1F:1/MAP_MIRAGE_TOWER_2F:1"
+    ]
+  },
+  "REGION_MIRAGE_TOWER_2F/TOP": {
+    "parent_map": "MAP_MIRAGE_TOWER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MIRAGE_TOWER_2F/BOTTOM",
+      "REGION_MIRAGE_TOWER_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_MIRAGE_TOWER_2F:1/MAP_MIRAGE_TOWER_1F:1"
+    ]
+  },
+  "REGION_MIRAGE_TOWER_2F/BOTTOM": {
+    "parent_map": "MAP_MIRAGE_TOWER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MIRAGE_TOWER_2F/TOP",
+      "REGION_MIRAGE_TOWER_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_MIRAGE_TOWER_2F:0/MAP_MIRAGE_TOWER_3F:0"
+    ]
+  },
+  "REGION_MIRAGE_TOWER_3F/TOP": {
+    "parent_map": "MAP_MIRAGE_TOWER_3F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MIRAGE_TOWER_3F/BOTTOM"
+    ],
+    "warps": [
+      "MAP_MIRAGE_TOWER_3F:1/MAP_MIRAGE_TOWER_4F:0"
+    ]
+  },
+  "REGION_MIRAGE_TOWER_3F/BOTTOM": {
+    "parent_map": "MAP_MIRAGE_TOWER_3F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MIRAGE_TOWER_3F/TOP",
+      "REGION_MIRAGE_TOWER_2F/TOP"
+    ],
+    "warps": [
+      "MAP_MIRAGE_TOWER_3F:0/MAP_MIRAGE_TOWER_2F:0"
+    ]
+  },
+  "REGION_MIRAGE_TOWER_4F/MAIN": {
+    "parent_map": "MAP_MIRAGE_TOWER_4F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MIRAGE_TOWER_4F/FOSSIL_PLATFORM"
+    ],
+    "warps": [
+      "MAP_MIRAGE_TOWER_4F:0/MAP_MIRAGE_TOWER_3F:1"
+    ]
+  },
+  "REGION_MIRAGE_TOWER_4F/FOSSIL_PLATFORM": {
+    "parent_map": "MAP_MIRAGE_TOWER_4F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": []
+  },
+  "REGION_DESERT_RUINS/MAIN": {
+    "parent_map": "MAP_DESERT_RUINS",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_DESERT_RUINS:0/MAP_ROUTE111:1",
+      "MAP_DESERT_RUINS:1/MAP_DESERT_RUINS:2",
+      "MAP_DESERT_RUINS:2/MAP_DESERT_RUINS:1"
+    ]
+  },
+  "REGION_METEOR_FALLS_1F_1R/MAIN": {
+    "parent_map": "MAP_METEOR_FALLS_1F_1R",
+    "locations": [
+      "ITEM_METEOR_FALLS_1F_1R_MOON_STONE",
+      "ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
+    ],
+    "events": [
+      "EVENT_MAGMA_STEALS_METEORITE"
+    ],
+    "exits": [
+      "REGION_METEOR_FALLS_1F_1R/ABOVE_WATERFALL"
+    ],
+    "warps": [
+      "MAP_METEOR_FALLS_1F_1R:0/MAP_ROUTE114:0",
+      "MAP_METEOR_FALLS_1F_1R:1/MAP_ROUTE115:0"
+    ]
+  },
+  "REGION_METEOR_FALLS_1F_1R/ABOVE_WATERFALL": {
+    "parent_map": "MAP_METEOR_FALLS_1F_1R",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_1F_1R/MAIN"
+    ],
+    "warps": [
+      "MAP_METEOR_FALLS_1F_1R:2/MAP_METEOR_FALLS_1F_2R:0"
+    ]
+  },
+  "REGION_METEOR_FALLS_1F_1R/TOP": {
+    "parent_map": "MAP_METEOR_FALLS_1F_1R",
+    "locations": [
+      "ITEM_METEOR_FALLS_1F_1R_TM23"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_METEOR_FALLS_1F_1R:3/MAP_METEOR_FALLS_B1F_1R:4",
+      "MAP_METEOR_FALLS_1F_1R:5/MAP_METEOR_FALLS_STEVENS_CAVE:0"
+    ]
+  },
+  "REGION_METEOR_FALLS_1F_1R/BOTTOM": {
+    "parent_map": "MAP_METEOR_FALLS_1F_1R",
+    "locations": [
+      "ITEM_METEOR_FALLS_1F_1R_PP_UP"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_METEOR_FALLS_1F_1R:4/MAP_METEOR_FALLS_B1F_1R:5"
+    ]
+  },
+  "REGION_METEOR_FALLS_1F_2R/TOP": {
+    "parent_map": "MAP_METEOR_FALLS_1F_2R",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_1F_2R/LEFT_SPLIT",
+      "REGION_METEOR_FALLS_1F_2R/RIGHT_SPLIT"
+    ],
+    "warps": [
+      "MAP_METEOR_FALLS_1F_2R:1/MAP_METEOR_FALLS_B1F_1R:0"
+    ]
+  },
+  "REGION_METEOR_FALLS_1F_2R/LEFT_SPLIT": {
+    "parent_map": "MAP_METEOR_FALLS_1F_2R",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_METEOR_FALLS_1F_2R:2/MAP_METEOR_FALLS_B1F_1R:1"
+    ]
+  },
+  "REGION_METEOR_FALLS_1F_2R/RIGHT_SPLIT": {
+    "parent_map": "MAP_METEOR_FALLS_1F_2R",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_METEOR_FALLS_1F_2R:0/MAP_METEOR_FALLS_1F_1R:2",
+      "MAP_METEOR_FALLS_1F_2R:3/MAP_METEOR_FALLS_B1F_1R:2"
+    ]
+  },
+  "REGION_METEOR_FALLS_B1F_1R/UPPER": {
+    "parent_map": "MAP_METEOR_FALLS_B1F_1R",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_METEOR_FALLS_B1F_1R:0/MAP_METEOR_FALLS_1F_2R:1",
+      "MAP_METEOR_FALLS_B1F_1R:2/MAP_METEOR_FALLS_1F_2R:3",
+      "MAP_METEOR_FALLS_B1F_1R:4/MAP_METEOR_FALLS_1F_1R:3"
+    ]
+  },
+  "REGION_METEOR_FALLS_B1F_1R/HIGHEST_LADDER": {
+    "parent_map": "MAP_METEOR_FALLS_B1F_1R",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_B1F_1R/WATER"
+    ],
+    "warps": [
+      "MAP_METEOR_FALLS_B1F_1R:1/MAP_METEOR_FALLS_1F_2R:2"
+    ]
+  },
+  "REGION_METEOR_FALLS_B1F_1R/NORTH_SHORE": {
+    "parent_map": "MAP_METEOR_FALLS_B1F_1R",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_B1F_1R/WATER"
+    ],
+    "warps": [
+      "MAP_METEOR_FALLS_B1F_1R:3/MAP_METEOR_FALLS_B1F_2R:0"
+    ]
+  },
+  "REGION_METEOR_FALLS_B1F_1R/SOUTH_SHORE": {
+    "parent_map": "MAP_METEOR_FALLS_B1F_1R",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_B1F_1R/WATER"
+    ],
+    "warps": [
+      "MAP_METEOR_FALLS_B1F_1R:5/MAP_METEOR_FALLS_1F_1R:4"
+    ]
+  },
+  "REGION_METEOR_FALLS_B1F_1R/WATER": {
+    "parent_map": "MAP_METEOR_FALLS_B1F_1R",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_B1F_1R/SOUTH_SHORE",
+      "REGION_METEOR_FALLS_B1F_1R/NORTH_SHORE",
+      "REGION_METEOR_FALLS_B1F_1R/HIGHEST_LADDER"
+    ],
+    "warps": []
+  },
+  "REGION_METEOR_FALLS_B1F_2R/ENTRANCE": {
+    "parent_map": "MAP_METEOR_FALLS_B1F_2R",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_B1F_2R/WATER"
+    ],
+    "warps": [
+      "MAP_METEOR_FALLS_B1F_2R:0/MAP_METEOR_FALLS_B1F_1R:3"
+    ]
+  },
+  "REGION_METEOR_FALLS_B1F_2R/WATER": {
+    "parent_map": "MAP_METEOR_FALLS_B1F_2R",
+    "locations": [
+      "ITEM_METEOR_FALLS_B1F_2R_TM02"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_METEOR_FALLS_B1F_2R/ENTRANCE"
+    ],
+    "warps": []
+  },
+  "REGION_METEOR_FALLS_STEVENS_CAVE/MAIN": {
+    "parent_map": "MAP_METEOR_FALLS_STEVENS_CAVE",
+    "locations": [],
+    "events": [
+      "EVENT_DEFEAT_STEVEN"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_METEOR_FALLS_STEVENS_CAVE:0/MAP_METEOR_FALLS_1F_1R:5"
+    ]
+  },
+  "REGION_ALTERING_CAVE/MAIN": {
+    "parent_map": "MAP_ALTERING_CAVE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ALTERING_CAVE:0/MAP_ROUTE103:0"
+    ]
+  },
+  "REGION_ISLAND_CAVE/MAIN": {
+    "parent_map": "MAP_ISLAND_CAVE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ISLAND_CAVE:0/MAP_ROUTE105:0",
+      "MAP_ISLAND_CAVE:1/MAP_ISLAND_CAVE:2",
+      "MAP_ISLAND_CAVE:2/MAP_ISLAND_CAVE:1"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_DECK/ENTRANCE": {
+    "parent_map": "MAP_ABANDONED_SHIP_DECK",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_DECK:0,1/MAP_ROUTE108:0",
+      "MAP_ABANDONED_SHIP_DECK:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:1"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_DECK/UPPER": {
+    "parent_map": "MAP_ABANDONED_SHIP_DECK",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_DECK:3/MAP_ABANDONED_SHIP_CORRIDORS_1F:2",
+      "MAP_ABANDONED_SHIP_DECK:4/MAP_ABANDONED_SHIP_CAPTAINS_OFFICE:0"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_CAPTAINS_OFFICE/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE:0,1/MAP_ABANDONED_SHIP_DECK:4"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_CORRIDORS_1F/WEST": {
+    "parent_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:2,3/MAP_ABANDONED_SHIP_DECK:3",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:8/MAP_ABANDONED_SHIP_ROOMS2_1F:0",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:10/MAP_ABANDONED_SHIP_CORRIDORS_B1F:6",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:11/MAP_ABANDONED_SHIP_ROOMS2_1F:2"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_CORRIDORS_1F/EAST": {
+    "parent_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:0,1/MAP_ABANDONED_SHIP_DECK:2",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:4/MAP_ABANDONED_SHIP_ROOMS_1F:0",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:5/MAP_ABANDONED_SHIP_ROOMS_1F:3",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:6/MAP_ABANDONED_SHIP_ROOMS_1F:2",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:7/MAP_ABANDONED_SHIP_ROOMS_1F:4",
+      "MAP_ABANDONED_SHIP_CORRIDORS_1F:9/MAP_ABANDONED_SHIP_CORRIDORS_B1F:7"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOMS_1F/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOMS_1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_1F:4",
+      "MAP_ABANDONED_SHIP_ROOMS_1F:3,5/MAP_ABANDONED_SHIP_CORRIDORS_1F:5",
+      "MAP_ABANDONED_SHIP_ROOMS_1F:4/MAP_ABANDONED_SHIP_CORRIDORS_1F:7"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOMS_1F/NORTH_WEST": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOMS_1F:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:6"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOMS2_1F/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOMS2_1F",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOMS2_1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_1F:8",
+      "MAP_ABANDONED_SHIP_ROOMS2_1F:2/MAP_ABANDONED_SHIP_CORRIDORS_1F:11"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_CORRIDORS_B1F/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:0/MAP_ABANDONED_SHIP_ROOMS2_B1F:2",
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:1/MAP_ABANDONED_SHIP_ROOMS2_B1F:0",
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:2/MAP_ABANDONED_SHIP_ROOMS_B1F:0",
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:3/MAP_ABANDONED_SHIP_ROOMS_B1F:1",
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:4/MAP_ABANDONED_SHIP_ROOMS_B1F:2",
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:5/MAP_ABANDONED_SHIP_ROOM_B1F:0",
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:6/MAP_ABANDONED_SHIP_CORRIDORS_1F:10",
+      "MAP_ABANDONED_SHIP_CORRIDORS_B1F:7/MAP_ABANDONED_SHIP_CORRIDORS_1F:9"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOMS_B1F/LEFT": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOMS_B1F:0/MAP_ABANDONED_SHIP_CORRIDORS_B1F:2"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOMS_B1F/CENTER": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ABANDONED_SHIP_UNDERWATER1/MAIN"
+    ],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOMS_B1F:1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:3"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOMS_B1F/RIGHT": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOMS_B1F:2/MAP_ABANDONED_SHIP_CORRIDORS_B1F:4"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOMS2_B1F/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOMS2_B1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:1",
+      "MAP_ABANDONED_SHIP_ROOMS2_B1F:2,3/MAP_ABANDONED_SHIP_CORRIDORS_B1F:0"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_ROOM_B1F/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_ROOM_B1F",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_ROOM_B1F:0,1/MAP_ABANDONED_SHIP_CORRIDORS_B1F:5"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ABANDONED_SHIP_UNDERWATER2/MAIN"
+    ],
+    "warps": [
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:0/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:0",
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:3/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:6",
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:1/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:2",
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:4/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:7",
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:2/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:4",
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:5/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:8"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS/TOP_LEFT": {
+    "parent_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+    "locations": [
+      "HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:6/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:3"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS/TOP_CENTER_DOORWAY": {
+    "parent_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:7/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:4"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS/TOP_RIGHT": {
+    "parent_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL",
+      "HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:8/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:5"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS/BOTTOM_LEFT": {
+    "parent_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18",
+      "HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:0,1/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:0"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS/BOTTOM_CENTER": {
+    "parent_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:2,3/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:1"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS/BOTTOM_RIGHT": {
+    "parent_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
+    "locations": [
+      "ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE",
+      "HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:4,5/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:2"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_UNDERWATER1/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_UNDERWATER1",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ABANDONED_SHIP_ROOMS_B1F/CENTER"
+    ],
+    "warps": [
+      "MAP_ABANDONED_SHIP_UNDERWATER1:0,1/MAP_ABANDONED_SHIP_UNDERWATER2:0"
+    ]
+  },
+  "REGION_ABANDONED_SHIP_UNDERWATER2/MAIN": {
+    "parent_map": "MAP_ABANDONED_SHIP_UNDERWATER2",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS/MAIN"
+    ],
+    "warps": [
+      "MAP_ABANDONED_SHIP_UNDERWATER2:0/MAP_ABANDONED_SHIP_UNDERWATER1:0"
+    ]
+  },
+  "REGION_NEW_MAUVILLE_ENTRANCE/MAIN": {
+    "parent_map": "MAP_NEW_MAUVILLE_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NEW_MAUVILLE_ENTRANCE:0/MAP_ROUTE110:0",
+      "MAP_NEW_MAUVILLE_ENTRANCE:1/MAP_NEW_MAUVILLE_INSIDE:0"
+    ]
+  },
+  "REGION_NEW_MAUVILLE_INSIDE/MAIN": {
+    "parent_map": "MAP_NEW_MAUVILLE_INSIDE",
+    "locations": [
+      "ITEM_NEW_MAUVILLE_ULTRA_BALL",
+      "ITEM_NEW_MAUVILLE_ESCAPE_ROPE",
+      "ITEM_NEW_MAUVILLE_THUNDER_STONE",
+      "ITEM_NEW_MAUVILLE_FULL_HEAL",
+      "ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
+    ],
+    "events": [
+      "EVENT_TURN_OFF_GENERATOR"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_NEW_MAUVILLE_INSIDE:0/MAP_NEW_MAUVILLE_ENTRANCE:1"
+    ]
+  },
+  "REGION_SCORCHED_SLAB/MAIN": {
+    "parent_map": "MAP_SCORCHED_SLAB",
+    "locations": [
+      "ITEM_SCORCHED_SLAB_TM11"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SCORCHED_SLAB:0/MAP_ROUTE120:1"
+    ]
+  },
+  "REGION_ANCIENT_TOMB/MAIN": {
+    "parent_map": "MAP_ANCIENT_TOMB",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ANCIENT_TOMB:0/MAP_ROUTE120:0",
+      "MAP_ANCIENT_TOMB:1/MAP_ANCIENT_TOMB:2",
+      "MAP_ANCIENT_TOMB:2/MAP_ANCIENT_TOMB:1"
+    ]
+  },
+  "REGION_MT_PYRE_1F/MAIN": {
+    "parent_map": "MAP_MT_PYRE_1F",
+    "locations": [
+      "NPC_GIFT_RECEIVED_CLEANSE_TAG"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_1F:0,2/MAP_ROUTE122:0",
+      "MAP_MT_PYRE_1F:1,3/MAP_MT_PYRE_EXTERIOR:0",
+      "MAP_MT_PYRE_1F:4/MAP_MT_PYRE_2F:0",
+      "MAP_MT_PYRE_1F:5/MAP_MT_PYRE_2F:4"
+    ]
+  },
+  "REGION_MT_PYRE_2F/MAIN": {
+    "parent_map": "MAP_MT_PYRE_2F",
+    "locations": [
+      "ITEM_MT_PYRE_2F_ULTRA_BALL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_2F:0/MAP_MT_PYRE_1F:4",
+      "MAP_MT_PYRE_2F:1/MAP_MT_PYRE_3F:0",
+      "MAP_MT_PYRE_2F:2/MAP_MT_PYRE_3F:4",
+      "MAP_MT_PYRE_2F:3/MAP_MT_PYRE_3F:5",
+      "MAP_MT_PYRE_2F:4/MAP_MT_PYRE_1F:5"
+    ]
+  },
+  "REGION_MT_PYRE_3F/MAIN": {
+    "parent_map": "MAP_MT_PYRE_3F",
+    "locations": [
+      "ITEM_MT_PYRE_3F_SUPER_REPEL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_3F:0/MAP_MT_PYRE_2F:1",
+      "MAP_MT_PYRE_3F:1/MAP_MT_PYRE_4F:1",
+      "MAP_MT_PYRE_3F:2/MAP_MT_PYRE_4F:4",
+      "MAP_MT_PYRE_3F:3/MAP_MT_PYRE_4F:5",
+      "MAP_MT_PYRE_3F:4/MAP_MT_PYRE_2F:2",
+      "MAP_MT_PYRE_3F:5/MAP_MT_PYRE_2F:3"
+    ]
+  },
+  "REGION_MT_PYRE_4F/MAIN": {
+    "parent_map": "MAP_MT_PYRE_4F",
+    "locations": [
+      "ITEM_MT_PYRE_4F_SEA_INCENSE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_4F:0/MAP_MT_PYRE_5F:1",
+      "MAP_MT_PYRE_4F:1/MAP_MT_PYRE_3F:1",
+      "MAP_MT_PYRE_4F:2/MAP_MT_PYRE_5F:3",
+      "MAP_MT_PYRE_4F:3/MAP_MT_PYRE_5F:4",
+      "MAP_MT_PYRE_4F:4/MAP_MT_PYRE_3F:2",
+      "MAP_MT_PYRE_4F:5/MAP_MT_PYRE_3F:3"
+    ]
+  },
+  "REGION_MT_PYRE_5F/MAIN": {
+    "parent_map": "MAP_MT_PYRE_5F",
+    "locations": [
+      "ITEM_MT_PYRE_5F_LAX_INCENSE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_5F:0/MAP_MT_PYRE_6F:0",
+      "MAP_MT_PYRE_5F:1/MAP_MT_PYRE_4F:0",
+      "MAP_MT_PYRE_5F:2/MAP_MT_PYRE_6F:1",
+      "MAP_MT_PYRE_5F:3/MAP_MT_PYRE_4F:2",
+      "MAP_MT_PYRE_5F:4/MAP_MT_PYRE_4F:3"
+    ]
+  },
+  "REGION_MT_PYRE_6F/MAIN": {
+    "parent_map": "MAP_MT_PYRE_6F",
+    "locations": [
+      "ITEM_MT_PYRE_6F_TM30"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_6F:0/MAP_MT_PYRE_5F:0",
+      "MAP_MT_PYRE_6F:1/MAP_MT_PYRE_5F:2"
+    ]
+  },
+  "REGION_MT_PYRE_EXTERIOR/MAIN": {
+    "parent_map": "MAP_MT_PYRE_EXTERIOR",
+    "locations": [
+      "ITEM_MT_PYRE_EXTERIOR_MAX_POTION",
+      "ITEM_MT_PYRE_EXTERIOR_TM48",
+      "HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL",
+      "HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_EXTERIOR:0/MAP_MT_PYRE_1F:1",
+      "MAP_MT_PYRE_EXTERIOR:1,2/MAP_MT_PYRE_SUMMIT:1"
+    ]
+  },
+  "REGION_MT_PYRE_SUMMIT/MAIN": {
+    "parent_map": "MAP_MT_PYRE_SUMMIT",
+    "locations": [
+      "HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC",
+      "HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY",
+      "NPC_GIFT_RECEIVED_MAGMA_EMBLEM"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MT_PYRE_SUMMIT:0,1,2/MAP_MT_PYRE_EXTERIOR:1"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_1F/MAIN": {
+    "parent_map": "MAP_AQUA_HIDEOUT_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_1F/WATER"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_1F:2/MAP_AQUA_HIDEOUT_B1F:0"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_1F/WATER": {
+    "parent_map": "MAP_AQUA_HIDEOUT_1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_1F:0,1/MAP_LILYCOVE_CITY:6"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/WEST_BOTTOM": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:8/MAP_AQUA_HIDEOUT_B1F:5",
+      "MAP_AQUA_HIDEOUT_B1F:9/MAP_AQUA_HIDEOUT_B1F:12",
+      "MAP_AQUA_HIDEOUT_B1F:10/MAP_AQUA_HIDEOUT_B1F:6"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/WEST_TOP_LEFT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:2/MAP_AQUA_HIDEOUT_B2F:1",
+      "MAP_AQUA_HIDEOUT_B1F:3/MAP_AQUA_HIDEOUT_B2F:2"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/WEST_TOP_CENTER": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:1/MAP_AQUA_HIDEOUT_B2F:0",
+      "MAP_AQUA_HIDEOUT_B1F:6/MAP_AQUA_HIDEOUT_B1F:10"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/WEST_TOP_RIGHT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:0/MAP_AQUA_HIDEOUT_1F:2",
+      "MAP_AQUA_HIDEOUT_B1F:4/MAP_AQUA_HIDEOUT_B1F:7",
+      "MAP_AQUA_HIDEOUT_B1F:5/MAP_AQUA_HIDEOUT_B1F:8"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/WEST_CENTER_RIGHT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [
+      "ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:7/MAP_AQUA_HIDEOUT_B1F:4"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/WEST_CENTER": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [
+      "ITEM_AQUA_HIDEOUT_B1F_NUGGET",
+      "ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:11/MAP_AQUA_HIDEOUT_B1F:22"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_TOP": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:12/MAP_AQUA_HIDEOUT_B1F:9",
+      "MAP_AQUA_HIDEOUT_B1F:13/MAP_AQUA_HIDEOUT_B1F:18",
+      "MAP_AQUA_HIDEOUT_B1F:14/MAP_AQUA_HIDEOUT_B1F:12!",
+      "MAP_AQUA_HIDEOUT_B1F:15/MAP_AQUA_HIDEOUT_B1F:16"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_1_RIGHT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_1_CENTER"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:18/MAP_AQUA_HIDEOUT_B1F:13"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_1_CENTER": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_1_LEFT",
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_1_RIGHT"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:17/MAP_AQUA_HIDEOUT_B1F:20"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_1_LEFT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_1_CENTER"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:16/MAP_AQUA_HIDEOUT_B1F:15"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_2_RIGHT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_2_CENTER"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:21/MAP_AQUA_HIDEOUT_B1F:12!"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_2_CENTER": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_2_LEFT",
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_2_RIGHT"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:20/MAP_AQUA_HIDEOUT_B1F:17"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_2_LEFT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_AQUA_HIDEOUT_B1F/EAST_ROW_2_CENTER"
+    ],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:19/MAP_AQUA_HIDEOUT_B1F:24"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B1F/EAST_BOTTOM": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B1F:22/MAP_AQUA_HIDEOUT_B1F:11",
+      "MAP_AQUA_HIDEOUT_B1F:23/MAP_AQUA_HIDEOUT_B1F:17!",
+      "MAP_AQUA_HIDEOUT_B1F:24/MAP_AQUA_HIDEOUT_B1F:19"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B2F/TOP_LEFT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B2F:2/MAP_AQUA_HIDEOUT_B1F:3",
+      "MAP_AQUA_HIDEOUT_B2F:5/MAP_AQUA_HIDEOUT_B2F:3"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B2F/TOP_CENTER": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B2F:1/MAP_AQUA_HIDEOUT_B1F:2",
+      "MAP_AQUA_HIDEOUT_B2F:4/MAP_AQUA_HIDEOUT_B2F:8"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B2F/TOP_RIGHT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B2F:0/MAP_AQUA_HIDEOUT_B1F:1",
+      "MAP_AQUA_HIDEOUT_B2F:3/MAP_AQUA_HIDEOUT_B2F:5",
+      "MAP_AQUA_HIDEOUT_B2F:6/MAP_AQUA_HIDEOUT_B2F:7"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B2F/BOTTOM_LEFT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B2F",
+    "locations": [
+      "ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B2F:7/MAP_AQUA_HIDEOUT_B2F:6"
+    ]
+  },
+  "REGION_AQUA_HIDEOUT_B2F/BOTTOM_RIGHT": {
+    "parent_map": "MAP_AQUA_HIDEOUT_B2F",
+    "locations": [],
+    "events": [
+      "EVENT_CLEAR_AQUA_HIDEOUT"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_AQUA_HIDEOUT_B2F:8/MAP_AQUA_HIDEOUT_B2F:4",
+      "MAP_AQUA_HIDEOUT_B2F:9/MAP_AQUA_HIDEOUT_B1F:4!"
+    ]
+  },
+  "REGION_SHOAL_CAVE_ENTRANCE_ROOM/SOUTH": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_ENTRANCE_ROOM/LOW_TIDE_LOWER",
+      "REGION_SHOAL_CAVE_ENTRANCE_ROOM/HIGH_TIDE_WATER"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:0/MAP_ROUTE125:0"
+    ]
+  },
+  "REGION_SHOAL_CAVE_ENTRANCE_ROOM/NORTH_WEST_CORNER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_ENTRANCE_ROOM/HIGH_TIDE_WATER"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:6"
+    ]
+  },
+  "REGION_SHOAL_CAVE_ENTRANCE_ROOM/NORTH_EAST_CORNER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+    "locations": [
+      "ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_ENTRANCE_ROOM/HIGH_TIDE_WATER"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:7"
+    ]
+  },
+  "REGION_SHOAL_CAVE_ENTRANCE_ROOM/HIGH_TIDE_WATER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_ENTRANCE_ROOM/SOUTH",
+      "REGION_SHOAL_CAVE_ENTRANCE_ROOM/NORTH_WEST_CORNER"
+    ],
+    "warps": []
+  },
+  "REGION_SHOAL_CAVE_ENTRANCE_ROOM/LOW_TIDE_LOWER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_ENTRANCE_ROOM/SOUTH"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:0"
+    ]
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_EAST_CORNER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:7/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:3"
+    ]
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_EAST_CORNER",
+      "REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_EAST_WATER",
+      "REGION_SHOAL_CAVE_INNER_ROOM/EAST_WATER",
+      "REGION_SHOAL_CAVE_INNER_ROOM/NORTH_WEST_WATER"
+    ],
+    "warps": []
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_EAST_MIDDLE_GROUND": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_SOUTH_EAST_LOWER",
+      "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_EAST_LOWER"
+    ],
+    "warps": []
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_WEST_CORNER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/NORTH_WEST_WATER"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:6/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:2"
+    ]
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/BRIDGES": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:1",
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:0"
+    ]
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/RARE_CANDY_PLATFORM": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [
+      "ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_EAST_WATER"
+    ],
+    "warps": []
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_EAST_WATER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND",
+      "REGION_SHOAL_CAVE_INNER_ROOM/RARE_CANDY_PLATFORM"
+    ],
+    "warps": []
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/EAST_WATER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND"
+    ],
+    "warps": []
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/NORTH_WEST_WATER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND",
+      "REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_WEST_CORNER"
+    ],
+    "warps": []
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_SOUTH_EAST_LOWER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_EAST_MIDDLE_GROUND"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:1",
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:5/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:2"
+    ]
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_EAST_LOWER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_EAST_MIDDLE_GROUND"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:0"
+    ]
+  },
+  "REGION_SHOAL_CAVE_INNER_ROOM/LOW_TIDE_NORTH_WEST_LOWER": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:4/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:1"
+    ]
+  },
+  "REGION_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM/MAIN": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+    "locations": [
+      "ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:1",
+      "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:2"
+    ]
+  },
+  "REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/NORTH_WEST": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+    "locations": [
+      "NPC_GIFT_RECEIVED_FOCUS_BAND"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/EAST",
+      "REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/SOUTH"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:3",
+      "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:1/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:4"
+    ]
+  },
+  "REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/SOUTH": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:2/MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM:5"
+    ]
+  },
+  "REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/EAST": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/NORTH_WEST"
+    ],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:3/MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM:0"
+    ]
+  },
+  "REGION_SHOAL_CAVE_LOW_TIDE_ICE_ROOM/MAIN": {
+    "parent_map": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
+    "locations": [
+      "ITEM_SHOAL_CAVE_ICE_ROOM_TM07",
+      "ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM:0/MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM:3"
+    ]
+  },
+  "REGION_UNDERWATER_SEAFLOOR_CAVERN/MAIN": {
+    "parent_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ENTRANCE/MAIN"
+    ],
+    "warps": [
+      "MAP_UNDERWATER_SEAFLOOR_CAVERN:0/MAP_UNDERWATER_ROUTE128:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ENTRANCE/MAIN": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_SEAFLOOR_CAVERN/MAIN"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ENTRANCE:0/MAP_UNDERWATER_ROUTE128:0!",
+      "MAP_SEAFLOOR_CAVERN_ENTRANCE:1/MAP_SEAFLOOR_CAVERN_ROOM1:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM1/NORTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM1",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM1/SOUTH"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM1:2/MAP_SEAFLOOR_CAVERN_ROOM2:0",
+      "MAP_SEAFLOOR_CAVERN_ROOM1:1/MAP_SEAFLOOR_CAVERN_ROOM5:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM1/SOUTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM1",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM1/NORTH"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM1:0/MAP_SEAFLOOR_CAVERN_ENTRANCE:1"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_WEST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_WEST",
+      "REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_EAST"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM2:1/MAP_SEAFLOOR_CAVERN_ROOM4:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_WEST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_WEST",
+      "REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_EAST",
+      "REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_EAST"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM2:2/MAP_SEAFLOOR_CAVERN_ROOM6:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_EAST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_WEST"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM2:0/MAP_SEAFLOOR_CAVERN_ROOM1:2"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_EAST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM2:3/MAP_SEAFLOOR_CAVERN_ROOM7:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM3/MAIN": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM3:2/MAP_SEAFLOOR_CAVERN_ROOM6:1",
+      "MAP_SEAFLOOR_CAVERN_ROOM3:0/MAP_SEAFLOOR_CAVERN_ROOM8:1",
+      "MAP_SEAFLOOR_CAVERN_ROOM3:1/MAP_SEAFLOOR_CAVERN_ROOM7:1"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM4/NORTH_WEST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM4",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM4/EAST"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM4:1/MAP_SEAFLOOR_CAVERN_ROOM5:1"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM4/EAST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM4",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM4/SOUTH"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM4:2/MAP_SEAFLOOR_CAVERN_ROOM5:2",
+      "MAP_SEAFLOOR_CAVERN_ROOM4:0/MAP_SEAFLOOR_CAVERN_ROOM2:1"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM4/SOUTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM4:3/MAP_SEAFLOOR_CAVERN_ENTRANCE:1!"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM5/NORTH_WEST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM5",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM5/EAST",
+      "REGION_SEAFLOOR_CAVERN_ROOM5/SOUTH_WEST"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM5:0/MAP_SEAFLOOR_CAVERN_ROOM1:1"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM5/EAST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM5",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM5/NORTH_WEST"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM5:1/MAP_SEAFLOOR_CAVERN_ROOM4:1"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM5/SOUTH_WEST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM5",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM5/NORTH_WEST"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM5:2/MAP_SEAFLOOR_CAVERN_ROOM4:2"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM6/NORTH_WEST": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM6",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM6/CAVE_ON_WATER"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM6:1/MAP_SEAFLOOR_CAVERN_ROOM3:2"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM6/CAVE_ON_WATER": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM6",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM6:2/MAP_SEAFLOOR_CAVERN_ENTRANCE:1!"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM6/SOUTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM6",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM6/NORTH_WEST",
+      "REGION_SEAFLOOR_CAVERN_ROOM6/CAVE_ON_WATER"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM6:0/MAP_SEAFLOOR_CAVERN_ROOM2:2"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM7/NORTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM7",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM7/SOUTH"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM7:1/MAP_SEAFLOOR_CAVERN_ROOM3:1"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM7/SOUTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM7",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM7/NORTH"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM7:0/MAP_SEAFLOOR_CAVERN_ROOM2:3"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM8/NORTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM8",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM8/SOUTH"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM8:0/MAP_SEAFLOOR_CAVERN_ROOM9:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM8/SOUTH": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM8",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEAFLOOR_CAVERN_ROOM8/NORTH"
+    ],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM8:1/MAP_SEAFLOOR_CAVERN_ROOM3:0"
+    ]
+  },
+  "REGION_SEAFLOOR_CAVERN_ROOM9/MAIN": {
+    "parent_map": "MAP_SEAFLOOR_CAVERN_ROOM9",
+    "locations": [
+      "ITEM_SEAFLOOR_CAVERN_ROOM_9_TM26"
+    ],
+    "events": [
+      "EVENT_RELEASE_KYOGRE"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_SEAFLOOR_CAVERN_ROOM9:0/MAP_SEAFLOOR_CAVERN_ROOM8:0"
+    ]
+  },
+  "REGION_CAVE_OF_ORIGIN_ENTRANCE/MAIN": {
+    "parent_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_CAVE_OF_ORIGIN_ENTRANCE:0/MAP_SOOTOPOLIS_CITY:3",
+      "MAP_CAVE_OF_ORIGIN_ENTRANCE:1/MAP_CAVE_OF_ORIGIN_1F:0"
+    ]
+  },
+  "REGION_CAVE_OF_ORIGIN_1F/MAIN": {
+    "parent_map": "MAP_CAVE_OF_ORIGIN_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_CAVE_OF_ORIGIN_1F:0/MAP_CAVE_OF_ORIGIN_ENTRANCE:1",
+      "MAP_CAVE_OF_ORIGIN_1F:1/MAP_CAVE_OF_ORIGIN_B1F:0"
+    ]
+  },
+  "REGION_CAVE_OF_ORIGIN_B1F/MAIN": {
+    "parent_map": "MAP_CAVE_OF_ORIGIN_B1F",
+    "locations": [],
+    "events": [
+      "EVENT_WALLACE_GOES_TO_SKY_PILLAR"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_CAVE_OF_ORIGIN_B1F:0/MAP_CAVE_OF_ORIGIN_1F:1"
+    ]
+  },
+  "REGION_SKY_PILLAR_ENTRANCE/MAIN": {
+    "parent_map": "MAP_SKY_PILLAR_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_ENTRANCE:0/MAP_ROUTE131:0",
+      "MAP_SKY_PILLAR_ENTRANCE:1/MAP_SKY_PILLAR_OUTSIDE:0"
+    ]
+  },
+  "REGION_SKY_PILLAR_OUTSIDE/MAIN": {
+    "parent_map": "MAP_SKY_PILLAR_OUTSIDE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_OUTSIDE:0/MAP_SKY_PILLAR_ENTRANCE:1",
+      "MAP_SKY_PILLAR_OUTSIDE:1/MAP_SKY_PILLAR_1F:0"
+    ]
+  },
+  "REGION_SKY_PILLAR_1F/MAIN": {
+    "parent_map": "MAP_SKY_PILLAR_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_1F:0,1/MAP_SKY_PILLAR_OUTSIDE:1",
+      "MAP_SKY_PILLAR_1F:2/MAP_SKY_PILLAR_2F:0"
+    ]
+  },
+  "REGION_SKY_PILLAR_2F/LEFT": {
+    "parent_map": "MAP_SKY_PILLAR_2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SKY_PILLAR_2F/RIGHT",
+      "REGION_SKY_PILLAR_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_SKY_PILLAR_2F:1/MAP_SKY_PILLAR_3F:0"
+    ]
+  },
+  "REGION_SKY_PILLAR_2F/RIGHT": {
+    "parent_map": "MAP_SKY_PILLAR_2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SKY_PILLAR_2F/LEFT",
+      "REGION_SKY_PILLAR_1F/MAIN"
+    ],
+    "warps": [
+      "MAP_SKY_PILLAR_2F:0/MAP_SKY_PILLAR_1F:2"
+    ]
+  },
+  "REGION_SKY_PILLAR_3F/MAIN": {
+    "parent_map": "MAP_SKY_PILLAR_3F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_3F:0/MAP_SKY_PILLAR_2F:1",
+      "MAP_SKY_PILLAR_3F:1/MAP_SKY_PILLAR_4F:0"
+    ]
+  },
+  "REGION_SKY_PILLAR_3F/TOP_CENTER": {
+    "parent_map": "MAP_SKY_PILLAR_3F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_3F:2/MAP_SKY_PILLAR_4F:1"
+    ]
+  },
+  "REGION_SKY_PILLAR_4F/MAIN": {
+    "parent_map": "MAP_SKY_PILLAR_4F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SKY_PILLAR_4F/ABOVE_3F_TOP_CENTER",
+      "REGION_SKY_PILLAR_3F/MAIN"
+    ],
+    "warps": [
+      "MAP_SKY_PILLAR_4F:0/MAP_SKY_PILLAR_3F:1"
+    ]
+  },
+  "REGION_SKY_PILLAR_4F/ABOVE_3F_TOP_CENTER": {
+    "parent_map": "MAP_SKY_PILLAR_4F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SKY_PILLAR_3F/TOP_CENTER"
+    ],
+    "warps": []
+  },
+  "REGION_SKY_PILLAR_4F/TOP_LEFT": {
+    "parent_map": "MAP_SKY_PILLAR_4F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_4F:1/MAP_SKY_PILLAR_3F:2",
+      "MAP_SKY_PILLAR_4F:2/MAP_SKY_PILLAR_5F:0"
+    ]
+  },
+  "REGION_SKY_PILLAR_5F/MAIN": {
+    "parent_map": "MAP_SKY_PILLAR_5F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_5F:0/MAP_SKY_PILLAR_4F:2",
+      "MAP_SKY_PILLAR_5F:1/MAP_SKY_PILLAR_TOP:0"
+    ]
+  },
+  "REGION_SKY_PILLAR_TOP/MAIN": {
+    "parent_map": "MAP_SKY_PILLAR_TOP",
+    "locations": [],
+    "events": [
+      "EVENT_WAKE_RAYQUAZA"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_SKY_PILLAR_TOP:0/MAP_SKY_PILLAR_5F:1"
+    ]
+  },
+  "REGION_UNDERWATER_SEALED_CHAMBER/MAIN": {
+    "parent_map": "MAP_UNDERWATER_SEALED_CHAMBER",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SEALED_CHAMBER_OUTER_ROOM/MAIN"
+    ],
+    "warps": [
+      "MAP_UNDERWATER_SEALED_CHAMBER:0/MAP_UNDERWATER_ROUTE134:0"
+    ]
+  },
+  "REGION_SEALED_CHAMBER_OUTER_ROOM/MAIN": {
+    "parent_map": "MAP_SEALED_CHAMBER_OUTER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_SEALED_CHAMBER/MAIN"
+    ],
+    "warps": [
+      "MAP_SEALED_CHAMBER_OUTER_ROOM:0/MAP_SEALED_CHAMBER_INNER_ROOM:0"
+    ]
+  },
+  "REGION_SEALED_CHAMBER_INNER_ROOM/MAIN": {
+    "parent_map": "MAP_SEALED_CHAMBER_INNER_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SEALED_CHAMBER_INNER_ROOM:0/MAP_SEALED_CHAMBER_OUTER_ROOM:0"
+    ]
+  },
+  "REGION_VICTORY_ROAD_1F/NORTH_EAST": {
+    "parent_map": "MAP_VICTORY_ROAD_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VICTORY_ROAD_1F:1/MAP_EVER_GRANDE_CITY:3",
+      "MAP_VICTORY_ROAD_1F:2/MAP_VICTORY_ROAD_B1F:5"
+    ]
+  },
+  "REGION_VICTORY_ROAD_1F/SOUTH_WEST": {
+    "parent_map": "MAP_VICTORY_ROAD_1F",
+    "locations": [
+      "ITEM_VICTORY_ROAD_1F_MAX_ELIXIR"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VICTORY_ROAD_1F:0/MAP_EVER_GRANDE_CITY:2",
+      "MAP_VICTORY_ROAD_1F:4/MAP_VICTORY_ROAD_B1F:4"
+    ]
+  },
+  "REGION_VICTORY_ROAD_1F/SOUTH_EAST": {
+    "parent_map": "MAP_VICTORY_ROAD_1F",
+    "locations": [
+      "ITEM_VICTORY_ROAD_1F_PP_UP",
+      "HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VICTORY_ROAD_1F:3/MAP_VICTORY_ROAD_B1F:2"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B1F/NORTH_EAST": {
+    "parent_map": "MAP_VICTORY_ROAD_B1F",
+    "locations": [
+      "ITEM_VICTORY_ROAD_B1F_TM29"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_VICTORY_ROAD_B1F:3/MAP_VICTORY_ROAD_B2F:1"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B1F/SOUTH_WEST_MAIN": {
+    "parent_map": "MAP_VICTORY_ROAD_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B1F/SOUTH_WEST_LADDER_UP"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B1F:1/MAP_VICTORY_ROAD_B2F:2",
+      "MAP_VICTORY_ROAD_B1F:6/MAP_VICTORY_ROAD_B2F:3"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B1F/SOUTH_WEST_LADDER_UP": {
+    "parent_map": "MAP_VICTORY_ROAD_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B1F/SOUTH_WEST_MAIN"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B1F:5/MAP_VICTORY_ROAD_1F:2"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B1F/MAIN_UPPER": {
+    "parent_map": "MAP_VICTORY_ROAD_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B1F/MAIN_LOWER_EAST"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B1F:2/MAP_VICTORY_ROAD_1F:3"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B1F/MAIN_LOWER_EAST": {
+    "parent_map": "MAP_VICTORY_ROAD_B1F",
+    "locations": [
+      "ITEM_VICTORY_ROAD_B1F_FULL_RESTORE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B1F/MAIN_LOWER_WEST"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B1F:0/MAP_VICTORY_ROAD_B2F:0"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B1F/MAIN_LOWER_WEST": {
+    "parent_map": "MAP_VICTORY_ROAD_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B1F/MAIN_UPPER",
+      "REGION_VICTORY_ROAD_B1F/MAIN_LOWER_EAST"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B1F:4/MAP_VICTORY_ROAD_1F:4"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B2F/LOWER_WEST": {
+    "parent_map": "MAP_VICTORY_ROAD_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B2F/LOWER_WEST_WATER"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B2F:3/MAP_VICTORY_ROAD_B1F:6"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B2F/LOWER_WEST_ISLAND": {
+    "parent_map": "MAP_VICTORY_ROAD_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B2F/LOWER_WEST_WATER"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B2F:2/MAP_VICTORY_ROAD_B1F:1"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B2F/LOWER_EAST": {
+    "parent_map": "MAP_VICTORY_ROAD_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B2F/LOWER_EAST_WATER"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B2F:0/MAP_VICTORY_ROAD_B1F:0"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B2F/LOWER_WEST_WATER": {
+    "parent_map": "MAP_VICTORY_ROAD_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B2F/UPPER_WATER",
+      "REGION_VICTORY_ROAD_B2F/LOWER_WEST",
+      "REGION_VICTORY_ROAD_B2F/LOWER_WEST_ISLAND"
+    ],
+    "warps": []
+  },
+  "REGION_VICTORY_ROAD_B2F/LOWER_EAST_WATER": {
+    "parent_map": "MAP_VICTORY_ROAD_B2F",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B2F/UPPER_WATER",
+      "REGION_VICTORY_ROAD_B2F/UPPER",
+      "REGION_VICTORY_ROAD_B2F/LOWER_EAST"
+    ],
+    "warps": []
+  },
+  "REGION_VICTORY_ROAD_B2F/UPPER": {
+    "parent_map": "MAP_VICTORY_ROAD_B2F",
+    "locations": [
+      "HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B2F/LOWER_EAST_WATER",
+      "REGION_VICTORY_ROAD_B2F/LOWER_EAST",
+      "REGION_VICTORY_ROAD_B2F/UPPER_WATER"
+    ],
+    "warps": [
+      "MAP_VICTORY_ROAD_B2F:1/MAP_VICTORY_ROAD_B1F:3"
+    ]
+  },
+  "REGION_VICTORY_ROAD_B2F/UPPER_WATER": {
+    "parent_map": "MAP_VICTORY_ROAD_B2F",
+    "locations": [
+      "ITEM_VICTORY_ROAD_B2F_FULL_HEAL",
+      "HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_VICTORY_ROAD_B2F/LOWER_WEST_WATER",
+      "REGION_VICTORY_ROAD_B2F/LOWER_EAST_WATER",
+      "REGION_VICTORY_ROAD_B2F/UPPER"
+    ],
+    "warps": []
+  }
+}
diff --git a/worlds/pokemon_emerald/data/regions/routes.json b/worlds/pokemon_emerald/data/regions/routes.json
new file mode 100644
index 0000000000..f4b8d935c3
--- /dev/null
+++ b/worlds/pokemon_emerald/data/regions/routes.json
@@ -0,0 +1,1890 @@
+{
+  "REGION_ROUTE101/MAIN": {
+    "parent_map": "MAP_ROUTE101",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LITTLEROOT_TOWN/MAIN",
+      "REGION_OLDALE_TOWN/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE102/MAIN": {
+    "parent_map": "MAP_ROUTE102",
+    "locations": [
+      "ITEM_ROUTE_102_POTION"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_OLDALE_TOWN/MAIN",
+      "REGION_PETALBURG_CITY/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE103/WEST": {
+    "parent_map": "MAP_ROUTE103",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE103/WATER",
+      "REGION_OLDALE_TOWN/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE103/WATER": {
+    "parent_map": "MAP_ROUTE103",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE103/WEST",
+      "REGION_ROUTE103/EAST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE103/EAST": {
+    "parent_map": "MAP_ROUTE103",
+    "locations": [
+      "ITEM_ROUTE_103_GUARD_SPEC",
+      "ITEM_ROUTE_103_PP_UP"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE103/WATER",
+      "REGION_ROUTE110/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE103:0/MAP_ALTERING_CAVE:0"
+    ]
+  },
+  "REGION_ROUTE104/SOUTH": {
+    "parent_map": "MAP_ROUTE104",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_104_POTION",
+      "HIDDEN_ITEM_ROUTE_104_HEART_SCALE",
+      "HIDDEN_ITEM_ROUTE_104_ANTIDOTE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_PETALBURG_CITY/MAIN",
+      "REGION_ROUTE105/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE104:0/MAP_ROUTE104_MR_BRINEYS_HOUSE:0",
+      "MAP_ROUTE104:4,5/MAP_PETALBURG_WOODS:2,3"
+    ]
+  },
+  "REGION_ROUTE104/SOUTH_LEDGE": {
+    "parent_map": "MAP_ROUTE104",
+    "locations": [
+      "ITEM_ROUTE_104_POKE_BALL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE104/SOUTH"
+    ],
+    "warps": [
+      "MAP_ROUTE104:6,7/MAP_PETALBURG_WOODS:4,5"
+    ]
+  },
+  "REGION_ROUTE104/NORTH": {
+    "parent_map": "MAP_ROUTE104",
+    "locations": [
+      "ITEM_ROUTE_104_PP_UP",
+      "ITEM_ROUTE_104_POTION",
+      "ITEM_ROUTE_104_X_ACCURACY",
+      "HIDDEN_ITEM_ROUTE_104_SUPER_POTION",
+      "HIDDEN_ITEM_ROUTE_104_POKE_BALL",
+      "NPC_GIFT_RECEIVED_TM09",
+      "NPC_GIFT_RECEIVED_WHITE_HERB",
+      "NPC_GIFT_RECEIVED_CHESTO_BERRY_ROUTE_104"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_RUSTBORO_CITY/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE104:1/MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP:0",
+      "MAP_ROUTE104:2,3/MAP_PETALBURG_WOODS:0,1"
+    ]
+  },
+  "REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE104_MR_BRINEYS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_DEWFORD_TOWN/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE104_MR_BRINEYS_HOUSE:0,1/MAP_ROUTE104:0"
+    ]
+  },
+  "REGION_ROUTE104_PRETTY_PETAL_FLOWER_SHOP/MAIN": {
+    "parent_map": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
+    "locations": [
+      "NPC_GIFT_RECEIVED_WAILMER_PAIL"
+    ],
+    "events": [
+      "EVENT_MEET_FLOWER_SHOP_OWNER"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP:0,1/MAP_ROUTE104:1"
+    ]
+  },
+  "REGION_ROUTE105/MAIN": {
+    "parent_map": "MAP_ROUTE105",
+    "locations": [
+      "ITEM_ROUTE_105_IRON",
+      "HIDDEN_ITEM_ROUTE_105_HEART_SCALE",
+      "HIDDEN_ITEM_ROUTE_105_BIG_PEARL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE104/SOUTH",
+      "REGION_ROUTE106/SEA",
+      "REGION_UNDERWATER_ROUTE105/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE105:0/MAP_ISLAND_CAVE:0"
+    ]
+  },
+  "REGION_UNDERWATER_ROUTE105/MAIN": {
+    "parent_map": "MAP_UNDERWATER_ROUTE105",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE105/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE106/WEST": {
+    "parent_map": "MAP_ROUTE106",
+    "locations": [
+      "ITEM_ROUTE_106_PROTEIN"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE106/SEA"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE106/SEA": {
+    "parent_map": "MAP_ROUTE106",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE105/MAIN",
+      "REGION_ROUTE106/EAST",
+      "REGION_ROUTE106/WEST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE106/EAST": {
+    "parent_map": "MAP_ROUTE106",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_106_POKE_BALL",
+      "HIDDEN_ITEM_ROUTE_106_STARDUST",
+      "HIDDEN_ITEM_ROUTE_106_HEART_SCALE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE106/SEA",
+      "REGION_DEWFORD_TOWN/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE106:0/MAP_GRANITE_CAVE_1F:0"
+    ]
+  },
+  "REGION_ROUTE107/MAIN": {
+    "parent_map": "MAP_ROUTE107",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_DEWFORD_TOWN/MAIN",
+      "REGION_ROUTE108/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE108/MAIN": {
+    "parent_map": "MAP_ROUTE108",
+    "locations": [
+      "ITEM_ROUTE_108_STAR_PIECE",
+      "HIDDEN_ITEM_ROUTE_108_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE107/MAIN",
+      "REGION_ROUTE109/SEA"
+    ],
+    "warps": [
+      "MAP_ROUTE108:0/MAP_ABANDONED_SHIP_DECK:0"
+    ]
+  },
+  "REGION_ROUTE109/SEA": {
+    "parent_map": "MAP_ROUTE109",
+    "locations": [
+      "ITEM_ROUTE_109_PP_UP",
+      "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE109/BEACH",
+      "REGION_ROUTE108/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE109/BEACH": {
+    "parent_map": "MAP_ROUTE109",
+    "locations": [
+      "ITEM_ROUTE_109_POTION",
+      "HIDDEN_ITEM_ROUTE_109_REVIVE",
+      "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1",
+      "HIDDEN_ITEM_ROUTE_109_GREAT_BALL",
+      "HIDDEN_ITEM_ROUTE_109_ETHER",
+      "HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2",
+      "NPC_GIFT_RECEIVED_SOFT_SAND"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE109/SEA",
+      "REGION_SLATEPORT_CITY/MAIN",
+      "REGION_DEWFORD_TOWN/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE109:0/MAP_ROUTE109_SEASHORE_HOUSE:0"
+    ]
+  },
+  "REGION_ROUTE109_SEASHORE_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE109_SEASHORE_HOUSE",
+    "locations": [
+      "NPC_GIFT_RECEIVED_6_SODA_POP"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE109_SEASHORE_HOUSE:0,1/MAP_ROUTE109:0"
+    ]
+  },
+  "REGION_ROUTE110/MAIN": {
+    "parent_map": "MAP_ROUTE110",
+    "locations": [
+      "ITEM_ROUTE_110_DIRE_HIT",
+      "ITEM_ROUTE_110_ELIXIR",
+      "HIDDEN_ITEM_ROUTE_110_REVIVE",
+      "HIDDEN_ITEM_ROUTE_110_GREAT_BALL",
+      "HIDDEN_ITEM_ROUTE_110_POKE_BALL",
+      "HIDDEN_ITEM_ROUTE_110_FULL_HEAL",
+      "NPC_GIFT_RECEIVED_ITEMFINDER"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110/SOUTH",
+      "REGION_ROUTE110/SOUTH_WATER",
+      "REGION_ROUTE110/NORTH_WATER",
+      "REGION_MAUVILLE_CITY/MAIN",
+      "REGION_ROUTE103/EAST"
+    ],
+    "warps": [
+      "MAP_ROUTE110:1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:0",
+      "MAP_ROUTE110:2/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:0"
+    ]
+  },
+  "REGION_ROUTE110/SOUTH": {
+    "parent_map": "MAP_ROUTE110",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110/MAIN",
+      "REGION_SLATEPORT_CITY/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE110:4/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:0"
+    ]
+  },
+  "REGION_ROUTE110/CYCLING_ROAD": {
+    "parent_map": "MAP_ROUTE110",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110:3/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:2",
+      "MAP_ROUTE110:5/MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:2"
+    ]
+  },
+  "REGION_ROUTE110/SOUTH_WATER": {
+    "parent_map": "MAP_ROUTE110",
+    "locations": [
+      "ITEM_ROUTE_110_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE110/NORTH_WATER": {
+    "parent_map": "MAP_ROUTE110",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE110:0/MAP_NEW_MAUVILLE_ENTRANCE:0"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_ENTRANCE/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:0,1/MAP_ROUTE110:1",
+      "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE1/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2/MAP_ROUTE110_TRICK_HOUSE_END:0"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_END/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_END",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_END:1/MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:0",
+      "MAP_ROUTE110_TRICK_HOUSE_END:0/MAP_ROUTE110_TRICK_HOUSE_PUZZLE1:2"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_CORRIDOR/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:2,3/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR:0,1/MAP_ROUTE110_TRICK_HOUSE_END:1"
+    ]
+  },
+  "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE/WEST": {
+    "parent_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE/EAST"
+    ],
+    "warps": [
+      "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:0,1/MAP_ROUTE110:2"
+    ]
+  },
+  "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE/EAST": {
+    "parent_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE/WEST"
+    ],
+    "warps": [
+      "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE:2,3/MAP_ROUTE110:3"
+    ]
+  },
+  "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE/WEST": {
+    "parent_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE/EAST"
+    ],
+    "warps": [
+      "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:0,1/MAP_ROUTE110:4"
+    ]
+  },
+  "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE/EAST": {
+    "parent_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE/WEST"
+    ],
+    "warps": [
+      "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE:2,3/MAP_ROUTE110:5"
+    ]
+  },
+  "REGION_ROUTE111/MIDDLE": {
+    "parent_map": "MAP_ROUTE111",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE111/DESERT",
+      "REGION_ROUTE111/SOUTH",
+      "REGION_ROUTE112/SOUTH_EAST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE111/SOUTH": {
+    "parent_map": "MAP_ROUTE111",
+    "locations": [
+      "ITEM_ROUTE_111_ELIXIR"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE111/SOUTH_POND",
+      "REGION_ROUTE111/MIDDLE",
+      "REGION_MAUVILLE_CITY/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE111:0/MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE:0",
+      "MAP_ROUTE111:4/MAP_TRAINER_HILL_ENTRANCE:0"
+    ]
+  },
+  "REGION_ROUTE111/SOUTH_POND": {
+    "parent_map": "MAP_ROUTE111",
+    "locations": [
+      "ITEM_ROUTE_111_HP_UP"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE111/SOUTH"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE111/DESERT": {
+    "parent_map": "MAP_ROUTE111",
+    "locations": [
+      "ITEM_ROUTE_111_TM37",
+      "ITEM_ROUTE_111_STARDUST",
+      "HIDDEN_ITEM_ROUTE_111_STARDUST",
+      "HIDDEN_ITEM_ROUTE_111_PROTEIN",
+      "HIDDEN_ITEM_ROUTE_111_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE111/NORTH",
+      "REGION_ROUTE111/MIDDLE"
+    ],
+    "warps": [
+      "MAP_ROUTE111:1/MAP_DESERT_RUINS:0",
+      "MAP_ROUTE111:3/MAP_MIRAGE_TOWER_1F:0"
+    ]
+  },
+  "REGION_ROUTE111/NORTH": {
+    "parent_map": "MAP_ROUTE111",
+    "locations": [
+      "NPC_GIFT_RECEIVED_SECRET_POWER"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE113/MAIN",
+      "REGION_ROUTE112/NORTH",
+      "REGION_ROUTE111/DESERT"
+    ],
+    "warps": [
+      "MAP_ROUTE111:2/MAP_ROUTE111_OLD_LADYS_REST_STOP:0"
+    ]
+  },
+  "REGION_ROUTE111_OLD_LADYS_REST_STOP/MAIN": {
+    "parent_map": "MAP_ROUTE111_OLD_LADYS_REST_STOP",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE111_OLD_LADYS_REST_STOP:0,1/MAP_ROUTE111:2"
+    ]
+  },
+  "REGION_ROUTE111_WINSTRATE_FAMILYS_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE",
+    "locations": [
+      "NPC_GIFT_RECEIVED_MACHO_BRACE"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE:0,1/MAP_ROUTE111:0"
+    ]
+  },
+  "REGION_ROUTE112/SOUTH_EAST": {
+    "parent_map": "MAP_ROUTE112",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE112/CABLE_CAR_STATION_ENTRANCE",
+      "REGION_ROUTE111/MIDDLE"
+    ],
+    "warps": [
+      "MAP_ROUTE112:4/MAP_FIERY_PATH:0"
+    ]
+  },
+  "REGION_ROUTE112/CABLE_CAR_STATION_ENTRANCE": {
+    "parent_map": "MAP_ROUTE112",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE112/SOUTH_EAST"
+    ],
+    "warps": [
+      "MAP_ROUTE112:0,1/MAP_ROUTE112_CABLE_CAR_STATION:0,1"
+    ]
+  },
+  "REGION_ROUTE112/SOUTH_WEST": {
+    "parent_map": "MAP_ROUTE112",
+    "locations": [
+      "ITEM_ROUTE_112_NUGGET"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE112/SOUTH_EAST",
+      "REGION_LAVARIDGE_TOWN/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE112:2,3/MAP_JAGGED_PASS:0,1"
+    ]
+  },
+  "REGION_ROUTE112/NORTH": {
+    "parent_map": "MAP_ROUTE112",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE111/NORTH"
+    ],
+    "warps": [
+      "MAP_ROUTE112:5/MAP_FIERY_PATH:1"
+    ]
+  },
+  "REGION_ROUTE112_CABLE_CAR_STATION/MAIN": {
+    "parent_map": "MAP_ROUTE112_CABLE_CAR_STATION",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MT_CHIMNEY_CABLE_CAR_STATION/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE112_CABLE_CAR_STATION:0,1/MAP_ROUTE112:0,1"
+    ]
+  },
+  "REGION_MT_CHIMNEY_CABLE_CAR_STATION/MAIN": {
+    "parent_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE112_CABLE_CAR_STATION/MAIN"
+    ],
+    "warps": [
+      "MAP_MT_CHIMNEY_CABLE_CAR_STATION:0,1/MAP_MT_CHIMNEY:0,1"
+    ]
+  },
+  "REGION_MT_CHIMNEY/MAIN": {
+    "parent_map": "MAP_MT_CHIMNEY",
+    "locations": [
+      "NPC_GIFT_RECEIVED_METEORITE"
+    ],
+    "events": [
+      "EVENT_RECOVER_METEORITE"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_MT_CHIMNEY:0,1/MAP_MT_CHIMNEY_CABLE_CAR_STATION:0,1",
+      "MAP_MT_CHIMNEY:2,3/MAP_JAGGED_PASS:2,3"
+    ]
+  },
+  "REGION_JAGGED_PASS/TOP": {
+    "parent_map": "MAP_JAGGED_PASS",
+    "locations": [
+      "HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_JAGGED_PASS/MIDDLE"
+    ],
+    "warps": [
+      "MAP_JAGGED_PASS:2,3/MAP_MT_CHIMNEY:2,3"
+    ]
+  },
+  "REGION_JAGGED_PASS/MIDDLE": {
+    "parent_map": "MAP_JAGGED_PASS",
+    "locations": [
+      "ITEM_JAGGED_PASS_BURN_HEAL",
+      "HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_JAGGED_PASS/TOP",
+      "REGION_JAGGED_PASS/BOTTOM"
+    ],
+    "warps": [
+      "MAP_JAGGED_PASS:4/MAP_MAGMA_HIDEOUT_1F:0"
+    ]
+  },
+  "REGION_JAGGED_PASS/BOTTOM": {
+    "parent_map": "MAP_JAGGED_PASS",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_JAGGED_PASS/MIDDLE"
+    ],
+    "warps": [
+      "MAP_JAGGED_PASS:0,1/MAP_ROUTE112:2,3"
+    ]
+  },
+  "REGION_ROUTE113/MAIN": {
+    "parent_map": "MAP_ROUTE113",
+    "locations": [
+      "ITEM_ROUTE_113_MAX_ETHER",
+      "ITEM_ROUTE_113_SUPER_REPEL",
+      "ITEM_ROUTE_113_HYPER_POTION",
+      "HIDDEN_ITEM_ROUTE_113_ETHER",
+      "HIDDEN_ITEM_ROUTE_113_TM32",
+      "HIDDEN_ITEM_ROUTE_113_NUGGET"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_FALLARBOR_TOWN/MAIN",
+      "REGION_ROUTE111/NORTH"
+    ],
+    "warps": [
+      "MAP_ROUTE113:0/MAP_ROUTE113_GLASS_WORKSHOP:0"
+    ]
+  },
+  "REGION_ROUTE113_GLASS_WORKSHOP/MAIN": {
+    "parent_map": "MAP_ROUTE113_GLASS_WORKSHOP",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE113_GLASS_WORKSHOP:0,1/MAP_ROUTE113:0"
+    ]
+  },
+  "REGION_ROUTE114/MAIN": {
+    "parent_map": "MAP_ROUTE114",
+    "locations": [
+      "ITEM_ROUTE_114_PROTEIN",
+      "ITEM_ROUTE_114_ENERGY_POWDER",
+      "HIDDEN_ITEM_ROUTE_114_REVIVE",
+      "HIDDEN_ITEM_ROUTE_114_CARBOS",
+      "NPC_GIFT_RECEIVED_TM05"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE114/ABOVE_WATERFALL",
+      "REGION_FALLARBOR_TOWN/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE114:0/MAP_METEOR_FALLS_1F_1R:0",
+      "MAP_ROUTE114:1/MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:0",
+      "MAP_ROUTE114:2/MAP_ROUTE114_LANETTES_HOUSE:0"
+    ]
+  },
+  "REGION_ROUTE114/ABOVE_WATERFALL": {
+    "parent_map": "MAP_ROUTE114",
+    "locations": [
+      "ITEM_ROUTE_114_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE114/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE114_FOSSIL_MANIACS_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE",
+    "locations": [
+      "NPC_GIFT_RECEIVED_TM28"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:0,1/MAP_ROUTE114:1",
+      "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:2/MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:0"
+    ]
+  },
+  "REGION_ROUTE114_FOSSIL_MANIACS_TUNNEL/MAIN": {
+    "parent_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:0,1/MAP_ROUTE114_FOSSIL_MANIACS_HOUSE:2",
+      "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:2/MAP_DESERT_UNDERPASS:0"
+    ]
+  },
+  "REGION_DESERT_UNDERPASS/MAIN": {
+    "parent_map": "MAP_DESERT_UNDERPASS",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_DESERT_UNDERPASS:0/MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:2"
+    ]
+  },
+  "REGION_ROUTE114_LANETTES_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE114_LANETTES_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE114_LANETTES_HOUSE:0,1/MAP_ROUTE114:2"
+    ]
+  },
+  "REGION_ROUTE115/SOUTH_BELOW_LEDGE": {
+    "parent_map": "MAP_ROUTE115",
+    "locations": [
+      "ITEM_ROUTE_115_SUPER_POTION"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE115/SEA",
+      "REGION_RUSTBORO_CITY/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE115/SOUTH_BEACH_NEAR_CAVE": {
+    "parent_map": "MAP_ROUTE115",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_115_HEART_SCALE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE115/SOUTH_ABOVE_LEDGE",
+      "REGION_ROUTE115/SEA"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE115/SOUTH_ABOVE_LEDGE": {
+    "parent_map": "MAP_ROUTE115",
+    "locations": [
+      "ITEM_ROUTE_115_PP_UP"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE115/SOUTH_BEACH_NEAR_CAVE",
+      "REGION_ROUTE115/SOUTH_BELOW_LEDGE",
+      "REGION_ROUTE115/SOUTH_BEHIND_ROCK"
+    ],
+    "warps": [
+      "MAP_ROUTE115:0/MAP_METEOR_FALLS_1F_1R:1"
+    ]
+  },
+  "REGION_ROUTE115/SOUTH_BEHIND_ROCK": {
+    "parent_map": "MAP_ROUTE115",
+    "locations": [
+      "ITEM_ROUTE_115_GREAT_BALL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE115/SOUTH_ABOVE_LEDGE"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE115/NORTH_BELOW_SLOPE": {
+    "parent_map": "MAP_ROUTE115",
+    "locations": [
+      "ITEM_ROUTE_115_HEAL_POWDER",
+      "ITEM_ROUTE_115_TM01"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE115/NORTH_ABOVE_SLOPE",
+      "REGION_ROUTE115/SEA"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE115/NORTH_ABOVE_SLOPE": {
+    "parent_map": "MAP_ROUTE115",
+    "locations": [
+      "ITEM_ROUTE_115_IRON"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE115/NORTH_BELOW_SLOPE"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE115/SEA": {
+    "parent_map": "MAP_ROUTE115",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE115/SOUTH_BELOW_LEDGE",
+      "REGION_ROUTE115/SOUTH_BEACH_NEAR_CAVE",
+      "REGION_ROUTE115/NORTH_BELOW_SLOPE"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE116/WEST": {
+    "parent_map": "MAP_ROUTE116",
+    "locations": [
+      "ITEM_ROUTE_116_REPEL",
+      "ITEM_ROUTE_116_X_SPECIAL",
+      "NPC_GIFT_RECEIVED_REPEAT_BALL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE116/WEST_ABOVE_LEDGE",
+      "REGION_RUSTBORO_CITY/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE116:0/MAP_RUSTURF_TUNNEL:0",
+      "MAP_ROUTE116:1/MAP_ROUTE116_TUNNELERS_REST_HOUSE:0"
+    ]
+  },
+  "REGION_ROUTE116/WEST_ABOVE_LEDGE": {
+    "parent_map": "MAP_ROUTE116",
+    "locations": [
+      "ITEM_ROUTE_116_ETHER",
+      "ITEM_ROUTE_116_POTION",
+      "HIDDEN_ITEM_ROUTE_116_SUPER_POTION"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE116/WEST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE116/EAST": {
+    "parent_map": "MAP_ROUTE116",
+    "locations": [
+      "ITEM_ROUTE_116_HP_UP",
+      "HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE116:2/MAP_RUSTURF_TUNNEL:2"
+    ]
+  },
+  "REGION_ROUTE116_TUNNELERS_REST_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE116_TUNNELERS_REST_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE116_TUNNELERS_REST_HOUSE:0,1/MAP_ROUTE116:1"
+    ]
+  },
+  "REGION_ROUTE117/MAIN": {
+    "parent_map": "MAP_ROUTE117",
+    "locations": [
+      "ITEM_ROUTE_117_GREAT_BALL",
+      "ITEM_ROUTE_117_REVIVE",
+      "HIDDEN_ITEM_ROUTE_117_REPEL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_VERDANTURF_TOWN/MAIN",
+      "REGION_MAUVILLE_CITY/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE117:0/MAP_ROUTE117_POKEMON_DAY_CARE:0"
+    ]
+  },
+  "REGION_ROUTE117_POKEMON_DAY_CARE/MAIN": {
+    "parent_map": "MAP_ROUTE117_POKEMON_DAY_CARE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE117_POKEMON_DAY_CARE:0,1/MAP_ROUTE117:0"
+    ]
+  },
+  "REGION_ROUTE118/WEST": {
+    "parent_map": "MAP_ROUTE118",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_118_HEART_SCALE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_MAUVILLE_CITY/MAIN",
+      "REGION_ROUTE118/WATER"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE118/WATER": {
+    "parent_map": "MAP_ROUTE118",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE118/WEST",
+      "REGION_ROUTE118/EAST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE118/EAST": {
+    "parent_map": "MAP_ROUTE118",
+    "locations": [
+      "ITEM_ROUTE_118_HYPER_POTION",
+      "HIDDEN_ITEM_ROUTE_118_IRON",
+      "NPC_GIFT_RECEIVED_GOOD_ROD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE118/WATER",
+      "REGION_ROUTE119/LOWER",
+      "REGION_ROUTE123/WEST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE119/LOWER": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [
+      "ITEM_ROUTE_119_SUPER_REPEL",
+      "ITEM_ROUTE_119_HYPER_POTION_1",
+      "HIDDEN_ITEM_ROUTE_119_FULL_HEAL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/MIDDLE",
+      "REGION_ROUTE119/LOWER_ACROSS_WATER",
+      "REGION_ROUTE119/LOWER_ACROSS_RAILS",
+      "REGION_ROUTE118/EAST"
+    ],
+    "warps": [
+      "MAP_ROUTE119:1/MAP_ROUTE119_HOUSE:0"
+    ]
+  },
+  "REGION_ROUTE119/LOWER_ACROSS_WATER": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [
+      "ITEM_ROUTE_119_ZINC"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/LOWER"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE119/LOWER_ACROSS_RAILS": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_119_CALCIUM"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/LOWER"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE119/MIDDLE": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [
+      "ITEM_ROUTE_119_ELIXIR_1",
+      "ITEM_ROUTE_119_HYPER_POTION_2"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/LOWER",
+      "REGION_ROUTE119/UPPER"
+    ],
+    "warps": [
+      "MAP_ROUTE119:0/MAP_ROUTE119_WEATHER_INSTITUTE_1F:0"
+    ]
+  },
+  "REGION_ROUTE119/MIDDLE_RIVER": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [
+      "ITEM_ROUTE_119_LEAF_STONE",
+      "HIDDEN_ITEM_ROUTE_119_ULTRA_BALL",
+      "HIDDEN_ITEM_ROUTE_119_MAX_ETHER"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/UPPER",
+      "REGION_ROUTE119/ABOVE_WATERFALL"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE119/UPPER": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [
+      "ITEM_ROUTE_119_ELIXIR_2",
+      "NPC_GIFT_RECEIVED_HM02"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/MIDDLE",
+      "REGION_ROUTE119/MIDDLE_RIVER",
+      "REGION_FORTREE_CITY/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE119/ABOVE_WATERFALL": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/MIDDLE_RIVER",
+      "REGION_ROUTE119/ABOVE_WATERFALL_ACROSS_RAILS"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE119/ABOVE_WATERFALL_ACROSS_RAILS": {
+    "parent_map": "MAP_ROUTE119",
+    "locations": [
+      "ITEM_ROUTE_119_RARE_CANDY",
+      "ITEM_ROUTE_119_NUGGET"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE119/ABOVE_WATERFALL"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE119_WEATHER_INSTITUTE_1F/MAIN": {
+    "parent_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE119_WEATHER_INSTITUTE_1F:0,1/MAP_ROUTE119:0",
+      "MAP_ROUTE119_WEATHER_INSTITUTE_1F:2/MAP_ROUTE119_WEATHER_INSTITUTE_2F:0"
+    ]
+  },
+  "REGION_ROUTE119_WEATHER_INSTITUTE_2F/MAIN": {
+    "parent_map": "MAP_ROUTE119_WEATHER_INSTITUTE_2F",
+    "locations": [],
+    "events": [
+      "EVENT_DEFEAT_SHELLY"
+    ],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE119_WEATHER_INSTITUTE_2F:0/MAP_ROUTE119_WEATHER_INSTITUTE_1F:2"
+    ]
+  },
+  "REGION_ROUTE119_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE119_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE119_HOUSE:0,1/MAP_ROUTE119:1"
+    ]
+  },
+  "REGION_ROUTE120/NORTH": {
+    "parent_map": "MAP_ROUTE120",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1",
+      "HIDDEN_ITEM_ROUTE_120_REVIVE",
+      "NPC_GIFT_RECEIVED_DEVON_SCOPE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_FORTREE_CITY/MAIN",
+      "REGION_ROUTE120/NORTH_POND_SHORE",
+      "REGION_ROUTE120/SOUTH"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE120/NORTH_POND_SHORE": {
+    "parent_map": "MAP_ROUTE120",
+    "locations": [
+      "ITEM_ROUTE_120_NEST_BALL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE120/NORTH",
+      "REGION_ROUTE120/NORTH_POND"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE120/NORTH_POND": {
+    "parent_map": "MAP_ROUTE120",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE120/NORTH_POND_SHORE"
+    ],
+    "warps": [
+      "MAP_ROUTE120:1/MAP_SCORCHED_SLAB:0"
+    ]
+  },
+  "REGION_ROUTE120/SOUTH": {
+    "parent_map": "MAP_ROUTE120",
+    "locations": [
+      "ITEM_ROUTE_120_NUGGET",
+      "ITEM_ROUTE_120_REVIVE",
+      "ITEM_ROUTE_120_HYPER_POTION",
+      "HIDDEN_ITEM_ROUTE_120_ZINC"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE120/NORTH",
+      "REGION_ROUTE120/SOUTH_PONDS",
+      "REGION_ROUTE121/WEST"
+    ],
+    "warps": [
+      "MAP_ROUTE120:0/MAP_ANCIENT_TOMB:0"
+    ]
+  },
+  "REGION_ROUTE120/SOUTH_PONDS": {
+    "parent_map": "MAP_ROUTE120",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2",
+      "ITEM_ROUTE_120_FULL_HEAL"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": []
+  },
+  "REGION_ROUTE121/WEST": {
+    "parent_map": "MAP_ROUTE121",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_121_HP_UP"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE121/EAST",
+      "REGION_ROUTE120/SOUTH"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE121/EAST": {
+    "parent_map": "MAP_ROUTE121",
+    "locations": [
+      "ITEM_ROUTE_121_CARBOS",
+      "ITEM_ROUTE_121_REVIVE",
+      "ITEM_ROUTE_121_ZINC",
+      "HIDDEN_ITEM_ROUTE_121_NUGGET",
+      "HIDDEN_ITEM_ROUTE_121_FULL_HEAL",
+      "HIDDEN_ITEM_ROUTE_121_MAX_REVIVE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE121/WEST",
+      "REGION_ROUTE122/SEA",
+      "REGION_LILYCOVE_CITY/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE121:0/MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:2"
+    ]
+  },
+  "REGION_ROUTE121_SAFARI_ZONE_ENTRANCE/MAIN": {
+    "parent_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:0,1/MAP_SAFARI_ZONE_SOUTH:0",
+      "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:2,3/MAP_ROUTE121:0"
+    ]
+  },
+  "REGION_SAFARI_ZONE_NORTH/MAIN": {
+    "parent_map": "MAP_SAFARI_ZONE_NORTH",
+    "locations": [
+      "ITEM_SAFARI_ZONE_NORTH_CALCIUM"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SAFARI_ZONE_SOUTH/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_SAFARI_ZONE_NORTHWEST/MAIN": {
+    "parent_map": "MAP_SAFARI_ZONE_NORTHWEST",
+    "locations": [
+      "ITEM_SAFARI_ZONE_NORTH_WEST_TM22"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SAFARI_ZONE_SOUTHWEST/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_SAFARI_ZONE_NORTHEAST/MAIN": {
+    "parent_map": "MAP_SAFARI_ZONE_NORTHEAST",
+    "locations": [
+      "ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET",
+      "HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY",
+      "HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SAFARI_ZONE_SOUTHEAST/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_SAFARI_ZONE_SOUTH/MAIN": {
+    "parent_map": "MAP_SAFARI_ZONE_SOUTH",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SAFARI_ZONE_NORTH/MAIN",
+      "REGION_SAFARI_ZONE_SOUTHEAST/MAIN",
+      "REGION_SAFARI_ZONE_SOUTHWEST/MAIN"
+    ],
+    "warps": [
+      "MAP_SAFARI_ZONE_SOUTH:0/MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:0"
+    ]
+  },
+  "REGION_SAFARI_ZONE_SOUTHWEST/MAIN": {
+    "parent_map": "MAP_SAFARI_ZONE_SOUTHWEST",
+    "locations": [
+      "ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SAFARI_ZONE_SOUTH/MAIN",
+      "REGION_SAFARI_ZONE_NORTHWEST/MAIN"
+    ],
+    "warps": [
+      "MAP_SAFARI_ZONE_SOUTHWEST:0/MAP_SAFARI_ZONE_REST_HOUSE:0"
+    ]
+  },
+  "REGION_SAFARI_ZONE_SOUTHEAST/MAIN": {
+    "parent_map": "MAP_SAFARI_ZONE_SOUTHEAST",
+    "locations": [
+      "ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL",
+      "HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP",
+      "HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_SAFARI_ZONE_SOUTH/MAIN",
+      "REGION_SAFARI_ZONE_NORTHEAST/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_SAFARI_ZONE_REST_HOUSE/MAIN": {
+    "parent_map": "MAP_SAFARI_ZONE_REST_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SAFARI_ZONE_REST_HOUSE:0,1/MAP_SAFARI_ZONE_SOUTHWEST:0"
+    ]
+  },
+  "REGION_ROUTE122/SEA": {
+    "parent_map": "MAP_ROUTE122",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE122/MT_PYRE_ENTRANCE",
+      "REGION_ROUTE121/EAST",
+      "REGION_ROUTE123/EAST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE122/MT_PYRE_ENTRANCE": {
+    "parent_map": "MAP_ROUTE122",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE122/SEA"
+    ],
+    "warps": [
+      "MAP_ROUTE122:0/MAP_MT_PYRE_1F:0"
+    ]
+  },
+  "REGION_ROUTE123/WEST": {
+    "parent_map": "MAP_ROUTE123",
+    "locations": [
+      "ITEM_ROUTE_123_ULTRA_BALL",
+      "HIDDEN_ITEM_ROUTE_123_REVIVE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE118/EAST"
+    ],
+    "warps": [
+      "MAP_ROUTE123:0/MAP_ROUTE123_BERRY_MASTERS_HOUSE:0"
+    ]
+  },
+  "REGION_ROUTE123/EAST": {
+    "parent_map": "MAP_ROUTE123",
+    "locations": [
+      "ITEM_ROUTE_123_CALCIUM",
+      "ITEM_ROUTE_123_ELIXIR",
+      "ITEM_ROUTE_123_PP_UP",
+      "ITEM_ROUTE_123_REVIVAL_HERB",
+      "HIDDEN_ITEM_ROUTE_123_SUPER_REPEL",
+      "HIDDEN_ITEM_ROUTE_123_HYPER_POTION",
+      "NPC_GIFT_RECEIVED_TM19"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE123/WEST",
+      "REGION_ROUTE123/EAST_BEHIND_TREE",
+      "REGION_ROUTE122/SEA"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE123/EAST_BEHIND_TREE": {
+    "parent_map": "MAP_ROUTE123",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_123_PP_UP",
+      "HIDDEN_ITEM_ROUTE_123_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE123/EAST"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE123_BERRY_MASTERS_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE123_BERRY_MASTERS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE123_BERRY_MASTERS_HOUSE:0,1/MAP_ROUTE123:0"
+    ]
+  },
+  "REGION_ROUTE124/MAIN": {
+    "parent_map": "MAP_ROUTE124",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_LILYCOVE_CITY/MAIN",
+      "REGION_MOSSDEEP_CITY/MAIN",
+      "REGION_UNDERWATER_ROUTE124/BIG_AREA",
+      "REGION_UNDERWATER_ROUTE124/SMALL_AREA_1",
+      "REGION_UNDERWATER_ROUTE124/SMALL_AREA_2",
+      "REGION_UNDERWATER_ROUTE124/SMALL_AREA_3",
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_1",
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_2",
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_3",
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_4"
+    ],
+    "warps": [
+      "MAP_ROUTE124:0/MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE:0"
+    ]
+  },
+  "REGION_ROUTE124/NORTH_ENCLOSED_AREA_1": {
+    "parent_map": "MAP_ROUTE124",
+    "locations": [
+      "ITEM_ROUTE_124_RED_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_1"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE124/NORTH_ENCLOSED_AREA_2": {
+    "parent_map": "MAP_ROUTE124",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_1"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE124/NORTH_ENCLOSED_AREA_3": {
+    "parent_map": "MAP_ROUTE124",
+    "locations": [
+      "ITEM_ROUTE_124_YELLOW_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_2"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE124/SOUTH_ENCLOSED_AREA_1": {
+    "parent_map": "MAP_ROUTE124",
+    "locations": [
+      "ITEM_ROUTE_124_BLUE_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_3"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE124/SOUTH_ENCLOSED_AREA_2": {
+    "parent_map": "MAP_ROUTE124",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_3"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE124/SOUTH_ENCLOSED_AREA_3": {
+    "parent_map": "MAP_ROUTE124",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE126/NEAR_ROUTE_124",
+      "REGION_UNDERWATER_ROUTE124/TUNNEL_4"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/BIG_AREA": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/SMALL_AREA_1": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_124_PEARL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/SMALL_AREA_2": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/SMALL_AREA_3": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/TUNNEL_1": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_124_CALCIUM",
+      "HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/NORTH_ENCLOSED_AREA_1",
+      "REGION_ROUTE124/NORTH_ENCLOSED_AREA_2",
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/TUNNEL_2": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/NORTH_ENCLOSED_AREA_3",
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/TUNNEL_3": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_124_CARBOS"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/SOUTH_ENCLOSED_AREA_1",
+      "REGION_ROUTE124/SOUTH_ENCLOSED_AREA_2",
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE124/TUNNEL_4": {
+    "parent_map": "MAP_UNDERWATER_ROUTE124",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/SOUTH_ENCLOSED_AREA_3",
+      "REGION_ROUTE124/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE/MAIN": {
+    "parent_map": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE:0,1/MAP_ROUTE124:0"
+    ]
+  },
+  "REGION_ROUTE125/SEA": {
+    "parent_map": "MAP_ROUTE125",
+    "locations": [
+      "ITEM_ROUTE_125_BIG_PEARL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE125/SHOAL_CAVE_ENTRANCE",
+      "REGION_MOSSDEEP_CITY/MAIN",
+      "REGION_UNDERWATER_ROUTE125/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE125/SHOAL_CAVE_ENTRANCE": {
+    "parent_map": "MAP_ROUTE125",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE125/SEA"
+    ],
+    "warps": [
+      "MAP_ROUTE125:0/MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM:0"
+    ]
+  },
+  "REGION_UNDERWATER_ROUTE125/MAIN": {
+    "parent_map": "MAP_UNDERWATER_ROUTE125",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE125/SEA"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE126/MAIN": {
+    "parent_map": "MAP_ROUTE126",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE127/MAIN",
+      "REGION_UNDERWATER_ROUTE126/MAIN",
+      "REGION_UNDERWATER_ROUTE126/SMALL_AREA_2"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE126/NEAR_ROUTE_124": {
+    "parent_map": "MAP_ROUTE126",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE124/SOUTH_ENCLOSED_AREA_3",
+      "REGION_UNDERWATER_ROUTE126/TUNNEL"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE126/NORTH_WEST_CORNER": {
+    "parent_map": "MAP_ROUTE126",
+    "locations": [
+      "ITEM_ROUTE_126_GREEN_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE126/TUNNEL"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE126/WEST": {
+    "parent_map": "MAP_ROUTE126",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE126/SMALL_AREA_1",
+      "REGION_UNDERWATER_ROUTE126/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE126/MAIN": {
+    "parent_map": "MAP_UNDERWATER_ROUTE126",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE",
+      "HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL",
+      "HIDDEN_ITEM_UNDERWATER_126_STARDUST",
+      "HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE126/MAIN",
+      "REGION_ROUTE126/WEST"
+    ],
+    "warps": [
+      "MAP_UNDERWATER_ROUTE126:0/MAP_UNDERWATER_SOOTOPOLIS_CITY:0"
+    ]
+  },
+  "REGION_UNDERWATER_ROUTE126/TUNNEL": {
+    "parent_map": "MAP_UNDERWATER_ROUTE126",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE126/NORTH_WEST_CORNER",
+      "REGION_ROUTE126/NEAR_ROUTE_124"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE126/SMALL_AREA_1": {
+    "parent_map": "MAP_UNDERWATER_ROUTE126",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_126_PEARL",
+      "HIDDEN_ITEM_UNDERWATER_126_IRON",
+      "HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE126/WEST"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE126/SMALL_AREA_2": {
+    "parent_map": "MAP_UNDERWATER_ROUTE126",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE126/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE127/MAIN": {
+    "parent_map": "MAP_ROUTE127",
+    "locations": [
+      "ITEM_ROUTE_127_ZINC",
+      "ITEM_ROUTE_127_RARE_CANDY"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE126/MAIN",
+      "REGION_MOSSDEEP_CITY/MAIN",
+      "REGION_ROUTE128/MAIN",
+      "REGION_UNDERWATER_ROUTE127/MAIN",
+      "REGION_UNDERWATER_ROUTE127/TUNNEL",
+      "REGION_UNDERWATER_ROUTE127/AREA_1",
+      "REGION_UNDERWATER_ROUTE127/AREA_2",
+      "REGION_UNDERWATER_ROUTE127/AREA_3"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE127/ENCLOSED_AREA": {
+    "parent_map": "MAP_ROUTE127",
+    "locations": [
+      "ITEM_ROUTE_127_CARBOS"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_ROUTE127/TUNNEL"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE127/MAIN": {
+    "parent_map": "MAP_UNDERWATER_ROUTE127",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE127/MAIN",
+      "REGION_UNDERWATER_ROUTE128/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE127/TUNNEL": {
+    "parent_map": "MAP_UNDERWATER_ROUTE127",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE127/MAIN",
+      "REGION_ROUTE127/ENCLOSED_AREA"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE127/AREA_1": {
+    "parent_map": "MAP_UNDERWATER_ROUTE127",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE127/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE127/AREA_2": {
+    "parent_map": "MAP_UNDERWATER_ROUTE127",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_127_HP_UP"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE127/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE127/AREA_3": {
+    "parent_map": "MAP_UNDERWATER_ROUTE127",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_127_RED_SHARD"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE127/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE128/MAIN": {
+    "parent_map": "MAP_ROUTE128",
+    "locations": [
+      "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1",
+      "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2",
+      "HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE127/MAIN",
+      "REGION_ROUTE129/MAIN",
+      "REGION_EVER_GRANDE_CITY/SEA",
+      "REGION_UNDERWATER_ROUTE128/MAIN",
+      "REGION_UNDERWATER_ROUTE128/AREA_1",
+      "REGION_UNDERWATER_ROUTE128/AREA_2"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE128/MAIN": {
+    "parent_map": "MAP_UNDERWATER_ROUTE128",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE128/MAIN",
+      "REGION_UNDERWATER_ROUTE127/MAIN"
+    ],
+    "warps": [
+      "MAP_UNDERWATER_ROUTE128:0/MAP_UNDERWATER_SEAFLOOR_CAVERN:0"
+    ]
+  },
+  "REGION_UNDERWATER_ROUTE128/AREA_1": {
+    "parent_map": "MAP_UNDERWATER_ROUTE128",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_128_PROTEIN"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE128/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE128/AREA_2": {
+    "parent_map": "MAP_UNDERWATER_ROUTE128",
+    "locations": [
+      "HIDDEN_ITEM_UNDERWATER_128_PEARL"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE128/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE129/MAIN": {
+    "parent_map": "MAP_ROUTE129",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE130/MAIN",
+      "REGION_ROUTE128/MAIN",
+      "REGION_UNDERWATER_ROUTE129/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE129/MAIN": {
+    "parent_map": "MAP_UNDERWATER_ROUTE129",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE129/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE130/MAIN": {
+    "parent_map": "MAP_ROUTE130",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE129/MAIN",
+      "REGION_ROUTE131/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE131/MAIN": {
+    "parent_map": "MAP_ROUTE131",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_PACIFIDLOG_TOWN/MAIN",
+      "REGION_ROUTE130/MAIN"
+    ],
+    "warps": [
+      "MAP_ROUTE131:0/MAP_SKY_PILLAR_ENTRANCE:0"
+    ]
+  },
+  "REGION_ROUTE132/EAST": {
+    "parent_map": "MAP_ROUTE132",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE132/WEST",
+      "REGION_PACIFIDLOG_TOWN/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE132/WEST": {
+    "parent_map": "MAP_ROUTE132",
+    "locations": [
+      "ITEM_ROUTE_132_RARE_CANDY",
+      "ITEM_ROUTE_132_PROTEIN"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE133/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE133/MAIN": {
+    "parent_map": "MAP_ROUTE133",
+    "locations": [
+      "ITEM_ROUTE_133_BIG_PEARL",
+      "ITEM_ROUTE_133_STAR_PIECE",
+      "ITEM_ROUTE_133_MAX_REVIVE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE134/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE134/MAIN": {
+    "parent_map": "MAP_ROUTE134",
+    "locations": [
+      "ITEM_ROUTE_134_CARBOS",
+      "ITEM_ROUTE_134_STAR_PIECE"
+    ],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE134/WEST",
+      "REGION_UNDERWATER_ROUTE134/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_ROUTE134/WEST": {
+    "parent_map": "MAP_ROUTE134",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SLATEPORT_CITY/MAIN"
+    ],
+    "warps": []
+  },
+  "REGION_UNDERWATER_ROUTE134/MAIN": {
+    "parent_map": "MAP_UNDERWATER_ROUTE134",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_ROUTE134/MAIN"
+    ],
+    "warps": [
+      "MAP_UNDERWATER_ROUTE134:0/MAP_UNDERWATER_SEALED_CHAMBER:0"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/worlds/pokemon_emerald/data/regions/unused/battle_frontier.json b/worlds/pokemon_emerald/data/regions/unused/battle_frontier.json
new file mode 100644
index 0000000000..3fdab431c2
--- /dev/null
+++ b/worlds/pokemon_emerald/data/regions/unused/battle_frontier.json
@@ -0,0 +1,396 @@
+{
+  "REGION_BATTLE_FRONTIER_RECEPTION_GATE/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_RECEPTION_GATE:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8",
+      "MAP_BATTLE_FRONTIER_RECEPTION_GATE:1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/DOCK": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_SLATEPORT_CITY_HARBOR/MAIN",
+      "REGION_LILYCOVE_CITY_HARBOR/MAIN"
+    ],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8/MAP_BATTLE_FRONTIER_RECEPTION_GATE:0"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/MAIN"
+    ],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7/MAP_BATTLE_FRONTIER_LOUNGE7:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2/MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1/MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9/MAP_BATTLE_FRONTIER_RECEPTION_GATE:1",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0/MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5/MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3/MAP_BATTLE_FRONTIER_LOUNGE2:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4/MAP_BATTLE_FRONTIER_MART:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6/MAP_BATTLE_FRONTIER_LOUNGE4:0"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/WATER": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/WATER",
+      "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/CAVE_ENTRANCE"
+    ],
+    "warps": []
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/CAVE_ENTRANCE": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/WATER"
+    ],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10/MAP_ARTISAN_CAVE_B1F:0"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/MAIN",
+      "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/ABOVE_WATERFALL"
+    ],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5/MAP_BATTLE_FRONTIER_LOUNGE1:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8/MAP_BATTLE_FRONTIER_LOUNGE6:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6/MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10/MAP_BATTLE_FRONTIER_LOUNGE8:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11/MAP_BATTLE_FRONTIER_LOUNGE9:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7/MAP_BATTLE_FRONTIER_LOUNGE5:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4/MAP_BATTLE_FRONTIER_RANKING_HALL:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1/MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3/MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0",
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9/MAP_BATTLE_FRONTIER_LOUNGE3:0"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/CAVE_ENTRANCE": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/MAIN"
+    ],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13/MAP_ARTISAN_CAVE_1F:0"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/ABOVE_WATERFALL": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/MAIN",
+      "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/WATER"
+    ],
+    "warps": []
+  },
+  "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/WATER": {
+    "parent_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_BATTLE_FRONTIER_OUTSIDE_EAST/ABOVE_WATERFALL",
+      "REGION_BATTLE_FRONTIER_OUTSIDE_WEST/WATER"
+    ],
+    "warps": []
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_DOME_LOBBY/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1!"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1!"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0",
+      "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0",
+      "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2",
+      "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:3/MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0!"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0",
+      "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_RANKING_HALL/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_RANKING_HALL",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_RANKING_HALL:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_POKEMON_CENTER_1F/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2/MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0",
+      "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_POKEMON_CENTER_2F/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_MART/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_MART",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_MART:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_SCOTTS_HOUSE/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE1/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE1:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE2/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE2:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE3/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE3:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE4/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE4:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE5/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE5",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE5:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE6/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE6",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE6:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE7/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE7",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE7:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE8/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE8",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE8:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10"
+    ]
+  },
+  "REGION_BATTLE_FRONTIER_LOUNGE9/MAIN": {
+    "parent_map": "MAP_BATTLE_FRONTIER_LOUNGE9",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BATTLE_FRONTIER_LOUNGE9:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11"
+    ]
+  },
+
+  "REGION_ARTISAN_CAVE_1F/MAIN": {
+    "parent_map": "MAP_ARTISAN_CAVE_1F",
+    "locations": [
+      "ITEM_ARTISAN_CAVE_1F_CARBOS"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ARTISAN_CAVE_1F:1/MAP_ARTISAN_CAVE_B1F:1",
+      "MAP_ARTISAN_CAVE_1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13"
+    ]
+  },
+  "REGION_ARTISAN_CAVE_B1F/MAIN": {
+    "parent_map": "MAP_ARTISAN_CAVE_B1F",
+    "locations": [
+      "ITEM_ARTISAN_CAVE_B1F_HP_UP",
+      "HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC",
+      "HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM",
+      "HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN",
+      "HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ARTISAN_CAVE_B1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10",
+      "MAP_ARTISAN_CAVE_B1F:1/MAP_ARTISAN_CAVE_1F:1"
+    ]
+  }
+}
diff --git a/worlds/pokemon_emerald/data/regions/unused/dungeons.json b/worlds/pokemon_emerald/data/regions/unused/dungeons.json
new file mode 100644
index 0000000000..c176de1b33
--- /dev/null
+++ b/worlds/pokemon_emerald/data/regions/unused/dungeons.json
@@ -0,0 +1,52 @@
+{
+  "REGION_TERRA_CAVE_ENTRANCE/MAIN": {
+    "parent_map": "MAP_TERRA_CAVE_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!",
+      "MAP_TERRA_CAVE_ENTRANCE:1/MAP_TERRA_CAVE_END:0"
+    ]
+  },
+  "REGION_TERRA_CAVE_END/MAIN": {
+    "parent_map": "MAP_TERRA_CAVE_END",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_TERRA_CAVE_END:0/MAP_TERRA_CAVE_ENTRANCE:1"
+    ]
+  },
+  "REGION_UNDERWATER_MARINE_CAVE/MAIN": {
+    "parent_map": "MAP_UNDERWATER_MARINE_CAVE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_MARINE_CAVE_ENTRANCE/MAIN"
+    ],
+    "warps": [
+      "MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!"
+    ]
+  },
+  "REGION_MARINE_CAVE_ENTRANCE/MAIN": {
+    "parent_map": "MAP_MARINE_CAVE_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [
+      "REGION_UNDERWATER_MARINE_CAVE/MAIN"
+    ],
+    "warps": [
+      "MAP_MARINE_CAVE_ENTRANCE:0/MAP_MARINE_CAVE_END:0"
+    ]
+  },
+  "REGION_MARINE_CAVE_END/MAIN": {
+    "parent_map": "MAP_MARINE_CAVE_END",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_MARINE_CAVE_END:0/MAP_MARINE_CAVE_ENTRANCE:0"
+    ]
+  }
+}
diff --git a/worlds/pokemon_emerald/data/regions/unused/islands.json b/worlds/pokemon_emerald/data/regions/unused/islands.json
new file mode 100644
index 0000000000..f7d931d168
--- /dev/null
+++ b/worlds/pokemon_emerald/data/regions/unused/islands.json
@@ -0,0 +1,276 @@
+{
+  "REGION_SOUTHERN_ISLAND_EXTERIOR/MAIN": {
+    "parent_map": "MAP_SOUTHERN_ISLAND_EXTERIOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOUTHERN_ISLAND_EXTERIOR:0,1/MAP_SOUTHERN_ISLAND_INTERIOR:0,1"
+    ]
+  },
+  "REGION_SOUTHERN_ISLAND_INTERIOR/MAIN": {
+    "parent_map": "MAP_SOUTHERN_ISLAND_INTERIOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_SOUTHERN_ISLAND_INTERIOR:0,1/MAP_SOUTHERN_ISLAND_EXTERIOR:0,1"
+    ]
+  },
+  "REGION_FARAWAY_ISLAND_ENTRANCE/MAIN": {
+    "parent_map": "MAP_FARAWAY_ISLAND_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FARAWAY_ISLAND_ENTRANCE:0,1/MAP_FARAWAY_ISLAND_INTERIOR:0,1"
+    ]
+  },
+  "REGION_FARAWAY_ISLAND_INTERIOR/MAIN": {
+    "parent_map": "MAP_FARAWAY_ISLAND_INTERIOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_FARAWAY_ISLAND_INTERIOR:0,1/MAP_FARAWAY_ISLAND_ENTRANCE:0,1"
+    ]
+  },
+  "REGION_BIRTH_ISLAND_HARBOR/MAIN": {
+    "parent_map": "MAP_BIRTH_ISLAND_HARBOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BIRTH_ISLAND_HARBOR:0/MAP_BIRTH_ISLAND_EXTERIOR:0"
+    ]
+  },
+  "REGION_BIRTH_ISLAND_EXTERIOR/MAIN": {
+    "parent_map": "MAP_BIRTH_ISLAND_EXTERIOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_BIRTH_ISLAND_EXTERIOR:0/MAP_BIRTH_ISLAND_HARBOR:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_HARBOR/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_HARBOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_HARBOR:0/MAP_NAVEL_ROCK_EXTERIOR:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_EXTERIOR/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_EXTERIOR",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_EXTERIOR:0/MAP_NAVEL_ROCK_HARBOR:0",
+      "MAP_NAVEL_ROCK_EXTERIOR:1/MAP_NAVEL_ROCK_ENTRANCE:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_ENTRANCE/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_ENTRANCE",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_ENTRANCE:0/MAP_NAVEL_ROCK_B1F:0",
+      "MAP_NAVEL_ROCK_ENTRANCE:1/MAP_NAVEL_ROCK_EXTERIOR:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_B1F/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_B1F",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_B1F:0/MAP_NAVEL_ROCK_ENTRANCE:0",
+      "MAP_NAVEL_ROCK_B1F:1/MAP_NAVEL_ROCK_FORK:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_FORK/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_FORK",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_FORK:0/MAP_NAVEL_ROCK_UP1:0",
+      "MAP_NAVEL_ROCK_FORK:1/MAP_NAVEL_ROCK_B1F:1",
+      "MAP_NAVEL_ROCK_FORK:2/MAP_NAVEL_ROCK_DOWN01:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN01/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN01",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN01:0/MAP_NAVEL_ROCK_FORK:2",
+      "MAP_NAVEL_ROCK_DOWN01:1/MAP_NAVEL_ROCK_DOWN02:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN02/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN02",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN02:1/MAP_NAVEL_ROCK_DOWN03:0",
+      "MAP_NAVEL_ROCK_DOWN02:0/MAP_NAVEL_ROCK_DOWN01:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN03/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN03",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN03:0/MAP_NAVEL_ROCK_DOWN02:1",
+      "MAP_NAVEL_ROCK_DOWN03:1/MAP_NAVEL_ROCK_DOWN04:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN04/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN04",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN04:1/MAP_NAVEL_ROCK_DOWN05:0",
+      "MAP_NAVEL_ROCK_DOWN04:0/MAP_NAVEL_ROCK_DOWN03:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN05/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN05",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN05:0/MAP_NAVEL_ROCK_DOWN04:1",
+      "MAP_NAVEL_ROCK_DOWN05:1/MAP_NAVEL_ROCK_DOWN06:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN06/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN06",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN06:1/MAP_NAVEL_ROCK_DOWN07:0",
+      "MAP_NAVEL_ROCK_DOWN06:0/MAP_NAVEL_ROCK_DOWN05:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN07/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN07",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN07:0/MAP_NAVEL_ROCK_DOWN06:1",
+      "MAP_NAVEL_ROCK_DOWN07:1/MAP_NAVEL_ROCK_DOWN08:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN08/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN08",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN08:1/MAP_NAVEL_ROCK_DOWN09:0",
+      "MAP_NAVEL_ROCK_DOWN08:0/MAP_NAVEL_ROCK_DOWN07:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN09/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN09",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN09:0/MAP_NAVEL_ROCK_DOWN08:1",
+      "MAP_NAVEL_ROCK_DOWN09:1/MAP_NAVEL_ROCK_DOWN10:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN10/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN10",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN10:1/MAP_NAVEL_ROCK_DOWN11:1",
+      "MAP_NAVEL_ROCK_DOWN10:0/MAP_NAVEL_ROCK_DOWN09:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_DOWN11/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_DOWN11",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_DOWN11:1/MAP_NAVEL_ROCK_DOWN10:1",
+      "MAP_NAVEL_ROCK_DOWN11:0/MAP_NAVEL_ROCK_BOTTOM:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_BOTTOM/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_BOTTOM",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_BOTTOM:0/MAP_NAVEL_ROCK_DOWN11:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_UP1/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_UP1",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_UP1:1/MAP_NAVEL_ROCK_UP2:0",
+      "MAP_NAVEL_ROCK_UP1:0/MAP_NAVEL_ROCK_FORK:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_UP2/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_UP2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_UP2:0/MAP_NAVEL_ROCK_UP1:1",
+      "MAP_NAVEL_ROCK_UP2:1/MAP_NAVEL_ROCK_UP3:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_UP3/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_UP3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_UP3:1/MAP_NAVEL_ROCK_UP4:0",
+      "MAP_NAVEL_ROCK_UP3:0/MAP_NAVEL_ROCK_UP2:1"
+    ]
+  },
+  "REGION_NAVEL_ROCK_UP4/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_UP4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_UP4:0/MAP_NAVEL_ROCK_UP3:1",
+      "MAP_NAVEL_ROCK_UP4:1/MAP_NAVEL_ROCK_TOP:0"
+    ]
+  },
+  "REGION_NAVEL_ROCK_TOP/MAIN": {
+    "parent_map": "MAP_NAVEL_ROCK_TOP",
+    "locations": [
+      "HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH"
+    ],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_NAVEL_ROCK_TOP:0/MAP_NAVEL_ROCK_UP4:1"
+    ]
+  }
+}
diff --git a/worlds/pokemon_emerald/data/regions/unused/routes.json b/worlds/pokemon_emerald/data/regions/unused/routes.json
new file mode 100644
index 0000000000..47cfc45415
--- /dev/null
+++ b/worlds/pokemon_emerald/data/regions/unused/routes.json
@@ -0,0 +1,82 @@
+{
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE2/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2:2/MAP_ROUTE110_TRICK_HOUSE_END:0!"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE3/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3:2/MAP_ROUTE110_TRICK_HOUSE_END:0!"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE4/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4:2/MAP_ROUTE110_TRICK_HOUSE_END:0!"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE5/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5:2/MAP_ROUTE110_TRICK_HOUSE_END:0!"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE6/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6:2/MAP_ROUTE110_TRICK_HOUSE_END:0!"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE7/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6"
+    ]
+  },
+  "REGION_ROUTE110_TRICK_HOUSE_PUZZLE8/MAIN": {
+    "parent_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8",
+    "locations": [],
+    "events": [],
+    "exits": [],
+    "warps": [
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+      "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8:2/MAP_ROUTE110_TRICK_HOUSE_END:0!"
+    ]
+  }
+}
diff --git a/worlds/pokemon_emerald/docs/en_Pokemon Emerald.md b/worlds/pokemon_emerald/docs/en_Pokemon Emerald.md
new file mode 100644
index 0000000000..8b09b51b38
--- /dev/null
+++ b/worlds/pokemon_emerald/docs/en_Pokemon Emerald.md	
@@ -0,0 +1,78 @@
+# Pokémon Emerald
+
+## Where is the options page?
+
+You can read through all the options and generate a YAML [here](../player-options).
+
+## What does randomization do to this game?
+
+This randomizer handles both item randomization and pokémon randomization. Badges, HMs, gifts from NPCs, and items on
+the ground can all be randomized. There are also many options for randomizing wild pokémon, starters, opponent pokémon,
+abilities, types, etc… You can even change a percentage of single battles into double battles. Check the
+[options page](../player-options) for a more comprehensive list of what can be changed.
+
+## What items and locations get randomized?
+
+The most interesting items that can be added to the item pool are badges and HMs, which most affect what locations you
+can access. Key items like the Devon Scope or Mach Bike can also be randomized, as well as the many Potions, Revives,
+TMs, and other items that you can find on the ground or receive as gifts.
+
+## What other changes are made to the game?
+
+There are many quality of life improvements meant to speed up the game a little and improve the experience of playing a
+randomizer. Here are some of the more important ones:
+
+- Shoal Cave switches between high tide and low tide every time you re-enter
+- Bag space is greatly expanded (you're all but guaranteed to never need to store items in the PC)
+- Trade evolutions have been changed to level or item evolutions
+- You can have both bikes simultaneously
+- You can run or bike (almost) anywhere
+- The Wally catching tutorial is skipped
+- All text is instant and, with an option, can be automatically progressed by holding A
+- When a Repel runs out, you will be prompted to use another
+- Many more minor improvements…
+
+## Where is my starting inventory?
+
+Except for badges, your starting inventory will be in the PC.
+
+## What does another world's item look like in Pokémon Emerald?
+
+When you find an item that is not your own, you will instead receive an "ARCHIPELAGO ITEM" which will *not* be added to
+your inventory.
+
+## When the player receives an item, what happens?
+
+You will only receive items while in the overworld and not during battles. Depending on your `Receive Item Messages`
+option, the received item will either be silently added to your bag or you will be shown a text box with the item's
+name and the item will be added to your bag while a fanfare plays.
+
+## Can I play offline?
+
+Yes, the client and connector are only necessary for sending and receiving items. If you're playing a solo game, you
+don't need to play online unless you want the rest of Archipelago's functionality (like hints and auto-tracking). If
+you're playing a multiworld game, the client will sync your game with the server the next time you connect.
+
+## Will battle mechanics be updated?
+
+This is something we'd love to see, but it's unlikely. We don't want to force new mechanics on players who would prefer
+to play with the classic mechanics, but trying to switch between old and new mechanics based on an option would be a
+monumental task, and is probably best solved some other way.
+
+## Is this randomizer compatible with other mods?
+
+No, other mods cannot be applied. It would be impossible to generalize this implementation's changes in a way that is
+compatible with any other mod or romhack. Romhacks could be added as their own games, but they would have to be
+implemented separately. Check out [Archipelago's Discord server](https://discord.gg/8Z65BR2) if you want to make a
+suggestion or contribute.
+
+## Can I use tools like the Universal Pokémon Randomizer?
+
+No, those tools expect data to be in certain locations and in a certain format, but this randomizer has to shift it
+around. Using tools to try to modify the game would only corrupt the ROM.
+
+We realize this means breaking from established habits when it comes to randomizing Pokémon games, but this randomizer
+would be many times more complex to develop if it were constrained by something like UPR.
+
+The one exception might be PKHeX. You may be able to extract pokémon from your save using PKHeX, but this isn't a
+guarantee, and we make no effort to keep our saves compatible with PKHeX.
diff --git a/worlds/pokemon_emerald/docs/setup_en.md b/worlds/pokemon_emerald/docs/setup_en.md
new file mode 100644
index 0000000000..e3f6d3c301
--- /dev/null
+++ b/worlds/pokemon_emerald/docs/setup_en.md
@@ -0,0 +1,72 @@
+# Pokémon Emerald Setup Guide
+
+## Required Software
+
+- [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
+- An English Pokémon Emerald ROM. The Archipelago community cannot provide this.
+- [BizHawk](https://tasvideos.org/BizHawk/ReleaseHistory) 2.7 or later
+
+### 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 `.gba` file in EmuHawk and go to `Config > Controllers…` to configure your inputs. If you can't click
+`Controllers…`, load any `.gba` 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.
+
+## Optional Software
+
+- [Pokémon Emerald AP Tracker](https://github.com/AliceMousie/emerald-ap-tracker/releases/latest), for use with
+[PopTracker](https://github.com/black-sliver/PopTracker/releases)
+
+## Generating and Patching a Game
+
+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).
+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.
+5. If this is your first time patching, you will be prompted to locate your vanilla ROM.
+6. A patched `.gba` 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.
+
+If you're playing a single-player seed and you don't care about autotracking or hints, you can stop here, close the
+client, and load the patched ROM in any emulator. However, for multiworlds and other Archipelago features, continue
+below using BizHawk as your emulator.
+
+## 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. Pokemon Emerald 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 Pokemon Emerald.
+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.
+
+## Auto-Tracking
+
+Pokémon Emerald has a fully functional map tracker that supports auto-tracking.
+
+1. Download [Pokémon Emerald AP Tracker](https://github.com/AliceMousie/emerald-ap-tracker/releases/latest) and
+[PopTracker](https://github.com/black-sliver/PopTracker/releases).
+2. Put the tracker pack into packs/ in your PopTracker install.
+3. Open PopTracker, and load the Pokémon Emerald pack.
+4. For autotracking, click on the "AP" symbol at the top.
+5. Enter the Archipelago server address (the one you connected your client to), slot name, and password.
diff --git a/worlds/pokemon_emerald/items.py b/worlds/pokemon_emerald/items.py
new file mode 100644
index 0000000000..7963f92384
--- /dev/null
+++ b/worlds/pokemon_emerald/items.py
@@ -0,0 +1,77 @@
+"""
+Classes and functions related to AP items for Pokemon Emerald
+"""
+from typing import Dict, FrozenSet, Optional
+
+from BaseClasses import Item, ItemClassification
+
+from .data import BASE_OFFSET, data
+
+
+class PokemonEmeraldItem(Item):
+    game: str = "Pokemon Emerald"
+    tags: FrozenSet[str]
+
+    def __init__(self, name: str, classification: ItemClassification, code: Optional[int], player: int) -> None:
+        super().__init__(name, classification, code, player)
+
+        if code is None:
+            self.tags = frozenset(["Event"])
+        else:
+            self.tags = data.items[reverse_offset_item_value(code)].tags
+
+
+def offset_item_value(item_value: int) -> int:
+    """
+    Returns the AP item id (code) for a given item value
+    """
+    return item_value + BASE_OFFSET
+
+
+def reverse_offset_item_value(item_id: int) -> int:
+    """
+    Returns the item value for a given AP item id (code)
+    """
+    return item_id - BASE_OFFSET
+
+
+def create_item_label_to_code_map() -> Dict[str, int]:
+    """
+    Creates a map from item labels to their AP item id (code)
+    """
+    label_to_code_map: Dict[str, int] = {}
+    for item_value, attributes in data.items.items():
+        label_to_code_map[attributes.label] = offset_item_value(item_value)
+
+    return label_to_code_map
+
+
+ITEM_GROUPS = {
+    "Badges": {
+        "Stone Badge", "Knuckle Badge",
+        "Dynamo Badge", "Heat Badge",
+        "Balance Badge", "Feather Badge",
+        "Mind Badge", "Rain Badge"
+    },
+    "HMs": {
+        "HM01 Cut", "HM02 Fly",
+        "HM03 Surf", "HM04 Strength",
+        "HM05 Flash", "HM06 Rock Smash",
+        "HM07 Waterfall", "HM08 Dive"
+    },
+    "HM01": {"HM01 Cut"},
+    "HM02": {"HM02 Fly"},
+    "HM03": {"HM03 Surf"},
+    "HM04": {"HM04 Strength"},
+    "HM05": {"HM05 Flash"},
+    "HM06": {"HM06 Rock Smash"},
+    "HM07": {"HM07 Waterfall"},
+    "HM08": {"HM08 Dive"}
+}
+
+
+def get_item_classification(item_code: int) -> ItemClassification:
+    """
+    Returns the item classification for a given AP item id (code)
+    """
+    return data.items[reverse_offset_item_value(item_code)].classification
diff --git a/worlds/pokemon_emerald/locations.py b/worlds/pokemon_emerald/locations.py
new file mode 100644
index 0000000000..bfe5be7545
--- /dev/null
+++ b/worlds/pokemon_emerald/locations.py
@@ -0,0 +1,122 @@
+"""
+Classes and functions related to AP locations for Pokemon Emerald
+"""
+from typing import TYPE_CHECKING, Dict, List, Optional, FrozenSet, Iterable
+
+from BaseClasses import Location, Region
+
+from .data import BASE_OFFSET, data
+from .items import offset_item_value
+
+if TYPE_CHECKING:
+    from . import PokemonEmeraldWorld
+
+
+class PokemonEmeraldLocation(Location):
+    game: str = "Pokemon Emerald"
+    rom_address: Optional[int]
+    default_item_code: Optional[int]
+    tags: FrozenSet[str]
+
+    def __init__(
+            self,
+            player: int,
+            name: str,
+            flag: Optional[int],
+            parent: Optional[Region] = None,
+            rom_address: Optional[int] = None,
+            default_item_value: Optional[int] = None,
+            tags: FrozenSet[str] = frozenset()) -> None:
+        super().__init__(player, name, None if flag is None else offset_flag(flag), parent)
+        self.default_item_code = None if default_item_value is None else offset_item_value(default_item_value)
+        self.rom_address = rom_address
+        self.tags = tags
+
+
+def offset_flag(flag: int) -> int:
+    """
+    Returns the AP location id (address) for a given flag
+    """
+    if flag is None:
+        return None
+    return flag + BASE_OFFSET
+
+
+def reverse_offset_flag(location_id: int) -> int:
+    """
+    Returns the flag id for a given AP location id (address)
+    """
+    if location_id is None:
+        return None
+    return location_id - BASE_OFFSET
+
+
+def create_locations_with_tags(world: "PokemonEmeraldWorld", regions: Dict[str, Region], tags: Iterable[str]) -> None:
+    """
+    Iterates through region data and adds locations to the multiworld if
+    those locations include any of the provided tags.
+    """
+    tags = set(tags)
+
+    for region_name, region_data in data.regions.items():
+        region = regions[region_name]
+        filtered_locations = [loc for loc in region_data.locations if len(tags & data.locations[loc].tags) > 0]
+
+        for location_name in filtered_locations:
+            location_data = data.locations[location_name]
+            location = PokemonEmeraldLocation(
+                world.player,
+                location_data.label,
+                location_data.flag,
+                region,
+                location_data.rom_address,
+                location_data.default_item,
+                location_data.tags
+            )
+            region.locations.append(location)
+
+
+def create_location_label_to_id_map() -> Dict[str, int]:
+    """
+    Creates a map from location labels to their AP location id (address)
+    """
+    label_to_id_map: Dict[str, int] = {}
+    for region_data in data.regions.values():
+        for location_name in region_data.locations:
+            location_data = data.locations[location_name]
+            label_to_id_map[location_data.label] = offset_flag(location_data.flag)
+
+    return label_to_id_map
+
+
+LOCATION_GROUPS = {
+    "Badges": {
+        "Rustboro Gym - Stone Badge",
+        "Dewford Gym - Knuckle Badge",
+        "Mauville Gym - Dynamo Badge",
+        "Lavaridge Gym - Heat Badge",
+        "Petalburg Gym - Balance Badge",
+        "Fortree Gym - Feather Badge",
+        "Mossdeep Gym - Mind Badge",
+        "Sootopolis Gym - Rain Badge",
+    },
+    "Gym TMs": {
+        "Rustboro Gym - TM39 from Roxanne",
+        "Dewford Gym - TM08 from Brawly",
+        "Mauville Gym - TM34 from Wattson",
+        "Lavaridge Gym - TM50 from Flannery",
+        "Petalburg Gym - TM42 from Norman",
+        "Fortree Gym - TM40 from Winona",
+        "Mossdeep Gym - TM04 from Tate and Liza",
+        "Sootopolis Gym - TM03 from Juan",
+    },
+    "Postgame Locations": {
+        "Littleroot Town - S.S. Ticket from Norman",
+        "SS Tidal - Hidden Item in Lower Deck Trash Can",
+        "SS Tidal - TM49 from Thief",
+        "Safari Zone NE - Hidden Item North",
+        "Safari Zone NE - Hidden Item East",
+        "Safari Zone SE - Hidden Item in South Grass 1",
+        "Safari Zone SE - Hidden Item in South Grass 2",
+    }
+}
diff --git a/worlds/pokemon_emerald/options.py b/worlds/pokemon_emerald/options.py
new file mode 100644
index 0000000000..655966a2a7
--- /dev/null
+++ b/worlds/pokemon_emerald/options.py
@@ -0,0 +1,606 @@
+"""
+Option definitions for Pokemon Emerald
+"""
+from dataclasses import dataclass
+from typing import Dict, Type
+
+from Options import Choice, DefaultOnToggle, Option, OptionSet, Range, Toggle, FreeText, PerGameCommonOptions
+
+from .data import data
+
+
+class Goal(Choice):
+    """
+    Determines what your goal is to consider the game beaten
+
+    Champion: Become the champion and enter the hall of fame
+    Steven: Defeat Steven in Meteor Falls
+    Norman: Defeat Norman in Petalburg Gym
+    """
+    display_name = "Goal"
+    default = 0
+    option_champion = 0
+    option_steven = 1
+    option_norman = 2
+
+
+class RandomizeBadges(Choice):
+    """
+    Adds Badges to the pool
+
+    Vanilla: Gym leaders give their own badge
+    Shuffle: Gym leaders give a random badge
+    Completely Random: Badges can be found anywhere
+    """
+    display_name = "Randomize Badges"
+    default = 2
+    option_vanilla = 0
+    option_shuffle = 1
+    option_completely_random = 2
+
+
+class RandomizeHms(Choice):
+    """
+    Adds HMs to the pool
+
+    Vanilla: HMs are at their vanilla locations
+    Shuffle: HMs are shuffled among vanilla HM locations
+    Completely Random: HMs can be found anywhere
+    """
+    display_name = "Randomize HMs"
+    default = 2
+    option_vanilla = 0
+    option_shuffle = 1
+    option_completely_random = 2
+
+
+class RandomizeKeyItems(DefaultOnToggle):
+    """
+    Adds most key items to the pool. These are usually required to unlock
+    a location or region (e.g. Devon Scope, Letter, Basement Key)
+    """
+    display_name = "Randomize Key Items"
+
+
+class RandomizeBikes(Toggle):
+    """
+    Adds the mach bike and acro bike to the pool
+    """
+    display_name = "Randomize Bikes"
+
+
+class RandomizeRods(Toggle):
+    """
+    Adds fishing rods to the pool
+    """
+    display_name = "Randomize Fishing Rods"
+
+
+class RandomizeOverworldItems(DefaultOnToggle):
+    """
+    Adds items on the ground with a Pokeball sprite to the pool
+    """
+    display_name = "Randomize Overworld Items"
+
+
+class RandomizeHiddenItems(Toggle):
+    """
+    Adds hidden items to the pool
+    """
+    display_name = "Randomize Hidden Items"
+
+
+class RandomizeNpcGifts(Toggle):
+    """
+    Adds most gifts received from NPCs to the pool (not including key items or HMs)
+    """
+    display_name = "Randomize NPC Gifts"
+
+
+class ItemPoolType(Choice):
+    """
+    Determines which non-progression items get put into the item pool
+
+    Shuffled: Item pool consists of shuffled vanilla items
+    Diverse Balanced: Item pool consists of random items approximately proportioned
+    according to what they're replacing (i.e. more pokeballs, fewer X items, etc...)
+    Diverse: Item pool consists of uniformly random (non-unique) items
+    """
+    display_name = "Item Pool Type"
+    default = 0
+    option_shuffled = 0
+    option_diverse_balanced = 1
+    option_diverse = 2
+
+
+class HiddenItemsRequireItemfinder(DefaultOnToggle):
+    """
+    The Itemfinder is logically required to pick up hidden items
+    """
+    display_name = "Require Itemfinder"
+
+
+class DarkCavesRequireFlash(DefaultOnToggle):
+    """
+    The lower floors of Granite Cave and Victory Road logically require use of HM05 Flash
+    """
+    display_name = "Require Flash"
+
+
+class EnableFerry(Toggle):
+    """
+    The ferry between Slateport, Lilycove, and the Battle Frontier can be used if you have the S.S. Ticket
+    """
+    display_name = "Enable Ferry"
+
+
+class EliteFourRequirement(Choice):
+    """
+    Sets the requirements to challenge the elite four
+
+    Badges: Obtain some number of badges
+    Gyms: Defeat some number of gyms
+    """
+    display_name = "Elite Four Requirement"
+    default = 0
+    option_badges = 0
+    option_gyms = 1
+
+
+class EliteFourCount(Range):
+    """
+    Sets the number of badges/gyms required to challenge the elite four
+    """
+    display_name = "Elite Four Count"
+    range_start = 0
+    range_end = 8
+    default = 8
+
+
+class NormanRequirement(Choice):
+    """
+    Sets the requirements to challenge the Petalburg Gym
+
+    Badges: Obtain some number of badges
+    Gyms: Defeat some number of gyms
+    """
+    display_name = "Norman Requirement"
+    default = 0
+    option_badges = 0
+    option_gyms = 1
+
+
+class NormanCount(Range):
+    """
+    Sets the number of badges/gyms required to challenge the Petalburg Gym
+    """
+    display_name = "Norman Count"
+    range_start = 0
+    range_end = 7
+    default = 4
+
+
+class RandomizeWildPokemon(Choice):
+    """
+    Randomizes wild pokemon encounters (grass, caves, water, fishing)
+
+    Vanilla: Wild encounters are unchanged
+    Match Base Stats: Wild pokemon are replaced with species with approximately the same bst
+    Match Type: Wild pokemon are replaced with species that share a type with the original
+    Match Base Stats and Type: Apply both Match Base Stats and Match Type
+    Completely Random: There are no restrictions
+    """
+    display_name = "Randomize Wild Pokemon"
+    default = 0
+    option_vanilla = 0
+    option_match_base_stats = 1
+    option_match_type = 2
+    option_match_base_stats_and_type = 3
+    option_completely_random = 4
+
+
+class AllowWildLegendaries(DefaultOnToggle):
+    """
+    Wild encounters can be replaced by legendaries. Only applied if Randomize Wild Pokemon is not Vanilla.
+    """
+    display_name = "Allow Wild Legendaries"
+
+
+class RandomizeStarters(Choice):
+    """
+    Randomizes the starter pokemon in Professor Birch's bag
+
+    Vanilla: Starters are unchanged
+    Match Base Stats: Starters are replaced with species with approximately the same bst
+    Match Type: Starters are replaced with species that share a type with the original
+    Match Base Stats and Type: Apply both Match Base Stats and Match Type
+    Completely Random: There are no restrictions
+    """
+    display_name = "Randomize Starters"
+    default = 0
+    option_vanilla = 0
+    option_match_base_stats = 1
+    option_match_type = 2
+    option_match_base_stats_and_type = 3
+    option_completely_random = 4
+
+
+class AllowStarterLegendaries(DefaultOnToggle):
+    """
+    Starters can be replaced by legendaries. Only applied if Randomize Starters is not Vanilla.
+    """
+    display_name = "Allow Starter Legendaries"
+
+
+class RandomizeTrainerParties(Choice):
+    """
+    Randomizes the parties of all trainers.
+
+    Vanilla: Parties are unchanged
+    Match Base Stats: Trainer pokemon are replaced with species with approximately the same bst
+    Match Type: Trainer pokemon are replaced with species that share a type with the original
+    Match Base Stats and Type: Apply both Match Base Stats and Match Type
+    Completely Random: There are no restrictions
+    """
+    display_name = "Randomize Trainer Parties"
+    default = 0
+    option_vanilla = 0
+    option_match_base_stats = 1
+    option_match_type = 2
+    option_match_base_stats_and_type = 3
+    option_completely_random = 4
+
+
+class AllowTrainerLegendaries(DefaultOnToggle):
+    """
+    Enemy trainer pokemon can be replaced by legendaries. Only applied if Randomize Trainer Parties is not Vanilla.
+    """
+    display_name = "Allow Trainer Legendaries"
+
+
+class RandomizeStaticEncounters(Choice):
+    """
+    Randomizes static encounters (Rayquaza, hidden Kekleons, fake Voltorb pokeballs, etc...)
+
+    Vanilla: Static encounters are unchanged
+    Shuffle: Static encounters are shuffled between each other
+    Match Base Stats: Static encounters are replaced with species with approximately the same bst
+    Match Type: Static encounters are replaced with species that share a type with the original
+    Match Base Stats and Type: Apply both Match Base Stats and Match Type
+    Completely Random: There are no restrictions
+    """
+    display_name = "Randomize Static Encounters"
+    default = 0
+    option_vanilla = 0
+    option_shuffle = 1
+    option_match_base_stats = 2
+    option_match_type = 3
+    option_match_base_stats_and_type = 4
+    option_completely_random = 5
+
+
+class RandomizeTypes(Choice):
+    """
+    Randomizes the type(s) of every pokemon. Each species will have the same number of types.
+
+    Vanilla: Types are unchanged
+    Shuffle: Types are shuffled globally for all species (e.g. every Water-type pokemon becomes Fire-type)
+    Completely Random: Each species has its type(s) randomized
+    Follow Evolutions: Types are randomized per evolution line instead of per species
+    """
+    display_name = "Randomize Types"
+    default = 0
+    option_vanilla = 0
+    option_shuffle = 1
+    option_completely_random = 2
+    option_follow_evolutions = 3
+
+
+class RandomizeAbilities(Choice):
+    """
+    Randomizes abilities of every species. Each species will have the same number of abilities.
+
+    Vanilla: Abilities are unchanged
+    Completely Random: Each species has its abilities randomized
+    Follow Evolutions: Abilities are randomized, but if a pokemon would normally retain its ability
+    when evolving, the random ability will also be retained
+    """
+    display_name = "Randomize Abilities"
+    default = 0
+    option_vanilla = 0
+    option_completely_random = 1
+    option_follow_evolutions = 2
+
+
+class AbilityBlacklist(OptionSet):
+    """
+    A list of abilities which no pokemon should have if abilities are randomized.
+    For example, you could exclude Wonder Guard and Arena Trap like this:
+    ["Wonder Guard", "Arena Trap"]
+    """
+    display_name = "Ability Blacklist"
+    valid_keys = frozenset([ability.label for ability in data.abilities])
+
+
+class LevelUpMoves(Choice):
+    """
+    Randomizes the moves a pokemon learns when they reach a level where they would learn a move.
+    Your starter is guaranteed to have a usable damaging move.
+
+    Vanilla: Learnset is unchanged
+    Randomized: Moves are randomized
+    Start with Four Moves: Moves are randomized and all Pokemon know 4 moves at level 1
+    """
+    display_name = "Level Up Moves"
+    default = 0
+    option_vanilla = 0
+    option_randomized = 1
+    option_start_with_four_moves = 2
+
+
+class MoveMatchTypeBias(Range):
+    """
+    Sets the probability that a learned move will be forced match one of the types of a pokemon.
+
+    If a move is not forced to match type, it will roll for Normal type bias.
+    """
+    display_name = "Move Match Type Bias"
+    range_start = 0
+    range_end = 100
+    default = 0
+
+
+class MoveNormalTypeBias(Range):
+    """
+    After it has been decided that a move will not be forced to match types, sets the probability that a learned move
+    will be forced to be the Normal type.
+
+    If a move is not forced to be Normal, it will be completely random.
+    """
+    display_name = "Move Normal Type Bias"
+    range_start = 0
+    range_end = 100
+    default = 0
+
+
+class HmCompatibility(Choice):
+    """
+    Modifies the compatibility of HMs
+
+    Vanilla: Compatibility is unchanged
+    Fully Compatible: Every species can learn any HM
+    Completely Random: Compatibility is 50/50 for every HM (does not remain consistent across evolution)
+    """
+    display_name = "HM Compatibility"
+    default = 1
+    option_vanilla = 0
+    option_fully_compatible = 1
+    option_completely_random = 2
+
+
+class TmCompatibility(Choice):
+    """
+    Modifies the compatibility of TMs
+
+    Vanilla: Compatibility is unchanged
+    Fully Compatible: Every species can learn any TM
+    Completely Random: Compatibility is 50/50 for every TM (does not remain consistent across evolution)
+    """
+    display_name = "TM Compatibility"
+    default = 0
+    option_vanilla = 0
+    option_fully_compatible = 1
+    option_completely_random = 2
+
+
+class TmMoves(Toggle):
+    """
+    Randomizes the moves taught by TMs
+    """
+    display_name = "TM Moves"
+
+
+class ReusableTms(Toggle):
+    """
+    Sets TMs to not break after use (they remain sellable)
+    """
+    display_name = "Reusable TMs"
+
+
+class MinCatchRate(Range):
+    """
+    Sets the minimum catch rate a pokemon can have. Any pokemon with a catch rate below this floor will have it raised to this value.
+
+    Legendaries are often in the single digits
+    Fully evolved pokemon are often double digits
+    Pidgey is 255
+    """
+    display_name = "Minimum Catch Rate"
+    range_start = 3
+    range_end = 255
+    default = 3
+
+
+class GuaranteedCatch(Toggle):
+    """
+    Every throw is guaranteed to catch a wild pokemon
+    """
+    display_name = "Guaranteed Catch"
+
+
+class ExpModifier(Range):
+    """
+    Multiplies gained experience by a percentage
+
+    100 is default
+    50 is half
+    200 is double
+    etc...
+    """
+    display_name = "Exp Modifier"
+    range_start = 0
+    range_end = 1000
+    default = 100
+
+
+class BlindTrainers(Toggle):
+    """
+    Causes trainers to not start a battle with you unless you talk to them
+    """
+    display_name = "Blind Trainers"
+
+
+class DoubleBattleChance(Range):
+    """
+    The percent chance that a trainer with more than 1 pokemon will be converted into a double battle.
+    If these trainers would normally approach you, they will only do so if you have 2 unfainted pokemon.
+    They can be battled by talking to them no matter what.
+    """
+    display_name = "Double Battle Chance"
+    range_start = 0
+    range_end = 100
+    default = 0
+
+
+class BetterShops(Toggle):
+    """
+    Pokemarts sell every item that can be obtained in a pokemart (except mail, which is still unique to the relevant city)
+    """
+    display_name = "Better Shops"
+
+
+class RemoveRoadblocks(OptionSet):
+    """
+    Removes specific NPCs that normally stand in your way until certain events are completed.
+
+    This can open up the world a bit and make your playthrough less linear, but careful how many you remove; it may make too much of your world accessible upon receiving Surf.
+
+    Possible values are:
+    "Route 110 Aqua Grunts"
+    "Route 112 Magma Grunts"
+    "Route 119 Aqua Grunts"
+    "Safari Zone Construction Workers"
+    "Lilycove City Wailmer"
+    "Aqua Hideout Grunts"
+    "Seafloor Cavern Aqua Grunt"
+    """
+    display_name = "Remove Roadblocks"
+    valid_keys = frozenset([
+        "Route 110 Aqua Grunts",
+        "Route 112 Magma Grunts",
+        "Route 119 Aqua Grunts",
+        "Safari Zone Construction Workers",
+        "Lilycove City Wailmer",
+        "Aqua Hideout Grunts",
+        "Seafloor Cavern Aqua Grunt"
+    ])
+
+
+class ExtraBoulders(Toggle):
+    """
+    Places strength boulders on Route 115 which block access to Meteor Falls from the beach.
+    This aims to take some power away from Surf as a tool for access.
+    """
+    display_name = "Extra Boulders"
+
+
+class FreeFlyLocation(Toggle):
+    """
+    Enables flying to one random location when Mom gives you the running shoes (excluding cities reachable with no items)
+    """
+    display_name = "Free Fly Location"
+
+
+class FlyWithoutBadge(DefaultOnToggle):
+    """
+    Fly does not require the Feather Badge to use in the field
+    """
+    display_name = "Fly Without Badge"
+
+
+class TurboA(Toggle):
+    """
+    Holding A will advance most text automatically
+    """
+    display_name = "Turbo A"
+
+
+class ReceiveItemMessages(Choice):
+    """
+    Determines whether you receive an in-game notification when receiving an item. Items can still only be received in the overworld.
+
+    All: Every item shows a message
+    Progression: Only progression items show a message
+    None: All items are added to your bag silently (badges will still show)
+    """
+    display_name = "Receive Item Messages"
+    default = 0
+    option_all = 0
+    option_progression = 1
+    option_none = 2
+
+
+class EasterEgg(FreeText):
+    """
+    ???
+    """
+    default = "Example Passphrase"
+
+
+@dataclass
+class PokemonEmeraldOptions(PerGameCommonOptions):
+    goal: Goal
+
+    badges: RandomizeBadges
+    hms: RandomizeHms
+    key_items: RandomizeKeyItems
+    bikes: RandomizeBikes
+    rods: RandomizeRods
+    overworld_items: RandomizeOverworldItems
+    hidden_items: RandomizeHiddenItems
+    npc_gifts: RandomizeNpcGifts
+    item_pool_type: ItemPoolType
+
+    require_itemfinder: HiddenItemsRequireItemfinder
+    require_flash: DarkCavesRequireFlash
+    elite_four_requirement: EliteFourRequirement
+    elite_four_count: EliteFourCount
+    norman_requirement: NormanRequirement
+    norman_count: NormanCount
+
+    wild_pokemon: RandomizeWildPokemon
+    allow_wild_legendaries: AllowWildLegendaries
+    starters: RandomizeStarters
+    allow_starter_legendaries: AllowStarterLegendaries
+    trainer_parties: RandomizeTrainerParties
+    allow_trainer_legendaries: AllowTrainerLegendaries
+    static_encounters: RandomizeStaticEncounters
+    types: RandomizeTypes
+    abilities: RandomizeAbilities
+    ability_blacklist: AbilityBlacklist
+
+    level_up_moves: LevelUpMoves
+    move_match_type_bias: MoveMatchTypeBias
+    move_normal_type_bias: MoveNormalTypeBias
+    tm_compatibility: TmCompatibility
+    hm_compatibility: HmCompatibility
+    tm_moves: TmMoves
+    reusable_tms: ReusableTms
+
+    min_catch_rate: MinCatchRate
+    guaranteed_catch: GuaranteedCatch
+    exp_modifier: ExpModifier
+    blind_trainers: BlindTrainers
+    double_battle_chance: DoubleBattleChance
+    better_shops: BetterShops
+
+    enable_ferry: EnableFerry
+    remove_roadblocks: RemoveRoadblocks
+    extra_boulders: ExtraBoulders
+    free_fly_location: FreeFlyLocation
+    fly_without_badge: FlyWithoutBadge
+
+    turbo_a: TurboA
+    receive_item_messages: ReceiveItemMessages
+
+    easter_egg: EasterEgg
diff --git a/worlds/pokemon_emerald/pokemon.py b/worlds/pokemon_emerald/pokemon.py
new file mode 100644
index 0000000000..13c92ddc09
--- /dev/null
+++ b/worlds/pokemon_emerald/pokemon.py
@@ -0,0 +1,196 @@
+"""
+Functions related to pokemon species and moves
+"""
+import time
+from typing import TYPE_CHECKING, Dict, List, Set, Optional, Tuple
+
+from .data import SpeciesData, data
+
+if TYPE_CHECKING:
+    from random import Random
+
+
+_damaging_moves = frozenset({
+      1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  13,
+     16,  17,  20,  21,  22,  23,  24,  25,  26,  27,  29,  30,
+     31,  33,  34,  35,  36,  37,  38,  40,  41,  42,  44,  51,
+     52,  53,  55,  56,  58,  59,  60,  61,  62,  63,  64,  65,
+     66,  67,  69,  71,  72,  75,  76,  80,  82,  83,  84,  85,
+     87,  88,  89,  91,  93,  94,  98,  99, 101, 121, 122, 123,
+    124, 125, 126, 128, 129, 130, 131, 132, 136, 140, 141, 143,
+    145, 146, 149, 152, 154, 155, 157, 158, 161, 162, 163, 167,
+    168, 172, 175, 177, 179, 181, 183, 185, 188, 189, 190, 192,
+    196, 198, 200, 202, 205, 209, 210, 211, 216, 217, 218, 221,
+    222, 223, 224, 225, 228, 229, 231, 232, 233, 237, 238, 239,
+    242, 245, 246, 247, 248, 250, 251, 253, 257, 263, 265, 267,
+    276, 279, 280, 282, 284, 290, 292, 295, 296, 299, 301, 302,
+    304, 305, 306, 307, 308, 309, 310, 311, 314, 315, 317, 318,
+    323, 324, 325, 326, 327, 328, 330, 331, 332, 333, 337, 338,
+    340, 341, 342, 343, 344, 345, 348, 350, 351, 352, 353, 354
+})
+
+_move_types = [
+     0,  0,  1,  0,  0,  0,  0, 10, 15, 13,  0,  0,  0,  0,  0,
+     0,  2,  2,  0,  2,  0,  0, 12,  0,  1,  0,  1,  1,  4,  0,
+     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  6,  6,  0, 17,
+     0,  0,  0,  0,  0,  0,  3, 10, 10, 15, 11, 11, 11, 15, 15,
+    14, 11, 15,  0,  2,  2,  1,  1,  1,  1,  0, 12, 12, 12,  0,
+    12, 12,  3, 12, 12, 12,  6, 16, 10, 13, 13, 13, 13,  5,  4,
+     4,  4,  3, 14, 14, 14, 14, 14,  0,  0, 14,  7,  0,  0,  0,
+     0,  0,  0,  0,  7, 11,  0, 14, 14, 15, 14,  0,  0,  0,  2,
+     0,  0,  7,  3,  3,  4, 10, 11, 11,  0,  0,  0,  0, 14, 14,
+     0,  1,  0, 14,  3,  0,  6,  0,  2,  0, 11,  0, 12,  0, 14,
+     0,  3, 11,  0,  0,  4, 14,  5,  0,  0,  0,  0,  0,  0,  0,
+     0,  0,  1, 17,  6,  0,  7, 10,  0,  9,  0,  0,  2, 12,  1,
+     7, 15,  0,  1,  0, 17,  0,  0,  3,  4, 11,  4, 13,  0,  7,
+     0, 15,  1,  4,  0, 16,  5, 12,  0,  0,  5,  0,  0,  0, 13,
+     6,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  4,  1,  6,
+    16,  0,  0, 17,  0,  0,  8,  8,  1,  0, 12,  0,  0,  1, 16,
+    11, 10, 17, 14,  0,  0,  5,  7, 14,  1, 11, 17,  0,  0,  0,
+     0,  0, 10, 15, 17, 17, 10, 17,  0,  1,  0,  0,  0, 13, 17,
+     0, 14, 14,  0,  0, 12,  1, 14,  0,  1,  1,  0, 17,  0, 10,
+    14, 14,  0,  7, 17,  0, 11,  1,  0,  6, 14, 14,  2,  0, 10,
+     4, 15, 12,  0,  0,  3,  0, 10, 11,  8,  7,  0, 12, 17,  2,
+    10,  0,  5,  6,  8, 12,  0, 14, 11,  6,  7, 14,  1,  4, 15,
+    11, 12,  2, 15,  8,  0,  0, 16, 12,  1,  2,  4,  3,  0, 13,
+    12, 11, 14, 12, 16,  5, 13, 11,  8, 14
+]
+
+_moves_by_type: Dict[int, List[int]] = {}
+for move, type in enumerate(_move_types):
+    _moves_by_type.setdefault(type, []).append(move)
+
+_move_blacklist = frozenset({
+    0,    # MOVE_NONE
+    165,  # Struggle
+    15,   # Cut
+    148,  # Flash
+    249,  # Rock Smash
+    70,   # Strength
+    57,   # Surf
+    19,   # Fly
+    291,  # Dive
+    127   # Waterfall
+})
+
+_legendary_pokemon = frozenset({
+    'Mew',
+    'Mewtwo',
+    'Articuno',
+    'Zapdos',
+    'Moltres',
+    'Lugia',
+    'Ho-oh',
+    'Raikou',
+    'Suicune',
+    'Entei',
+    'Celebi',
+    'Groudon',
+    'Kyogre',
+    'Rayquaza',
+    'Latios',
+    'Latias',
+    'Registeel',
+    'Regirock',
+    'Regice',
+    'Jirachi',
+    'Deoxys'
+})
+
+
+def get_random_species(
+        random: "Random",
+        candidates: List[Optional[SpeciesData]],
+        nearby_bst: Optional[int] = None,
+        species_type: Optional[int] = None,
+        allow_legendaries: bool = True) -> SpeciesData:
+    candidates: List[SpeciesData] = [species for species in candidates if species is not None]
+
+    if species_type is not None:
+        candidates = [species for species in candidates if species_type in species.types]
+
+    if not allow_legendaries:
+        candidates = [species for species in candidates if species.label not in _legendary_pokemon]
+
+    if nearby_bst is not None:
+        def has_nearby_bst(species: SpeciesData, max_percent_different: int) -> bool:
+            return abs(sum(species.base_stats) - nearby_bst) < nearby_bst * (max_percent_different / 100)
+
+        max_percent_different = 10
+        bst_filtered_candidates = [species for species in candidates if has_nearby_bst(species, max_percent_different)]
+        while len(bst_filtered_candidates) == 0:
+            max_percent_different += 10
+            bst_filtered_candidates = [
+                species
+                for species in candidates
+                if has_nearby_bst(species, max_percent_different)
+            ]
+
+        candidates = bst_filtered_candidates
+
+    return random.choice(candidates)
+
+
+def get_random_type(random: "Random") -> int:
+    picked_type = random.randrange(0, 18)
+    while picked_type == 9:  # Don't pick the ??? type
+        picked_type = random.randrange(0, 18)
+
+    return picked_type
+
+
+def get_random_move(
+        random: "Random",
+        blacklist: Optional[Set[int]] = None,
+        type_bias: int = 0,
+        normal_bias: int = 0,
+        type_target: Optional[Tuple[int, int]] = None) -> int:
+    expanded_blacklist = _move_blacklist | (blacklist if blacklist is not None else set())
+
+    bias = random.random() * 100
+    if bias < type_bias:
+        pass  # Keep type_target unchanged
+    elif bias < type_bias + ((100 - type_bias) * (normal_bias / 100)):
+        type_target = (0, 0)
+    else:
+        type_target = None
+
+    chosen_move = None
+
+    # The blacklist is relatively small, so if we don't need to restrict
+    # ourselves to any particular types, it's usually much faster to pick
+    # a random number and hope it works. Limit this to 5 tries in case the
+    # blacklist is actually significant enough to make this unlikely to work.
+    if type_target is None:
+        remaining_attempts = 5
+        while remaining_attempts > 0:
+            remaining_attempts -= 1
+            chosen_move = random.randrange(0, data.constants["MOVES_COUNT"])
+            if chosen_move not in expanded_blacklist:
+                return chosen_move
+        else:
+            chosen_move = None
+
+    # We're either matching types or failed to pick a move above
+    if type_target is None:
+        possible_moves = [i for i in range(data.constants["MOVES_COUNT"]) if i not in expanded_blacklist]
+    else:
+        possible_moves = [move for move in _moves_by_type[type_target[0]] if move not in expanded_blacklist] + \
+                            [move for move in _moves_by_type[type_target[1]] if move not in expanded_blacklist]
+
+    if len(possible_moves) == 0:
+        return get_random_move(random, None, type_bias, normal_bias, type_target)
+
+    return random.choice(possible_moves)
+
+
+def get_random_damaging_move(random: "Random", blacklist: Optional[Set[int]] = None) -> int:
+    expanded_blacklist = _move_blacklist | (blacklist if blacklist is not None else set())
+
+    move_options = list(_damaging_moves)
+
+    move = random.choice(move_options)
+    while move in expanded_blacklist:
+        move = random.choice(move_options)
+
+    return move
diff --git a/worlds/pokemon_emerald/regions.py b/worlds/pokemon_emerald/regions.py
new file mode 100644
index 0000000000..e8f6d26e08
--- /dev/null
+++ b/worlds/pokemon_emerald/regions.py
@@ -0,0 +1,49 @@
+"""
+Functions related to AP regions for Pokemon Emerald (see ./data/regions for region definitions)
+"""
+from typing import TYPE_CHECKING, Dict, List, Tuple
+
+from BaseClasses import ItemClassification, Region
+
+from .data import data
+from .items import PokemonEmeraldItem
+from .locations import PokemonEmeraldLocation
+
+if TYPE_CHECKING:
+    from . import PokemonEmeraldWorld
+
+
+def create_regions(world: "PokemonEmeraldWorld") -> Dict[str, Region]:
+    """
+    Iterates through regions created from JSON to create regions and adds them to the multiworld.
+    Also creates and places events and connects regions via warps and the exits defined in the JSON.
+    """
+    regions: Dict[str, Region] = {}
+    connections: List[Tuple[str, str, str]] = []
+
+    for region_name, region_data in data.regions.items():
+        new_region = Region(region_name, world.player, world.multiworld)
+
+        for event_data in region_data.events:
+            event = PokemonEmeraldLocation(world.player, event_data.name, None, new_region)
+            event.place_locked_item(PokemonEmeraldItem(event_data.name, ItemClassification.progression, None, world.player))
+            new_region.locations.append(event)
+
+        for region_exit in region_data.exits:
+            connections.append((f"{region_name} -> {region_exit}", region_name, region_exit))
+
+        for warp in region_data.warps:
+            dest_warp = data.warps[data.warp_map[warp]]
+            if dest_warp.parent_region is None:
+                continue
+            connections.append((warp, region_name, dest_warp.parent_region))
+
+        regions[region_name] = new_region
+
+    for name, source, dest in connections:
+        regions[source].connect(regions[dest], name)
+
+    regions["Menu"] = Region("Menu", world.player, world.multiworld)
+    regions["Menu"].connect(regions["REGION_LITTLEROOT_TOWN/MAIN"], "Start Game")
+
+    return regions
diff --git a/worlds/pokemon_emerald/rom.py b/worlds/pokemon_emerald/rom.py
new file mode 100644
index 0000000000..156410553c
--- /dev/null
+++ b/worlds/pokemon_emerald/rom.py
@@ -0,0 +1,420 @@
+"""
+Classes and functions related to creating a ROM patch
+"""
+import os
+import pkgutil
+from typing import TYPE_CHECKING, List, Tuple
+
+import bsdiff4
+
+from worlds.Files import APDeltaPatch
+from settings import get_settings
+
+from .data import PokemonEmeraldData, TrainerPokemonDataTypeEnum, data
+from .items import reverse_offset_item_value
+from .options import RandomizeWildPokemon, RandomizeTrainerParties, EliteFourRequirement, NormanRequirement
+from .pokemon import get_random_species
+
+if TYPE_CHECKING:
+    from . import PokemonEmeraldWorld
+
+
+class PokemonEmeraldDeltaPatch(APDeltaPatch):
+    game = "Pokemon Emerald"
+    hash = "605b89b67018abcea91e693a4dd25be3"
+    patch_file_ending = ".apemerald"
+    result_file_ending = ".gba"
+
+    @classmethod
+    def get_source_data(cls) -> bytes:
+        return get_base_rom_as_bytes()
+
+
+location_visited_event_to_id_map = {
+    "EVENT_VISITED_LITTLEROOT_TOWN": 0,
+    "EVENT_VISITED_OLDALE_TOWN": 1,
+    "EVENT_VISITED_PETALBURG_CITY": 2,
+    "EVENT_VISITED_RUSTBORO_CITY": 3,
+    "EVENT_VISITED_DEWFORD_TOWN": 4,
+    "EVENT_VISITED_SLATEPORT_CITY": 5,
+    "EVENT_VISITED_MAUVILLE_CITY": 6,
+    "EVENT_VISITED_VERDANTURF_TOWN": 7,
+    "EVENT_VISITED_FALLARBOR_TOWN": 8,
+    "EVENT_VISITED_LAVARIDGE_TOWN": 9,
+    "EVENT_VISITED_FORTREE_CITY": 10,
+    "EVENT_VISITED_LILYCOVE_CITY": 11,
+    "EVENT_VISITED_MOSSDEEP_CITY": 12,
+    "EVENT_VISITED_SOOTOPOLIS_CITY": 13,
+    "EVENT_VISITED_PACIFIDLOG_TOWN": 14,
+    "EVENT_VISITED_EVER_GRANDE_CITY": 15,
+    "EVENT_VISITED_BATTLE_FRONTIER": 16,
+    "EVENT_VISITED_SOUTHERN_ISLAND": 17
+}
+
+
+def generate_output(world: "PokemonEmeraldWorld", output_directory: str) -> None:
+    base_rom = get_base_rom_as_bytes()
+    base_patch = pkgutil.get_data(__name__, "data/base_patch.bsdiff4")
+    patched_rom = bytearray(bsdiff4.patch(base_rom, base_patch))
+
+    # Set item values
+    for location in world.multiworld.get_locations(world.player):
+        # Set free fly location
+        if location.address is None:
+            if world.options.free_fly_location and location.name == "EVENT_VISITED_LITTLEROOT_TOWN":
+                _set_bytes_little_endian(
+                    patched_rom,
+                    data.rom_addresses["gArchipelagoOptions"] + 0x16,
+                    1,
+                    world.free_fly_location_id
+                )
+            continue
+
+        if location.item and location.item.player == world.player:
+            _set_bytes_little_endian(
+                patched_rom,
+                location.rom_address,
+                2,
+                reverse_offset_item_value(location.item.code)
+            )
+        else:
+            _set_bytes_little_endian(
+                patched_rom,
+                location.rom_address,
+                2,
+                data.constants["ITEM_ARCHIPELAGO_PROGRESSION"]
+            )
+
+    # Set start inventory
+    start_inventory = world.options.start_inventory.value.copy()
+
+    starting_badges = 0
+    if start_inventory.pop("Stone Badge", 0) > 0:
+        starting_badges |= (1 << 0)
+    if start_inventory.pop("Knuckle Badge", 0) > 0:
+        starting_badges |= (1 << 1)
+    if start_inventory.pop("Dynamo Badge", 0) > 0:
+        starting_badges |= (1 << 2)
+    if start_inventory.pop("Heat Badge", 0) > 0:
+        starting_badges |= (1 << 3)
+    if start_inventory.pop("Balance Badge", 0) > 0:
+        starting_badges |= (1 << 4)
+    if start_inventory.pop("Feather Badge", 0) > 0:
+        starting_badges |= (1 << 5)
+    if start_inventory.pop("Mind Badge", 0) > 0:
+        starting_badges |= (1 << 6)
+    if start_inventory.pop("Rain Badge", 0) > 0:
+        starting_badges |= (1 << 7)
+
+    pc_slots: List[Tuple[str, int]] = []
+    while any(qty > 0 for qty in start_inventory.values()):
+        if len(pc_slots) >= 19:
+            break
+
+        for i, item_name in enumerate(start_inventory.keys()):
+            if len(pc_slots) >= 19:
+                break
+
+            quantity = min(start_inventory[item_name], 999)
+            if quantity == 0:
+                continue
+
+            start_inventory[item_name] -= quantity
+
+            pc_slots.append((item_name, quantity))
+
+    pc_slots.sort(reverse=True)
+
+    for i, slot in enumerate(pc_slots):
+        address = data.rom_addresses["sNewGamePCItems"] + (i * 4)
+        item = reverse_offset_item_value(world.item_name_to_id[slot[0]])
+        _set_bytes_little_endian(patched_rom, address + 0, 2, item)
+        _set_bytes_little_endian(patched_rom, address + 2, 2, slot[1])
+
+    # Set species data
+    _set_species_info(world, patched_rom)
+
+    # Set encounter tables
+    if world.options.wild_pokemon != RandomizeWildPokemon.option_vanilla:
+        _set_encounter_tables(world, patched_rom)
+
+    # Set opponent data
+    if world.options.trainer_parties != RandomizeTrainerParties.option_vanilla:
+        _set_opponents(world, patched_rom)
+
+    # Set static pokemon
+    _set_static_encounters(world, patched_rom)
+
+    # Set starters
+    _set_starters(world, patched_rom)
+
+    # Set TM moves
+    _set_tm_moves(world, patched_rom)
+
+    # Set TM/HM compatibility
+    _set_tmhm_compatibility(world, patched_rom)
+
+    # Randomize opponent double or single
+    _randomize_opponent_battle_type(world, patched_rom)
+
+    # Options
+    # struct ArchipelagoOptions
+    # {
+    #     /* 0x00 */ bool8 advanceTextWithHoldA;
+    #     /* 0x01 */ bool8 isFerryEnabled;
+    #     /* 0x02 */ bool8 areTrainersBlind;
+    #     /* 0x03 */ bool8 canFlyWithoutBadge;
+    #     /* 0x04 */ u16 expMultiplierNumerator;
+    #     /* 0x06 */ u16 expMultiplierDenominator;
+    #     /* 0x08 */ u16 birchPokemon;
+    #     /* 0x0A */ bool8 guaranteedCatch;
+    #     /* 0x0B */ bool8 betterShopsEnabled;
+    #     /* 0x0C */ bool8 eliteFourRequiresGyms;
+    #     /* 0x0D */ u8 eliteFourRequiredCount;
+    #     /* 0x0E */ bool8 normanRequiresGyms;
+    #     /* 0x0F */ u8 normanRequiredCount;
+    #     /* 0x10 */ u8 startingBadges;
+    #     /* 0x11 */ u8 receivedItemMessageFilter; // 0 = Show All; 1 = Show Progression Only; 2 = Show None
+    #     /* 0x12 */ bool8 reusableTms;
+    #     /* 0x14 */ u16 removedBlockers;
+    #     /* 0x13 */ bool8 addRoute115Boulders;
+    #     /* 0x14 */ u16 removedBlockers;
+    #     /* 0x14 */ u16 removedBlockers;
+    #     /* 0x16 */ u8 freeFlyLocation;
+    # };
+    options_address = data.rom_addresses["gArchipelagoOptions"]
+
+    # Set hold A to advance text
+    turbo_a = 1 if world.options.turbo_a else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x00, 1, turbo_a)
+
+    # Set ferry enabled
+    enable_ferry = 1 if world.options.enable_ferry else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x01, 1, enable_ferry)
+
+    # Set blind trainers
+    blind_trainers = 1 if world.options.blind_trainers else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x02, 1, blind_trainers)
+
+    # Set fly without badge
+    fly_without_badge = 1 if world.options.fly_without_badge else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x03, 1, fly_without_badge)
+
+    # Set exp modifier
+    numerator = min(max(world.options.exp_modifier.value, 0), 2**16 - 1)
+    _set_bytes_little_endian(patched_rom, options_address + 0x04, 2, numerator)
+    _set_bytes_little_endian(patched_rom, options_address + 0x06, 2, 100)
+
+    # Set Birch pokemon
+    _set_bytes_little_endian(
+        patched_rom,
+        options_address + 0x08,
+        2,
+        get_random_species(world.random, data.species).species_id
+    )
+
+    # Set guaranteed catch
+    guaranteed_catch = 1 if world.options.guaranteed_catch else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x0A, 1, guaranteed_catch)
+
+    # Set better shops
+    better_shops = 1 if world.options.better_shops else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x0B, 1, better_shops)
+
+    # Set elite four requirement
+    elite_four_requires_gyms = 1 if world.options.elite_four_requirement == EliteFourRequirement.option_gyms else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x0C, 1, elite_four_requires_gyms)
+
+    # Set elite four count
+    elite_four_count = min(max(world.options.elite_four_count.value, 0), 8)
+    _set_bytes_little_endian(patched_rom, options_address + 0x0D, 1, elite_four_count)
+
+    # Set norman requirement
+    norman_requires_gyms = 1 if world.options.norman_requirement == NormanRequirement.option_gyms else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x0E, 1, norman_requires_gyms)
+
+    # Set norman count
+    norman_count = min(max(world.options.norman_count.value, 0), 8)
+    _set_bytes_little_endian(patched_rom, options_address + 0x0F, 1, norman_count)
+
+    # Set starting badges
+    _set_bytes_little_endian(patched_rom, options_address + 0x10, 1, starting_badges)
+
+    # Set receive item messages type
+    receive_item_messages_type = world.options.receive_item_messages.value
+    _set_bytes_little_endian(patched_rom, options_address + 0x11, 1, receive_item_messages_type)
+
+    # Set reusable TMs
+    reusable_tms = 1 if world.options.reusable_tms else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x12, 1, reusable_tms)
+
+    # Set route 115 boulders
+    route_115_boulders = 1 if world.options.extra_boulders else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x13, 1, route_115_boulders)
+
+    # Set removed blockers
+    removed_roadblocks = world.options.remove_roadblocks.value
+    removed_roadblocks_bitfield = 0
+    removed_roadblocks_bitfield |= (1 << 0) if "Safari Zone Construction Workers" in removed_roadblocks else 0
+    removed_roadblocks_bitfield |= (1 << 1) if "Lilycove City Wailmer" in removed_roadblocks else 0
+    removed_roadblocks_bitfield |= (1 << 2) if "Route 110 Aqua Grunts" in removed_roadblocks else 0
+    removed_roadblocks_bitfield |= (1 << 3) if "Aqua Hideout Grunts" in removed_roadblocks else 0
+    removed_roadblocks_bitfield |= (1 << 4) if "Route 119 Aqua Grunts" in removed_roadblocks else 0
+    removed_roadblocks_bitfield |= (1 << 5) if "Route 112 Magma Grunts" in removed_roadblocks else 0
+    removed_roadblocks_bitfield |= (1 << 6) if "Seafloor Cavern Aqua Grunt" in removed_roadblocks else 0
+    _set_bytes_little_endian(patched_rom, options_address + 0x14, 2, removed_roadblocks_bitfield)
+
+    # Set slot name
+    player_name = world.multiworld.get_player_name(world.player)
+    for i, byte in enumerate(player_name.encode("utf-8")):
+        _set_bytes_little_endian(patched_rom, data.rom_addresses["gArchipelagoInfo"] + i, 1, byte)
+
+    # Write Output
+    out_file_name = world.multiworld.get_out_file_name_base(world.player)
+    output_path = os.path.join(output_directory, f"{out_file_name}.gba")
+    with open(output_path, "wb") as out_file:
+        out_file.write(patched_rom)
+    patch = PokemonEmeraldDeltaPatch(os.path.splitext(output_path)[0] + ".apemerald", player=world.player,
+                                     player_name=player_name, patched_path=output_path)
+
+    patch.write()
+    os.unlink(output_path)
+
+
+def get_base_rom_as_bytes() -> bytes:
+    with open(get_settings().pokemon_emerald_settings.rom_file, "rb") as infile:
+        base_rom_bytes = bytes(infile.read())
+
+    return base_rom_bytes
+
+
+def _set_bytes_little_endian(byte_array: bytearray, address: int, size: int, value: int) -> None:
+    offset = 0
+    while size > 0:
+        byte_array[address + offset] = value & 0xFF
+        value = value >> 8
+        offset += 1
+        size -= 1
+
+
+def _set_encounter_tables(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    """
+    Encounter tables are lists of
+    struct {
+        min_level:  0x01 bytes,
+        max_level:  0x01 bytes,
+        species_id: 0x02 bytes
+    }
+    """
+
+    for map_data in world.modified_maps:
+        tables = [map_data.land_encounters, map_data.water_encounters, map_data.fishing_encounters]
+        for table in tables:
+            if table is not None:
+                for i, species_id in enumerate(table.slots):
+                    address = table.rom_address + 2 + (4 * i)
+                    _set_bytes_little_endian(rom, address, 2, species_id)
+
+
+def _set_species_info(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    for species in world.modified_species:
+        if species is not None:
+            _set_bytes_little_endian(rom, species.rom_address + 6, 1, species.types[0])
+            _set_bytes_little_endian(rom, species.rom_address + 7, 1, species.types[1])
+            _set_bytes_little_endian(rom, species.rom_address + 8, 1, species.catch_rate)
+            _set_bytes_little_endian(rom, species.rom_address + 22, 1, species.abilities[0])
+            _set_bytes_little_endian(rom, species.rom_address + 23, 1, species.abilities[1])
+
+            for i, learnset_move in enumerate(species.learnset):
+                level_move = learnset_move.level << 9 | learnset_move.move_id
+                _set_bytes_little_endian(rom, species.learnset_rom_address + (i * 2), 2, level_move)
+
+
+def _set_opponents(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    for trainer in world.modified_trainers:
+        party_address = trainer.party.rom_address
+
+        pokemon_data_size: int
+        if trainer.party.pokemon_data_type in {TrainerPokemonDataTypeEnum.NO_ITEM_DEFAULT_MOVES, TrainerPokemonDataTypeEnum.ITEM_DEFAULT_MOVES}:
+            pokemon_data_size = 8
+        else:  # Custom Moves
+            pokemon_data_size = 16
+
+        for i, pokemon in enumerate(trainer.party.pokemon):
+            pokemon_address = party_address + (i * pokemon_data_size)
+
+            # Replace species
+            _set_bytes_little_endian(rom, pokemon_address + 0x04, 2, pokemon.species_id)
+
+            # Replace custom moves if applicable
+            if trainer.party.pokemon_data_type == TrainerPokemonDataTypeEnum.NO_ITEM_CUSTOM_MOVES:
+                _set_bytes_little_endian(rom, pokemon_address + 0x06, 2, pokemon.moves[0])
+                _set_bytes_little_endian(rom, pokemon_address + 0x08, 2, pokemon.moves[1])
+                _set_bytes_little_endian(rom, pokemon_address + 0x0A, 2, pokemon.moves[2])
+                _set_bytes_little_endian(rom, pokemon_address + 0x0C, 2, pokemon.moves[3])
+            elif trainer.party.pokemon_data_type == TrainerPokemonDataTypeEnum.ITEM_CUSTOM_MOVES:
+                _set_bytes_little_endian(rom, pokemon_address + 0x08, 2, pokemon.moves[0])
+                _set_bytes_little_endian(rom, pokemon_address + 0x0A, 2, pokemon.moves[1])
+                _set_bytes_little_endian(rom, pokemon_address + 0x0C, 2, pokemon.moves[2])
+                _set_bytes_little_endian(rom, pokemon_address + 0x0E, 2, pokemon.moves[3])
+
+
+def _set_static_encounters(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    for encounter in world.modified_static_encounters:
+        _set_bytes_little_endian(rom, encounter.rom_address, 2, encounter.species_id)
+
+
+def _set_starters(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    address = data.rom_addresses["sStarterMon"]
+    (starter_1, starter_2, starter_3) = world.modified_starters
+
+    _set_bytes_little_endian(rom, address + 0, 2, starter_1)
+    _set_bytes_little_endian(rom, address + 2, 2, starter_2)
+    _set_bytes_little_endian(rom, address + 4, 2, starter_3)
+
+
+def _set_tm_moves(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    tmhm_list_address = data.rom_addresses["sTMHMMoves"]
+
+    for i, move in enumerate(world.modified_tmhm_moves):
+        # Don't modify HMs
+        if i >= 50:
+            break
+
+        _set_bytes_little_endian(rom, tmhm_list_address + (i * 2), 2, move)
+
+
+def _set_tmhm_compatibility(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    learnsets_address = data.rom_addresses["gTMHMLearnsets"]
+
+    for species in world.modified_species:
+        if species is not None:
+            _set_bytes_little_endian(rom, learnsets_address + (species.species_id * 8), 8, species.tm_hm_compatibility)
+
+
+def _randomize_opponent_battle_type(world: "PokemonEmeraldWorld", rom: bytearray) -> None:
+    probability = world.options.double_battle_chance.value / 100
+
+    battle_type_map = {
+        0: 4,
+        1: 8,
+        2: 6,
+        3: 13,
+    }
+
+    for trainer_data in data.trainers:
+        if trainer_data.battle_script_rom_address != 0 and len(trainer_data.party.pokemon) > 1:
+            if world.random.random() < probability:
+                # Set the trainer to be a double battle
+                _set_bytes_little_endian(rom, trainer_data.rom_address + 0x18, 1, 1)
+
+                # Swap the battle type in the script for the purpose of loading the right text
+                # and setting data to the right places
+                original_battle_type = rom[trainer_data.battle_script_rom_address + 1]
+                if original_battle_type in battle_type_map:
+                    _set_bytes_little_endian(
+                        rom,
+                        trainer_data.battle_script_rom_address + 1,
+                        1,
+                        battle_type_map[original_battle_type]
+                    )
diff --git a/worlds/pokemon_emerald/rules.py b/worlds/pokemon_emerald/rules.py
new file mode 100644
index 0000000000..564bf5af8d
--- /dev/null
+++ b/worlds/pokemon_emerald/rules.py
@@ -0,0 +1,1376 @@
+"""
+Logic rule definitions for Pokemon Emerald
+"""
+from typing import TYPE_CHECKING
+
+from BaseClasses import CollectionState
+from worlds.generic.Rules import add_rule, set_rule
+
+from .data import data
+from .options import EliteFourRequirement, NormanRequirement, Goal
+
+if TYPE_CHECKING:
+    from . import PokemonEmeraldWorld
+
+
+# Rules are organized by town/route/dungeon and ordered approximately
+# by when you would first reach that place in a vanilla playthrough.
+def set_rules(world: "PokemonEmeraldWorld") -> None:
+    def can_cut(state: CollectionState):
+        return state.has("HM01 Cut", world.player) and state.has("Stone Badge", world.player)
+
+    def can_surf(state: CollectionState):
+        return state.has("HM03 Surf", world.player) and state.has("Balance Badge", world.player)
+
+    def can_strength(state: CollectionState):
+        return state.has("HM04 Strength", world.player) and state.has("Heat Badge", world.player)
+
+    def can_flash(state: CollectionState):
+        return state.has("HM05 Flash", world.player) and state.has("Knuckle Badge", world.player)
+
+    def can_rock_smash(state: CollectionState):
+        return state.has("HM06 Rock Smash", world.player) and state.has("Dynamo Badge", world.player)
+
+    def can_waterfall(state: CollectionState):
+        return state.has("HM07 Waterfall", world.player) and state.has("Rain Badge", world.player)
+
+    def can_dive(state: CollectionState):
+        return state.has("HM08 Dive", world.player) and state.has("Mind Badge", world.player)
+
+    def has_acro_bike(state: CollectionState):
+        return state.has("Acro Bike", world.player)
+
+    def has_mach_bike(state: CollectionState):
+        return state.has("Mach Bike", world.player)
+    
+    def defeated_n_gym_leaders(state: CollectionState, n: int) -> bool:
+        return sum([state.has(event, world.player) for event in [
+            "EVENT_DEFEAT_ROXANNE",
+            "EVENT_DEFEAT_BRAWLY",
+            "EVENT_DEFEAT_WATTSON",
+            "EVENT_DEFEAT_FLANNERY",
+            "EVENT_DEFEAT_NORMAN",
+            "EVENT_DEFEAT_WINONA",
+            "EVENT_DEFEAT_TATE_AND_LIZA",
+            "EVENT_DEFEAT_JUAN"
+        ]]) >= n
+
+    def get_entrance(entrance: str):
+        return world.multiworld.get_entrance(entrance, world.player)
+
+    def get_location(location: str):
+        if location in data.locations:
+            location = data.locations[location].label
+
+        return world.multiworld.get_location(location, world.player)
+
+    victory_event_name = "EVENT_DEFEAT_CHAMPION"
+    if world.options.goal == Goal.option_steven:
+        victory_event_name = "EVENT_DEFEAT_STEVEN"
+    elif world.options.goal == Goal.option_norman:
+        victory_event_name = "EVENT_DEFEAT_NORMAN"
+
+    world.multiworld.completion_condition[world.player] = lambda state: state.has(victory_event_name, world.player)
+
+    # Sky
+    if world.options.fly_without_badge:
+        set_rule(
+            get_entrance("REGION_LITTLEROOT_TOWN/MAIN -> REGION_SKY"),
+            lambda state: state.has("HM02 Fly", world.player)
+        )
+    else:
+        set_rule(
+            get_entrance("REGION_LITTLEROOT_TOWN/MAIN -> REGION_SKY"),
+            lambda state: state.has("HM02 Fly", world.player) and state.has("Feather Badge", world.player)
+        )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_LITTLEROOT_TOWN/MAIN"),
+        lambda state: state.has("EVENT_VISITED_LITTLEROOT_TOWN", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_OLDALE_TOWN/MAIN"),
+        lambda state: state.has("EVENT_VISITED_OLDALE_TOWN", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_PETALBURG_CITY/MAIN"),
+        lambda state: state.has("EVENT_VISITED_PETALBURG_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_RUSTBORO_CITY/MAIN"),
+        lambda state: state.has("EVENT_VISITED_RUSTBORO_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_DEWFORD_TOWN/MAIN"),
+        lambda state: state.has("EVENT_VISITED_DEWFORD_TOWN", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_SLATEPORT_CITY/MAIN"),
+        lambda state: state.has("EVENT_VISITED_SLATEPORT_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_MAUVILLE_CITY/MAIN"),
+        lambda state: state.has("EVENT_VISITED_MAUVILLE_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_VERDANTURF_TOWN/MAIN"),
+        lambda state: state.has("EVENT_VISITED_VERDANTURF_TOWN", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_FALLARBOR_TOWN/MAIN"),
+        lambda state: state.has("EVENT_VISITED_FALLARBOR_TOWN", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_LAVARIDGE_TOWN/MAIN"),
+        lambda state: state.has("EVENT_VISITED_LAVARIDGE_TOWN", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_FORTREE_CITY/MAIN"),
+        lambda state: state.has("EVENT_VISITED_FORTREE_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_LILYCOVE_CITY/MAIN"),
+        lambda state: state.has("EVENT_VISITED_LILYCOVE_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_MOSSDEEP_CITY/MAIN"),
+        lambda state: state.has("EVENT_VISITED_MOSSDEEP_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_SOOTOPOLIS_CITY/EAST"),
+        lambda state: state.has("EVENT_VISITED_SOOTOPOLIS_CITY", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SKY -> REGION_EVER_GRANDE_CITY/SOUTH"),
+        lambda state: state.has("EVENT_VISITED_EVER_GRANDE_CITY", world.player)
+    )
+
+    # Route 103
+    set_rule(
+        get_entrance("REGION_ROUTE103/EAST -> REGION_ROUTE103/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE103/WEST -> REGION_ROUTE103/WATER"),
+        can_surf
+    )
+
+    # Petalburg City
+    set_rule(
+        get_entrance("REGION_PETALBURG_CITY/MAIN -> REGION_PETALBURG_CITY/SOUTH_POND"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_PETALBURG_CITY/MAIN -> REGION_PETALBURG_CITY/NORTH_POND"),
+        can_surf
+    )
+    set_rule(
+        get_location("NPC_GIFT_RECEIVED_HM03"),
+        lambda state: state.has("EVENT_DEFEAT_NORMAN", world.player)
+    )
+    if world.options.norman_requirement == NormanRequirement.option_badges:
+        set_rule(
+            get_entrance("MAP_PETALBURG_CITY_GYM:2/MAP_PETALBURG_CITY_GYM:3"),
+            lambda state: state.has_group("Badges", world.player, world.options.norman_count.value)
+        )
+        set_rule(
+            get_entrance("MAP_PETALBURG_CITY_GYM:5/MAP_PETALBURG_CITY_GYM:6"),
+            lambda state: state.has_group("Badges", world.player, world.options.norman_count.value)
+        )
+    else:
+        set_rule(
+            get_entrance("MAP_PETALBURG_CITY_GYM:2/MAP_PETALBURG_CITY_GYM:3"),
+            lambda state: defeated_n_gym_leaders(state, world.options.norman_count.value)
+        )
+        set_rule(
+            get_entrance("MAP_PETALBURG_CITY_GYM:5/MAP_PETALBURG_CITY_GYM:6"),
+            lambda state: defeated_n_gym_leaders(state, world.options.norman_count.value)
+        )
+
+    # Route 104
+    set_rule(
+        get_entrance("REGION_ROUTE104/SOUTH -> REGION_ROUTE105/MAIN"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN"),
+        lambda state: state.has("EVENT_TALK_TO_MR_STONE", world.player)
+    )
+
+    # Petalburg Woods
+    set_rule(
+        get_entrance("REGION_PETALBURG_WOODS/WEST_PATH -> REGION_PETALBURG_WOODS/EAST_PATH"),
+        can_cut
+    )
+
+    # Rustboro City
+    set_rule(
+        get_location("EVENT_RETURN_DEVON_GOODS"),
+        lambda state: state.has("EVENT_RECOVER_DEVON_GOODS", world.player)
+    )
+
+    # Devon Corp
+    set_rule(
+        get_entrance("MAP_RUSTBORO_CITY_DEVON_CORP_1F:2/MAP_RUSTBORO_CITY_DEVON_CORP_2F:0"),
+        lambda state: state.has("EVENT_RETURN_DEVON_GOODS", world.player)
+    )
+
+    # Route 116
+    set_rule(
+        get_entrance("REGION_ROUTE116/WEST -> REGION_ROUTE116/WEST_ABOVE_LEDGE"),
+        can_cut
+    )
+
+    # Rusturf Tunnel
+    set_rule(
+        get_entrance("REGION_RUSTURF_TUNNEL/WEST -> REGION_RUSTURF_TUNNEL/EAST"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_RUSTURF_TUNNEL/EAST -> REGION_RUSTURF_TUNNEL/WEST"),
+        can_rock_smash
+    )
+    set_rule(
+        get_location("NPC_GIFT_RECEIVED_HM04"),
+        can_rock_smash
+    )
+    set_rule(
+        get_location("EVENT_RECOVER_DEVON_GOODS"),
+        lambda state: state.has("EVENT_DEFEAT_ROXANNE", world.player)
+    )
+
+    # Route 115
+    set_rule(
+        get_entrance("REGION_ROUTE115/SOUTH_BELOW_LEDGE -> REGION_ROUTE115/SEA"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE115/SOUTH_BEACH_NEAR_CAVE -> REGION_ROUTE115/SEA"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE115/SOUTH_ABOVE_LEDGE -> REGION_ROUTE115/SOUTH_BEHIND_ROCK"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE115/NORTH_BELOW_SLOPE -> REGION_ROUTE115/SEA"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE115/NORTH_BELOW_SLOPE -> REGION_ROUTE115/NORTH_ABOVE_SLOPE"),
+        lambda state: has_mach_bike(state)
+    )
+    if world.options.extra_boulders:
+        set_rule(
+            get_entrance("REGION_ROUTE115/SOUTH_BEACH_NEAR_CAVE -> REGION_ROUTE115/SOUTH_ABOVE_LEDGE"),
+            can_strength
+        )
+        set_rule(
+            get_entrance("REGION_ROUTE115/SOUTH_ABOVE_LEDGE -> REGION_ROUTE115/SOUTH_BEACH_NEAR_CAVE"),
+            can_strength
+        )
+
+    # Route 105
+    set_rule(
+        get_entrance("REGION_ROUTE105/MAIN -> REGION_UNDERWATER_ROUTE105/MAIN"),
+        can_dive
+    )
+
+    # Route 106
+    set_rule(
+        get_entrance("REGION_ROUTE106/EAST -> REGION_ROUTE106/SEA"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE106/WEST -> REGION_ROUTE106/SEA"),
+        can_surf
+    )
+
+    # Dewford Town
+    set_rule(
+        get_entrance("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE109/BEACH"),
+        lambda state:
+            state.can_reach("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN", "Entrance", world.player)
+            and state.has("EVENT_TALK_TO_MR_STONE", world.player)
+            and state.has("EVENT_DELIVER_LETTER", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN"),
+        lambda state:
+            state.can_reach("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN", "Entrance", world.player)
+            and state.has("EVENT_TALK_TO_MR_STONE", world.player)
+    )
+
+    # Granite Cave
+    set_rule(
+        get_entrance("REGION_GRANITE_CAVE_STEVENS_ROOM/MAIN -> REGION_GRANITE_CAVE_STEVENS_ROOM/LETTER_DELIVERED"),
+        lambda state: state.has("Letter", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_GRANITE_CAVE_B1F/LOWER -> REGION_GRANITE_CAVE_B1F/UPPER"),
+        lambda state: has_mach_bike(state)
+    )
+
+    # Route 107
+    set_rule(
+        get_entrance("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE107/MAIN"),
+        can_surf
+    )
+
+    # Route 109
+    set_rule(
+        get_entrance("REGION_ROUTE109/BEACH -> REGION_DEWFORD_TOWN/MAIN"),
+        lambda state:
+            state.can_reach("REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN", "Entrance", world.player)
+            and state.can_reach("REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE109/BEACH", "Entrance", world.player)
+            and state.has("EVENT_TALK_TO_MR_STONE", world.player)
+            and state.has("EVENT_DELIVER_LETTER", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE109/BEACH -> REGION_ROUTE109/SEA"),
+        can_surf
+    )
+
+    # Slateport City
+    set_rule(
+        get_entrance("REGION_SLATEPORT_CITY/MAIN -> REGION_ROUTE134/WEST"),
+        can_surf
+    )
+    set_rule(
+        get_location("EVENT_TALK_TO_DOCK"),
+        lambda state: state.has("Devon Goods", world.player)
+    )
+    set_rule(
+        get_entrance("MAP_SLATEPORT_CITY:5,7/MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F:0,1"),
+        lambda state: state.has("EVENT_TALK_TO_DOCK", world.player)
+    )
+    set_rule(
+        get_location("EVENT_AQUA_STEALS_SUBMARINE"),
+        lambda state: state.has("EVENT_RELEASE_GROUDON", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SLATEPORT_CITY_HARBOR/MAIN -> REGION_SS_TIDAL_CORRIDOR/MAIN"),
+        lambda state: state.has("EVENT_DEFEAT_CHAMPION", world.player)
+    )
+
+    # Route 110
+    set_rule(
+        get_entrance("REGION_ROUTE110/MAIN -> REGION_ROUTE110/SOUTH_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE110/MAIN -> REGION_ROUTE110/NORTH_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE/WEST -> REGION_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE/EAST"),
+        lambda state: has_acro_bike(state) or has_mach_bike(state)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE/WEST -> REGION_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE/EAST"),
+        lambda state: has_acro_bike(state) or has_mach_bike(state)
+    )
+    if "Route 110 Aqua Grunts" not in world.options.remove_roadblocks.value:
+        set_rule(
+            get_entrance("REGION_ROUTE110/SOUTH -> REGION_ROUTE110/MAIN"),
+            lambda state: state.has("EVENT_RESCUE_CAPT_STERN", world.player)
+        )
+        set_rule(
+            get_entrance("REGION_ROUTE110/MAIN -> REGION_ROUTE110/SOUTH"),
+            lambda state: state.has("EVENT_RESCUE_CAPT_STERN", world.player)
+        )
+
+    # Mauville City
+    set_rule(
+        get_location("NPC_GIFT_GOT_BASEMENT_KEY_FROM_WATTSON"),
+        lambda state: state.has("EVENT_DEFEAT_NORMAN", world.player)
+    )
+
+    # Route 111
+    set_rule(
+        get_entrance("REGION_ROUTE111/MIDDLE -> REGION_ROUTE111/DESERT"),
+        lambda state: state.has("Go Goggles", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE111/NORTH -> REGION_ROUTE111/DESERT"),
+        lambda state: state.has("Go Goggles", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE111/MIDDLE -> REGION_ROUTE111/SOUTH"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE111/SOUTH -> REGION_ROUTE111/SOUTH_POND"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE111/SOUTH -> REGION_ROUTE111/MIDDLE"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("MAP_ROUTE111:4/MAP_TRAINER_HILL_ENTRANCE:0"),
+        lambda state: state.has("EVENT_DEFEAT_CHAMPION", world.player)
+    )
+
+    # Route 112
+    if "Route 112 Magma Grunts" not in world.options.remove_roadblocks.value:
+        set_rule(
+            get_entrance("REGION_ROUTE112/SOUTH_EAST -> REGION_ROUTE112/CABLE_CAR_STATION_ENTRANCE"),
+            lambda state: state.has("EVENT_MAGMA_STEALS_METEORITE", world.player)
+        )
+        set_rule(
+            get_entrance("REGION_ROUTE112/CABLE_CAR_STATION_ENTRANCE -> REGION_ROUTE112/SOUTH_EAST"),
+            lambda state: state.has("EVENT_MAGMA_STEALS_METEORITE", world.player)
+        )
+
+    # Fiery Path
+    set_rule(
+        get_entrance("REGION_FIERY_PATH/MAIN -> REGION_FIERY_PATH/BEHIND_BOULDER"),
+        can_strength
+    )
+
+    # Route 114
+    set_rule(
+        get_entrance("REGION_ROUTE114/MAIN -> REGION_ROUTE114/ABOVE_WATERFALL"),
+        lambda state: can_surf(state) and can_waterfall(state)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE114/ABOVE_WATERFALL -> REGION_ROUTE114/MAIN"),
+        lambda state: can_surf(state) and can_waterfall(state)
+    )
+    set_rule(
+        get_entrance("MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL:2/MAP_DESERT_UNDERPASS:0"),
+        lambda state: state.has("EVENT_DEFEAT_CHAMPION", world.player)
+    )
+
+    # Meteor Falls
+    set_rule(
+        get_entrance("REGION_METEOR_FALLS_1F_1R/MAIN -> REGION_METEOR_FALLS_1F_1R/ABOVE_WATERFALL"),
+        lambda state: can_surf(state) and can_waterfall(state)
+    )
+    set_rule(
+        get_entrance("REGION_METEOR_FALLS_1F_1R/ABOVE_WATERFALL -> REGION_METEOR_FALLS_1F_1R/MAIN"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("MAP_METEOR_FALLS_1F_1R:5/MAP_METEOR_FALLS_STEVENS_CAVE:0"),
+        lambda state: state.has("EVENT_DEFEAT_CHAMPION", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_METEOR_FALLS_B1F_1R/HIGHEST_LADDER -> REGION_METEOR_FALLS_B1F_1R/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_METEOR_FALLS_B1F_1R/NORTH_SHORE -> REGION_METEOR_FALLS_B1F_1R/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_METEOR_FALLS_B1F_1R/SOUTH_SHORE -> REGION_METEOR_FALLS_B1F_1R/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_METEOR_FALLS_B1F_2R/ENTRANCE -> REGION_METEOR_FALLS_B1F_2R/WATER"),
+        can_surf
+    )
+
+    # Jagged Pass
+    set_rule(
+        get_entrance("REGION_JAGGED_PASS/BOTTOM -> REGION_JAGGED_PASS/MIDDLE"),
+        lambda state: has_acro_bike(state)
+    )
+    set_rule(
+        get_entrance("REGION_JAGGED_PASS/MIDDLE -> REGION_JAGGED_PASS/TOP"),
+        lambda state: has_acro_bike(state)
+    )
+    set_rule(
+        get_entrance("MAP_JAGGED_PASS:4/MAP_MAGMA_HIDEOUT_1F:0"),
+        lambda state: state.has("Magma Emblem", world.player)
+    )
+
+    # Lavaridge Town
+    set_rule(
+        get_location("NPC_GIFT_RECEIVED_GO_GOGGLES"),
+        lambda state: state.has("EVENT_DEFEAT_FLANNERY", world.player)
+    )
+
+    # Mirage Tower
+    set_rule(
+        get_entrance("REGION_MIRAGE_TOWER_2F/TOP -> REGION_MIRAGE_TOWER_2F/BOTTOM"),
+        lambda state: has_mach_bike(state)
+    )
+    set_rule(
+        get_entrance("REGION_MIRAGE_TOWER_2F/BOTTOM -> REGION_MIRAGE_TOWER_2F/TOP"),
+        lambda state: has_mach_bike(state)
+    )
+    set_rule(
+        get_entrance("REGION_MIRAGE_TOWER_3F/TOP -> REGION_MIRAGE_TOWER_3F/BOTTOM"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_MIRAGE_TOWER_3F/BOTTOM -> REGION_MIRAGE_TOWER_3F/TOP"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_MIRAGE_TOWER_4F/MAIN -> REGION_MIRAGE_TOWER_4F/FOSSIL_PLATFORM"),
+        can_rock_smash
+    )
+
+    # Abandoned Ship
+    set_rule(
+        get_entrance("REGION_ABANDONED_SHIP_ROOMS_B1F/CENTER -> REGION_ABANDONED_SHIP_UNDERWATER1/MAIN"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS/MAIN -> REGION_ABANDONED_SHIP_UNDERWATER2/MAIN"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:0/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:0"),
+        lambda state: state.has("Room 1 Key", world.player)
+    )
+    set_rule(
+        get_entrance("MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:1/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:2"),
+        lambda state: state.has("Room 2 Key", world.player)
+    )
+    set_rule(
+        get_entrance("MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:3/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:6"),
+        lambda state: state.has("Room 4 Key", world.player)
+    )
+    set_rule(
+        get_entrance("MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS:5/MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS:8"),
+        lambda state: state.has("Room 6 Key", world.player)
+    )
+    set_rule(
+        get_entrance("MAP_ABANDONED_SHIP_CORRIDORS_B1F:5/MAP_ABANDONED_SHIP_ROOM_B1F:0"),
+        lambda state: state.has("Storage Key", world.player)
+    )
+
+    # New Mauville
+    set_rule(
+        get_entrance("MAP_NEW_MAUVILLE_ENTRANCE:1/MAP_NEW_MAUVILLE_INSIDE:0"),
+        lambda state: state.has("Basement Key", world.player)
+    )
+
+    # Route 118
+    set_rule(
+        get_entrance("REGION_ROUTE118/WEST -> REGION_ROUTE118/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE118/EAST -> REGION_ROUTE118/WATER"),
+        can_surf
+    )
+
+    # Route 119
+    set_rule(
+        get_entrance("REGION_ROUTE119/LOWER -> REGION_ROUTE119/LOWER_ACROSS_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE119/LOWER_ACROSS_WATER -> REGION_ROUTE119/LOWER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE119/LOWER -> REGION_ROUTE119/LOWER_ACROSS_RAILS"),
+        lambda state: has_acro_bike(state)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE119/LOWER_ACROSS_RAILS -> REGION_ROUTE119/LOWER"),
+        lambda state: has_acro_bike(state)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE119/UPPER -> REGION_ROUTE119/MIDDLE_RIVER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE119/MIDDLE_RIVER -> REGION_ROUTE119/ABOVE_WATERFALL"),
+        can_waterfall
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE119/ABOVE_WATERFALL -> REGION_ROUTE119/MIDDLE_RIVER"),
+        can_waterfall
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE119/ABOVE_WATERFALL -> REGION_ROUTE119/ABOVE_WATERFALL_ACROSS_RAILS"),
+        lambda state: has_acro_bike(state)
+    )
+    if "Route 119 Aqua Grunts" not in world.options.remove_roadblocks.value:
+        set_rule(
+            get_entrance("REGION_ROUTE119/MIDDLE -> REGION_ROUTE119/UPPER"),
+            lambda state: state.has("EVENT_DEFEAT_SHELLY", world.player)
+        )
+        set_rule(
+            get_entrance("REGION_ROUTE119/UPPER -> REGION_ROUTE119/MIDDLE"),
+            lambda state: state.has("EVENT_DEFEAT_SHELLY", world.player)
+        )
+
+    # Fortree City
+    set_rule(
+        get_entrance("REGION_FORTREE_CITY/MAIN -> REGION_FORTREE_CITY/BEFORE_GYM"),
+        lambda state: state.has("Devon Scope", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_FORTREE_CITY/BEFORE_GYM -> REGION_FORTREE_CITY/MAIN"),
+        lambda state: state.has("Devon Scope", world.player)
+    )
+
+    # Route 120
+    set_rule(
+        get_entrance("REGION_ROUTE120/NORTH -> REGION_ROUTE120/NORTH_POND_SHORE"),
+        lambda state: state.has("Devon Scope", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE120/NORTH_POND_SHORE -> REGION_ROUTE120/NORTH"),
+        lambda state: state.has("Devon Scope", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE120/NORTH_POND_SHORE -> REGION_ROUTE120/NORTH_POND"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE120/SOUTH -> REGION_ROUTE120/SOUTH_PONDS"),
+        can_surf
+    )
+
+    # Route 121
+    set_rule(
+        get_entrance("REGION_ROUTE121/EAST -> REGION_ROUTE121/WEST"),
+        can_cut
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE121/EAST -> REGION_ROUTE122/SEA"),
+        can_surf
+    )
+
+    # Safari Zone
+    set_rule(
+        get_entrance("MAP_ROUTE121_SAFARI_ZONE_ENTRANCE:0,1/MAP_SAFARI_ZONE_SOUTH:0"),
+        lambda state: state.has("Pokeblock Case", world.player)
+    )
+    set_rule(
+        get_entrance("REGION_SAFARI_ZONE_SOUTH/MAIN -> REGION_SAFARI_ZONE_NORTH/MAIN"),
+        lambda state: has_acro_bike(state)
+    )
+    set_rule(
+        get_entrance("REGION_SAFARI_ZONE_SOUTHWEST/MAIN -> REGION_SAFARI_ZONE_NORTHWEST/MAIN"),
+        lambda state: has_mach_bike(state)
+    )
+    if "Safari Zone Construction Workers" not in world.options.remove_roadblocks.value:
+        set_rule(
+            get_entrance("REGION_SAFARI_ZONE_SOUTH/MAIN -> REGION_SAFARI_ZONE_SOUTHEAST/MAIN"),
+            lambda state: state.has("EVENT_DEFEAT_CHAMPION", world.player)
+        )
+
+    # Route 122
+    set_rule(
+        get_entrance("REGION_ROUTE122/MT_PYRE_ENTRANCE -> REGION_ROUTE122/SEA"),
+        can_surf
+    )
+
+    # Route 123
+    set_rule(
+        get_entrance("REGION_ROUTE123/EAST -> REGION_ROUTE122/SEA"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE123/EAST -> REGION_ROUTE123/EAST_BEHIND_TREE"),
+        can_cut
+    )
+
+    # Lilycove City
+    set_rule(
+        get_entrance("REGION_LILYCOVE_CITY/MAIN -> REGION_LILYCOVE_CITY/SEA"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_LILYCOVE_CITY_HARBOR/MAIN -> REGION_SS_TIDAL_CORRIDOR/MAIN"),
+        lambda state: state.has("EVENT_DEFEAT_CHAMPION", world.player)
+    )
+    if "Lilycove City Wailmer" not in world.options.remove_roadblocks.value:
+        set_rule(
+            get_entrance("REGION_LILYCOVE_CITY/SEA -> REGION_ROUTE124/MAIN"),
+            lambda state: state.has("EVENT_CLEAR_AQUA_HIDEOUT", world.player)
+        )
+
+    # Magma Hideout
+    set_rule(
+        get_entrance("REGION_MAGMA_HIDEOUT_1F/ENTRANCE -> REGION_MAGMA_HIDEOUT_1F/MAIN"),
+        can_strength
+    )
+    set_rule(
+        get_entrance("REGION_MAGMA_HIDEOUT_1F/MAIN -> REGION_MAGMA_HIDEOUT_1F/ENTRANCE"),
+        can_strength
+    )
+
+    # Aqua Hideout
+    if "Aqua Hideout Grunts" not in world.options.remove_roadblocks.value:
+        set_rule(
+            get_entrance("REGION_AQUA_HIDEOUT_1F/WATER -> REGION_AQUA_HIDEOUT_1F/MAIN"),
+            lambda state: state.has("EVENT_AQUA_STEALS_SUBMARINE", world.player)
+        )
+        set_rule(
+            get_entrance("REGION_AQUA_HIDEOUT_1F/MAIN -> REGION_AQUA_HIDEOUT_1F/WATER"),
+            lambda state: can_surf(state) and state.has("EVENT_AQUA_STEALS_SUBMARINE", world.player)
+        )
+
+    # Route 124
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/BIG_AREA"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/SMALL_AREA_1"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/SMALL_AREA_2"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/SMALL_AREA_3"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/TUNNEL_1"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/TUNNEL_2"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/TUNNEL_3"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/MAIN -> REGION_UNDERWATER_ROUTE124/TUNNEL_4"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/NORTH_ENCLOSED_AREA_1 -> REGION_UNDERWATER_ROUTE124/TUNNEL_1"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/NORTH_ENCLOSED_AREA_2 -> REGION_UNDERWATER_ROUTE124/TUNNEL_1"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/NORTH_ENCLOSED_AREA_3 -> REGION_UNDERWATER_ROUTE124/TUNNEL_2"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/SOUTH_ENCLOSED_AREA_1 -> REGION_UNDERWATER_ROUTE124/TUNNEL_3"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/SOUTH_ENCLOSED_AREA_2 -> REGION_UNDERWATER_ROUTE124/TUNNEL_3"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE124/SOUTH_ENCLOSED_AREA_3 -> REGION_UNDERWATER_ROUTE124/TUNNEL_4"),
+        can_dive
+    )
+
+    # Mossdeep City
+    set_rule(
+        get_entrance("REGION_MOSSDEEP_CITY/MAIN -> REGION_ROUTE124/MAIN"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_MOSSDEEP_CITY/MAIN -> REGION_ROUTE125/SEA"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_MOSSDEEP_CITY/MAIN -> REGION_ROUTE127/MAIN"),
+        can_surf
+    )
+    set_rule(
+        get_location("EVENT_DEFEAT_MAXIE_AT_SPACE_STATION"),
+        lambda state: state.has("EVENT_DEFEAT_TATE_AND_LIZA", world.player)
+    )
+    set_rule(
+        get_location("EVENT_STEVEN_GIVES_DIVE"),
+        lambda state: state.has("EVENT_DEFEAT_MAXIE_AT_SPACE_STATION", world.player)
+    )
+    set_rule(
+        get_location("NPC_GIFT_RECEIVED_HM08"),
+        lambda state: state.has("EVENT_DEFEAT_MAXIE_AT_SPACE_STATION", world.player)
+    )
+
+    # Shoal Cave
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_ENTRANCE_ROOM/SOUTH -> REGION_SHOAL_CAVE_ENTRANCE_ROOM/HIGH_TIDE_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_ENTRANCE_ROOM/NORTH_WEST_CORNER -> REGION_SHOAL_CAVE_ENTRANCE_ROOM/HIGH_TIDE_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_ENTRANCE_ROOM/NORTH_EAST_CORNER -> REGION_SHOAL_CAVE_ENTRANCE_ROOM/HIGH_TIDE_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND -> REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_EAST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND -> REGION_SHOAL_CAVE_INNER_ROOM/EAST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_INNER_ROOM/HIGH_TIDE_EAST_MIDDLE_GROUND -> REGION_SHOAL_CAVE_INNER_ROOM/NORTH_WEST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_WEST_CORNER -> REGION_SHOAL_CAVE_INNER_ROOM/NORTH_WEST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_INNER_ROOM/RARE_CANDY_PLATFORM -> REGION_SHOAL_CAVE_INNER_ROOM/SOUTH_EAST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/NORTH_WEST -> REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/EAST"),
+        can_strength
+    )
+    set_rule(
+        get_entrance("REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/EAST -> REGION_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM/NORTH_WEST"),
+        can_strength
+    )
+
+    # Route 126
+    set_rule(
+        get_entrance("REGION_ROUTE126/MAIN -> REGION_UNDERWATER_ROUTE126/MAIN"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE126/MAIN -> REGION_UNDERWATER_ROUTE126/SMALL_AREA_2"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE126/NEAR_ROUTE_124 -> REGION_UNDERWATER_ROUTE126/TUNNEL"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE126/NORTH_WEST_CORNER -> REGION_UNDERWATER_ROUTE126/TUNNEL"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE126/WEST -> REGION_UNDERWATER_ROUTE126/MAIN"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE126/WEST -> REGION_UNDERWATER_ROUTE126/SMALL_AREA_1"),
+        can_dive
+    )
+
+    # Sootopolis City
+    set_rule(
+        get_entrance("REGION_SOOTOPOLIS_CITY/WATER -> REGION_UNDERWATER_SOOTOPOLIS_CITY/MAIN"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_SOOTOPOLIS_CITY/EAST -> REGION_SOOTOPOLIS_CITY/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SOOTOPOLIS_CITY/WEST -> REGION_SOOTOPOLIS_CITY/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SOOTOPOLIS_CITY/ISLAND -> REGION_SOOTOPOLIS_CITY/WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("MAP_SOOTOPOLIS_CITY:3/MAP_CAVE_OF_ORIGIN_ENTRANCE:0"),
+        lambda state: state.has("EVENT_RELEASE_KYOGRE", world.player)
+    )
+    set_rule(
+        get_entrance("MAP_SOOTOPOLIS_CITY:2/MAP_SOOTOPOLIS_CITY_GYM_1F:0"),
+        lambda state: state.has("EVENT_WAKE_RAYQUAZA", world.player)
+    )
+    set_rule(
+        get_location("NPC_GIFT_RECEIVED_HM07"),
+        lambda state: state.has("EVENT_WAKE_RAYQUAZA", world.player)
+    )
+
+    # Route 127
+    set_rule(
+        get_entrance("REGION_ROUTE127/MAIN -> REGION_UNDERWATER_ROUTE127/MAIN"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE127/MAIN -> REGION_UNDERWATER_ROUTE127/TUNNEL"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE127/MAIN -> REGION_UNDERWATER_ROUTE127/AREA_1"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE127/MAIN -> REGION_UNDERWATER_ROUTE127/AREA_2"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE127/MAIN -> REGION_UNDERWATER_ROUTE127/AREA_3"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE127/ENCLOSED_AREA -> REGION_UNDERWATER_ROUTE127/TUNNEL"),
+        can_dive
+    )
+
+    # Route 128
+    set_rule(
+        get_entrance("REGION_ROUTE128/MAIN -> REGION_UNDERWATER_ROUTE128/MAIN"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE128/MAIN -> REGION_UNDERWATER_ROUTE128/AREA_1"),
+        can_dive
+    )
+    set_rule(
+        get_entrance("REGION_ROUTE128/MAIN -> REGION_UNDERWATER_ROUTE128/AREA_2"),
+        can_dive
+    )
+
+    # Seafloor Cavern
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM1/SOUTH -> REGION_SEAFLOOR_CAVERN_ROOM1/NORTH"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM1/NORTH -> REGION_SEAFLOOR_CAVERN_ROOM1/SOUTH"),
+        can_strength
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_WEST"),
+        can_strength
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_WEST"),
+        can_strength
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_EAST"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_EAST -> REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_WEST"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_EAST"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM2/NORTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM2/SOUTH_EAST"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM5/NORTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM5/EAST"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM5/EAST -> REGION_SEAFLOOR_CAVERN_ROOM5/NORTH_WEST"),
+        can_strength
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM5/NORTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM5/SOUTH_WEST"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM5/SOUTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM5/NORTH_WEST"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM6/NORTH_WEST -> REGION_SEAFLOOR_CAVERN_ROOM6/CAVE_ON_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM6/SOUTH -> REGION_SEAFLOOR_CAVERN_ROOM6/NORTH_WEST"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM6/SOUTH -> REGION_SEAFLOOR_CAVERN_ROOM6/CAVE_ON_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM7/SOUTH -> REGION_SEAFLOOR_CAVERN_ROOM7/NORTH"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM7/NORTH -> REGION_SEAFLOOR_CAVERN_ROOM7/SOUTH"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM8/NORTH -> REGION_SEAFLOOR_CAVERN_ROOM8/SOUTH"),
+        can_strength
+    )
+    set_rule(
+        get_entrance("REGION_SEAFLOOR_CAVERN_ROOM8/SOUTH -> REGION_SEAFLOOR_CAVERN_ROOM8/NORTH"),
+        can_strength
+    )
+    if "Seafloor Cavern Aqua Grunt" not in world.options.remove_roadblocks.value:
+        set_rule(
+            get_entrance("MAP_SEAFLOOR_CAVERN_ENTRANCE:1/MAP_SEAFLOOR_CAVERN_ROOM1:0"),
+            lambda state: state.has("EVENT_STEVEN_GIVES_DIVE", world.player)
+        )
+
+    # Pacifidlog Town
+    set_rule(
+        get_entrance("REGION_PACIFIDLOG_TOWN/MAIN -> REGION_ROUTE131/MAIN"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_PACIFIDLOG_TOWN/MAIN -> REGION_ROUTE132/EAST"),
+        can_surf
+    )
+
+    # Sky Pillar
+    set_rule(
+        get_entrance("MAP_SKY_PILLAR_OUTSIDE:1/MAP_SKY_PILLAR_1F:0"),
+        lambda state: state.has("EVENT_WALLACE_GOES_TO_SKY_PILLAR", world.player)
+    )
+    # Sky Pillar does not require the mach bike until Rayquaza returns, which means the top
+    # is only logically locked behind the mach bike after the top has been reached already
+    # set_rule(
+    #     get_entrance("REGION_SKY_PILLAR_2F/RIGHT -> REGION_SKY_PILLAR_2F/LEFT"),
+    #     lambda state: has_mach_bike(state)
+    # )
+    # set_rule(
+    #     get_entrance("REGION_SKY_PILLAR_2F/LEFT -> REGION_SKY_PILLAR_2F/RIGHT"),
+    #     lambda state: has_mach_bike(state)
+    # )
+    # set_rule(
+    #     get_entrance("REGION_SKY_PILLAR_4F/MAIN -> REGION_SKY_PILLAR_4F/ABOVE_3F_TOP_CENTER"),
+    #     lambda state: has_mach_bike(state)
+    # )
+
+    # Route 134
+    set_rule(
+        get_entrance("REGION_ROUTE134/MAIN -> REGION_UNDERWATER_ROUTE134/MAIN"),
+        can_dive
+    )
+
+    # Ever Grande City
+    set_rule(
+        get_entrance("REGION_EVER_GRANDE_CITY/SEA -> REGION_EVER_GRANDE_CITY/SOUTH"),
+        can_waterfall
+    )
+    set_rule(
+        get_entrance("REGION_EVER_GRANDE_CITY/SOUTH -> REGION_EVER_GRANDE_CITY/SEA"),
+        can_surf
+    )
+
+    # Victory Road
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B1F/SOUTH_WEST_MAIN -> REGION_VICTORY_ROAD_B1F/SOUTH_WEST_LADDER_UP"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B1F/SOUTH_WEST_LADDER_UP -> REGION_VICTORY_ROAD_B1F/SOUTH_WEST_MAIN"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B1F/MAIN_UPPER -> REGION_VICTORY_ROAD_B1F/MAIN_LOWER_EAST"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B1F/MAIN_LOWER_EAST -> REGION_VICTORY_ROAD_B1F/MAIN_LOWER_WEST"),
+        can_rock_smash
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B1F/MAIN_LOWER_WEST -> REGION_VICTORY_ROAD_B1F/MAIN_LOWER_EAST"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B1F/MAIN_LOWER_WEST -> REGION_VICTORY_ROAD_B1F/MAIN_UPPER"),
+        lambda state: can_rock_smash(state) and can_strength(state)
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B2F/LOWER_WEST -> REGION_VICTORY_ROAD_B2F/LOWER_WEST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B2F/LOWER_WEST_ISLAND -> REGION_VICTORY_ROAD_B2F/LOWER_WEST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B2F/LOWER_EAST -> REGION_VICTORY_ROAD_B2F/LOWER_EAST_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B2F/LOWER_WEST_WATER -> REGION_VICTORY_ROAD_B2F/UPPER_WATER"),
+        can_waterfall
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B2F/LOWER_EAST_WATER -> REGION_VICTORY_ROAD_B2F/UPPER_WATER"),
+        can_waterfall
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B2F/UPPER -> REGION_VICTORY_ROAD_B2F/UPPER_WATER"),
+        can_surf
+    )
+    set_rule(
+        get_entrance("REGION_VICTORY_ROAD_B2F/UPPER -> REGION_VICTORY_ROAD_B2F/LOWER_EAST_WATER"),
+        can_surf
+    )
+
+    # Pokemon League
+    if world.options.elite_four_requirement == EliteFourRequirement.option_badges:
+        set_rule(
+            get_entrance("REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/MAIN -> REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/BEHIND_BADGE_CHECKERS"),
+            lambda state: state.has_group("Badges", world.player, world.options.elite_four_count.value)
+        )
+    else:
+        set_rule(
+            get_entrance("REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/MAIN -> REGION_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F/BEHIND_BADGE_CHECKERS"),
+            lambda state: defeated_n_gym_leaders(state, world.options.elite_four_count.value)
+        )
+
+    # Battle Frontier
+    # set_rule(
+    #     get_entrance("REGION_BATTLE_FRONTIER_OUTSIDE_WEST/DOCK -> REGION_LILYCOVE_CITY_HARBOR/MAIN"),
+    #     lambda state: state.has("S.S. Ticket", world.player) and
+    #         (state.has("EVENT_DEFEAT_CHAMPION", world.player) or world.options.enable_ferry.value == Toggle.option_true)
+    # )
+    # set_rule(
+    #     get_entrance("REGION_BATTLE_FRONTIER_OUTSIDE_WEST/DOCK -> REGION_SLATEPORT_CITY_HARBOR/MAIN"),
+    #     lambda state: state.has("S.S. Ticket", world.player) and
+    #         (state.has("EVENT_DEFEAT_CHAMPION", world.player) or world.options.enable_ferry.value == Toggle.option_true)
+    # )
+    # set_rule(
+    #     get_entrance("REGION_BATTLE_FRONTIER_OUTSIDE_WEST/CAVE_ENTRANCE -> REGION_BATTLE_FRONTIER_OUTSIDE_WEST/WATER"),
+    #     can_surf
+    # )
+    # set_rule(
+    #     get_entrance("REGION_BATTLE_FRONTIER_OUTSIDE_EAST/MAIN -> REGION_BATTLE_FRONTIER_OUTSIDE_EAST/ABOVE_WATERFALL"),
+    #     lambda state: state.has("Wailmer Pail", world.player) and can_surf(state)
+    # )
+    # set_rule(
+    #     get_entrance("REGION_BATTLE_FRONTIER_OUTSIDE_EAST/ABOVE_WATERFALL -> REGION_BATTLE_FRONTIER_OUTSIDE_EAST/MAIN"),
+    #     lambda state: state.has("ITEM_WAILMER_PAIL", world.player)
+    # )
+    # set_rule(
+    #     get_entrance("REGION_BATTLE_FRONTIER_OUTSIDE_EAST/WATER -> REGION_BATTLE_FRONTIER_OUTSIDE_EAST/ABOVE_WATERFALL"),
+    #     can_waterfall
+    # )
+
+    # Overworld Items
+    if world.options.overworld_items:
+        # Route 103
+        set_rule(
+            get_location("ITEM_ROUTE_103_PP_UP"),
+            can_cut
+        )
+        set_rule(
+            get_location("ITEM_ROUTE_103_GUARD_SPEC"),
+            can_cut
+        )
+
+        # Route 104
+        set_rule(
+            get_location("ITEM_ROUTE_104_X_ACCURACY"),
+            lambda state: can_surf(state) or can_cut(state)
+        )
+        set_rule(
+            get_location("ITEM_ROUTE_104_PP_UP"),
+            can_surf
+        )
+
+        # Route 117
+        set_rule(
+            get_location("ITEM_ROUTE_117_REVIVE"),
+            can_cut
+        )
+
+        # Route 114
+        set_rule(
+            get_location("ITEM_ROUTE_114_PROTEIN"),
+            can_rock_smash
+        )
+
+        # Safari Zone
+        set_rule(
+            get_location("ITEM_SAFARI_ZONE_NORTH_WEST_TM22"),
+            can_surf
+        )
+        set_rule(
+            get_location("ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"),
+            can_surf
+        )
+        set_rule(
+            get_location("ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL"),
+            can_surf
+        )
+
+        # Victory Road
+        set_rule(
+            get_location("ITEM_VICTORY_ROAD_B1F_FULL_RESTORE"),
+            lambda state: can_rock_smash(state) and can_strength(state)
+        )
+
+    # Hidden Items
+    if world.options.hidden_items:
+        # Route 120
+        set_rule(
+            get_location("HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1"),
+            can_cut
+        )
+
+        # Route 121
+        set_rule(
+            get_location("HIDDEN_ITEM_ROUTE_121_NUGGET"),
+            can_cut
+        )
+
+    # NPC Gifts
+    if world.options.npc_gifts:
+        # Littleroot Town
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_AMULET_COIN"),
+            lambda state: state.has("EVENT_TALK_TO_MR_STONE", world.player) and state.has("Balance Badge", world.player)
+        )
+
+        # Petalburg City
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_TM36"),
+            lambda state: state.has("EVENT_DEFEAT_NORMAN", world.player)
+        )
+
+        # Route 104
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_WHITE_HERB"),
+            lambda state: state.has("Dynamo Badge", world.player) and state.has("EVENT_MEET_FLOWER_SHOP_OWNER", world.player)
+        )
+
+        # Devon Corp
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_EXP_SHARE"),
+            lambda state: state.has("EVENT_DELIVER_LETTER", world.player)
+        )
+
+        # Slateport City
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_DEEP_SEA_TOOTH"),
+            lambda state: state.has("EVENT_AQUA_STEALS_SUBMARINE", world.player)
+                          and state.has("Scanner", world.player)
+                          and state.has("Mind Badge", world.player)
+        )
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_DEEP_SEA_SCALE"),
+            lambda state: state.has("EVENT_AQUA_STEALS_SUBMARINE", world.player)
+                          and state.has("Scanner", world.player)
+                          and state.has("Mind Badge", world.player)
+        )
+
+        # Route 116
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_REPEAT_BALL"),
+            lambda state: state.has("EVENT_RESCUE_CAPT_STERN", world.player)
+        )
+
+        # Mauville City
+        set_rule(
+            get_location("NPC_GIFT_GOT_TM24_FROM_WATTSON"),
+            lambda state: state.has("EVENT_DEFEAT_NORMAN", world.player) and state.has("EVENT_TURN_OFF_GENERATOR", world.player)
+        )
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_COIN_CASE"),
+            lambda state: state.has("EVENT_BUY_HARBOR_MAIL", world.player)
+        )
+
+        # Fallarbor Town
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_TM27"),
+            lambda state: state.has("EVENT_RECOVER_METEORITE", world.player) and state.has("Meteorite", world.player)
+        )
+
+        # Fortree City
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_MENTAL_HERB"),
+            lambda state: state.has("EVENT_WINGULL_QUEST_2", world.player)
+        )
+
+    # Ferry Items
+    if world.options.enable_ferry:
+        set_rule(
+            get_location("NPC_GIFT_RECEIVED_SS_TICKET"),
+            lambda state: state.has("EVENT_DEFEAT_CHAMPION", world.player)
+        )
+        set_rule(
+            get_entrance("REGION_SLATEPORT_CITY_HARBOR/MAIN -> REGION_SS_TIDAL_CORRIDOR/MAIN"),
+            lambda state: state.has("S.S. Ticket", world.player)
+        )
+        set_rule(
+            get_entrance("REGION_LILYCOVE_CITY_HARBOR/MAIN -> REGION_SS_TIDAL_CORRIDOR/MAIN"),
+            lambda state: state.has("S.S. Ticket", world.player)
+        )
+
+    # Add Itemfinder requirement to hidden items
+    if world.options.require_itemfinder:
+        for location in world.multiworld.get_locations(world.player):
+            if location.tags is not None and "HiddenItem" in location.tags:
+                add_rule(
+                    location,
+                    lambda state: state.has("Itemfinder", world.player)
+                )
+
+    # Add Flash requirements to dark caves
+    if world.options.require_flash:
+        # Granite Cave
+        add_rule(
+            get_entrance("MAP_GRANITE_CAVE_1F:2/MAP_GRANITE_CAVE_B1F:1"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_GRANITE_CAVE_B1F:3/MAP_GRANITE_CAVE_B2F:1"),
+            can_flash
+        )
+
+        # Victory Road
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_1F:2/MAP_VICTORY_ROAD_B1F:5"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_1F:4/MAP_VICTORY_ROAD_B1F:4"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_1F:3/MAP_VICTORY_ROAD_B1F:2"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B1F:3/MAP_VICTORY_ROAD_B2F:1"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B1F:1/MAP_VICTORY_ROAD_B2F:2"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B1F:6/MAP_VICTORY_ROAD_B2F:3"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B1F:0/MAP_VICTORY_ROAD_B2F:0"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B2F:3/MAP_VICTORY_ROAD_B1F:6"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B2F:2/MAP_VICTORY_ROAD_B1F:1"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B2F:0/MAP_VICTORY_ROAD_B1F:0"),
+            can_flash
+        )
+        add_rule(
+            get_entrance("MAP_VICTORY_ROAD_B2F:1/MAP_VICTORY_ROAD_B1F:3"),
+            can_flash
+        )
diff --git a/worlds/pokemon_emerald/sanity_check.py b/worlds/pokemon_emerald/sanity_check.py
new file mode 100644
index 0000000000..58f9b1ef4d
--- /dev/null
+++ b/worlds/pokemon_emerald/sanity_check.py
@@ -0,0 +1,352 @@
+"""
+Looks through data object to double-check it makes sense. Will fail for missing or duplicate definitions or
+duplicate claims and give warnings for unused and unignored locations or warps.
+"""
+import logging
+from typing import List
+
+from .data import data
+
+
+_ignorable_locations = {
+    # Trick House
+    "HIDDEN_ITEM_TRICK_HOUSE_NUGGET",
+    "ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL",
+    "ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL",
+
+    # Battle Frontier
+    "ITEM_ARTISAN_CAVE_1F_CARBOS",
+    "ITEM_ARTISAN_CAVE_B1F_HP_UP",
+    "HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM",
+    "HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON",
+    "HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN",
+    "HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC",
+
+    # Event islands
+    "HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH"
+}
+
+_ignorable_warps = {
+    # Trick House
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:12/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:11",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:4/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:3",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:6/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:5",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:8/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:7",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:9/MAP_ROUTE110_TRICK_HOUSE_PUZZLE7:10",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8:0,1/MAP_ROUTE110_TRICK_HOUSE_ENTRANCE:2!",
+    "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8:2/MAP_ROUTE110_TRICK_HOUSE_END:0!",
+
+    # Department store elevator
+    "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0,1/MAP_DYNAMIC:-1!",
+    "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F:3/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!",
+    "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!",
+    "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!",
+    "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F:2/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!",
+    "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F:1/MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR:0!",
+
+    # Intro truck
+    "MAP_INSIDE_OF_TRUCK:0,1,2/MAP_DYNAMIC:-1!",
+
+    # Battle Frontier
+    "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1",
+    "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1!",
+    "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1",
+    "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1!",
+    "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2",
+    "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2",
+    "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0,1/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2",
+    "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0",
+    "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:3/MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM:0!",
+    "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2",
+    "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR:0",
+    "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0",
+    "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3",
+    "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0,1/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2",
+    "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0",
+    "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:2/MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM:0",
+    "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0,1,2/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6",
+    "MAP_BATTLE_FRONTIER_LOUNGE1:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5",
+    "MAP_BATTLE_FRONTIER_LOUNGE2:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3",
+    "MAP_BATTLE_FRONTIER_LOUNGE3:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9",
+    "MAP_BATTLE_FRONTIER_LOUNGE4:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6",
+    "MAP_BATTLE_FRONTIER_LOUNGE5:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7",
+    "MAP_BATTLE_FRONTIER_LOUNGE6:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8",
+    "MAP_BATTLE_FRONTIER_LOUNGE7:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7",
+    "MAP_BATTLE_FRONTIER_LOUNGE8:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10",
+    "MAP_BATTLE_FRONTIER_LOUNGE9:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11",
+    "MAP_BATTLE_FRONTIER_MART:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:0/MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:1/MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:10/MAP_BATTLE_FRONTIER_LOUNGE8:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:11/MAP_BATTLE_FRONTIER_LOUNGE9:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13/MAP_ARTISAN_CAVE_1F:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:2/MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:3/MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4/MAP_BATTLE_FRONTIER_RANKING_HALL:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:5/MAP_BATTLE_FRONTIER_LOUNGE1:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:6/MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:7/MAP_BATTLE_FRONTIER_LOUNGE5:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:8/MAP_BATTLE_FRONTIER_LOUNGE6:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_EAST:9/MAP_BATTLE_FRONTIER_LOUNGE3:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:0/MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:1/MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10/MAP_ARTISAN_CAVE_B1F:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:2/MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:3/MAP_BATTLE_FRONTIER_LOUNGE2:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:4/MAP_BATTLE_FRONTIER_MART:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5/MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:6/MAP_BATTLE_FRONTIER_LOUNGE4:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:7/MAP_BATTLE_FRONTIER_LOUNGE7:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8/MAP_BATTLE_FRONTIER_RECEPTION_GATE:0",
+    "MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9/MAP_BATTLE_FRONTIER_RECEPTION_GATE:1",
+    "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:12",
+    "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2/MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0",
+    "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:0/MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F:2",
+    "MAP_BATTLE_FRONTIER_RANKING_HALL:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:4",
+    "MAP_BATTLE_FRONTIER_RECEPTION_GATE:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:8",
+    "MAP_BATTLE_FRONTIER_RECEPTION_GATE:1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:9",
+    "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE:0,1/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:5",
+
+    "MAP_ARTISAN_CAVE_1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_EAST:13",
+    "MAP_ARTISAN_CAVE_1F:1/MAP_ARTISAN_CAVE_B1F:1",
+    "MAP_ARTISAN_CAVE_B1F:0/MAP_BATTLE_FRONTIER_OUTSIDE_WEST:10",
+    "MAP_ARTISAN_CAVE_B1F:1/MAP_ARTISAN_CAVE_1F:1",
+
+    # Terra Cave and Marine Cave
+    "MAP_TERRA_CAVE_ENTRANCE:0/MAP_DYNAMIC:-1!",
+    "MAP_TERRA_CAVE_END:0/MAP_TERRA_CAVE_ENTRANCE:1",
+    "MAP_TERRA_CAVE_ENTRANCE:1/MAP_TERRA_CAVE_END:0",
+    "MAP_ROUTE113:1/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE113:2/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE114:3/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE114:4/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE115:1/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE115:2/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE116:3/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE116:4/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE118:0/MAP_TERRA_CAVE_ENTRANCE:0!",
+    "MAP_ROUTE118:1/MAP_TERRA_CAVE_ENTRANCE:0!",
+
+    "MAP_UNDERWATER_MARINE_CAVE:0/MAP_DYNAMIC:-1!",
+    "MAP_MARINE_CAVE_END:0/MAP_MARINE_CAVE_ENTRANCE:0",
+    "MAP_MARINE_CAVE_ENTRANCE:0/MAP_MARINE_CAVE_END:0",
+    "MAP_UNDERWATER_ROUTE105:0/MAP_UNDERWATER_MARINE_CAVE:0!",
+    "MAP_UNDERWATER_ROUTE105:1/MAP_UNDERWATER_MARINE_CAVE:0!",
+    "MAP_UNDERWATER_ROUTE125:0/MAP_UNDERWATER_MARINE_CAVE:0!",
+    "MAP_UNDERWATER_ROUTE125:1/MAP_UNDERWATER_MARINE_CAVE:0!",
+    "MAP_UNDERWATER_ROUTE127:0/MAP_UNDERWATER_MARINE_CAVE:0!",
+    "MAP_UNDERWATER_ROUTE127:1/MAP_UNDERWATER_MARINE_CAVE:0!",
+    "MAP_UNDERWATER_ROUTE129:0/MAP_UNDERWATER_MARINE_CAVE:0!",
+    "MAP_UNDERWATER_ROUTE129:1/MAP_UNDERWATER_MARINE_CAVE:0!",
+
+    # Event islands
+    "MAP_BIRTH_ISLAND_EXTERIOR:0/MAP_BIRTH_ISLAND_HARBOR:0",
+    "MAP_BIRTH_ISLAND_HARBOR:0/MAP_BIRTH_ISLAND_EXTERIOR:0",
+
+    "MAP_FARAWAY_ISLAND_ENTRANCE:0,1/MAP_FARAWAY_ISLAND_INTERIOR:0,1",
+    "MAP_FARAWAY_ISLAND_INTERIOR:0,1/MAP_FARAWAY_ISLAND_ENTRANCE:0,1",
+
+    "MAP_SOUTHERN_ISLAND_EXTERIOR:0,1/MAP_SOUTHERN_ISLAND_INTERIOR:0,1",
+    "MAP_SOUTHERN_ISLAND_INTERIOR:0,1/MAP_SOUTHERN_ISLAND_EXTERIOR:0,1",
+
+    "MAP_NAVEL_ROCK_B1F:0/MAP_NAVEL_ROCK_ENTRANCE:0",
+    "MAP_NAVEL_ROCK_B1F:1/MAP_NAVEL_ROCK_FORK:1",
+    "MAP_NAVEL_ROCK_BOTTOM:0/MAP_NAVEL_ROCK_DOWN11:0",
+    "MAP_NAVEL_ROCK_DOWN01:0/MAP_NAVEL_ROCK_FORK:2",
+    "MAP_NAVEL_ROCK_DOWN01:1/MAP_NAVEL_ROCK_DOWN02:0",
+    "MAP_NAVEL_ROCK_DOWN02:0/MAP_NAVEL_ROCK_DOWN01:1",
+    "MAP_NAVEL_ROCK_DOWN02:1/MAP_NAVEL_ROCK_DOWN03:0",
+    "MAP_NAVEL_ROCK_DOWN03:0/MAP_NAVEL_ROCK_DOWN02:1",
+    "MAP_NAVEL_ROCK_DOWN03:1/MAP_NAVEL_ROCK_DOWN04:0",
+    "MAP_NAVEL_ROCK_DOWN04:0/MAP_NAVEL_ROCK_DOWN03:1",
+    "MAP_NAVEL_ROCK_DOWN04:1/MAP_NAVEL_ROCK_DOWN05:0",
+    "MAP_NAVEL_ROCK_DOWN05:0/MAP_NAVEL_ROCK_DOWN04:1",
+    "MAP_NAVEL_ROCK_DOWN05:1/MAP_NAVEL_ROCK_DOWN06:0",
+    "MAP_NAVEL_ROCK_DOWN06:0/MAP_NAVEL_ROCK_DOWN05:1",
+    "MAP_NAVEL_ROCK_DOWN06:1/MAP_NAVEL_ROCK_DOWN07:0",
+    "MAP_NAVEL_ROCK_DOWN07:0/MAP_NAVEL_ROCK_DOWN06:1",
+    "MAP_NAVEL_ROCK_DOWN07:1/MAP_NAVEL_ROCK_DOWN08:0",
+    "MAP_NAVEL_ROCK_DOWN08:0/MAP_NAVEL_ROCK_DOWN07:1",
+    "MAP_NAVEL_ROCK_DOWN08:1/MAP_NAVEL_ROCK_DOWN09:0",
+    "MAP_NAVEL_ROCK_DOWN09:0/MAP_NAVEL_ROCK_DOWN08:1",
+    "MAP_NAVEL_ROCK_DOWN09:1/MAP_NAVEL_ROCK_DOWN10:0",
+    "MAP_NAVEL_ROCK_DOWN10:0/MAP_NAVEL_ROCK_DOWN09:1",
+    "MAP_NAVEL_ROCK_DOWN10:1/MAP_NAVEL_ROCK_DOWN11:1",
+    "MAP_NAVEL_ROCK_DOWN11:0/MAP_NAVEL_ROCK_BOTTOM:0",
+    "MAP_NAVEL_ROCK_DOWN11:1/MAP_NAVEL_ROCK_DOWN10:1",
+    "MAP_NAVEL_ROCK_ENTRANCE:0/MAP_NAVEL_ROCK_B1F:0",
+    "MAP_NAVEL_ROCK_ENTRANCE:1/MAP_NAVEL_ROCK_EXTERIOR:1",
+    "MAP_NAVEL_ROCK_EXTERIOR:0/MAP_NAVEL_ROCK_HARBOR:0",
+    "MAP_NAVEL_ROCK_EXTERIOR:1/MAP_NAVEL_ROCK_ENTRANCE:1",
+    "MAP_NAVEL_ROCK_FORK:0/MAP_NAVEL_ROCK_UP1:0",
+    "MAP_NAVEL_ROCK_FORK:1/MAP_NAVEL_ROCK_B1F:1",
+    "MAP_NAVEL_ROCK_FORK:2/MAP_NAVEL_ROCK_DOWN01:0",
+    "MAP_NAVEL_ROCK_HARBOR:0/MAP_NAVEL_ROCK_EXTERIOR:0",
+    "MAP_NAVEL_ROCK_TOP:0/MAP_NAVEL_ROCK_UP4:1",
+    "MAP_NAVEL_ROCK_UP1:0/MAP_NAVEL_ROCK_FORK:0",
+    "MAP_NAVEL_ROCK_UP1:1/MAP_NAVEL_ROCK_UP2:0",
+    "MAP_NAVEL_ROCK_UP2:0/MAP_NAVEL_ROCK_UP1:1",
+    "MAP_NAVEL_ROCK_UP2:1/MAP_NAVEL_ROCK_UP3:0",
+    "MAP_NAVEL_ROCK_UP3:0/MAP_NAVEL_ROCK_UP2:1",
+    "MAP_NAVEL_ROCK_UP3:1/MAP_NAVEL_ROCK_UP4:0",
+    "MAP_NAVEL_ROCK_UP4:0/MAP_NAVEL_ROCK_UP3:1",
+    "MAP_NAVEL_ROCK_UP4:1/MAP_NAVEL_ROCK_TOP:0",
+
+    # Secret bases
+    "MAP_SECRET_BASE_BROWN_CAVE1:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_BROWN_CAVE2:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_BROWN_CAVE3:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_BROWN_CAVE4:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_BLUE_CAVE1:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_BLUE_CAVE2:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_BLUE_CAVE3:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_BLUE_CAVE4:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_YELLOW_CAVE1:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_YELLOW_CAVE2:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_YELLOW_CAVE3:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_YELLOW_CAVE4:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_RED_CAVE1:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_RED_CAVE2:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_RED_CAVE3:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_RED_CAVE4:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_SHRUB1:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_SHRUB2:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_SHRUB3:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_SHRUB4:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_TREE1:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_TREE2:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_TREE3:0/MAP_DYNAMIC:-2!",
+    "MAP_SECRET_BASE_TREE4:0/MAP_DYNAMIC:-2!",
+
+    # Multiplayer rooms
+    "MAP_RECORD_CORNER:0,1,2,3/MAP_DYNAMIC:-1!",
+
+    "MAP_UNION_ROOM:0,1/MAP_DYNAMIC:-1!",
+    "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_PETALBURG_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_OLDALE_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_FORTREE_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+    "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:1/MAP_UNION_ROOM:0!",
+
+    "MAP_TRADE_CENTER:0,1/MAP_DYNAMIC:-1!",
+    "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_PETALBURG_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_OLDALE_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_FORTREE_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+    "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F:2/MAP_TRADE_CENTER:0!",
+
+    "MAP_BATTLE_COLOSSEUM_2P:0,1/MAP_DYNAMIC:-1!",
+    "MAP_BATTLE_COLOSSEUM_4P:0,1,2,3/MAP_DYNAMIC:-1!",
+
+    # Unused content
+    "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:0/MAP_CAVE_OF_ORIGIN_1F:1!",
+    "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:1/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:0",
+    "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:0/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1:1",
+    "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:1/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:0",
+    "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:0/MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2:1",
+    "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3:1/MAP_CAVE_OF_ORIGIN_B1F:0!",
+    "MAP_LILYCOVE_CITY_UNUSED_MART:0,1/MAP_LILYCOVE_CITY:0!"
+}
+
+
+def validate_regions() -> bool:
+    error_messages: List[str] = []
+    warn_messages: List[str] = []
+    failed = False
+
+    def error(message: str) -> None:
+        nonlocal failed
+        failed = True
+        error_messages.append(message)
+
+    def warn(message: str) -> None:
+        warn_messages.append(message)
+
+    # Check regions
+    for name, region in data.regions.items():
+        for region_exit in region.exits:
+            if region_exit not in data.regions:
+                error(f"Pokemon Emerald: Region [{region_exit}] referenced by [{name}] was not defined")
+
+    # Check warps
+    for warp_source, warp_dest in data.warp_map.items():
+        if warp_source in _ignorable_warps:
+            continue
+
+        if warp_dest is None:
+            error(f"Pokemon Emerald: Warp [{warp_source}] has no destination")
+        elif not data.warps[warp_dest].connects_to(data.warps[warp_source]) and not data.warps[warp_source].is_one_way:
+            error(f"Pokemon Emerald: Warp [{warp_source}] appears to be a one-way warp but was not marked as one")
+
+    # Check locations
+    claimed_locations = [location for region in data.regions.values() for location in region.locations]
+    claimed_locations_set = set()
+    for location_name in claimed_locations:
+        if location_name in claimed_locations_set:
+            error(f"Pokemon Emerald: Location [{location_name}] was claimed by multiple regions")
+        claimed_locations_set.add(location_name)
+
+    for location_name in data.locations:
+        if location_name not in claimed_locations and location_name not in _ignorable_locations:
+            warn(f"Pokemon Emerald: Location [{location_name}] was not claimed by any region")
+
+    warn_messages.sort()
+    error_messages.sort()
+
+    for message in warn_messages:
+        logging.warning(message)
+    for message in error_messages:
+        logging.error(message)
+
+    logging.debug("Pokemon Emerald sanity check done. Found %s errors and %s warnings.", len(error_messages), len(warn_messages))
+
+    return not failed
diff --git a/worlds/pokemon_emerald/test/__init__.py b/worlds/pokemon_emerald/test/__init__.py
new file mode 100644
index 0000000000..84ce64003d
--- /dev/null
+++ b/worlds/pokemon_emerald/test/__init__.py
@@ -0,0 +1,5 @@
+from test.TestBase import WorldTestBase
+
+
+class PokemonEmeraldTestBase(WorldTestBase):
+    game = "Pokemon Emerald"
diff --git a/worlds/pokemon_emerald/test/test_accessibility.py b/worlds/pokemon_emerald/test/test_accessibility.py
new file mode 100644
index 0000000000..853a92ffb8
--- /dev/null
+++ b/worlds/pokemon_emerald/test/test_accessibility.py
@@ -0,0 +1,215 @@
+from Options import Toggle
+
+from . import PokemonEmeraldTestBase
+from ..util import location_name_to_label
+from ..options import NormanRequirement
+
+
+class TestBasic(PokemonEmeraldTestBase):
+    def test_always_accessible(self) -> None:
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_ROUTE_102_POTION")))
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_ROUTE_115_SUPER_POTION")))
+
+
+class TestScorchedSlabPond(PokemonEmeraldTestBase):
+    options = {
+        "enable_ferry": Toggle.option_true,
+        "require_flash": Toggle.option_false
+    }
+
+    def test_with_neither(self) -> None:
+        self.collect_by_name(["S.S. Ticket", "Letter", "Stone Badge", "HM01 Cut"])
+        self.assertTrue(self.can_reach_region("REGION_ROUTE120/NORTH"))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_ROUTE_120_NEST_BALL")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_SCORCHED_SLAB_TM11")))
+
+    def test_with_surf(self) -> None:
+        self.collect_by_name(["S.S. Ticket", "Letter", "Stone Badge", "HM01 Cut", "HM03 Surf", "Balance Badge"])
+        self.assertTrue(self.can_reach_region("REGION_ROUTE120/NORTH"))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_ROUTE_120_NEST_BALL")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_SCORCHED_SLAB_TM11")))
+
+    def test_with_scope(self) -> None:
+        self.collect_by_name(["S.S. Ticket", "Letter", "Stone Badge", "HM01 Cut", "Devon Scope"])
+        self.assertTrue(self.can_reach_region("REGION_ROUTE120/NORTH"))
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_ROUTE_120_NEST_BALL")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_SCORCHED_SLAB_TM11")))
+
+    def test_with_both(self) -> None:
+        self.collect_by_name(["S.S. Ticket", "Letter", "Stone Badge", "HM01 Cut", "Devon Scope", "HM03 Surf", "Balance Badge"])
+        self.assertTrue(self.can_reach_region("REGION_ROUTE120/NORTH"))
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_ROUTE_120_NEST_BALL")))
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_SCORCHED_SLAB_TM11")))
+
+
+class TestSurf(PokemonEmeraldTestBase):
+    options = {
+        "npc_gifts": Toggle.option_true,
+        "hidden_items": Toggle.option_true,
+        "require_itemfinder": Toggle.option_false
+    }
+
+    def test_inaccessible_with_no_surf(self) -> None:
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_PETALBURG_CITY_ETHER")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("NPC_GIFT_RECEIVED_SOOTHE_BELL")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_LILYCOVE_CITY_MAX_REPEL")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_ROUTE_120_FULL_HEAL")))
+        self.assertFalse(self.can_reach_entrance("REGION_ROUTE118/WATER -> REGION_ROUTE118/EAST"))
+        self.assertFalse(self.can_reach_entrance("REGION_ROUTE119/UPPER -> REGION_FORTREE_CITY/MAIN"))
+        self.assertFalse(self.can_reach_entrance("MAP_FORTREE_CITY:3/MAP_FORTREE_CITY_MART:0"))
+
+    def test_accessible_with_surf_only(self) -> None:
+        self.collect_by_name(["HM03 Surf", "Balance Badge"])
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_PETALBURG_CITY_ETHER")))
+        self.assertTrue(self.can_reach_location(location_name_to_label("NPC_GIFT_RECEIVED_SOOTHE_BELL")))
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_LILYCOVE_CITY_MAX_REPEL")))
+        self.assertTrue(self.can_reach_location(location_name_to_label("HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2")))
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_ROUTE_120_FULL_HEAL")))
+        self.assertTrue(self.can_reach_entrance("REGION_ROUTE118/WATER -> REGION_ROUTE118/EAST"))
+        self.assertTrue(self.can_reach_entrance("REGION_ROUTE119/UPPER -> REGION_FORTREE_CITY/MAIN"))
+        self.assertTrue(self.can_reach_entrance("MAP_FORTREE_CITY:3/MAP_FORTREE_CITY_MART:0"))
+        self.assertTrue(self.can_reach_location(location_name_to_label("BADGE_4")))
+
+
+class TestFreeFly(PokemonEmeraldTestBase):
+    options = {
+        "npc_gifts": Toggle.option_true,
+        "free_fly_location": Toggle.option_true
+    }
+
+    def setUp(self) -> None:
+        super(PokemonEmeraldTestBase, self).setUp()
+
+        # Swap free fly to Sootopolis
+        free_fly_location = self.multiworld.get_location("FREE_FLY_LOCATION", 1)
+        free_fly_location.item = None
+        free_fly_location.place_locked_item(self.multiworld.worlds[1].create_event("EVENT_VISITED_SOOTOPOLIS_CITY"))
+
+    def test_sootopolis_gift_inaccessible_with_no_surf(self) -> None:
+        self.collect_by_name(["HM02 Fly", "Feather Badge"])
+        self.assertFalse(self.can_reach_location(location_name_to_label("NPC_GIFT_RECEIVED_TM31")))
+
+    def test_sootopolis_gift_accessible_with_surf(self) -> None:
+        self.collect_by_name(["HM03 Surf", "Balance Badge", "HM02 Fly", "Feather Badge"])
+        self.assertTrue(self.can_reach_location(location_name_to_label("NPC_GIFT_RECEIVED_TM31")))
+
+
+class TestFerry(PokemonEmeraldTestBase):
+    options = {
+        "npc_gifts": Toggle.option_true,
+        "enable_ferry": Toggle.option_true
+    }
+
+    def test_inaccessible_with_no_items(self) -> None:
+        self.assertFalse(self.can_reach_location(location_name_to_label("NPC_GIFT_RECEIVED_SOOTHE_BELL")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_LILYCOVE_CITY_MAX_REPEL")))
+
+    def test_inaccessible_with_only_slateport_access(self) -> None:
+        self.collect_by_name(["HM06 Rock Smash", "Dynamo Badge", "Acro Bike"])
+        self.assertTrue(self.can_reach_location(location_name_to_label("NPC_GIFT_RECEIVED_SOOTHE_BELL")))
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_LILYCOVE_CITY_MAX_REPEL")))
+
+    def test_accessible_with_slateport_access_and_ticket(self) -> None:
+        self.collect_by_name(["HM06 Rock Smash", "Dynamo Badge", "Acro Bike", "S.S. Ticket"])
+        self.assertTrue(self.can_reach_location(location_name_to_label("NPC_GIFT_RECEIVED_SOOTHE_BELL")))
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_LILYCOVE_CITY_MAX_REPEL")))
+
+
+class TestExtraBouldersOn(PokemonEmeraldTestBase):
+    options = {
+        "extra_boulders": Toggle.option_true
+    }
+
+    def test_inaccessible_with_no_items(self) -> None:
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_ROUTE_115_PP_UP")))
+
+    def test_inaccessible_with_surf_only(self) -> None:
+        self.collect_by_name(["HM03 Surf", "Balance Badge"])
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_ROUTE_115_PP_UP")))
+
+    def test_accessible_with_surf_and_strength(self) -> None:
+        self.collect_by_name(["HM03 Surf", "Balance Badge", "HM04 Strength", "Heat Badge"])
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_ROUTE_115_PP_UP")))
+
+
+class TestExtraBouldersOff(PokemonEmeraldTestBase):
+    options = {
+        "extra_boulders": Toggle.option_false
+    }
+
+    def test_inaccessible_with_no_items(self) -> None:
+        self.assertFalse(self.can_reach_location(location_name_to_label("ITEM_ROUTE_115_PP_UP")))
+
+    def test_accessible_with_surf_only(self) -> None:
+        self.collect_by_name(["HM03 Surf", "Balance Badge"])
+        self.assertTrue(self.can_reach_location(location_name_to_label("ITEM_ROUTE_115_PP_UP")))
+
+
+class TestNormanRequirement1(PokemonEmeraldTestBase):
+    options = {
+        "norman_requirement": NormanRequirement.option_badges,
+        "norman_count": 0
+    }
+
+    def test_accessible_with_no_items(self) -> None:
+        self.assertTrue(self.can_reach_location(location_name_to_label("BADGE_5")))
+
+
+class TestNormanRequirement2(PokemonEmeraldTestBase):
+    options = {
+        "norman_requirement": NormanRequirement.option_badges,
+        "norman_count": 4
+    }
+
+    def test_inaccessible_with_no_items(self) -> None:
+        self.assertFalse(self.can_reach_location(location_name_to_label("BADGE_5")))
+
+    def test_accessible_with_enough_badges(self) -> None:
+        self.collect_by_name(["Stone Badge", "Knuckle Badge", "Feather Badge", "Balance Badge"])
+        self.assertTrue(self.can_reach_location(location_name_to_label("BADGE_5")))
+
+
+class TestNormanRequirement3(PokemonEmeraldTestBase):
+    options = {
+        "norman_requirement": NormanRequirement.option_gyms,
+        "norman_count": 0
+    }
+
+    def test_accessible_with_no_items(self) -> None:
+        self.assertTrue(self.can_reach_location(location_name_to_label("BADGE_5")))
+
+
+class TestNormanRequirement4(PokemonEmeraldTestBase):
+    options = {
+        "norman_requirement": NormanRequirement.option_gyms,
+        "norman_count": 4
+    }
+
+    def test_inaccessible_with_no_items(self) -> None:
+        self.assertFalse(self.can_reach_location(location_name_to_label("BADGE_5")))
+
+    def test_accessible_with_reachable_gyms(self) -> None:
+        self.collect_by_name(["HM03 Surf", "Balance Badge"])  # Reaches Roxanne, Brawley, Wattson, and Flannery
+        self.assertTrue(self.can_reach_location(location_name_to_label("BADGE_5")))
+
+
+class TestVictoryRoad(PokemonEmeraldTestBase):
+    options = {
+        "elite_four_requirement": NormanRequirement.option_badges,
+        "elite_four_count": 0,
+        "remove_roadblocks": {"Lilycove City Wailmer"}
+    }
+
+    def test_accessible_with_specific_hms(self) -> None:
+        self.assertFalse(self.can_reach_location("EVENT_DEFEAT_CHAMPION"))
+        self.collect_by_name(["HM03 Surf", "Balance Badge"])
+        self.assertFalse(self.can_reach_location("EVENT_DEFEAT_CHAMPION"))
+        self.collect_by_name(["HM07 Waterfall", "Rain Badge"])
+        self.assertFalse(self.can_reach_location("EVENT_DEFEAT_CHAMPION"))
+        self.collect_by_name(["HM04 Strength", "Heat Badge"])
+        self.assertFalse(self.can_reach_location("EVENT_DEFEAT_CHAMPION"))
+        self.collect_by_name(["HM06 Rock Smash", "Dynamo Badge"])
+        self.assertFalse(self.can_reach_location("EVENT_DEFEAT_CHAMPION"))
+        self.collect_by_name(["HM05 Flash", "Knuckle Badge"])
+        self.assertTrue(self.can_reach_location("EVENT_DEFEAT_CHAMPION"))
diff --git a/worlds/pokemon_emerald/test/test_warps.py b/worlds/pokemon_emerald/test/test_warps.py
new file mode 100644
index 0000000000..75a2417dfb
--- /dev/null
+++ b/worlds/pokemon_emerald/test/test_warps.py
@@ -0,0 +1,21 @@
+from test.TestBase import TestBase
+from ..data import Warp
+
+
+class TestWarps(TestBase):
+    def test_warps_connect_ltr(self) -> None:
+        # 2-way
+        self.assertTrue(Warp("FAKE_MAP_A:0/FAKE_MAP_B:0").connects_to(Warp("FAKE_MAP_B:0/FAKE_MAP_A:0")))
+        self.assertTrue(Warp("FAKE_MAP_A:0/FAKE_MAP_B:2").connects_to(Warp("FAKE_MAP_B:2/FAKE_MAP_A:0")))
+        self.assertTrue(Warp("FAKE_MAP_A:0,1/FAKE_MAP_B:2").connects_to(Warp("FAKE_MAP_B:2/FAKE_MAP_A:0")))
+        self.assertTrue(Warp("FAKE_MAP_A:0/FAKE_MAP_B:2").connects_to(Warp("FAKE_MAP_B:2,3/FAKE_MAP_A:0")))
+
+        # 1-way
+        self.assertTrue(Warp("FAKE_MAP_A:0/FAKE_MAP_B:2!").connects_to(Warp("FAKE_MAP_B:2/FAKE_MAP_A:3")))
+        self.assertTrue(Warp("FAKE_MAP_A:0,1/FAKE_MAP_B:2!").connects_to(Warp("FAKE_MAP_B:2/FAKE_MAP_A:3")))
+        self.assertTrue(Warp("FAKE_MAP_A:0/FAKE_MAP_B:2!").connects_to(Warp("FAKE_MAP_B:2,3/FAKE_MAP_A:3")))
+
+        # Invalid
+        self.assertFalse(Warp("FAKE_MAP_A:0/FAKE_MAP_B:2").connects_to(Warp("FAKE_MAP_B:4/FAKE_MAP_A:0")))
+        self.assertFalse(Warp("FAKE_MAP_A:0,4/FAKE_MAP_B:2").connects_to(Warp("FAKE_MAP_B:4/FAKE_MAP_A:0")))
+        self.assertFalse(Warp("FAKE_MAP_A:0,4/FAKE_MAP_B:2").connects_to(Warp("FAKE_MAP_C:2/FAKE_MAP_A:0")))
diff --git a/worlds/pokemon_emerald/util.py b/worlds/pokemon_emerald/util.py
new file mode 100644
index 0000000000..781cfd47bc
--- /dev/null
+++ b/worlds/pokemon_emerald/util.py
@@ -0,0 +1,19 @@
+from typing import List
+
+from .data import data
+
+
+def location_name_to_label(name: str) -> str:
+    return data.locations[name].label
+
+
+def int_to_bool_array(num: int) -> List[bool]:
+    binary_string = format(num, '064b')
+    bool_array = [bit == '1' for bit in reversed(binary_string)]
+    return bool_array
+
+
+def bool_array_to_int(bool_array: List[bool]) -> int:
+    binary_string = ''.join(['1' if bit else '0' for bit in reversed(bool_array)])
+    num = int(binary_string, 2)
+    return num
diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py
index 11aa737e0f..5a94a8b5ff 100644
--- a/worlds/pokemon_rb/__init__.py
+++ b/worlds/pokemon_rb/__init__.py
@@ -2,9 +2,11 @@ import os
 import settings
 import typing
 import threading
+import base64
 from copy import deepcopy
 from typing import TextIO
 
+from Utils import __version__
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification, LocationProgressType
 from Fill import fill_restrictive, FillError, sweep_from_pool
 from worlds.AutoWorld import World, WebWorld
@@ -22,6 +24,7 @@ from .rules import set_rules
 from .level_scaling import level_scaling
 from . import logic
 from . import poke_data
+from . import client
 
 
 class PokemonSettings(settings.Group):
@@ -36,16 +39,8 @@ class PokemonSettings(settings.Group):
         copy_to = "Pokemon Blue (UE) [S][!].gb"
         md5s = [BlueDeltaPatch.hash]
 
-    class RomStart(str):
-        """
-        Set this to false to never autostart a rom (such as after patching)
-        True for operating system default program
-        Alternatively, a path to a program to open the .gb file with
-        """
-
     red_rom_file: RedRomFile = RedRomFile(RedRomFile.copy_to)
     blue_rom_file: BlueRomFile = BlueRomFile(BlueRomFile.copy_to)
-    rom_start: typing.Union[RomStart, bool] = True
 
 
 class PokemonWebWorld(WebWorld):
@@ -141,9 +136,6 @@ class PokemonRedBlueWorld(World):
         else:
             self.rival_name = encode_name(self.multiworld.rival_name[self.player].value, "Rival")
 
-        if len(self.multiworld.player_name[self.player].encode()) > 16:
-            raise Exception(f"Player name too long for {self.multiworld.get_player_name(self.player)}. Player name cannot exceed 16 bytes for Pokémon Red and Blue.")
-
         if not self.multiworld.badgesanity[self.player]:
             self.multiworld.non_local_items[self.player].value -= self.item_name_groups["Badges"]
 
@@ -289,18 +281,20 @@ class PokemonRedBlueWorld(World):
                     self.multiworld.itempool.remove(badge)
                     progitempool.remove(badge)
                 for _ in range(5):
-                    badgelocs = [self.multiworld.get_location(loc, self.player) for loc in [
-                        "Pewter Gym - Brock Prize", "Cerulean Gym - Misty Prize",
-                        "Vermilion Gym - Lt. Surge Prize", "Celadon Gym - Erika Prize",
-                        "Fuchsia Gym - Koga Prize", "Saffron Gym - Sabrina Prize",
-                        "Cinnabar Gym - Blaine Prize", "Viridian Gym - Giovanni Prize"]]
+                    badgelocs = [
+                        self.multiworld.get_location(loc, self.player) for loc in [
+                            "Pewter Gym - Brock Prize", "Cerulean Gym - Misty Prize",
+                            "Vermilion Gym - Lt. Surge Prize", "Celadon Gym - Erika Prize",
+                            "Fuchsia Gym - Koga Prize", "Saffron Gym - Sabrina Prize",
+                            "Cinnabar Gym - Blaine Prize", "Viridian Gym - Giovanni Prize"
+                        ] if self.multiworld.get_location(loc, self.player).item is None]
                     state = self.multiworld.get_all_state(False)
                     self.multiworld.random.shuffle(badges)
                     self.multiworld.random.shuffle(badgelocs)
                     badgelocs_copy = badgelocs.copy()
                     # allow_partial so that unplaced badges aren't lost, for debugging purposes
                     fill_restrictive(self.multiworld, state, badgelocs_copy, badges, True, True, allow_partial=True)
-                    if badges:
+                    if len(badges) > 8 - len(badgelocs):
                         for location in badgelocs:
                             if location.item:
                                 badges.append(location.item)
@@ -310,6 +304,7 @@ class PokemonRedBlueWorld(World):
                         for location in badgelocs:
                             if location.item:
                                 fill_locations.remove(location)
+                        progitempool += badges
                         break
                 else:
                     raise FillError(f"Failed to place badges for player {self.player}")
@@ -422,7 +417,7 @@ class PokemonRedBlueWorld(World):
                     > 7) or (self.multiworld.door_shuffle[self.player] not in ("off", "simple")))):
                 intervene_move = "Cut"
             elif ((not logic.can_learn_hm(test_state, "Flash", self.player)) and self.multiworld.dark_rock_tunnel_logic[self.player]
-                    and (((self.multiworld.accessibility[self.player] != "minimal" and
+                    and (((self.multiworld.accessibility[self.player] != "minimal" or
                     (self.multiworld.trainersanity[self.player] or self.multiworld.extra_key_items[self.player])) or
                     self.multiworld.door_shuffle[self.player]))):
                 intervene_move = "Flash"
@@ -445,13 +440,9 @@ class PokemonRedBlueWorld(World):
         # Delete evolution events for Pokémon that are not in logic in an all_state so that accessibility check does not
         # fail. Re-use test_state from previous final loop.
         evolutions_region = self.multiworld.get_region("Evolution", self.player)
-        clear_cache = False
         for location in evolutions_region.locations.copy():
             if not test_state.can_reach(location, player=self.player):
                 evolutions_region.locations.remove(location)
-                clear_cache = True
-        if clear_cache:
-            self.multiworld.clear_location_cache()
 
         if self.multiworld.old_man[self.player] == "early_parcel":
             self.multiworld.local_early_items[self.player]["Oak's Parcel"] = 1
@@ -467,13 +458,17 @@ class PokemonRedBlueWorld(World):
         locs = {self.multiworld.get_location("Fossil - Choice A", self.player),
                 self.multiworld.get_location("Fossil - Choice B", self.player)}
 
-        for loc in locs:
+        if not self.multiworld.key_items_only[self.player]:
+            rule = None
             if self.multiworld.fossil_check_item_types[self.player] == "key_items":
-                add_item_rule(loc, lambda i: i.advancement)
+                rule = lambda i: i.advancement
             elif self.multiworld.fossil_check_item_types[self.player] == "unique_items":
-                add_item_rule(loc, lambda i: i.name in item_groups["Unique"])
+                rule = lambda i: i.name in item_groups["Unique"]
             elif self.multiworld.fossil_check_item_types[self.player] == "no_key_items":
-                add_item_rule(loc, lambda i: not i.advancement)
+                rule = lambda i: not i.advancement
+            if rule:
+                for loc in locs:
+                    add_item_rule(loc, rule)
 
         for mon in ([" ".join(self.multiworld.get_location(
                 f"Oak's Lab - Starter {i}", self.player).item.name.split(" ")[1:]) for i in range(1, 4)]
@@ -559,7 +554,6 @@ class PokemonRedBlueWorld(World):
                     else:
                         raise Exception("Failed to remove corresponding item while deleting unreachable Dexsanity location")
 
-            self.multiworld._recache()
 
         if self.multiworld.door_shuffle[self.player] == "decoupled":
             swept_state = self.multiworld.state.copy()
@@ -622,6 +616,13 @@ class PokemonRedBlueWorld(World):
     def generate_output(self, output_directory: str):
         generate_output(self, output_directory)
 
+    def modify_multidata(self, multidata: dict):
+        rom_name = bytearray(f'AP{__version__.replace(".", "")[0:3]}_{self.player}_{self.multiworld.seed:11}\0',
+                             'utf8')[:21]
+        rom_name.extend([0] * (21 - len(rom_name)))
+        new_name = base64.b64encode(bytes(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):
         spoiler_handle.write(f"Cerulean Cave Total Key Items:   {self.multiworld.cerulean_cave_key_items_condition[self.player].total}\n")
         spoiler_handle.write(f"Elite Four Total Key Items:      {self.multiworld.elite_four_key_items_condition[self.player].total}\n")
diff --git a/worlds/pokemon_rb/basepatch_blue.bsdiff4 b/worlds/pokemon_rb/basepatch_blue.bsdiff4
index b7bdda7fbb..5ccf4e9bba 100644
Binary files a/worlds/pokemon_rb/basepatch_blue.bsdiff4 and b/worlds/pokemon_rb/basepatch_blue.bsdiff4 differ
diff --git a/worlds/pokemon_rb/basepatch_red.bsdiff4 b/worlds/pokemon_rb/basepatch_red.bsdiff4
index 51440789fd..26d2eb0c28 100644
Binary files a/worlds/pokemon_rb/basepatch_red.bsdiff4 and b/worlds/pokemon_rb/basepatch_red.bsdiff4 differ
diff --git a/worlds/pokemon_rb/client.py b/worlds/pokemon_rb/client.py
new file mode 100644
index 0000000000..7424cc8ddf
--- /dev/null
+++ b/worlds/pokemon_rb/client.py
@@ -0,0 +1,277 @@
+import base64
+import logging
+import time
+
+from NetUtils import ClientStatus
+from worlds._bizhawk.client import BizHawkClient
+from worlds._bizhawk import read, write, guarded_write
+
+from .locations import location_data
+
+logger = logging.getLogger("Client")
+
+BANK_EXCHANGE_RATE = 100000000
+
+DATA_LOCATIONS = {
+    "ItemIndex": (0x1A6E, 0x02),
+    "Deathlink": (0x00FD, 0x01),
+    "APItem": (0x00FF, 0x01),
+    "EventFlag": (0x1735, 0x140),
+    "Missable": (0x161A, 0x20),
+    "Hidden": (0x16DE, 0x0E),
+    "Rod": (0x1716, 0x01),
+    "DexSanityFlag": (0x1A71, 19),
+    "GameStatus": (0x1A84, 0x01),
+    "Money": (0x141F, 3),
+    "ResetCheck": (0x0100, 4),
+    # First and second Vermilion Gym trash can selection. Second is not used, so should always be 0.
+    # First should never be above 0x0F. This is just before Event Flags.
+    "CrashCheck1": (0x1731, 2),
+    # Unused, should always be 0. This is just before Missables flags.
+    "CrashCheck2": (0x1617, 1),
+    # Progressive keys, should never be above 10. Just before Dexsanity flags.
+    "CrashCheck3": (0x1A70, 1),
+    # Route 18 script value. Should never be above 2. Just before Hidden items flags.
+    "CrashCheck4": (0x16DD, 1),
+}
+
+location_map = {"Rod": {}, "EventFlag": {}, "Missable": {}, "Hidden": {}, "list": {}, "DexSanityFlag": {}}
+location_bytes_bits = {}
+for location in location_data:
+    if location.ram_address is not None:
+        if type(location.ram_address) == list:
+            location_map[type(location.ram_address).__name__][(location.ram_address[0].flag, location.ram_address[1].flag)] = location.address
+            location_bytes_bits[location.address] = [{'byte': location.ram_address[0].byte, 'bit': location.ram_address[0].bit},
+                                                     {'byte': location.ram_address[1].byte, 'bit': location.ram_address[1].bit}]
+        else:
+            location_map[type(location.ram_address).__name__][location.ram_address.flag] = location.address
+            location_bytes_bits[location.address] = {'byte': location.ram_address.byte, 'bit': location.ram_address.bit}
+
+location_name_to_id = {location.name: location.address for location in location_data if location.type == "Item"
+                       and location.address is not None}
+
+
+class PokemonRBClient(BizHawkClient):
+    system = ("GB", "SGB")
+    patch_suffix = (".apred", ".apblue")
+    game = "Pokemon Red and Blue"
+
+    def __init__(self):
+        super().__init__()
+        self.auto_hints = set()
+        self.locations_array = None
+        self.disconnect_pending = False
+        self.set_deathlink = False
+        self.banking_command = None
+        self.game_state = False
+        self.last_death_link = 0
+
+    async def validate_rom(self, ctx):
+        game_name = await read(ctx.bizhawk_ctx, [(0x134, 12, "ROM")])
+        game_name = game_name[0].decode("ascii")
+        if game_name in ("POKEMON RED\00", "POKEMON BLUE"):
+            ctx.game = self.game
+            ctx.items_handling = 0b001
+            ctx.command_processor.commands["bank"] = cmd_bank
+            seed_name = await read(ctx.bizhawk_ctx, [(0xFFDB, 21, "ROM")])
+            ctx.seed_name = seed_name[0].split(b"\0")[0].decode("ascii")
+            self.set_deathlink = False
+            self.banking_command = None
+            self.locations_array = None
+            self.disconnect_pending = False
+            return True
+        return False
+
+    async def set_auth(self, ctx):
+        auth_name = await read(ctx.bizhawk_ctx, [(0xFFC6, 21, "ROM")])
+        if auth_name[0] == bytes([0] * 21):
+            # rom was patched before rom names implemented, use player name
+            auth_name = await read(ctx.bizhawk_ctx, [(0xFFF0, 16, "ROM")])
+            auth_name = auth_name[0].decode("ascii").split("\x00")[0]
+        else:
+            auth_name = base64.b64encode(auth_name[0]).decode()
+        ctx.auth = auth_name
+
+    async def game_watcher(self, ctx):
+        if not ctx.server or not ctx.server.socket.open or ctx.server.socket.closed:
+            return
+
+        data = await read(ctx.bizhawk_ctx, [(loc_data[0], loc_data[1], "WRAM")
+                                            for loc_data in DATA_LOCATIONS.values()])
+        data = {data_set_name: data_name for data_set_name, data_name in zip(DATA_LOCATIONS.keys(), data)}
+
+        if self.set_deathlink:
+            self.set_deathlink = False
+            await ctx.update_death_link(True)
+
+        if self.disconnect_pending:
+            self.disconnect_pending = False
+            await ctx.disconnect()
+
+        if data["GameStatus"][0] == 0 or data["ResetCheck"] == b'\xff\xff\xff\x7f':
+            # Do not handle anything before game save is loaded
+            self.game_state = False
+            return
+        elif (data["GameStatus"][0] not in (0x2A, 0xAC)
+              or data["CrashCheck1"][0] & 0xF0 or data["CrashCheck1"][1] & 0xFF
+              or data["CrashCheck2"][0]
+              or data["CrashCheck3"][0] > 10
+              or data["CrashCheck4"][0] > 2):
+            # Should mean game crashed
+            logger.warning("Pokémon Red/Blue game may have crashed. Disconnecting from server.")
+            self.game_state = False
+            await ctx.disconnect()
+            return
+        self.game_state = True
+
+        # SEND ITEMS TO CLIENT
+
+        if data["APItem"][0] == 0:
+            item_index = int.from_bytes(data["ItemIndex"], "little")
+            if len(ctx.items_received) > item_index:
+                item_code = ctx.items_received[item_index].item - 172000000
+                if item_code > 255:
+                    item_code -= 256
+                await write(ctx.bizhawk_ctx, [(DATA_LOCATIONS["APItem"][0],
+                                               [item_code], "WRAM")])
+
+        # LOCATION CHECKS
+
+        locations = set()
+
+        for flag_type, loc_map in location_map.items():
+            for flag, loc_id in loc_map.items():
+                if flag_type == "list":
+                    if (data["EventFlag"][location_bytes_bits[loc_id][0]['byte']] & 1 <<
+                            location_bytes_bits[loc_id][0]['bit']
+                            and data["Missable"][location_bytes_bits[loc_id][1]['byte']] & 1 <<
+                            location_bytes_bits[loc_id][1]['bit']):
+                        locations.add(loc_id)
+                elif data[flag_type][location_bytes_bits[loc_id]['byte']] & 1 << location_bytes_bits[loc_id]['bit']:
+                    locations.add(loc_id)
+
+        if locations != self.locations_array:
+            if locations:
+                self.locations_array = locations
+                await ctx.send_msgs([{"cmd": "LocationChecks", "locations": list(locations)}])
+
+        # AUTO HINTS
+
+        hints = []
+        if data["EventFlag"][280] & 16:
+            hints.append("Cerulean Bicycle Shop")
+        if data["EventFlag"][280] & 32:
+            hints.append("Route 2 Gate - Oak's Aide")
+        if data["EventFlag"][280] & 64:
+            hints.append("Route 11 Gate 2F - Oak's Aide")
+        if data["EventFlag"][280] & 128:
+            hints.append("Route 15 Gate 2F - Oak's Aide")
+        if data["EventFlag"][281] & 1:
+            hints += ["Celadon Prize Corner - Item Prize 1", "Celadon Prize Corner - Item Prize 2",
+                      "Celadon Prize Corner - Item Prize 3"]
+        if (location_name_to_id["Fossil - Choice A"] in ctx.checked_locations and location_name_to_id[
+            "Fossil - Choice B"]
+                not in ctx.checked_locations):
+            hints.append("Fossil - Choice B")
+        elif (location_name_to_id["Fossil - Choice B"] in ctx.checked_locations and location_name_to_id[
+            "Fossil - Choice A"]
+              not in ctx.checked_locations):
+            hints.append("Fossil - Choice A")
+        hints = [
+            location_name_to_id[loc] for loc in hints if location_name_to_id[loc] not in self.auto_hints and
+                                                         location_name_to_id[loc] in ctx.missing_locations and
+                                                         location_name_to_id[loc] not in ctx.locations_checked
+        ]
+        if hints:
+            await ctx.send_msgs([{"cmd": "LocationScouts", "locations": hints, "create_as_hint": 2}])
+        self.auto_hints.update(hints)
+
+        # DEATHLINK
+
+        if "DeathLink" in ctx.tags:
+            if data["Deathlink"][0] == 3:
+                await ctx.send_death(ctx.player_names[ctx.slot] + " is out of usable Pokémon! "
+                                     + ctx.player_names[ctx.slot] + " blacked out!")
+                await write(ctx.bizhawk_ctx, [(DATA_LOCATIONS["Deathlink"][0], [0], "WRAM")])
+                self.last_death_link = ctx.last_death_link
+            elif ctx.last_death_link > self.last_death_link:
+                self.last_death_link = ctx.last_death_link
+                await write(ctx.bizhawk_ctx, [(DATA_LOCATIONS["Deathlink"][0], [1], "WRAM")])
+
+        # BANK
+
+        if self.banking_command:
+            original_money = data["Money"]
+            # Money is stored as binary-coded decimal.
+            money = int(original_money.hex())
+            if self.banking_command > money:
+                logger.warning(f"You do not have ${self.banking_command} to deposit!")
+            elif (-self.banking_command * BANK_EXCHANGE_RATE) > ctx.stored_data[f"EnergyLink{ctx.team}"]:
+                logger.warning("Not enough money in the EnergyLink storage!")
+            else:
+                if self.banking_command + money > 999999:
+                    self.banking_command = 999999 - money
+                money = str(money - self.banking_command).zfill(6)
+                money = [int(money[:2], 16), int(money[2:4], 16), int(money[4:], 16)]
+                money_written = await guarded_write(ctx.bizhawk_ctx, [(0x141F, money, "WRAM")],
+                                                    [(0x141F, original_money, "WRAM")])
+                if money_written:
+                    if self.banking_command >= 0:
+                        deposit = self.banking_command - int(self.banking_command / 4)
+                        tax = self.banking_command - deposit
+                        logger.info(f"Deposited ${deposit}, and charged a tax of ${tax}.")
+                        self.banking_command = deposit
+                    else:
+                        logger.info(f"Withdrew ${-self.banking_command}.")
+                    await ctx.send_msgs([{
+                        "cmd": "Set", "key": f"EnergyLink{ctx.team}", "operations":
+                            [{"operation": "add", "value": self.banking_command * BANK_EXCHANGE_RATE},
+                             {"operation": "max", "value": 0}],
+                    }])
+            self.banking_command = None
+
+        # VICTORY
+
+        if data["EventFlag"][280] & 1 and not ctx.finished_game:
+            await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+            ctx.finished_game = True
+
+    def on_package(self, ctx, cmd, args):
+        if cmd == 'Connected':
+            if 'death_link' in args['slot_data'] and args['slot_data']['death_link']:
+                self.set_deathlink = True
+                self.last_death_link = time.time()
+            ctx.set_notify(f"EnergyLink{ctx.team}")
+        elif cmd == 'RoomInfo':
+            if ctx.seed_name and ctx.seed_name != args["seed_name"]:
+                # CommonClient's on_package displays an error to the user in this case, but connection is not cancelled.
+                self.game_state = False
+                self.disconnect_pending = True
+        super().on_package(ctx, cmd, args)
+
+
+def cmd_bank(self, cmd: str = "", amount: str = ""):
+    """Deposit or withdraw money with the server's EnergyLink storage.
+    /bank - check server balance.
+    /bank deposit # - deposit money. One quarter of the amount will be lost to taxation.
+    /bank withdraw # - withdraw money."""
+    if self.ctx.game != "Pokemon Red and Blue":
+        logger.warning("This command can only be used while playing Pokémon Red and Blue")
+        return
+    if not cmd:
+        logger.info(f"Money available: {int(self.ctx.stored_data[f'EnergyLink{self.ctx.team}'] / BANK_EXCHANGE_RATE)}")
+        return
+    elif (not self.ctx.server) or self.ctx.server.socket.closed or not self.ctx.client_handler.game_state:
+        logger.info(f"Must be connected to server and in game.")
+    elif not amount:
+        logger.warning("You must specify an amount.")
+    elif cmd == "withdraw":
+        self.ctx.client_handler.banking_command = -int(amount)
+    elif cmd == "deposit":
+        if int(amount) < 4:
+            logger.warning("You must deposit at least $4, for tax purposes.")
+            return
+        self.ctx.client_handler.banking_command = int(amount)
+    else:
+        logger.warning(f"Invalid bank command {cmd}")
+        return
diff --git a/worlds/pokemon_rb/docs/en_Pokemon Red and Blue.md b/worlds/pokemon_rb/docs/en_Pokemon Red and Blue.md
index daefd6b2f7..b164d4b0fe 100644
--- a/worlds/pokemon_rb/docs/en_Pokemon Red and Blue.md	
+++ b/worlds/pokemon_rb/docs/en_Pokemon Red and Blue.md	
@@ -80,3 +80,12 @@ All items for other games will display simply as "AP ITEM," including those for
 A "received item" sound effect will play. Currently, there is no in-game message informing you of what the item is.
 If you are in battle, have menus or text boxes opened, or scripted events are occurring, the items will not be given to
 you until these have ended.
+
+## Unique Local Commands
+
+You can use `/bank` commands to deposit and withdraw money from the server's EnergyLink storage. This can be accessed by
+any players playing games that use the EnergyLink feature.
+
+- `/bank` - check the amount of money available on the server.
+- `/bank withdraw #` - withdraw money from the server.
+- `/bank deposit #` - deposit money into the server. 25% of the amount will be lost to taxation.
\ No newline at end of file
diff --git a/worlds/pokemon_rb/docs/setup_en.md b/worlds/pokemon_rb/docs/setup_en.md
index 488f3fdc07..c9344959f6 100644
--- a/worlds/pokemon_rb/docs/setup_en.md
+++ b/worlds/pokemon_rb/docs/setup_en.md
@@ -7,11 +7,10 @@ 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.7 is recommended for stability.
+  - Version 2.3.1 and later are supported. Version 2.9.1 is recommended.
   - 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)
-  (select `Pokemon Client` during installation).
 - Pokémon Red and/or Blue ROM files. The Archipelago community cannot provide these.
 
 ## Optional Software
@@ -23,7 +22,7 @@ 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
+- (If using 2.8 or earlier) 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** 
@@ -57,7 +56,7 @@ For `trainer_name` and `rival_name` the following regular characters are allowed
 
 * `‘’“”·… ABCDEFGHIJKLMNOPQRSTUVWXYZ():;[]abcdefghijklmnopqrstuvwxyzé'-?!.♂$×/,♀0123456789`
 
-And the following special characters (these each take up one character):
+And the following special characters (these each count as one character):
 * `<'d>`
 * `<'l>`
 * `<'t>`
@@ -71,28 +70,41 @@ And the following special characters (these each take up one character):
 
 ## Joining a MultiWorld Game
 
-### Obtain your Pokémon patch file
+### Generating and Patching a Game
 
-When you join a multiworld game, you will be asked to provide your YAML file to whoever is hosting. Once that is done,
-the host will provide you with either a link to download your data file, or with a zip file containing everyone's data
-files. Your data file should have a `.apred` or `.apblue` extension.
+1. Create your settings file (YAML).
+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 a `.apred` or `.apblue` 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.
+6. A patched `.gb` 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.
 
-Double-click on your patch file to start your client and start the ROM patch process. Once the process is finished
-(this can take a while), the client and the emulator will be started automatically (if you associated the extension
-to the emulator as recommended).
+If you're playing a single-player seed and you don't care about autotracking or hints, you can stop here, close the
+client, and load the patched ROM in any emulator. However, for multiworlds and other Archipelago features, continue
+below using BizHawk as your emulator.
 
 ### Connect to the Multiserver
 
-Once both the client and the emulator are started, you must connect them. Navigate to your Archipelago install folder,
-then to `data/lua`, and drag+drop the `connector_pkmn_rb.lua` script onto the main EmuHawk window. (You could instead
-open the Lua Console manually, click `Script` 〉 `Open Script`, and navigate to `connector_pkmn_rb.lua` with the file
-picker.)
+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. Pokémon Red and Blue use 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 may freeze every few seconds until it manages to connect to the client. This is expected. The BizHawk
+Client window should indicate that it connected and recognized Pokémon Red/Blue.
+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.
 
 To connect the client to the multiserver simply put `<address>:<port>` on the textfield on top and press enter (if the
 server uses password, type in the bottom textfield `/connect <address>:<port> [password]`)
 
-Now you are ready to start your adventure in Kanto.
-
 ## Auto-Tracking
 
 Pokémon Red and Blue has a fully functional map tracker that supports auto-tracking.
@@ -102,4 +114,5 @@ Pokémon Red and Blue has a fully functional map tracker that supports auto-trac
 3. Click on the "AP" symbol at the top.
 4. Enter the AP address, slot name and password. 
 
-The rest should take care of itself! Items and checks will be marked automatically, and it even knows your settings - It will hide checks & adjust logic accordingly.
+The rest should take care of itself! Items and checks will be marked automatically, and it even knows your settings - It
+will hide checks & adjust logic accordingly.
diff --git a/worlds/pokemon_rb/docs/setup_es.md b/worlds/pokemon_rb/docs/setup_es.md
index 4073103775..a6a6aa6ce7 100644
--- a/worlds/pokemon_rb/docs/setup_es.md
+++ b/worlds/pokemon_rb/docs/setup_es.md
@@ -7,7 +7,7 @@ Al usar BizHawk, esta guía solo es aplicable en los sistemas de Windows y Linux
 ## Software Requerido
 
 - BizHawk: [BizHawk Releases en TASVideos](https://tasvideos.org/BizHawk/ReleaseHistory)
-  - La versión 2.3.1 y posteriores son soportadas. Se recomienda la versión 2.7 para estabilidad.
+  - La versión 2.3.1 y posteriores son soportadas. Se recomienda la versión 2.9.1.
   - Instrucciones de instalación detalladas para BizHawk se pueden encontrar en el enlace de arriba.
   - Los usuarios de Windows deben ejecutar el instalador de prerrequisitos (prereq installer) primero, que también se 
     encuentra en el enlace de arriba.
@@ -27,31 +27,31 @@ Una vez que Bizhawk se haya instalado, abre Emuhawk y cambia las siguientes conf
 - (≤ 2.8) Abrir EmuHawk e ir a Config > Customize. Abrir la pestaña Advanced, y en la opción de Lua Core cambiar desde
   "NLua+KopiLua" a "Lua+LuaInterface". Luego reinicia EmuHawk. Esto es fundamental para que el script de Lua funcione
   correctamente.
-  **NOTA: Incluso si "Lua+LuaInterface" ya estaba seleccionado, cambia entre las opciones y vuelvelo a seleccionar.
-  **Algunas instalaciones de versiones nuevas de EmuHawk tienen una tendencia a mostrar "Lua+LuaInterface" por defecto
-  **pero siguen cargando "NLua+KopiLua" hasta completar este paso.**
-- Aun en la pestaña Advanced, asegurate que la casilla de AutoSaveRAM este marcada, y selecciona también la casilla 5s.
+  **NOTA: Incluso si "Lua+LuaInterface" ya estaba seleccionado, cambia entre las opciones y vuélvelo a seleccionar.
+  Algunas instalaciones de versiones nuevas de EmuHawk tienen una tendencia a mostrar "Lua+LuaInterface" por defecto
+  pero siguen cargando "NLua+KopiLua" hasta completar este paso.**
+- Aun en la pestaña Advanced, asegurate que la casilla de AutoSaveRAM esté marcada, y selecciona también la casilla 5s.
   Esto reduce la posibilidad de que se pierdan datos guardados en el caso de que el emulador deje de funcionar (crash).
 - En Config > Customize, pestaña General, marcar la casilla "Run in background". Esto evitará que te desconectes del
-  cliente mientras EmuHawk se esta ejecutando en segundo plano.
+  cliente mientras EmuHawk se está ejecutando en segundo plano.
 
 Es muy recomendado asociar los archivos GB (\*.gb) al emulador EmuHawk que se acaba de instalar.
-Para hacerlo, simplemente busca uno de los ROMs de gameboy, presiona con el click derecho sobre el y selecciona
-"Abrir con...", despliega la lista que aparece y selecciona la opción al final de la lista "Buscar otra aplicación en"
-"el equipo", luego navega a la carpeta de Bizhawk y selecciona EmuHawk.exe.
+Para hacerlo, simplemente busca uno de los ROMs de gameboy, presiona con el clic derecho sobre él y selecciona
+"Abrir con...", despliega la lista que aparece y selecciona la opción al final de la lista "Buscar otra aplicación en
+el equipo", luego navega a la carpeta de Bizhawk y selecciona EmuHawk.exe.
 
 ## Configura tu archivo YAML
 
-### Que es un archivo YAML y por qué necesito uno?
+### ¿Qué es un archivo YAML y por qué necesito uno?
 
 Tu archivo YAML contiene un número de opciones que proveen al generador con información sobre como debe generar tu
-juego. Cada jugador de un multiworld entregara su propio archivo YAML. Esto permite que cada jugador disfrute de una
+juego. Cada jugador de un multiworld entregará su propio archivo YAML. Esto permite que cada jugador disfrute de una
 experiencia personalizada a su manera, y que diferentes jugadores dentro del mismo multiworld pueden tener diferentes
 opciones.
 
-### Donde puedo obtener un archivo YAML?
+### ¿Dónde puedo obtener un archivo YAML?
 
-Puedes generar un archivo YAML or descargar su plantilla en la [pagina de configuración de jugador de Pokemon Red and Blue](/games/Pokemon%20Red%20and%20Blue/player-settings)
+Puedes generar un archivo YAML or descargar su plantilla en la [página de configuración de jugador de Pokémon Red and Blue](/games/Pokemon%20Red%20and%20Blue/player-settings)
 
 Es importante tener en cuenta que la opción `game_version` determina el ROM que será parcheado.
 Tanto el jugador como la persona que genera (si está generando localmente) necesitarán el archivo del ROM
@@ -61,7 +61,7 @@ Para las opciones `trainer_name` y `rival_name`, los siguientes caracteres norma
 
 * `‘’“”·… ABCDEFGHIJKLMNOPQRSTUVWXYZ():;[]abcdefghijklmnopqrstuvwxyzé'-?!.♂$×/,♀0123456789`
 
-Y los siguientes caracteres especiales (cada uno ocupa un caracter):
+Y los siguientes caracteres especiales (cada uno ocupa un carácter):
 * `<'d>`
 * `<'l>`
 * `<'t>`
@@ -77,12 +77,12 @@ Y los siguientes caracteres especiales (cada uno ocupa un caracter):
 
 ### Obtener tu parche de Pokémon
 
-Cuando te unes a un juego multiworld, se te pedirá que entregues tu archivo YAML a quien lo este organizando.
+Cuando te unes a un juego multiworld, se te pedirá que entregues tu archivo YAML a quien lo esté organizando.
 Una vez que la generación acabe, el anfitrión te dará un enlace a tu archivo, o un .zip con los archivos de
 todos. Tu archivo tiene una extensión `.apred` o `.apblue`.
 
-Haz doble click en tu archivo `.apred` o `.apblue` para que se ejecute el cliente y realize el parcheado de la ROM.
-Una vez acabe ese proceso (esto puede tardar un poco), el cliente y el emulador se abrirán automaticamente (si es que se
+Haz doble clic en tu archivo `.apred` o `.apblue` para que se ejecute el cliente y realice el parcheado del ROM.
+Una vez acabe ese proceso (esto puede tardar un poco), el cliente y el emulador se abrirán automáticamente (si es que se
 ha asociado la extensión al emulador tal como fue recomendado)
 
 ### Conectarse al multiserver
@@ -103,8 +103,8 @@ Pokémon Red and Blue tiene un mapa completamente funcional que soporta seguimie
 
 1. Descarga el [Tracker de mapa para Pokémon Red and Blue Archipelago](https://github.com/j-imbo/pkmnrb_jim/releases/latest) y [PopTracker](https://github.com/black-sliver/PopTracker/releases). 
 2. Abre PopTracker, y carga el pack de Pokémon Red and Blue.
-3. Haz click en el símbolo "AP" en la parte superior.
+3. Haz clic en el símbolo "AP" en la parte superior.
 4. Ingresa la dirección de AP, nombre del slot y contraseña (si es que hay).
 
-Y ya, el resto debería hacerse solo! Los items y checks seran marcados automaticamente, e incluso reconocerá tus
-configuraciones - Ocultará checks y ajustará la logica segun corresponda.
+¡Y ya, el resto debería hacerse solo! Los items y checks serán marcados automáticamente, e incluso reconocerá tus
+configuraciones - Ocultará checks y ajustará la lógica según corresponda.
diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py
index ec6375859b..3fff3b88c1 100644
--- a/worlds/pokemon_rb/locations.py
+++ b/worlds/pokemon_rb/locations.py
@@ -502,8 +502,8 @@ location_data = [
     LocationData("Mt Moon 1F", "Lass 2", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_1_TRAINER_2_ITEM"], EventFlag(134), inclusion=trainersanity),
     LocationData("Mt Moon 1F", "Youngster", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_1_TRAINER_1_ITEM"], EventFlag(135), inclusion=trainersanity),
     LocationData("Mt Moon 1F", "Hiker", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_1_TRAINER_0_ITEM"], EventFlag(136), inclusion=trainersanity),
-    LocationData("Mt Moon B2F-NE", "Rocket 1", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_1_ITEM"], EventFlag(127), inclusion=trainersanity),
-    LocationData("Mt Moon B2F-C", "Rocket 2", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_2_ITEM"], EventFlag(126), inclusion=trainersanity),
+    LocationData("Mt Moon B2F-C", "Rocket 1", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_1_ITEM"], EventFlag(127), inclusion=trainersanity),
+    LocationData("Mt Moon B2F-NE", "Rocket 2", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_2_ITEM"], EventFlag(126), inclusion=trainersanity),
     LocationData("Mt Moon B2F", "Rocket 3", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_3_ITEM"], EventFlag(125), inclusion=trainersanity),
     LocationData("Mt Moon B2F", "Rocket 4", None, rom_addresses["Trainersanity_EVENT_BEAT_MT_MOON_3_TRAINER_0_ITEM"], EventFlag(128), inclusion=trainersanity),
     LocationData("Viridian Forest", "Bug Catcher 1", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0_ITEM"], EventFlag(139), inclusion=trainersanity),
@@ -795,7 +795,7 @@ location_data = [
     LocationData("Pewter Gym", "Defeat Brock", "Defeat Brock", event=True),
     LocationData("Cerulean Gym", "Defeat Misty", "Defeat Misty", event=True),
     LocationData("Vermilion Gym", "Defeat Lt. Surge", "Defeat Lt. Surge", event=True),
-    LocationData("Celadon Gym", "Defeat Erika", "Defeat Erika", event=True),
+    LocationData("Celadon Gym-C", "Defeat Erika", "Defeat Erika", event=True),
     LocationData("Fuchsia Gym", "Defeat Koga", "Defeat Koga", event=True),
     LocationData("Cinnabar Gym", "Defeat Blaine", "Defeat Blaine", event=True),
     LocationData("Saffron Gym-C", "Defeat Sabrina", "Defeat Sabrina", event=True),
@@ -2310,43 +2310,50 @@ trainer_data = {
     'Cerulean Gym': [{'level': 19, 'party': ['Goldeen'], 'party_address': 'Trainer_Party_Cerulean_Gym_JrTrainerF_A'},
                      {'level': 16, 'party': ['Horsea', 'Shellder'],
                       'party_address': 'Trainer_Party_Cerulean_Gym_Swimmer_A'},
-        {'level': [18, 21], 'party': ['Staryu', 'Starmie'], 'party_address': 'Trainer_Party_Misty_A'},], 'Route 10-N': [ ###
-        {'level': 20, 'party': ['Pikachu', 'Clefairy'], 'party_address': 'Trainer_Party_Route_10_JrTrainerF_A'},
+        {'level': [18, 21], 'party': ['Staryu', 'Starmie'], 'party_address': 'Trainer_Party_Misty_A'},],
+    'Route 10-N': [{'level': 20, 'party': ['Pikachu', 'Clefairy'], 'party_address': 'Trainer_Party_Route_10_JrTrainerF_A'}],
+    'Route 10-C': [
+        {'level': 30, 'party': ['Rhyhorn', 'Lickitung'], 'party_address': 'Trainer_Party_Route_10_Pokemaniac_A'}],
+    'Route 10-S': [
         {'level': 21, 'party': ['Pidgey', 'Pidgeotto'], 'party_address': 'Trainer_Party_Route_10_JrTrainerF_B'},
-        {'level': 30, 'party': ['Rhyhorn', 'Lickitung'], 'party_address': 'Trainer_Party_Route_10_Pokemaniac_A'},
         {'level': 20, 'party': ['Cubone', 'Slowpoke'], 'party_address': 'Trainer_Party_Route_10_Pokemaniac_B'},
         {'level': 21, 'party': ['Geodude', 'Onix'], 'party_address': 'Trainer_Party_Route_10_Hiker_A'},
         {'level': 19, 'party': ['Onix', 'Graveler'], 'party_address': 'Trainer_Party_Route_10_Hiker_B'}],
-    'Rock Tunnel B1F-E': [{'level': 21, 'party': ['Jigglypuff', 'Pidgey', 'Meowth'], ###
+    'Rock Tunnel B1F-W': [{'level': 21, 'party': ['Jigglypuff', 'Pidgey', 'Meowth'],
                          'party_address': 'Trainer_Party_Rock_Tunnel_B1F_JrTrainerF_A'},
-                        {'level': 22, 'party': ['Oddish', 'Bulbasaur'],
-                         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_JrTrainerF_B'},
                         {'level': 20, 'party': ['Slowpoke', 'Slowpoke', 'Slowpoke'],
                          'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_A'},
-                        {'level': 22, 'party': ['Charmander', 'Cubone'],
-                         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_B'},
-                        {'level': 25, 'party': ['Slowpoke'],
-                         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_C'},
                         {'level': 21, 'party': ['Geodude', 'Geodude', 'Graveler'],
-                         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_A'},
-                        {'level': 25, 'party': ['Geodude'], 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_B'},
-                        {'level': 20, 'party': ['Machop', 'Onix'],
-                         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_D'}], 'Route 13': [
+                         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_A'},],
+    'Rock Tunnel B1F-E': [
+        {'level': 22, 'party': ['Oddish', 'Bulbasaur'],
+         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_JrTrainerF_B'},
+        {'level': 22, 'party': ['Charmander', 'Cubone'],
+         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_B'},
+        {'level': 25, 'party': ['Slowpoke'],
+         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Pokemaniac_C'},
+        {'level': 25, 'party': ['Geodude'], 'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_B'},
+        {'level': 20, 'party': ['Machop', 'Onix'],
+         'party_address': 'Trainer_Party_Rock_Tunnel_B1F_Hiker_D'}],
+    'Route 13-E': [
+        {'level': 28, 'party': ['Goldeen', 'Poliwag', 'Horsea'],
+         'party_address': 'Trainer_Party_Route_13_JrTrainerF_D'},
+        {'level': 29, 'party': ['Pidgey', 'Pidgeotto'], 'party_address': 'Trainer_Party_Route_13_BirdKeeper_A'},
         {'level': 24, 'party': ['Pidgey', 'Meowth', 'Rattata', 'Pikachu', 'Meowth'],
          'party_address': 'Trainer_Party_Route_13_JrTrainerF_A'},
+    ],
+    'Route 13': [
         {'level': 30, 'party': ['Poliwag', 'Poliwag'], 'party_address': 'Trainer_Party_Route_13_JrTrainerF_B'},
         {'level': 27, 'party': ['Pidgey', 'Meowth', 'Pidgey', 'Pidgeotto'],
          'party_address': 'Trainer_Party_Route_13_JrTrainerF_C'},
-        {'level': 28, 'party': ['Goldeen', 'Poliwag', 'Horsea'],
-         'party_address': 'Trainer_Party_Route_13_JrTrainerF_D'},
         {'level': 28, 'party': ['Koffing', 'Koffing', 'Koffing'], 'party_address': 'Trainer_Party_Route_13_Biker_A'},
         {'level': 27, 'party': ['Rattata', 'Pikachu', 'Rattata'], 'party_address': 'Trainer_Party_Route_13_Beauty_A'},
         {'level': 29, 'party': ['Clefairy', 'Meowth'], 'party_address': 'Trainer_Party_Route_13_Beauty_B'},
-        {'level': 29, 'party': ['Pidgey', 'Pidgeotto'], 'party_address': 'Trainer_Party_Route_13_BirdKeeper_A'},
         {'level': 25, 'party': ['Spearow', 'Pidgey', 'Pidgey', 'Spearow', 'Spearow'],
          'party_address': 'Trainer_Party_Route_13_BirdKeeper_B'},
         {'level': 26, 'party': ['Pidgey', 'Pidgeotto', 'Spearow', 'Fearow'],
          'party_address': 'Trainer_Party_Route_13_BirdKeeper_C'}],
+
     'Route 20-E': [
         {'level': 31, 'party': ['Shellder', 'Cloyster'], 'party_address': 'Trainer_Party_Route_20_Swimmer_A'},
         {'level': 28, 'party': ['Horsea', 'Horsea', 'Seadra', 'Horsea'],
@@ -2354,9 +2361,9 @@ trainer_data = {
          'party_address': 'Trainer_Party_Route_20_Swimmer_C'},
 
         {'level': 30, 'party': ['Seadra', 'Horsea', 'Seadra'],
-         'party_address': 'Trainer_Party_Route_20_Beauty_E'}],
+         'party_address': 'Trainer_Party_Route_20_Beauty_E'},
+        {'level': 35, 'party': ['Seaking'], 'party_address': 'Trainer_Party_Route_20_Beauty_A'},],
     'Route 20-W': [
-        {'level': 35, 'party': ['Seaking'], 'party_address': 'Trainer_Party_Route_20_Beauty_A'},
         {'level': 31, 'party': ['Goldeen', 'Seaking'], 'party_address': 'Trainer_Party_Route_20_JrTrainerF_A'},
                  {'level': 30, 'party': ['Tentacool', 'Horsea', 'Seel'],
                   'party_address': 'Trainer_Party_Route_20_JrTrainerF_C'},
@@ -2374,16 +2381,19 @@ trainer_data = {
         {'level': 20, 'party': ['Meowth', 'Oddish', 'Pidgey'],
          'party_address': 'Trainer_Party_Rock_Tunnel_1F_JrTrainerF_B'},
         {'level': 19, 'party': ['Pidgey', 'Rattata', 'Rattata', 'Bellsprout'],
-         'party_address': 'Trainer_Party_Rock_Tunnel_1F_JrTrainerF_C'},
-        {'level': 23, 'party': ['Cubone', 'Slowpoke'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Pokemaniac_A'},
+         'party_address': 'Trainer_Party_Rock_Tunnel_1F_JrTrainerF_C'}],
+    'Rock Tunnel 1F-NE': [
+        {'level': 23, 'party': ['Cubone', 'Slowpoke'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Pokemaniac_A'}],
+    'Rock Tunnel 1F-NW': [
         {'level': 19, 'party': ['Geodude', 'Machop', 'Geodude', 'Geodude'],
          'party_address': 'Trainer_Party_Rock_Tunnel_1F_Hiker_A'},
         {'level': 20, 'party': ['Onix', 'Onix', 'Geodude'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Hiker_B'},
         {'level': 21, 'party': ['Geodude', 'Graveler'], 'party_address': 'Trainer_Party_Rock_Tunnel_1F_Hiker_C'}],
+    'Route 15-N': [
+        {'level': 33, 'party': ['Clefairy'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_C'}],
     'Route 15': [
         {'level': 28, 'party': ['Gloom', 'Oddish', 'Oddish'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_A'},
         {'level': 29, 'party': ['Pikachu', 'Raichu'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_B'},
-        {'level': 33, 'party': ['Clefairy'], 'party_address': 'Trainer_Party_Route_15_JrTrainerF_C'},
         {'level': 29, 'party': ['Bellsprout', 'Oddish', 'Tangela'],
          'party_address': 'Trainer_Party_Route_15_JrTrainerF_D'},
         {'level': 25, 'party': ['Koffing', 'Koffing', 'Weezing', 'Koffing', 'Grimer'],
@@ -2394,15 +2404,16 @@ trainer_data = {
         {'level': 26, 'party': ['Pidgeotto', 'Farfetchd', 'Doduo', 'Pidgey'],
          'party_address': 'Trainer_Party_Route_15_BirdKeeper_A'},
         {'level': 28, 'party': ['Dodrio', 'Doduo', 'Doduo'], 'party_address': 'Trainer_Party_Route_15_BirdKeeper_B'}],
-    'Victory Road 2F-C': [{'level': 40, 'party': ['Charmeleon', 'Lapras', 'Lickitung'], ###
-                         'party_address': 'Trainer_Party_Victory_Road_2F_Pokemaniac_A'},
-                        {'level': 41, 'party': ['Drowzee', 'Hypno', 'Kadabra', 'Kadabra'],
-                         'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_A'},
-                        {'level': 48, 'party': ['Mr Mime'], 'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_C'},
-                        {'level': 44, 'party': ['Persian', 'Golduck'],
-                         'party_address': 'Trainer_Party_Victory_Road_2F_Tamer_A'},
-                        {'level': 43, 'party': ['Machoke', 'Machop', 'Machoke'],
-                         'party_address': 'Trainer_Party_Victory_Road_2F_Blackbelt_A'}], 'Mt Moon B2F': [
+    'Victory Road 2F-NW': [{'level': 40, 'party': ['Charmeleon', 'Lapras', 'Lickitung'],
+                         'party_address': 'Trainer_Party_Victory_Road_2F_Pokemaniac_A'}],
+    'Victory Road 2F-C': [
+        {'level': 41, 'party': ['Drowzee', 'Hypno', 'Kadabra', 'Kadabra'],
+         'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_A'},
+        {'level': 48, 'party': ['Mr Mime'], 'party_address': 'Trainer_Party_Victory_Road_2F_Juggler_C'},
+        {'level': 44, 'party': ['Persian', 'Golduck'],
+         'party_address': 'Trainer_Party_Victory_Road_2F_Tamer_A'},
+        {'level': 43, 'party': ['Machoke', 'Machop', 'Machoke'],
+         'party_address': 'Trainer_Party_Victory_Road_2F_Blackbelt_A'}], 'Mt Moon B2F': [
         {'level': 12, 'party': ['Grimer', 'Voltorb', 'Koffing'],
          'party_address': 'Trainer_Party_Mt_Moon_B2F_SuperNerd_A'},
         {'level': 13, 'party': ['Rattata', 'Zubat'], 'party_address': 'Trainer_Party_Mt_Moon_B2F_Rocket_A'},
@@ -2585,7 +2596,7 @@ trainer_data = {
                                                             ['Pidgeotto', 'Abra', 'Rattata', 'Charmander']],
                        'party_address': ['Trainer_Party_Cerulean_City_Green1_A', 'Trainer_Party_Cerulean_City_Green1_B', 'Trainer_Party_Cerulean_City_Green1_C']},
                       {'level': 17, 'party': ['Machop', 'Drowzee'],
-                       'party_address': 'Trainer_Party_Cerulean_City_Rocket_A'}], 'Pokemon Mansion 1F': [
+                       'party_address': 'Trainer_Party_Cerulean_City_Rocket_A'}], 'Pokemon Mansion 1F-SE': [
         {'level': 29, 'party': ['Electrode', 'Weezing'], 'party_address': 'Trainer_Party_Mansion_1F_Scientist_A'}],
     'Silph Co 2F-SW': [{'level': 26, 'party': ['Grimer', 'Weezing', 'Koffing', 'Weezing'],
                       'party_address': 'Trainer_Party_Silph_Co_2F_Scientist_A'}],
@@ -2595,7 +2606,7 @@ trainer_data = {
                      {'level': 25, 'party': ['Golbat', 'Zubat', 'Zubat', 'Raticate', 'Zubat'],
                       'party_address': 'Trainer_Party_Silph_Co_2F_Rocket_B'}], 'Silph Co 3F-W': [
         {'level': 29, 'party': ['Electrode', 'Weezing'], 'party_address': 'Trainer_Party_Silph_Co_3F_Scientist_A'}],
-        'Silph Co 3F': [    {'level': 28, 'party': ['Raticate', 'Hypno', 'Raticate'],
+        'Silph Co 3F': [{'level': 28, 'party': ['Raticate', 'Hypno', 'Raticate'],
          'party_address': 'Trainer_Party_Silph_Co_3F_Rocket_A'}],
     'Silph Co 4F-N': [{'level': 33, 'party': ['Electrode'], 'party_address': 'Trainer_Party_Silph_Co_4F_Scientist_A'}],
                     'Silph Co 4F': [{'level': 29, 'party': ['Machop', 'Drowzee'],
@@ -2670,15 +2681,17 @@ trainer_data = {
                          {'level': 26, 'party': ['Koffing', 'Drowzee'],
                           'party_address': 'Trainer_Party_Pokemon_Tower_7F_Rocket_B'},
                          {'level': 23, 'party': ['Zubat', 'Rattata', 'Raticate', 'Zubat'],
-                          'party_address': 'Trainer_Party_Pokemon_Tower_7F_Rocket_C'}], 'Victory Road 3F': [
-        {'level': 43, 'party': ['Exeggutor', 'Cloyster', 'Arcanine'],
+                          'party_address': 'Trainer_Party_Pokemon_Tower_7F_Rocket_C'}],
+    'Victory Road 3F': [{'level': 43, 'party': ['Exeggutor', 'Cloyster', 'Arcanine'],
          'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerM_A'},
+        {'level': 43, 'party': ['Parasect', 'Dewgong', 'Chansey'],
+         'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerF_B'}],
+    'Victory Road 3F-S': [
         {'level': 43, 'party': ['Kingler', 'Tentacruel', 'Blastoise'],
          'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerM_B'},
         {'level': 43, 'party': ['Bellsprout', 'Weepinbell', 'Victreebel'],
          'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerF_A'},
-        {'level': 43, 'party': ['Parasect', 'Dewgong', 'Chansey'],
-         'party_address': 'Trainer_Party_Victory_Road_3F_CooltrainerF_B'}], 'Victory Road 1F': [
+], 'Victory Road 1F': [
         {'level': 42, 'party': ['Ivysaur', 'Wartortle', 'Charmeleon', 'Charizard'],
          'party_address': 'Trainer_Party_Victory_Road_1F_CooltrainerM_A'},
         {'level': 44, 'party': ['Persian', 'Ninetales'],
diff --git a/worlds/pokemon_rb/options.py b/worlds/pokemon_rb/options.py
index 794977d32d..8afe91b867 100644
--- a/worlds/pokemon_rb/options.py
+++ b/worlds/pokemon_rb/options.py
@@ -1,4 +1,4 @@
-from Options import Toggle, Choice, Range, SpecialRange, TextChoice, DeathLink
+from Options import Toggle, Choice, Range, NamedRange, TextChoice, DeathLink
 
 
 class GameVersion(Choice):
@@ -285,7 +285,7 @@ class AllPokemonSeen(Toggle):
     display_name = "All Pokemon Seen"
 
 
-class DexSanity(SpecialRange):
+class DexSanity(NamedRange):
     """Adds location checks for Pokemon flagged "owned" on your Pokedex. You may specify a percentage of Pokemon to
     have checks added. If Accessibility is set to locations, this will be the percentage of all logically reachable
     Pokemon that will get a location check added to it. With items or minimal Accessibility, it will be the percentage
@@ -412,7 +412,7 @@ class LevelScaling(Choice):
     default = 1
 
 
-class ExpModifier(SpecialRange):
+class ExpModifier(NamedRange):
     """Modifier for EXP gained. When specifying a number, exp is multiplied by this amount and divided by 16."""
     display_name = "Exp Modifier"
     default = 16
@@ -607,8 +607,8 @@ class RandomizeTMMoves(Toggle):
     display_name = "Randomize TM Moves"
 
 
-class TMHMCompatibility(SpecialRange):
-    range_start = -1
+class TMHMCompatibility(NamedRange):
+    range_start = 0
     range_end = 100
     special_range_names = {
         "vanilla": -1,
@@ -675,12 +675,12 @@ class RandomizeMoveTypes(Toggle):
     default = 0
 
 
-class SecondaryTypeChance(SpecialRange):
+class SecondaryTypeChance(NamedRange):
     """If randomize_pokemon_types is on, this is the chance each Pokemon will have a secondary type. If follow_evolutions
     is selected, it is the chance a second type will be added at each evolution stage. vanilla will give secondary types
     to Pokemon that normally have a secondary type."""
     display_name = "Secondary Type Chance"
-    range_start = -1
+    range_start = 0
     range_end = 100
     default = -1
     special_range_names = {
diff --git a/worlds/pokemon_rb/regions.py b/worlds/pokemon_rb/regions.py
index cc788dd2ba..97e63c0557 100644
--- a/worlds/pokemon_rb/regions.py
+++ b/worlds/pokemon_rb/regions.py
@@ -1456,7 +1456,9 @@ mansion_stair_destinations = [
 unreachable_outdoor_entrances = [
     "Route 4-C to Mt Moon B1F-NE",
     "Fuchsia City-Good Rod House Backyard to Fuchsia Good Rod House",
-    "Cerulean City-Badge House Backyard to Cerulean Badge House"
+    "Cerulean City-Badge House Backyard to Cerulean Badge House",
+    # TODO: This doesn't need to be forced if fly location is Pokemon League?
+    "Route 23-N to Victory Road 2F-E"
 ]
 
 
@@ -1592,7 +1594,7 @@ def create_regions(self):
     connect(multiworld, player, "Menu", "Pallet Town", one_way=True)
     connect(multiworld, player, "Menu", "Pokedex", one_way=True)
     connect(multiworld, player, "Menu", "Evolution", one_way=True)
-    connect(multiworld, player, "Menu", "Fossil", lambda state: logic.fossil_checks(state, 
+    connect(multiworld, player, "Menu", "Fossil", lambda state: logic.fossil_checks(state,
         state.multiworld.second_fossil_check_condition[player].value, player), one_way=True)
     connect(multiworld, player, "Pallet Town", "Route 1")
     connect(multiworld, player, "Route 1", "Viridian City")
@@ -1629,7 +1631,7 @@ def create_regions(self):
     connect(multiworld, player, "Cerulean City", "Route 24", one_way=True)
     connect(multiworld, player, "Cerulean City", "Cerulean City-T", lambda state: state.has("Help Bill", player))
     connect(multiworld, player, "Cerulean City-Outskirts", "Cerulean City", one_way=True)
-    connect(multiworld, player, "Cerulean City-Outskirts", "Cerulean City", lambda state: logic.can_cut(state, player))
+    connect(multiworld, player, "Cerulean City", "Cerulean City-Outskirts", lambda state: logic.can_cut(state, player), one_way=True)
     connect(multiworld, player, "Cerulean City-Outskirts", "Route 9", lambda state: logic.can_cut(state, player))
     connect(multiworld, player, "Cerulean City-Outskirts", "Route 5")
     connect(multiworld, player, "Cerulean Cave B1F", "Cerulean Cave B1F-E", lambda state: logic.can_surf(state, player), one_way=True)
@@ -1705,7 +1707,6 @@ def create_regions(self):
     connect(multiworld, player, "Route 12-S", "Route 12-Grass", lambda state: logic.can_cut(state, player), one_way=True)
     connect(multiworld, player, "Route 12-L", "Lavender Town")
     connect(multiworld, player, "Route 10-S", "Lavender Town")
-    connect(multiworld, player, "Route 8-W", "Saffron City")
     connect(multiworld, player, "Route 8", "Lavender Town")
     connect(multiworld, player, "Pokemon Tower 6F", "Pokemon Tower 6F-S", lambda state: state.has("Silph Scope", player) or (state.has("Buy Poke Doll", player) and state.multiworld.poke_doll_skip[player]))
     connect(multiworld, player, "Route 8", "Route 8-Grass", lambda state: logic.can_cut(state, player), one_way=True)
@@ -1829,7 +1830,8 @@ def create_regions(self):
     connect(multiworld, player, "Silph Co 6F", "Silph Co 6F-SW", lambda state: logic.card_key(state, 6, player))
     connect(multiworld, player, "Silph Co 7F", "Silph Co 7F-E", lambda state: logic.card_key(state, 7, player))
     connect(multiworld, player, "Silph Co 7F-SE", "Silph Co 7F-E", lambda state: logic.card_key(state, 7, player))
-    connect(multiworld, player, "Silph Co 8F", "Silph Co 8F-W", lambda state: logic.card_key(state, 8, player))
+    connect(multiworld, player, "Silph Co 8F", "Silph Co 8F-W", lambda state: logic.card_key(state, 8, player), one_way=True, name="Silph Co 8F to Silph Co 8F-W (Card Key)")
+    connect(multiworld, player, "Silph Co 8F-W", "Silph Co 8F", lambda state: logic.card_key(state, 8, player), one_way=True, name="Silph Co 8F-W to Silph Co 8F (Card Key)")
     connect(multiworld, player, "Silph Co 9F", "Silph Co 9F-SW", lambda state: logic.card_key(state, 9, player))
     connect(multiworld, player, "Silph Co 9F-NW", "Silph Co 9F-SW", lambda state: logic.card_key(state, 9, player))
     connect(multiworld, player, "Silph Co 10F", "Silph Co 10F-SE", lambda state: logic.card_key(state, 10, player))
@@ -1862,22 +1864,23 @@ def create_regions(self):
     # access to any part of a city will enable flying to the Pokemon Center
     connect(multiworld, player, "Cerulean City-Cave", "Cerulean City", lambda state: logic.can_fly(state, player), one_way=True)
     connect(multiworld, player, "Cerulean City-Badge House Backyard", "Cerulean City", lambda state: logic.can_fly(state, player), one_way=True)
+    connect(multiworld, player, "Cerulean City-T", "Cerulean City", lambda state: logic.can_fly(state, player), one_way=True, name="Cerulean City-T to Cerulean City (Fly)")
     connect(multiworld, player, "Fuchsia City-Good Rod House Backyard", "Fuchsia City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Saffron City-G", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Saffron City-Pidgey", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Saffron City-Silph", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Saffron City-Copycat", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Celadon City-G", "Celadon City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Vermilion City-G", "Vermilion City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Vermilion City-Dock", "Vermilion City", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Cinnabar Island-G", "Cinnabar Island", lambda state: logic.can_fly(state, player), one_way=True)
-    connect(multiworld, player, "Cinnabar Island-M", "Cinnabar Island", lambda state: logic.can_fly(state, player), one_way=True)
+    connect(multiworld, player, "Saffron City-G", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True, name="Saffron City-G to Saffron City (Fly)")
+    connect(multiworld, player, "Saffron City-Pidgey", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True, name="Saffron City-Pidgey to Saffron City (Fly)")
+    connect(multiworld, player, "Saffron City-Silph", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True, name="Saffron City-Silph to Saffron City (Fly)")
+    connect(multiworld, player, "Saffron City-Copycat", "Saffron City", lambda state: logic.can_fly(state, player), one_way=True, name="Saffron City-Copycat to Saffron City (Fly)")
+    connect(multiworld, player, "Celadon City-G", "Celadon City", lambda state: logic.can_fly(state, player), one_way=True, name="Celadon City-G to Celadon City (Fly)")
+    connect(multiworld, player, "Vermilion City-G", "Vermilion City", lambda state: logic.can_fly(state, player), one_way=True, name="Vermilion City-G to Vermilion City (Fly)")
+    connect(multiworld, player, "Vermilion City-Dock", "Vermilion City", lambda state: logic.can_fly(state, player), one_way=True, name="Vermilion City-Dock to Vermilion City (Fly)")
+    connect(multiworld, player, "Cinnabar Island-G", "Cinnabar Island", lambda state: logic.can_fly(state, player), one_way=True, name="Cinnabar Island-G to Cinnabar Island (Fly)")
+    connect(multiworld, player, "Cinnabar Island-M", "Cinnabar Island", lambda state: logic.can_fly(state, player), one_way=True, name="Cinnabar Island-M to Cinnabar Island (Fly)")
 
 
     # drops
-    connect(multiworld, player, "Seafoam Islands 1F", "Seafoam Islands B1F", one_way=True)
-    connect(multiworld, player, "Seafoam Islands 1F", "Seafoam Islands B1F-NE", one_way=True)
-    connect(multiworld, player, "Seafoam Islands B1F", "Seafoam Islands B2F-NW", one_way=True)
+    connect(multiworld, player, "Seafoam Islands 1F", "Seafoam Islands B1F", one_way=True, name="Seafoam Islands 1F to Seafoam Islands B1F (Drop)")
+    connect(multiworld, player, "Seafoam Islands 1F", "Seafoam Islands B1F-NE", one_way=True, name="Seafoam Islands 1F to Seafoam Islands B1F-NE (Drop)")
+    connect(multiworld, player, "Seafoam Islands B1F", "Seafoam Islands B2F-NW", one_way=True, name="Seafoam Islands 1F to Seafoam Islands B2F-NW (Drop)")
     connect(multiworld, player, "Seafoam Islands B1F-NE", "Seafoam Islands B2F-NE", one_way=True)
     connect(multiworld, player, "Seafoam Islands B2F-NW", "Seafoam Islands B3F", lambda state: logic.can_strength(state, player) and state.has("Seafoam Exit Boulder", player, 6), one_way=True)
     connect(multiworld, player, "Seafoam Islands B2F-NE", "Seafoam Islands B3F", lambda state: logic.can_strength(state, player) and state.has("Seafoam Exit Boulder", player, 6), one_way=True)
@@ -1886,7 +1889,7 @@ def create_regions(self):
     # If you haven't dropped the boulders, you'll go straight to B4F
     connect(multiworld, player, "Seafoam Islands B2F-NW", "Seafoam Islands B4F-W", one_way=True)
     connect(multiworld, player, "Seafoam Islands B2F-NE", "Seafoam Islands B4F-W", one_way=True)
-    connect(multiworld, player, "Seafoam Islands B3F", "Seafoam Islands B4F", one_way=True)
+    connect(multiworld, player, "Seafoam Islands B3F", "Seafoam Islands B4F", one_way=True, name="Seafoam Islands B1F to Seafoam Islands B4F (Drop)")
     connect(multiworld, player, "Seafoam Islands B3F", "Seafoam Islands B4F-W", lambda state: logic.can_surf(state, player), one_way=True)
     connect(multiworld, player, "Pokemon Mansion 3F-SE", "Pokemon Mansion 2F", one_way=True)
     connect(multiworld, player, "Pokemon Mansion 3F-SE", "Pokemon Mansion 1F-SE", one_way=True)
@@ -1942,7 +1945,8 @@ def create_regions(self):
                     connect(multiworld, player, region.name, entrance_data["to"]["map"],
                             lambda state: logic.rock_tunnel(state, player), one_way=True)
                 else:
-                    connect(multiworld, player, region.name, entrance_data["to"]["map"], one_way=True)
+                    connect(multiworld, player, region.name, entrance_data["to"]["map"], one_way=True,
+                            name=entrance_data["name"] if "name" in entrance_data else None)
 
     forced_connections = set()
 
@@ -2220,7 +2224,7 @@ def create_regions(self):
                         "Cinnabar Gym - Blaine Prize", "Viridian Gym - Giovanni Prize"]:
                 badge_locs.append(multiworld.get_location(loc, player))
             multiworld.random.shuffle(badges)
-            while badges[3].name == "Cascade Badge" and multiworld.badges_needed_for_hm_moves[player] == "on":
+            while badges[3].name == "Cascade Badge" and multiworld.badges_needed_for_hm_moves[player]:
                 multiworld.random.shuffle(badges)
             for badge, loc in zip(badges, badge_locs):
                 loc.place_locked_item(badge)
@@ -2265,22 +2269,30 @@ def create_regions(self):
                 "Defeat Viridian Gym Giovanni",
             ]
 
-        def adds_reachable_entrances(entrances_copy, item):
-            state.collect(item, False)
+        event_locations = self.multiworld.get_filled_locations(player)
+
+        def adds_reachable_entrances(entrances_copy, item, dead_end_cache):
+            ret = dead_end_cache.get(item.name)
+            if (ret != None):
+                return ret
+
+            state_copy = state.copy()
+            state_copy.collect(item, True)
+            state.sweep_for_events(locations=event_locations)
             ret = len([entrance for entrance in entrances_copy if entrance in reachable_entrances or
-                      entrance.parent_region.can_reach(state)]) > len(reachable_entrances)
-            state.remove(item)
+                      entrance.parent_region.can_reach(state_copy)]) > len(reachable_entrances)
+            dead_end_cache[item.name] = ret
             return ret
 
-        def dead_end(entrances_copy, e):
+        def dead_end(entrances_copy, e, dead_end_cache):
             region = e.parent_region
             check_warps = set()
             checked_regions = {region}
             check_warps.update(region.exits)
             check_warps.remove(e)
             for location in region.locations:
-                if location.item and location.item.name in relevant_events and adds_reachable_entrances(entrances_copy,
-                                                                                                        location.item):
+                if location.item and location.item.name in relevant_events and \
+                                 adds_reachable_entrances(entrances_copy, location.item, dead_end_cache):
                     return False
             while check_warps:
                 warp = check_warps.pop()
@@ -2297,16 +2309,22 @@ def create_regions(self):
                                 check_warps.update(warp.connected_region.exits)
                                 for location in warp.connected_region.locations:
                                     if (location.item and location.item.name in relevant_events and
-                                            adds_reachable_entrances(entrances_copy, location.item)):
+                                            adds_reachable_entrances(entrances_copy, location.item, dead_end_cache)):
                                         return False
             return True
 
         starting_entrances = len(entrances)
         dc_connected = []
-        event_locations = self.multiworld.get_filled_locations(player)
+        rock_tunnel_entrances = [entrance for entrance in entrances if "Rock Tunnel" in entrance.name]
+        entrances = [entrance for entrance in entrances if entrance not in rock_tunnel_entrances]
         while entrances:
             state.update_reachable_regions(player)
             state.sweep_for_events(locations=event_locations)
+
+            if rock_tunnel_entrances and logic.rock_tunnel(state, player):
+                entrances += rock_tunnel_entrances
+                rock_tunnel_entrances = None
+
             reachable_entrances = [entrance for entrance in entrances if entrance in reachable_entrances or
                                    entrance.parent_region.can_reach(state)]
             assert reachable_entrances, \
@@ -2321,30 +2339,29 @@ def create_regions(self):
             if multiworld.door_shuffle[player] == "full" or len(entrances) != len(reachable_entrances):
                 entrances.sort(key=lambda e: e.name not in entrance_only)
 
-                if len(entrances) < 48 and multiworld.door_shuffle[player] == "full":
-                    # Prevent a situation where the only remaining outdoor entrances are ones that cannot be reached
-                    # except by connecting directly to it.
-                    entrances.sort(key=lambda e: e.name in unreachable_outdoor_entrances)
+                dead_end_cache = {}
+
                 # entrances list is empty while it's being sorted, must pass a copy to iterate through
                 entrances_copy = entrances.copy()
                 if multiworld.door_shuffle[player] == "decoupled":
-                    if len(reachable_entrances) <= 8 and not logic.rock_tunnel(state, player):
-                        entrances.sort(key=lambda e: 1 if "Rock Tunnel" in e.name else 2 if e.connected_region is not
-                                       None else 3 if e not in reachable_entrances else 0)
-                    else:
-                        entrances.sort(key=lambda e: 1 if e.connected_region is not None else 2 if e not in
-                                       reachable_entrances else 0)
+                    entrances.sort(key=lambda e: 1 if e.connected_region is not None else 2 if e not in
+                                   reachable_entrances else 0)
                     assert entrances[0].connected_region is None,\
                         "Ran out of valid reachable entrances in Pokemon Red and Blue door shuffle"
                 elif len(reachable_entrances) > (1 if multiworld.door_shuffle[player] == "insanity" else 8) and len(
                         entrances) <= (starting_entrances - 3):
                     entrances.sort(key=lambda e: 0 if e in reachable_entrances else 2 if
-                                   dead_end(entrances_copy, e) else 1)
+                                   dead_end(entrances_copy, e, dead_end_cache) else 1)
                 else:
                     entrances.sort(key=lambda e: 0 if e in reachable_entrances else 1 if
-                                   dead_end(entrances_copy, e) else 2)
+                                   dead_end(entrances_copy, e, dead_end_cache) else 2)
                 if multiworld.door_shuffle[player] == "full":
                     outdoor = outdoor_map(entrances[0].parent_region.name)
+                    if len(entrances) < 48 and not outdoor:
+                        # Prevent a situation where the only remaining outdoor entrances are ones that cannot be reached
+                        # except by connecting directly to it.
+                        entrances.sort(key=lambda e: e.name in unreachable_outdoor_entrances)
+
                     entrances.sort(key=lambda e: outdoor_map(e.parent_region.name) != outdoor)
                 assert entrances[0] in reachable_entrances, \
                     "Ran out of valid reachable entrances in Pokemon Red and Blue door shuffle"
diff --git a/worlds/pokemon_rb/rom.py b/worlds/pokemon_rb/rom.py
index 4b191d9176..81ab6648dd 100644
--- a/worlds/pokemon_rb/rom.py
+++ b/worlds/pokemon_rb/rom.py
@@ -539,6 +539,10 @@ def generate_output(self, output_directory: str):
         write_bytes(data, self.rival_name, rom_addresses['Rival_Name'])
 
     data[0xFF00] = 2  # client compatibility version
+    rom_name = bytearray(f'AP{Utils.__version__.replace(".", "")[0:3]}_{self.player}_{self.multiworld.seed:11}\0',
+                         'utf8')[:21]
+    rom_name.extend([0] * (21 - len(rom_name)))
+    write_bytes(data, rom_name, 0xFFC6)
     write_bytes(data, self.multiworld.seed_name.encode(), 0xFFDB)
     write_bytes(data, self.multiworld.player_name[self.player].encode(), 0xFFF0)
 
@@ -546,10 +550,8 @@ def generate_output(self, output_directory: str):
 
     write_quizzes(self, data, random)
 
-    for location in self.multiworld.get_locations():
-        if location.player != self.player:
-            continue
-        elif location.party_data:
+    for location in self.multiworld.get_locations(self.player):
+        if location.party_data:
             for party in location.party_data:
                 if not isinstance(party["party_address"], list):
                     addresses = [rom_addresses[party["party_address"]]]
diff --git a/worlds/pokemon_rb/rom_addresses.py b/worlds/pokemon_rb/rom_addresses.py
index 9c6621523c..ffb89a4dfc 100644
--- a/worlds/pokemon_rb/rom_addresses.py
+++ b/worlds/pokemon_rb/rom_addresses.py
@@ -1,10 +1,10 @@
 rom_addresses = {
     "Option_Encounter_Minimum_Steps": 0x3c1,
-    "Option_Pitch_Black_Rock_Tunnel": 0x758,
-    "Option_Blind_Trainers": 0x30c3,
-    "Option_Trainersanity1": 0x3153,
-    "Option_Split_Card_Key": 0x3e0c,
-    "Option_Fix_Combat_Bugs": 0x3e0d,
+    "Option_Pitch_Black_Rock_Tunnel": 0x75c,
+    "Option_Blind_Trainers": 0x30c7,
+    "Option_Trainersanity1": 0x3157,
+    "Option_Split_Card_Key": 0x3e10,
+    "Option_Fix_Combat_Bugs": 0x3e11,
     "Option_Lose_Money": 0x40d4,
     "Base_Stats_Mew": 0x4260,
     "Title_Mon_First": 0x4373,
@@ -12,101 +12,101 @@ rom_addresses = {
     "Player_Name": 0x4568,
     "Rival_Name": 0x4570,
     "Price_Master_Ball": 0x45c8,
-    "Title_Seed": 0x5f1b,
-    "Title_Slot_Name": 0x5f3b,
-    "PC_Item": 0x6309,
-    "PC_Item_Quantity": 0x630e,
-    "Fly_Location": 0x631c,
-    "Skip_Player_Name": 0x6335,
-    "Skip_Rival_Name": 0x6343,
-    "Pallet_Fly_Coords": 0x666e,
-    "Option_Old_Man": 0xcb0e,
-    "Option_Old_Man_Lying": 0xcb11,
-    "Option_Route3_Guard_A": 0xcb17,
-    "Option_Trashed_House_Guard_A": 0xcb20,
-    "Option_Trashed_House_Guard_B": 0xcb26,
-    "Option_Boulders": 0xcdb7,
-    "Option_Rock_Tunnel_Extra_Items": 0xcdc0,
-    "Wild_Route1": 0xd13b,
-    "Wild_Route2": 0xd151,
-    "Wild_Route22": 0xd167,
-    "Wild_ViridianForest": 0xd17d,
-    "Wild_Route3": 0xd193,
-    "Wild_MtMoon1F": 0xd1a9,
-    "Wild_MtMoonB1F": 0xd1bf,
-    "Wild_MtMoonB2F": 0xd1d5,
-    "Wild_Route4": 0xd1eb,
-    "Wild_Route24": 0xd201,
-    "Wild_Route25": 0xd217,
-    "Wild_Route9": 0xd22d,
-    "Wild_Route5": 0xd243,
-    "Wild_Route6": 0xd259,
-    "Wild_Route11": 0xd26f,
-    "Wild_RockTunnel1F": 0xd285,
-    "Wild_RockTunnelB1F": 0xd29b,
-    "Wild_Route10": 0xd2b1,
-    "Wild_Route12": 0xd2c7,
-    "Wild_Route8": 0xd2dd,
-    "Wild_Route7": 0xd2f3,
-    "Wild_PokemonTower3F": 0xd30d,
-    "Wild_PokemonTower4F": 0xd323,
-    "Wild_PokemonTower5F": 0xd339,
-    "Wild_PokemonTower6F": 0xd34f,
-    "Wild_PokemonTower7F": 0xd365,
-    "Wild_Route13": 0xd37b,
-    "Wild_Route14": 0xd391,
-    "Wild_Route15": 0xd3a7,
-    "Wild_Route16": 0xd3bd,
-    "Wild_Route17": 0xd3d3,
-    "Wild_Route18": 0xd3e9,
-    "Wild_SafariZoneCenter": 0xd3ff,
-    "Wild_SafariZoneEast": 0xd415,
-    "Wild_SafariZoneNorth": 0xd42b,
-    "Wild_SafariZoneWest": 0xd441,
-    "Wild_SeaRoutes": 0xd458,
-    "Wild_SeafoamIslands1F": 0xd46d,
-    "Wild_SeafoamIslandsB1F": 0xd483,
-    "Wild_SeafoamIslandsB2F": 0xd499,
-    "Wild_SeafoamIslandsB3F": 0xd4af,
-    "Wild_SeafoamIslandsB4F": 0xd4c5,
-    "Wild_PokemonMansion1F": 0xd4db,
-    "Wild_PokemonMansion2F": 0xd4f1,
-    "Wild_PokemonMansion3F": 0xd507,
-    "Wild_PokemonMansionB1F": 0xd51d,
-    "Wild_Route21": 0xd533,
-    "Wild_Surf_Route21": 0xd548,
-    "Wild_CeruleanCave1F": 0xd55d,
-    "Wild_CeruleanCave2F": 0xd573,
-    "Wild_CeruleanCaveB1F": 0xd589,
-    "Wild_PowerPlant": 0xd59f,
-    "Wild_Route23": 0xd5b5,
-    "Wild_VictoryRoad2F": 0xd5cb,
-    "Wild_VictoryRoad3F": 0xd5e1,
-    "Wild_VictoryRoad1F": 0xd5f7,
-    "Wild_DiglettsCave": 0xd60d,
-    "Ghost_Battle5": 0xd781,
-    "HM_Surf_Badge_a": 0xda73,
-    "HM_Surf_Badge_b": 0xda78,
-    "Option_Fix_Combat_Bugs_Heal_Stat_Modifiers": 0xdcc2,
-    "Option_Silph_Scope_Skip": 0xe207,
-    "Wild_Old_Rod": 0xe382,
-    "Wild_Good_Rod": 0xe3af,
-    "Option_Fix_Combat_Bugs_PP_Restore": 0xe541,
-    "Option_Reusable_TMs": 0xe675,
-    "Wild_Super_Rod_A": 0xeaa9,
-    "Wild_Super_Rod_B": 0xeaae,
-    "Wild_Super_Rod_C": 0xeab3,
-    "Wild_Super_Rod_D": 0xeaba,
-    "Wild_Super_Rod_E": 0xeabf,
-    "Wild_Super_Rod_F": 0xeac4,
-    "Wild_Super_Rod_G": 0xeacd,
-    "Wild_Super_Rod_H": 0xead6,
-    "Wild_Super_Rod_I": 0xeadf,
-    "Wild_Super_Rod_J": 0xeae8,
-    "Starting_Money_High": 0xf9aa,
-    "Starting_Money_Middle": 0xf9ad,
-    "Starting_Money_Low": 0xf9b0,
-    "Option_Pokedex_Seen": 0xf9cb,
+    "Title_Seed": 0x5f22,
+    "Title_Slot_Name": 0x5f42,
+    "PC_Item": 0x6310,
+    "PC_Item_Quantity": 0x6315,
+    "Fly_Location": 0x6323,
+    "Skip_Player_Name": 0x633c,
+    "Skip_Rival_Name": 0x634a,
+    "Pallet_Fly_Coords": 0x6675,
+    "Option_Old_Man": 0xcb0b,
+    "Option_Old_Man_Lying": 0xcb0e,
+    "Option_Route3_Guard_A": 0xcb14,
+    "Option_Trashed_House_Guard_A": 0xcb1d,
+    "Option_Trashed_House_Guard_B": 0xcb23,
+    "Option_Boulders": 0xcdb4,
+    "Option_Rock_Tunnel_Extra_Items": 0xcdbd,
+    "Wild_Route1": 0xd138,
+    "Wild_Route2": 0xd14e,
+    "Wild_Route22": 0xd164,
+    "Wild_ViridianForest": 0xd17a,
+    "Wild_Route3": 0xd190,
+    "Wild_MtMoon1F": 0xd1a6,
+    "Wild_MtMoonB1F": 0xd1bc,
+    "Wild_MtMoonB2F": 0xd1d2,
+    "Wild_Route4": 0xd1e8,
+    "Wild_Route24": 0xd1fe,
+    "Wild_Route25": 0xd214,
+    "Wild_Route9": 0xd22a,
+    "Wild_Route5": 0xd240,
+    "Wild_Route6": 0xd256,
+    "Wild_Route11": 0xd26c,
+    "Wild_RockTunnel1F": 0xd282,
+    "Wild_RockTunnelB1F": 0xd298,
+    "Wild_Route10": 0xd2ae,
+    "Wild_Route12": 0xd2c4,
+    "Wild_Route8": 0xd2da,
+    "Wild_Route7": 0xd2f0,
+    "Wild_PokemonTower3F": 0xd30a,
+    "Wild_PokemonTower4F": 0xd320,
+    "Wild_PokemonTower5F": 0xd336,
+    "Wild_PokemonTower6F": 0xd34c,
+    "Wild_PokemonTower7F": 0xd362,
+    "Wild_Route13": 0xd378,
+    "Wild_Route14": 0xd38e,
+    "Wild_Route15": 0xd3a4,
+    "Wild_Route16": 0xd3ba,
+    "Wild_Route17": 0xd3d0,
+    "Wild_Route18": 0xd3e6,
+    "Wild_SafariZoneCenter": 0xd3fc,
+    "Wild_SafariZoneEast": 0xd412,
+    "Wild_SafariZoneNorth": 0xd428,
+    "Wild_SafariZoneWest": 0xd43e,
+    "Wild_SeaRoutes": 0xd455,
+    "Wild_SeafoamIslands1F": 0xd46a,
+    "Wild_SeafoamIslandsB1F": 0xd480,
+    "Wild_SeafoamIslandsB2F": 0xd496,
+    "Wild_SeafoamIslandsB3F": 0xd4ac,
+    "Wild_SeafoamIslandsB4F": 0xd4c2,
+    "Wild_PokemonMansion1F": 0xd4d8,
+    "Wild_PokemonMansion2F": 0xd4ee,
+    "Wild_PokemonMansion3F": 0xd504,
+    "Wild_PokemonMansionB1F": 0xd51a,
+    "Wild_Route21": 0xd530,
+    "Wild_Surf_Route21": 0xd545,
+    "Wild_CeruleanCave1F": 0xd55a,
+    "Wild_CeruleanCave2F": 0xd570,
+    "Wild_CeruleanCaveB1F": 0xd586,
+    "Wild_PowerPlant": 0xd59c,
+    "Wild_Route23": 0xd5b2,
+    "Wild_VictoryRoad2F": 0xd5c8,
+    "Wild_VictoryRoad3F": 0xd5de,
+    "Wild_VictoryRoad1F": 0xd5f4,
+    "Wild_DiglettsCave": 0xd60a,
+    "Ghost_Battle5": 0xd77e,
+    "HM_Surf_Badge_a": 0xda70,
+    "HM_Surf_Badge_b": 0xda75,
+    "Option_Fix_Combat_Bugs_Heal_Stat_Modifiers": 0xdcbf,
+    "Option_Silph_Scope_Skip": 0xe204,
+    "Wild_Old_Rod": 0xe37f,
+    "Wild_Good_Rod": 0xe3ac,
+    "Option_Fix_Combat_Bugs_PP_Restore": 0xe53e,
+    "Option_Reusable_TMs": 0xe672,
+    "Wild_Super_Rod_A": 0xeaa6,
+    "Wild_Super_Rod_B": 0xeaab,
+    "Wild_Super_Rod_C": 0xeab0,
+    "Wild_Super_Rod_D": 0xeab7,
+    "Wild_Super_Rod_E": 0xeabc,
+    "Wild_Super_Rod_F": 0xeac1,
+    "Wild_Super_Rod_G": 0xeaca,
+    "Wild_Super_Rod_H": 0xead3,
+    "Wild_Super_Rod_I": 0xeadc,
+    "Wild_Super_Rod_J": 0xeae5,
+    "Starting_Money_High": 0xf9a7,
+    "Starting_Money_Middle": 0xf9aa,
+    "Starting_Money_Low": 0xf9ad,
+    "Option_Pokedex_Seen": 0xf9c8,
     "HM_Fly_Badge_a": 0x13182,
     "HM_Fly_Badge_b": 0x13187,
     "HM_Cut_Badge_a": 0x131b8,
@@ -168,12 +168,12 @@ rom_addresses = {
     "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_0_ITEM": 0x1a61c,
     "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_1_ITEM": 0x1a62a,
     "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_2_ITEM": 0x1a638,
-    "Event_SKC6F": 0x1a666,
-    "Warps_SilphCo6F": 0x1a741,
-    "Missable_Silph_Co_6F_Item_1": 0x1a791,
-    "Missable_Silph_Co_6F_Item_2": 0x1a798,
-    "Path_Pallet_Oak": 0x1a91e,
-    "Path_Pallet_Player": 0x1a92b,
+    "Event_SKC6F": 0x1a659,
+    "Warps_SilphCo6F": 0x1a737,
+    "Missable_Silph_Co_6F_Item_1": 0x1a787,
+    "Missable_Silph_Co_6F_Item_2": 0x1a78e,
+    "Path_Pallet_Oak": 0x1a914,
+    "Path_Pallet_Player": 0x1a921,
     "Warps_CinnabarIsland": 0x1c026,
     "Warps_Route1": 0x1c0e9,
     "Option_Extra_Key_Items_B": 0x1ca46,
@@ -1164,22 +1164,22 @@ rom_addresses = {
     "Prize_Mon_E": 0x52944,
     "Prize_Mon_F": 0x52946,
     "Start_Inventory": 0x52a7b,
-    "Map_Fly_Location": 0x52c6f,
-    "Reset_A": 0x52d1b,
-    "Reset_B": 0x52d47,
-    "Reset_C": 0x52d73,
-    "Reset_D": 0x52d9f,
-    "Reset_E": 0x52dcb,
-    "Reset_F": 0x52df7,
-    "Reset_G": 0x52e23,
-    "Reset_H": 0x52e4f,
-    "Reset_I": 0x52e7b,
-    "Reset_J": 0x52ea7,
-    "Reset_K": 0x52ed3,
-    "Reset_L": 0x52eff,
-    "Reset_M": 0x52f2b,
-    "Reset_N": 0x52f57,
-    "Reset_O": 0x52f83,
+    "Map_Fly_Location": 0x52c75,
+    "Reset_A": 0x52d21,
+    "Reset_B": 0x52d4d,
+    "Reset_C": 0x52d79,
+    "Reset_D": 0x52da5,
+    "Reset_E": 0x52dd1,
+    "Reset_F": 0x52dfd,
+    "Reset_G": 0x52e29,
+    "Reset_H": 0x52e55,
+    "Reset_I": 0x52e81,
+    "Reset_J": 0x52ead,
+    "Reset_K": 0x52ed9,
+    "Reset_L": 0x52f05,
+    "Reset_M": 0x52f31,
+    "Reset_N": 0x52f5d,
+    "Reset_O": 0x52f89,
     "Warps_Route2": 0x54026,
     "Missable_Route_2_Item_1": 0x5404a,
     "Missable_Route_2_Item_2": 0x54051,
diff --git a/worlds/pokemon_rb/rules.py b/worlds/pokemon_rb/rules.py
index 0855e7a108..21dceb75e8 100644
--- a/worlds/pokemon_rb/rules.py
+++ b/worlds/pokemon_rb/rules.py
@@ -103,25 +103,25 @@ def set_rules(multiworld, player):
         "Route 22 - Trainer Parties": lambda state: state.has("Oak's Parcel", player),
 
         # # Rock Tunnel
-        # "Rock Tunnel 1F - PokeManiac": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel 1F - Hiker 1": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel 1F - Hiker 2": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel 1F - Hiker 3": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel 1F - Jr. Trainer F 1": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel 1F - Jr. Trainer F 2": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel 1F - Jr. Trainer F 3": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - PokeManiac 1": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - PokeManiac 2": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - PokeManiac 3": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - Jr. Trainer F 1": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - Jr. Trainer F 2": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - Hiker 1": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - Hiker 2": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - Hiker 3": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - North Item": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - Northwest Item": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - Southwest Item": lambda state: logic.rock_tunnel(state, player),
-        # "Rock Tunnel B1F - West Item": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel 1F - PokeManiac": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel 1F - Hiker 1": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel 1F - Hiker 2": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel 1F - Hiker 3": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel 1F - Jr. Trainer F 1": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel 1F - Jr. Trainer F 2": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel 1F - Jr. Trainer F 3": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - PokeManiac 1": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - PokeManiac 2": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - PokeManiac 3": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - Jr. Trainer F 1": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - Jr. Trainer F 2": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - Hiker 1": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - Hiker 2": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - Hiker 3": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - North Item": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - Northwest Item": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - Southwest Item": lambda state: logic.rock_tunnel(state, player),
+        "Rock Tunnel B1F - West Item": lambda state: logic.rock_tunnel(state, player),
 
         # Pokédex check
         "Oak's Lab - Oak's Parcel Reward": lambda state: state.has("Oak's Parcel", player),
diff --git a/worlds/raft/__init__.py b/worlds/raft/__init__.py
index fec60c3bd5..8e4eda09e1 100644
--- a/worlds/raft/__init__.py
+++ b/worlds/raft/__init__.py
@@ -1,5 +1,4 @@
 import typing
-import random
 
 from .Locations import location_table, lookup_name_to_id as locations_lookup_name_to_id
 from .Items import (createResourcePackName, item_table, progressive_table, progressive_item_list,
@@ -100,7 +99,7 @@ class RaftWorld(World):
                         extraItemNamePool.append(item["name"])
             
             if (len(extraItemNamePool) > 0):
-                for randomItem in random.choices(extraItemNamePool, k=extras):
+                for randomItem in self.random.choices(extraItemNamePool, k=extras):
                     raft_item = self.create_item_replaceAsNecessary(randomItem)
                     pool.append(raft_item)
 
@@ -194,7 +193,7 @@ class RaftWorld(World):
             previousLocation = "RadioTower"
             while (len(availableLocationList) > 0):
                 if (len(availableLocationList) > 1):
-                    currentLocation = availableLocationList[random.randint(0, len(availableLocationList) - 2)]
+                    currentLocation = availableLocationList[self.random.randint(0, len(availableLocationList) - 2)]
                 else:
                     currentLocation = availableLocationList[0] # Utopia (only one left in list)
                 availableLocationList.remove(currentLocation)
@@ -212,7 +211,7 @@ class RaftWorld(World):
     def setLocationItemFromRegion(self, region: str, itemName: str):
         itemToUse = next(filter(lambda itm: itm.name == itemName, self.multiworld.raft_frequencyItemsPerPlayer[self.player]))
         self.multiworld.raft_frequencyItemsPerPlayer[self.player].remove(itemToUse)
-        location = random.choice(list(loc for loc in location_table if loc["region"] == region))
+        location = self.random.choice(list(loc for loc in location_table if loc["region"] == region))
         self.multiworld.get_location(location["name"], self.player).place_locked_item(itemToUse)
     
     def fill_slot_data(self):
diff --git a/worlds/rogue_legacy/Presets.py b/worlds/rogue_legacy/Presets.py
new file mode 100644
index 0000000000..2dfeee64d8
--- /dev/null
+++ b/worlds/rogue_legacy/Presets.py
@@ -0,0 +1,61 @@
+from typing import Any, Dict
+
+from .Options import Architect, GoldGainMultiplier, Vendors
+
+rl_options_presets: Dict[str, Dict[str, Any]] = {
+    # Example preset using only literal values.
+    "Unknown Fate": {
+        "progression_balancing":    "random",
+        "accessibility":            "random",
+        "starting_gender":          "random",
+        "starting_class":           "random",
+        "new_game_plus":            "random",
+        "fairy_chests_per_zone":    "random",
+        "chests_per_zone":          "random",
+        "universal_fairy_chests":   "random",
+        "universal_chests":         "random",
+        "vendors":                  "random",
+        "architect":                "random",
+        "architect_fee":            "random",
+        "disable_charon":           "random",
+        "require_purchasing":       "random",
+        "progressive_blueprints":   "random",
+        "gold_gain_multiplier":     "random",
+        "number_of_children":       "random",
+        "free_diary_on_generation": "random",
+        "khidr":                    "random",
+        "alexander":                "random",
+        "leon":                     "random",
+        "herodotus":                "random",
+        "health_pool":              "random",
+        "mana_pool":                "random",
+        "attack_pool":              "random",
+        "magic_damage_pool":        "random",
+        "armor_pool":               "random",
+        "equip_pool":               "random",
+        "crit_chance_pool":         "random",
+        "crit_damage_pool":         "random",
+        "allow_default_names":      True,
+        "death_link":               "random",
+    },
+    # A preset I actually use, using some literal values and some from the option itself.
+    "Limited Potential": {
+        "progression_balancing":    "disabled",
+        "fairy_chests_per_zone":    2,
+        "starting_class":           "random",
+        "chests_per_zone":          30,
+        "vendors":                  Vendors.option_normal,
+        "architect":                Architect.option_disabled,
+        "gold_gain_multiplier":     GoldGainMultiplier.option_half,
+        "number_of_children":       2,
+        "free_diary_on_generation": False,
+        "health_pool":              10,
+        "mana_pool":                10,
+        "attack_pool":              10,
+        "magic_damage_pool":        10,
+        "armor_pool":               5,
+        "equip_pool":               10,
+        "crit_chance_pool":         5,
+        "crit_damage_pool":         5,
+    }
+}
diff --git a/worlds/rogue_legacy/Rules.py b/worlds/rogue_legacy/Rules.py
index 90f6cc08b1..2fac8d5613 100644
--- a/worlds/rogue_legacy/Rules.py
+++ b/worlds/rogue_legacy/Rules.py
@@ -7,8 +7,8 @@ def get_upgrade_total(multiworld: MultiWorld, player: int) -> int:
 
 
 def get_upgrade_count(state: CollectionState, player: int) -> int:
-    return state.item_count("Health Up", player) + state.item_count("Mana Up", player) + \
-           state.item_count("Attack Up", player) + state.item_count("Magic Damage Up", player)
+    return state.count("Health Up", player) + state.count("Mana Up", player) + \
+        state.count("Attack Up", player) + state.count("Magic Damage Up", player)
 
 
 def has_vendors(state: CollectionState, player: int) -> bool:
diff --git a/worlds/rogue_legacy/__init__.py b/worlds/rogue_legacy/__init__.py
index 68a0c856c8..c5a8d71b5d 100644
--- a/worlds/rogue_legacy/__init__.py
+++ b/worlds/rogue_legacy/__init__.py
@@ -5,6 +5,7 @@ from worlds.AutoWorld import WebWorld, World
 from .Items import RLItem, RLItemData, event_item_table, get_items_by_category, item_table
 from .Locations import RLLocation, location_table
 from .Options import rl_options
+from .Presets import rl_options_presets
 from .Regions import create_regions
 from .Rules import set_rules
 
@@ -22,6 +23,7 @@ class RLWeb(WebWorld):
     )]
     bug_report_page = "https://github.com/ThePhar/RogueLegacyRandomizer/issues/new?assignees=&labels=bug&template=" \
                       "report-an-issue---.md&title=%5BIssue%5D"
+    options_presets = rl_options_presets
 
 
 class RLWorld(World):
diff --git a/worlds/ror2/Items.py b/worlds/ror2/Items.py
deleted file mode 100644
index 448e3272ae..0000000000
--- a/worlds/ror2/Items.py
+++ /dev/null
@@ -1,194 +0,0 @@
-from BaseClasses import Item
-from .Options import ItemWeights
-from .RoR2Environments import *
-
-
-class RiskOfRainItem(Item):
-    game: str = "Risk of Rain 2"
-
-
-# 37000 - 37699, 38000
-item_table: Dict[str, int] = {
-    "Dio's Best Friend":    37001,
-    "Common Item":          37002,
-    "Uncommon Item":        37003,
-    "Legendary Item":       37004,
-    "Boss Item":            37005,
-    "Lunar Item":           37006,
-    "Equipment":            37007,
-    "Item Scrap, White":    37008,
-    "Item Scrap, Green":    37009,
-    "Item Scrap, Red":      37010,
-    "Item Scrap, Yellow":   37011,
-    "Void Item":            37012,
-    "Beads of Fealty":      37013
-}
-
-# 37700 - 37699
-##################################################
-# environments
-
-environment_offest = 37700
-
-# add ALL environments into the item table
-environment_offset_table = shift_by_offset(environment_ALL_table, environment_offest)
-item_table.update(shift_by_offset(environment_ALL_table, environment_offest))
-# use the sotv dlc in the item table so that all names can be looked up regardless of use
-
-# end of environments
-##################################################
-
-default_weights: Dict[str, int] = {
-    "Item Scrap, Green":    16,
-    "Item Scrap, Red":      4,
-    "Item Scrap, Yellow":   1,
-    "Item Scrap, White":    32,
-    "Common Item":          64,
-    "Uncommon Item":        32,
-    "Legendary Item":       8,
-    "Boss Item":            4,
-    "Lunar Item":           16,
-    "Void Item":            16,
-    "Equipment":            32
-}
-
-new_weights: Dict[str, int] = {
-    "Item Scrap, Green":    15,
-    "Item Scrap, Red":      5,
-    "Item Scrap, Yellow":   1,
-    "Item Scrap, White":    30,
-    "Common Item":          75,
-    "Uncommon Item":        40,
-    "Legendary Item":       10,
-    "Boss Item":            5,
-    "Lunar Item":           10,
-    "Void Item":            16,
-    "Equipment":            20
-}
-
-uncommon_weights: Dict[str, int] = {
-    "Item Scrap, Green":    45,
-    "Item Scrap, Red":      5,
-    "Item Scrap, Yellow":   1,
-    "Item Scrap, White":    30,
-    "Common Item":          45,
-    "Uncommon Item":        100,
-    "Legendary Item":       10,
-    "Boss Item":            5,
-    "Lunar Item":           15,
-    "Void Item":            16,
-    "Equipment":            20
-}
-
-legendary_weights: Dict[str, int] = {
-    "Item Scrap, Green":    15,
-    "Item Scrap, Red":      5,
-    "Item Scrap, Yellow":   1,
-    "Item Scrap, White":    30,
-    "Common Item":          50,
-    "Uncommon Item":        25,
-    "Legendary Item":       100,
-    "Boss Item":            5,
-    "Lunar Item":           15,
-    "Void Item":            16,
-    "Equipment":            20
-}
-
-lunartic_weights: Dict[str, int] = {
-    "Item Scrap, Green":    0,
-    "Item Scrap, Red":      0,
-    "Item Scrap, Yellow":   0,
-    "Item Scrap, White":    0,
-    "Common Item":          0,
-    "Uncommon Item":        0,
-    "Legendary Item":       0,
-    "Boss Item":            0,
-    "Lunar Item":           100,
-    "Void Item":            0,
-    "Equipment":            0
-}
-
-chaos_weights: Dict[str, int] = {
-    "Item Scrap, Green":    80,
-    "Item Scrap, Red":      45,
-    "Item Scrap, Yellow":   30,
-    "Item Scrap, White":    100,
-    "Common Item":          100,
-    "Uncommon Item":        70,
-    "Legendary Item":       30,
-    "Boss Item":            20,
-    "Lunar Item":           60,
-    "Void Item":            60,
-    "Equipment":            40
-}
-
-no_scraps_weights: Dict[str, int] = {
-    "Item Scrap, Green":    0,
-    "Item Scrap, Red":      0,
-    "Item Scrap, Yellow":   0,
-    "Item Scrap, White":    0,
-    "Common Item":          100,
-    "Uncommon Item":        40,
-    "Legendary Item":       15,
-    "Boss Item":            5,
-    "Lunar Item":           10,
-    "Void Item":            16,
-    "Equipment":            25
-}
-
-even_weights: Dict[str, int] = {
-    "Item Scrap, Green":    1,
-    "Item Scrap, Red":      1,
-    "Item Scrap, Yellow":   1,
-    "Item Scrap, White":    1,
-    "Common Item":          1,
-    "Uncommon Item":        1,
-    "Legendary Item":       1,
-    "Boss Item":            1,
-    "Lunar Item":           1,
-    "Void Item":            1,
-    "Equipment":            1
-}
-
-scraps_only: Dict[str, int] = {
-    "Item Scrap, Green":    70,
-    "Item Scrap, White":    100,
-    "Item Scrap, Red":      30,
-    "Item Scrap, Yellow":   5,
-    "Common Item":          0,
-    "Uncommon Item":        0,
-    "Legendary Item":       0,
-    "Boss Item":            0,
-    "Lunar Item":           0,
-    "Void Item":            0,
-    "Equipment":            0
-}
-
-void_weights: Dict[str, int] = {
-    "Item Scrap, Green":    0,
-    "Item Scrap, Red":      0,
-    "Item Scrap, Yellow":   0,
-    "Item Scrap, White":    0,
-    "Common Item":          0,
-    "Uncommon Item":        0,
-    "Legendary Item":       0,
-    "Boss Item":            0,
-    "Lunar Item":           0,
-    "Void Item":            100,
-    "Equipment":            0
-}
-
-item_pool_weights: Dict[int, Dict[str, int]] = {
-    ItemWeights.option_default:     default_weights,
-    ItemWeights.option_new:         new_weights,
-    ItemWeights.option_uncommon:    uncommon_weights,
-    ItemWeights.option_legendary:   legendary_weights,
-    ItemWeights.option_lunartic:    lunartic_weights,
-    ItemWeights.option_chaos:       chaos_weights,
-    ItemWeights.option_no_scraps:   no_scraps_weights,
-    ItemWeights.option_even:        even_weights,
-    ItemWeights.option_scraps_only: scraps_only,
-    ItemWeights.option_void:        void_weights,
-}
-
-lookup_id_to_name: Dict[int, str] = {id: name for name, id in item_table.items()}
diff --git a/worlds/ror2/Locations.py b/worlds/ror2/Locations.py
deleted file mode 100644
index 7db3ceca73..0000000000
--- a/worlds/ror2/Locations.py
+++ /dev/null
@@ -1,119 +0,0 @@
-from typing import Tuple
-from BaseClasses import Location
-from .Options import TotalLocations
-from .Options import ChestsPerEnvironment
-from .Options import ShrinesPerEnvironment
-from .Options import ScavengersPerEnvironment
-from .Options import ScannersPerEnvironment
-from .Options import AltarsPerEnvironment
-from .RoR2Environments import *
-
-
-class RiskOfRainLocation(Location):
-    game: str = "Risk of Rain 2"
-
-
-ror2_locations_start_id = 38000
-
-
-def get_classic_item_pickups(n: int) -> Dict[str, int]:
-    """Get n ItemPickups, capped at the max value for TotalLocations"""
-    n = max(n, 0)
-    n = min(n, TotalLocations.range_end)
-    return { f"ItemPickup{i+1}": ror2_locations_start_id+i for i in range(n) }
-
-
-item_pickups = get_classic_item_pickups(TotalLocations.range_end)
-location_table = item_pickups
-
-
-def environment_abreviation(long_name:str) -> str:
-    """convert long environment names to initials"""
-    abrev = ""
-    # go through every word finding a letter (or number) for an initial
-    for word in long_name.split():
-        initial = word[0]
-        for letter in word:
-            if letter.isalnum():
-                initial = letter
-                break
-        abrev+= initial
-    return abrev
-
-# highest numbered orderedstages (this is so we can treat the easily caculate the check ids based on the environment and location "offset")
-highest_orderedstage: int= max(compress_dict_list_horizontal(environment_orderedstages_table).values())
-
-ror2_locations_start_orderedstage = ror2_locations_start_id + TotalLocations.range_end
-
-class orderedstage_location:
-    """A class to behave like a struct for storing the offsets of location types in the allocated space per orderedstage environments."""
-    # TODO is there a better, more generic way to do this?
-    offset_ChestsPerEnvironment     = 0
-    offset_ShrinesPerEnvironment    = offset_ChestsPerEnvironment       + ChestsPerEnvironment.range_end
-    offset_ScavengersPerEnvironment = offset_ShrinesPerEnvironment      + ShrinesPerEnvironment.range_end
-    offset_ScannersPerEnvironment   = offset_ScavengersPerEnvironment   + ScavengersPerEnvironment.range_end
-    offset_AltarsPerEnvironment     = offset_ScannersPerEnvironment     + ScannersPerEnvironment.range_end
-
-    # total space allocated to the locations in a single orderedstage environment
-    allocation = offset_AltarsPerEnvironment + AltarsPerEnvironment.range_end
-
-    def get_environment_locations(chests:int, shrines:int, scavengers:int, scanners:int, altars:int, environment: Tuple[str, int]) -> Dict[str, int]:
-        """Get the locations within a specific environment"""
-        environment_name = environment[0]
-        environment_index = environment[1]
-        locations = {}
-
-        # due to this mapping, since environment ids are not consecutive, there are lots of "wasted" id numbers
-        # TODO perhaps a hashing algorithm could be used to compress this range and save "wasted" ids
-        environment_start_id = environment_index * orderedstage_location.allocation + ror2_locations_start_orderedstage
-        for n in range(chests):
-            locations.update({f"{environment_name}: Chest {n+1}":            n + orderedstage_location.offset_ChestsPerEnvironment       + environment_start_id})
-        for n in range(shrines):
-            locations.update({f"{environment_name}: Shrine {n+1}":           n + orderedstage_location.offset_ShrinesPerEnvironment      + environment_start_id})
-        for n in range(scavengers):
-            locations.update({f"{environment_name}: Scavenger {n+1}":        n + orderedstage_location.offset_ScavengersPerEnvironment   + environment_start_id})
-        for n in range(scanners):
-            locations.update({f"{environment_name}: Radio Scanner {n+1}":    n + orderedstage_location.offset_ScannersPerEnvironment     + environment_start_id})
-        for n in range(altars):
-            locations.update({f"{environment_name}: Newt Altar {n+1}":       n + orderedstage_location.offset_AltarsPerEnvironment       + environment_start_id})
-        return locations
-
-    def get_locations(chests:int, shrines:int, scavengers:int, scanners:int, altars:int, dlc_sotv:bool) -> Dict[str, int]:
-        """Get a dictionary of locations for the ordedstage environments with the locations from the parameters."""
-        locations = {}
-        orderedstages = compress_dict_list_horizontal(environment_vanilla_orderedstages_table)
-        if(dlc_sotv): orderedstages.update(compress_dict_list_horizontal(environment_sotv_orderedstages_table))
-        # for every environment, generate the respective locations
-        for environment_name, environment_index in orderedstages.items():
-            # locations = locations | orderedstage_location.get_environment_locations(
-            locations.update(orderedstage_location.get_environment_locations(
-                chests=chests,
-                shrines=shrines,
-                scavengers=scavengers,
-                scanners=scanners,
-                altars=altars,
-                environment=(environment_name, environment_index)
-            ))
-        return locations
-
-    def getall_locations(dlc_sotv:bool=True) -> Dict[str, int]:
-        """
-        Get all locations in ordered stages.
-        Set dlc_sotv to true for the SOTV DLC to be included.
-        """
-        # to get all locations, attempt using as many locations as possible
-        return orderedstage_location.get_locations(
-            chests=ChestsPerEnvironment.range_end,
-            shrines=ShrinesPerEnvironment.range_end,
-            scavengers=ScavengersPerEnvironment.range_end,
-            scanners=ScannersPerEnvironment.range_end,
-            altars=AltarsPerEnvironment.range_end,
-            dlc_sotv=dlc_sotv
-        )
-
-
-ror2_location_post_orderedstage = ror2_locations_start_orderedstage + highest_orderedstage*orderedstage_location.allocation
-location_table.update(orderedstage_location.getall_locations())
-# use the sotv dlc in the lookup table so that all ids can be looked up regardless of use
-
-lookup_id_to_name: Dict[int, str] = {id: name for name, id in location_table.items()}
diff --git a/worlds/ror2/RoR2Environments.py b/worlds/ror2/RoR2Environments.py
deleted file mode 100644
index 2a9bf73e98..0000000000
--- a/worlds/ror2/RoR2Environments.py
+++ /dev/null
@@ -1,118 +0,0 @@
-from typing import Dict, List, TypeVar
-
-# TODO probably move to Locations
-
-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
-}
-environment_vanilla_orderedstage_2_table: Dict[str, int] = {
-    "Abandoned Aqueduct":                      17, # goolake
-    "Wetland Aspect":                          12, # foggyswamp
-}
-environment_vanilla_orderedstage_3_table: Dict[str, int] = {
-    "Rallypoint Delta":                        13, # frozenwall
-    "Scorched Acres":                          47, # wispgraveyard
-}
-environment_vanilla_orderedstage_4_table: Dict[str, int] = {
-    "Abyssal Depths":                          10, # dampcavesimple
-    "Siren's Call":                            37, # shipgraveyard
-    "Sundered Grove":                          35, # rootjungle
-}
-environment_vanilla_orderedstage_5_table: Dict[str, int] = {
-    "Sky Meadow":                              38, # skymeadow
-}
-
-environment_vanilla_hidden_realm_table: Dict[str, int] = {
-    "Hidden Realm: Bulwark's Ambry":            5, # artifactworld
-    "Hidden Realm: Bazaar Between Time":        6, # bazaar
-    "Hidden Realm: Gilded Coast":              14, # goldshores
-    "Hidden Realm: A Moment, Whole":           27, # limbo
-    "Hidden Realm: A Moment, Fractured":       33, # mysteryspace
-}
-
-environment_vanilla_special_table: Dict[str, int] = {
-    "Void Fields":                              4, # arena
-    "Commencement":                            32, # moon2
-}
-
-environment_sotv_orderedstage_1_table: Dict[str, int] = {
-    "Siphoned Forest":                         39, # snowyforest
-}
-environment_sotv_orderedstage_2_table: Dict[str, int] = {
-    "Aphelian Sanctuary":                       3, # ancientloft
-}
-environment_sotv_orderedstage_3_table: Dict[str, int] = {
-    "Sulfur Pools":                            41, # sulfurpools
-}
-environment_sotv_orderedstage_4_table: Dict[str, int] = { }
-environment_sotv_orderedstage_5_table: Dict[str, int] = { }
-
-# TODO idk much and idc much about simulacrum, is there a forced order or something?
-environment_sotv_simulacrum_table: Dict[str, int] = {
-    "The Simulacrum (Aphelian Sanctuary)":     20, # itancientloft
-    "The Simulacrum (Abyssal Depths)":         21, # itdampcave
-    "The Simulacrum (Rallypoint Delta)":       22, # itfrozenwall
-    "The Simulacrum (Titanic Plains)":         23, # itgolemplains
-    "The Simulacrum (Abandoned Aqueduct)":     24, # itgoolake
-    "The Simulacrum (Commencement)":           25, # itmoon
-    "The Simulacrum (Sky Meadow)":             26, # itskymeadow
-}
-
-environment_sotv_special_table: Dict[str, int] = {
-    "Void Locus":                              46, # voidstage
-    "The Planetarium":                         45, # voidraid
-}
-
-X = TypeVar("X")
-Y = TypeVar("Y")
-
-
-def compress_dict_list_horizontal(list_of_dict: List[Dict[X, Y]]) -> Dict[X, Y]:
-    """Combine all dictionaries in a list together into one dictionary."""
-    compressed: Dict[X,Y] = {}
-    for individual in list_of_dict: compressed.update(individual)
-    return compressed
-
-def collapse_dict_list_vertical(list_of_dict1: List[Dict[X, Y]], *args: List[Dict[X, Y]]) -> List[Dict[X, Y]]:
-    """Combine all parallel dictionaries in lists together to make a new list of dictionaries of the same length."""
-    # find the length of the longest list
-    length = len(list_of_dict1)
-    for list_of_dictN in args:
-        length = max(length, len(list_of_dictN))
-
-    # create a combined list with a length the same as the longest list
-    collapsed = [{}] * (length)
-    # The reason the list_of_dict1 is not directly used to make collapsed is
-    #   side effects can occur if all the dictionaries are not manually unioned.
-
-    # merge contents from list_of_dict1
-    for i in range(len(list_of_dict1)):
-        collapsed[i] = {**collapsed[i],  **list_of_dict1[i]}
-
-    # merge contents of remaining lists_of_dicts
-    for list_of_dictN in args:
-        for i in range(len(list_of_dictN)):
-            collapsed[i] = {**collapsed[i], **list_of_dictN[i]}
-
-    return collapsed
-
-# TODO potentially these should only be created when they are directly referenced (unsure of the space/time cost of creating these initially)
-
-environment_vanilla_orderedstages_table = [ environment_vanilla_orderedstage_1_table, environment_vanilla_orderedstage_2_table, environment_vanilla_orderedstage_3_table, environment_vanilla_orderedstage_4_table, environment_vanilla_orderedstage_5_table ]
-environment_vanilla_table = {**compress_dict_list_horizontal(environment_vanilla_orderedstages_table), **environment_vanilla_hidden_realm_table, **environment_vanilla_special_table}
-
-environment_sotv_orderedstages_table = [ environment_sotv_orderedstage_1_table, environment_sotv_orderedstage_2_table, environment_sotv_orderedstage_3_table, environment_sotv_orderedstage_4_table, environment_sotv_orderedstage_5_table ]
-environment_sotv_non_simulacrum_table = {**compress_dict_list_horizontal(environment_sotv_orderedstages_table), **environment_sotv_special_table}
-environment_sotv_table = {**environment_sotv_non_simulacrum_table}
-
-environment_non_orderedstages_table = {**environment_vanilla_hidden_realm_table, **environment_vanilla_special_table, **environment_sotv_simulacrum_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}
-
-
-def shift_by_offset(dictionary: Dict[str, int], offset:int) -> Dict[str, int]:
-    """Shift all indexes in a dictionary by an offset"""
-    return {name:index+offset for name, index in dictionary.items()}
diff --git a/worlds/ror2/__init__.py b/worlds/ror2/__init__.py
index 7c638f50b3..6574a176dc 100644
--- a/worlds/ror2/__init__.py
+++ b/worlds/ror2/__init__.py
@@ -1,14 +1,16 @@
 import string
 
-from .Items import RiskOfRainItem, item_table, item_pool_weights, environment_offest
-from .Locations import RiskOfRainLocation, get_classic_item_pickups, item_pickups, orderedstage_location
-from .Rules import set_rules
-from .RoR2Environments import *
+from .items import RiskOfRainItem, item_table, item_pool_weights, offset, filler_table, environment_offset
+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
 
-from BaseClasses import Region, Entrance, Item, ItemClassification, MultiWorld, Tutorial
-from .Options import ror2_options, ItemWeights
+from BaseClasses import Item, ItemClassification, Tutorial
+from .options import ItemWeights, ROR2Options
 from worlds.AutoWorld import World, WebWorld
-from .Regions import create_regions
+from .regions import create_explore_regions, create_classic_regions
+from typing import List, Dict, Any
 
 
 class RiskOfWeb(WebWorld):
@@ -18,7 +20,7 @@ class RiskOfWeb(WebWorld):
         "English",
         "setup_en.md",
         "setup/en",
-        ["Ijwu"]
+        ["Ijwu", "Kindasneaki"]
     )]
 
 
@@ -28,249 +30,217 @@ class RiskOfRainWorld(World):
      Combine loot in surprising ways and master each character until you become the havoc you feared upon your
      first crash landing.
     """
-    game: str = "Risk of Rain 2"
-    option_definitions = ror2_options
+    game = "Risk of Rain 2"
+    options_dataclass = ROR2Options
+    options: ROR2Options
     topology_present = False
-
-    item_name_to_id = item_table
+    item_name_to_id = {name: data.code for name, data in item_table.items()}
+    item_name_groups = {
+        "Stages": {name for name, data in item_table.items() if data.category == "Stage"},
+        "Environments": {name for name, data in item_table.items() if data.category == "Environment"},
+        "Upgrades": {name for name, data in item_table.items() if data.category == "Upgrade"},
+        "Fillers": {name for name, data in item_table.items() if data.category == "Filler"},
+        "Traps": {name for name, data in item_table.items() if data.category == "Trap"},
+    }
     location_name_to_id = item_pickups
 
-    data_version = 7
-    required_client_version = (0, 4, 2)
+    data_version = 8
+    required_client_version = (0, 4, 4)
     web = RiskOfWeb()
     total_revivals: int
 
-    def __init__(self, multiworld: "MultiWorld", player: int):
-        super().__init__(multiworld, player)
-        self.junk_pool: Dict[str, int] = {}
-
     def generate_early(self) -> None:
         # figure out how many revivals should exist in the pool
-        if self.multiworld.goal[self.player] == "classic":
-            total_locations = self.multiworld.total_locations[self.player].value
+        if self.options.goal == "classic":
+            total_locations = self.options.total_locations.value
         else:
             total_locations = len(
-                orderedstage_location.get_locations(
-                    chests=self.multiworld.chests_per_stage[self.player].value,
-                    shrines=self.multiworld.shrines_per_stage[self.player].value,
-                    scavengers=self.multiworld.scavengers_per_stage[self.player].value,
-                    scanners=self.multiworld.scanner_per_stage[self.player].value,
-                    altars=self.multiworld.altars_per_stage[self.player].value,
-                    dlc_sotv=self.multiworld.dlc_sotv[self.player].value
+                get_locations(
+                    chests=self.options.chests_per_stage.value,
+                    shrines=self.options.shrines_per_stage.value,
+                    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)
                 )
             )
-        self.total_revivals = int(self.multiworld.total_revivals[self.player].value / 100 *
+        self.total_revivals = int(self.options.total_revivals.value / 100 *
                                   total_locations)
-        # self.total_revivals = self.multiworld.total_revivals[self.player].value
-        if self.multiworld.start_with_revive[self.player].value:
+        if self.options.start_with_revive:
             self.total_revivals -= 1
+        if self.options.victory == "voidling" and not self.options.dlc_sotv:
+            self.options.victory.value = self.options.victory.option_any
+
+    def create_regions(self) -> None:
+
+        if self.options.goal == "classic":
+            # classic mode
+            create_classic_regions(self)
+        else:
+            # explore mode
+            create_explore_regions(self)
+
+        self.create_events()
 
     def create_items(self) -> None:
         # shortcut for starting_inventory... The start_with_revive option lets you start with a Dio's Best Friend
-        if self.multiworld.start_with_revive[self.player]:
+        if self.options.start_with_revive:
             self.multiworld.push_precollected(self.multiworld.create_item("Dio's Best Friend", self.player))
 
         environments_pool = {}
         # only mess with the environments if they are set as items
-        if self.multiworld.goal[self.player] == "explore":
+        if self.options.goal == "explore":
 
             # figure out all available ordered stages for each tier
             environment_available_orderedstages_table = environment_vanilla_orderedstages_table
-            if self.multiworld.dlc_sotv[self.player]:
-                environment_available_orderedstages_table = collapse_dict_list_vertical(environment_available_orderedstages_table, environment_sotv_orderedstages_table)
+            if self.options.dlc_sotv:
+                environment_available_orderedstages_table = \
+                    collapse_dict_list_vertical(environment_available_orderedstages_table,
+                                                environment_sotv_orderedstages_table)
 
-            environments_pool = shift_by_offset(environment_vanilla_table, environment_offest)
+            environments_pool = shift_by_offset(environment_vanilla_table, environment_offset)
 
-            if self.multiworld.dlc_sotv[self.player]:
-                environment_offset_table = shift_by_offset(environment_sotv_table, environment_offest)
+            if self.options.dlc_sotv:
+                environment_offset_table = shift_by_offset(environment_sotv_table, environment_offset)
                 environments_pool = {**environments_pool, **environment_offset_table}
-            environments_to_precollect = 5 if self.multiworld.begin_with_loop[self.player].value else 1
-            # percollect environments for each stage (or just stage 1)
-            for i in range(environments_to_precollect):
-                unlock = self.multiworld.random.choices(list(environment_available_orderedstages_table[i].keys()), k=1)
-                self.multiworld.push_precollected(self.create_item(unlock[0]))
-                environments_pool.pop(unlock[0])
+            # 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]))
+            environments_pool.pop(unlock[0])
 
         # Generate item pool
-        itempool: List = []
+        itempool: List[str] = ["Beads of Fealty", "Radar Scanner"]
         # Add revive items for the player
         itempool += ["Dio's Best Friend"] * self.total_revivals
-        itempool += ["Beads of Fealty"]
 
         for env_name, _ in environments_pool.items():
             itempool += [env_name]
 
-        if self.multiworld.goal[self.player] == "classic":
+        if self.options.goal == "classic":
             # classic mode
-            total_locations = self.multiworld.total_locations[self.player].value
+            total_locations = self.options.total_locations.value
         else:
             # explore mode
+            # Add Stage items for logic gates
+            itempool += ["Stage 1", "Stage 2", "Stage 3", "Stage 4"]
             total_locations = len(
-                orderedstage_location.get_locations(
-                    chests=self.multiworld.chests_per_stage[self.player].value,
-                    shrines=self.multiworld.shrines_per_stage[self.player].value,
-                    scavengers=self.multiworld.scavengers_per_stage[self.player].value,
-                    scanners=self.multiworld.scanner_per_stage[self.player].value,
-                    altars=self.multiworld.altars_per_stage[self.player].value,
-                    dlc_sotv=self.multiworld.dlc_sotv[self.player].value
+                get_locations(
+                    chests=self.options.chests_per_stage.value,
+                    shrines=self.options.shrines_per_stage.value,
+                    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)
                 )
             )
         # Create junk items
-        self.junk_pool = self.create_junk_pool()
+        junk_pool = self.create_junk_pool()
         # Fill remaining items with randomly generated junk
-        while len(itempool) < total_locations:
-            itempool.append(self.get_filler_item_name())
+        filler = self.random.choices(*zip(*junk_pool.items()), k=total_locations - len(itempool))
+        itempool.extend(filler)
 
         # Convert itempool into real items
-        itempool = list(map(lambda name: self.create_item(name), itempool))
-        self.multiworld.itempool += itempool
+        self.multiworld.itempool += map(self.create_item, itempool)
 
-    def set_rules(self) -> None:
-        set_rules(self.multiworld, self.player)
-
-    def get_filler_item_name(self) -> str:
-        if not self.junk_pool:
-            self.junk_pool = self.create_junk_pool()
-        weights = [data for data in self.junk_pool.values()]
-        filler = self.multiworld.random.choices([filler for filler in self.junk_pool.keys()], weights,
-                                                k=1)[0]
-        return filler
-
-    def create_junk_pool(self) -> Dict:
+    def create_junk_pool(self) -> Dict[str, int]:
         # if presets are enabled generate junk_pool from the selected preset
-        pool_option = self.multiworld.item_weights[self.player].value
+        pool_option = self.options.item_weights.value
         junk_pool: Dict[str, int] = {}
-        if self.multiworld.item_pool_presets[self.player]:
+        if self.options.item_pool_presets:
             # generate chaos weights if the preset is chosen
             if pool_option == ItemWeights.option_chaos:
                 for name, max_value in item_pool_weights[pool_option].items():
-                    junk_pool[name] = self.multiworld.random.randint(0, max_value)
+                    junk_pool[name] = self.random.randint(0, max_value)
             else:
                 junk_pool = item_pool_weights[pool_option].copy()
         else:  # generate junk pool from user created presets
             junk_pool = {
-                "Item Scrap, Green": self.multiworld.green_scrap[self.player].value,
-                "Item Scrap, Red": self.multiworld.red_scrap[self.player].value,
-                "Item Scrap, Yellow": self.multiworld.yellow_scrap[self.player].value,
-                "Item Scrap, White": self.multiworld.white_scrap[self.player].value,
-                "Common Item": self.multiworld.common_item[self.player].value,
-                "Uncommon Item": self.multiworld.uncommon_item[self.player].value,
-                "Legendary Item": self.multiworld.legendary_item[self.player].value,
-                "Boss Item": self.multiworld.boss_item[self.player].value,
-                "Lunar Item": self.multiworld.lunar_item[self.player].value,
-                "Void Item": self.multiworld.void_item[self.player].value,
-                "Equipment": self.multiworld.equipment[self.player].value
+                "Item Scrap, Green": self.options.green_scrap.value,
+                "Item Scrap, Red": self.options.red_scrap.value,
+                "Item Scrap, Yellow": self.options.yellow_scrap.value,
+                "Item Scrap, White": self.options.white_scrap.value,
+                "Common Item": self.options.common_item.value,
+                "Uncommon Item": self.options.uncommon_item.value,
+                "Legendary Item": self.options.legendary_item.value,
+                "Boss Item": self.options.boss_item.value,
+                "Lunar Item": self.options.lunar_item.value,
+                "Void Item": self.options.void_item.value,
+                "Equipment": self.options.equipment.value,
+                "Money": self.options.money.value,
+                "Lunar Coin": self.options.lunar_coin.value,
+                "1000 Exp": self.options.experience.value,
+                "Mountain Trap": self.options.mountain_trap.value,
+                "Time Warp Trap": self.options.time_warp_trap.value,
+                "Combat Trap": self.options.combat_trap.value,
+                "Teleport Trap": self.options.teleport_trap.value,
             }
-
-        # remove lunar items from the pool if they're disabled in the yaml unless lunartic is rolled
-        if not (self.multiworld.enable_lunar[self.player] or pool_option == ItemWeights.option_lunartic):
+        # remove trap items from the pool (excluding lunar items)
+        if not self.options.enable_trap:
+            junk_pool.pop("Mountain Trap")
+            junk_pool.pop("Time Warp Trap")
+            junk_pool.pop("Combat Trap")
+            junk_pool.pop("Teleport Trap")
+        # remove lunar items from the pool
+        if not (self.options.enable_lunar or pool_option == ItemWeights.option_lunartic):
             junk_pool.pop("Lunar Item")
         # remove void items from the pool
-        if not (self.multiworld.dlc_sotv[self.player] or pool_option == ItemWeights.option_void):
+        if not (self.options.dlc_sotv or pool_option == ItemWeights.option_void):
             junk_pool.pop("Void Item")
 
         return junk_pool
 
-    def create_regions(self) -> None:
+    def create_item(self, name: str) -> Item:
+        data = item_table[name]
+        return RiskOfRainItem(name, data.item_type, data.code, self.player)
 
-        if self.multiworld.goal[self.player] == "classic":
-            # classic mode
-            menu = create_region(self.multiworld, self.player, "Menu")
-            self.multiworld.regions.append(menu)
-            # By using a victory region, we can define it as being connected to by several regions
-            #   which can then determine the availability of the victory.
-            victory_region = create_region(self.multiworld, self.player, "Victory")
-            self.multiworld.regions.append(victory_region)
-            petrichor = create_region(self.multiworld, self.player, "Petrichor V",
-                                      get_classic_item_pickups(self.multiworld.total_locations[self.player].value))
-            self.multiworld.regions.append(petrichor)
+    def set_rules(self) -> None:
+        set_rules(self)
 
-            # classic mode can get to victory from the beginning of the game
-            to_victory = Entrance(self.player, "beating game", petrichor)
-            petrichor.exits.append(to_victory)
-            to_victory.connect(victory_region)
+    def get_filler_item_name(self) -> str:
+        weights = [data.weight for data in filler_table.values()]
+        filler = self.multiworld.random.choices([filler for filler in filler_table.keys()], weights,
+                                                k=1)[0]
+        return filler
 
-            connection = Entrance(self.player, "Lobby", menu)
-            menu.exits.append(connection)
-            connection.connect(petrichor)
-        else:
-            # explore mode
-            create_regions(self.multiworld, self.player)
-
-        create_events(self.multiworld, self.player)
-
-    def fill_slot_data(self):
+    def fill_slot_data(self) -> Dict[str, Any]:
+        options_dict = self.options.as_dict("item_pickup_step", "shrine_use_step", "goal", "victory", "total_locations",
+                                            "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",
+                                            casing="camel")
         return {
-            "itemPickupStep": self.multiworld.item_pickup_step[self.player].value,
-            "shrineUseStep": self.multiworld.shrine_use_step[self.player].value,
-            "goal": self.multiworld.goal[self.player].value,
-            "seed": "".join(self.multiworld.per_slot_randoms[self.player].choice(string.digits) for _ in range(16)),
-            "totalLocations": self.multiworld.total_locations[self.player].value,
-            "chestsPerStage": self.multiworld.chests_per_stage[self.player].value,
-            "shrinesPerStage": self.multiworld.shrines_per_stage[self.player].value,
-            "scavengersPerStage": self.multiworld.scavengers_per_stage[self.player].value,
-            "scannerPerStage": self.multiworld.scanner_per_stage[self.player].value,
-            "altarsPerStage": self.multiworld.altars_per_stage[self.player].value,
-            "totalRevivals": self.multiworld.total_revivals[self.player].value,
-            "startWithDio": self.multiworld.start_with_revive[self.player].value,
-            "finalStageDeath": self.multiworld.final_stage_death[self.player].value,
-            "deathLink": self.multiworld.death_link[self.player].value,
+            **options_dict,
+            "seed": "".join(self.random.choice(string.digits) for _ in range(16)),
+            "offset": offset
         }
 
-    def create_item(self, name: str) -> Item:
-        item_id = item_table[name]
-        classification = ItemClassification.filler
-        if name in {"Dio's Best Friend", "Beads of Fealty"}:
-            classification = ItemClassification.progression
-        elif name in {"Legendary Item", "Boss Item"}:
-            classification = ItemClassification.useful
-        elif name == "Lunar Item":
-            classification = ItemClassification.trap
-
-        # Only check for an item to be a environment unlock if those are known to be in the pool.
-        # This should shave down comparisons.
-
-        elif name in environment_ALL_table.keys():
-            if name in {"Hidden Realm: Bulwark's Ambry", "Hidden Realm: Gilded Coast,"}:
-                classification = ItemClassification.useful
-            else:
-                classification = ItemClassification.progression
-
-        item = RiskOfRainItem(name, classification, item_id, self.player)
-        return item
-
-
-def create_events(world: MultiWorld, player: int) -> None:
-    total_locations = world.total_locations[player].value
-    num_of_events = total_locations // 25
-    if total_locations / 25 == num_of_events:
-        num_of_events -= 1
-    world_region = world.get_region("Petrichor V", player)
-    if world.goal[player] == "classic":
-        # only setup Pickups when using classic_mode
-        for i in range(num_of_events):
-            event_loc = RiskOfRainLocation(player, f"Pickup{(i + 1) * 25}", None, world_region)
-            event_loc.place_locked_item(RiskOfRainItem(f"Pickup{(i + 1) * 25}", ItemClassification.progression, None, player))
-            event_loc.access_rule = \
-                lambda state, i=i: state.can_reach(f"ItemPickup{((i + 1) * 25) - 1}", "Location", player)
-            world_region.locations.append(event_loc)
-    elif world.goal[player] == "explore":
-        for n in range(1, 6):
-
-            event_region = world.get_region(f"OrderedStage_{n}", player)
-            event_loc = RiskOfRainLocation(player, f"Stage_{n}", None, event_region)
-            event_loc.place_locked_item(RiskOfRainItem(f"Stage_{n}", ItemClassification.progression, None, player))
+    def create_events(self) -> None:
+        total_locations = self.options.total_locations.value
+        num_of_events = total_locations // 25
+        if total_locations / 25 == num_of_events:
+            num_of_events -= 1
+        world_region = self.multiworld.get_region("Petrichor V", self.player)
+        if self.options.goal == "classic":
+            # classic mode
+            # only setup Pickups when using classic_mode
+            for i in range(num_of_events):
+                event_loc = RiskOfRainLocation(self.player, f"Pickup{(i + 1) * 25}", None, world_region)
+                event_loc.place_locked_item(
+                    RiskOfRainItem(f"Pickup{(i + 1) * 25}", ItemClassification.progression, None,
+                                   self.player))
+                event_loc.access_rule = \
+                    lambda state, i=i: state.can_reach(f"ItemPickup{((i + 1) * 25) - 1}", "Location", self.player)
+                world_region.locations.append(event_loc)
+        else:
+            # explore mode
+            event_region = self.multiworld.get_region("OrderedStage_5", self.player)
+            event_loc = RiskOfRainLocation(self.player, "Stage 5", None, event_region)
+            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)
 
-    victory_region = world.get_region("Victory", player)
-    victory_event = RiskOfRainLocation(player, "Victory", None, victory_region)
-    victory_event.place_locked_item(RiskOfRainItem("Victory", ItemClassification.progression, None, player))
-    world_region.locations.append(victory_event)
-
-
-def create_region(world: MultiWorld, player: int, name: str, locations: Dict[str, int] = {}) -> Region:
-    ret = Region(name, player, world)
-    for location_name, location_id in locations.items():
-        ret.locations.append(RiskOfRainLocation(player, location_name, location_id, ret))
-    return ret
+        victory_region = self.multiworld.get_region("Victory", self.player)
+        victory_event = RiskOfRainLocation(self.player, "Victory", None, victory_region)
+        victory_event.place_locked_item(RiskOfRainItem("Victory", ItemClassification.progression, None, self.player))
+        victory_region.locations.append(victory_event)
diff --git a/worlds/ror2/docs/setup_en.md b/worlds/ror2/docs/setup_en.md
index 4e59d2bf41..0fa99c071b 100644
--- a/worlds/ror2/docs/setup_en.md
+++ b/worlds/ror2/docs/setup_en.md
@@ -55,4 +55,15 @@ the player's YAML.
 You can talk to other in the multiworld chat using the RoR2 chat. All other multiworld
 remote commands list in the [commands guide](/tutorial/Archipelago/commands/en) work as well in the RoR2 chat. You can 
 also optionally connect to the multiworld using the text client, which can be found in the 
-[main Archipelago installation](https://github.com/ArchipelagoMW/Archipelago/releases).
\ No newline at end of file
+[main Archipelago installation](https://github.com/ArchipelagoMW/Archipelago/releases).
+
+### In-Game Commands
+These commands are to be used in-game by using ``Ctrl + Alt + ` `` and then typing the following:
+ - `archipelago_connect <url> <port> <slot> [password]` example: "archipelago_connect archipelago.gg 38281 SlotName".
+ - `archipelago_deathlink true/false` Toggle deathlink.
+ - `archipelago_disconnect` Disconnect from AP.
+ - `archipelago_final_stage_death true/false` Toggle final stage death.
+
+Explore Mode only
+ - `archipelago_show_unlocked_stages` Show which stages have been received.
+ - `archipelago_highlight_satellite true/false` This will highlight the satellite to make it easier to see (Default false).
\ No newline at end of file
diff --git a/worlds/ror2/items.py b/worlds/ror2/items.py
new file mode 100644
index 0000000000..449686d04b
--- /dev/null
+++ b/worlds/ror2/items.py
@@ -0,0 +1,309 @@
+from BaseClasses import Item, ItemClassification
+from .options import ItemWeights
+from .ror2environments import environment_all_table
+from typing import NamedTuple, Optional, Dict
+
+
+class RiskOfRainItem(Item):
+    game: str = "Risk of Rain 2"
+
+
+class RiskOfRainItemData(NamedTuple):
+    category: str
+    code: int
+    item_type: ItemClassification = ItemClassification.filler
+    weight: Optional[int] = None
+
+
+offset: int = 37000
+filler_offset: int = offset + 300
+trap_offset: int = offset + 400
+stage_offset: int = offset + 500
+environment_offset: int = offset + 700
+# Upgrade item ids 37002 - 37012
+upgrade_table: Dict[str, RiskOfRainItemData] = {
+    "Common Item":          RiskOfRainItemData("Upgrade", 2 + offset, ItemClassification.filler, 64),
+    "Uncommon Item":        RiskOfRainItemData("Upgrade", 3 + offset, ItemClassification.filler, 32),
+    "Legendary Item":       RiskOfRainItemData("Upgrade", 4 + offset, ItemClassification.useful, 8),
+    "Boss Item":            RiskOfRainItemData("Upgrade", 5 + offset, ItemClassification.useful, 4),
+    "Equipment":            RiskOfRainItemData("Upgrade", 7 + offset, ItemClassification.filler, 32),
+    "Item Scrap, White":    RiskOfRainItemData("Upgrade", 8 + offset, ItemClassification.filler, 32),
+    "Item Scrap, Green":    RiskOfRainItemData("Upgrade", 9 + offset, ItemClassification.filler, 16),
+    "Item Scrap, Red":      RiskOfRainItemData("Upgrade", 10 + offset, ItemClassification.filler, 4),
+    "Item Scrap, Yellow":   RiskOfRainItemData("Upgrade", 11 + offset, ItemClassification.filler, 1),
+    "Void Item":            RiskOfRainItemData("Upgrade", 12 + offset, ItemClassification.filler, 16),
+}
+# Other item ids 37001, 37013-37014
+other_table: Dict[str, RiskOfRainItemData] = {
+    "Dio's Best Friend":    RiskOfRainItemData("ExtraLife", 1 + offset, ItemClassification.progression_skip_balancing),
+    "Beads of Fealty":      RiskOfRainItemData("Beads", 13 + offset, ItemClassification.progression),
+    "Radar Scanner":        RiskOfRainItemData("Radar", 14 + offset, ItemClassification.useful),
+}
+# Filler item ids 37301 - 37303
+filler_table: Dict[str, RiskOfRainItemData] = {
+    "Money":                RiskOfRainItemData("Filler", 1 + filler_offset, ItemClassification.filler, 64),
+    "Lunar Coin":           RiskOfRainItemData("Filler", 2 + filler_offset, ItemClassification.filler, 20),
+    "1000 Exp":             RiskOfRainItemData("Filler", 3 + filler_offset, ItemClassification.filler, 40),
+}
+# Trap item ids 37401 - 37404 (Lunar items used to be part of the upgrade item list, so keeping the id the same)
+trap_table: Dict[str, RiskOfRainItemData] = {
+    "Lunar Item":           RiskOfRainItemData("Trap", 6 + offset, ItemClassification.trap, 16),
+    "Mountain Trap":        RiskOfRainItemData("Trap", 1 + trap_offset, ItemClassification.trap, 5),
+    "Time Warp Trap":       RiskOfRainItemData("Trap", 2 + trap_offset, ItemClassification.trap, 20),
+    "Combat Trap":          RiskOfRainItemData("Trap", 3 + trap_offset, ItemClassification.trap, 20),
+    "Teleport Trap":        RiskOfRainItemData("Trap", 4 + trap_offset, ItemClassification.trap, 10),
+}
+# Stage item ids 37501 - 37504
+stage_table: Dict[str, RiskOfRainItemData] = {
+    "Stage 1":              RiskOfRainItemData("Stage", 1 + stage_offset, ItemClassification.progression),
+    "Stage 2":              RiskOfRainItemData("Stage", 2 + stage_offset, ItemClassification.progression),
+    "Stage 3":              RiskOfRainItemData("Stage", 3 + stage_offset, ItemClassification.progression),
+    "Stage 4":              RiskOfRainItemData("Stage", 4 + stage_offset, ItemClassification.progression),
+
+}
+
+item_table = {**upgrade_table, **other_table, **filler_table, **trap_table, **stage_table}
+# Environment item ids 37700 - 37746
+##################################################
+# environments
+
+
+# add ALL environments into the item table
+def create_environment_table(name: str, environment_id: int, environment_classification: ItemClassification) \
+        -> Dict[str, RiskOfRainItemData]:
+    return {name: RiskOfRainItemData("Environment", environment_offset + environment_id, environment_classification)}
+
+
+environment_table: Dict[str, RiskOfRainItemData] = {}
+# use the sotv dlc in the item table so that all names can be looked up regardless of use
+for data, key in environment_all_table.items():
+    classification = ItemClassification.progression
+    if data in {"Hidden Realm: Bulwark's Ambry", "Hidden Realm: Gilded Coast"}:
+        classification = ItemClassification.useful
+    environment_table.update(create_environment_table(data, key, classification))
+
+item_table.update(environment_table)
+
+# end of environments
+##################################################
+
+default_weights: Dict[str, int] = {
+    "Item Scrap, Green":    16,
+    "Item Scrap, Red":      4,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    32,
+    "Common Item":          64,
+    "Uncommon Item":        32,
+    "Legendary Item":       8,
+    "Boss Item":            4,
+    "Void Item":            16,
+    "Equipment":            32,
+    "Money":                64,
+    "Lunar Coin":           20,
+    "1000 Exp":             40,
+    "Lunar Item":           10,
+    "Mountain Trap":        4,
+    "Time Warp Trap":       20,
+    "Combat Trap":          20,
+    "Teleport Trap":        20
+}
+
+new_weights: Dict[str, int] = {
+    "Item Scrap, Green":    15,
+    "Item Scrap, Red":      5,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    30,
+    "Common Item":          75,
+    "Uncommon Item":        40,
+    "Legendary Item":       10,
+    "Boss Item":            5,
+    "Void Item":            16,
+    "Equipment":            20,
+    "Money":                64,
+    "Lunar Coin":           20,
+    "1000 Exp":             40,
+    "Lunar Item":           10,
+    "Mountain Trap":        4,
+    "Time Warp Trap":       20,
+    "Combat Trap":          20,
+    "Teleport Trap":        20
+}
+
+uncommon_weights: Dict[str, int] = {
+    "Item Scrap, Green":    45,
+    "Item Scrap, Red":      5,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    30,
+    "Common Item":          45,
+    "Uncommon Item":        100,
+    "Legendary Item":       10,
+    "Boss Item":            5,
+    "Void Item":            16,
+    "Equipment":            20,
+    "Money":                64,
+    "Lunar Coin":           20,
+    "1000 Exp":             40,
+    "Lunar Item":           10,
+    "Mountain Trap":        4,
+    "Time Warp Trap":       20,
+    "Combat Trap":          20,
+    "Teleport Trap":        20
+}
+
+legendary_weights: Dict[str, int] = {
+    "Item Scrap, Green":    15,
+    "Item Scrap, Red":      5,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    30,
+    "Common Item":          50,
+    "Uncommon Item":        25,
+    "Legendary Item":       100,
+    "Boss Item":            5,
+    "Void Item":            16,
+    "Equipment":            20,
+    "Money":                64,
+    "Lunar Coin":           20,
+    "1000 Exp":             40,
+    "Lunar Item":           10,
+    "Mountain Trap":        4,
+    "Time Warp Trap":       20,
+    "Combat Trap":          20,
+    "Teleport Trap":        20
+}
+
+chaos_weights: Dict[str, int] = {
+    "Item Scrap, Green":    80,
+    "Item Scrap, Red":      45,
+    "Item Scrap, Yellow":   30,
+    "Item Scrap, White":    100,
+    "Common Item":          100,
+    "Uncommon Item":        70,
+    "Legendary Item":       30,
+    "Boss Item":            20,
+    "Void Item":            60,
+    "Equipment":            40,
+    "Money":                64,
+    "Lunar Coin":           20,
+    "1000 Exp":             40,
+    "Lunar Item":           10,
+    "Mountain Trap":        4,
+    "Time Warp Trap":       20,
+    "Combat Trap":          20,
+    "Teleport Trap":        20
+}
+
+no_scraps_weights: Dict[str, int] = {
+    "Item Scrap, Green":    0,
+    "Item Scrap, Red":      0,
+    "Item Scrap, Yellow":   0,
+    "Item Scrap, White":    0,
+    "Common Item":          100,
+    "Uncommon Item":        40,
+    "Legendary Item":       15,
+    "Boss Item":            5,
+    "Void Item":            16,
+    "Equipment":            25,
+    "Money":                64,
+    "Lunar Coin":           20,
+    "1000 Exp":             40,
+    "Lunar Item":           10,
+    "Mountain Trap":        4,
+    "Time Warp Trap":       20,
+    "Combat Trap":          20,
+    "Teleport Trap":        20
+}
+
+even_weights: Dict[str, int] = {
+    "Item Scrap, Green":    1,
+    "Item Scrap, Red":      1,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    1,
+    "Common Item":          1,
+    "Uncommon Item":        1,
+    "Legendary Item":       1,
+    "Boss Item":            1,
+    "Void Item":            1,
+    "Equipment":            1,
+    "Money":                1,
+    "Lunar Coin":           1,
+    "1000 Exp":             1,
+    "Lunar Item":           1,
+    "Mountain Trap":        1,
+    "Time Warp Trap":       1,
+    "Combat Trap":          1,
+    "Teleport Trap":        1
+}
+
+scraps_only: Dict[str, int] = {
+    "Item Scrap, Green":    70,
+    "Item Scrap, White":    100,
+    "Item Scrap, Red":      30,
+    "Item Scrap, Yellow":   5,
+    "Common Item":          0,
+    "Uncommon Item":        0,
+    "Legendary Item":       0,
+    "Boss Item":            0,
+    "Void Item":            0,
+    "Equipment":            0,
+    "Money":                20,
+    "Lunar Coin":           10,
+    "1000 Exp":             10,
+    "Lunar Item":           0,
+    "Mountain Trap":        5,
+    "Time Warp Trap":       10,
+    "Combat Trap":          10,
+    "Teleport Trap":        10
+}
+lunartic_weights: Dict[str, int] = {
+    "Item Scrap, Green": 0,
+    "Item Scrap, Red": 0,
+    "Item Scrap, Yellow": 0,
+    "Item Scrap, White": 0,
+    "Common Item": 0,
+    "Uncommon Item": 0,
+    "Legendary Item": 0,
+    "Boss Item": 0,
+    "Void Item": 0,
+    "Equipment": 0,
+    "Money": 20,
+    "Lunar Coin": 10,
+    "1000 Exp": 10,
+    "Lunar Item": 100,
+    "Mountain Trap": 5,
+    "Time Warp Trap": 10,
+    "Combat Trap": 10,
+    "Teleport Trap": 10
+}
+void_weights: Dict[str, int] = {
+    "Item Scrap, Green":    0,
+    "Item Scrap, Red":      0,
+    "Item Scrap, Yellow":   0,
+    "Item Scrap, White":    0,
+    "Common Item":          0,
+    "Uncommon Item":        0,
+    "Legendary Item":       0,
+    "Boss Item":            0,
+    "Void Item":            100,
+    "Equipment":            0,
+    "Money":                20,
+    "Lunar Coin":           10,
+    "1000 Exp":             10,
+    "Lunar Item":           0,
+    "Mountain Trap":        5,
+    "Time Warp Trap":       10,
+    "Combat Trap":          10,
+    "Teleport Trap":        10
+}
+
+item_pool_weights: Dict[int, Dict[str, int]] = {
+    ItemWeights.option_default:     default_weights,
+    ItemWeights.option_new:         new_weights,
+    ItemWeights.option_uncommon:    uncommon_weights,
+    ItemWeights.option_legendary:   legendary_weights,
+    ItemWeights.option_chaos:       chaos_weights,
+    ItemWeights.option_no_scraps:   no_scraps_weights,
+    ItemWeights.option_even:        even_weights,
+    ItemWeights.option_scraps_only: scraps_only,
+    ItemWeights.option_lunartic:    lunartic_weights,
+    ItemWeights.option_void:        void_weights,
+}
diff --git a/worlds/ror2/locations.py b/worlds/ror2/locations.py
new file mode 100644
index 0000000000..13077b3e14
--- /dev/null
+++ b/worlds/ror2/locations.py
@@ -0,0 +1,89 @@
+from typing import Dict
+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
+
+
+class RiskOfRainLocation(Location):
+    game: str = "Risk of Rain 2"
+
+
+ror2_locations_start_id = 38000
+
+
+def get_classic_item_pickups(n: int) -> Dict[str, int]:
+    """Get n ItemPickups, capped at the max value for TotalLocations"""
+    n = max(n, 0)
+    n = min(n, TotalLocations.range_end)
+    return {f"ItemPickup{i + 1}": ror2_locations_start_id + i for i in range(n)}
+
+
+item_pickups = get_classic_item_pickups(TotalLocations.range_end)
+location_table = item_pickups
+
+# this is so we can easily calculate the environment and location "offset" ids
+ror2_locations_start_ordered_stage = ror2_locations_start_id + TotalLocations.range_end
+
+# TODO is there a better, more generic way to do this?
+offset_chests = 0
+offset_shrines = offset_chests + ChestsPerEnvironment.range_end
+offset_scavengers = offset_shrines + ShrinesPerEnvironment.range_end
+offset_scanners = offset_scavengers + ScavengersPerEnvironment.range_end
+offset_altars = offset_scanners + ScannersPerEnvironment.range_end
+
+# total space allocated to the locations in a single orderedstage environment
+allocation = offset_altars + AltarsPerEnvironment.range_end
+
+
+def get_environment_locations(chests: int, shrines: int, scavengers: int, scanners: int, altars: int,
+                              environment_name: str, environment_index: int) -> Dict[str, int]:
+    """Get the locations within a specific environment"""
+    locations = {}
+
+    # due to this mapping, since environment ids are not consecutive, there are lots of "wasted" id numbers
+    environment_start_id = environment_index * allocation + ror2_locations_start_ordered_stage
+    for n in range(chests):
+        locations.update({f"{environment_name}: Chest {n + 1}": n + offset_chests + environment_start_id})
+    for n in range(shrines):
+        locations.update({f"{environment_name}: Shrine {n + 1}": n + offset_shrines + environment_start_id})
+    for n in range(scavengers):
+        locations.update({f"{environment_name}: Scavenger {n + 1}": n + offset_scavengers + environment_start_id})
+    for n in range(scanners):
+        locations.update({f"{environment_name}: Radio Scanner {n + 1}": n + offset_scanners + environment_start_id})
+    for n in range(altars):
+        locations.update({f"{environment_name}: Newt Altar {n + 1}": n + offset_altars + environment_start_id})
+    return locations
+
+
+def get_locations(chests: int, shrines: int, scavengers: int, scanners: int, altars: int, dlc_sotv: 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 dlc_sotv:
+        orderedstages.update(compress_dict_list_horizontal(environment_sotv_orderedstages_table))
+    # for every environment, generate the respective locations
+    for environment_name, environment_index in orderedstages.items():
+        locations.update(get_environment_locations(
+            chests=chests,
+            shrines=shrines,
+            scavengers=scavengers,
+            scanners=scanners,
+            altars=altars,
+            environment_name=environment_name,
+            environment_index=environment_index),
+        )
+    return locations
+
+
+# Get all locations in ordered stages.
+location_table.update(get_locations(
+    chests=ChestsPerEnvironment.range_end,
+    shrines=ShrinesPerEnvironment.range_end,
+    scavengers=ScavengersPerEnvironment.range_end,
+    scanners=ScannersPerEnvironment.range_end,
+    altars=AltarsPerEnvironment.range_end,
+    dlc_sotv=True,
+))
diff --git a/worlds/ror2/Options.py b/worlds/ror2/options.py
similarity index 62%
rename from worlds/ror2/Options.py
rename to worlds/ror2/options.py
index cdd548d33f..abb8e91da2 100644
--- a/worlds/ror2/Options.py
+++ b/worlds/ror2/options.py
@@ -1,10 +1,10 @@
-from typing import Dict
-from Options import Option, Toggle, DefaultOnToggle, DeathLink, Range, Choice
+from dataclasses import dataclass
+from Options import Toggle, DefaultOnToggle, DeathLink, Range, Choice, PerGameCommonOptions
 
 
 # NOTE be aware that since the range of item ids that RoR2 uses is based off of the maximums of checks
 # Be careful when changing the range_end values not to go into another game's IDs
-# NOTE that these changes to range_end must also be reflected in the RoR2 client so it understands the same ids.
+# NOTE that these changes to range_end must also be reflected in the RoR2 client, so it understands the same ids.
 
 class Goal(Choice):
     """
@@ -16,6 +16,21 @@ class Goal(Choice):
     display_name = "Game Mode"
     option_classic = 0
     option_explore = 1
+    default = 1
+
+
+class Victory(Choice):
+    """
+    Mithrix: Defeat Mithrix in Commencement
+    Voidling: Defeat the Voidling in The Planetarium (DLC required! Will select any if not enabled.)
+    Limbo: Defeat the Scavenger in Hidden Realm: A Moment, Whole
+    Any: Any victory in the game will count. See Final Stage Death for additional ways.
+    """
+    display_name = "Victory Condition"
+    option_any = 0
+    option_mithrix = 1
+    option_voidling = 2
+    option_limbo = 3
     default = 0
 
 
@@ -48,7 +63,8 @@ class ScavengersPerEnvironment(Range):
     display_name = "Scavenger per Environment"
     range_start = 0
     range_end = 1
-    default = 1
+    default = 0
+
 
 class ScannersPerEnvironment(Range):
     """Explore Mode: The number of scanners locations per environment."""
@@ -57,6 +73,7 @@ class ScannersPerEnvironment(Range):
     range_end = 1
     default = 1
 
+
 class AltarsPerEnvironment(Range):
     """Explore Mode: The number of altars locations per environment."""
     display_name = "Newts Per Environment"
@@ -64,6 +81,7 @@ class AltarsPerEnvironment(Range):
     range_end = 2
     default = 1
 
+
 class TotalRevivals(Range):
     """Total Percentage of `Dio's Best Friend` item put in the item pool."""
     display_name = "Total Revives as percentage"
@@ -83,6 +101,7 @@ class ItemPickupStep(Range):
     range_end = 5
     default = 1
 
+
 class ShrineUseStep(Range):
     """
     Explore Mode:
@@ -96,6 +115,11 @@ class ShrineUseStep(Range):
     default = 0
 
 
+class AllowTrapItems(Toggle):
+    """Allows Trap items in the item pool."""
+    display_name = "Enable Trap Items"
+
+
 class AllowLunarItems(DefaultOnToggle):
     """Allows Lunar items in the item pool."""
     display_name = "Enable Lunar Item Shuffling"
@@ -107,21 +131,17 @@ class StartWithRevive(DefaultOnToggle):
 
 
 class FinalStageDeath(Toggle):
-    """The following will count as a win if set to true:
+    """The following will count as a win if set to "true", and victory is set to "any":
     Dying in Commencement.
     Dying in The Planetarium.
-    Obliterating yourself"""
+    Obliterating yourself
+    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."""
     display_name = "Final Stage Death is Win"
 
 
-class BeginWithLoop(Toggle):
-    """
-    Enable to precollect a full loop of environments.
-    Only has an effect with Explore Mode.
-    """
-    display_name = "Begin With Loop"
-
-
 class DLC_SOTV(Toggle):
     """
      Enable if you are using SOTV DLC.
@@ -131,7 +151,6 @@ class DLC_SOTV(Toggle):
     display_name = "Enable DLC - SOTV"
 
 
-
 class GreenScrap(Range):
     """Weight of Green Scraps in the item pool.
 
@@ -244,6 +263,76 @@ class Equipment(Range):
     default = 32
 
 
+class Money(Range):
+    """Weight of money items in the item pool.
+
+    (Ignored unless Item Weight Presets is 'No')"""
+    display_name = "Money"
+    range_start = 0
+    range_end = 100
+    default = 64
+
+
+class LunarCoin(Range):
+    """Weight of lunar coin items in the item pool.
+
+    (Ignored unless Item Weight Presets is 'No')"""
+    display_name = "Lunar Coins"
+    range_start = 0
+    range_end = 100
+    default = 20
+
+
+class Experience(Range):
+    """Weight of 1000 exp items in the item pool.
+
+    (Ignored unless Item Weight Presets is 'No')"""
+    display_name = "1000 Exp"
+    range_start = 0
+    range_end = 100
+    default = 40
+
+
+class MountainTrap(Range):
+    """Weight of mountain trap items in the item pool.
+
+    (Ignored unless Item Weight Presets is 'No')"""
+    display_name = "Mountain Trap"
+    range_start = 0
+    range_end = 100
+    default = 5
+
+
+class TimeWarpTrap(Range):
+    """Weight of time warp trap items in the item pool.
+
+    (Ignored unless Item Weight Presets is 'No')"""
+    display_name = "Time Warp Trap"
+    range_start = 0
+    range_end = 100
+    default = 20
+
+
+class CombatTrap(Range):
+    """Weight of combat trap items in the item pool.
+
+    (Ignored unless Item Weight Presets is 'No')"""
+    display_name = "Combat Trap"
+    range_start = 0
+    range_end = 100
+    default = 20
+
+
+class TeleportTrap(Range):
+    """Weight of teleport trap items in the item pool.
+
+    (Ignored unless Item Weight Presets is 'No')"""
+    display_name = "Teleport Trap"
+    range_start = 0
+    range_end = 100
+    default = 20
+
+
 class ItemPoolPresetToggle(Toggle):
     """Will use the item weight presets when set to true, otherwise will use the custom set item pool weights."""
     display_name = "Use Item Weight Presets"
@@ -255,58 +344,63 @@ class ItemWeights(Choice):
     - New is a test for a potential adjustment to the default weights.
     - Uncommon puts a large number of uncommon items in the pool.
     - Legendary puts a large number of legendary items in the pool.
-    - Lunartic makes everything a lunar item.
-    - Chaos generates the pool completely at random with rarer items having a slight cap to prevent this option being too easy.
+    - Chaos generates the pool completely at random with rarer items having a slight cap to prevent this option being
+    too easy.
     - No Scraps removes all scrap items from the item pool.
     - Even generates the item pool with every item having an even weight.
     - Scraps Only will be only scrap items in the item pool.
+    - Lunartic makes everything a lunar item.
     - Void makes everything a void item."""
     display_name = "Item Weights"
     option_default = 0
     option_new = 1
     option_uncommon = 2
     option_legendary = 3
-    option_lunartic = 4
-    option_chaos = 5
-    option_no_scraps = 6
-    option_even = 7
-    option_scraps_only = 8
+    option_chaos = 4
+    option_no_scraps = 5
+    option_even = 6
+    option_scraps_only = 7
+    option_lunartic = 8
     option_void = 9
 
 
-# define a dictionary for the weights of the generated item pool.
-ror2_weights: Dict[str, type(Option)] = {
-    "green_scrap":          GreenScrap,
-    "red_scrap":            RedScrap,
-    "yellow_scrap":         YellowScrap,
-    "white_scrap":          WhiteScrap,
-    "common_item":          CommonItem,
-    "uncommon_item":        UncommonItem,
-    "legendary_item":       LegendaryItem,
-    "boss_item":            BossItem,
-    "lunar_item":           LunarItem,
-    "void_item":            VoidItem,
-    "equipment":            Equipment
-}
-
-ror2_options: Dict[str, type(Option)] = {
-    "goal":                     Goal,
-    "total_locations":          TotalLocations,
-    "chests_per_stage":         ChestsPerEnvironment,
-    "shrines_per_stage":        ShrinesPerEnvironment,
-    "scavengers_per_stage":     ScavengersPerEnvironment,
-    "scanner_per_stage":        ScannersPerEnvironment,
-    "altars_per_stage":         AltarsPerEnvironment,
-    "total_revivals":           TotalRevivals,
-    "start_with_revive":        StartWithRevive,
-    "final_stage_death":        FinalStageDeath,
-    "begin_with_loop":          BeginWithLoop,
-    "dlc_sotv":                 DLC_SOTV,
-    "death_link":               DeathLink,
-    "item_pickup_step":         ItemPickupStep,
-    "shrine_use_step":          ShrineUseStep,
-    "enable_lunar":             AllowLunarItems,
-    "item_weights":             ItemWeights,
-    "item_pool_presets":        ItemPoolPresetToggle,
-    **ror2_weights
-}
+@dataclass
+class ROR2Options(PerGameCommonOptions):
+    goal: Goal
+    victory: Victory
+    total_locations: TotalLocations
+    chests_per_stage: ChestsPerEnvironment
+    shrines_per_stage: ShrinesPerEnvironment
+    scavengers_per_stage: ScavengersPerEnvironment
+    scanner_per_stage: ScannersPerEnvironment
+    altars_per_stage: AltarsPerEnvironment
+    total_revivals: TotalRevivals
+    start_with_revive: StartWithRevive
+    final_stage_death: FinalStageDeath
+    dlc_sotv: DLC_SOTV
+    death_link: DeathLink
+    item_pickup_step: ItemPickupStep
+    shrine_use_step: ShrineUseStep
+    enable_trap: AllowTrapItems
+    enable_lunar: AllowLunarItems
+    item_weights: ItemWeights
+    item_pool_presets: ItemPoolPresetToggle
+    # define the weights of the generated item pool.
+    green_scrap: GreenScrap
+    red_scrap: RedScrap
+    yellow_scrap: YellowScrap
+    white_scrap: WhiteScrap
+    common_item: CommonItem
+    uncommon_item: UncommonItem
+    legendary_item: LegendaryItem
+    boss_item: BossItem
+    lunar_item: LunarItem
+    void_item: VoidItem
+    equipment: Equipment
+    money: Money
+    lunar_coin: LunarCoin
+    experience: Experience
+    mountain_trap: MountainTrap
+    time_warp_trap: TimeWarpTrap
+    combat_trap: CombatTrap
+    teleport_trap: TeleportTrap
diff --git a/worlds/ror2/Regions.py b/worlds/ror2/regions.py
similarity index 59%
rename from worlds/ror2/Regions.py
rename to worlds/ror2/regions.py
index 94f5aaf71e..13b229da92 100644
--- a/worlds/ror2/Regions.py
+++ b/worlds/ror2/regions.py
@@ -1,7 +1,10 @@
-from typing import Dict, List, NamedTuple, Optional
+from typing import Dict, List, NamedTuple, Optional, TYPE_CHECKING
 
-from BaseClasses import MultiWorld, Region, Entrance
-from .Locations import location_table, RiskOfRainLocation
+from BaseClasses import Region, Entrance, MultiWorld
+from .locations import location_table, RiskOfRainLocation, get_classic_item_pickups
+
+if TYPE_CHECKING:
+    from . import RiskOfRainWorld
 
 
 class RoRRegionData(NamedTuple):
@@ -9,10 +12,14 @@ class RoRRegionData(NamedTuple):
     region_exits: Optional[List[str]]
 
 
-def create_regions(multiworld: MultiWorld, player: int):
+def create_explore_regions(ror2_world: "RiskOfRainWorld") -> None:
+    player = ror2_world.player
+    ror2_options = ror2_world.options
+    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", "Distant Roost (2)",
+                                                                     "Titanic Plains", "Titanic Plains (2)"]),
         "Distant Roost":                        RoRRegionData([], ["OrderedStage_1"]),
         "Distant Roost (2)":                    RoRRegionData([], ["OrderedStage_1"]),
         "Titanic Plains":                       RoRRegionData([], ["OrderedStage_1"]),
@@ -34,33 +41,36 @@ def create_regions(multiworld: MultiWorld, player: int):
     }
     other_regions: Dict[str, RoRRegionData] = {
         "Commencement":                         RoRRegionData(None, ["Victory", "Petrichor V"]),
-        "OrderedStage_5":                       RoRRegionData(None, ["Hidden Realm: A Moment, Fractured", "Commencement"]),
+        "OrderedStage_5":                       RoRRegionData(None, ["Hidden Realm: A Moment, Fractured",
+                                                                     "Commencement"]),
         "OrderedStage_1":                       RoRRegionData(None, ["Hidden Realm: Bazaar Between Time",
-                                                "Hidden Realm: Gilded Coast", "Abandoned Aqueduct", "Wetland Aspect"]),
+                                                                     "Hidden Realm: Gilded Coast", "Abandoned Aqueduct",
+                                                                     "Wetland Aspect"]),
         "OrderedStage_2":                       RoRRegionData(None, ["Rallypoint Delta", "Scorched Acres"]),
-        "OrderedStage_3":                       RoRRegionData(None, ["Abyssal Depths", "Siren's Call", "Sundered Grove"]),
+        "OrderedStage_3":                       RoRRegionData(None, ["Abyssal Depths", "Siren's Call",
+                                                                     "Sundered Grove"]),
         "OrderedStage_4":                       RoRRegionData(None, ["Sky Meadow"]),
         "Hidden Realm: A Moment, Fractured":    RoRRegionData(None, ["Hidden Realm: A Moment, Whole"]),
-        "Hidden Realm: A Moment, Whole":        RoRRegionData(None, ["Victory"]),
+        "Hidden Realm: A Moment, Whole":        RoRRegionData(None, ["Victory", "Petrichor V"]),
         "Void Fields":                          RoRRegionData(None, []),
         "Victory":                              RoRRegionData(None, None),
-        "Petrichor V":                          RoRRegionData(None, ["Victory"]),
+        "Petrichor V":                          RoRRegionData(None, []),
         "Hidden Realm: Bulwark's Ambry":        RoRRegionData(None, None),
         "Hidden Realm: Bazaar Between Time":    RoRRegionData(None, ["Void Fields"]),
         "Hidden Realm: Gilded Coast":           RoRRegionData(None, None)
     }
     dlc_other_regions: Dict[str, RoRRegionData] = {
-        "The Planetarium":                      RoRRegionData(None, ["Victory"]),
+        "The Planetarium":                      RoRRegionData(None, ["Victory", "Petrichor V"]),
         "Void Locus":                           RoRRegionData(None, ["The Planetarium"])
     }
     # Totals of each item
-    chests = int(multiworld.chests_per_stage[player])
-    shrines = int(multiworld.shrines_per_stage[player])
-    scavengers = int(multiworld.scavengers_per_stage[player])
-    scanners = int(multiworld.scanner_per_stage[player])
-    newt = int(multiworld.altars_per_stage[player])
+    chests = int(ror2_options.chests_per_stage)
+    shrines = int(ror2_options.shrines_per_stage)
+    scavengers = int(ror2_options.scavengers_per_stage)
+    scanners = int(ror2_options.scanner_per_stage)
+    newt = int(ror2_options.altars_per_stage)
     all_location_regions = {**non_dlc_regions}
-    if multiworld.dlc_sotv[player]:
+    if ror2_options.dlc_sotv:
         all_location_regions = {**non_dlc_regions, **dlc_regions}
 
     # Locations
@@ -88,23 +98,35 @@ def create_regions(multiworld: MultiWorld, player: int):
     regions_pool: Dict = {**all_location_regions, **other_regions}
 
     # DLC Locations
-    if multiworld.dlc_sotv[player]:
+    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}
 
+    # 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)
+    elif ror2_options.victory == "voidling":
+        other_regions["Commencement"].region_exits.pop(0)
+        other_regions["Hidden Realm: A Moment, Whole"].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)
+
     # Create all the regions
     for name, data in regions_pool.items():
-        multiworld.regions.append(create_region(multiworld, player, name, data))
+        multiworld.regions.append(create_explore_region(multiworld, player, name, data))
 
     # Connect all the regions to their exits
     for name, data in regions_pool.items():
         create_connections_in_regions(multiworld, player, name, data)
 
 
-def create_region(multiworld: MultiWorld, player: int, name: str, data: RoRRegionData):
+def create_explore_region(multiworld: MultiWorld, player: int, name: str, data: RoRRegionData) -> Region:
     region = Region(name, player, multiworld)
     if data.locations:
         for location_name in data.locations:
@@ -115,7 +137,7 @@ def create_region(multiworld: MultiWorld, player: int, name: str, data: RoRRegio
     return region
 
 
-def create_connections_in_regions(multiworld: MultiWorld, player: int, name: str, data: RoRRegionData):
+def create_connections_in_regions(multiworld: MultiWorld, player: int, name: str, data: RoRRegionData) -> None:
     region = multiworld.get_region(name, player)
     if data.region_exits:
         for region_exit in data.region_exits:
@@ -123,3 +145,34 @@ def create_connections_in_regions(multiworld: MultiWorld, player: int, name: str
             exit_region = multiworld.get_region(region_exit, player)
             r_exit_stage.connect(exit_region)
             region.exits.append(r_exit_stage)
+
+
+def create_classic_regions(ror2_world: "RiskOfRainWorld") -> None:
+    player = ror2_world.player
+    ror2_options = ror2_world.options
+    multiworld = ror2_world.multiworld
+    menu = create_classic_region(multiworld, player, "Menu")
+    multiworld.regions.append(menu)
+    # By using a victory region, we can define it as being connected to by several regions
+    #   which can then determine the availability of the victory.
+    victory_region = create_classic_region(multiworld, player, "Victory")
+    multiworld.regions.append(victory_region)
+    petrichor = create_classic_region(multiworld, player, "Petrichor V",
+                                      get_classic_item_pickups(ror2_options.total_locations.value))
+    multiworld.regions.append(petrichor)
+
+    # classic mode can get to victory from the beginning of the game
+    to_victory = Entrance(player, "beating game", petrichor)
+    petrichor.exits.append(to_victory)
+    to_victory.connect(victory_region)
+
+    connection = Entrance(player, "Lobby", menu)
+    menu.exits.append(connection)
+    connection.connect(petrichor)
+
+
+def create_classic_region(multiworld: MultiWorld, player: int, name: str, locations: Dict[str, int] = {}) -> Region:
+    ret = Region(name, player, multiworld)
+    for location_name, location_id in locations.items():
+        ret.locations.append(RiskOfRainLocation(player, location_name, location_id, ret))
+    return ret
diff --git a/worlds/ror2/ror2environments.py b/worlds/ror2/ror2environments.py
new file mode 100644
index 0000000000..d821763ef4
--- /dev/null
+++ b/worlds/ror2/ror2environments.py
@@ -0,0 +1,118 @@
+from typing import Dict, List, TypeVar
+
+# TODO probably move to Locations
+
+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
+}
+environment_vanilla_orderedstage_2_table: Dict[str, int] = {
+    "Abandoned Aqueduct":                      17,  # goolake
+    "Wetland Aspect":                          12,  # foggyswamp
+}
+environment_vanilla_orderedstage_3_table: Dict[str, int] = {
+    "Rallypoint Delta":                        13,  # frozenwall
+    "Scorched Acres":                          47,  # wispgraveyard
+}
+environment_vanilla_orderedstage_4_table: Dict[str, int] = {
+    "Abyssal Depths":                          10,  # dampcavesimple
+    "Siren's Call":                            37,  # shipgraveyard
+    "Sundered Grove":                          35,  # rootjungle
+}
+environment_vanilla_orderedstage_5_table: Dict[str, int] = {
+    "Sky Meadow":                              38,  # skymeadow
+}
+
+environment_vanilla_hidden_realm_table: Dict[str, int] = {
+    "Hidden Realm: Bulwark's Ambry":            5,  # artifactworld
+    "Hidden Realm: Bazaar Between Time":        6,  # bazaar
+    "Hidden Realm: Gilded Coast":              14,  # goldshores
+    "Hidden Realm: A Moment, Whole":           27,  # limbo
+    "Hidden Realm: A Moment, Fractured":       33,  # mysteryspace
+}
+
+environment_vanilla_special_table: Dict[str, int] = {
+    "Void Fields":                              4,  # arena
+    "Commencement":                            32,  # moon2
+}
+
+environment_sotv_orderedstage_1_table: Dict[str, int] = {
+    "Siphoned Forest":                         39,  # snowyforest
+}
+environment_sotv_orderedstage_2_table: Dict[str, int] = {
+    "Aphelian Sanctuary":                       3,  # ancientloft
+}
+environment_sotv_orderedstage_3_table: Dict[str, int] = {
+    "Sulfur Pools":                            41,  # sulfurpools
+}
+
+environment_sotv_special_table: Dict[str, int] = {
+    "Void Locus":                              46,  # voidstage
+    "The Planetarium":                         45,  # voidraid
+}
+
+X = TypeVar("X")
+Y = TypeVar("Y")
+
+
+def compress_dict_list_horizontal(list_of_dict: List[Dict[X, Y]]) -> Dict[X, Y]:
+    """Combine all dictionaries in a list together into one dictionary."""
+    compressed: Dict[X, Y] = {}
+    for individual in list_of_dict:
+        compressed.update(individual)
+    return compressed
+
+
+def collapse_dict_list_vertical(list_of_dict_1: List[Dict[X, Y]], *args: List[Dict[X, Y]]) -> List[Dict[X, Y]]:
+    """Combine all parallel dictionaries in lists together to make a new list of dictionaries of the same length."""
+    # find the length of the longest list
+    length = len(list_of_dict_1)
+    for list_of_dict_n in args:
+        length = max(length, len(list_of_dict_n))
+
+    # create a combined list with a length the same as the longest list
+    collapsed: List[Dict[X, Y]] = [{}] * length
+    # The reason the list_of_dict_1 is not directly used to make collapsed is
+    #   side effects can occur if all the dictionaries are not manually unioned.
+
+    # merge contents from list_of_dict_1
+    for i in range(len(list_of_dict_1)):
+        collapsed[i] = {**collapsed[i], **list_of_dict_1[i]}
+
+    # merge contents of remaining lists_of_dicts
+    for list_of_dict_n in args:
+        for i in range(len(list_of_dict_n)):
+            collapsed[i] = {**collapsed[i], **list_of_dict_n[i]}
+
+    return collapsed
+
+
+# TODO potentially these should only be created when they are directly referenced
+#  (unsure of the space/time cost of creating these initially)
+
+environment_vanilla_orderedstages_table = \
+    [environment_vanilla_orderedstage_1_table, environment_vanilla_orderedstage_2_table,
+     environment_vanilla_orderedstage_3_table, environment_vanilla_orderedstage_4_table,
+     environment_vanilla_orderedstage_5_table]
+environment_vanilla_table = \
+    {**compress_dict_list_horizontal(environment_vanilla_orderedstages_table),
+     **environment_vanilla_hidden_realm_table, **environment_vanilla_special_table}
+
+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}
+
+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}
+
+
+def shift_by_offset(dictionary: Dict[str, int], offset: int) -> Dict[str, int]:
+    """Shift all indexes in a dictionary by an offset"""
+    return {name: index+offset for name, index in dictionary.items()}
diff --git a/worlds/ror2/Rules.py b/worlds/ror2/rules.py
similarity index 60%
rename from worlds/ror2/Rules.py
rename to worlds/ror2/rules.py
index 7d94177417..442e6c0002 100644
--- a/worlds/ror2/Rules.py
+++ b/worlds/ror2/rules.py
@@ -1,62 +1,71 @@
-from BaseClasses import MultiWorld, CollectionState
 from worlds.generic.Rules import set_rule, add_rule
-from .Locations import orderedstage_location
-from .RoR2Environments import environment_vanilla_orderedstages_table, environment_sotv_orderedstages_table, \
-    environment_orderedstages_table
+from BaseClasses import MultiWorld
+from .locations import get_locations
+from .ror2environments import environment_vanilla_orderedstages_table, environment_sotv_orderedstages_table
+from typing import Set, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from . import RiskOfRainWorld
 
 
 # Rule to see if it has access to the previous stage
-def has_entrance_access_rule(multiworld: MultiWorld, stage: str, entrance: str, player: int):
+def has_entrance_access_rule(multiworld: MultiWorld, stage: str, entrance: str, player: int) -> None:
     multiworld.get_entrance(entrance, player).access_rule = \
         lambda state: state.has(entrance, player) and state.has(stage, player)
 
 
+def has_all_items(multiworld: MultiWorld, items: Set[str], entrance: str, player: int) -> None:
+    multiworld.get_entrance(entrance, player).access_rule = \
+        lambda state: state.has_all(items, player) and state.has(entrance, player)
+
+
 # Checks to see if chest/shrine are accessible
-def has_location_access_rule(multiworld: MultiWorld, environment: str, player: int, item_number: int, item_type: str):
+def has_location_access_rule(multiworld: MultiWorld, environment: str, player: int, item_number: int, item_type: str)\
+        -> None:
     if item_number == 1:
         multiworld.get_location(f"{environment}: {item_type} {item_number}", player).access_rule = \
             lambda state: state.has(environment, player)
+        #  scavengers need to be locked till after a full loop since that is when they are capable of spawning.
+        # (While technically the requirement is just beating 5 stages, this will ensure that the player will have
+        #  a long enough run to have enough director credits for scavengers and
+        #  help prevent being stuck in the same stages until that point).
         if item_type == "Scavenger":
             multiworld.get_location(f"{environment}: {item_type} {item_number}", player).access_rule = \
-                lambda state: state.has(environment, player) and state.has("Stage_4", player)
+                lambda state: state.has(environment, player) and state.has("Stage 5", player)
     else:
         multiworld.get_location(f"{environment}: {item_type} {item_number}", player).access_rule = \
             lambda state: check_location(state, environment, player, item_number, item_type)
 
 
-def check_location(state, environment: str, player: int, item_number: int, item_name: str):
+def check_location(state, environment: str, player: int, item_number: int, item_name: str) -> bool:
     return state.can_reach(f"{environment}: {item_name} {item_number - 1}", "Location", player)
 
 
 # unlock event to next set of stages
-def get_stage_event(multiworld: MultiWorld, player: int, stage_number: int):
-    if not multiworld.dlc_sotv[player]:
-        environment_name = multiworld.random.choices(list(environment_vanilla_orderedstages_table[stage_number].keys()),
-                                                     k=1)
-    else:
-        environment_name = multiworld.random.choices(list(environment_orderedstages_table[stage_number].keys()), k=1)
-    multiworld.get_location(f"Stage_{stage_number + 1}", player).access_rule = \
-        lambda state: get_one_of_the_stages(state, environment_name[0], player)
+def get_stage_event(multiworld: MultiWorld, player: int, stage_number: int) -> None:
+    if stage_number == 4:
+        return
+    multiworld.get_entrance(f"OrderedStage_{stage_number + 1}", player).access_rule = \
+        lambda state: state.has(f"Stage {stage_number + 1}", player)
 
 
-def get_one_of_the_stages(state: CollectionState, stage: str, player: int):
-    return state.has(stage, player)
-
-
-def set_rules(multiworld: MultiWorld, player: int) -> None:
-    if multiworld.goal[player] == "classic":
+def set_rules(ror2_world: "RiskOfRainWorld") -> None:
+    player = ror2_world.player
+    multiworld = ror2_world.multiworld
+    ror2_options = ror2_world.options
+    if ror2_options.goal == "classic":
         # classic mode
-        total_locations = multiworld.total_locations[player].value  # total locations for current player
+        total_locations = ror2_options.total_locations.value  # total locations for current player
     else:
         # explore mode
         total_locations = len(
-            orderedstage_location.get_locations(
-                chests=multiworld.chests_per_stage[player].value,
-                shrines=multiworld.shrines_per_stage[player].value,
-                scavengers=multiworld.scavengers_per_stage[player].value,
-                scanners=multiworld.scanner_per_stage[player].value,
-                altars=multiworld.altars_per_stage[player].value,
-                dlc_sotv=multiworld.dlc_sotv[player].value
+            get_locations(
+                chests=ror2_options.chests_per_stage.value,
+                shrines=ror2_options.shrines_per_stage.value,
+                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)
             )
         )
 
@@ -64,14 +73,15 @@ def set_rules(multiworld: MultiWorld, player: int) -> None:
     divisions = total_locations // event_location_step
     total_revivals = multiworld.worlds[player].total_revivals  # pulling this info we calculated in generate_basic
 
-    if multiworld.goal[player] == "classic":
+    if ror2_options.goal == "classic":
         # classic mode
         if divisions:
             for i in range(1, divisions + 1):  # since divisions is the floor of total_locations / 25
                 if i * event_location_step != total_locations:
                     event_loc = multiworld.get_location(f"Pickup{i * event_location_step}", player)
                     set_rule(event_loc,
-                            lambda state, i=i: state.can_reach(f"ItemPickup{i * event_location_step - 1}", "Location", player))
+                             lambda state, i=i: state.can_reach(f"ItemPickup{i * event_location_step - 1}",
+                                                                "Location", player))
                     # we want to create a rule for each of the 25 locations per division
                 for n in range(i * event_location_step, (i + 1) * event_location_step + 1):
                     if n > total_locations:
@@ -84,28 +94,18 @@ def set_rules(multiworld: MultiWorld, player: int) -> None:
                                  lambda state, n=n: state.can_reach(f"ItemPickup{n - 1}", "Location", player))
         set_rule(multiworld.get_location("Victory", player),
                  lambda state: state.can_reach(f"ItemPickup{total_locations}", "Location", player))
-        if total_revivals or multiworld.start_with_revive[player].value:
+        if total_revivals or ror2_options.start_with_revive.value:
             add_rule(multiworld.get_location("Victory", player),
                      lambda state: state.has("Dio's Best Friend", player,
-                                             total_revivals + multiworld.start_with_revive[player]))
+                                             total_revivals + ror2_options.start_with_revive))
 
-    elif multiworld.goal[player] == "explore":
-        # When explore_mode is used,
-        #   scavengers need to be locked till after a full loop since that is when they are capable of spawning.
-        # (While technically the requirement is just beating 5 stages, this will ensure that the player will have
-        #   a long enough run to have enough director credits for scavengers and
-        #   help prevent being stuck in the same stages until that point.)
-
-        for location in multiworld.get_locations():
-            if location.player != player: continue  # ignore all checks that don't belong to this player
-            if "Scavenger" in location.name:
-                add_rule(location, lambda state: state.has("Stage_5", player))
-        # Regions
-        chests = multiworld.chests_per_stage[player]
-        shrines = multiworld.shrines_per_stage[player]
-        newts = multiworld.altars_per_stage[player]
-        scavengers = multiworld.scavengers_per_stage[player]
-        scanners = multiworld.scanner_per_stage[player]
+    else:
+        # explore mode
+        chests = ror2_options.chests_per_stage.value
+        shrines = ror2_options.shrines_per_stage.value
+        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
@@ -121,10 +121,10 @@ def set_rules(multiworld: MultiWorld, player: int) -> None:
                     for newt in range(1, newts + 1):
                         has_location_access_rule(multiworld, environment_name, player, newt, "Newt Altar")
                 if i > 0:
-                    has_entrance_access_rule(multiworld, f"Stage_{i}", environment_name, player)
+                    has_entrance_access_rule(multiworld, f"Stage {i}", environment_name, player)
             get_stage_event(multiworld, player, i)
 
-        if multiworld.dlc_sotv[player]:
+        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
@@ -140,16 +140,19 @@ def set_rules(multiworld: MultiWorld, player: int) -> None:
                         for newt in range(1, newts + 1):
                             has_location_access_rule(multiworld, environment_name, player, newt, "Newt Altar")
                     if i > 0:
-                        has_entrance_access_rule(multiworld, f"Stage_{i}", environment_name, player)
-        has_entrance_access_rule(multiworld, f"Hidden Realm: A Moment, Fractured", "Hidden Realm: A Moment, Whole",
+                        has_entrance_access_rule(multiworld, f"Stage {i}", environment_name, player)
+        has_entrance_access_rule(multiworld, "Hidden Realm: A Moment, Fractured", "Hidden Realm: A Moment, Whole",
                                  player)
-        has_entrance_access_rule(multiworld, f"Stage_1", "Hidden Realm: Bazaar Between Time", player)
-        has_entrance_access_rule(multiworld, f"Hidden Realm: Bazaar Between Time", "Void Fields", player)
-        has_entrance_access_rule(multiworld, f"Stage_5", "Commencement", player)
-        has_entrance_access_rule(multiworld, f"Stage_5", "Hidden Realm: A Moment, Fractured", player)
+        has_entrance_access_rule(multiworld, "Stage 1", "Hidden Realm: Bazaar Between Time", player)
+        has_entrance_access_rule(multiworld, "Hidden Realm: Bazaar Between Time", "Void Fields", player)
+        has_entrance_access_rule(multiworld, "Stage 5", "Commencement", player)
+        has_entrance_access_rule(multiworld, "Stage 5", "Hidden Realm: A Moment, Fractured", player)
         has_entrance_access_rule(multiworld, "Beads of Fealty", "Hidden Realm: A Moment, Whole", player)
-        if multiworld.dlc_sotv[player]:
-            has_entrance_access_rule(multiworld, f"Stage_5", "Void Locus", player)
-            has_entrance_access_rule(multiworld, f"Void Locus", "The Planetarium", player)
+        if ror2_options.dlc_sotv:
+            has_entrance_access_rule(multiworld, "Stage 5", "The Planetarium", player)
+            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)
+
     # Win Condition
     multiworld.completion_condition[player] = lambda state: state.has("Victory", player)
diff --git a/worlds/ror2/test/__init__.py b/worlds/ror2/test/__init__.py
new file mode 100644
index 0000000000..87d8183ab8
--- /dev/null
+++ b/worlds/ror2/test/__init__.py
@@ -0,0 +1,5 @@
+from test.bases import WorldTestBase
+
+
+class RoR2TestBase(WorldTestBase):
+    game = "Risk of Rain 2"
diff --git a/worlds/ror2/test/test_any_goal.py b/worlds/ror2/test/test_any_goal.py
new file mode 100644
index 0000000000..18d4994419
--- /dev/null
+++ b/worlds/ror2/test/test_any_goal.py
@@ -0,0 +1,26 @@
+from . import RoR2TestBase
+
+
+class DLCTest(RoR2TestBase):
+    options = {
+        "dlc_sotv": "true",
+        "victory": "any"
+    }
+
+    def test_commencement_victory(self) -> None:
+        self.collect_all_but(["Commencement", "The Planetarium", "Hidden Realm: A Moment, Whole", "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.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.assertBeatable(False)
+        self.collect_by_name("Hidden Realm: A Moment, Whole")
+        self.assertBeatable(True)
diff --git a/worlds/ror2/test/test_classic.py b/worlds/ror2/test/test_classic.py
new file mode 100644
index 0000000000..90ed2302b2
--- /dev/null
+++ b/worlds/ror2/test/test_classic.py
@@ -0,0 +1,7 @@
+from . import RoR2TestBase
+
+
+class ClassicTest(RoR2TestBase):
+    options = {
+        "goal": "classic",
+    }
diff --git a/worlds/ror2/test/test_limbo_goal.py b/worlds/ror2/test/test_limbo_goal.py
new file mode 100644
index 0000000000..f8757a9176
--- /dev/null
+++ b/worlds/ror2/test/test_limbo_goal.py
@@ -0,0 +1,15 @@
+from . import RoR2TestBase
+
+
+class LimboGoalTest(RoR2TestBase):
+    options = {
+        "victory": "limbo"
+    }
+
+    def test_limbo(self) -> None:
+        self.collect_all_but(["Hidden Realm: A Moment, Whole", "Victory"])
+        self.assertFalse(self.can_reach_entrance("Hidden Realm: A Moment, Whole"))
+        self.assertBeatable(False)
+        self.collect_by_name("Hidden Realm: A Moment, Whole")
+        self.assertTrue(self.can_reach_entrance("Hidden Realm: A Moment, Whole"))
+        self.assertBeatable(True)
diff --git a/worlds/ror2/test/test_mithrix_goal.py b/worlds/ror2/test/test_mithrix_goal.py
new file mode 100644
index 0000000000..7ed9a2cd73
--- /dev/null
+++ b/worlds/ror2/test/test_mithrix_goal.py
@@ -0,0 +1,25 @@
+from . import RoR2TestBase
+
+
+class MithrixGoalTest(RoR2TestBase):
+    options = {
+        "victory": "mithrix"
+    }
+
+    def test_mithrix(self) -> None:
+        self.collect_all_but(["Commencement", "Victory"])
+        self.assertFalse(self.can_reach_entrance("Commencement"))
+        self.assertBeatable(False)
+        self.collect_by_name("Commencement")
+        self.assertTrue(self.can_reach_entrance("Commencement"))
+        self.assertBeatable(True)
+
+    def test_stage5(self) -> None:
+        self.collect_all_but(["Stage 4", "Sky Meadow", "Victory"])
+        self.assertFalse(self.can_reach_entrance("Sky Meadow"))
+        self.assertBeatable(False)
+        self.collect_by_name("Sky Meadow")
+        self.assertFalse(self.can_reach_entrance("Sky Meadow"))
+        self.collect_by_name("Stage 4")
+        self.assertTrue(self.can_reach_entrance("Sky Meadow"))
+        self.assertBeatable(True)
diff --git a/worlds/ror2/test/test_voidling_goal.py b/worlds/ror2/test/test_voidling_goal.py
new file mode 100644
index 0000000000..a7520a5c5f
--- /dev/null
+++ b/worlds/ror2/test/test_voidling_goal.py
@@ -0,0 +1,28 @@
+from . import RoR2TestBase
+
+
+class VoidlingGoalTest(RoR2TestBase):
+    options = {
+        "dlc_sotv": "true",
+        "victory": "voidling"
+    }
+
+    def test_planetarium(self) -> None:
+        self.collect_all_but(["The Planetarium", "Victory"])
+        self.assertFalse(self.can_reach_entrance("The Planetarium"))
+        self.assertBeatable(False)
+        self.collect_by_name("The Planetarium")
+        self.assertTrue(self.can_reach_entrance("The Planetarium"))
+        self.assertBeatable(True)
+
+    def test_void_locus_to_victory(self) -> None:
+        self.collect_all_but(["Void Locus", "Commencement"])
+        self.assertFalse(self.can_reach_location("Victory"))
+        self.collect_by_name("Void Locus")
+        self.assertTrue(self.can_reach_entrance("Victory"))
+
+    def test_commencement_to_victory(self) -> None:
+        self.collect_all_but(["Void Locus", "Commencement"])
+        self.assertFalse(self.can_reach_location("Victory"))
+        self.collect_by_name("Commencement")
+        self.assertTrue(self.can_reach_location("Victory"))
diff --git a/worlds/sa2b/AestheticData.py b/worlds/sa2b/AestheticData.py
new file mode 100644
index 0000000000..077f35fc01
--- /dev/null
+++ b/worlds/sa2b/AestheticData.py
@@ -0,0 +1,346 @@
+
+chao_name_conversion = {
+	"!": 0x01,
+	"!": 0x02,
+	"#": 0x03,
+	"$": 0x04,
+	"%": 0x05,
+	"&": 0x06,
+	"\\": 0x07,
+	"(": 0x08,
+	")": 0x09,
+	"*": 0x0A,
+	"+": 0x0B,
+	",": 0x0C,
+	"-": 0x0D,
+	".": 0x0E,
+	"/": 0x0F,
+
+	"0": 0x10,
+	"1": 0x11,
+	"2": 0x12,
+	"3": 0x13,
+	"4": 0x14,
+	"5": 0x15,
+	"6": 0x16,
+	"7": 0x17,
+	"8": 0x18,
+	"9": 0x19,
+	":": 0x1A,
+	";": 0x1B,
+	"<": 0x1C,
+	"=": 0x1D,
+	">": 0x1E,
+	"?": 0x1F,
+
+	"@": 0x20,
+	"A": 0x21,
+	"B": 0x22,
+	"C": 0x23,
+	"D": 0x24,
+	"E": 0x25,
+	"F": 0x26,
+	"G": 0x27,
+	"H": 0x28,
+	"I": 0x29,
+	"J": 0x2A,
+	"K": 0x2B,
+	"L": 0x2C,
+	"M": 0x2D,
+	"N": 0x2E,
+	"O": 0x2F,
+
+	"P": 0x30,
+	"Q": 0x31,
+	"R": 0x32,
+	"S": 0x33,
+	"T": 0x34,
+	"U": 0x35,
+	"V": 0x36,
+	"W": 0x37,
+	"X": 0x38,
+	"Y": 0x39,
+	"Z": 0x3A,
+	"[": 0x3B,
+	"¥": 0x3C,
+	"]": 0x3D,
+	"^": 0x3E,
+	"_": 0x3F,
+
+	"`": 0x40,
+	"a": 0x41,
+	"b": 0x42,
+	"c": 0x43,
+	"d": 0x44,
+	"e": 0x45,
+	"f": 0x46,
+	"g": 0x47,
+	"h": 0x48,
+	"i": 0x49,
+	"j": 0x4A,
+	"k": 0x4B,
+	"l": 0x4C,
+	"m": 0x4D,
+	"n": 0x4E,
+	"o": 0x4F,
+
+	"p": 0x50,
+	"q": 0x51,
+	"r": 0x52,
+	"s": 0x53,
+	"t": 0x54,
+	"u": 0x55,
+	"v": 0x56,
+	"w": 0x57,
+	"x": 0x58,
+	"y": 0x59,
+	"z": 0x5A,
+	"{": 0x5B,
+	"|": 0x5C,
+	"}": 0x5D,
+	"~": 0x5E,
+	" ": 0x5F,
+}
+
+sample_chao_names = [
+	"Aginah",
+	"Biter",
+	"Steve",
+	"Ryley",
+	"Watcher",
+	"Acrid",
+	"Sheik",
+	"Lunais",
+	"Samus",
+	"The Kid",
+	"Jack",
+	"Sir Lee",
+	"Viridian",
+	"Rouhi",
+	"Toad",
+	"Merit",
+	"Ridley",
+	"Hornet",
+	"Carl",
+	"Raynor",
+	"Dixie",
+	"Wolnir",
+	"Mario",
+	"Gary",
+	"Wayne",
+	"Kevin",
+	"J.J.",
+	"Maxim",
+	"Redento",
+	"Caesar",
+	"Abigail",
+	"Link",
+	"Ninja",
+	"Roxas",
+	"Marin",
+	"Yorgle",
+	"DLC",
+	"Mina",
+	"Sans",
+	"Lan",
+	"Rin",
+	"Doomguy",
+	"Guide",
+	"May",
+	"Hubert",
+	"Corvus",
+	"Nigel",
+]
+
+totally_real_item_names = [
+	"Mallet",
+	"Lava Rod",
+	"Master Knife",
+	"Slippers",
+	"Spade",
+
+	"Progressive Car Upgrade",
+	"Bonus Token",
+
+	"Shortnail",
+	"Runmaster",
+
+	"Courage Form",
+	"Auto Courage",
+	"Donald Defender",
+	"Goofy Blizzard",
+	"Ultimate Weapon",
+
+	"Song of the Sky Whale",
+	"Gryphon Shoes",
+	"Wing Key",
+	"Strength Anklet",
+
+	"Hairclip",
+
+	"Key of Wisdom",
+
+	"Baking",
+	"Progressive Block Mining",
+
+	"Jar",
+	"Whistle of Space",
+	"Rito Tunic",
+
+	"Kitchen Sink",
+
+	"Rock Badge",
+	"Key Card",
+	"Pikachu",
+	"Eevee",
+	"HM02 Strength",
+
+	"Progressive Astromancers",
+	"Progressive Chefs",
+	"The Living Safe",
+	"Lady Quinn",
+
+	"Dio's Worst Enemy",
+
+	"Pink Chaos Emerald",
+	"Black Chaos Emerald",
+	"Tails - Large Cannon",
+	"Eggman - Bazooka",
+	"Eggman - Booster",
+	"Knuckles - Shades",
+	"Sonic - Magic Shoes",
+	"Shadow - Bounce Bracelet",
+	"Rouge - Air Necklace",
+	"Big Key (Eggman's Pyramid)",
+
+	"Sensor Bunker",
+	"Phantom",
+	"Soldier",
+
+	"Plasma Suit",
+	"Gravity Beam",
+	"Hi-Jump Ball",
+
+	"Cannon Unlock LLL",
+	"Feather Cap",
+
+	"Progressive Yoshi",
+	"Purple Switch Palace",
+	"Cape Feather",
+
+	"Cane of Bryan",
+
+	"Van Repair",
+	"Autumn",
+	"Galaxy Knife",
+	"Green Cabbage Seeds",
+
+	"Timespinner Cog 1",
+
+	"Ladder",
+
+	"Visible Dots",
+]
+
+all_exits = [
+	0x00,  # Lobby to Neutral
+	0x01,  # Lobby to Hero
+	0x02,  # Lobby to Dark
+	0x03,  # Lobby to Kindergarten
+	0x04,  # Neutral to Lobby
+	0x05,  # Neutral to Cave
+	0x06,  # Neutral to Transporter
+	0x07,  # Hero to Lobby
+	0x08,  # Hero to Transporter
+	0x09,  # Dark to Lobby
+	0x0A,  # Dark to Transporter
+	0x0B,  # Cave to Neutral
+	0x0C,  # Cave to Race
+	0x0D,  # Cave to Karate
+	0x0E,  # Race to Cave
+	0x0F,  # Karate to Cave
+	0x10,  # Transporter to Neutral
+	#0x11,  # Transporter to Hero
+	#0x12,  # Transporter to Dark
+	0x13,  # Kindergarten to Lobby
+]
+
+all_destinations = [
+	0x07,  # Lobby
+	0x07,
+	0x07,
+	0x07,
+	0x01,  # Neutral
+	0x01,
+	0x01,
+	0x02,  # Hero
+	0x02,
+	0x03,  # Dark
+	0x03,
+	0x09,  # Cave
+	0x09,
+	0x09,
+	0x05,  # Chao Race
+	0x0A,  # Chao Karate
+	0x0C,  # Transporter
+	#0x0C,
+	#0x0C,
+	0x06,  # Kindergarten
+]
+
+multi_rooms = [
+	0x07,
+	0x01,
+	0x02,
+	0x03,
+	0x09,
+]
+
+single_rooms = [
+	0x05,
+	0x0A,
+	0x0C,
+	0x06,
+]
+
+room_to_exits_map = {
+	0x07: [0x00, 0x01, 0x02, 0x03],
+	0x01: [0x04, 0x05, 0x06],
+	0x02: [0x07, 0x08],
+	0x03: [0x09, 0x0A],
+	0x09: [0x0B, 0x0C, 0x0D],
+	0x05: [0x0E],
+	0x0A: [0x0F],
+	0x0C: [0x10],#, 0x11, 0x12],
+	0x06: [0x13],
+}
+
+exit_to_room_map = {
+	0x00: 0x07,  # Lobby to Neutral
+	0x01: 0x07,  # Lobby to Hero
+	0x02: 0x07,  # Lobby to Dark
+	0x03: 0x07,  # Lobby to Kindergarten
+	0x04: 0x01,  # Neutral to Lobby
+	0x05: 0x01,  # Neutral to Cave
+	0x06: 0x01,  # Neutral to Transporter
+	0x07: 0x02,  # Hero to Lobby
+	0x08: 0x02,  # Hero to Transporter
+	0x09: 0x03,  # Dark to Lobby
+	0x0A: 0x03,  # Dark to Transporter
+	0x0B: 0x09,  # Cave to Neutral
+	0x0C: 0x09,  # Cave to Race
+	0x0D: 0x09,  # Cave to Karate
+	0x0E: 0x05,  # Race to Cave
+	0x0F: 0x0A,  # Karate to Cave
+	0x10: 0x0C,  # Transporter to Neutral
+	#0x11: 0x0C,  # Transporter to Hero
+	#0x12: 0x0C,  # Transporter to Dark
+	0x13: 0x06,  # Kindergarten to Lobby
+}
+
+valid_kindergarten_exits = [
+	0x04,  # Neutral to Lobby
+	0x05,  # Neutral to Cave
+	0x07,  # Hero to Lobby
+	0x09,  # Dark to Lobby
+]
diff --git a/worlds/sa2b/GateBosses.py b/worlds/sa2b/GateBosses.py
index e89d4c4557..76dd71fa3c 100644
--- a/worlds/sa2b/GateBosses.py
+++ b/worlds/sa2b/GateBosses.py
@@ -1,4 +1,6 @@
 import typing
+from BaseClasses import MultiWorld
+from worlds.AutoWorld import World
 
 speed_characters_1 = "Sonic vs Shadow 1"
 speed_characters_2 = "Sonic vs Shadow 2"
@@ -59,17 +61,17 @@ def boss_has_requirement(boss: int):
     return boss >= len(gate_bosses_no_requirements_table)
 
 
-def get_gate_bosses(world, player: int):
+def get_gate_bosses(multiworld: MultiWorld, world: World):
     selected_bosses: typing.List[int] = []
     boss_gates: typing.List[int] = []
     available_bosses: typing.List[str] = list(gate_bosses_no_requirements_table.keys())
-    world.random.shuffle(available_bosses)
+    multiworld.random.shuffle(available_bosses)
     halfway = False
 
-    for x in range(world.number_of_level_gates[player]):
-        if (not halfway) and ((x + 1) / world.number_of_level_gates[player]) > 0.5:
+    for x in range(world.options.number_of_level_gates):
+        if (not halfway) and ((x + 1) / world.options.number_of_level_gates) > 0.5:
             available_bosses.extend(gate_bosses_with_requirements_table)
-            world.random.shuffle(available_bosses)
+            multiworld.random.shuffle(available_bosses)
             halfway = True
         selected_bosses.append(all_gate_bosses_table[available_bosses[0]])
         boss_gates.append(x + 1)
@@ -80,27 +82,27 @@ def get_gate_bosses(world, player: int):
     return bosses
 
 
-def get_boss_rush_bosses(multiworld, player: int):
+def get_boss_rush_bosses(multiworld: MultiWorld, world: World):
 
-    if multiworld.boss_rush_shuffle[player] == 0:
+    if world.options.boss_rush_shuffle == 0:
         boss_list_o = list(range(0, 16))
         boss_list_s = [5, 2, 0, 10, 8, 4, 3, 1, 6, 13, 7, 11, 9, 15, 14, 12]
 
         return dict(zip(boss_list_o, boss_list_s))
-    elif multiworld.boss_rush_shuffle[player] == 1:
+    elif world.options.boss_rush_shuffle == 1:
         boss_list_o = list(range(0, 16))
         boss_list_s = boss_list_o.copy()
         multiworld.random.shuffle(boss_list_s)
 
         return dict(zip(boss_list_o, boss_list_s))
-    elif multiworld.boss_rush_shuffle[player] == 2:
+    elif world.options.boss_rush_shuffle == 2:
         boss_list_o = list(range(0, 16))
         boss_list_s = [multiworld.random.choice(boss_list_o) for i in range(0, 16)]
         if 10 not in boss_list_s:
             boss_list_s[multiworld.random.randint(0, 15)] = 10
 
         return dict(zip(boss_list_o, boss_list_s))
-    elif multiworld.boss_rush_shuffle[player] == 3:
+    elif world.options.boss_rush_shuffle == 3:
         boss_list_o = list(range(0, 16))
         boss_list_s = [multiworld.random.choice(boss_list_o)] * len(boss_list_o)
         if 10 not in boss_list_s:
diff --git a/worlds/sa2b/Items.py b/worlds/sa2b/Items.py
index 2b862c66af..318a57f753 100644
--- a/worlds/sa2b/Items.py
+++ b/worlds/sa2b/Items.py
@@ -22,7 +22,8 @@ class SA2BItem(Item):
 
 # Separate tables for each type of item.
 emblems_table = {
-    ItemName.emblem:  ItemData(0xFF0000, True),
+    ItemName.emblem:       ItemData(0xFF0000, True),
+    ItemName.market_token: ItemData(0xFF001F, True),
 }
 
 upgrades_table = {
@@ -82,6 +83,7 @@ trap_table = {
     ItemName.ice_trap:        ItemData(0xFF0037, False, True),
     ItemName.slow_trap:       ItemData(0xFF0038, False, True),
     ItemName.cutscene_trap:   ItemData(0xFF0039, False, True),
+    ItemName.reverse_trap:    ItemData(0xFF003A, False, True),
 
     ItemName.pong_trap:       ItemData(0xFF0050, False, True),
 }
@@ -96,6 +98,142 @@ emeralds_table = {
     ItemName.blue_emerald:   ItemData(0xFF0046, True),
 }
 
+eggs_table = {
+    ItemName.normal_egg:              ItemData(0xFF0100, False),
+    ItemName.yellow_monotone_egg:     ItemData(0xFF0101, False),
+    ItemName.white_monotone_egg:      ItemData(0xFF0102, False),
+    ItemName.brown_monotone_egg:      ItemData(0xFF0103, False),
+    ItemName.sky_blue_monotone_egg:   ItemData(0xFF0104, False),
+    ItemName.pink_monotone_egg:       ItemData(0xFF0105, False),
+    ItemName.blue_monotone_egg:       ItemData(0xFF0106, False),
+    ItemName.grey_monotone_egg:       ItemData(0xFF0107, False),
+    ItemName.green_monotone_egg:      ItemData(0xFF0108, False),
+    ItemName.red_monotone_egg:        ItemData(0xFF0109, False),
+    ItemName.lime_green_monotone_egg: ItemData(0xFF010A, False),
+    ItemName.purple_monotone_egg:     ItemData(0xFF010B, False),
+    ItemName.orange_monotone_egg:     ItemData(0xFF010C, False),
+    ItemName.black_monotone_egg:      ItemData(0xFF010D, False),
+
+    ItemName.yellow_twotone_egg:     ItemData(0xFF010E, False),
+    ItemName.white_twotone_egg:      ItemData(0xFF010F, False),
+    ItemName.brown_twotone_egg:      ItemData(0xFF0110, False),
+    ItemName.sky_blue_twotone_egg:   ItemData(0xFF0111, False),
+    ItemName.pink_twotone_egg:       ItemData(0xFF0112, False),
+    ItemName.blue_twotone_egg:       ItemData(0xFF0113, False),
+    ItemName.grey_twotone_egg:       ItemData(0xFF0114, False),
+    ItemName.green_twotone_egg:      ItemData(0xFF0115, False),
+    ItemName.red_twotone_egg:        ItemData(0xFF0116, False),
+    ItemName.lime_green_twotone_egg: ItemData(0xFF0117, False),
+    ItemName.purple_twotone_egg:     ItemData(0xFF0118, False),
+    ItemName.orange_twotone_egg:     ItemData(0xFF0119, False),
+    ItemName.black_twotone_egg:      ItemData(0xFF011A, False),
+
+    ItemName.normal_shiny_egg:     ItemData(0xFF011B, False),
+    ItemName.yellow_shiny_egg:     ItemData(0xFF011C, False),
+    ItemName.white_shiny_egg:      ItemData(0xFF011D, False),
+    ItemName.brown_shiny_egg:      ItemData(0xFF011E, False),
+    ItemName.sky_blue_shiny_egg:   ItemData(0xFF011F, False),
+    ItemName.pink_shiny_egg:       ItemData(0xFF0120, False),
+    ItemName.blue_shiny_egg:       ItemData(0xFF0121, False),
+    ItemName.grey_shiny_egg:       ItemData(0xFF0122, False),
+    ItemName.green_shiny_egg:      ItemData(0xFF0123, False),
+    ItemName.red_shiny_egg:        ItemData(0xFF0124, False),
+    ItemName.lime_green_shiny_egg: ItemData(0xFF0125, False),
+    ItemName.purple_shiny_egg:     ItemData(0xFF0126, False),
+    ItemName.orange_shiny_egg:     ItemData(0xFF0127, False),
+    ItemName.black_shiny_egg:      ItemData(0xFF0128, False),
+}
+
+fruits_table = {
+    ItemName.chao_garden_fruit: ItemData(0xFF0200, False),
+    ItemName.hero_garden_fruit: ItemData(0xFF0201, False),
+    ItemName.dark_garden_fruit: ItemData(0xFF0202, False),
+
+    ItemName.strong_fruit:   ItemData(0xFF0203, False),
+    ItemName.tasty_fruit:    ItemData(0xFF0204, False),
+    ItemName.hero_fruit:     ItemData(0xFF0205, False),
+    ItemName.dark_fruit:     ItemData(0xFF0206, False),
+    ItemName.round_fruit:    ItemData(0xFF0207, False),
+    ItemName.triangle_fruit: ItemData(0xFF0208, False),
+    ItemName.square_fruit:   ItemData(0xFF0209, False),
+    ItemName.heart_fruit:    ItemData(0xFF020A, False),
+    ItemName.chao_fruit:     ItemData(0xFF020B, False),
+    ItemName.smart_fruit:    ItemData(0xFF020C, False),
+
+    ItemName.orange_fruit: ItemData(0xFF020D, False),
+    ItemName.blue_fruit:   ItemData(0xFF020E, False),
+    ItemName.pink_fruit:   ItemData(0xFF020F, False),
+    ItemName.green_fruit:  ItemData(0xFF0210, False),
+    ItemName.purple_fruit: ItemData(0xFF0211, False),
+    ItemName.yellow_fruit: ItemData(0xFF0212, False),
+    ItemName.red_fruit:    ItemData(0xFF0213, False),
+
+    ItemName.mushroom_fruit:       ItemData(0xFF0214, False),
+    ItemName.super_mushroom_fruit: ItemData(0xFF0215, False),
+    ItemName.mint_candy_fruit:     ItemData(0xFF0216, False),
+    ItemName.grapes_fruit:         ItemData(0xFF0217, False),
+}
+
+seeds_table = {
+    ItemName.strong_seed:   ItemData(0xFF0300, False),
+    ItemName.tasty_seed:    ItemData(0xFF0301, False),
+    ItemName.hero_seed:     ItemData(0xFF0302, False),
+    ItemName.dark_seed:     ItemData(0xFF0303, False),
+    ItemName.round_seed:    ItemData(0xFF0304, False),
+    ItemName.triangle_seed: ItemData(0xFF0305, False),
+    ItemName.square_seed:   ItemData(0xFF0306, False),
+}
+
+hats_table = {
+    ItemName.pumpkin_hat:       ItemData(0xFF0401, False),
+    ItemName.skull_hat:         ItemData(0xFF0402, False),
+    ItemName.apple_hat:         ItemData(0xFF0403, False),
+    ItemName.bucket_hat:        ItemData(0xFF0404, False),
+    ItemName.empty_can_hat:     ItemData(0xFF0405, False),
+    ItemName.cardboard_box_hat: ItemData(0xFF0406, False),
+    ItemName.flower_pot_hat:    ItemData(0xFF0407, False),
+    ItemName.paper_bag_hat:     ItemData(0xFF0408, False),
+    ItemName.pan_hat:           ItemData(0xFF0409, False),
+    ItemName.stump_hat:         ItemData(0xFF040A, False),
+    ItemName.watermelon_hat:    ItemData(0xFF040B, False),
+
+    ItemName.red_wool_beanie_hat:   ItemData(0xFF040C, False),
+    ItemName.blue_wool_beanie_hat:  ItemData(0xFF040D, False),
+    ItemName.black_wool_beanie_hat: ItemData(0xFF040E, False),
+    ItemName.pacifier_hat:          ItemData(0xFF040F, False),
+}
+
+animals_table = {
+    ItemName.animal_penguin:      ItemData(0xFF0500, False),
+    ItemName.animal_seal:         ItemData(0xFF0501, False),
+    ItemName.animal_otter:        ItemData(0xFF0502, False),
+    ItemName.animal_rabbit:       ItemData(0xFF0503, False),
+    ItemName.animal_cheetah:      ItemData(0xFF0504, False),
+    ItemName.animal_warthog:      ItemData(0xFF0505, False),
+    ItemName.animal_bear:         ItemData(0xFF0506, False),
+    ItemName.animal_tiger:        ItemData(0xFF0507, False),
+    ItemName.animal_gorilla:      ItemData(0xFF0508, False),
+    ItemName.animal_peacock:      ItemData(0xFF0509, False),
+    ItemName.animal_parrot:       ItemData(0xFF050A, False),
+    ItemName.animal_condor:       ItemData(0xFF050B, False),
+    ItemName.animal_skunk:        ItemData(0xFF050C, False),
+    ItemName.animal_sheep:        ItemData(0xFF050D, False),
+    ItemName.animal_raccoon:      ItemData(0xFF050E, False),
+    ItemName.animal_halffish:     ItemData(0xFF050F, False),
+    ItemName.animal_skeleton_dog: ItemData(0xFF0510, False),
+    ItemName.animal_bat:          ItemData(0xFF0511, False),
+    ItemName.animal_dragon:       ItemData(0xFF0512, False),
+    ItemName.animal_unicorn:      ItemData(0xFF0513, False),
+    ItemName.animal_phoenix:      ItemData(0xFF0514, False),
+}
+
+chaos_drives_table = {
+    ItemName.chaos_drive_yellow: ItemData(0xFF0515, False),
+    ItemName.chaos_drive_green:  ItemData(0xFF0516, False),
+    ItemName.chaos_drive_red:    ItemData(0xFF0517, False),
+    ItemName.chaos_drive_purple: ItemData(0xFF0518, False),
+}
+
 event_table = {
     ItemName.maria: ItemData(0xFF001D, True),
 }
@@ -107,12 +245,25 @@ item_table = {
     **junk_table,
     **trap_table,
     **emeralds_table,
+    **eggs_table,
+    **fruits_table,
+    **seeds_table,
+    **hats_table,
+    **animals_table,
+    **chaos_drives_table,
     **event_table,
 }
 
 lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_table.items() if data.code}
 
-item_groups: typing.Dict[str, str] = {"Chaos Emeralds": [item_name for item_name, data in emeralds_table.items()]}
+item_groups: typing.Dict[str, str] = {
+    "Chaos Emeralds": list(emeralds_table.keys()),
+    "Eggs":           list(eggs_table.keys()),
+    "Fruits":         list(fruits_table.keys()),
+    "Seeds":          list(seeds_table.keys()),
+    "Hats":           list(hats_table.keys()),
+    "Traps":          list(trap_table.keys()),
+}
 
 ALTTPWorld.pedestal_credit_texts[item_table[ItemName.sonic_light_shoes].code] = "and the Soap Shoes"
 ALTTPWorld.pedestal_credit_texts[item_table[ItemName.shadow_air_shoes].code] = "and the Soap Shoes"
diff --git a/worlds/sa2b/Locations.py b/worlds/sa2b/Locations.py
index 461580bb6e..c928e0c389 100644
--- a/worlds/sa2b/Locations.py
+++ b/worlds/sa2b/Locations.py
@@ -1,6 +1,7 @@
 import typing
 
 from BaseClasses import Location, MultiWorld
+from worlds.AutoWorld import World
 from .Names import LocationName
 from .Missions import stage_name_prefixes, mission_orders
 
@@ -1066,6 +1067,7 @@ animal_location_table = {
     LocationName.final_rush_animal_11: 0xFF0C4F,
 
     LocationName.iron_gate_animal_11: 0xFF0C50,
+    LocationName.dry_lagoon_animal_11: 0xFF0C51,
     LocationName.sand_ocean_animal_11: 0xFF0C52,
     LocationName.radical_highway_animal_11: 0xFF0C53,
     LocationName.lost_colony_animal_11: 0xFF0C55,
@@ -1241,7 +1243,7 @@ boss_rush_location_table = {
     LocationName.boss_rush_16: 0xFF0114,
 }
 
-chao_garden_beginner_location_table = {
+chao_race_beginner_location_table = {
     LocationName.chao_race_crab_pool_1: 0xFF0200,
     LocationName.chao_race_crab_pool_2: 0xFF0201,
     LocationName.chao_race_crab_pool_3: 0xFF0202,
@@ -1254,11 +1256,17 @@ chao_garden_beginner_location_table = {
     LocationName.chao_race_block_canyon_1: 0xFF0209,
     LocationName.chao_race_block_canyon_2: 0xFF020A,
     LocationName.chao_race_block_canyon_3: 0xFF020B,
-
-    LocationName.chao_beginner_karate: 0xFF0300,
 }
 
-chao_garden_intermediate_location_table = {
+chao_karate_beginner_location_table = {
+    LocationName.chao_beginner_karate_1: 0xFF0300,
+    LocationName.chao_beginner_karate_2: 0xFF0301,
+    LocationName.chao_beginner_karate_3: 0xFF0302,
+    LocationName.chao_beginner_karate_4: 0xFF0303,
+    LocationName.chao_beginner_karate_5: 0xFF0304,
+}
+
+chao_race_intermediate_location_table = {
     LocationName.chao_race_challenge_1: 0xFF022A,
     LocationName.chao_race_challenge_2: 0xFF022B,
     LocationName.chao_race_challenge_3: 0xFF022C,
@@ -1281,11 +1289,17 @@ chao_garden_intermediate_location_table = {
     LocationName.chao_race_dark_2: 0xFF023B,
     LocationName.chao_race_dark_3: 0xFF023C,
     LocationName.chao_race_dark_4: 0xFF023D,
-
-    LocationName.chao_standard_karate: 0xFF0301,
 }
 
-chao_garden_expert_location_table = {
+chao_karate_intermediate_location_table = {
+    LocationName.chao_standard_karate_1: 0xFF0305,
+    LocationName.chao_standard_karate_2: 0xFF0306,
+    LocationName.chao_standard_karate_3: 0xFF0307,
+    LocationName.chao_standard_karate_4: 0xFF0308,
+    LocationName.chao_standard_karate_5: 0xFF0309,
+}
+
+chao_race_expert_location_table = {
     LocationName.chao_race_aquamarine_1: 0xFF020C,
     LocationName.chao_race_aquamarine_2: 0xFF020D,
     LocationName.chao_race_aquamarine_3: 0xFF020E,
@@ -1316,11 +1330,187 @@ chao_garden_expert_location_table = {
     LocationName.chao_race_diamond_3: 0xFF0227,
     LocationName.chao_race_diamond_4: 0xFF0228,
     LocationName.chao_race_diamond_5: 0xFF0229,
-
-    LocationName.chao_expert_karate: 0xFF0302,
-    LocationName.chao_super_karate: 0xFF0303,
 }
 
+chao_karate_expert_location_table = {
+    LocationName.chao_expert_karate_1: 0xFF030A,
+    LocationName.chao_expert_karate_2: 0xFF030B,
+    LocationName.chao_expert_karate_3: 0xFF030C,
+    LocationName.chao_expert_karate_4: 0xFF030D,
+    LocationName.chao_expert_karate_5: 0xFF030E,
+}
+
+chao_karate_super_location_table = {
+    LocationName.chao_super_karate_1: 0xFF030F,
+    LocationName.chao_super_karate_2: 0xFF0310,
+    LocationName.chao_super_karate_3: 0xFF0311,
+    LocationName.chao_super_karate_4: 0xFF0312,
+    LocationName.chao_super_karate_5: 0xFF0313,
+}
+
+chao_stat_swim_table         = { LocationName.chao_stat_swim_base         + str(index): (0xFF0E00 + index) for index in range(1,100) }
+chao_stat_fly_table          = { LocationName.chao_stat_fly_base          + str(index): (0xFF0E80 + index) for index in range(1,100) }
+chao_stat_run_table          = { LocationName.chao_stat_run_base          + str(index): (0xFF0F00 + index) for index in range(1,100) }
+chao_stat_power_table        = { LocationName.chao_stat_power_base        + str(index): (0xFF0F80 + index) for index in range(1,100) }
+chao_stat_stamina_table      = { LocationName.chao_stat_stamina_base      + str(index): (0xFF1000 + index) for index in range(1,100) }
+chao_stat_luck_table         = { LocationName.chao_stat_luck_base         + str(index): (0xFF1080 + index) for index in range(1,100) }
+chao_stat_intelligence_table = { LocationName.chao_stat_intelligence_base + str(index): (0xFF1100 + index) for index in range(1,100) }
+
+chao_animal_event_location_table = {
+    LocationName.animal_penguin:      None,
+    LocationName.animal_seal:         None,
+    LocationName.animal_otter:        None,
+    LocationName.animal_rabbit:       None,
+    LocationName.animal_cheetah:      None,
+    LocationName.animal_warthog:      None,
+    LocationName.animal_bear:         None,
+    LocationName.animal_tiger:        None,
+    LocationName.animal_gorilla:      None,
+    LocationName.animal_peacock:      None,
+    LocationName.animal_parrot:       None,
+    LocationName.animal_condor:       None,
+    LocationName.animal_skunk:        None,
+    LocationName.animal_sheep:        None,
+    LocationName.animal_raccoon:      None,
+    LocationName.animal_halffish:     None,
+    LocationName.animal_skeleton_dog: None,
+    LocationName.animal_bat:          None,
+    LocationName.animal_dragon:       None,
+    LocationName.animal_unicorn:      None,
+    LocationName.animal_phoenix:      None,
+}
+
+chao_animal_part_location_table = {
+    LocationName.chao_penguin_arms:     0xFF1220,
+    LocationName.chao_penguin_forehead: 0xFF1222,
+    LocationName.chao_penguin_legs:     0xFF1224,
+
+    LocationName.chao_seal_arms: 0xFF1228,
+    LocationName.chao_seal_tail: 0xFF122E,
+
+    LocationName.chao_otter_arms: 0xFF1230,
+    LocationName.chao_otter_ears: 0xFF1231,
+    LocationName.chao_otter_face: 0xFF1233,
+    LocationName.chao_otter_legs: 0xFF1234,
+    LocationName.chao_otter_tail: 0xFF1236,
+
+    LocationName.chao_rabbit_arms: 0xFF1238,
+    LocationName.chao_rabbit_ears: 0xFF1239,
+    LocationName.chao_rabbit_legs: 0xFF123C,
+    LocationName.chao_rabbit_tail: 0xFF123E,
+
+    LocationName.chao_cheetah_arms: 0xFF1240,
+    LocationName.chao_cheetah_ears: 0xFF1241,
+    LocationName.chao_cheetah_legs: 0xFF1244,
+    LocationName.chao_cheetah_tail: 0xFF1246,
+
+    LocationName.chao_warthog_arms: 0xFF1248,
+    LocationName.chao_warthog_ears: 0xFF1249,
+    LocationName.chao_warthog_face: 0xFF124B,
+    LocationName.chao_warthog_legs: 0xFF124C,
+    LocationName.chao_warthog_tail: 0xFF124E,
+
+    LocationName.chao_bear_arms: 0xFF1250,
+    LocationName.chao_bear_ears: 0xFF1251,
+    LocationName.chao_bear_legs: 0xFF1254,
+
+    LocationName.chao_tiger_arms: 0xFF1258,
+    LocationName.chao_tiger_ears: 0xFF1259,
+    LocationName.chao_tiger_legs: 0xFF125C,
+    LocationName.chao_tiger_tail: 0xFF125E,
+
+    LocationName.chao_gorilla_arms:     0xFF1260,
+    LocationName.chao_gorilla_ears:     0xFF1261,
+    LocationName.chao_gorilla_forehead: 0xFF1262,
+    LocationName.chao_gorilla_legs:     0xFF1264,
+
+    LocationName.chao_peacock_forehead: 0xFF126A,
+    LocationName.chao_peacock_legs:     0xFF126C,
+    LocationName.chao_peacock_tail:     0xFF126E,
+    LocationName.chao_peacock_wings:    0xFF126F,
+
+    LocationName.chao_parrot_forehead: 0xFF1272,
+    LocationName.chao_parrot_legs:     0xFF1274,
+    LocationName.chao_parrot_tail:     0xFF1276,
+    LocationName.chao_parrot_wings:    0xFF1277,
+
+    LocationName.chao_condor_ears:  0xFF1279,
+    LocationName.chao_condor_legs:  0xFF127C,
+    LocationName.chao_condor_tail:  0xFF127E,
+    LocationName.chao_condor_wings: 0xFF127F,
+
+    LocationName.chao_skunk_arms:     0xFF1280,
+    LocationName.chao_skunk_forehead: 0xFF1282,
+    LocationName.chao_skunk_legs:     0xFF1284,
+    LocationName.chao_skunk_tail:     0xFF1286,
+
+    LocationName.chao_sheep_arms: 0xFF1288,
+    LocationName.chao_sheep_ears: 0xFF1289,
+    LocationName.chao_sheep_legs: 0xFF128C,
+    LocationName.chao_sheep_horn: 0xFF128D,
+    LocationName.chao_sheep_tail: 0xFF128E,
+
+    LocationName.chao_raccoon_arms: 0xFF1290,
+    LocationName.chao_raccoon_ears: 0xFF1291,
+    LocationName.chao_raccoon_legs: 0xFF1294,
+
+    LocationName.chao_dragon_arms:  0xFF12A0,
+    LocationName.chao_dragon_ears:  0xFF12A1,
+    LocationName.chao_dragon_legs:  0xFF12A4,
+    LocationName.chao_dragon_horn:  0xFF12A5,
+    LocationName.chao_dragon_tail:  0xFF12A6,
+    LocationName.chao_dragon_wings: 0xFF12A7,
+
+    LocationName.chao_unicorn_arms:     0xFF12A8,
+    LocationName.chao_unicorn_ears:     0xFF12A9,
+    LocationName.chao_unicorn_forehead: 0xFF12AA,
+    LocationName.chao_unicorn_legs:     0xFF12AC,
+    LocationName.chao_unicorn_tail:     0xFF12AE,
+
+    LocationName.chao_phoenix_forehead: 0xFF12B2,
+    LocationName.chao_phoenix_legs:     0xFF12B4,
+    LocationName.chao_phoenix_tail:     0xFF12B6,
+    LocationName.chao_phoenix_wings:    0xFF12B7,
+}
+
+chao_kindergarten_location_table = {
+    LocationName.chao_kindergarten_drawing_1: 0xFF12D0,
+    LocationName.chao_kindergarten_drawing_2: 0xFF12D1,
+    LocationName.chao_kindergarten_drawing_3: 0xFF12D2,
+    LocationName.chao_kindergarten_drawing_4: 0xFF12D3,
+    LocationName.chao_kindergarten_drawing_5: 0xFF12D4,
+
+    LocationName.chao_kindergarten_shake_dance: 0xFF12D8,
+    LocationName.chao_kindergarten_spin_dance:  0xFF12D9,
+    LocationName.chao_kindergarten_step_dance:  0xFF12DA,
+    LocationName.chao_kindergarten_gogo_dance:  0xFF12DB,
+    LocationName.chao_kindergarten_exercise:    0xFF12DC,
+
+    LocationName.chao_kindergarten_song_1: 0xFF12E0,
+    LocationName.chao_kindergarten_song_2: 0xFF12E1,
+    LocationName.chao_kindergarten_song_3: 0xFF12E2,
+    LocationName.chao_kindergarten_song_4: 0xFF12E3,
+    LocationName.chao_kindergarten_song_5: 0xFF12E4,
+
+    LocationName.chao_kindergarten_bell:       0xFF12E8,
+    LocationName.chao_kindergarten_castanets:  0xFF12E9,
+    LocationName.chao_kindergarten_cymbals:    0xFF12EA,
+    LocationName.chao_kindergarten_drum:       0xFF12EB,
+    LocationName.chao_kindergarten_flute:      0xFF12EC,
+    LocationName.chao_kindergarten_maracas:    0xFF12ED,
+    LocationName.chao_kindergarten_trumpet:    0xFF12EE,
+    LocationName.chao_kindergarten_tambourine: 0xFF12EF,
+}
+
+chao_kindergarten_basics_location_table = {
+    LocationName.chao_kindergarten_any_drawing:    0xFF12F0,
+    LocationName.chao_kindergarten_any_dance:      0xFF12F1,
+    LocationName.chao_kindergarten_any_song:       0xFF12F2,
+    LocationName.chao_kindergarten_any_instrument: 0xFF12F3,
+}
+
+black_market_location_table = { LocationName.chao_black_market_base + str(index): (0xFF1300 + index) for index in range(1,65) }
+
 kart_race_beginner_location_table = {
     LocationName.kart_race_beginner_sonic: 0xFF0A00,
     LocationName.kart_race_beginner_tails: 0xFF0A01,
@@ -1375,6 +1565,10 @@ grand_prix_location_table = {
     LocationName.grand_prix: 0xFF007F,
 }
 
+chaos_chao_location_table = {
+    LocationName.chaos_chao: 0xFF009F,
+}
+
 all_locations = {
     **mission_location_table,
     **upgrade_location_table,
@@ -1386,9 +1580,13 @@ all_locations = {
     **beetle_location_table,
     **omochao_location_table,
     **animal_location_table,
-    **chao_garden_beginner_location_table,
-    **chao_garden_intermediate_location_table,
-    **chao_garden_expert_location_table,
+    **chao_race_beginner_location_table,
+    **chao_karate_beginner_location_table,
+    **chao_race_intermediate_location_table,
+    **chao_karate_intermediate_location_table,
+    **chao_race_expert_location_table,
+    **chao_karate_expert_location_table,
+    **chao_karate_super_location_table,
     **kart_race_beginner_location_table,
     **kart_race_standard_location_table,
     **kart_race_expert_location_table,
@@ -1398,6 +1596,18 @@ all_locations = {
     **green_hill_animal_location_table,
     **final_boss_location_table,
     **grand_prix_location_table,
+    **chaos_chao_location_table,
+    **chao_stat_swim_table,
+    **chao_stat_fly_table,
+    **chao_stat_run_table,
+    **chao_stat_power_table,
+    **chao_stat_stamina_table,
+    **chao_stat_luck_table,
+    **chao_stat_intelligence_table,
+    **chao_animal_part_location_table,
+    **chao_kindergarten_location_table,
+    **chao_kindergarten_basics_location_table,
+    **black_market_location_table,
 }
 
 boss_gate_set = [
@@ -1408,13 +1618,6 @@ boss_gate_set = [
     LocationName.gate_5_boss,
 ]
 
-chao_karate_set = [
-    LocationName.chao_beginner_karate,
-    LocationName.chao_standard_karate,
-    LocationName.chao_expert_karate,
-    LocationName.chao_super_karate,
-]
-
 chao_race_prize_set = [
     LocationName.chao_race_crab_pool_3,
     LocationName.chao_race_stump_valley_3,
@@ -1437,19 +1640,24 @@ chao_race_prize_set = [
 
     LocationName.chao_race_dark_2,
     LocationName.chao_race_dark_4,
+
+    LocationName.chao_beginner_karate_5,
+    LocationName.chao_standard_karate_5,
+    LocationName.chao_expert_karate_5,
+    LocationName.chao_super_karate_5,
 ]
 
 
-def setup_locations(world: MultiWorld, player: int, mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int]):
+def setup_locations(world: World, player: int, mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int]):
     location_table = {}
     chao_location_table = {}
 
-    if world.goal[player] == 3:
-        if world.kart_race_checks[player] == 2:
+    if world.options.goal == 3:
+        if world.options.kart_race_checks == 2:
             location_table.update({**kart_race_beginner_location_table})
             location_table.update({**kart_race_standard_location_table})
             location_table.update({**kart_race_expert_location_table})
-        elif world.kart_race_checks[player] == 1:
+        elif world.options.kart_race_checks == 1:
             location_table.update({**kart_race_mini_location_table})
         location_table.update({**grand_prix_location_table})
     else:
@@ -1465,67 +1673,100 @@ def setup_locations(world: MultiWorld, player: int, mission_map: typing.Dict[int
 
         location_table.update({**upgrade_location_table})
 
-        if world.keysanity[player]:
+        if world.options.keysanity:
             location_table.update({**chao_key_location_table})
 
-        if world.whistlesanity[player].value == 1:
+        if world.options.whistlesanity.value == 1:
             location_table.update({**pipe_location_table})
-        elif world.whistlesanity[player].value == 2:
+        elif world.options.whistlesanity.value == 2:
             location_table.update({**hidden_whistle_location_table})
-        elif world.whistlesanity[player].value == 3:
+        elif world.options.whistlesanity.value == 3:
             location_table.update({**pipe_location_table})
             location_table.update({**hidden_whistle_location_table})
 
-        if world.beetlesanity[player]:
+        if world.options.beetlesanity:
             location_table.update({**beetle_location_table})
 
-        if world.omosanity[player]:
+        if world.options.omosanity:
             location_table.update({**omochao_location_table})
 
-        if world.animalsanity[player]:
+        if world.options.animalsanity:
             location_table.update({**animal_location_table})
 
-        if world.kart_race_checks[player] == 2:
+        if world.options.kart_race_checks == 2:
             location_table.update({**kart_race_beginner_location_table})
             location_table.update({**kart_race_standard_location_table})
             location_table.update({**kart_race_expert_location_table})
-        elif world.kart_race_checks[player] == 1:
+        elif world.options.kart_race_checks == 1:
             location_table.update({**kart_race_mini_location_table})
 
-        if world.goal[player].value in [0, 2, 4, 5, 6]:
+        if world.options.goal.value in [0, 2, 4, 5, 6]:
             location_table.update({**final_boss_location_table})
+        elif world.options.goal.value in [7]:
+            location_table.update({**chaos_chao_location_table})
 
-        if world.goal[player].value in [1, 2]:
+        if world.options.goal.value in [1, 2]:
             location_table.update({**green_hill_location_table})
 
-            if world.keysanity[player]:
+            if world.options.keysanity:
                 location_table.update({**green_hill_chao_location_table})
 
-            if world.animalsanity[player]:
+            if world.options.animalsanity:
                 location_table.update({**green_hill_animal_location_table})
 
-        if world.goal[player].value in [4, 5, 6]:
+        if world.options.goal.value in [4, 5, 6]:
             location_table.update({**boss_rush_location_table})
 
-        if world.chao_garden_difficulty[player].value >= 1:
-            chao_location_table.update({**chao_garden_beginner_location_table})
-        if world.chao_garden_difficulty[player].value >= 2:
-            chao_location_table.update({**chao_garden_intermediate_location_table})
-        if world.chao_garden_difficulty[player].value >= 3:
-            chao_location_table.update({**chao_garden_expert_location_table})
+        if world.options.chao_race_difficulty.value >= 1:
+            chao_location_table.update({**chao_race_beginner_location_table})
+        if world.options.chao_race_difficulty.value >= 2:
+            chao_location_table.update({**chao_race_intermediate_location_table})
+        if world.options.chao_race_difficulty.value >= 3:
+            chao_location_table.update({**chao_race_expert_location_table})
+
+        if world.options.chao_karate_difficulty.value >= 1:
+            chao_location_table.update({**chao_karate_beginner_location_table})
+        if world.options.chao_karate_difficulty.value >= 2:
+            chao_location_table.update({**chao_karate_intermediate_location_table})
+        if world.options.chao_karate_difficulty.value >= 3:
+            chao_location_table.update({**chao_karate_expert_location_table})
+        if world.options.chao_karate_difficulty.value >= 4:
+            chao_location_table.update({**chao_karate_super_location_table})
 
         for key, value in chao_location_table.items():
-            if key in chao_karate_set:
-                if world.include_chao_karate[player]:
-                    location_table[key] = value
-            elif key not in chao_race_prize_set:
-                if world.chao_race_checks[player] == "all":
+            if key not in chao_race_prize_set:
+                if world.options.chao_stadium_checks == "all":
                     location_table[key] = value
             else:
                 location_table[key] = value
 
+        for index in range(1, world.options.chao_stats.value + 1):
+            if (index % world.options.chao_stats_frequency.value) == (world.options.chao_stats.value % world.options.chao_stats_frequency.value):
+                location_table[LocationName.chao_stat_swim_base    + str(index)] = chao_stat_swim_table[   LocationName.chao_stat_swim_base    + str(index)]
+                location_table[LocationName.chao_stat_fly_base     + str(index)] = chao_stat_fly_table[    LocationName.chao_stat_fly_base     + str(index)]
+                location_table[LocationName.chao_stat_run_base     + str(index)] = chao_stat_run_table[    LocationName.chao_stat_run_base     + str(index)]
+                location_table[LocationName.chao_stat_power_base   + str(index)] = chao_stat_power_table[  LocationName.chao_stat_power_base   + str(index)]
+
+                if world.options.chao_stats_stamina:
+                    location_table[LocationName.chao_stat_stamina_base + str(index)] = chao_stat_stamina_table[LocationName.chao_stat_stamina_base + str(index)]
+
+                if world.options.chao_stats_hidden:
+                    location_table[LocationName.chao_stat_luck_base         + str(index)] = chao_stat_luck_table[        LocationName.chao_stat_luck_base         + str(index)]
+                    location_table[LocationName.chao_stat_intelligence_base + str(index)] = chao_stat_intelligence_table[LocationName.chao_stat_intelligence_base + str(index)]
+
+        if world.options.chao_animal_parts:
+            location_table.update({**chao_animal_part_location_table})
+
+        if world.options.chao_kindergarten.value == 1:
+            location_table.update({**chao_kindergarten_basics_location_table})
+        elif world.options.chao_kindergarten.value == 2:
+            location_table.update({**chao_kindergarten_location_table})
+
+        for index in range(1, world.options.black_market_slots.value + 1):
+            location_table[LocationName.chao_black_market_base + str(index)] = black_market_location_table[LocationName.chao_black_market_base + str(index)]
+
         for x in range(len(boss_gate_set)):
-            if x < world.number_of_level_gates[player].value:
+            if x < world.options.number_of_level_gates.value:
                 location_table[boss_gate_set[x]] = boss_gate_location_table[boss_gate_set[x]]
 
     return location_table
diff --git a/worlds/sa2b/Missions.py b/worlds/sa2b/Missions.py
index 1fcd2aed87..5ee48d5640 100644
--- a/worlds/sa2b/Missions.py
+++ b/worlds/sa2b/Missions.py
@@ -2,6 +2,7 @@ import typing
 import copy
 
 from BaseClasses import MultiWorld
+from worlds.AutoWorld import World
 
 
 mission_orders: typing.List[typing.List[int]] = [
@@ -193,10 +194,10 @@ stage_name_prefixes: typing.List[str] = [
     "Cannon's Core - ",
 ]
 
-def get_mission_count_table(multiworld: MultiWorld, player: int):
+def get_mission_count_table(multiworld: MultiWorld, world: World, player: int):
     mission_count_table: typing.Dict[int, int] = {}
 
-    if multiworld.goal[player] == 3:
+    if world.options.goal == 3:
         for level in range(31):
             mission_count_table[level] = 0
     else:
@@ -207,26 +208,26 @@ def get_mission_count_table(multiworld: MultiWorld, player: int):
         cannons_core_active_missions = 1
 
         for i in range(2,6):
-            if getattr(multiworld, "speed_mission_" + str(i), None)[player]:
+            if getattr(world.options, "speed_mission_" + str(i), None):
                 speed_active_missions += 1
 
-            if getattr(multiworld, "mech_mission_" + str(i), None)[player]:
+            if getattr(world.options, "mech_mission_" + str(i), None):
                 mech_active_missions += 1
 
-            if getattr(multiworld, "hunt_mission_" + str(i), None)[player]:
+            if getattr(world.options, "hunt_mission_" + str(i), None):
                 hunt_active_missions += 1
 
-            if getattr(multiworld, "kart_mission_" + str(i), None)[player]:
+            if getattr(world.options, "kart_mission_" + str(i), None):
                 kart_active_missions += 1
 
-            if getattr(multiworld, "cannons_core_mission_" + str(i), None)[player]:
+            if getattr(world.options, "cannons_core_mission_" + str(i), None):
                 cannons_core_active_missions += 1
 
-        speed_active_missions        = min(speed_active_missions, multiworld.speed_mission_count[player].value)
-        mech_active_missions         = min(mech_active_missions, multiworld.mech_mission_count[player].value)
-        hunt_active_missions         = min(hunt_active_missions, multiworld.hunt_mission_count[player].value)
-        kart_active_missions         = min(kart_active_missions, multiworld.kart_mission_count[player].value)
-        cannons_core_active_missions = min(cannons_core_active_missions, multiworld.cannons_core_mission_count[player].value)
+        speed_active_missions        = min(speed_active_missions, world.options.speed_mission_count.value)
+        mech_active_missions         = min(mech_active_missions, world.options.mech_mission_count.value)
+        hunt_active_missions         = min(hunt_active_missions, world.options.hunt_mission_count.value)
+        kart_active_missions         = min(kart_active_missions, world.options.kart_mission_count.value)
+        cannons_core_active_missions = min(cannons_core_active_missions, world.options.cannons_core_mission_count.value)
 
         active_missions: typing.List[typing.List[int]] = [
             speed_active_missions,
@@ -244,10 +245,10 @@ def get_mission_count_table(multiworld: MultiWorld, player: int):
     return mission_count_table
 
 
-def get_mission_table(multiworld: MultiWorld, player: int):
+def get_mission_table(multiworld: MultiWorld, world: World, player: int):
     mission_table: typing.Dict[int, int] = {}
 
-    if multiworld.goal[player] == 3:
+    if world.options.goal == 3:
         for level in range(31):
             mission_table[level] = 0
     else:
@@ -259,19 +260,19 @@ def get_mission_table(multiworld: MultiWorld, player: int):
 
         # Add included missions
         for i in range(2,6):
-            if getattr(multiworld, "speed_mission_" + str(i), None)[player]:
+            if getattr(world.options, "speed_mission_" + str(i), None):
                 speed_active_missions.append(i)
 
-            if getattr(multiworld, "mech_mission_" + str(i), None)[player]:
+            if getattr(world.options, "mech_mission_" + str(i), None):
                 mech_active_missions.append(i)
 
-            if getattr(multiworld, "hunt_mission_" + str(i), None)[player]:
+            if getattr(world.options, "hunt_mission_" + str(i), None):
                 hunt_active_missions.append(i)
 
-            if getattr(multiworld, "kart_mission_" + str(i), None)[player]:
+            if getattr(world.options, "kart_mission_" + str(i), None):
                 kart_active_missions.append(i)
 
-            if getattr(multiworld, "cannons_core_mission_" + str(i), None)[player]:
+            if getattr(world.options, "cannons_core_mission_" + str(i), None):
                 cannons_core_active_missions.append(i)
 
         active_missions: typing.List[typing.List[int]] = [
@@ -292,10 +293,10 @@ def get_mission_table(multiworld: MultiWorld, player: int):
             first_mission = 1
             first_mission_options = [1, 2, 3]
 
-            if not multiworld.animalsanity[player]:
+            if not world.options.animalsanity:
                 first_mission_options.append(4)
 
-            if multiworld.mission_shuffle[player]:
+            if world.options.mission_shuffle:
                 first_mission = multiworld.random.choice([mission for mission in level_active_missions if mission in first_mission_options])
 
             level_active_missions.remove(first_mission)
@@ -305,7 +306,7 @@ def get_mission_table(multiworld: MultiWorld, player: int):
                 if mission not in level_chosen_missions:
                     level_chosen_missions.append(mission)
 
-            if multiworld.mission_shuffle[player]:
+            if world.options.mission_shuffle:
                 multiworld.random.shuffle(level_chosen_missions)
 
             level_chosen_missions.insert(0, first_mission)
diff --git a/worlds/sa2b/Names/ItemName.py b/worlds/sa2b/Names/ItemName.py
index eb088ceb40..c6de98183b 100644
--- a/worlds/sa2b/Names/ItemName.py
+++ b/worlds/sa2b/Names/ItemName.py
@@ -1,6 +1,9 @@
 # Emblem Definition
 emblem = "Emblem"
 
+# Market Token Definition
+market_token = "Chao Coin"
+
 # Upgrade Definitions
 sonic_gloves          = "Sonic - Magic Glove"
 sonic_light_shoes     = "Sonic - Light Shoes"
@@ -36,6 +39,8 @@ rouge_pick_nails     = "Rouge - Pick Nails"
 rouge_treasure_scope = "Rouge - Treasure Scope"
 rouge_iron_boots     = "Rouge - Iron Boots"
 
+
+# Junk
 five_rings      = "Five Rings"
 ten_rings       = "Ten Rings"
 twenty_rings    = "Twenty Rings"
@@ -44,6 +49,8 @@ shield          = "Shield"
 magnetic_shield = "Magnetic Shield"
 invincibility   = "Invincibility"
 
+
+# Traps
 omochao_trap    = "OmoTrap"
 timestop_trap   = "Chaos Control Trap"
 confuse_trap    = "Confusion Trap"
@@ -54,9 +61,12 @@ darkness_trap   = "Darkness Trap"
 ice_trap        = "Ice Trap"
 slow_trap       = "Slow Trap"
 cutscene_trap   = "Cutscene Trap"
+reverse_trap    = "Reverse Trap"
 
 pong_trap       = "Pong Trap"
 
+
+# Chaos Emeralds
 white_emerald  = "White Chaos Emerald"
 red_emerald    = "Red Chaos Emerald"
 cyan_emerald   = "Cyan Chaos Emerald"
@@ -65,4 +75,140 @@ green_emerald  = "Green Chaos Emerald"
 yellow_emerald = "Yellow Chaos Emerald"
 blue_emerald   = "Blue Chaos Emerald"
 
+
+# Chao Eggs
+normal_egg              = "Normal Egg"
+yellow_monotone_egg     = "Yellow Mono-Tone Egg"
+white_monotone_egg      = "White Mono-Tone Egg"
+brown_monotone_egg      = "Brown Mono-Tone Egg"
+sky_blue_monotone_egg   = "Sky Blue Mono-Tone Egg"
+pink_monotone_egg       = "Pink Mono-Tone Egg"
+blue_monotone_egg       = "Blue Mono-Tone Egg"
+grey_monotone_egg       = "Grey Mono-Tone Egg"
+green_monotone_egg      = "Green Mono-Tone Egg"
+red_monotone_egg        = "Red Mono-Tone Egg"
+lime_green_monotone_egg = "Lime Green Mono-Tone Egg"
+purple_monotone_egg     = "Purple Mono-Tone Egg"
+orange_monotone_egg     = "Orange Mono-Tone Egg"
+black_monotone_egg      = "Black Mono-Tone Egg"
+
+yellow_twotone_egg     = "Yellow Two-Tone Egg"
+white_twotone_egg      = "White Two-Tone Egg"
+brown_twotone_egg      = "Brown Two-Tone Egg"
+sky_blue_twotone_egg   = "Sky Blue Two-Tone Egg"
+pink_twotone_egg       = "Pink Two-Tone Egg"
+blue_twotone_egg       = "Blue Two-Tone Egg"
+grey_twotone_egg       = "Grey Two-Tone Egg"
+green_twotone_egg      = "Green Two-Tone Egg"
+red_twotone_egg        = "Red Two-Tone Egg"
+lime_green_twotone_egg = "Lime Green Two-Tone Egg"
+purple_twotone_egg     = "Purple Two-Tone Egg"
+orange_twotone_egg     = "Orange Two-Tone Egg"
+black_twotone_egg      = "Black Two-Tone Egg"
+
+normal_shiny_egg     = "Normal Shiny Egg"
+yellow_shiny_egg     = "Yellow Shiny Egg"
+white_shiny_egg      = "White Shiny Egg"
+brown_shiny_egg      = "Brown Shiny Egg"
+sky_blue_shiny_egg   = "Sky Blue Shiny Egg"
+pink_shiny_egg       = "Pink Shiny Egg"
+blue_shiny_egg       = "Blue Shiny Egg"
+grey_shiny_egg       = "Grey Shiny Egg"
+green_shiny_egg      = "Green Shiny Egg"
+red_shiny_egg        = "Red Shiny Egg"
+lime_green_shiny_egg = "Lime Green Shiny Egg"
+purple_shiny_egg     = "Purple Shiny Egg"
+orange_shiny_egg     = "Orange Shiny Egg"
+black_shiny_egg      = "Black Shiny Egg"
+
+
+# Chao Fruit
+chao_garden_fruit = "Chao Garden Fruit"
+hero_garden_fruit = "Hero Garden Fruit"
+dark_garden_fruit = "Dark Garden Fruit"
+
+strong_fruit   = "Strong Fruit"
+tasty_fruit    = "Tasty Fruit"
+hero_fruit     = "Hero Fruit"
+dark_fruit     = "Dark Fruit"
+round_fruit    = "Round Fruit"
+triangle_fruit = "Triangle Fruit"
+square_fruit   = "Square Fruit"
+heart_fruit    = "Heart Fruit"
+chao_fruit     = "Chao Fruit"
+smart_fruit    = "Smart Fruit"
+
+orange_fruit = "Orange Fruit"
+blue_fruit   = "Blue Fruit"
+pink_fruit   = "Pink Fruit"
+green_fruit  = "Green Fruit"
+purple_fruit = "Purple Fruit"
+yellow_fruit = "Yellow Fruit"
+red_fruit    = "Red Fruit"
+
+mushroom_fruit       = "Mushroom"
+super_mushroom_fruit = "Super Mushroom"
+mint_candy_fruit     = "Mint Candy"
+grapes_fruit         = "Grapes"
+
+
+# Chao Seeds
+strong_seed   = "Strong Seed"
+tasty_seed    = "Tasty Seed"
+hero_seed     = "Hero Seed"
+dark_seed     = "Dark Seed"
+round_seed    = "Round Seed"
+triangle_seed = "Triangle Seed"
+square_seed   = "Square Seed"
+
+
+# Chao Hats
+pumpkin_hat       = "Pumpkin"
+skull_hat         = "Skull"
+apple_hat         = "Apple"
+bucket_hat        = "Bucket"
+empty_can_hat     = "Empty Can"
+cardboard_box_hat = "Cardboard Box"
+flower_pot_hat    = "Flower Pot"
+paper_bag_hat     = "Paper Bag"
+pan_hat           = "Pan"
+stump_hat         = "Stump"
+watermelon_hat    = "Watermelon"
+
+red_wool_beanie_hat   = "Red Wool Beanie"
+blue_wool_beanie_hat  = "Blue Wool Beanie"
+black_wool_beanie_hat = "Black Wool Beanie"
+pacifier_hat          = "Pacifier"
+
+
+# Animal Items
+animal_penguin      = "Penguin"
+animal_seal         = "Seal"
+animal_otter        = "Otter"
+animal_rabbit       = "Rabbit"
+animal_cheetah      = "Cheetah"
+animal_warthog      = "Warthog"
+animal_bear         = "Bear"
+animal_tiger        = "Tiger"
+animal_gorilla      = "Gorilla"
+animal_peacock      = "Peacock"
+animal_parrot       = "Parrot"
+animal_condor       = "Condor"
+animal_skunk        = "Skunk"
+animal_sheep        = "Sheep"
+animal_raccoon      = "Raccoon"
+animal_halffish     = "HalfFish"
+animal_skeleton_dog = "Skeleton Dog"
+animal_bat          = "Bat"
+animal_dragon       = "Dragon"
+animal_unicorn      = "Unicorn"
+animal_phoenix      = "Phoenix"
+
+chaos_drive_yellow = "Yellow Chaos Drive"
+chaos_drive_green  = "Green Chaos Drive"
+chaos_drive_red    = "Red Chaos Drive"
+chaos_drive_purple = "Purple Chaos Drive"
+
+
+# Goal Item
 maria = "What Maria Wanted"
diff --git a/worlds/sa2b/Names/LocationName.py b/worlds/sa2b/Names/LocationName.py
index f0638430fc..bde25a8a75 100644
--- a/worlds/sa2b/Names/LocationName.py
+++ b/worlds/sa2b/Names/LocationName.py
@@ -909,6 +909,7 @@ dry_lagoon_animal_7    = "Dry Lagoon - 7 Animals"
 dry_lagoon_animal_8    = "Dry Lagoon - 8 Animals"
 dry_lagoon_animal_9    = "Dry Lagoon - 9 Animals"
 dry_lagoon_animal_10   = "Dry Lagoon - 10 Animals"
+dry_lagoon_animal_11   = "Dry Lagoon - 11 Animals"
 dry_lagoon_upgrade     = "Dry Lagoon - Upgrade"
 egg_quarters_1         = "Egg Quarters - 1"
 egg_quarters_2         = "Egg Quarters - 2"
@@ -1150,10 +1151,190 @@ chao_race_dark_2 = "Chao Race - Dark 2"
 chao_race_dark_3 = "Chao Race - Dark 3"
 chao_race_dark_4 = "Chao Race - Dark 4"
 
-chao_beginner_karate = "Chao Karate - Beginner"
-chao_standard_karate = "Chao Karate - Standard"
-chao_expert_karate   = "Chao Karate - Expert"
-chao_super_karate    = "Chao Karate - Super"
+chao_beginner_karate_1 = "Chao Karate - Beginner 1"
+chao_beginner_karate_2 = "Chao Karate - Beginner 2"
+chao_beginner_karate_3 = "Chao Karate - Beginner 3"
+chao_beginner_karate_4 = "Chao Karate - Beginner 4"
+chao_beginner_karate_5 = "Chao Karate - Beginner 5"
+chao_standard_karate_1 = "Chao Karate - Standard 1"
+chao_standard_karate_2 = "Chao Karate - Standard 2"
+chao_standard_karate_3 = "Chao Karate - Standard 3"
+chao_standard_karate_4 = "Chao Karate - Standard 4"
+chao_standard_karate_5 = "Chao Karate - Standard 5"
+chao_expert_karate_1   = "Chao Karate - Expert 1"
+chao_expert_karate_2   = "Chao Karate - Expert 2"
+chao_expert_karate_3   = "Chao Karate - Expert 3"
+chao_expert_karate_4   = "Chao Karate - Expert 4"
+chao_expert_karate_5   = "Chao Karate - Expert 5"
+chao_super_karate_1    = "Chao Karate - Super 1"
+chao_super_karate_2    = "Chao Karate - Super 2"
+chao_super_karate_3    = "Chao Karate - Super 3"
+chao_super_karate_4    = "Chao Karate - Super 4"
+chao_super_karate_5    = "Chao Karate - Super 5"
+
+chao_stat_swim_base         = "Chao Stat - Swim - "
+chao_stat_fly_base          = "Chao Stat - Fly - "
+chao_stat_run_base          = "Chao Stat - Run - "
+chao_stat_power_base        = "Chao Stat - Power - "
+chao_stat_stamina_base      = "Chao Stat - Stamina - "
+chao_stat_luck_base         = "Chao Stat - Luck - "
+chao_stat_intelligence_base = "Chao Stat - Intelligence - "
+
+chao_black_market_base = "Black Market - "
+
+# Animal Event Locations
+animal_penguin      = "Penguin Behavior"
+animal_seal         = "Seal Behavior"
+animal_otter        = "Otter Behavior"
+animal_rabbit       = "Rabbit Behavior"
+animal_cheetah      = "Cheetah Behavior"
+animal_warthog      = "Warthog Behavior"
+animal_bear         = "Bear Behavior"
+animal_tiger        = "Tiger Behavior"
+animal_gorilla      = "Gorilla Behavior"
+animal_peacock      = "Peacock Behavior"
+animal_parrot       = "Parrot Behavior"
+animal_condor       = "Condor Behavior"
+animal_skunk        = "Skunk Behavior"
+animal_sheep        = "Sheep Behavior"
+animal_raccoon      = "Raccoon Behavior"
+animal_halffish     = "HalfFish Behavior"
+animal_skeleton_dog = "Skeleton Dog Behavior"
+animal_bat          = "Bat Behavior"
+animal_dragon       = "Dragon Behavior"
+animal_unicorn      = "Unicorn Behavior"
+animal_phoenix      = "Phoenix Behavior"
+
+# Animal Body Part Locations
+chao_penguin_arms      = "Chao - Penguin Arms"
+chao_penguin_forehead  = "Chao - Penguin Forehead"
+chao_penguin_legs      = "Chao - Penguin Legs"
+
+chao_seal_arms     = "Chao - Seal Arms"
+chao_seal_tail     = "Chao - Seal Tail"
+
+chao_otter_arms = "Chao - Otter Arms"
+chao_otter_ears = "Chao - Otter Ears"
+chao_otter_face = "Chao - Otter Face"
+chao_otter_legs = "Chao - Otter Legs"
+chao_otter_tail = "Chao - Otter Tail"
+
+chao_rabbit_arms = "Chao - Rabbit Arms"
+chao_rabbit_ears = "Chao - Rabbit Ears"
+chao_rabbit_legs = "Chao - Rabbit Legs"
+chao_rabbit_tail = "Chao - Rabbit Tail"
+
+chao_cheetah_arms = "Chao - Cheetah Arms"
+chao_cheetah_ears = "Chao - Cheetah Ears"
+chao_cheetah_legs = "Chao - Cheetah Legs"
+chao_cheetah_tail = "Chao - Cheetah Tail"
+
+chao_warthog_arms = "Chao - Warthog Arms"
+chao_warthog_ears = "Chao - Warthog Ears"
+chao_warthog_face = "Chao - Warthog Face"
+chao_warthog_legs = "Chao - Warthog Legs"
+chao_warthog_tail = "Chao - Warthog Tail"
+
+chao_bear_arms = "Chao - Bear Arms"
+chao_bear_ears = "Chao - Bear Ears"
+chao_bear_legs = "Chao - Bear Legs"
+
+chao_tiger_arms = "Chao - Tiger Arms"
+chao_tiger_ears = "Chao - Tiger Ears"
+chao_tiger_legs = "Chao - Tiger Legs"
+chao_tiger_tail = "Chao - Tiger Tail"
+
+chao_gorilla_arms     = "Chao - Gorilla Arms"
+chao_gorilla_ears     = "Chao - Gorilla Ears"
+chao_gorilla_forehead = "Chao - Gorilla Forehead"
+chao_gorilla_legs     = "Chao - Gorilla Legs"
+
+chao_peacock_forehead = "Chao - Peacock Forehead"
+chao_peacock_legs     = "Chao - Peacock Legs"
+chao_peacock_tail     = "Chao - Peacock Tail"
+chao_peacock_wings    = "Chao - Peacock Wings"
+
+chao_parrot_forehead = "Chao - Parrot Forehead"
+chao_parrot_legs     = "Chao - Parrot Legs"
+chao_parrot_tail     = "Chao - Parrot Tail"
+chao_parrot_wings    = "Chao - Parrot Wings"
+
+chao_condor_ears  = "Chao - Condor Ears"
+chao_condor_legs  = "Chao - Condor Legs"
+chao_condor_tail  = "Chao - Condor Tail"
+chao_condor_wings = "Chao - Condor Wings"
+
+chao_skunk_arms     = "Chao - Skunk Arms"
+chao_skunk_forehead = "Chao - Skunk Forehead"
+chao_skunk_legs     = "Chao - Skunk Legs"
+chao_skunk_tail     = "Chao - Skunk Tail"
+
+chao_sheep_arms = "Chao - Sheep Arms"
+chao_sheep_ears = "Chao - Sheep Ears"
+chao_sheep_legs = "Chao - Sheep Legs"
+chao_sheep_horn = "Chao - Sheep Horn"
+chao_sheep_tail = "Chao - Sheep Tail"
+
+chao_raccoon_arms = "Chao - Raccoon Arms"
+chao_raccoon_ears = "Chao - Raccoon Ears"
+chao_raccoon_legs = "Chao - Raccoon Legs"
+
+chao_dragon_arms  = "Chao - Dragon Arms"
+chao_dragon_ears  = "Chao - Dragon Ears"
+chao_dragon_legs  = "Chao - Dragon Legs"
+chao_dragon_horn  = "Chao - Dragon Horn"
+chao_dragon_tail  = "Chao - Dragon Tail"
+chao_dragon_wings = "Chao - Dragon Wings"
+
+chao_unicorn_arms     = "Chao - Unicorn Arms"
+chao_unicorn_ears     = "Chao - Unicorn Ears"
+chao_unicorn_forehead = "Chao - Unicorn Forehead"
+chao_unicorn_legs     = "Chao - Unicorn Legs"
+chao_unicorn_tail     = "Chao - Unicorn Tail"
+
+chao_phoenix_forehead = "Chao - Phoenix Forehead"
+chao_phoenix_legs     = "Chao - Phoenix Legs"
+chao_phoenix_tail     = "Chao - Phoenix Tail"
+chao_phoenix_wings    = "Chao - Phoenix Wings"
+
+# Chao Kindergarten Locations
+chao_kindergarten_drawing_1 = "Chao Kindergarten - Drawing 1"
+chao_kindergarten_drawing_2 = "Chao Kindergarten - Drawing 2"
+chao_kindergarten_drawing_3 = "Chao Kindergarten - Drawing 3"
+chao_kindergarten_drawing_4 = "Chao Kindergarten - Drawing 4"
+chao_kindergarten_drawing_5 = "Chao Kindergarten - Drawing 5"
+
+chao_kindergarten_shake_dance = "Chao Kindergarten - Shake Dance"
+chao_kindergarten_spin_dance  = "Chao Kindergarten - Spin Dance"
+chao_kindergarten_step_dance  = "Chao Kindergarten - Step Dance"
+chao_kindergarten_gogo_dance  = "Chao Kindergarten - Go-Go Dance"
+chao_kindergarten_exercise    = "Chao Kindergarten - Exercise"
+
+chao_kindergarten_song_1 = "Chao Kindergarten - Song 1"
+chao_kindergarten_song_2 = "Chao Kindergarten - Song 2"
+chao_kindergarten_song_3 = "Chao Kindergarten - Song 3"
+chao_kindergarten_song_4 = "Chao Kindergarten - Song 4"
+chao_kindergarten_song_5 = "Chao Kindergarten - Song 5"
+
+chao_kindergarten_bell       = "Chao Kindergarten - Bell"
+chao_kindergarten_castanets  = "Chao Kindergarten - Castanets"
+chao_kindergarten_cymbals    = "Chao Kindergarten - Cymbals"
+chao_kindergarten_drum       = "Chao Kindergarten - Drum"
+chao_kindergarten_flute      = "Chao Kindergarten - Flute"
+chao_kindergarten_maracas    = "Chao Kindergarten - Maracas"
+chao_kindergarten_trumpet    = "Chao Kindergarten - Trumpet"
+chao_kindergarten_tambourine = "Chao Kindergarten - Tambourine"
+
+chao_kindergarten_any_drawing    = "Chao Kindergarten - Any Drawing"
+chao_kindergarten_any_dance      = "Chao Kindergarten - Any Dance"
+chao_kindergarten_any_song       = "Chao Kindergarten - Any Song"
+chao_kindergarten_any_instrument = "Chao Kindergarten - Any Instrument"
+
+
+# Chao Goal Locations
+chaos_chao        = "Chaos Chao"
+chaos_chao_region = "Chaos Chao"
+
 
 # Kart Race Definitions
 kart_race_beginner_sonic    = "Kart Race - Beginner - Sonic"
@@ -1261,9 +1442,18 @@ green_hill_region  = "Green Hill"
 grand_prix        = "Grand Prix"
 grand_prix_region = "Grand Prix"
 
-chao_garden_beginner_region     = "Chao Garden - Beginner"
-chao_garden_intermediate_region = "Chao Garden - Intermediate"
-chao_garden_expert_region       = "Chao Garden - Expert"
+chao_race_beginner_region     = "Chao Race - Beginner"
+chao_race_intermediate_region = "Chao Race - Intermediate"
+chao_race_expert_region       = "Chao Race - Expert"
+
+chao_karate_beginner_region     = "Chao Karate - Beginner"
+chao_karate_intermediate_region = "Chao Karate - Standard"
+chao_karate_expert_region       = "Chao Karate - Expert"
+chao_karate_super_region        = "Chao Karate - Super"
+
+chao_kindergarten_region = "Chao Kindergarten"
+
+black_market_region = "Black Market"
 
 kart_race_beginner_region = "Kart Race - Beginner"
 kart_race_standard_region = "Kart Race - Intermediate"
diff --git a/worlds/sa2b/Options.py b/worlds/sa2b/Options.py
index 6bef9def3d..be00157284 100644
--- a/worlds/sa2b/Options.py
+++ b/worlds/sa2b/Options.py
@@ -13,6 +13,7 @@ class Goal(Choice):
     Boss Rush: Beat all of the bosses in the Boss Rush, ending with Finalhazard
     Cannon's Core Boss Rush: Beat Cannon's Core, then beat all of the bosses in the Boss Rush, ending with Finalhazard
     Boss Rush Chaos Emerald Hunt: Find the Seven Chaos Emeralds, then beat all of the bosses in the Boss Rush, ending with Finalhazard
+    Chaos Chao: Raise a Chaos Chao to win
     """
     display_name = "Goal"
     option_biolizard = 0
@@ -22,6 +23,7 @@ class Goal(Choice):
     option_boss_rush = 4
     option_cannons_core_boss_rush = 5
     option_boss_rush_chaos_emerald_hunt = 6
+    option_chaos_chao = 7
     default = 0
 
     @classmethod
@@ -70,74 +72,81 @@ class BaseTrapWeight(Choice):
 
 class OmochaoTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which spawns several Omochao around the player
+    Likelihood of receiving a trap which spawns several Omochao around the player
     """
     display_name = "OmoTrap Weight"
 
 
 class TimestopTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which briefly stops time
+    Likelihood of receiving a trap which briefly stops time
     """
     display_name = "Chaos Control Trap Weight"
 
 
 class ConfusionTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which causes the controls to be skewed for a period of time
+    Likelihood of receiving a trap which causes the controls to be skewed for a period of time
     """
     display_name = "Confusion Trap Weight"
 
 
 class TinyTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which causes the player to become tiny
+    Likelihood of receiving a trap which causes the player to become tiny
     """
     display_name = "Tiny Trap Weight"
 
 
 class GravityTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which increases gravity
+    Likelihood of receiving a trap which increases gravity
     """
     display_name = "Gravity Trap Weight"
 
 
 class ExpositionTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which tells you the story
+    Likelihood of receiving a trap which tells you the story
     """
     display_name = "Exposition Trap Weight"
 
 
 class DarknessTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which makes the world dark
+    Likelihood of receiving a trap which makes the world dark
     """
     display_name = "Darkness Trap Weight"
 
 
 class IceTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which makes the world slippery
+    Likelihood of receiving a trap which makes the world slippery
     """
     display_name = "Ice Trap Weight"
 
 
 class SlowTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which makes you gotta go slow
+    Likelihood of receiving a trap which makes you gotta go slow
     """
     display_name = "Slow Trap Weight"
 
 
 class CutsceneTrapWeight(BaseTrapWeight):
     """
-    Likelihood of a receiving a trap which makes you watch an unskippable cutscene
+    Likelihood of receiving a trap which makes you watch an unskippable cutscene
     """
     display_name = "Cutscene Trap Weight"
 
 
+class ReverseTrapWeight(BaseTrapWeight):
+    """
+    Likelihood of receiving a trap which reverses your controls
+    """
+    display_name = "Reverse Trap Weight"
+
+
 class PongTrapWeight(BaseTrapWeight):
     """
     Likelihood of receiving a trap which forces you to play a Pong minigame
@@ -219,7 +228,7 @@ class Omosanity(Toggle):
 class Animalsanity(Toggle):
     """
     Determines whether picking up counted small animals grants checks
-    (420 Locations)
+    (421 Locations)
     """
     display_name = "Animalsanity"
 
@@ -291,7 +300,7 @@ class MaximumEmblemCap(Range):
     """
     display_name = "Max Emblem Cap"
     range_start = 50
-    range_end = 500
+    range_end = 1000
     default = 180
 
 
@@ -308,15 +317,15 @@ class RequiredRank(Choice):
     default = 0
 
 
-class ChaoGardenDifficulty(Choice):
+class ChaoRaceDifficulty(Choice):
     """
-    Determines the number of chao garden difficulty levels included. Easier difficulty settings means fewer chao garden checks
-    None: No Chao Garden Activities have checks
+    Determines the number of Chao Race difficulty levels included. Easier difficulty settings means fewer Chao Race checks
+    None: No Chao Races have checks
     Beginner: Beginner Races
     Intermediate: Beginner, Challenge, Hero, and Dark Races
     Expert: Beginner, Challenge, Hero, Dark and Jewel Races
     """
-    display_name = "Chao Garden Difficulty"
+    display_name = "Chao Race Difficulty"
     option_none = 0
     option_beginner = 1
     option_intermediate = 2
@@ -324,26 +333,138 @@ class ChaoGardenDifficulty(Choice):
     default = 0
 
 
-class IncludeChaoKarate(Toggle):
+class ChaoKarateDifficulty(Choice):
     """
-    Determines whether the Chao Karate should be included as checks (Note: This setting requires purchase of the "Battle" DLC)
+    Determines the number of Chao Karate difficulty levels included. (Note: This setting requires purchase of the "Battle" DLC)
     """
-    display_name = "Include Chao Karate"
+    display_name = "Chao Karate Difficulty"
+    option_none = 0
+    option_beginner = 1
+    option_standard = 2
+    option_expert = 3
+    option_super = 4
+    default = 0
 
 
-class ChaoRaceChecks(Choice):
+class ChaoStadiumChecks(Choice):
     """
-    Determines which Chao Races grant checks
-    All: Each individual race grants a check
+    Determines which Chao Stadium activities grant checks
+    All: Each individual race and karate fight grants a check
     Prize: Only the races which grant Chao Toys grant checks (final race of each Beginner and Jewel cup, 4th, 8th, and
-           12th Challenge Races, 2nd and 4th Hero and Dark Races)
+           12th Challenge Races, 2nd and 4th Hero and Dark Races, final fight of each Karate difficulty)
     """
-    display_name = "Chao Race Checks"
+    display_name = "Chao Stadium Checks"
     option_all = 0
     option_prize = 1
     default = 0
 
 
+class ChaoStats(Range):
+    """
+    Determines the highest level in each Chao Stat that grants checks
+    (Swim, Fly, Run, Power)
+    """
+    display_name = "Chao Stats"
+    range_start = 0
+    range_end = 99
+    default = 0
+
+
+class ChaoStatsFrequency(Range):
+    """
+    Determines how many levels in each Chao Stat grant checks (up to the maximum set in the `chao_stats` option)
+    `1` means every level is included, `2` means every other level is included, `3` means every third, and so on
+    """
+    display_name = "Chao Stats Frequency"
+    range_start = 1
+    range_end = 20
+    default = 5
+
+
+class ChaoStatsStamina(Toggle):
+    """
+    Determines whether Stamina is included in the `chao_stats` option
+    """
+    display_name = "Chao Stats - Stamina"
+
+
+class ChaoStatsHidden(Toggle):
+    """
+    Determines whether the hidden stats (Luck and Intelligence) are included in the `chao_stats` option
+    """
+    display_name = "Chao Stats - Luck and Intelligence"
+
+
+class ChaoAnimalParts(Toggle):
+    """
+    Determines whether giving Chao various animal parts grants checks
+    (73 Locations)
+    """
+    display_name = "Chao Animal Parts"
+
+
+class ChaoKindergarten(Choice):
+    """
+    Determines whether learning the lessons from the Kindergarten Classroom grants checks
+    (WARNING: VERY SLOW)
+    None: No Kindergarten classes have checks
+    Basics: One class from each category (Drawing, Dance, Song, and Instrument) is a check (4 Locations)
+    Full: Every class is a check (23 Locations)
+    """
+    display_name = "Chao Kindergarten Checks"
+    option_none = 0
+    option_basics = 1
+    option_full = 2
+    default = 0
+
+
+class BlackMarketSlots(Range):
+    """
+    Determines how many multiworld items are available to purchase from the Black Market
+    """
+    display_name = "Black Market Slots"
+    range_start = 0
+    range_end = 64
+    default = 0
+
+
+class BlackMarketUnlockCosts(Choice):
+    """
+    Determines how many Chao Coins are required to unlock sets of Black Market items
+    """
+    display_name = "Black Market Unlock Costs"
+    option_low = 0
+    option_medium = 1
+    option_high = 2
+    default = 1
+
+
+class BlackMarketPriceMultiplier(Range):
+    """
+    Determines how many rings the Black Market items cost
+    The base ring costs of items in the Black Market range from 50-100,
+    and are then multiplied by this value
+    """
+    display_name = "Black Market Price Multiplier"
+    range_start = 0
+    range_end = 40
+    default = 1
+
+
+class ShuffleStartingChaoEggs(DefaultOnToggle):
+    """
+    Determines whether the starting Chao eggs in the gardens are random
+    """
+    display_name = "Shuffle Starting Chao Eggs"
+
+
+class ChaoEntranceRandomization(Toggle):
+    """
+    Determines whether entrances in Chao World are randomized
+    """
+    display_name = "Chao Entrance Randomization"
+
+
 class RequiredCannonsCoreMissions(Choice):
     """
     Determines how many Cannon's Core missions must be completed (for Biolizard or Cannon's Core goals)
@@ -657,24 +778,42 @@ class LogicDifficulty(Choice):
 
 sa2b_options: typing.Dict[str, type(Option)] = {
     "goal": Goal,
+
     "mission_shuffle": MissionShuffle,
     "boss_rush_shuffle": BossRushShuffle,
+
     "keysanity": Keysanity,
     "whistlesanity": Whistlesanity,
     "beetlesanity": Beetlesanity,
     "omosanity": Omosanity,
     "animalsanity": Animalsanity,
     "kart_race_checks": KartRaceChecks,
+
+    "logic_difficulty": LogicDifficulty,
     "required_rank": RequiredRank,
-    "emblem_percentage_for_cannons_core": EmblemPercentageForCannonsCore,
     "required_cannons_core_missions": RequiredCannonsCoreMissions,
+
+    "emblem_percentage_for_cannons_core": EmblemPercentageForCannonsCore,
     "number_of_level_gates": NumberOfLevelGates,
     "level_gate_distribution": LevelGateDistribution,
     "level_gate_costs": LevelGateCosts,
     "max_emblem_cap": MaximumEmblemCap,
-    "chao_garden_difficulty": ChaoGardenDifficulty,
-    "include_chao_karate": IncludeChaoKarate,
-    "chao_race_checks": ChaoRaceChecks,
+
+    "chao_race_difficulty": ChaoRaceDifficulty,
+    "chao_karate_difficulty": ChaoKarateDifficulty,
+    "chao_stadium_checks": ChaoStadiumChecks,
+    "chao_stats": ChaoStats,
+    "chao_stats_frequency": ChaoStatsFrequency,
+    "chao_stats_stamina": ChaoStatsStamina,
+    "chao_stats_hidden": ChaoStatsHidden,
+    "chao_animal_parts": ChaoAnimalParts,
+    "chao_kindergarten": ChaoKindergarten,
+    "black_market_slots": BlackMarketSlots,
+    "black_market_unlock_costs": BlackMarketUnlockCosts,
+    "black_market_price_multiplier": BlackMarketPriceMultiplier,
+    "shuffle_starting_chao_eggs": ShuffleStartingChaoEggs,
+    "chao_entrance_randomization": ChaoEntranceRandomization,
+
     "junk_fill_percentage": JunkFillPercentage,
     "trap_fill_percentage": TrapFillPercentage,
     "omochao_trap_weight": OmochaoTrapWeight,
@@ -687,39 +826,46 @@ sa2b_options: typing.Dict[str, type(Option)] = {
     "ice_trap_weight": IceTrapWeight,
     "slow_trap_weight": SlowTrapWeight,
     "cutscene_trap_weight": CutsceneTrapWeight,
+    "reverse_trap_weight": ReverseTrapWeight,
     "pong_trap_weight": PongTrapWeight,
     "minigame_trap_difficulty": MinigameTrapDifficulty,
-    "ring_loss": RingLoss,
-    "ring_link": RingLink,
+
     "sadx_music": SADXMusic,
     "music_shuffle": MusicShuffle,
     "voice_shuffle": VoiceShuffle,
     "narrator": Narrator,
-    "logic_difficulty": LogicDifficulty,
+    "ring_loss": RingLoss,
+
     "speed_mission_count": SpeedMissionCount,
     "speed_mission_2": SpeedMission2,
     "speed_mission_3": SpeedMission3,
     "speed_mission_4": SpeedMission4,
     "speed_mission_5": SpeedMission5,
+
     "mech_mission_count": MechMissionCount,
     "mech_mission_2": MechMission2,
     "mech_mission_3": MechMission3,
     "mech_mission_4": MechMission4,
     "mech_mission_5": MechMission5,
+
     "hunt_mission_count": HuntMissionCount,
     "hunt_mission_2": HuntMission2,
     "hunt_mission_3": HuntMission3,
     "hunt_mission_4": HuntMission4,
     "hunt_mission_5": HuntMission5,
+
     "kart_mission_count": KartMissionCount,
     "kart_mission_2": KartMission2,
     "kart_mission_3": KartMission3,
     "kart_mission_4": KartMission4,
     "kart_mission_5": KartMission5,
+
     "cannons_core_mission_count": CannonsCoreMissionCount,
     "cannons_core_mission_2": CannonsCoreMission2,
     "cannons_core_mission_3": CannonsCoreMission3,
     "cannons_core_mission_4": CannonsCoreMission4,
     "cannons_core_mission_5": CannonsCoreMission5,
+
+    "ring_link": RingLink,
     "death_link": DeathLink,
 }
diff --git a/worlds/sa2b/Regions.py b/worlds/sa2b/Regions.py
index da51928330..fb6472d65d 100644
--- a/worlds/sa2b/Regions.py
+++ b/worlds/sa2b/Regions.py
@@ -1,8 +1,14 @@
 import typing
+import math
 
-from BaseClasses import MultiWorld, Region, Entrance
+from BaseClasses import MultiWorld, Region, Entrance, ItemClassification
+from worlds.AutoWorld import World
 from .Items import SA2BItem
-from .Locations import SA2BLocation, boss_gate_location_table, boss_gate_set
+from .Locations import SA2BLocation, boss_gate_location_table, boss_gate_set,\
+                                     chao_stat_swim_table, chao_stat_fly_table, chao_stat_run_table,\
+                                     chao_stat_power_table, chao_stat_stamina_table,\
+                                     chao_stat_luck_table, chao_stat_intelligence_table, chao_animal_event_location_table,\
+                                     chao_kindergarten_location_table, chao_kindergarten_basics_location_table, black_market_location_table
 from .Names import LocationName, ItemName
 from .GateBosses import get_boss_name, all_gate_bosses_table, king_boom_boo
 
@@ -86,35 +92,37 @@ gate_0_whitelist_regions = [
 ]
 
 
-def create_regions(world, player: int, active_locations):
-    menu_region = create_region(world, player, active_locations, 'Menu', None)
+def create_regions(multiworld: MultiWorld, world: World, player: int, active_locations):
+    menu_region = create_region(multiworld, player, active_locations, 'Menu', None)
 
-    gate_0_region = create_region(world, player, active_locations, 'Gate 0', None)
+    conditional_regions = []
+    gate_0_region = create_region(multiworld, player, active_locations, 'Gate 0', None)
+    conditional_regions += [gate_0_region]
 
-    if world.number_of_level_gates[player].value >= 1:
-        gate_1_boss_region = create_region(world, player, active_locations, 'Gate 1 Boss', [LocationName.gate_1_boss])
-        gate_1_region = create_region(world, player, active_locations, 'Gate 1', None)
-        world.regions += [gate_1_region, gate_1_boss_region]
+    if world.options.number_of_level_gates.value >= 1:
+        gate_1_boss_region = create_region(multiworld, player, active_locations, 'Gate 1 Boss', [LocationName.gate_1_boss])
+        gate_1_region = create_region(multiworld, player, active_locations, 'Gate 1', None)
+        conditional_regions += [gate_1_region, gate_1_boss_region]
 
-    if world.number_of_level_gates[player].value >= 2:
-        gate_2_boss_region = create_region(world, player, active_locations, 'Gate 2 Boss', [LocationName.gate_2_boss])
-        gate_2_region = create_region(world, player, active_locations, 'Gate 2', None)
-        world.regions += [gate_2_region, gate_2_boss_region]
+    if world.options.number_of_level_gates.value >= 2:
+        gate_2_boss_region = create_region(multiworld, player, active_locations, 'Gate 2 Boss', [LocationName.gate_2_boss])
+        gate_2_region = create_region(multiworld, player, active_locations, 'Gate 2', None)
+        conditional_regions += [gate_2_region, gate_2_boss_region]
 
-    if world.number_of_level_gates[player].value >= 3:
-        gate_3_boss_region = create_region(world, player, active_locations, 'Gate 3 Boss', [LocationName.gate_3_boss])
-        gate_3_region = create_region(world, player, active_locations, 'Gate 3', None)
-        world.regions += [gate_3_region, gate_3_boss_region]
+    if world.options.number_of_level_gates.value >= 3:
+        gate_3_boss_region = create_region(multiworld, player, active_locations, 'Gate 3 Boss', [LocationName.gate_3_boss])
+        gate_3_region = create_region(multiworld, player, active_locations, 'Gate 3', None)
+        conditional_regions += [gate_3_region, gate_3_boss_region]
 
-    if world.number_of_level_gates[player].value >= 4:
-        gate_4_boss_region = create_region(world, player, active_locations, 'Gate 4 Boss', [LocationName.gate_4_boss])
-        gate_4_region = create_region(world, player, active_locations, 'Gate 4', None)
-        world.regions += [gate_4_region, gate_4_boss_region]
+    if world.options.number_of_level_gates.value >= 4:
+        gate_4_boss_region = create_region(multiworld, player, active_locations, 'Gate 4 Boss', [LocationName.gate_4_boss])
+        gate_4_region = create_region(multiworld, player, active_locations, 'Gate 4', None)
+        conditional_regions += [gate_4_region, gate_4_boss_region]
 
-    if world.number_of_level_gates[player].value >= 5:
-        gate_5_boss_region = create_region(world, player, active_locations, 'Gate 5 Boss', [LocationName.gate_5_boss])
-        gate_5_region = create_region(world, player, active_locations, 'Gate 5', None)
-        world.regions += [gate_5_region, gate_5_boss_region]
+    if world.options.number_of_level_gates.value >= 5:
+        gate_5_boss_region = create_region(multiworld, player, active_locations, 'Gate 5 Boss', [LocationName.gate_5_boss])
+        gate_5_region = create_region(multiworld, player, active_locations, 'Gate 5', None)
+        conditional_regions += [gate_5_region, gate_5_boss_region]
 
     city_escape_region_locations = [
         LocationName.city_escape_1,
@@ -171,7 +179,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.city_escape_animal_20,
         LocationName.city_escape_upgrade,
     ]
-    city_escape_region = create_region(world, player, active_locations, LocationName.city_escape_region,
+    city_escape_region = create_region(multiworld, player, active_locations, LocationName.city_escape_region,
                                        city_escape_region_locations)
 
     metal_harbor_region_locations = [
@@ -206,7 +214,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.metal_harbor_animal_14,
         LocationName.metal_harbor_upgrade,
     ]
-    metal_harbor_region = create_region(world, player, active_locations, LocationName.metal_harbor_region,
+    metal_harbor_region = create_region(multiworld, player, active_locations, LocationName.metal_harbor_region,
                                         metal_harbor_region_locations)
 
     green_forest_region_locations = [
@@ -245,7 +253,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.green_forest_animal_18,
         LocationName.green_forest_upgrade,
     ]
-    green_forest_region = create_region(world, player, active_locations, LocationName.green_forest_region,
+    green_forest_region = create_region(multiworld, player, active_locations, LocationName.green_forest_region,
                                         green_forest_region_locations)
 
     pyramid_cave_region_locations = [
@@ -287,7 +295,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.pyramid_cave_animal_19,
         LocationName.pyramid_cave_upgrade,
     ]
-    pyramid_cave_region = create_region(world, player, active_locations, LocationName.pyramid_cave_region,
+    pyramid_cave_region = create_region(multiworld, player, active_locations, LocationName.pyramid_cave_region,
                                         pyramid_cave_region_locations)
 
     crazy_gadget_region_locations = [
@@ -336,7 +344,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.crazy_gadget_animal_16,
         LocationName.crazy_gadget_upgrade,
     ]
-    crazy_gadget_region = create_region(world, player, active_locations, LocationName.crazy_gadget_region,
+    crazy_gadget_region = create_region(multiworld, player, active_locations, LocationName.crazy_gadget_region,
                                         crazy_gadget_region_locations)
 
     final_rush_region_locations = [
@@ -372,7 +380,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.final_rush_animal_16,
         LocationName.final_rush_upgrade,
     ]
-    final_rush_region = create_region(world, player, active_locations, LocationName.final_rush_region,
+    final_rush_region = create_region(multiworld, player, active_locations, LocationName.final_rush_region,
                                       final_rush_region_locations)
 
     prison_lane_region_locations = [
@@ -418,7 +426,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.prison_lane_animal_15,
         LocationName.prison_lane_upgrade,
     ]
-    prison_lane_region = create_region(world, player, active_locations, LocationName.prison_lane_region,
+    prison_lane_region = create_region(multiworld, player, active_locations, LocationName.prison_lane_region,
                                        prison_lane_region_locations)
 
     mission_street_region_locations = [
@@ -464,7 +472,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.mission_street_animal_16,
         LocationName.mission_street_upgrade,
     ]
-    mission_street_region = create_region(world, player, active_locations, LocationName.mission_street_region,
+    mission_street_region = create_region(multiworld, player, active_locations, LocationName.mission_street_region,
                                           mission_street_region_locations)
 
     route_101_region_locations = [
@@ -474,7 +482,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.route_101_4,
         LocationName.route_101_5,
     ]
-    route_101_region = create_region(world, player, active_locations, LocationName.route_101_region,
+    route_101_region = create_region(multiworld, player, active_locations, LocationName.route_101_region,
                                      route_101_region_locations)
 
     hidden_base_region_locations = [
@@ -512,7 +520,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.hidden_base_animal_15,
         LocationName.hidden_base_upgrade,
     ]
-    hidden_base_region = create_region(world, player, active_locations, LocationName.hidden_base_region,
+    hidden_base_region = create_region(multiworld, player, active_locations, LocationName.hidden_base_region,
                                        hidden_base_region_locations)
 
     eternal_engine_region_locations = [
@@ -559,7 +567,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.eternal_engine_animal_15,
         LocationName.eternal_engine_upgrade,
     ]
-    eternal_engine_region = create_region(world, player, active_locations, LocationName.eternal_engine_region,
+    eternal_engine_region = create_region(multiworld, player, active_locations, LocationName.eternal_engine_region,
                                           eternal_engine_region_locations)
 
     wild_canyon_region_locations = [
@@ -597,7 +605,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.wild_canyon_animal_10,
         LocationName.wild_canyon_upgrade,
     ]
-    wild_canyon_region = create_region(world, player, active_locations, LocationName.wild_canyon_region,
+    wild_canyon_region = create_region(multiworld, player, active_locations, LocationName.wild_canyon_region,
                                        wild_canyon_region_locations)
 
     pumpkin_hill_region_locations = [
@@ -635,7 +643,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.pumpkin_hill_animal_11,
         LocationName.pumpkin_hill_upgrade,
     ]
-    pumpkin_hill_region = create_region(world, player, active_locations, LocationName.pumpkin_hill_region,
+    pumpkin_hill_region = create_region(multiworld, player, active_locations, LocationName.pumpkin_hill_region,
                                         pumpkin_hill_region_locations)
 
     aquatic_mine_region_locations = [
@@ -670,7 +678,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.aquatic_mine_animal_10,
         LocationName.aquatic_mine_upgrade,
     ]
-    aquatic_mine_region = create_region(world, player, active_locations, LocationName.aquatic_mine_region,
+    aquatic_mine_region = create_region(multiworld, player, active_locations, LocationName.aquatic_mine_region,
                                         aquatic_mine_region_locations)
 
     death_chamber_region_locations = [
@@ -709,7 +717,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.death_chamber_animal_10,
         LocationName.death_chamber_upgrade,
     ]
-    death_chamber_region = create_region(world, player, active_locations, LocationName.death_chamber_region,
+    death_chamber_region = create_region(multiworld, player, active_locations, LocationName.death_chamber_region,
                                          death_chamber_region_locations)
 
     meteor_herd_region_locations = [
@@ -741,7 +749,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.meteor_herd_animal_11,
         LocationName.meteor_herd_upgrade,
     ]
-    meteor_herd_region = create_region(world, player, active_locations, LocationName.meteor_herd_region,
+    meteor_herd_region = create_region(multiworld, player, active_locations, LocationName.meteor_herd_region,
                                        meteor_herd_region_locations)
 
     radical_highway_region_locations = [
@@ -790,7 +798,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.radical_highway_animal_20,
         LocationName.radical_highway_upgrade,
     ]
-    radical_highway_region = create_region(world, player, active_locations, LocationName.radical_highway_region,
+    radical_highway_region = create_region(multiworld, player, active_locations, LocationName.radical_highway_region,
                                            radical_highway_region_locations)
 
     white_jungle_region_locations = [
@@ -833,7 +841,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.white_jungle_animal_16,
         LocationName.white_jungle_upgrade,
     ]
-    white_jungle_region = create_region(world, player, active_locations, LocationName.white_jungle_region,
+    white_jungle_region = create_region(multiworld, player, active_locations, LocationName.white_jungle_region,
                                         white_jungle_region_locations)
 
     sky_rail_region_locations = [
@@ -874,7 +882,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.sky_rail_animal_20,
         LocationName.sky_rail_upgrade,
     ]
-    sky_rail_region = create_region(world, player, active_locations, LocationName.sky_rail_region,
+    sky_rail_region = create_region(multiworld, player, active_locations, LocationName.sky_rail_region,
                                     sky_rail_region_locations)
 
     final_chase_region_locations = [
@@ -910,7 +918,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.final_chase_animal_17,
         LocationName.final_chase_upgrade,
     ]
-    final_chase_region = create_region(world, player, active_locations, LocationName.final_chase_region,
+    final_chase_region = create_region(multiworld, player, active_locations, LocationName.final_chase_region,
                                        final_chase_region_locations)
 
     iron_gate_region_locations = [
@@ -951,7 +959,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.iron_gate_animal_15,
         LocationName.iron_gate_upgrade,
     ]
-    iron_gate_region = create_region(world, player, active_locations, LocationName.iron_gate_region,
+    iron_gate_region = create_region(multiworld, player, active_locations, LocationName.iron_gate_region,
                                      iron_gate_region_locations)
 
     sand_ocean_region_locations = [
@@ -988,7 +996,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.sand_ocean_animal_15,
         LocationName.sand_ocean_upgrade,
     ]
-    sand_ocean_region = create_region(world, player, active_locations, LocationName.sand_ocean_region,
+    sand_ocean_region = create_region(multiworld, player, active_locations, LocationName.sand_ocean_region,
                                       sand_ocean_region_locations)
 
     lost_colony_region_locations = [
@@ -1028,7 +1036,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.lost_colony_animal_14,
         LocationName.lost_colony_upgrade,
     ]
-    lost_colony_region = create_region(world, player, active_locations, LocationName.lost_colony_region,
+    lost_colony_region = create_region(multiworld, player, active_locations, LocationName.lost_colony_region,
                                        lost_colony_region_locations)
 
     weapons_bed_region_locations = [
@@ -1065,7 +1073,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.weapons_bed_animal_15,
         LocationName.weapons_bed_upgrade,
     ]
-    weapons_bed_region = create_region(world, player, active_locations, LocationName.weapons_bed_region,
+    weapons_bed_region = create_region(multiworld, player, active_locations, LocationName.weapons_bed_region,
                                        weapons_bed_region_locations)
 
     cosmic_wall_region_locations = [
@@ -1101,7 +1109,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.cosmic_wall_animal_15,
         LocationName.cosmic_wall_upgrade,
     ]
-    cosmic_wall_region = create_region(world, player, active_locations, LocationName.cosmic_wall_region,
+    cosmic_wall_region = create_region(multiworld, player, active_locations, LocationName.cosmic_wall_region,
                                        cosmic_wall_region_locations)
 
     dry_lagoon_region_locations = [
@@ -1138,9 +1146,10 @@ def create_regions(world, player: int, active_locations):
         LocationName.dry_lagoon_animal_8,
         LocationName.dry_lagoon_animal_9,
         LocationName.dry_lagoon_animal_10,
+        LocationName.dry_lagoon_animal_11,
         LocationName.dry_lagoon_upgrade,
     ]
-    dry_lagoon_region = create_region(world, player, active_locations, LocationName.dry_lagoon_region,
+    dry_lagoon_region = create_region(multiworld, player, active_locations, LocationName.dry_lagoon_region,
                                       dry_lagoon_region_locations)
 
     egg_quarters_region_locations = [
@@ -1176,7 +1185,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.egg_quarters_animal_10,
         LocationName.egg_quarters_upgrade,
     ]
-    egg_quarters_region = create_region(world, player, active_locations, LocationName.egg_quarters_region,
+    egg_quarters_region = create_region(multiworld, player, active_locations, LocationName.egg_quarters_region,
                                         egg_quarters_region_locations)
 
     security_hall_region_locations = [
@@ -1213,7 +1222,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.security_hall_animal_8,
         LocationName.security_hall_upgrade,
     ]
-    security_hall_region = create_region(world, player, active_locations, LocationName.security_hall_region,
+    security_hall_region = create_region(multiworld, player, active_locations, LocationName.security_hall_region,
                                          security_hall_region_locations)
 
     route_280_region_locations = [
@@ -1223,7 +1232,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.route_280_4,
         LocationName.route_280_5,
     ]
-    route_280_region = create_region(world, player, active_locations, LocationName.route_280_region,
+    route_280_region = create_region(multiworld, player, active_locations, LocationName.route_280_region,
                                      route_280_region_locations)
 
     mad_space_region_locations = [
@@ -1257,7 +1266,7 @@ def create_regions(world, player: int, active_locations):
         LocationName.mad_space_animal_10,
         LocationName.mad_space_upgrade,
     ]
-    mad_space_region = create_region(world, player, active_locations, LocationName.mad_space_region,
+    mad_space_region = create_region(multiworld, player, active_locations, LocationName.mad_space_region,
                                      mad_space_region_locations)
 
     cannon_core_region_locations = [
@@ -1305,10 +1314,10 @@ def create_regions(world, player: int, active_locations):
         LocationName.cannon_core_animal_19,
         LocationName.cannon_core_beetle,
     ]
-    cannon_core_region = create_region(world, player, active_locations, LocationName.cannon_core_region,
+    cannon_core_region = create_region(multiworld, player, active_locations, LocationName.cannon_core_region,
                                        cannon_core_region_locations)
 
-    chao_garden_beginner_region_locations = [
+    chao_race_beginner_region_locations = [
         LocationName.chao_race_crab_pool_1,
         LocationName.chao_race_crab_pool_2,
         LocationName.chao_race_crab_pool_3,
@@ -1321,13 +1330,21 @@ def create_regions(world, player: int, active_locations):
         LocationName.chao_race_block_canyon_1,
         LocationName.chao_race_block_canyon_2,
         LocationName.chao_race_block_canyon_3,
-
-        LocationName.chao_beginner_karate,
     ]
-    chao_garden_beginner_region = create_region(world, player, active_locations, LocationName.chao_garden_beginner_region,
-                                                chao_garden_beginner_region_locations)
+    chao_race_beginner_region = create_region(multiworld, player, active_locations, LocationName.chao_race_beginner_region,
+                                              chao_race_beginner_region_locations)
 
-    chao_garden_intermediate_region_locations = [
+    chao_karate_beginner_region_locations = [
+        LocationName.chao_beginner_karate_1,
+        LocationName.chao_beginner_karate_2,
+        LocationName.chao_beginner_karate_3,
+        LocationName.chao_beginner_karate_4,
+        LocationName.chao_beginner_karate_5,
+    ]
+    chao_karate_beginner_region = create_region(multiworld, player, active_locations, LocationName.chao_karate_beginner_region,
+                                                chao_karate_beginner_region_locations)
+
+    chao_race_intermediate_region_locations = [
         LocationName.chao_race_challenge_1,
         LocationName.chao_race_challenge_2,
         LocationName.chao_race_challenge_3,
@@ -1350,13 +1367,21 @@ def create_regions(world, player: int, active_locations):
         LocationName.chao_race_dark_2,
         LocationName.chao_race_dark_3,
         LocationName.chao_race_dark_4,
-
-        LocationName.chao_standard_karate,
     ]
-    chao_garden_intermediate_region = create_region(world, player, active_locations, LocationName.chao_garden_intermediate_region,
-                                                    chao_garden_intermediate_region_locations)
+    chao_race_intermediate_region = create_region(multiworld, player, active_locations, LocationName.chao_race_intermediate_region,
+                                                  chao_race_intermediate_region_locations)
 
-    chao_garden_expert_region_locations = [
+    chao_karate_intermediate_region_locations = [
+        LocationName.chao_standard_karate_1,
+        LocationName.chao_standard_karate_2,
+        LocationName.chao_standard_karate_3,
+        LocationName.chao_standard_karate_4,
+        LocationName.chao_standard_karate_5,
+    ]
+    chao_karate_intermediate_region = create_region(multiworld, player, active_locations, LocationName.chao_karate_intermediate_region,
+                                                    chao_karate_intermediate_region_locations)
+
+    chao_race_expert_region_locations = [
         LocationName.chao_race_aquamarine_1,
         LocationName.chao_race_aquamarine_2,
         LocationName.chao_race_aquamarine_3,
@@ -1387,15 +1412,266 @@ def create_regions(world, player: int, active_locations):
         LocationName.chao_race_diamond_3,
         LocationName.chao_race_diamond_4,
         LocationName.chao_race_diamond_5,
-
-        LocationName.chao_expert_karate,
-        LocationName.chao_super_karate,
     ]
-    chao_garden_expert_region = create_region(world, player, active_locations, LocationName.chao_garden_expert_region,
-                                              chao_garden_expert_region_locations)
+    chao_race_expert_region = create_region(multiworld, player, active_locations, LocationName.chao_race_expert_region,
+                                            chao_race_expert_region_locations)
+
+    chao_karate_expert_region_locations = [
+        LocationName.chao_expert_karate_1,
+        LocationName.chao_expert_karate_2,
+        LocationName.chao_expert_karate_3,
+        LocationName.chao_expert_karate_4,
+        LocationName.chao_expert_karate_5,
+    ]
+    chao_karate_expert_region = create_region(multiworld, player, active_locations, LocationName.chao_karate_expert_region,
+                                              chao_karate_expert_region_locations)
+
+    chao_karate_super_region_locations = [
+        LocationName.chao_super_karate_1,
+        LocationName.chao_super_karate_2,
+        LocationName.chao_super_karate_3,
+        LocationName.chao_super_karate_4,
+        LocationName.chao_super_karate_5,
+    ]
+    chao_karate_super_region = create_region(multiworld, player, active_locations, LocationName.chao_karate_super_region,
+                                             chao_karate_super_region_locations)
+
+    if world.options.goal == 7 or world.options.chao_animal_parts:
+        animal_penguin_region_locations = [
+            LocationName.animal_penguin,
+            LocationName.chao_penguin_arms,
+            LocationName.chao_penguin_forehead,
+            LocationName.chao_penguin_legs,
+        ]
+        animal_penguin_region = create_region(multiworld, player, active_locations, LocationName.animal_penguin,
+                                              animal_penguin_region_locations)
+        conditional_regions += [animal_penguin_region]
+
+        animal_seal_region_locations = [
+            LocationName.animal_seal,
+            LocationName.chao_seal_arms,
+            LocationName.chao_seal_tail,
+        ]
+        animal_seal_region = create_region(multiworld, player, active_locations, LocationName.animal_seal,
+                                           animal_seal_region_locations)
+        conditional_regions += [animal_seal_region]
+
+        animal_otter_region_locations = [
+            LocationName.animal_otter,
+            LocationName.chao_otter_arms,
+            LocationName.chao_otter_ears,
+            LocationName.chao_otter_face,
+            LocationName.chao_otter_legs,
+            LocationName.chao_otter_tail,
+        ]
+        animal_otter_region = create_region(multiworld, player, active_locations, LocationName.animal_otter,
+                                            animal_otter_region_locations)
+        conditional_regions += [animal_otter_region]
+
+        animal_rabbit_region_locations = [
+            LocationName.animal_rabbit,
+            LocationName.chao_rabbit_arms,
+            LocationName.chao_rabbit_ears,
+            LocationName.chao_rabbit_legs,
+            LocationName.chao_rabbit_tail,
+        ]
+        animal_rabbit_region = create_region(multiworld, player, active_locations, LocationName.animal_rabbit,
+                                             animal_rabbit_region_locations)
+        conditional_regions += [animal_rabbit_region]
+
+        animal_cheetah_region_locations = [
+            LocationName.animal_cheetah,
+            LocationName.chao_cheetah_arms,
+            LocationName.chao_cheetah_ears,
+            LocationName.chao_cheetah_legs,
+            LocationName.chao_cheetah_tail,
+        ]
+        animal_cheetah_region = create_region(multiworld, player, active_locations, LocationName.animal_cheetah,
+                                              animal_cheetah_region_locations)
+        conditional_regions += [animal_cheetah_region]
+
+        animal_warthog_region_locations = [
+            LocationName.animal_warthog,
+            LocationName.chao_warthog_arms,
+            LocationName.chao_warthog_ears,
+            LocationName.chao_warthog_face,
+            LocationName.chao_warthog_legs,
+            LocationName.chao_warthog_tail,
+        ]
+        animal_warthog_region = create_region(multiworld, player, active_locations, LocationName.animal_warthog,
+                                              animal_warthog_region_locations)
+        conditional_regions += [animal_warthog_region]
+
+        animal_bear_region_locations = [
+            LocationName.animal_bear,
+            LocationName.chao_bear_arms,
+            LocationName.chao_bear_ears,
+            LocationName.chao_bear_legs,
+        ]
+        animal_bear_region = create_region(multiworld, player, active_locations, LocationName.animal_bear,
+                                           animal_bear_region_locations)
+        conditional_regions += [animal_bear_region]
+
+        animal_tiger_region_locations = [
+            LocationName.animal_tiger,
+            LocationName.chao_tiger_arms,
+            LocationName.chao_tiger_ears,
+            LocationName.chao_tiger_legs,
+            LocationName.chao_tiger_tail,
+        ]
+        animal_tiger_region = create_region(multiworld, player, active_locations, LocationName.animal_tiger,
+                                            animal_tiger_region_locations)
+        conditional_regions += [animal_tiger_region]
+
+        animal_gorilla_region_locations = [
+            LocationName.animal_gorilla,
+            LocationName.chao_gorilla_arms,
+            LocationName.chao_gorilla_ears,
+            LocationName.chao_gorilla_forehead,
+            LocationName.chao_gorilla_legs,
+        ]
+        animal_gorilla_region = create_region(multiworld, player, active_locations, LocationName.animal_gorilla,
+                                              animal_gorilla_region_locations)
+        conditional_regions += [animal_gorilla_region]
+
+        animal_peacock_region_locations = [
+            LocationName.animal_peacock,
+            LocationName.chao_peacock_forehead,
+            LocationName.chao_peacock_legs,
+            LocationName.chao_peacock_tail,
+            LocationName.chao_peacock_wings,
+        ]
+        animal_peacock_region = create_region(multiworld, player, active_locations, LocationName.animal_peacock,
+                                              animal_peacock_region_locations)
+        conditional_regions += [animal_peacock_region]
+
+        animal_parrot_region_locations = [
+            LocationName.animal_parrot,
+            LocationName.chao_parrot_forehead,
+            LocationName.chao_parrot_legs,
+            LocationName.chao_parrot_tail,
+            LocationName.chao_parrot_wings,
+        ]
+        animal_parrot_region = create_region(multiworld, player, active_locations, LocationName.animal_parrot,
+                                             animal_parrot_region_locations)
+        conditional_regions += [animal_parrot_region]
+
+        animal_condor_region_locations = [
+            LocationName.animal_condor,
+            LocationName.chao_condor_ears,
+            LocationName.chao_condor_legs,
+            LocationName.chao_condor_tail,
+            LocationName.chao_condor_wings,
+        ]
+        animal_condor_region = create_region(multiworld, player, active_locations, LocationName.animal_condor,
+                                             animal_condor_region_locations)
+        conditional_regions += [animal_condor_region]
+
+        animal_skunk_region_locations = [
+            LocationName.animal_skunk,
+            LocationName.chao_skunk_arms,
+            LocationName.chao_skunk_forehead,
+            LocationName.chao_skunk_legs,
+            LocationName.chao_skunk_tail,
+        ]
+        animal_skunk_region = create_region(multiworld, player, active_locations, LocationName.animal_skunk,
+                                            animal_skunk_region_locations)
+        conditional_regions += [animal_skunk_region]
+
+        animal_sheep_region_locations = [
+            LocationName.animal_sheep,
+            LocationName.chao_sheep_arms,
+            LocationName.chao_sheep_ears,
+            LocationName.chao_sheep_legs,
+            LocationName.chao_sheep_horn,
+            LocationName.chao_sheep_tail,
+        ]
+        animal_sheep_region = create_region(multiworld, player, active_locations, LocationName.animal_sheep,
+                                            animal_sheep_region_locations)
+        conditional_regions += [animal_sheep_region]
+
+        animal_raccoon_region_locations = [
+            LocationName.animal_raccoon,
+            LocationName.chao_raccoon_arms,
+            LocationName.chao_raccoon_ears,
+            LocationName.chao_raccoon_legs,
+        ]
+        animal_raccoon_region = create_region(multiworld, player, active_locations, LocationName.animal_raccoon,
+                                              animal_raccoon_region_locations)
+        conditional_regions += [animal_raccoon_region]
+
+        animal_halffish_region_locations = [
+            LocationName.animal_halffish,
+        ]
+        animal_halffish_region = create_region(multiworld, player, active_locations, LocationName.animal_halffish,
+                                               animal_halffish_region_locations)
+        conditional_regions += [animal_halffish_region]
+
+        animal_skeleton_dog_region_locations = [
+            LocationName.animal_skeleton_dog,
+        ]
+        animal_skeleton_dog_region = create_region(multiworld, player, active_locations, LocationName.animal_skeleton_dog,
+                                                   animal_skeleton_dog_region_locations)
+        conditional_regions += [animal_skeleton_dog_region]
+
+        animal_bat_region_locations = [
+            LocationName.animal_bat,
+        ]
+        animal_bat_region = create_region(multiworld, player, active_locations, LocationName.animal_bat,
+                                          animal_bat_region_locations)
+        conditional_regions += [animal_bat_region]
+
+        animal_dragon_region_locations = [
+            LocationName.animal_dragon,
+            LocationName.chao_dragon_arms,
+            LocationName.chao_dragon_ears,
+            LocationName.chao_dragon_legs,
+            LocationName.chao_dragon_horn,
+            LocationName.chao_dragon_tail,
+            LocationName.chao_dragon_wings,
+        ]
+        animal_dragon_region = create_region(multiworld, player, active_locations, LocationName.animal_dragon,
+                                             animal_dragon_region_locations)
+        conditional_regions += [animal_dragon_region]
+
+        animal_unicorn_region_locations = [
+            LocationName.animal_unicorn,
+            LocationName.chao_unicorn_arms,
+            LocationName.chao_unicorn_ears,
+            LocationName.chao_unicorn_forehead,
+            LocationName.chao_unicorn_legs,
+            LocationName.chao_unicorn_tail,
+        ]
+        animal_unicorn_region = create_region(multiworld, player, active_locations, LocationName.animal_unicorn,
+                                              animal_unicorn_region_locations)
+        conditional_regions += [animal_unicorn_region]
+
+        animal_phoenix_region_locations = [
+            LocationName.animal_phoenix,
+            LocationName.chao_phoenix_forehead,
+            LocationName.chao_phoenix_legs,
+            LocationName.chao_phoenix_tail,
+            LocationName.chao_phoenix_wings,
+        ]
+        animal_phoenix_region = create_region(multiworld, player, active_locations, LocationName.animal_phoenix,
+                                              animal_phoenix_region_locations)
+        conditional_regions += [animal_phoenix_region]
+
+    if world.options.chao_kindergarten:
+        chao_kindergarten_region_locations = list(chao_kindergarten_location_table.keys()) + list(chao_kindergarten_basics_location_table.keys())
+        chao_kindergarten_region = create_region(multiworld, player, active_locations, LocationName.chao_kindergarten_region,
+                                                 chao_kindergarten_region_locations)
+        conditional_regions += [chao_kindergarten_region]
+
+    if world.options.black_market_slots.value > 0:
+
+        black_market_region_locations = list(black_market_location_table.keys())
+        black_market_region = create_region(multiworld, player, active_locations, LocationName.black_market_region,
+                                            black_market_region_locations)
+        conditional_regions += [black_market_region]
 
     kart_race_beginner_region_locations = []
-    if world.kart_race_checks[player] == 2:
+    if world.options.kart_race_checks == 2:
         kart_race_beginner_region_locations.extend([
             LocationName.kart_race_beginner_sonic,
             LocationName.kart_race_beginner_tails,
@@ -1404,13 +1680,13 @@ def create_regions(world, player: int, active_locations):
             LocationName.kart_race_beginner_eggman,
             LocationName.kart_race_beginner_rouge,
         ])
-    if world.kart_race_checks[player] == 1:
+    if world.options.kart_race_checks == 1:
         kart_race_beginner_region_locations.append(LocationName.kart_race_beginner)
-    kart_race_beginner_region = create_region(world, player, active_locations, LocationName.kart_race_beginner_region,
+    kart_race_beginner_region = create_region(multiworld, player, active_locations, LocationName.kart_race_beginner_region,
                                               kart_race_beginner_region_locations)
 
     kart_race_standard_region_locations = []
-    if world.kart_race_checks[player] == 2:
+    if world.options.kart_race_checks == 2:
         kart_race_standard_region_locations.extend([
             LocationName.kart_race_standard_sonic,
             LocationName.kart_race_standard_tails,
@@ -1419,13 +1695,13 @@ def create_regions(world, player: int, active_locations):
             LocationName.kart_race_standard_eggman,
             LocationName.kart_race_standard_rouge,
         ])
-    if world.kart_race_checks[player] == 1:
+    if world.options.kart_race_checks == 1:
         kart_race_standard_region_locations.append(LocationName.kart_race_standard)
-    kart_race_standard_region = create_region(world, player, active_locations, LocationName.kart_race_standard_region,
+    kart_race_standard_region = create_region(multiworld, player, active_locations, LocationName.kart_race_standard_region,
                                               kart_race_standard_region_locations)
 
     kart_race_expert_region_locations = []
-    if world.kart_race_checks[player] == 2:
+    if world.options.kart_race_checks == 2:
         kart_race_expert_region_locations.extend([
             LocationName.kart_race_expert_sonic,
             LocationName.kart_race_expert_tails,
@@ -1434,51 +1710,56 @@ def create_regions(world, player: int, active_locations):
             LocationName.kart_race_expert_eggman,
             LocationName.kart_race_expert_rouge,
         ])
-    if world.kart_race_checks[player] == 1:
+    if world.options.kart_race_checks == 1:
         kart_race_expert_region_locations.append(LocationName.kart_race_expert)
-    kart_race_expert_region = create_region(world, player, active_locations, LocationName.kart_race_expert_region,
+    kart_race_expert_region = create_region(multiworld, player, active_locations, LocationName.kart_race_expert_region,
                                             kart_race_expert_region_locations)
 
-    if world.goal[player] == 3:
+    if world.options.goal == 3:
         grand_prix_region_locations = [
             LocationName.grand_prix,
         ]
-        grand_prix_region = create_region(world, player, active_locations, LocationName.grand_prix_region,
+        grand_prix_region = create_region(multiworld, player, active_locations, LocationName.grand_prix_region,
                                           grand_prix_region_locations)
-        world.regions += [grand_prix_region]
-
-    if world.goal[player] in [0, 2, 4, 5, 6]:
+        conditional_regions += [grand_prix_region]
+    elif world.options.goal in [0, 2, 4, 5, 6]:
         biolizard_region_locations = [
             LocationName.finalhazard,
         ]
-        biolizard_region = create_region(world, player, active_locations, LocationName.biolizard_region,
+        biolizard_region = create_region(multiworld, player, active_locations, LocationName.biolizard_region,
                                          biolizard_region_locations)
-        world.regions += [biolizard_region]
+        conditional_regions += [biolizard_region]
+    elif world.options.goal == 7:
+        chaos_chao_region_locations = [
+            LocationName.chaos_chao,
+        ]
+        chaos_chao_region = create_region(multiworld, player, active_locations, LocationName.chaos_chao_region,
+                                          chaos_chao_region_locations)
+        conditional_regions += [chaos_chao_region]
 
-    if world.goal[player] in [1, 2]:
+    if world.options.goal in [1, 2]:
         green_hill_region_locations = [
             LocationName.green_hill,
             LocationName.green_hill_chao_1,
             #LocationName.green_hill_animal_1,
         ]
-        green_hill_region = create_region(world, player, active_locations, LocationName.green_hill_region,
+        green_hill_region = create_region(multiworld, player, active_locations, LocationName.green_hill_region,
                                           green_hill_region_locations)
-        world.regions += [green_hill_region]
+        conditional_regions += [green_hill_region]
 
-    if world.goal[player] in [4, 5, 6]:
+    if world.options.goal in [4, 5, 6]:
         for i in range(16):
             boss_region_locations = [
                 "Boss Rush - " + str(i + 1),
             ]
-            boss_region = create_region(world, player, active_locations, "Boss Rush " + str(i + 1),
+            boss_region = create_region(multiworld, player, active_locations, "Boss Rush " + str(i + 1),
                                         boss_region_locations)
-            world.regions += [boss_region]
+            conditional_regions += [boss_region]
 
 
     # Set up the regions correctly.
-    world.regions += [
+    multiworld.regions += [
         menu_region,
-        gate_0_region,
         city_escape_region,
         metal_harbor_region,
         green_forest_region,
@@ -1510,32 +1791,38 @@ def create_regions(world, player: int, active_locations):
         route_280_region,
         mad_space_region,
         cannon_core_region,
-        chao_garden_beginner_region,
-        chao_garden_intermediate_region,
-        chao_garden_expert_region,
+        chao_race_beginner_region,
+        chao_karate_beginner_region,
+        chao_race_intermediate_region,
+        chao_karate_intermediate_region,
+        chao_race_expert_region,
+        chao_karate_expert_region,
+        chao_karate_super_region,
         kart_race_beginner_region,
         kart_race_standard_region,
         kart_race_expert_region,
     ]
 
+    multiworld.regions += conditional_regions
 
-def connect_regions(world, player, gates: typing.List[LevelGate], cannon_core_emblems, gate_bosses, boss_rush_bosses, first_cannons_core_mission: str, final_cannons_core_mission: str):
+
+def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: typing.List[LevelGate], cannon_core_emblems, gate_bosses, boss_rush_bosses, first_cannons_core_mission: str, final_cannons_core_mission: str):
     names: typing.Dict[str, int] = {}
 
-    connect(world, player, names, 'Menu', LocationName.gate_0_region)
-    connect(world, player, names, LocationName.gate_0_region, LocationName.cannon_core_region,
+    connect(multiworld, player, names, 'Menu', LocationName.gate_0_region)
+    connect(multiworld, player, names, LocationName.gate_0_region, LocationName.cannon_core_region,
             lambda state: (state.has(ItemName.emblem, player, cannon_core_emblems)))
 
-    if world.goal[player] == 0:
+    if world.options.goal == 0:
         required_mission_name = first_cannons_core_mission
 
-        if world.required_cannons_core_missions[player].value == 1:
+        if world.options.required_cannons_core_missions.value == 1:
             required_mission_name = final_cannons_core_mission
 
-        connect(world, player, names, LocationName.cannon_core_region, LocationName.biolizard_region,
+        connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.biolizard_region,
                 lambda state: (state.can_reach(required_mission_name, "Location", player)))
-    elif world.goal[player] in [1, 2]:
-        connect(world, player, names, 'Menu', LocationName.green_hill_region,
+    elif world.options.goal in [1, 2]:
+        connect(multiworld, player, names, 'Menu', LocationName.green_hill_region,
                 lambda state: (state.has(ItemName.white_emerald, player) and
                                state.has(ItemName.red_emerald, player) and
                                state.has(ItemName.cyan_emerald, player) and
@@ -1543,23 +1830,23 @@ def connect_regions(world, player, gates: typing.List[LevelGate], cannon_core_em
                                state.has(ItemName.green_emerald, player) and
                                state.has(ItemName.yellow_emerald, player) and
                                state.has(ItemName.blue_emerald, player)))
-        if world.goal[player] == 2:
-            connect(world, player, names, LocationName.green_hill_region, LocationName.biolizard_region)
-    elif world.goal[player] == 3:
-        connect(world, player, names, LocationName.kart_race_expert_region, LocationName.grand_prix_region)
-    elif world.goal[player] in [4, 5, 6]:
-        if world.goal[player] == 4:
-            connect(world, player, names, LocationName.gate_0_region, LocationName.boss_rush_1_region)
-        elif world.goal[player] == 5:
+        if world.options.goal == 2:
+            connect(multiworld, player, names, LocationName.green_hill_region, LocationName.biolizard_region)
+    elif world.options.goal == 3:
+        connect(multiworld, player, names, LocationName.kart_race_expert_region, LocationName.grand_prix_region)
+    elif world.options.goal in [4, 5, 6]:
+        if world.options.goal == 4:
+            connect(multiworld, player, names, LocationName.gate_0_region, LocationName.boss_rush_1_region)
+        elif world.options.goal == 5:
             required_mission_name = first_cannons_core_mission
 
-            if world.required_cannons_core_missions[player].value == 1:
+            if world.options.required_cannons_core_missions.value == 1:
                 required_mission_name = final_cannons_core_mission
 
-            connect(world, player, names, LocationName.cannon_core_region, LocationName.boss_rush_1_region,
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.boss_rush_1_region,
                     lambda state: (state.can_reach(required_mission_name, "Location", player)))
-        elif world.goal[player] == 6:
-            connect(world, player, names, LocationName.gate_0_region, LocationName.boss_rush_1_region,
+        elif world.options.goal == 6:
+            connect(multiworld, player, names, LocationName.gate_0_region, LocationName.boss_rush_1_region,
                     lambda state: (state.has(ItemName.white_emerald, player) and
                                    state.has(ItemName.red_emerald, player) and
                                    state.has(ItemName.cyan_emerald, player) and
@@ -1570,134 +1857,576 @@ def connect_regions(world, player, gates: typing.List[LevelGate], cannon_core_em
 
         for i in range(15):
             if boss_rush_bosses[i] == all_gate_bosses_table[king_boom_boo]:
-                connect(world, player, names, "Boss Rush " + str(i + 1), "Boss Rush " + str(i + 2),
+                connect(multiworld, player, names, "Boss Rush " + str(i + 1), "Boss Rush " + str(i + 2),
                         lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
             else:
-                connect(world, player, names, "Boss Rush " + str(i + 1), "Boss Rush " + str(i + 2))
+                connect(multiworld, player, names, "Boss Rush " + str(i + 1), "Boss Rush " + str(i + 2))
 
-        connect(world, player, names, LocationName.boss_rush_16_region, LocationName.biolizard_region)
+        connect(multiworld, player, names, LocationName.boss_rush_16_region, LocationName.biolizard_region)
+    elif world.options.goal == 7:
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chaos_chao,
+                lambda state: (state.has_all(chao_animal_event_location_table.keys(), player)))
 
     for i in range(len(gates[0].gate_levels)):
-        connect(world, player, names, LocationName.gate_0_region, shuffleable_regions[gates[0].gate_levels[i]])
+        connect(multiworld, player, names, LocationName.gate_0_region, shuffleable_regions[gates[0].gate_levels[i]])
 
     gates_len = len(gates)
     if gates_len >= 2:
-        connect(world, player, names, LocationName.gate_0_region, LocationName.gate_1_boss_region,
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.gate_1_boss_region,
                 lambda state: (state.has(ItemName.emblem, player, gates[1].gate_emblem_count)))
 
         if gate_bosses[1] == all_gate_bosses_table[king_boom_boo]:
-            connect(world, player, names, LocationName.gate_1_boss_region, LocationName.gate_1_region,
+            connect(multiworld, player, names, LocationName.gate_1_boss_region, LocationName.gate_1_region,
                     lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
         else:
-            connect(world, player, names, LocationName.gate_1_boss_region, LocationName.gate_1_region)
+            connect(multiworld, player, names, LocationName.gate_1_boss_region, LocationName.gate_1_region)
 
         for i in range(len(gates[1].gate_levels)):
-            connect(world, player, names, LocationName.gate_1_region, shuffleable_regions[gates[1].gate_levels[i]])
+            connect(multiworld, player, names, LocationName.gate_1_region, shuffleable_regions[gates[1].gate_levels[i]])
 
     if gates_len >= 3:
-        connect(world, player, names, LocationName.gate_1_region, LocationName.gate_2_boss_region,
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.gate_2_boss_region,
                 lambda state: (state.has(ItemName.emblem, player, gates[2].gate_emblem_count)))
 
         if gate_bosses[2] == all_gate_bosses_table[king_boom_boo]:
-            connect(world, player, names, LocationName.gate_2_boss_region, LocationName.gate_2_region,
+            connect(multiworld, player, names, LocationName.gate_2_boss_region, LocationName.gate_2_region,
                     lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
         else:
-            connect(world, player, names, LocationName.gate_2_boss_region, LocationName.gate_2_region)
+            connect(multiworld, player, names, LocationName.gate_2_boss_region, LocationName.gate_2_region)
 
         for i in range(len(gates[2].gate_levels)):
-            connect(world, player, names, LocationName.gate_2_region, shuffleable_regions[gates[2].gate_levels[i]])
+            connect(multiworld, player, names, LocationName.gate_2_region, shuffleable_regions[gates[2].gate_levels[i]])
 
     if gates_len >= 4:
-        connect(world, player, names, LocationName.gate_2_region, LocationName.gate_3_boss_region,
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.gate_3_boss_region,
                 lambda state: (state.has(ItemName.emblem, player, gates[3].gate_emblem_count)))
 
         if gate_bosses[3] == all_gate_bosses_table[king_boom_boo]:
-            connect(world, player, names, LocationName.gate_3_boss_region, LocationName.gate_3_region,
+            connect(multiworld, player, names, LocationName.gate_3_boss_region, LocationName.gate_3_region,
                     lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
         else:
-            connect(world, player, names, LocationName.gate_3_boss_region, LocationName.gate_3_region)
+            connect(multiworld, player, names, LocationName.gate_3_boss_region, LocationName.gate_3_region)
 
         for i in range(len(gates[3].gate_levels)):
-            connect(world, player, names, LocationName.gate_3_region, shuffleable_regions[gates[3].gate_levels[i]])
+            connect(multiworld, player, names, LocationName.gate_3_region, shuffleable_regions[gates[3].gate_levels[i]])
 
     if gates_len >= 5:
-        connect(world, player, names, LocationName.gate_3_region, LocationName.gate_4_boss_region,
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.gate_4_boss_region,
                 lambda state: (state.has(ItemName.emblem, player, gates[4].gate_emblem_count)))
 
         if gate_bosses[4] == all_gate_bosses_table[king_boom_boo]:
-            connect(world, player, names, LocationName.gate_4_boss_region, LocationName.gate_4_region,
+            connect(multiworld, player, names, LocationName.gate_4_boss_region, LocationName.gate_4_region,
                     lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
         else:
-            connect(world, player, names, LocationName.gate_4_boss_region, LocationName.gate_4_region)
+            connect(multiworld, player, names, LocationName.gate_4_boss_region, LocationName.gate_4_region)
 
         for i in range(len(gates[4].gate_levels)):
-            connect(world, player, names, LocationName.gate_4_region, shuffleable_regions[gates[4].gate_levels[i]])
+            connect(multiworld, player, names, LocationName.gate_4_region, shuffleable_regions[gates[4].gate_levels[i]])
 
     if gates_len >= 6:
-        connect(world, player, names, LocationName.gate_4_region, LocationName.gate_5_boss_region,
+        connect(multiworld, player, names, LocationName.gate_4_region, LocationName.gate_5_boss_region,
                 lambda state: (state.has(ItemName.emblem, player, gates[5].gate_emblem_count)))
 
         if gate_bosses[5] == all_gate_bosses_table[king_boom_boo]:
-            connect(world, player, names, LocationName.gate_5_boss_region, LocationName.gate_5_region,
+            connect(multiworld, player, names, LocationName.gate_5_boss_region, LocationName.gate_5_region,
                     lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
         else:
-            connect(world, player, names, LocationName.gate_5_boss_region, LocationName.gate_5_region)
+            connect(multiworld, player, names, LocationName.gate_5_boss_region, LocationName.gate_5_region)
 
         for i in range(len(gates[5].gate_levels)):
-            connect(world, player, names, LocationName.gate_5_region, shuffleable_regions[gates[5].gate_levels[i]])
+            connect(multiworld, player, names, LocationName.gate_5_region, shuffleable_regions[gates[5].gate_levels[i]])
 
     if gates_len == 1:
-        connect(world, player, names, LocationName.gate_0_region, LocationName.chao_garden_beginner_region)
-        connect(world, player, names, LocationName.gate_0_region, LocationName.chao_garden_intermediate_region)
-        connect(world, player, names, LocationName.gate_0_region, LocationName.chao_garden_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_race_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_race_expert_region)
 
-        connect(world, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
-        connect(world, player, names, LocationName.gate_0_region, LocationName.kart_race_standard_region)
-        connect(world, player, names, LocationName.gate_0_region, LocationName.kart_race_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_super_region)
+
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.kart_race_standard_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.kart_race_expert_region)
+
+        if world.options.chao_kindergarten:
+            connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_kindergarten_region)
     elif gates_len == 2:
-        connect(world, player, names, LocationName.gate_0_region, LocationName.chao_garden_beginner_region)
-        connect(world, player, names, LocationName.gate_0_region, LocationName.chao_garden_intermediate_region)
-        connect(world, player, names, LocationName.gate_1_region, LocationName.chao_garden_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_race_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_race_expert_region)
 
-        connect(world, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
-        connect(world, player, names, LocationName.gate_0_region, LocationName.kart_race_standard_region)
-        connect(world, player, names, LocationName.gate_1_region, LocationName.kart_race_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_karate_expert_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_karate_super_region)
+
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.kart_race_standard_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.kart_race_expert_region)
+
+        if world.options.chao_kindergarten:
+            connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_kindergarten_region)
     elif gates_len == 3:
-        connect(world, player, names, LocationName.gate_0_region, LocationName.chao_garden_beginner_region)
-        connect(world, player, names, LocationName.gate_1_region, LocationName.chao_garden_intermediate_region)
-        connect(world, player, names, LocationName.gate_2_region, LocationName.chao_garden_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_race_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_race_expert_region)
 
-        connect(world, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
-        connect(world, player, names, LocationName.gate_1_region, LocationName.kart_race_standard_region)
-        connect(world, player, names, LocationName.gate_2_region, LocationName.kart_race_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_karate_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_karate_expert_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_karate_super_region)
+
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.kart_race_standard_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.kart_race_expert_region)
+
+        if world.options.chao_kindergarten:
+            connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_kindergarten_region)
     elif gates_len == 4:
-        connect(world, player, names, LocationName.gate_0_region, LocationName.chao_garden_beginner_region)
-        connect(world, player, names, LocationName.gate_1_region, LocationName.chao_garden_intermediate_region)
-        connect(world, player, names, LocationName.gate_3_region, LocationName.chao_garden_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_race_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.chao_race_expert_region)
 
-        connect(world, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
-        connect(world, player, names, LocationName.gate_1_region, LocationName.kart_race_standard_region)
-        connect(world, player, names, LocationName.gate_3_region, LocationName.kart_race_expert_region)
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.chao_karate_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_karate_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_karate_expert_region)
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.chao_karate_super_region)
+
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.kart_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.kart_race_standard_region)
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.kart_race_expert_region)
+
+        if world.options.chao_kindergarten:
+            connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_kindergarten_region)
     elif gates_len == 5:
-        connect(world, player, names, LocationName.gate_1_region, LocationName.chao_garden_beginner_region)
-        connect(world, player, names, LocationName.gate_2_region, LocationName.chao_garden_intermediate_region)
-        connect(world, player, names, LocationName.gate_3_region, LocationName.chao_garden_expert_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_race_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.chao_race_expert_region)
 
-        connect(world, player, names, LocationName.gate_1_region, LocationName.kart_race_beginner_region)
-        connect(world, player, names, LocationName.gate_2_region, LocationName.kart_race_standard_region)
-        connect(world, player, names, LocationName.gate_3_region, LocationName.kart_race_expert_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_karate_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_karate_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.chao_karate_expert_region)
+        connect(multiworld, player, names, LocationName.gate_4_region, LocationName.chao_karate_super_region)
+
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.kart_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.kart_race_standard_region)
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.kart_race_expert_region)
+
+        if world.options.chao_kindergarten:
+            connect(multiworld, player, names, LocationName.gate_3_region, LocationName.chao_kindergarten_region)
     elif gates_len >= 6:
-        connect(world, player, names, LocationName.gate_1_region, LocationName.chao_garden_beginner_region)
-        connect(world, player, names, LocationName.gate_2_region, LocationName.chao_garden_intermediate_region)
-        connect(world, player, names, LocationName.gate_4_region, LocationName.chao_garden_expert_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_race_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_4_region, LocationName.chao_race_expert_region)
 
-        connect(world, player, names, LocationName.gate_1_region, LocationName.kart_race_beginner_region)
-        connect(world, player, names, LocationName.gate_2_region, LocationName.kart_race_standard_region)
-        connect(world, player, names, LocationName.gate_4_region, LocationName.kart_race_expert_region)
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.chao_karate_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.chao_karate_intermediate_region)
+        connect(multiworld, player, names, LocationName.gate_3_region, LocationName.chao_karate_expert_region)
+        connect(multiworld, player, names, LocationName.gate_4_region, LocationName.chao_karate_super_region)
+
+        connect(multiworld, player, names, LocationName.gate_1_region, LocationName.kart_race_beginner_region)
+        connect(multiworld, player, names, LocationName.gate_2_region, LocationName.kart_race_standard_region)
+        connect(multiworld, player, names, LocationName.gate_4_region, LocationName.kart_race_expert_region)
+
+        if world.options.chao_kindergarten:
+            connect(multiworld, player, names, LocationName.gate_3_region, LocationName.chao_kindergarten_region)
+
+    stat_checks_per_gate = world.options.chao_stats.value / (gates_len)
+    for index in range(1, world.options.chao_stats.value + 1):
+        if (index % world.options.chao_stats_frequency.value) == (world.options.chao_stats.value % world.options.chao_stats_frequency.value):
+            gate_val    = math.ceil(index / stat_checks_per_gate) - 1
+            gate_region = multiworld.get_region("Gate " + str(gate_val), player)
+
+            loc_name_swim = LocationName.chao_stat_swim_base + str(index)
+            loc_id_swim   = chao_stat_swim_table[loc_name_swim]
+            location_swim = SA2BLocation(player, loc_name_swim, loc_id_swim, gate_region)
+            gate_region.locations.append(location_swim)
+
+            loc_name_fly = LocationName.chao_stat_fly_base + str(index)
+            loc_id_fly   = chao_stat_fly_table[loc_name_fly]
+            location_fly = SA2BLocation(player, loc_name_fly, loc_id_fly, gate_region)
+            gate_region.locations.append(location_fly)
+
+            loc_name_run = LocationName.chao_stat_run_base + str(index)
+            loc_id_run   = chao_stat_run_table[loc_name_run]
+            location_run = SA2BLocation(player, loc_name_run, loc_id_run, gate_region)
+            gate_region.locations.append(location_run)
+
+            loc_name_power = LocationName.chao_stat_power_base + str(index)
+            loc_id_power   = chao_stat_power_table[loc_name_power]
+            location_power = SA2BLocation(player, loc_name_power, loc_id_power, gate_region)
+            gate_region.locations.append(location_power)
+
+            if world.options.chao_stats_stamina:
+                loc_name_stamina = LocationName.chao_stat_stamina_base + str(index)
+                loc_id_stamina   = chao_stat_stamina_table[loc_name_stamina]
+                location_stamina = SA2BLocation(player, loc_name_stamina, loc_id_stamina, gate_region)
+                gate_region.locations.append(location_stamina)
+
+            if world.options.chao_stats_hidden:
+                loc_name_luck = LocationName.chao_stat_luck_base + str(index)
+                loc_id_luck   = chao_stat_luck_table[loc_name_luck]
+                location_luck = SA2BLocation(player, loc_name_luck, loc_id_luck, gate_region)
+                gate_region.locations.append(location_luck)
+
+                loc_name_intelligence = LocationName.chao_stat_intelligence_base + str(index)
+                loc_id_intelligence   = chao_stat_intelligence_table[loc_name_intelligence]
+                location_intelligence = SA2BLocation(player, loc_name_intelligence, loc_id_intelligence, gate_region)
+                gate_region.locations.append(location_intelligence)
+
+    # Handle access to Animal Parts
+    if world.options.goal == 7 or world.options.chao_animal_parts:
+        connect(multiworld, player, names, LocationName.city_escape_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.city_escape_region, LocationName.animal_skunk)
+        connect(multiworld, player, names, LocationName.city_escape_region, LocationName.animal_sheep)
+        connect(multiworld, player, names, LocationName.city_escape_region, LocationName.animal_raccoon)
+
+        connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_cheetah)
+        connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_condor)
+        connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_sheep)
+
+        connect(multiworld, player, names, LocationName.prison_lane_region, LocationName.animal_otter)
+        connect(multiworld, player, names, LocationName.prison_lane_region, LocationName.animal_tiger)
+        connect(multiworld, player, names, LocationName.prison_lane_region, LocationName.animal_gorilla)
+        connect(multiworld, player, names, LocationName.prison_lane_region, LocationName.animal_sheep)
+        connect(multiworld, player, names, LocationName.prison_lane_region, LocationName.animal_unicorn,
+                lambda state: (state.has(ItemName.tails_booster, player)))
+
+        connect(multiworld, player, names, LocationName.metal_harbor_region, LocationName.animal_penguin)
+        connect(multiworld, player, names, LocationName.metal_harbor_region, LocationName.animal_seal)
+        connect(multiworld, player, names, LocationName.metal_harbor_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.metal_harbor_region, LocationName.animal_raccoon)
+
+        connect(multiworld, player, names, LocationName.green_forest_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.green_forest_region, LocationName.animal_cheetah)
+        connect(multiworld, player, names, LocationName.green_forest_region, LocationName.animal_parrot)
+        connect(multiworld, player, names, LocationName.green_forest_region, LocationName.animal_raccoon)
+        connect(multiworld, player, names, LocationName.green_forest_region, LocationName.animal_halffish)
+
+        connect(multiworld, player, names, LocationName.pumpkin_hill_region, LocationName.animal_cheetah)
+        connect(multiworld, player, names, LocationName.pumpkin_hill_region, LocationName.animal_warthog)
+        connect(multiworld, player, names, LocationName.pumpkin_hill_region, LocationName.animal_skeleton_dog)
+        connect(multiworld, player, names, LocationName.pumpkin_hill_region, LocationName.animal_bat)
+
+        connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_warthog)
+        connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_gorilla)
+        connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_sheep)
+
+        connect(multiworld, player, names, LocationName.aquatic_mine_region, LocationName.animal_penguin)
+        connect(multiworld, player, names, LocationName.aquatic_mine_region, LocationName.animal_seal)
+        connect(multiworld, player, names, LocationName.aquatic_mine_region, LocationName.animal_condor)
+        connect(multiworld, player, names, LocationName.aquatic_mine_region, LocationName.animal_skunk)
+        connect(multiworld, player, names, LocationName.aquatic_mine_region, LocationName.animal_dragon)
+
+        connect(multiworld, player, names, LocationName.hidden_base_region, LocationName.animal_penguin,
+                lambda state: (state.has(ItemName.tails_booster, player)))
+        connect(multiworld, player, names, LocationName.hidden_base_region, LocationName.animal_otter,
+                lambda state: (state.has(ItemName.tails_booster, player)))
+        connect(multiworld, player, names, LocationName.hidden_base_region, LocationName.animal_tiger,
+                lambda state: (state.has(ItemName.tails_booster, player)))
+        connect(multiworld, player, names, LocationName.hidden_base_region, LocationName.animal_skunk)
+        connect(multiworld, player, names, LocationName.hidden_base_region, LocationName.animal_halffish,
+                lambda state: (state.has(ItemName.tails_booster, player)))
+
+        connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_condor)
+        connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_sheep)
+        connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_bat)
+
+        connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_tiger)
+        connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_gorilla)
+        connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_skunk)
+
+        connect(multiworld, player, names, LocationName.eternal_engine_region, LocationName.animal_warthog)
+        connect(multiworld, player, names, LocationName.eternal_engine_region, LocationName.animal_parrot,
+                lambda state: (state.has(ItemName.tails_booster, player)))
+        connect(multiworld, player, names, LocationName.eternal_engine_region, LocationName.animal_condor)
+        connect(multiworld, player, names, LocationName.eternal_engine_region, LocationName.animal_raccoon)
+
+        connect(multiworld, player, names, LocationName.meteor_herd_region, LocationName.animal_penguin)
+        connect(multiworld, player, names, LocationName.meteor_herd_region, LocationName.animal_seal)
+        connect(multiworld, player, names, LocationName.meteor_herd_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.meteor_herd_region, LocationName.animal_sheep)
+        connect(multiworld, player, names, LocationName.meteor_herd_region, LocationName.animal_phoenix)
+
+        connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_seal)
+        connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_bear)
+        connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_tiger)
+
+        connect(multiworld, player, names, LocationName.final_rush_region, LocationName.animal_penguin)
+        connect(multiworld, player, names, LocationName.final_rush_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.final_rush_region, LocationName.animal_condor)
+        connect(multiworld, player, names, LocationName.final_rush_region, LocationName.animal_sheep)
+        connect(multiworld, player, names, LocationName.final_rush_region, LocationName.animal_dragon,
+                lambda state: (state.has(ItemName.sonic_bounce_bracelet, player)))
+
+        connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_tiger)
+        connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_gorilla)
+        connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_skunk)
+
+        connect(multiworld, player, names, LocationName.dry_lagoon_region, LocationName.animal_penguin)
+        connect(multiworld, player, names, LocationName.dry_lagoon_region, LocationName.animal_otter)
+        connect(multiworld, player, names, LocationName.dry_lagoon_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.dry_lagoon_region, LocationName.animal_sheep)
+        connect(multiworld, player, names, LocationName.dry_lagoon_region, LocationName.animal_unicorn)
+
+        connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_parrot)
+        connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_raccoon)
+        connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_bat)
+
+        connect(multiworld, player, names, LocationName.radical_highway_region, LocationName.animal_seal)
+        connect(multiworld, player, names, LocationName.radical_highway_region, LocationName.animal_cheetah)
+        connect(multiworld, player, names, LocationName.radical_highway_region, LocationName.animal_warthog)
+        connect(multiworld, player, names, LocationName.radical_highway_region, LocationName.animal_raccoon)
+
+        connect(multiworld, player, names, LocationName.egg_quarters_region, LocationName.animal_bear)
+        connect(multiworld, player, names, LocationName.egg_quarters_region, LocationName.animal_gorilla)
+        connect(multiworld, player, names, LocationName.egg_quarters_region, LocationName.animal_parrot)
+        connect(multiworld, player, names, LocationName.egg_quarters_region, LocationName.animal_skunk)
+        connect(multiworld, player, names, LocationName.egg_quarters_region, LocationName.animal_halffish)
+
+        connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_warthog)
+        connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_bat)
+
+        connect(multiworld, player, names, LocationName.weapons_bed_region, LocationName.animal_seal)
+        connect(multiworld, player, names, LocationName.weapons_bed_region, LocationName.animal_otter)
+        connect(multiworld, player, names, LocationName.weapons_bed_region, LocationName.animal_cheetah)
+        connect(multiworld, player, names, LocationName.weapons_bed_region, LocationName.animal_sheep)
+
+        connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_tiger)
+        connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_parrot)
+        connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_condor)
+        connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_raccoon)
+
+        connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_bear)
+        connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_parrot)
+        connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_skunk)
+
+        connect(multiworld, player, names, LocationName.sky_rail_region, LocationName.animal_bear)
+        connect(multiworld, player, names, LocationName.sky_rail_region, LocationName.animal_tiger)
+        connect(multiworld, player, names, LocationName.sky_rail_region, LocationName.animal_condor)
+        connect(multiworld, player, names, LocationName.sky_rail_region, LocationName.animal_sheep)
+
+        connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_peacock)
+        connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_parrot)
+
+        connect(multiworld, player, names, LocationName.cosmic_wall_region, LocationName.animal_otter,
+                lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+        connect(multiworld, player, names, LocationName.cosmic_wall_region, LocationName.animal_rabbit)
+        connect(multiworld, player, names, LocationName.cosmic_wall_region, LocationName.animal_cheetah,
+                lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+        connect(multiworld, player, names, LocationName.cosmic_wall_region, LocationName.animal_sheep,
+                lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+        connect(multiworld, player, names, LocationName.cosmic_wall_region, LocationName.animal_dragon,
+                lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+
+        connect(multiworld, player, names, LocationName.final_chase_region, LocationName.animal_penguin)
+        connect(multiworld, player, names, LocationName.final_chase_region, LocationName.animal_otter)
+        connect(multiworld, player, names, LocationName.final_chase_region, LocationName.animal_tiger)
+        connect(multiworld, player, names, LocationName.final_chase_region, LocationName.animal_skunk)
+        connect(multiworld, player, names, LocationName.final_chase_region, LocationName.animal_phoenix)
+
+        connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_seal)
+        connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_bear,
+                lambda state: (state.has(ItemName.tails_booster, player)))
+        connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_gorilla)
+        connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_skunk)
+
+        if world.options.goal in [1, 2]:
+            connect(multiworld, player, names, LocationName.green_hill_region, LocationName.animal_penguin)
+            connect(multiworld, player, names, LocationName.green_hill_region, LocationName.animal_otter)
+            connect(multiworld, player, names, LocationName.green_hill_region, LocationName.animal_gorilla)
+            connect(multiworld, player, names, LocationName.green_hill_region, LocationName.animal_raccoon)
+            connect(multiworld, player, names, LocationName.green_hill_region, LocationName.animal_unicorn)
+
+        if world.options.logic_difficulty.value == 0:
+            connect(multiworld, player, names, LocationName.metal_harbor_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.sonic_light_shoes, player)))
+
+            connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_skunk,
+                    lambda state: (state.has(ItemName.sonic_bounce_bracelet, player)))
+            connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                   state.has(ItemName.sonic_bounce_bracelet, player) and
+                                   state.has(ItemName.sonic_flame_ring, player)))
+
+            connect(multiworld, player, names, LocationName.weapons_bed_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                   state.has(ItemName.eggman_large_cannon, player)))
+
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_gorilla,
+                    lambda state: (state.has(ItemName.rouge_iron_boots, player)))
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_raccoon,
+                    lambda state: (state.has(ItemName.rouge_iron_boots, player)))
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_halffish,
+                    lambda state: (state.has(ItemName.rouge_iron_boots, player)))
+
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_otter,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.eggman_jet_engine, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_rabbit,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.eggman_jet_engine, player) and
+                                   state.has(ItemName.knuckles_air_necklace, player) and
+                                   state.has(ItemName.knuckles_hammer_gloves, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_cheetah,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.eggman_jet_engine, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_warthog,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.eggman_jet_engine, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_parrot,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.eggman_jet_engine, player) and
+                                   state.has(ItemName.knuckles_air_necklace, player) and
+                                   state.has(ItemName.knuckles_hammer_gloves, player) and
+                                   (state.has(ItemName.sonic_bounce_bracelet, player) or
+                                    state.has(ItemName.sonic_flame_ring, player))))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_condor,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.eggman_jet_engine, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_raccoon,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   (state.has(ItemName.eggman_jet_engine, player) or
+                                    state.has(ItemName.eggman_large_cannon, player))))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.eggman_jet_engine, player)))
+
+        elif world.options.logic_difficulty.value == 1:
+            connect(multiworld, player, names, LocationName.metal_harbor_region, LocationName.animal_phoenix)
+
+            connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_skunk)
+            connect(multiworld, player, names, LocationName.crazy_gadget_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                   state.has(ItemName.sonic_flame_ring, player)))
+
+            connect(multiworld, player, names, LocationName.weapons_bed_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_gorilla)
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_raccoon)
+            connect(multiworld, player, names, LocationName.mad_space_region, LocationName.animal_halffish)
+
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_otter,
+                    lambda state: (state.has(ItemName.tails_booster, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_rabbit,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.knuckles_hammer_gloves, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_cheetah,
+                    lambda state: (state.has(ItemName.tails_booster, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_warthog,
+                    lambda state: (state.has(ItemName.tails_booster, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_parrot,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.knuckles_hammer_gloves, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_condor,
+                    lambda state: (state.has(ItemName.tails_booster, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_raccoon,
+                    lambda state: (state.has(ItemName.tails_booster, player)))
+            connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.tails_booster, player)))
+
+        if world.options.keysanity:
+            connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_dragon,
+                    lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
+
+            connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.tails_bazooka, player)))
+
+            connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
+                    lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                   state.has(ItemName.sonic_flame_ring, player)))
+
+            connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_raccoon,
+                    lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+
+            if world.options.logic_difficulty.value == 0:
+                connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                       state.has(ItemName.eggman_large_cannon, player)))
+
+                connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.eggman_jet_engine, player) and
+                                       state.has(ItemName.eggman_large_cannon, player)))
+            if world.options.logic_difficulty.value == 1:
+                connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+
+                connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.eggman_jet_engine, player)))
+
+        else:
+            connect(multiworld, player, names, LocationName.city_escape_region, LocationName.animal_unicorn)
+
+            connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_dragon)
+
+            connect(multiworld, player, names, LocationName.pumpkin_hill_region, LocationName.animal_halffish)
+
+            connect(multiworld, player, names, LocationName.mission_street_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.tails_booster, player)))
+
+            connect(multiworld, player, names, LocationName.death_chamber_region, LocationName.animal_skeleton_dog,
+                    lambda state: (state.has(ItemName.knuckles_shovel_claws, player) and
+                                   state.has(ItemName.knuckles_hammer_gloves, player)))
+
+            connect(multiworld, player, names, LocationName.eternal_engine_region, LocationName.animal_halffish,
+                    lambda state: (state.has(ItemName.tails_booster, player) and
+                                   state.has(ItemName.tails_bazooka, player)))
+
+            connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon)
+
+            connect(multiworld, player, names, LocationName.sand_ocean_region, LocationName.animal_skeleton_dog)
+
+            connect(multiworld, player, names, LocationName.radical_highway_region, LocationName.animal_unicorn)
+
+            connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_raccoon)
+            connect(multiworld, player, names, LocationName.lost_colony_region, LocationName.animal_skeleton_dog)
+
+            connect(multiworld, player, names, LocationName.security_hall_region, LocationName.animal_phoenix,
+                    lambda state: (state.has(ItemName.rouge_pick_nails, player)))
+
+            connect(multiworld, player, names, LocationName.sky_rail_region, LocationName.animal_phoenix)
+
+            if world.options.logic_difficulty.value == 0:
+                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                                       state.has(ItemName.sonic_bounce_bracelet, player) and
+                                       state.has(ItemName.sonic_mystic_melody, player)))
+
+                connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.shadow_air_shoes, player)))
+
+                connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.tails_booster, player) and
+                                       state.has(ItemName.eggman_jet_engine, player) and
+                                       state.has(ItemName.knuckles_air_necklace, player) and
+                                       state.has(ItemName.knuckles_hammer_gloves, player)))
+            elif world.options.logic_difficulty.value == 1:
+                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog)
+
+                connect(multiworld, player, names, LocationName.white_jungle_region, LocationName.animal_dragon)
+
+                connect(multiworld, player, names, LocationName.cannon_core_region, LocationName.animal_dragon,
+                        lambda state: (state.has(ItemName.tails_booster, player) and
+                                       state.has(ItemName.knuckles_hammer_gloves, player)))
+
+    if world.options.black_market_slots.value > 0:
+        connect(multiworld, player, names, LocationName.gate_0_region, LocationName.black_market_region)
 
 
-def create_region(world: MultiWorld, player: int, active_locations, name: str, locations=None):
-    ret = Region(name, player, world)
+def create_region(multiworld: MultiWorld, player: int, active_locations, name: str, locations=None):
+    ret = Region(name, player, multiworld)
     if locations:
         for location in locations:
             loc_id = active_locations.get(location, 0)
@@ -1708,10 +2437,10 @@ def create_region(world: MultiWorld, player: int, active_locations, name: str, l
     return ret
 
 
-def connect(world: MultiWorld, player: int, used_names: typing.Dict[str, int], source: str, target: str,
+def connect(multiworld: MultiWorld, player: int, used_names: typing.Dict[str, int], source: str, target: str,
             rule: typing.Optional[typing.Callable] = None):
-    source_region = world.get_region(source, player)
-    target_region = world.get_region(target, player)
+    source_region = multiworld.get_region(source, player)
+    target_region = multiworld.get_region(target, player)
 
     if target not in used_names:
         used_names[target] = 1
diff --git a/worlds/sa2b/Rules.py b/worlds/sa2b/Rules.py
index 146938db76..afd0dcb182 100644
--- a/worlds/sa2b/Rules.py
+++ b/worlds/sa2b/Rules.py
@@ -1,6 +1,7 @@
 import typing
 
 from BaseClasses import MultiWorld
+from worlds.AutoWorld import World
 from .Names import LocationName, ItemName
 from .Locations import boss_gate_set
 from worlds.AutoWorld import LogicMixin
@@ -19,7 +20,7 @@ def add_rule_safe(multiworld: MultiWorld, spot_name: str, player: int, rule: Col
         add_rule(location, rule)
 
 
-def set_mission_progress_rules(world: MultiWorld, player: int, mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int]):
+def set_mission_progress_rules(multiworld: MultiWorld, player: int, mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int]):
     for i in range(31):
         mission_count = mission_count_map[i]
         mission_order: typing.List[int] = mission_orders[mission_map[i]]
@@ -33,58 +34,58 @@ def set_mission_progress_rules(world: MultiWorld, player: int, mission_map: typi
             prev_mission_number = mission_order[j - 1]
             location_name: str = stage_prefix + str(mission_number)
             prev_location_name: str = stage_prefix + str(prev_mission_number)
-            set_rule(world.get_location(location_name, player),
+            set_rule(multiworld.get_location(location_name, player),
                      lambda state, prev_location_name=prev_location_name: state.can_reach(prev_location_name, "Location", player))
 
 
-def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
+def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, player: int):
     # Mission 1 Upgrade Requirements
-    add_rule_safe(world, LocationName.metal_harbor_1, player,
+    add_rule_safe(multiworld, LocationName.metal_harbor_1, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player))
-    add_rule_safe(world, LocationName.pumpkin_hill_1, player,
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_1, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.mission_street_1, player,
+    add_rule_safe(multiworld, LocationName.mission_street_1, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.aquatic_mine_1, player,
+    add_rule_safe(multiworld, LocationName.aquatic_mine_1, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.hidden_base_1, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_1, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.pyramid_cave_1, player,
+    add_rule_safe(multiworld, LocationName.pyramid_cave_1, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-    add_rule_safe(world, LocationName.death_chamber_1, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_1, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_1, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_1, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.meteor_herd_1, player,
+    add_rule_safe(multiworld, LocationName.meteor_herd_1, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.crazy_gadget_1, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_1, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.final_rush_1, player,
+    add_rule_safe(multiworld, LocationName.final_rush_1, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.egg_quarters_1, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_1, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule_safe(world, LocationName.lost_colony_1, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_1, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_1, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_1, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.security_hall_1, player,
+    add_rule_safe(multiworld, LocationName.security_hall_1, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule_safe(world, LocationName.white_jungle_1, player,
+    add_rule_safe(multiworld, LocationName.white_jungle_1, player,
                   lambda state: state.has(ItemName.shadow_air_shoes, player))
-    add_rule_safe(world, LocationName.mad_space_1, player,
+    add_rule_safe(multiworld, LocationName.mad_space_1, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.cosmic_wall_1, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_1, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_1, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_1, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player) and
@@ -92,129 +93,128 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                 state.has(ItemName.sonic_bounce_bracelet, player))
 
     # Mission 2 Upgrade Requirements
-    add_rule_safe(world, LocationName.metal_harbor_2, player,
+    add_rule_safe(multiworld, LocationName.metal_harbor_2, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player))
-    add_rule_safe(world, LocationName.mission_street_2, player,
+    add_rule_safe(multiworld, LocationName.mission_street_2, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.hidden_base_2, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_2, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.death_chamber_2, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_2, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_2, player,
-                  lambda state: state.has(ItemName.tails_booster, player) and
-                                state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.crazy_gadget_2, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_2, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
+    add_rule_safe(multiworld, LocationName.crazy_gadget_2, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.lost_colony_2, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_2, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_2, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_2, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.security_hall_2, player,
+    add_rule_safe(multiworld, LocationName.security_hall_2, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule_safe(world, LocationName.mad_space_2, player,
+    add_rule_safe(multiworld, LocationName.mad_space_2, player,
                   lambda state: state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.cosmic_wall_2, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_2, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_2, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_2, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.eggman_jet_engine, player))
 
     # Mission 3 Upgrade Requirements
-    add_rule_safe(world, LocationName.city_escape_3, player,
+    add_rule_safe(multiworld, LocationName.city_escape_3, player,
                   lambda state: state.has(ItemName.sonic_mystic_melody, player))
-    add_rule_safe(world, LocationName.wild_canyon_3, player,
+    add_rule_safe(multiworld, LocationName.wild_canyon_3, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player) and
                                 state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.prison_lane_3, player,
+    add_rule_safe(multiworld, LocationName.prison_lane_3, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_mystic_melody, player))
-    add_rule_safe(world, LocationName.metal_harbor_3, player,
+    add_rule_safe(multiworld, LocationName.metal_harbor_3, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_mystic_melody, player))
-    add_rule_safe(world, LocationName.green_forest_3, player,
+    add_rule_safe(multiworld, LocationName.green_forest_3, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_mystic_melody, player))
-    add_rule_safe(world, LocationName.pumpkin_hill_3, player,
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_3, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.mission_street_3, player,
+    add_rule_safe(multiworld, LocationName.mission_street_3, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_mystic_melody, player))
-    add_rule_safe(world, LocationName.aquatic_mine_3, player,
+    add_rule_safe(multiworld, LocationName.aquatic_mine_3, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.hidden_base_3, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_3, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_mystic_melody, player))
-    add_rule_safe(world, LocationName.pyramid_cave_3, player,
+    add_rule_safe(multiworld, LocationName.pyramid_cave_3, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_mystic_melody, player))
-    add_rule_safe(world, LocationName.death_chamber_3, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_3, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player) and
                                 state.has(ItemName.knuckles_air_necklace, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_3, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_3, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_mystic_melody, player))
-    add_rule_safe(world, LocationName.meteor_herd_3, player,
+    add_rule_safe(multiworld, LocationName.meteor_herd_3, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.crazy_gadget_3, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_3, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_flame_ring, player) and
                                 state.has(ItemName.sonic_mystic_melody, player))
-    add_rule_safe(world, LocationName.final_rush_3, player,
+    add_rule_safe(multiworld, LocationName.final_rush_3, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_mystic_melody, player))
 
-    add_rule_safe(world, LocationName.iron_gate_3, player,
+    add_rule_safe(multiworld, LocationName.iron_gate_3, player,
                   lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                 state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.dry_lagoon_3, player,
+    add_rule_safe(multiworld, LocationName.dry_lagoon_3, player,
                   lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                 state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.sand_ocean_3, player,
+    add_rule_safe(multiworld, LocationName.sand_ocean_3, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.radical_highway_3, player,
+    add_rule_safe(multiworld, LocationName.radical_highway_3, player,
                   lambda state: state.has(ItemName.shadow_mystic_melody, player))
-    add_rule_safe(world, LocationName.egg_quarters_3, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_3, player,
                   lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                 state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.lost_colony_3, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_3, player,
                   lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                 state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_3, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_3, player,
                   lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                 state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.security_hall_3, player,
+    add_rule_safe(multiworld, LocationName.security_hall_3, player,
                   lambda state: state.has(ItemName.rouge_treasure_scope, player))
-    add_rule_safe(world, LocationName.white_jungle_3, player,
+    add_rule_safe(multiworld, LocationName.white_jungle_3, player,
                   lambda state: state.has(ItemName.shadow_air_shoes, player) and
                                 state.has(ItemName.shadow_mystic_melody, player))
-    add_rule_safe(world, LocationName.sky_rail_3, player,
+    add_rule_safe(multiworld, LocationName.sky_rail_3, player,
                   lambda state: state.has(ItemName.shadow_air_shoes, player) and
                                 state.has(ItemName.shadow_mystic_melody, player))
-    add_rule_safe(world, LocationName.mad_space_3, player,
+    add_rule_safe(multiworld, LocationName.mad_space_3, player,
                   lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.cosmic_wall_3, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_3, player,
                   lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                 state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.final_chase_3, player,
+    add_rule_safe(multiworld, LocationName.final_chase_3, player,
                   lambda state: state.has(ItemName.shadow_air_shoes, player) and
                                 state.has(ItemName.shadow_mystic_melody, player))
 
-    add_rule_safe(world, LocationName.cannon_core_3, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_3, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.eggman_mystic_melody, player) and
                                 state.has(ItemName.eggman_jet_engine, player) and
@@ -227,52 +227,52 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                 state.has(ItemName.sonic_light_shoes, player))
 
     # Mission 4 Upgrade Requirements
-    add_rule_safe(world, LocationName.metal_harbor_4, player,
+    add_rule_safe(multiworld, LocationName.metal_harbor_4, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player))
-    add_rule_safe(world, LocationName.pumpkin_hill_4, player,
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_4, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.mission_street_4, player,
+    add_rule_safe(multiworld, LocationName.mission_street_4, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.aquatic_mine_4, player,
+    add_rule_safe(multiworld, LocationName.aquatic_mine_4, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.hidden_base_4, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_4, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.pyramid_cave_4, player,
+    add_rule_safe(multiworld, LocationName.pyramid_cave_4, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-    add_rule_safe(world, LocationName.death_chamber_4, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_4, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_4, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_4, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.meteor_herd_4, player,
+    add_rule_safe(multiworld, LocationName.meteor_herd_4, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.crazy_gadget_4, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_4, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.final_rush_4, player,
+    add_rule_safe(multiworld, LocationName.final_rush_4, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.egg_quarters_4, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_4, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule_safe(world, LocationName.lost_colony_4, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_4, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_4, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_4, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.security_hall_4, player,
+    add_rule_safe(multiworld, LocationName.security_hall_4, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule_safe(world, LocationName.white_jungle_4, player,
+    add_rule_safe(multiworld, LocationName.white_jungle_4, player,
                   lambda state: state.has(ItemName.shadow_air_shoes, player))
-    add_rule_safe(world, LocationName.mad_space_4, player,
+    add_rule_safe(multiworld, LocationName.mad_space_4, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.cosmic_wall_4, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_4, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_4, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_4, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player) and
@@ -280,76 +280,76 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                 state.has(ItemName.sonic_bounce_bracelet, player))
 
     # Mission 5 Upgrade Requirements
-    add_rule_safe(world, LocationName.city_escape_5, player,
+    add_rule_safe(multiworld, LocationName.city_escape_5, player,
                   lambda state: state.has(ItemName.sonic_flame_ring, player) and
                                 state.has(ItemName.sonic_light_shoes, player))
-    add_rule_safe(world, LocationName.wild_canyon_5, player,
+    add_rule_safe(multiworld, LocationName.wild_canyon_5, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_sunglasses, player))
-    add_rule_safe(world, LocationName.metal_harbor_5, player,
+    add_rule_safe(multiworld, LocationName.metal_harbor_5, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player))
-    add_rule_safe(world, LocationName.green_forest_5, player,
+    add_rule_safe(multiworld, LocationName.green_forest_5, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-    add_rule_safe(world, LocationName.pumpkin_hill_5, player,
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_5, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_sunglasses, player))
-    add_rule_safe(world, LocationName.mission_street_5, player,
+    add_rule_safe(multiworld, LocationName.mission_street_5, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.aquatic_mine_5, player,
+    add_rule_safe(multiworld, LocationName.aquatic_mine_5, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player) and
                                 state.has(ItemName.knuckles_air_necklace, player) and
                                 state.has(ItemName.knuckles_sunglasses, player))
-    add_rule_safe(world, LocationName.hidden_base_5, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_5, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.pyramid_cave_5, player,
+    add_rule_safe(multiworld, LocationName.pyramid_cave_5, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-    add_rule_safe(world, LocationName.death_chamber_5, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_5, player,
                   lambda state: state.has(ItemName.knuckles_hammer_gloves, player) and
                                 state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_mystic_melody, player) and
                                 state.has(ItemName.knuckles_air_necklace, player))
-    add_rule_safe(world, LocationName.eternal_engine_5, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_5, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.meteor_herd_5, player,
+    add_rule_safe(multiworld, LocationName.meteor_herd_5, player,
                   lambda state: state.has(ItemName.knuckles_sunglasses, player))
-    add_rule_safe(world, LocationName.crazy_gadget_5, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_5, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.final_rush_5, player,
+    add_rule_safe(multiworld, LocationName.final_rush_5, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.iron_gate_5, player,
+    add_rule_safe(multiworld, LocationName.iron_gate_5, player,
                   lambda state: state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.dry_lagoon_5, player,
+    add_rule_safe(multiworld, LocationName.dry_lagoon_5, player,
                   lambda state: state.has(ItemName.rouge_treasure_scope, player))
-    add_rule_safe(world, LocationName.sand_ocean_5, player,
+    add_rule_safe(multiworld, LocationName.sand_ocean_5, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.egg_quarters_5, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_5, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_treasure_scope, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.lost_colony_5, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_5, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.weapons_bed_5, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_5, player,
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.security_hall_5, player,
+    add_rule_safe(multiworld, LocationName.security_hall_5, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_treasure_scope, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.white_jungle_5, player,
+    add_rule_safe(multiworld, LocationName.white_jungle_5, player,
                   lambda state: state.has(ItemName.shadow_air_shoes, player) and
                                 state.has(ItemName.shadow_flame_ring, player))
-    add_rule_safe(world, LocationName.mad_space_5, player,
+    add_rule_safe(multiworld, LocationName.mad_space_5, player,
                   lambda state: state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.cosmic_wall_5, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_5, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_5, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_5, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.knuckles_mystic_melody, player) and
@@ -358,132 +358,132 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                 state.has(ItemName.sonic_bounce_bracelet, player))
 
     # Upgrade Spot Upgrade Requirements
-    add_rule(world.get_location(LocationName.city_escape_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.city_escape_upgrade, player),
              lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                            state.has(ItemName.sonic_flame_ring, player))
-    add_rule(world.get_location(LocationName.wild_canyon_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.wild_canyon_upgrade, player),
              lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule(world.get_location(LocationName.prison_lane_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.prison_lane_upgrade, player),
              lambda state: state.has(ItemName.tails_bazooka, player))
-    add_rule(world.get_location(LocationName.hidden_base_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.hidden_base_upgrade, player),
              lambda state: state.has(ItemName.tails_booster, player) and
                            state.has(ItemName.tails_bazooka, player))
-    add_rule(world.get_location(LocationName.eternal_engine_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.eternal_engine_upgrade, player),
              lambda state: state.has(ItemName.tails_booster, player))
-    add_rule(world.get_location(LocationName.meteor_herd_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.meteor_herd_upgrade, player),
              lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule(world.get_location(LocationName.crazy_gadget_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.crazy_gadget_upgrade, player),
              lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-    add_rule(world.get_location(LocationName.final_rush_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.final_rush_upgrade, player),
              lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule(world.get_location(LocationName.iron_gate_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.iron_gate_upgrade, player),
              lambda state: state.has(ItemName.eggman_large_cannon, player))
-    add_rule(world.get_location(LocationName.dry_lagoon_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.dry_lagoon_upgrade, player),
              lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule(world.get_location(LocationName.sand_ocean_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.sand_ocean_upgrade, player),
              lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule(world.get_location(LocationName.radical_highway_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.radical_highway_upgrade, player),
              lambda state: state.has(ItemName.shadow_air_shoes, player))
-    add_rule(world.get_location(LocationName.security_hall_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.security_hall_upgrade, player),
              lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                            state.has(ItemName.rouge_iron_boots, player))
-    add_rule(world.get_location(LocationName.cosmic_wall_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.cosmic_wall_upgrade, player),
              lambda state: state.has(ItemName.eggman_jet_engine, player))
 
     # Chao Key Upgrade Requirements
-    if world.keysanity[player]:
-        add_rule(world.get_location(LocationName.prison_lane_chao_1, player),
+    if world.options.keysanity:
+        add_rule(multiworld.get_location(LocationName.prison_lane_chao_1, player),
                  lambda state: state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_chao_1, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_chao_1, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.cosmic_wall_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_1, player),
                  lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.metal_harbor_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_chao_2, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_chao_2, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_chao_2, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_chao_2, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_chao_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_chao_2, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.mad_space_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_chao_2, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_chao_3, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_chao_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_chao_3, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
-        add_rule(world.get_location(LocationName.death_chamber_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_chao_3, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_chao_3, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_chao_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.egg_quarters_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.egg_quarters_chao_3, player),
                  lambda state: state.has(ItemName.rouge_mystic_melody, player))
-        add_rule(world.get_location(LocationName.lost_colony_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_chao_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_chao_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.security_hall_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_chao_3, player),
                  lambda state: state.has(ItemName.rouge_pick_nails, player))
-        add_rule(world.get_location(LocationName.white_jungle_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_chao_3, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.mad_space_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_chao_3, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_chao_3, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
@@ -491,804 +491,807 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                state.has(ItemName.sonic_flame_ring, player))
 
     # Pipe Upgrade Requirements
-    if world.whistlesanity[player].value == 1 or world.whistlesanity[player].value == 3:
-        add_rule(world.get_location(LocationName.mission_street_pipe_1, player),
+    if world.options.whistlesanity.value == 1 or world.options.whistlesanity.value == 3:
+        add_rule(multiworld.get_location(LocationName.mission_street_pipe_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_pipe_1, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.sand_ocean_pipe_1, player),
+        add_rule(multiworld.get_location(LocationName.sand_ocean_pipe_1, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_1, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_1, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.mission_street_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_pipe_2, player),
+
+        add_rule(multiworld.get_location(LocationName.mission_street_pipe_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_2, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
+        add_rule(multiworld.get_location(LocationName.death_chamber_pipe_2, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_pipe_2, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.sand_ocean_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.sand_ocean_pipe_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.lost_colony_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_pipe_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_pipe_3, player),
                  lambda state: state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_pipe_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_pipe_3, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_pipe_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_pipe_3, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.mad_space_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_pipe_3, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_pipe_4, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_4, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_pipe_4, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_pipe_4, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.mad_space_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_pipe_4, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_4, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_5, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_5, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.knuckles_air_necklace, player))
 
     # Hidden Whistle Upgrade Requirements
-    if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3:
-        add_rule(world.get_location(LocationName.mission_street_hidden_3, player),
+    if world.options.whistlesanity.value == 2 or world.options.whistlesanity.value == 3:
+        add_rule(multiworld.get_location(LocationName.mission_street_hidden_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.mission_street_hidden_4, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_hidden_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_hidden_1, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_hidden_1, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.death_chamber_hidden_2, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_hidden_2, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_hidden_1, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_hidden_1, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.white_jungle_hidden_3, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_hidden_3, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.cannon_core_hidden_1, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_hidden_1, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
     # Omochao Upgrade Requirements
-    if world.omosanity[player]:
-        add_rule(world.get_location(LocationName.eternal_engine_omo_1, player),
+    if world.options.omosanity:
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_omo_2, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_2, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.radical_highway_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.radical_highway_omo_2, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.weapons_bed_omo_2, player),
-                 lambda state: state.has(ItemName.eggman_jet_engine, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_omo_2, player),
+                 lambda state: state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_omo_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.final_rush_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_omo_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_omo_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_omo_4, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_omo_4, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_4, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.mad_space_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_omo_4, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_omo_5, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_5, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_5, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.white_jungle_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_omo_5, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.mad_space_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_omo_5, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_5, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_6, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_6, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_6, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_6, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_7, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_7, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_7, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_7, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.knuckles_air_necklace, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_8, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_8, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_8, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.security_hall_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_omo_8, player),
                  lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                state.has(ItemName.rouge_iron_boots, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_8, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.knuckles_air_necklace, player))
 
-        add_rule(world.get_location(LocationName.death_chamber_omo_9, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_9, player),
                  lambda state: state.has(ItemName.knuckles_mystic_melody, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_9, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_9, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_9, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_9, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_9, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.knuckles_air_necklace, player))
 
-        add_rule(world.get_location(LocationName.eternal_engine_omo_10, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_10, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_10, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_10, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.eternal_engine_omo_11, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_11, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_11, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_11, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.eternal_engine_omo_12, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_12, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_12, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_12, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_13, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_13, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
     # Gold Beetle Upgrade Requirements
-    if world.beetlesanity[player]:
-        add_rule(world.get_location(LocationName.mission_street_beetle, player),
+    if world.options.beetlesanity:
+        add_rule(multiworld.get_location(LocationName.mission_street_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_beetle, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_beetle, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_beetle, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_beetle, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_beetle, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_beetle, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_beetle, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_beetle, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.dry_lagoon_beetle, player),
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_beetle, player),
                  lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                state.has(ItemName.rouge_pick_nails, player) and
                                state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.lost_colony_beetle, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_beetle, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.white_jungle_beetle, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_beetle, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.mad_space_beetle, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_beetle, player),
                  lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_beetle, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_beetle, player),
                  lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_beetle, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.knuckles_air_necklace, player))
 
     # Animal Upgrade Requirements
-    if world.animalsanity[player]:
-        add_rule(world.get_location(LocationName.hidden_base_animal_2, player),
+    if world.options.animalsanity:
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_2, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_3, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_4, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_4, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_4, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.mission_street_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_5, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_5, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_5, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_5, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                (state.has(ItemName.eggman_jet_engine, player) or
                                 state.has(ItemName.eggman_large_cannon, player)))
 
-        add_rule(world.get_location(LocationName.metal_harbor_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_6, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_6, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_6, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_6, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_6, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_6, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_6, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_6, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_7, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_7, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_7, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_7, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_7, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) or
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_7, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.security_hall_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_animal_7, player),
                  lambda state: state.has(ItemName.rouge_pick_nails, player) or
                                state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_7, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_7, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_7, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_8, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_8, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_8, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_8, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_8, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_8, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.security_hall_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_animal_8, player),
                  lambda state: state.has(ItemName.rouge_pick_nails, player) and
                                state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_8, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_8, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_8, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_9, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_9, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_9, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_9, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_9, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_9, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_9, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_9, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_9, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.wild_canyon_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.wild_canyon_animal_10, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-        add_rule(world.get_location(LocationName.metal_harbor_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_10, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.aquatic_mine_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.aquatic_mine_animal_10, player),
                  lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_10, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_10, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_10, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_10, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.egg_quarters_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.egg_quarters_animal_10, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.lost_colony_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_10, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_10, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_10, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_10, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_11, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_11, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_11, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                (state.has(ItemName.sonic_flame_ring, player) or
                                 state.has(ItemName.sonic_mystic_melody, player)))
-        add_rule(world.get_location(LocationName.final_rush_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_11, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_11, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_11, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_animal_11, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_11, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.metal_harbor_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_12, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_12, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_12, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player) and
                                (state.has(ItemName.sonic_light_shoes, player) or
                                 state.has(ItemName.sonic_mystic_melody, player)))
-        add_rule(world.get_location(LocationName.final_rush_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_12, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.sand_ocean_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.sand_ocean_animal_12, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.lost_colony_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_12, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_12, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_animal_12, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_12, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player) or
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.metal_harbor_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_13, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_13, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_13, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_13, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.sand_ocean_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.sand_ocean_animal_13, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.lost_colony_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_13, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_13, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_animal_13, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_13, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                (state.has(ItemName.knuckles_air_necklace, player) or
                                 state.has(ItemName.knuckles_hammer_gloves, player)))
 
-        add_rule(world.get_location(LocationName.prison_lane_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_14, player),
                  lambda state: state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.metal_harbor_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.metal_harbor_animal_14, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_14, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_14, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_14, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.sand_ocean_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.sand_ocean_animal_14, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.lost_colony_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_14, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_14, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_animal_14, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_14, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_air_necklace, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_15, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_15, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_15, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.iron_gate_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.iron_gate_animal_15, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.sand_ocean_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.sand_ocean_animal_15, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_15, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.white_jungle_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_animal_15, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_15, player),
                  lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_air_necklace, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.mission_street_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_16, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_16, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                (state.has(ItemName.sonic_flame_ring, player) or
                                 (state.has(ItemName.sonic_light_shoes, player) and
                                  state.has(ItemName.sonic_mystic_melody, player))))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_16, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_16, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.white_jungle_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_animal_16, player),
                  lambda state: state.has(ItemName.shadow_flame_ring, player) and
                                state.has(ItemName.shadow_air_shoes, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_16, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_air_necklace, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_17, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_17, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
 
-        add_rule(world.get_location(LocationName.final_chase_animal_17, player),
+        add_rule(multiworld.get_location(LocationName.final_chase_animal_17, player),
                  lambda state: state.has(ItemName.shadow_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_17, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_17, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
@@ -1297,12 +1300,12 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                (state.has(ItemName.sonic_bounce_bracelet, player) or
                                 state.has(ItemName.sonic_flame_ring, player)))
 
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_18, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_18, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_18, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_18, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
@@ -1310,12 +1313,12 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_19, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_19, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
@@ -1324,897 +1327,901 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
                                state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.radical_highway_animal_20, player),
+        add_rule(multiworld.get_location(LocationName.radical_highway_animal_20, player),
                  lambda state: state.has(ItemName.shadow_flame_ring, player))
 
-def set_mission_upgrade_rules_hard(world: MultiWorld, player: int):
+def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player: int):
     # Mission 1 Upgrade Requirements
-    add_rule_safe(world, LocationName.pumpkin_hill_1, player,
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_1, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.mission_street_1, player,
+    add_rule_safe(multiworld, LocationName.mission_street_1, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.hidden_base_1, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_1, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.death_chamber_1, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_1, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_1, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_1, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.crazy_gadget_1, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_1, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.final_rush_1, player,
+    add_rule_safe(multiworld, LocationName.final_rush_1, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.egg_quarters_1, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_1, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule_safe(world, LocationName.lost_colony_1, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_1, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_1, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_1, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.cosmic_wall_1, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_1, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_1, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_1, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
 
     # Mission 2 Upgrade Requirements
-    add_rule_safe(world, LocationName.mission_street_2, player,
+    add_rule_safe(multiworld, LocationName.mission_street_2, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.hidden_base_2, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_2, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.death_chamber_2, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_2, player,
                   lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_2, player,
-                  lambda state: state.has(ItemName.tails_booster, player) and
-                                state.has(ItemName.tails_bazooka, player))
+    add_rule_safe(multiworld, LocationName.eternal_engine_2, player,
+                  lambda state: state.has(ItemName.tails_booster, player))
 
-    add_rule_safe(world, LocationName.lost_colony_2, player,
-                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_2, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_2, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.cosmic_wall_2, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_2, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_2, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_2, player,
                   lambda state: state.has(ItemName.tails_booster, player))
 
     # Mission 3 Upgrade Requirements
-    add_rule_safe(world, LocationName.wild_canyon_3, player,
+    add_rule_safe(multiworld, LocationName.wild_canyon_3, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.prison_lane_3, player,
+    add_rule_safe(multiworld, LocationName.prison_lane_3, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.mission_street_3, player,
+    add_rule_safe(multiworld, LocationName.mission_street_3, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.aquatic_mine_3, player,
+    add_rule_safe(multiworld, LocationName.aquatic_mine_3, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.hidden_base_3, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_3, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_mystic_melody, player))
-    add_rule_safe(world, LocationName.death_chamber_3, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_3, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_3, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_3, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.meteor_herd_3, player,
+    add_rule_safe(multiworld, LocationName.meteor_herd_3, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.crazy_gadget_3, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_3, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.final_rush_3, player,
+    add_rule_safe(multiworld, LocationName.final_rush_3, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.iron_gate_3, player,
+    add_rule_safe(multiworld, LocationName.iron_gate_3, player,
                   lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                 state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.dry_lagoon_3, player,
+    add_rule_safe(multiworld, LocationName.dry_lagoon_3, player,
                   lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                 state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.sand_ocean_3, player,
+    add_rule_safe(multiworld, LocationName.sand_ocean_3, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.egg_quarters_3, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_3, player,
                   lambda state: state.has(ItemName.rouge_mystic_melody, player))
-    add_rule_safe(world, LocationName.lost_colony_3, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_3, player,
                   lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                 state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_3, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_3, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.mad_space_3, player,
+    add_rule_safe(multiworld, LocationName.mad_space_3, player,
                   lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                 state.has(ItemName.rouge_iron_boots, player))
-    add_rule_safe(world, LocationName.cosmic_wall_3, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_3, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_3, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_3, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
 
     # Mission 4 Upgrade Requirements
-    add_rule_safe(world, LocationName.pumpkin_hill_4, player,
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_4, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.mission_street_4, player,
+    add_rule_safe(multiworld, LocationName.mission_street_4, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.hidden_base_4, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_4, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.death_chamber_4, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_4, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule_safe(world, LocationName.eternal_engine_4, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_4, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.crazy_gadget_4, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_4, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.final_rush_4, player,
+    add_rule_safe(multiworld, LocationName.final_rush_4, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.egg_quarters_4, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_4, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule_safe(world, LocationName.lost_colony_4, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_4, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.weapons_bed_4, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_4, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.cosmic_wall_4, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_4, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_4, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_4, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
 
     # Mission 5 Upgrade Requirements
-    add_rule_safe(world, LocationName.city_escape_5, player,
+    add_rule_safe(multiworld, LocationName.city_escape_5, player,
                   lambda state: state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.wild_canyon_5, player,
+    add_rule_safe(multiworld, LocationName.wild_canyon_5, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.pumpkin_hill_5, player,
+    add_rule_safe(multiworld, LocationName.pumpkin_hill_5, player,
                   lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule_safe(world, LocationName.mission_street_5, player,
+    add_rule_safe(multiworld, LocationName.mission_street_5, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.aquatic_mine_5, player,
+    add_rule_safe(multiworld, LocationName.aquatic_mine_5, player,
                   lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.hidden_base_5, player,
+    add_rule_safe(multiworld, LocationName.hidden_base_5, player,
                   lambda state: state.has(ItemName.tails_booster, player))
-    add_rule_safe(world, LocationName.death_chamber_5, player,
+    add_rule_safe(multiworld, LocationName.death_chamber_5, player,
                   lambda state: state.has(ItemName.knuckles_hammer_gloves, player) and
                                 state.has(ItemName.knuckles_shovel_claws, player) and
                                 state.has(ItemName.knuckles_mystic_melody, player))
-    add_rule_safe(world, LocationName.eternal_engine_5, player,
+    add_rule_safe(multiworld, LocationName.eternal_engine_5, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.tails_bazooka, player))
-    add_rule_safe(world, LocationName.crazy_gadget_5, player,
+    add_rule_safe(multiworld, LocationName.crazy_gadget_5, player,
                   lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                 state.has(ItemName.sonic_bounce_bracelet, player) and
                                 state.has(ItemName.sonic_flame_ring, player))
-    add_rule_safe(world, LocationName.final_rush_5, player,
+    add_rule_safe(multiworld, LocationName.final_rush_5, player,
                   lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule_safe(world, LocationName.iron_gate_5, player,
+    add_rule_safe(multiworld, LocationName.iron_gate_5, player,
                   lambda state: state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.dry_lagoon_5, player,
+    add_rule_safe(multiworld, LocationName.dry_lagoon_5, player,
                   lambda state: state.has(ItemName.rouge_treasure_scope, player))
-    add_rule_safe(world, LocationName.sand_ocean_5, player,
+    add_rule_safe(multiworld, LocationName.sand_ocean_5, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.egg_quarters_5, player,
+    add_rule_safe(multiworld, LocationName.egg_quarters_5, player,
                   lambda state: state.has(ItemName.rouge_pick_nails, player) and
                                 state.has(ItemName.rouge_treasure_scope, player))
-    add_rule_safe(world, LocationName.lost_colony_5, player,
+    add_rule_safe(multiworld, LocationName.lost_colony_5, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                 state.has(ItemName.eggman_large_cannon, player))
-    add_rule_safe(world, LocationName.weapons_bed_5, player,
+    add_rule_safe(multiworld, LocationName.weapons_bed_5, player,
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule_safe(world, LocationName.security_hall_5, player,
+    add_rule_safe(multiworld, LocationName.security_hall_5, player,
                   lambda state: state.has(ItemName.rouge_treasure_scope, player))
-    add_rule_safe(world, LocationName.cosmic_wall_5, player,
+    add_rule_safe(multiworld, LocationName.cosmic_wall_5, player,
                   lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-    add_rule_safe(world, LocationName.cannon_core_5, player,
+    add_rule_safe(multiworld, LocationName.cannon_core_5, player,
                   lambda state: state.has(ItemName.tails_booster, player) and
                                 state.has(ItemName.knuckles_mystic_melody, player) and
                                 state.has(ItemName.knuckles_hammer_gloves, player))
 
     # Upgrade Spot Upgrade Requirements
-    add_rule(world.get_location(LocationName.city_escape_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.city_escape_upgrade, player),
              lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                            state.has(ItemName.sonic_flame_ring, player))
-    add_rule(world.get_location(LocationName.wild_canyon_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.wild_canyon_upgrade, player),
              lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-    add_rule(world.get_location(LocationName.prison_lane_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.prison_lane_upgrade, player),
              lambda state: state.has(ItemName.tails_bazooka, player))
-    add_rule(world.get_location(LocationName.hidden_base_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.hidden_base_upgrade, player),
              lambda state: state.has(ItemName.tails_booster, player) and
                            (state.has(ItemName.tails_bazooka, player) or state.has(ItemName.tails_mystic_melody, player)))
-    add_rule(world.get_location(LocationName.eternal_engine_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.eternal_engine_upgrade, player),
              lambda state: state.has(ItemName.tails_booster, player))
-    add_rule(world.get_location(LocationName.meteor_herd_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.meteor_herd_upgrade, player),
              lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-    add_rule(world.get_location(LocationName.final_rush_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.final_rush_upgrade, player),
              lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-    add_rule(world.get_location(LocationName.iron_gate_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.iron_gate_upgrade, player),
              lambda state: state.has(ItemName.eggman_jet_engine, player) or
                            state.has(ItemName.eggman_large_cannon, player))
-    add_rule(world.get_location(LocationName.dry_lagoon_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.dry_lagoon_upgrade, player),
              lambda state: state.has(ItemName.rouge_pick_nails, player))
-    add_rule(world.get_location(LocationName.sand_ocean_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.sand_ocean_upgrade, player),
              lambda state: state.has(ItemName.eggman_jet_engine, player))
-    add_rule(world.get_location(LocationName.security_hall_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.security_hall_upgrade, player),
              lambda state: state.has(ItemName.rouge_iron_boots, player))
-    add_rule(world.get_location(LocationName.cosmic_wall_upgrade, player),
+    add_rule(multiworld.get_location(LocationName.cosmic_wall_upgrade, player),
              lambda state: state.has(ItemName.eggman_jet_engine, player))
 
     # Chao Key Upgrade Requirements
-    if world.keysanity[player]:
-        add_rule(world.get_location(LocationName.prison_lane_chao_1, player),
+    if world.options.keysanity:
+        add_rule(multiworld.get_location(LocationName.prison_lane_chao_1, player),
                  lambda state: state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_chao_1, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cosmic_wall_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_1, player),
                  lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_chao_1, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_chao_1, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.mission_street_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_chao_2, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_chao_2, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_chao_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_chao_2, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_chao_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.mission_street_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_chao_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_chao_3, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_chao_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_chao_3, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_chao_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.egg_quarters_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.egg_quarters_chao_3, player),
                  lambda state: state.has(ItemName.rouge_mystic_melody, player))
-        add_rule(world.get_location(LocationName.lost_colony_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_chao_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_chao_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.security_hall_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_chao_3, player),
                  lambda state: state.has(ItemName.rouge_pick_nails, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_chao_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_chao_3, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_chao_3, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
     # Pipe Upgrade Requirements
-    if world.whistlesanity[player].value == 1 or world.whistlesanity[player].value == 3:
-        add_rule(world.get_location(LocationName.hidden_base_pipe_1, player),
+    if world.options.whistlesanity.value == 1 or world.options.whistlesanity.value == 3:
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_1, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_1, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_pipe_2, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_pipe_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_2, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_pipe_3, player),
                  lambda state: state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_pipe_3, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_3, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_4, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_pipe_4, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_4, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_pipe_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_pipe_5, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_pipe_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_pipe_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_pipe_5, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_pipe_5, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
     # Hidden Whistle Upgrade Requirements
-    if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3:
-        add_rule(world.get_location(LocationName.mission_street_hidden_3, player),
+    if world.options.whistlesanity.value == 2 or world.options.whistlesanity.value == 3:
+        add_rule(multiworld.get_location(LocationName.mission_street_hidden_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.mission_street_hidden_4, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_hidden_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_hidden_1, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_hidden_1, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.death_chamber_hidden_2, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_hidden_2, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.cannon_core_hidden_1, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_hidden_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
     # Omochao Upgrade Requirements
-    if world.omosanity[player]:
-        add_rule(world.get_location(LocationName.eternal_engine_omo_1, player),
+    if world.options.omosanity:
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_1, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_2, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_omo_2, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_omo_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) or
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.final_rush_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_omo_3, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_omo_3, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_omo_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_omo_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_4, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_4, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_5, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_5, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_6, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_6, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_6, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_7, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_7, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_7, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_7, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.mission_street_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_omo_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_8, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_omo_8, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.security_hall_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_omo_8, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_8, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_8, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.death_chamber_omo_9, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_omo_9, player),
                  lambda state: state.has(ItemName.knuckles_mystic_melody, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_omo_9, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_omo_9, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_omo_9, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.eternal_engine_omo_10, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_10, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
 
-        add_rule(world.get_location(LocationName.eternal_engine_omo_11, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_11, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
 
-        add_rule(world.get_location(LocationName.eternal_engine_omo_12, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_omo_12, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_12, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_12, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.crazy_gadget_omo_13, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_omo_13, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
     # Gold Beetle Upgrade Requirements
-    if world.beetlesanity[player]:
-        add_rule(world.get_location(LocationName.hidden_base_beetle, player),
+    if world.options.beetlesanity:
+        add_rule(multiworld.get_location(LocationName.hidden_base_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_beetle, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_beetle, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_beetle, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_beetle, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_beetle, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.dry_lagoon_beetle, player),
+        add_rule(multiworld.get_location(LocationName.dry_lagoon_beetle, player),
                  lambda state: state.has(ItemName.rouge_mystic_melody, player) and
                                state.has(ItemName.rouge_pick_nails, player) and
                                state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.lost_colony_beetle, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_beetle, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_beetle, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_beetle, player),
                  lambda state: state.has(ItemName.eggman_mystic_melody, player) and
                                state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_beetle, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_beetle, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
     # Animal Upgrade Requirements
-    if world.animalsanity[player]:
-        add_rule(world.get_location(LocationName.hidden_base_animal_2, player),
+    if world.options.animalsanity:
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_2, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_2, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_2, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_3, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_3, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_3, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_3, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_4, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_4, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_4, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_4, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_5, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_5, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_5, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_5, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_6, player),
                  lambda state: state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_6, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_6, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_6, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_6, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_7, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_7, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.security_hall_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_animal_7, player),
                  lambda state: state.has(ItemName.rouge_pick_nails, player) or
                                state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_7, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_7, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_7, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.hidden_base_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_8, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_8, player),
                  lambda state: state.has(ItemName.tails_booster, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_8, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.security_hall_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.security_hall_animal_8, player),
                  lambda state: state.has(ItemName.rouge_pick_nails, player) and
                                state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_8, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_8, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_8, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.mission_street_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_9, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_9, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.weapons_bed_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_9, player),
+                 lambda state: state.has(ItemName.eggman_jet_engine, player) or
+                               state.has(ItemName.eggman_large_cannon, player))
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_9, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_9, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_9, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_9, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.wild_canyon_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.wild_canyon_animal_10, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.aquatic_mine_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.aquatic_mine_animal_10, player),
                  lambda state: state.has(ItemName.knuckles_mystic_melody, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.death_chamber_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.death_chamber_animal_10, player),
                  lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_10, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.egg_quarters_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.egg_quarters_animal_10, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.lost_colony_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_10, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_10, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.mad_space_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.mad_space_animal_10, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_10, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_10, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_10, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.mission_street_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_11, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_11, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_11, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_11, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_11, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_11, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.mission_street_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_12, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_12, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_12, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_12, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_12, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_12, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_12, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player) or
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_13, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_13, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_13, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_13, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_13, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_13, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_13, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_14, player),
                  lambda state: state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_14, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_14, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.lost_colony_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.lost_colony_animal_14, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_14, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_14, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_14, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_14, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.prison_lane_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.prison_lane_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.mission_street_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.hidden_base_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.hidden_base_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.eternal_engine_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.eternal_engine_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_15, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_15, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.iron_gate_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.iron_gate_animal_15, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(world.get_location(LocationName.sand_ocean_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.sand_ocean_animal_15, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.weapons_bed_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.weapons_bed_animal_15, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player) and
                                state.has(ItemName.eggman_large_cannon, player))
-        add_rule(world.get_location(LocationName.cosmic_wall_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.cosmic_wall_animal_15, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_15, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_15, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.mission_street_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.mission_street_animal_16, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.tails_bazooka, player))
-        add_rule(world.get_location(LocationName.crazy_gadget_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.crazy_gadget_animal_16, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_flame_ring, player))
-        add_rule(world.get_location(LocationName.final_rush_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.final_rush_animal_16, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_16, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_16, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.final_chase_animal_17, player),
+        add_rule(multiworld.get_location(LocationName.final_chase_animal_17, player),
                  lambda state: state.has(ItemName.shadow_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_17, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_17, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_18, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_18, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
-        add_rule(world.get_location(LocationName.pyramid_cave_animal_19, player),
+        add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
                  lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
 
-        add_rule(world.get_location(LocationName.cannon_core_animal_19, player),
+        add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_large_cannon, player) and
                                state.has(ItemName.knuckles_hammer_gloves, player) and
                                state.has(ItemName.sonic_flame_ring, player))
 
-        add_rule(world.get_location(LocationName.radical_highway_animal_20, player),
+        add_rule(multiworld.get_location(LocationName.radical_highway_animal_20, player),
                  lambda state: state.has(ItemName.shadow_flame_ring, player))
 
 
-def set_boss_gate_rules(world: MultiWorld, player: int, gate_bosses: typing.Dict[int, int]):
+def set_boss_gate_rules(multiworld: MultiWorld, player: int, gate_bosses: typing.Dict[int, int]):
     for x in range(len(gate_bosses)):
         if boss_has_requirement(gate_bosses[x + 1]):
-            add_rule(world.get_location(boss_gate_set[x], player),
+            add_rule(multiworld.get_location(boss_gate_set[x], player),
                      lambda state: state.has(ItemName.knuckles_shovel_claws, player))
 
 
-def set_rules(world: MultiWorld, player: int, gate_bosses: typing.Dict[int, int], boss_rush_map: typing.Dict[int, int], mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int]):
+def set_rules(multiworld: MultiWorld, world: World, player: int, gate_bosses: typing.Dict[int, int], boss_rush_map: typing.Dict[int, int], mission_map: typing.Dict[int, int], mission_count_map: typing.Dict[int, int], black_market_costs: typing.Dict[int, int]):
     # Mission Progression Rules (Mission 1 begets Mission 2, etc.)
-    set_mission_progress_rules(world, player, mission_map, mission_count_map)
+    set_mission_progress_rules(multiworld, player, mission_map, mission_count_map)
 
-    if world.goal[player].value != 3:
+    if world.options.goal.value != 3:
         # Upgrade Requirements for each mission location
-        if world.logic_difficulty[player].value == 0:
-            set_mission_upgrade_rules_standard(world, player)
-        elif world.logic_difficulty[player].value == 1:
-            set_mission_upgrade_rules_hard(world, player)
+        if world.options.logic_difficulty.value == 0:
+            set_mission_upgrade_rules_standard(multiworld, world, player)
+        elif world.options.logic_difficulty.value == 1:
+            set_mission_upgrade_rules_hard(multiworld, world, player)
 
-    if world.goal[player] in [4, 5, 6]:
+        for i in range(world.options.black_market_slots.value):
+            add_rule(multiworld.get_location(LocationName.chao_black_market_base + str(i + 1), player),
+                     lambda state, i=i: (state.has(ItemName.market_token, player, black_market_costs[i])))
+
+    if world.options.goal in [4, 5, 6]:
         for i in range(16):
             if boss_rush_map[i] == 10:
-                add_rule(world.get_location("Boss Rush - " + str(i + 1), player),
+                add_rule(multiworld.get_location("Boss Rush - " + str(i + 1), player),
                          lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
 
     # Upgrade Requirements for each boss gate
-    set_boss_gate_rules(world, player, gate_bosses)
+    set_boss_gate_rules(multiworld, player, gate_bosses)
 
-    world.completion_condition[player] = lambda state: state.has(ItemName.maria, player)
+    multiworld.completion_condition[player] = lambda state: state.has(ItemName.maria, player)
diff --git a/worlds/sa2b/__init__.py b/worlds/sa2b/__init__.py
index 496d18fa37..7d77aebc4c 100644
--- a/worlds/sa2b/__init__.py
+++ b/worlds/sa2b/__init__.py
@@ -1,14 +1,18 @@
 import typing
 import math
+import logging
 
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification
-from .Items import SA2BItem, ItemData, item_table, upgrades_table, emeralds_table, junk_table, trap_table, item_groups
-from .Locations import SA2BLocation, all_locations, setup_locations
+from .Items import SA2BItem, ItemData, item_table, upgrades_table, emeralds_table, junk_table, trap_table, item_groups, \
+                   eggs_table, fruits_table, seeds_table, hats_table, animals_table, chaos_drives_table
+from .Locations import SA2BLocation, all_locations, setup_locations, chao_animal_event_location_table, black_market_location_table
 from .Options import sa2b_options
 from .Regions import create_regions, shuffleable_regions, connect_regions, LevelGate, gate_0_whitelist_regions, \
     gate_0_blacklist_regions
 from .Rules import set_rules
 from .Names import ItemName, LocationName
+from .AestheticData import chao_name_conversion, sample_chao_names, totally_real_item_names, \
+                           all_exits, all_destinations, multi_rooms, single_rooms, room_to_exits_map, exit_to_room_map, valid_kindergarten_exits
 from worlds.AutoWorld import WebWorld, World
 from .GateBosses import get_gate_bosses, get_boss_rush_bosses, get_boss_name
 from .Missions import get_mission_table, get_mission_count_table, get_first_and_last_cannons_core_missions
@@ -52,7 +56,7 @@ class SA2BWorld(World):
     game: str = "Sonic Adventure 2 Battle"
     option_definitions = sa2b_options
     topology_present = False
-    data_version = 6
+    data_version = 7
 
     item_name_groups = item_groups
     item_name_to_id = {name: data.code for name, data in item_table.items()}
@@ -60,8 +64,6 @@ class SA2BWorld(World):
 
     location_table: typing.Dict[str, int]
 
-    music_map: typing.Dict[int, int]
-    voice_map: typing.Dict[int, int]
     mission_map: typing.Dict[int, int]
     mission_count_map: typing.Dict[int, int]
     emblems_for_cannons_core: int
@@ -69,138 +71,126 @@ class SA2BWorld(World):
     gate_costs: typing.Dict[int, int]
     gate_bosses: typing.Dict[int, int]
     boss_rush_map: typing.Dict[int, int]
+    black_market_costs: typing.Dict[int, int]
+
     web = SA2BWeb()
 
-    def _get_slot_data(self):
+    def fill_slot_data(self) -> dict:
         return {
-            "ModVersion": 202,
-            "Goal": self.multiworld.goal[self.player].value,
-            "MusicMap": self.music_map,
-            "VoiceMap": self.voice_map,
+            "ModVersion": 203,
+            "Goal": self.options.goal.value,
+            "MusicMap": self.generate_music_data(),
+            "VoiceMap": self.generate_voice_data(),
+            "DefaultEggMap": self.generate_chao_egg_data(),
+            "DefaultChaoNameMap": self.generate_chao_name_data(),
             "MissionMap": self.mission_map,
             "MissionCountMap": self.mission_count_map,
-            "MusicShuffle": self.multiworld.music_shuffle[self.player].value,
-            "Narrator": self.multiworld.narrator[self.player].value,
-            "MinigameTrapDifficulty": self.multiworld.minigame_trap_difficulty[self.player].value,
-            "RingLoss": self.multiworld.ring_loss[self.player].value,
-            "RingLink": self.multiworld.ring_link[self.player].value,
-            "RequiredRank": self.multiworld.required_rank[self.player].value,
-            "ChaoKeys": self.multiworld.keysanity[self.player].value,
-            "Whistlesanity": self.multiworld.whistlesanity[self.player].value,
-            "GoldBeetles": self.multiworld.beetlesanity[self.player].value,
-            "OmochaoChecks": self.multiworld.omosanity[self.player].value,
-            "AnimalChecks": self.multiworld.animalsanity[self.player].value,
-            "KartRaceChecks": self.multiworld.kart_race_checks[self.player].value,
-            "ChaoRaceChecks": self.multiworld.chao_race_checks[self.player].value,
-            "ChaoGardenDifficulty": self.multiworld.chao_garden_difficulty[self.player].value,
-            "DeathLink": self.multiworld.death_link[self.player].value,
-            "EmblemPercentageForCannonsCore": self.multiworld.emblem_percentage_for_cannons_core[self.player].value,
-            "RequiredCannonsCoreMissions": self.multiworld.required_cannons_core_missions[self.player].value,
-            "NumberOfLevelGates": self.multiworld.number_of_level_gates[self.player].value,
-            "LevelGateDistribution": self.multiworld.level_gate_distribution[self.player].value,
+            "MusicShuffle": self.options.music_shuffle.value,
+            "Narrator": self.options.narrator.value,
+            "MinigameTrapDifficulty": self.options.minigame_trap_difficulty.value,
+            "RingLoss": self.options.ring_loss.value,
+            "RingLink": self.options.ring_link.value,
+            "RequiredRank": self.options.required_rank.value,
+            "ChaoKeys": self.options.keysanity.value,
+            "Whistlesanity": self.options.whistlesanity.value,
+            "GoldBeetles": self.options.beetlesanity.value,
+            "OmochaoChecks": self.options.omosanity.value,
+            "AnimalChecks": self.options.animalsanity.value,
+            "KartRaceChecks": self.options.kart_race_checks.value,
+            "ChaoStadiumChecks": self.options.chao_stadium_checks.value,
+            "ChaoRaceDifficulty": self.options.chao_race_difficulty.value,
+            "ChaoKarateDifficulty": self.options.chao_karate_difficulty.value,
+            "ChaoStats": self.options.chao_stats.value,
+            "ChaoStatsFrequency": self.options.chao_stats_frequency.value,
+            "ChaoStatsStamina": self.options.chao_stats_stamina.value,
+            "ChaoStatsHidden": self.options.chao_stats_hidden.value,
+            "ChaoAnimalParts": self.options.chao_animal_parts.value,
+            "ChaoKindergarten": self.options.chao_kindergarten.value,
+            "BlackMarketSlots": self.options.black_market_slots.value,
+            "BlackMarketData": self.generate_black_market_data(),
+            "BlackMarketUnlockCosts": self.black_market_costs,
+            "BlackMarketUnlockSetting": self.options.black_market_unlock_costs.value,
+            "ChaoERLayout": self.generate_er_layout(),
+            "DeathLink": self.options.death_link.value,
+            "EmblemPercentageForCannonsCore": self.options.emblem_percentage_for_cannons_core.value,
+            "RequiredCannonsCoreMissions": self.options.required_cannons_core_missions.value,
+            "NumberOfLevelGates": self.options.number_of_level_gates.value,
+            "LevelGateDistribution": self.options.level_gate_distribution.value,
             "EmblemsForCannonsCore": self.emblems_for_cannons_core,
             "RegionEmblemMap": self.region_emblem_map,
             "GateCosts": self.gate_costs,
             "GateBosses": self.gate_bosses,
             "BossRushMap": self.boss_rush_map,
+            "PlayerNum": self.player,
         }
 
-    def _create_items(self, name: str):
-        data = item_table[name]
-        return [self.create_item(name) for _ in range(data.quantity)]
-
-    def fill_slot_data(self) -> dict:
-        slot_data = self._get_slot_data()
-        slot_data["MusicMap"] = self.music_map
-        for option_name in sa2b_options:
-            option = getattr(self.multiworld, option_name)[self.player]
-            slot_data[option_name] = option.value
-
-        return slot_data
-
-    def get_levels_per_gate(self) -> list:
-        levels_per_gate = list()
-        max_gate_index = self.multiworld.number_of_level_gates[self.player]
-        average_level_count = 30 / (max_gate_index + 1)
-        levels_added = 0
-
-        for i in range(max_gate_index + 1):
-            levels_per_gate.append(average_level_count)
-            levels_added += average_level_count
-        additional_count_iterator = 0
-        while levels_added < 30:
-            levels_per_gate[additional_count_iterator] += 1
-            levels_added += 1
-            additional_count_iterator += 1 if additional_count_iterator < max_gate_index else -max_gate_index
-
-        if self.multiworld.level_gate_distribution[self.player] == 0 or self.multiworld.level_gate_distribution[self.player] == 2:
-            early_distribution = self.multiworld.level_gate_distribution[self.player] == 0
-            levels_to_distribute = 5
-            gate_index_offset = 0
-            while levels_to_distribute > 0:
-                if levels_per_gate[0 + gate_index_offset] == 1 or \
-                        levels_per_gate[max_gate_index - gate_index_offset] == 1:
-                    break
-                if early_distribution:
-                    levels_per_gate[0 + gate_index_offset] += 1
-                    levels_per_gate[max_gate_index - gate_index_offset] -= 1
-                else:
-                    levels_per_gate[0 + gate_index_offset] -= 1
-                    levels_per_gate[max_gate_index - gate_index_offset] += 1
-                gate_index_offset += 1
-                if gate_index_offset > math.floor(max_gate_index / 2):
-                    gate_index_offset = 0
-                levels_to_distribute -= 1
-
-        return levels_per_gate
-
     def generate_early(self):
-        if self.multiworld.goal[self.player].value == 3:
+        if self.options.goal.value == 3:
             # Turn off everything else for Grand Prix goal
-            self.multiworld.number_of_level_gates[self.player].value = 0
-            self.multiworld.emblem_percentage_for_cannons_core[self.player].value = 0
-            self.multiworld.junk_fill_percentage[self.player].value = 100
-            self.multiworld.trap_fill_percentage[self.player].value = 100
-            self.multiworld.omochao_trap_weight[self.player].value = 0
-            self.multiworld.timestop_trap_weight[self.player].value = 0
-            self.multiworld.confusion_trap_weight[self.player].value = 0
-            self.multiworld.tiny_trap_weight[self.player].value = 0
-            self.multiworld.gravity_trap_weight[self.player].value = 0
-            self.multiworld.ice_trap_weight[self.player].value = 0
-            self.multiworld.slow_trap_weight[self.player].value = 0
+            self.options.number_of_level_gates.value = 0
+            self.options.emblem_percentage_for_cannons_core.value = 0
 
-            valid_trap_weights = self.multiworld.exposition_trap_weight[self.player].value + \
-                                 self.multiworld.cutscene_trap_weight[self.player].value + \
-                                 self.multiworld.pong_trap_weight[self.player].value
+            self.options.chao_race_difficulty.value = 0
+            self.options.chao_karate_difficulty.value = 0
+            self.options.chao_stats.value = 0
+            self.options.chao_animal_parts.value = 0
+            self.options.chao_kindergarten.value = 0
+            self.options.black_market_slots.value = 0
+
+            self.options.junk_fill_percentage.value = 100
+            self.options.trap_fill_percentage.value = 100
+            self.options.omochao_trap_weight.value = 0
+            self.options.timestop_trap_weight.value = 0
+            self.options.confusion_trap_weight.value = 0
+            self.options.tiny_trap_weight.value = 0
+            self.options.gravity_trap_weight.value = 0
+            self.options.ice_trap_weight.value = 0
+            self.options.slow_trap_weight.value = 0
+            self.options.cutscene_trap_weight.value = 0
+
+            valid_trap_weights = self.options.exposition_trap_weight.value + \
+                                 self.options.reverse_trap_weight.value + \
+                                 self.options.pong_trap_weight.value
 
             if valid_trap_weights == 0:
-                self.multiworld.exposition_trap_weight[self.player].value = 4
-                self.multiworld.cutscene_trap_weight[self.player].value = 4
-                self.multiworld.pong_trap_weight[self.player].value = 4
+                self.options.exposition_trap_weight.value = 4
+                self.options.reverse_trap_weight.value = 4
+                self.options.pong_trap_weight.value = 4
 
-            if self.multiworld.kart_race_checks[self.player].value == 0:
-                self.multiworld.kart_race_checks[self.player].value = 2
+            if self.options.kart_race_checks.value == 0:
+                self.options.kart_race_checks.value = 2
 
             self.gate_bosses = {}
             self.boss_rush_map = {}
         else:
-            self.gate_bosses   = get_gate_bosses(self.multiworld, self.player)
-            self.boss_rush_map = get_boss_rush_bosses(self.multiworld, self.player)
+            self.gate_bosses   = get_gate_bosses(self.multiworld, self)
+            self.boss_rush_map = get_boss_rush_bosses(self.multiworld, self)
 
     def create_regions(self):
-        self.mission_map       = get_mission_table(self.multiworld, self.player)
-        self.mission_count_map = get_mission_count_table(self.multiworld, self.player)
+        self.mission_map       = get_mission_table(self.multiworld, self, self.player)
+        self.mission_count_map = get_mission_count_table(self.multiworld, self, self.player)
 
-        self.location_table = setup_locations(self.multiworld, self.player, self.mission_map, self.mission_count_map)
-        create_regions(self.multiworld, self.player, self.location_table)
+        self.location_table = setup_locations(self, self.player, self.mission_map, self.mission_count_map)
+        create_regions(self.multiworld, self, self.player, self.location_table)
 
         # Not Generate Basic
-        if self.multiworld.goal[self.player].value in [0, 2, 4, 5, 6]:
+        self.black_market_costs = dict()
+
+        if self.options.goal.value in [0, 2, 4, 5, 6]:
             self.multiworld.get_location(LocationName.finalhazard, self.player).place_locked_item(self.create_item(ItemName.maria))
-        elif self.multiworld.goal[self.player].value == 1:
+        elif self.options.goal.value == 1:
             self.multiworld.get_location(LocationName.green_hill, self.player).place_locked_item(self.create_item(ItemName.maria))
-        elif self.multiworld.goal[self.player].value == 3:
+        elif self.options.goal.value == 3:
             self.multiworld.get_location(LocationName.grand_prix, self.player).place_locked_item(self.create_item(ItemName.maria))
+        elif self.options.goal.value == 7:
+            self.multiworld.get_location(LocationName.chaos_chao, self.player).place_locked_item(self.create_item(ItemName.maria))
+
+            for animal_name in chao_animal_event_location_table.keys():
+                animal_region = self.multiworld.get_region(animal_name, self.player)
+                animal_event_location = SA2BLocation(self.player, animal_name, None, animal_region)
+                animal_region.locations.append(animal_event_location)
+                animal_event_item = SA2BItem(animal_name, ItemClassification.progression, None, self.player)
+                self.multiworld.get_location(animal_name, self.player).place_locked_item(animal_event_item)
 
         itempool: typing.List[SA2BItem] = []
 
@@ -208,28 +198,40 @@ class SA2BWorld(World):
         total_required_locations = len(self.location_table)
         total_required_locations -= 1; # Locked Victory Location
 
-        if self.multiworld.goal[self.player].value != 3:
+        if self.options.goal.value != 3:
             # Fill item pool with all required items
             for item in {**upgrades_table}:
-                itempool += [self.create_item(item, False, self.multiworld.goal[self.player].value)]
+                itempool += [self.create_item(item, False, self.options.goal.value)]
 
-            if self.multiworld.goal[self.player].value in [1, 2, 6]:
+            if self.options.goal.value in [1, 2, 6]:
                 # Some flavor of Chaos Emerald Hunt
                 for item in {**emeralds_table}:
-                    itempool += self._create_items(item)
+                    itempool.append(self.create_item(item))
+
+            # Black Market
+            itempool += [self.create_item(ItemName.market_token) for _ in range(self.options.black_market_slots.value)]
+
+            black_market_unlock_mult = 1.0
+            if self.options.black_market_unlock_costs.value == 0:
+                black_market_unlock_mult = 0.5
+            elif self.options.black_market_unlock_costs.value == 1:
+                black_market_unlock_mult = 0.75
+
+            for i in range(self.options.black_market_slots.value):
+                self.black_market_costs[i] = math.floor((i + 1) * black_market_unlock_mult)
 
         # Cap at player-specified Emblem count
         raw_emblem_count = total_required_locations - len(itempool)
-        total_emblem_count = min(raw_emblem_count, self.multiworld.max_emblem_cap[self.player].value)
+        total_emblem_count = min(raw_emblem_count, self.options.max_emblem_cap.value)
         extra_junk_count = raw_emblem_count - total_emblem_count
 
         self.emblems_for_cannons_core = math.floor(
-            total_emblem_count * (self.multiworld.emblem_percentage_for_cannons_core[self.player].value / 100.0))
+            total_emblem_count * (self.options.emblem_percentage_for_cannons_core.value / 100.0))
 
         gate_cost_mult = 1.0
-        if self.multiworld.level_gate_costs[self.player].value == 0:
+        if self.options.level_gate_costs.value == 0:
             gate_cost_mult = 0.6
-        elif self.multiworld.level_gate_costs[self.player].value == 1:
+        elif self.options.level_gate_costs.value == 1:
             gate_cost_mult = 0.8
 
         shuffled_region_list = list(range(30))
@@ -253,8 +255,8 @@ class SA2BWorld(World):
             total_levels_added += 1
             if levels_added_to_gate >= levels_per_gate[current_gate]:
                 current_gate += 1
-                if current_gate > self.multiworld.number_of_level_gates[self.player].value:
-                    current_gate = self.multiworld.number_of_level_gates[self.player].value
+                if current_gate > self.options.number_of_level_gates.value:
+                    current_gate = self.options.number_of_level_gates.value
                 else:
                     current_gate_emblems = max(
                         math.floor(total_emblem_count * math.pow(total_levels_added / 30.0, 2.0) * gate_cost_mult), current_gate)
@@ -266,38 +268,70 @@ class SA2BWorld(World):
 
         first_cannons_core_mission, final_cannons_core_mission = get_first_and_last_cannons_core_missions(self.mission_map, self.mission_count_map)
 
-        connect_regions(self.multiworld, self.player, gates, self.emblems_for_cannons_core, self.gate_bosses, self.boss_rush_map, first_cannons_core_mission, final_cannons_core_mission)
+        connect_regions(self.multiworld, self, self.player, gates, self.emblems_for_cannons_core, self.gate_bosses, self.boss_rush_map, first_cannons_core_mission, final_cannons_core_mission)
 
         max_required_emblems = max(max(emblem_requirement_list), self.emblems_for_cannons_core)
         itempool += [self.create_item(ItemName.emblem) for _ in range(max_required_emblems)]
 
         non_required_emblems = (total_emblem_count - max_required_emblems)
-        junk_count = math.floor(non_required_emblems * (self.multiworld.junk_fill_percentage[self.player].value / 100.0))
+        junk_count = math.floor(non_required_emblems * (self.options.junk_fill_percentage.value / 100.0))
         itempool += [self.create_item(ItemName.emblem, True) for _ in range(non_required_emblems - junk_count)]
 
         # Carve Traps out of junk_count
         trap_weights = []
-        trap_weights += ([ItemName.omochao_trap] * self.multiworld.omochao_trap_weight[self.player].value)
-        trap_weights += ([ItemName.timestop_trap] * self.multiworld.timestop_trap_weight[self.player].value)
-        trap_weights += ([ItemName.confuse_trap] * self.multiworld.confusion_trap_weight[self.player].value)
-        trap_weights += ([ItemName.tiny_trap] * self.multiworld.tiny_trap_weight[self.player].value)
-        trap_weights += ([ItemName.gravity_trap] * self.multiworld.gravity_trap_weight[self.player].value)
-        trap_weights += ([ItemName.exposition_trap] * self.multiworld.exposition_trap_weight[self.player].value)
-        #trap_weights += ([ItemName.darkness_trap] * self.multiworld.darkness_trap_weight[self.player].value)
-        trap_weights += ([ItemName.ice_trap] * self.multiworld.ice_trap_weight[self.player].value)
-        trap_weights += ([ItemName.slow_trap] * self.multiworld.slow_trap_weight[self.player].value)
-        trap_weights += ([ItemName.cutscene_trap] * self.multiworld.cutscene_trap_weight[self.player].value)
-        trap_weights += ([ItemName.pong_trap] * self.multiworld.pong_trap_weight[self.player].value)
+        trap_weights += ([ItemName.omochao_trap] * self.options.omochao_trap_weight.value)
+        trap_weights += ([ItemName.timestop_trap] * self.options.timestop_trap_weight.value)
+        trap_weights += ([ItemName.confuse_trap] * self.options.confusion_trap_weight.value)
+        trap_weights += ([ItemName.tiny_trap] * self.options.tiny_trap_weight.value)
+        trap_weights += ([ItemName.gravity_trap] * self.options.gravity_trap_weight.value)
+        trap_weights += ([ItemName.exposition_trap] * self.options.exposition_trap_weight.value)
+        #trap_weights += ([ItemName.darkness_trap] * self.options.darkness_trap_weight.value)
+        trap_weights += ([ItemName.ice_trap] * self.options.ice_trap_weight.value)
+        trap_weights += ([ItemName.slow_trap] * self.options.slow_trap_weight.value)
+        trap_weights += ([ItemName.cutscene_trap] * self.options.cutscene_trap_weight.value)
+        trap_weights += ([ItemName.reverse_trap] * self.options.reverse_trap_weight.value)
+        trap_weights += ([ItemName.pong_trap] * self.options.pong_trap_weight.value)
 
         junk_count += extra_junk_count
-        trap_count = 0 if (len(trap_weights) == 0) else math.ceil(junk_count * (self.multiworld.trap_fill_percentage[self.player].value / 100.0))
+        trap_count = 0 if (len(trap_weights) == 0) else math.ceil(junk_count * (self.options.trap_fill_percentage.value / 100.0))
         junk_count -= trap_count
 
+        chao_active = self.any_chao_locations_active()
         junk_pool = []
         junk_keys = list(junk_table.keys())
+
+        # Chao Junk
+        if chao_active:
+            junk_keys += list(chaos_drives_table.keys())
+        eggs_keys = list(eggs_table.keys())
+        fruits_keys = list(fruits_table.keys())
+        seeds_keys = list(seeds_table.keys())
+        hats_keys = list(hats_table.keys())
+        eggs_count = 0
+        seeds_count = 0
+        hats_count = 0
+
         for i in range(junk_count):
-            junk_item = self.multiworld.random.choice(junk_keys)
-            junk_pool.append(self.create_item(junk_item))
+            junk_type = self.random.randint(0, len(junk_keys) + 3)
+
+            if chao_active and junk_type == len(junk_keys) + 0 and eggs_count < 20:
+                junk_item = self.multiworld.random.choice(eggs_keys)
+                junk_pool.append(self.create_item(junk_item))
+                eggs_count += 1
+            elif chao_active and junk_type == len(junk_keys) + 1:
+                junk_item = self.multiworld.random.choice(fruits_keys)
+                junk_pool.append(self.create_item(junk_item))
+            elif chao_active and junk_type == len(junk_keys) + 2 and seeds_count < 12:
+                junk_item = self.multiworld.random.choice(seeds_keys)
+                junk_pool.append(self.create_item(junk_item))
+                seeds_count += 1
+            elif chao_active and junk_type == len(junk_keys) + 3 and hats_count < 20:
+                junk_item = self.multiworld.random.choice(hats_keys)
+                junk_pool.append(self.create_item(junk_item))
+                hats_count += 1
+            else:
+                junk_item = self.multiworld.random.choice(junk_keys)
+                junk_pool.append(self.create_item(junk_item))
 
         itempool += junk_pool
 
@@ -310,95 +344,6 @@ class SA2BWorld(World):
 
         self.multiworld.itempool += itempool
 
-        # Music Shuffle
-        if self.multiworld.music_shuffle[self.player] == "levels":
-            musiclist_o = list(range(0, 47))
-            musiclist_s = musiclist_o.copy()
-            self.multiworld.random.shuffle(musiclist_s)
-            musiclist_o.extend(range(47, 78))
-            musiclist_s.extend(range(47, 78))
-
-            if self.multiworld.sadx_music[self.player].value == 1:
-                musiclist_s = [x+100 for x in musiclist_s]
-            elif self.multiworld.sadx_music[self.player].value == 2:
-                for i in range(len(musiclist_s)):
-                    if self.multiworld.random.randint(0,1):
-                        musiclist_s[i] += 100
-
-            self.music_map = dict(zip(musiclist_o, musiclist_s))
-        elif self.multiworld.music_shuffle[self.player] == "full":
-            musiclist_o = list(range(0, 78))
-            musiclist_s = musiclist_o.copy()
-            self.multiworld.random.shuffle(musiclist_s)
-
-            if self.multiworld.sadx_music[self.player].value == 1:
-                musiclist_s = [x+100 for x in musiclist_s]
-            elif self.multiworld.sadx_music[self.player].value == 2:
-                for i in range(len(musiclist_s)):
-                    if self.multiworld.random.randint(0,1):
-                        musiclist_s[i] += 100
-
-            self.music_map = dict(zip(musiclist_o, musiclist_s))
-        elif self.multiworld.music_shuffle[self.player] == "singularity":
-            musiclist_o = list(range(0, 78))
-            musiclist_s = [self.multiworld.random.choice(musiclist_o)] * len(musiclist_o)
-
-            if self.multiworld.sadx_music[self.player].value == 1:
-                musiclist_s = [x+100 for x in musiclist_s]
-            elif self.multiworld.sadx_music[self.player].value == 2:
-                if self.multiworld.random.randint(0,1):
-                    musiclist_s = [x+100 for x in musiclist_s]
-
-            self.music_map = dict(zip(musiclist_o, musiclist_s))
-        else:
-            musiclist_o = list(range(0, 78))
-            musiclist_s = musiclist_o.copy()
-
-            if self.multiworld.sadx_music[self.player].value == 1:
-                musiclist_s = [x+100 for x in musiclist_s]
-            elif self.multiworld.sadx_music[self.player].value == 2:
-                for i in range(len(musiclist_s)):
-                    if self.multiworld.random.randint(0,1):
-                        musiclist_s[i] += 100
-
-            self.music_map = dict(zip(musiclist_o, musiclist_s))
-
-        # Voice Shuffle
-        if self.multiworld.voice_shuffle[self.player] == "shuffled":
-            voicelist_o = list(range(0, 2623))
-            voicelist_s = voicelist_o.copy()
-            self.multiworld.random.shuffle(voicelist_s)
-
-            self.voice_map = dict(zip(voicelist_o, voicelist_s))
-        elif self.multiworld.voice_shuffle[self.player] == "rude":
-            voicelist_o = list(range(0, 2623))
-            voicelist_s = voicelist_o.copy()
-            self.multiworld.random.shuffle(voicelist_s)
-
-            for i in range(len(voicelist_s)):
-                if self.multiworld.random.randint(1,100) > 80:
-                    voicelist_s[i] = 17
-
-            self.voice_map = dict(zip(voicelist_o, voicelist_s))
-        elif self.multiworld.voice_shuffle[self.player] == "chao":
-            voicelist_o = list(range(0, 2623))
-            voicelist_s = voicelist_o.copy()
-            self.multiworld.random.shuffle(voicelist_s)
-
-            for i in range(len(voicelist_s)):
-                voicelist_s[i] = self.multiworld.random.choice(range(2586, 2608))
-
-            self.voice_map = dict(zip(voicelist_o, voicelist_s))
-        elif self.multiworld.voice_shuffle[self.player] == "singularity":
-            voicelist_o = list(range(0, 2623))
-            voicelist_s = [self.multiworld.random.choice(voicelist_o)] * len(voicelist_o)
-
-            self.voice_map = dict(zip(voicelist_o, voicelist_s))
-        else:
-            voicelist_o = list(range(0, 2623))
-            voicelist_s = voicelist_o.copy()
-
-            self.voice_map = dict(zip(voicelist_o, voicelist_s))
 
 
     def create_item(self, name: str, force_non_progression=False, goal=0) -> Item:
@@ -422,26 +367,32 @@ class SA2BWorld(World):
         return created_item
 
     def get_filler_item_name(self) -> str:
-        return self.multiworld.random.choice(list(junk_table.keys()))
+        junk_keys = list(junk_table.keys())
+
+        # Chao Junk
+        if self.any_chao_locations_active():
+            junk_keys += list(chaos_drives_table.keys())
+
+        return self.multiworld.random.choice(junk_keys)
 
     def set_rules(self):
-        set_rules(self.multiworld, self.player, self.gate_bosses, self.boss_rush_map, self.mission_map, self.mission_count_map)
+        set_rules(self.multiworld, self, self.player, self.gate_bosses, self.boss_rush_map, self.mission_map, self.mission_count_map, self.black_market_costs)
 
     def write_spoiler(self, spoiler_handle: typing.TextIO):
-        if self.multiworld.number_of_level_gates[self.player].value > 0 or self.multiworld.goal[self.player].value in [4, 5, 6]:
+        if self.options.number_of_level_gates.value > 0 or self.options.goal.value in [4, 5, 6]:
             spoiler_handle.write("\n")
             header_text = "Sonic Adventure 2 Bosses for {}:\n"
             header_text = header_text.format(self.multiworld.player_name[self.player])
             spoiler_handle.write(header_text)
 
-            if self.multiworld.number_of_level_gates[self.player].value > 0:
+            if self.options.number_of_level_gates.value > 0:
                 for x in range(len(self.gate_bosses.values())):
                     text = "Gate {0} Boss: {1}\n"
                     text = text.format((x + 1), get_boss_name(self.gate_bosses[x + 1]))
                     spoiler_handle.writelines(text)
                 spoiler_handle.write("\n")
 
-            if self.multiworld.goal[self.player].value in [4, 5, 6]:
+            if self.options.goal.value in [4, 5, 6]:
                 for x in range(len(self.boss_rush_map.values())):
                     text = "Boss Rush Boss {0}: {1}\n"
                     text = text.format((x + 1), get_boss_name(self.boss_rush_map[x]))
@@ -459,12 +410,21 @@ class SA2BWorld(World):
         ]
         no_hint_region_names = [
             LocationName.cannon_core_region,
-            LocationName.chao_garden_beginner_region,
-            LocationName.chao_garden_intermediate_region,
-            LocationName.chao_garden_expert_region,
+            LocationName.chao_race_beginner_region,
+            LocationName.chao_race_intermediate_region,
+            LocationName.chao_race_expert_region,
+            LocationName.chao_karate_beginner_region,
+            LocationName.chao_karate_intermediate_region,
+            LocationName.chao_karate_expert_region,
+            LocationName.chao_karate_super_region,
+            LocationName.kart_race_beginner_region,
+            LocationName.kart_race_standard_region,
+            LocationName.kart_race_expert_region,
+            LocationName.chao_kindergarten_region,
+            LocationName.black_market_region,
         ]
         er_hint_data = {}
-        for i in range(self.multiworld.number_of_level_gates[self.player].value + 1):
+        for i in range(self.options.number_of_level_gates.value + 1):
             gate_name = gate_names[i]
             gate_region = self.multiworld.get_region(gate_name, self.player)
             if not gate_region:
@@ -476,10 +436,353 @@ class SA2BWorld(World):
                 for location in level_region.locations:
                     er_hint_data[location.address] = gate_name
 
+        for i in range(self.options.black_market_slots.value):
+            location = self.multiworld.get_location(LocationName.chao_black_market_base + str(i + 1), self.player)
+            er_hint_data[location.address] = str(self.black_market_costs[i]) + " " + str(ItemName.market_token)
+
+
         hint_data[self.player] = er_hint_data
 
     @classmethod
-    def stage_fill_hook(cls, world, progitempool, usefulitempool, filleritempool, fill_locations):
-        if world.get_game_players("Sonic Adventure 2 Battle"):
+    def stage_fill_hook(cls, multiworld: MultiWorld, progitempool, usefulitempool, filleritempool, fill_locations):
+        if multiworld.get_game_players("Sonic Adventure 2 Battle"):
             progitempool.sort(
                 key=lambda item: 0 if (item.name != 'Emblem') else 1)
+
+    def get_levels_per_gate(self) -> list:
+        levels_per_gate = list()
+        max_gate_index = self.options.number_of_level_gates
+        average_level_count = 30 / (max_gate_index + 1)
+        levels_added = 0
+
+        for i in range(max_gate_index + 1):
+            levels_per_gate.append(average_level_count)
+            levels_added += average_level_count
+        additional_count_iterator = 0
+        while levels_added < 30:
+            levels_per_gate[additional_count_iterator] += 1
+            levels_added += 1
+            additional_count_iterator += 1 if additional_count_iterator < max_gate_index else -max_gate_index
+
+        if self.options.level_gate_distribution == 0 or self.options.level_gate_distribution == 2:
+            early_distribution = self.options.level_gate_distribution == 0
+            levels_to_distribute = 5
+            gate_index_offset = 0
+            while levels_to_distribute > 0:
+                if levels_per_gate[0 + gate_index_offset] == 1 or \
+                        levels_per_gate[max_gate_index - gate_index_offset] == 1:
+                    break
+                if early_distribution:
+                    levels_per_gate[0 + gate_index_offset] += 1
+                    levels_per_gate[max_gate_index - gate_index_offset] -= 1
+                else:
+                    levels_per_gate[0 + gate_index_offset] -= 1
+                    levels_per_gate[max_gate_index - gate_index_offset] += 1
+                gate_index_offset += 1
+                if gate_index_offset > math.floor(max_gate_index / 2):
+                    gate_index_offset = 0
+                levels_to_distribute -= 1
+
+        return levels_per_gate
+
+    def any_chao_locations_active(self) -> bool:
+        if self.options.chao_race_difficulty.value > 0 or \
+           self.options.chao_karate_difficulty.value > 0 or \
+           self.options.chao_stats.value > 0 or \
+           self.options.chao_animal_parts or \
+           self.options.chao_kindergarten or \
+           self.options.black_market_slots.value > 0:
+            return True;
+
+        return False
+
+    def generate_music_data(self) -> typing.Dict[int, int]:
+        if self.options.music_shuffle == "levels":
+            musiclist_o = list(range(0, 47))
+            musiclist_s = musiclist_o.copy()
+            self.random.shuffle(musiclist_s)
+            musiclist_o.extend(range(47, 78))
+            musiclist_s.extend(range(47, 78))
+
+            if self.options.sadx_music.value == 1:
+                musiclist_s = [x+100 for x in musiclist_s]
+            elif self.options.sadx_music.value == 2:
+                for i in range(len(musiclist_s)):
+                    if self.random.randint(0,1):
+                        musiclist_s[i] += 100
+
+            return dict(zip(musiclist_o, musiclist_s))
+        elif self.options.music_shuffle == "full":
+            musiclist_o = list(range(0, 78))
+            musiclist_s = musiclist_o.copy()
+            self.random.shuffle(musiclist_s)
+
+            if self.options.sadx_music.value == 1:
+                musiclist_s = [x+100 for x in musiclist_s]
+            elif self.options.sadx_music.value == 2:
+                for i in range(len(musiclist_s)):
+                    if self.random.randint(0,1):
+                        musiclist_s[i] += 100
+
+            return dict(zip(musiclist_o, musiclist_s))
+        elif self.options.music_shuffle == "singularity":
+            musiclist_o = list(range(0, 78))
+            musiclist_s = [self.random.choice(musiclist_o)] * len(musiclist_o)
+
+            if self.options.sadx_music.value == 1:
+                musiclist_s = [x+100 for x in musiclist_s]
+            elif self.options.sadx_music.value == 2:
+                if self.random.randint(0,1):
+                    musiclist_s = [x+100 for x in musiclist_s]
+
+            return dict(zip(musiclist_o, musiclist_s))
+        else:
+            musiclist_o = list(range(0, 78))
+            musiclist_s = musiclist_o.copy()
+
+            if self.options.sadx_music.value == 1:
+                musiclist_s = [x+100 for x in musiclist_s]
+            elif self.options.sadx_music.value == 2:
+                for i in range(len(musiclist_s)):
+                    if self.random.randint(0,1):
+                        musiclist_s[i] += 100
+
+            return dict(zip(musiclist_o, musiclist_s))
+
+    def generate_voice_data(self) -> typing.Dict[int, int]:
+        if self.options.voice_shuffle == "shuffled":
+            voicelist_o = list(range(0, 2623))
+            voicelist_s = voicelist_o.copy()
+            self.random.shuffle(voicelist_s)
+
+            return dict(zip(voicelist_o, voicelist_s))
+        elif self.options.voice_shuffle == "rude":
+            voicelist_o = list(range(0, 2623))
+            voicelist_s = voicelist_o.copy()
+            self.random.shuffle(voicelist_s)
+
+            for i in range(len(voicelist_s)):
+                if self.random.randint(1,100) > 80:
+                    voicelist_s[i] = 17
+
+            return dict(zip(voicelist_o, voicelist_s))
+        elif self.options.voice_shuffle == "chao":
+            voicelist_o = list(range(0, 2623))
+            voicelist_s = voicelist_o.copy()
+            self.random.shuffle(voicelist_s)
+
+            for i in range(len(voicelist_s)):
+                voicelist_s[i] = self.random.choice(range(2586, 2608))
+
+            return dict(zip(voicelist_o, voicelist_s))
+        elif self.options.voice_shuffle == "singularity":
+            voicelist_o = list(range(0, 2623))
+            voicelist_s = [self.random.choice(voicelist_o)] * len(voicelist_o)
+
+            return dict(zip(voicelist_o, voicelist_s))
+        else:
+            voicelist_o = list(range(0, 2623))
+            voicelist_s = voicelist_o.copy()
+
+            return dict(zip(voicelist_o, voicelist_s))
+
+    def generate_chao_egg_data(self) -> typing.Dict[int, int]:
+        if self.options.shuffle_starting_chao_eggs:
+            egglist_o = list(range(0, 4))
+            egglist_s = self.random.sample(range(0,54), 4)
+
+            return dict(zip(egglist_o, egglist_s))
+        else:
+            # Indicate these are not shuffled
+            egglist_o = [0, 1, 2, 3]
+            egglist_s = [255, 255, 255, 255]
+
+            return dict(zip(egglist_o, egglist_s))
+
+    def generate_chao_name_data(self) -> typing.Dict[int, int]:
+        number_of_names = 30
+        name_list_o = list(range(number_of_names * 7))
+        name_list_s = []
+
+        name_list_base = []
+        name_list_copy = list(self.multiworld.player_name.values())
+        name_list_copy.remove(self.multiworld.player_name[self.player])
+
+        if len(name_list_copy) >= number_of_names:
+            name_list_base = self.random.sample(name_list_copy, number_of_names)
+        else:
+            name_list_base = name_list_copy
+            self.random.shuffle(name_list_base)
+
+            name_list_base += self.random.sample(sample_chao_names, number_of_names - len(name_list_base))
+
+        for name in name_list_base:
+            for char_idx in range(7):
+                if char_idx < len(name):
+                    name_list_s.append(chao_name_conversion.get(name[char_idx], 0x5F))
+                else:
+                    name_list_s.append(0x00)
+
+        return dict(zip(name_list_o, name_list_s))
+
+    def generate_black_market_data(self) -> typing.Dict[int, int]:
+        if self.options.black_market_slots.value == 0:
+            return {}
+
+        ring_costs = [50, 75, 100]
+
+        market_data = {}
+        item_names = []
+        player_names = []
+        progression_flags = []
+        totally_real_item_names_copy = totally_real_item_names.copy()
+        location_names = [(LocationName.chao_black_market_base + str(i)) for i in range(1, self.options.black_market_slots.value + 1)]
+        locations = [self.multiworld.get_location(location_name, self.player) for location_name in location_names]
+        for location in locations:
+            if location.item.classification & ItemClassification.trap:
+                item_name = self.random.choice(totally_real_item_names_copy)
+                totally_real_item_names_copy.remove(item_name)
+                item_names.append(item_name)
+            else:
+                item_names.append(location.item.name)
+            player_names.append(self.multiworld.player_name[location.item.player])
+
+            if location.item.classification & ItemClassification.progression or location.item.classification & ItemClassification.trap:
+                progression_flags.append(2)
+            elif location.item.classification & ItemClassification.useful:
+                progression_flags.append(1)
+            else:
+                progression_flags.append(0)
+
+        for item_idx in range(self.options.black_market_slots.value):
+            for chr_idx in range(len(item_names[item_idx][:26])):
+                market_data[(item_idx * 46) + chr_idx] = ord(item_names[item_idx][chr_idx])
+            for chr_idx in range(len(player_names[item_idx][:16])):
+                market_data[(item_idx * 46) + 26 + chr_idx] = ord(player_names[item_idx][chr_idx])
+
+            market_data[(item_idx * 46) + 42] = ring_costs[progression_flags[item_idx]] * self.options.black_market_price_multiplier.value
+
+        return market_data
+
+    def generate_er_layout(self) -> typing.Dict[int, int]:
+        if not self.options.chao_entrance_randomization:
+            return {}
+
+        er_layout = {}
+
+        start_exit = self.random.randint(0, 3)
+        accessible_rooms = []
+
+        multi_rooms_copy      = multi_rooms.copy()
+        single_rooms_copy     = single_rooms.copy()
+        all_exits_copy        = all_exits.copy()
+        all_destinations_copy = all_destinations.copy()
+
+        multi_rooms_copy.remove(0x07)
+        accessible_rooms.append(0x07)
+
+        # Place Kindergarten somewhere sane
+        exit_choice = self.random.choice(valid_kindergarten_exits)
+        exit_room = exit_to_room_map[exit_choice]
+        all_exits_copy.remove(exit_choice)
+        multi_rooms_copy.remove(exit_room)
+
+        destination = 0x06
+        single_rooms_copy.remove(destination)
+        all_destinations_copy.remove(destination)
+
+        er_layout[exit_choice] = destination
+
+        reverse_exit = self.random.choice(room_to_exits_map[destination])
+
+        er_layout[reverse_exit] = exit_to_room_map[exit_choice]
+
+        all_exits_copy.remove(reverse_exit)
+        all_destinations_copy.remove(exit_room)
+
+        # Connect multi-exit rooms
+        loop_guard = 0
+        while len(multi_rooms_copy) > 0:
+            loop_guard += 1
+            if loop_guard > 2000:
+                logging.warning(f"Failed to generate Chao Entrance Randomization for player: {self.multiworld.player_name[self.player]}")
+                return {}
+
+            exit_room = self.random.choice(accessible_rooms)
+            possible_exits = [exit for exit in room_to_exits_map[exit_room] if exit in all_exits_copy]
+            if len(possible_exits) == 0:
+                continue
+            exit_choice = self.random.choice(possible_exits)
+            all_exits_copy.remove(exit_choice)
+
+            destination = self.random.choice(multi_rooms_copy)
+            multi_rooms_copy.remove(destination)
+            all_destinations_copy.remove(destination)
+            accessible_rooms.append(destination)
+
+            er_layout[exit_choice] = destination
+
+            reverse_exit = self.random.choice(room_to_exits_map[destination])
+
+            er_layout[reverse_exit] = exit_room
+
+            all_exits_copy.remove(reverse_exit)
+            all_destinations_copy.remove(exit_room)
+
+        # Connect dead-end rooms
+        loop_guard = 0
+        while len(single_rooms_copy) > 0:
+            loop_guard += 1
+            if loop_guard > 2000:
+                logging.warning(f"Failed to generate Chao Entrance Randomization for player: {self.multiworld.player_name[self.player]}")
+                return {}
+
+            exit_room = self.random.choice(accessible_rooms)
+            possible_exits = [exit for exit in room_to_exits_map[exit_room] if exit in all_exits_copy]
+            if len(possible_exits) == 0:
+                continue
+            exit_choice = self.random.choice(possible_exits)
+            all_exits_copy.remove(exit_choice)
+
+            destination = self.random.choice(single_rooms_copy)
+            single_rooms_copy.remove(destination)
+            all_destinations_copy.remove(destination)
+
+            er_layout[exit_choice] = destination
+
+            reverse_exit = self.random.choice(room_to_exits_map[destination])
+
+            er_layout[reverse_exit] = exit_room
+
+            all_exits_copy.remove(reverse_exit)
+            all_destinations_copy.remove(exit_room)
+
+        # Connect remaining exits
+        loop_guard = 0
+        while len(all_exits_copy) > 0:
+            loop_guard += 1
+            if loop_guard > 2000:
+                logging.warning(f"Failed to generate Chao Entrance Randomization for player: {self.multiworld.player_name[self.player]}")
+                return {}
+
+            exit_room = self.random.choice(all_destinations_copy)
+            possible_exits = [exit for exit in room_to_exits_map[exit_room] if exit in all_exits_copy]
+            if len(possible_exits) == 0:
+                continue
+            exit_choice = self.random.choice(possible_exits)
+            all_exits_copy.remove(exit_choice)
+            all_destinations_copy.remove(exit_room)
+
+            destination = self.random.choice(all_destinations_copy)
+            all_destinations_copy.remove(destination)
+
+            er_layout[exit_choice] = destination
+
+            possible_reverse_exits = [exit for exit in room_to_exits_map[destination] if exit in all_exits_copy]
+            reverse_exit = self.random.choice(possible_reverse_exits)
+
+            er_layout[reverse_exit] = exit_room
+
+            all_exits_copy.remove(reverse_exit)
+
+        return er_layout
diff --git a/worlds/sa2b/docs/setup_en.md b/worlds/sa2b/docs/setup_en.md
index b30255ad73..2ac00a3fb8 100644
--- a/worlds/sa2b/docs/setup_en.md
+++ b/worlds/sa2b/docs/setup_en.md
@@ -127,9 +127,6 @@ If you wish to use the `SADX Music` option of the Randomizer, you must own a cop
 - Mission 1 is missing a texture in the stage select UI.
 	- Most likely another mod is conflicting and overwriting the texture pack. It is recommeded to have the SA2B Archipelago mod load last in the mod loader.
 
-- Received Cutscene Traps don't play after beating a level.
-	- Make sure you don't have the "`Skip Intro`" option enabled in the mod manager.
-
 ## Save File Safeguard (Advanced Option)
 
 The mod contains a save file safeguard which associates a savefile to a specific Archipelago seed. By default, save files can only connect to Archipelago servers that match their seed. The safeguard can be disabled in the mod config.ini by setting `IgnoreFileSafety` to true. This is NOT recommended for the standard user as it will allow any save file to connect and send items to the Archipelago server.
diff --git a/worlds/sc2wol/Client.py b/worlds/sc2wol/Client.py
index a9bb826b74..3dbd2047de 100644
--- a/worlds/sc2wol/Client.py
+++ b/worlds/sc2wol/Client.py
@@ -9,6 +9,7 @@ import multiprocessing
 import os.path
 import re
 import sys
+import tempfile
 import typing
 import queue
 import zipfile
@@ -286,6 +287,8 @@ class SC2Context(CommonContext):
             await super(SC2Context, self).server_auth(password_requested)
         await self.get_username()
         await self.send_connect()
+        if self.ui:
+            self.ui.first_check = True
 
     def on_package(self, cmd: str, args: dict):
         if cmd in {"Connected"}:
@@ -1166,10 +1169,12 @@ def download_latest_release_zip(owner: str, repo: str, api_version: str, metadat
 
     r2 = requests.get(download_url, headers=headers)
     if r2.status_code == 200 and zipfile.is_zipfile(io.BytesIO(r2.content)):
-        with open(f"{repo}.zip", "wb") as fh:
+        tempdir = tempfile.gettempdir()
+        file = tempdir + os.sep + f"{repo}.zip"
+        with open(file, "wb") as fh:
             fh.write(r2.content)
         sc2_logger.info(f"Successfully downloaded {repo}.zip.")
-        return f"{repo}.zip", latest_metadata
+        return file, latest_metadata
     else:
         sc2_logger.warning(f"Status code: {r2.status_code}")
         sc2_logger.warning("Download failed.")
diff --git a/worlds/sc2wol/Locations.py b/worlds/sc2wol/Locations.py
index ae31fa8eaa..fba7051337 100644
--- a/worlds/sc2wol/Locations.py
+++ b/worlds/sc2wol/Locations.py
@@ -68,10 +68,10 @@ def get_locations(multiworld: Optional[MultiWorld], player: Optional[int]) -> Tu
                      lambda state: state._sc2wol_has_common_unit(multiworld, player) and
                                    (logic_level > 0 and state._sc2wol_has_anti_air(multiworld, player)
                                     or state._sc2wol_has_competent_anti_air(multiworld, player))),
-        LocationData("Evacuation", "Evacuation: First Chrysalis", SC2WOL_LOC_ID_OFFSET + 401, LocationType.BONUS),
-        LocationData("Evacuation", "Evacuation: Second Chrysalis", SC2WOL_LOC_ID_OFFSET + 402, LocationType.BONUS,
+        LocationData("Evacuation", "Evacuation: North Chrysalis", SC2WOL_LOC_ID_OFFSET + 401, LocationType.BONUS),
+        LocationData("Evacuation", "Evacuation: West Chrysalis", SC2WOL_LOC_ID_OFFSET + 402, LocationType.BONUS,
                      lambda state: state._sc2wol_has_common_unit(multiworld, player)),
-        LocationData("Evacuation", "Evacuation: Third Chrysalis", SC2WOL_LOC_ID_OFFSET + 403, LocationType.BONUS,
+        LocationData("Evacuation", "Evacuation: East Chrysalis", SC2WOL_LOC_ID_OFFSET + 403, LocationType.BONUS,
                      lambda state: state._sc2wol_has_common_unit(multiworld, player)),
         LocationData("Evacuation", "Evacuation: Reach Hanson", SC2WOL_LOC_ID_OFFSET + 404, LocationType.MISSION_PROGRESS),
         LocationData("Evacuation", "Evacuation: Secret Resource Stash", SC2WOL_LOC_ID_OFFSET + 405, LocationType.BONUS),
@@ -419,7 +419,7 @@ def get_locations(multiworld: Optional[MultiWorld], player: Optional[int]) -> Tu
                      lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)),
         LocationData("A Sinister Turn", "A Sinister Turn: Northeast Base", SC2WOL_LOC_ID_OFFSET + 2304, LocationType.MISSION_PROGRESS,
                      lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)),
-        LocationData("A Sinister Turn", "A Sinister Turn: Southeast Base", SC2WOL_LOC_ID_OFFSET + 2305, LocationType.MISSION_PROGRESS,
+        LocationData("A Sinister Turn", "A Sinister Turn: Southwest Base", SC2WOL_LOC_ID_OFFSET + 2305, LocationType.MISSION_PROGRESS,
                      lambda state: state._sc2wol_has_protoss_medium_units(multiworld, player)),
         LocationData("A Sinister Turn", "A Sinister Turn: Maar", SC2WOL_LOC_ID_OFFSET + 2306, LocationType.MISSION_PROGRESS,
                      lambda state: logic_level > 0 or state._sc2wol_has_protoss_medium_units(multiworld, player)),
diff --git a/worlds/sc2wol/Options.py b/worlds/sc2wol/Options.py
index 13b01c42a2..e4b6a74066 100644
--- a/worlds/sc2wol/Options.py
+++ b/worlds/sc2wol/Options.py
@@ -41,6 +41,10 @@ class FinalMap(Choice):
 
     Vanilla mission order always ends with All in mission!
 
+    Warning: Using All-in with a short mission order (7 or fewer missions) is not recommended,
+        as there might not be enough locations to place all the required items,
+        any excess required items will be placed into the player's starting inventory!
+
     This option is short-lived. It may be changed in the future
     """
     display_name = "Final Map"
@@ -265,7 +269,6 @@ class MissionProgressLocations(LocationInclusion):
     Nothing: No rewards for this type of tasks, effectively disabling such locations
 
     Note: Individual locations subject to plando are always enabled, so the plando can be placed properly.
-    Warning: The generation may fail if too many locations are excluded by this way.
     See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando)
     """
     display_name = "Mission Progress Locations"
@@ -282,7 +285,6 @@ class BonusLocations(LocationInclusion):
     Nothing: No rewards for this type of tasks, effectively disabling such locations
 
     Note: Individual locations subject to plando are always enabled, so the plando can be placed properly.
-    Warning: The generation may fail if too many locations are excluded by this way.
     See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando)
     """
     display_name = "Bonus Locations"
@@ -300,7 +302,6 @@ class ChallengeLocations(LocationInclusion):
     Nothing: No rewards for this type of tasks, effectively disabling such locations
 
     Note: Individual locations subject to plando are always enabled, so the plando can be placed properly.
-    Warning: The generation may fail if too many locations are excluded by this way.
     See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando)
     """
     display_name = "Challenge Locations"
@@ -317,7 +318,6 @@ class OptionalBossLocations(LocationInclusion):
     Nothing: No rewards for this type of tasks, effectively disabling such locations
 
     Note: Individual locations subject to plando are always enabled, so the plando can be placed properly.
-    Warning: The generation may fail if too many locations are excluded by this way.
     See also: Excluded Locations, Item Plando (https://archipelago.gg/tutorial/Archipelago/plando/en#item-plando)
     """
     display_name = "Optional Boss Locations"
diff --git a/worlds/sc2wol/PoolFilter.py b/worlds/sc2wol/PoolFilter.py
index 4a19e2dbb3..23422a3d1e 100644
--- a/worlds/sc2wol/PoolFilter.py
+++ b/worlds/sc2wol/PoolFilter.py
@@ -1,6 +1,7 @@
 from typing import Callable, Dict, List, Set
 from BaseClasses import MultiWorld, ItemClassification, Item, Location
-from .Items import get_full_item_list, spider_mine_sources, second_pass_placeable_items, filler_items
+from .Items import get_full_item_list, spider_mine_sources, second_pass_placeable_items, filler_items, \
+    progressive_if_nco
 from .MissionTables import no_build_regions_list, easy_regions_list, medium_regions_list, hard_regions_list,\
     mission_orders, MissionInfo, alt_final_mission_locations, MissionPools
 from .Options import get_option_value, MissionOrder, FinalMap, MissionProgressLocations, LocationInclusion
@@ -15,7 +16,7 @@ UPGRADABLE_ITEMS = [
 ]
 
 BARRACKS_UNITS = {"Marine", "Medic", "Firebat", "Marauder", "Reaper", "Ghost", "Spectre"}
-FACTORY_UNITS = {"Hellion", "Vulture", "Goliath", "Diamondback", "Siege Tank", "Thor", "Predator", "Widow Mine"}
+FACTORY_UNITS = {"Hellion", "Vulture", "Goliath", "Diamondback", "Siege Tank", "Thor", "Predator", "Widow Mine", "Cyclone"}
 STARPORT_UNITS = {"Medivac", "Wraith", "Viking", "Banshee", "Battlecruiser", "Hercules", "Science Vessel", "Raven", "Liberator", "Valkyrie"}
 
 PROTOSS_REGIONS = {"A Sinister Turn", "Echoes of the Future", "In Utter Darkness"}
@@ -93,7 +94,10 @@ def get_item_upgrades(inventory: List[Item], parent_item: Item or str):
     ]
 
 
-def get_item_quantity(item):
+def get_item_quantity(item: Item, multiworld: MultiWorld, player: int):
+    if (not get_option_value(multiworld, player, "nco_items")) \
+            and item.name in progressive_if_nco:
+        return 1
     return get_full_item_list()[item.name].quantity
 
 
@@ -138,13 +142,13 @@ class ValidInventory:
                 if not all(requirement(self) for requirement in requirements):
                     # If item cannot be removed, lock or revert
                     self.logical_inventory.add(item.name)
-                    for _ in range(get_item_quantity(item)):
+                    for _ in range(get_item_quantity(item, self.multiworld, self.player)):
                         locked_items.append(copy_item(item))
                     return False
             return True
-        
+
         # Limit the maximum number of upgrades 
-        maxUpgrad = get_option_value(self.multiworld, self.player, 
+        maxUpgrad = get_option_value(self.multiworld, self.player,
                             "max_number_of_upgrades")
         if maxUpgrad != -1:
             unit_avail_upgrades = {}
@@ -197,15 +201,16 @@ class ValidInventory:
                     # Don't process general upgrades, they may have been pre-locked per-level
                     for item in items_to_lock:
                         if item in inventory:
+                            item_quantity = inventory.count(item)
                             # Unit upgrades, lock all levels
-                            for _ in range(inventory.count(item)):
+                            for _ in range(item_quantity):
                                 inventory.remove(item)
                             if item not in locked_items:
                                 # Lock all the associated items if not already locked
-                                for _ in range(get_item_quantity(item)):
+                                for _ in range(item_quantity):
                                     locked_items.append(copy_item(item))
-                    if item in existing_items:
-                        existing_items.remove(item)
+                        if item in existing_items:
+                            existing_items.remove(item)
 
         if self.min_units_per_structure > 0 and self.has_units_per_structure():
             requirements.append(lambda state: state.has_units_per_structure())
@@ -216,7 +221,13 @@ class ValidInventory:
 
         while len(inventory) + len(locked_items) > inventory_size:
             if len(inventory) == 0:
-                raise Exception("Reduced item pool generation failed - not enough locations available to place items.")
+                # There are more items than locations and all of them are already locked due to YAML or logic.
+                # Random items from locked ones will go to starting items
+                self.multiworld.random.shuffle(locked_items)
+                while len(locked_items) > inventory_size:
+                    item: Item = locked_items.pop()
+                    self.multiworld.push_precollected(item)
+                break
             # Select random item from removable items
             item = self.multiworld.random.choice(inventory)
             # Cascade removals to associated items
@@ -245,7 +256,7 @@ class ValidInventory:
                             for _ in range(inventory.count(transient_item)):
                                 inventory.remove(transient_item)
                         if transient_item not in locked_items:
-                            for _ in range(get_item_quantity(transient_item)):
+                            for _ in range(get_item_quantity(transient_item, self.multiworld, self.player)):
                                 locked_items.append(copy_item(transient_item))
                         if transient_item.classification in (ItemClassification.progression, ItemClassification.progression_skip_balancing):
                             self.logical_inventory.add(transient_item.name)
diff --git a/worlds/sc2wol/Starcraft2.kv b/worlds/sc2wol/Starcraft2.kv
index 9c52d64c47..f0785b89e4 100644
--- a/worlds/sc2wol/Starcraft2.kv
+++ b/worlds/sc2wol/Starcraft2.kv
@@ -11,6 +11,6 @@
     markup: True
     halign: 'center'
     valign: 'middle'
-    padding_x: 5
+    padding: [5,0,5,0]
     markup: True
     outline_width: 1
diff --git a/worlds/sc2wol/__init__.py b/worlds/sc2wol/__init__.py
index 93aebb7ad1..5c487f8fee 100644
--- a/worlds/sc2wol/__init__.py
+++ b/worlds/sc2wol/__init__.py
@@ -34,7 +34,7 @@ class SC2WoLWorld(World):
 
     game = "Starcraft 2 Wings of Liberty"
     web = Starcraft2WoLWebWorld()
-    data_version = 4
+    data_version = 5
 
     item_name_to_id = {name: data.code for name, data in get_full_item_list().items()}
     location_name_to_id = {location.name: location.code for location in get_locations(None, None)}
@@ -46,7 +46,7 @@ class SC2WoLWorld(World):
     mission_req_table = {}
     final_mission_id: int
     victory_item: str
-    required_client_version = 0, 3, 6
+    required_client_version = 0, 4, 3
 
     def __init__(self, multiworld: MultiWorld, player: int):
         super(SC2WoLWorld, self).__init__(multiworld, player)
diff --git a/worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md b/worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md
index f7c8519a2a..18bda64784 100644
--- a/worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md	
+++ b/worlds/sc2wol/docs/en_Starcraft 2 Wings of Liberty.md	
@@ -31,4 +31,24 @@ The goal is to beat the final mission: 'All In'. The config file determines whic
 
 By default, any of StarCraft 2's items (specified above) can be in another player's world. See the
 [Advanced YAML Guide](https://archipelago.gg/tutorial/Archipelago/advanced_settings/en)
-for more information on how to change this.
\ No newline at end of file
+for more information on how to change this.
+
+## Unique Local Commands
+
+The following commands are only available when using the Starcraft 2 Client to play with Archipelago.
+
+- `/difficulty [difficulty]` Overrides the difficulty set for the world.
+  - Options: casual, normal, hard, brutal
+- `/game_speed [game_speed]` Overrides the game speed for the world
+  - Options: default, slower, slow, normal, fast, faster
+- `/color [color]` Changes your color (Currently has no effect)
+  - Options: white, red, blue, teal, purple, yellow, orange, green, lightpink, violet, lightgrey, darkgreen, brown,
+    lightgreen, darkgrey, pink, rainbow, random, default
+- `/disable_mission_check` Disables the check to see if a mission is available to play. Meant for co-op runs where one
+  player can play the next mission in a chain the other player is doing.
+- `/play [mission_id]` Starts a Starcraft 2 mission based off of the mission_id provided
+- `/available` Get what missions are currently available to play
+- `/unfinished` Get what missions are currently available to play and have not had all locations checked
+- `/set_path [path]` Menually set the SC2 install directory (if the automatic detection fails)
+- `/download_data` Download the most recent release of the necassry files for playing SC2 with Archipelago. Will
+  overwrite existing files
diff --git a/worlds/shivers/Constants.py b/worlds/shivers/Constants.py
new file mode 100644
index 0000000000..0b00cecec3
--- /dev/null
+++ b/worlds/shivers/Constants.py
@@ -0,0 +1,17 @@
+import os
+import json
+import pkgutil
+
+def load_data_file(*args) -> dict:
+    fname = os.path.join("data", *args)
+    return json.loads(pkgutil.get_data(__name__, fname).decode())
+
+location_id_offset: int = 27000
+
+location_info = load_data_file("locations.json")
+location_name_to_id = {name: location_id_offset + index \
+	for index, name in enumerate(location_info["all_locations"])}
+
+exclusion_info = load_data_file("excluded_locations.json")
+
+region_info = load_data_file("regions.json")
diff --git a/worlds/shivers/Items.py b/worlds/shivers/Items.py
new file mode 100644
index 0000000000..caf24ded29
--- /dev/null
+++ b/worlds/shivers/Items.py
@@ -0,0 +1,112 @@
+from BaseClasses import Item, ItemClassification
+import typing
+
+class ShiversItem(Item):
+    game: str = "Shivers"
+
+class ItemData(typing.NamedTuple):
+    code: int
+    type: str
+    classification: ItemClassification = ItemClassification.progression
+
+SHIVERS_ITEM_ID_OFFSET = 27000
+
+item_table = {
+    #Pot Pieces
+    "Water Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 0, "pot"),
+    "Wax Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 1, "pot"),
+    "Ash Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 2, "pot"),
+    "Oil Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 3, "pot"),
+    "Cloth Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 4, "pot"),
+    "Wood Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 5, "pot"),
+    "Crystal Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 6, "pot"),
+    "Lightning Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 7, "pot"),
+    "Sand Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 8, "pot"),
+    "Metal Pot Bottom": ItemData(SHIVERS_ITEM_ID_OFFSET + 9, "pot"),
+    "Water Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 10, "pot"),
+    "Wax Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 11, "pot"),
+    "Ash Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 12, "pot"),
+    "Oil Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 13, "pot"),
+    "Cloth Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 14, "pot"),
+    "Wood Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 15, "pot"),
+    "Crystal Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 16, "pot"),
+    "Lightning Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 17, "pot"),
+    "Sand Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 18, "pot"),
+    "Metal Pot Top": ItemData(SHIVERS_ITEM_ID_OFFSET + 19, "pot"),
+
+    #Keys
+    "Key for Office Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 20, "key"),
+    "Key for Bedroom Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 21, "key"),
+    "Key for Three Floor Elevator": ItemData(SHIVERS_ITEM_ID_OFFSET + 22, "key"),
+    "Key for Workshop": ItemData(SHIVERS_ITEM_ID_OFFSET + 23, "key"),
+    "Key for Office": ItemData(SHIVERS_ITEM_ID_OFFSET + 24, "key"),
+    "Key for Prehistoric Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 25, "key"),
+    "Key for Greenhouse Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 26, "key"),
+    "Key for Ocean Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 27, "key"),
+    "Key for Projector Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 28, "key"),
+    "Key for Generator Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 29, "key"),
+    "Key for Egypt Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 30, "key"),
+    "Key for Library Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 31, "key"),
+    "Key for Tiki Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 32, "key"),
+    "Key for UFO Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 33, "key"),
+    "Key for Torture Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 34, "key"),
+    "Key for Puzzle Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 35, "key"),
+    "Key for Bedroom": ItemData(SHIVERS_ITEM_ID_OFFSET + 36, "key"),
+    "Key for Underground Lake Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 37, "key"),
+    "Key for Janitor Closet": ItemData(SHIVERS_ITEM_ID_OFFSET + 38, "key"),
+    "Key for Front Door": ItemData(SHIVERS_ITEM_ID_OFFSET + 39, "key-optional"),
+
+    #Abilities
+    "Crawling": ItemData(SHIVERS_ITEM_ID_OFFSET + 50, "ability"),
+
+    #Event Items
+    "Victory": ItemData(SHIVERS_ITEM_ID_OFFSET + 60, "victory"),
+
+    #Duplicate pot pieces for fill_Restrictive
+    "Water Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 70, "potduplicate"),
+    "Wax Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 71, "potduplicate"),
+    "Ash Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 72, "potduplicate"),
+    "Oil Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 73, "potduplicate"),
+    "Cloth Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 74, "potduplicate"),
+    "Wood Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 75, "potduplicate"),
+    "Crystal Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 76, "potduplicate"),
+    "Lightning Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 77, "potduplicate"),
+    "Sand Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 78, "potduplicate"),
+    "Metal Pot Bottom DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 79, "potduplicate"),
+    "Water Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 80, "potduplicate"),
+    "Wax Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 81, "potduplicate"),
+    "Ash Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 82, "potduplicate"),
+    "Oil Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 83, "potduplicate"),
+    "Cloth Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 84, "potduplicate"),
+    "Wood Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 85, "potduplicate"),
+    "Crystal Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 86, "potduplicate"),
+    "Lightning Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 87, "potduplicate"),
+    "Sand Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 88, "potduplicate"),
+    "Metal Pot Top DUPE": ItemData(SHIVERS_ITEM_ID_OFFSET + 89, "potduplicate"),
+
+    #Filler
+    "Empty": ItemData(SHIVERS_ITEM_ID_OFFSET + 90, "filler"),
+    "Easier Lyre": ItemData(SHIVERS_ITEM_ID_OFFSET + 91, "filler", ItemClassification.filler),
+    "Water Always Available in Lobby": ItemData(SHIVERS_ITEM_ID_OFFSET + 92, "filler2", ItemClassification.filler),
+    "Wax Always Available in Library": ItemData(SHIVERS_ITEM_ID_OFFSET + 93, "filler2", ItemClassification.filler),
+    "Wax Always Available in Anansi Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 94, "filler2", ItemClassification.filler),
+    "Wax Always Available in Tiki Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 95, "filler2", ItemClassification.filler),
+    "Ash Always Available in Office": ItemData(SHIVERS_ITEM_ID_OFFSET + 96, "filler2", ItemClassification.filler),
+    "Ash Always Available in Burial Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 97, "filler2", ItemClassification.filler),
+    "Oil Always Available in Prehistoric Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 98, "filler2", ItemClassification.filler),
+    "Cloth Always Available in Egypt": ItemData(SHIVERS_ITEM_ID_OFFSET + 99, "filler2", ItemClassification.filler),
+    "Cloth Always Available in Burial Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 100, "filler2", ItemClassification.filler),
+    "Wood Always Available in Workshop": ItemData(SHIVERS_ITEM_ID_OFFSET + 101, "filler2", ItemClassification.filler),
+    "Wood Always Available in Blue Maze": ItemData(SHIVERS_ITEM_ID_OFFSET + 102, "filler2", ItemClassification.filler),
+    "Wood Always Available in Pegasus Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 103, "filler2", ItemClassification.filler),
+    "Wood Always Available in Gods Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 104, "filler2", ItemClassification.filler),
+    "Crystal Always Available in Lobby": ItemData(SHIVERS_ITEM_ID_OFFSET + 105, "filler2", ItemClassification.filler),
+    "Crystal Always Available in Ocean": ItemData(SHIVERS_ITEM_ID_OFFSET + 106, "filler2", ItemClassification.filler),
+    "Sand Always Available in Greenhouse Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 107, "filler2", ItemClassification.filler),
+    "Sand Always Available in Ocean": ItemData(SHIVERS_ITEM_ID_OFFSET + 108, "filler2", ItemClassification.filler),
+    "Metal Always Available in Projector Room": ItemData(SHIVERS_ITEM_ID_OFFSET + 109, "filler2", ItemClassification.filler),
+    "Metal Always Available in Bedroom": ItemData(SHIVERS_ITEM_ID_OFFSET + 110, "filler2", ItemClassification.filler),
+    "Metal Always Available in Prehistoric": ItemData(SHIVERS_ITEM_ID_OFFSET + 111, "filler2", ItemClassification.filler),
+    "Heal": ItemData(SHIVERS_ITEM_ID_OFFSET + 112, "filler3", ItemClassification.filler)
+
+}
diff --git a/worlds/shivers/Options.py b/worlds/shivers/Options.py
new file mode 100644
index 0000000000..6d18804069
--- /dev/null
+++ b/worlds/shivers/Options.py
@@ -0,0 +1,50 @@
+from Options import Choice, DefaultOnToggle, Toggle, PerGameCommonOptions
+from dataclasses import dataclass
+
+
+class LobbyAccess(Choice):
+    """Chooses how keys needed to reach the lobby are placed.
+    - Normal: Keys are placed anywhere
+    - Early: Keys are placed early 
+    - Local: Keys are placed locally"""
+    display_name = "Lobby Access"
+    option_normal = 0
+    option_early = 1
+    option_local = 2
+
+class PuzzleHintsRequired(DefaultOnToggle):
+    """If turned on puzzle hints will be available before the corresponding puzzle is required. For example: The Tiki
+    Drums puzzle will be placed after access to the security cameras which give you the solution. Turning this off
+    allows for greater randomization."""
+    display_name = "Puzzle Hints Required"
+
+class InformationPlaques(Toggle):
+    """Adds Information Plaques as checks."""
+    display_name = "Include Information Plaques"
+
+class FrontDoorUsable(Toggle):
+    """Adds a key to unlock the front door of the museum."""
+    display_name = "Front Door Usable"
+
+class ElevatorsStaySolved(DefaultOnToggle):
+    """Adds elevators as checks and will remain open upon solving them."""
+    display_name = "Elevators Stay Solved"
+
+class EarlyBeth(DefaultOnToggle):
+    """Beth's body is open at the start of the game. This allows any pot piece to be placed in the slide and early checks on the second half of the final riddle."""
+    display_name = "Early Beth"
+
+class EarlyLightning(Toggle):
+    """Allows lightning to be captured at any point in the game. You will still need to capture all ten Ixupi for victory."""
+    display_name = "Early Lightning"
+
+
+@dataclass
+class ShiversOptions(PerGameCommonOptions):
+    lobby_access: LobbyAccess
+    puzzle_hints_required: PuzzleHintsRequired
+    include_information_plaques: InformationPlaques
+    front_door_usable: FrontDoorUsable
+    elevators_stay_solved: ElevatorsStaySolved
+    early_beth: EarlyBeth
+    early_lightning: EarlyLightning
diff --git a/worlds/shivers/Rules.py b/worlds/shivers/Rules.py
new file mode 100644
index 0000000000..4e1058fecf
--- /dev/null
+++ b/worlds/shivers/Rules.py
@@ -0,0 +1,228 @@
+from typing import Dict, List, TYPE_CHECKING
+from collections.abc import Callable
+from BaseClasses import CollectionState
+from worlds.generic.Rules import forbid_item
+
+if TYPE_CHECKING:
+    from . import ShiversWorld
+
+
+def water_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Lobby", "Region", player) or (state.can_reach("Janitor Closet", "Region", player) and cloth_capturable(state, player))) \
+        and state.has_all({"Water Pot Bottom", "Water Pot Top", "Water Pot Bottom DUPE", "Water Pot Top DUPE"}, player)
+
+
+def wax_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Library", "Region", player) or state.can_reach("Anansi", "Region", player)) \
+        and state.has_all({"Wax Pot Bottom", "Wax Pot Top", "Wax Pot Bottom DUPE", "Wax Pot Top DUPE"}, player)
+
+
+def ash_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Office", "Region", player) or state.can_reach("Burial", "Region", player)) \
+        and state.has_all({"Ash Pot Bottom", "Ash Pot Top", "Ash Pot Bottom DUPE", "Ash Pot Top DUPE"}, player)
+
+
+def oil_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Prehistoric", "Region", player) or state.can_reach("Tar River", "Region", player)) \
+        and state.has_all({"Oil Pot Bottom", "Oil Pot Top", "Oil Pot Bottom DUPE", "Oil Pot Top DUPE"}, player)
+
+
+def cloth_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Egypt", "Region", player) or state.can_reach("Burial", "Region", player) or state.can_reach("Janitor Closet", "Region", player)) \
+        and state.has_all({"Cloth Pot Bottom", "Cloth Pot Top", "Cloth Pot Bottom DUPE", "Cloth Pot Top DUPE"}, player)
+
+
+def wood_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Workshop", "Region", player) or state.can_reach("Blue Maze", "Region", player) or state.can_reach("Gods Room", "Region", player) or state.can_reach("Anansi", "Region", player)) \
+        and state.has_all({"Wood Pot Bottom", "Wood Pot Top", "Wood Pot Bottom DUPE", "Wood Pot Top DUPE"}, player)
+
+
+def crystal_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Lobby", "Region", player) or state.can_reach("Ocean", "Region", player)) \
+        and state.has_all({"Crystal Pot Bottom", "Crystal Pot Top", "Crystal Pot Bottom DUPE", "Crystal Pot Top DUPE"}, player)
+
+
+def sand_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Greenhouse", "Region", player) or state.can_reach("Ocean", "Region", player)) \
+        and state.has_all({"Sand Pot Bottom", "Sand Pot Top", "Sand Pot Bottom DUPE", "Sand Pot Top DUPE"}, player)
+
+
+def metal_capturable(state: CollectionState, player: int) -> bool:
+    return (state.can_reach("Projector Room", "Region", player) or state.can_reach("Prehistoric", "Region", player) or state.can_reach("Bedroom", "Region", player)) \
+        and state.has_all({"Metal Pot Bottom", "Metal Pot Top", "Metal Pot Bottom DUPE", "Metal Pot Top DUPE"}, player)
+
+
+def lightning_capturable(state: CollectionState, player: int) -> bool:
+    return (first_nine_ixupi_capturable or state.multiworld.early_lightning[player].value) \
+        and state.can_reach("Generator", "Region", player) \
+        and state.has_all({"Lightning Pot Bottom", "Lightning Pot Top", "Lightning Pot Bottom DUPE", "Lightning Pot Top DUPE"}, player)
+
+
+def beths_body_available(state: CollectionState, player: int) -> bool:
+    return (first_nine_ixupi_capturable(state, player) or state.multiworld.early_beth[player].value) \
+        and state.can_reach("Generator", "Region", player)
+
+
+def first_nine_ixupi_capturable(state: CollectionState, player: int) -> bool:
+    return water_capturable(state, player) and wax_capturable(state, player) \
+        and ash_capturable(state, player) and oil_capturable(state, player) \
+        and cloth_capturable(state, player) and wood_capturable(state, player) \
+        and crystal_capturable(state, player) and sand_capturable(state, player) \
+        and metal_capturable(state, player)
+
+
+def get_rules_lookup(player: int):
+    rules_lookup: Dict[str, List[Callable[[CollectionState], bool]]] = {
+        "entrances": {
+            "To Office Elevator From Underground Blue Tunnels": lambda state: state.has("Key for Office Elevator", player),
+            "To Office Elevator From Office": lambda state: state.has("Key for Office Elevator", player),
+            "To Bedroom Elevator From Office": lambda state: state.has_all({"Key for Bedroom Elevator", "Crawling"}, player),
+            "To Office From Bedroom Elevator": lambda state: state.has_all({"Key for Bedroom Elevator", "Crawling"}, player),
+            "To Three Floor Elevator From Maintenance Tunnels": lambda state: state.has("Key for Three Floor Elevator", player),
+            "To Three Floor Elevator From Blue Maze Bottom": lambda state: state.has("Key for Three Floor Elevator", player),
+            "To Three Floor Elevator From Blue Maze Top": lambda state: state.has("Key for Three Floor Elevator", player),
+            "To Workshop": lambda state: state.has("Key for Workshop", player),
+            "To Lobby From Office": lambda state: state.has("Key for Office", player),
+            "To Office From Lobby": lambda state: state.has("Key for Office", player),
+            "To Library From Lobby": lambda state: state.has("Key for Library Room", player),
+            "To Lobby From Library": lambda state: state.has("Key for Library Room", player),
+            "To Prehistoric From Lobby": lambda state: state.has("Key for Prehistoric Room", player),
+            "To Lobby From Prehistoric": lambda state: state.has("Key for Prehistoric Room", player),
+            "To Greenhouse": lambda state: state.has("Key for Greenhouse Room", player),
+            "To Ocean From Prehistoric": lambda state: state.has("Key for Ocean Room", player),
+            "To Prehistoric From Ocean": lambda state: state.has("Key for Ocean Room", player),
+            "To Projector Room": lambda state: state.has("Key for Projector Room", player),
+            "To Generator": lambda state: state.has("Key for Generator Room", player),
+            "To Lobby From Egypt": lambda state: state.has("Key for Egypt Room", player),
+            "To Egypt From Lobby": lambda state: state.has("Key for Egypt Room", player),
+            "To Janitor Closet": lambda state: state.has("Key for Janitor Closet", player),
+            "To Tiki From Burial": lambda state: state.has("Key for Tiki Room", player),
+            "To Burial From Tiki": lambda state: state.has("Key for Tiki Room", player),
+            "To Inventions From UFO": lambda state: state.has("Key for UFO Room", player),
+            "To UFO From Inventions": lambda state: state.has("Key for UFO Room", player),
+            "To Torture From Inventions": lambda state: state.has("Key for Torture Room", player),
+            "To Inventions From Torture": lambda state: state.has("Key for Torture Room", player),
+            "To Torture": lambda state: state.has("Key for Puzzle Room", player),
+            "To Puzzle Room Mastermind From Torture": lambda state: state.has("Key for Puzzle Room", player),
+            "To Bedroom": lambda state: state.has("Key for Bedroom", player),
+            "To Underground Lake From Underground Tunnels": lambda state: state.has("Key for Underground Lake Room", player),
+            "To Underground Tunnels From Underground Lake": lambda state: state.has("Key for Underground Lake Room", player),
+            "To Outside From Lobby": lambda state: state.has("Key for Front Door", player),
+            "To Lobby From Outside": lambda state: state.has("Key for Front Door", player),
+            "To Maintenance Tunnels From Theater Back Hallways": lambda state: state.has("Crawling", player),
+            "To Blue Maze From Egypt": lambda state: state.has("Crawling", player),
+            "To Egypt From Blue Maze": lambda state: state.has("Crawling", player),
+            "To Lobby From Tar River": lambda state: (state.has("Crawling", player) and oil_capturable(state, player)),
+            "To Tar River From Lobby": lambda state: (state.has("Crawling", player) and oil_capturable(state, player) and state.can_reach("Tar River", "Region", player)),
+            "To Burial From Egypt": lambda state: state.can_reach("Egypt", "Region", player),
+            "To Gods Room From Anansi": lambda state: state.can_reach("Gods Room", "Region", player),
+            "To Slide Room": lambda state: (
+                        state.can_reach("Prehistoric", "Region", player) and state.can_reach("Tar River", "Region",player) and
+                        state.can_reach("Egypt", "Region", player) and state.can_reach("Burial", "Region", player) and
+                        state.can_reach("Gods Room", "Region", player) and state.can_reach("Werewolf", "Region", player)),
+            "To Lobby From Slide Room": lambda state: (beths_body_available(state, player))
+        },
+        "locations_required": {
+            "Puzzle Solved Anansi Musicbox": lambda state: state.can_reach("Clock Tower", "Region", player),
+            "Accessible: Storage: Janitor Closet": lambda state: cloth_capturable(state, player),
+            "Accessible: Storage: Tar River": lambda state: oil_capturable(state, player),
+            "Accessible: Storage: Theater": lambda state: state.can_reach("Projector Room", "Region", player),
+            "Accessible: Storage: Slide": lambda state: beths_body_available(state, player) and state.can_reach("Slide Room", "Region", player),
+            "Ixupi Captured Water": lambda state: water_capturable(state, player),
+            "Ixupi Captured Wax": lambda state: wax_capturable(state, player),
+            "Ixupi Captured Ash": lambda state: ash_capturable(state, player),
+            "Ixupi Captured Oil": lambda state: oil_capturable(state, player),
+            "Ixupi Captured Cloth": lambda state: cloth_capturable(state, player),
+            "Ixupi Captured Wood": lambda state: wood_capturable(state, player),
+            "Ixupi Captured Crystal": lambda state: crystal_capturable(state, player),
+            "Ixupi Captured Sand": lambda state: sand_capturable(state, player),
+            "Ixupi Captured Metal": lambda state: metal_capturable(state, player),
+            "Final Riddle: Planets Aligned": lambda state: state.can_reach("Fortune Teller", "Region", player),
+            "Final Riddle: Norse God Stone Message": lambda state: (state.can_reach("Fortune Teller", "Region", player) and state.can_reach("UFO", "Region", player)),
+            "Final Riddle: Beth's Body Page 17": lambda state: beths_body_available(state, player),
+            "Final Riddle: Guillotine Dropped": lambda state: beths_body_available(state, player),
+            },
+        "locations_puzzle_hints": {
+            "Puzzle Solved Clock Tower Door": lambda state: state.can_reach("Three Floor Elevator", "Region", player),
+            "Puzzle Solved Clock Chains": lambda state: state.can_reach("Bedroom", "Region", player),
+            "Puzzle Solved Tiki Drums": lambda state: state.can_reach("Clock Tower", "Region", player),
+            "Puzzle Solved Red Door": lambda state: state.can_reach("Maintenance Tunnels", "Region", player),
+            "Puzzle Solved UFO Symbols": lambda state: state.can_reach("Library", "Region", player),
+            "Puzzle Solved Maze Door": lambda state: state.can_reach("Projector Room", "Region", player),
+            "Puzzle Solved Theater Door": lambda state: state.can_reach("Underground Lake", "Region", player),
+            "Puzzle Solved Columns of RA": lambda state: state.can_reach("Underground Lake", "Region", player),
+            "Final Riddle: Guillotine Dropped": lambda state: state.can_reach("Underground Lake", "Region", player)
+            },
+        "elevators": {
+            "Puzzle Solved Underground Elevator": lambda state: ((state.can_reach("Underground Lake", "Region", player) or state.can_reach("Office", "Region", player)
+                                                                  and state.has("Key for Office Elevator", player))),
+            "Puzzle Solved Bedroom Elevator": lambda state: (state.can_reach("Office", "Region", player) and state.has_all({"Key for Bedroom Elevator","Crawling"}, player)),
+            "Puzzle Solved Three Floor Elevator": lambda state: (((state.can_reach("Maintenance Tunnels", "Region", player) or state.can_reach("Blue Maze", "Region", player))
+                                                                  and state.has("Key for Three Floor Elevator", player)))
+            },
+        "lightning": {
+            "Ixupi Captured Lightning": lambda state: lightning_capturable(state, player)
+        }
+    }
+    return rules_lookup
+
+
+def set_rules(world: "ShiversWorld") -> None:
+    multiworld = world.multiworld
+    player = world.player
+
+    rules_lookup = get_rules_lookup(player)
+    # Set required entrance rules
+    for entrance_name, rule in rules_lookup["entrances"].items():
+        multiworld.get_entrance(entrance_name, player).access_rule = rule
+
+    # Set required location rules
+    for location_name, rule in rules_lookup["locations_required"].items():
+        multiworld.get_location(location_name, player).access_rule = rule
+
+    # Set option location rules
+    if world.options.puzzle_hints_required.value:
+        for location_name, rule in rules_lookup["locations_puzzle_hints"].items():
+            multiworld.get_location(location_name, player).access_rule = rule
+    if world.options.elevators_stay_solved.value:
+        for location_name, rule in rules_lookup["elevators"].items():
+            multiworld.get_location(location_name, player).access_rule = rule
+    if world.options.early_lightning.value:
+        for location_name, rule in rules_lookup["lightning"].items():
+            multiworld.get_location(location_name, player).access_rule = rule
+
+    # forbid cloth in janitor closet and oil in tar river
+    forbid_item(multiworld.get_location("Accessible: Storage: Janitor Closet", player), "Cloth Pot Bottom DUPE", player)
+    forbid_item(multiworld.get_location("Accessible: Storage: Janitor Closet", player), "Cloth Pot Top DUPE", player)
+    forbid_item(multiworld.get_location("Accessible: Storage: Tar River", player), "Oil Pot Bottom DUPE", player)
+    forbid_item(multiworld.get_location("Accessible: Storage: Tar River", player), "Oil Pot Top DUPE", player)
+
+    # Filler Item Forbids
+    forbid_item(multiworld.get_location("Puzzle Solved Lyre", player), "Easier Lyre", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Water", player), "Water Always Available in Lobby", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Library", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Anansi Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Wax", player), "Wax Always Available in Tiki Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Office", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Ash", player), "Ash Always Available in Burial Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Oil", player), "Oil Always Available in Prehistoric Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Cloth", player), "Cloth Always Available in Egypt", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Cloth", player), "Cloth Always Available in Burial Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Workshop", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Blue Maze", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Pegasus Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Wood", player), "Wood Always Available in Gods Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Crystal", player), "Crystal Always Available in Lobby", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Crystal", player), "Crystal Always Available in Ocean", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Sand", player), "Sand Always Available in Plants Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Sand", player), "Sand Always Available in Ocean", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Metal", player), "Metal Always Available in Projector Room", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Metal", player), "Metal Always Available in Bedroom", player)
+    forbid_item(multiworld.get_location("Ixupi Captured Metal", player), "Metal Always Available in Prehistoric", player)
+
+    # Set completion condition
+    multiworld.completion_condition[player] = lambda state: (first_nine_ixupi_capturable(state, player) and lightning_capturable(state, player))
+
+
+
+
diff --git a/worlds/shivers/__init__.py b/worlds/shivers/__init__.py
new file mode 100644
index 0000000000..e43e91fb5a
--- /dev/null
+++ b/worlds/shivers/__init__.py
@@ -0,0 +1,178 @@
+from .Items import item_table, ShiversItem
+from .Rules import set_rules
+from BaseClasses import Item, Tutorial, Region, Location
+from Fill import fill_restrictive
+from worlds.AutoWorld import WebWorld, World
+from . import Constants, Rules
+from .Options import ShiversOptions
+
+
+class ShiversWeb(WebWorld):
+    tutorials = [Tutorial(
+        "Shivers Setup Guide",
+        "A guide to setting up Shivers for Multiworld.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["GodlFire", "Mathx2"]
+    )]
+
+class ShiversWorld(World):
+    """
+    Shivers is a horror themed point and click adventure. Explore the mysteries of Windlenot's Museum of the Strange and Unusual.
+    """
+
+    game: str = "Shivers"
+    topology_present = False
+    web = ShiversWeb()
+    options_dataclass = ShiversOptions
+    options: ShiversOptions
+
+    item_name_to_id = {name: data.code for name, data in item_table.items()}
+    location_name_to_id = Constants.location_name_to_id
+    
+    def create_item(self, name: str) -> Item:
+        data = item_table[name]
+        return ShiversItem(name, data.classification, data.code, self.player)
+
+    def create_event(self, region_name: str, event_name: str) -> None:
+        region = self.multiworld.get_region(region_name, self.player)
+        loc = ShiversLocation(self.player, event_name, None, region)
+        loc.place_locked_item(self.create_event_item(event_name))
+        region.locations.append(loc)
+
+    def create_regions(self) -> None:
+        # Create regions
+        for region_name, exits in Constants.region_info["regions"]:
+            r = Region(region_name, self.player, self.multiworld)
+            self.multiworld.regions.append(r)
+            for exit_name in exits:
+                r.create_exit(exit_name)
+
+
+        # Bind mandatory connections
+        for entr_name, region_name in Constants.region_info["mandatory_connections"]:
+            e = self.multiworld.get_entrance(entr_name, self.player)
+            r = self.multiworld.get_region(region_name, self.player)
+            e.connect(r)
+        
+        # Locations
+        # Build exclusion list
+        self.removed_locations = set()
+        if not self.options.include_information_plaques:
+            self.removed_locations.update(Constants.exclusion_info["plaques"])
+        if not self.options.elevators_stay_solved:
+            self.removed_locations.update(Constants.exclusion_info["elevators"])
+        if not self.options.early_lightning:
+            self.removed_locations.update(Constants.exclusion_info["lightning"])
+
+        # Add locations
+        for region_name, locations in Constants.location_info["locations_by_region"].items():
+            region = self.multiworld.get_region(region_name, self.player)
+            for loc_name in locations:
+                if loc_name not in self.removed_locations:
+                    loc = ShiversLocation(self.player, loc_name, self.location_name_to_id.get(loc_name, None), region)
+                    region.locations.append(loc)
+
+    def create_items(self) -> None:
+        #Add items to item pool
+        itempool = []
+        for name, data in item_table.items():
+            if data.type in {"pot", "key", "ability", "filler2"}:
+                itempool.append(self.create_item(name))
+
+        #Add Filler
+        itempool += [self.create_item("Easier Lyre") for i in range(9)]
+
+        #Extra filler is random between Heals and Easier Lyre. Heals weighted 95%.
+        filler_needed = len(self.multiworld.get_unfilled_locations(self.player)) - 24 - len(itempool)
+        itempool += [self.random.choices([self.create_item("Heal"), self.create_item("Easier Lyre")], weights=[95, 5])[0] for i in range(filler_needed)]
+
+
+        #Place library escape items. Choose a location to place the escape item
+        library_region = self.multiworld.get_region("Library", self.player)
+        librarylocation = self.random.choice([loc for loc in library_region.locations if not loc.name.startswith("Accessible:")])
+
+        #Roll for which escape items will be placed in the Library
+        library_random = self.random.randint(1, 3)
+        if library_random == 1: 
+            librarylocation.place_locked_item(self.create_item("Crawling"))
+
+            itempool = [item for item in itempool if item.name != "Crawling"]
+
+        elif library_random == 2: 
+            librarylocation.place_locked_item(self.create_item("Key for Library Room"))
+
+            itempool = [item for item in itempool if item.name != "Key for Library Room"]
+        elif library_random == 3: 
+            librarylocation.place_locked_item(self.create_item("Key for Three Floor Elevator"))
+            
+            librarylocationkeytwo = self.random.choice([loc for loc in library_region.locations if not loc.name.startswith("Accessible:") and loc != librarylocation])
+            librarylocationkeytwo.place_locked_item(self.create_item("Key for Egypt Room"))
+
+            itempool = [item for item in itempool if item.name not in ["Key for Three Floor Elevator", "Key for Egypt Room"]]
+
+        #If front door option is on, determine which set of keys will be used for lobby access and add front door key to item pool
+        lobby_access_keys = 1
+        if self.options.front_door_usable:
+            lobby_access_keys = self.random.randint(1, 2)
+            itempool += [self.create_item("Key for Front Door")]
+        else:
+            itempool += [self.create_item("Heal")]
+
+        self.multiworld.itempool += itempool
+
+        #Lobby acess:
+        if self.options.lobby_access == 1:
+            if lobby_access_keys == 1:
+                self.multiworld.early_items[self.player]["Key for Underground Lake Room"] = 1
+                self.multiworld.early_items[self.player]["Key for Office Elevator"] = 1
+                self.multiworld.early_items[self.player]["Key for Office"] = 1
+            elif lobby_access_keys == 2:
+                self.multiworld.early_items[self.player]["Key for Front Door"] = 1
+        if self.options.lobby_access == 2:
+            if lobby_access_keys == 1:
+                self.multiworld.local_early_items[self.player]["Key for Underground Lake Room"] = 1
+                self.multiworld.local_early_items[self.player]["Key for Office Elevator"] = 1
+                self.multiworld.local_early_items[self.player]["Key for Office"] = 1
+            elif lobby_access_keys == 2:
+                self.multiworld.local_early_items[self.player]["Key for Front Door"] = 1
+
+    def pre_fill(self) -> None:
+        # Prefills event storage locations with duplicate pots
+        storagelocs = []
+        storageitems = []
+        self.storage_placements = []
+
+        for locations in Constants.location_info["locations_by_region"].values():
+            for loc_name in locations:
+                if loc_name.startswith("Accessible: "):
+                    storagelocs.append(self.multiworld.get_location(loc_name, self.player))
+
+        storageitems += [self.create_item(name) for name, data in item_table.items() if data.type == 'potduplicate']
+        storageitems += [self.create_item("Empty") for i in range(3)]
+
+        state = self.multiworld.get_all_state(True)
+
+        self.random.shuffle(storagelocs)
+        self.random.shuffle(storageitems)
+        
+        fill_restrictive(self.multiworld, state, storagelocs.copy(), storageitems, True, True)
+
+        self.storage_placements = {location.name: location.item.name for location in storagelocs}
+
+    set_rules = set_rules
+
+    def fill_slot_data(self) -> dict:
+
+        return {
+            "storageplacements": self.storage_placements,
+            "excludedlocations": {str(excluded_location).replace('ExcludeLocations(', '').replace(')', '') for excluded_location in self.multiworld.exclude_locations.values()},
+            "elevatorsstaysolved": {self.options.elevators_stay_solved.value},
+            "earlybeth": {self.options.early_beth.value},
+            "earlylightning": {self.options.early_lightning.value},
+        }
+
+
+class ShiversLocation(Location):
+    game = "Shivers"
diff --git a/worlds/shivers/data/excluded_locations.json b/worlds/shivers/data/excluded_locations.json
new file mode 100644
index 0000000000..6ed625077a
--- /dev/null
+++ b/worlds/shivers/data/excluded_locations.json
@@ -0,0 +1,52 @@
+{
+	"plaques": [
+		"Information Plaque: Transforming Masks (Lobby)",
+		"Information Plaque: Jade Skull (Lobby)",
+		"Information Plaque: Bronze Unicorn (Prehistoric)",
+		"Information Plaque: Griffin (Prehistoric)",
+		"Information Plaque: Eagles Nest (Prehistoric)",
+		"Information Plaque: Large Spider (Prehistoric)",
+		"Information Plaque: Starfish (Prehistoric)",
+		"Information Plaque: Quartz Crystal (Ocean)",
+		"Information Plaque: Poseidon (Ocean)",
+		"Information Plaque: Colossus of Rhodes (Ocean)",
+		"Information Plaque: Poseidon's Temple (Ocean)",
+		"Information Plaque: Subterranean World (Underground Maze)",
+		"Information Plaque: Dero (Underground Maze)",
+		"Information Plaque: Tomb of the Ixupi (Egypt)",
+		"Information Plaque: The Sphinx (Egypt)",
+		"Information Plaque: Curse of Anubis (Egypt)",
+		"Information Plaque: Norse Burial Ship (Burial)",
+		"Information Plaque: Paracas Burial Bundles (Burial)",
+		"Information Plaque: Spectacular Coffins of Ghana (Burial)",
+		"Information Plaque: Cremation (Burial)",
+		"Information Plaque: Animal Crematorium (Burial)",
+		"Information Plaque: Witch Doctors of the Congo (Tiki)",
+		"Information Plaque: Sarombe doctor of Mozambique (Tiki)",
+		"Information Plaque: Fisherman's Canoe God (Gods)",
+		"Information Plaque: Mayan Gods (Gods)",
+		"Information Plaque: Thor (Gods)",
+		"Information Plaque: Celtic Janus Sculpture (Gods)",
+		"Information Plaque: Sumerian Bull God - An (Gods)",
+		"Information Plaque: Sumerian Lyre (Gods)",
+		"Information Plaque: Chuen (Gods)",
+		"Information Plaque: African Creation Myth (Anansi)",
+		"Information Plaque: Apophis the Serpent (Anansi)",
+		"Information Plaque: Death (Anansi)",
+		"Information Plaque: Cyclops (Pegasus)",
+		"Information Plaque: Lycanthropy (Werewolf)",
+		"Information Plaque: Coincidence or Extraterrestrial Visits? (UFO)",
+		"Information Plaque: Planets (UFO)",
+		"Information Plaque: Astronomical Construction (UFO)",
+		"Information Plaque: Guillotine (Torture)",
+		"Information Plaque: Aliens (UFO)"
+	],
+	"elevators": [
+		"Puzzle Solved Underground Elevator",
+		"Puzzle Solved Bedroom Elevator",
+		"Puzzle Solved Three Floor Elevator"
+	],
+	"lightning": [
+		"Ixupi Captured Lightning"
+	]
+}
\ No newline at end of file
diff --git a/worlds/shivers/data/locations.json b/worlds/shivers/data/locations.json
new file mode 100644
index 0000000000..7d031b886b
--- /dev/null
+++ b/worlds/shivers/data/locations.json
@@ -0,0 +1,325 @@
+{
+  "all_locations": [
+    "Puzzle Solved Gears",
+    "Puzzle Solved Stone Henge",
+    "Puzzle Solved Workshop Drawers",
+    "Puzzle Solved Library Statue",
+    "Puzzle Solved Theater Door",
+    "Puzzle Solved Clock Tower Door",
+    "Puzzle Solved Clock Chains",
+    "Puzzle Solved Atlantis",
+    "Puzzle Solved Organ",
+    "Puzzle Solved Maze Door",
+    "Puzzle Solved Columns of RA",
+    "Puzzle Solved Burial Door",
+    "Puzzle Solved Chinese Solitaire",
+    "Puzzle Solved Tiki Drums",
+    "Puzzle Solved Lyre",
+    "Puzzle Solved Red Door",
+    "Puzzle Solved Fortune Teller Door",
+    "Puzzle Solved Alchemy",
+    "Puzzle Solved UFO Symbols",
+    "Puzzle Solved Anansi Musicbox",
+    "Puzzle Solved Gallows",
+    "Puzzle Solved Mastermind",
+    "Puzzle Solved Marble Flipper",
+    "Puzzle Solved Skull Dial Door",
+    "Flashback Memory Obtained Beth's Ghost",
+    "Flashback Memory Obtained Merrick's Ghost",
+    "Flashback Memory Obtained Windlenot's Ghost",
+    "Flashback Memory Obtained Ancient Astrology",
+    "Flashback Memory Obtained Scrapbook",
+    "Flashback Memory Obtained Museum Brochure",
+    "Flashback Memory Obtained In Search of the Unexplained",
+    "Flashback Memory Obtained Egyptian Hieroglyphics Explained",
+    "Flashback Memory Obtained South American Pictographs",
+    "Flashback Memory Obtained Mythology of the Stars",
+    "Flashback Memory Obtained Black Book",
+    "Flashback Memory Obtained Theater Movie",
+    "Flashback Memory Obtained Museum Blueprints",
+    "Flashback Memory Obtained Beth's Address Book",
+    "Flashback Memory Obtained Merick's Notebook",
+    "Flashback Memory Obtained Professor Windlenot's Diary",
+    "Ixupi Captured Water",
+    "Ixupi Captured Wax",
+    "Ixupi Captured Ash",
+    "Ixupi Captured Oil",
+    "Ixupi Captured Cloth",
+    "Ixupi Captured Wood",
+    "Ixupi Captured Crystal",
+    "Ixupi Captured Sand",
+    "Ixupi Captured Metal",
+    "Final Riddle: Fortune Teller",
+    "Final Riddle: Planets Aligned",
+    "Final Riddle: Norse God Stone Message",
+    "Final Riddle: Beth's Body Page 17",
+    "Final Riddle: Guillotine Dropped",
+    "Puzzle Hint Found: Combo Lock in Mailbox",
+    "Puzzle Hint Found: Orange Symbol",
+    "Puzzle Hint Found: Silver Symbol",
+    "Puzzle Hint Found: Green Symbol",
+    "Puzzle Hint Found: White Symbol",
+    "Puzzle Hint Found: Brown Symbol",
+    "Puzzle Hint Found: Tan Symbol",
+    "Puzzle Hint Found: Basilisk Bone Fragments",
+    "Puzzle Hint Found: Atlantis Map",
+    "Puzzle Hint Found: Sirens Song Heard",
+    "Puzzle Hint Found: Egyptian Sphinx Heard",
+    "Puzzle Hint Found: Gallows Information Plaque",
+    "Puzzle Hint Found: Mastermind Information Plaque",
+    "Puzzle Hint Found: Elevator Writing",
+    "Puzzle Hint Found: Tiki Security Camera",
+    "Puzzle Hint Found: Tape Recorder Heard",
+    "Information Plaque: Transforming Masks (Lobby)",
+    "Information Plaque: Jade Skull (Lobby)",
+    "Information Plaque: Bronze Unicorn (Prehistoric)",
+    "Information Plaque: Griffin (Prehistoric)",
+    "Information Plaque: Eagles Nest (Prehistoric)",
+    "Information Plaque: Large Spider (Prehistoric)",
+    "Information Plaque: Starfish (Prehistoric)",
+    "Information Plaque: Quartz Crystal (Ocean)",
+    "Information Plaque: Poseidon (Ocean)",
+    "Information Plaque: Colossus of Rhodes (Ocean)",
+    "Information Plaque: Poseidon's Temple (Ocean)",
+    "Information Plaque: Subterranean World (Underground Maze)",
+    "Information Plaque: Dero (Underground Maze)",
+    "Information Plaque: Tomb of the Ixupi (Egypt)",
+    "Information Plaque: The Sphinx (Egypt)",
+    "Information Plaque: Curse of Anubis (Egypt)",
+    "Information Plaque: Norse Burial Ship (Burial)",
+    "Information Plaque: Paracas Burial Bundles (Burial)",
+    "Information Plaque: Spectacular Coffins of Ghana (Burial)",
+    "Information Plaque: Cremation (Burial)",
+    "Information Plaque: Animal Crematorium (Burial)",
+    "Information Plaque: Witch Doctors of the Congo (Tiki)",
+    "Information Plaque: Sarombe doctor of Mozambique (Tiki)",
+    "Information Plaque: Fisherman's Canoe God (Gods)",
+    "Information Plaque: Mayan Gods (Gods)",
+    "Information Plaque: Thor (Gods)",
+    "Information Plaque: Celtic Janus Sculpture (Gods)",
+    "Information Plaque: Sumerian Bull God - An (Gods)",
+    "Information Plaque: Sumerian Lyre (Gods)",
+    "Information Plaque: Chuen (Gods)",
+    "Information Plaque: African Creation Myth (Anansi)",
+    "Information Plaque: Apophis the Serpent (Anansi)",
+    "Information Plaque: Death (Anansi)",
+    "Information Plaque: Cyclops (Pegasus)",
+    "Information Plaque: Lycanthropy (Werewolf)",
+    "Information Plaque: Coincidence or Extraterrestrial Visits? (UFO)",
+    "Information Plaque: Planets (UFO)",
+    "Information Plaque: Astronomical Construction (UFO)",
+    "Information Plaque: Guillotine (Torture)",
+    "Information Plaque: Aliens (UFO)",
+    "Puzzle Solved Underground Elevator",
+    "Puzzle Solved Bedroom Elevator",
+    "Puzzle Solved Three Floor Elevator",
+    "Ixupi Captured Lightning"
+  ],
+  "locations_by_region": {
+    "Outside": [
+      "Puzzle Solved Gears",
+      "Puzzle Solved Stone Henge",
+      "Ixupi Captured Water",
+      "Ixupi Captured Wax",
+      "Ixupi Captured Ash",
+      "Ixupi Captured Oil",
+      "Ixupi Captured Cloth",
+      "Ixupi Captured Wood",
+      "Ixupi Captured Crystal",
+      "Ixupi Captured Sand",
+      "Ixupi Captured Metal",
+      "Ixupi Captured Lightning",
+      "Puzzle Solved Underground Elevator",
+      "Puzzle Solved Three Floor Elevator",
+      "Puzzle Hint Found: Combo Lock in Mailbox",
+      "Puzzle Hint Found: Orange Symbol",
+      "Puzzle Hint Found: Silver Symbol",
+      "Puzzle Hint Found: Green Symbol",
+      "Puzzle Hint Found: White Symbol",
+      "Puzzle Hint Found: Brown Symbol",
+      "Puzzle Hint Found: Tan Symbol"
+    ],
+    "Underground Lake": [
+      "Flashback Memory Obtained Windlenot's Ghost",
+      "Flashback Memory Obtained Egyptian Hieroglyphics Explained"
+    ],
+    "Office": [
+      "Flashback Memory Obtained Scrapbook",
+      "Accessible: Storage: Desk Drawer",
+      "Puzzle Hint Found: Atlantis Map",
+      "Puzzle Hint Found: Tape Recorder Heard",
+      "Puzzle Solved Bedroom Elevator"
+    ],
+    "Workshop": [
+      "Puzzle Solved Workshop Drawers",
+      "Accessible: Storage: Workshop Drawers",
+      "Puzzle Hint Found: Basilisk Bone Fragments"
+    ],
+    "Bedroom": [
+      "Flashback Memory Obtained Professor Windlenot's Diary"
+    ],
+    "Library": [
+      "Puzzle Solved Library Statue",
+      "Flashback Memory Obtained In Search of the Unexplained",
+      "Flashback Memory Obtained South American Pictographs",
+      "Flashback Memory Obtained Mythology of the Stars",
+      "Flashback Memory Obtained Black Book",
+      "Accessible: Storage: Library Cabinet",
+      "Accessible: Storage: Library Statue"
+    ],
+    "Maintenance Tunnels": [
+      "Flashback Memory Obtained Beth's Address Book"
+    ],
+    "Three Floor Elevator": [
+      "Puzzle Hint Found: Elevator Writing"
+    ],
+    "Lobby": [
+      "Puzzle Solved Theater Door",
+      "Flashback Memory Obtained Museum Brochure",
+      "Information Plaque: Jade Skull (Lobby)",
+      "Information Plaque: Transforming Masks (Lobby)",
+      "Accessible: Storage: Slide",
+      "Accessible: Storage: Eagles Head"
+    ],
+    "Generator": [
+      "Final Riddle: Beth's Body Page 17"
+    ],
+    "Theater Back Hallways": [
+      "Puzzle Solved Clock Tower Door"
+    ],
+    "Clock Tower Staircase": [
+      "Puzzle Solved Clock Chains"
+    ],
+    "Clock Tower": [
+      "Flashback Memory Obtained Beth's Ghost",
+      "Accessible: Storage: Clock Tower",
+      "Puzzle Hint Found: Tiki Security Camera"
+    ],
+    "Projector Room": [
+      "Flashback Memory Obtained Theater Movie"
+    ],
+    "Ocean": [
+      "Puzzle Solved Atlantis",
+      "Puzzle Solved Organ",
+      "Flashback Memory Obtained Museum Blueprints",
+      "Accessible: Storage: Ocean",
+      "Puzzle Hint Found: Sirens Song Heard",
+      "Information Plaque: Quartz Crystal (Ocean)",
+      "Information Plaque: Poseidon (Ocean)",
+      "Information Plaque: Colossus of Rhodes (Ocean)",
+      "Information Plaque: Poseidon's Temple (Ocean)"
+    ],
+    "Maze Staircase": [
+      "Puzzle Solved Maze Door"
+    ],
+    "Egypt": [
+      "Puzzle Solved Columns of RA",
+      "Puzzle Solved Burial Door",
+      "Accessible: Storage: Egypt",
+      "Puzzle Hint Found: Egyptian Sphinx Heard",
+      "Information Plaque: Tomb of the Ixupi (Egypt)",
+      "Information Plaque: The Sphinx (Egypt)",
+      "Information Plaque: Curse of Anubis (Egypt)"
+    ],
+    "Burial": [
+      "Puzzle Solved Chinese Solitaire",
+      "Flashback Memory Obtained Merick's Notebook",
+      "Accessible: Storage: Chinese Solitaire",
+      "Information Plaque: Norse Burial Ship (Burial)",
+      "Information Plaque: Paracas Burial Bundles (Burial)",
+      "Information Plaque: Spectacular Coffins of Ghana (Burial)",
+      "Information Plaque: Animal Crematorium (Burial)",
+      "Information Plaque: Cremation (Burial)"
+    ],
+    "Tiki": [
+      "Puzzle Solved Tiki Drums",
+      "Accessible: Storage: Tiki Hut",
+      "Information Plaque: Witch Doctors of the Congo (Tiki)",
+      "Information Plaque: Sarombe doctor of Mozambique (Tiki)"
+    ],
+    "Gods Room": [
+      "Puzzle Solved Lyre",
+      "Puzzle Solved Red Door",
+      "Accessible: Storage: Lyre",
+      "Final Riddle: Norse God Stone Message",
+      "Information Plaque: Fisherman's Canoe God (Gods)",
+      "Information Plaque: Mayan Gods (Gods)",
+      "Information Plaque: Thor (Gods)",
+      "Information Plaque: Celtic Janus Sculpture (Gods)",
+      "Information Plaque: Sumerian Bull God - An (Gods)",
+      "Information Plaque: Sumerian Lyre (Gods)",
+      "Information Plaque: Chuen (Gods)"
+    ],
+    "Blue Maze": [
+      "Puzzle Solved Fortune Teller Door"
+    ],
+    "Fortune Teller": [
+      "Flashback Memory Obtained Merrick's Ghost",
+      "Final Riddle: Fortune Teller"
+    ],
+    "Inventions": [
+      "Puzzle Solved Alchemy",
+      "Accessible: Storage: Alchemy"
+    ],
+    "UFO": [
+      "Puzzle Solved UFO Symbols",
+      "Accessible: Storage: UFO",
+      "Final Riddle: Planets Aligned",
+      "Information Plaque: Coincidence or Extraterrestrial Visits? (UFO)",
+      "Information Plaque: Planets (UFO)",
+      "Information Plaque: Astronomical Construction (UFO)",
+      "Information Plaque: Aliens (UFO)"
+    ],
+    "Anansi": [
+      "Puzzle Solved Anansi Musicbox",
+      "Flashback Memory Obtained Ancient Astrology",
+      "Accessible: Storage: Skeleton",
+      "Accessible: Storage: Anansi",
+      "Information Plaque: African Creation Myth (Anansi)",
+      "Information Plaque: Apophis the Serpent (Anansi)",
+      "Information Plaque: Death (Anansi)",
+      "Information Plaque: Cyclops (Pegasus)",
+      "Information Plaque: Lycanthropy (Werewolf)"
+    ],
+    "Torture": [
+      "Puzzle Solved Gallows",
+      "Accessible: Storage: Hanging",
+      "Final Riddle: Guillotine Dropped",
+      "Puzzle Hint Found: Gallows Information Plaque",
+      "Information Plaque: Guillotine (Torture)"
+    ],
+    "Puzzle Room Mastermind": [
+      "Puzzle Solved Mastermind",
+      "Puzzle Hint Found: Mastermind Information Plaque"
+    ],
+    "Puzzle Room Marbles": [
+      "Puzzle Solved Marble Flipper"
+    ],
+    "Prehistoric": [
+      "Information Plaque: Bronze Unicorn (Prehistoric)",
+      "Information Plaque: Griffin (Prehistoric)",
+      "Information Plaque: Eagles Nest (Prehistoric)",
+      "Information Plaque: Large Spider (Prehistoric)",
+      "Information Plaque: Starfish (Prehistoric)",
+      "Accessible: Storage: Eagles Nest"
+    ],
+    "Tar River": [
+      "Accessible: Storage: Tar River",
+      "Information Plaque: Subterranean World (Underground Maze)",
+      "Information Plaque: Dero (Underground Maze)"
+    ],
+    "Theater": [
+      "Accessible: Storage: Theater"
+    ],
+    "Greenhouse": [
+      "Accessible: Storage: Greenhouse"
+    ],
+    "Janitor Closet": [
+      "Accessible: Storage: Janitor Closet"
+    ],
+    "Skull Dial Bridge": [
+      "Accessible: Storage: Skull Bridge",
+      "Puzzle Solved Skull Dial Door"
+    ]
+  }
+}   
diff --git a/worlds/shivers/data/regions.json b/worlds/shivers/data/regions.json
new file mode 100644
index 0000000000..3e81136c45
--- /dev/null
+++ b/worlds/shivers/data/regions.json
@@ -0,0 +1,145 @@
+{
+    "regions": [
+		["Menu", ["To Registry"]],
+		["Registry", ["To Outside From Registry"]],
+		["Outside", ["To Underground Tunnels From Outside", "To Lobby From Outside"]],
+		["Underground Tunnels", ["To Underground Lake From Underground Tunnels", "To Outside From Underground"]],
+		["Underground Lake", ["To Underground Tunnels From Underground Lake", "To Underground Blue Tunnels From Underground Lake"]],
+		["Underground Blue Tunnels", ["To Underground Lake From Underground Blue Tunnels", "To Office Elevator From Underground Blue Tunnels"]],
+		["Office Elevator", ["To Underground Blue Tunnels From Office Elevator","To Office From Office Elevator"]],
+		["Office", ["To Office Elevator From Office", "To Workshop", "To Lobby From Office", "To Bedroom Elevator From Office"]],
+		["Workshop", ["To Office From Workshop"]],
+		["Bedroom Elevator", ["To Office From Bedroom Elevator", "To Bedroom"]],
+		["Bedroom", ["To Bedroom Elevator From Bedroom"]],
+		["Lobby", ["To Office From Lobby", "To Library From Lobby", "To Theater From Lobby", "To Prehistoric From Lobby", "To Egypt From Lobby", "To Tar River From Lobby", "To Outside From Lobby"]],
+		["Library", ["To Lobby From Library", "To Maintenance Tunnels From Library"]],
+		["Maintenance Tunnels", ["To Library From Maintenance Tunnels", "To Three Floor Elevator From Maintenance Tunnels", "To Generator"]],
+		["Generator", ["To Maintenance Tunnels From Generator"]],
+		["Theater", ["To Lobby From Theater", "To Theater Back Hallways From Theater"]],
+		["Theater Back Hallways", ["To Theater From Theater Back Hallways", "To Clock Tower Staircase From Theater Back Hallways", "To Maintenance Tunnels From Theater Back Hallways", "To Projector Room"]],
+		["Clock Tower Staircase", ["To Theater Back Hallways From Clock Tower Staircase", "To Clock Tower"]],
+		["Clock Tower", ["To Clock Tower Staircase From Clock Tower"]],
+		["Projector Room", ["To Theater Back Hallways From Projector Room"]],
+		["Prehistoric", ["To Lobby From Prehistoric", "To Greenhouse", "To Ocean From Prehistoric"]],
+		["Greenhouse", ["To Prehistoric From Greenhouse"]],
+		["Ocean", ["To Prehistoric From Ocean", "To Maze Staircase From Ocean"]],
+		["Maze Staircase", ["To Ocean From Maze Staircase", "To Maze From Maze Staircase"]],
+		["Maze", ["To Maze Staircase From Maze", "To Tar River"]],
+		["Tar River", ["To Maze From Tar River", "To Lobby From Tar River"]],
+		["Egypt", ["To Lobby From Egypt", "To Burial From Egypt", "To Blue Maze From Egypt"]],
+		["Burial", ["To Egypt From Burial", "To Tiki From Burial"]],
+		["Tiki", ["To Burial From Tiki", "To Gods Room"]],
+		["Gods Room", ["To Tiki From Gods Room", "To Anansi From Gods Room"]],
+		["Anansi", ["To Gods Room From Anansi", "To Werewolf From Anansi"]],
+		["Werewolf", ["To Anansi From Werewolf", "To Night Staircase From Werewolf"]],
+		["Night Staircase", ["To Werewolf From Night Staircase", "To Janitor Closet", "To UFO"]],
+		["Janitor Closet", ["To Night Staircase From Janitor Closet"]],
+		["UFO", ["To Night Staircase From UFO", "To Inventions From UFO"]],
+		["Blue Maze", ["To Egypt From Blue Maze", "To Three Floor Elevator From Blue Maze Bottom", "To Three Floor Elevator From Blue Maze Top", "To Fortune Teller", "To Inventions From Blue Maze"]],
+		["Three Floor Elevator", ["To Maintenance Tunnels From Three Floor Elevator", "To Blue Maze From Three Floor Elevator"]],
+		["Fortune Teller", ["To Blue Maze From Fortune Teller"]],
+		["Inventions", ["To Blue Maze From Inventions", "To UFO From Inventions", "To Torture From Inventions"]],
+		["Torture", ["To Inventions From Torture", "To Puzzle Room Mastermind From Torture"]],
+		["Puzzle Room Mastermind", ["To Torture", "To Puzzle Room Marbles From Puzzle Room Mastermind"]],
+		["Puzzle Room Marbles", ["To Puzzle Room Mastermind From Puzzle Room Marbles", "To Skull Dial Bridge From Puzzle Room Marbles"]],
+		["Skull Dial Bridge", ["To Puzzle Room Marbles From Skull Dial Bridge", "To Slide Room"]],
+		["Slide Room", ["To Skull Dial Bridge From Slide Room", "To Lobby From Slide Room"]]
+    ],
+    "mandatory_connections": [
+    ["To Registry", "Registry"],
+		["To Outside From Registry", "Outside"],
+		["To Outside From Underground", "Outside"],
+		["To Outside From Lobby", "Outside"],
+		["To Underground Tunnels From Outside", "Underground Tunnels"],
+		["To Underground Tunnels From Underground Lake", "Underground Tunnels"],
+		["To Underground Lake From Underground Tunnels", "Underground Lake"],
+		["To Underground Lake From Underground Blue Tunnels", "Underground Lake"],
+		["To Underground Blue Tunnels From Underground Lake", "Underground Blue Tunnels"],
+		["To Underground Blue Tunnels From Office Elevator", "Underground Blue Tunnels"],
+		["To Office Elevator From Underground Blue Tunnels", "Office Elevator"],
+		["To Office Elevator From Office", "Office Elevator"],
+		["To Office From Office Elevator", "Office"],
+		["To Office From Workshop", "Office"],
+		["To Office From Bedroom Elevator", "Office"],
+		["To Office From Lobby", "Office"],
+		["To Workshop", "Workshop"],
+		["To Lobby From Office", "Lobby"],
+		["To Lobby From Library", "Lobby"],
+		["To Lobby From Tar River", "Lobby"],
+		["To Lobby From Slide Room", "Lobby"],
+		["To Lobby From Egypt", "Lobby"],
+		["To Lobby From Theater", "Lobby"],
+		["To Lobby From Prehistoric", "Lobby"],
+		["To Lobby From Outside", "Lobby"],
+		["To Bedroom Elevator From Office", "Bedroom Elevator"],
+		["To Bedroom Elevator From Bedroom", "Bedroom Elevator"],
+		["To Bedroom", "Bedroom"],
+		["To Library From Lobby", "Library"],
+		["To Library From Maintenance Tunnels", "Library"],
+		["To Theater From Lobby", "Theater" ],
+		["To Theater From Theater Back Hallways", "Theater"],
+		["To Prehistoric From Lobby", "Prehistoric"],
+		["To Prehistoric From Greenhouse", "Prehistoric"],
+		["To Prehistoric From Ocean", "Prehistoric"],
+		["To Egypt From Lobby", "Egypt"],
+		["To Egypt From Burial", "Egypt"],
+		["To Egypt From Blue Maze", "Egypt"],
+		["To Maintenance Tunnels From Generator", "Maintenance Tunnels"],
+		["To Maintenance Tunnels From Three Floor Elevator", "Maintenance Tunnels"],
+		["To Maintenance Tunnels From Library", "Maintenance Tunnels"],
+		["To Maintenance Tunnels From Theater Back Hallways", "Maintenance Tunnels"],
+		["To Three Floor Elevator From Maintenance Tunnels", "Three Floor Elevator"],
+		["To Three Floor Elevator From Blue Maze Bottom", "Three Floor Elevator"],
+		["To Three Floor Elevator From Blue Maze Top", "Three Floor Elevator"],
+		["To Generator", "Generator"],
+		["To Theater Back Hallways From Theater", "Theater Back Hallways"],
+		["To Theater Back Hallways From Clock Tower Staircase", "Theater Back Hallways"],
+		["To Theater Back Hallways From Projector Room", "Theater Back Hallways"],
+		["To Clock Tower Staircase From Theater Back Hallways", "Clock Tower Staircase"],
+		["To Clock Tower Staircase From Clock Tower", "Clock Tower Staircase"],
+		["To Projector Room", "Projector Room"],
+		["To Clock Tower", "Clock Tower"],
+		["To Greenhouse", "Greenhouse"],
+		["To Ocean From Prehistoric", "Ocean"],
+		["To Ocean From Maze Staircase", "Ocean"],
+		["To Maze Staircase From Ocean", "Maze Staircase"],
+		["To Maze Staircase From Maze", "Maze Staircase"],
+		["To Maze From Maze Staircase", "Maze"],
+		["To Maze From Tar River", "Maze"],
+		["To Tar River", "Tar River"],
+		["To Tar River From Lobby", "Tar River"],
+		["To Burial From Egypt", "Burial"],
+		["To Burial From Tiki", "Burial"],
+		["To Blue Maze From Three Floor Elevator", "Blue Maze"],
+		["To Blue Maze From Fortune Teller", "Blue Maze"],
+		["To Blue Maze From Inventions", "Blue Maze"],
+		["To Blue Maze From Egypt", "Blue Maze"],
+		["To Tiki From Burial", "Tiki"],
+		["To Tiki From Gods Room", "Tiki"],
+		["To Gods Room", "Gods Room" ],
+		["To Gods Room From Anansi", "Gods Room"],
+		["To Anansi From Gods Room", "Anansi"],
+		["To Anansi From Werewolf", "Anansi"],
+		["To Werewolf From Anansi", "Werewolf"],
+		["To Werewolf From Night Staircase", "Werewolf"],
+		["To Night Staircase From Werewolf", "Night Staircase"],
+		["To Night Staircase From Janitor Closet", "Night Staircase"],
+		["To Night Staircase From UFO", "Night Staircase"],
+		["To Janitor Closet", "Janitor Closet"],
+		["To UFO", "UFO"],
+		["To UFO From Inventions", "UFO"],
+		["To Inventions From UFO", "Inventions"],
+		["To Inventions From Blue Maze", "Inventions"],
+		["To Inventions From Torture", "Inventions"],
+		["To Fortune Teller", "Fortune Teller"],
+		["To Torture", "Torture"],
+		["To Torture From Inventions", "Torture"],
+		["To Puzzle Room Mastermind From Torture", "Puzzle Room Mastermind"],
+		["To Puzzle Room Mastermind From Puzzle Room Marbles", "Puzzle Room Mastermind"],
+		["To Puzzle Room Marbles From Puzzle Room Mastermind", "Puzzle Room Marbles"],
+		["To Puzzle Room Marbles From Skull Dial Bridge", "Puzzle Room Marbles"],
+		["To Skull Dial Bridge From Puzzle Room Marbles", "Skull Dial Bridge"],
+		["To Skull Dial Bridge From Slide Room", "Skull Dial Bridge"],
+		["To Slide Room", "Slide Room"]
+	]
+}
\ No newline at end of file
diff --git a/worlds/shivers/docs/en_Shivers.md b/worlds/shivers/docs/en_Shivers.md
new file mode 100644
index 0000000000..51730057b0
--- /dev/null
+++ b/worlds/shivers/docs/en_Shivers.md
@@ -0,0 +1,31 @@
+# Shivers
+
+## Where is the settings page?
+
+The [player settings page for this game](../player-settings) contains all the options you need to configure and export a
+configuration file.
+
+## What does randomization do to this game?
+
+All Ixupi pot pieces are randomized. Keys have been added to the game to lock off different rooms in the museum, 
+these are randomized. Crawling has been added and is required to use any crawl space.
+
+## What is considered a location check in Shivers?
+
+1. All puzzle solves are location checks excluding elevator puzzles. 
+2. All Ixupi captures are location checks excluding Lightning.
+3. Puzzle hints/solutions are location checks. For example, looking at the Atlantis map.
+4. Optionally information plaques are location checks.
+
+## When the player receives an item, what happens?
+
+If the player receives a key then the corresponding door will be unlocked. If the player receives a pot piece, it is placed into a pot piece storage location.
+
+## What is the victory condition?
+
+Victory is achieved when the player captures Lightning in the generator room.
+
+## Encountered a bug?
+
+Please contact GodlFire on Discord for bugs related to Shivers world generation.\
+Please contact GodlFire or mouse on Discord for bugs related to the Shivers Randomizer.
diff --git a/worlds/shivers/docs/setup_en.md b/worlds/shivers/docs/setup_en.md
new file mode 100644
index 0000000000..ee33bb7040
--- /dev/null
+++ b/worlds/shivers/docs/setup_en.md
@@ -0,0 +1,60 @@
+# Shivers Randomizer Setup Guide
+
+
+## Required Software
+
+- [Shivers (GOG version)](https://www.gog.com/en/game/shivers) or original disc
+- [ScummVM](https://www.scummvm.org/downloads/) version 2.7.0 or later
+- [Shivers Randomizer](https://www.speedrun.com/shivers/resources)
+
+## Setup ScummVM for Shivers
+
+### GOG version of Shivers
+
+1. Launch ScummVM
+2. Click Add Game...
+3. Locate the folder for Shivers (typically in GOG Galaxy\Games\Shivers)
+4. Click OK
+
+### Disc copy of Shivers
+
+1. Copy contents of Shivers disc to a desired location on your computer
+2. Launch ScummVM
+3. Click Add Game...
+4. Locate the folder for Shivers and click Choose
+5. Click OK
+
+## 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 Settings page on the website allows you to configure your personal settings and export a config file from
+them. Player settings page: [Shivers Player Settings Page](/games/Shivers/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)
+
+## Joining a MultiWorld Game
+
+1. Launch ScummVM
+2. Highlight Shivers and click "Start"
+3. Launch the Shivers Randomizer
+4. Click "Attach"
+5. Click "Archipelago"
+6. Enter the Archipelago server address, slot name, and password
+7. Click "Connect"
+8. In Shivers click "New Game"
+
+## What is a check
+
+- Every puzzle
+- Every puzzle hint/solution
+- Every document that is considered a Flashback
+- Optionally information plaques.
diff --git a/worlds/sm/Client.py b/worlds/sm/Client.py
index df73ae47a0..756fd4bf36 100644
--- a/worlds/sm/Client.py
+++ b/worlds/sm/Client.py
@@ -61,7 +61,7 @@ class SMSNIClient(SNIClient):
         from SNIClient import snes_buffered_write, snes_flush_writes, snes_read
 
         rom_name = await snes_read(ctx, SM_ROMNAME_START, ROMNAME_SIZE)
-        if rom_name is None or rom_name == bytes([0] * ROMNAME_SIZE) or rom_name[:2] != b"SM" or rom_name[:3] == b"SMW":
+        if rom_name is None or rom_name == bytes([0] * ROMNAME_SIZE) or rom_name[:2] != b"SM" or rom_name[2] not in b"1234567890":
             return False
 
         ctx.game = self.game
diff --git a/worlds/sm/__init__.py b/worlds/sm/__init__.py
index 21e29868ed..3e9015eab7 100644
--- a/worlds/sm/__init__.py
+++ b/worlds/sm/__init__.py
@@ -1,18 +1,17 @@
 from __future__ import annotations
 
-import logging
-import copy
-import os
-import threading
 import base64
-import settings
+import copy
+import logging
+import threading
 import typing
 from typing import Any, Dict, Iterable, List, Set, TextIO, TypedDict
 
-from BaseClasses import Region, Entrance, Location, MultiWorld, Item, ItemClassification, CollectionState, Tutorial
-from Fill import fill_restrictive
-from worlds.AutoWorld import World, AutoLogicRegister, WebWorld
-from worlds.generic.Rules import set_rule, add_rule, add_item_rule
+import settings
+from BaseClasses import CollectionState, Entrance, Item, ItemClassification, Location, MultiWorld, Region, Tutorial
+from Options import Accessibility
+from worlds.AutoWorld import AutoLogicRegister, WebWorld, World
+from worlds.generic.Rules import add_rule, set_rule
 
 logger = logging.getLogger("Super Metroid")
 
@@ -113,15 +112,12 @@ class SMWorld(World):
     required_client_version = (0, 2, 6)
 
     itemManager: ItemManager
-    spheres = None
 
     Logic.factory('vanilla')
 
     def __init__(self, world: MultiWorld, player: int):
         self.rom_name_available_event = threading.Event()
         self.locations = {}
-        if SMWorld.spheres != None:
-            SMWorld.spheres = None
         super().__init__(world, player)
 
     @classmethod
@@ -148,7 +144,7 @@ class SMWorld(World):
         self.remote_items = self.multiworld.remote_items[self.player]
 
         if (len(self.variaRando.randoExec.setup.restrictedLocs) > 0):
-            self.multiworld.accessibility[self.player] = self.multiworld.accessibility[self.player].from_text("minimal")
+            self.multiworld.accessibility[self.player].value = Accessibility.option_minimal
             logger.warning(f"accessibility forced to 'minimal' for player {self.multiworld.get_player_name(self.player)} because of 'fun' settings")
     
     def create_items(self):
@@ -295,7 +291,7 @@ class SMWorld(World):
         for src, dest in self.variaRando.randoExec.areaGraph.InterAreaTransitions:
             src_region = self.multiworld.get_region(src.Name, self.player)
             dest_region = self.multiworld.get_region(dest.Name, self.player)
-            if ((src.Name + "->" + dest.Name, self.player) not in self.multiworld._entrance_cache):
+            if src.Name + "->" + dest.Name not in self.multiworld.regions.entrance_cache[self.player]:
                 src_region.exits.append(Entrance(self.player, src.Name + "->" + dest.Name, src_region))
             srcDestEntrance = self.multiworld.get_entrance(src.Name + "->" + dest.Name, self.player)
             srcDestEntrance.connect(dest_region)
@@ -369,7 +365,7 @@ class SMWorld(World):
                                     locationsDict[first_local_collected_loc.name]),
                         itemLoc.item.player,
                         True)
-                        for itemLoc in SMWorld.spheres if itemLoc.item.player == self.player and (not progression_only or itemLoc.item.advancement)
+                        for itemLoc in spheres if itemLoc.item.player == self.player and (not progression_only or itemLoc.item.advancement)
                     ]
         
         # Having a sorted itemLocs from collection order is required for escapeTrigger when Tourian is Disabled.
@@ -377,8 +373,10 @@ class SMWorld(World):
         # get_spheres could be cached in multiworld?
         # Another possible solution would be to have a globally accessible list of items in the order in which the get placed in push_item
         # and use the inversed starting from the first progression item.
-        if (SMWorld.spheres == None):
-            SMWorld.spheres = [itemLoc for sphere in self.multiworld.get_spheres() for itemLoc in sorted(sphere, key=lambda location: location.name)]
+        spheres: List[Location] = getattr(self.multiworld, "_sm_spheres", None)
+        if spheres is None:
+            spheres = [itemLoc for sphere in self.multiworld.get_spheres() for itemLoc in sorted(sphere, key=lambda location: location.name)]
+            setattr(self.multiworld, "_sm_spheres", spheres)
 
         self.itemLocs = [
             ItemLocation(copy.copy(ItemManager.Items[itemLoc.item.type
@@ -391,7 +389,7 @@ class SMWorld(World):
         escapeTrigger = None
         if self.variaRando.randoExec.randoSettings.restrictions["EscapeTrigger"]:
             #used to simulate received items
-            first_local_collected_loc = next(itemLoc for itemLoc in SMWorld.spheres if itemLoc.player == self.player)
+            first_local_collected_loc = next(itemLoc for itemLoc in spheres if itemLoc.player == self.player)
 
             playerItemsItemLocs = get_player_ItemLocation(False)
             playerProgItemsItemLocs = get_player_ItemLocation(True)
@@ -564,8 +562,8 @@ class SMWorld(World):
         multiWorldItems: List[ByteEdit] = []
         idx = 0
         vanillaItemTypesCount = 21
-        for itemLoc in self.multiworld.get_locations():
-            if itemLoc.player == self.player and "Boss" not in locationsDict[itemLoc.name].Class:
+        for itemLoc in self.multiworld.get_locations(self.player):
+            if "Boss" not in locationsDict[itemLoc.name].Class:
                 SMZ3NameToSMType = {
                     "ETank": "ETank", "Missile": "Missile", "Super": "Super", "PowerBomb": "PowerBomb", "Bombs": "Bomb",
                     "Charge": "Charge", "Ice": "Ice", "HiJump": "HiJump", "SpeedBooster": "SpeedBooster",
diff --git a/worlds/sm/docs/multiworld_en.md b/worlds/sm/docs/multiworld_en.md
index ce91e7a7e4..1291507743 100644
--- a/worlds/sm/docs/multiworld_en.md
+++ b/worlds/sm/docs/multiworld_en.md
@@ -49,7 +49,7 @@ them. Player settings page: [Super Metroid Player Settings Page](/games/Super%20
 ### 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)
+validator page: [YAML Validation page](/check)
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/sm/variaRandomizer/rando/GraphBuilder.py b/worlds/sm/variaRandomizer/rando/GraphBuilder.py
index 7bee33ec82..88b539e7f0 100644
--- a/worlds/sm/variaRandomizer/rando/GraphBuilder.py
+++ b/worlds/sm/variaRandomizer/rando/GraphBuilder.py
@@ -170,7 +170,8 @@ class GraphBuilder(object):
         ap = "Landing Site" # dummy value it'll be overwritten at first collection
         while len(itemLocs) > 0 and not (sm.canPassG4() and graph.canAccess(sm, ap, "Landing Site", maxDiff)):
             il = itemLocs.pop(0)
-            if il.Location.restricted or il.Item.Type == "ArchipelagoItem":
+            # can happen with item links replacement items that its not in the container's itemPool
+            if il.Location.restricted or il.Item.Type == "ArchipelagoItem" or il.Item not in container.itemPool:
                 continue
             self.log.debug("collecting " + getItemLocStr(il))
             container.collect(il)
diff --git a/worlds/sm64ex/Options.py b/worlds/sm64ex/Options.py
index a603b61c58..8a10f3edea 100644
--- a/worlds/sm64ex/Options.py
+++ b/worlds/sm64ex/Options.py
@@ -88,6 +88,12 @@ class ExclamationBoxes(Choice):
     option_Off = 0
     option_1Ups_Only = 1
 
+class CompletionType(Choice):
+    """Set goal for game completion"""
+    display_name = "Completion Goal"
+    option_Last_Bowser_Stage = 0
+    option_All_Bowser_Stages = 1
+
 
 class ProgressiveKeys(DefaultOnToggle):
     """Keys will first grant you access to the Basement, then to the Secound Floor"""
@@ -110,4 +116,5 @@ sm64_options: typing.Dict[str, type(Option)] = {
     "death_link": DeathLink,
     "BuddyChecks": BuddyChecks,
     "ExclamationBoxes": ExclamationBoxes,
+    "CompletionType" : CompletionType,
 }
diff --git a/worlds/sm64ex/Regions.py b/worlds/sm64ex/Regions.py
index c2e9e2d981..d426804c30 100644
--- a/worlds/sm64ex/Regions.py
+++ b/worlds/sm64ex/Regions.py
@@ -1,30 +1,77 @@
 import typing
+
+from enum import Enum
+
 from BaseClasses import MultiWorld, Region, Entrance, Location
 from .Locations import SM64Location, location_table, locBoB_table, locWhomp_table, locJRB_table, locCCM_table, \
     locBBH_table, \
     locHMC_table, locLLL_table, locSSL_table, locDDD_table, locSL_table, \
     locWDW_table, locTTM_table, locTHI_table, locTTC_table, locRR_table, \
     locPSS_table, locSA_table, locBitDW_table, locTotWC_table, locCotMC_table, \
-    locVCutM_table, locBitFS_table, locWMotR_table, locBitS_table, locSS_table
+    locVCutM_table, locBitFS_table, locWMotR_table, locBitS_table, locSS_table    
 
-# List of all courses, including secrets, without BitS as that one is static
-sm64courses = ["Bob-omb Battlefield", "Whomp's Fortress", "Jolly Roger Bay", "Cool, Cool Mountain", "Big Boo's Haunt",
-               "Hazy Maze Cave", "Lethal Lava Land", "Shifting Sand Land", "Dire, Dire Docks", "Snowman's Land",
-               "Wet-Dry World", "Tall, Tall Mountain", "Tiny-Huge Island", "Tick Tock Clock", "Rainbow Ride",
-               "The Princess's Secret Slide", "The Secret Aquarium", "Bowser in the Dark World", "Tower of the Wing Cap",
-               "Cavern of the Metal Cap", "Vanish Cap under the Moat", "Bowser in the Fire Sea", "Wing Mario over the Rainbow"]
+class SM64Levels(int, Enum):
+    BOB_OMB_BATTLEFIELD = 91
+    WHOMPS_FORTRESS = 241
+    JOLLY_ROGER_BAY = 121
+    COOL_COOL_MOUNTAIN = 51
+    BIG_BOOS_HAUNT = 41
+    HAZY_MAZE_CAVE = 71
+    LETHAL_LAVA_LAND = 221
+    SHIFTING_SAND_LAND = 81
+    DIRE_DIRE_DOCKS = 231
+    SNOWMANS_LAND = 101
+    WET_DRY_WORLD = 111
+    TALL_TALL_MOUNTAIN = 361
+    TINY_HUGE_ISLAND_TINY = 132
+    TINY_HUGE_ISLAND_HUGE = 131
+    TICK_TOCK_CLOCK = 141
+    RAINBOW_RIDE = 151
+    THE_PRINCESS_SECRET_SLIDE = 271
+    THE_SECRET_AQUARIUM = 201
+    BOWSER_IN_THE_DARK_WORLD = 171
+    TOWER_OF_THE_WING_CAP = 291
+    CAVERN_OF_THE_METAL_CAP = 281
+    VANISH_CAP_UNDER_THE_MOAT = 181
+    BOWSER_IN_THE_FIRE_SEA = 191
+    WING_MARIO_OVER_THE_RAINBOW = 311
 
-# sm64paintings is list of entrances, format LEVEL | AREA. String Reference below
-sm64paintings   = [91,241,121,51,41,71,221,81,231,101,111,361,132,131,141,151]
-sm64paintings_s = ["BOB", "WF", "JRB", "CCM", "BBH", "HMC", "LLL", "SSL", "DDD", "SL", "WDW", "TTM", "THI Tiny", "THI Huge", "TTC", "RR"]
-# sm64secrets is list of secret areas
-sm64secrets = [271, 201, 171, 291, 281, 181, 191, 311]
-sm64secrets_s = ["PSS", "SA", "BitDW", "TOTWC", "COTMC", "VCUTM", "BitFS", "WMOTR"]
+# sm64paintings is a dict of entrances, format LEVEL | AREA
+sm64_level_to_paintings: typing.Dict[SM64Levels, str] = {
+    SM64Levels.BOB_OMB_BATTLEFIELD: "Bob-omb Battlefield",
+    SM64Levels.WHOMPS_FORTRESS: "Whomp's Fortress",
+    SM64Levels.JOLLY_ROGER_BAY: "Jolly Roger Bay",
+    SM64Levels.COOL_COOL_MOUNTAIN: "Cool, Cool Mountain",
+    SM64Levels.BIG_BOOS_HAUNT: "Big Boo's Haunt",
+    SM64Levels.HAZY_MAZE_CAVE: "Hazy Maze Cave",
+    SM64Levels.LETHAL_LAVA_LAND: "Lethal Lava Land",
+    SM64Levels.SHIFTING_SAND_LAND: "Shifting Sand Land",
+    SM64Levels.DIRE_DIRE_DOCKS: "Dire, Dire Docks",
+    SM64Levels.SNOWMANS_LAND: "Snowman's Land",
+    SM64Levels.WET_DRY_WORLD: "Wet-Dry World",
+    SM64Levels.TALL_TALL_MOUNTAIN: "Tall, Tall Mountain",
+    SM64Levels.TINY_HUGE_ISLAND_TINY: "Tiny-Huge Island (Tiny)",
+    SM64Levels.TINY_HUGE_ISLAND_HUGE: "Tiny-Huge Island (Huge)",
+    SM64Levels.TICK_TOCK_CLOCK: "Tick Tock Clock",
+    SM64Levels.RAINBOW_RIDE: "Rainbow Ride"
+}
+sm64_paintings_to_level = { painting: level for (level,painting) in sm64_level_to_paintings.items() }
 
-sm64entrances = sm64paintings + sm64secrets
-sm64entrances_s = sm64paintings_s + sm64secrets_s
-sm64_internalloc_to_string = dict(zip(sm64paintings+sm64secrets, sm64entrances_s))
-sm64_internalloc_to_regionid = dict(zip(sm64paintings+sm64secrets, list(range(13)) + [12,13,14] + list(range(15,15+len(sm64secrets)))))
+# sm64secrets is a dict of secret areas, same format as sm64paintings
+sm64_level_to_secrets: typing.Dict[SM64Levels, str] = {
+    SM64Levels.THE_PRINCESS_SECRET_SLIDE: "The Princess's Secret Slide",
+    SM64Levels.THE_SECRET_AQUARIUM: "The Secret Aquarium",
+    SM64Levels.BOWSER_IN_THE_DARK_WORLD: "Bowser in the Dark World",
+    SM64Levels.TOWER_OF_THE_WING_CAP: "Tower of the Wing Cap",
+    SM64Levels.CAVERN_OF_THE_METAL_CAP: "Cavern of the Metal Cap",
+    SM64Levels.VANISH_CAP_UNDER_THE_MOAT: "Vanish Cap under the Moat",
+    SM64Levels.BOWSER_IN_THE_FIRE_SEA: "Bowser in the Fire Sea",
+    SM64Levels.WING_MARIO_OVER_THE_RAINBOW: "Wing Mario over the Rainbow"
+}
+sm64_secrets_to_level = { secret: level for (level,secret) in sm64_level_to_secrets.items() }
+
+sm64_entrances_to_level = { **sm64_paintings_to_level, **sm64_secrets_to_level }
+sm64_level_to_entrances = { **sm64_level_to_paintings, **sm64_level_to_secrets }
 
 def create_regions(world: MultiWorld, player: int):
     regSS = Region("Menu", player, world, "Castle Area")
@@ -137,11 +184,13 @@ def create_regions(world: MultiWorld, player: int):
         regTTM.locations.append(SM64Location(player, "TTM: 100 Coins", location_table["TTM: 100 Coins"], regTTM))
     world.regions.append(regTTM)
 
-    regTHI = create_region("Tiny-Huge Island", player, world)
-    create_default_locs(regTHI, locTHI_table, player)
+    regTHIT = create_region("Tiny-Huge Island (Tiny)", player, world)
+    create_default_locs(regTHIT, locTHI_table, player)
     if (world.EnableCoinStars[player].value):
-        regTHI.locations.append(SM64Location(player, "THI: 100 Coins", location_table["THI: 100 Coins"], regTHI))
-    world.regions.append(regTHI)
+        regTHIT.locations.append(SM64Location(player, "THI: 100 Coins", location_table["THI: 100 Coins"], regTHIT))
+    world.regions.append(regTHIT)
+    regTHIH = create_region("Tiny-Huge Island (Huge)", player, world)
+    world.regions.append(regTHIH)
 
     regFloor3 = create_region("Third Floor", player, world)
     world.regions.append(regFloor3)
diff --git a/worlds/sm64ex/Rules.py b/worlds/sm64ex/Rules.py
index 7c50ba4708..fedd5b7a6e 100644
--- a/worlds/sm64ex/Rules.py
+++ b/worlds/sm64ex/Rules.py
@@ -1,77 +1,86 @@
 from ..generic.Rules import add_rule
-from .Regions import connect_regions, sm64courses, sm64paintings, sm64secrets, sm64entrances
+from .Regions import connect_regions, SM64Levels, sm64_level_to_paintings, sm64_paintings_to_level, sm64_level_to_secrets, sm64_secrets_to_level, sm64_entrances_to_level, sm64_level_to_entrances
 
-def fix_reg(entrance_ids, reg, invalidspot, swaplist, world):
-    if entrance_ids.index(reg) == invalidspot: # Unlucky :C
-            swaplist.remove(invalidspot)
-            rand = world.random.choice(swaplist)
-            entrance_ids[invalidspot], entrance_ids[rand] = entrance_ids[rand], entrance_ids[invalidspot]
-            swaplist.append(invalidspot)
-            swaplist.remove(rand)
+def shuffle_dict_keys(world, obj: dict) -> dict:
+    keys = list(obj.keys())
+    values = list(obj.values())
+    world.random.shuffle(keys)
+    return dict(zip(keys,values))
 
-def set_rules(world, player: int, area_connections):
-    destination_regions = list(range(13)) + [12,13,14] + list(range(15,15+len(sm64secrets))) # Two instances of Destination Course THI. Past normal course idx are secret regions
-    secret_entrance_ids = list(range(len(sm64paintings), len(sm64paintings) + len(sm64secrets)))
-    course_entrance_ids = list(range(len(sm64paintings)))
+def fix_reg(entrance_map: dict, entrance: SM64Levels, invalid_regions: set,
+            swapdict: dict, world):
+    if entrance_map[entrance] in invalid_regions: # Unlucky :C
+        replacement_regions = [(rand_region, rand_entrance) for rand_region, rand_entrance in swapdict.items()
+                               if rand_region not in invalid_regions]
+        rand_region, rand_entrance = world.random.choice(replacement_regions)
+        old_dest = entrance_map[entrance]
+        entrance_map[entrance], entrance_map[rand_entrance] = rand_region, old_dest
+        swapdict[rand_region] = entrance
+    swapdict.pop(entrance_map[entrance]) # Entrance now fixed to rand_region
+
+def set_rules(world, player: int, area_connections: dict):
+    randomized_level_to_paintings = sm64_level_to_paintings.copy()
+    randomized_level_to_secrets = sm64_level_to_secrets.copy()
     if world.AreaRandomizer[player].value >= 1:  # Some randomization is happening, randomize Courses
-        world.random.shuffle(course_entrance_ids)
+        randomized_level_to_paintings = shuffle_dict_keys(world,sm64_level_to_paintings)
     if world.AreaRandomizer[player].value == 2:  # Randomize Secrets as well
-        world.random.shuffle(secret_entrance_ids)
-    entrance_ids = course_entrance_ids + secret_entrance_ids
+        randomized_level_to_secrets = shuffle_dict_keys(world,sm64_level_to_secrets)
+    randomized_entrances = { **randomized_level_to_paintings, **randomized_level_to_secrets }
     if world.AreaRandomizer[player].value == 3:  # Randomize Courses and Secrets in one pool
-        world.random.shuffle(entrance_ids)
+        randomized_entrances = shuffle_dict_keys(world,randomized_entrances)
+        swapdict = { entrance: level for (level,entrance) in randomized_entrances.items() }
         # Guarantee first entrance is a course
-        swaplist = list(range(len(entrance_ids)))
-        if entrance_ids.index(0) > 15: # Unlucky :C
-            rand = world.random.randint(0,15)
-            entrance_ids[entrance_ids.index(0)], entrance_ids[rand] = entrance_ids[rand], entrance_ids[entrance_ids.index(0)]
-            swaplist.remove(entrance_ids.index(0))
-        # Guarantee COTMC is not mapped to HMC, cuz thats impossible
-        fix_reg(entrance_ids, 20, 5, swaplist, world)
+        fix_reg(randomized_entrances, SM64Levels.BOB_OMB_BATTLEFIELD, sm64_secrets_to_level.keys(), swapdict, world)
         # Guarantee BITFS is not mapped to DDD
-        fix_reg(entrance_ids, 22, 8, swaplist, world)
-        if entrance_ids.index(22) == 5: # If BITFS is mapped to HMC...
-            fix_reg(entrance_ids, 20, 8, swaplist, world) # ... then dont allow COTMC to be mapped to DDD
-    temp_assign = dict(zip(entrance_ids,destination_regions)) # Used for Rules only
+        fix_reg(randomized_entrances, SM64Levels.BOWSER_IN_THE_FIRE_SEA, {"Dire, Dire Docks"}, swapdict, world)
+        # Guarantee COTMC is not mapped to HMC, cuz thats impossible. If BitFS -> HMC, also no COTMC -> DDD.
+        if randomized_entrances[SM64Levels.BOWSER_IN_THE_FIRE_SEA] == "Hazy Maze Cave":
+            fix_reg(randomized_entrances, SM64Levels.CAVERN_OF_THE_METAL_CAP, {"Hazy Maze Cave", "Dire, Dire Docks"}, swapdict, world)
+        else:
+            fix_reg(randomized_entrances, SM64Levels.CAVERN_OF_THE_METAL_CAP, {"Hazy Maze Cave"}, swapdict, world)
 
     # Destination Format: LVL | AREA with LVL = LEVEL_x, AREA = Area as used in sm64 code
-    area_connections.update({sm64entrances[entrance]: destination for entrance, destination in zip(entrance_ids,sm64entrances)})
+    # Cast to int to not rely on availability of SM64Levels enum. Will cause crash in MultiServer otherwise
+    area_connections.update({int(entrance_lvl): int(sm64_entrances_to_level[destination]) for (entrance_lvl,destination) in randomized_entrances.items()})
+    randomized_entrances_s = {sm64_level_to_entrances[entrance_lvl]: destination for (entrance_lvl,destination) in randomized_entrances.items()}
     
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[0]]) # BOB
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[1]], lambda state: state.has("Power Star", player, 1)) # WF
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[2]], lambda state: state.has("Power Star", player, 3)) # JRB
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[3]], lambda state: state.has("Power Star", player, 3)) # CCM
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[4]], lambda state: state.has("Power Star", player, 12)) # BBH
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[16]], lambda state: state.has("Power Star", player, 1)) # PSS
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[17]], lambda state: state.has("Power Star", player, 3)) # SA
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[19]], lambda state: state.has("Power Star", player, 10)) # TOTWC
-    connect_regions(world, player, "Menu", sm64courses[temp_assign[18]], lambda state: state.has("Power Star", player, world.FirstBowserStarDoorCost[player].value)) # BITDW
+    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["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, "Menu", randomized_entrances_s["The Secret Aquarium"], lambda state: state.has("Power Star", player, 3))
+    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"], lambda state: state.has("Power Star", player, world.FirstBowserStarDoorCost[player].value))
 
     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", sm64courses[temp_assign[5]]) # HMC
-    connect_regions(world, player, "Basement", sm64courses[temp_assign[6]]) # LLL
-    connect_regions(world, player, "Basement", sm64courses[temp_assign[7]]) # SSL
-    connect_regions(world, player, "Basement", sm64courses[temp_assign[8]], lambda state: state.has("Power Star", player, world.BasementStarDoorCost[player].value)) # DDD
-    connect_regions(world, player, "Hazy Maze Cave", sm64courses[temp_assign[20]]) # COTMC
-    connect_regions(world, player, "Basement", sm64courses[temp_assign[21]]) # VCUTM
-    connect_regions(world, player, "Basement", sm64courses[temp_assign[22]], lambda state: state.has("Power Star", player, world.BasementStarDoorCost[player].value) and
-                                                                                       state.can_reach("DDD: Board Bowser's Sub", 'Location', player)) # BITFS
+    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["Dire, Dire Docks"], lambda state: state.has("Power Star", player, world.BasementStarDoorCost[player].value))
+    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"])
+    connect_regions(world, player, "Basement", randomized_entrances_s["Bowser in the Fire Sea"], lambda state: state.has("Power Star", player, world.BasementStarDoorCost[player].value) and
+                                                                                       state.can_reach("DDD: Board Bowser's Sub", 'Location', player))
 
     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", sm64courses[temp_assign[9]]) # SL
-    connect_regions(world, player, "Second Floor", sm64courses[temp_assign[10]]) # WDW
-    connect_regions(world, player, "Second Floor", sm64courses[temp_assign[11]]) # TTM
-    connect_regions(world, player, "Second Floor", sm64courses[temp_assign[12]]) # THI Tiny
-    connect_regions(world, player, "Second Floor", sm64courses[temp_assign[13]]) # THI Huge
+    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, "Tiny-Huge Island (Tiny)", "Tiny-Huge Island (Huge)")
+    connect_regions(world, player, "Tiny-Huge Island (Huge)", "Tiny-Huge Island (Tiny)")
 
     connect_regions(world, player, "Second Floor", "Third Floor", lambda state: state.has("Power Star", player, world.SecondFloorStarDoorCost[player].value))
 
-    connect_regions(world, player, "Third Floor", sm64courses[temp_assign[14]]) # TTC
-    connect_regions(world, player, "Third Floor", sm64courses[temp_assign[15]]) # RR
-    connect_regions(world, player, "Third Floor", sm64courses[temp_assign[23]]) # WMOTR
-    connect_regions(world, player, "Third Floor", "Bowser in the Sky", lambda state: state.has("Power Star", player, world.StarsToFinish[player].value)) # BITS
+    connect_regions(world, player, "Third Floor", randomized_entrances_s["Tick Tock Clock"])
+    connect_regions(world, player, "Third Floor", randomized_entrances_s["Rainbow Ride"])
+    connect_regions(world, player, "Third Floor", randomized_entrances_s["Wing Mario over the Rainbow"])
+    connect_regions(world, player, "Third Floor", "Bowser in the Sky", lambda state: state.has("Power Star", player, world.StarsToFinish[player].value))
 
     #Special Rules for some Locations
     add_rule(world.get_location("BoB: Mario Wings to the Sky", player), lambda state: state.has("Cannon Unlock BoB", player))
@@ -124,4 +133,9 @@ def set_rules(world, player: int, area_connections):
     add_rule(world.get_location("MIPS 1", player), lambda state: state.can_reach("Basement", 'Region', player) and state.has("Power Star", player, world.MIPS1Cost[player].value))
     add_rule(world.get_location("MIPS 2", player), lambda state: state.can_reach("Basement", 'Region', player) and state.has("Power Star", player, world.MIPS2Cost[player].value))
 
-    world.completion_condition[player] = lambda state: state.can_reach("Bowser in the Sky", 'Region', player)
+    if world.CompletionType[player] == "last_bowser_stage":
+        world.completion_condition[player] = lambda state: state.can_reach("Bowser in the Sky", 'Region', player)
+    elif world.CompletionType[player] == "all_bowser_stages":
+        world.completion_condition[player] = lambda state: state.can_reach("Bowser in the Dark World", 'Region', player) and \
+                                                           state.can_reach("Bowser in the Fire Sea", 'Region', player) and \
+                                                           state.can_reach("Bowser in the Sky", 'Region', player)
diff --git a/worlds/sm64ex/__init__.py b/worlds/sm64ex/__init__.py
index 6a7a3bd272..ab7409a324 100644
--- a/worlds/sm64ex/__init__.py
+++ b/worlds/sm64ex/__init__.py
@@ -5,7 +5,7 @@ from .Items import item_table, cannon_item_table, SM64Item
 from .Locations import location_table, SM64Location
 from .Options import sm64_options
 from .Rules import set_rules
-from .Regions import create_regions, sm64courses, sm64entrances_s, sm64_internalloc_to_string, sm64_internalloc_to_regionid
+from .Regions import create_regions, sm64_level_to_entrances
 from BaseClasses import Item, Tutorial, ItemClassification
 from ..AutoWorld import World, WebWorld
 
@@ -55,8 +55,8 @@ class SM64World(World):
             # Write area_connections to spoiler log
             for entrance, destination in self.area_connections.items():
                 self.multiworld.spoiler.set_entrance(
-                    sm64_internalloc_to_string[entrance] + " Entrance",
-                    sm64_internalloc_to_string[destination],
+                    sm64_level_to_entrances[entrance] + " Entrance",
+                    sm64_level_to_entrances[destination],
                     'entrance', self.player)
 
     def create_item(self, name: str) -> Item:
@@ -154,6 +154,7 @@ class SM64World(World):
             "MIPS2Cost": self.multiworld.MIPS2Cost[self.player].value,
             "StarsToFinish": self.multiworld.StarsToFinish[self.player].value,
             "DeathLink": self.multiworld.death_link[self.player].value,
+            "CompletionType" : self.multiworld.CompletionType[self.player].value,
         }
 
     def generate_output(self, output_directory: str):
@@ -181,8 +182,7 @@ class SM64World(World):
         if self.topology_present:
             er_hint_data = {}
             for entrance, destination in self.area_connections.items():
-                regionid = sm64_internalloc_to_regionid[destination]
-                region = self.multiworld.get_region(sm64courses[regionid], self.player)
+                region = self.multiworld.get_region(sm64_level_to_entrances[destination], self.player)
                 for location in region.locations:
-                    er_hint_data[location.address] = sm64_internalloc_to_string[entrance]
+                    er_hint_data[location.address] = sm64_level_to_entrances[entrance]
             multidata['er_hint_data'][self.player] = er_hint_data
diff --git a/worlds/sm64ex/docs/setup_en.md b/worlds/sm64ex/docs/setup_en.md
index 38edeb2c4a..2817d3c324 100644
--- a/worlds/sm64ex/docs/setup_en.md
+++ b/worlds/sm64ex/docs/setup_en.md
@@ -2,71 +2,77 @@
 
 ## Required Software
 
-- Super Mario 64 US Rom (Japanese may work also. Europe and Shindou not supported)
+- Super Mario 64 US or JP Rom (Europe and Shindou not supported)
 - Either of
-    - [sm64pclauncher](https://github.com/N00byKing/sm64pclauncher/releases) or
+    - [SM64AP-Launcher](https://github.com/N00byKing/SM64AP-Launcher/releases) or
     - Cloning and building [sm64ex](https://github.com/N00byKing/sm64ex) manually
 - Optional, for sending [commands](/tutorial/Archipelago/commands/en) like `!hint`: the TextClient from [the most recent Archipelago release](https://github.com/ArchipelagoMW/Archipelago/releases)
 
-NOTE: The above linked sm64pclauncher is a special version designed to work with the Archipelago build of sm64ex.
+NOTE: The above linked launcher is a special version designed to work with the Archipelago build of sm64ex.
 You can use other sm64-port based builds with it, but you can't use a different launcher with the Archipelago build of sm64ex.
 
 ## Installation and Game Start Procedures
 
-### Installation via sm64pclauncher (For Windows)
+### Installation via SM64AP-Launcher
+
+*Windows Preparations*
 
 First, install [MSYS](https://www.msys2.org/) as described on the page. DO NOT INSTALL INTO A FOLDER PATH WITH SPACES.
-Do all steps up to including step 6.
-Best use default install directory.
-Then follow the steps below
+It is extremely encouraged to use the default install directory!
+Then continue to `Using the Launcher`
 
-1. Go to the page linked for sm64pclauncher, and press on the topmost entry
-3. Scroll down, and download the zip file
-4. Unpack the zip file in an empty folder
-5. Run the Launcher and press build.
-6. Set the location where you installed MSYS when prompted. Check the "Install Dependencies" Checkbox
-7. Set the Repo link to `https://github.com/N00byKing/sm64ex` and the Branch to `archipelago` (Top two boxes). You can choose the folder (Secound Box) at will, as long as it does not exist yet
-8. Point the Launcher to your Super Mario 64 US/JP Rom, and set the Region correspondingly
-9. Set Build Options and press build.
-    - Recommended: To build faster, use `-jn` where `n` is the number of CPU cores to use (e.g., `-j4` to use 4 cores).
-    - Optional: Add options from [this list](https://github.com/sm64pc/sm64ex/wiki/Build-options), separated by spaces (e.g., `-j4 BETTERCAMERA=1`).
-10. SM64EX will now be compiled. The Launcher will appear to have crashed, but this is not likely the case. Best wait a bit, but there may be a problem if it takes longer than 10 Minutes
+*Linux Preparations*
 
-After it's done, the Build list should have another entry titled with what you named the folder in step 7.
+You will need to install some dependencies before using the launcher.
+The launcher itself needs `qt6`, `patch` and `git`, and building the game requires `sdl2 glew cmake python make` (If you install `jsoncpp` as well, it will be linked dynamically).
+Then continue to `Using the Launcher`
 
-NOTE: For some reason first start of the game always crashes the launcher. Just restart it.
-If it still crashes, recheck if you typed the launch options correctly (Described in "Joining a MultiWorld Game")
+*Using the Launcher*
+
+1. Go to the page linked for SM64AP-Launcher, and press on the topmost entry
+2. Scroll down, and download the zip file for your OS.
+3. Unpack the zip file in an empty folder
+4. Run the Launcher. On first start, press `Check Requirements`, which will guide you through the rest of the needed steps.
+    - Windows: If you did not use the default install directory for MSYS, close this window, check `Show advanced options` and reopen using `Re-check Requirements`. You can then set the path manually.
+5. When finished, use `Compile default SM64AP build` to continue
+    - Advanced user can use `Show advanced options` to build with custom makeflags (`BETTERCAMERA`, `NODRAWINGDISTANCE`, ...), different repos and branches, and game patches such as 60FPS, Enhanced Moveset and others.
+6. Press `Download Files` to prepare the build, afterwards `Create Build`.
+7. SM64EX will now be compiled. This can take a while.
+
+After it's done, the build list should have another entry with the name you gave it.
+
+NOTE: If it does not start when pressing `Play selected build`, recheck if you typed the launch options correctly (Described in "Joining a MultiWorld Game")
 
 ### Manual Compilation (Linux/Windows)
 
-*Windows Instructions*
+*Windows Preparations*
 
 First, install [MSYS](https://www.msys2.org/) as described on the page. DO NOT INSTALL INTO A FOLDER PATH WITH SPACES.
 
-After launching msys2, and update by entering `pacman -Syuu` in the command prompt. Next, install the relevant dependencies by entering `pacman -S unzip mingw-w64-x86_64-gcc mingw-w64-x86_64-glew mingw-w64-x86_64-SDL2 git make python3 mingw-w64-x86_64-cmake`. SM64EX will link `jsoncpp` dynamic if installed. If not, it will compile and link statically.
+After launching msys2 using a MinGW x64 shell (there should be a start menu entry), update by entering `pacman -Syuu` in the command prompt. Next, install the relevant dependencies by entering `pacman -S unzip mingw-w64-x86_64-gcc mingw-w64-x86_64-glew mingw-w64-x86_64-SDL2 git make python3 mingw-w64-x86_64-cmake`.
 
-After this, obtain the code base by cloning the relevant repository manually via `git clone --recursive https://github.com/N00byKing/sm64ex`. Ready your ROM by copying your legally dumped rom into your sm64ex folder (if you are not sure where your folder is located, do a quick Windows search for sm64ex). The name of the ROM needs to be `baserom.REGION.z64` where `REGION` is either `us` or `jp` respectively.
+Continue to `Compiling`.
 
-After all these preparatory steps have succeeded, type `make` in your command prompt and get ready to wait for a bit. If you want to speed up compilation, tell the compiler how many CPU cores to use by using `make -jn` where n is the number of cores you want.
+*Linux Preparations*
 
-After the compliation was successful, there will be a binary in your `sm64ex/build/REGION_pc/` folder.
+Install the relevant dependencies `sdl2 glew cmake python make patch git`. SM64EX will link `jsoncpp` dynamic if installed. If not, it will compile and link statically.
 
-*Linux Instructions*
+Continue to `Compiling`.
 
-Install the relevant dependencies `sdl2 glew cmake python make`. SM64EX will link `jsoncpp` dynamic if installed. If not, it will compile and link statically.
+*Compiling*
 
-After this, obtain the code base by cloning the relevant repository manually via `git clone --recursive https://github.com/N00byKing/sm64ex`. Ready your ROM by copying your legally dumped rom into your sm64ex folder. The name of the ROM needs to be `baserom.REGION.z64` where `REGION` is either `us` or `jp` respectively.
+Obtain the code base by cloning the relevant repository via `git clone --recursive https://github.com/N00byKing/sm64ex`. Copy your legally dumped rom into your sm64ex folder (if you are not sure where your folder is located, do a quick Windows search for sm64ex). The name of the ROM needs to be `baserom.REGION.z64` where `REGION` is either `us` or `jp` respectively.
 
-After all these preparatory steps have succeeded, type `make` in your command prompt and get ready to wait for a bit. If you want to speed up compilation, tell the compiler how many CPU cores to use by using `make -jn` where n is the number of cores you want.
+After all these preparatory steps have succeeded, type `cd sm64ex && make` in your command prompt and get ready to wait for a bit. If you want to speed up compilation, tell the compiler how many CPU cores to use by using `make -jn` instead, where n is the number of cores you want.
 
 After the compliation was successful, there will be a binary in your `sm64ex/build/REGION_pc/` folder.
 
 ### Joining a MultiWorld Game
 
 To join, set the following launch options: `--sm64ap_name YourName --sm64ap_ip ServerIP:Port`.
+For example, if you are hosting a game using the website, `YourName` will be the name from the Settings Page, `ServerIP` is `archipelago.gg` and `Port` the port given on the Archipelago room page.
 Optionally, add `--sm64ap_passwd "YourPassword"` if the room you are using requires a password.
-The Name in this case is the one specified in your generated .yaml file.
-In case you are using the Archipelago Website, the IP should be `archipelago.gg`.
+Should your name or password have spaces, enclose it in quotes: `"YourPassword"` and `"YourName"`.
 
 Should the connection fail (for example when using the wrong name or IP/Port combination) the game will inform you of that.
 Additionally, any time the game is not connected (for example when the connection is unstable) it will attempt to reconnect and display a status text.
@@ -81,7 +87,7 @@ Create a room and download the `.apsm64ex` file, and start the game with the `--
 
 ### Optional: Using Batch Files to play offline and MultiWorld games
 
-As an alternative to launching the game with sm64pclauncher, it is also possible to launch the completed build with the use of Windows batch files. This has the added benefit of streamlining the join process so that manual editing of connection info is not needed for each new game. However, you'll need to be somewhat comfortable with creating and using batch files.
+As an alternative to launching the game with SM64AP-Launcher, it is also possible to launch the completed build with the use of Windows batch files. This has the added benefit of streamlining the join process so that manual editing of connection info is not needed for each new game. However, you'll need to be somewhat comfortable with creating and using batch files.
 
 IMPORTANT NOTE: The remainder of this section uses copy-and-paste code that assumes you're using the US version. If you instead use the Japanese version, you'll need to edit the EXE name accordingly by changing "sm64.us.f3dex2e.exe" to "sm64.jp.f3dex2e.exe".
 
@@ -91,7 +97,7 @@ Open Notepad. Paste in the following text: `start sm64.us.f3dex2e.exe --sm64ap_f
 
 Go to File > Save As...
 
-Navigate to the folder you selected for your SM64 build when you followed the Build guide for SM64PCLauncher earlier. Once there, navigate further into `build` and then `us_pc`. This folder should be the same folder that `sm64.us.f3dex2e.exe` resides in. 
+Navigate to the folder you selected for your SM64 build when you followed the Build guide for SM64AP-Launcher earlier. Once there, navigate further into `build` and then `us_pc`. This folder should be the same folder that `sm64.us.f3dex2e.exe` resides in. 
 
 Make the file name `"offline.bat"` . THE QUOTE MARKS ARE IMPORTANT! Otherwise, it will create a text file instead ("offline.bat.txt"), which won't work as a batch file.
 
@@ -120,8 +126,8 @@ To use this batch file,  double-click it. A window will open. Type the five-digi
 - The port number is provided on the room page. The game host should share this page with all players.
 - The slot name is whatever you typed in the "Name" field when creating a config file. All slot names are visible on the room page.
 
-Once you provide those two bits of information, the game will open. If the info is correct, when the game starts, you will see "Connected to Archipelago" on the bottom of your screen, and you will be able to enter the castle.
-- If you don't see this text and crash upon entering the castle, try again. Double-check the port number and slot name; even a single typo will cause your connection to fail.
+Once you provide those two bits of information, the game will open. 
+- If the game only says `Connecting`, try again. Double-check the port number and slot name; even a single typo will cause your connection to fail.
 
 ### Addendum - Deleting old saves
 
@@ -170,6 +176,5 @@ Should the problem still be there after about a minute or two, just save and res
 
 ### How do I update the Game to a new Build?
 
+When using the Launcher follow the normal build steps, but when choosing a folder name use the same as before. The launcher will recognize this, and offer to replace it.
 When manually compiling just pull in changes and run `make` again. Sometimes it helps to run `make clean` before.
-
-When using the Launcher follow the normal build steps, but when choosing a folder name use the same as before. Then continue as normal.
diff --git a/worlds/smw/docs/setup_en.md b/worlds/smw/docs/setup_en.md
index 9ca8bdf58a..3967f544a0 100644
--- a/worlds/smw/docs/setup_en.md
+++ b/worlds/smw/docs/setup_en.md
@@ -50,7 +50,7 @@ them. Player settings page: [Super Mario World Player Settings Page](/games/Supe
 ### 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)
+validator page: [YAML Validation page](/check)
 
 ## Joining a MultiWorld Game
 
diff --git a/worlds/smz3/Client.py b/worlds/smz3/Client.py
index 687a43b00f..859cf234eb 100644
--- a/worlds/smz3/Client.py
+++ b/worlds/smz3/Client.py
@@ -69,7 +69,7 @@ class SMZ3SNIClient(SNIClient):
                 ctx.finished_game = True
             return
 
-        data = await snes_read(ctx, SMZ3_RECV_PROGRESS_ADDR + 0x680, 4)
+        data = await snes_read(ctx, SMZ3_RECV_PROGRESS_ADDR + 0xD3C, 4)
         if data is None:
             return
 
@@ -77,14 +77,14 @@ class SMZ3SNIClient(SNIClient):
         recv_item = data[2] | (data[3] << 8)
 
         while (recv_index < recv_item):
-            item_address = recv_index * 8
-            message = await snes_read(ctx, SMZ3_RECV_PROGRESS_ADDR + 0x700 + item_address, 8)
-            is_z3_item = ((message[5] & 0x80) != 0)
-            masked_part = (message[5] & 0x7F) if is_z3_item else message[5]
-            item_index = ((message[4] | (masked_part << 8)) >> 3) + (256 if is_z3_item else 0)
+            item_address = recv_index * 2
+            message = await snes_read(ctx, SMZ3_RECV_PROGRESS_ADDR + 0xDA0 + item_address, 2)
+            is_z3_item = ((message[1] & 0x80) != 0)
+            masked_part = (message[1] & 0x7F) if is_z3_item else message[1]
+            item_index = ((message[0] | (masked_part << 8)) >> 3) + (256 if is_z3_item else 0)
 
             recv_index += 1
-            snes_buffered_write(ctx, SMZ3_RECV_PROGRESS_ADDR + 0x680, bytes([recv_index & 0xFF, (recv_index >> 8) & 0xFF]))
+            snes_buffered_write(ctx, SMZ3_RECV_PROGRESS_ADDR + 0xD3C, bytes([recv_index & 0xFF, (recv_index >> 8) & 0xFF]))
 
             from .TotalSMZ3.Location import locations_start_id
             from . import convertLocSMZ3IDToAPID
@@ -95,7 +95,7 @@ class SMZ3SNIClient(SNIClient):
             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": [location_id]}])
 
-        data = await snes_read(ctx, SMZ3_RECV_PROGRESS_ADDR + 0x600, 4)
+        data = await snes_read(ctx, SMZ3_RECV_PROGRESS_ADDR + 0xD36, 4)
         if data is None:
             return
 
@@ -106,10 +106,10 @@ class SMZ3SNIClient(SNIClient):
             item = ctx.items_received[item_out_ptr]
             item_id = item.item - items_start_id
 
-            player_id = item.player if item.player <= SMZ3_ROM_PLAYER_LIMIT else 0
-            snes_buffered_write(ctx, SMZ3_RECV_PROGRESS_ADDR + item_out_ptr * 4, bytes([player_id & 0xFF, (player_id >> 8) & 0xFF, item_id & 0xFF, (item_id >> 8) & 0xFF]))
+            player_id = item.player if item.player < SMZ3_ROM_PLAYER_LIMIT else 0
+            snes_buffered_write(ctx, SMZ3_RECV_PROGRESS_ADDR + item_out_ptr * 2, bytes([player_id, item_id]))
             item_out_ptr += 1
-            snes_buffered_write(ctx, SMZ3_RECV_PROGRESS_ADDR + 0x602, bytes([item_out_ptr & 0xFF, (item_out_ptr >> 8) & 0xFF]))
+            snes_buffered_write(ctx, SMZ3_RECV_PROGRESS_ADDR + 0xD38, bytes([item_out_ptr & 0xFF, (item_out_ptr >> 8) & 0xFF]))
             logging.info('Received %s from %s (%s) (%d/%d in list)' % (
                 color(ctx.item_names[item.item], 'red', 'bold'), color(ctx.player_names[item.player], 'yellow'),
                 ctx.location_names[item.location], item_out_ptr, len(ctx.items_received)))
diff --git a/worlds/smz3/TotalSMZ3/Item.py b/worlds/smz3/TotalSMZ3/Item.py
index b4fc9d5925..28e9658ce1 100644
--- a/worlds/smz3/TotalSMZ3/Item.py
+++ b/worlds/smz3/TotalSMZ3/Item.py
@@ -181,6 +181,7 @@ class Item:
     keycard = re.compile("^Card")
     smMap = re.compile("^SmMap")
 
+    def IsNameDungeonItem(item_name): return Item.dungeon.match(item_name)
     def IsDungeonItem(self): return self.dungeon.match(self.Type.name)
     def IsBigKey(self): return self.bigKey.match(self.Type.name)
     def IsKey(self): return self.key.match(self.Type.name)
diff --git a/worlds/smz3/TotalSMZ3/Patch.py b/worlds/smz3/TotalSMZ3/Patch.py
index 049b200c46..c137442d9b 100644
--- a/worlds/smz3/TotalSMZ3/Patch.py
+++ b/worlds/smz3/TotalSMZ3/Patch.py
@@ -319,7 +319,7 @@ class Patch:
     def WriteZ3Locations(self, locations: List[Location]):
         for location in locations:
             if (location.Type == LocationType.HeraStandingKey):
-                self.patches.append((Snes(0x9E3BB), [0xE4] if location.APLocation.item.game == "SMZ3" and location.APLocation.item.item.Type == ItemType.KeyTH else [0xEB]))
+                self.patches.append((Snes(0x9E3BB), [0xEB]))
             elif (location.Type in [LocationType.Pedestal, LocationType.Ether, LocationType.Bombos]):
                 text = Texts.ItemTextbox(location.APLocation.item.item if location.APLocation.item.game == "SMZ3" else Item(ItemType.Something))
                 if (location.Type == LocationType.Pedestal):
diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index 79ba17db82..39aa42c07a 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -80,7 +80,8 @@ class SMZ3World(World):
     locationNamesGT: Set[str] = {loc.Name for loc in GanonsTower(None, None).Locations}
 
     # first added for 0.2.6
-    required_client_version = (0, 2, 6)
+    # optimized message queues for 0.4.4
+    required_client_version = (0, 4, 4)
 
     def __init__(self, world: MultiWorld, player: int):
         self.rom_name_available_event = threading.Event()
@@ -221,7 +222,9 @@ class SMZ3World(World):
         if (self.smz3World.Config.Keysanity):
             progressionItems = self.progression + self.dungeon + self.keyCardsItems + self.SmMapsItems
         else:
-            progressionItems = self.progression 
+            progressionItems = self.progression
+            # Dungeons items here are not in the itempool and will be prefilled locally so they must stay local
+            self.multiworld.non_local_items[self.player].value -= frozenset(item_name for item_name in self.item_names if TotalSMZ3Item.Item.IsNameDungeonItem(item_name))
             for item in self.keyCardsItems:
                 self.multiworld.push_precollected(SMZ3Item(item.Type.name, ItemClassification.filler, item.Type, self.item_name_to_id[item.Type.name], self.player, item))
 
@@ -468,7 +471,7 @@ class SMZ3World(World):
     def collect(self, state: CollectionState, item: Item) -> bool:
         state.smz3state[self.player].Add([TotalSMZ3Item.Item(TotalSMZ3Item.ItemType[item.name], self.smz3World if hasattr(self, "smz3World") else None)])
         if item.advancement:
-            state.prog_items[item.name, item.player] += 1
+            state.prog_items[item.player][item.name] += 1
             return True  # indicate that a logical state change has occured
         return False
 
@@ -476,9 +479,9 @@ class SMZ3World(World):
         name = self.collect_item(state, item, True)
         if name:
             state.smz3state[item.player].Remove([TotalSMZ3Item.Item(TotalSMZ3Item.ItemType[item.name], self.smz3World if hasattr(self, "smz3World") else None)])
-            state.prog_items[name, item.player] -= 1
-            if state.prog_items[name, item.player] < 1:
-                del (state.prog_items[name, item.player])
+            state.prog_items[item.player][item.name] -= 1
+            if state.prog_items[item.player][item.name] < 1:
+                del (state.prog_items[item.player][item.name])
             return True
         return False
 
@@ -548,11 +551,8 @@ class SMZ3World(World):
 
     def JunkFillGT(self, factor):
         poolLength = len(self.multiworld.itempool)
-        playerGroups = self.multiworld.get_player_groups(self.player)
-        playerGroups.add(self.player)
         junkPoolIdx = [i for i in range(0, poolLength)
-                    if self.multiworld.itempool[i].classification in (ItemClassification.filler, ItemClassification.trap) and
-                    self.multiworld.itempool[i].player in playerGroups]
+                    if self.multiworld.itempool[i].classification in (ItemClassification.filler, ItemClassification.trap)]
         toRemove = []
         for loc in self.locations.values():
             # commenting this for now since doing a partial GT pre fill would allow for non SMZ3 progression in GT
@@ -563,6 +563,7 @@ class SMZ3World(World):
                 poolLength = len(junkPoolIdx)
                 # start looking at a random starting index and loop at start if no match found
                 start = self.multiworld.random.randint(0, poolLength)
+                itemFromPool = None
                 for off in range(0, poolLength):
                     i = (start + off) % poolLength
                     candidate = self.multiworld.itempool[junkPoolIdx[i]]
@@ -570,6 +571,7 @@ class SMZ3World(World):
                         itemFromPool = candidate
                         toRemove.append(junkPoolIdx[i])
                         break
+                assert itemFromPool is not None, "Can't find anymore item(s) to pre fill GT"
                 self.multiworld.push_item(loc, itemFromPool, False)
                 loc.event = False
         toRemove.sort(reverse = True)
diff --git a/worlds/smz3/data/zsm.ips b/worlds/smz3/data/zsm.ips
index fff36d95d1..87a4f924f1 100644
Binary files a/worlds/smz3/data/zsm.ips and b/worlds/smz3/data/zsm.ips differ
diff --git a/worlds/smz3/docs/multiworld_en.md b/worlds/smz3/docs/multiworld_en.md
index da6e29ab69..53842a3c6f 100644
--- a/worlds/smz3/docs/multiworld_en.md
+++ b/worlds/smz3/docs/multiworld_en.md
@@ -47,7 +47,7 @@ them. Player settings page: [SMZ3 Player Settings Page](/games/SMZ3/player-setti
 ### 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)
+validator page: [YAML Validation page](/check)
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/soe/Logic.py b/worlds/soe/Logic.py
index 3c173dec2f..fe5339c955 100644
--- a/worlds/soe/Logic.py
+++ b/worlds/soe/Logic.py
@@ -3,7 +3,7 @@ from typing import Protocol, Set
 from BaseClasses import MultiWorld
 from worlds.AutoWorld import LogicMixin
 from . import pyevermizer
-from .Options import EnergyCore
+from .Options import EnergyCore, OutOfBounds, SequenceBreaks
 
 # TODO: Options may preset certain progress steps (i.e. P_ROCK_SKIP), set in generate_early?
 
@@ -18,7 +18,7 @@ items = [item for item in filter(lambda item: item.progression, pyevermizer.get_
 
 class LogicProtocol(Protocol):
     def has(self, name: str, player: int) -> bool: ...
-    def item_count(self, name: str, player: int) -> int: ...
+    def count(self, name: str, player: int) -> int: ...
     def soe_has(self, progress: int, world: MultiWorld, player: int, count: int) -> bool: ...
     def _soe_count(self, progress: int, world: MultiWorld, player: int, max_count: int) -> int: ...
 
@@ -35,7 +35,7 @@ class SecretOfEvermoreLogic(LogicMixin):
             for pvd in item.provides:
                 if pvd[1] == progress:
                     if self.has(item.name, player):
-                        n += self.item_count(item.name, player) * pvd[0]
+                        n += self.count(item.name, player) * pvd[0]
                         if n >= max_count > 0:
                             return n
         for rule in rules:
@@ -61,4 +61,10 @@ class SecretOfEvermoreLogic(LogicMixin):
             if w.energy_core == EnergyCore.option_fragments:
                 progress = pyevermizer.P_CORE_FRAGMENT
                 count = w.required_fragments
+        elif progress == pyevermizer.P_ALLOW_OOB:
+            if world.worlds[player].out_of_bounds == OutOfBounds.option_logic:
+                return True
+        elif progress == pyevermizer.P_ALLOW_SEQUENCE_BREAKS:
+            if world.worlds[player].sequence_breaks == SequenceBreaks.option_logic:
+                return True
         return self._soe_count(progress, world, player, count) >= count
diff --git a/worlds/soe/Options.py b/worlds/soe/Options.py
index f1a30745f8..3de2de34ac 100644
--- a/worlds/soe/Options.py
+++ b/worlds/soe/Options.py
@@ -38,6 +38,12 @@ class OffOnFullChoice(Choice):
     alias_chaos = 2
 
 
+class OffOnLogicChoice(Choice):
+    option_off = 0
+    option_on = 1
+    option_logic = 2
+
+
 # actual options
 class Difficulty(EvermizerFlags, Choice):
     """Changes relative spell cost and stuff"""
@@ -93,10 +99,18 @@ class ExpModifier(Range):
     default = 200
 
 
-class FixSequence(EvermizerFlag, DefaultOnToggle):
-    """Fix some sequence breaks"""
-    display_name = "Fix Sequence"
-    flag = '1'
+class SequenceBreaks(EvermizerFlags, OffOnLogicChoice):
+    """Disable, enable some sequence breaks or put them in logic"""
+    display_name = "Sequence Breaks"
+    default = 0
+    flags = ['', 'j', 'J']
+
+
+class OutOfBounds(EvermizerFlags, OffOnLogicChoice):
+    """Disable, enable the out-of-bounds glitch or put it in logic"""
+    display_name = "Out Of Bounds"
+    default = 0
+    flags = ['', 'u', 'U']
 
 
 class FixCheats(EvermizerFlag, DefaultOnToggle):
@@ -240,7 +254,8 @@ soe_options: typing.Dict[str, AssembleOptions] = {
     "available_fragments":   AvailableFragments,
     "money_modifier":        MoneyModifier,
     "exp_modifier":          ExpModifier,
-    "fix_sequence":          FixSequence,
+    "sequence_breaks":       SequenceBreaks,
+    "out_of_bounds":         OutOfBounds,
     "fix_cheats":            FixCheats,
     "fix_infinite_ammo":     FixInfiniteAmmo,
     "fix_atlas_glitch":      FixAtlasGlitch,
diff --git a/worlds/soe/__init__.py b/worlds/soe/__init__.py
index f887325c60..d02a8d02ee 100644
--- a/worlds/soe/__init__.py
+++ b/worlds/soe/__init__.py
@@ -10,12 +10,8 @@ from worlds.generic.Rules import add_item_rule, set_rule
 from BaseClasses import Entrance, Item, ItemClassification, Location, LocationProgressType, Region, Tutorial
 from Utils import output_path
 
-try:
-    import pyevermizer  # from package
-except ImportError:
-    import traceback
-    traceback.print_exc()
-    from . import pyevermizer  # as part of the source tree
+import pyevermizer  # from package
+# from . import pyevermizer  # as part of the source tree
 
 from . import Logic  # load logic mixin
 from .Options import soe_options, Difficulty, EnergyCore, RequiredFragments, AvailableFragments
@@ -179,6 +175,8 @@ class SoEWorld(World):
     evermizer_seed: int
     connect_name: str
     energy_core: int
+    sequence_breaks: int
+    out_of_bounds: int
     available_fragments: int
     required_fragments: int
 
@@ -191,6 +189,8 @@ class SoEWorld(World):
     def generate_early(self) -> None:
         # store option values that change logic
         self.energy_core = self.multiworld.energy_core[self.player].value
+        self.sequence_breaks = self.multiworld.sequence_breaks[self.player].value
+        self.out_of_bounds = self.multiworld.out_of_bounds[self.player].value
         self.required_fragments = self.multiworld.required_fragments[self.player].value
         if self.required_fragments > self.multiworld.available_fragments[self.player].value:
             self.multiworld.available_fragments[self.player].value = self.required_fragments
@@ -224,9 +224,8 @@ class SoEWorld(World):
         max_difficulty = 1 if self.multiworld.difficulty[self.player] == Difficulty.option_easy else 256
 
         # TODO: generate *some* regions from locations' requirements?
-        r = Region('Menu', self.player, self.multiworld)
-        r.exits = [Entrance(self.player, 'New Game', r)]
-        self.multiworld.regions += [r]
+        menu = Region('Menu', self.player, self.multiworld)
+        self.multiworld.regions += [menu]
 
         def get_sphere_index(evermizer_loc):
             """Returns 0, 1 or 2 for locations in spheres 1, 2, 3+"""
@@ -234,11 +233,14 @@ class SoEWorld(World):
                 return 2
             return min(2, len(evermizer_loc.requires))
 
+        # create ingame region
+        ingame = Region('Ingame', self.player, self.multiworld)
+
         # group locations into spheres (1, 2, 3+ at index 0, 1, 2)
         spheres: typing.Dict[int, typing.Dict[int, typing.List[SoELocation]]] = {}
         for loc in _locations:
             spheres.setdefault(get_sphere_index(loc), {}).setdefault(loc.type, []).append(
-                SoELocation(self.player, loc.name, self.location_name_to_id[loc.name], r,
+                SoELocation(self.player, loc.name, self.location_name_to_id[loc.name], ingame,
                             loc.difficulty > max_difficulty))
 
         # location balancing data
@@ -280,18 +282,16 @@ class SoEWorld(World):
         late_locations = self.multiworld.random.sample(late_bosses, late_count)
 
         # add locations to the world
-        r = Region('Ingame', self.player, self.multiworld)
         for sphere in spheres.values():
             for locations in sphere.values():
                 for location in locations:
-                    r.locations.append(location)
+                    ingame.locations.append(location)
                     if location.name in late_locations:
                         location.progress_type = LocationProgressType.PRIORITY
 
-        r.locations.append(SoELocation(self.player, 'Done', None, r))
-        self.multiworld.regions += [r]
-
-        self.multiworld.get_entrance('New Game', self.player).connect(self.multiworld.get_region('Ingame', self.player))
+        ingame.locations.append(SoELocation(self.player, 'Done', None, ingame))
+        menu.connect(ingame, "New Game")
+        self.multiworld.regions += [ingame]
 
     def create_items(self):
         # add regular items to the pool
@@ -417,7 +417,7 @@ class SoEWorld(World):
                     flags += option.to_flag()
 
             with open(placement_file, "wb") as f:  # generate placement file
-                for location in filter(lambda l: l.player == self.player, self.multiworld.get_locations()):
+                for location in self.multiworld.get_locations(self.player):
                     item = location.item
                     assert item is not None, "Can't handle unfilled location"
                     if item.code is None or location.address is None:
diff --git a/worlds/soe/docs/multiworld_en.md b/worlds/soe/docs/multiworld_en.md
index d995cea56a..58b9aabf6a 100644
--- a/worlds/soe/docs/multiworld_en.md
+++ b/worlds/soe/docs/multiworld_en.md
@@ -29,7 +29,7 @@ them. Player settings page: [Secret of Evermore Player Settings PAge](/games/Sec
 ### 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 Validation page](/mysterycheck)
+page: [YAML Validation page](/check)
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/soe/requirements.txt b/worlds/soe/requirements.txt
index 878a2a80cc..710f51ddb0 100644
--- a/worlds/soe/requirements.txt
+++ b/worlds/soe/requirements.txt
@@ -1,18 +1,36 @@
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp38-cp38-win_amd64.whl#0.44.0 ; sys_platform == 'win32' and platform_machine == 'AMD64' and python_version == '3.8'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp39-cp39-win_amd64.whl#0.44.0 ; sys_platform == 'win32' and platform_machine == 'AMD64' and python_version == '3.9'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp310-cp310-win_amd64.whl#0.44.0 ; sys_platform == 'win32' and platform_machine == 'AMD64' and python_version == '3.10'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp311-cp311-win_amd64.whl#0.44.0 ; sys_platform == 'win32' and platform_machine == 'AMD64' and python_version == '3.11'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.8'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.9'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.10'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.11'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.8'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.9'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.10'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#0.44.0 ; sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.11'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp38-cp38-macosx_10_9_x86_64.whl#0.44.0 ; sys_platform == 'darwin' and python_version == '3.8'
-#pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp39-cp39-macosx_10_9_x86_64.whl#0.44.0 ; sys_platform == 'darwin' and python_version == '3.9'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp39-cp39-macosx_10_9_universal2.whl#0.44.0 ; sys_platform == 'darwin' and python_version == '3.9'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp310-cp310-macosx_10_9_universal2.whl#0.44.0 ; sys_platform == 'darwin' and python_version == '3.10'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-cp311-cp311-macosx_10_9_universal2.whl#0.44.0 ; sys_platform == 'darwin' and python_version == '3.11'
-pyevermizer @ https://github.com/black-sliver/pyevermizer/releases/download/v0.44.0/pyevermizer-0.44.0-1.tar.gz#0.44.0 ; python_version < '3.8' or python_version > '3.11' or (sys_platform != 'win32' and sys_platform != 'linux' and sys_platform != 'darwin') or (platform_machine != 'AMD64' and platform_machine != 'x86_64' and platform_machine != 'aarch64' and platform_machine != 'universal2' and platform_machine != 'arm64')
+pyevermizer==0.46.1 \
+  --hash=sha256:9fd71b5e4af26a5dd24a9cbf5320bf0111eef80320613401a1c03011b1515806 \
+  --hash=sha256:23f553ed0509d9a238b2832f775e0b5abd7741b38ab60d388294ee8a7b96c5fb \
+  --hash=sha256:7189b67766418a3e7e6c683f09c5e758aa1a5c24316dd9b714984bac099c4b75 \
+  --hash=sha256:befa930711e63d5d5892f67fd888b2e65e746363e74599c53e71ecefb90ae16a \
+  --hash=sha256:202933ce21e0f33859537bf3800d9a626c70262a9490962e3f450171758507ca \
+  --hash=sha256:c20ca69311c696528e1122ebc7d33775ee971f538c0e3e05dd3bfd4de10b82d4 \
+  --hash=sha256:74dc689a771ae5ffcd5257e763f571ee890e3e87bdb208233b7f451522c00d66 \
+  --hash=sha256:072296baef464daeb6304cf58827dcbae441ad0803039aee1c0caa10d56e0674 \
+  --hash=sha256:7921baf20d52d92d6aeb674125963c335b61abb7e1298bde4baf069d11a2d05e \
+  --hash=sha256:ca098034a84007038c2bff004582e6e6ac2fa9cc8b9251301d25d7e2adcee6da \
+  --hash=sha256:22ddb29823c19be9b15e1b3627db1babfe08b486aede7d5cc463a0a1ae4c75d8 \
+  --hash=sha256:bf1c441b49026d9000166be6e2f63fc351a3fda170aa3fdf18d44d5e5d044640 \
+  --hash=sha256:9710aa7957b4b1f14392006237eb95803acf27897377df3e85395f057f4316b9 \
+  --hash=sha256:8feb676c198bee17ab991ee015828345ac3f87c27dfdb3061d92d1fe47c184b4 \
+  --hash=sha256:597026dede72178ff3627a4eb3315de8444461c7f0f856f5773993c3f9790c53 \
+  --hash=sha256:70f9b964bdfb5191e8f264644c5d1af3041c66fe15261df8a99b3d719dc680d6 \
+  --hash=sha256:74655c0353ffb6cda30485091d0917ce703b128cd824b612b3110a85c79a93d0 \
+  --hash=sha256:0e9c74d105d4ec3af12404e85bb8776931c043657add19f798ee69465f92b999 \
+  --hash=sha256:d3c13446d3d482b9cce61ac73b38effd26fcdcf7f693a405868d3aaaa4d18ca6 \
+  --hash=sha256:371ac3360640ef439a5920ddfe11a34e9d2e546ed886bb8c9ed312611f9f4655 \
+  --hash=sha256:6e5cf63b036f24d2ae4375a88df8d0bc93208352939521d1fcac3c829ef2c363 \
+  --hash=sha256:edf28f5c4d1950d17343adf6d8d40d12c7e982d1e39535d55f7915e122cd8b0e \
+  --hash=sha256:b5ef6f3b4e04f677c296f60f7f4c320ac22cd5bc09c05574460116c8641c801a \
+  --hash=sha256:dd651f66720af4abe2ddae29944e299a57ff91e6fca1739e6dc1f8fd7a8c2b39 \
+  --hash=sha256:4e278f5f72c27f9703bce5514d2fead8c00361caac03e94b0bf9ad8a144f1eeb \
+  --hash=sha256:38f36ea1f545b835c3ecd6e081685a233ac2e3cf0eec8916adc92e4d791098a6 \
+  --hash=sha256:0a2e58ed6e7c42f006cc17d32cec1f432f01b3fe490e24d71471b36e0d0d8742 \
+  --hash=sha256:c1b658db76240596c03571c60635abe953f36fb55b363202971831c2872ea9a0 \
+  --hash=sha256:deb5a84a6a56325eb6701336cdbf70f72adaaeab33cbe953d0e551ecf2592f20 \
+  --hash=sha256:b1425c793e0825f58b3726e7afebaf5a296c07cb0d28580d0ee93dbe10dcdf63 \
+  --hash=sha256:11995fb4dfd14b5c359591baee2a864c5814650ba0084524d4ea0466edfaf029 \
+  --hash=sha256:5d2120b5c93ae322fe2a85d48e3eab4168a19e974a880908f1ac291c0300940f \
+  --hash=sha256:254912ea4bfaaffb0abe366e73bd9ecde622677d6afaf2ce8a0c330df99fefd9 \
+  --hash=sha256:540d8e4525f0b5255c1554b4589089dc58e15df22f343e9545ea00f7012efa07 \
+  --hash=sha256:f69b8ebded7eed181fabe30deabae89fd10c41964f38abb26b19664bbe55c1ae
diff --git a/worlds/soe/test/__init__.py b/worlds/soe/test/__init__.py
index 3c2a0dc1b6..27d38605aa 100644
--- a/worlds/soe/test/__init__.py
+++ b/worlds/soe/test/__init__.py
@@ -1,5 +1,20 @@
 from test.TestBase import WorldTestBase
+from typing import Iterable
 
 
 class SoETestBase(WorldTestBase):
     game = "Secret of Evermore"
+
+    def assertLocationReachability(self, reachable: Iterable[str] = (), unreachable: Iterable[str] = (),
+                                   satisfied=True) -> None:
+        """
+        Tests that unreachable can't be reached. Tests that reachable can be reached if satisfied=True.
+        Usage: test with satisfied=False, collect requirements into state, test again with satisfied=True
+        """
+        for location in reachable:
+            self.assertEqual(self.can_reach_location(location), satisfied,
+                             f"{location} is unreachable but should be" if satisfied else
+                             f"{location} is reachable but shouldn't be")
+        for location in unreachable:
+            self.assertFalse(self.can_reach_location(location),
+                             f"{location} is reachable but shouldn't be")
diff --git a/worlds/soe/test/TestAccess.py b/worlds/soe/test/test_access.py
similarity index 100%
rename from worlds/soe/test/TestAccess.py
rename to worlds/soe/test/test_access.py
diff --git a/worlds/soe/test/TestGoal.py b/worlds/soe/test/test_goal.py
similarity index 100%
rename from worlds/soe/test/TestGoal.py
rename to worlds/soe/test/test_goal.py
diff --git a/worlds/soe/test/test_oob.py b/worlds/soe/test/test_oob.py
new file mode 100644
index 0000000000..27e00cd3e7
--- /dev/null
+++ b/worlds/soe/test/test_oob.py
@@ -0,0 +1,51 @@
+import typing
+from . import SoETestBase
+
+
+class OoBTest(SoETestBase):
+    """Tests that 'on' doesn't put out-of-bounds in logic. This is also the test base for OoB in logic."""
+    options: typing.Dict[str, typing.Any] = {"out_of_bounds": "on"}
+
+    def testOoBAccess(self):
+        in_logic = self.options["out_of_bounds"] == "logic"
+
+        # some locations that just need a weapon + OoB
+        oob_reachable = [
+            "Aquagoth", "Sons of Sth.", "Mad Monk", "Magmar",  # OoB can use volcano shop to skip rock skip
+            "Levitate", "Fireball", "Drain", "Speed",
+            "E. Crustacia #107", "Energy Core #285", "Vanilla Gauge #57",
+        ]
+        # some locations that should still be unreachable
+        oob_unreachable = [
+            "Tiny", "Rimsala",
+            "Barrier", "Call Up", "Reflect", "Force Field", "Stop",  # Stop guy doesn't spawn for the other entrances
+            "Pyramid bottom #118", "Tiny's hideout #160", "Tiny's hideout #161", "Greenhouse #275",
+        ]
+        # OoB + Diamond Eyes
+        de_reachable = [
+            "Tiny's hideout #160",
+        ]
+        # still unreachable
+        de_unreachable = [
+            "Tiny",
+            "Tiny's hideout #161",
+        ]
+
+        self.assertLocationReachability(reachable=oob_reachable, unreachable=oob_unreachable, satisfied=False)
+        self.collect_by_name("Gladiator Sword")
+        self.assertLocationReachability(reachable=oob_reachable, unreachable=oob_unreachable, satisfied=in_logic)
+        self.collect_by_name("Diamond Eye")
+        self.assertLocationReachability(reachable=de_reachable, unreachable=de_unreachable, satisfied=in_logic)
+
+    def testOoBGoal(self):
+        # still need Energy Core with OoB if sequence breaks are not in logic
+        for item in ["Gladiator Sword", "Diamond Eye", "Wheel", "Gauge"]:
+            self.collect_by_name(item)
+        self.assertBeatable(False)
+        self.collect_by_name("Energy Core")
+        self.assertBeatable(True)
+
+
+class OoBInLogicTest(OoBTest):
+    """Tests that stuff that should be reachable/unreachable with out-of-bounds actually is."""
+    options: typing.Dict[str, typing.Any] = {"out_of_bounds": "logic"}
diff --git a/worlds/soe/test/test_sequence_breaks.py b/worlds/soe/test/test_sequence_breaks.py
new file mode 100644
index 0000000000..4248f9b47d
--- /dev/null
+++ b/worlds/soe/test/test_sequence_breaks.py
@@ -0,0 +1,45 @@
+import typing
+from . import SoETestBase
+
+
+class SequenceBreaksTest(SoETestBase):
+    """Tests that 'on' doesn't put sequence breaks in logic. This is also the test base for in-logic."""
+    options: typing.Dict[str, typing.Any] = {"sequence_breaks": "on"}
+
+    def testSequenceBreaksAccess(self):
+        in_logic = self.options["sequence_breaks"] == "logic"
+
+        # some locations that just need any weapon + sequence break
+        break_reachable = [
+            "Sons of Sth.", "Mad Monk", "Magmar",
+            "Fireball",
+            "Volcano Room1 #73", "Pyramid top #135",
+        ]
+        # some locations that should still be unreachable
+        break_unreachable = [
+            "Aquagoth", "Megataur", "Tiny", "Rimsala",
+            "Barrier", "Call Up", "Levitate", "Stop", "Drain", "Escape",
+            "Greenhouse #275", "E. Crustacia #107", "Energy Core #285", "Vanilla Gauge #57",
+        ]
+
+        self.assertLocationReachability(reachable=break_reachable, unreachable=break_unreachable, satisfied=False)
+        self.collect_by_name("Gladiator Sword")
+        self.assertLocationReachability(reachable=break_reachable, unreachable=break_unreachable, satisfied=in_logic)
+        self.collect_by_name("Spider Claw")  # Gauge now just needs non-sword
+        self.assertEqual(self.can_reach_location("Vanilla Gauge #57"), in_logic)
+        self.collect_by_name("Bronze Spear")  # Escape now just needs either Megataur or Rimsala dead
+        self.assertEqual(self.can_reach_location("Escape"), in_logic)
+
+    def testSequenceBreaksGoal(self):
+        in_logic = self.options["sequence_breaks"] == "logic"
+
+        # don't need Energy Core with sequence breaks in logic
+        for item in ["Gladiator Sword", "Diamond Eye", "Wheel", "Gauge"]:
+            self.assertBeatable(False)
+            self.collect_by_name(item)
+        self.assertBeatable(in_logic)
+
+
+class SequenceBreaksInLogicTest(SequenceBreaksTest):
+    """Tests that stuff that should be reachable/unreachable with sequence breaks actually is."""
+    options: typing.Dict[str, typing.Any] = {"sequence_breaks": "logic"}
diff --git a/worlds/spire/Rules.py b/worlds/spire/Rules.py
index 7c8c1c0f3d..3c6f09b34d 100644
--- a/worlds/spire/Rules.py
+++ b/worlds/spire/Rules.py
@@ -5,11 +5,11 @@ from ..generic.Rules import set_rule
 
 class SpireLogic(LogicMixin):
     def _spire_has_relics(self, player: int, amount: int) -> bool:
-        count: int = self.item_count("Relic", player) + self.item_count("Boss Relic", player)
+        count: int = self.count("Relic", player) + self.count("Boss Relic", player)
         return count >= amount
 
     def _spire_has_cards(self, player: int, amount: int) -> bool:
-        count = self.item_count("Card Draw", player) + self.item_count("Rare Card Draw", player)
+        count = self.count("Card Draw", player) + self.count("Rare Card Draw", player)
         return count >= amount
 
 
diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py
index 150e3589b0..aa825af302 100644
--- a/worlds/stardew_valley/__init__.py
+++ b/worlds/stardew_valley/__init__.py
@@ -1,18 +1,21 @@
 import logging
-from typing import Dict, Any, Iterable, Optional, Union, Set
+from typing import Dict, Any, Iterable, Optional, Union, Set, List
 
-from BaseClasses import Region, Entrance, Location, Item, Tutorial, CollectionState, ItemClassification, MultiWorld
+from BaseClasses import Region, Entrance, Location, Item, Tutorial, CollectionState, ItemClassification, MultiWorld, Group as ItemLinkGroup
+from Options import PerGameCommonOptions
 from worlds.AutoWorld import World, WebWorld
-from . import rules, logic, options
+from . import rules
 from .bundles import get_all_bundles, Bundle
-from .items import item_table, create_items, ItemData, Group, items_by_group
+from .items import item_table, create_items, ItemData, Group, items_by_group, get_all_filler_items, remove_limited_amount_packs
 from .locations import location_table, create_locations, LocationData
 from .logic import StardewLogic, StardewRule, True_, MAX_MONTHS
-from .options import stardew_valley_options, StardewOptions, fetch_options
+from .options import StardewValleyOptions, SeasonRandomization, Goal, BundleRandomization, BundlePrice, NumberOfLuckBuffs, NumberOfMovementBuffs, \
+    BackpackProgression, BuildingProgression, ExcludeGingerIsland, TrapItems
+from .presets import sv_options_presets
 from .regions import create_regions
 from .rules import set_rules
 from worlds.generic.Rules import set_rule
-from .strings.goal_names import Goal
+from .strings.goal_names import Goal as GoalName
 
 client_version = 0
 
@@ -32,6 +35,7 @@ class StardewItem(Item):
 class StardewWebWorld(WebWorld):
     theme = "dirt"
     bug_report_page = "https://github.com/agilbert1412/StardewArchipelago/issues/new?labels=bug&title=%5BBug%5D%3A+Brief+Description+of+bug+here"
+    options_presets = sv_options_presets
 
     tutorials = [
         Tutorial(
@@ -50,7 +54,6 @@ class StardewValleyWorld(World):
     befriend villagers, and uncover dark secrets.
     """
     game = "Stardew Valley"
-    option_definitions = stardew_valley_options
     topology_present = False
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
@@ -59,7 +62,8 @@ class StardewValleyWorld(World):
     data_version = 3
     required_client_version = (0, 4, 0)
 
-    options: StardewOptions
+    options_dataclass = StardewValleyOptions
+    options: StardewValleyOptions
     logic: StardewLogic
 
     web = StardewWebWorld()
@@ -70,27 +74,27 @@ class StardewValleyWorld(World):
     def __init__(self, world: MultiWorld, player: int):
         super().__init__(world, player)
         self.all_progression_items = set()
+        self.filler_item_pool_names = []
 
     def generate_early(self):
-        self.options = fetch_options(self.multiworld, self.player)
         self.force_change_options_if_incompatible()
 
         self.logic = StardewLogic(self.player, self.options)
         self.modified_bundles = get_all_bundles(self.multiworld.random,
                                                 self.logic,
-                                                self.options[options.BundleRandomization],
-                                                self.options[options.BundlePrice])
+                                                self.options.bundle_randomization,
+                                                self.options.bundle_price)
 
     def force_change_options_if_incompatible(self):
-        goal_is_walnut_hunter = self.options[options.Goal] == options.Goal.option_greatest_walnut_hunter
-        goal_is_perfection = self.options[options.Goal] == options.Goal.option_perfection
+        goal_is_walnut_hunter = self.options.goal == Goal.option_greatest_walnut_hunter
+        goal_is_perfection = self.options.goal == Goal.option_perfection
         goal_is_island_related = goal_is_walnut_hunter or goal_is_perfection
-        exclude_ginger_island = self.options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true
+        exclude_ginger_island = self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
         if goal_is_island_related and exclude_ginger_island:
-            self.options[options.ExcludeGingerIsland] = options.ExcludeGingerIsland.option_false
-            goal = options.Goal.name_lookup[self.options[options.Goal]]
+            self.options.exclude_ginger_island.value = ExcludeGingerIsland.option_false
+            goal_name = self.options.goal.current_key
             player_name = self.multiworld.player_name[self.player]
-            logging.warning(f"Goal '{goal}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({player_name})")
+            logging.warning(f"Goal '{goal_name}' requires Ginger Island. Exclude Ginger Island setting forced to 'False' for player {self.player} ({player_name})")
 
     def create_regions(self):
         def create_region(name: str, exits: Iterable[str]) -> Region:
@@ -99,15 +103,15 @@ class StardewValleyWorld(World):
             return region
 
         world_regions, self.randomized_entrances = create_regions(create_region, self.multiworld.random, self.options)
-        self.multiworld.regions.extend(world_regions)
 
         def add_location(name: str, code: Optional[int], region: str):
-            region = self.multiworld.get_region(region, self.player)
+            region = world_regions[region]
             location = StardewLocation(self.player, name, code, region)
             location.access_rule = lambda _: True
             region.locations.append(location)
 
         create_locations(add_location, self.options, self.multiworld.random)
+        self.multiworld.regions.extend(world_regions.values())
 
     def create_items(self):
         self.precollect_starting_season()
@@ -116,7 +120,7 @@ class StardewValleyWorld(World):
                             if not item_table[excluded_items.name].has_any_group(Group.RESOURCE_PACK,
                                                                                  Group.FRIENDSHIP_PACK)]
 
-        if self.options[options.SeasonRandomization] == options.SeasonRandomization.option_disabled:
+        if self.options.season_randomization == SeasonRandomization.option_disabled:
             items_to_exclude = [item for item in items_to_exclude
                                 if item_table[item.name] not in items_by_group[Group.SEASON]]
 
@@ -134,12 +138,12 @@ class StardewValleyWorld(World):
         self.setup_victory()
 
     def precollect_starting_season(self) -> Optional[StardewItem]:
-        if self.options[options.SeasonRandomization] == options.SeasonRandomization.option_progressive:
+        if self.options.season_randomization == SeasonRandomization.option_progressive:
             return
 
         season_pool = items_by_group[Group.SEASON]
 
-        if self.options[options.SeasonRandomization] == options.SeasonRandomization.option_disabled:
+        if self.options.season_randomization == SeasonRandomization.option_disabled:
             for season in season_pool:
                 self.multiworld.push_precollected(self.create_item(season))
             return
@@ -148,18 +152,18 @@ class StardewValleyWorld(World):
             if item.name in {season.name for season in items_by_group[Group.SEASON]}]:
             return
 
-        if self.options[options.SeasonRandomization] == options.SeasonRandomization.option_randomized_not_winter:
+        if self.options.season_randomization == SeasonRandomization.option_randomized_not_winter:
             season_pool = [season for season in season_pool if season.name != "Winter"]
 
         starting_season = self.create_item(self.multiworld.random.choice(season_pool))
         self.multiworld.push_precollected(starting_season)
 
     def setup_early_items(self):
-        if (self.options[options.BuildingProgression] ==
-                options.BuildingProgression.option_progressive_early_shipping_bin):
+        if (self.options.building_progression ==
+                BuildingProgression.option_progressive_early_shipping_bin):
             self.multiworld.early_items[self.player]["Shipping Bin"] = 1
 
-        if self.options[options.BackpackProgression] == options.BackpackProgression.option_early_progressive:
+        if self.options.backpack_progression == BackpackProgression.option_early_progressive:
             self.multiworld.early_items[self.player]["Progressive Backpack"] = 1
 
     def setup_month_events(self):
@@ -172,40 +176,40 @@ class StardewValleyWorld(World):
             self.create_event_location(month_end, self.logic.received("Month End", i).simplify(), "Month End")
 
     def setup_victory(self):
-        if self.options[options.Goal] == options.Goal.option_community_center:
-            self.create_event_location(location_table[Goal.community_center],
+        if self.options.goal == Goal.option_community_center:
+            self.create_event_location(location_table[GoalName.community_center],
                                        self.logic.can_complete_community_center().simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_grandpa_evaluation:
-            self.create_event_location(location_table[Goal.grandpa_evaluation],
+        elif self.options.goal == Goal.option_grandpa_evaluation:
+            self.create_event_location(location_table[GoalName.grandpa_evaluation],
                                        self.logic.can_finish_grandpa_evaluation().simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_bottom_of_the_mines:
-            self.create_event_location(location_table[Goal.bottom_of_the_mines],
+        elif self.options.goal == Goal.option_bottom_of_the_mines:
+            self.create_event_location(location_table[GoalName.bottom_of_the_mines],
                                        self.logic.can_mine_to_floor(120).simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_cryptic_note:
-            self.create_event_location(location_table[Goal.cryptic_note],
+        elif self.options.goal == Goal.option_cryptic_note:
+            self.create_event_location(location_table[GoalName.cryptic_note],
                                        self.logic.can_complete_quest("Cryptic Note").simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_master_angler:
-            self.create_event_location(location_table[Goal.master_angler],
+        elif self.options.goal == Goal.option_master_angler:
+            self.create_event_location(location_table[GoalName.master_angler],
                                        self.logic.can_catch_every_fish().simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_complete_collection:
-            self.create_event_location(location_table[Goal.complete_museum],
+        elif self.options.goal == Goal.option_complete_collection:
+            self.create_event_location(location_table[GoalName.complete_museum],
                                        self.logic.can_complete_museum().simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_full_house:
-            self.create_event_location(location_table[Goal.full_house],
+        elif self.options.goal == Goal.option_full_house:
+            self.create_event_location(location_table[GoalName.full_house],
                                        (self.logic.has_children(2) & self.logic.can_reproduce()).simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_greatest_walnut_hunter:
-            self.create_event_location(location_table[Goal.greatest_walnut_hunter],
+        elif self.options.goal == Goal.option_greatest_walnut_hunter:
+            self.create_event_location(location_table[GoalName.greatest_walnut_hunter],
                                        self.logic.has_walnut(130).simplify(),
                                        "Victory")
-        elif self.options[options.Goal] == options.Goal.option_perfection:
-            self.create_event_location(location_table[Goal.perfection],
+        elif self.options.goal == Goal.option_perfection:
+            self.create_event_location(location_table[GoalName.perfection],
                                        self.logic.has_everything(self.all_progression_items).simplify(),
                                        "Victory")
 
@@ -230,7 +234,7 @@ class StardewValleyWorld(World):
         location.place_locked_item(self.create_item(item))
 
     def set_rules(self):
-        set_rules(self.multiworld, self.player, self.options, self.logic, self.modified_bundles)
+        set_rules(self)
         self.force_first_month_once_all_early_items_are_found()
 
     def force_first_month_once_all_early_items_are_found(self):
@@ -267,7 +271,33 @@ class StardewValleyWorld(World):
         pass
 
     def get_filler_item_name(self) -> str:
-        return "Joja Cola"
+        if not self.filler_item_pool_names:
+            self.generate_filler_item_pool_names()
+        return self.random.choice(self.filler_item_pool_names)
+
+    def generate_filler_item_pool_names(self):
+        include_traps, exclude_island = self.get_filler_item_rules()
+        available_filler = get_all_filler_items(include_traps, exclude_island)
+        available_filler = remove_limited_amount_packs(available_filler)
+        self.filler_item_pool_names = [item.name for item in available_filler]
+
+    def get_filler_item_rules(self):
+        if self.player in self.multiworld.groups:
+            link_group: ItemLinkGroup = self.multiworld.groups[self.player]
+            include_traps = True
+            exclude_island = False
+            for player in link_group["players"]:
+                player_options = self.multiworld.worlds[player].options
+                if self.multiworld.game[player] != self.game:
+
+                    continue
+                if player_options.trap_items == TrapItems.option_no_traps:
+                    include_traps = False
+                if player_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
+                    exclude_island = True
+            return include_traps, exclude_island
+        else:
+            return self.options.trap_items != TrapItems.option_no_traps, self.options.exclude_ginger_island == ExcludeGingerIsland.option_true
 
     def fill_slot_data(self) -> Dict[str, Any]:
 
@@ -276,11 +306,12 @@ class StardewValleyWorld(World):
             key, value = self.modified_bundles[bundle_key].to_pair()
             modified_bundles[key] = value
 
-        excluded_options = [options.BundleRandomization, options.BundlePrice,
-                            options.NumberOfMovementBuffs, options.NumberOfLuckBuffs]
-        slot_data = dict(self.options.options)
-        for option in excluded_options:
-            slot_data.pop(option.internal_name)
+        excluded_options = [BundleRandomization, BundlePrice, NumberOfMovementBuffs, NumberOfLuckBuffs]
+        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)
+        included_option_names: List[str] = [option_name for option_name in self.options_dataclass.type_hints if option_name not in excluded_option_names]
+        slot_data = self.options.as_dict(*included_option_names)
         slot_data.update({
             "seed": self.multiworld.per_slot_randoms[self.player].randrange(1000000000),  # Seed should be max 9 digits
             "randomized_entrances": self.randomized_entrances,
diff --git a/worlds/stardew_valley/bundles.py b/worlds/stardew_valley/bundles.py
index 7cbb139237..4af21542a4 100644
--- a/worlds/stardew_valley/bundles.py
+++ b/worlds/stardew_valley/bundles.py
@@ -152,7 +152,7 @@ class Bundle:
     # shuffle_vault_amongst_themselves(random, bundles)
 
 
-def get_all_bundles(random: Random, logic: StardewLogic, randomization: int, price: int) -> Dict[str, Bundle]:
+def get_all_bundles(random: Random, logic: StardewLogic, randomization: BundleRandomization, price: BundlePrice) -> Dict[str, Bundle]:
     bundles = {}
     for bundle_key in vanilla_bundles:
         bundle_value = vanilla_bundles[bundle_key]
diff --git a/worlds/stardew_valley/data/bundle_data.py b/worlds/stardew_valley/data/bundle_data.py
index 8a1a6a5bcf..183383ccbf 100644
--- a/worlds/stardew_valley/data/bundle_data.py
+++ b/worlds/stardew_valley/data/bundle_data.py
@@ -303,8 +303,7 @@ artisan_goods_items = [truffle_oil, cloth, goat_cheese, cheese, honey, beer, jui
 
 river_fish_items = [chub, catfish, rainbow_trout, lingcod, walleye, perch, pike, bream,
                     salmon, sunfish, tiger_trout, shad, smallmouth_bass, dorado]
-lake_fish_items = [chub, rainbow_trout, lingcod, walleye, perch, carp, midnight_carp,
-                   largemouth_bass, sturgeon, bullhead, midnight_carp]
+lake_fish_items = [chub, rainbow_trout, lingcod, walleye, perch, carp, midnight_carp, largemouth_bass, sturgeon, bullhead]
 ocean_fish_items = [tilapia, pufferfish, tuna, super_cucumber, flounder, anchovy, sardine, red_mullet,
                     herring, eel, octopus, red_snapper, squid, sea_cucumber, albacore, halibut]
 night_fish_items = [walleye, bream, super_cucumber, eel, squid, midnight_carp]
diff --git a/worlds/stardew_valley/data/items.csv b/worlds/stardew_valley/data/items.csv
index a3d61e8b58..3c4ddb8415 100644
--- a/worlds/stardew_valley/data/items.csv
+++ b/worlds/stardew_valley/data/items.csv
@@ -1,7 +1,7 @@
 id,name,classification,groups,mod_name
 0,Joja Cola,filler,TRASH,
-15,Rusty Key,progression,MUSEUM,
-16,Dwarvish Translation Guide,progression,MUSEUM,
+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,
diff --git a/worlds/stardew_valley/items.py b/worlds/stardew_valley/items.py
index 1035997034..1f0735f4ae 100644
--- a/worlds/stardew_valley/items.py
+++ b/worlds/stardew_valley/items.py
@@ -7,10 +7,11 @@ from random import Random
 from typing import Dict, List, Protocol, Union, Set, Optional
 
 from BaseClasses import Item, ItemClassification
-from . import options, data
+from . import data
 from .data.villagers_data import all_villagers
 from .mods.mod_data import ModNames
-from .options import StardewOptions
+from .options import StardewValleyOptions, TrapItems, FestivalLocations, ExcludeGingerIsland, SpecialOrderLocations, SeasonRandomization, Cropsanity, Friendsanity, Museumsanity, \
+    Fishsanity, BuildingProgression, SkillProgression, ToolProgression, ElevatorProgression, BackpackProgression, ArcadeMachineLocations
 from .strings.ap_names.buff_names import Buff
 
 ITEM_CODE_OFFSET = 717000
@@ -138,10 +139,9 @@ initialize_groups()
 
 
 def create_items(item_factory: StardewItemFactory, locations_count: int, items_to_exclude: List[Item],
-                 world_options: StardewOptions,
-                 random: Random) -> List[Item]:
+                 options: StardewValleyOptions, random: Random) -> List[Item]:
     items = []
-    unique_items = create_unique_items(item_factory, world_options, random)
+    unique_items = create_unique_items(item_factory, options, random)
 
     for item in items_to_exclude:
         if item in unique_items:
@@ -151,58 +151,58 @@ 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, world_options, random, locations_count - len(items))
+    unique_filler_items = create_unique_filler_items(item_factory, 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, world_options, random, items, locations_count)
+    resource_pack_items = fill_with_resource_packs_and_traps(item_factory, options, random, items, locations_count)
     items += resource_pack_items
     logger.debug(f"Created {len(resource_pack_items)} resource packs")
 
     return items
 
 
-def create_unique_items(item_factory: StardewItemFactory, world_options: StardewOptions, random: Random) -> List[Item]:
+def create_unique_items(item_factory: StardewItemFactory, options: StardewValleyOptions, random: Random) -> List[Item]:
     items = []
 
     items.extend(item_factory(item) for item in items_by_group[Group.COMMUNITY_REWARD])
 
-    create_backpack_items(item_factory, world_options, items)
+    create_backpack_items(item_factory, options, items)
     create_mine_rewards(item_factory, items, random)
-    create_elevators(item_factory, world_options, items)
-    create_tools(item_factory, world_options, items)
-    create_skills(item_factory, world_options, items)
-    create_wizard_buildings(item_factory, world_options, items)
-    create_carpenter_buildings(item_factory, world_options, items)
+    create_elevators(item_factory, options, items)
+    create_tools(item_factory, options, items)
+    create_skills(item_factory, options, items)
+    create_wizard_buildings(item_factory, options, items)
+    create_carpenter_buildings(item_factory, options, items)
     items.append(item_factory("Beach Bridge"))
     items.append(item_factory("Dark Talisman"))
     create_tv_channels(item_factory, items)
     create_special_quest_rewards(item_factory, items)
-    create_stardrops(item_factory, world_options, items)
-    create_museum_items(item_factory, world_options, items)
-    create_arcade_machine_items(item_factory, world_options, items)
+    create_stardrops(item_factory, options, items)
+    create_museum_items(item_factory, options, items)
+    create_arcade_machine_items(item_factory, options, items)
     items.append(item_factory(random.choice(items_by_group[Group.GALAXY_WEAPONS])))
-    create_player_buffs(item_factory, world_options, items)
+    create_player_buffs(item_factory, options, items)
     create_traveling_merchant_items(item_factory, items)
     items.append(item_factory("Return Scepter"))
-    create_seasons(item_factory, world_options, items)
-    create_seeds(item_factory, world_options, items)
-    create_friendsanity_items(item_factory, world_options, items)
-    create_festival_rewards(item_factory, world_options, items)
+    create_seasons(item_factory, options, items)
+    create_seeds(item_factory, options, items)
+    create_friendsanity_items(item_factory, options, items)
+    create_festival_rewards(item_factory, options, items)
     create_babies(item_factory, items, random)
-    create_special_order_board_rewards(item_factory, world_options, items)
-    create_special_order_qi_rewards(item_factory, world_options, items)
-    create_walnut_purchase_rewards(item_factory, world_options, items)
-    create_magic_mod_spells(item_factory, world_options, items)
+    create_special_order_board_rewards(item_factory, options, items)
+    create_special_order_qi_rewards(item_factory, options, items)
+    create_walnut_purchase_rewards(item_factory, options, items)
+    create_magic_mod_spells(item_factory, options, items)
 
     return items
 
 
-def create_backpack_items(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if (world_options[options.BackpackProgression] == options.BackpackProgression.option_progressive or
-            world_options[options.BackpackProgression] == options.BackpackProgression.option_early_progressive):
+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 world_options[options.Mods]:
+        if ModNames.big_backpack in options.mods:
             items.append(item_factory("Progressive Backpack"))
 
 
@@ -220,46 +220,46 @@ def create_mine_rewards(item_factory: StardewItemFactory, items: List[Item], ran
     items.append(item_factory("Skull Key"))
 
 
-def create_elevators(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.ElevatorProgression] == options.ElevatorProgression.option_vanilla:
+def create_elevators(item_factory: StardewItemFactory, options: StardewValleyOptions, 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 world_options[options.Mods]:
+    if ModNames.deepwoods in options.mods:
         items.extend([item_factory(item) for item in ["Progressive Woods Obelisk Sigils"] * 10])
-    if ModNames.skull_cavern_elevator in world_options[options.Mods]:
+    if ModNames.skull_cavern_elevator in options.mods:
         items.extend([item_factory(item) for item in ["Progressive Skull Cavern Elevator"] * 8])
 
 
-def create_tools(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.ToolProgression] == options.ToolProgression.option_progressive:
+def create_tools(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.tool_progression == ToolProgression.option_progressive:
         items.extend(item_factory(item) for item in items_by_group[Group.PROGRESSIVE_TOOLS] * 4)
     items.append(item_factory("Golden Scythe"))
 
 
-def create_skills(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.SkillProgression] == options.SkillProgression.option_progressive:
+def create_skills(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.skill_progression == SkillProgression.option_progressive:
         for item in items_by_group[Group.SKILL_LEVEL_UP]:
-            if item.mod_name not in world_options[options.Mods] and item.mod_name is not None:
+            if item.mod_name not in options.mods and item.mod_name is not None:
                 continue
             items.extend(item_factory(item) for item in [item.name] * 10)
 
 
-def create_wizard_buildings(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
+def create_wizard_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
     items.append(item_factory("Earth Obelisk"))
     items.append(item_factory("Water Obelisk"))
     items.append(item_factory("Desert Obelisk"))
     items.append(item_factory("Junimo Hut"))
     items.append(item_factory("Gold Clock"))
-    if world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_false:
+    if options.exclude_ginger_island == ExcludeGingerIsland.option_false:
         items.append(item_factory("Island Obelisk"))
-    if ModNames.deepwoods in world_options[options.Mods]:
+    if ModNames.deepwoods in options.mods:
         items.append(item_factory("Woods Obelisk"))
 
 
-def create_carpenter_buildings(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.BuildingProgression] in {options.BuildingProgression.option_progressive,
-                                                      options.BuildingProgression.option_progressive_early_shipping_bin}:
+def create_carpenter_buildings(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.building_progression in {BuildingProgression.option_progressive,
+                                                      BuildingProgression.option_progressive_early_shipping_bin}:
         items.append(item_factory("Progressive Coop"))
         items.append(item_factory("Progressive Coop"))
         items.append(item_factory("Progressive Coop"))
@@ -278,7 +278,7 @@ def create_carpenter_buildings(item_factory: StardewItemFactory, world_options:
         items.append(item_factory("Progressive House"))
         items.append(item_factory("Progressive House"))
         items.append(item_factory("Progressive House"))
-        if ModNames.tractor in world_options[options.Mods]:
+        if ModNames.tractor in options.mods:
             items.append(item_factory("Tractor Garage"))
 
 
@@ -290,38 +290,38 @@ def create_special_quest_rewards(item_factory: StardewItemFactory, items: List[I
     items.append(item_factory("Iridium Snake Milk"))
 
 
-def create_stardrops(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
+def create_stardrops(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
     items.append(item_factory("Stardrop"))  # The Mines level 100
     items.append(item_factory("Stardrop"))  # Old Master Cannoli
-    if world_options[options.Fishsanity] != options.Fishsanity.option_none:
+    if options.fishsanity != Fishsanity.option_none:
         items.append(item_factory("Stardrop"))  #Master Angler Stardrop
-    if ModNames.deepwoods in world_options[options.Mods]:
+    if ModNames.deepwoods in options.mods:
         items.append(item_factory("Stardrop"))  # Petting the Unicorn
 
 
-def create_museum_items(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.Museumsanity] == options.Museumsanity.option_none:
-        return
-    items.extend(item_factory(item) for item in ["Magic Rock Candy"] * 5)
-    items.extend(item_factory(item) for item in ["Ancient Seeds"] * 5)
-    items.extend(item_factory(item) for item in ["Traveling Merchant Metal Detector"] * 4)
-    items.append(item_factory("Ancient Seeds Recipe"))
-    items.append(item_factory("Stardrop"))
+def create_museum_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
     items.append(item_factory("Rusty Key"))
     items.append(item_factory("Dwarvish Translation Guide"))
-
-
-def create_friendsanity_items(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.Friendsanity] == options.Friendsanity.option_none:
+    items.append(item_factory("Ancient Seeds Recipe"))
+    if options.museumsanity == Museumsanity.option_none:
         return
-    exclude_non_bachelors = world_options[options.Friendsanity] == options.Friendsanity.option_bachelors
-    exclude_locked_villagers = world_options[options.Friendsanity] == options.Friendsanity.option_starting_npcs or \
-                               world_options[options.Friendsanity] == options.Friendsanity.option_bachelors
-    include_post_marriage_hearts = world_options[options.Friendsanity] == options.Friendsanity.option_all_with_marriage
-    exclude_ginger_island = world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true
-    heart_size = world_options[options.FriendsanityHeartSize]
+    items.extend(item_factory(item) for item in ["Magic Rock Candy"] * 10)
+    items.extend(item_factory(item) for item in ["Ancient Seeds"] * 5)
+    items.extend(item_factory(item) for item in ["Traveling Merchant Metal Detector"] * 4)
+    items.append(item_factory("Stardrop"))
+
+
+def create_friendsanity_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.friendsanity == Friendsanity.option_none:
+        return
+    exclude_non_bachelors = options.friendsanity == Friendsanity.option_bachelors
+    exclude_locked_villagers = options.friendsanity == Friendsanity.option_starting_npcs or \
+                               options.friendsanity == Friendsanity.option_bachelors
+    include_post_marriage_hearts = options.friendsanity == Friendsanity.option_all_with_marriage
+    exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true
+    heart_size = options.friendsanity_heart_size
     for villager in all_villagers:
-        if villager.mod_name not in world_options[options.Mods] and villager.mod_name is not None:
+        if villager.mod_name not in options.mods and villager.mod_name is not None:
             continue
         if not villager.available and exclude_locked_villagers:
             continue
@@ -350,8 +350,8 @@ def create_babies(item_factory: StardewItemFactory, items: List[Item], random: R
         items.append(item_factory(chosen_baby))
 
 
-def create_arcade_machine_items(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.ArcadeMachineLocations] == options.ArcadeMachineLocations.option_full_shuffling:
+def create_arcade_machine_items(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.arcade_machine_locations == ArcadeMachineLocations.option_full_shuffling:
         items.append(item_factory("JotPK: Progressive Boots"))
         items.append(item_factory("JotPK: Progressive Boots"))
         items.append(item_factory("JotPK: Progressive Gun"))
@@ -367,11 +367,9 @@ def create_arcade_machine_items(item_factory: StardewItemFactory, world_options:
         items.extend(item_factory(item) for item in ["Junimo Kart: Extra Life"] * 8)
 
 
-def create_player_buffs(item_factory: StardewItemFactory, world_options: options.StardewOptions, items: List[Item]):
-    number_of_movement_buffs: int = world_options[options.NumberOfMovementBuffs]
-    number_of_luck_buffs: int = world_options[options.NumberOfLuckBuffs]
-    items.extend(item_factory(item) for item in [Buff.movement] * number_of_movement_buffs)
-    items.extend(item_factory(item) for item in [Buff.luck] * number_of_luck_buffs)
+def create_player_buffs(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    items.extend(item_factory(item) for item in [Buff.movement] * options.movement_buff_number.value)
+    items.extend(item_factory(item) for item in [Buff.luck] * options.luck_buff_number.value)
 
 
 def create_traveling_merchant_items(item_factory: StardewItemFactory, items: List[Item]):
@@ -380,36 +378,36 @@ def create_traveling_merchant_items(item_factory: StardewItemFactory, items: Lis
                   *(item_factory(item) for item in ["Traveling Merchant Discount"] * 8)])
 
 
-def create_seasons(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.SeasonRandomization] == options.SeasonRandomization.option_disabled:
+def create_seasons(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.season_randomization == SeasonRandomization.option_disabled:
         return
 
-    if world_options[options.SeasonRandomization] == options.SeasonRandomization.option_progressive:
+    if options.season_randomization == SeasonRandomization.option_progressive:
         items.extend([item_factory(item) for item in ["Progressive Season"] * 3])
         return
 
     items.extend([item_factory(item) for item in items_by_group[Group.SEASON]])
 
 
-def create_seeds(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.Cropsanity] == options.Cropsanity.option_disabled:
+def create_seeds(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.cropsanity == Cropsanity.option_disabled:
         return
 
-    include_ginger_island = world_options[options.ExcludeGingerIsland] != options.ExcludeGingerIsland.option_true
+    include_ginger_island = options.exclude_ginger_island != ExcludeGingerIsland.option_true
     seed_items = [item_factory(item) for item in items_by_group[Group.CROPSANITY] if include_ginger_island or Group.GINGER_ISLAND not in item.groups]
     items.extend(seed_items)
 
 
-def create_festival_rewards(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.FestivalLocations] == options.FestivalLocations.option_disabled:
+def create_festival_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.festival_locations == FestivalLocations.option_disabled:
         return
 
     items.extend([*[item_factory(item) for item in items_by_group[Group.FESTIVAL] if item.classification != ItemClassification.filler],
                   item_factory("Stardrop")])
 
 
-def create_walnut_purchase_rewards(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true:
+def create_walnut_purchase_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
         return
 
     items.extend([item_factory("Boat Repair"),
@@ -420,16 +418,16 @@ def create_walnut_purchase_rewards(item_factory: StardewItemFactory, world_optio
 
 
 
-def create_special_order_board_rewards(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if world_options[options.SpecialOrderLocations] == options.SpecialOrderLocations.option_disabled:
+def create_special_order_board_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if options.special_order_locations == SpecialOrderLocations.option_disabled:
         return
 
     items.extend([item_factory(item) for item in items_by_group[Group.SPECIAL_ORDER_BOARD]])
 
 
-def create_special_order_qi_rewards(item_factory: StardewItemFactory, world_options: StardewOptions, items: List[Item]):
-    if (world_options[options.SpecialOrderLocations] != options.SpecialOrderLocations.option_board_qi or
-            world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true):
+def create_special_order_qi_rewards(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if (options.special_order_locations != SpecialOrderLocations.option_board_qi or
+            options.exclude_ginger_island == ExcludeGingerIsland.option_true):
         return
     qi_gem_rewards = ["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"]
@@ -441,53 +439,50 @@ def create_tv_channels(item_factory: StardewItemFactory, items: List[Item]):
     items.extend([item_factory(item) for item in items_by_group[Group.TV_CHANNEL]])
 
 
-def create_filler_festival_rewards(item_factory: StardewItemFactory, world_options: StardewOptions) -> List[Item]:
-    if world_options[options.FestivalLocations] == options.FestivalLocations.option_disabled:
+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, world_options: StardewOptions, items: List[Item]):
-    if ModNames.magic not in world_options[options.Mods]:
+def create_magic_mod_spells(item_factory: StardewItemFactory, options: StardewValleyOptions, items: List[Item]):
+    if ModNames.magic not in options.mods:
         return []
     items.extend([item_factory(item) for item in items_by_group[Group.MAGIC_SPELL]])
 
 
-def create_unique_filler_items(item_factory: StardewItemFactory, world_options: options.StardewOptions, random: Random,
+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, world_options))
+    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 fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, world_options: options.StardewOptions, random: Random,
+def fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, options: StardewValleyOptions, random: Random,
                                        items_already_added: List[Item],
                                        number_locations: int) -> List[Item]:
-    include_traps = world_options[options.TrapItems] != options.TrapItems.option_no_traps
-    all_filler_packs = [pack for pack in items_by_group[Group.RESOURCE_PACK]]
-    all_filler_packs.extend(items_by_group[Group.TRASH])
-    if include_traps:
-        all_filler_packs.extend(items_by_group[Group.TRAP])
+    include_traps = options.trap_items != TrapItems.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 = [pack for pack in items_by_group[Group.TRAP]
                   if pack.name not in items_already_added_names and
-                  (pack.mod_name is None or pack.mod_name in world_options[options.Mods])]
+                  (pack.mod_name is None or pack.mod_name in options.mods)]
 
     priority_filler_items = []
     priority_filler_items.extend(useful_resource_packs)
     if include_traps:
         priority_filler_items.extend(trap_items)
 
-    all_filler_packs = remove_excluded_packs(all_filler_packs, world_options)
-    priority_filler_items = remove_excluded_packs(priority_filler_items, world_options)
+    exclude_ginger_island = options.exclude_ginger_island == ExcludeGingerIsland.option_true
+    all_filler_packs = get_all_filler_items(include_traps, exclude_ginger_island)
+    priority_filler_items = remove_excluded_packs(priority_filler_items, exclude_ginger_island)
 
     number_priority_items = len(priority_filler_items)
     required_resource_pack = number_locations - len(items_already_added)
@@ -521,8 +516,21 @@ def fill_with_resource_packs_and_traps(item_factory: StardewItemFactory, world_o
     return items
 
 
-def remove_excluded_packs(packs, world_options):
+def remove_excluded_packs(packs, exclude_ginger_island: bool):
     included_packs = [pack for pack in packs if Group.DEPRECATED not in pack.groups]
-    if world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true:
+    if exclude_ginger_island:
         included_packs = [pack for pack in included_packs if Group.GINGER_ISLAND not in pack.groups]
     return included_packs
+
+
+def remove_limited_amount_packs(packs):
+    return [pack for pack in packs if Group.MAXIMUM_ONE not in pack.groups and Group.EXACTLY_TWO not in pack.groups]
+
+
+def get_all_filler_items(include_traps: bool, exclude_ginger_island: bool):
+    all_filler_packs = [pack for pack in items_by_group[Group.RESOURCE_PACK]]
+    all_filler_packs.extend(items_by_group[Group.TRASH])
+    if include_traps:
+        all_filler_packs.extend(items_by_group[Group.TRAP])
+    all_filler_packs = remove_excluded_packs(all_filler_packs, exclude_ginger_island)
+    return all_filler_packs
diff --git a/worlds/stardew_valley/locations.py b/worlds/stardew_valley/locations.py
index 67bffa1396..345796b031 100644
--- a/worlds/stardew_valley/locations.py
+++ b/worlds/stardew_valley/locations.py
@@ -4,10 +4,12 @@ from dataclasses import dataclass
 from random import Random
 from typing import Optional, Dict, Protocol, List, FrozenSet
 
-from . import options, data
+from . import data
+from .options import StardewValleyOptions
 from .data.fish_data import legendary_fish, special_fish, all_fish
 from .data.museum_data import all_museum_items
 from .data.villagers_data import all_villagers
+from .options import ExcludeGingerIsland, Friendsanity, ArcadeMachineLocations, SpecialOrderLocations, Cropsanity, Fishsanity, Museumsanity, FestivalLocations, SkillProgression, BuildingProgression, ToolProgression, ElevatorProgression, BackpackProgression
 from .strings.goal_names import Goal
 from .strings.region_names import Region
 
@@ -133,12 +135,12 @@ def initialize_groups():
 initialize_groups()
 
 
-def extend_cropsanity_locations(randomized_locations: List[LocationData], world_options):
-    if world_options[options.Cropsanity] == options.Cropsanity.option_disabled:
+def extend_cropsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+    if options.cropsanity == Cropsanity.option_disabled:
         return
 
     cropsanity_locations = locations_by_tag[LocationTags.CROPSANITY]
-    cropsanity_locations = filter_ginger_island(world_options, cropsanity_locations)
+    cropsanity_locations = filter_ginger_island(options, cropsanity_locations)
     randomized_locations.extend(cropsanity_locations)
 
 
@@ -157,56 +159,56 @@ def extend_help_wanted_quests(randomized_locations: List[LocationData], desired_
             randomized_locations.append(location_table[f"Help Wanted: Gathering {batch + 1}"])
 
 
-def extend_fishsanity_locations(randomized_locations: List[LocationData], world_options, random: Random):
+def extend_fishsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, random: Random):
     prefix = "Fishsanity: "
-    if world_options[options.Fishsanity] == options.Fishsanity.option_none:
+    if options.fishsanity == Fishsanity.option_none:
         return
-    elif world_options[options.Fishsanity] == options.Fishsanity.option_legendaries:
+    elif options.fishsanity == Fishsanity.option_legendaries:
         randomized_locations.extend(location_table[f"{prefix}{legendary.name}"] for legendary in legendary_fish)
-    elif world_options[options.Fishsanity] == options.Fishsanity.option_special:
+    elif options.fishsanity == Fishsanity.option_special:
         randomized_locations.extend(location_table[f"{prefix}{special.name}"] for special in special_fish)
-    elif world_options[options.Fishsanity] == options.Fishsanity.option_randomized:
+    elif options.fishsanity == Fishsanity.option_randomized:
         fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if random.random() < 0.4]
-        randomized_locations.extend(filter_ginger_island(world_options, fish_locations))
-    elif world_options[options.Fishsanity] == options.Fishsanity.option_all:
+        randomized_locations.extend(filter_ginger_island(options, fish_locations))
+    elif options.fishsanity == Fishsanity.option_all:
         fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish]
-        randomized_locations.extend(filter_ginger_island(world_options, fish_locations))
-    elif world_options[options.Fishsanity] == options.Fishsanity.option_exclude_legendaries:
+        randomized_locations.extend(filter_ginger_island(options, fish_locations))
+    elif options.fishsanity == Fishsanity.option_exclude_legendaries:
         fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if fish not in legendary_fish]
-        randomized_locations.extend(filter_ginger_island(world_options, fish_locations))
-    elif world_options[options.Fishsanity] == options.Fishsanity.option_exclude_hard_fish:
+        randomized_locations.extend(filter_ginger_island(options, fish_locations))
+    elif options.fishsanity == Fishsanity.option_exclude_hard_fish:
         fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if fish.difficulty < 80]
-        randomized_locations.extend(filter_ginger_island(world_options, fish_locations))
-    elif world_options[options.Fishsanity] == options.Fishsanity.option_only_easy_fish:
+        randomized_locations.extend(filter_ginger_island(options, fish_locations))
+    elif options.fishsanity == Fishsanity.option_only_easy_fish:
         fish_locations = [location_table[f"{prefix}{fish.name}"] for fish in all_fish if fish.difficulty < 50]
-        randomized_locations.extend(filter_ginger_island(world_options, fish_locations))
+        randomized_locations.extend(filter_ginger_island(options, fish_locations))
 
 
-def extend_museumsanity_locations(randomized_locations: List[LocationData], museumsanity: int, random: Random):
+def extend_museumsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions, random: Random):
     prefix = "Museumsanity: "
-    if museumsanity == options.Museumsanity.option_none:
+    if options.museumsanity == Museumsanity.option_none:
         return
-    elif museumsanity == options.Museumsanity.option_milestones:
+    elif options.museumsanity == Museumsanity.option_milestones:
         randomized_locations.extend(locations_by_tag[LocationTags.MUSEUM_MILESTONES])
-    elif museumsanity == options.Museumsanity.option_randomized:
+    elif options.museumsanity == Museumsanity.option_randomized:
         randomized_locations.extend(location_table[f"{prefix}{museum_item.name}"]
                                     for museum_item in all_museum_items if random.random() < 0.4)
-    elif museumsanity == options.Museumsanity.option_all:
+    elif options.museumsanity == Museumsanity.option_all:
         randomized_locations.extend(location_table[f"{prefix}{museum_item.name}"] for museum_item in all_museum_items)
 
 
-def extend_friendsanity_locations(randomized_locations: List[LocationData], world_options: options.StardewOptions):
-    if world_options[options.Friendsanity] == options.Friendsanity.option_none:
+def extend_friendsanity_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+    if options.friendsanity == Friendsanity.option_none:
         return
 
-    exclude_leo = world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true
-    exclude_non_bachelors = world_options[options.Friendsanity] == options.Friendsanity.option_bachelors
-    exclude_locked_villagers = world_options[options.Friendsanity] == options.Friendsanity.option_starting_npcs or \
-                               world_options[options.Friendsanity] == options.Friendsanity.option_bachelors
-    include_post_marriage_hearts = world_options[options.Friendsanity] == options.Friendsanity.option_all_with_marriage
-    heart_size = world_options[options.FriendsanityHeartSize]
+    exclude_leo = options.exclude_ginger_island == ExcludeGingerIsland.option_true
+    exclude_non_bachelors = options.friendsanity == Friendsanity.option_bachelors
+    exclude_locked_villagers = options.friendsanity == Friendsanity.option_starting_npcs or \
+                               options.friendsanity == Friendsanity.option_bachelors
+    include_post_marriage_hearts = options.friendsanity == Friendsanity.option_all_with_marriage
+    heart_size = options.friendsanity_heart_size
     for villager in all_villagers:
-        if villager.mod_name not in world_options[options.Mods] and villager.mod_name is not None:
+        if villager.mod_name not in options.mods and villager.mod_name is not None:
             continue
         if not villager.available and exclude_locked_villagers:
             continue
@@ -228,38 +230,38 @@ def extend_friendsanity_locations(randomized_locations: List[LocationData], worl
                 randomized_locations.append(location_table[f"Friendsanity: Pet {heart} <3"])
 
 
-def extend_festival_locations(randomized_locations: List[LocationData], festival_option: int):
-    if festival_option == options.FestivalLocations.option_disabled:
+def extend_festival_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+    if options.festival_locations == FestivalLocations.option_disabled:
         return
 
     festival_locations = locations_by_tag[LocationTags.FESTIVAL]
     randomized_locations.extend(festival_locations)
-    extend_hard_festival_locations(randomized_locations, festival_option)
+    extend_hard_festival_locations(randomized_locations, options)
 
 
-def extend_hard_festival_locations(randomized_locations, festival_option: int):
-    if festival_option != options.FestivalLocations.option_hard:
+def extend_hard_festival_locations(randomized_locations, options: StardewValleyOptions):
+    if options.festival_locations != FestivalLocations.option_hard:
         return
 
     hard_festival_locations = locations_by_tag[LocationTags.FESTIVAL_HARD]
     randomized_locations.extend(hard_festival_locations)
 
 
-def extend_special_order_locations(randomized_locations: List[LocationData], world_options):
-    if world_options[options.SpecialOrderLocations] == options.SpecialOrderLocations.option_disabled:
+def extend_special_order_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+    if options.special_order_locations == SpecialOrderLocations.option_disabled:
         return
 
-    include_island = world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_false
-    board_locations = filter_disabled_locations(world_options, locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD])
+    include_island = options.exclude_ginger_island == ExcludeGingerIsland.option_false
+    board_locations = filter_disabled_locations(options, locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD])
     randomized_locations.extend(board_locations)
-    if world_options[options.SpecialOrderLocations] == options.SpecialOrderLocations.option_board_qi and include_island:
-        include_arcade = world_options[options.ArcadeMachineLocations] != options.ArcadeMachineLocations.option_disabled
+    if options.special_order_locations == SpecialOrderLocations.option_board_qi and include_island:
+        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], world_options):
-    if world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true:
+def extend_walnut_purchase_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+    if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
         return
     randomized_locations.append(location_table["Repair Ticket Machine"])
     randomized_locations.append(location_table["Repair Boat Hull"])
@@ -269,82 +271,82 @@ def extend_walnut_purchase_locations(randomized_locations: List[LocationData], w
     randomized_locations.extend(locations_by_tag[LocationTags.WALNUT_PURCHASE])
 
 
-def extend_mandatory_locations(randomized_locations: List[LocationData], world_options):
+def extend_mandatory_locations(randomized_locations: List[LocationData], options):
     mandatory_locations = [location for location in locations_by_tag[LocationTags.MANDATORY]]
-    filtered_mandatory_locations = filter_disabled_locations(world_options, mandatory_locations)
+    filtered_mandatory_locations = filter_disabled_locations(options, mandatory_locations)
     randomized_locations.extend(filtered_mandatory_locations)
 
 
-def extend_backpack_locations(randomized_locations: List[LocationData], world_options):
-    if world_options[options.BackpackProgression] == options.BackpackProgression.option_vanilla:
+def extend_backpack_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+    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(world_options, backpack_locations)
+    filtered_backpack_locations = filter_modded_locations(options, backpack_locations)
     randomized_locations.extend(filtered_backpack_locations)
 
 
-def extend_elevator_locations(randomized_locations: List[LocationData], world_options):
-    if world_options[options.ElevatorProgression] == options.ElevatorProgression.option_vanilla:
+def extend_elevator_locations(randomized_locations: List[LocationData], options: StardewValleyOptions):
+    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(world_options, elevator_locations)
+    filtered_elevator_locations = filter_modded_locations(options, elevator_locations)
     randomized_locations.extend(filtered_elevator_locations)
 
 
 def create_locations(location_collector: StardewLocationCollector,
-                     world_options: options.StardewOptions,
+                     options: StardewValleyOptions,
                      random: Random):
     randomized_locations = []
 
-    extend_mandatory_locations(randomized_locations, world_options)
-    extend_backpack_locations(randomized_locations, world_options)
+    extend_mandatory_locations(randomized_locations, options)
+    extend_backpack_locations(randomized_locations, options)
 
-    if not world_options[options.ToolProgression] == options.ToolProgression.option_vanilla:
+    if not options.tool_progression == ToolProgression.option_vanilla:
         randomized_locations.extend(locations_by_tag[LocationTags.TOOL_UPGRADE])
 
-    extend_elevator_locations(randomized_locations, world_options)
+    extend_elevator_locations(randomized_locations, options)
 
-    if not world_options[options.SkillProgression] == options.SkillProgression.option_vanilla:
+    if not options.skill_progression == SkillProgression.option_vanilla:
         for location in locations_by_tag[LocationTags.SKILL_LEVEL]:
-            if location.mod_name is None or location.mod_name in world_options[options.Mods]:
+            if location.mod_name is None or location.mod_name in options.mods:
                 randomized_locations.append(location_table[location.name])
 
-    if not world_options[options.BuildingProgression] == options.BuildingProgression.option_vanilla:
+    if not options.building_progression == BuildingProgression.option_vanilla:
         for location in locations_by_tag[LocationTags.BUILDING_BLUEPRINT]:
-            if location.mod_name is None or location.mod_name in world_options[options.Mods]:
+            if location.mod_name is None or location.mod_name in options.mods:
                 randomized_locations.append(location_table[location.name])
 
-    if world_options[options.ArcadeMachineLocations] != options.ArcadeMachineLocations.option_disabled:
+    if options.arcade_machine_locations != ArcadeMachineLocations.option_disabled:
         randomized_locations.extend(locations_by_tag[LocationTags.ARCADE_MACHINE_VICTORY])
 
-    if world_options[options.ArcadeMachineLocations] == options.ArcadeMachineLocations.option_full_shuffling:
+    if options.arcade_machine_locations == ArcadeMachineLocations.option_full_shuffling:
         randomized_locations.extend(locations_by_tag[LocationTags.ARCADE_MACHINE])
 
-    extend_cropsanity_locations(randomized_locations, world_options)
-    extend_help_wanted_quests(randomized_locations, world_options[options.HelpWantedLocations])
-    extend_fishsanity_locations(randomized_locations, world_options, random)
-    extend_museumsanity_locations(randomized_locations, world_options[options.Museumsanity], random)
-    extend_friendsanity_locations(randomized_locations, world_options)
+    extend_cropsanity_locations(randomized_locations, options)
+    extend_help_wanted_quests(randomized_locations, options.help_wanted_locations.value)
+    extend_fishsanity_locations(randomized_locations, options, random)
+    extend_museumsanity_locations(randomized_locations, options, random)
+    extend_friendsanity_locations(randomized_locations, options)
 
-    extend_festival_locations(randomized_locations, world_options[options.FestivalLocations])
-    extend_special_order_locations(randomized_locations, world_options)
-    extend_walnut_purchase_locations(randomized_locations, world_options)
+    extend_festival_locations(randomized_locations, options)
+    extend_special_order_locations(randomized_locations, options)
+    extend_walnut_purchase_locations(randomized_locations, options)
 
     for location_data in randomized_locations:
         location_collector(location_data.name, location_data.code, location_data.region)
 
 
-def filter_ginger_island(world_options: options.StardewOptions, locations: List[LocationData]) -> List[LocationData]:
-    include_island = world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_false
+def filter_ginger_island(options: StardewValleyOptions, locations: List[LocationData]) -> List[LocationData]:
+    include_island = options.exclude_ginger_island == ExcludeGingerIsland.option_false
     return [location for location in locations if include_island or LocationTags.GINGER_ISLAND not in location.tags]
 
 
-def filter_modded_locations(world_options: options.StardewOptions, locations: List[LocationData]) -> List[LocationData]:
-    current_mod_names = world_options[options.Mods]
+def filter_modded_locations(options: StardewValleyOptions, locations: List[LocationData]) -> List[LocationData]:
+    current_mod_names = options.mods
     return [location for location in locations if location.mod_name is None or location.mod_name in current_mod_names]
 
 
-def filter_disabled_locations(world_options: options.StardewOptions, locations: List[LocationData]) -> List[LocationData]:
-    locations_first_pass = filter_ginger_island(world_options, locations)
-    locations_second_pass = filter_modded_locations(world_options, locations_first_pass)
+def filter_disabled_locations(options: StardewValleyOptions, locations: List[LocationData]) -> List[LocationData]:
+    locations_first_pass = filter_ginger_island(options, locations)
+    locations_second_pass = filter_modded_locations(options, locations_first_pass)
     return locations_second_pass
diff --git a/worlds/stardew_valley/logic.py b/worlds/stardew_valley/logic.py
index 377fa0d03b..d4476a3f31 100644
--- a/worlds/stardew_valley/logic.py
+++ b/worlds/stardew_valley/logic.py
@@ -4,12 +4,11 @@ import math
 from dataclasses import dataclass, field
 from typing import Dict, Union, Optional, Iterable, Sized, List, Set
 
-from . import options
 from .data import all_fish, FishItem, all_purchasable_seeds, SeedItem, all_crops, CropItem
 from .data.bundle_data import BundleItem
 from .data.crops_data import crops_by_name
 from .data.fish_data import island_fish
-from .data.museum_data import all_museum_items, MuseumItem, all_museum_artifacts, dwarf_scrolls, all_museum_minerals
+from .data.museum_data import all_museum_items, MuseumItem, all_museum_artifacts, all_museum_minerals
 from .data.recipe_data import all_cooking_recipes, CookingRecipe, RecipeSource, FriendshipSource, QueenOfSauceSource, \
     StarterSource, ShopSource, SkillSource
 from .data.villagers_data import all_villagers_by_name, Villager
@@ -20,7 +19,8 @@ from .mods.logic.special_orders import get_modded_special_orders_rules
 from .mods.logic.skullcavernelevator import has_skull_cavern_elevator_to_floor
 from .mods.mod_data import ModNames
 from .mods.logic import magic, skills
-from .options import StardewOptions
+from .options import Museumsanity, SeasonRandomization, StardewValleyOptions, BuildingProgression, SkillProgression, ToolProgression, Friendsanity, Cropsanity, \
+    ExcludeGingerIsland, ElevatorProgression, ArcadeMachineLocations, FestivalLocations, SpecialOrderLocations
 from .regions import vanilla_regions
 from .stardew_rule import False_, Reach, Or, True_, Received, Count, And, Has, TotalReceived, StardewRule
 from .strings.animal_names import Animal, coop_animals, barn_animals
@@ -81,10 +81,11 @@ tool_upgrade_prices = {
 
 fishing_regions = [Region.beach, Region.town, Region.forest, Region.mountain, Region.island_south, Region.island_west]
 
+
 @dataclass(frozen=True, repr=False)
 class StardewLogic:
     player: int
-    options: StardewOptions
+    options: StardewValleyOptions
 
     item_rules: Dict[str, StardewRule] = field(default_factory=dict)
     sapling_rules: Dict[str, StardewRule] = field(default_factory=dict)
@@ -398,7 +399,7 @@ class StardewLogic:
             Building.cellar: self.can_spend_money_at(Region.carpenter, 100000) & self.has_house(2),
         })
 
-        self.building_rules.update(get_modded_building_rules(self, self.options[options.Mods]))
+        self.building_rules.update(get_modded_building_rules(self, self.options.mods))
 
         self.quest_rules.update({
             Quest.introductions: self.can_reach_region(Region.town),
@@ -455,7 +456,7 @@ class StardewLogic:
                                     self.can_meet(NPC.wizard) & self.can_meet(NPC.willy),
         })
 
-        self.quest_rules.update(get_modded_quest_rules(self, self.options[options.Mods]))
+        self.quest_rules.update(get_modded_quest_rules(self, self.options.mods))
 
         self.festival_rules.update({
             FestivalCheck.egg_hunt: self.has_season(Season.spring) & self.can_reach_region(Region.town) & self.can_win_egg_hunt(),
@@ -539,7 +540,7 @@ class StardewLogic:
                                                self.can_spend_money(80000),  # I need this extra rule because money rules aren't additive...
         })
 
-        self.special_order_rules.update(get_modded_special_orders_rules(self, self.options[options.Mods]))
+        self.special_order_rules.update(get_modded_special_orders_rules(self, self.options.mods))
 
     def has(self, items: Union[str, (Iterable[str], Sized)], count: Optional[int] = None) -> StardewRule:
         if isinstance(items, str):
@@ -596,7 +597,7 @@ class StardewLogic:
         return self.has_lived_months(min(8, amount // MONEY_PER_MONTH))
 
     def can_spend_money(self, amount: int) -> StardewRule:
-        if self.options[options.StartingMoney] == -1:
+        if self.options.starting_money == -1:
             return True_()
         return self.has_lived_months(min(8, amount // (MONEY_PER_MONTH // 5)))
 
@@ -607,7 +608,7 @@ class StardewLogic:
         if material == ToolMaterial.basic or tool == Tool.scythe:
             return True_()
 
-        if self.options[options.ToolProgression] == options.ToolProgression.option_progressive:
+        if self.options.tool_progression == ToolProgression.option_progressive:
             return self.received(f"Progressive {tool}", count=tool_materials[material])
 
         return self.has(f"{material} Bar") & self.can_spend_money(tool_upgrade_prices[material])
@@ -644,7 +645,7 @@ class StardewLogic:
         if level <= 0:
             return True_()
 
-        if self.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+        if self.options.skill_progression == SkillProgression.option_progressive:
             return self.received(f"{skill} Level", count=level)
 
         return self.can_earn_skill_level(skill, level)
@@ -656,7 +657,7 @@ class StardewLogic:
         if level <= 0:
             return True_()
 
-        if self.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+        if self.options.skill_progression == SkillProgression.option_progressive:
             skills_items = ["Farming Level", "Mining Level", "Foraging Level",
                             "Fishing Level", "Combat Level"]
             if allow_modded_skills:
@@ -672,7 +673,7 @@ class StardewLogic:
 
     def has_building(self, building: str) -> StardewRule:
         carpenter_rule = self.can_reach_region(Region.carpenter)
-        if not self.options[options.BuildingProgression] == options.BuildingProgression.option_vanilla:
+        if not self.options.building_progression == BuildingProgression.option_vanilla:
             count = 1
             if building in [Building.coop, Building.barn, Building.shed]:
                 building = f"Progressive {building}"
@@ -693,7 +694,7 @@ class StardewLogic:
         if upgrade_level > 3:
             return False_()
 
-        if not self.options[options.BuildingProgression] == options.BuildingProgression.option_vanilla:
+        if not self.options.building_progression == BuildingProgression.option_vanilla:
             return self.received(f"Progressive House", upgrade_level) & self.can_reach_region(Region.carpenter)
 
         if upgrade_level == 1:
@@ -734,7 +735,7 @@ class StardewLogic:
         return tool_rule & enemy_rule
 
     def can_get_fishing_xp(self) -> StardewRule:
-        if self.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+        if self.options.skill_progression == SkillProgression.option_progressive:
             return self.can_fish() | self.can_crab_pot()
 
         return self.can_fish()
@@ -746,7 +747,7 @@ class StardewLogic:
         skill_rule = self.has_skill_level(Skill.fishing, skill_required)
         region_rule = self.can_reach_any_region(fishing_regions)
         number_fishing_rod_required = 1 if difficulty < 50 else 2
-        if self.options[options.ToolProgression] == options.ToolProgression.option_progressive:
+        if self.options.tool_progression == ToolProgression.option_progressive:
             return self.received("Progressive Fishing Rod", number_fishing_rod_required) & skill_rule & region_rule
 
         return skill_rule & region_rule
@@ -763,7 +764,7 @@ class StardewLogic:
         return self.has_max_fishing_rod() & skill_rule
 
     def can_buy_seed(self, seed: SeedItem) -> StardewRule:
-        if self.options[options.Cropsanity] == options.Cropsanity.option_disabled:
+        if self.options.cropsanity == Cropsanity.option_disabled:
             item_rule = True_()
         else:
             item_rule = self.received(seed.name)
@@ -781,7 +782,7 @@ class StardewLogic:
                           Fruit.peach: 6000,
                           Fruit.pomegranate: 6000, Fruit.banana: 0, Fruit.mango: 0}
         received_sapling = self.received(f"{fruit} Sapling")
-        if self.options[options.Cropsanity] == options.Cropsanity.option_disabled:
+        if self.options.cropsanity == Cropsanity.option_disabled:
             allowed_buy_sapling = True_()
         else:
             allowed_buy_sapling = received_sapling
@@ -824,14 +825,14 @@ class StardewLogic:
     def can_catch_every_fish(self) -> StardewRule:
         rules = [self.has_skill_level(Skill.fishing, 10), self.has_max_fishing_rod()]
         for fish in all_fish:
-            if self.options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true and \
+            if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true and \
                     fish in island_fish:
                 continue
             rules.append(self.can_catch_fish(fish))
         return And(rules)
 
     def has_max_fishing_rod(self) -> StardewRule:
-        if self.options[options.ToolProgression] == options.ToolProgression.option_progressive:
+        if self.options.tool_progression == ToolProgression.option_progressive:
             return self.received(APTool.fishing_rod, 4)
         return self.can_get_fishing_xp()
 
@@ -875,7 +876,7 @@ class StardewLogic:
 
     def can_crab_pot(self, region: str = Generic.any) -> StardewRule:
         crab_pot_rule = self.has(Craftable.bait)
-        if self.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+        if self.options.skill_progression == SkillProgression.option_progressive:
             crab_pot_rule = crab_pot_rule & self.has(Machine.crab_pot)
         else:
             crab_pot_rule = crab_pot_rule & self.can_get_fishing_xp()
@@ -926,9 +927,7 @@ class StardewLogic:
         return region_rule & ((tool_rule & foraging_rule) | magic_rule)
 
     def has_max_buffs(self) -> StardewRule:
-        number_of_movement_buffs: int = self.options[options.NumberOfMovementBuffs]
-        number_of_luck_buffs: int = self.options[options.NumberOfLuckBuffs]
-        return self.received(Buff.movement, number_of_movement_buffs) & self.received(Buff.luck, number_of_luck_buffs)
+        return self.received(Buff.movement, self.options.movement_buff_number.value) & self.received(Buff.luck, self.options.luck_buff_number.value)
 
     def get_weapon_rule_for_floor_tier(self, tier: int):
         if tier >= 4:
@@ -946,9 +945,9 @@ class StardewLogic:
         rules = []
         weapon_rule = self.get_weapon_rule_for_floor_tier(tier)
         rules.append(weapon_rule)
-        if self.options[options.ToolProgression] == options.ToolProgression.option_progressive:
+        if self.options.tool_progression == ToolProgression.option_progressive:
             rules.append(self.has_tool(Tool.pickaxe, ToolMaterial.tiers[tier]))
-        if self.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+        if self.options.skill_progression == SkillProgression.option_progressive:
             combat_tier = min(10, max(0, tier * 2))
             rules.append(self.has_skill_level(Skill.combat, combat_tier))
         return And(rules)
@@ -958,15 +957,15 @@ class StardewLogic:
         rules = []
         weapon_rule = self.get_weapon_rule_for_floor_tier(tier)
         rules.append(weapon_rule)
-        if self.options[options.ToolProgression] == options.ToolProgression.option_progressive:
+        if self.options.tool_progression == ToolProgression.option_progressive:
             rules.append(self.has_tool(Tool.pickaxe, ToolMaterial.tiers[tier]))
-        if self.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+        if self.options.skill_progression == SkillProgression.option_progressive:
             combat_tier = min(10, max(0, tier * 2))
             rules.append(self.has_skill_level(Skill.combat, combat_tier))
         return And(rules)
 
     def has_mine_elevator_to_floor(self, floor: int) -> StardewRule:
-        if self.options[options.ElevatorProgression] != options.ElevatorProgression.option_vanilla:
+        if self.options.elevator_progression != ElevatorProgression.option_vanilla:
             return self.received("Progressive Mine Elevator", count=int(floor / 5))
         return True_()
 
@@ -984,9 +983,9 @@ class StardewLogic:
         weapon_rule = self.has_great_weapon()
         rules.append(weapon_rule)
         rules.append(self.can_cook())
-        if self.options[options.ToolProgression] == options.ToolProgression.option_progressive:
+        if self.options.tool_progression == ToolProgression.option_progressive:
             rules.append(self.received("Progressive Pickaxe", min(4, max(0, tier + 2))))
-        if self.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+        if self.options.skill_progression == SkillProgression.option_progressive:
             skill_tier = min(10, max(0, tier * 2 + 6))
             rules.extend({self.has_skill_level(Skill.combat, skill_tier),
                           self.has_skill_level(Skill.mining, skill_tier)})
@@ -1005,20 +1004,20 @@ class StardewLogic:
                  self.can_progress_easily_in_the_skull_cavern_from_floor(previous_previous_elevator))) & has_mine_elevator
 
     def has_jotpk_power_level(self, power_level: int) -> StardewRule:
-        if self.options[options.ArcadeMachineLocations] != options.ArcadeMachineLocations.option_full_shuffling:
+        if self.options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling:
             return True_()
         jotpk_buffs = ["JotPK: Progressive Boots", "JotPK: Progressive Gun",
                        "JotPK: Progressive Ammo", "JotPK: Extra Life", "JotPK: Increased Drop Rate"]
         return self.received(jotpk_buffs, power_level)
 
     def has_junimo_kart_power_level(self, power_level: int) -> StardewRule:
-        if self.options[options.ArcadeMachineLocations] != options.ArcadeMachineLocations.option_full_shuffling:
+        if self.options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling:
             return True_()
         return self.received("Junimo Kart: Extra Life", power_level)
 
     def has_junimo_kart_max_level(self) -> StardewRule:
         play_rule = self.can_reach_region(Region.junimo_kart_3)
-        if self.options[options.ArcadeMachineLocations] != options.ArcadeMachineLocations.option_full_shuffling:
+        if self.options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling:
             return play_rule
         return self.has_junimo_kart_power_level(8)
 
@@ -1043,12 +1042,12 @@ class StardewLogic:
     def has_relationship(self, npc: str, hearts: int = 1) -> StardewRule:
         if hearts <= 0:
             return True_()
-        friendsanity = self.options[options.Friendsanity]
-        if friendsanity == options.Friendsanity.option_none:
+        friendsanity = self.options.friendsanity
+        if friendsanity == Friendsanity.option_none:
             return self.can_earn_relationship(npc, hearts)
         if npc not in all_villagers_by_name:
             if npc == NPC.pet:
-                if friendsanity == options.Friendsanity.option_bachelors:
+                if friendsanity == Friendsanity.option_bachelors:
                     return self.can_befriend_pet(hearts)
                 return self.received_hearts(NPC.pet, hearts)
             if npc == Generic.any or npc == Generic.bachelor:
@@ -1078,11 +1077,11 @@ class StardewLogic:
         if not self.npc_is_in_current_slot(npc):
             return True_()
         villager = all_villagers_by_name[npc]
-        if friendsanity == options.Friendsanity.option_bachelors and not villager.bachelor:
+        if friendsanity == Friendsanity.option_bachelors and not villager.bachelor:
             return self.can_earn_relationship(npc, hearts)
-        if friendsanity == options.Friendsanity.option_starting_npcs and not villager.available:
+        if friendsanity == Friendsanity.option_starting_npcs and not villager.available:
             return self.can_earn_relationship(npc, hearts)
-        is_capped_at_8 = villager.bachelor and friendsanity != options.Friendsanity.option_all_with_marriage
+        is_capped_at_8 = villager.bachelor and friendsanity != Friendsanity.option_all_with_marriage
         if is_capped_at_8 and hearts > 8:
             return self.received_hearts(villager, 8) & self.can_earn_relationship(npc, hearts)
         return self.received_hearts(villager, hearts)
@@ -1090,7 +1089,7 @@ class StardewLogic:
     def received_hearts(self, npc: Union[str, Villager], hearts: int) -> StardewRule:
         if isinstance(npc, Villager):
             return self.received_hearts(npc.name, hearts)
-        heart_size: int = self.options[options.FriendsanityHeartSize]
+        heart_size = self.options.friendsanity_heart_size.value
         return self.received(self.heart(npc), math.ceil(hearts / heart_size))
 
     def can_meet(self, npc: str) -> StardewRule:
@@ -1122,13 +1121,13 @@ class StardewLogic:
         if hearts <= 0:
             return True_()
 
-        heart_size: int = self.options[options.FriendsanityHeartSize]
+        heart_size = self.options.friendsanity_heart_size.value
         previous_heart = hearts - heart_size
         previous_heart_rule = self.has_relationship(npc, previous_heart)
 
         if npc == NPC.pet:
             earn_rule = self.can_befriend_pet(hearts)
-        elif npc == NPC.wizard and ModNames.magic in self.options[options.Mods]:
+        elif npc == NPC.wizard and ModNames.magic in self.options.mods:
             earn_rule = self.can_meet(npc) & self.has_lived_months(hearts)
         elif npc in all_villagers_by_name:
             if not self.npc_is_in_current_slot(npc):
@@ -1284,8 +1283,6 @@ class StardewLogic:
         return self.has_lived_months(8)
 
     def can_speak_dwarf(self) -> StardewRule:
-        if self.options[options.Museumsanity] == options.Museumsanity.option_none:
-            return And([self.can_donate_museum_item(item) for item in dwarf_scrolls])
         return self.received("Dwarvish Translation Guide")
 
     def can_donate_museum_item(self, item: MuseumItem) -> StardewRule:
@@ -1334,7 +1331,7 @@ class StardewLogic:
     def can_complete_museum(self) -> StardewRule:
         rules = [self.can_reach_region(Region.museum), self.can_mine_perfectly()]
 
-        if self.options[options.Museumsanity] != options.Museumsanity.option_none:
+        if self.options.museumsanity != Museumsanity.option_none:
             rules.append(self.received("Traveling Merchant Metal Detector", 4))
 
         for donation in all_museum_items:
@@ -1345,9 +1342,9 @@ class StardewLogic:
         if season == Generic.any:
             return True_()
         seasons_order = [Season.spring, Season.summer, Season.fall, Season.winter]
-        if self.options[options.SeasonRandomization] == options.SeasonRandomization.option_progressive:
+        if self.options.season_randomization == SeasonRandomization.option_progressive:
             return self.received(Season.progressive, seasons_order.index(season))
-        if self.options[options.SeasonRandomization] == options.SeasonRandomization.option_disabled:
+        if self.options.season_randomization == SeasonRandomization.option_disabled:
             if season == Season.spring:
                 return True_()
             return self.has_lived_months(1)
@@ -1371,19 +1368,16 @@ class StardewLogic:
         return self.received("Month End", number)
 
     def has_rusty_key(self) -> StardewRule:
-        if self.options[options.Museumsanity] == options.Museumsanity.option_none:
-            required_donations = 80  # It's 60, but without a metal detector I'd rather overshoot so players don't get screwed by RNG
-            return self.has([item.name for item in all_museum_items], required_donations) & self.can_reach_region(Region.museum)
         return self.received(Wallet.rusty_key)
 
     def can_win_egg_hunt(self) -> StardewRule:
-        number_of_movement_buffs: int = self.options[options.NumberOfMovementBuffs]
-        if self.options[options.FestivalLocations] == options.FestivalLocations.option_hard or number_of_movement_buffs < 2:
+        number_of_movement_buffs = self.options.movement_buff_number.value
+        if self.options.festival_locations == FestivalLocations.option_hard or number_of_movement_buffs < 2:
             return True_()
         return self.received(Buff.movement, number_of_movement_buffs // 2)
 
     def can_succeed_luau_soup(self) -> StardewRule:
-        if self.options[options.FestivalLocations] != options.FestivalLocations.option_hard:
+        if self.options.festival_locations != FestivalLocations.option_hard:
             return True_()
         eligible_fish = [Fish.blobfish, Fish.crimsonfish, "Ice Pip", Fish.lava_eel, Fish.legend, Fish.angler, Fish.catfish, Fish.glacierfish,
                          Fish.mutant_carp, Fish.spookfish, Fish.stingray, Fish.sturgeon, "Super Cucumber"]
@@ -1398,7 +1392,7 @@ class StardewLogic:
         return Or(fish_rule) | Or(aged_rule)
 
     def can_succeed_grange_display(self) -> StardewRule:
-        if self.options[options.FestivalLocations] != options.FestivalLocations.option_hard:
+        if self.options.festival_locations != FestivalLocations.option_hard:
             return True_()
         animal_rule = self.has_animal(Generic.any)
         artisan_rule = self.can_keg(Generic.any) | self.can_preserves_jar(Generic.any)
@@ -1527,12 +1521,12 @@ class StardewLogic:
         return blacksmith_access & self.has(geode)
 
     def has_island_trader(self) -> StardewRule:
-        if self.options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true:
+        if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true:
             return False_()
         return self.can_reach_region(Region.island_trader)
 
     def has_walnut(self, number: int) -> StardewRule:
-        if self.options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true:
+        if self.options.exclude_ginger_island == ExcludeGingerIsland.option_true:
             return False_()
         if number <= 0:
             return True_()
@@ -1542,6 +1536,7 @@ class StardewLogic:
         reach_west = self.can_reach_region(Region.island_west)
         reach_hut = self.can_reach_region(Region.leo_hut)
         reach_southeast = self.can_reach_region(Region.island_south_east)
+        reach_field_office = self.can_reach_region(Region.field_office)
         reach_pirate_cove = self.can_reach_region(Region.pirate_cove)
         reach_outside_areas = And(reach_south, reach_north, reach_west, reach_hut)
         reach_volcano_regions = [self.can_reach_region(Region.volcano),
@@ -1550,12 +1545,12 @@ class StardewLogic:
                                  self.can_reach_region(Region.volcano_floor_10)]
         reach_volcano = Or(reach_volcano_regions)
         reach_all_volcano = And(reach_volcano_regions)
-        reach_walnut_regions = [reach_south, reach_north, reach_west, reach_volcano]
+        reach_walnut_regions = [reach_south, reach_north, reach_west, reach_volcano, reach_field_office]
         reach_caves = And(self.can_reach_region(Region.qi_walnut_room), self.can_reach_region(Region.dig_site),
                           self.can_reach_region(Region.gourmand_frog_cave),
                           self.can_reach_region(Region.colored_crystals_cave),
                           self.can_reach_region(Region.shipwreck), self.has(Weapon.any_slingshot))
-        reach_entire_island = And(reach_outside_areas, reach_all_volcano,
+        reach_entire_island = And(reach_outside_areas, reach_field_office, reach_all_volcano,
                                   reach_caves, reach_southeast, reach_pirate_cove)
         if number <= 5:
             return Or(reach_south, reach_north, reach_west, reach_volcano)
@@ -1569,7 +1564,8 @@ class StardewLogic:
             return reach_entire_island
         gems = [Mineral.amethyst, Mineral.aquamarine, Mineral.emerald, Mineral.ruby, Mineral.topaz]
         return reach_entire_island & self.has(Fruit.banana) & self.has(gems) & self.can_mine_perfectly() & \
-               self.can_fish_perfectly() & self.has(Craftable.flute_block) & self.has(Seed.melon) & self.has(Seed.wheat) & self.has(Seed.garlic)
+               self.can_fish_perfectly() & self.has(Craftable.flute_block) & self.has(Seed.melon) & self.has(Seed.wheat) & self.has(Seed.garlic) & \
+               self.can_complete_field_office()
 
     def has_everything(self, all_progression_items: Set[str]) -> StardewRule:
         all_regions = [region.name for region in vanilla_regions]
@@ -1592,7 +1588,7 @@ class StardewLogic:
     def npc_is_in_current_slot(self, name: str) -> bool:
         npc = all_villagers_by_name[name]
         mod = npc.mod_name
-        return mod is None or mod in self.options[options.Mods]
+        return mod is None or mod in self.options.mods
 
     def can_do_combat_at_level(self, level: str) -> StardewRule:
         if level == Performance.basic:
@@ -1612,7 +1608,7 @@ class StardewLogic:
         return tool_rule | spell_rule
 
     def has_prismatic_jelly_reward_access(self) -> StardewRule:
-        if self.options[options.SpecialOrderLocations] == options.SpecialOrderLocations.option_disabled:
+        if self.options.special_order_locations == SpecialOrderLocations.option_disabled:
             return self.can_complete_special_order("Prismatic Jelly")
         return self.received("Monster Musk Recipe")
 
diff --git a/worlds/stardew_valley/mods/logic/deepwoods.py b/worlds/stardew_valley/mods/logic/deepwoods.py
index f6ecd6d828..2aa90e5b76 100644
--- a/worlds/stardew_valley/mods/logic/deepwoods.py
+++ b/worlds/stardew_valley/mods/logic/deepwoods.py
@@ -17,14 +17,14 @@ def can_reach_woods_depth(vanilla_logic, depth: int) -> StardewRule:
     if depth > 50:
         rules.append(vanilla_logic.can_do_combat_at_level(Performance.great) & vanilla_logic.can_cook() &
                      vanilla_logic.received(ModTransportation.woods_obelisk))
-    if vanilla_logic.options[options.SkillProgression] == options.SkillProgression.option_progressive:
+    if vanilla_logic.options.skill_progression == options.SkillProgression.option_progressive:
         combat_tier = min(10, max(0, tier + 5))
         rules.append(vanilla_logic.has_skill_level(Skill.combat, combat_tier))
     return And(rules)
 
 
 def has_woods_rune_to_depth(vanilla_logic, floor: int) -> StardewRule:
-    if vanilla_logic.options[options.ElevatorProgression] == options.ElevatorProgression.option_vanilla:
+    if vanilla_logic.options.elevator_progression == options.ElevatorProgression.option_vanilla:
         return True_()
     return vanilla_logic.received("Progressive Woods Obelisk Sigils", count=int(floor / 10))
 
diff --git a/worlds/stardew_valley/mods/logic/magic.py b/worlds/stardew_valley/mods/logic/magic.py
index a084c6aa91..709376399c 100644
--- a/worlds/stardew_valley/mods/logic/magic.py
+++ b/worlds/stardew_valley/mods/logic/magic.py
@@ -7,19 +7,19 @@ from ... import options
 
 
 def can_use_clear_debris_instead_of_tool_level(vanilla_logic, level: int) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     return vanilla_logic.received(MagicSpell.clear_debris) & can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, level)
 
 
 def can_use_altar(vanilla_logic) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     return vanilla_logic.can_reach_region(MagicRegion.altar)
 
 
 def has_any_spell(vanilla_logic) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     return can_use_altar(vanilla_logic)
 
@@ -40,7 +40,7 @@ def has_support_spell_count(vanilla_logic, count: int) -> StardewRule:
 
 
 def has_decent_spells(vanilla_logic) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 2)
     magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 1)
@@ -48,7 +48,7 @@ def has_decent_spells(vanilla_logic) -> StardewRule:
 
 
 def has_good_spells(vanilla_logic) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 4)
     magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 2)
@@ -57,7 +57,7 @@ def has_good_spells(vanilla_logic) -> StardewRule:
 
 
 def has_great_spells(vanilla_logic) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 6)
     magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 3)
@@ -66,7 +66,7 @@ def has_great_spells(vanilla_logic) -> StardewRule:
 
 
 def has_amazing_spells(vanilla_logic) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     magic_resource_rule = can_use_altar(vanilla_logic) & vanilla_logic.received(ModSkillLevel.magic_level, 8)
     magic_attack_options_rule = has_attack_spell_count(vanilla_logic, 4)
@@ -75,6 +75,6 @@ def has_amazing_spells(vanilla_logic) -> StardewRule:
 
 
 def can_blink(vanilla_logic) -> StardewRule:
-    if ModNames.magic not in vanilla_logic.options[options.Mods]:
+    if ModNames.magic not in vanilla_logic.options.mods:
         return False_()
     return vanilla_logic.received(MagicSpell.blink) & can_use_altar(vanilla_logic)
diff --git a/worlds/stardew_valley/mods/logic/skills.py b/worlds/stardew_valley/mods/logic/skills.py
index 05b4c623e1..24402a088b 100644
--- a/worlds/stardew_valley/mods/logic/skills.py
+++ b/worlds/stardew_valley/mods/logic/skills.py
@@ -29,17 +29,17 @@ def append_mod_skill_level(skills_items: List[str], active_mods):
 
 
 def can_earn_mod_skill_level(logic, skill: str, level: int) -> StardewRule:
-    if ModNames.luck_skill in logic.options[options.Mods] and skill == ModSkill.luck:
+    if ModNames.luck_skill in logic.options.mods and skill == ModSkill.luck:
         return can_earn_luck_skill_level(logic, level)
-    if ModNames.magic in logic.options[options.Mods] and skill == ModSkill.magic:
+    if ModNames.magic in logic.options.mods and skill == ModSkill.magic:
         return can_earn_magic_skill_level(logic, level)
-    if ModNames.socializing_skill in logic.options[options.Mods] and skill == ModSkill.socializing:
+    if ModNames.socializing_skill in logic.options.mods and skill == ModSkill.socializing:
         return can_earn_socializing_skill_level(logic, level)
-    if ModNames.archaeology in logic.options[options.Mods] and skill == ModSkill.archaeology:
+    if ModNames.archaeology in logic.options.mods and skill == ModSkill.archaeology:
         return can_earn_archaeology_skill_level(logic, level)
-    if ModNames.cooking_skill in logic.options[options.Mods] and skill == ModSkill.cooking:
+    if ModNames.cooking_skill in logic.options.mods and skill == ModSkill.cooking:
         return can_earn_cooking_skill_level(logic, level)
-    if ModNames.binning_skill in logic.options[options.Mods] and skill == ModSkill.binning:
+    if ModNames.binning_skill in logic.options.mods and skill == ModSkill.binning:
         return can_earn_binning_skill_level(logic, level)
     return False_()
 
@@ -65,7 +65,7 @@ def can_earn_magic_skill_level(vanilla_logic, level: int) -> StardewRule:
 def can_earn_socializing_skill_level(vanilla_logic, level: int) -> StardewRule:
     villager_count = []
     for villager in all_villagers:
-        if villager.mod_name in vanilla_logic.options[options.Mods] or villager.mod_name is None:
+        if villager.mod_name in vanilla_logic.options.mods or villager.mod_name is None:
             villager_count.append(vanilla_logic.can_earn_relationship(villager.name, level))
     return Count(level * 2, villager_count)
 
diff --git a/worlds/stardew_valley/mods/logic/skullcavernelevator.py b/worlds/stardew_valley/mods/logic/skullcavernelevator.py
index 74db86d89a..9a5140ae39 100644
--- a/worlds/stardew_valley/mods/logic/skullcavernelevator.py
+++ b/worlds/stardew_valley/mods/logic/skullcavernelevator.py
@@ -4,7 +4,7 @@ from ... import options
 
 
 def has_skull_cavern_elevator_to_floor(self, floor: int) -> StardewRule:
-    if self.options[options.ElevatorProgression] != options.ElevatorProgression.option_vanilla and \
-            ModNames.skull_cavern_elevator in self.options[options.Mods]:
+    if self.options.elevator_progression != options.ElevatorProgression.option_vanilla and \
+            ModNames.skull_cavern_elevator in self.options.mods:
         return self.received("Progressive Skull Cavern Elevator", floor // 25)
     return True_()
diff --git a/worlds/stardew_valley/mods/mod_data.py b/worlds/stardew_valley/mods/mod_data.py
index 81c4989411..30fe96c9d9 100644
--- a/worlds/stardew_valley/mods/mod_data.py
+++ b/worlds/stardew_valley/mods/mod_data.py
@@ -21,3 +21,11 @@ class ModNames:
     ayeisha = "Ayeisha - The Postal Worker (Custom NPC)"
     riley = "Custom NPC - Riley"
     skull_cavern_elevator = "Skull Cavern Elevator"
+
+
+all_mods = frozenset({ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
+                      ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology,
+                      ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna,
+                      ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene,
+                      ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores,
+                      ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator})
diff --git a/worlds/stardew_valley/options.py b/worlds/stardew_valley/options.py
index 78de9e8dbb..267ebd7a63 100644
--- a/worlds/stardew_valley/options.py
+++ b/worlds/stardew_valley/options.py
@@ -1,41 +1,21 @@
 from dataclasses import dataclass
-from typing import Dict, Union, Protocol, runtime_checkable, ClassVar
+from typing import Dict
 
-from Options import Option, Range, DeathLink, SpecialRange, Toggle, Choice, OptionSet
+from Options import Range, NamedRange, Toggle, Choice, OptionSet, PerGameCommonOptions, DeathLink, Option
 from .mods.mod_data import ModNames
 
-@runtime_checkable
-class StardewOption(Protocol):
-    internal_name: ClassVar[str]
-
-
-@dataclass
-class StardewOptions:
-    options: Dict[str, Union[bool, int, str]]
-
-    def __getitem__(self, item: Union[str, StardewOption]) -> Union[bool, int, str]:
-        if isinstance(item, StardewOption):
-            item = item.internal_name
-
-        return self.options.get(item, None)
-
-    def __setitem__(self, key: Union[str, StardewOption], value: Union[bool, int, str]):
-        if isinstance(key, StardewOption):
-            key = key.internal_name
-        self.options[key] = value
-
 
 class Goal(Choice):
     """What's your goal with this play-through?
-    Community Center: The world will be completed once you complete the Community Center.
-    Grandpa's Evaluation: The world will be completed once 4 candles are lit at Grandpa's Shrine.
-    Bottom of the Mines: The world will be completed once you reach level 120 in the mineshaft.
-    Cryptic Note: The world will be completed once you complete the quest "Cryptic Note" where Mr Qi asks you to reach floor 100 in the Skull Cavern.
-    Master Angler: The world will be completed once you have caught every fish in the game. Pairs well with Fishsanity.
-    Complete Collection: The world will be completed once you have completed the museum by donating every possible item. Pairs well with Museumsanity.
-    Full House: The world will be completed once you get married and have two kids. Pairs well with Friendsanity.
-    Greatest Walnut Hunter: The world will be completed once you find all 130 Golden Walnuts
-    Perfection: The world will be completed once you attain Perfection, based on the vanilla definition.
+    Community Center: Complete the Community Center.
+    Grandpa's Evaluation: Succeed grandpa's evaluation with 4 lit candles.
+    Bottom of the Mines: Reach level 120 in the mineshaft.
+    Cryptic Note: Complete the quest "Cryptic Note" where Mr Qi asks you to reach floor 100 in the Skull Cavern.
+    Master Angler: Catch every fish in the game. Pairs well with Fishsanity.
+    Complete Collection: Complete the museum by donating every possible item. Pairs well with Museumsanity.
+    Full House: Get married and have two children. Pairs well with Friendsanity.
+    Greatest Walnut Hunter: Find all 130 Golden Walnuts
+    Perfection: Attain Perfection, based on the vanilla definition.
     """
     internal_name = "goal"
     display_name = "Goal"
@@ -68,12 +48,12 @@ class Goal(Choice):
         return super().get_option_name(value)
 
 
-class StartingMoney(SpecialRange):
+class StartingMoney(NamedRange):
     """Amount of gold when arriving at the farm.
-    Set to -1 or unlimited for infinite money in this playthrough"""
+    Set to -1 or unlimited for infinite money"""
     internal_name = "starting_money"
     display_name = "Starting Gold"
-    range_start = -1
+    range_start = 0
     range_end = 50000
     default = 5000
 
@@ -87,7 +67,7 @@ class StartingMoney(SpecialRange):
     }
 
 
-class ProfitMargin(SpecialRange):
+class ProfitMargin(NamedRange):
     """Multiplier over all gold earned in-game by the player."""
     internal_name = "profit_margin"
     display_name = "Profit Margin"
@@ -137,10 +117,10 @@ class BundlePrice(Choice):
 class EntranceRandomization(Choice):
     """Should area entrances be randomized?
     Disabled: No entrance randomization is done
-    Pelican Town: Only buildings in the main town area are randomized among each other
-    Non Progression: Only buildings that are always available are randomized with each other
-    Buildings: All Entrances that Allow you to enter a building using a door are randomized with each other
-    Chaos: Same as above, but the entrances get reshuffled every single day!
+    Pelican Town: Only doors in the main town area are randomized with each other
+    Non Progression: Only entrances that are always available are randomized with each other
+    Buildings: All Entrances that Allow you to enter a building are randomized with each other
+    Chaos: Same as "Buildings", but the entrances get reshuffled every single day!
     """
     # Everything: All buildings and areas are randomized with each other
     # Chaos, same as everything: but the buildings are shuffled again every in-game day. You can't learn it!
@@ -164,11 +144,10 @@ class EntranceRandomization(Choice):
 
 class SeasonRandomization(Choice):
     """Should seasons be randomized?
-    All settings allow you to choose which season you want to play next (from those unlocked) at the end of a season.
-    Disabled: You will start in Spring with all seasons unlocked.
-    Randomized: The seasons will be unlocked randomly as Archipelago items.
-    Randomized Not Winter: The seasons are randomized, but you're guaranteed not to start with winter.
-    Progressive: You will start in Spring and unlock the seasons in their original order.
+    Disabled: Start in Spring with all seasons unlocked.
+    Randomized: Start in a random season and the other 3 must be unlocked randomly.
+    Randomized Not Winter: Same as randomized, but the start season is guaranteed not to be winter.
+    Progressive: Start in Spring and unlock the seasons in their original order.
     """
     internal_name = "season_randomization"
     display_name = "Season Randomization"
@@ -183,20 +162,21 @@ class Cropsanity(Choice):
     """Formerly named "Seed Shuffle"
     Pierre now sells a random amount of seasonal seeds and Joja sells them without season requirements, but only in huge packs.
     Disabled: All the seeds are unlocked from the start, there are no location checks for growing and harvesting crops
-    Shuffled: Seeds are unlocked as archipelago item, for each seed there is a location check for growing and harvesting that crop
+    Shuffled: Seeds are unlocked as archipelago items, for each seed there is a location check for growing and harvesting that crop
     """
     internal_name = "cropsanity"
     display_name = "Cropsanity"
     default = 1
     option_disabled = 0
-    option_shuffled = 1
+    option_enabled = 1
+    alias_shuffled = option_enabled
 
 
 class BackpackProgression(Choice):
-    """How is the backpack progression handled?
-    Vanilla: You can buy them at Pierre's General Store.
+    """Shuffle the backpack?
+    Vanilla: You can buy backpacks at Pierre's General Store.
     Progressive: You will randomly find Progressive Backpack upgrades.
-    Early Progressive: You can expect your first Backpack in sphere 1.
+    Early Progressive: Same as progressive, but one backpack will be placed early in the multiworld.
     """
     internal_name = "backpack_progression"
     display_name = "Backpack Progression"
@@ -207,8 +187,8 @@ class BackpackProgression(Choice):
 
 
 class ToolProgression(Choice):
-    """How is the tool progression handled?
-    Vanilla: Clint will upgrade your tools with ore.
+    """Shuffle the tool upgrades?
+    Vanilla: Clint will upgrade your tools with metal bars.
     Progressive: You will randomly find Progressive Tool upgrades."""
     internal_name = "tool_progression"
     display_name = "Tool Progression"
@@ -218,12 +198,11 @@ class ToolProgression(Choice):
 
 
 class ElevatorProgression(Choice):
-    """How is Elevator progression handled?
-    Vanilla: You will unlock new elevator floors for yourself.
-    Progressive: You will randomly find Progressive Mine Elevators to go deeper. Locations are sent for reaching
-        every elevator level.
-    Progressive from previous floor: Same as progressive, but you must reach elevator floors on your own,
-        you cannot use the elevator to check elevator locations"""
+    """Shuffle the elevator?
+    Vanilla: Reaching a mineshaft floor unlocks the elevator for it
+    Progressive: You will randomly find Progressive Mine Elevators to go deeper.
+    Progressive from previous floor: Same as progressive, but you cannot use the elevator to check elevator locations.
+        You must reach elevator floors on your own."""
     internal_name = "elevator_progression"
     display_name = "Elevator Progression"
     default = 2
@@ -233,10 +212,9 @@ class ElevatorProgression(Choice):
 
 
 class SkillProgression(Choice):
-    """How is the skill progression handled?
-    Vanilla: You will level up and get the normal reward at each level.
-    Progressive: The xp will be earned internally, locations will be sent when you earn a level. Your real
-        levels will be scattered around the multiworld."""
+    """Shuffle skill levels?
+    Vanilla: Leveling up skills is normal
+    Progressive: Skill levels are unlocked randomly, and earning xp sends checks"""
     internal_name = "skill_progression"
     display_name = "Skill Progression"
     default = 1
@@ -245,11 +223,11 @@ class SkillProgression(Choice):
 
 
 class BuildingProgression(Choice):
-    """How is the building progression handled?
-    Vanilla: You will buy each building normally.
+    """Shuffle Carpenter Buildings?
+    Vanilla: You can buy each building normally.
     Progressive: You will receive the buildings and will be able to build the first one of each type for free,
         once it is received. If you want more of the same building, it will cost the vanilla price.
-    Progressive early shipping bin: You can expect your shipping bin in sphere 1.
+    Progressive early shipping bin: Same as Progressive, but the shipping bin will be placed early in the multiworld.
     """
     internal_name = "building_progression"
     display_name = "Building Progression"
@@ -260,10 +238,10 @@ class BuildingProgression(Choice):
 
 
 class FestivalLocations(Choice):
-    """Locations for attending and participating in festivals
-    With Disabled, you do not need to attend festivals
-    With Easy, there are checks for participating in festivals
-    With Hard, the festival checks are only granted when the player performs well in the festival
+    """Shuffle Festival Activities?
+    Disabled: You do not need to attend festivals
+    Easy: Every festival has checks, but they are easy and usually only require attendance
+    Hard: Festivals have more checks, and many require performing well, not just attending
     """
     internal_name = "festival_locations"
     display_name = "Festival Locations"
@@ -274,11 +252,10 @@ class FestivalLocations(Choice):
 
 
 class ArcadeMachineLocations(Choice):
-    """How are the Arcade Machines handled?
-    Disabled: The arcade machines are not included in the Archipelago shuffling.
+    """Shuffle the arcade machines?
+    Disabled: The arcade machines are not included.
     Victories: Each Arcade Machine will contain one check on victory
-    Victories Easy: The arcade machines are both made considerably easier to be more accessible for the average
-        player.
+    Victories Easy: Same as Victories, but both games are made considerably easier.
     Full Shuffling: The arcade machines will contain multiple checks each, and different buffs that make the game
         easier are in the item pool. Junimo Kart has one check at the end of each level.
         Journey of the Prairie King has one check after each boss, plus one check for each vendor equipment.
@@ -293,10 +270,10 @@ class ArcadeMachineLocations(Choice):
 
 
 class SpecialOrderLocations(Choice):
-    """How are the Special Orders handled?
+    """Shuffle Special Orders?
     Disabled: The special orders are not included in the Archipelago shuffling.
     Board Only: The Special Orders on the board in town are location checks
-    Board and Qi: The Special Orders from Qi's walnut room are checks, as well as the board in town
+    Board and Qi: The Special Orders from Mr Qi's walnut room are checks, in addition to the board in town
     """
     internal_name = "special_order_locations"
     display_name = "Special Order Locations"
@@ -306,8 +283,8 @@ class SpecialOrderLocations(Choice):
     option_board_qi = 2
 
 
-class HelpWantedLocations(SpecialRange):
-    """How many "Help Wanted" quests need to be completed as Archipelago Locations
+class HelpWantedLocations(NamedRange):
+    """Include location checks for Help Wanted quests
     Out of every 7 quests, 4 will be item deliveries, and then 1 of each for: Fishing, Gathering and Slaying Monsters.
     Choosing a multiple of 7 is recommended."""
     internal_name = "help_wanted_locations"
@@ -327,7 +304,7 @@ class HelpWantedLocations(SpecialRange):
 
 
 class Fishsanity(Choice):
-    """Locations for catching fish?
+    """Locations for catching a fish the first time?
     None: There are no locations for catching fish
     Legendaries: Each of the 5 legendary fish are checks
     Special: A curated selection of strong fish are checks
@@ -356,7 +333,7 @@ class Museumsanity(Choice):
     None: There are no locations for donating artifacts and minerals to the museum
     Milestones: The donation milestones from the vanilla game are checks
     Randomized: A random selection of minerals and artifacts are checks
-    All: Every single donation will be a check
+    All: Every single donation is a check
     """
     internal_name = "museumsanity"
     display_name = "Museumsanity"
@@ -368,12 +345,12 @@ class Museumsanity(Choice):
 
 
 class Friendsanity(Choice):
-    """Locations for friendships?
-    None: There are no checks for befriending villagers
-    Bachelors: Each heart of a bachelor is a check
-    Starting NPCs: Each heart for npcs that are immediately available is a check
-    All: Every heart with every NPC is a check, including Leo, Kent, Sandy, etc
-    All With Marriage: Marriage candidates must also be dated, married, and befriended up to 14 hearts.
+    """Shuffle Friendships?
+    None: Friendship hearts are earned normally
+    Bachelors: Hearts with bachelors are shuffled
+    Starting NPCs: Hearts for NPCs available immediately are checks
+    All: Hearts for all npcs are checks, including Leo, Kent, Sandy, etc
+    All With Marriage: Hearts for all npcs are checks, including romance hearts up to 14 when applicable
     """
     internal_name = "friendsanity"
     display_name = "Friendsanity"
@@ -388,7 +365,7 @@ class Friendsanity(Choice):
 
 # Conditional Setting - Friendsanity not None
 class FriendsanityHeartSize(Range):
-    """If using friendsanity, how many hearts are received per item, and how many hearts must be earned to send a check
+    """If using friendsanity, how many hearts are received per heart item, and how many hearts must be earned to send a check
     A higher value will lead to fewer heart items in the item pool, reducing bloat"""
     internal_name = "friendsanity_heart_size"
     display_name = "Friendsanity Heart Size"
@@ -431,6 +408,7 @@ class ExcludeGingerIsland(Toggle):
 
 class TrapItems(Choice):
     """When rolling filler items, including resource packs, the game can also roll trap items.
+    Trap items are negative items that cause problems or annoyances for the player
     This setting is for choosing if traps will be in the item pool, and if so, how punishing they will be.
     """
     internal_name = "trap_items"
@@ -451,7 +429,7 @@ class MultipleDaySleepEnabled(Toggle):
     default = 1
 
 
-class MultipleDaySleepCost(SpecialRange):
+class MultipleDaySleepCost(NamedRange):
     """How much gold it will cost to use MultiSleep. You will have to pay that amount for each day skipped."""
     internal_name = "multiple_day_sleep_cost"
     display_name = "Multiple Day Sleep Cost"
@@ -461,14 +439,16 @@ class MultipleDaySleepCost(SpecialRange):
 
     special_range_names = {
         "free": 0,
-        "cheap": 25,
-        "medium": 50,
-        "expensive": 100,
+        "cheap": 10,
+        "medium": 25,
+        "expensive": 50,
+        "very expensive": 100,
     }
 
 
-class ExperienceMultiplier(SpecialRange):
-    """How fast you want to earn skill experience. A lower setting mean less experience.
+class ExperienceMultiplier(NamedRange):
+    """How fast you want to earn skill experience.
+    A lower setting mean less experience.
     A higher setting means more experience."""
     internal_name = "experience_multiplier"
     display_name = "Experience Multiplier"
@@ -486,7 +466,7 @@ class ExperienceMultiplier(SpecialRange):
     }
 
 
-class FriendshipMultiplier(SpecialRange):
+class FriendshipMultiplier(NamedRange):
     """How fast you want to earn friendship points with villagers.
     A lower setting mean less friendship per action.
     A higher setting means more friendship per action."""
@@ -533,14 +513,15 @@ class QuickStart(Toggle):
 
 
 class Gifting(Toggle):
-    """Do you want to enable gifting items to and from other Stardew Valley worlds?"""
+    """Do you want to enable gifting items to and from other Archipelago slots?
+    Items can only be sent to games that also support gifting"""
     internal_name = "gifting"
     display_name = "Gifting"
     default = 1
 
 
 class Mods(OptionSet):
-    """List of mods that will be considered for shuffling."""
+    """List of mods that will be included in the shuffling."""
     internal_name = "mods"
     display_name = "Mods"
     valid_keys = {
@@ -553,56 +534,39 @@ class Mods(OptionSet):
     }
 
 
-stardew_valley_option_classes = [
-    Goal,
-    StartingMoney,
-    ProfitMargin,
-    BundleRandomization,
-    BundlePrice,
-    EntranceRandomization,
-    SeasonRandomization,
-    Cropsanity,
-    BackpackProgression,
-    ToolProgression,
-    SkillProgression,
-    BuildingProgression,
-    FestivalLocations,
-    ElevatorProgression,
-    ArcadeMachineLocations,
-    SpecialOrderLocations,
-    HelpWantedLocations,
-    Fishsanity,
-    Museumsanity,
-    Friendsanity,
-    FriendsanityHeartSize,
-    NumberOfMovementBuffs,
-    NumberOfLuckBuffs,
-    ExcludeGingerIsland,
-    TrapItems,
-    MultipleDaySleepEnabled,
-    MultipleDaySleepCost,
-    ExperienceMultiplier,
-    FriendshipMultiplier,
-    DebrisMultiplier,
-    QuickStart,
-    Gifting,
-    Mods,
-]
-stardew_valley_options: Dict[str, type(Option)] = {option.internal_name: option for option in
-                                                   stardew_valley_option_classes}
-default_options = {option.internal_name: option.default for option in stardew_valley_options.values()}
-stardew_valley_options["death_link"] = DeathLink
-
-
-def fetch_options(world, player: int) -> StardewOptions:
-    return StardewOptions({option: get_option_value(world, player, option) for option in stardew_valley_options})
-
-
-def get_option_value(world, player: int, name: str) -> Union[bool, int]:
-    assert name in stardew_valley_options, f"{name} is not a valid option for Stardew Valley."
-
-    value = getattr(world, name)
-
-    if issubclass(stardew_valley_options[name], Toggle):
-        return bool(value[player].value)
-    return value[player].value
+@dataclass
+class StardewValleyOptions(PerGameCommonOptions):
+    goal: Goal
+    starting_money: StartingMoney
+    profit_margin: ProfitMargin
+    bundle_randomization: BundleRandomization
+    bundle_price: BundlePrice
+    entrance_randomization: EntranceRandomization
+    season_randomization: SeasonRandomization
+    cropsanity: Cropsanity
+    backpack_progression: BackpackProgression
+    tool_progression: ToolProgression
+    skill_progression: SkillProgression
+    building_progression: BuildingProgression
+    festival_locations: FestivalLocations
+    elevator_progression: ElevatorProgression
+    arcade_machine_locations: ArcadeMachineLocations
+    special_order_locations: SpecialOrderLocations
+    help_wanted_locations: HelpWantedLocations
+    fishsanity: Fishsanity
+    museumsanity: Museumsanity
+    friendsanity: Friendsanity
+    friendsanity_heart_size: FriendsanityHeartSize
+    movement_buff_number: NumberOfMovementBuffs
+    luck_buff_number: NumberOfLuckBuffs
+    exclude_ginger_island: ExcludeGingerIsland
+    trap_items: TrapItems
+    multiple_day_sleep_enabled: MultipleDaySleepEnabled
+    multiple_day_sleep_cost: MultipleDaySleepCost
+    experience_multiplier: ExperienceMultiplier
+    friendship_multiplier: FriendshipMultiplier
+    debris_multiplier: DebrisMultiplier
+    quick_start: QuickStart
+    gifting: Gifting
+    mods: Mods
+    death_link: DeathLink
diff --git a/worlds/stardew_valley/presets.py b/worlds/stardew_valley/presets.py
new file mode 100644
index 0000000000..8823c52e5b
--- /dev/null
+++ b/worlds/stardew_valley/presets.py
@@ -0,0 +1,323 @@
+from typing import Any, Dict
+
+from Options import Accessibility, ProgressionBalancing, DeathLink
+from .options import Goal, StartingMoney, ProfitMargin, BundleRandomization, BundlePrice, EntranceRandomization, SeasonRandomization, Cropsanity, \
+    BackpackProgression, ToolProgression, ElevatorProgression, SkillProgression, BuildingProgression, FestivalLocations, ArcadeMachineLocations, \
+    SpecialOrderLocations, HelpWantedLocations, Fishsanity, Museumsanity, Friendsanity, FriendsanityHeartSize, NumberOfMovementBuffs, NumberOfLuckBuffs, \
+    ExcludeGingerIsland, TrapItems, MultipleDaySleepEnabled, MultipleDaySleepCost, ExperienceMultiplier, FriendshipMultiplier, DebrisMultiplier, QuickStart, \
+    Gifting
+
+all_random_settings = {
+    "progression_balancing":                "random",
+    "accessibility":                        "random",
+    Goal.internal_name:                     "random",
+    StartingMoney.internal_name:            "random",
+    ProfitMargin.internal_name:             "random",
+    BundleRandomization.internal_name:      "random",
+    BundlePrice.internal_name:              "random",
+    EntranceRandomization.internal_name:    "random",
+    SeasonRandomization.internal_name:      "random",
+    Cropsanity.internal_name:               "random",
+    BackpackProgression.internal_name:      "random",
+    ToolProgression.internal_name:          "random",
+    ElevatorProgression.internal_name:      "random",
+    SkillProgression.internal_name:         "random",
+    BuildingProgression.internal_name:      "random",
+    FestivalLocations.internal_name:        "random",
+    ArcadeMachineLocations.internal_name:   "random",
+    SpecialOrderLocations.internal_name:    "random",
+    HelpWantedLocations.internal_name:      "random",
+    Fishsanity.internal_name:               "random",
+    Museumsanity.internal_name:             "random",
+    Friendsanity.internal_name:             "random",
+    FriendsanityHeartSize.internal_name:    "random",
+    NumberOfMovementBuffs.internal_name:    "random",
+    NumberOfLuckBuffs.internal_name:        "random",
+    ExcludeGingerIsland.internal_name:      "random",
+    TrapItems.internal_name:                "random",
+    MultipleDaySleepEnabled.internal_name:  "random",
+    MultipleDaySleepCost.internal_name:     "random",
+    ExperienceMultiplier.internal_name:     "random",
+    FriendshipMultiplier.internal_name:     "random",
+    DebrisMultiplier.internal_name:         "random",
+    QuickStart.internal_name:               "random",
+    Gifting.internal_name:                  "random",
+    "death_link":                           "random",
+}
+
+easy_settings = {
+    "progression_balancing":                ProgressionBalancing.default,
+    "accessibility":                        Accessibility.option_items,
+    Goal.internal_name:                     Goal.option_community_center,
+    StartingMoney.internal_name:            "very rich",
+    ProfitMargin.internal_name:             "double",
+    BundleRandomization.internal_name:      BundleRandomization.option_thematic,
+    BundlePrice.internal_name:              BundlePrice.option_cheap,
+    EntranceRandomization.internal_name:    EntranceRandomization.option_disabled,
+    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized_not_winter,
+    Cropsanity.internal_name:               Cropsanity.option_enabled,
+    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
+    ToolProgression.internal_name:          ToolProgression.option_progressive,
+    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive,
+    SkillProgression.internal_name:         SkillProgression.option_progressive,
+    BuildingProgression.internal_name:      BuildingProgression.option_progressive_early_shipping_bin,
+    FestivalLocations.internal_name:        FestivalLocations.option_easy,
+    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_disabled,
+    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_disabled,
+    HelpWantedLocations.internal_name:      "minimum",
+    Fishsanity.internal_name:               Fishsanity.option_only_easy_fish,
+    Museumsanity.internal_name:             Museumsanity.option_milestones,
+    Friendsanity.internal_name:             Friendsanity.option_none,
+    FriendsanityHeartSize.internal_name:    4,
+    NumberOfMovementBuffs.internal_name:    8,
+    NumberOfLuckBuffs.internal_name:        8,
+    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
+    TrapItems.internal_name:                TrapItems.option_easy,
+    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
+    MultipleDaySleepCost.internal_name:     "free",
+    ExperienceMultiplier.internal_name:     "triple",
+    FriendshipMultiplier.internal_name:     "quadruple",
+    DebrisMultiplier.internal_name:         DebrisMultiplier.option_quarter,
+    QuickStart.internal_name:               QuickStart.option_true,
+    Gifting.internal_name:                  Gifting.option_true,
+    "death_link":                           "false",
+}
+
+medium_settings = {
+    "progression_balancing":                25,
+    "accessibility":                        Accessibility.option_locations,
+    Goal.internal_name:                     Goal.option_community_center,
+    StartingMoney.internal_name:            "rich",
+    ProfitMargin.internal_name:             150,
+    BundleRandomization.internal_name:      BundleRandomization.option_thematic,
+    BundlePrice.internal_name:              BundlePrice.option_normal,
+    EntranceRandomization.internal_name:    EntranceRandomization.option_non_progression,
+    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
+    Cropsanity.internal_name:               Cropsanity.option_enabled,
+    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
+    ToolProgression.internal_name:          ToolProgression.option_progressive,
+    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive_from_previous_floor,
+    SkillProgression.internal_name:         SkillProgression.option_progressive,
+    BuildingProgression.internal_name:      BuildingProgression.option_progressive_early_shipping_bin,
+    FestivalLocations.internal_name:        FestivalLocations.option_hard,
+    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_victories_easy,
+    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_only,
+    HelpWantedLocations.internal_name:      "normal",
+    Fishsanity.internal_name:               Fishsanity.option_exclude_legendaries,
+    Museumsanity.internal_name:             Museumsanity.option_milestones,
+    Friendsanity.internal_name:             Friendsanity.option_starting_npcs,
+    FriendsanityHeartSize.internal_name:    4,
+    NumberOfMovementBuffs.internal_name:    6,
+    NumberOfLuckBuffs.internal_name:        6,
+    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
+    TrapItems.internal_name:                TrapItems.option_medium,
+    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
+    MultipleDaySleepCost.internal_name:     "free",
+    ExperienceMultiplier.internal_name:     "double",
+    FriendshipMultiplier.internal_name:     "triple",
+    DebrisMultiplier.internal_name:         DebrisMultiplier.option_half,
+    QuickStart.internal_name:               QuickStart.option_true,
+    Gifting.internal_name:                  Gifting.option_true,
+    "death_link":                           "false",
+}
+
+hard_settings = {
+    "progression_balancing":                0,
+    "accessibility":                        Accessibility.option_locations,
+    Goal.internal_name:                     Goal.option_grandpa_evaluation,
+    StartingMoney.internal_name:            "extra",
+    ProfitMargin.internal_name:             "normal",
+    BundleRandomization.internal_name:      BundleRandomization.option_thematic,
+    BundlePrice.internal_name:              BundlePrice.option_expensive,
+    EntranceRandomization.internal_name:    EntranceRandomization.option_buildings,
+    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
+    Cropsanity.internal_name:               Cropsanity.option_enabled,
+    BackpackProgression.internal_name:      BackpackProgression.option_progressive,
+    ToolProgression.internal_name:          ToolProgression.option_progressive,
+    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive_from_previous_floor,
+    SkillProgression.internal_name:         SkillProgression.option_progressive,
+    BuildingProgression.internal_name:      BuildingProgression.option_progressive,
+    FestivalLocations.internal_name:        FestivalLocations.option_hard,
+    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_full_shuffling,
+    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_qi,
+    HelpWantedLocations.internal_name:      "lots",
+    Fishsanity.internal_name:               Fishsanity.option_all,
+    Museumsanity.internal_name:             Museumsanity.option_all,
+    Friendsanity.internal_name:             Friendsanity.option_all,
+    FriendsanityHeartSize.internal_name:    4,
+    NumberOfMovementBuffs.internal_name:    4,
+    NumberOfLuckBuffs.internal_name:        4,
+    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_false,
+    TrapItems.internal_name:                TrapItems.option_hard,
+    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
+    MultipleDaySleepCost.internal_name:     "cheap",
+    ExperienceMultiplier.internal_name:     "vanilla",
+    FriendshipMultiplier.internal_name:     "double",
+    DebrisMultiplier.internal_name:         DebrisMultiplier.option_vanilla,
+    QuickStart.internal_name:               QuickStart.option_true,
+    Gifting.internal_name:                  Gifting.option_true,
+    "death_link":                           "true",
+}
+
+nightmare_settings = {
+    "progression_balancing":                0,
+    "accessibility":                        Accessibility.option_locations,
+    Goal.internal_name:                     Goal.option_community_center,
+    StartingMoney.internal_name:            "vanilla",
+    ProfitMargin.internal_name:             "half",
+    BundleRandomization.internal_name:      BundleRandomization.option_shuffled,
+    BundlePrice.internal_name:              BundlePrice.option_expensive,
+    EntranceRandomization.internal_name:    EntranceRandomization.option_buildings,
+    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
+    Cropsanity.internal_name:               Cropsanity.option_enabled,
+    BackpackProgression.internal_name:      BackpackProgression.option_progressive,
+    ToolProgression.internal_name:          ToolProgression.option_progressive,
+    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive_from_previous_floor,
+    SkillProgression.internal_name:         SkillProgression.option_progressive,
+    BuildingProgression.internal_name:      BuildingProgression.option_progressive,
+    FestivalLocations.internal_name:        FestivalLocations.option_hard,
+    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_full_shuffling,
+    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_qi,
+    HelpWantedLocations.internal_name:      "maximum",
+    Fishsanity.internal_name:               Fishsanity.option_special,
+    Museumsanity.internal_name:             Museumsanity.option_all,
+    Friendsanity.internal_name:             Friendsanity.option_all_with_marriage,
+    FriendsanityHeartSize.internal_name:    4,
+    NumberOfMovementBuffs.internal_name:    2,
+    NumberOfLuckBuffs.internal_name:        2,
+    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_false,
+    TrapItems.internal_name:                TrapItems.option_hell,
+    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
+    MultipleDaySleepCost.internal_name:     "expensive",
+    ExperienceMultiplier.internal_name:     "half",
+    FriendshipMultiplier.internal_name:     "vanilla",
+    DebrisMultiplier.internal_name:         DebrisMultiplier.option_vanilla,
+    QuickStart.internal_name:               QuickStart.option_false,
+    Gifting.internal_name:                  Gifting.option_true,
+    "death_link":                           "true",
+}
+
+short_settings = {
+    "progression_balancing":                ProgressionBalancing.default,
+    "accessibility":                        Accessibility.option_items,
+    Goal.internal_name:                     Goal.option_bottom_of_the_mines,
+    StartingMoney.internal_name:            "filthy rich",
+    ProfitMargin.internal_name:             "quadruple",
+    BundleRandomization.internal_name:      BundleRandomization.option_thematic,
+    BundlePrice.internal_name:              BundlePrice.option_very_cheap,
+    EntranceRandomization.internal_name:    EntranceRandomization.option_disabled,
+    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized_not_winter,
+    Cropsanity.internal_name:               Cropsanity.option_disabled,
+    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
+    ToolProgression.internal_name:          ToolProgression.option_progressive,
+    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive_from_previous_floor,
+    SkillProgression.internal_name:         SkillProgression.option_progressive,
+    BuildingProgression.internal_name:      BuildingProgression.option_progressive_early_shipping_bin,
+    FestivalLocations.internal_name:        FestivalLocations.option_disabled,
+    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_disabled,
+    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_disabled,
+    HelpWantedLocations.internal_name:      "none",
+    Fishsanity.internal_name:               Fishsanity.option_none,
+    Museumsanity.internal_name:             Museumsanity.option_none,
+    Friendsanity.internal_name:             Friendsanity.option_none,
+    FriendsanityHeartSize.internal_name:    4,
+    NumberOfMovementBuffs.internal_name:    10,
+    NumberOfLuckBuffs.internal_name:        10,
+    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
+    TrapItems.internal_name:                TrapItems.option_easy,
+    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.option_true,
+    MultipleDaySleepCost.internal_name:     "free",
+    ExperienceMultiplier.internal_name:     "quadruple",
+    FriendshipMultiplier.internal_name:     800,
+    DebrisMultiplier.internal_name:         DebrisMultiplier.option_none,
+    QuickStart.internal_name:               QuickStart.option_true,
+    Gifting.internal_name:                  Gifting.option_true,
+    "death_link":                           "false",
+}
+
+lowsanity_settings = {
+    "progression_balancing":                ProgressionBalancing.default,
+    "accessibility":                        Accessibility.option_minimal,
+    Goal.internal_name:                     Goal.default,
+    StartingMoney.internal_name:            StartingMoney.default,
+    ProfitMargin.internal_name:             ProfitMargin.default,
+    BundleRandomization.internal_name:      BundleRandomization.default,
+    BundlePrice.internal_name:              BundlePrice.default,
+    EntranceRandomization.internal_name:    EntranceRandomization.default,
+    SeasonRandomization.internal_name:      SeasonRandomization.option_disabled,
+    Cropsanity.internal_name:               Cropsanity.option_disabled,
+    BackpackProgression.internal_name:      BackpackProgression.option_vanilla,
+    ToolProgression.internal_name:          ToolProgression.option_vanilla,
+    ElevatorProgression.internal_name:      ElevatorProgression.option_vanilla,
+    SkillProgression.internal_name:         SkillProgression.option_vanilla,
+    BuildingProgression.internal_name:      BuildingProgression.option_vanilla,
+    FestivalLocations.internal_name:        FestivalLocations.option_disabled,
+    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_disabled,
+    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_disabled,
+    HelpWantedLocations.internal_name:      "none",
+    Fishsanity.internal_name:               Fishsanity.option_none,
+    Museumsanity.internal_name:             Museumsanity.option_none,
+    Friendsanity.internal_name:             Friendsanity.option_none,
+    FriendsanityHeartSize.internal_name:    FriendsanityHeartSize.default,
+    NumberOfMovementBuffs.internal_name:    NumberOfMovementBuffs.default,
+    NumberOfLuckBuffs.internal_name:        NumberOfLuckBuffs.default,
+    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_true,
+    TrapItems.internal_name:                TrapItems.default,
+    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.default,
+    MultipleDaySleepCost.internal_name:     MultipleDaySleepCost.default,
+    ExperienceMultiplier.internal_name:     ExperienceMultiplier.default,
+    FriendshipMultiplier.internal_name:     FriendshipMultiplier.default,
+    DebrisMultiplier.internal_name:         DebrisMultiplier.default,
+    QuickStart.internal_name:               QuickStart.default,
+    Gifting.internal_name:                  Gifting.default,
+    "death_link":                           DeathLink.default,
+}
+
+allsanity_settings = {
+    "progression_balancing":                ProgressionBalancing.default,
+    "accessibility":                        Accessibility.option_locations,
+    Goal.internal_name:                     Goal.default,
+    StartingMoney.internal_name:            StartingMoney.default,
+    ProfitMargin.internal_name:             ProfitMargin.default,
+    BundleRandomization.internal_name:      BundleRandomization.default,
+    BundlePrice.internal_name:              BundlePrice.default,
+    EntranceRandomization.internal_name:    EntranceRandomization.option_buildings,
+    SeasonRandomization.internal_name:      SeasonRandomization.option_randomized,
+    Cropsanity.internal_name:               Cropsanity.option_enabled,
+    BackpackProgression.internal_name:      BackpackProgression.option_early_progressive,
+    ToolProgression.internal_name:          ToolProgression.option_progressive,
+    ElevatorProgression.internal_name:      ElevatorProgression.option_progressive,
+    SkillProgression.internal_name:         SkillProgression.option_progressive,
+    BuildingProgression.internal_name:      BuildingProgression.option_progressive_early_shipping_bin,
+    FestivalLocations.internal_name:        FestivalLocations.option_hard,
+    ArcadeMachineLocations.internal_name:   ArcadeMachineLocations.option_full_shuffling,
+    SpecialOrderLocations.internal_name:    SpecialOrderLocations.option_board_qi,
+    HelpWantedLocations.internal_name:      "maximum",
+    Fishsanity.internal_name:               Fishsanity.option_all,
+    Museumsanity.internal_name:             Museumsanity.option_all,
+    Friendsanity.internal_name:             Friendsanity.option_all,
+    FriendsanityHeartSize.internal_name:    1,
+    NumberOfMovementBuffs.internal_name:    12,
+    NumberOfLuckBuffs.internal_name:        12,
+    ExcludeGingerIsland.internal_name:      ExcludeGingerIsland.option_false,
+    TrapItems.internal_name:                TrapItems.default,
+    MultipleDaySleepEnabled.internal_name:  MultipleDaySleepEnabled.default,
+    MultipleDaySleepCost.internal_name:     MultipleDaySleepCost.default,
+    ExperienceMultiplier.internal_name:     ExperienceMultiplier.default,
+    FriendshipMultiplier.internal_name:     FriendshipMultiplier.default,
+    DebrisMultiplier.internal_name:         DebrisMultiplier.default,
+    QuickStart.internal_name:               QuickStart.default,
+    Gifting.internal_name:                  Gifting.default,
+    "death_link":                           DeathLink.default,
+}
+
+sv_options_presets: Dict[str, Dict[str, Any]] = {
+    "All random": all_random_settings,
+    "Easy": easy_settings,
+    "Medium": medium_settings,
+    "Hard": hard_settings,
+    "Nightmare": nightmare_settings,
+    "Short": short_settings,
+    "Lowsanity": lowsanity_settings,
+    "Allsanity": allsanity_settings,
+}
diff --git a/worlds/stardew_valley/regions.py b/worlds/stardew_valley/regions.py
index 60cad4c136..d8e2248411 100644
--- a/worlds/stardew_valley/regions.py
+++ b/worlds/stardew_valley/regions.py
@@ -2,11 +2,10 @@ from random import Random
 from typing import Iterable, Dict, Protocol, List, Tuple, Set
 
 from BaseClasses import Region, Entrance
-from . import options
+from .options import EntranceRandomization, ExcludeGingerIsland, Museumsanity
 from .strings.entrance_names import Entrance
 from .strings.region_names import Region
 from .region_classes import RegionData, ConnectionData, RandomizationFlag
-from .options import StardewOptions
 from .mods.mod_regions import ModDataList
 
 
@@ -397,12 +396,12 @@ vanilla_connections = [
 ]
 
 
-def create_final_regions(world_options: StardewOptions) -> List[RegionData]:
+def create_final_regions(world_options) -> List[RegionData]:
     final_regions = []
     final_regions.extend(vanilla_regions)
-    if world_options[options.Mods] is None:
+    if world_options.mods is None:
         return final_regions
-    for mod in world_options[options.Mods]:
+    for mod in world_options.mods.value:
         if mod not in ModDataList:
             continue
         for mod_region in ModDataList[mod].regions:
@@ -417,20 +416,20 @@ def create_final_regions(world_options: StardewOptions) -> List[RegionData]:
     return final_regions
 
 
-def create_final_connections(world_options: StardewOptions) -> List[ConnectionData]:
+def create_final_connections(world_options) -> List[ConnectionData]:
     final_connections = []
     final_connections.extend(vanilla_connections)
-    if world_options[options.Mods] is None:
+    if world_options.mods is None:
         return final_connections
-    for mod in world_options[options.Mods]:
+    for mod in world_options.mods.value:
         if mod not in ModDataList:
             continue
         final_connections.extend(ModDataList[mod].connections)
     return final_connections
 
 
-def create_regions(region_factory: RegionFactory, random: Random, world_options: StardewOptions) -> Tuple[
-    Iterable[Region], Dict[str, str]]:
+def create_regions(region_factory: RegionFactory, random: Random, world_options) -> Tuple[
+    Dict[str, Region], Dict[str, str]]:
     final_regions = create_final_regions(world_options)
     regions: Dict[str: Region] = {region.name: region_factory(region.name, region.exits) for region in
                                   final_regions}
@@ -445,24 +444,24 @@ def create_regions(region_factory: RegionFactory, random: Random, world_options:
         if connection.name in entrances:
             entrances[connection.name].connect(regions[connection.destination])
 
-    return regions.values(), randomized_data
+    return regions, randomized_data
 
 
-def randomize_connections(random: Random, world_options: StardewOptions, regions_by_name) -> Tuple[
+def randomize_connections(random: Random, world_options, regions_by_name) -> Tuple[
     List[ConnectionData], Dict[str, str]]:
     connections_to_randomize = []
     final_connections = create_final_connections(world_options)
     connections_by_name: Dict[str, ConnectionData] = {connection.name: connection for connection in final_connections}
-    if world_options[options.EntranceRandomization] == options.EntranceRandomization.option_pelican_town:
+    if world_options.entrance_randomization == EntranceRandomization.option_pelican_town:
         connections_to_randomize = [connection for connection in final_connections if
                                     RandomizationFlag.PELICAN_TOWN in connection.flag]
-    elif world_options[options.EntranceRandomization] == options.EntranceRandomization.option_non_progression:
+    elif world_options.entrance_randomization == EntranceRandomization.option_non_progression:
         connections_to_randomize = [connection for connection in final_connections if
                                     RandomizationFlag.NON_PROGRESSION in connection.flag]
-    elif world_options[options.EntranceRandomization] == options.EntranceRandomization.option_buildings:
+    elif world_options.entrance_randomization == EntranceRandomization.option_buildings:
         connections_to_randomize = [connection for connection in final_connections if
                                     RandomizationFlag.BUILDINGS in connection.flag]
-    elif world_options[options.EntranceRandomization] == options.EntranceRandomization.option_chaos:
+    elif world_options.entrance_randomization == EntranceRandomization.option_chaos:
         connections_to_randomize = [connection for connection in final_connections if
                                     RandomizationFlag.BUILDINGS in connection.flag]
         connections_to_randomize = exclude_island_if_necessary(connections_to_randomize, world_options)
@@ -491,8 +490,8 @@ def randomize_connections(random: Random, world_options: StardewOptions, regions
 
 
 def remove_excluded_entrances(connections_to_randomize, world_options):
-    exclude_island = world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true
-    exclude_sewers = world_options[options.Museumsanity] == options.Museumsanity.option_none
+    exclude_island = world_options.exclude_ginger_island == ExcludeGingerIsland.option_true
+    exclude_sewers = world_options.museumsanity == Museumsanity.option_none
     if exclude_island:
         connections_to_randomize = [connection for connection in connections_to_randomize if RandomizationFlag.GINGER_ISLAND not in connection.flag]
     if exclude_sewers:
@@ -502,7 +501,7 @@ def remove_excluded_entrances(connections_to_randomize, world_options):
 
 
 def exclude_island_if_necessary(connections_to_randomize: List[ConnectionData], world_options) -> List[ConnectionData]:
-    exclude_island = world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true
+    exclude_island = world_options.exclude_ginger_island == ExcludeGingerIsland.option_true
     if exclude_island:
         connections_to_randomize = [connection for connection in connections_to_randomize if
                                     RandomizationFlag.GINGER_ISLAND not in connection.flag]
diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py
index 34ee1f807d..f56dec39a1 100644
--- a/worlds/stardew_valley/rules.py
+++ b/worlds/stardew_valley/rules.py
@@ -1,10 +1,10 @@
 import itertools
-from typing import Dict, List
+from typing import List
 
 from BaseClasses import MultiWorld
 from worlds.generic import Rules as MultiWorldRules
-from . import options, locations
-from .bundles import Bundle
+from .options import StardewValleyOptions, ToolProgression, BuildingProgression, SkillProgression, ExcludeGingerIsland, Cropsanity, SpecialOrderLocations, Museumsanity, \
+    BackpackProgression, ArcadeMachineLocations
 from .strings.entrance_names import dig_to_mines_floor, dig_to_skull_floor, Entrance, move_to_woods_depth, \
     DeepWoodsEntrance, AlecEntrance, MagicEntrance
 from .data.museum_data import all_museum_items, all_museum_minerals, all_museum_artifacts, \
@@ -13,9 +13,8 @@ from .data.museum_data import all_museum_items, all_museum_minerals, all_museum_
 from .strings.region_names import Region
 from .mods.mod_data import ModNames
 from .mods.logic import magic, deepwoods
-from .locations import LocationTags
+from .locations import LocationTags, locations_by_tag
 from .logic import StardewLogic, And, tool_upgrade_prices
-from .options import StardewOptions
 from .strings.ap_names.transport_names import Transportation
 from .strings.artisan_good_names import ArtisanGood
 from .strings.calendar_names import Weekday
@@ -28,251 +27,256 @@ from .strings.villager_names import NPC, ModNPC
 from .strings.wallet_item_names import Wallet
 
 
-def set_rules(multi_world: MultiWorld, player: int, world_options: StardewOptions, logic: StardewLogic,
-              current_bundles: Dict[str, Bundle]):
-    all_location_names = list(location.name for location in multi_world.get_locations(player))
+def set_rules(world):
+    multiworld = world.multiworld
+    world_options = world.options
+    player = world.player
+    logic = world.logic
+    current_bundles = world.modified_bundles
+    
+    all_location_names = list(location.name for location in multiworld.get_locations(player))
 
-    set_entrance_rules(logic, multi_world, player, world_options)
+    set_entrance_rules(logic, multiworld, player, world_options)
 
-    set_ginger_island_rules(logic, multi_world, player, world_options)
+    set_ginger_island_rules(logic, multiworld, player, world_options)
 
     # Those checks do not exist if ToolProgression is vanilla
-    if world_options[options.ToolProgression] != options.ToolProgression.option_vanilla:
-        MultiWorldRules.add_rule(multi_world.get_location("Purchase Fiberglass Rod", player),
+    if world_options.tool_progression != ToolProgression.option_vanilla:
+        MultiWorldRules.add_rule(multiworld.get_location("Purchase Fiberglass Rod", player),
                                  (logic.has_skill_level(Skill.fishing, 2) & logic.can_spend_money(1800)).simplify())
-        MultiWorldRules.add_rule(multi_world.get_location("Purchase Iridium Rod", player),
+        MultiWorldRules.add_rule(multiworld.get_location("Purchase Iridium Rod", player),
                                  (logic.has_skill_level(Skill.fishing, 6) & logic.can_spend_money(7500)).simplify())
 
         materials = [None, "Copper", "Iron", "Gold", "Iridium"]
         tool = [Tool.hoe, Tool.pickaxe, Tool.axe, Tool.watering_can, Tool.watering_can, Tool.trash_can]
         for (previous, material), tool in itertools.product(zip(materials[:4], materials[1:]), tool):
             if previous is None:
-                MultiWorldRules.add_rule(multi_world.get_location(f"{material} {tool} Upgrade", player),
+                MultiWorldRules.add_rule(multiworld.get_location(f"{material} {tool} Upgrade", player),
                                          (logic.has(f"{material} Ore") &
                                           logic.can_spend_money(tool_upgrade_prices[material])).simplify())
             else:
-                MultiWorldRules.add_rule(multi_world.get_location(f"{material} {tool} Upgrade", player),
+                MultiWorldRules.add_rule(multiworld.get_location(f"{material} {tool} Upgrade", player),
                                          (logic.has(f"{material} Ore") & logic.has_tool(tool, previous) &
                                           logic.can_spend_money(tool_upgrade_prices[material])).simplify())
 
-    set_skills_rules(logic, multi_world, player, world_options)
+    set_skills_rules(logic, multiworld, player, world_options)
 
     # Bundles
     for bundle in current_bundles.values():
-        location = multi_world.get_location(bundle.get_name_with_bundle(), player)
+        location = multiworld.get_location(bundle.get_name_with_bundle(), player)
         rules = logic.can_complete_bundle(bundle.requirements, bundle.number_required)
         simplified_rules = rules.simplify()
         MultiWorldRules.set_rule(location, simplified_rules)
-    MultiWorldRules.add_rule(multi_world.get_location("Complete Crafts Room", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Complete Crafts Room", player),
                              And(logic.can_reach_location(bundle.name)
-                                 for bundle in locations.locations_by_tag[LocationTags.CRAFTS_ROOM_BUNDLE]).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Complete Pantry", player),
+                                 for bundle in locations_by_tag[LocationTags.CRAFTS_ROOM_BUNDLE]).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Complete Pantry", player),
                              And(logic.can_reach_location(bundle.name)
-                                 for bundle in locations.locations_by_tag[LocationTags.PANTRY_BUNDLE]).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Complete Fish Tank", player),
+                                 for bundle in locations_by_tag[LocationTags.PANTRY_BUNDLE]).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Complete Fish Tank", player),
                              And(logic.can_reach_location(bundle.name)
-                                 for bundle in locations.locations_by_tag[LocationTags.FISH_TANK_BUNDLE]).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Complete Boiler Room", player),
+                                 for bundle in locations_by_tag[LocationTags.FISH_TANK_BUNDLE]).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Complete Boiler Room", player),
                              And(logic.can_reach_location(bundle.name)
-                                 for bundle in locations.locations_by_tag[LocationTags.BOILER_ROOM_BUNDLE]).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Complete Bulletin Board", player),
+                                 for bundle in locations_by_tag[LocationTags.BOILER_ROOM_BUNDLE]).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Complete Bulletin Board", player),
                              And(logic.can_reach_location(bundle.name)
                                  for bundle
-                                 in locations.locations_by_tag[LocationTags.BULLETIN_BOARD_BUNDLE]).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Complete Vault", player),
+                                 in locations_by_tag[LocationTags.BULLETIN_BOARD_BUNDLE]).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Complete Vault", player),
                              And(logic.can_reach_location(bundle.name)
-                                 for bundle in locations.locations_by_tag[LocationTags.VAULT_BUNDLE]).simplify())
+                                 for bundle in locations_by_tag[LocationTags.VAULT_BUNDLE]).simplify())
 
     # Buildings
-    if world_options[options.BuildingProgression] != options.BuildingProgression.option_vanilla:
-        for building in locations.locations_by_tag[LocationTags.BUILDING_BLUEPRINT]:
-            if building.mod_name is not None and building.mod_name not in world_options[options.Mods]:
+    if world_options.building_progression != BuildingProgression.option_vanilla:
+        for building in locations_by_tag[LocationTags.BUILDING_BLUEPRINT]:
+            if building.mod_name is not None and building.mod_name not in world_options.mods:
                 continue
-            MultiWorldRules.set_rule(multi_world.get_location(building.name, player),
+            MultiWorldRules.set_rule(multiworld.get_location(building.name, player),
                                      logic.building_rules[building.name.replace(" Blueprint", "")].simplify())
 
-    set_cropsanity_rules(all_location_names, logic, multi_world, player, world_options)
-    set_story_quests_rules(all_location_names, logic, multi_world, player, world_options)
-    set_special_order_rules(all_location_names, logic, multi_world, player, world_options)
-    set_help_wanted_quests_rules(logic, multi_world, player, world_options)
-    set_fishsanity_rules(all_location_names, logic, multi_world, player)
-    set_museumsanity_rules(all_location_names, logic, multi_world, player, world_options)
-    set_friendsanity_rules(all_location_names, logic, multi_world, player)
-    set_backpack_rules(logic, multi_world, player, world_options)
-    set_festival_rules(all_location_names, logic, multi_world, player)
+    set_cropsanity_rules(all_location_names, logic, multiworld, player, world_options)
+    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_friendsanity_rules(all_location_names, logic, multiworld, player)
+    set_backpack_rules(logic, multiworld, player, world_options)
+    set_festival_rules(all_location_names, logic, multiworld, player)
 
-    MultiWorldRules.add_rule(multi_world.get_location("Old Master Cannoli", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Old Master Cannoli", player),
                              logic.has("Sweet Gem Berry").simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Galaxy Sword Shrine", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Galaxy Sword Shrine", player),
                              logic.has("Prismatic Shard").simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Have a Baby", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Have a Baby", player),
                              logic.can_reproduce(1).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Have Another Baby", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Have Another Baby", player),
                              logic.can_reproduce(2).simplify())
 
-    set_traveling_merchant_rules(logic, multi_world, player)
-    set_arcade_machine_rules(logic, multi_world, player, world_options)
-    set_deepwoods_rules(logic, multi_world, player, world_options)
-    set_magic_spell_rules(logic, multi_world, player, world_options)
+    set_traveling_merchant_rules(logic, multiworld, player)
+    set_arcade_machine_rules(logic, multiworld, player, world_options)
+    set_deepwoods_rules(logic, multiworld, player, world_options)
+    set_magic_spell_rules(logic, multiworld, player, world_options)
 
 
-def set_skills_rules(logic, multi_world, player, world_options):
+def set_skills_rules(logic, multiworld, player, world_options):
     # Skills
-    if world_options[options.SkillProgression] != options.SkillProgression.option_vanilla:
+    if world_options.skill_progression != SkillProgression.option_vanilla:
         for i in range(1, 11):
-            set_skill_rule(logic, multi_world, player, Skill.farming, i)
-            set_skill_rule(logic, multi_world, player, Skill.fishing, i)
-            set_skill_rule(logic, multi_world, player, Skill.foraging, i)
-            set_skill_rule(logic, multi_world, player, Skill.mining, i)
-            set_skill_rule(logic, multi_world, player, Skill.combat, i)
+            set_skill_rule(logic, multiworld, player, Skill.farming, i)
+            set_skill_rule(logic, multiworld, player, Skill.fishing, i)
+            set_skill_rule(logic, multiworld, player, Skill.foraging, i)
+            set_skill_rule(logic, multiworld, player, Skill.mining, i)
+            set_skill_rule(logic, multiworld, player, Skill.combat, i)
 
             # Modded Skills
-            if ModNames.luck_skill in world_options[options.Mods]:
-                set_skill_rule(logic, multi_world, player, ModSkill.luck, i)
-            if ModNames.magic in world_options[options.Mods]:
-                set_skill_rule(logic, multi_world, player, ModSkill.magic, i)
-            if ModNames.binning_skill in world_options[options.Mods]:
-                set_skill_rule(logic, multi_world, player, ModSkill.binning, i)
-            if ModNames.cooking_skill in world_options[options.Mods]:
-                set_skill_rule(logic, multi_world, player, ModSkill.cooking, i)
-            if ModNames.socializing_skill in world_options[options.Mods]:
-                set_skill_rule(logic, multi_world, player, ModSkill.socializing, i)
-            if ModNames.archaeology in world_options[options.Mods]:
-                set_skill_rule(logic, multi_world, player, ModSkill.archaeology, i)
+            if ModNames.luck_skill in world_options.mods:
+                set_skill_rule(logic, multiworld, player, ModSkill.luck, i)
+            if ModNames.magic in world_options.mods:
+                set_skill_rule(logic, multiworld, player, ModSkill.magic, i)
+            if ModNames.binning_skill in world_options.mods:
+                set_skill_rule(logic, multiworld, player, ModSkill.binning, i)
+            if ModNames.cooking_skill in world_options.mods:
+                set_skill_rule(logic, multiworld, player, ModSkill.cooking, i)
+            if ModNames.socializing_skill in world_options.mods:
+                set_skill_rule(logic, multiworld, player, ModSkill.socializing, i)
+            if ModNames.archaeology in world_options.mods:
+                set_skill_rule(logic, multiworld, player, ModSkill.archaeology, i)
 
 
-def set_skill_rule(logic, multi_world, player, skill: str, level: int):
+def set_skill_rule(logic, multiworld, player, skill: str, level: int):
     location_name = f"Level {level} {skill}"
-    location = multi_world.get_location(location_name, player)
+    location = multiworld.get_location(location_name, player)
     rule = logic.can_earn_skill_level(skill, level).simplify()
     MultiWorldRules.set_rule(location, rule)
 
 
-def set_entrance_rules(logic, multi_world, player, world_options: StardewOptions):
+def set_entrance_rules(logic, multiworld, player, world_options: StardewValleyOptions):
     for floor in range(5, 120 + 5, 5):
-        MultiWorldRules.set_rule(multi_world.get_entrance(dig_to_mines_floor(floor), player),
+        MultiWorldRules.set_rule(multiworld.get_entrance(dig_to_mines_floor(floor), player),
                                  logic.can_mine_to_floor(floor).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_tide_pools, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_tide_pools, player),
                              logic.received("Beach Bridge") | (magic.can_blink(logic)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_quarry, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_quarry, player),
                              logic.received("Bridge Repair") | (magic.can_blink(logic)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_secret_woods, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_secret_woods, player),
                              logic.has_tool(Tool.axe, "Iron") | (magic.can_blink(logic)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.forest_to_sewer, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.forest_to_sewer, player),
                              logic.has_rusty_key().simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.town_to_sewer, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.town_to_sewer, player),
                              logic.has_rusty_key().simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.take_bus_to_desert, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.take_bus_to_desert, player),
                              logic.received("Bus Repair").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_skull_cavern, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_skull_cavern, player),
                              logic.received(Wallet.skull_key).simplify())
     for floor in range(25, 200 + 25, 25):
-        MultiWorldRules.set_rule(multi_world.get_entrance(dig_to_skull_floor(floor), player),
+        MultiWorldRules.set_rule(multiworld.get_entrance(dig_to_skull_floor(floor), player),
                                  logic.can_mine_to_skull_cavern_floor(floor).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.talk_to_mines_dwarf, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.talk_to_mines_dwarf, player),
                              logic.can_speak_dwarf() & logic.has_tool(Tool.pickaxe, ToolMaterial.iron))
 
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.use_desert_obelisk, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_desert_obelisk, player),
                              logic.received(Transportation.desert_obelisk).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.use_island_obelisk, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_island_obelisk, player),
                              logic.received(Transportation.island_obelisk).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.use_farm_obelisk, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_farm_obelisk, player),
                              logic.received(Transportation.farm_obelisk).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.buy_from_traveling_merchant, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.buy_from_traveling_merchant, player),
                              logic.has_traveling_merchant())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_greenhouse, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_greenhouse, player),
                              logic.received("Greenhouse"))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.mountain_to_adventurer_guild, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_adventurer_guild, player),
                              logic.received("Adventurer's Guild"))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.mountain_to_railroad, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_railroad, player),
                              logic.has_lived_months(2))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_witch_warp_cave, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_witch_warp_cave, player),
                              logic.received(Wallet.dark_talisman) | (magic.can_blink(logic)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_witch_hut, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_witch_hut, player),
                              (logic.has(ArtisanGood.void_mayonnaise) | magic.can_blink(logic)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_mutant_bug_lair, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_mutant_bug_lair, player),
                              ((logic.has_rusty_key() & logic.can_reach_region(Region.railroad) &
                                logic.can_meet(NPC.krobus) | magic.can_blink(logic)).simplify()))
 
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_harvey_room, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_harvey_room, player),
                              logic.has_relationship(NPC.harvey, 2))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.mountain_to_maru_room, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_maru_room, player),
                              logic.has_relationship(NPC.maru, 2))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_sebastian_room, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_sebastian_room, player),
                              (logic.has_relationship(NPC.sebastian, 2) | magic.can_blink(logic)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.forest_to_leah_cottage, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.forest_to_leah_cottage, player),
                              logic.has_relationship(NPC.leah, 2))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_elliott_house, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_elliott_house, player),
                              logic.has_relationship(NPC.elliott, 2))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_sunroom, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_sunroom, player),
                              logic.has_relationship(NPC.caroline, 2))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.enter_wizard_basement, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.enter_wizard_basement, player),
                              logic.has_relationship(NPC.wizard, 4))
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.mountain_to_leo_treehouse, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.mountain_to_leo_treehouse, player),
                              logic.received("Treehouse"))
-    if ModNames.alec in world_options[options.Mods]:
-        MultiWorldRules.set_rule(multi_world.get_entrance(AlecEntrance.petshop_to_bedroom, player),
+    if ModNames.alec in world_options.mods:
+        MultiWorldRules.set_rule(multiworld.get_entrance(AlecEntrance.petshop_to_bedroom, player),
                                  (logic.has_relationship(ModNPC.alec, 2) | magic.can_blink(logic)).simplify())
 
 
-def set_ginger_island_rules(logic: StardewLogic, multi_world, player, world_options: StardewOptions):
-    set_island_entrances_rules(logic, multi_world, player)
-    if world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true:
+def set_ginger_island_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+    set_island_entrances_rules(logic, multiworld, player)
+    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
         return
 
-    set_boat_repair_rules(logic, multi_world, player)
-    set_island_parrot_rules(logic, multi_world, player)
-    MultiWorldRules.add_rule(multi_world.get_location("Open Professor Snail Cave", player),
+    set_boat_repair_rules(logic, multiworld, player)
+    set_island_parrot_rules(logic, multiworld, player)
+    MultiWorldRules.add_rule(multiworld.get_location("Open Professor Snail Cave", player),
                              logic.has(Craftable.cherry_bomb).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Complete Island Field Office", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Complete Island Field Office", player),
                              logic.can_complete_field_office().simplify())
 
 
-def set_boat_repair_rules(logic: StardewLogic, multi_world, player):
-    MultiWorldRules.add_rule(multi_world.get_location("Repair Boat Hull", player),
+def set_boat_repair_rules(logic: StardewLogic, multiworld, player):
+    MultiWorldRules.add_rule(multiworld.get_location("Repair Boat Hull", player),
                              logic.has(Material.hardwood).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Repair Boat Anchor", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Repair Boat Anchor", player),
                              logic.has(MetalBar.iridium).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Repair Ticket Machine", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Repair Ticket Machine", player),
                              logic.has(ArtisanGood.battery_pack).simplify())
 
 
-def set_island_entrances_rules(logic: StardewLogic, multi_world, player):
+def set_island_entrances_rules(logic: StardewLogic, multiworld, player):
     boat_repaired = logic.received(Transportation.boat_repair).simplify()
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.fish_shop_to_boat_tunnel, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.fish_shop_to_boat_tunnel, player),
                              boat_repaired)
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.boat_to_ginger_island, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.boat_to_ginger_island, player),
                              boat_repaired)
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_south_to_west, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_south_to_west, player),
                              logic.received("Island West Turtle").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_south_to_north, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_south_to_north, player),
                              logic.received("Island North Turtle").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_west_to_islandfarmhouse, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_west_to_islandfarmhouse, player),
                              logic.received("Island Farmhouse").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_west_to_gourmand_cave, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_west_to_gourmand_cave, player),
                              logic.received("Island Farmhouse").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_north_to_dig_site, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_north_to_dig_site, player),
                              logic.received("Dig Site Bridge").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.dig_site_to_professor_snail_cave, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.dig_site_to_professor_snail_cave, player),
                              logic.received("Open Professor Snail Cave").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.talk_to_island_trader, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.talk_to_island_trader, player),
                              logic.received("Island Trader").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_south_to_southeast, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_south_to_southeast, player),
                              logic.received("Island Resort").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.use_island_resort, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.use_island_resort, player),
                              logic.received("Island Resort").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_west_to_qi_walnut_room, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_west_to_qi_walnut_room, player),
                              logic.received("Qi Walnut Room").simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.island_north_to_volcano, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.island_north_to_volcano, player),
                              (logic.can_water(0) | logic.received("Volcano Bridge") |
                               magic.can_blink(logic)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.volcano_to_secret_beach, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.volcano_to_secret_beach, player),
                              logic.can_water(2).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.climb_to_volcano_5, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.climb_to_volcano_5, player),
                              (logic.can_mine_perfectly() & logic.can_water(1)).simplify())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.talk_to_volcano_dwarf, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.talk_to_volcano_dwarf, player),
                              logic.can_speak_dwarf())
-    MultiWorldRules.set_rule(multi_world.get_entrance(Entrance.climb_to_volcano_10, player),
+    MultiWorldRules.set_rule(multiworld.get_entrance(Entrance.climb_to_volcano_10, player),
                              (logic.can_mine_perfectly() & logic.can_water(1) & logic.received("Volcano Exit Shortcut")).simplify())
     parrots = [Entrance.parrot_express_docks_to_volcano, Entrance.parrot_express_jungle_to_volcano,
                Entrance.parrot_express_dig_site_to_volcano, Entrance.parrot_express_docks_to_dig_site,
@@ -281,78 +285,78 @@ def set_island_entrances_rules(logic: StardewLogic, multi_world, player):
                Entrance.parrot_express_volcano_to_jungle, Entrance.parrot_express_jungle_to_docks,
                Entrance.parrot_express_dig_site_to_docks, Entrance.parrot_express_volcano_to_docks]
     for parrot in parrots:
-        MultiWorldRules.set_rule(multi_world.get_entrance(parrot, player), logic.received(Transportation.parrot_express).simplify())
+        MultiWorldRules.set_rule(multiworld.get_entrance(parrot, player), logic.received(Transportation.parrot_express).simplify())
 
 
-def set_island_parrot_rules(logic: StardewLogic, multi_world, player):
+def set_island_parrot_rules(logic: StardewLogic, multiworld, player):
     has_walnut = logic.has_walnut(1).simplify()
     has_5_walnut = logic.has_walnut(5).simplify()
     has_10_walnut = logic.has_walnut(10).simplify()
     has_20_walnut = logic.has_walnut(20).simplify()
-    MultiWorldRules.add_rule(multi_world.get_location("Leo's Parrot", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Leo's Parrot", player),
                              has_walnut)
-    MultiWorldRules.add_rule(multi_world.get_location("Island West Turtle", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Island West Turtle", player),
                              has_10_walnut & logic.received("Island North Turtle"))
-    MultiWorldRules.add_rule(multi_world.get_location("Island Farmhouse", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Island Farmhouse", player),
                              has_20_walnut)
-    MultiWorldRules.add_rule(multi_world.get_location("Island Mailbox", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Island Mailbox", player),
                              has_5_walnut & logic.received("Island Farmhouse"))
-    MultiWorldRules.add_rule(multi_world.get_location(Transportation.farm_obelisk, player),
+    MultiWorldRules.add_rule(multiworld.get_location(Transportation.farm_obelisk, player),
                              has_20_walnut & logic.received("Island Mailbox"))
-    MultiWorldRules.add_rule(multi_world.get_location("Dig Site Bridge", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Dig Site Bridge", player),
                              has_10_walnut & logic.received("Island West Turtle"))
-    MultiWorldRules.add_rule(multi_world.get_location("Island Trader", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Island Trader", player),
                              has_10_walnut & logic.received("Island Farmhouse"))
-    MultiWorldRules.add_rule(multi_world.get_location("Volcano Bridge", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Volcano Bridge", player),
                              has_5_walnut & logic.received("Island West Turtle") &
                              logic.can_reach_region(Region.volcano_floor_10))
-    MultiWorldRules.add_rule(multi_world.get_location("Volcano Exit Shortcut", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Volcano Exit Shortcut", player),
                              has_5_walnut & logic.received("Island West Turtle"))
-    MultiWorldRules.add_rule(multi_world.get_location("Island Resort", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Island Resort", player),
                              has_20_walnut & logic.received("Island Farmhouse"))
-    MultiWorldRules.add_rule(multi_world.get_location(Transportation.parrot_express, player),
+    MultiWorldRules.add_rule(multiworld.get_location(Transportation.parrot_express, player),
                              has_10_walnut)
 
 
-def set_cropsanity_rules(all_location_names: List[str], logic, multi_world, player, world_options: StardewOptions):
-    if world_options[options.Cropsanity] == options.Cropsanity.option_disabled:
+def set_cropsanity_rules(all_location_names: List[str], logic, multiworld, player, world_options: StardewValleyOptions):
+    if world_options.cropsanity == Cropsanity.option_disabled:
         return
 
     harvest_prefix = "Harvest "
     harvest_prefix_length = len(harvest_prefix)
-    for harvest_location in locations.locations_by_tag[LocationTags.CROPSANITY]:
-        if harvest_location.name in all_location_names and (harvest_location.mod_name is None or harvest_location.mod_name in world_options[options.Mods]):
+    for harvest_location in locations_by_tag[LocationTags.CROPSANITY]:
+        if harvest_location.name in all_location_names and (harvest_location.mod_name is None or harvest_location.mod_name in world_options.mods):
             crop_name = harvest_location.name[harvest_prefix_length:]
-            MultiWorldRules.set_rule(multi_world.get_location(harvest_location.name, player),
+            MultiWorldRules.set_rule(multiworld.get_location(harvest_location.name, player),
                                      logic.has(crop_name).simplify())
 
 
-def set_story_quests_rules(all_location_names: List[str], logic, multi_world, player, world_options: StardewOptions):
-    for quest in locations.locations_by_tag[LocationTags.QUEST]:
-        if quest.name in all_location_names and (quest.mod_name is None or quest.mod_name in world_options[options.Mods]):
-            MultiWorldRules.set_rule(multi_world.get_location(quest.name, player),
+def set_story_quests_rules(all_location_names: List[str], logic, multiworld, player, world_options: StardewValleyOptions):
+    for quest in locations_by_tag[LocationTags.QUEST]:
+        if quest.name in all_location_names and (quest.mod_name is None or quest.mod_name in world_options.mods):
+            MultiWorldRules.set_rule(multiworld.get_location(quest.name, player),
                                      logic.quest_rules[quest.name].simplify())
 
 
-def set_special_order_rules(all_location_names: List[str], logic: StardewLogic, multi_world, player,
-                            world_options: StardewOptions):
-    if world_options[options.SpecialOrderLocations] == options.SpecialOrderLocations.option_disabled:
+def set_special_order_rules(all_location_names: List[str], logic: StardewLogic, multiworld, player,
+                            world_options: StardewValleyOptions):
+    if world_options.special_order_locations == SpecialOrderLocations.option_disabled:
         return
     board_rule = logic.received("Special Order Board") & logic.has_lived_months(4)
-    for board_order in locations.locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]:
+    for board_order in locations_by_tag[LocationTags.SPECIAL_ORDER_BOARD]:
         if board_order.name in all_location_names:
             order_rule = board_rule & logic.special_order_rules[board_order.name]
-            MultiWorldRules.set_rule(multi_world.get_location(board_order.name, player), order_rule.simplify())
+            MultiWorldRules.set_rule(multiworld.get_location(board_order.name, player), order_rule.simplify())
 
-    if world_options[options.ExcludeGingerIsland] == options.ExcludeGingerIsland.option_true:
+    if world_options.exclude_ginger_island == ExcludeGingerIsland.option_true:
         return
-    if world_options[options.SpecialOrderLocations] == options.SpecialOrderLocations.option_board_only:
+    if world_options.special_order_locations == SpecialOrderLocations.option_board_only:
         return
     qi_rule = logic.can_reach_region(Region.qi_walnut_room) & logic.has_lived_months(8)
-    for qi_order in locations.locations_by_tag[LocationTags.SPECIAL_ORDER_QI]:
+    for qi_order in locations_by_tag[LocationTags.SPECIAL_ORDER_QI]:
         if qi_order.name in all_location_names:
             order_rule = qi_rule & logic.special_order_rules[qi_order.name]
-            MultiWorldRules.set_rule(multi_world.get_location(qi_order.name, player), order_rule.simplify())
+            MultiWorldRules.set_rule(multiworld.get_location(qi_order.name, player), order_rule.simplify())
 
 
 help_wanted_prefix = "Help Wanted:"
@@ -362,8 +366,8 @@ fishing = "Fishing"
 slay_monsters = "Slay Monsters"
 
 
-def set_help_wanted_quests_rules(logic: StardewLogic, multi_world, player, world_options):
-    help_wanted_number = world_options[options.HelpWantedLocations]
+def set_help_wanted_quests_rules(logic: StardewLogic, multiworld, player, world_options: StardewValleyOptions):
+    help_wanted_number = world_options.help_wanted_locations
     for i in range(0, help_wanted_number):
         set_number = i // 7
         month_rule = logic.has_lived_months(set_number).simplify()
@@ -371,58 +375,58 @@ def set_help_wanted_quests_rules(logic: StardewLogic, multi_world, 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(multi_world, player, month_rule, quest_number)
+            set_help_wanted_delivery_rule(multiworld, player, month_rule, quest_number)
         elif quest_number_in_set == 4:
-            set_help_wanted_fishing_rule(logic, multi_world, player, month_rule, quest_number)
+            set_help_wanted_fishing_rule(logic, multiworld, player, month_rule, quest_number)
         elif quest_number_in_set == 5:
-            set_help_wanted_slay_monsters_rule(logic, multi_world, player, month_rule, quest_number)
+            set_help_wanted_slay_monsters_rule(logic, multiworld, player, month_rule, quest_number)
         elif quest_number_in_set == 6:
-            set_help_wanted_gathering_rule(multi_world, player, month_rule, quest_number)
+            set_help_wanted_gathering_rule(multiworld, player, month_rule, quest_number)
 
 
-def set_help_wanted_delivery_rule(multi_world, player, month_rule, quest_number):
+def set_help_wanted_delivery_rule(multiworld, player, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {item_delivery} {quest_number}"
-    MultiWorldRules.set_rule(multi_world.get_location(location_name, player), month_rule)
+    MultiWorldRules.set_rule(multiworld.get_location(location_name, player), month_rule)
 
 
-def set_help_wanted_gathering_rule(multi_world, player, month_rule, quest_number):
+def set_help_wanted_gathering_rule(multiworld, player, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {gathering} {quest_number}"
-    MultiWorldRules.set_rule(multi_world.get_location(location_name, player), month_rule)
+    MultiWorldRules.set_rule(multiworld.get_location(location_name, player), month_rule)
 
 
-def set_help_wanted_fishing_rule(logic: StardewLogic, multi_world, player, month_rule, quest_number):
+def set_help_wanted_fishing_rule(logic: StardewLogic, multiworld, player, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {fishing} {quest_number}"
     fishing_rule = month_rule & logic.can_fish()
-    MultiWorldRules.set_rule(multi_world.get_location(location_name, player), fishing_rule.simplify())
+    MultiWorldRules.set_rule(multiworld.get_location(location_name, player), fishing_rule.simplify())
 
 
-def set_help_wanted_slay_monsters_rule(logic: StardewLogic, multi_world, player, month_rule, quest_number):
+def set_help_wanted_slay_monsters_rule(logic: StardewLogic, multiworld, player, month_rule, quest_number):
     location_name = f"{help_wanted_prefix} {slay_monsters} {quest_number}"
     slay_rule = month_rule & logic.can_do_combat_at_level("Basic")
-    MultiWorldRules.set_rule(multi_world.get_location(location_name, player), slay_rule.simplify())
+    MultiWorldRules.set_rule(multiworld.get_location(location_name, player), slay_rule.simplify())
 
 
-def set_fishsanity_rules(all_location_names: List[str], logic: StardewLogic, multi_world: MultiWorld, player: int):
+def set_fishsanity_rules(all_location_names: List[str], logic: StardewLogic, multiworld: MultiWorld, player: int):
     fish_prefix = "Fishsanity: "
-    for fish_location in locations.locations_by_tag[LocationTags.FISHSANITY]:
+    for fish_location in locations_by_tag[LocationTags.FISHSANITY]:
         if fish_location.name in all_location_names:
             fish_name = fish_location.name[len(fish_prefix):]
-            MultiWorldRules.set_rule(multi_world.get_location(fish_location.name, player),
+            MultiWorldRules.set_rule(multiworld.get_location(fish_location.name, player),
                                      logic.has(fish_name).simplify())
 
 
-def set_museumsanity_rules(all_location_names: List[str], logic: StardewLogic, multi_world: MultiWorld, player: int,
-                           world_options: StardewOptions):
+def set_museumsanity_rules(all_location_names: List[str], logic: StardewLogic, multiworld: MultiWorld, player: int,
+                           world_options: StardewValleyOptions):
     museum_prefix = "Museumsanity: "
-    if world_options[options.Museumsanity] == options.Museumsanity.option_milestones:
-        for museum_milestone in locations.locations_by_tag[LocationTags.MUSEUM_MILESTONES]:
-            set_museum_milestone_rule(logic, multi_world, museum_milestone, museum_prefix, player)
-    elif world_options[options.Museumsanity] != options.Museumsanity.option_none:
-        set_museum_individual_donations_rules(all_location_names, logic, multi_world, museum_prefix, player)
+    if world_options.museumsanity == Museumsanity.option_milestones:
+        for museum_milestone in locations_by_tag[LocationTags.MUSEUM_MILESTONES]:
+            set_museum_milestone_rule(logic, multiworld, museum_milestone, museum_prefix, player)
+    elif world_options.museumsanity != Museumsanity.option_none:
+        set_museum_individual_donations_rules(all_location_names, logic, multiworld, museum_prefix, player)
 
 
-def set_museum_individual_donations_rules(all_location_names, logic: StardewLogic, multi_world, museum_prefix, player):
-    all_donations = sorted(locations.locations_by_tag[LocationTags.MUSEUM_DONATIONS],
+def set_museum_individual_donations_rules(all_location_names, logic: StardewLogic, multiworld, museum_prefix, player):
+    all_donations = sorted(locations_by_tag[LocationTags.MUSEUM_DONATIONS],
                            key=lambda x: all_museum_items_by_name[x.name[len(museum_prefix):]].difficulty, reverse=True)
     counter = 0
     number_donations = len(all_donations)
@@ -430,13 +434,14 @@ def set_museum_individual_donations_rules(all_location_names, logic: StardewLogi
         if museum_location.name in all_location_names:
             donation_name = museum_location.name[len(museum_prefix):]
             required_detectors = counter * 5 // number_donations
-            rule = logic.can_donate_museum_item(all_museum_items_by_name[donation_name]) & logic.received("Traveling Merchant Metal Detector", required_detectors)
-            MultiWorldRules.set_rule(multi_world.get_location(museum_location.name, player),
+            rule = logic.can_donate_museum_item(all_museum_items_by_name[donation_name]) & logic.received("Traveling Merchant Metal Detector",
+                                                                                                          required_detectors)
+            MultiWorldRules.set_rule(multiworld.get_location(museum_location.name, player),
                                      rule.simplify())
         counter += 1
 
 
-def set_museum_milestone_rule(logic: StardewLogic, multi_world: MultiWorld, museum_milestone, museum_prefix: str,
+def set_museum_milestone_rule(logic: StardewLogic, multiworld: MultiWorld, museum_milestone, museum_prefix: str,
                               player: int):
     milestone_name = museum_milestone.name[len(museum_prefix):]
     donations_suffix = " Donations"
@@ -462,7 +467,7 @@ def set_museum_milestone_rule(logic: StardewLogic, multi_world: MultiWorld, muse
         rule = logic.can_donate_museum_item(Artifact.ancient_seed) & logic.received(metal_detector, 4)
     if rule is None:
         return
-    MultiWorldRules.set_rule(multi_world.get_location(museum_milestone.name, player), rule.simplify())
+    MultiWorldRules.set_rule(multiworld.get_location(museum_milestone.name, player), rule.simplify())
 
 
 def get_museum_item_count_rule(logic: StardewLogic, suffix, milestone_name, accepted_items, donation_func):
@@ -473,156 +478,156 @@ def get_museum_item_count_rule(logic: StardewLogic, suffix, milestone_name, acce
     return rule
 
 
-def set_backpack_rules(logic: StardewLogic, multi_world: MultiWorld, player: int, world_options):
-    if world_options[options.BackpackProgression] != options.BackpackProgression.option_vanilla:
-        MultiWorldRules.set_rule(multi_world.get_location("Large Pack", player),
+def set_backpack_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
+    if world_options.backpack_progression != BackpackProgression.option_vanilla:
+        MultiWorldRules.set_rule(multiworld.get_location("Large Pack", player),
                                  logic.can_spend_money(2000).simplify())
-        MultiWorldRules.set_rule(multi_world.get_location("Deluxe Pack", player),
+        MultiWorldRules.set_rule(multiworld.get_location("Deluxe Pack", player),
                                  (logic.can_spend_money(10000) & logic.received("Progressive Backpack")).simplify())
-        if ModNames.big_backpack in world_options[options.Mods]:
-            MultiWorldRules.set_rule(multi_world.get_location("Premium Pack", player),
+        if ModNames.big_backpack in world_options.mods:
+            MultiWorldRules.set_rule(multiworld.get_location("Premium Pack", player),
                                      (logic.can_spend_money(150000) &
                                       logic.received("Progressive Backpack", 2)).simplify())
 
 
-def set_festival_rules(all_location_names: List[str], logic: StardewLogic, multi_world, player):
+def set_festival_rules(all_location_names: List[str], logic: StardewLogic, multiworld, player):
     festival_locations = []
-    festival_locations.extend(locations.locations_by_tag[LocationTags.FESTIVAL])
-    festival_locations.extend(locations.locations_by_tag[LocationTags.FESTIVAL_HARD])
+    festival_locations.extend(locations_by_tag[LocationTags.FESTIVAL])
+    festival_locations.extend(locations_by_tag[LocationTags.FESTIVAL_HARD])
     for festival in festival_locations:
         if festival.name in all_location_names:
-            MultiWorldRules.set_rule(multi_world.get_location(festival.name, player),
+            MultiWorldRules.set_rule(multiworld.get_location(festival.name, player),
                                      logic.festival_rules[festival.name].simplify())
 
 
-def set_traveling_merchant_rules(logic: StardewLogic, multi_world: MultiWorld, player: int):
+def set_traveling_merchant_rules(logic: StardewLogic, multiworld: MultiWorld, player: int):
     for day in Weekday.all_days:
         item_for_day = f"Traveling Merchant: {day}"
         for i in range(1, 4):
             location_name = f"Traveling Merchant {day} Item {i}"
-            MultiWorldRules.set_rule(multi_world.get_location(location_name, player),
+            MultiWorldRules.set_rule(multiworld.get_location(location_name, player),
                                      logic.received(item_for_day))
 
 
-def set_arcade_machine_rules(logic: StardewLogic, multi_world: MultiWorld, player: int, world_options):
-    MultiWorldRules.add_rule(multi_world.get_entrance(Entrance.play_junimo_kart, player),
+def set_arcade_machine_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
+    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_junimo_kart, player),
                              logic.received(Wallet.skull_key).simplify())
-    if world_options[options.ArcadeMachineLocations] != options.ArcadeMachineLocations.option_full_shuffling:
+    if world_options.arcade_machine_locations != ArcadeMachineLocations.option_full_shuffling:
         return
 
-    MultiWorldRules.add_rule(multi_world.get_entrance(Entrance.play_junimo_kart, player),
+    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_junimo_kart, player),
                              logic.has("Junimo Kart Small Buff").simplify())
-    MultiWorldRules.add_rule(multi_world.get_entrance(Entrance.reach_junimo_kart_2, player),
+    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_junimo_kart_2, player),
                              logic.has("Junimo Kart Medium Buff").simplify())
-    MultiWorldRules.add_rule(multi_world.get_entrance(Entrance.reach_junimo_kart_3, player),
+    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_junimo_kart_3, player),
                              logic.has("Junimo Kart Big Buff").simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Junimo Kart: Sunset Speedway (Victory)", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Junimo Kart: Sunset Speedway (Victory)", player),
                              logic.has("Junimo Kart Max Buff").simplify())
-    MultiWorldRules.add_rule(multi_world.get_entrance(Entrance.play_journey_of_the_prairie_king, player),
+    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.play_journey_of_the_prairie_king, player),
                              logic.has("JotPK Small Buff").simplify())
-    MultiWorldRules.add_rule(multi_world.get_entrance(Entrance.reach_jotpk_world_2, player),
+    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_jotpk_world_2, player),
                              logic.has("JotPK Medium Buff").simplify())
-    MultiWorldRules.add_rule(multi_world.get_entrance(Entrance.reach_jotpk_world_3, player),
+    MultiWorldRules.add_rule(multiworld.get_entrance(Entrance.reach_jotpk_world_3, player),
                              logic.has("JotPK Big Buff").simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Journey of the Prairie King Victory", player),
+    MultiWorldRules.add_rule(multiworld.get_location("Journey of the Prairie King Victory", player),
                              logic.has("JotPK Max Buff").simplify())
 
 
-def set_friendsanity_rules(all_location_names: List[str], logic: StardewLogic, multi_world: MultiWorld, player: int):
+def set_friendsanity_rules(all_location_names: List[str], logic: StardewLogic, multiworld: MultiWorld, player: int):
     friend_prefix = "Friendsanity: "
     friend_suffix = " <3"
-    for friend_location in locations.locations_by_tag[LocationTags.FRIENDSANITY]:
-        if not friend_location.name in all_location_names:
+    for friend_location in locations_by_tag[LocationTags.FRIENDSANITY]:
+        if friend_location.name not in all_location_names:
             continue
         friend_location_without_prefix = friend_location.name[len(friend_prefix):]
         friend_location_trimmed = friend_location_without_prefix[:friend_location_without_prefix.index(friend_suffix)]
         split_index = friend_location_trimmed.rindex(" ")
         friend_name = friend_location_trimmed[:split_index]
         num_hearts = int(friend_location_trimmed[split_index + 1:])
-        MultiWorldRules.set_rule(multi_world.get_location(friend_location.name, player),
+        MultiWorldRules.set_rule(multiworld.get_location(friend_location.name, player),
                                  logic.can_earn_relationship(friend_name, num_hearts).simplify())
 
 
-def set_deepwoods_rules(logic: StardewLogic, multi_world: MultiWorld, player: int, world_options: StardewOptions):
-    if ModNames.deepwoods in world_options[options.Mods]:
-        MultiWorldRules.add_rule(multi_world.get_location("Breaking Up Deep Woods Gingerbread House", player),
+def set_deepwoods_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
+    if ModNames.deepwoods in world_options.mods:
+        MultiWorldRules.add_rule(multiworld.get_location("Breaking Up Deep Woods Gingerbread House", player),
                                  logic.has_tool(Tool.axe, "Gold") & deepwoods.can_reach_woods_depth(logic, 50).simplify())
-        MultiWorldRules.add_rule(multi_world.get_location("Chop Down a Deep Woods Iridium Tree", player),
+        MultiWorldRules.add_rule(multiworld.get_location("Chop Down a Deep Woods Iridium Tree", player),
                                  logic.has_tool(Tool.axe, "Iridium").simplify())
-        MultiWorldRules.set_rule(multi_world.get_entrance(DeepWoodsEntrance.use_woods_obelisk, player),
+        MultiWorldRules.set_rule(multiworld.get_entrance(DeepWoodsEntrance.use_woods_obelisk, player),
                                  logic.received("Woods Obelisk").simplify())
         for depth in range(10, 100 + 10, 10):
-            MultiWorldRules.set_rule(multi_world.get_entrance(move_to_woods_depth(depth), player),
+            MultiWorldRules.set_rule(multiworld.get_entrance(move_to_woods_depth(depth), player),
                                      deepwoods.can_chop_to_depth(logic, depth).simplify())
 
 
-def set_magic_spell_rules(logic: StardewLogic, multi_world: MultiWorld, player: int, world_options: StardewOptions):
-    if ModNames.magic not in world_options[options.Mods]:
+def set_magic_spell_rules(logic: StardewLogic, multiworld: MultiWorld, player: int, world_options: StardewValleyOptions):
+    if ModNames.magic not in world_options.mods:
         return
 
-    MultiWorldRules.set_rule(multi_world.get_entrance(MagicEntrance.store_to_altar, player),
-                                 (logic.has_relationship(NPC.wizard, 3) &
-                                  logic.can_reach_region(Region.wizard_tower)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Clear Debris", player),
-                                 ((logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic"))
-                                  & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Till", player),
-                                 (logic.has_tool("Hoe", "Basic") & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Water", player),
-                                 (logic.has_tool("Watering Can", "Basic") & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze All Toil School Locations", player),
-                                 (logic.has_tool("Watering Can", "Basic") & logic.has_tool("Hoe", "Basic")
-                                  & (logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic"))
-                                  & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.set_rule(multiworld.get_entrance(MagicEntrance.store_to_altar, player),
+                             (logic.has_relationship(NPC.wizard, 3) &
+                              logic.can_reach_region(Region.wizard_tower)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Clear Debris", player),
+                             ((logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic"))
+                              & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Till", player),
+                             (logic.has_tool("Hoe", "Basic") & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Water", player),
+                             (logic.has_tool("Watering Can", "Basic") & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze All Toil School Locations", player),
+                             (logic.has_tool("Watering Can", "Basic") & logic.has_tool("Hoe", "Basic")
+                              & (logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic"))
+                              & magic.can_use_altar(logic)).simplify())
     # Do I *want* to add boots into logic when you get them even in vanilla without effort?  idk
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Evac", player),
-                                 (logic.can_mine_perfectly() & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Haste", player),
-                                 (logic.has("Coffee") & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Heal", player),
-                                 (logic.has("Life Elixir") & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze All Life School Locations", player),
-                                 (logic.has("Coffee") & logic.has("Life Elixir")
-                                  & logic.can_mine_perfectly() & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Descend", player),
-                                 (logic.can_reach_region(Region.mines) & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Fireball", player),
-                                 (logic.has("Fire Quartz") & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Frostbite", player),
-                                 (logic.can_mine_to_floor(70) & logic.can_fish(85) & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze All Elemental School Locations", player),
-                                 (logic.can_reach_region(Region.mines) & logic.has("Fire Quartz")
-                                  & logic.can_reach_region(Region.mines_floor_70) & logic.can_fish(85) &
-                                  magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Lantern", player),
-                                 magic.can_use_altar(logic).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Tendrils", player),
-                                 (logic.can_reach_region(Region.farm) & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Shockwave", player),
-                                 (logic.has("Earth Crystal") & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze All Nature School Locations", player),
-                                 (logic.has("Earth Crystal") & logic.can_reach_region("Farm") &
-                                  magic.can_use_altar(logic)).simplify()),
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Meteor", player),
-                                 (logic.can_reach_region(Region.farm) & logic.has_lived_months(12)
-                                  & magic.can_use_altar(logic)).simplify()),
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Lucksteal", player),
-                                 (logic.can_reach_region(Region.witch_hut) & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze: Bloodmana", player),
-                                 (logic.can_reach_region(Region.mines_floor_100) & magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze All Eldritch School Locations", player),
-                                 (logic.can_reach_region(Region.witch_hut) &
-                                  logic.can_reach_region(Region.mines_floor_100) &
-                                  logic.can_reach_region(Region.farm) & logic.has_lived_months(12) &
-                                  magic.can_use_altar(logic)).simplify())
-    MultiWorldRules.add_rule(multi_world.get_location("Analyze Every Magic School Location", player),
-                                 (logic.has_tool("Watering Can", "Basic") & logic.has_tool("Hoe", "Basic")
-                                  & (logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic")) &
-                                  logic.has("Coffee") & logic.has("Life Elixir")
-                                  & logic.can_mine_perfectly() & logic.has("Earth Crystal") &
-                                  logic.can_reach_region(Region.mines) &
-                                  logic.has("Fire Quartz") & logic.can_fish(85) &
-                                  logic.can_reach_region(Region.witch_hut) &
-                                  logic.can_reach_region(Region.mines_floor_100) &
-                                  logic.can_reach_region(Region.farm) & logic.has_lived_months(12) &
-                                  magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Evac", player),
+                             (logic.can_mine_perfectly() & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Haste", player),
+                             (logic.has("Coffee") & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Heal", player),
+                             (logic.has("Life Elixir") & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze All Life School Locations", player),
+                             (logic.has("Coffee") & logic.has("Life Elixir")
+                              & logic.can_mine_perfectly() & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Descend", player),
+                             (logic.can_reach_region(Region.mines) & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Fireball", player),
+                             (logic.has("Fire Quartz") & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Frostbite", player),
+                             (logic.can_mine_to_floor(70) & logic.can_fish(85) & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze All Elemental School Locations", player),
+                             (logic.can_reach_region(Region.mines) & logic.has("Fire Quartz")
+                              & logic.can_reach_region(Region.mines_floor_70) & logic.can_fish(85) &
+                              magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Lantern", player),
+                             magic.can_use_altar(logic).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Tendrils", player),
+                             (logic.can_reach_region(Region.farm) & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Shockwave", player),
+                             (logic.has("Earth Crystal") & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze All Nature School Locations", player),
+                             (logic.has("Earth Crystal") & logic.can_reach_region("Farm") &
+                              magic.can_use_altar(logic)).simplify()),
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Meteor", player),
+                             (logic.can_reach_region(Region.farm) & logic.has_lived_months(12)
+                              & magic.can_use_altar(logic)).simplify()),
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Lucksteal", player),
+                             (logic.can_reach_region(Region.witch_hut) & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze: Bloodmana", player),
+                             (logic.can_reach_region(Region.mines_floor_100) & magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze All Eldritch School Locations", player),
+                             (logic.can_reach_region(Region.witch_hut) &
+                              logic.can_reach_region(Region.mines_floor_100) &
+                              logic.can_reach_region(Region.farm) & logic.has_lived_months(12) &
+                              magic.can_use_altar(logic)).simplify())
+    MultiWorldRules.add_rule(multiworld.get_location("Analyze Every Magic School Location", player),
+                             (logic.has_tool("Watering Can", "Basic") & logic.has_tool("Hoe", "Basic")
+                              & (logic.has_tool("Axe", "Basic") | logic.has_tool("Pickaxe", "Basic")) &
+                              logic.has("Coffee") & logic.has("Life Elixir")
+                              & logic.can_mine_perfectly() & logic.has("Earth Crystal") &
+                              logic.can_reach_region(Region.mines) &
+                              logic.has("Fire Quartz") & logic.can_fish(85) &
+                              logic.can_reach_region(Region.witch_hut) &
+                              logic.can_reach_region(Region.mines_floor_100) &
+                              logic.can_reach_region(Region.farm) & logic.has_lived_months(12) &
+                              magic.can_use_altar(logic)).simplify())
diff --git a/worlds/stardew_valley/stardew_rule.py b/worlds/stardew_valley/stardew_rule.py
index d0fa9858cc..9c96de00d3 100644
--- a/worlds/stardew_valley/stardew_rule.py
+++ b/worlds/stardew_valley/stardew_rule.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Iterable, Dict, List, Union, FrozenSet
+from typing import Iterable, Dict, List, Union, FrozenSet, Set
 
 from BaseClasses import CollectionState, ItemClassification
 from .items import item_table
@@ -14,13 +14,13 @@ class StardewRule:
         raise NotImplementedError
 
     def __or__(self, other) -> StardewRule:
-        if isinstance(other, Or):
+        if type(other) is Or:
             return Or(self, *other.rules)
 
         return Or(self, other)
 
     def __and__(self, other) -> StardewRule:
-        if isinstance(other, And):
+        if type(other) is And:
             return And(other.rules.union({self}))
 
         return And(self, other)
@@ -80,30 +80,40 @@ class False_(StardewRule):  # noqa
         return 999999999
 
 
+false_ = False_()
+true_ = True_()
+assert false_ is False_()
+assert true_ is True_()
+
+
 class Or(StardewRule):
     rules: FrozenSet[StardewRule]
+    _simplified: bool
 
     def __init__(self, rule: Union[StardewRule, Iterable[StardewRule]], *rules: StardewRule):
-        rules_list = set()
+        rules_list: Set[StardewRule]
+
         if isinstance(rule, Iterable):
-            rules_list.update(rule)
+            rules_list = {*rule}
         else:
-            rules_list.add(rule)
+            rules_list = {rule}
 
         if rules is not None:
             rules_list.update(rules)
 
         assert rules_list, "Can't create a Or conditions without rules"
 
-        new_rules = set()
-        for rule in rules_list:
-            if isinstance(rule, Or):
-                new_rules.update(rule.rules)
-            else:
-                new_rules.add(rule)
-        rules_list = new_rules
+        if any(type(rule) is Or for rule in rules_list):
+            new_rules: Set[StardewRule] = set()
+            for rule in rules_list:
+                if type(rule) is Or:
+                    new_rules.update(rule.rules)
+                else:
+                    new_rules.add(rule)
+            rules_list = new_rules
 
         self.rules = frozenset(rules_list)
+        self._simplified = False
 
     def __call__(self, state: CollectionState) -> bool:
         return any(rule(state) for rule in self.rules)
@@ -112,11 +122,11 @@ class Or(StardewRule):
         return f"({' | '.join(repr(rule) for rule in self.rules)})"
 
     def __or__(self, other):
-        if isinstance(other, True_):
+        if other is true_:
             return other
-        if isinstance(other, False_):
+        if other is false_:
             return self
-        if isinstance(other, Or):
+        if type(other) is Or:
             return Or(self.rules.union(other.rules))
 
         return Or(self.rules.union({other}))
@@ -131,46 +141,53 @@ class Or(StardewRule):
         return min(rule.get_difficulty() for rule in self.rules)
 
     def simplify(self) -> StardewRule:
-        if any(isinstance(rule, True_) for rule in self.rules):
-            return True_()
+        if self._simplified:
+            return self
+        if true_ in self.rules:
+            return true_
 
-        simplified_rules = {rule.simplify() for rule in self.rules}
-        simplified_rules = {rule for rule in simplified_rules if rule is not False_()}
+        simplified_rules = [simplified for simplified in {rule.simplify() for rule in self.rules}
+                            if simplified is not false_]
 
         if not simplified_rules:
-            return False_()
+            return false_
 
         if len(simplified_rules) == 1:
-            return next(iter(simplified_rules))
+            return simplified_rules[0]
 
-        return Or(simplified_rules)
+        self.rules = frozenset(simplified_rules)
+        self._simplified = True
+        return self
 
 
 class And(StardewRule):
     rules: FrozenSet[StardewRule]
+    _simplified: bool
 
     def __init__(self, rule: Union[StardewRule, Iterable[StardewRule]], *rules: StardewRule):
-        rules_list = set()
+        rules_list: Set[StardewRule]
+
         if isinstance(rule, Iterable):
-            rules_list.update(rule)
+            rules_list = {*rule}
         else:
-            rules_list.add(rule)
+            rules_list = {rule}
 
         if rules is not None:
             rules_list.update(rules)
 
-        if len(rules_list) < 1:
-            rules_list.add(True_())
-
-        new_rules = set()
-        for rule in rules_list:
-            if isinstance(rule, And):
-                new_rules.update(rule.rules)
-            else:
-                new_rules.add(rule)
-        rules_list = new_rules
+        if not rules_list:
+            rules_list.add(true_)
+        elif any(type(rule) is And for rule in rules_list):
+            new_rules: Set[StardewRule] = set()
+            for rule in rules_list:
+                if type(rule) is And:
+                    new_rules.update(rule.rules)
+                else:
+                    new_rules.add(rule)
+            rules_list = new_rules
 
         self.rules = frozenset(rules_list)
+        self._simplified = False
 
     def __call__(self, state: CollectionState) -> bool:
         return all(rule(state) for rule in self.rules)
@@ -179,11 +196,11 @@ class And(StardewRule):
         return f"({' & '.join(repr(rule) for rule in self.rules)})"
 
     def __and__(self, other):
-        if isinstance(other, True_):
+        if other is true_:
             return self
-        if isinstance(other, False_):
+        if other is false_:
             return other
-        if isinstance(other, And):
+        if type(other) is And:
             return And(self.rules.union(other.rules))
 
         return And(self.rules.union({other}))
@@ -198,19 +215,23 @@ class And(StardewRule):
         return max(rule.get_difficulty() for rule in self.rules)
 
     def simplify(self) -> StardewRule:
-        if any(isinstance(rule, False_) for rule in self.rules):
-            return False_()
+        if self._simplified:
+            return self
+        if false_ in self.rules:
+            return false_
 
-        simplified_rules = {rule.simplify() for rule in self.rules}
-        simplified_rules = {rule for rule in simplified_rules if rule is not True_()}
+        simplified_rules = [simplified for simplified in {rule.simplify() for rule in self.rules}
+                            if simplified is not true_]
 
         if not simplified_rules:
-            return True_()
+            return true_
 
         if len(simplified_rules) == 1:
-            return next(iter(simplified_rules))
+            return simplified_rules[0]
 
-        return And(simplified_rules)
+        self.rules = frozenset(simplified_rules)
+        self._simplified = True
+        return self
 
 
 class Count(StardewRule):
@@ -218,11 +239,12 @@ class Count(StardewRule):
     rules: List[StardewRule]
 
     def __init__(self, count: int, rule: Union[StardewRule, Iterable[StardewRule]], *rules: StardewRule):
-        rules_list = []
+        rules_list: List[StardewRule]
+
         if isinstance(rule, Iterable):
-            rules_list.extend(rule)
+            rules_list = [*rule]
         else:
-            rules_list.append(rule)
+            rules_list = [rule]
 
         if rules is not None:
             rules_list.extend(rules)
@@ -260,11 +282,12 @@ class TotalReceived(StardewRule):
     player: int
 
     def __init__(self, count: int, items: Union[str, Iterable[str]], player: int):
-        items_list = []
+        items_list: List[str]
+
         if isinstance(items, Iterable):
-            items_list.extend(items)
+            items_list = [*items]
         else:
-            items_list.append(items)
+            items_list = [items]
 
         assert items_list, "Can't create a Total Received conditions without items"
         for item in items_list:
diff --git a/worlds/stardew_valley/test/TestBackpack.py b/worlds/stardew_valley/test/TestBackpack.py
index f26a7c1f03..378c90e40a 100644
--- a/worlds/stardew_valley/test/TestBackpack.py
+++ b/worlds/stardew_valley/test/TestBackpack.py
@@ -5,40 +5,41 @@ from .. import options
 class TestBackpackVanilla(SVTestBase):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla}
 
-    def test_no_backpack_in_pool(self):
-        item_names = {item.name for item in self.multiworld.get_items()}
-        self.assertNotIn("Progressive Backpack", item_names)
+    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)
 
-    def test_no_backpack_locations(self):
-        location_names = {location.name for location in self.multiworld.get_locations()}
-        self.assertNotIn("Large Pack", location_names)
-        self.assertNotIn("Deluxe Pack", location_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)
 
 
 class TestBackpackProgressive(SVTestBase):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive}
 
-    def test_backpack_is_in_pool_2_times(self):
-        item_names = [item.name for item in self.multiworld.get_items()]
-        self.assertEqual(item_names.count("Progressive Backpack"), 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)
 
-    def test_2_backpack_locations(self):
-        location_names = {location.name for location in self.multiworld.get_locations()}
-        self.assertIn("Large Pack", location_names)
-        self.assertIn("Deluxe Pack", location_names)
+        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)
 
 
-class TestBackpackEarlyProgressive(SVTestBase):
+class TestBackpackEarlyProgressive(TestBackpackProgressive):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_early_progressive}
 
-    def test_backpack_is_in_pool_2_times(self):
-        item_names = [item.name for item in self.multiworld.get_items()]
-        self.assertEqual(item_names.count("Progressive Backpack"), 2)
+    @property
+    def run_default_tests(self) -> bool:
+        # EarlyProgressive is default
+        return False
 
-    def test_2_backpack_locations(self):
-        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_backpack(self):
+        super().test_backpack()
 
-    def test_progressive_backpack_is_in_early_pool(self):
-        self.assertIn("Progressive Backpack", self.multiworld.early_items[1])
+        with self.subTest(check="is early"):
+            self.assertIn("Progressive Backpack", self.multiworld.early_items[1])
diff --git a/worlds/stardew_valley/test/TestGeneration.py b/worlds/stardew_valley/test/TestGeneration.py
index 0142ad0079..46c6685ad5 100644
--- a/worlds/stardew_valley/test/TestGeneration.py
+++ b/worlds/stardew_valley/test/TestGeneration.py
@@ -1,5 +1,8 @@
+import typing
+
 from BaseClasses import ItemClassification, MultiWorld
-from . import setup_solo_multiworld, SVTestBase
+from . import setup_solo_multiworld, SVTestBase, SVTestCase, allsanity_options_with_mods, \
+    allsanity_options_without_mods, minimal_locations_maximal_items
 from .. import locations, items, location_table, options
 from ..data.villagers_data import all_villagers_by_name, all_villagers_by_mod_by_name
 from ..items import items_by_group, Group
@@ -7,11 +10,11 @@ from ..locations import LocationTags
 from ..mods.mod_data import ModNames
 
 
-def get_real_locations(tester: SVTestBase, multiworld: MultiWorld):
+def get_real_locations(tester: typing.Union[SVTestBase, SVTestCase], multiworld: MultiWorld):
     return [location for location in multiworld.get_locations(tester.player) if not location.event]
 
 
-def get_real_location_names(tester: SVTestBase, multiworld: MultiWorld):
+def get_real_location_names(tester: typing.Union[SVTestBase, SVTestCase], multiworld: MultiWorld):
     return [location.name for location in multiworld.get_locations(tester.player) if not location.event]
 
 
@@ -115,21 +118,6 @@ class TestNoGingerIslandItemGeneration(SVTestBase):
                 self.assertTrue(count == 0 or count == 2)
 
 
-class TestGivenProgressiveBackpack(SVTestBase):
-    options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive}
-
-    def test_when_generate_world_then_two_progressive_backpack_are_added(self):
-        self.assertEqual(self.multiworld.itempool.count(self.world.create_item("Progressive Backpack")), 2)
-
-    def test_when_generate_world_then_backpack_locations_are_added(self):
-        created_locations = {location.name for location in self.multiworld.get_locations(1)}
-        backpacks_exist = [location.name in created_locations
-                           for location in locations.locations_by_tag[LocationTags.BACKPACK]
-                           if location.name != "Premium Pack"]
-        all_exist = all(backpacks_exist)
-        self.assertTrue(all_exist)
-
-
 class TestRemixedMineRewards(SVTestBase):
     def test_when_generate_world_then_one_reward_is_added_per_chest(self):
         # assert self.world.create_item("Rusty Sword") in self.multiworld.itempool
@@ -205,17 +193,17 @@ class TestLocationGeneration(SVTestBase):
                 self.assertIn(location.name, location_table)
 
 
-class TestLocationAndItemCount(SVTestBase):
+class TestLocationAndItemCount(SVTestCase):
 
     def test_minimal_location_maximal_items_still_valid(self):
-        min_max_options = self.minimal_locations_maximal_items()
+        min_max_options = minimal_locations_maximal_items()
         multiworld = setup_solo_multiworld(min_max_options)
         valid_locations = get_real_locations(self, multiworld)
         self.assertGreaterEqual(len(valid_locations), len(multiworld.itempool))
 
     def test_allsanity_without_mods_has_at_least_locations(self):
         expected_locations = 994
-        allsanity_options = self.allsanity_options_without_mods()
+        allsanity_options = allsanity_options_without_mods()
         multiworld = setup_solo_multiworld(allsanity_options)
         number_locations = len(get_real_locations(self, multiworld))
         self.assertGreaterEqual(number_locations, expected_locations)
@@ -228,7 +216,7 @@ class TestLocationAndItemCount(SVTestBase):
 
     def test_allsanity_with_mods_has_at_least_locations(self):
         expected_locations = 1246
-        allsanity_options = self.allsanity_options_with_mods()
+        allsanity_options = allsanity_options_with_mods()
         multiworld = setup_solo_multiworld(allsanity_options)
         number_locations = len(get_real_locations(self, multiworld))
         self.assertGreaterEqual(number_locations, expected_locations)
@@ -245,6 +233,11 @@ class TestFriendsanityNone(SVTestBase):
         options.Friendsanity.internal_name: options.Friendsanity.option_none,
     }
 
+    @property
+    def run_default_tests(self) -> bool:
+        # None is default
+        return False
+
     def test_no_friendsanity_items(self):
         for item in self.multiworld.itempool:
             self.assertFalse(item.name.endswith(" <3"))
@@ -416,6 +409,7 @@ class TestFriendsanityAllNpcsWithMarriage(SVTestBase):
                     self.assertLessEqual(int(hearts), 10)
 
 
+"""  # Assuming math is correct if we check 2 points
 class TestFriendsanityAllNpcsWithMarriageHeartSize2(SVTestBase):
     options = {
         options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
@@ -528,6 +522,7 @@ class TestFriendsanityAllNpcsWithMarriageHeartSize4(SVTestBase):
                 self.assertTrue(hearts == 4 or hearts == 8 or hearts == 12 or hearts == 14)
             else:
                 self.assertTrue(hearts == 4 or hearts == 8 or hearts == 10)
+"""
 
 
 class TestFriendsanityAllNpcsWithMarriageHeartSize5(SVTestBase):
diff --git a/worlds/stardew_valley/test/TestItemLink.py b/worlds/stardew_valley/test/TestItemLink.py
new file mode 100644
index 0000000000..f55ab8ca34
--- /dev/null
+++ b/worlds/stardew_valley/test/TestItemLink.py
@@ -0,0 +1,100 @@
+from . import SVTestBase
+from .. import options, item_table, Group
+
+max_iterations = 2000
+
+
+class TestItemLinksEverythingIncluded(SVTestBase):
+    options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
+               options.TrapItems.internal_name: options.TrapItems.option_medium}
+
+    def test_filler_of_all_types_generated(self):
+        max_number_filler = 115
+        filler_generated = []
+        at_least_one_trap = False
+        at_least_one_island = False
+        for i in range(0, max_iterations):
+            filler = self.multiworld.worlds[1].get_filler_item_name()
+            if filler in filler_generated:
+                continue
+            filler_generated.append(filler)
+            self.assertNotIn(Group.MAXIMUM_ONE, item_table[filler].groups)
+            self.assertNotIn(Group.EXACTLY_TWO, item_table[filler].groups)
+            if Group.TRAP in item_table[filler].groups:
+                at_least_one_trap = True
+            if Group.GINGER_ISLAND in item_table[filler].groups:
+                at_least_one_island = True
+            if len(filler_generated) >= max_number_filler:
+                break
+        self.assertTrue(at_least_one_trap)
+        self.assertTrue(at_least_one_island)
+        self.assertGreaterEqual(len(filler_generated), max_number_filler)
+
+
+class TestItemLinksNoIsland(SVTestBase):
+    options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
+               options.TrapItems.internal_name: options.TrapItems.option_medium}
+
+    def test_filler_has_no_island_but_has_traps(self):
+        max_number_filler = 109
+        filler_generated = []
+        at_least_one_trap = False
+        for i in range(0, max_iterations):
+            filler = self.multiworld.worlds[1].get_filler_item_name()
+            if filler in filler_generated:
+                continue
+            filler_generated.append(filler)
+            self.assertNotIn(Group.GINGER_ISLAND, item_table[filler].groups)
+            self.assertNotIn(Group.MAXIMUM_ONE, item_table[filler].groups)
+            self.assertNotIn(Group.EXACTLY_TWO, item_table[filler].groups)
+            if Group.TRAP in item_table[filler].groups:
+                at_least_one_trap = True
+            if len(filler_generated) >= max_number_filler:
+                break
+        self.assertTrue(at_least_one_trap)
+        self.assertGreaterEqual(len(filler_generated), max_number_filler)
+
+
+class TestItemLinksNoTraps(SVTestBase):
+    options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
+               options.TrapItems.internal_name: options.TrapItems.option_no_traps}
+
+    def test_filler_has_no_traps_but_has_island(self):
+        max_number_filler = 100
+        filler_generated = []
+        at_least_one_island = False
+        for i in range(0, max_iterations):
+            filler = self.multiworld.worlds[1].get_filler_item_name()
+            if filler in filler_generated:
+                continue
+            filler_generated.append(filler)
+            self.assertNotIn(Group.TRAP, item_table[filler].groups)
+            self.assertNotIn(Group.MAXIMUM_ONE, item_table[filler].groups)
+            self.assertNotIn(Group.EXACTLY_TWO, item_table[filler].groups)
+            if Group.GINGER_ISLAND in item_table[filler].groups:
+                at_least_one_island = True
+            if len(filler_generated) >= max_number_filler:
+                break
+        self.assertTrue(at_least_one_island)
+        self.assertGreaterEqual(len(filler_generated), max_number_filler)
+
+
+class TestItemLinksNoTrapsAndIsland(SVTestBase):
+    options = {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
+               options.TrapItems.internal_name: options.TrapItems.option_no_traps}
+
+    def test_filler_generated_without_island_or_traps(self):
+        max_number_filler = 94
+        filler_generated = []
+        for i in range(0, max_iterations):
+            filler = self.multiworld.worlds[1].get_filler_item_name()
+            if filler in filler_generated:
+                continue
+            filler_generated.append(filler)
+            self.assertNotIn(Group.GINGER_ISLAND, item_table[filler].groups)
+            self.assertNotIn(Group.TRAP, item_table[filler].groups)
+            self.assertNotIn(Group.MAXIMUM_ONE, item_table[filler].groups)
+            self.assertNotIn(Group.EXACTLY_TWO, item_table[filler].groups)
+            if len(filler_generated) >= max_number_filler:
+                break
+        self.assertGreaterEqual(len(filler_generated), max_number_filler)
diff --git a/worlds/stardew_valley/test/TestItems.py b/worlds/stardew_valley/test/TestItems.py
index 7f48f9347c..38f59c7490 100644
--- a/worlds/stardew_valley/test/TestItems.py
+++ b/worlds/stardew_valley/test/TestItems.py
@@ -6,12 +6,12 @@ import random
 from typing import Set
 
 from BaseClasses import ItemClassification, MultiWorld
-from . import setup_solo_multiworld, SVTestBase
+from . import setup_solo_multiworld, SVTestCase, allsanity_options_without_mods
 from .. import ItemData, StardewValleyWorld
 from ..items import Group, item_table
 
 
-class TestItems(SVTestBase):
+class TestItems(SVTestCase):
     def test_can_create_item_of_resource_pack(self):
         item_name = "Resource Pack: 500 Money"
 
@@ -46,7 +46,7 @@ class TestItems(SVTestBase):
 
     def test_correct_number_of_stardrops(self):
         seed = random.randrange(sys.maxsize)
-        allsanity_options = self.allsanity_options_without_mods()
+        allsanity_options = allsanity_options_without_mods()
         multiworld = setup_solo_multiworld(allsanity_options, seed=seed)
         stardrop_items = [item for item in multiworld.get_items() if "Stardrop" in item.name]
         self.assertEqual(len(stardrop_items), 5)
diff --git a/worlds/stardew_valley/test/TestLogicSimplification.py b/worlds/stardew_valley/test/TestLogicSimplification.py
index 83d779ce90..3f02643b83 100644
--- a/worlds/stardew_valley/test/TestLogicSimplification.py
+++ b/worlds/stardew_valley/test/TestLogicSimplification.py
@@ -1,57 +1,57 @@
+import unittest
 from .. import True_
-from ..logic import Received, Has, False_, And, Or, StardewLogic
-from ..options import default_options, StardewOptions
+from ..logic import Received, Has, False_, And, Or
 
 
-def test_simplify_true_in_and():
-    rules = {
-        "Wood": True_(),
-        "Rock": True_(),
-    }
-    summer = Received("Summer", 0, 1)
-    assert (Has("Wood", rules) & summer & Has("Rock", rules)).simplify() == summer
+class TestSimplification(unittest.TestCase):
+    def test_simplify_true_in_and(self):
+        rules = {
+            "Wood": True_(),
+            "Rock": True_(),
+        }
+        summer = Received("Summer", 0, 1)
+        self.assertEqual((Has("Wood", rules) & summer & Has("Rock", rules)).simplify(),
+                         summer)
 
+    def test_simplify_false_in_or(self):
+        rules = {
+            "Wood": False_(),
+            "Rock": False_(),
+        }
+        summer = Received("Summer", 0, 1)
+        self.assertEqual((Has("Wood", rules) | summer | Has("Rock", rules)).simplify(),
+                         summer)
 
-def test_simplify_false_in_or():
-    rules = {
-        "Wood": False_(),
-        "Rock": False_(),
-    }
-    summer = Received("Summer", 0, 1)
-    assert (Has("Wood", rules) | summer | Has("Rock", rules)).simplify() == summer
+    def test_simplify_and_in_and(self):
+        rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)),
+                   And(Received('Winter', 0, 1), Received('Spring', 0, 1)))
+        self.assertEqual(rule.simplify(),
+                         And(Received('Summer', 0, 1), Received('Fall', 0, 1),
+                             Received('Winter', 0, 1), Received('Spring', 0, 1)))
 
+    def test_simplify_duplicated_and(self):
+        rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)),
+                   And(Received('Summer', 0, 1), Received('Fall', 0, 1)))
+        self.assertEqual(rule.simplify(),
+                         And(Received('Summer', 0, 1), Received('Fall', 0, 1)))
 
-def test_simplify_and_in_and():
-    rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)),
-               And(Received('Winter', 0, 1), Received('Spring', 0, 1)))
-    assert rule.simplify() == And(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1),
-                                  Received('Spring', 0, 1))
+    def test_simplify_or_in_or(self):
+        rule = Or(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)),
+                  Or(Received('Winter', 0, 1), Received('Spring', 0, 1)))
+        self.assertEqual(rule.simplify(),
+                         Or(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1),
+                            Received('Spring', 0, 1)))
 
+    def test_simplify_duplicated_or(self):
+        rule = And(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)),
+                   Or(Received('Summer', 0, 1), Received('Fall', 0, 1)))
+        self.assertEqual(rule.simplify(),
+                         Or(Received('Summer', 0, 1), Received('Fall', 0, 1)))
 
-def test_simplify_duplicated_and():
-    rule = And(And(Received('Summer', 0, 1), Received('Fall', 0, 1)),
-               And(Received('Summer', 0, 1), Received('Fall', 0, 1)))
-    assert rule.simplify() == And(Received('Summer', 0, 1), Received('Fall', 0, 1))
+    def test_simplify_true_in_or(self):
+        rule = Or(True_(), Received('Summer', 0, 1))
+        self.assertEqual(rule.simplify(), True_())
 
-
-def test_simplify_or_in_or():
-    rule = Or(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)),
-              Or(Received('Winter', 0, 1), Received('Spring', 0, 1)))
-    assert rule.simplify() == Or(Received('Summer', 0, 1), Received('Fall', 0, 1), Received('Winter', 0, 1),
-                                 Received('Spring', 0, 1))
-
-
-def test_simplify_duplicated_or():
-    rule = And(Or(Received('Summer', 0, 1), Received('Fall', 0, 1)),
-               Or(Received('Summer', 0, 1), Received('Fall', 0, 1)))
-    assert rule.simplify() == Or(Received('Summer', 0, 1), Received('Fall', 0, 1))
-
-
-def test_simplify_true_in_or():
-    rule = Or(True_(), Received('Summer', 0, 1))
-    assert rule.simplify() == True_()
-
-
-def test_simplify_false_in_and():
-    rule = And(False_(), Received('Summer', 0, 1))
-    assert rule.simplify() == False_()
+    def test_simplify_false_in_and(self):
+        rule = And(False_(), Received('Summer', 0, 1))
+        self.assertEqual(rule.simplify(), False_())
diff --git a/worlds/stardew_valley/test/TestOptions.py b/worlds/stardew_valley/test/TestOptions.py
index 1cd17ada1f..ccffc2848a 100644
--- a/worlds/stardew_valley/test/TestOptions.py
+++ b/worlds/stardew_valley/test/TestOptions.py
@@ -4,12 +4,12 @@ from random import random
 from typing import Dict
 
 from BaseClasses import ItemClassification, MultiWorld
-from Options import SpecialRange, OptionSet
-from . import setup_solo_multiworld, SVTestBase
-from .. import StardewItem, options, items_by_group, Group
+from Options import NamedRange
+from . import setup_solo_multiworld, SVTestBase, SVTestCase, allsanity_options_without_mods, allsanity_options_with_mods
+from .. import StardewItem, items_by_group, Group, StardewValleyWorld
 from ..locations import locations_by_tag, LocationTags, location_table
-from ..options import StardewOption, stardew_valley_option_classes, Mods
-from ..strings.goal_names import Goal
+from ..options import ExcludeGingerIsland, ToolProgression, Goal, SeasonRandomization, TrapItems, 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
@@ -18,21 +18,21 @@ SEASONS = {Season.spring, Season.summer, Season.fall, Season.winter}
 TOOLS = {"Hoe", "Pickaxe", "Axe", "Watering Can", "Trash Can", "Fishing Rod"}
 
 
-def assert_can_win(tester: SVTestBase, multiworld: MultiWorld):
+def assert_can_win(tester: unittest.TestCase, multiworld: MultiWorld):
     for item in multiworld.get_items():
         multiworld.state.collect(item)
 
     tester.assertTrue(multiworld.find_item("Victory", 1).can_reach(multiworld.state))
 
 
-def basic_checks(tester: SVTestBase, multiworld: MultiWorld):
+def basic_checks(tester: unittest.TestCase, multiworld: MultiWorld):
     tester.assertIn(StardewItem("Victory", ItemClassification.progression, None, 1), multiworld.get_items())
     assert_can_win(tester, multiworld)
     non_event_locations = [location for location in multiworld.get_locations() if not location.event]
     tester.assertEqual(len(multiworld.itempool), len(non_event_locations))
 
 
-def check_no_ginger_island(tester: SVTestBase, multiworld: MultiWorld):
+def check_no_ginger_island(tester: unittest.TestCase, multiworld: MultiWorld):
     ginger_island_items = [item_data.name for item_data in items_by_group[Group.GINGER_ISLAND]]
     ginger_island_locations = [location_data.name for location_data in locations_by_tag[LocationTags.GINGER_ISLAND]]
     for item in multiworld.get_items():
@@ -42,63 +42,65 @@ def check_no_ginger_island(tester: SVTestBase, multiworld: MultiWorld):
 
 
 def get_option_choices(option) -> Dict[str, int]:
-    if issubclass(option, SpecialRange):
+    if issubclass(option, NamedRange):
         return option.special_range_names
     elif option.options:
         return option.options
     return {}
 
 
-class TestGenerateDynamicOptions(SVTestBase):
+class TestGenerateDynamicOptions(SVTestCase):
     def test_given_special_range_when_generate_then_basic_checks(self):
-        for option in stardew_valley_option_classes:
-            if not issubclass(option, SpecialRange):
+        options = StardewValleyWorld.options_dataclass.type_hints
+        for option_name, option in options.items():
+            if not isinstance(option, NamedRange):
                 continue
             for value in option.special_range_names:
-                with self.subTest(f"{option.internal_name}: {value}"):
-                    choices = {option.internal_name: option.special_range_names[value]}
+                with self.subTest(f"{option_name}: {value}"):
+                    choices = {option_name: option.special_range_names[value]}
                     multiworld = setup_solo_multiworld(choices)
                     basic_checks(self, multiworld)
 
     def test_given_choice_when_generate_then_basic_checks(self):
         seed = int(random() * pow(10, 18) - 1)
-        for option in stardew_valley_option_classes:
+        options = StardewValleyWorld.options_dataclass.type_hints
+        for option_name, option in options.items():
             if not option.options:
                 continue
             for value in option.options:
-                with self.subTest(f"{option.internal_name}: {value} [Seed: {seed}]"):
-                    world_options = {option.internal_name: option.options[value]}
+                with self.subTest(f"{option_name}: {value} [Seed: {seed}]"):
+                    world_options = {option_name: option.options[value]}
                     multiworld = setup_solo_multiworld(world_options, seed)
                     basic_checks(self, multiworld)
 
 
-class TestGoal(SVTestBase):
+class TestGoal(SVTestCase):
     def test_given_goal_when_generate_then_victory_is_in_correct_location(self):
-        for goal, location in [("community_center", Goal.community_center),
-                               ("grandpa_evaluation", Goal.grandpa_evaluation),
-                               ("bottom_of_the_mines", Goal.bottom_of_the_mines),
-                               ("cryptic_note", Goal.cryptic_note),
-                               ("master_angler", Goal.master_angler),
-                               ("complete_collection", Goal.complete_museum),
-                               ("full_house", Goal.full_house),
-                               ("perfection", Goal.perfection)]:
+        for goal, location in [("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)]:
             with self.subTest(msg=f"Goal: {goal}, Location: {location}"):
-                world_options = {options.Goal.internal_name: options.Goal.options[goal]}
+                world_options = {Goal.internal_name: Goal.options[goal]}
                 multi_world = setup_solo_multiworld(world_options)
                 victory = multi_world.find_item("Victory", 1)
                 self.assertEqual(victory.name, location)
 
 
-class TestSeasonRandomization(SVTestBase):
+class TestSeasonRandomization(SVTestCase):
     def test_given_disabled_when_generate_then_all_seasons_are_precollected(self):
-        world_options = {options.SeasonRandomization.internal_name: options.SeasonRandomization.option_disabled}
+        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_disabled}
         multi_world = setup_solo_multiworld(world_options)
 
         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 = {options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized}
+        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_randomized}
         multi_world = setup_solo_multiworld(world_options)
         precollected_items = {item.name for item in multi_world.precollected_items[1]}
         items = {item.name for item in multi_world.get_items()} | precollected_items
@@ -106,16 +108,16 @@ class TestSeasonRandomization(SVTestBase):
         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 = {options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive}
+        world_options = {SeasonRandomization.internal_name: SeasonRandomization.option_progressive}
         multi_world = setup_solo_multiworld(world_options)
 
         items = [item.name for item in multi_world.get_items()]
         self.assertEqual(items.count(Season.progressive), 3)
 
 
-class TestToolProgression(SVTestBase):
+class TestToolProgression(SVTestCase):
     def test_given_vanilla_when_generate_then_no_tool_in_pool(self):
-        world_options = {options.ToolProgression.internal_name: options.ToolProgression.option_vanilla}
+        world_options = {ToolProgression.internal_name: ToolProgression.option_vanilla}
         multi_world = setup_solo_multiworld(world_options)
 
         items = {item.name for item in multi_world.get_items()}
@@ -123,7 +125,7 @@ class TestToolProgression(SVTestBase):
             self.assertNotIn(tool, items)
 
     def test_given_progressive_when_generate_then_progressive_tool_of_each_is_in_pool_four_times(self):
-        world_options = {options.ToolProgression.internal_name: options.ToolProgression.option_progressive}
+        world_options = {ToolProgression.internal_name: ToolProgression.option_progressive}
         multi_world = setup_solo_multiworld(world_options)
 
         items = [item.name for item in multi_world.get_items()]
@@ -131,7 +133,7 @@ class TestToolProgression(SVTestBase):
             self.assertEqual(items.count("Progressive " + tool), 4)
 
     def test_given_progressive_when_generate_then_tool_upgrades_are_locations(self):
-        world_options = {options.ToolProgression.internal_name: options.ToolProgression.option_progressive}
+        world_options = {ToolProgression.internal_name: ToolProgression.option_progressive}
         multi_world = setup_solo_multiworld(world_options)
 
         locations = {locations.name for locations in multi_world.get_locations(1)}
@@ -146,52 +148,54 @@ class TestToolProgression(SVTestBase):
         self.assertIn("Purchase Iridium Rod", locations)
 
 
-class TestGenerateAllOptionsWithExcludeGingerIsland(SVTestBase):
+class TestGenerateAllOptionsWithExcludeGingerIsland(SVTestCase):
     def test_given_special_range_when_generate_exclude_ginger_island(self):
-        for option in stardew_valley_option_classes:
-            if not issubclass(option,
-                              SpecialRange) or option.internal_name == options.ExcludeGingerIsland.internal_name:
+        options = StardewValleyWorld.options_dataclass.type_hints
+        for option_name, option in options.items():
+            if not isinstance(option, NamedRange) or option_name == ExcludeGingerIsland.internal_name:
                 continue
             for value in option.special_range_names:
-                with self.subTest(f"{option.internal_name}: {value}"):
+                with self.subTest(f"{option_name}: {value}"):
                     multiworld = setup_solo_multiworld(
-                        {options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
-                         option.internal_name: option.special_range_names[value]})
+                        {ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+                         option_name: option.special_range_names[value]})
                     check_no_ginger_island(self, multiworld)
 
     def test_given_choice_when_generate_exclude_ginger_island(self):
         seed = int(random() * pow(10, 18) - 1)
-        island_option = options.ExcludeGingerIsland
-        for option in stardew_valley_option_classes:
-            if not option.options or option.internal_name == island_option.internal_name:
+        options = StardewValleyWorld.options_dataclass.type_hints
+        for option_name, option in options.items():
+            if not option.options or option_name == ExcludeGingerIsland.internal_name:
                 continue
             for value in option.options:
-                with self.subTest(f"{option.internal_name}: {value} [Seed: {seed}]"):
+                with self.subTest(f"{option_name}: {value} [Seed: {seed}]"):
                     multiworld = setup_solo_multiworld(
-                        {island_option.internal_name: island_option.option_true,
-                         option.internal_name: option.options[value]}, seed)
-                    if multiworld.worlds[self.player].options[island_option.internal_name] != island_option.option_true:
+                        {ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+                         option_name: option.options[value]}, seed)
+                    stardew_world: StardewValleyWorld = multiworld.worlds[self.player]
+                    if stardew_world.options.exclude_ginger_island != ExcludeGingerIsland.option_true:
                         continue
                     basic_checks(self, multiworld)
                     check_no_ginger_island(self, multiworld)
 
     def test_given_island_related_goal_then_override_exclude_ginger_island(self):
-        island_goals = [value for value in options.Goal.options if value in ["walnut_hunter", "perfection"]]
-        island_option = options.ExcludeGingerIsland
+        island_goals = [value for value in Goal.options if value in ["walnut_hunter", "perfection"]]
+        island_option = ExcludeGingerIsland
         for goal in island_goals:
             for value in island_option.options:
                 with self.subTest(f"Goal: {goal}, {island_option.internal_name}: {value}"):
                     multiworld = setup_solo_multiworld(
-                        {options.Goal.internal_name: options.Goal.options[goal],
+                        {Goal.internal_name: Goal.options[goal],
                             island_option.internal_name: island_option.options[value]})
-                    self.assertEqual(multiworld.worlds[self.player].options[island_option.internal_name], island_option.option_false)
+                    stardew_world: StardewValleyWorld = multiworld.worlds[self.player]
+                    self.assertEqual(stardew_world.options.exclude_ginger_island, island_option.option_false)
                     basic_checks(self, multiworld)
 
 
-class TestTraps(SVTestBase):
+class TestTraps(SVTestCase):
     def test_given_no_traps_when_generate_then_no_trap_in_pool(self):
-        world_options = self.allsanity_options_without_mods()
-        world_options.update({options.TrapItems.internal_name: options.TrapItems.option_no_traps})
+        world_options = allsanity_options_without_mods()
+        world_options.update({TrapItems.internal_name: TrapItems.option_no_traps})
         multi_world = setup_solo_multiworld(world_options)
 
         trap_items = [item_data.name for item_data in items_by_group[Group.TRAP]]
@@ -202,12 +206,12 @@ class TestTraps(SVTestBase):
                 self.assertNotIn(item, multiworld_items)
 
     def test_given_traps_when_generate_then_all_traps_in_pool(self):
-        trap_option = options.TrapItems
+        trap_option = TrapItems
         for value in trap_option.options:
             if value == "no_traps":
                 continue
-            world_options = self.allsanity_options_with_mods()
-            world_options.update({options.TrapItems.internal_name: trap_option.options[value]})
+            world_options = allsanity_options_with_mods()
+            world_options.update({TrapItems.internal_name: trap_option.options[value]})
             multi_world = setup_solo_multiworld(world_options)
             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()]
@@ -216,9 +220,9 @@ class TestTraps(SVTestBase):
                     self.assertIn(item, multiworld_items)
 
 
-class TestSpecialOrders(SVTestBase):
+class TestSpecialOrders(SVTestCase):
     def test_given_disabled_then_no_order_in_pool(self):
-        world_options = {options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_disabled}
+        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled}
         multi_world = setup_solo_multiworld(world_options)
 
         locations_in_pool = {location.name for location in multi_world.get_locations() if location.name in location_table}
@@ -228,7 +232,7 @@ class TestSpecialOrders(SVTestBase):
             self.assertNotIn(LocationTags.SPECIAL_ORDER_QI, location.tags)
 
     def test_given_board_only_then_no_qi_order_in_pool(self):
-        world_options = {options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_only}
+        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_only}
         multi_world = setup_solo_multiworld(world_options)
 
         locations_in_pool = {location.name for location in multi_world.get_locations() if location.name in location_table}
@@ -242,8 +246,8 @@ class TestSpecialOrders(SVTestBase):
             self.assertIn(board_location.name, locations_in_pool)
 
     def test_given_board_and_qi_then_all_orders_in_pool(self):
-        world_options = {options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
-                         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_victories}
+        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
+                         ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_victories}
         multi_world = setup_solo_multiworld(world_options)
 
         locations_in_pool = {location.name for location in multi_world.get_locations()}
@@ -258,8 +262,8 @@ class TestSpecialOrders(SVTestBase):
             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 = {options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
-                         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled}
+        world_options = {SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
+                         ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled}
         multi_world = setup_solo_multiworld(world_options)
 
         locations_in_pool = {location.name for location in multi_world.get_locations()}
diff --git a/worlds/stardew_valley/test/TestRegions.py b/worlds/stardew_valley/test/TestRegions.py
index 293ce72d07..7ebbcece5c 100644
--- a/worlds/stardew_valley/test/TestRegions.py
+++ b/worlds/stardew_valley/test/TestRegions.py
@@ -2,8 +2,9 @@ import random
 import sys
 import unittest
 
-from . import SVTestBase, setup_solo_multiworld
-from .. import StardewOptions, options, StardewValleyWorld
+from . import SVTestCase, setup_solo_multiworld
+from .. import options, StardewValleyWorld, StardewValleyOptions
+from ..options import EntranceRandomization, ExcludeGingerIsland
 from ..regions import vanilla_regions, vanilla_connections, randomize_connections, RandomizationFlag
 
 connections_by_name = {connection.name for connection in vanilla_connections}
@@ -37,11 +38,12 @@ class TestEntranceRando(unittest.TestCase):
             seed = random.randrange(sys.maxsize)
             with self.subTest(flag=flag, msg=f"Seed: {seed}"):
                 rand = random.Random(seed)
-                world_options = StardewOptions({options.EntranceRandomization.internal_name: option,
-                                                options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false})
+                world_options = {EntranceRandomization.internal_name: option,
+                                 ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false}
+                multiworld = setup_solo_multiworld(world_options)
                 regions_by_name = {region.name: region for region in vanilla_regions}
 
-                _, randomized_connections = randomize_connections(rand, world_options, regions_by_name)
+                _, randomized_connections = randomize_connections(rand, multiworld.worlds[1].options, regions_by_name)
 
                 for connection in vanilla_connections:
                     if flag in connection.flag:
@@ -62,11 +64,12 @@ class TestEntranceRando(unittest.TestCase):
             with self.subTest(option=option, flag=flag):
                 seed = random.randrange(sys.maxsize)
                 rand = random.Random(seed)
-                world_options = StardewOptions({options.EntranceRandomization.internal_name: option,
-                                                options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true})
+                world_options = {EntranceRandomization.internal_name: option,
+                                 ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true}
+                multiworld = setup_solo_multiworld(world_options)
                 regions_by_name = {region.name: region for region in vanilla_regions}
 
-                _, randomized_connections = randomize_connections(rand, world_options, regions_by_name)
+                _, randomized_connections = randomize_connections(rand, multiworld.worlds[1].options, regions_by_name)
 
                 for connection in vanilla_connections:
                     if flag in connection.flag:
@@ -85,7 +88,7 @@ class TestEntranceRando(unittest.TestCase):
                                  f"Connections are duplicated in randomization. Seed = {seed}")
 
 
-class TestEntranceClassifications(SVTestBase):
+class TestEntranceClassifications(SVTestCase):
 
     def test_non_progression_are_all_accessible_with_empty_inventory(self):
         for option, flag in [(options.EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN),
diff --git a/worlds/stardew_valley/test/TestRules.py b/worlds/stardew_valley/test/TestRules.py
index 0847d8a63b..0749b1a8f1 100644
--- a/worlds/stardew_valley/test/TestRules.py
+++ b/worlds/stardew_valley/test/TestRules.py
@@ -24,7 +24,7 @@ class TestProgressiveToolsLogic(SVTestBase):
 
     def setUp(self):
         super().setUp()
-        self.multiworld.state.prog_items = Counter()
+        self.multiworld.state.prog_items = {1: Counter()}
 
     def test_sturgeon(self):
         self.assertFalse(self.world.logic.has("Sturgeon")(self.multiworld.state))
@@ -329,7 +329,7 @@ class TestRecipeLogic(SVTestBase):
     options = {
         options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
         options.SkillProgression.internal_name: options.SkillProgression.option_progressive,
-        options.Cropsanity.internal_name: options.Cropsanity.option_shuffled,
+        options.Cropsanity.internal_name: options.Cropsanity.option_enabled,
     }
 
     # I wanted to make a test for different ways to obtain a pizza, but I'm stuck not knowing how to block the immediate purchase from Gus
diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py
index 59da64c1d7..ba037f7a65 100644
--- a/worlds/stardew_valley/test/__init__.py
+++ b/worlds/stardew_valley/test/__init__.py
@@ -1,20 +1,31 @@
 import os
+import unittest
 from argparse import Namespace
 from typing import Dict, FrozenSet, Tuple, Any, ClassVar
 
 from BaseClasses import MultiWorld
+from Utils import cache_argsless
 from test.TestBase import WorldTestBase
 from test.general import gen_steps, setup_solo_multiworld as setup_base_solo_multiworld
-from .. import StardewValleyWorld, options
+from .. import StardewValleyWorld
 from ..mods.mod_data import ModNames
 from worlds.AutoWorld import call_all
+from ..options import Cropsanity, SkillProgression, SpecialOrderLocations, Friendsanity, NumberOfLuckBuffs, SeasonRandomization, ToolProgression, \
+    ElevatorProgression, Museumsanity, BackpackProgression, BuildingProgression, ArcadeMachineLocations, HelpWantedLocations, Fishsanity, NumberOfMovementBuffs, \
+    BundleRandomization, BundlePrice, FestivalLocations, FriendsanityHeartSize, ExcludeGingerIsland, TrapItems, Goal, Mods
 
 
-class SVTestBase(WorldTestBase):
+class SVTestCase(unittest.TestCase):
+    player: ClassVar[int] = 1
+    """Set to False to not skip some 'extra' tests"""
+    skip_extra_tests: bool = True
+    """Set to False to run tests that take long"""
+    skip_long_tests: bool = True
+
+
+class SVTestBase(WorldTestBase, SVTestCase):
     game = "Stardew Valley"
     world: StardewValleyWorld
-    player: ClassVar[int] = 1
-    skip_long_tests: bool = True
 
     def world_setup(self, *args, **kwargs):
         super().world_setup(*args, **kwargs)
@@ -31,66 +42,73 @@ class SVTestBase(WorldTestBase):
         should_run_default_tests = is_not_stardew_test and super().run_default_tests
         return should_run_default_tests
 
-    def minimal_locations_maximal_items(self):
-        min_max_options = {
-            options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized,
-            options.Cropsanity.internal_name: options.Cropsanity.option_shuffled,
-            options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla,
-            options.ToolProgression.internal_name: options.ToolProgression.option_vanilla,
-            options.SkillProgression.internal_name: options.SkillProgression.option_vanilla,
-            options.BuildingProgression.internal_name: options.BuildingProgression.option_vanilla,
-            options.ElevatorProgression.internal_name: options.ElevatorProgression.option_vanilla,
-            options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled,
-            options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_disabled,
-            options.HelpWantedLocations.internal_name: 0,
-            options.Fishsanity.internal_name: options.Fishsanity.option_none,
-            options.Museumsanity.internal_name: options.Museumsanity.option_none,
-            options.Friendsanity.internal_name: options.Friendsanity.option_none,
-            options.NumberOfMovementBuffs.internal_name: 12,
-            options.NumberOfLuckBuffs.internal_name: 12,
-        }
-        return min_max_options
 
-    def allsanity_options_without_mods(self):
-        allsanity = {
-            options.Goal.internal_name: options.Goal.option_perfection,
-            options.BundleRandomization.internal_name: options.BundleRandomization.option_shuffled,
-            options.BundlePrice.internal_name: options.BundlePrice.option_expensive,
-            options.SeasonRandomization.internal_name: options.SeasonRandomization.option_randomized,
-            options.Cropsanity.internal_name: options.Cropsanity.option_shuffled,
-            options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
-            options.ToolProgression.internal_name: options.ToolProgression.option_progressive,
-            options.SkillProgression.internal_name: options.SkillProgression.option_progressive,
-            options.BuildingProgression.internal_name: options.BuildingProgression.option_progressive,
-            options.FestivalLocations.internal_name: options.FestivalLocations.option_hard,
-            options.ElevatorProgression.internal_name: options.ElevatorProgression.option_progressive,
-            options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_full_shuffling,
-            options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
-            options.HelpWantedLocations.internal_name: 56,
-            options.Fishsanity.internal_name: options.Fishsanity.option_all,
-            options.Museumsanity.internal_name: options.Museumsanity.option_all,
-            options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
-            options.FriendsanityHeartSize.internal_name: 1,
-            options.NumberOfMovementBuffs.internal_name: 12,
-            options.NumberOfLuckBuffs.internal_name: 12,
-            options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
-            options.TrapItems.internal_name: options.TrapItems.option_nightmare,
-        }
-        return allsanity
+@cache_argsless
+def minimal_locations_maximal_items():
+    min_max_options = {
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Cropsanity.internal_name: Cropsanity.option_enabled,
+        BackpackProgression.internal_name: BackpackProgression.option_vanilla,
+        ToolProgression.internal_name: ToolProgression.option_vanilla,
+        SkillProgression.internal_name: SkillProgression.option_vanilla,
+        BuildingProgression.internal_name: BuildingProgression.option_vanilla,
+        ElevatorProgression.internal_name: ElevatorProgression.option_vanilla,
+        ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_disabled,
+        SpecialOrderLocations.internal_name: SpecialOrderLocations.option_disabled,
+        HelpWantedLocations.internal_name: 0,
+        Fishsanity.internal_name: Fishsanity.option_none,
+        Museumsanity.internal_name: Museumsanity.option_none,
+        Friendsanity.internal_name: Friendsanity.option_none,
+        NumberOfMovementBuffs.internal_name: 12,
+        NumberOfLuckBuffs.internal_name: 12,
+    }
+    return min_max_options
+
+
+@cache_argsless
+def allsanity_options_without_mods():
+    allsanity = {
+        Goal.internal_name: Goal.option_perfection,
+        BundleRandomization.internal_name: BundleRandomization.option_shuffled,
+        BundlePrice.internal_name: BundlePrice.option_expensive,
+        SeasonRandomization.internal_name: SeasonRandomization.option_randomized,
+        Cropsanity.internal_name: Cropsanity.option_enabled,
+        BackpackProgression.internal_name: BackpackProgression.option_progressive,
+        ToolProgression.internal_name: ToolProgression.option_progressive,
+        SkillProgression.internal_name: SkillProgression.option_progressive,
+        BuildingProgression.internal_name: BuildingProgression.option_progressive,
+        FestivalLocations.internal_name: FestivalLocations.option_hard,
+        ElevatorProgression.internal_name: ElevatorProgression.option_progressive,
+        ArcadeMachineLocations.internal_name: ArcadeMachineLocations.option_full_shuffling,
+        SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
+        HelpWantedLocations.internal_name: 56,
+        Fishsanity.internal_name: Fishsanity.option_all,
+        Museumsanity.internal_name: Museumsanity.option_all,
+        Friendsanity.internal_name: Friendsanity.option_all_with_marriage,
+        FriendsanityHeartSize.internal_name: 1,
+        NumberOfMovementBuffs.internal_name: 12,
+        NumberOfLuckBuffs.internal_name: 12,
+        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
+        TrapItems.internal_name: TrapItems.option_nightmare,
+    }
+    return allsanity
+
+
+@cache_argsless
+def allsanity_options_with_mods():
+    allsanity = {}
+    allsanity.update(allsanity_options_without_mods())
+    all_mods = (
+        ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
+        ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology,
+        ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna,
+        ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene,
+        ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores,
+        ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator
+    )
+    allsanity.update({Mods.internal_name: all_mods})
+    return allsanity
 
-    def allsanity_options_with_mods(self):
-        allsanity = {}
-        allsanity.update(self.allsanity_options_without_mods())
-        all_mods = (
-            ModNames.deepwoods, ModNames.tractor, ModNames.big_backpack,
-            ModNames.luck_skill, ModNames.magic, ModNames.socializing_skill, ModNames.archaeology,
-            ModNames.cooking_skill, ModNames.binning_skill, ModNames.juna,
-            ModNames.jasper, ModNames.alec, ModNames.yoba, ModNames.eugene,
-            ModNames.wellwick, ModNames.ginger, ModNames.shiko, ModNames.delores,
-            ModNames.ayeisha, ModNames.riley, ModNames.skull_cavern_elevator
-        )
-        allsanity.update({options.Mods.internal_name: all_mods})
-        return allsanity
 
 pre_generated_worlds = {}
 
@@ -110,7 +128,7 @@ def setup_solo_multiworld(test_options=None, seed=None,
     multiworld.set_seed(seed)
     # print(f"Seed: {multiworld.seed}") # Uncomment to print the seed for every test
     args = Namespace()
-    for name, option in StardewValleyWorld.option_definitions.items():
+    for name, option in StardewValleyWorld.options_dataclass.type_hints.items():
         value = option(test_options[name]) if name in test_options else option.from_any(option.default)
         setattr(args, name, {1: value})
     multiworld.set_options(args)
diff --git a/worlds/stardew_valley/test/checks/goal_checks.py b/worlds/stardew_valley/test/checks/goal_checks.py
index e1059fe2d6..d0f06a6caa 100644
--- a/worlds/stardew_valley/test/checks/goal_checks.py
+++ b/worlds/stardew_valley/test/checks/goal_checks.py
@@ -1,11 +1,11 @@
 from BaseClasses import MultiWorld
-from .option_checks import is_setting, assert_is_setting
+from .option_checks import get_stardew_options
 from ... import options
 from .. import SVTestBase
 
 
 def is_goal(multiworld: MultiWorld, goal: int) -> bool:
-    return is_setting(multiworld, options.Goal.internal_name, goal)
+    return get_stardew_options(multiworld).goal.value == goal
 
 
 def is_bottom_mines(multiworld: MultiWorld) -> bool:
@@ -33,7 +33,7 @@ def is_not_perfection(multiworld: MultiWorld) -> bool:
 
 
 def assert_ginger_island_is_included(tester: SVTestBase, multiworld: MultiWorld):
-    assert_is_setting(tester, multiworld, options.ExcludeGingerIsland.internal_name, options.ExcludeGingerIsland.option_false)
+    tester.assertEqual(get_stardew_options(multiworld).exclude_ginger_island, options.ExcludeGingerIsland.option_false)
 
 
 def assert_walnut_hunter_world_is_valid(tester: SVTestBase, multiworld: MultiWorld):
diff --git a/worlds/stardew_valley/test/checks/option_checks.py b/worlds/stardew_valley/test/checks/option_checks.py
index e6bced5b1c..c9d9860cf5 100644
--- a/worlds/stardew_valley/test/checks/option_checks.py
+++ b/worlds/stardew_valley/test/checks/option_checks.py
@@ -1,5 +1,3 @@
-from typing import Union
-
 from BaseClasses import MultiWorld
 from .world_checks import get_all_item_names, get_all_location_names
 from .. import SVTestBase
@@ -8,32 +6,16 @@ from ...locations import LocationTags
 from ...strings.ap_names.transport_names import Transportation
 
 
-def get_stardew_world(multiworld: MultiWorld) -> Union[StardewValleyWorld, None]:
+def get_stardew_world(multiworld: MultiWorld) -> StardewValleyWorld:
     for world_key in multiworld.worlds:
         world = multiworld.worlds[world_key]
         if isinstance(world, StardewValleyWorld):
             return world
-    return None
+    raise ValueError("no stardew world in this multiworld")
 
 
-def is_setting(multiworld: MultiWorld, setting_name: str, setting_value: int) -> bool:
-    stardew_world = get_stardew_world(multiworld)
-    if not stardew_world:
-        return False
-    current_value = stardew_world.options[setting_name]
-    return current_value == setting_value
-
-
-def is_not_setting(multiworld: MultiWorld, setting_name: str, setting_value: int) -> bool:
-    return not is_setting(multiworld, setting_name, setting_value)
-
-
-def assert_is_setting(tester: SVTestBase, multiworld: MultiWorld, setting_name: str, setting_value: int) -> bool:
-    stardew_world = get_stardew_world(multiworld)
-    if not stardew_world:
-        return False
-    current_value = stardew_world.options[setting_name]
-    tester.assertEqual(current_value, setting_value)
+def get_stardew_options(multiworld: MultiWorld) -> options.StardewValleyOptions:
+    return get_stardew_world(multiworld).options
 
 
 def assert_can_reach_island(tester: SVTestBase, multiworld: MultiWorld):
@@ -49,7 +31,8 @@ def assert_cannot_reach_island(tester: SVTestBase, multiworld: MultiWorld):
 
 
 def assert_can_reach_island_if_should(tester: SVTestBase, multiworld: MultiWorld):
-    include_island = is_setting(multiworld, options.ExcludeGingerIsland.internal_name, options.ExcludeGingerIsland.option_false)
+    stardew_options = get_stardew_options(multiworld)
+    include_island = stardew_options.exclude_ginger_island.value == options.ExcludeGingerIsland.option_false
     if include_island:
         assert_can_reach_island(tester, multiworld)
     else:
@@ -57,7 +40,7 @@ def assert_can_reach_island_if_should(tester: SVTestBase, multiworld: MultiWorld
 
 
 def assert_cropsanity_same_number_items_and_locations(tester: SVTestBase, multiworld: MultiWorld):
-    is_cropsanity = is_setting(multiworld, options.Cropsanity.internal_name, options.Cropsanity.option_shuffled)
+    is_cropsanity = get_stardew_options(multiworld).cropsanity.value == options.Cropsanity.option_enabled
     if not is_cropsanity:
         return
 
@@ -80,11 +63,10 @@ def assert_has_deluxe_scarecrow_recipe(tester: SVTestBase, multiworld: MultiWorl
 
 
 def assert_festivals_give_access_to_deluxe_scarecrow(tester: SVTestBase, multiworld: MultiWorld):
-    has_festivals = is_not_setting(multiworld, options.FestivalLocations.internal_name, options.FestivalLocations.option_disabled)
+    stardew_options = get_stardew_options(multiworld)
+    has_festivals = stardew_options.festival_locations.value != options.FestivalLocations.option_disabled
     if not has_festivals:
         return
 
     assert_all_rarecrows_exist(tester, multiworld)
     assert_has_deluxe_scarecrow_recipe(tester, multiworld)
-
-
diff --git a/worlds/stardew_valley/test/checks/world_checks.py b/worlds/stardew_valley/test/checks/world_checks.py
index 2cdb0534d4..9bd9fd614c 100644
--- a/worlds/stardew_valley/test/checks/world_checks.py
+++ b/worlds/stardew_valley/test/checks/world_checks.py
@@ -1,8 +1,8 @@
+import unittest
 from typing import List
 
 from BaseClasses import MultiWorld, ItemClassification
 from ... import StardewItem
-from .. import SVTestBase
 
 
 def get_all_item_names(multiworld: MultiWorld) -> List[str]:
@@ -13,21 +13,21 @@ def get_all_location_names(multiworld: MultiWorld) -> List[str]:
     return [location.name for location in multiworld.get_locations() if not location.event]
 
 
-def assert_victory_exists(tester: SVTestBase, multiworld: MultiWorld):
+def assert_victory_exists(tester: unittest.TestCase, multiworld: MultiWorld):
     tester.assertIn(StardewItem("Victory", ItemClassification.progression, None, 1), multiworld.get_items())
 
 
-def collect_all_then_assert_can_win(tester: SVTestBase, multiworld: MultiWorld):
+def collect_all_then_assert_can_win(tester: unittest.TestCase, multiworld: MultiWorld):
     for item in multiworld.get_items():
         multiworld.state.collect(item)
     tester.assertTrue(multiworld.find_item("Victory", 1).can_reach(multiworld.state))
 
 
-def assert_can_win(tester: SVTestBase, multiworld: MultiWorld):
+def assert_can_win(tester: unittest.TestCase, multiworld: MultiWorld):
     assert_victory_exists(tester, multiworld)
     collect_all_then_assert_can_win(tester, multiworld)
 
 
-def assert_same_number_items_locations(tester: SVTestBase, multiworld: MultiWorld):
+def assert_same_number_items_locations(tester: unittest.TestCase, multiworld: MultiWorld):
     non_event_locations = [location for location in multiworld.get_locations() if not location.event]
     tester.assertEqual(len(multiworld.itempool), len(non_event_locations))
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/long/TestModsLong.py b/worlds/stardew_valley/test/long/TestModsLong.py
new file mode 100644
index 0000000000..36a59ae854
--- /dev/null
+++ b/worlds/stardew_valley/test/long/TestModsLong.py
@@ -0,0 +1,57 @@
+import unittest
+from typing import List, Union
+
+from BaseClasses import MultiWorld
+from worlds.stardew_valley.mods.mod_data import all_mods
+from worlds.stardew_valley.test import setup_solo_multiworld
+from worlds.stardew_valley.test.TestOptions import basic_checks, SVTestCase
+from worlds.stardew_valley.items import item_table
+from worlds.stardew_valley.locations import location_table
+from worlds.stardew_valley.options import Mods
+from .option_names import options_to_include
+
+
+def check_stray_mod_items(chosen_mods: Union[List[str], str], tester: unittest.TestCase, multiworld: MultiWorld):
+    if isinstance(chosen_mods, str):
+        chosen_mods = [chosen_mods]
+    for multiworld_item in multiworld.get_items():
+        item = item_table[multiworld_item.name]
+        tester.assertTrue(item.mod_name is None or item.mod_name in chosen_mods)
+    for multiworld_location in multiworld.get_locations():
+        if multiworld_location.event:
+            continue
+        location = location_table[multiworld_location.name]
+        tester.assertTrue(location.mod_name is None or location.mod_name in chosen_mods)
+
+
+class TestGenerateModsOptions(SVTestCase):
+
+    def test_given_mod_pairs_when_generate_then_basic_checks(self):
+        if self.skip_long_tests:
+            return
+        mods = list(all_mods)
+        num_mods = len(mods)
+        for mod1_index in range(0, num_mods):
+            for mod2_index in range(mod1_index + 1, num_mods):
+                mod1 = mods[mod1_index]
+                mod2 = mods[mod2_index]
+                mod_pair = (mod1, mod2)
+                with self.subTest(f"Mods: {mod_pair}"):
+                    multiworld = setup_solo_multiworld({Mods: mod_pair})
+                    basic_checks(self, multiworld)
+                    check_stray_mod_items(list(mod_pair), self, multiworld)
+
+    def test_given_mod_names_when_generate_paired_with_other_options_then_basic_checks(self):
+        if self.skip_long_tests:
+            return
+        num_options = len(options_to_include)
+        for option_index in range(0, num_options):
+            option = options_to_include[option_index]
+            if not option.options:
+                continue
+            for value in option.options:
+                for mod in all_mods:
+                    with self.subTest(f"{option.internal_name}: {value}, Mod: {mod}"):
+                        multiworld = setup_solo_multiworld({option.internal_name: option.options[value], Mods: mod})
+                        basic_checks(self, multiworld)
+                        check_stray_mod_items(mod, self, multiworld)
\ No newline at end of file
diff --git a/worlds/stardew_valley/test/long/TestOptionsLong.py b/worlds/stardew_valley/test/long/TestOptionsLong.py
index c614ddcc36..e3da6968ed 100644
--- a/worlds/stardew_valley/test/long/TestOptionsLong.py
+++ b/worlds/stardew_valley/test/long/TestOptionsLong.py
@@ -1,30 +1,30 @@
+import unittest
 from typing import Dict
 
 from BaseClasses import MultiWorld
-from Options import SpecialRange
+from Options import NamedRange
 from .option_names import options_to_include
 from worlds.stardew_valley.test.checks.world_checks import assert_can_win, assert_same_number_items_locations
-from .. import setup_solo_multiworld, SVTestBase
+from .. import setup_solo_multiworld, SVTestCase
 
 
-def basic_checks(tester: SVTestBase, multiworld: MultiWorld):
+def basic_checks(tester: unittest.TestCase, multiworld: MultiWorld):
     assert_can_win(tester, multiworld)
     assert_same_number_items_locations(tester, multiworld)
 
 
 def get_option_choices(option) -> Dict[str, int]:
-    if issubclass(option, SpecialRange):
+    if issubclass(option, NamedRange):
         return option.special_range_names
     elif option.options:
         return option.options
     return {}
 
 
-class TestGenerateDynamicOptions(SVTestBase):
+class TestGenerateDynamicOptions(SVTestCase):
     def test_given_option_pair_when_generate_then_basic_checks(self):
         if self.skip_long_tests:
             return
-
         num_options = len(options_to_include)
         for option1_index in range(0, num_options):
             for option2_index in range(option1_index + 1, num_options):
diff --git a/worlds/stardew_valley/test/long/TestRandomWorlds.py b/worlds/stardew_valley/test/long/TestRandomWorlds.py
index 6ba814aba2..1f1d59652c 100644
--- a/worlds/stardew_valley/test/long/TestRandomWorlds.py
+++ b/worlds/stardew_valley/test/long/TestRandomWorlds.py
@@ -1,19 +1,18 @@
-from typing import Dict, List
+from typing import Dict
 import random
 
 from BaseClasses import MultiWorld
-from Options import SpecialRange, Range
+from Options import NamedRange, Range
 from .option_names import options_to_include
-from .. import setup_solo_multiworld, SVTestBase
+from .. import setup_solo_multiworld, SVTestCase
 from ..checks.goal_checks import assert_perfection_world_is_valid, assert_goal_world_is_valid
 from ..checks.option_checks import assert_can_reach_island_if_should, assert_cropsanity_same_number_items_and_locations, \
     assert_festivals_give_access_to_deluxe_scarecrow
 from ..checks.world_checks import assert_same_number_items_locations, assert_victory_exists
-from ... import options
 
 
 def get_option_choices(option) -> Dict[str, int]:
-    if issubclass(option, SpecialRange):
+    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)}
@@ -73,14 +72,14 @@ def generate_many_worlds(number_worlds: int, start_index: int) -> Dict[int, Mult
     return multiworlds
 
 
-def check_every_multiworld_is_valid(tester: SVTestBase, multiworlds: Dict[int, MultiWorld]):
+def check_every_multiworld_is_valid(tester: SVTestCase, multiworlds: Dict[int, MultiWorld]):
     for multiworld_id in multiworlds:
         multiworld = multiworlds[multiworld_id]
         with tester.subTest(f"Checking validity of world {multiworld_id}"):
             check_multiworld_is_valid(tester, multiworld_id, multiworld)
 
 
-def check_multiworld_is_valid(tester: SVTestBase, multiworld_id: int, multiworld: MultiWorld):
+def check_multiworld_is_valid(tester: SVTestCase, multiworld_id: int, multiworld: MultiWorld):
     assert_victory_exists(tester, multiworld)
     assert_same_number_items_locations(tester, multiworld)
     assert_goal_world_is_valid(tester, multiworld)
@@ -89,7 +88,7 @@ def check_multiworld_is_valid(tester: SVTestBase, multiworld_id: int, multiworld
     assert_festivals_give_access_to_deluxe_scarecrow(tester, multiworld)
 
 
-class TestGenerateManyWorlds(SVTestBase):
+class TestGenerateManyWorlds(SVTestCase):
     def test_generate_many_worlds_then_check_results(self):
         if self.skip_long_tests:
             return
diff --git a/worlds/stardew_valley/test/long/option_names.py b/worlds/stardew_valley/test/long/option_names.py
index 9bb950d3a6..649d0da5b3 100644
--- a/worlds/stardew_valley/test/long/option_names.py
+++ b/worlds/stardew_valley/test/long/option_names.py
@@ -1,7 +1,8 @@
-from worlds.stardew_valley.options import stardew_valley_option_classes
+from ... import StardewValleyWorld
 
 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"]
-options_to_include = [option_to_include for option_to_include in stardew_valley_option_classes
-                      if option_to_include.internal_name not in options_to_exclude]
+                      "quick_start", "gifting", "gift_tax", "progression_balancing", "accessibility", "start_inventory", "start_hints", "death_link"]
+
+options_to_include = [option for option_name, option in StardewValleyWorld.options_dataclass.type_hints.items()
+                      if option_name not in options_to_exclude]
diff --git a/worlds/stardew_valley/test/mods/TestBiggerBackpack.py b/worlds/stardew_valley/test/mods/TestBiggerBackpack.py
index 0265f61731..bc81f21963 100644
--- a/worlds/stardew_valley/test/mods/TestBiggerBackpack.py
+++ b/worlds/stardew_valley/test/mods/TestBiggerBackpack.py
@@ -7,45 +7,40 @@ class TestBiggerBackpackVanilla(SVTestBase):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_vanilla,
                options.Mods.internal_name: ModNames.big_backpack}
 
-    def test_no_backpack_in_pool(self):
-        item_names = {item.name for item in self.multiworld.get_items()}
-        self.assertNotIn("Progressive Backpack", item_names)
+    def test_no_backpack(self):
+        with self.subTest(check="no items"):
+            item_names = {item.name for item in self.multiworld.get_items()}
+            self.assertNotIn("Progressive Backpack", item_names)
 
-    def test_no_backpack_locations(self):
-        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)
+        with self.subTest(check="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)
+            self.assertNotIn("Premium Pack", location_names)
 
 
 class TestBiggerBackpackProgressive(SVTestBase):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_progressive,
                options.Mods.internal_name: ModNames.big_backpack}
 
-    def test_backpack_is_in_pool_3_times(self):
-        item_names = [item.name for item in self.multiworld.get_items()]
-        self.assertEqual(item_names.count("Progressive Backpack"), 3)
+    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"), 3)
 
-    def test_3_backpack_locations(self):
-        location_names = {location.name for location in self.multiworld.get_locations()}
-        self.assertIn("Large Pack", location_names)
-        self.assertIn("Deluxe Pack", location_names)
-        self.assertIn("Premium Pack", location_names)
+        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)
+            self.assertIn("Premium Pack", location_names)
 
 
-class TestBiggerBackpackEarlyProgressive(SVTestBase):
+class TestBiggerBackpackEarlyProgressive(TestBiggerBackpackProgressive):
     options = {options.BackpackProgression.internal_name: options.BackpackProgression.option_early_progressive,
                options.Mods.internal_name: ModNames.big_backpack}
 
-    def test_backpack_is_in_pool_3_times(self):
-        item_names = [item.name for item in self.multiworld.get_items()]
-        self.assertEqual(item_names.count("Progressive Backpack"), 3)
+    def test_backpack(self):
+        super().test_backpack()
 
-    def test_3_backpack_locations(self):
-        location_names = {location.name for location in self.multiworld.get_locations()}
-        self.assertIn("Large Pack", location_names)
-        self.assertIn("Deluxe Pack", location_names)
-        self.assertIn("Premium Pack", location_names)
-
-    def test_progressive_backpack_is_in_early_pool(self):
-        self.assertIn("Progressive Backpack", self.multiworld.early_items[1])
+        with self.subTest(check="is early"):
+            self.assertIn("Progressive Backpack", self.multiworld.early_items[1])
diff --git a/worlds/stardew_valley/test/mods/TestMods.py b/worlds/stardew_valley/test/mods/TestMods.py
index a3198e4d2a..9bdabaf73f 100644
--- a/worlds/stardew_valley/test/mods/TestMods.py
+++ b/worlds/stardew_valley/test/mods/TestMods.py
@@ -4,24 +4,17 @@ import random
 import sys
 
 from BaseClasses import MultiWorld
-from worlds.stardew_valley.test import setup_solo_multiworld
-from worlds.stardew_valley.test.TestOptions import basic_checks, SVTestBase
-from worlds.stardew_valley import options, locations, items, Group, ItemClassification, StardewOptions
-from worlds.stardew_valley.mods.mod_data import ModNames
-from worlds.stardew_valley.regions import RandomizationFlag, create_final_connections, randomize_connections, create_final_regions
-from worlds.stardew_valley.items import item_table, items_by_group
-from worlds.stardew_valley.locations import location_table, LocationTags
-from worlds.stardew_valley.options import stardew_valley_option_classes, Mods, EntranceRandomization
-
-mod_list = ["DeepWoods", "Tractor Mod", "Bigger Backpack",
-            "Luck Skill", "Magic", "Socializing Skill", "Archaeology",
-            "Cooking Skill", "Binning Skill", "Juna - Roommate NPC",
-            "Professor Jasper Thomas", "Alec Revisited", "Custom NPC - Yoba", "Custom NPC Eugene",
-            "'Prophet' Wellwick", "Mister Ginger (cat npc)", "Shiko - New Custom NPC", "Delores - Custom NPC",
-            "Ayeisha - The Postal Worker (Custom NPC)", "Custom NPC - Riley", "Skull Cavern Elevator"]
+from ...mods.mod_data import all_mods
+from .. import setup_solo_multiworld, SVTestBase, SVTestCase, allsanity_options_without_mods
+from ..TestOptions import basic_checks
+from ... import items, Group, ItemClassification
+from ...regions import RandomizationFlag, create_final_connections, randomize_connections, create_final_regions
+from ...items import item_table, items_by_group
+from ...locations import location_table
+from ...options import Mods, EntranceRandomization, Friendsanity, SeasonRandomization, SpecialOrderLocations, ExcludeGingerIsland, TrapItems
 
 
-def check_stray_mod_items(chosen_mods: Union[List[str], str], tester: SVTestBase, multiworld: MultiWorld):
+def check_stray_mod_items(chosen_mods: Union[List[str], str], tester: unittest.TestCase, multiworld: MultiWorld):
     if isinstance(chosen_mods, str):
         chosen_mods = [chosen_mods]
     for multiworld_item in multiworld.get_items():
@@ -34,57 +27,32 @@ def check_stray_mod_items(chosen_mods: Union[List[str], str], tester: SVTestBase
         tester.assertTrue(location.mod_name is None or location.mod_name in chosen_mods)
 
 
-class TestGenerateModsOptions(SVTestBase):
+class TestGenerateModsOptions(SVTestCase):
 
     def test_given_single_mods_when_generate_then_basic_checks(self):
-        for mod in mod_list:
+        for mod in all_mods:
             with self.subTest(f"Mod: {mod}"):
                 multi_world = setup_solo_multiworld({Mods: mod})
                 basic_checks(self, multi_world)
                 check_stray_mod_items(mod, self, multi_world)
 
-    def test_given_mod_pairs_when_generate_then_basic_checks(self):
-        if self.skip_long_tests:
-            return
-        num_mods = len(mod_list)
-        for mod1_index in range(0, num_mods):
-            for mod2_index in range(mod1_index + 1, num_mods):
-                mod1 = mod_list[mod1_index]
-                mod2 = mod_list[mod2_index]
-                mods = (mod1, mod2)
-                with self.subTest(f"Mods: {mods}"):
-                    multiworld = setup_solo_multiworld({Mods: mods})
-                    basic_checks(self, multiworld)
-                    check_stray_mod_items(list(mods), self, multiworld)
-
     def test_given_mod_names_when_generate_paired_with_entrance_randomizer_then_basic_checks(self):
         for option in EntranceRandomization.options:
-            for mod in mod_list:
+            for mod in all_mods:
                 with self.subTest(f"entrance_randomization: {option}, Mod: {mod}"):
                     multiworld = setup_solo_multiworld({EntranceRandomization.internal_name: option, Mods: mod})
                     basic_checks(self, multiworld)
                     check_stray_mod_items(mod, self, multiworld)
-
-    def test_given_mod_names_when_generate_paired_with_other_options_then_basic_checks(self):
-        if self.skip_long_tests:
-            return
-        for option in stardew_valley_option_classes:
-            if not option.options:
-                continue
-            for value in option.options:
-                for mod in mod_list:
-                    with self.subTest(f"{option.internal_name}: {value}, Mod: {mod}"):
-                        multiworld = setup_solo_multiworld({option.internal_name: option.options[value], Mods: mod})
-                        basic_checks(self, multiworld)
-                        check_stray_mod_items(mod, self, multiworld)
+                    if self.skip_extra_tests:
+                        return  # assume the rest will work as well
 
 
 class TestBaseItemGeneration(SVTestBase):
     options = {
-        options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
-        options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive,
-        options.SpecialOrderLocations.internal_name: options.SpecialOrderLocations.option_board_qi,
-        options.Mods.internal_name: mod_list
+        Friendsanity.internal_name: Friendsanity.option_all_with_marriage,
+        SeasonRandomization.internal_name: SeasonRandomization.option_progressive,
+        SpecialOrderLocations.internal_name: SpecialOrderLocations.option_board_qi,
+        Mods.internal_name: all_mods
     }
 
     def test_all_progression_items_are_added_to_the_pool(self):
@@ -105,10 +73,10 @@ class TestBaseItemGeneration(SVTestBase):
 
 class TestNoGingerIslandModItemGeneration(SVTestBase):
     options = {
-        options.Friendsanity.internal_name: options.Friendsanity.option_all_with_marriage,
-        options.SeasonRandomization.internal_name: options.SeasonRandomization.option_progressive,
-        options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_true,
-        options.Mods.internal_name: mod_list
+        Friendsanity.internal_name: Friendsanity.option_all_with_marriage,
+        SeasonRandomization.internal_name: SeasonRandomization.option_progressive,
+        ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_true,
+        Mods.internal_name: all_mods
     }
 
     def test_all_progression_items_except_island_are_added_to_the_pool(self):
@@ -130,46 +98,47 @@ class TestNoGingerIslandModItemGeneration(SVTestBase):
                     self.assertIn(progression_item.name, all_created_items)
 
 
-class TestModEntranceRando(unittest.TestCase):
+class TestModEntranceRando(SVTestCase):
 
     def test_mod_entrance_randomization(self):
 
-        for option, flag in [(options.EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN),
-                             (options.EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION),
-                             (options.EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]:
+        for option, flag in [(EntranceRandomization.option_pelican_town, RandomizationFlag.PELICAN_TOWN),
+                             (EntranceRandomization.option_non_progression, RandomizationFlag.NON_PROGRESSION),
+                             (EntranceRandomization.option_buildings, RandomizationFlag.BUILDINGS)]:
             with self.subTest(option=option, flag=flag):
                 seed = random.randrange(sys.maxsize)
                 rand = random.Random(seed)
-                world_options = StardewOptions({options.EntranceRandomization.internal_name: option,
-                                                options.ExcludeGingerIsland.internal_name: options.ExcludeGingerIsland.option_false,
-                                                options.Mods.internal_name: mod_list})
-                final_regions = create_final_regions(world_options)
-                final_connections = create_final_connections(world_options)
+                world_options = {EntranceRandomization.internal_name: option,
+                                 ExcludeGingerIsland.internal_name: ExcludeGingerIsland.option_false,
+                                 Mods.internal_name: all_mods}
+                multiworld = setup_solo_multiworld(world_options)
+                world = multiworld.worlds[1]
+                final_regions = create_final_regions(world.options)
+                final_connections = create_final_connections(world.options)
 
                 regions_by_name = {region.name: region for region in final_regions}
-                _, randomized_connections = randomize_connections(rand, world_options, regions_by_name)
+                _, randomized_connections = randomize_connections(rand, world.options, regions_by_name)
 
                 for connection in final_connections:
                     if flag in connection.flag:
                         connection_in_randomized = connection.name in randomized_connections
                         reverse_in_randomized = connection.reverse in randomized_connections
                         self.assertTrue(connection_in_randomized,
-                                      f"Connection {connection.name} should be randomized but it is not in the output. Seed = {seed}")
+                                        f"Connection {connection.name} should be randomized but it is not in the output. Seed = {seed}")
                         self.assertTrue(reverse_in_randomized,
-                                      f"Connection {connection.reverse} should be randomized but it is not in the output. Seed = {seed}")
+                                        f"Connection {connection.reverse} should be randomized but it is not in the output. Seed = {seed}")
 
                 self.assertEqual(len(set(randomized_connections.values())), len(randomized_connections.values()),
                                  f"Connections are duplicated in randomization. Seed = {seed}")
 
 
-class TestModTraps(SVTestBase):
+class TestModTraps(SVTestCase):
     def test_given_traps_when_generate_then_all_traps_in_pool(self):
-        trap_option = options.TrapItems
-        for value in trap_option.options:
+        for value in TrapItems.options:
             if value == "no_traps":
                 continue
-            world_options = self.allsanity_options_without_mods()
-            world_options.update({options.TrapItems.internal_name: trap_option.options[value], Mods: "Magic"})
+            world_options = allsanity_options_without_mods()
+            world_options.update({TrapItems.internal_name: TrapItems.options[value], Mods: "Magic"})
             multi_world = setup_solo_multiworld(world_options)
             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()]
diff --git a/worlds/subnautica/__init__.py b/worlds/subnautica/__init__.py
index 2d4cf2faf6..de4f4e33dc 100644
--- a/worlds/subnautica/__init__.py
+++ b/worlds/subnautica/__init__.py
@@ -6,12 +6,12 @@ from typing import List, Dict, Any, cast
 
 from BaseClasses import Region, Entrance, Location, Item, Tutorial, ItemClassification
 from worlds.AutoWorld import World, WebWorld
-from . import Items
-from . import Locations
-from . import Creatures
-from . import Options
-from .Items import item_table, group_items, items_by_type, ItemType
-from .Rules import set_rules
+from . import items
+from . import locations
+from . import creatures
+from . import options
+from .items import item_table, group_items, items_by_type, ItemType
+from .rules import set_rules
 
 logger = logging.getLogger("Subnautica")
 
@@ -27,8 +27,8 @@ class SubnaticaWeb(WebWorld):
     )]
 
 
-all_locations = {data["name"]: loc_id for loc_id, data in Locations.location_table.items()}
-all_locations.update(Creatures.creature_locations)
+all_locations = {data["name"]: loc_id for loc_id, data in locations.location_table.items()}
+all_locations.update(creatures.creature_locations)
 
 
 class SubnauticaWorld(World):
@@ -40,9 +40,9 @@ class SubnauticaWorld(World):
     game = "Subnautica"
     web = SubnaticaWeb()
 
-    item_name_to_id = {data.name: item_id for item_id, data in Items.item_table.items()}
+    item_name_to_id = {data.name: item_id for item_id, data in items.item_table.items()}
     location_name_to_id = all_locations
-    option_definitions = Options.options
+    option_definitions = options.option_definitions
 
     data_version = 10
     required_client_version = (0, 4, 1)
@@ -50,37 +50,53 @@ class SubnauticaWorld(World):
     creatures_to_scan: List[str]
 
     def generate_early(self) -> None:
-        if self.multiworld.early_seaglide[self.player]:
+        if self.options.early_seaglide:
             self.multiworld.local_early_items[self.player]["Seaglide Fragment"] = 2
 
-        scan_option: Options.AggressiveScanLogic = self.multiworld.creature_scan_logic[self.player]
+        scan_option: options.AggressiveScanLogic = self.options.creature_scan_logic
         creature_pool = scan_option.get_pool()
 
-        self.multiworld.creature_scans[self.player].value = min(
+        self.options.creature_scans.value = min(
             len(creature_pool),
-            self.multiworld.creature_scans[self.player].value
+            self.options.creature_scans.value
         )
 
-        self.creatures_to_scan = self.multiworld.random.sample(
-            creature_pool, self.multiworld.creature_scans[self.player].value)
+        self.creatures_to_scan = self.random.sample(
+            creature_pool, self.options.creature_scans.value)
 
     def create_regions(self):
-        self.multiworld.regions += [
-            self.create_region("Menu", None, ["Lifepod 5"]),
-            self.create_region("Planet 4546B",
-                               Locations.events +
-                               [location["name"] for location in Locations.location_table.values()] +
-                               [creature+Creatures.suffix for creature in self.creatures_to_scan])
-        ]
+        # Create Regions
+        menu_region = Region("Menu", self.player, self.multiworld)
+        planet_region = Region("Planet 4546B", self.player, self.multiworld)
 
-        # Link regions
-        self.multiworld.get_entrance("Lifepod 5", self.player).connect(self.multiworld.get_region("Planet 4546B", self.player))
+        # Link regions together
+        menu_region.connect(planet_region, "Lifepod 5")
 
-        for event in Locations.events:
-            self.multiworld.get_location(event, self.player).place_locked_item(
+        # Create regular locations
+        location_names = itertools.chain((location["name"] for location in locations.location_table.values()),
+                                         (creature + creatures.suffix for creature in self.creatures_to_scan))
+        for location_name in location_names:
+            loc_id = self.location_name_to_id[location_name]
+            location = SubnauticaLocation(self.player, location_name, loc_id, planet_region)
+            planet_region.locations.append(location)
+
+        # Create events
+        goal_event_name = self.options.goal.get_event_name()
+
+        for event in locations.events:
+            location = SubnauticaLocation(self.player, event, None, planet_region)
+            planet_region.locations.append(location)
+            location.place_locked_item(
                 SubnauticaItem(event, ItemClassification.progression, None, player=self.player))
-        # make the goal event the victory "item"
-        self.multiworld.get_location(self.multiworld.goal[self.player].get_event_name(), self.player).item.name = "Victory"
+            if event == goal_event_name:
+                # make the goal event the victory "item"
+                location.item.name = "Victory"
+
+        # Register regions to multiworld
+        self.multiworld.regions += [
+            menu_region,
+            planet_region
+        ]
 
     # refer to Rules.py
     set_rules = set_rules
@@ -88,7 +104,7 @@ class SubnauticaWorld(World):
     def create_items(self):
         # Generate item pool
         pool: List[SubnauticaItem] = []
-        extras = self.multiworld.creature_scans[self.player].value
+        extras = self.options.creature_scans.value
 
         grouped = set(itertools.chain.from_iterable(group_items.values()))
 
@@ -139,17 +155,15 @@ class SubnauticaWorld(World):
         self.multiworld.itempool += pool
 
     def fill_slot_data(self) -> Dict[str, Any]:
-        goal: Options.Goal = self.multiworld.goal[self.player]
-        swim_rule: Options.SwimRule = self.multiworld.swim_rule[self.player]
         vanilla_tech: List[str] = []
 
         slot_data: Dict[str, Any] = {
-            "goal": goal.current_key,
-            "swim_rule": swim_rule.current_key,
+            "goal": self.options.goal.current_key,
+            "swim_rule": self.options.swim_rule.current_key,
             "vanilla_tech": vanilla_tech,
             "creatures_to_scan": self.creatures_to_scan,
-            "death_link": self.multiworld.death_link[self.player].value,
-            "free_samples": self.multiworld.free_samples[self.player].value,
+            "death_link": self.options.death_link.value,
+            "free_samples": self.options.free_samples.value,
         }
 
         return slot_data
@@ -161,10 +175,10 @@ class SubnauticaWorld(World):
                               item_table[item_id].classification,
                               item_id, player=self.player)
 
-    def create_region(self, name: str, locations=None, exits=None):
+    def create_region(self, name: str, region_locations=None, exits=None):
         ret = Region(name, self.player, self.multiworld)
-        if locations:
-            for location in locations:
+        if region_locations:
+            for location in region_locations:
                 loc_id = self.location_name_to_id.get(location, None)
                 location = SubnauticaLocation(self.player, location, loc_id, ret)
                 ret.locations.append(location)
diff --git a/worlds/subnautica/Creatures.py b/worlds/subnautica/creatures.py
similarity index 100%
rename from worlds/subnautica/Creatures.py
rename to worlds/subnautica/creatures.py
diff --git a/worlds/subnautica/Exports.py b/worlds/subnautica/exports.py
similarity index 95%
rename from worlds/subnautica/Exports.py
rename to worlds/subnautica/exports.py
index 7a69cffc8d..911c6a6f69 100644
--- a/worlds/subnautica/Exports.py
+++ b/worlds/subnautica/exports.py
@@ -12,8 +12,8 @@ if __name__ == "__main__":
     os.chdir(new_home)
     sys.path.append(new_home)
 
-    from worlds.subnautica.Locations import Vector, location_table
-    from worlds.subnautica.Items import item_table, group_items, items_by_type
+    from worlds.subnautica.locations import Vector, location_table
+    from worlds.subnautica.items import item_table, group_items, items_by_type
     from NetUtils import encode
 
     export_folder = os.path.join(new_home, "Subnautica Export")
diff --git a/worlds/subnautica/Items.py b/worlds/subnautica/items.py
similarity index 100%
rename from worlds/subnautica/Items.py
rename to worlds/subnautica/items.py
diff --git a/worlds/subnautica/Locations.py b/worlds/subnautica/locations.py
similarity index 100%
rename from worlds/subnautica/Locations.py
rename to worlds/subnautica/locations.py
diff --git a/worlds/subnautica/Options.py b/worlds/subnautica/options.py
similarity index 98%
rename from worlds/subnautica/Options.py
rename to worlds/subnautica/options.py
index 582e93eb0e..d8d727a9e1 100644
--- a/worlds/subnautica/Options.py
+++ b/worlds/subnautica/options.py
@@ -1,7 +1,7 @@
 import typing
 
 from Options import Choice, Range, DeathLink, Toggle, DefaultOnToggle, StartInventoryPool
-from .Creatures import all_creatures, Definitions
+from .creatures import all_creatures, Definitions
 
 
 class SwimRule(Choice):
@@ -103,7 +103,7 @@ class SubnauticaDeathLink(DeathLink):
     Note: can be toggled via in-game console command "deathlink"."""
 
 
-options = {
+option_definitions = {
     "swim_rule": SwimRule,
     "early_seaglide": EarlySeaglide,
     "free_samples": FreeSamples,
diff --git a/worlds/subnautica/Rules.py b/worlds/subnautica/rules.py
similarity index 92%
rename from worlds/subnautica/Rules.py
rename to worlds/subnautica/rules.py
index 793c85be41..3b6c5cd4dd 100644
--- a/worlds/subnautica/Rules.py
+++ b/worlds/subnautica/rules.py
@@ -1,9 +1,9 @@
 from typing import TYPE_CHECKING, Dict, Callable, Optional
 
 from worlds.generic.Rules import set_rule, add_rule
-from .Locations import location_table, LocationDict
-from .Creatures import all_creatures, aggressive, suffix, hatchable, containment
-from .Options import AggressiveScanLogic, SwimRule
+from .locations import location_table, LocationDict
+from .creatures import all_creatures, aggressive, suffix, hatchable, containment
+from .options import AggressiveScanLogic, SwimRule
 import math
 
 if TYPE_CHECKING:
@@ -290,16 +290,16 @@ aggression_rules: Dict[int, Callable[["CollectionState", int], bool]] = {
 
 def set_rules(subnautica_world: "SubnauticaWorld"):
     player = subnautica_world.player
-    world = subnautica_world.multiworld
+    multiworld = subnautica_world.multiworld
 
     for loc in location_table.values():
-        set_location_rule(world, player, loc)
+        set_location_rule(multiworld, player, loc)
 
     if subnautica_world.creatures_to_scan:
-        option = world.creature_scan_logic[player]
+        option = multiworld.creature_scan_logic[player]
 
         for creature_name in subnautica_world.creatures_to_scan:
-            location = set_creature_rule(world, player, creature_name)
+            location = set_creature_rule(multiworld, player, creature_name)
             if creature_name in containment:  # there is no other way, hard-required containment
                 add_rule(location, lambda state: has_containment(state, player))
             elif creature_name in aggressive:
@@ -309,7 +309,7 @@ def set_rules(subnautica_world: "SubnauticaWorld"):
                              lambda state, loc_rule=get_aggression_rule(option, creature_name): loc_rule(state, player))
 
     # Victory locations
-    set_rule(world.get_location("Neptune Launch", player),
+    set_rule(multiworld.get_location("Neptune Launch", player),
              lambda state:
              get_max_depth(state, player) >= 1444 and
              has_mobile_vehicle_bay(state, player) and
@@ -322,13 +322,14 @@ def set_rules(subnautica_world: "SubnauticaWorld"):
              state.has("Ion Battery", player) and
              has_cyclops_shield(state, player))
 
-    set_rule(world.get_location("Disable Quarantine", player), lambda state:
-    get_max_depth(state, player) >= 1444)
+    set_rule(multiworld.get_location("Disable Quarantine", player),
+             lambda state: get_max_depth(state, player) >= 1444)
 
-    set_rule(world.get_location("Full Infection", player), lambda state:
-    get_max_depth(state, player) >= 900)
+    set_rule(multiworld.get_location("Full Infection", player),
+             lambda state: get_max_depth(state, player) >= 900)
 
-    room = world.get_location("Aurora Drive Room - Upgrade Console", player)
-    set_rule(world.get_location("Repair Aurora Drive", player), lambda state: room.can_reach(state))
+    room = multiworld.get_location("Aurora Drive Room - Upgrade Console", player)
+    set_rule(multiworld.get_location("Repair Aurora Drive", player),
+             lambda state: room.can_reach(state))
 
-    world.completion_condition[player] = lambda state: state.has("Victory", player)
+    multiworld.completion_condition[player] = lambda state: state.has("Victory", player)
diff --git a/worlds/subnautica/test/__init__.py b/worlds/subnautica/test/__init__.py
index d938830737..69f0b6c7cd 100644
--- a/worlds/subnautica/test/__init__.py
+++ b/worlds/subnautica/test/__init__.py
@@ -15,11 +15,11 @@ class SubnauticaTest(unittest.TestCase):
                     self.assertGreater(self.scancutoff, id)
 
     def testGroupAssociation(self):
-        from worlds.subnautica import Items
-        for item_id, item_data in Items.item_table.items():
-            if item_data.type == Items.ItemType.group:
+        from worlds.subnautica import items
+        for item_id, item_data in items.item_table.items():
+            if item_data.type == items.ItemType.group:
                 with self.subTest(item=item_data.name):
-                    self.assertIn(item_id, Items.group_items)
-        for item_id in Items.group_items:
+                    self.assertIn(item_id, items.group_items)
+        for item_id in items.group_items:
             with self.subTest(item_id=item_id):
-                self.assertEqual(Items.item_table[item_id].type, Items.ItemType.group)
+                self.assertEqual(items.item_table[item_id].type, items.ItemType.group)
diff --git a/worlds/terraria/Rules.dsv b/worlds/terraria/Rules.dsv
index 5f5551e465..b511db54de 100644
--- a/worlds/terraria/Rules.dsv
+++ b/worlds/terraria/Rules.dsv
@@ -305,7 +305,7 @@ Hydraulic Volt Crusher;             Calamity;
 Life Fruit;                         ;                                           (@mech_boss(1) & Wall of Flesh) | (@calamity & (Living Shard | Wall of Flesh));
 Get a Life;                         Achievement;                                Life Fruit;
 Topped Off;                         Achievement;                                Life Fruit;
-Old One's Army Tier 2;              Location | Item;                            #Old One's Army Tier 1 & (@mech_boss(1) | #Old One's Army Tier 3);
+Old One's Army Tier 2;              Location | Item;                            #Old One's Army Tier 1 & ((Wall of Flesh & @mech_boss(1)) | #Old One's Army Tier 3);
 
 // Brimstone Elemental
 Infernal Suevite;                   Calamity;                                   @pickaxe(150) | Brimstone Elemental;
@@ -410,7 +410,7 @@ Scoria Bar;                         Calamity;
 Seismic Hampick;                    Calamity | Pickaxe(210) | Hammer(95);       Hardmode Anvil & Scoria Bar;
 Life Alloy;                         Calamity;                                   (Hardmode Anvil & Cryonic Bar & Perennial Bar & Scoria Bar) | Necromantic Geode;
 Advanced Display;                   Calamity;                                   Hardmode Anvil & Mysterious Circuitry & Dubious Plating & Life Alloy & Long Ranged Sensor Array;
-Old One's Army Tier 3;              Location | Item;                            #Old One's Army Tier 1 & Golem;
+Old One's Army Tier 3;              Location | Item;                            #Old One's Army Tier 1 & Wall of Flesh & Golem;
 
 // Martian Madness
 Martian Madness;                    Location | Item;                            Wall of Flesh & Golem;
diff --git a/worlds/terraria/docs/setup_en.md b/worlds/terraria/docs/setup_en.md
index 84744a4a33..b69af591fa 100644
--- a/worlds/terraria/docs/setup_en.md
+++ b/worlds/terraria/docs/setup_en.md
@@ -31,6 +31,8 @@ highly recommended to use utility mods and features to speed up gameplay, such a
     - (Can be used to break progression)
 - Reduced Grinding
 - Upgraded Research
+    - (WARNING: Do not use without Journey mode)
+    - (NOTE: If items you pick up aren't showing up in your inventory, check your research menu. This mod automatically researches certain items.)
 
 ## Configuring your YAML File
 
diff --git a/worlds/timespinner/Locations.py b/worlds/timespinner/Locations.py
index 70c76b8638..7b378b4637 100644
--- a/worlds/timespinner/Locations.py
+++ b/worlds/timespinner/Locations.py
@@ -1,4 +1,4 @@
-from typing import List, Tuple, Optional, Callable, NamedTuple
+from typing import List, Optional, Callable, NamedTuple
 from BaseClasses import MultiWorld, CollectionState
 from .Options import is_option_enabled
 from .PreCalculatedWeights import PreCalculatedWeights
@@ -11,11 +11,11 @@ class LocationData(NamedTuple):
     region: str
     name: str
     code: Optional[int]
-    rule: Callable[[CollectionState], bool] = lambda state: True
+    rule: Optional[Callable[[CollectionState], bool]] = None
 
 
 def get_location_datas(world: Optional[MultiWorld], player: Optional[int], 
-                  precalculated_weights: PreCalculatedWeights) -> Tuple[LocationData, ...]:
+                  precalculated_weights: PreCalculatedWeights) -> List[LocationData]:
 
     flooded: PreCalculatedWeights = precalculated_weights
     logic = TimespinnerLogic(world, player, precalculated_weights)
@@ -88,9 +88,9 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int],
         LocationData('Military Fortress (hangar)', 'Military Fortress: Soldiers bridge',  1337060),
         LocationData('Military Fortress (hangar)', 'Military Fortress: Giantess room',  1337061),
         LocationData('Military Fortress (hangar)', 'Military Fortress: Giantess bridge',  1337062),
-        LocationData('Military Fortress (hangar)', 'Military Fortress: B door chest 2',  1337063, lambda state: logic.has_doublejump(state) and logic.has_keycard_B(state)),
-        LocationData('Military Fortress (hangar)', 'Military Fortress: B door chest 1',  1337064, lambda state: logic.has_doublejump(state) and logic.has_keycard_B(state)),
-        LocationData('Military Fortress (hangar)', 'Military Fortress: Pedestal',  1337065, lambda state: logic.has_doublejump_of_npc(state) or logic.has_forwarddash_doublejump(state)),
+        LocationData('Military Fortress (hangar)', 'Military Fortress: B door chest 2',  1337063, lambda state: logic.has_keycard_B(state) and (state.has('Water Mask', player) if flooded.flood_lab else logic.has_doublejump(state))),
+        LocationData('Military Fortress (hangar)', 'Military Fortress: B door chest 1',  1337064, lambda state: logic.has_keycard_B(state) and (state.has('Water Mask', player) if flooded.flood_lab else logic.has_doublejump(state))),
+        LocationData('Military Fortress (hangar)', 'Military Fortress: Pedestal',  1337065, lambda state: state.has('Water Mask', player) if flooded.flood_lab else (logic.has_doublejump_of_npc(state) or logic.has_forwarddash_doublejump(state))),
         LocationData('The lab', 'Lab: Coffee break',  1337066),
         LocationData('The lab', 'Lab: Lower trash right',  1337067, logic.has_doublejump),
         LocationData('The lab', 'Lab: Lower trash left',  1337068, logic.has_upwarddash),
@@ -139,17 +139,17 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int],
         LocationData('Lower Lake Serene', 'Lake Serene (Lower): Under the eels',  1337106),
         LocationData('Lower Lake Serene', 'Lake Serene (Lower): Water spikes room',  1337107),
         LocationData('Lower Lake Serene', 'Lake Serene (Lower): Underwater secret',  1337108, logic.can_break_walls),
-        LocationData('Lower Lake Serene', 'Lake Serene (Lower): T chest',  1337109, lambda state: not flooded.dry_lake_serene or logic.has_doublejump_of_npc(state)),
+        LocationData('Lower Lake Serene', 'Lake Serene (Lower): T chest',  1337109, lambda state: flooded.flood_lake_serene or logic.has_doublejump_of_npc(state)),
         LocationData('Lower Lake Serene', 'Lake Serene (Lower): Past the eels',  1337110),
-        LocationData('Lower Lake Serene', 'Lake Serene (Lower): Underwater pedestal',  1337111, lambda state: not flooded.dry_lake_serene or logic.has_doublejump(state)),
-        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Shroom jump room',  1337112, lambda state: not flooded.flood_maw or logic.has_doublejump(state)),
+        LocationData('Lower Lake Serene', 'Lake Serene (Lower): Underwater pedestal',  1337111, lambda state: flooded.flood_lake_serene or logic.has_doublejump(state)),
+        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Shroom jump room',  1337112, lambda state: flooded.flood_maw or logic.has_doublejump(state)),
         LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Secret room',  1337113, lambda state: logic.can_break_walls(state) and (not flooded.flood_maw or state.has('Water Mask', player))),
         LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Bottom left room',  1337114, lambda state: not flooded.flood_maw or state.has('Water Mask', player)),
         LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Single shroom room',  1337115),
-        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 1',  1337116, lambda state: logic.has_forwarddash_doublejump(state) or flooded.flood_maw),
-        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 2',  1337117, lambda state: logic.has_forwarddash_doublejump(state) or flooded.flood_maw),
-        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 3',  1337118, lambda state: logic.has_forwarddash_doublejump(state) or flooded.flood_maw),
-        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 4',  1337119, lambda state: logic.has_forwarddash_doublejump(state) or flooded.flood_maw),
+        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 1',  1337116, lambda state: flooded.flood_maw or logic.has_forwarddash_doublejump(state)),
+        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 2',  1337117, lambda state: flooded.flood_maw or logic.has_forwarddash_doublejump(state)),
+        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 3',  1337118, lambda state: flooded.flood_maw or logic.has_forwarddash_doublejump(state)),
+        LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Jackpot room chest 4',  1337119, lambda state: flooded.flood_maw or logic.has_forwarddash_doublejump(state)),
         LocationData('Caves of Banishment (upper)', 'Caves of Banishment (Maw): Pedestal',  1337120, lambda state: not flooded.flood_maw or state.has('Water Mask', player)),
         LocationData('Caves of Banishment (Maw)', 'Caves of Banishment (Maw): Last chance before Maw',  1337121, lambda state: state.has('Water Mask', player) if flooded.flood_maw else logic.has_doublejump(state)),
         LocationData('Caves of Banishment (Maw)', 'Caves of Banishment (Maw): Plasma Crystal', 1337173, lambda state: state.has_any({'Gas Mask', 'Talaria Attachment'}, player) and (not flooded.flood_maw or state.has('Water Mask', player))),
@@ -197,7 +197,7 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int],
         LocationData('Ancient Pyramid (entrance)', 'Ancient Pyramid: Why not it\'s right there',  1337246),
         LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Conviction guarded room',  1337247),
         LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Pit secret room',  1337248, lambda state: logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
-        LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret chest',  1337249, lambda state: logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))),
+        LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret chest',  1337249, lambda state: logic.can_break_walls(state) and (state.has('Water Mask', player) if flooded.flood_pyramid_shaft else logic.has_doublejump(state))),
         LocationData('Ancient Pyramid (right)', 'Ancient Pyramid: Nightmare Door chest',  1337236, lambda state: not flooded.flood_pyramid_back or state.has('Water Mask', player)),
         LocationData('Ancient Pyramid (right)', 'Killed Nightmare', EventId, lambda state: state.has_all({'Timespinner Wheel', 'Timespinner Spindle', 'Timespinner Gear 1', 'Timespinner Gear 2', 'Timespinner Gear 3'}, player) and (not flooded.flood_pyramid_back or state.has('Water Mask', player)))
     ]
@@ -271,4 +271,4 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int],
             LocationData('Ifrit\'s Lair', 'Ifrit: Post fight (chest)', 1337245),
         )
  
-    return tuple(location_table)
+    return location_table
diff --git a/worlds/timespinner/Options.py b/worlds/timespinner/Options.py
index 8b11184944..f7921fcb81 100644
--- a/worlds/timespinner/Options.py
+++ b/worlds/timespinner/Options.py
@@ -54,14 +54,23 @@ class LoreChecks(Toggle):
     display_name = "Lore Checks"
 
 
-class BossRando(Toggle):
-    "Shuffles the positions of all bosses."
+class BossRando(Choice):
+    "Wheter all boss locations are shuffled, and if their damage/hp should be scaled."
     display_name = "Boss Randomization"
+    option_off = 0
+    option_scaled = 1
+    option_unscaled = 2
+    alias_true = 1
 
 
-class BossScaling(DefaultOnToggle):
-    "When Boss Rando is enabled, scales the bosses' HP, XP, and ATK to the stats of the location they replace (Recommended)"
-    display_name = "Scale Random Boss Stats"
+class EnemyRando(Choice):
+    "Wheter enemies will be randomized, and if their damage/hp should be scaled."
+    display_name = "Enemy Randomization"
+    option_off = 0
+    option_scaled = 1
+    option_unscaled = 2
+    option_ryshia = 3
+    alias_true = 1
 
 
 class DamageRando(Choice):
@@ -336,6 +345,7 @@ def rising_tide_option(location: str, with_save_point_option: bool = False) -> D
 class RisingTidesOverrides(OptionDict):
     """Odds for specific areas to be flooded or drained, only has effect when RisingTides is on.
     Areas that are not specified will roll with the default 33% chance of getting flooded or drained"""
+    display_name = "Rising Tides Overrides"
     schema = Schema({
         **rising_tide_option("Xarion"),
         **rising_tide_option("Maw"),
@@ -345,9 +355,10 @@ class RisingTidesOverrides(OptionDict):
         **rising_tide_option("CastleBasement", with_save_point_option=True),
         **rising_tide_option("CastleCourtyard"),
         **rising_tide_option("LakeDesolation"),
-        **rising_tide_option("LakeSerene")
+        **rising_tide_option("LakeSerene"),
+        **rising_tide_option("LakeSereneBridge"),
+        **rising_tide_option("Lab"),
     })
-    display_name = "Rising Tides Overrides"
     default = {
         "Xarion": { "Dry": 67, "Flooded": 33 },
         "Maw": { "Dry": 67, "Flooded": 33 },
@@ -358,6 +369,8 @@ class RisingTidesOverrides(OptionDict):
         "CastleCourtyard": { "Dry": 67, "Flooded": 33 },
         "LakeDesolation": { "Dry": 67, "Flooded": 33 },
         "LakeSerene": { "Dry": 33, "Flooded": 67 },
+        "LakeSereneBridge": { "Dry": 67, "Flooded": 33 },
+        "Lab": { "Dry": 67, "Flooded": 33 },
     }
 
 
@@ -383,6 +396,11 @@ class Traps(OptionList):
     default = [ "Meteor Sparrow Trap", "Poison Trap", "Chaos Trap", "Neurotoxin Trap", "Bee Trap" ]
 
 
+class PresentAccessWithWheelAndSpindle(Toggle):
+    """When inverted, allows using the refugee camp warp when both the Timespinner Wheel and Spindle is acquired."""
+    display_name = "Past Wheel & Spindle Warp"
+
+
 # Some options that are available in the timespinner randomizer arent currently implemented
 timespinner_options: Dict[str, Option] = {
     "StartWithJewelryBox": StartWithJewelryBox,
@@ -396,7 +414,7 @@ timespinner_options: Dict[str, Option] = {
     "Cantoran": Cantoran,
     "LoreChecks": LoreChecks,
     "BossRando": BossRando,
-    "BossScaling": BossScaling,
+    "EnemyRando": EnemyRando,
     "DamageRando": DamageRando,
     "DamageRandoOverrides": DamageRandoOverrides,
     "HpCap": HpCap,
@@ -419,6 +437,7 @@ timespinner_options: Dict[str, Option] = {
     "UnchainedKeys": UnchainedKeys,
     "TrapChance": TrapChance,
     "Traps": Traps,
+    "PresentAccessWithWheelAndSpindle": PresentAccessWithWheelAndSpindle,
     "DeathLink": DeathLink,
 }
 
diff --git a/worlds/timespinner/PreCalculatedWeights.py b/worlds/timespinner/PreCalculatedWeights.py
index 64243e25ed..ff7f031d3b 100644
--- a/worlds/timespinner/PreCalculatedWeights.py
+++ b/worlds/timespinner/PreCalculatedWeights.py
@@ -1,4 +1,4 @@
-from typing import Tuple, Dict, Union
+from typing import Tuple, Dict, Union, List
 from BaseClasses import MultiWorld
 from .Options import timespinner_options, is_option_enabled, get_option_value
 
@@ -17,7 +17,9 @@ class PreCalculatedWeights:
     flood_moat: bool
     flood_courtyard: bool
     flood_lake_desolation: bool
-    dry_lake_serene: bool
+    flood_lake_serene: bool
+    flood_lake_serene_bridge: bool
+    flood_lab: bool
 
     def __init__(self, world: MultiWorld, player: int):
         if world and is_option_enabled(world, player, "RisingTides"):
@@ -32,8 +34,9 @@ class PreCalculatedWeights:
             self.flood_moat, _ = self.roll_flood_setting(world, player, weights_overrrides, "CastleMoat")
             self.flood_courtyard, _ = self.roll_flood_setting(world, player, weights_overrrides, "CastleCourtyard")
             self.flood_lake_desolation, _ = self.roll_flood_setting(world, player, weights_overrrides, "LakeDesolation")
-            flood_lake_serene, _ = self.roll_flood_setting(world, player, weights_overrrides, "LakeSerene")
-            self.dry_lake_serene = not flood_lake_serene 
+            self.flood_lake_serene, _ = self.roll_flood_setting(world, player, weights_overrrides, "LakeSerene")
+            self.flood_lake_serene_bridge, _ = self.roll_flood_setting(world, player, weights_overrrides, "LakeSereneBridge")
+            self.flood_lab, _ = self.roll_flood_setting(world, player, weights_overrrides, "Lab")
         else:
             self.flood_basement = False
             self.flood_basement_high = False
@@ -44,30 +47,32 @@ class PreCalculatedWeights:
             self.flood_moat = False
             self.flood_courtyard = False
             self.flood_lake_desolation = False
-            self.dry_lake_serene = False 
+            self.flood_lake_serene = True 
+            self.flood_lake_serene_bridge = False
+            self.flood_lab = False
 
         self.pyramid_keys_unlock, self.present_key_unlock, self.past_key_unlock, self.time_key_unlock = \
-            self.get_pyramid_keys_unlocks(world, player, self.flood_maw)
+            self.get_pyramid_keys_unlocks(world, player, self.flood_maw, self.flood_xarion)
 
     @staticmethod
-    def get_pyramid_keys_unlocks(world: MultiWorld, player: int, is_maw_flooded: bool) -> Tuple[str, str, str, str]:
-        present_teleportation_gates: Tuple[str, ...] = (
+    def get_pyramid_keys_unlocks(world: MultiWorld, player: int, is_maw_flooded: bool, is_xarion_flooded: bool) -> Tuple[str, str, str, str]:
+        present_teleportation_gates: List[str] = [
             "GateKittyBoss",
             "GateLeftLibrary",
             "GateMilitaryGate",
             "GateSealedCaves",
             "GateSealedSirensCave",
             "GateLakeDesolation"
-        )
+        ]
 
-        past_teleportation_gates: Tuple[str, ...] = (
+        past_teleportation_gates: List[str] = [
             "GateLakeSereneRight",
             "GateAccessToPast",
             "GateCastleRamparts",
             "GateCastleKeep",
             "GateRoyalTowers",
             "GateCavesOfBanishment"
-        )
+        ]
 
         ancient_pyramid_teleportation_gates: Tuple[str, ...] = (
             "GateGyre",
@@ -84,7 +89,10 @@ class PreCalculatedWeights:
             )
 
         if not is_maw_flooded:
-            past_teleportation_gates += ("GateMaw", )
+            past_teleportation_gates.append("GateMaw")
+
+        if not is_xarion_flooded:
+            present_teleportation_gates.append("GateXarion")
 
         if is_option_enabled(world, player, "Inverted"):
             all_gates: Tuple[str, ...] = present_teleportation_gates
diff --git a/worlds/timespinner/Regions.py b/worlds/timespinner/Regions.py
index 905cae867e..fc75356429 100644
--- a/worlds/timespinner/Regions.py
+++ b/worlds/timespinner/Regions.py
@@ -1,4 +1,4 @@
-from typing import List, Set, Dict, Tuple, Optional, Callable
+from typing import List, Set, Dict, Optional, Callable
 from BaseClasses import CollectionState, MultiWorld, Region, Entrance, Location
 from .Options import is_option_enabled
 from .Locations import LocationData, get_location_datas
@@ -7,9 +7,8 @@ from .LogicExtensions import TimespinnerLogic
 
 
 def create_regions_and_locations(world: MultiWorld, player: int, precalculated_weights: PreCalculatedWeights):
-    locationn_datas: Tuple[LocationData] = get_location_datas(world, player, precalculated_weights)
-
-    locations_per_region: Dict[str, List[LocationData]] = split_location_datas_per_region(locationn_datas)
+    locations_per_region: Dict[str, List[LocationData]] = split_location_datas_per_region(
+        get_location_datas(world, player, precalculated_weights))
 
     regions = [
         create_region(world, player, locations_per_region, 'Menu'),
@@ -32,7 +31,6 @@ def create_regions_and_locations(world: MultiWorld, player: int, precalculated_w
         create_region(world, player, locations_per_region, 'The lab (upper)'),
         create_region(world, player, locations_per_region, 'Emperors tower'),
         create_region(world, player, locations_per_region, 'Skeleton Shaft'),
-        create_region(world, player, locations_per_region, 'Sealed Caves (upper)'),
         create_region(world, player, locations_per_region, 'Sealed Caves (Xarion)'),
         create_region(world, player, locations_per_region, 'Refugee Camp'),
         create_region(world, player, locations_per_region, 'Forest'),
@@ -63,7 +61,7 @@ def create_regions_and_locations(world: MultiWorld, player: int, precalculated_w
 
     if __debug__:
         throwIfAnyLocationIsNotAssignedToARegion(regions, locations_per_region.keys())
-        
+
     world.regions += regions
 
     connectStartingRegion(world, player)
@@ -71,9 +69,9 @@ def create_regions_and_locations(world: MultiWorld, player: int, precalculated_w
     flooded: PreCalculatedWeights = precalculated_weights
     logic = TimespinnerLogic(world, player, precalculated_weights)
 
-    connect(world, player, 'Lake desolation', 'Lower lake desolation', lambda state: logic.has_timestop(state) or state.has('Talaria Attachment', player) or flooded.flood_lake_desolation)
+    connect(world, player, 'Lake desolation', 'Lower lake desolation', lambda state: flooded.flood_lake_desolation or logic.has_timestop(state) or state.has('Talaria Attachment', player))
     connect(world, player, 'Lake desolation', 'Upper lake desolation', lambda state: logic.has_fire(state) and state.can_reach('Upper Lake Serene', 'Region', player))
-    connect(world, player, 'Lake desolation', 'Skeleton Shaft', lambda state: logic.has_doublejump(state) or flooded.flood_lake_desolation)
+    connect(world, player, 'Lake desolation', 'Skeleton Shaft', lambda state: flooded.flood_lake_desolation or logic.has_doublejump(state))
     connect(world, player, 'Lake desolation', 'Space time continuum', logic.has_teleport)
     connect(world, player, 'Upper lake desolation', 'Lake desolation')
     connect(world, player, 'Upper lake desolation', 'Eastern lake desolation')
@@ -109,40 +107,38 @@ def create_regions_and_locations(world: MultiWorld, player: int, precalculated_w
     connect(world, player, 'Military Fortress', 'Temporal Gyre', lambda state: state.has('Timespinner Wheel', player))
     connect(world, player, 'Military Fortress', 'Military Fortress (hangar)', logic.has_doublejump)
     connect(world, player, 'Military Fortress (hangar)', 'Military Fortress')
-    connect(world, player, 'Military Fortress (hangar)', 'The lab', lambda state: logic.has_keycard_B(state) and logic.has_doublejump(state))
+    connect(world, player, 'Military Fortress (hangar)', 'The lab', lambda state: logic.has_keycard_B(state) and (state.has('Water Mask', player) if flooded.flood_lab else logic.has_doublejump(state)))
     connect(world, player, 'Temporal Gyre', 'Military Fortress')
     connect(world, player, 'The lab', 'Military Fortress')
     connect(world, player, 'The lab', 'The lab (power off)', logic.has_doublejump_of_npc)
-    connect(world, player, 'The lab (power off)', 'The lab')
+    connect(world, player, 'The lab (power off)', 'The lab', lambda state: not flooded.flood_lab or state.has('Water Mask', player))
     connect(world, player, 'The lab (power off)', 'The lab (upper)', logic.has_forwarddash_doublejump)
     connect(world, player, 'The lab (upper)', 'The lab (power off)')
     connect(world, player, 'The lab (upper)', 'Emperors tower', logic.has_forwarddash_doublejump)
     connect(world, player, 'The lab (upper)', 'Ancient Pyramid (entrance)', lambda state: state.has_all({'Timespinner Wheel', 'Timespinner Spindle', 'Timespinner Gear 1', 'Timespinner Gear 2', 'Timespinner Gear 3'}, player))
     connect(world, player, 'Emperors tower', 'The lab (upper)')
     connect(world, player, 'Skeleton Shaft', 'Lake desolation')
-    connect(world, player, 'Skeleton Shaft', 'Sealed Caves (upper)', logic.has_keycard_A)
+    connect(world, player, 'Skeleton Shaft', 'Sealed Caves (Xarion)', logic.has_keycard_A)
     connect(world, player, 'Skeleton Shaft', 'Space time continuum', logic.has_teleport)
-    connect(world, player, 'Sealed Caves (upper)', 'Skeleton Shaft')
-    connect(world, player, 'Sealed Caves (upper)', 'Sealed Caves (Xarion)', lambda state: logic.has_teleport(state) or logic.has_doublejump(state))
-    connect(world, player, 'Sealed Caves (Xarion)', 'Sealed Caves (upper)', logic.has_doublejump)
+    connect(world, player, 'Sealed Caves (Xarion)', 'Skeleton Shaft')
     connect(world, player, 'Sealed Caves (Xarion)', 'Space time continuum', logic.has_teleport)
     connect(world, player, 'Refugee Camp', 'Forest')
-    #connect(world, player, 'Refugee Camp', 'Library', lambda state: not is_option_enabled(world, player, "Inverted"))
+    connect(world, player, 'Refugee Camp', 'Library', lambda state: is_option_enabled(world, player, "Inverted") and is_option_enabled(world, player, "PresentAccessWithWheelAndSpindle") and state.has_all({'Timespinner Wheel', 'Timespinner Spindle'}, player))
     connect(world, player, 'Refugee Camp', 'Space time continuum', logic.has_teleport)
     connect(world, player, 'Forest', 'Refugee Camp')
-    connect(world, player, 'Forest', 'Left Side forest Caves', lambda state: state.has('Talaria Attachment', player) or logic.has_timestop(state))
+    connect(world, player, 'Forest', 'Left Side forest Caves', lambda state: flooded.flood_lake_serene_bridge or state.has('Talaria Attachment', player) or logic.has_timestop(state))
     connect(world, player, 'Forest', 'Caves of Banishment (Sirens)')
     connect(world, player, 'Forest', 'Castle Ramparts')
     connect(world, player, 'Left Side forest Caves', 'Forest')
     connect(world, player, 'Left Side forest Caves', 'Upper Lake Serene', logic.has_timestop)
-    connect(world, player, 'Left Side forest Caves', 'Lower Lake Serene', lambda state: state.has('Water Mask', player) or flooded.dry_lake_serene)
+    connect(world, player, 'Left Side forest Caves', 'Lower Lake Serene', lambda state: not flooded.flood_lake_serene or state.has('Water Mask', player))
     connect(world, player, 'Left Side forest Caves', 'Space time continuum', logic.has_teleport)
     connect(world, player, 'Upper Lake Serene', 'Left Side forest Caves')
-    connect(world, player, 'Upper Lake Serene', 'Lower Lake Serene', lambda state: state.has('Water Mask', player) or flooded.dry_lake_serene)
+    connect(world, player, 'Upper Lake Serene', 'Lower Lake Serene', lambda state: not flooded.flood_lake_serene or state.has('Water Mask', player))
     connect(world, player, 'Lower Lake Serene', 'Upper Lake Serene')
     connect(world, player, 'Lower Lake Serene', 'Left Side forest Caves')
-    connect(world, player, 'Lower Lake Serene', 'Caves of Banishment (upper)', lambda state: not flooded.dry_lake_serene or logic.has_doublejump(state))
-    connect(world, player, 'Caves of Banishment (upper)', 'Upper Lake Serene', lambda state: state.has('Water Mask', player) or flooded.dry_lake_serene)
+    connect(world, player, 'Lower Lake Serene', 'Caves of Banishment (upper)', lambda state: flooded.flood_lake_serene or logic.has_doublejump(state))
+    connect(world, player, 'Caves of Banishment (upper)', 'Lower Lake Serene', lambda state: not flooded.flood_lake_serene or state.has('Water Mask', player))
     connect(world, player, 'Caves of Banishment (upper)', 'Caves of Banishment (Maw)', lambda state: logic.has_doublejump(state) or state.has_any({'Gas Mask', 'Talaria Attachment'} or logic.has_teleport(state), player))
     connect(world, player, 'Caves of Banishment (upper)', 'Space time continuum', logic.has_teleport)
     connect(world, player, 'Caves of Banishment (Maw)', 'Caves of Banishment (upper)', lambda state: logic.has_doublejump(state) if not flooded.flood_maw else state.has('Water Mask', player))
@@ -153,7 +149,7 @@ def create_regions_and_locations(world: MultiWorld, player: int, precalculated_w
     connect(world, player, 'Castle Ramparts', 'Castle Keep')
     connect(world, player, 'Castle Ramparts', 'Space time continuum', logic.has_teleport)
     connect(world, player, 'Castle Keep', 'Castle Ramparts')
-    connect(world, player, 'Castle Keep', 'Castle Basement', lambda state: state.has('Water Mask', player) or not flooded.flood_basement)
+    connect(world, player, 'Castle Keep', 'Castle Basement', lambda state: not flooded.flood_basement or state.has('Water Mask', player))
     connect(world, player, 'Castle Keep', 'Royal towers (lower)', logic.has_doublejump)
     connect(world, player, 'Castle Keep', 'Space time continuum', logic.has_teleport)
     connect(world, player, 'Royal towers (lower)', 'Castle Keep')
@@ -165,14 +161,15 @@ def create_regions_and_locations(world: MultiWorld, player: int, precalculated_w
     #connect(world, player, 'Ancient Pyramid (entrance)', 'The lab (upper)', lambda state: not is_option_enabled(world, player, "EnterSandman"))
     connect(world, player, 'Ancient Pyramid (entrance)', 'Ancient Pyramid (left)', logic.has_doublejump)
     connect(world, player, 'Ancient Pyramid (left)', 'Ancient Pyramid (entrance)')
-    connect(world, player, 'Ancient Pyramid (left)', 'Ancient Pyramid (right)', lambda state: logic.has_upwarddash(state) or flooded.flood_pyramid_shaft)
-    connect(world, player, 'Ancient Pyramid (right)', 'Ancient Pyramid (left)', lambda state: logic.has_upwarddash(state) or flooded.flood_pyramid_shaft)
+    connect(world, player, 'Ancient Pyramid (left)', 'Ancient Pyramid (right)', lambda state: flooded.flood_pyramid_shaft or logic.has_upwarddash(state))
+    connect(world, player, 'Ancient Pyramid (right)', 'Ancient Pyramid (left)', lambda state: flooded.flood_pyramid_shaft or logic.has_upwarddash(state))
     connect(world, player, 'Space time continuum', 'Lake desolation', lambda state: logic.can_teleport_to(state, "Present", "GateLakeDesolation"))
     connect(world, player, 'Space time continuum', 'Lower lake desolation', lambda state: logic.can_teleport_to(state, "Present", "GateKittyBoss"))
     connect(world, player, 'Space time continuum', 'Library', lambda state: logic.can_teleport_to(state, "Present", "GateLeftLibrary"))
     connect(world, player, 'Space time continuum', 'Varndagroth tower right (lower)', lambda state: logic.can_teleport_to(state, "Present", "GateMilitaryGate"))
     connect(world, player, 'Space time continuum', 'Skeleton Shaft', lambda state: logic.can_teleport_to(state, "Present", "GateSealedCaves"))
     connect(world, player, 'Space time continuum', 'Sealed Caves (Sirens)', lambda state: logic.can_teleport_to(state, "Present", "GateSealedSirensCave"))
+    connect(world, player, 'Space time continuum', 'Sealed Caves (Xarion)', lambda state: logic.can_teleport_to(state, "Present", "GateXarion"))
     connect(world, player, 'Space time continuum', 'Upper Lake Serene', lambda state: logic.can_teleport_to(state, "Past", "GateLakeSereneLeft"))
     connect(world, player, 'Space time continuum', 'Left Side forest Caves', lambda state: logic.can_teleport_to(state, "Past", "GateLakeSereneRight"))
     connect(world, player, 'Space time continuum', 'Refugee Camp', lambda state: logic.can_teleport_to(state, "Past", "GateAccessToPast"))
@@ -204,12 +201,13 @@ def throwIfAnyLocationIsNotAssignedToARegion(regions: List[Region], regionNames:
 
 def create_location(player: int, location_data: LocationData, region: Region) -> Location:
     location = Location(player, location_data.name, location_data.code, region)
-    location.access_rule = location_data.rule
+
+    if location_data.rule:
+        location.access_rule = location_data.rule
 
     if id is None:
         location.event = True
         location.locked = True
-
     return location
 
 
@@ -220,7 +218,6 @@ def create_region(world: MultiWorld, player: int, locations_per_region: Dict[str
         for location_data in locations_per_region[name]:
             location = create_location(player, location_data, region)
             region.locations.append(location)
-
     return region
 
 
@@ -237,11 +234,9 @@ def connectStartingRegion(world: MultiWorld, player: int):
     menu_to_tutorial = Entrance(player, 'Tutorial', menu)
     menu_to_tutorial.connect(tutorial)
     menu.exits.append(menu_to_tutorial)
-
     tutorial_to_start = Entrance(player, 'Start Game', tutorial)
     tutorial_to_start.connect(starting_region)
     tutorial.exits.append(tutorial_to_start)
-
     teleport_back_to_start = Entrance(player, 'Teleport back to start', space_time_continuum)
     teleport_back_to_start.connect(starting_region)
     space_time_continuum.exits.append(teleport_back_to_start)
@@ -249,7 +244,7 @@ def connectStartingRegion(world: MultiWorld, player: int):
 
 def connect(world: MultiWorld, player: int, source: str, target: str, 
             rule: Optional[Callable[[CollectionState], bool]] = None):
-    
+
     sourceRegion = world.get_region(source, player)
     targetRegion = world.get_region(target, player)
 
@@ -257,15 +252,13 @@ def connect(world: MultiWorld, player: int, source: str, target: str,
 
     if rule:
         connection.access_rule = rule
-
     sourceRegion.exits.append(connection)
     connection.connect(targetRegion)
 
 
-def split_location_datas_per_region(locations: Tuple[LocationData, ...]) -> Dict[str, List[LocationData]]:
+def split_location_datas_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
+    return per_region
\ No newline at end of file
diff --git a/worlds/timespinner/__init__.py b/worlds/timespinner/__init__.py
index de1d58e961..ff7b3515e6 100644
--- a/worlds/timespinner/__init__.py
+++ b/worlds/timespinner/__init__.py
@@ -39,9 +39,9 @@ class TimespinnerWorld(World):
     option_definitions = timespinner_options
     game = "Timespinner"
     topology_present = True
-    data_version = 11
+    data_version = 12
     web = TimespinnerWebWorld()
-    required_client_version = (0, 3, 7)
+    required_client_version = (0, 4, 2)
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {location.name: location.code for location in get_location_datas(None, None, None)}
@@ -49,11 +49,9 @@ class TimespinnerWorld(World):
 
     precalculated_weights: PreCalculatedWeights
 
-    def __init__(self, world: MultiWorld, player: int):
-        super().__init__(world, player)
-        self.precalculated_weights = PreCalculatedWeights(world, player)
-
     def generate_early(self) -> None:
+        self.precalculated_weights = PreCalculatedWeights(self.multiworld, self.player)
+
         # in generate_early the start_inventory isnt copied over to precollected_items yet, so we can still modify the options directly
         if self.multiworld.start_inventory[self.player].value.pop('Meyef', 0) > 0:
             self.multiworld.StartWithMeyef[self.player].value = self.multiworld.StartWithMeyef[self.player].option_true
@@ -110,7 +108,9 @@ class TimespinnerWorld(World):
         slot_data["CastleMoat"] = self.precalculated_weights.flood_moat
         slot_data["CastleCourtyard"] = self.precalculated_weights.flood_courtyard
         slot_data["LakeDesolation"] = self.precalculated_weights.flood_lake_desolation
-        slot_data["DryLakeSerene"] = self.precalculated_weights.dry_lake_serene
+        slot_data["DryLakeSerene"] = not self.precalculated_weights.flood_lake_serene
+        slot_data["LakeSereneBridge"] = self.precalculated_weights.flood_lake_serene_bridge
+        slot_data["Lab"] = self.precalculated_weights.flood_lab
 
         return slot_data
 
@@ -146,8 +146,12 @@ class TimespinnerWorld(World):
                 flooded_areas.append("Castle Courtyard")
             if self.precalculated_weights.flood_lake_desolation:
                 flooded_areas.append("Lake Desolation")
-            if not self.precalculated_weights.dry_lake_serene:
+            if self.precalculated_weights.flood_lake_serene:
                 flooded_areas.append("Lake Serene")
+            if self.precalculated_weights.flood_lake_serene_bridge:
+                flooded_areas.append("Lake Serene Bridge")
+            if self.precalculated_weights.flood_lab:
+                flooded_areas.append("Lab")
 
             if len(flooded_areas) == 0:
                 flooded_areas_string: str = "None"
@@ -222,15 +226,18 @@ class TimespinnerWorld(World):
 
     def assign_starter_items(self, excluded_items: Set[str]) -> None:
         non_local_items: Set[str] = self.multiworld.non_local_items[self.player].value
+        local_items: Set[str] = self.multiworld.local_items[self.player].value
 
-        local_starter_melee_weapons = tuple(item for item in starter_melee_weapons if item not in non_local_items)
+        local_starter_melee_weapons = tuple(item for item in starter_melee_weapons if 
+                                            item in local_items or not item in non_local_items)
         if not local_starter_melee_weapons:
             if 'Plasma Orb' in non_local_items:
                 raise Exception("Atleast one melee orb must be local")
             else:
                 local_starter_melee_weapons = ('Plasma Orb',)
 
-        local_starter_spells = tuple(item for item in starter_spells if item not in non_local_items)
+        local_starter_spells = tuple(item for item in starter_spells if
+                                     item in local_items or not item in non_local_items)
         if not local_starter_spells:
             if 'Lightwall' in non_local_items:
                 raise Exception("Atleast one spell must be local")
diff --git a/worlds/tloz/ItemPool.py b/worlds/tloz/ItemPool.py
index 1d33336172..456598edec 100644
--- a/worlds/tloz/ItemPool.py
+++ b/worlds/tloz/ItemPool.py
@@ -93,7 +93,11 @@ def get_pool_core(world):
 
     # Starting Weapon
     start_weapon_locations = starting_weapon_locations.copy()
-    starting_weapon = random.choice(starting_weapons)
+    final_starting_weapons = [weapon for weapon in starting_weapons
+                              if weapon not in world.multiworld.non_local_items[world.player]]
+    if not final_starting_weapons:
+        final_starting_weapons = starting_weapons
+    starting_weapon = random.choice(final_starting_weapons)
     if world.multiworld.StartingPosition[world.player] == StartingPosition.option_safe:
         placed_items[start_weapon_locations[0]] = starting_weapon
     elif world.multiworld.StartingPosition[world.player] in \
@@ -117,6 +121,9 @@ def get_pool_core(world):
     else:
         possible_level_locations = [location for location in standard_level_locations
                                     if location not in level_locations[8]]
+    for location in placed_items.keys():
+        if location in possible_level_locations:
+            possible_level_locations.remove(location)
     for level in range(1, 9):
         if world.multiworld.TriforceLocations[world.player] == TriforceLocations.option_vanilla:
             placed_items[f"Level {level} Triforce"] = fragment
diff --git a/worlds/tloz/__init__.py b/worlds/tloz/__init__.py
index 20ab003ead..6e8927c4e7 100644
--- a/worlds/tloz/__init__.py
+++ b/worlds/tloz/__init__.py
@@ -200,15 +200,17 @@ class TLoZWorld(World):
         for i in range(0, 0x7F):
             item = rom_data[first_quest_dungeon_items_early + i]
             if item & 0b00100000:
-                rom_data[first_quest_dungeon_items_early + i] = item & 0b11011111
-                rom_data[first_quest_dungeon_items_early + i] = item | 0b01000000
+                item = item & 0b11011111
+                item = item | 0b01000000
+                rom_data[first_quest_dungeon_items_early + i] = item
             if item & 0b00011111 == 0b00000011: # Change all Item 03s to Item 3F, the proper "nothing"
                 rom_data[first_quest_dungeon_items_early + i] = item | 0b00111111
 
             item = rom_data[first_quest_dungeon_items_late + i]
             if item & 0b00100000:
-                rom_data[first_quest_dungeon_items_late + i] = item & 0b11011111
-                rom_data[first_quest_dungeon_items_late + i] = item | 0b01000000
+                item = item & 0b11011111
+                item = item | 0b01000000
+                rom_data[first_quest_dungeon_items_late + i] = item
             if item & 0b00011111 == 0b00000011:
                 rom_data[first_quest_dungeon_items_late + i] = item | 0b00111111
         return rom_data
diff --git a/worlds/tloz/docs/en_The Legend of Zelda.md b/worlds/tloz/docs/en_The Legend of Zelda.md
index e443c9b953..7c2e6deda5 100644
--- a/worlds/tloz/docs/en_The Legend of Zelda.md	
+++ b/worlds/tloz/docs/en_The Legend of Zelda.md	
@@ -35,9 +35,17 @@ filler and useful items will cost less, and uncategorized items will be in the m
 
 ## Are there any other changes made?
 
-- The map and compass for each dungeon start already acquired, and other items can be found in their place. 
+- The map and compass for each dungeon start already acquired, and other items can be found in their place.
 - The Recorder will warp you between all eight levels regardless of Triforce count
-    - It's possible for this to be your route to level 4! 
+  - It's possible for this to be your route to level 4!
 - Pressing Select will cycle through your inventory.
 - Shop purchases are tracked within sessions, indicated by the item being elevated from its normal position.
-- What slots from a Take Any Cave have been chosen are similarly tracked.
\ No newline at end of file
+- What slots from a Take Any Cave have been chosen are similarly tracked.
+-
+
+## Local Unique Commands
+
+The following commands are only available when using the Zelda1Client to play with Archipelago.
+
+- `/nes` Check NES Connection State
+- `/toggle_msgs` Toggle displaying messages in EmuHawk
diff --git a/worlds/tloz/docs/multiworld_en.md b/worlds/tloz/docs/multiworld_en.md
index 581e8cf7b2..df857f16df 100644
--- a/worlds/tloz/docs/multiworld_en.md
+++ b/worlds/tloz/docs/multiworld_en.md
@@ -6,6 +6,7 @@
     - Bundled with Archipelago: [Archipelago Releases Page](https://github.com/ArchipelagoMW/Archipelago/releases)
 - The BizHawk emulator. Versions 2.3.1 and higher are supported.
     - [BizHawk at TASVideos](https://tasvideos.org/BizHawk)
+- Your legally acquired US v1.0 PRG0 ROM file, probably named `Legend of Zelda, The (U) (PRG0) [!].nes`
 
 ## Optional Software
 
@@ -44,7 +45,7 @@ them. Player settings page: [The Legend of Zelda Player Settings Page](/games/Th
 ### 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)
+validator page: [YAML Validation page](/check)
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/undertale/Regions.py b/worlds/undertale/Regions.py
index ec13b249fa..138a684653 100644
--- a/worlds/undertale/Regions.py
+++ b/worlds/undertale/Regions.py
@@ -24,6 +24,7 @@ undertale_regions = [
     ("True Lab", []),
     ("Core", ["Core Exit"]),
     ("New Home", ["New Home Exit"]),
+    ("Last Corridor", ["Last Corridor Exit"]),
     ("Barrier", []),
 ]
 
@@ -40,7 +41,8 @@ mandatory_connections = [
     ("News Show Entrance", "News Show"),
     ("Lab Elevator", "True Lab"),
     ("Core Exit", "New Home"),
-    ("New Home Exit", "Barrier"),
+    ("New Home Exit", "Last Corridor"),
+    ("Last Corridor Exit", "Barrier"),
     ("Snowdin Hub", "Snowdin Forest"),
     ("Waterfall Hub", "Waterfall"),
     ("Hotland Hub", "Hotland"),
diff --git a/worlds/undertale/Rules.py b/worlds/undertale/Rules.py
index 648152c504..897484b050 100644
--- a/worlds/undertale/Rules.py
+++ b/worlds/undertale/Rules.py
@@ -81,23 +81,27 @@ def set_rules(multiworld: MultiWorld, player: int):
     set_rule(multiworld.get_entrance("New Home Exit", player),
              lambda state: (state.has("Left Home Key", player) and
                             state.has("Right Home Key", player)) or
-                           state.has("Key Piece", player, state.multiworld.key_pieces[player]))
+                           state.has("Key Piece", player, state.multiworld.key_pieces[player].value))
     if _undertale_is_route(multiworld.state, player, 1):
         set_rule(multiworld.get_entrance("Papyrus\" Home Entrance", player),
                  lambda state: _undertale_has_plot(state, player, "Complete Skeleton"))
         set_rule(multiworld.get_entrance("Undyne\"s Home Entrance", player),
                  lambda state: _undertale_has_plot(state, player, "Fish") and state.has("Papyrus Date", player))
         set_rule(multiworld.get_entrance("Lab Elevator", player),
-                 lambda state: state.has("Alphys Date", player) and _undertale_has_plot(state, player, "DT Extractor"))
+                 lambda state: state.has("Alphys Date", player) and state.has("DT Extractor", player) and
+                                ((state.has("Left Home Key", player) and state.has("Right Home Key", player)) or
+                                state.has("Key Piece", player, state.multiworld.key_pieces[player].value)))
         set_rule(multiworld.get_location("Alphys Date", player),
-                 lambda state: state.has("Undyne Letter EX", player) and state.has("Undyne Date", player))
+                 lambda state: state.can_reach("New Home", "Region", player) and state.has("Undyne Letter EX", player)
+                               and state.has("Undyne Date", player))
         set_rule(multiworld.get_location("Papyrus Plot", player),
                  lambda state: state.can_reach("Snowdin Town", "Region", player))
         set_rule(multiworld.get_location("Undyne Plot", player),
                  lambda state: state.can_reach("Waterfall", "Region", player))
         set_rule(multiworld.get_location("True Lab Plot", player),
                  lambda state: state.can_reach("New Home", "Region", player)
-                               and state.can_reach("Letter Quest", "Location", player))
+                               and state.can_reach("Letter Quest", "Location", player)
+                               and state.can_reach("Alphys Date", "Location", player))
         set_rule(multiworld.get_location("Chisps Machine", player),
                  lambda state: state.can_reach("True Lab", "Region", player))
         set_rule(multiworld.get_location("Dog Sale 1", player),
@@ -113,7 +117,7 @@ def set_rules(multiworld: MultiWorld, player: int):
         set_rule(multiworld.get_location("Hush Trade", player),
                  lambda state: state.can_reach("News Show", "Region", player) and state.has("Hot Dog...?", player, 1))
         set_rule(multiworld.get_location("Letter Quest", player),
-                 lambda state: state.can_reach("New Home Exit", "Entrance", player) and state.has("Undyne Date", player))
+                 lambda state: state.can_reach("Last Corridor", "Region", player) and state.has("Undyne Date", player))
     if (not _undertale_is_route(multiworld.state, player, 2)) or _undertale_is_route(multiworld.state, player, 3):
         set_rule(multiworld.get_location("Nicecream Punch Card", player),
                  lambda state: state.has("Punch Card", player, 3) and state.can_reach("Waterfall", "Region", player))
@@ -126,7 +130,7 @@ def set_rules(multiworld: MultiWorld, player: int):
         set_rule(multiworld.get_location("Apron Hidden", player),
                  lambda state: state.can_reach("Cooking Show", "Region", player))
     if _undertale_is_route(multiworld.state, player, 2) and \
-            (multiworld.rando_love[player] or multiworld.rando_stats[player]):
+            (bool(multiworld.rando_love[player].value) or bool(multiworld.rando_stats[player].value)):
         maxlv = 1
         exp = 190
         curarea = "Old Home"
@@ -304,7 +308,7 @@ def set_rules(multiworld: MultiWorld, player: int):
 
 # Sets rules on completion condition
 def set_completion_rules(multiworld: MultiWorld, player: int):
-    completion_requirements = lambda state: state.can_reach("New Home Exit", "Entrance", player)
+    completion_requirements = lambda state: state.can_reach("Barrier", "Region", player)
     if _undertale_is_route(multiworld.state, player, 1):
         completion_requirements = lambda state: state.can_reach("True Lab", "Region", player)
 
diff --git a/worlds/undertale/__init__.py b/worlds/undertale/__init__.py
index 5e36344703..9e784a4a59 100644
--- a/worlds/undertale/__init__.py
+++ b/worlds/undertale/__init__.py
@@ -193,7 +193,7 @@ class UndertaleWorld(World):
     def create_regions(self):
         def UndertaleRegion(region_name: str, exits=[]):
             ret = Region(region_name, self.player, self.multiworld)
-            ret.locations = [UndertaleAdvancement(self.player, loc_name, loc_data.id, ret)
+            ret.locations += [UndertaleAdvancement(self.player, loc_name, loc_data.id, ret)
                              for loc_name, loc_data in advancement_table.items()
                              if loc_data.region == region_name and
                              (loc_name not in exclusion_table["NoStats"] or
diff --git a/worlds/undertale/docs/en_Undertale.md b/worlds/undertale/docs/en_Undertale.md
index 3905d3bc3e..7ff5d55eda 100644
--- a/worlds/undertale/docs/en_Undertale.md
+++ b/worlds/undertale/docs/en_Undertale.md
@@ -42,11 +42,22 @@ In the Pacifist run, you are not required to go to the Ruins to spare Toriel. Th
 Undyne, and Mettaton EX. Just as it is in the vanilla game, you cannot kill anyone. You are also required to complete 
 the date/hangout with Papyrus, Undyne, and Alphys, in that order, before entering the True Lab.
 
-Additionally, custom items are required to hang out with Papyrus, Undyne, to enter the True Lab, and to fight 
-Mettaton EX/NEO. The respective items for each interaction are `Complete Skeleton`, `Fish`, `DT Extractor`, 
+Additionally, custom items are required to hang out with Papyrus, Undyne, to enter the True Lab, and to fight
+Mettaton EX/NEO. The respective items for each interaction are `Complete Skeleton`, `Fish`, `DT Extractor`,
 and `Mettaton Plush`.
 
-The Riverperson will only take you to locations you have seen them at, meaning they will only take you to 
+The Riverperson will only take you to locations you have seen them at, meaning they will only take you to
 Waterfall if you have seen them at Waterfall at least once.
 
-If you press `W` while in the save menu, you will teleport back to the flower room, for quick access to the other areas.
\ No newline at end of file
+If you press `W` while in the save menu, you will teleport back to the flower room, for quick access to the other areas.
+
+## Unique Local Commands
+
+The following commands are only available when using the UndertaleClient to play with Archipelago.
+
+- `/resync` Manually trigger a resync.
+- `/savepath` Redirect to proper save data folder. This is necessary for Linux users to use before connecting.
+- `/auto_patch` Patch the game automatically.
+- `/patch` Patch the game. Only use this command if `/auto_patch` fails.
+- `/online` Toggles seeing other Undertale players.
+- `/deathlink` Toggles deathlink
diff --git a/worlds/wargroove/docs/en_Wargroove.md b/worlds/wargroove/docs/en_Wargroove.md
index 18474a4269..f08902535d 100644
--- a/worlds/wargroove/docs/en_Wargroove.md
+++ b/worlds/wargroove/docs/en_Wargroove.md
@@ -26,9 +26,16 @@ Any of the above items can be in another player's world.
 
 ## When the player receives an item, what happens?
 
-When the player receives an item, a message will appear in Wargroove with the item name and sender name, once an action 
+When the player receives an item, a message will appear in Wargroove with the item name and sender name, once an action
 is taken in game.
 
 ## What is the goal of this game when randomized?
 
 The goal is to beat the level titled `The End` by finding the `Final Bridges`, `Final Walls`, and `Final Sickle`.
+
+## Unique Local Commands
+
+The following commands are only available when using the WargrooveClient to play with Archipelago.
+
+- `/resync` Manually trigger a resync.
+- `/commander` Set the current commander to the given commander.
diff --git a/worlds/wargroove/docs/wargroove_en.md b/worlds/wargroove/docs/wargroove_en.md
index 121e8c0890..1954dc0139 100644
--- a/worlds/wargroove/docs/wargroove_en.md
+++ b/worlds/wargroove/docs/wargroove_en.md
@@ -18,7 +18,7 @@ is strongly recommended in case they become corrupted.
 2. Open the `host.yaml` file in your favorite text editor (Notepad will work).
 3. Put your Wargroove root directory in the `root_directory:` under the `wargroove_options:` section.
    - The Wargroove root directory can be found by going to 
-   `Steam->Right Click Wargroove->Properties->Local Files->Browse Local Files` and copying the path in the address bar.
+   `Steam->Right Click Wargroove->Properties->Installed Files->Browse` and copying the path in the address bar.
    - Paste the path in between the quotes next to `root_directory:` in the `host.yaml`.
    - You may have to replace all single \\ with \\\\.
 4. Start the Wargroove client.
diff --git a/worlds/witness/Options.py b/worlds/witness/Options.py
index b7364b5e70..4c4b4f7626 100644
--- a/worlds/witness/Options.py
+++ b/worlds/witness/Options.py
@@ -1,23 +1,25 @@
-from typing import Dict, Union
-from BaseClasses import MultiWorld
-from Options import Toggle, DefaultOnToggle, Range, Choice
+from dataclasses import dataclass
+from Options import Toggle, DefaultOnToggle, Range, Choice, PerGameCommonOptions
 
 
-# class HardMode(Toggle):
-#    "Play the randomizer in hardmode"
-#    display_name = "Hard Mode"
-
 class DisableNonRandomizedPuzzles(Toggle):
     """Disables puzzles that cannot be randomized.
     This includes many puzzles that heavily involve the environment, such as Shadows, Monastery or Orchard.
-    The lasers for those areas will be activated as you solve optional puzzles throughout the island."""
+    The lasers for those areas will activate as you solve optional puzzles, such as Discarded Panels.
+    Additionally, the panels activating Monastery Laser and Jungle Popup Wall will be on from the start."""
     display_name = "Disable non randomized puzzles"
 
 
-class EarlySecretArea(Toggle):
-    """Opens the Mountainside shortcut to the Caves from the start.
-    (Otherwise known as "UTM", "Caves" or the "Challenge Area")"""
+class EarlyCaves(Choice):
+    """Adds an item that opens the Caves Shortcuts to Swamp and Mountain,
+    allowing early access to the Caves even if you are not playing a remote Door Shuffle mode.
+    You can either add this item to the pool to be found on one of your randomized checks,
+    or you can outright start with it and have immediate access to the Caves.
+    If you choose "add_to_pool" and you are already playing a remote Door Shuffle mode, this setting will do nothing."""
     display_name = "Early Caves"
+    option_off = 0
+    option_add_to_pool = 1
+    option_starting_inventory = 2
 
 
 class ShuffleSymbols(DefaultOnToggle):
@@ -34,27 +36,41 @@ class ShuffleLasers(Toggle):
 
 
 class ShuffleDoors(Choice):
-    """If on, opening doors will require their respective "keys".
-    If set to "panels", those keys will unlock the panels on doors.
-    In "doors_simple" and "doors_complex", the doors will magically open by themselves upon receiving the key.
-    The last option, "max", is a combination of "doors_complex" and "panels"."""
+    """If on, opening doors, moving bridges etc. will require a "key".
+    If set to "panels", the panel on the door will be locked until receiving its corresponding key.
+    If set to "doors", the door will open immediately upon receiving its key. Door panels are added as location checks.
+    "Mixed" includes all doors from "doors", and all control panels (bridges, elevators etc.) from "panels"."""
     display_name = "Shuffle Doors"
-    option_none = 0
+    option_off = 0
     option_panels = 1
-    option_doors_simple = 2
-    option_doors_complex = 3
-    option_max = 4
+    option_doors = 2
+    option_mixed = 3
+
+
+class DoorGroupings(Choice):
+    """If set to "none", there will be one key for every door, resulting in up to 120 keys being added to the item pool.
+    If set to "regional", all doors in the same general region will open at once with a single key,
+    reducing the amount of door items and complexity."""
+    display_name = "Door Groupings"
+    option_off = 0
+    option_regional = 1
+
+
+class ShuffleBoat(DefaultOnToggle):
+    """If set, adds a "Boat" item to the item pool. Before receiving this item, you will not be able to use the boat."""
+    display_name = "Shuffle Boat"
 
 
 class ShuffleDiscardedPanels(Toggle):
     """Add Discarded Panels into the location pool.
-    Solving certain Discarded Panels may still be necessary to beat the game, even if this is off."""
+    Solving certain Discarded Panels may still be necessary to beat the game, even if this is off - The main example
+    of this being the alternate activation triggers in disable_non_randomized."""
 
     display_name = "Shuffle Discarded Panels"
 
 
 class ShuffleVaultBoxes(Toggle):
-    """Vault Boxes will have items on them."""
+    """Add Vault Boxes to the location pool."""
     display_name = "Shuffle Vault Boxes"
 
 
@@ -132,6 +148,12 @@ class ChallengeLasers(Range):
     default = 11
 
 
+class ElevatorsComeToYou(Toggle):
+    """If true, the Quarry Elevator, Bunker Elevator and Swamp Long Bridge will "come to you" if you approach them.
+    This does actually affect logic as it allows unintended backwards / early access into these areas."""
+    display_name = "All Bridges & Elevators come to you"
+
+
 class TrapPercentage(Range):
     """Replaces junk items with traps, at the specified rate."""
     display_name = "Trap Percentage"
@@ -150,8 +172,8 @@ class PuzzleSkipAmount(Range):
 
 
 class HintAmount(Range):
-    """Adds hints to Audio Logs. Hints will have the same number of duplicates, as many as will fit. Remaining Audio
-    Logs will have junk hints."""
+    """Adds hints to Audio Logs. If set to a low amount, up to 2 additional duplicates of each hint will be added.
+    Remaining Audio Logs will have junk hints."""
     display_name = "Hints on Audio Logs"
     range_start = 0
     range_end = 49
@@ -164,38 +186,26 @@ class DeathLink(Toggle):
     display_name = "Death Link"
 
 
-the_witness_options: Dict[str, type] = {
-    "puzzle_randomization": PuzzleRandomization,
-    "shuffle_symbols": ShuffleSymbols,
-    "shuffle_doors": ShuffleDoors,
-    "shuffle_lasers": ShuffleLasers,
-    "disable_non_randomized_puzzles": DisableNonRandomizedPuzzles,
-    "shuffle_discarded_panels": ShuffleDiscardedPanels,
-    "shuffle_vault_boxes": ShuffleVaultBoxes,
-    "shuffle_EPs": ShuffleEnvironmentalPuzzles,
-    "EP_difficulty": EnvironmentalPuzzlesDifficulty,
-    "shuffle_postgame": ShufflePostgame,
-    "victory_condition": VictoryCondition,
-    "mountain_lasers": MountainLasers,
-    "challenge_lasers": ChallengeLasers,
-    "early_secret_area": EarlySecretArea,
-    "trap_percentage": TrapPercentage,
-    "puzzle_skip_amount": PuzzleSkipAmount,
-    "hint_amount": HintAmount,
-    "death_link": DeathLink,
-}
-
-
-def is_option_enabled(world: MultiWorld, player: int, name: str) -> bool:
-    return get_option_value(world, player, name) > 0
-
-
-def get_option_value(world: MultiWorld, player: int, name: str) -> Union[bool, int]:
-    option = getattr(world, name, None)
-
-    if option is None:
-        return 0
-
-    if issubclass(the_witness_options[name], Toggle) or issubclass(the_witness_options[name], DefaultOnToggle):
-        return bool(option[player].value)
-    return option[player].value
+@dataclass
+class TheWitnessOptions(PerGameCommonOptions):
+    puzzle_randomization: PuzzleRandomization
+    shuffle_symbols: ShuffleSymbols
+    shuffle_doors: ShuffleDoors
+    door_groupings: DoorGroupings
+    shuffle_boat: ShuffleBoat
+    shuffle_lasers: ShuffleLasers
+    disable_non_randomized_puzzles: DisableNonRandomizedPuzzles
+    shuffle_discarded_panels: ShuffleDiscardedPanels
+    shuffle_vault_boxes: ShuffleVaultBoxes
+    shuffle_EPs: ShuffleEnvironmentalPuzzles
+    EP_difficulty: EnvironmentalPuzzlesDifficulty
+    shuffle_postgame: ShufflePostgame
+    victory_condition: VictoryCondition
+    mountain_lasers: MountainLasers
+    challenge_lasers: ChallengeLasers
+    early_caves: EarlyCaves
+    elevators_come_to_you: ElevatorsComeToYou
+    trap_percentage: TrapPercentage
+    puzzle_skip_amount: PuzzleSkipAmount
+    hint_amount: HintAmount
+    death_link: DeathLink
diff --git a/worlds/witness/WitnessItems.txt b/worlds/witness/WitnessItems.txt
index 71ffe276a6..750d6bd4eb 100644
--- a/worlds/witness/WitnessItems.txt
+++ b/worlds/witness/WitnessItems.txt
@@ -37,22 +37,42 @@ Jokes:
 
 Doors:
 1100 - Glass Factory Entry (Panel) - 0x01A54
+1101 - Tutorial Outpost Entry (Panel) - 0x0A171
+1102 - Tutorial Outpost Exit (Panel) - 0x04CA4
 1105 - Symmetry Island Lower (Panel) - 0x000B0
 1107 - Symmetry Island Upper (Panel) - 0x1C349
 1110 - Desert Light Room Entry (Panel) - 0x0C339
 1111 - Desert Flood Controls (Panel) - 0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B
+1112 - Desert Light Control (Panel) - 0x09FAA
+1113 - Desert Flood Room Entry (Panel) - 0x0A249
+1115 - Quarry Elevator Control (Panel) - 0x17CC4
+1117 - Quarry Entry 1 (Panel) - 0x09E57
+1118 - Quarry Entry 2 (Panel) - 0x17C09
 1119 - Quarry Stoneworks Entry (Panel) - 0x01E5A,0x01E59
 1120 - Quarry Stoneworks Ramp Controls (Panel) - 0x03678,0x03676
 1122 - Quarry Stoneworks Lift Controls (Panel) - 0x03679,0x03675
 1125 - Quarry Boathouse Ramp Height Control (Panel) - 0x03852
 1127 - Quarry Boathouse Ramp Horizontal Control (Panel) - 0x03858
+1129 - Quarry Boathouse Hook Control (Panel) - 0x275FA
 1131 - Shadows Door Timer (Panel) - 0x334DB,0x334DC
+1140 - Keep Hedge Maze 1 (Panel) - 0x00139
+1142 - Keep Hedge Maze 2 (Panel) - 0x019DC
+1144 - Keep Hedge Maze 3 (Panel) - 0x019E7
+1146 - Keep Hedge Maze 4 (Panel) - 0x01A0F
 1150 - Monastery Entry Left (Panel) - 0x00B10
 1151 - Monastery Entry Right (Panel) - 0x00C92
-1162 - Town Tinted Glass Door (Panel) - 0x28998
+1156 - Monastery Shutters Control (Panel) - 0x09D9B
+1162 - Town RGB House Entry (Panel) - 0x28998
 1163 - Town Church Entry (Panel) - 0x28A0D
-1166 - Town Maze Panel (Drop-Down Staircase) (Panel) - 0x28A79
-1169 - Windmill Entry (Panel) - 0x17F5F
+1164 - Town RGB Control (Panel) - 0x334D8
+1166 - Town Maze Stairs (Panel) - 0x28A79
+1167 - Town Maze Rooftop Bridge (Panel) - 0x2896A
+1169 - Town Windmill Entry (Panel) - 0x17F5F
+1172 - Town Cargo Box Entry (Panel) - 0x0A0C8
+1182 - Windmill Turn Control (Panel) - 0x17D02
+1184 - Theater Entry (Panel) - 0x17F89
+1185 - Theater Video Input (Panel) - 0x00815
+1189 - Theater Exit (Panel) - 0x0A168,0x33AB2
 1200 - Treehouse First & Second Doors (Panel) - 0x0288C,0x02886
 1202 - Treehouse Third Door (Panel) - 0x0A182
 1205 - Treehouse Laser House Door Timer (Panel) - 0x2700B,0x17CBC
@@ -61,10 +81,24 @@ Doors:
 1180 - Bunker Entry (Panel) - 0x17C2E
 1183 - Bunker Tinted Glass Door (Panel) - 0x0A099
 1186 - Bunker Elevator Control (Panel) - 0x0A079
+1188 - Bunker Drop-Down Door Controls (Panel) - 0x34BC5,0x34BC6
 1190 - Swamp Entry (Panel) - 0x0056E
 1192 - Swamp Sliding Bridge (Panel) - 0x00609,0x18488
+1194 - Swamp Platform Shortcut (Panel) - 0x17C0D
 1195 - Swamp Rotating Bridge (Panel) - 0x181F5
-1197 - Swamp Maze Control (Panel) - 0x17C0A,0x17E07
+1196 - Swamp Long Bridge (Panel) - 0x17E2B
+1197 - Swamp Maze Controls (Panel) - 0x17C0A,0x17E07
+1220 - Mountain Floor 1 Light Bridge (Panel) - 0x09E39
+1225 - Mountain Floor 2 Light Bridge Near (Panel) - 0x09E86
+1230 - Mountain Floor 2 Light Bridge Far (Panel) - 0x09ED8
+1235 - Mountain Floor 2 Elevator Control (Panel) - 0x09EEB
+1240 - Caves Entry (Panel) - 0x00FF8
+1242 - Caves Elevator Controls (Panel) - 0x335AB,0x335AC,0x3369D
+1245 - Challenge Entry (Panel) - 0x0A16E
+1250 - Tunnels Entry (Panel) - 0x039B4
+1255 - Tunnels Town Shortcut (Panel) - 0x09E85
+
+
 1310 - Boat - 0x17CDF,0x17CC8,0x17CA6,0x09DB8,0x17C95,0x0A054
 
 1400 - Caves Mountain Shortcut (Door) - 0x2D73F
@@ -82,6 +116,7 @@ Doors:
 1624 - Desert Pond Room Entry (Door) - 0x0C2C3
 1627 - Desert Flood Room Entry (Door) - 0x0A24B
 1630 - Desert Elevator Room Entry (Door) - 0x0C316
+1631 - Desert Elevator (Door) - 0x01317
 1633 - Quarry Entry 1 (Door) - 0x09D6F
 1636 - Quarry Entry 2 (Door) - 0x17C07
 1639 - Quarry Stoneworks Entry (Door) - 0x02010
@@ -109,13 +144,13 @@ Doors:
 1699 - Keep Pressure Plates 4 Exit (Door) - 0x01D40
 1702 - Keep Shadows Shortcut (Door) - 0x09E3D
 1705 - Keep Tower Shortcut (Door) - 0x04F8F
-1708 - Monastery Shortcut (Door) - 0x0364E
+1708 - Monastery Laser Shortcut (Door) - 0x0364E
 1711 - Monastery Entry Inner (Door) - 0x0C128
 1714 - Monastery Entry Outer (Door) - 0x0C153
 1717 - Monastery Garden Entry (Door) - 0x03750
 1718 - Town Cargo Box Entry (Door) - 0x0A0C9
 1720 - Town Wooden Roof Stairs (Door) - 0x034F5
-1723 - Town Tinted Glass Door - 0x28A61
+1723 - Town RGB House Entry (Door) - 0x28A61
 1726 - Town Church Entry (Door) - 0x03BB0
 1729 - Town Maze Stairs (Door) - 0x28AA2
 1732 - Town Windmill Entry (Door) - 0x1845B
@@ -129,7 +164,7 @@ Doors:
 1756 - Theater Exit Right (Door) - 0x3CCDF
 1759 - Jungle Bamboo Laser Shortcut (Door) - 0x3873B
 1760 - Jungle Popup Wall (Door) - 0x1475B
-1762 - River Monastery Shortcut (Door) - 0x0CF2A
+1762 - River Monastery Garden Shortcut (Door) - 0x0CF2A
 1765 - Bunker Entry (Door) - 0x0C2A4
 1768 - Bunker Tinted Glass Door - 0x17C79
 1771 - Bunker UV Room Entry (Door) - 0x0C2A3
@@ -166,36 +201,66 @@ Doors:
 1870 - Tunnels Town Shortcut (Door) - 0x09E87
 
 1903 - Outside Tutorial Outpost Doors - 0x03BA2,0x0A170,0x04CA3
+1904 - Glass Factory Doors - 0x0D7ED,0x01A29
 1906 - Symmetry Island Doors - 0x17F3E,0x18269
 1909 - Orchard Gates - 0x03313,0x03307
-1912 - Desert Doors - 0x09FEE,0x0C2C3,0x0A24B,0x0C316
-1915 - Quarry Main Entry - 0x09D6F,0x17C07
-1918 - Quarry Stoneworks Shortcuts - 0x17CE8,0x0368A,0x275FF
-1921 - Quarry Boathouse Barriers - 0x17C50,0x3865F
-1924 - Shadows Laser Room Door - 0x194B2,0x19665
-1927 - Shadows Barriers - 0x19865,0x0A2DF,0x1855B,0x19ADE
+1912 - Desert Doors & Elevator - 0x09FEE,0x0C2C3,0x0A24B,0x0C316,0x01317
+1915 - Quarry Entry Doors - 0x09D6F,0x17C07
+1918 - Quarry Stoneworks Doors - 0x02010,0x275FF,0x17CE8,0x0368A
+1921 - Quarry Boathouse Doors - 0x17C50,0x3865F,0x2769B,0x27163
+1924 - Shadows Laser Room Doors - 0x194B2,0x19665
+1927 - Shadows Lower Doors - 0x19865,0x0A2DF,0x1855B,0x19ADE,0x19B24
 1930 - Keep Hedge Maze Doors - 0x01954,0x018CE,0x019D8,0x019B5,0x019E6,0x0199A,0x01A0E
 1933 - Keep Pressure Plates Doors - 0x01BEC,0x01BEA,0x01CD5,0x01D40
 1936 - Keep Shortcuts - 0x09E3D,0x04F8F
-1939 - Monastery Entry - 0x0C128,0x0C153
-1942 - Monastery Shortcuts - 0x0364E,0x03750
-1945 - Town Doors - 0x0A0C9,0x034F5,0x28A61,0x03BB0,0x28AA2,0x1845B,0x2897B
+1939 - Monastery Entry Doors - 0x0C128,0x0C153
+1942 - Monastery Shortcuts - 0x0364E,0x03750,0x0CF2A
+1945 - Town Doors - 0x0A0C9,0x034F5,0x28A61,0x03BB0,0x28AA2,0x2897B
 1948 - Town Tower Doors - 0x27798,0x27799,0x2779A,0x2779C
-1951 - Theater Exit - 0x0A16D,0x3CCDF
-1954 - Jungle & River Shortcuts - 0x3873B,0x0CF2A
+1951 - Windmill & Theater Doors - 0x0A16D,0x3CCDF,0x1845B,0x17F88
+1954 - Jungle Doors - 0x3873B,0x1475B
 1957 - Bunker Doors - 0x0C2A4,0x17C79,0x0C2A3,0x0A08D
-1960 - Swamp Doors - 0x00C1C,0x184B7,0x38AE6,0x18507
+1960 - Swamp Doors - 0x00C1C,0x184B7,0x18507
+1961 - Swamp Shortcuts - 0x38AE6,0x2D880
 1963 - Swamp Water Pumps - 0x04B7F,0x183F2,0x305D5,0x18482,0x0A1D6
 1966 - Treehouse Entry Doors - 0x0C309,0x0C310,0x0A181
-1975 - Mountain Floor 2 Stairs & Doors - 0x09FFB,0x09EDD,0x09E07
-1978 - Mountain Bottom Floor Doors to Caves - 0x17F33,0x2D77D
-1981 - Caves Doors to Challenge - 0x019A5,0x0A19A
-1984 - Caves Exits to Main Island - 0x2D859,0x2D73F
-1987 - Tunnels Doors - 0x27739,0x27263,0x09E87
+1969 - Treehouse Upper Doors - 0x0C323,0x0C32D
+1975 - Mountain Floor 1 & 2 Doors - 0x09E54,0x09FFB,0x09EDD,0x09E07
+1978 - Mountain Bottom Floor Doors - 0x0C141,0x17F33,0x09F89
+1981 - Caves Doors - 0x019A5,0x0A19A,0x2D77D
+1984 - Caves Shortcuts - 0x2D859,0x2D73F
+1987 - Tunnels Doors - 0x27739,0x27263,0x09E87,0x0348A
+
+2000 - Desert Control Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B
+2005 - Quarry Stoneworks Control Panels - 0x03678,0x03676,0x03679,0x03675
+2010 - Quarry Boathouse Control Panels - 0x03852,0x03858,0x275FA
+2015 - Town Control Panels - 0x2896A,0x334D8
+2020 - Windmill & Theater Control Panels - 0x17D02,0x00815
+2025 - Bunker Control Panels - 0x34BC5,0x34BC6,0x0A079
+2030 - Swamp Control Panels - 0x00609,0x18488,0x181F5,0x17E2B,0x17C0A,0x17E07
+2035 - Mountain & Caves Control Panels - 0x09ED8,0x09E86,0x09E39,0x09EEB,0x335AB,0x335AC,0x3369D
+
+2100 - Symmetry Island Panels - 0x1C349,0x000B0
+2101 - Tutorial Outpost Panels - 0x0A171,0x04CA4
+2105 - Desert Panels - 0x09FAA,0x1C2DF,0x1831E,0x1C260,0x1831C,0x1C2F3,0x1831D,0x1C2B1,0x1831B,0x0C339,0x0A249
+2110 - Quarry Outside Panels - 0x17C09,0x09E57,0x17CC4
+2115 - Quarry Stoneworks Panels - 0x01E5A,0x01E59,0x03678,0x03676,0x03679,0x03675
+2120 - Quarry Boathouse Panels - 0x03852,0x03858,0x275FA
+2122 - Keep Hedge Maze Panels - 0x00139,0x019DC,0x019E7,0x01A0F
+2125 - Monastery Panels - 0x09D9B,0x00C92,0x00B10
+2130 - Town Church & RGB House Panels - 0x28998,0x28A0D,0x334D8
+2135 - Town Maze Panels - 0x2896A,0x28A79
+2140 - Windmill & Theater Panels - 0x17D02,0x00815,0x17F5F,0x17F89,0x0A168,0x33AB2
+2145 - Treehouse Panels - 0x0A182,0x0288C,0x02886,0x2700B,0x17CBC,0x037FF
+2150 - Bunker Panels - 0x34BC5,0x34BC6,0x0A079,0x0A099,0x17C2E
+2155 - Swamp Panels - 0x00609,0x18488,0x181F5,0x17E2B,0x17C0A,0x17E07,0x17C0D,0x0056E
+2160 - Mountain Panels - 0x09ED8,0x09E86,0x09E39,0x09EEB
+2165 - Caves Panels - 0x3369D,0x00FF8,0x0A16E,0x335AB,0x335AC
+2170 - Tunnels Panels - 0x09E85,0x039B4
 
 Lasers:
 1500 - Symmetry Laser - 0x00509
-1501 - Desert Laser - 0x012FB,0x01317
+1501 - Desert Laser - 0x012FB
 1502 - Quarry Laser - 0x01539
 1503 - Shadows Laser - 0x181B3
 1504 - Keep Laser - 0x014BB
diff --git a/worlds/witness/WitnessLogic.txt b/worlds/witness/WitnessLogic.txt
index dffdc1a701..acfbe8c14e 100644
--- a/worlds/witness/WitnessLogic.txt
+++ b/worlds/witness/WitnessLogic.txt
@@ -1,3 +1,5 @@
+Menu (Menu) - Entry - True:
+
 Entry (Entry):
 
 First Hallway (First Hallway) - Entry - True - First Hallway Room - 0x00064:
@@ -21,9 +23,9 @@ Tutorial (Tutorial) - Outside Tutorial - 0x03629:
 159513 - 0x33600 (Patio Flowers EP) - 0x0C373 - True
 159517 - 0x3352F (Gate EP) - 0x03505 - True
 
-Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2:
-158650 - 0x033D4 (Vault) - True - Dots & Black/White Squares
-158651 - 0x03481 (Vault Box) - 0x033D4 - True
+Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2 - Outside Tutorial Vault - 0x033D0:
+158650 - 0x033D4 (Vault Panel) - True - Dots & Black/White Squares
+Door - 0x033D0 (Vault Door) - 0x033D4
 158013 - 0x0005D (Shed Row 1) - True - Dots
 158014 - 0x0005E (Shed Row 2) - 0x0005D - Dots
 158015 - 0x0005F (Shed Row 3) - 0x0005E - Dots
@@ -44,6 +46,9 @@ Door - 0x03BA2 (Outpost Path) - 0x0A3B5
 159516 - 0x334A3 (Path EP) - True - True
 159500 - 0x035C7 (Tractor EP) - True - True
 
+Outside Tutorial Vault (Outside Tutorial):
+158651 - 0x03481 (Vault Box) - True - True
+
 Outside Tutorial Path To Outpost (Outside Tutorial) - Outside Tutorial Outpost - 0x0A170:
 158011 - 0x0A171 (Outpost Entry Panel) - True - Dots & Full Dots
 Door - 0x0A170 (Outpost Entry) - 0x0A171
@@ -54,6 +59,7 @@ Door - 0x04CA3 (Outpost Exit) - 0x04CA4
 158600 - 0x17CFB (Discard) - True - Triangles
 
 Main Island (Main Island) - Outside Tutorial - True:
+159801 - 0xFFD00 (Reached Independently) - True - True
 159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True
 
 Outside Glass Factory (Glass Factory) - Main Island - True - Inside Glass Factory - 0x01A29:
@@ -76,7 +82,7 @@ Inside Glass Factory (Glass Factory) - Inside Glass Factory Behind Back Wall - 0
 158038 - 0x0343A (Melting 3) - 0x00082 - Symmetry
 Door - 0x0D7ED (Back Wall) - 0x0005C
 
-Inside Glass Factory Behind Back Wall (Glass Factory) - Boat - 0x17CC8:
+Inside Glass Factory Behind Back Wall (Glass Factory) - The Ocean - 0x17CC8:
 158039 - 0x17CC8 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat
 
 Outside Symmetry Island (Symmetry Island) - Main Island - True - Symmetry Island Lower - 0x17F3E:
@@ -112,12 +118,12 @@ Door - 0x18269 (Upper) - 0x1C349
 159000 - 0x0332B (Glass Factory Black Line Reflection EP) - True - True
 
 Symmetry Island Upper (Symmetry Island):
-158065 - 0x00A52 (Yellow 1) - True - Symmetry & Colored Dots
-158066 - 0x00A57 (Yellow 2) - 0x00A52 - Symmetry & Colored Dots
-158067 - 0x00A5B (Yellow 3) - 0x00A57 - Symmetry & Colored Dots
-158068 - 0x00A61 (Blue 1) - 0x00A52 - Symmetry & Colored Dots
-158069 - 0x00A64 (Blue 2) - 0x00A61 & 0x00A52 - Symmetry & Colored Dots
-158070 - 0x00A68 (Blue 3) - 0x00A64 & 0x00A57 - Symmetry & Colored Dots
+158065 - 0x00A52 (Laser Yellow 1) - True - Symmetry & Colored Dots
+158066 - 0x00A57 (Laser Yellow 2) - 0x00A52 - Symmetry & Colored Dots
+158067 - 0x00A5B (Laser Yellow 3) - 0x00A57 - Symmetry & Colored Dots
+158068 - 0x00A61 (Laser Blue 1) - 0x00A52 - Symmetry & Colored Dots
+158069 - 0x00A64 (Laser Blue 2) - 0x00A61 & 0x00A57 - Symmetry & Colored Dots
+158070 - 0x00A68 (Laser Blue 3) - 0x00A64 & 0x00A5B - Symmetry & Colored Dots
 158700 - 0x0360D (Laser Panel) - 0x00A68 - True
 Laser - 0x00509 (Laser) - 0x0360D
 159001 - 0x03367 (Glass Factory Black Line EP) - True - True
@@ -135,9 +141,9 @@ Door - 0x03313 (Second Gate) - 0x032FF
 
 Orchard End (Orchard):
 
-Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE:
-158652 - 0x0CC7B (Vault) - True - Dots & Shapers & Rotated Shapers & Negative Shapers & Full Dots
-158653 - 0x0339E (Vault Box) - 0x0CC7B - True
+Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE - Desert Vault - 0x03444:
+158652 - 0x0CC7B (Vault Panel) - True - Dots & Shapers & Rotated Shapers & Negative Shapers & Full Dots
+Door - 0x03444 (Vault Door) - 0x0CC7B
 158602 - 0x17CE7 (Discard) - True - Triangles
 158076 - 0x00698 (Surface 1) - True - True
 158077 - 0x0048F (Surface 2) - 0x00698 - True
@@ -163,6 +169,9 @@ Laser - 0x012FB (Laser) - 0x03608
 159040 - 0x334B9 (Shore EP) - True - True
 159041 - 0x334BC (Island EP) - True - True
 
+Desert Vault (Desert):
+158653 - 0x0339E (Vault Box) - True - True
+
 Desert Floodlight Room (Desert) - Desert Pond Room - 0x0C2C3:
 158087 - 0x09FAA (Light Control) - True - True
 158088 - 0x00422 (Light Room 1) - 0x09FAA - True
@@ -199,18 +208,19 @@ Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316:
 Door - 0x0C316 (Elevator Room Entry) - 0x18076
 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True
 
-Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x012FB:
+Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317:
 158111 - 0x17C31 (Final Transparent) - True - True
 158113 - 0x012D7 (Final Hexagonal) - 0x17C31 & 0x0A015 - True
 158114 - 0x0A015 (Final Hexagonal Control) - 0x17C31 - True
 158115 - 0x0A15C (Final Bent 1) - True - True
 158116 - 0x09FFF (Final Bent 2) - 0x0A15C - True
 158117 - 0x0A15F (Final Bent 3) - 0x09FFF - True
-159035 - 0x037BB (Elevator EP) - 0x012FB - True
+159035 - 0x037BB (Elevator EP) - 0x01317 - True
+Door - 0x01317 (Elevator) - 0x03608
 
 Desert Lowest Level Inbetween Shortcuts (Desert):
 
-Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - TrueOneWay:
+Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01:
 158118 - 0x09E57 (Entry 1 Panel) - True - Black/White Squares
 158603 - 0x17CF0 (Discard) - True - Triangles
 158702 - 0x03612 (Laser Panel) - 0x0A3D0 & 0x0367C - Eraser & Shapers
@@ -222,7 +232,7 @@ Door - 0x09D6F (Entry 1) - 0x09E57
 159420 - 0x289CF (Rock Line EP) - True - True
 159421 - 0x289D1 (Rock Line Reflection EP) - True - True
 
-Quarry Elevator (Quarry):
+Quarry Elevator (Quarry) - Outside Quarry - 0x17CC4 - Quarry - 0x17CC4:
 158120 - 0x17CC4 (Elevator Control) - 0x0367C - Dots & Eraser
 159403 - 0x17CB9 (Railroad EP) - 0x17CC4 - True
 
@@ -230,28 +240,31 @@ Quarry Between Entrys (Quarry) - Quarry - 0x17C07:
 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers
 Door - 0x17C07 (Entry 2) - 0x17C09
 
-Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4:
+Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010:
+159802 - 0xFFD01 (Inside Reached Independently) - True - True
 158121 - 0x01E5A (Stoneworks Entry Left Panel) - True - Black/White Squares
 158122 - 0x01E59 (Stoneworks Entry Right Panel) - True - Dots
 Door - 0x02010 (Stoneworks Entry) - 0x01E59 & 0x01E5A
 
-Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8:
+Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8 - Quarry Stoneworks Lift - TrueOneWay:
 158123 - 0x275ED (Side Exit Panel) - True - True
 Door - 0x275FF (Side Exit) - 0x275ED
 158124 - 0x03678 (Lower Ramp Control) - True - Dots & Eraser
 158145 - 0x17CAC (Roof Exit Panel) - True - True
 Door - 0x17CE8 (Roof Exit) - 0x17CAC
 
-Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Ground Floor - 0x03675 - Quarry Stoneworks Upper Floor - 0x03679:
+Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Lift - TrueOneWay:
 158125 - 0x00E0C (Lower Row 1) - True - Dots & Eraser
 158126 - 0x01489 (Lower Row 2) - 0x00E0C - Dots & Eraser
 158127 - 0x0148A (Lower Row 3) - 0x01489 - Dots & Eraser
 158128 - 0x014D9 (Lower Row 4) - 0x0148A - Dots & Eraser
 158129 - 0x014E7 (Lower Row 5) - 0x014D9 - Dots & Eraser
 158130 - 0x014E8 (Lower Row 6) - 0x014E7 - Dots & Eraser
+
+Quarry Stoneworks Lift (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03679 - Quarry Stoneworks Ground Floor - 0x03679 - Quarry Stoneworks Upper Floor - 0x03679:
 158131 - 0x03679 (Lower Lift Control) - 0x014E8 - Dots & Eraser
 
-Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03676 & 0x03679 - Quarry Stoneworks Ground Floor - 0x0368A:
+Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Lift - 0x03675 - Quarry Stoneworks Ground Floor - 0x0368A:
 158132 - 0x03676 (Upper Ramp Control) - True - Dots & Eraser
 158133 - 0x03675 (Upper Lift Control) - True - Dots & Eraser
 158134 - 0x00557 (Upper Row 1) - True - Colored Squares & Eraser
@@ -262,7 +275,7 @@ Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Flo
 158139 - 0x3C12D (Upper Row 6) - 0x0146C - Colored Squares & Eraser
 158140 - 0x03686 (Upper Row 7) - 0x3C12D - Colored Squares & Eraser
 158141 - 0x014E9 (Upper Row 8) - 0x03686 - Colored Squares & Eraser
-158142 - 0x03677 (Stair Control) - True - Colored Squares & Eraser
+158142 - 0x03677 (Stairs Panel) - True - Colored Squares & Eraser
 Door - 0x0368A (Stairs) - 0x03677
 158143 - 0x3C125 (Control Room Left) - 0x014E9 - Black/White Squares & Dots & Eraser
 158144 - 0x0367C (Control Room Right) - 0x014E9 - Colored Squares & Dots & Eraser
@@ -277,7 +290,7 @@ Quarry Boathouse (Quarry Boathouse) - Quarry - True - Quarry Boathouse Upper Fro
 Door - 0x2769B (Dock) - 0x17CA6
 Door - 0x27163 (Dock Invis Barrier) - 0x17CA6
 
-Quarry Boathouse Behind Staircase (Quarry Boathouse) - Boat - 0x17CA6:
+Quarry Boathouse Behind Staircase (Quarry Boathouse) - The Ocean - 0x17CA6:
 
 Quarry Boathouse Upper Front (Quarry Boathouse) - Quarry Boathouse Upper Middle - 0x17C50:
 158149 - 0x021B3 (Front Row 1) - True - Shapers & Eraser
@@ -309,9 +322,9 @@ Door - 0x3865F (Second Barrier) - 0x38663
 158169 - 0x0A3D0 (Back Second Row 3) - 0x0A3CC - Stars & Eraser & Shapers
 159401 - 0x005F6 (Hook EP) - 0x275FA & 0x03852 & 0x3865F - True
 
-Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 & 0x19665:
+Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 | 0x19665:
 158170 - 0x334DB (Door Timer Outside) - True - True
-Door - 0x19B24 (Timed Door) - 0x334DB
+Door - 0x19B24 (Timed Door) - 0x334DB | 0x334DC
 158171 - 0x0AC74 (Intro 6) - 0x0A8DC - True
 158172 - 0x0AC7A (Intro 7) - 0x0AC74 - True
 158173 - 0x0A8E0 (Intro 8) - 0x0AC7A - True
@@ -336,7 +349,7 @@ Shadows Ledge (Shadows) - Shadows - 0x1855B - Quarry - 0x19865 & 0x0A2DF:
 158187 - 0x334DC (Door Timer Inside) - True - True
 158188 - 0x198B5 (Intro 1) - True - True
 158189 - 0x198BD (Intro 2) - 0x198B5 - True
-158190 - 0x198BF (Intro 3) - 0x198BD & 0x334DC & 0x19B24 - True
+158190 - 0x198BF (Intro 3) - 0x198BD & 0x19B24 - True
 Door - 0x19865 (Quarry Barrier) - 0x198BF
 Door - 0x0A2DF (Quarry Barrier 2) - 0x198BF
 158191 - 0x19771 (Intro 4) - 0x198BF - True
@@ -345,7 +358,7 @@ Door - 0x1855B (Ledge Barrier) - 0x0A8DC
 Door - 0x19ADE (Ledge Barrier 2) - 0x0A8DC
 
 Shadows Laser Room (Shadows):
-158703 - 0x19650 (Laser Panel) - True - True
+158703 - 0x19650 (Laser Panel) - 0x194B2 & 0x19665 - True
 Laser - 0x181B3 (Laser) - 0x19650
 
 Treehouse Beach (Treehouse Beach) - Main Island - True:
@@ -395,9 +408,9 @@ Door - 0x01D40 (Pressure Plates 4 Exit) - 0x01D3F
 158205 - 0x09E49 (Shadows Shortcut Panel) - True - True
 Door - 0x09E3D (Shadows Shortcut) - 0x09E49
 
-Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True:
-158654 - 0x00AFB (Vault) - True - Symmetry & Sound Dots & Colored Dots
-158655 - 0x03535 (Vault Box) - 0x00AFB - True
+Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True - Shipwreck Vault - 0x17BB4:
+158654 - 0x00AFB (Vault Panel) - True - Symmetry & Sound Dots & Colored Dots
+Door - 0x17BB4 (Vault Door) - 0x00AFB
 158605 - 0x17D28 (Discard) - True - Triangles
 159220 - 0x03B22 (Circle Far EP) - True - True
 159221 - 0x03B23 (Circle Left EP) - True - True
@@ -407,6 +420,9 @@ Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True:
 159226 - 0x28ABE (Rope Outer EP) - True - True
 159230 - 0x3388F (Couch EP) - 0x17CDF | 0x0A054 - True
 
+Shipwreck Vault (Shipwreck):
+158655 - 0x03535 (Vault Box) - True - True
+
 Keep Tower (Keep) - Keep - 0x04F8F:
 158206 - 0x0361B (Tower Shortcut Panel) - True - True
 Door - 0x04F8F (Tower Shortcut) - 0x0361B
@@ -422,8 +438,8 @@ Laser - 0x014BB (Laser) - 0x0360E | 0x03317
 159251 - 0x3348F (Hedges EP) - True - True
 
 Outside Monastery (Monastery) - Main Island - True - Inside Monastery - 0x0C128 & 0x0C153 - Monastery Garden - 0x03750:
-158207 - 0x03713 (Shortcut Panel) - True - True
-Door - 0x0364E (Shortcut) - 0x03713
+158207 - 0x03713 (Laser Shortcut Panel) - True - True
+Door - 0x0364E (Laser Shortcut) - 0x03713
 158208 - 0x00B10 (Entry Left) - True - True
 158209 - 0x00C92 (Entry Right) - True - True
 Door - 0x0C128 (Entry Inner) - 0x00B10
@@ -454,7 +470,7 @@ Inside Monastery (Monastery):
 
 Monastery Garden (Monastery):
 
-Town (Town) - Main Island - True - Boat - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9:
+Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9:
 158218 - 0x0A054 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat
 158219 - 0x0A0C8 (Cargo Box Entry Panel) - True - Black/White Squares & Shapers
 Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8
@@ -469,11 +485,11 @@ Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8
 158238 - 0x28AC0 (Wooden Roof Lower Row 4) - 0x28ABF - Rotated Shapers & Dots & Full Dots
 158239 - 0x28AC1 (Wooden Roof Lower Row 5) - 0x28AC0 - Rotated Shapers & Dots & Full Dots
 Door - 0x034F5 (Wooden Roof Stairs) - 0x28AC1
-158225 - 0x28998 (Tinted Glass Door Panel) - True - Stars & Rotated Shapers
-Door - 0x28A61 (Tinted Glass Door) - 0x28998
+158225 - 0x28998 (RGB House Entry Panel) - True - Stars & Rotated Shapers
+Door - 0x28A61 (RGB House Entry) - 0x28998
 158226 - 0x28A0D (Church Entry Panel) - 0x28A61 - Stars
 Door - 0x03BB0 (Church Entry) - 0x28A0D
-158228 - 0x28A79 (Maze Stair Control) - True - True
+158228 - 0x28A79 (Maze Panel) - True - True
 Door - 0x28AA2 (Maze Stairs) - 0x28A79
 158241 - 0x17F5F (Windmill Entry Panel) - True - Dots
 Door - 0x1845B (Windmill Entry) - 0x17F5F
@@ -557,7 +573,7 @@ Door - 0x3CCDF (Exit Right) - 0x33AB2
 159556 - 0x33A2A (Door EP) - 0x03553 - True
 159558 - 0x33B06 (Church EP) - 0x0354E - True
 
-Jungle (Jungle) - Main Island - True - Outside Jungle River - 0x3873B - Boat - 0x17CDF:
+Jungle (Jungle) - Main Island - True - The Ocean - 0x17CDF:
 158251 - 0x17CDF (Shore Boat Spawn) - True - Boat
 158609 - 0x17F9B (Discard) - True - Triangles
 158252 - 0x002C4 (First Row 1) - True - True
@@ -588,18 +604,21 @@ Door - 0x3873B (Laser Shortcut) - 0x337FA
 159350 - 0x035CB (Bamboo CCW EP) - True - True
 159351 - 0x035CF (Bamboo CW EP) - True - True
 
-Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A:
-158267 - 0x17CAA (Monastery Shortcut Panel) - True - True
-Door - 0x0CF2A (Monastery Shortcut) - 0x17CAA
-158663 - 0x15ADD (Vault) - True - Black/White Squares & Dots
-158664 - 0x03702 (Vault Box) - 0x15ADD - True
+Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A - River Vault - 0x15287:
+158267 - 0x17CAA (Monastery Garden Shortcut Panel) - True - True
+Door - 0x0CF2A (Monastery Garden Shortcut) - 0x17CAA
+158663 - 0x15ADD (Vault Panel) - True - Black/White Squares & Dots
+Door - 0x15287 (Vault Door) - 0x15ADD
 159110 - 0x03AC5 (Green Leaf Moss EP) - True - True
 159120 - 0x03BE2 (Monastery Garden Left EP) - 0x03750 - True
 159121 - 0x03BE3 (Monastery Garden Right EP) - True - True
 159122 - 0x0A409 (Monastery Wall EP) - True - True
 
+River Vault (River):
+158664 - 0x03702 (Vault Box) - True - True
+
 Outside Bunker (Bunker) - Main Island - True - Bunker - 0x0C2A4:
-158268 - 0x17C2E (Entry Panel) - True - Black/White Squares & Colored Squares
+158268 - 0x17C2E (Entry Panel) - True - Black/White Squares
 Door - 0x0C2A4 (Entry) - 0x17C2E
 
 Bunker (Bunker) - Bunker Glass Room - 0x17C79:
@@ -616,9 +635,9 @@ Bunker (Bunker) - Bunker Glass Room - 0x17C79:
 Door - 0x17C79 (Tinted Glass Door) - 0x0A099
 
 Bunker Glass Room (Bunker) - Bunker Ultraviolet Room - 0x0C2A3:
-158279 - 0x0A010 (Glass Room 1) - True - Colored Squares
-158280 - 0x0A01B (Glass Room 2) - 0x0A010 - Colored Squares & Black/White Squares
-158281 - 0x0A01F (Glass Room 3) - 0x0A01B - Colored Squares & Black/White Squares
+158279 - 0x0A010 (Glass Room 1) - 0x17C79 - Colored Squares
+158280 - 0x0A01B (Glass Room 2) - 0x17C79 & 0x0A010 - Colored Squares & Black/White Squares
+158281 - 0x0A01F (Glass Room 3) - 0x17C79 & 0x0A01B - Colored Squares & Black/White Squares
 Door - 0x0C2A3 (UV Room Entry) - 0x0A01F
 
 Bunker Ultraviolet Room (Bunker) - Bunker Elevator Section - 0x0A08D:
@@ -631,7 +650,7 @@ Door - 0x0A08D (Elevator Room Entry) - 0x17E67
 Bunker Elevator Section (Bunker) - Bunker Elevator - TrueOneWay:
 159311 - 0x035F5 (Tinted Door EP) - 0x17C79 - True
 
-Bunker Elevator (Bunker) - Bunker Laser Platform - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079:
+Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079:
 158286 - 0x0A079 (Elevator Control) - True - Colored Squares & Black/White Squares
 
 Bunker Green Room (Bunker) - Bunker Elevator - TrueOneWay:
@@ -676,7 +695,7 @@ Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat
 158316 - 0x00990 (Platform Row 4) - 0x0098F - Shapers
 Door - 0x184B7 (Between Bridges First Door) - 0x00990
 158317 - 0x17C0D (Platform Shortcut Left Panel) - True - Shapers
-158318 - 0x17C0E (Platform Shortcut Right Panel) - True - Shapers
+158318 - 0x17C0E (Platform Shortcut Right Panel) - 0x17C0D - Shapers
 Door - 0x38AE6 (Platform Shortcut Door) - 0x17C0E
 Door - 0x04B7F (Cyan Water Pump) - 0x00006
 
@@ -715,18 +734,21 @@ Swamp Rotating Bridge (Swamp) - Swamp Between Bridges Far - 0x181F5 - Swamp Near
 159331 - 0x016B2 (Rotating Bridge CCW EP) - 0x181F5 - True
 159334 - 0x036CE (Rotating Bridge CW EP) - 0x181F5 - True
 
-Swamp Near Boat (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Blue Underwater - 0x18482:
+Swamp Near Boat (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Blue Underwater - 0x18482 - Swamp Long Bridge - 0xFFD00 & 0xFFD02 - The Ocean - 0x09DB8:
+158903 - 0xFFD02 (Beyond Rotating Bridge Reached Independently) - True - True
 158328 - 0x09DB8 (Boat Spawn) - True - Boat
 158329 - 0x003B2 (Beyond Rotating Bridge 1) - 0x0000A - Rotated Shapers
 158330 - 0x00A1E (Beyond Rotating Bridge 2) - 0x003B2 - Rotated Shapers
 158331 - 0x00C2E (Beyond Rotating Bridge 3) - 0x00A1E - Rotated Shapers
 158332 - 0x00E3A (Beyond Rotating Bridge 4) - 0x00C2E - Rotated Shapers
-158339 - 0x17E2B (Long Bridge Control) - True - Rotated Shapers & Shapers
 Door - 0x18482 (Blue Water Pump) - 0x00E3A
 159332 - 0x3365F (Boat EP) - 0x09DB8 - True
 159333 - 0x03731 (Long Bridge Side EP) - 0x17E2B - True
 
-Swamp Purple Area (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Purple Underwater - 0x0A1D6:
+Swamp Long Bridge (Swamp) - Swamp Near Boat - 0x17E2B - Outside Swamp - 0x17E2B:
+158339 - 0x17E2B (Long Bridge Control) - True - Rotated Shapers & Shapers
+
+Swamp Purple Area (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Purple Underwater - 0x0A1D6 - Swamp Near Boat - TrueOneWay:
 Door - 0x0A1D6 (Purple Water Pump) - 0x00E3A
 
 Swamp Purple Underwater (Swamp):
@@ -752,7 +774,7 @@ Laser - 0x00BF6 (Laser) - 0x03615
 158342 - 0x17C02 (Laser Shortcut Right Panel) - 0x17C05 - Shapers & Negative Shapers & Rotated Shapers
 Door - 0x2D880 (Laser Shortcut) - 0x17C02
 
-Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309:
+Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309 - The Ocean - 0x17C95:
 158343 - 0x17C95 (Boat Spawn) - True - Boat
 158344 - 0x0288C (First Door Panel) - True - Stars
 Door - 0x0C309 (First Door) - 0x0288C
@@ -778,7 +800,7 @@ Treehouse After Yellow Bridge (Treehouse) - Treehouse Junction - 0x0A181:
 Door - 0x0A181 (Third Door) - 0x0A182
 
 Treehouse Junction (Treehouse) - Treehouse Right Orange Bridge - True - Treehouse First Purple Bridge - True - Treehouse Green Bridge - True:
-158356 - 0x2700B (Laser House Door Timer Outside Control) - True - True
+158356 - 0x2700B (Laser House Door Timer Outside) - True - True
 
 Treehouse First Purple Bridge (Treehouse) - Treehouse Second Purple Bridge - 0x17D6C:
 158357 - 0x17DC8 (First Purple Bridge 1) - True - Stars & Dots
@@ -802,7 +824,7 @@ Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2:
 158402 - 0x17DA2 (Right Orange Bridge 12) - 0x17DB1 - Stars
 
 Treehouse Bridge Platform (Treehouse) - Main Island - 0x0C32D:
-158404 - 0x037FF (Bridge Control) - True - Stars
+158404 - 0x037FF (Drawbridge Panel) - True - Stars
 Door - 0x0C32D (Drawbridge) - 0x037FF
 
 Treehouse Second Purple Bridge (Treehouse) - Treehouse Left Orange Bridge - 0x17DC6:
@@ -847,7 +869,7 @@ Treehouse Green Bridge Left House (Treehouse):
 159211 - 0x220A7 (Right Orange Bridge EP) - 0x17DA2 - True
 
 Treehouse Laser Room Front Platform (Treehouse) - Treehouse Laser Room - 0x0C323:
-Door - 0x0C323 (Laser House Entry) - 0x17DA2 & 0x2700B & 0x17DDB
+Door - 0x0C323 (Laser House Entry) - 0x17DA2 & 0x2700B & 0x17DDB | 0x17CBC
 
 Treehouse Laser Room Back Platform (Treehouse):
 158611 - 0x17FA0 (Laser Discard) - True - Triangles
@@ -860,19 +882,22 @@ Treehouse Laser Room (Treehouse):
 158403 - 0x17CBC (Laser House Door Timer Inside) - True - True
 Laser - 0x028A4 (Laser) - 0x03613
 
-Mountainside (Mountainside) - Main Island - True - Mountaintop - True:
+Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085:
 158612 - 0x17C42 (Discard) - True - Triangles
-158665 - 0x002A6 (Vault) - True - Symmetry & Colored Dots & Black/White Squares & Dots
-158666 - 0x03542 (Vault Box) - 0x002A6 - True
+158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Dots & Black/White Squares & Dots
+Door - 0x00085 (Vault Door) - 0x002A6
 159301 - 0x335AE (Cloud Cycle EP) - True - True
 159325 - 0x33505 (Bush EP) - True - True
 159335 - 0x03C07 (Apparent River EP) - True - True
 
+Mountainside Vault (Mountainside):
+158666 - 0x03542 (Vault Box) - True - True
+
 Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34:
 158405 - 0x0042D (River Shape) - True - True
 158406 - 0x09F7F (Box Short) - 7 Lasers - True
-158407 - 0x17C34 (Trap Door Triple Exit) - 0x09F7F - Stars & Black/White Squares & Stars + Same Colored Symbol
-158800 - 0xFFF00 (Box Long) - 7 Lasers & 11 Lasers & 0x17C34 - True
+158407 - 0x17C34 (Mountain Entry Panel) - 0x09F7F - Stars & Black/White Squares & Stars + Same Colored Symbol
+158800 - 0xFFF00 (Box Long) - 11 Lasers & 0x17C34 - True
 159300 - 0x001A3 (River Shape EP) - True - True
 159320 - 0x3370E (Arch Black EP) - True - True
 159324 - 0x336C8 (Arch White Right EP) - True - True
@@ -881,7 +906,7 @@ Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34:
 Mountain Top Layer (Mountain Floor 1) - Mountain Top Layer Bridge - 0x09E39:
 158408 - 0x09E39 (Light Bridge Controller) - True - Black/White Squares & Colored Squares & Eraser
 
-Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
+Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - TrueOneWay:
 158409 - 0x09E7A (Right Row 1) - True - Black/White Squares & Dots
 158410 - 0x09E71 (Right Row 2) - 0x09E7A - Black/White Squares & Dots
 158411 - 0x09E72 (Right Row 3) - 0x09E71 - Black/White Squares & Shapers & Dots
@@ -899,6 +924,8 @@ Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 158423 - 0x09F6E (Back Row 3) - 0x33AF7 - Symmetry & Dots
 158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers
 158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shapers
+
+Mountain Top Layer At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B
 
 Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Blue Bridge - 0x09E86 - Mountain Pink Bridge EP - TrueOneWay:
@@ -917,7 +944,7 @@ Door - 0x09EDD (Elevator Room Entry) - 0x09ED8 & 0x09E86
 Mountain Floor 2 Light Bridge Room Near (Mountain Floor 2):
 158431 - 0x09E86 (Light Bridge Controller Near) - True - Stars & Stars + Same Colored Symbol & Rotated Shapers & Eraser
 
-Mountain Floor 2 Beyond Bridge (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Far - 0x09E07 - Mountain Pink Bridge EP - TrueOneWay:
+Mountain Floor 2 Beyond Bridge (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Far - 0x09E07 - Mountain Pink Bridge EP - TrueOneWay - Mountain Floor 2 - 0x09ED8:
 158432 - 0x09FCC (Far Row 1) - True - Dots
 158433 - 0x09FCE (Far Row 2) - 0x09FCC - Black/White Squares
 158434 - 0x09FCF (Far Row 3) - 0x09FCE - Stars
@@ -935,29 +962,27 @@ Mountain Floor 2 Elevator Room (Mountain Floor 2) - Mountain Floor 2 Elevator -
 Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Third Layer - 0x09EEB:
 158439 - 0x09EEB (Elevator Control Panel) - True - Dots
 
-Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89:
+Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay:
 158440 - 0x09FC1 (Giant Puzzle Bottom Left) - True - Shapers & Eraser
 158441 - 0x09F8E (Giant Puzzle Bottom Right) - True - Shapers & Eraser
 158442 - 0x09F01 (Giant Puzzle Top Right) - True - Rotated Shapers
 158443 - 0x09EFF (Giant Puzzle Top Left) - True - Shapers & Eraser
 158444 - 0x09FDA (Giant Puzzle) - 0x09FC1 & 0x09F8E & 0x09F01 & 0x09EFF - Shapers & Symmetry
+159313 - 0x09D5D (Yellow Bridge EP) - 0x09E86 & 0x09ED8 - True
+159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True
 Door - 0x09F89 (Exit) - 0x09FDA
 
-Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Bottom Floor Rock - 0x17FA2 - Final Room - 0x0C141 - Mountain Pink Bridge EP - TrueOneWay:
+Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Final Room - 0x0C141:
 158614 - 0x17FA2 (Discard) - 0xFFF00 - Triangles
 158445 - 0x01983 (Final Room Entry Left) - True - Shapers & Stars
 158446 - 0x01987 (Final Room Entry Right) - True - Colored Squares & Dots
 Door - 0x0C141 (Final Room Entry) - 0x01983 & 0x01987
-159313 - 0x09D5D (Yellow Bridge EP) - 0x09E86 & 0x09ED8 - True
-159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True
+Door - 0x17F33 (Rock Open) - 0x17FA2 | 0x334E1
 
 Mountain Pink Bridge EP (Mountain Floor 2):
 159312 - 0x09D63 (Pink Bridge EP) - 0x09E39 - True
 
-Mountain Bottom Floor Rock (Mountain Bottom Floor) - Mountain Bottom Floor - 0x17F33 - Mountain Path to Caves - 0x17F33:
-Door - 0x17F33 (Rock Open) - True - True
-
-Mountain Path to Caves (Mountain Bottom Floor) - Mountain Bottom Floor Rock - 0x334E1 - Caves - 0x2D77D:
+Mountain Path to Caves (Mountain Bottom Floor) - Caves - 0x2D77D:
 158447 - 0x00FF8 (Caves Entry Panel) - True - Triangles & Black/White Squares
 Door - 0x2D77D (Caves Entry) - 0x00FF8
 158448 - 0x334E1 (Rock Control) - True - True
@@ -1021,7 +1046,7 @@ Path to Challenge (Caves) - Challenge - 0x0A19A:
 158477 - 0x0A16E (Challenge Entry Panel) - True - Stars & Shapers & Stars + Same Colored Symbol
 Door - 0x0A19A (Challenge Entry) - 0x0A16E
 
-Challenge (Challenge) - Tunnels - 0x0348A:
+Challenge (Challenge) - Tunnels - 0x0348A - Challenge Vault - 0x04D75:
 158499 - 0x0A332 (Start Timer) - 11 Lasers - True
 158500 - 0x0088E (Small Basic) - 0x0A332 - True
 158501 - 0x00BAF (Big Basic) - 0x0088E - True
@@ -1041,11 +1066,14 @@ Challenge (Challenge) - Tunnels - 0x0348A:
 158515 - 0x034EC (Maze Hidden 2) - 0x00C68 | 0x00C59 | 0x00C22 - Triangles
 158516 - 0x1C31A (Dots Pillar) - 0x034F4 & 0x034EC - Dots & Symmetry
 158517 - 0x1C319 (Squares Pillar) - 0x034F4 & 0x034EC - Black/White Squares & Symmetry
-158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True
+Door - 0x04D75 (Vault Door) - 0x1C31A & 0x1C319
 158518 - 0x039B4 (Tunnels Entry Panel) - True - Triangles
 Door - 0x0348A (Tunnels Entry) - 0x039B4
 159530 - 0x28B30 (Water EP) - True - True
 
+Challenge Vault (Challenge):
+158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True
+
 Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Lowest Level Inbetween Shortcuts - 0x27263 - Town - 0x09E87:
 158668 - 0x2FAF6 (Vault Box) - True - True
 158519 - 0x27732 (Theater Shortcut Panel) - True - True
@@ -1075,7 +1103,7 @@ Elevator (Mountain Final Room):
 158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True
 158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True
 
-Boat (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay:
+The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay:
 159042 - 0x22106 (Desert EP) - True - True
 159223 - 0x03B25 (Shipwreck CCW Underside EP) - True - True
 159231 - 0x28B29 (Shipwreck Green EP) - True - True
@@ -1093,34 +1121,38 @@ Obelisks (EPs) - Entry - True:
 159702 - 0xFFE02 (Desert Obelisk Side 3) - 0x3351D - True
 159703 - 0xFFE03 (Desert Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True
 159704 - 0xFFE04 (Desert Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True
+159709 - 0x00359 (Desert Obelisk) - True - True
 159710 - 0xFFE10 (Monastery Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True
 159711 - 0xFFE11 (Monastery Obelisk Side 2) - 0x03AC5 - True
 159712 - 0xFFE12 (Monastery Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True
 159713 - 0xFFE13 (Monastery Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True
 159714 - 0xFFE14 (Monastery Obelisk Side 5) - 0x03E01 - True
 159715 - 0xFFE15 (Monastery Obelisk Side 6) - 0x289F4 & 0x289F5 - True
+159719 - 0x00263 (Monastery Obelisk) - True - True
 159720 - 0xFFE20 (Treehouse Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True
 159721 - 0xFFE21 (Treehouse Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True
 159722 - 0xFFE22 (Treehouse Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True
 159723 - 0xFFE23 (Treehouse Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True
 159724 - 0xFFE24 (Treehouse Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True
 159725 - 0xFFE25 (Treehouse Obelisk Side 6) - 0x28AE9 & 0x3348F - True
+159729 - 0x00097 (Treehouse Obelisk) - True - True
 159730 - 0xFFE30 (River Obelisk Side 1) - 0x001A3 & 0x335AE - True
 159731 - 0xFFE31 (River Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True
 159732 - 0xFFE32 (River Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True
 159733 - 0xFFE33 (River Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True
 159734 - 0xFFE34 (River Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True
 159735 - 0xFFE35 (River Obelisk Side 6) - 0x035CB & 0x035CF - True
+159739 - 0x00367 (River Obelisk) - True - True
 159740 - 0xFFE40 (Quarry Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True
 159741 - 0xFFE41 (Quarry Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True
 159742 - 0xFFE42 (Quarry Obelisk Side 3) - 0x289CF & 0x289D1 - True
 159743 - 0xFFE43 (Quarry Obelisk Side 4) - 0x33692 - True
 159744 - 0xFFE44 (Quarry Obelisk Side 5) - 0x03E77 & 0x03E7C - True
+159749 - 0x22073 (Quarry Obelisk) - True - True
 159750 - 0xFFE50 (Town Obelisk Side 1) - 0x035C7 - True
 159751 - 0xFFE51 (Town Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True
 159752 - 0xFFE52 (Town Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True
 159753 - 0xFFE53 (Town Obelisk Side 4) - 0x28B30 & 0x035C9 - True
 159754 - 0xFFE54 (Town Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True
 159755 - 0xFFE55 (Town Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True
-
-Lasers (Lasers) - Entry - True:
+159759 - 0x0A16C (Town Obelisk) - True - True
diff --git a/worlds/witness/WitnessLogicExpert.txt b/worlds/witness/WitnessLogicExpert.txt
index 581167cc45..b1d9b8e30e 100644
--- a/worlds/witness/WitnessLogicExpert.txt
+++ b/worlds/witness/WitnessLogicExpert.txt
@@ -1,3 +1,5 @@
+Menu (Menu) - Entry - True:
+
 Entry (Entry):
 
 First Hallway (First Hallway) - Entry - True - First Hallway Room - 0x00064:
@@ -21,9 +23,9 @@ Tutorial (Tutorial) - Outside Tutorial - True:
 159513 - 0x33600 (Patio Flowers EP) - 0x0C373 - True
 159517 - 0x3352F (Gate EP) - 0x03505 - True
 
-Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2:
-158650 - 0x033D4 (Vault) - True - Dots & Full Dots & Squares & Black/White Squares
-158651 - 0x03481 (Vault Box) - 0x033D4 - True
+Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2 - Outside Tutorial Vault - 0x033D0:
+158650 - 0x033D4 (Vault Panel) - True - Dots & Full Dots & Squares & Black/White Squares
+Door - 0x033D0 (Vault Door) - 0x033D4
 158013 - 0x0005D (Shed Row 1) - True - Dots & Full Dots
 158014 - 0x0005E (Shed Row 2) - 0x0005D - Dots & Full Dots
 158015 - 0x0005F (Shed Row 3) - 0x0005E - Dots & Full Dots
@@ -44,6 +46,9 @@ Door - 0x03BA2 (Outpost Path) - 0x0A3B5
 159516 - 0x334A3 (Path EP) - True - True
 159500 - 0x035C7 (Tractor EP) - True - True
 
+Outside Tutorial Vault (Outside Tutorial):
+158651 - 0x03481 (Vault Box) - True - True
+
 Outside Tutorial Path To Outpost (Outside Tutorial) - Outside Tutorial Outpost - 0x0A170:
 158011 - 0x0A171 (Outpost Entry Panel) - True - Dots & Full Dots & Triangles
 Door - 0x0A170 (Outpost Entry) - 0x0A171
@@ -54,6 +59,7 @@ Door - 0x04CA3 (Outpost Exit) - 0x04CA4
 158600 - 0x17CFB (Discard) - True - Arrows
 
 Main Island (Main Island) - Outside Tutorial - True:
+159801 - 0xFFD00 (Reached Independently) - True - True
 159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True
 
 Outside Glass Factory (Glass Factory) - Main Island - True - Inside Glass Factory - 0x01A29:
@@ -76,7 +82,7 @@ Inside Glass Factory (Glass Factory) - Inside Glass Factory Behind Back Wall - 0
 158038 - 0x0343A (Melting 3) - 0x00082 - Symmetry & Dots
 Door - 0x0D7ED (Back Wall) - 0x0005C
 
-Inside Glass Factory Behind Back Wall (Glass Factory) - Boat - 0x17CC8:
+Inside Glass Factory Behind Back Wall (Glass Factory) - The Ocean - 0x17CC8:
 158039 - 0x17CC8 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat
 
 Outside Symmetry Island (Symmetry Island) - Main Island - True - Symmetry Island Lower - 0x17F3E:
@@ -112,12 +118,12 @@ Door - 0x18269 (Upper) - 0x1C349
 159000 - 0x0332B (Glass Factory Black Line Reflection EP) - True - True
 
 Symmetry Island Upper (Symmetry Island):
-158065 - 0x00A52 (Yellow 1) - True - Symmetry & Colored Dots
-158066 - 0x00A57 (Yellow 2) - 0x00A52 - Symmetry & Colored Dots
-158067 - 0x00A5B (Yellow 3) - 0x00A57 - Symmetry & Colored Dots
-158068 - 0x00A61 (Blue 1) - 0x00A52 - Symmetry & Colored Dots
-158069 - 0x00A64 (Blue 2) - 0x00A61 & 0x00A52 - Symmetry & Colored Dots
-158070 - 0x00A68 (Blue 3) - 0x00A64 & 0x00A57 - Symmetry & Colored Dots
+158065 - 0x00A52 (Laser Yellow 1) - True - Symmetry & Colored Dots
+158066 - 0x00A57 (Laser Yellow 2) - 0x00A52 - Symmetry & Colored Dots
+158067 - 0x00A5B (Laser Yellow 3) - 0x00A57 - Symmetry & Colored Dots
+158068 - 0x00A61 (Laser Blue 1) - 0x00A52 - Symmetry & Colored Dots
+158069 - 0x00A64 (Laser Blue 2) - 0x00A61 & 0x00A57 - Symmetry & Colored Dots
+158070 - 0x00A68 (Laser Blue 3) - 0x00A64 & 0x00A5B - Symmetry & Colored Dots
 158700 - 0x0360D (Laser Panel) - 0x00A68 - True
 Laser - 0x00509 (Laser) - 0x0360D
 159001 - 0x03367 (Glass Factory Black Line EP) - True - True
@@ -135,9 +141,9 @@ Door - 0x03313 (Second Gate) - 0x032FF
 
 Orchard End (Orchard):
 
-Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE:
-158652 - 0x0CC7B (Vault) - True - Dots & Full Dots & Stars & Stars + Same Colored Symbol & Eraser & Triangles & Shapers & Negative Shapers & Colored Squares
-158653 - 0x0339E (Vault Box) - 0x0CC7B - True
+Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE - Desert Vault - 0x03444:
+158652 - 0x0CC7B (Vault Panel) - True - Dots & Full Dots & Stars & Stars + Same Colored Symbol & Eraser & Triangles & Shapers & Negative Shapers & Colored Squares
+Door - 0x03444 (Vault Door) - 0x0CC7B
 158602 - 0x17CE7 (Discard) - True - Arrows
 158076 - 0x00698 (Surface 1) - True - True
 158077 - 0x0048F (Surface 2) - 0x00698 - True
@@ -163,6 +169,9 @@ Laser - 0x012FB (Laser) - 0x03608
 159040 - 0x334B9 (Shore EP) - True - True
 159041 - 0x334BC (Island EP) - True - True
 
+Desert Vault (Desert):
+158653 - 0x0339E (Vault Box) - True - True
+
 Desert Floodlight Room (Desert) - Desert Pond Room - 0x0C2C3:
 158087 - 0x09FAA (Light Control) - True - True
 158088 - 0x00422 (Light Room 1) - 0x09FAA - True
@@ -199,18 +208,19 @@ Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316:
 Door - 0x0C316 (Elevator Room Entry) - 0x18076
 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True
 
-Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x012FB:
+Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317:
 158111 - 0x17C31 (Final Transparent) - True - True
 158113 - 0x012D7 (Final Hexagonal) - 0x17C31 & 0x0A015 - True
 158114 - 0x0A015 (Final Hexagonal Control) - 0x17C31 - True
 158115 - 0x0A15C (Final Bent 1) - True - True
 158116 - 0x09FFF (Final Bent 2) - 0x0A15C - True
 158117 - 0x0A15F (Final Bent 3) - 0x09FFF - True
-159035 - 0x037BB (Elevator EP) - 0x012FB - True
+159035 - 0x037BB (Elevator EP) - 0x01317 - True
+Door - 0x01317 (Elevator) - 0x03608
 
 Desert Lowest Level Inbetween Shortcuts (Desert):
 
-Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - TrueOneWay:
+Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01:
 158118 - 0x09E57 (Entry 1 Panel) - True - Squares & Black/White Squares & Triangles
 158603 - 0x17CF0 (Discard) - True - Arrows
 158702 - 0x03612 (Laser Panel) - 0x0A3D0 & 0x0367C - Eraser & Triangles & Stars & Stars + Same Colored Symbol
@@ -222,7 +232,7 @@ Door - 0x09D6F (Entry 1) - 0x09E57
 159420 - 0x289CF (Rock Line EP) - True - True
 159421 - 0x289D1 (Rock Line Reflection EP) - True - True
 
-Quarry Elevator (Quarry):
+Quarry Elevator (Quarry) - Outside Quarry - 0x17CC4 - Quarry - 0x17CC4:
 158120 - 0x17CC4 (Elevator Control) - 0x0367C - Dots & Eraser
 159403 - 0x17CB9 (Railroad EP) - 0x17CC4 - True
 
@@ -230,28 +240,31 @@ Quarry Between Entrys (Quarry) - Quarry - 0x17C07:
 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers & Triangles
 Door - 0x17C07 (Entry 2) - 0x17C09
 
-Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4:
+Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010:
+159802 - 0xFFD01 (Inside Reached Independently) - True - True
 158121 - 0x01E5A (Stoneworks Entry Left Panel) - True - Squares & Black/White Squares & Stars & Stars + Same Colored Symbol
 158122 - 0x01E59 (Stoneworks Entry Right Panel) - True - Triangles
 Door - 0x02010 (Stoneworks Entry) - 0x01E59 & 0x01E5A
 
-Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8:
+Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8 - Quarry Stoneworks Lift - TrueOneWay:
 158123 - 0x275ED (Side Exit Panel) - True - True
 Door - 0x275FF (Side Exit) - 0x275ED
 158124 - 0x03678 (Lower Ramp Control) - True - Dots & Eraser
 158145 - 0x17CAC (Roof Exit Panel) - True - True
 Door - 0x17CE8 (Roof Exit) - 0x17CAC
 
-Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Ground Floor - 0x03675 - Quarry Stoneworks Upper Floor - 0x03679:
+Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Lift - TrueOneWay:
 158125 - 0x00E0C (Lower Row 1) - True - Triangles & Eraser
 158126 - 0x01489 (Lower Row 2) - 0x00E0C - Triangles & Eraser
 158127 - 0x0148A (Lower Row 3) - 0x01489 - Triangles & Eraser
 158128 - 0x014D9 (Lower Row 4) - 0x0148A - Triangles & Eraser
 158129 - 0x014E7 (Lower Row 5) - 0x014D9 - Triangles & Eraser
 158130 - 0x014E8 (Lower Row 6) - 0x014E7 - Triangles & Eraser
+
+Quarry Stoneworks Lift (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03679 - Quarry Stoneworks Ground Floor - 0x03679 - Quarry Stoneworks Upper Floor - 0x03679:
 158131 - 0x03679 (Lower Lift Control) - 0x014E8 - Dots & Eraser
 
-Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03676 & 0x03679 - Quarry Stoneworks Ground Floor - 0x0368A:
+Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Lift - 0x03675 - Quarry Stoneworks Ground Floor - 0x0368A:
 158132 - 0x03676 (Upper Ramp Control) - True - Dots & Eraser
 158133 - 0x03675 (Upper Lift Control) - True - Dots & Eraser
 158134 - 0x00557 (Upper Row 1) - True - Squares & Colored Squares & Eraser & Stars & Stars + Same Colored Symbol
@@ -262,7 +275,7 @@ Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Flo
 158139 - 0x3C12D (Upper Row 6) - 0x0146C - Squares & Colored Squares & Eraser & Stars & Stars + Same Colored Symbol
 158140 - 0x03686 (Upper Row 7) - 0x3C12D - Squares & Colored Squares & Eraser & Stars & Stars + Same Colored Symbol
 158141 - 0x014E9 (Upper Row 8) - 0x03686 - Squares & Colored Squares & Eraser & Stars & Stars + Same Colored Symbol
-158142 - 0x03677 (Stair Control) - True - Squares & Colored Squares & Eraser
+158142 - 0x03677 (Stairs Panel) - True - Squares & Colored Squares & Eraser
 Door - 0x0368A (Stairs) - 0x03677
 158143 - 0x3C125 (Control Room Left) - 0x014E9 - Squares & Black/White Squares & Dots & Full Dots & Eraser
 158144 - 0x0367C (Control Room Right) - 0x014E9 - Squares & Colored Squares & Triangles & Eraser & Stars & Stars + Same Colored Symbol
@@ -277,7 +290,7 @@ Quarry Boathouse (Quarry Boathouse) - Quarry - True - Quarry Boathouse Upper Fro
 Door - 0x2769B (Dock) - 0x17CA6
 Door - 0x27163 (Dock Invis Barrier) - 0x17CA6
 
-Quarry Boathouse Behind Staircase (Quarry Boathouse) - Boat - 0x17CA6:
+Quarry Boathouse Behind Staircase (Quarry Boathouse) - The Ocean - 0x17CA6:
 
 Quarry Boathouse Upper Front (Quarry Boathouse) - Quarry Boathouse Upper Middle - 0x17C50:
 158149 - 0x021B3 (Front Row 1) - True - Shapers & Eraser & Negative Shapers
@@ -309,9 +322,9 @@ Door - 0x3865F (Second Barrier) - 0x38663
 158169 - 0x0A3D0 (Back Second Row 3) - 0x0A3CC - Stars & Eraser & Shapers & Negative Shapers & Stars + Same Colored Symbol
 159401 - 0x005F6 (Hook EP) - 0x275FA & 0x03852 & 0x3865F - True
 
-Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 & 0x19665:
+Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 | 0x19665:
 158170 - 0x334DB (Door Timer Outside) - True - True
-Door - 0x19B24 (Timed Door) - 0x334DB
+Door - 0x19B24 (Timed Door) - 0x334DB | 0x334DC
 158171 - 0x0AC74 (Intro 6) - 0x0A8DC - True
 158172 - 0x0AC7A (Intro 7) - 0x0AC74 - True
 158173 - 0x0A8E0 (Intro 8) - 0x0AC7A - True
@@ -336,7 +349,7 @@ Shadows Ledge (Shadows) - Shadows - 0x1855B - Quarry - 0x19865 & 0x0A2DF:
 158187 - 0x334DC (Door Timer Inside) - True - True
 158188 - 0x198B5 (Intro 1) - True - True
 158189 - 0x198BD (Intro 2) - 0x198B5 - True
-158190 - 0x198BF (Intro 3) - 0x198BD & 0x334DC & 0x19B24 - True
+158190 - 0x198BF (Intro 3) - 0x198BD & 0x19B24 - True
 Door - 0x19865 (Quarry Barrier) - 0x198BF
 Door - 0x0A2DF (Quarry Barrier 2) - 0x198BF
 158191 - 0x19771 (Intro 4) - 0x198BF - True
@@ -345,7 +358,7 @@ Door - 0x1855B (Ledge Barrier) - 0x0A8DC
 Door - 0x19ADE (Ledge Barrier 2) - 0x0A8DC
 
 Shadows Laser Room (Shadows):
-158703 - 0x19650 (Laser Panel) - True - True
+158703 - 0x19650 (Laser Panel) - 0x194B2 & 0x19665 - True
 Laser - 0x181B3 (Laser) - 0x19650
 
 Treehouse Beach (Treehouse Beach) - Main Island - True:
@@ -395,9 +408,9 @@ Door - 0x01D40 (Pressure Plates 4 Exit) - 0x01D3F
 158205 - 0x09E49 (Shadows Shortcut Panel) - True - True
 Door - 0x09E3D (Shadows Shortcut) - 0x09E49
 
-Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True:
-158654 - 0x00AFB (Vault) - True - Symmetry & Sound Dots & Colored Dots
-158655 - 0x03535 (Vault Box) - 0x00AFB - True
+Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True - Shipwreck Vault - 0x17BB4:
+158654 - 0x00AFB (Vault Panel) - True - Symmetry & Sound Dots & Colored Dots
+Door - 0x17BB4 (Vault Door) - 0x00AFB
 158605 - 0x17D28 (Discard) - True - Arrows
 159220 - 0x03B22 (Circle Far EP) - True - True
 159221 - 0x03B23 (Circle Left EP) - True - True
@@ -407,6 +420,9 @@ Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True:
 159226 - 0x28ABE (Rope Outer EP) - True - True
 159230 - 0x3388F (Couch EP) - 0x17CDF | 0x0A054 - True
 
+Shipwreck Vault (Shipwreck):
+158655 - 0x03535 (Vault Box) - True - True
+
 Keep Tower (Keep) - Keep - 0x04F8F:
 158206 - 0x0361B (Tower Shortcut Panel) - True - True
 Door - 0x04F8F (Tower Shortcut) - 0x0361B
@@ -422,8 +438,8 @@ Laser - 0x014BB (Laser) - 0x0360E | 0x03317
 159251 - 0x3348F (Hedges EP) - True - True
 
 Outside Monastery (Monastery) - Main Island - True - Inside Monastery - 0x0C128 & 0x0C153 - Monastery Garden - 0x03750:
-158207 - 0x03713 (Shortcut Panel) - True - True
-Door - 0x0364E (Shortcut) - 0x03713
+158207 - 0x03713 (Laser Shortcut Panel) - True - True
+Door - 0x0364E (Laser Shortcut) - 0x03713
 158208 - 0x00B10 (Entry Left) - True - True
 158209 - 0x00C92 (Entry Right) - True - True
 Door - 0x0C128 (Entry Inner) - 0x00B10
@@ -454,7 +470,7 @@ Inside Monastery (Monastery):
 
 Monastery Garden (Monastery):
 
-Town (Town) - Main Island - True - Boat - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9:
+Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9:
 158218 - 0x0A054 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat
 158219 - 0x0A0C8 (Cargo Box Entry Panel) - True - Squares & Black/White Squares & Shapers & Triangles
 Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8
@@ -469,11 +485,11 @@ Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8
 158238 - 0x28AC0 (Wooden Roof Lower Row 4) - 0x28ABF - Triangles & Dots & Full Dots
 158239 - 0x28AC1 (Wooden Roof Lower Row 5) - 0x28AC0 - Triangles & Dots & Full Dots
 Door - 0x034F5 (Wooden Roof Stairs) - 0x28AC1
-158225 - 0x28998 (Tinted Glass Door Panel) - True - Stars & Rotated Shapers & Stars + Same Colored Symbol
-Door - 0x28A61 (Tinted Glass Door) - 0x28A0D
+158225 - 0x28998 (RGB House Entry Panel) - True - Stars & Rotated Shapers & Stars + Same Colored Symbol
+Door - 0x28A61 (RGB House Entry) - 0x28A0D
 158226 - 0x28A0D (Church Entry Panel) - 0x28998 - Stars
 Door - 0x03BB0 (Church Entry) - 0x03C08
-158228 - 0x28A79 (Maze Stair Control) - True - True
+158228 - 0x28A79 (Maze Panel) - True - True
 Door - 0x28AA2 (Maze Stairs) - 0x28A79
 158241 - 0x17F5F (Windmill Entry Panel) - True - Dots
 Door - 0x1845B (Windmill Entry) - 0x17F5F
@@ -484,7 +500,7 @@ Door - 0x1845B (Windmill Entry) - 0x17F5F
 159541 - 0x03412 (Tower Underside Fourth EP) - True - True
 159542 - 0x038A6 (Tower Underside First EP) - True - True
 159543 - 0x038AA (Tower Underside Second EP) - True - True
-159545 - 0x03E40 (RGB House Green EP) - 0x334D8 & 0x03C0C & 0x03C08 - True
+159545 - 0x03E40 (RGB House Green EP) - 0x334D8 - True
 159546 - 0x28B8E (Maze Bridge Underside EP) - 0x2896A - True
 159552 - 0x03BCF (Black Line Redirect EP) - True - True
 159800 - 0xFFF80 (Pet the Dog) - True - True
@@ -557,7 +573,7 @@ Door - 0x3CCDF (Exit Right) - 0x33AB2
 159556 - 0x33A2A (Door EP) - 0x03553 - True
 159558 - 0x33B06 (Church EP) - 0x0354E - True
 
-Jungle (Jungle) - Main Island - True - Outside Jungle River - 0x3873B - Boat - 0x17CDF:
+Jungle (Jungle) - Main Island - True - The Ocean - 0x17CDF:
 158251 - 0x17CDF (Shore Boat Spawn) - True - Boat
 158609 - 0x17F9B (Discard) - True - Arrows
 158252 - 0x002C4 (First Row 1) - True - True
@@ -588,18 +604,21 @@ Door - 0x3873B (Laser Shortcut) - 0x337FA
 159350 - 0x035CB (Bamboo CCW EP) - True - True
 159351 - 0x035CF (Bamboo CW EP) - True - True
 
-Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A:
-158267 - 0x17CAA (Monastery Shortcut Panel) - True - True
-Door - 0x0CF2A (Monastery Shortcut) - 0x17CAA
-158663 - 0x15ADD (Vault) - True - Black/White Squares & Dots
-158664 - 0x03702 (Vault Box) - 0x15ADD - True
+Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A - River Vault - 0x15287:
+158267 - 0x17CAA (Monastery Garden Shortcut Panel) - True - True
+Door - 0x0CF2A (Monastery Garden Shortcut) - 0x17CAA
+158663 - 0x15ADD (Vault Panel) - True - Black/White Squares & Dots
+Door - 0x15287 (Vault Door) - 0x15ADD
 159110 - 0x03AC5 (Green Leaf Moss EP) - True - True
 159120 - 0x03BE2 (Monastery Garden Left EP) - 0x03750 - True
 159121 - 0x03BE3 (Monastery Garden Right EP) - True - True
 159122 - 0x0A409 (Monastery Wall EP) - True - True
 
+River Vault (River):
+158664 - 0x03702 (Vault Box) - True - True
+
 Outside Bunker (Bunker) - Main Island - True - Bunker - 0x0C2A4:
-158268 - 0x17C2E (Entry Panel) - True - Squares & Black/White Squares & Colored Squares
+158268 - 0x17C2E (Entry Panel) - True - Squares & Black/White Squares
 Door - 0x0C2A4 (Entry) - 0x17C2E
 
 Bunker (Bunker) - Bunker Glass Room - 0x17C79:
@@ -616,9 +635,9 @@ Bunker (Bunker) - Bunker Glass Room - 0x17C79:
 Door - 0x17C79 (Tinted Glass Door) - 0x0A099
 
 Bunker Glass Room (Bunker) - Bunker Ultraviolet Room - 0x0C2A3:
-158279 - 0x0A010 (Glass Room 1) - True - Squares & Colored Squares
-158280 - 0x0A01B (Glass Room 2) - 0x0A010 - Squares & Colored Squares & Black/White Squares
-158281 - 0x0A01F (Glass Room 3) - 0x0A01B - Squares & Colored Squares & Black/White Squares
+158279 - 0x0A010 (Glass Room 1) - 0x17C79 - Squares & Colored Squares
+158280 - 0x0A01B (Glass Room 2) - 0x17C79 & 0x0A010 - Squares & Colored Squares & Black/White Squares
+158281 - 0x0A01F (Glass Room 3) - 0x17C79 & 0x0A01B - Squares & Colored Squares & Black/White Squares
 Door - 0x0C2A3 (UV Room Entry) - 0x0A01F
 
 Bunker Ultraviolet Room (Bunker) - Bunker Elevator Section - 0x0A08D:
@@ -631,7 +650,7 @@ Door - 0x0A08D (Elevator Room Entry) - 0x17E67
 Bunker Elevator Section (Bunker) - Bunker Elevator - TrueOneWay:
 159311 - 0x035F5 (Tinted Door EP) - 0x17C79 - True
 
-Bunker Elevator (Bunker) - Bunker Laser Platform - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079:
+Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079:
 158286 - 0x0A079 (Elevator Control) - True - Colored Squares & Black/White Squares
 
 Bunker Green Room (Bunker) - Bunker Elevator - TrueOneWay:
@@ -676,7 +695,7 @@ Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat
 158316 - 0x00990 (Platform Row 4) - 0x0098F - Rotated Shapers
 Door - 0x184B7 (Between Bridges First Door) - 0x00990
 158317 - 0x17C0D (Platform Shortcut Left Panel) - True - Rotated Shapers
-158318 - 0x17C0E (Platform Shortcut Right Panel) - True - Rotated Shapers
+158318 - 0x17C0E (Platform Shortcut Right Panel) - 0x17C0D - Rotated Shapers
 Door - 0x38AE6 (Platform Shortcut Door) - 0x17C0E
 Door - 0x04B7F (Cyan Water Pump) - 0x00006
 
@@ -715,18 +734,21 @@ Swamp Rotating Bridge (Swamp) - Swamp Between Bridges Far - 0x181F5 - Swamp Near
 159331 - 0x016B2 (Rotating Bridge CCW EP) - 0x181F5 - True
 159334 - 0x036CE (Rotating Bridge CW EP) - 0x181F5 - True
 
-Swamp Near Boat (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Blue Underwater - 0x18482:
+Swamp Near Boat (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Blue Underwater - 0x18482 - Swamp Long Bridge - 0xFFD00 & 0xFFD02 - The Ocean - 0x09DB8:
+158903 - 0xFFD02 (Beyond Rotating Bridge Reached Independently) - True - True
 158328 - 0x09DB8 (Boat Spawn) - True - Boat
 158329 - 0x003B2 (Beyond Rotating Bridge 1) - 0x0000A - Shapers & Dots & Full Dots
 158330 - 0x00A1E (Beyond Rotating Bridge 2) - 0x003B2 - Rotated Shapers & Shapers & Dots & Full Dots
 158331 - 0x00C2E (Beyond Rotating Bridge 3) - 0x00A1E - Shapers & Dots & Full Dots
 158332 - 0x00E3A (Beyond Rotating Bridge 4) - 0x00C2E - Shapers & Dots & Full Dots
-158339 - 0x17E2B (Long Bridge Control) - True - Rotated Shapers & Shapers
 Door - 0x18482 (Blue Water Pump) - 0x00E3A
 159332 - 0x3365F (Boat EP) - 0x09DB8 - True
 159333 - 0x03731 (Long Bridge Side EP) - 0x17E2B - True
 
-Swamp Purple Area (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Purple Underwater - 0x0A1D6:
+Swamp Long Bridge (Swamp) - Swamp Near Boat - 0x17E2B - Outside Swamp - 0x17E2B:
+158339 - 0x17E2B (Long Bridge Control) - True - Rotated Shapers & Shapers
+
+Swamp Purple Area (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Purple Underwater - 0x0A1D6 - Swamp Near Boat - TrueOneWay:
 Door - 0x0A1D6 (Purple Water Pump) - 0x00E3A
 
 Swamp Purple Underwater (Swamp):
@@ -752,7 +774,7 @@ Laser - 0x00BF6 (Laser) - 0x03615
 158342 - 0x17C02 (Laser Shortcut Right Panel) - 0x17C05 - Shapers & Negative Shapers & Stars & Stars + Same Colored Symbol
 Door - 0x2D880 (Laser Shortcut) - 0x17C02
 
-Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309:
+Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309 - The Ocean - 0x17C95:
 158343 - 0x17C95 (Boat Spawn) - True - Boat
 158344 - 0x0288C (First Door Panel) - True - Stars & Stars + Same Colored Symbol & Triangles
 Door - 0x0C309 (First Door) - 0x0288C
@@ -778,7 +800,7 @@ Treehouse After Yellow Bridge (Treehouse) - Treehouse Junction - 0x0A181:
 Door - 0x0A181 (Third Door) - 0x0A182
 
 Treehouse Junction (Treehouse) - Treehouse Right Orange Bridge - True - Treehouse First Purple Bridge - True - Treehouse Green Bridge - True:
-158356 - 0x2700B (Laser House Door Timer Outside Control) - True - True
+158356 - 0x2700B (Laser House Door Timer Outside) - True - True
 
 Treehouse First Purple Bridge (Treehouse) - Treehouse Second Purple Bridge - 0x17D6C:
 158357 - 0x17DC8 (First Purple Bridge 1) - True - Stars & Dots & Full Dots
@@ -802,7 +824,7 @@ Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2:
 158402 - 0x17DA2 (Right Orange Bridge 12) - 0x17DB1 - Stars & Stars + Same Colored Symbol & Triangles
 
 Treehouse Bridge Platform (Treehouse) - Main Island - 0x0C32D:
-158404 - 0x037FF (Bridge Control) - True - Stars
+158404 - 0x037FF (Drawbridge Panel) - True - Stars
 Door - 0x0C32D (Drawbridge) - 0x037FF
 
 Treehouse Second Purple Bridge (Treehouse) - Treehouse Left Orange Bridge - 0x17DC6:
@@ -847,7 +869,7 @@ Treehouse Green Bridge Left House (Treehouse):
 159211 - 0x220A7 (Right Orange Bridge EP) - 0x17DA2 - True
 
 Treehouse Laser Room Front Platform (Treehouse) - Treehouse Laser Room - 0x0C323:
-Door - 0x0C323 (Laser House Entry) - 0x17DA2 & 0x2700B & 0x17DEC
+Door - 0x0C323 (Laser House Entry) - 0x17DA2 & 0x2700B & 0x17DEC | 0x17CBC
 
 Treehouse Laser Room Back Platform (Treehouse):
 158611 - 0x17FA0 (Laser Discard) - True - Arrows
@@ -860,19 +882,22 @@ Treehouse Laser Room (Treehouse):
 158403 - 0x17CBC (Laser House Door Timer Inside) - True - True
 Laser - 0x028A4 (Laser) - 0x03613
 
-Mountainside (Mountainside) - Main Island - True - Mountaintop - True:
+Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085:
 158612 - 0x17C42 (Discard) - True - Arrows
-158665 - 0x002A6 (Vault) - True - Symmetry & Colored Squares & Triangles & Stars & Stars + Same Colored Symbol
-158666 - 0x03542 (Vault Box) - 0x002A6 - True
+158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Squares & Triangles & Stars & Stars + Same Colored Symbol
+Door - 0x00085 (Vault Door) - 0x002A6
 159301 - 0x335AE (Cloud Cycle EP) - True - True
 159325 - 0x33505 (Bush EP) - True - True
 159335 - 0x03C07 (Apparent River EP) - True - True
 
+Mountainside Vault (Mountainside):
+158666 - 0x03542 (Vault Box) - True - True
+
 Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34:
 158405 - 0x0042D (River Shape) - True - True
 158406 - 0x09F7F (Box Short) - 7 Lasers - True
-158407 - 0x17C34 (Trap Door Triple Exit) - 0x09F7F - Stars & Black/White Squares & Stars + Same Colored Symbol & Triangles
-158800 - 0xFFF00 (Box Long) - 7 Lasers & 11 Lasers & 0x17C34 - True
+158407 - 0x17C34 (Mountain Entry Panel) - 0x09F7F - Stars & Black/White Squares & Stars + Same Colored Symbol & Triangles
+158800 - 0xFFF00 (Box Long) - 11 Lasers & 0x17C34 - True
 159300 - 0x001A3 (River Shape EP) - True - True
 159320 - 0x3370E (Arch Black EP) - True - True
 159324 - 0x336C8 (Arch White Right EP) - True - True
@@ -881,7 +906,7 @@ Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34:
 Mountain Top Layer (Mountain Floor 1) - Mountain Top Layer Bridge - 0x09E39:
 158408 - 0x09E39 (Light Bridge Controller) - True - Eraser & Triangles
 
-Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
+Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - TrueOneWay:
 158409 - 0x09E7A (Right Row 1) - True - Black/White Squares & Dots & Stars & Stars + Same Colored Symbol
 158410 - 0x09E71 (Right Row 2) - 0x09E7A - Black/White Squares & Triangles
 158411 - 0x09E72 (Right Row 3) - 0x09E71 - Black/White Squares & Shapers & Stars & Stars + Same Colored Symbol
@@ -899,6 +924,8 @@ Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 158423 - 0x09F6E (Back Row 3) - 0x33AF7 - Symmetry & Stars & Shapers & Stars + Same Colored Symbol
 158424 - 0x09EAD (Trash Pillar 1) - True - Rotated Shapers & Stars
 158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Rotated Shapers & Triangles
+
+Mountain Top Layer At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B
 
 Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Blue Bridge - 0x09E86 - Mountain Pink Bridge EP - TrueOneWay:
@@ -917,7 +944,7 @@ Door - 0x09EDD (Elevator Room Entry) - 0x09ED8 & 0x09E86
 Mountain Floor 2 Light Bridge Room Near (Mountain Floor 2):
 158431 - 0x09E86 (Light Bridge Controller Near) - True - Shapers & Dots
 
-Mountain Floor 2 Beyond Bridge (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Far - 0x09E07 - Mountain Pink Bridge EP - TrueOneWay:
+Mountain Floor 2 Beyond Bridge (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Far - 0x09E07 - Mountain Pink Bridge EP - TrueOneWay - Mountain Floor 2 - 0x09ED8:
 158432 - 0x09FCC (Far Row 1) - True - Triangles
 158433 - 0x09FCE (Far Row 2) - 0x09FCC - Black/White Squares & Stars & Stars + Same Colored Symbol
 158434 - 0x09FCF (Far Row 3) - 0x09FCE - Stars & Triangles & Stars + Same Colored Symbol
@@ -935,29 +962,27 @@ Mountain Floor 2 Elevator Room (Mountain Floor 2) - Mountain Floor 2 Elevator -
 Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Third Layer - 0x09EEB:
 158439 - 0x09EEB (Elevator Control Panel) - True - Dots
 
-Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89:
+Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay:
 158440 - 0x09FC1 (Giant Puzzle Bottom Left) - True - Shapers & Eraser & Negative Shapers
 158441 - 0x09F8E (Giant Puzzle Bottom Right) - True - Shapers & Eraser & Negative Shapers
 158442 - 0x09F01 (Giant Puzzle Top Right) - True - Shapers & Eraser & Negative Shapers
 158443 - 0x09EFF (Giant Puzzle Top Left) - True - Shapers & Eraser & Negative Shapers
 158444 - 0x09FDA (Giant Puzzle) - 0x09FC1 & 0x09F8E & 0x09F01 & 0x09EFF - Shapers & Symmetry
+159313 - 0x09D5D (Yellow Bridge EP) - 0x09E86 & 0x09ED8 - True
+159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True
 Door - 0x09F89 (Exit) - 0x09FDA
 
-Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Bottom Floor Rock - 0x17FA2 - Final Room - 0x0C141 - Mountain Pink Bridge EP - TrueOneWay:
+Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Final Room - 0x0C141:
 158614 - 0x17FA2 (Discard) - 0xFFF00 - Arrows
 158445 - 0x01983 (Final Room Entry Left) - True - Shapers & Stars
 158446 - 0x01987 (Final Room Entry Right) - True - Squares & Colored Squares & Dots
 Door - 0x0C141 (Final Room Entry) - 0x01983 & 0x01987
-159313 - 0x09D5D (Yellow Bridge EP) - 0x09E86 & 0x09ED8 - True
-159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True
+Door - 0x17F33 (Rock Open) - 0x17FA2 | 0x334E1
 
 Mountain Pink Bridge EP (Mountain Floor 2):
 159312 - 0x09D63 (Pink Bridge EP) - 0x09E39 - True
 
-Mountain Bottom Floor Rock (Mountain Bottom Floor) - Mountain Bottom Floor - 0x17F33 - Mountain Path to Caves - 0x17F33:
-Door - 0x17F33 (Rock Open) - True
-
-Mountain Path to Caves (Mountain Bottom Floor) - Mountain Bottom Floor Rock - 0x334E1 - Caves - 0x2D77D:
+Mountain Path to Caves (Mountain Bottom Floor) - Caves - 0x2D77D:
 158447 - 0x00FF8 (Caves Entry Panel) - True - Arrows & Black/White Squares
 Door - 0x2D77D (Caves Entry) - 0x00FF8
 158448 - 0x334E1 (Rock Control) - True - True
@@ -1021,31 +1046,34 @@ Path to Challenge (Caves) - Challenge - 0x0A19A:
 158477 - 0x0A16E (Challenge Entry Panel) - True - Stars & Arrows & Stars + Same Colored Symbol
 Door - 0x0A19A (Challenge Entry) - 0x0A16E
 
-Challenge (Challenge) - Tunnels - 0x0348A:
+Challenge (Challenge) - Tunnels - 0x0348A - Challenge Vault - 0x04D75:
 158499 - 0x0A332 (Start Timer) - 11 Lasers - True
 158500 - 0x0088E (Small Basic) - 0x0A332 - True
 158501 - 0x00BAF (Big Basic) - 0x0088E - True
-158502 - 0x00BF3 (Square) - 0x00BAF - Squares & Black/White Squares
+158502 - 0x00BF3 (Square) - 0x00BAF - Black/White Squares
 158503 - 0x00C09 (Maze Map) - 0x00BF3 - Dots
 158504 - 0x00CDB (Stars and Dots) - 0x00C09 - Stars & Dots
 158505 - 0x0051F (Symmetry) - 0x00CDB - Symmetry & Colored Dots & Dots
 158506 - 0x00524 (Stars and Shapers) - 0x0051F - Stars & Shapers
 158507 - 0x00CD4 (Big Basic 2) - 0x00524 - True
-158508 - 0x00CB9 (Choice Squares Right) - 0x00CD4 - Squares & Black/White Squares
-158509 - 0x00CA1 (Choice Squares Middle) - 0x00CD4 - Squares & Black/White Squares
-158510 - 0x00C80 (Choice Squares Left) - 0x00CD4 - Squares & Black/White Squares
-158511 - 0x00C68 (Choice Squares 2 Right) - 0x00CB9 | 0x00CA1 | 0x00C80 - Squares & Black/White Squares & Colored Squares
-158512 - 0x00C59 (Choice Squares 2 Middle) - 0x00CB9 | 0x00CA1 | 0x00C80 - Squares & Black/White Squares & Colored Squares
-158513 - 0x00C22 (Choice Squares 2 Left) - 0x00CB9 | 0x00CA1 | 0x00C80 - Squares & Black/White Squares & Colored Squares
+158508 - 0x00CB9 (Choice Squares Right) - 0x00CD4 - Black/White Squares
+158509 - 0x00CA1 (Choice Squares Middle) - 0x00CD4 - Black/White Squares
+158510 - 0x00C80 (Choice Squares Left) - 0x00CD4 - Black/White Squares
+158511 - 0x00C68 (Choice Squares 2 Right) - 0x00CB9 | 0x00CA1 | 0x00C80 - Black/White Squares & Colored Squares
+158512 - 0x00C59 (Choice Squares 2 Middle) - 0x00CB9 | 0x00CA1 | 0x00C80 - Black/White Squares & Colored Squares
+158513 - 0x00C22 (Choice Squares 2 Left) - 0x00CB9 | 0x00CA1 | 0x00C80 - Black/White Squares & Colored Squares
 158514 - 0x034F4 (Maze Hidden 1) - 0x00C68 | 0x00C59 | 0x00C22 - Triangles
 158515 - 0x034EC (Maze Hidden 2) - 0x00C68 | 0x00C59 | 0x00C22 - Triangles
 158516 - 0x1C31A (Dots Pillar) - 0x034F4 & 0x034EC - Dots & Symmetry
-158517 - 0x1C319 (Squares Pillar) - 0x034F4 & 0x034EC - Squares & Black/White Squares & Symmetry
-158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True
+158517 - 0x1C319 (Squares Pillar) - 0x034F4 & 0x034EC - Black/White Squares & Symmetry
+Door - 0x04D75 (Vault Door) - 0x1C31A & 0x1C319
 158518 - 0x039B4 (Tunnels Entry Panel) - True - Arrows
 Door - 0x0348A (Tunnels Entry) - 0x039B4
 159530 - 0x28B30 (Water EP) - True - True
 
+Challenge Vault (Challenge):
+158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True
+
 Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Lowest Level Inbetween Shortcuts - 0x27263 - Town - 0x09E87:
 158668 - 0x2FAF6 (Vault Box) - True - True
 158519 - 0x27732 (Theater Shortcut Panel) - True - True
@@ -1075,7 +1103,7 @@ Elevator (Mountain Final Room):
 158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True
 158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True
 
-Boat (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay:
+The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay:
 159042 - 0x22106 (Desert EP) - True - True
 159223 - 0x03B25 (Shipwreck CCW Underside EP) - True - True
 159231 - 0x28B29 (Shipwreck Green EP) - True - True
@@ -1093,32 +1121,38 @@ Obelisks (EPs) - Entry - True:
 159702 - 0xFFE02 (Desert Obelisk Side 3) - 0x3351D - True
 159703 - 0xFFE03 (Desert Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True
 159704 - 0xFFE04 (Desert Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True
+159709 - 0x00359 (Desert Obelisk) - True - True
 159710 - 0xFFE10 (Monastery Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True
 159711 - 0xFFE11 (Monastery Obelisk Side 2) - 0x03AC5 - True
 159712 - 0xFFE12 (Monastery Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True
 159713 - 0xFFE13 (Monastery Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True
 159714 - 0xFFE14 (Monastery Obelisk Side 5) - 0x03E01 - True
 159715 - 0xFFE15 (Monastery Obelisk Side 6) - 0x289F4 & 0x289F5 - True
+159719 - 0x00263 (Monastery Obelisk) - True - True
 159720 - 0xFFE20 (Treehouse Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True
 159721 - 0xFFE21 (Treehouse Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True
 159722 - 0xFFE22 (Treehouse Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True
 159723 - 0xFFE23 (Treehouse Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True
 159724 - 0xFFE24 (Treehouse Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True
 159725 - 0xFFE25 (Treehouse Obelisk Side 6) - 0x28AE9 & 0x3348F - True
+159729 - 0x00097 (Treehouse Obelisk) - True - True
 159730 - 0xFFE30 (River Obelisk Side 1) - 0x001A3 & 0x335AE - True
 159731 - 0xFFE31 (River Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True
 159732 - 0xFFE32 (River Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True
 159733 - 0xFFE33 (River Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True
 159734 - 0xFFE34 (River Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True
 159735 - 0xFFE35 (River Obelisk Side 6) - 0x035CB & 0x035CF - True
+159739 - 0x00367 (River Obelisk) - True - True
 159740 - 0xFFE40 (Quarry Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True
 159741 - 0xFFE41 (Quarry Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True
 159742 - 0xFFE42 (Quarry Obelisk Side 3) - 0x289CF & 0x289D1 - True
 159743 - 0xFFE43 (Quarry Obelisk Side 4) - 0x33692 - True
 159744 - 0xFFE44 (Quarry Obelisk Side 5) - 0x03E77 & 0x03E7C - True
+159749 - 0x22073 (Quarry Obelisk) - True - True
 159750 - 0xFFE50 (Town Obelisk Side 1) - 0x035C7 - True
 159751 - 0xFFE51 (Town Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True
 159752 - 0xFFE52 (Town Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True
 159753 - 0xFFE53 (Town Obelisk Side 4) - 0x28B30 & 0x035C9 - True
 159754 - 0xFFE54 (Town Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True
 159755 - 0xFFE55 (Town Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True
+159759 - 0x0A16C (Town Obelisk) - True - True
diff --git a/worlds/witness/WitnessLogicVanilla.txt b/worlds/witness/WitnessLogicVanilla.txt
index 84e73e68a5..779ead6bde 100644
--- a/worlds/witness/WitnessLogicVanilla.txt
+++ b/worlds/witness/WitnessLogicVanilla.txt
@@ -1,3 +1,5 @@
+Menu (Menu) - Entry - True:
+
 Entry (Entry):
 
 First Hallway (First Hallway) - Entry - True - First Hallway Room - 0x00064:
@@ -21,9 +23,9 @@ Tutorial (Tutorial) - Outside Tutorial - 0x03629:
 159513 - 0x33600 (Patio Flowers EP) - 0x0C373 - True
 159517 - 0x3352F (Gate EP) - 0x03505 - True
 
-Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2:
-158650 - 0x033D4 (Vault) - True - Dots & Black/White Squares
-158651 - 0x03481 (Vault Box) - 0x033D4 - True
+Outside Tutorial (Outside Tutorial) - Outside Tutorial Path To Outpost - 0x03BA2 - Outside Tutorial Vault - 0x033D0:
+158650 - 0x033D4 (Vault Panel) - True - Dots & Black/White Squares
+Door - 0x033D0 (Vault Door) - 0x033D4
 158013 - 0x0005D (Shed Row 1) - True - Dots
 158014 - 0x0005E (Shed Row 2) - 0x0005D - Dots
 158015 - 0x0005F (Shed Row 3) - 0x0005E - Dots
@@ -44,6 +46,9 @@ Door - 0x03BA2 (Outpost Path) - 0x0A3B5
 159516 - 0x334A3 (Path EP) - True - True
 159500 - 0x035C7 (Tractor EP) - True - True
 
+Outside Tutorial Vault (Outside Tutorial):
+158651 - 0x03481 (Vault Box) - True - True
+
 Outside Tutorial Path To Outpost (Outside Tutorial) - Outside Tutorial Outpost - 0x0A170:
 158011 - 0x0A171 (Outpost Entry Panel) - True - Dots & Full Dots
 Door - 0x0A170 (Outpost Entry) - 0x0A171
@@ -54,6 +59,7 @@ Door - 0x04CA3 (Outpost Exit) - 0x04CA4
 158600 - 0x17CFB (Discard) - True - Triangles
 
 Main Island (Main Island) - Outside Tutorial - True:
+159801 - 0xFFD00 (Reached Independently) - True - True
 159550 - 0x28B91 (Thundercloud EP) - 0x09F98 & 0x012FB - True
 
 Outside Glass Factory (Glass Factory) - Main Island - True - Inside Glass Factory - 0x01A29:
@@ -76,7 +82,7 @@ Inside Glass Factory (Glass Factory) - Inside Glass Factory Behind Back Wall - 0
 158038 - 0x0343A (Melting 3) - 0x00082 - Symmetry
 Door - 0x0D7ED (Back Wall) - 0x0005C
 
-Inside Glass Factory Behind Back Wall (Glass Factory) - Boat - 0x17CC8:
+Inside Glass Factory Behind Back Wall (Glass Factory) - The Ocean - 0x17CC8:
 158039 - 0x17CC8 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat
 
 Outside Symmetry Island (Symmetry Island) - Main Island - True - Symmetry Island Lower - 0x17F3E:
@@ -112,12 +118,12 @@ Door - 0x18269 (Upper) - 0x1C349
 159000 - 0x0332B (Glass Factory Black Line Reflection EP) - True - True
 
 Symmetry Island Upper (Symmetry Island):
-158065 - 0x00A52 (Yellow 1) - True - Symmetry & Colored Dots
-158066 - 0x00A57 (Yellow 2) - 0x00A52 - Symmetry & Colored Dots
-158067 - 0x00A5B (Yellow 3) - 0x00A57 - Symmetry & Colored Dots
-158068 - 0x00A61 (Blue 1) - 0x00A52 - Symmetry & Colored Dots
-158069 - 0x00A64 (Blue 2) - 0x00A61 & 0x00A52 - Symmetry & Colored Dots
-158070 - 0x00A68 (Blue 3) - 0x00A64 & 0x00A57 - Symmetry & Colored Dots
+158065 - 0x00A52 (Laser Yellow 1) - True - Symmetry & Colored Dots
+158066 - 0x00A57 (Laser Yellow 2) - 0x00A52 - Symmetry & Colored Dots
+158067 - 0x00A5B (Laser Yellow 3) - 0x00A57 - Symmetry & Colored Dots
+158068 - 0x00A61 (Laser Blue 1) - 0x00A52 - Symmetry & Colored Dots
+158069 - 0x00A64 (Laser Blue 2) - 0x00A61 & 0x00A57 - Symmetry & Colored Dots
+158070 - 0x00A68 (Laser Blue 3) - 0x00A64 & 0x00A5B - Symmetry & Colored Dots
 158700 - 0x0360D (Laser Panel) - 0x00A68 - True
 Laser - 0x00509 (Laser) - 0x0360D
 159001 - 0x03367 (Glass Factory Black Line EP) - True - True
@@ -135,9 +141,9 @@ Door - 0x03313 (Second Gate) - 0x032FF
 
 Orchard End (Orchard):
 
-Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE:
-158652 - 0x0CC7B (Vault) - True - Dots & Shapers & Rotated Shapers & Negative Shapers & Full Dots
-158653 - 0x0339E (Vault Box) - 0x0CC7B - True
+Desert Outside (Desert) - Main Island - True - Desert Floodlight Room - 0x09FEE - Desert Vault - 0x03444:
+158652 - 0x0CC7B (Vault Panel) - True - Dots & Shapers & Rotated Shapers & Negative Shapers & Full Dots
+Door - 0x03444 (Vault Door) - 0x0CC7B
 158602 - 0x17CE7 (Discard) - True - Triangles
 158076 - 0x00698 (Surface 1) - True - True
 158077 - 0x0048F (Surface 2) - 0x00698 - True
@@ -163,6 +169,9 @@ Laser - 0x012FB (Laser) - 0x03608
 159040 - 0x334B9 (Shore EP) - True - True
 159041 - 0x334BC (Island EP) - True - True
 
+Desert Vault (Desert):
+158653 - 0x0339E (Vault Box) - True - True
+
 Desert Floodlight Room (Desert) - Desert Pond Room - 0x0C2C3:
 158087 - 0x09FAA (Light Control) - True - True
 158088 - 0x00422 (Light Room 1) - 0x09FAA - True
@@ -199,18 +208,19 @@ Desert Water Levels Room (Desert) - Desert Elevator Room - 0x0C316:
 Door - 0x0C316 (Elevator Room Entry) - 0x18076
 159034 - 0x337F8 (Flood Room EP) - 0x1C2DF - True
 
-Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x012FB:
+Desert Elevator Room (Desert) - Desert Lowest Level Inbetween Shortcuts - 0x01317:
 158111 - 0x17C31 (Final Transparent) - True - True
 158113 - 0x012D7 (Final Hexagonal) - 0x17C31 & 0x0A015 - True
 158114 - 0x0A015 (Final Hexagonal Control) - 0x17C31 - True
 158115 - 0x0A15C (Final Bent 1) - True - True
 158116 - 0x09FFF (Final Bent 2) - 0x0A15C - True
 158117 - 0x0A15F (Final Bent 3) - 0x09FFF - True
-159035 - 0x037BB (Elevator EP) - 0x012FB - True
+159035 - 0x037BB (Elevator EP) - 0x01317 - True
+Door - 0x01317 (Elevator) - 0x03608
 
 Desert Lowest Level Inbetween Shortcuts (Desert):
 
-Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - TrueOneWay:
+Outside Quarry (Quarry) - Main Island - True - Quarry Between Entrys - 0x09D6F - Quarry Elevator - 0xFFD00 & 0xFFD01:
 158118 - 0x09E57 (Entry 1 Panel) - True - Black/White Squares
 158603 - 0x17CF0 (Discard) - True - Triangles
 158702 - 0x03612 (Laser Panel) - 0x0A3D0 & 0x0367C - Eraser & Shapers
@@ -222,7 +232,7 @@ Door - 0x09D6F (Entry 1) - 0x09E57
 159420 - 0x289CF (Rock Line EP) - True - True
 159421 - 0x289D1 (Rock Line Reflection EP) - True - True
 
-Quarry Elevator (Quarry):
+Quarry Elevator (Quarry) - Outside Quarry - 0x17CC4 - Quarry - 0x17CC4:
 158120 - 0x17CC4 (Elevator Control) - 0x0367C - Dots & Eraser
 159403 - 0x17CB9 (Railroad EP) - 0x17CC4 - True
 
@@ -230,28 +240,31 @@ Quarry Between Entrys (Quarry) - Quarry - 0x17C07:
 158119 - 0x17C09 (Entry 2 Panel) - True - Shapers
 Door - 0x17C07 (Entry 2) - 0x17C09
 
-Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010 - Quarry Elevator - 0x17CC4:
+Quarry (Quarry) - Quarry Stoneworks Ground Floor - 0x02010:
+159802 - 0xFFD01 (Inside Reached Independently) - True - True
 158121 - 0x01E5A (Stoneworks Entry Left Panel) - True - Black/White Squares
 158122 - 0x01E59 (Stoneworks Entry Right Panel) - True - Dots
 Door - 0x02010 (Stoneworks Entry) - 0x01E59 & 0x01E5A
 
-Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8:
+Quarry Stoneworks Ground Floor (Quarry Stoneworks) - Quarry - 0x275FF - Quarry Stoneworks Middle Floor - 0x03678 - Outside Quarry - 0x17CE8 - Quarry Stoneworks Lift - TrueOneWay:
 158123 - 0x275ED (Side Exit Panel) - True - True
 Door - 0x275FF (Side Exit) - 0x275ED
 158124 - 0x03678 (Lower Ramp Control) - True - Dots & Eraser
 158145 - 0x17CAC (Roof Exit Panel) - True - True
 Door - 0x17CE8 (Roof Exit) - 0x17CAC
 
-Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Ground Floor - 0x03675 - Quarry Stoneworks Upper Floor - 0x03679:
+Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Lift - TrueOneWay:
 158125 - 0x00E0C (Lower Row 1) - True - Dots & Eraser
 158126 - 0x01489 (Lower Row 2) - 0x00E0C - Dots & Eraser
 158127 - 0x0148A (Lower Row 3) - 0x01489 - Dots & Eraser
-158128 - 0x014D9 (Lower Row 4) - 0x0148A - Dots & Eraser
+158128 - 0x014D9 (Lower Row 4) - 0x0148A - Dots & Full Dots & Eraser
 158129 - 0x014E7 (Lower Row 5) - 0x014D9 - Dots
 158130 - 0x014E8 (Lower Row 6) - 0x014E7 - Dots & Eraser
+
+Quarry Stoneworks Lift (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03679 - Quarry Stoneworks Ground Floor - 0x03679 - Quarry Stoneworks Upper Floor - 0x03679:
 158131 - 0x03679 (Lower Lift Control) - 0x014E8 - Dots & Eraser
 
-Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Floor - 0x03676 & 0x03679 - Quarry Stoneworks Ground Floor - 0x0368A:
+Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Lift - 0x03675 - Quarry Stoneworks Ground Floor - 0x0368A:
 158132 - 0x03676 (Upper Ramp Control) - True - Dots & Eraser
 158133 - 0x03675 (Upper Lift Control) - True - Dots & Eraser
 158134 - 0x00557 (Upper Row 1) - True - Colored Squares & Eraser
@@ -262,7 +275,7 @@ Quarry Stoneworks Upper Floor (Quarry Stoneworks) - Quarry Stoneworks Middle Flo
 158139 - 0x3C12D (Upper Row 6) - 0x0146C - Colored Squares & Eraser
 158140 - 0x03686 (Upper Row 7) - 0x3C12D - Colored Squares & Eraser
 158141 - 0x014E9 (Upper Row 8) - 0x03686 - Colored Squares & Eraser
-158142 - 0x03677 (Stair Control) - True - Colored Squares & Eraser
+158142 - 0x03677 (Stairs Panel) - True - Colored Squares & Eraser
 Door - 0x0368A (Stairs) - 0x03677
 158143 - 0x3C125 (Control Room Left) - 0x014E9 - Black/White Squares & Dots & Eraser
 158144 - 0x0367C (Control Room Right) - 0x014E9 - Colored Squares & Dots & Eraser
@@ -277,7 +290,7 @@ Quarry Boathouse (Quarry Boathouse) - Quarry - True - Quarry Boathouse Upper Fro
 Door - 0x2769B (Dock) - 0x17CA6
 Door - 0x27163 (Dock Invis Barrier) - 0x17CA6
 
-Quarry Boathouse Behind Staircase (Quarry Boathouse) - Boat - 0x17CA6:
+Quarry Boathouse Behind Staircase (Quarry Boathouse) - The Ocean - 0x17CA6:
 
 Quarry Boathouse Upper Front (Quarry Boathouse) - Quarry Boathouse Upper Middle - 0x17C50:
 158149 - 0x021B3 (Front Row 1) - True - Shapers & Eraser
@@ -294,9 +307,9 @@ Quarry Boathouse Upper Middle (Quarry Boathouse) - Quarry Boathouse Upper Back -
 Quarry Boathouse Upper Back (Quarry Boathouse) - Quarry Boathouse Upper Middle - 0x3865F:
 158155 - 0x38663 (Second Barrier Panel) - True - True
 Door - 0x3865F (Second Barrier) - 0x38663
-158156 - 0x021B5 (Back First Row 1) - True - Stars & Stars + Same Colored Symbol & Eraser
+158156 - 0x021B5 (Back First Row 1) - True - Stars & Eraser
 158157 - 0x021B6 (Back First Row 2) - 0x021B5 - Stars & Stars + Same Colored Symbol & Eraser
-158158 - 0x021B7 (Back First Row 3) - 0x021B6 - Stars & Stars + Same Colored Symbol & Eraser
+158158 - 0x021B7 (Back First Row 3) - 0x021B6 - Stars & Eraser
 158159 - 0x021BB (Back First Row 4) - 0x021B7 - Stars & Stars + Same Colored Symbol & Eraser
 158160 - 0x09DB5 (Back First Row 5) - 0x021BB - Stars & Stars + Same Colored Symbol & Eraser
 158161 - 0x09DB1 (Back First Row 6) - 0x09DB5 - Stars & Stars + Same Colored Symbol & Eraser
@@ -309,9 +322,9 @@ Door - 0x3865F (Second Barrier) - 0x38663
 158169 - 0x0A3D0 (Back Second Row 3) - 0x0A3CC - Stars & Eraser & Shapers
 159401 - 0x005F6 (Hook EP) - 0x275FA & 0x03852 & 0x3865F - True
 
-Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 & 0x19665:
+Shadows (Shadows) - Main Island - True - Shadows Ledge - 0x19B24 - Shadows Laser Room - 0x194B2 | 0x19665:
 158170 - 0x334DB (Door Timer Outside) - True - True
-Door - 0x19B24 (Timed Door) - 0x334DB
+Door - 0x19B24 (Timed Door) - 0x334DB | 0x334DC
 158171 - 0x0AC74 (Intro 6) - 0x0A8DC - True
 158172 - 0x0AC7A (Intro 7) - 0x0AC74 - True
 158173 - 0x0A8E0 (Intro 8) - 0x0AC7A - True
@@ -336,7 +349,7 @@ Shadows Ledge (Shadows) - Shadows - 0x1855B - Quarry - 0x19865 & 0x0A2DF:
 158187 - 0x334DC (Door Timer Inside) - True - True
 158188 - 0x198B5 (Intro 1) - True - True
 158189 - 0x198BD (Intro 2) - 0x198B5 - True
-158190 - 0x198BF (Intro 3) - 0x198BD & 0x334DC & 0x19B24 - True
+158190 - 0x198BF (Intro 3) - 0x198BD & 0x19B24 - True
 Door - 0x19865 (Quarry Barrier) - 0x198BF
 Door - 0x0A2DF (Quarry Barrier 2) - 0x198BF
 158191 - 0x19771 (Intro 4) - 0x198BF - True
@@ -345,7 +358,7 @@ Door - 0x1855B (Ledge Barrier) - 0x0A8DC
 Door - 0x19ADE (Ledge Barrier 2) - 0x0A8DC
 
 Shadows Laser Room (Shadows):
-158703 - 0x19650 (Laser Panel) - True - True
+158703 - 0x19650 (Laser Panel) - 0x194B2 & 0x19665 - True
 Laser - 0x181B3 (Laser) - 0x19650
 
 Treehouse Beach (Treehouse Beach) - Main Island - True:
@@ -395,9 +408,9 @@ Door - 0x01D40 (Pressure Plates 4 Exit) - 0x01D3F
 158205 - 0x09E49 (Shadows Shortcut Panel) - True - True
 Door - 0x09E3D (Shadows Shortcut) - 0x09E49
 
-Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True:
-158654 - 0x00AFB (Vault) - True - Symmetry & Sound Dots & Colored Dots
-158655 - 0x03535 (Vault Box) - 0x00AFB - True
+Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True - Shipwreck Vault - 0x17BB4:
+158654 - 0x00AFB (Vault Panel) - True - Symmetry & Sound Dots & Colored Dots
+Door - 0x17BB4 (Vault Door) - 0x00AFB
 158605 - 0x17D28 (Discard) - True - Triangles
 159220 - 0x03B22 (Circle Far EP) - True - True
 159221 - 0x03B23 (Circle Left EP) - True - True
@@ -407,14 +420,17 @@ Shipwreck (Shipwreck) - Keep 3rd Pressure Plate - True:
 159226 - 0x28ABE (Rope Outer EP) - True - True
 159230 - 0x3388F (Couch EP) - 0x17CDF | 0x0A054 - True
 
+Shipwreck Vault (Shipwreck):
+158655 - 0x03535 (Vault Box) - True - True
+
 Keep Tower (Keep) - Keep - 0x04F8F:
 158206 - 0x0361B (Tower Shortcut Panel) - True - True
 Door - 0x04F8F (Tower Shortcut) - 0x0361B
 158704 - 0x0360E (Laser Panel Hedges) - 0x01A0F & 0x019E7 & 0x019DC & 0x00139 - True
-158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Shapers & Black/White Squares & Rotated Shapers
+158705 - 0x03317 (Laser Panel Pressure Plates) - 0x033EA & 0x01BE9 & 0x01CD3 & 0x01D3F - Dots & Shapers & Black/White Squares & Rotated Shapers
 Laser - 0x014BB (Laser) - 0x0360E | 0x03317
 159240 - 0x033BE (Pressure Plates 1 EP) - 0x033EA - True
-159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 - True
+159241 - 0x033BF (Pressure Plates 2 EP) - 0x01BE9 & 0x01BEA - True
 159242 - 0x033DD (Pressure Plates 3 EP) - 0x01CD3 & 0x01CD5 - True
 159243 - 0x033E5 (Pressure Plates 4 Left Exit EP) - 0x01D3F - True
 159244 - 0x018B6 (Pressure Plates 4 Right Exit EP) - 0x01D3F - True
@@ -422,8 +438,8 @@ Laser - 0x014BB (Laser) - 0x0360E | 0x03317
 159251 - 0x3348F (Hedges EP) - True - True
 
 Outside Monastery (Monastery) - Main Island - True - Inside Monastery - 0x0C128 & 0x0C153 - Monastery Garden - 0x03750:
-158207 - 0x03713 (Shortcut Panel) - True - True
-Door - 0x0364E (Shortcut) - 0x03713
+158207 - 0x03713 (Laser Shortcut Panel) - True - True
+Door - 0x0364E (Laser Shortcut) - 0x03713
 158208 - 0x00B10 (Entry Left) - True - True
 158209 - 0x00C92 (Entry Right) - True - True
 Door - 0x0C128 (Entry Inner) - 0x00B10
@@ -454,7 +470,7 @@ Inside Monastery (Monastery):
 
 Monastery Garden (Monastery):
 
-Town (Town) - Main Island - True - Boat - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9:
+Town (Town) - Main Island - True - The Ocean - 0x0A054 - Town Maze Rooftop - 0x28AA2 - Town Church - True - Town Wooden Rooftop - 0x034F5 - RGB House - 0x28A61 - Windmill Interior - 0x1845B - Town Inside Cargo Box - 0x0A0C9:
 158218 - 0x0A054 (Boat Spawn) - 0x17CA6 | 0x17CDF | 0x09DB8 | 0x17C95 - Boat
 158219 - 0x0A0C8 (Cargo Box Entry Panel) - True - Black/White Squares & Shapers
 Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8
@@ -469,11 +485,11 @@ Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8
 158238 - 0x28AC0 (Wooden Roof Lower Row 4) - 0x28ABF - Rotated Shapers & Dots & Full Dots
 158239 - 0x28AC1 (Wooden Roof Lower Row 5) - 0x28AC0 - Rotated Shapers & Dots & Full Dots
 Door - 0x034F5 (Wooden Roof Stairs) - 0x28AC1
-158225 - 0x28998 (Tinted Glass Door Panel) - True - Stars & Rotated Shapers
-Door - 0x28A61 (Tinted Glass Door) - 0x28998
+158225 - 0x28998 (RGB House Entry Panel) - True - Stars & Rotated Shapers
+Door - 0x28A61 (RGB House Entry) - 0x28998
 158226 - 0x28A0D (Church Entry Panel) - 0x28A61 - Stars
 Door - 0x03BB0 (Church Entry) - 0x28A0D
-158228 - 0x28A79 (Maze Stair Control) - True - True
+158228 - 0x28A79 (Maze Panel) - True - True
 Door - 0x28AA2 (Maze Stairs) - 0x28A79
 158241 - 0x17F5F (Windmill Entry Panel) - True - Dots
 Door - 0x1845B (Windmill Entry) - 0x17F5F
@@ -500,13 +516,13 @@ Town Red Rooftop (Town):
 158607 - 0x17C71 (Rooftop Discard) - True - Triangles
 158230 - 0x28AC7 (Red Rooftop 1) - True - Symmetry & Black/White Squares
 158231 - 0x28AC8 (Red Rooftop 2) - 0x28AC7 - Symmetry & Black/White Squares
-158232 - 0x28ACA (Red Rooftop 3) - 0x28AC8 - Symmetry & Black/White Squares & Dots
+158232 - 0x28ACA (Red Rooftop 3) - 0x28AC8 - Symmetry & Black/White Squares
 158233 - 0x28ACB (Red Rooftop 4) - 0x28ACA - Symmetry & Black/White Squares & Dots
 158234 - 0x28ACC (Red Rooftop 5) - 0x28ACB - Symmetry & Black/White Squares & Dots
 158224 - 0x28B39 (Tall Hexagonal) - 0x079DF - True
 
 Town Wooden Rooftop (Town):
-158240 - 0x28AD9 (Wooden Rooftop) - 0x28AC1 - Rotated Shapers & Dots & Eraser & Full Dots
+158240 - 0x28AD9 (Wooden Rooftop) - 0x28AC1 - Shapers & Dots & Eraser & Full Dots
 
 Town Church (Town):
 158227 - 0x28A69 (Church Lattice) - 0x03BB0 - True
@@ -557,7 +573,7 @@ Door - 0x3CCDF (Exit Right) - 0x33AB2
 159556 - 0x33A2A (Door EP) - 0x03553 - True
 159558 - 0x33B06 (Church EP) - 0x0354E - True
 
-Jungle (Jungle) - Main Island - True - Outside Jungle River - 0x3873B - Boat - 0x17CDF:
+Jungle (Jungle) - Main Island - True - The Ocean - 0x17CDF:
 158251 - 0x17CDF (Shore Boat Spawn) - True - Boat
 158609 - 0x17F9B (Discard) - True - Triangles
 158252 - 0x002C4 (First Row 1) - True - True
@@ -588,18 +604,21 @@ Door - 0x3873B (Laser Shortcut) - 0x337FA
 159350 - 0x035CB (Bamboo CCW EP) - True - True
 159351 - 0x035CF (Bamboo CW EP) - True - True
 
-Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A:
-158267 - 0x17CAA (Monastery Shortcut Panel) - True - True
-Door - 0x0CF2A (Monastery Shortcut) - 0x17CAA
-158663 - 0x15ADD (Vault) - True - Black/White Squares & Dots
-158664 - 0x03702 (Vault Box) - 0x15ADD - True
+Outside Jungle River (River) - Main Island - True - Monastery Garden - 0x0CF2A - River Vault - 0x15287:
+158267 - 0x17CAA (Monastery Garden Shortcut Panel) - True - True
+Door - 0x0CF2A (Monastery Garden Shortcut) - 0x17CAA
+158663 - 0x15ADD (Vault Panel) - True - Black/White Squares & Dots
+Door - 0x15287 (Vault Door) - 0x15ADD
 159110 - 0x03AC5 (Green Leaf Moss EP) - True - True
 159120 - 0x03BE2 (Monastery Garden Left EP) - 0x03750 - True
 159121 - 0x03BE3 (Monastery Garden Right EP) - True - True
 159122 - 0x0A409 (Monastery Wall EP) - True - True
 
+River Vault (River):
+158664 - 0x03702 (Vault Box) - True - True
+
 Outside Bunker (Bunker) - Main Island - True - Bunker - 0x0C2A4:
-158268 - 0x17C2E (Entry Panel) - True - Black/White Squares & Colored Squares
+158268 - 0x17C2E (Entry Panel) - True - Black/White Squares
 Door - 0x0C2A4 (Entry) - 0x17C2E
 
 Bunker (Bunker) - Bunker Glass Room - 0x17C79:
@@ -616,9 +635,9 @@ Bunker (Bunker) - Bunker Glass Room - 0x17C79:
 Door - 0x17C79 (Tinted Glass Door) - 0x0A099
 
 Bunker Glass Room (Bunker) - Bunker Ultraviolet Room - 0x0C2A3:
-158279 - 0x0A010 (Glass Room 1) - True - Colored Squares
-158280 - 0x0A01B (Glass Room 2) - 0x0A010 - Colored Squares & Black/White Squares
-158281 - 0x0A01F (Glass Room 3) - 0x0A01B - Colored Squares & Black/White Squares
+158279 - 0x0A010 (Glass Room 1) - 0x17C79 - Colored Squares
+158280 - 0x0A01B (Glass Room 2) - 0x17C79 & 0x0A010 - Colored Squares & Black/White Squares
+158281 - 0x0A01F (Glass Room 3) - 0x17C79 & 0x0A01B - Colored Squares & Black/White Squares
 Door - 0x0C2A3 (UV Room Entry) - 0x0A01F
 
 Bunker Ultraviolet Room (Bunker) - Bunker Elevator Section - 0x0A08D:
@@ -631,7 +650,7 @@ Door - 0x0A08D (Elevator Room Entry) - 0x17E67
 Bunker Elevator Section (Bunker) - Bunker Elevator - TrueOneWay:
 159311 - 0x035F5 (Tinted Door EP) - 0x17C79 - True
 
-Bunker Elevator (Bunker) - Bunker Laser Platform - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079:
+Bunker Elevator (Bunker) - Bunker Elevator Section - 0x0A079 - Bunker Green Room - 0x0A079 - Bunker Laser Platform - 0x0A079 - Outside Bunker - 0x0A079:
 158286 - 0x0A079 (Elevator Control) - True - Colored Squares & Black/White Squares
 
 Bunker Green Room (Bunker) - Bunker Elevator - TrueOneWay:
@@ -676,7 +695,7 @@ Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat
 158316 - 0x00990 (Platform Row 4) - 0x0098F - Shapers
 Door - 0x184B7 (Between Bridges First Door) - 0x00990
 158317 - 0x17C0D (Platform Shortcut Left Panel) - True - Shapers
-158318 - 0x17C0E (Platform Shortcut Right Panel) - True - Shapers
+158318 - 0x17C0E (Platform Shortcut Right Panel) - 0x17C0D - Shapers
 Door - 0x38AE6 (Platform Shortcut Door) - 0x17C0E
 Door - 0x04B7F (Cyan Water Pump) - 0x00006
 
@@ -715,18 +734,21 @@ Swamp Rotating Bridge (Swamp) - Swamp Between Bridges Far - 0x181F5 - Swamp Near
 159331 - 0x016B2 (Rotating Bridge CCW EP) - 0x181F5 - True
 159334 - 0x036CE (Rotating Bridge CW EP) - 0x181F5 - True
 
-Swamp Near Boat (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Blue Underwater - 0x18482:
+Swamp Near Boat (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Blue Underwater - 0x18482 - Swamp Long Bridge - 0xFFD00 & 0xFFD02 - The Ocean - 0x09DB8:
+158903 - 0xFFD02 (Beyond Rotating Bridge Reached Independently) - True - True
 158328 - 0x09DB8 (Boat Spawn) - True - Boat
 158329 - 0x003B2 (Beyond Rotating Bridge 1) - 0x0000A - Rotated Shapers
 158330 - 0x00A1E (Beyond Rotating Bridge 2) - 0x003B2 - Rotated Shapers
 158331 - 0x00C2E (Beyond Rotating Bridge 3) - 0x00A1E - Rotated Shapers & Shapers
-158332 - 0x00E3A (Beyond Rotating Bridge 4) - 0x00C2E - Rotated Shapers
-158339 - 0x17E2B (Long Bridge Control) - True - Rotated Shapers & Shapers
+158332 - 0x00E3A (Beyond Rotating Bridge 4) - 0x00C2E - Rotated Shapers & Shapers
 Door - 0x18482 (Blue Water Pump) - 0x00E3A
 159332 - 0x3365F (Boat EP) - 0x09DB8 - True
 159333 - 0x03731 (Long Bridge Side EP) - 0x17E2B - True
 
-Swamp Purple Area (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Purple Underwater - 0x0A1D6:
+Swamp Long Bridge (Swamp) - Swamp Near Boat - 0x17E2B - Outside Swamp - 0x17E2B:
+158339 - 0x17E2B (Long Bridge Control) - True - Rotated Shapers & Shapers
+
+Swamp Purple Area (Swamp) - Swamp Rotating Bridge - TrueOneWay - Swamp Purple Underwater - 0x0A1D6 - Swamp Near Boat - TrueOneWay:
 Door - 0x0A1D6 (Purple Water Pump) - 0x00E3A
 
 Swamp Purple Underwater (Swamp):
@@ -752,7 +774,7 @@ Laser - 0x00BF6 (Laser) - 0x03615
 158342 - 0x17C02 (Laser Shortcut Right Panel) - 0x17C05 - Shapers & Negative Shapers & Rotated Shapers
 Door - 0x2D880 (Laser Shortcut) - 0x17C02
 
-Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309:
+Treehouse Entry Area (Treehouse) - Treehouse Between Doors - 0x0C309 - The Ocean - 0x17C95:
 158343 - 0x17C95 (Boat Spawn) - True - Boat
 158344 - 0x0288C (First Door Panel) - True - Stars
 Door - 0x0C309 (First Door) - 0x0288C
@@ -778,7 +800,7 @@ Treehouse After Yellow Bridge (Treehouse) - Treehouse Junction - 0x0A181:
 Door - 0x0A181 (Third Door) - 0x0A182
 
 Treehouse Junction (Treehouse) - Treehouse Right Orange Bridge - True - Treehouse First Purple Bridge - True - Treehouse Green Bridge - True:
-158356 - 0x2700B (Laser House Door Timer Outside Control) - True - True
+158356 - 0x2700B (Laser House Door Timer Outside) - True - True
 
 Treehouse First Purple Bridge (Treehouse) - Treehouse Second Purple Bridge - 0x17D6C:
 158357 - 0x17DC8 (First Purple Bridge 1) - True - Stars & Dots
@@ -802,7 +824,7 @@ Treehouse Right Orange Bridge (Treehouse) - Treehouse Bridge Platform - 0x17DA2:
 158402 - 0x17DA2 (Right Orange Bridge 12) - 0x17DB1 - Stars
 
 Treehouse Bridge Platform (Treehouse) - Main Island - 0x0C32D:
-158404 - 0x037FF (Bridge Control) - True - Stars
+158404 - 0x037FF (Drawbridge Panel) - True - Stars
 Door - 0x0C32D (Drawbridge) - 0x037FF
 
 Treehouse Second Purple Bridge (Treehouse) - Treehouse Left Orange Bridge - 0x17DC6:
@@ -837,7 +859,7 @@ Treehouse Green Bridge (Treehouse) - Treehouse Green Bridge Front House - 0x17E6
 158371 - 0x17E4F (Green Bridge 3) - 0x17E4D - Stars & Shapers & Rotated Shapers
 158372 - 0x17E52 (Green Bridge 4 & Directional) - 0x17E4F - Stars & Rotated Shapers
 158373 - 0x17E5B (Green Bridge 5) - 0x17E52 - Stars & Shapers & Stars + Same Colored Symbol
-158374 - 0x17E5F (Green Bridge 6) - 0x17E5B - Stars & Shapers & Negative Shapers & Stars + Same Colored Symbol & Rotated Shapers
+158374 - 0x17E5F (Green Bridge 6) - 0x17E5B - Stars & Negative Shapers & Rotated Shapers
 158375 - 0x17E61 (Green Bridge 7) - 0x17E5F - Stars & Shapers & Rotated Shapers
 
 Treehouse Green Bridge Front House (Treehouse):
@@ -847,7 +869,7 @@ Treehouse Green Bridge Left House (Treehouse):
 159211 - 0x220A7 (Right Orange Bridge EP) - 0x17DA2 - True
 
 Treehouse Laser Room Front Platform (Treehouse) - Treehouse Laser Room - 0x0C323:
-Door - 0x0C323 (Laser House Entry) - 0x17DA2 & 0x2700B & 0x17DDB
+Door - 0x0C323 (Laser House Entry) - 0x17DA2 & 0x2700B & 0x17DDB | 0x17CBC
 
 Treehouse Laser Room Back Platform (Treehouse):
 158611 - 0x17FA0 (Laser Discard) - True - Triangles
@@ -860,19 +882,22 @@ Treehouse Laser Room (Treehouse):
 158403 - 0x17CBC (Laser House Door Timer Inside) - True - True
 Laser - 0x028A4 (Laser) - 0x03613
 
-Mountainside (Mountainside) - Main Island - True - Mountaintop - True:
+Mountainside (Mountainside) - Main Island - True - Mountaintop - True - Mountainside Vault - 0x00085:
 158612 - 0x17C42 (Discard) - True - Triangles
-158665 - 0x002A6 (Vault) - True - Symmetry & Colored Dots & Black/White Squares
-158666 - 0x03542 (Vault Box) - 0x002A6 - True
+158665 - 0x002A6 (Vault Panel) - True - Symmetry & Colored Dots & Black/White Squares
+Door - 0x00085 (Vault Door) - 0x002A6
 159301 - 0x335AE (Cloud Cycle EP) - True - True
 159325 - 0x33505 (Bush EP) - True - True
 159335 - 0x03C07 (Apparent River EP) - True - True
 
+Mountainside Vault (Mountainside):
+158666 - 0x03542 (Vault Box) - True - True
+
 Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34:
 158405 - 0x0042D (River Shape) - True - True
 158406 - 0x09F7F (Box Short) - 7 Lasers - True
-158407 - 0x17C34 (Trap Door Triple Exit) - 0x09F7F - Black/White Squares
-158800 - 0xFFF00 (Box Long) - 7 Lasers & 11 Lasers & 0x17C34 - True
+158407 - 0x17C34 (Mountain Entry Panel) - 0x09F7F - Black/White Squares
+158800 - 0xFFF00 (Box Long) - 11 Lasers & 0x17C34 - True
 159300 - 0x001A3 (River Shape EP) - True - True
 159320 - 0x3370E (Arch Black EP) - True - True
 159324 - 0x336C8 (Arch White Right EP) - True - True
@@ -881,7 +906,7 @@ Mountaintop (Mountaintop) - Mountain Top Layer - 0x17C34:
 Mountain Top Layer (Mountain Floor 1) - Mountain Top Layer Bridge - 0x09E39:
 158408 - 0x09E39 (Light Bridge Controller) - True - Black/White Squares & Rotated Shapers
 
-Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
+Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Top Layer At Door - TrueOneWay:
 158409 - 0x09E7A (Right Row 1) - True - Black/White Squares & Dots
 158410 - 0x09E71 (Right Row 2) - 0x09E7A - Black/White Squares & Dots
 158411 - 0x09E72 (Right Row 3) - 0x09E71 - Black/White Squares & Shapers
@@ -892,13 +917,15 @@ Mountain Top Layer Bridge (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 158416 - 0x09E78 (Left Row 3) - 0x09E75 - Dots & Shapers
 158417 - 0x09E79 (Left Row 4) - 0x09E78 - Shapers & Rotated Shapers
 158418 - 0x09E6C (Left Row 5) - 0x09E79 - Stars & Black/White Squares
-158419 - 0x09E6F (Left Row 6) - 0x09E6C - Shapers
+158419 - 0x09E6F (Left Row 6) - 0x09E6C - Shapers & Dots
 158420 - 0x09E6B (Left Row 7) - 0x09E6F - Dots
 158421 - 0x33AF5 (Back Row 1) - True - Black/White Squares & Symmetry
-158422 - 0x33AF7 (Back Row 2) - 0x33AF5 - Black/White Squares & Stars
+158422 - 0x33AF7 (Back Row 2) - 0x33AF5 - Black/White Squares
 158423 - 0x09F6E (Back Row 3) - 0x33AF7 - Symmetry & Dots
 158424 - 0x09EAD (Trash Pillar 1) - True - Black/White Squares & Shapers
 158425 - 0x09EAF (Trash Pillar 2) - 0x09EAD - Black/White Squares & Shapers
+
+Mountain Top Layer At Door (Mountain Floor 1) - Mountain Floor 2 - 0x09E54:
 Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B
 
 Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Blue Bridge - 0x09E86 - Mountain Pink Bridge EP - TrueOneWay:
@@ -906,7 +933,7 @@ Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near -
 158427 - 0x09FD4 (Near Row 2) - 0x09FD3 - Colored Squares & Dots
 158428 - 0x09FD6 (Near Row 3) - 0x09FD4 - Stars & Colored Squares & Stars + Same Colored Symbol
 158429 - 0x09FD7 (Near Row 4) - 0x09FD6 - Stars & Colored Squares & Stars + Same Colored Symbol & Shapers
-158430 - 0x09FD8 (Near Row 5) - 0x09FD7 - Colored Squares & Symmetry
+158430 - 0x09FD8 (Near Row 5) - 0x09FD7 - Colored Squares
 Door - 0x09FFB (Staircase Near) - 0x09FD8
 
 Mountain Floor 2 Blue Bridge (Mountain Floor 2) - Mountain Floor 2 Beyond Bridge - TrueOneWay - Mountain Floor 2 At Door - 0x09ED8:
@@ -917,7 +944,7 @@ Door - 0x09EDD (Elevator Room Entry) - 0x09ED8 & 0x09E86
 Mountain Floor 2 Light Bridge Room Near (Mountain Floor 2):
 158431 - 0x09E86 (Light Bridge Controller Near) - True - Stars & Black/White Squares
 
-Mountain Floor 2 Beyond Bridge (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Far - 0x09E07 - Mountain Pink Bridge EP - TrueOneWay:
+Mountain Floor 2 Beyond Bridge (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Far - 0x09E07 - Mountain Pink Bridge EP - TrueOneWay - Mountain Floor 2 - 0x09ED8:
 158432 - 0x09FCC (Far Row 1) - True - Dots
 158433 - 0x09FCE (Far Row 2) - 0x09FCC - Black/White Squares
 158434 - 0x09FCF (Far Row 3) - 0x09FCE - Shapers
@@ -935,29 +962,27 @@ Mountain Floor 2 Elevator Room (Mountain Floor 2) - Mountain Floor 2 Elevator -
 Mountain Floor 2 Elevator (Mountain Floor 2) - Mountain Floor 2 Elevator Room - 0x09EEB - Mountain Third Layer - 0x09EEB:
 158439 - 0x09EEB (Elevator Control Panel) - True - Dots
 
-Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89:
+Mountain Third Layer (Mountain Bottom Floor) - Mountain Floor 2 Elevator - TrueOneWay - Mountain Bottom Floor - 0x09F89 - Mountain Pink Bridge EP - TrueOneWay:
 158440 - 0x09FC1 (Giant Puzzle Bottom Left) - True - Shapers & Eraser
 158441 - 0x09F8E (Giant Puzzle Bottom Right) - True - Rotated Shapers & Eraser
 158442 - 0x09F01 (Giant Puzzle Top Right) - True - Shapers & Eraser
 158443 - 0x09EFF (Giant Puzzle Top Left) - True - Shapers & Eraser
 158444 - 0x09FDA (Giant Puzzle) - 0x09FC1 & 0x09F8E & 0x09F01 & 0x09EFF - Shapers & Symmetry
+159313 - 0x09D5D (Yellow Bridge EP) - 0x09E86 & 0x09ED8 - True
+159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True
 Door - 0x09F89 (Exit) - 0x09FDA
 
-Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Bottom Floor Rock - 0x17FA2 - Final Room - 0x0C141 - Mountain Pink Bridge EP - TrueOneWay:
+Mountain Bottom Floor (Mountain Bottom Floor) - Mountain Path to Caves - 0x17F33 - Final Room - 0x0C141:
 158614 - 0x17FA2 (Discard) - 0xFFF00 - Triangles
 158445 - 0x01983 (Final Room Entry Left) - True - Shapers & Stars
 158446 - 0x01987 (Final Room Entry Right) - True - Colored Squares & Dots
 Door - 0x0C141 (Final Room Entry) - 0x01983 & 0x01987
-159313 - 0x09D5D (Yellow Bridge EP) - 0x09E86 & 0x09ED8 - True
-159314 - 0x09D5E (Blue Bridge EP) - 0x09E86 & 0x09ED8 - True
+Door - 0x17F33 (Rock Open) - 0x17FA2 | 0x334E1
 
 Mountain Pink Bridge EP (Mountain Floor 2):
 159312 - 0x09D63 (Pink Bridge EP) - 0x09E39 - True
 
-Mountain Bottom Floor Rock (Mountain Bottom Floor) - Mountain Bottom Floor - 0x17F33 - Mountain Path to Caves - 0x17F33:
-Door - 0x17F33 (Rock Open) - True - True
-
-Mountain Path to Caves (Mountain Bottom Floor) - Mountain Bottom Floor Rock - 0x334E1 - Caves - 0x2D77D:
+Mountain Path to Caves (Mountain Bottom Floor) - Caves - 0x2D77D:
 158447 - 0x00FF8 (Caves Entry Panel) - True - Black/White Squares
 Door - 0x2D77D (Caves Entry) - 0x00FF8
 158448 - 0x334E1 (Rock Control) - True - True
@@ -984,8 +1009,8 @@ Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Path to Challenge - 0x019A5:
 158469 - 0x009A4 (Blue Tunnel Left Third 1) - True - Shapers
 158470 - 0x018A0 (Blue Tunnel Right Third 1) - True - Shapers & Symmetry
 158471 - 0x00A72 (Blue Tunnel Left Fourth 1) - True - Shapers & Negative Shapers
-158472 - 0x32962 (First Floor Left) - True - Rotated Shapers
-158473 - 0x32966 (First Floor Grounded) - True - Stars & Black/White Squares & Stars + Same Colored Symbol
+158472 - 0x32962 (First Floor Left) - True - Rotated Shapers & Shapers
+158473 - 0x32966 (First Floor Grounded) - True - Stars & Black/White Squares
 158474 - 0x01A31 (First Floor Middle) - True - Colored Squares
 158475 - 0x00B71 (First Floor Right) - True - Colored Squares & Stars & Stars + Same Colored Symbol & Eraser
 158478 - 0x288EA (First Wooden Beam) - True - Rotated Shapers
@@ -1021,7 +1046,7 @@ Path to Challenge (Caves) - Challenge - 0x0A19A:
 158477 - 0x0A16E (Challenge Entry Panel) - True - Stars & Shapers & Stars + Same Colored Symbol
 Door - 0x0A19A (Challenge Entry) - 0x0A16E
 
-Challenge (Challenge) - Tunnels - 0x0348A:
+Challenge (Challenge) - Tunnels - 0x0348A - Challenge Vault - 0x04D75:
 158499 - 0x0A332 (Start Timer) - 11 Lasers - True
 158500 - 0x0088E (Small Basic) - 0x0A332 - True
 158501 - 0x00BAF (Big Basic) - 0x0088E - True
@@ -1041,11 +1066,14 @@ Challenge (Challenge) - Tunnels - 0x0348A:
 158515 - 0x034EC (Maze Hidden 2) - 0x00C68 | 0x00C59 | 0x00C22 - Triangles
 158516 - 0x1C31A (Dots Pillar) - 0x034F4 & 0x034EC - Dots & Symmetry
 158517 - 0x1C319 (Squares Pillar) - 0x034F4 & 0x034EC - Black/White Squares & Symmetry
-158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True
+Door - 0x04D75 (Vault Door) - 0x1C31A & 0x1C319
 158518 - 0x039B4 (Tunnels Entry Panel) - True - Triangles
 Door - 0x0348A (Tunnels Entry) - 0x039B4
 159530 - 0x28B30 (Water EP) - True - True
 
+Challenge Vault (Challenge):
+158667 - 0x0356B (Vault Box) - 0x1C31A & 0x1C319 - True
+
 Tunnels (Tunnels) - Windmill Interior - 0x27739 - Desert Lowest Level Inbetween Shortcuts - 0x27263 - Town - 0x09E87:
 158668 - 0x2FAF6 (Vault Box) - True - True
 158519 - 0x27732 (Theater Shortcut Panel) - True - True
@@ -1075,7 +1103,7 @@ Elevator (Mountain Final Room):
 158535 - 0x3D9A8 (Back Wall Right) - 0x3D9A6 | 0x3D9A7 - True
 158536 - 0x3D9A9 (Elevator Start) - 0x3D9AA & 7 Lasers | 0x3D9A8 & 7 Lasers - True
 
-Boat (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay:
+The Ocean (Boat) - Main Island - TrueOneWay - Swamp Near Boat - TrueOneWay - Treehouse Entry Area - TrueOneWay - Quarry Boathouse Behind Staircase - TrueOneWay - Inside Glass Factory Behind Back Wall - TrueOneWay:
 159042 - 0x22106 (Desert EP) - True - True
 159223 - 0x03B25 (Shipwreck CCW Underside EP) - True - True
 159231 - 0x28B29 (Shipwreck Green EP) - True - True
@@ -1093,32 +1121,38 @@ Obelisks (EPs) - Entry - True:
 159702 - 0xFFE02 (Desert Obelisk Side 3) - 0x3351D - True
 159703 - 0xFFE03 (Desert Obelisk Side 4) - 0x0053C & 0x00771 & 0x335C8 & 0x335C9 & 0x337F8 & 0x037BB & 0x220E4 & 0x220E5 - True
 159704 - 0xFFE04 (Desert Obelisk Side 5) - 0x334B9 & 0x334BC & 0x22106 & 0x0A14C & 0x0A14D - True
+159709 - 0x00359 (Desert Obelisk) - True - True
 159710 - 0xFFE10 (Monastery Obelisk Side 1) - 0x03ABC & 0x03ABE & 0x03AC0 & 0x03AC4 - True
 159711 - 0xFFE11 (Monastery Obelisk Side 2) - 0x03AC5 - True
 159712 - 0xFFE12 (Monastery Obelisk Side 3) - 0x03BE2 & 0x03BE3 & 0x0A409 - True
 159713 - 0xFFE13 (Monastery Obelisk Side 4) - 0x006E5 & 0x006E6 & 0x006E7 & 0x034A7 & 0x034AD & 0x034AF & 0x03DAB & 0x03DAC & 0x03DAD - True
 159714 - 0xFFE14 (Monastery Obelisk Side 5) - 0x03E01 - True
 159715 - 0xFFE15 (Monastery Obelisk Side 6) - 0x289F4 & 0x289F5 - True
+159719 - 0x00263 (Monastery Obelisk) - True - True
 159720 - 0xFFE20 (Treehouse Obelisk Side 1) - 0x0053D & 0x0053E & 0x00769 - True
 159721 - 0xFFE21 (Treehouse Obelisk Side 2) - 0x33721 & 0x220A7 & 0x220BD - True
 159722 - 0xFFE22 (Treehouse Obelisk Side 3) - 0x03B22 & 0x03B23 & 0x03B24 & 0x03B25 & 0x03A79 & 0x28ABD & 0x28ABE - True
 159723 - 0xFFE23 (Treehouse Obelisk Side 4) - 0x3388F & 0x28B29 & 0x28B2A - True
 159724 - 0xFFE24 (Treehouse Obelisk Side 5) - 0x018B6 & 0x033BE & 0x033BF & 0x033DD & 0x033E5 - True
 159725 - 0xFFE25 (Treehouse Obelisk Side 6) - 0x28AE9 & 0x3348F - True
+159729 - 0x00097 (Treehouse Obelisk) - True - True
 159730 - 0xFFE30 (River Obelisk Side 1) - 0x001A3 & 0x335AE - True
 159731 - 0xFFE31 (River Obelisk Side 2) - 0x000D3 & 0x035F5 & 0x09D5D & 0x09D5E & 0x09D63 - True
 159732 - 0xFFE32 (River Obelisk Side 3) - 0x3370E & 0x035DE & 0x03601 & 0x03603 & 0x03D0D & 0x3369A & 0x336C8 & 0x33505 - True
 159733 - 0xFFE33 (River Obelisk Side 4) - 0x03A9E & 0x016B2 & 0x3365F & 0x03731 & 0x036CE & 0x03C07 & 0x03A93 - True
 159734 - 0xFFE34 (River Obelisk Side 5) - 0x03AA6 & 0x3397C & 0x0105D & 0x0A304 - True
 159735 - 0xFFE35 (River Obelisk Side 6) - 0x035CB & 0x035CF - True
+159739 - 0x00367 (River Obelisk) - True - True
 159740 - 0xFFE40 (Quarry Obelisk Side 1) - 0x28A7B & 0x005F6 & 0x00859 & 0x17CB9 & 0x28A4A - True
 159741 - 0xFFE41 (Quarry Obelisk Side 2) - 0x334B6 & 0x00614 & 0x0069D & 0x28A4C - True
 159742 - 0xFFE42 (Quarry Obelisk Side 3) - 0x289CF & 0x289D1 - True
 159743 - 0xFFE43 (Quarry Obelisk Side 4) - 0x33692 - True
 159744 - 0xFFE44 (Quarry Obelisk Side 5) - 0x03E77 & 0x03E7C - True
+159749 - 0x22073 (Quarry Obelisk) - True - True
 159750 - 0xFFE50 (Town Obelisk Side 1) - 0x035C7 - True
 159751 - 0xFFE51 (Town Obelisk Side 2) - 0x01848 & 0x03D06 & 0x33530 & 0x33600 & 0x28A2F & 0x28A37 & 0x334A3 & 0x3352F - True
 159752 - 0xFFE52 (Town Obelisk Side 3) - 0x33857 & 0x33879 & 0x03C19 - True
 159753 - 0xFFE53 (Town Obelisk Side 4) - 0x28B30 & 0x035C9 - True
 159754 - 0xFFE54 (Town Obelisk Side 5) - 0x03335 & 0x03412 & 0x038A6 & 0x038AA & 0x03E3F & 0x03E40 & 0x28B8E - True
 159755 - 0xFFE55 (Town Obelisk Side 6) - 0x28B91 & 0x03BCE & 0x03BCF & 0x03BD1 & 0x339B6 & 0x33A20 & 0x33A29 & 0x33A2A & 0x33B06 - True
+159759 - 0x0A16C (Town Obelisk) - True - True
diff --git a/worlds/witness/__init__.py b/worlds/witness/__init__.py
index faaafd598b..6360c33aef 100644
--- a/worlds/witness/__init__.py
+++ b/worlds/witness/__init__.py
@@ -1,9 +1,11 @@
 """
 Archipelago init file for The Witness
 """
+import dataclasses
 from typing import Dict, Optional
 
-from BaseClasses import Region, Location, MultiWorld, Item, Entrance, Tutorial
+from BaseClasses import Region, Location, MultiWorld, Item, Entrance, Tutorial, CollectionState
+from Options import PerGameCommonOptions, Toggle
 from .hints import get_always_hint_locations, get_always_hint_items, get_priority_hint_locations, \
     get_priority_hint_items, make_hints, generate_joke_hints
 from worlds.AutoWorld import World, WebWorld
@@ -11,9 +13,9 @@ from .player_logic import WitnessPlayerLogic
 from .static_logic import StaticWitnessLogic
 from .locations import WitnessPlayerLocations, StaticWitnessLocations
 from .items import WitnessItem, StaticWitnessItems, WitnessPlayerItems, ItemData
-from .rules import set_rules
 from .regions import WitnessRegions
-from .Options import is_option_enabled, the_witness_options, get_option_value
+from .rules import set_rules
+from .Options import TheWitnessOptions
 from .utils import get_audio_logs
 from logging import warning, error
 
@@ -38,13 +40,15 @@ class WitnessWorld(World):
     """
     game = "The Witness"
     topology_present = False
-    data_version = 13
+    data_version = 14
 
     StaticWitnessLogic()
     StaticWitnessLocations()
     StaticWitnessItems()
     web = WitnessWebWorld()
-    option_definitions = the_witness_options
+
+    options_dataclass = TheWitnessOptions
+    options: TheWitnessOptions
 
     item_name_to_id = {
         name: data.ap_code for name, data in StaticWitnessItems.item_data.items()
@@ -52,7 +56,7 @@ class WitnessWorld(World):
     location_name_to_id = StaticWitnessLocations.ALL_LOCATIONS_TO_ID
     item_name_groups = StaticWitnessItems.item_groups
 
-    required_client_version = (0, 3, 9)
+    required_client_version = (0, 4, 4)
 
     def __init__(self, multiworld: "MultiWorld", player: int):
         super().__init__(multiworld, player)
@@ -64,20 +68,22 @@ class WitnessWorld(World):
 
         self.log_ids_to_hints = None
 
+        self.items_placed_early = []
+        self.own_itempool = []
+
     def _get_slot_data(self):
         return {
-            'seed': self.multiworld.per_slot_randoms[self.player].randint(0, 1000000),
+            'seed': self.random.randrange(0, 1000000),
             'victory_location': int(self.player_logic.VICTORY_LOCATION, 16),
             'panelhex_to_id': self.locat.CHECK_PANELHEX_TO_ID,
             'item_id_to_door_hexes': StaticWitnessItems.get_item_to_door_mappings(),
             'door_hexes_in_the_pool': self.items.get_door_ids_in_pool(),
             'symbols_not_in_the_game': self.items.get_symbol_ids_not_in_pool(),
-            'disabled_panels': list(self.player_logic.COMPLETELY_DISABLED_CHECKS),
+            'disabled_entities': [int(h, 16) for h in self.player_logic.COMPLETELY_DISABLED_ENTITIES],
             'log_ids_to_hints': self.log_ids_to_hints,
             'progressive_item_lists': self.items.get_progressive_item_ids_in_pool(),
             'obelisk_side_id_to_EPs': StaticWitnessLogic.OBELISK_SIDE_ID_TO_EP_HEXES,
-            'precompleted_puzzles': [int(h, 16) for h in
-                                     self.player_logic.EXCLUDED_LOCATIONS | self.player_logic.PRECOMPLETED_LOCATIONS],
+            'precompleted_puzzles': [int(h, 16) for h in self.player_logic.EXCLUDED_LOCATIONS],
             'entity_to_name': StaticWitnessLogic.ENTITY_ID_TO_NAME,
         }
 
@@ -85,36 +91,125 @@ class WitnessWorld(World):
         disabled_locations = self.multiworld.exclude_locations[self.player].value
 
         self.player_logic = WitnessPlayerLogic(
-            self.multiworld, self.player, disabled_locations, self.multiworld.start_inventory[self.player].value
+            self, disabled_locations, self.multiworld.start_inventory[self.player].value
         )
 
-        self.locat: WitnessPlayerLocations = WitnessPlayerLocations(self.multiworld, self.player, self.player_logic)
-        self.items: WitnessPlayerItems = WitnessPlayerItems(self.multiworld, self.player, self.player_logic, self.locat)
-        self.regio: WitnessRegions = WitnessRegions(self.locat)
+        self.locat: WitnessPlayerLocations = WitnessPlayerLocations(self, self.player_logic)
+        self.items: WitnessPlayerItems = WitnessPlayerItems(
+            self, self.player_logic, self.locat
+        )
+        self.regio: WitnessRegions = WitnessRegions(self.locat, self)
 
         self.log_ids_to_hints = dict()
 
-        if not (is_option_enabled(self.multiworld, self.player, "shuffle_symbols")
-                or get_option_value(self.multiworld, self.player, "shuffle_doors")
-                or is_option_enabled(self.multiworld, self.player, "shuffle_lasers")):
+        if not (self.options.shuffle_symbols or self.options.shuffle_doors or self.options.shuffle_lasers):
             if self.multiworld.players == 1:
-                warning("This Witness world doesn't have any progression items. Please turn on Symbol Shuffle, Door"
-                        " Shuffle or Laser Shuffle if that doesn't seem right.")
+                warning(f"{self.multiworld.get_player_name(self.player)}'s Witness world doesn't have any progression"
+                        f" items. Please turn on Symbol Shuffle, Door Shuffle or Laser Shuffle if that doesn't"
+                        f" seem right.")
             else:
-                raise Exception("This Witness world doesn't have any progression items. Please turn on Symbol Shuffle,"
-                                " Door Shuffle or Laser Shuffle.")
+                raise Exception(f"{self.multiworld.get_player_name(self.player)}'s Witness world doesn't have any"
+                                f" progression items. Please turn on Symbol Shuffle, Door Shuffle or Laser Shuffle.")
 
     def create_regions(self):
-        self.regio.create_regions(self.multiworld, self.player, self.player_logic)
+        self.regio.create_regions(self, self.player_logic)
+
+        # Set rules early so extra locations can be created based on the results of exploring collection states
+
+        set_rules(self)
+
+        # Add event items and tie them to event locations (e.g. laser activations).
+
+        event_locations = []
+
+        for event_location in self.locat.EVENT_LOCATION_TABLE:
+            item_obj = self.create_item(
+                self.player_logic.EVENT_ITEM_PAIRS[event_location]
+            )
+            location_obj = self.multiworld.get_location(event_location, self.player)
+            location_obj.place_locked_item(item_obj)
+            self.own_itempool.append(item_obj)
+
+            event_locations.append(location_obj)
+
+        # Place other locked items
+        dog_puzzle_skip = self.create_item("Puzzle Skip")
+        self.multiworld.get_location("Town Pet the Dog", self.player).place_locked_item(dog_puzzle_skip)
+
+        self.own_itempool.append(dog_puzzle_skip)
+
+        self.items_placed_early.append("Puzzle Skip")
+
+        # Pick an early item to place on the tutorial gate.
+        early_items = [item for item in self.items.get_early_items() if item in self.items.get_mandatory_items()]
+        if early_items:
+            random_early_item = self.random.choice(early_items)
+            if self.options.puzzle_randomization == 1:
+                # In Expert, only tag the item as early, rather than forcing it onto the gate.
+                self.multiworld.local_early_items[self.player][random_early_item] = 1
+            else:
+                # Force the item onto the tutorial gate check and remove it from our random pool.
+                gate_item = self.create_item(random_early_item)
+                self.multiworld.get_location("Tutorial Gate Open", self.player).place_locked_item(gate_item)
+                self.own_itempool.append(gate_item)
+                self.items_placed_early.append(random_early_item)
+
+        # There are some really restrictive settings in The Witness.
+        # They are rarely played, but when they are, we add some extra sphere 1 locations.
+        # This is done both to prevent generation failures, but also to make the early game less linear.
+        # Only sweeps for events because having this behavior be random based on Tutorial Gate would be strange.
+
+        state = CollectionState(self.multiworld)
+        state.sweep_for_events(locations=event_locations)
+
+        num_early_locs = sum(1 for loc in self.multiworld.get_reachable_locations(state, self.player) if loc.address)
+
+        # Adjust the needed size for sphere 1 based on how restrictive the settings are in terms of items
+
+        needed_size = 3
+        needed_size += self.options.puzzle_randomization == 1
+        needed_size += self.options.shuffle_symbols
+        needed_size += self.options.shuffle_doors > 0
+
+        # Then, add checks in order until the required amount of sphere 1 checks is met.
+
+        extra_checks = [
+            ("First Hallway Room", "First Hallway Bend"),
+            ("First Hallway", "First Hallway Straight"),
+            ("Desert Outside", "Desert Surface 3"),
+        ]
+
+        for i in range(num_early_locs, needed_size):
+            if not extra_checks:
+                break
+
+            region, loc = extra_checks.pop(0)
+            self.locat.add_location_late(loc)
+            self.multiworld.get_region(region, self.player).add_locations({loc: self.location_name_to_id[loc]})
+
+            player = self.multiworld.get_player_name(self.player)
+            
+            warning(f"""Location "{loc}" had to be added to {player}'s world due to insufficient sphere 1 size.""")
 
     def create_items(self):
-
-        # Determine pool size. Note that the dog location is included in the location list, so this needs to be -1.
-        pool_size: int = len(self.locat.CHECK_LOCATION_TABLE) - len(self.locat.EVENT_LOCATION_TABLE) - 1
+        # Determine pool size.
+        pool_size: int = len(self.locat.CHECK_LOCATION_TABLE) - len(self.locat.EVENT_LOCATION_TABLE)
 
         # Fill mandatory items and remove precollected and/or starting items from the pool.
         item_pool: Dict[str, int] = self.items.get_mandatory_items()
 
+        # Remove one copy of each item that was placed early
+        for already_placed in self.items_placed_early:
+            pool_size -= 1
+
+            if already_placed not in item_pool:
+                continue
+
+            if item_pool[already_placed] == 1:
+                item_pool.pop(already_placed)
+            else:
+                item_pool[already_placed] -= 1
+
         for precollected_item_name in [item.name for item in self.multiworld.precollected_items[self.player]]:
             if precollected_item_name in item_pool:
                 if item_pool[precollected_item_name] == 1:
@@ -131,17 +226,18 @@ class WitnessWorld(World):
             self.multiworld.push_precollected(self.create_item(inventory_item_name))
 
         if len(item_pool) > pool_size:
-            error_string = "The Witness world has too few locations ({num_loc}) to place its necessary items " \
-                           "({num_item})."
-            error(error_string.format(num_loc=pool_size, num_item=len(item_pool)))
+            error(f"{self.multiworld.get_player_name(self.player)}'s Witness world has too few locations ({pool_size})"
+                  f" to place its necessary items ({len(item_pool)}).")
             return
 
         remaining_item_slots = pool_size - sum(item_pool.values())
 
         # Add puzzle skips.
-        num_puzzle_skips = get_option_value(self.multiworld, self.player, "puzzle_skip_amount")
+        num_puzzle_skips = self.options.puzzle_skip_amount
+
         if num_puzzle_skips > remaining_item_slots:
-            warning(f"The Witness world has insufficient locations to place all requested puzzle skips.")
+            warning(f"{self.multiworld.get_player_name(self.player)}'s Witness world has insufficient locations"
+                    f" to place all requested puzzle skips.")
             num_puzzle_skips = remaining_item_slots
         item_pool["Puzzle Skip"] = num_puzzle_skips
         remaining_item_slots -= num_puzzle_skips
@@ -150,45 +246,17 @@ class WitnessWorld(World):
         if remaining_item_slots > 0:
             item_pool.update(self.items.get_filler_items(remaining_item_slots))
 
-        # Add event items and tie them to event locations (e.g. laser activations).
-        for event_location in self.locat.EVENT_LOCATION_TABLE:
-            item_obj = self.create_item(
-                self.player_logic.EVENT_ITEM_PAIRS[event_location]
-            )
-            location_obj = self.multiworld.get_location(event_location, self.player)
-            location_obj.place_locked_item(item_obj)
-
-        # BAD DOG GET BACK HERE WITH THAT PUZZLE SKIP YOU'RE POLLUTING THE ITEM POOL
-        self.multiworld.get_location("Town Pet the Dog", self.player)\
-            .place_locked_item(self.create_item("Puzzle Skip"))
-
-        # Pick an early item to place on the tutorial gate.
-        early_items = [item for item in self.items.get_early_items() if item in item_pool]
-        if early_items:
-            random_early_item = self.multiworld.random.choice(early_items)
-            if get_option_value(self.multiworld, self.player, "puzzle_randomization") == 1:
-                # In Expert, only tag the item as early, rather than forcing it onto the gate.
-                self.multiworld.local_early_items[self.player][random_early_item] = 1
-            else:
-                # Force the item onto the tutorial gate check and remove it from our random pool.
-                self.multiworld.get_location("Tutorial Gate Open", self.player)\
-                    .place_locked_item(self.create_item(random_early_item))
-                if item_pool[random_early_item] == 1:
-                    item_pool.pop(random_early_item)
-                else:
-                    item_pool[random_early_item] -= 1
-
         # Generate the actual items.
         for item_name, quantity in sorted(item_pool.items()):
-            self.multiworld.itempool += [self.create_item(item_name) for _ in range(0, quantity)]
+            new_items = [self.create_item(item_name) for _ in range(0, quantity)]
+
+            self.own_itempool += new_items
+            self.multiworld.itempool += new_items
             if self.items.item_data[item_name].local_only:
                 self.multiworld.local_items[self.player].value.add(item_name)
 
-    def set_rules(self):
-        set_rules(self.multiworld, self.player, self.player_logic, self.locat)
-
     def fill_slot_data(self) -> dict:
-        hint_amount = get_option_value(self.multiworld, self.player, "hint_amount")
+        hint_amount = self.options.hint_amount.value
 
         credits_hint = (
             "This Randomizer is brought to you by",
@@ -199,9 +267,9 @@ class WitnessWorld(World):
         audio_logs = get_audio_logs().copy()
 
         if hint_amount != 0:
-            generated_hints = make_hints(self.multiworld, self.player, hint_amount)
+            generated_hints = make_hints(self, hint_amount, self.own_itempool)
 
-            self.multiworld.per_slot_randoms[self.player].shuffle(audio_logs)
+            self.random.shuffle(audio_logs)
 
             duplicates = min(3, len(audio_logs) // hint_amount)
 
@@ -216,7 +284,7 @@ class WitnessWorld(World):
             audio_log = audio_logs.pop()
             self.log_ids_to_hints[int(audio_log, 16)] = credits_hint
 
-        joke_hints = generate_joke_hints(self.multiworld, self.player, len(audio_logs))
+        joke_hints = generate_joke_hints(self, len(audio_logs))
 
         while audio_logs:
             audio_log = audio_logs.pop()
@@ -226,10 +294,10 @@ class WitnessWorld(World):
 
         slot_data = self._get_slot_data()
 
-        for option_name in the_witness_options:
-            slot_data[option_name] = get_option_value(
-                self.multiworld, self.player, option_name
-            )
+        for option_name in (attr.name for attr in dataclasses.fields(TheWitnessOptions)
+                            if attr not in dataclasses.fields(PerGameCommonOptions)):
+            option = getattr(self.options, option_name)
+            slot_data[option_name] = bool(option.value) if isinstance(option, Toggle) else option.value
 
         return slot_data
 
@@ -257,36 +325,35 @@ class WitnessLocation(Location):
     Archipelago Location for The Witness
     """
     game: str = "The Witness"
-    check_hex: int = -1
+    entity_hex: int = -1
 
     def __init__(self, player: int, name: str, address: Optional[int], parent, ch_hex: int = -1):
         super().__init__(player, name, address, parent)
-        self.check_hex = ch_hex
+        self.entity_hex = ch_hex
 
 
-def create_region(world: MultiWorld, player: int, name: str,
-                  locat: WitnessPlayerLocations, region_locations=None, exits=None):
+def create_region(world: WitnessWorld, name: str, locat: WitnessPlayerLocations, region_locations=None, exits=None):
     """
     Create an Archipelago Region for The Witness
     """
 
-    ret = Region(name, player, world)
+    ret = Region(name, world.player, world.multiworld)
     if region_locations:
         for location in region_locations:
             loc_id = locat.CHECK_LOCATION_TABLE[location]
 
-            check_hex = -1
-            if location in StaticWitnessLogic.CHECKS_BY_NAME:
-                check_hex = int(
-                    StaticWitnessLogic.CHECKS_BY_NAME[location]["checkHex"], 0
+            entity_hex = -1
+            if location in StaticWitnessLogic.ENTITIES_BY_NAME:
+                entity_hex = int(
+                    StaticWitnessLogic.ENTITIES_BY_NAME[location]["entity_hex"], 0
                 )
             location = WitnessLocation(
-                player, location, loc_id, ret, check_hex
+                world.player, location, loc_id, ret, entity_hex
             )
 
             ret.locations.append(location)
     if exits:
         for single_exit in exits:
-            ret.exits.append(Entrance(player, single_exit, ret))
+            ret.exits.append(Entrance(world.player, single_exit, ret))
 
     return ret
diff --git a/worlds/witness/docs/en_The Witness.md b/worlds/witness/docs/en_The Witness.md
index 2ae478bed0..4d00ecaae4 100644
--- a/worlds/witness/docs/en_The Witness.md	
+++ b/worlds/witness/docs/en_The Witness.md	
@@ -10,12 +10,13 @@ config file.
 Puzzles are randomly generated using the popular [Sigma Rando](https://github.com/sigma144/witness-randomizer).
 They are made to be similar to the original game, but with different solutions.
 
-Ontop of that each puzzle symbol (Squares, Stars, Dots, etc.) is now an item.
+On top of that, each puzzle symbol (Squares, Stars, Dots, etc.) is now an item.
 Panels with puzzle symbols on them are now locked initially.
 
 ## What is a "check" in The Witness?
 
 Solving the last panel in a row of panels or an important standalone panel will count as a check, and send out an item.
+It is also possible to add Environmental Puzzles into the location pool via the "Shuffle Environmental Puzzles" setting.
 
 ## What "items" can you unlock in The Witness?
 
@@ -32,7 +33,7 @@ By default, the audio logs scattered around the world will have 10 hints for you
 
 Example: "Shipwreck Vault contains Triangles".
 
-## The Jungle, Orchard, Forest and Color House aren't randomized. What gives?
+## The Jungle, Orchard, Forest and Color Bunker aren't randomized. What gives?
 
 There are limitations to what can currently be randomized in The Witness.
 There is an option to turn these non-randomized panels off, called "disable_non_randomized" in your yaml file. This will also slightly change the activation requirement of certain panels, detailed [here](https://github.com/sigma144/witness-randomizer/wiki/Activation-Triggers).
@@ -46,4 +47,4 @@ In this case, the generator will make its best attempt to adjust logic according
 One of the use cases of this could be to pre-open a specific door or pre-activate a single laser.
 
 In "shuffle_EPs: obelisk_sides", any Environmental Puzzles in exclude_locations will be pre-completed and not considered for their Obelisk Side.
-If every Environmental Puzzle on an Obelisk Side is pre-completed, that side disappears from the location pool entirely.
\ No newline at end of file
+If every Environmental Puzzle on an Obelisk Side is pre-completed, that side disappears from the location pool entirely.
diff --git a/worlds/witness/docs/setup_en.md b/worlds/witness/docs/setup_en.md
index 94a50846f9..daa9b8b9b5 100644
--- a/worlds/witness/docs/setup_en.md
+++ b/worlds/witness/docs/setup_en.md
@@ -29,8 +29,10 @@ To continue an earlier game:
 
 ## Archipelago Text Client
 
-It is recommended to have Archipelago's Text Client open on the side to keep track of what items you receive and send, as The Witness has no in-game messages.
-<br/>Or use the Auto-Tracker!
+It is recommended to have Archipelago's Text Client open on the side to keep track of what items you receive and send.
+<br/>The Witness does display received and sent items in-game, but only for a short time, and the messages are easy to miss while playing.
+
+<br/><br/>Of course, you can also use the Auto-Tracker!
 
 ## Auto-Tracking
 
@@ -41,4 +43,4 @@ The Witness has a fully functional map tracker that supports auto-tracking.
 3. Click on the "AP" symbol at the top.
 4. Enter the AP address, slot name and password. 
 
-The rest should take care of itself! Items and checks will be marked automatically, and it even knows your settings - It will hide checks & adjust logic accordingly. Note that the tracker may be out of date.
\ No newline at end of file
+The rest should take care of itself! Items and checks will be marked automatically, and it even knows your settings - It will hide checks & adjust logic accordingly.
diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index 5d8bd5d370..d238aa4adf 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -1,5 +1,9 @@
-from BaseClasses import MultiWorld
-from .Options import is_option_enabled, get_option_value
+from typing import Tuple, List, TYPE_CHECKING
+
+from BaseClasses import Item
+
+if TYPE_CHECKING:
+    from . import WitnessWorld
 
 joke_hints = [
     "Quaternions break my brain",
@@ -65,6 +69,12 @@ joke_hints = [
     "Have you tried Undertale?\nI hope I'm not the 10th person to ask you that. But it's, like, really good.",
     "Have you tried Wargroove?\nI'm glad that for every abandoned series, enough people are yearning for its return that one of them will know how to code.",
     "Have you tried Blasphemous?\nYou haven't? Blasphemy!\n...Sorry. You should try it, though!",
+    "Have you tried Doom II?\nGot a good game on your hands? Just make it bigger and better.",
+    "Have you tried Lingo?\nIt's an open world puzzle game. It features panels with non-verbally explained mechanics.\nIf you like this game, you'll like Lingo too.",
+    "(Middle Yellow)\nYOU AILED OVERNIGHT\nH--- --- ----- -----?",
+    "Have you tried Bumper Stickers?\nMaybe after spending so much time on this island, you are longing for a simpler puzzle game.",
+    "Have you tried Pokemon Emerald?\nI'm going to say it: 10/10, just the right amount of water.",
+    "Have you tried Terraria?\nA prime example of a survival sandbox game that beats the \"Wide as an ocean, deep as a puddle\" allegations.",
     
     "One day I was fascinated by the subject of generation of waves by wind.",
     "I don't like sandwiches. Why would you think I like sandwiches? Have you ever seen me with a sandwich?",
@@ -108,21 +118,59 @@ joke_hints = [
     "Have you found a red page yet? No? Then have you found a blue page?",
     "And here we see the Witness player, seeking answers where there are none-\nDid someone turn on the loudspeaker?",
 
-    "Hints suggested by:\nIHNN, Beaker, MrPokemon11, Ember, TheM8, NewSoupVi,"
-    "KF, Yoshi348, Berserker, BowlinJim, oddGarrett, Pink Switch.",
+    "Be quiet. I can't hear the elevator.",
+    "Witness me.\n- The famous last words of John Witness.",
+    "It's okay, I always have to skip the Rotated Shaper puzzles too.",
+    "Alan please add hint.",
+    "Rumor has it there's an audio log with a hint nearby.",
+    "In the future, war will break out between obelisk_sides and individual EP players.\nWhich side are you on?",
+    "Droplets: Low, High, Mid.\nAmbience: Mid, Low, Mid, High.",
+    "Name a better game involving lines. I'll wait.",
+    "\"You have to draw a line in the sand.\"\n- Arin \"Egoraptor\" Hanson",
+    "Have you tried?\nThe puzzles tend to get easier if you do.",
+    "Sorry, I accidentally left my phone in the Jungle.\nAnd also all my fragile dishes.",
+    "Winner of the \"Most Irrelevant PR in AP History\" award!",
+    "I bet you wish this was a real hint :)",
+    "\"This hint is an impostor.\"- Junk hint submitted by T1mshady.\n...wait, I'm not supposed to say that part?",
+    "Wouldn't you like to know, weather buoy?",
+    "Give me a few minutes, I should have better material by then.",
+    "Just pet the doggy! You know you want to!!!",
+    "ceci n'est pas une metroidvania",
+    "HINT is MELT\nYOU is HOT",
+    "Who's that behind you?",
+    ":3",
+    "^v ^^v> >>^>v\n^^v>v ^v>> v>^> v>v^",
+    "Statement #0162601, regarding a strange island that--\nOh, wait, sorry. I'm not supposed to be here.",
+    "Hollow Bastion has 6 progression items.\nOr maybe it doesn't.\nI wouldn't know.",
+    "Set your hint count lower so I can tell you more jokes next time.",
+    "A non-edge start point is similar to a cat.\nIt must be either inside or outside, it can't be both.",
+    "What if we kissed on the Bunker Laser Platform?\nJk... unless?",
+    "You don't have Boat? Invisible boat time!\nYou do have boat? Boat clipping time!",
+    "Cet indice est en français. Nous nous excusons de tout inconvénients engendrés par cela.",
+    "How many of you have personally witnessed a total solar eclipse?",
+    "In the Treehouse area, you will find \n[Error: Data not found] progression items.",
+    "Lingo\nLingoing\nLingone",
+    "The name of the captain was Albert Einstein.",
+    "Panel impossible Sigma plz fix",
+    "Welcome Back! (:",
+    "R R R U L L U L U R U R D R D R U U",
+    "Have you tried checking your tracker?",
+    
+    "Hints suggested by:\nIHNN, Beaker, MrPokemon11, Ember, TheM8, NewSoupVi, Jasper Bird, T1mshady,"
+    "KF, Yoshi348, Berserker, BowlinJim, oddGarrett, Pink Switch, Rever, Ishigh, snolid.",
 ]
 
 
-def get_always_hint_items(multiworld: MultiWorld, player: int):
+def get_always_hint_items(world: "WitnessWorld") -> List[str]:
     always = [
         "Boat",
-        "Caves Exits to Main Island",
+        "Caves Shortcuts",
         "Progressive Dots",
     ]
 
-    difficulty = get_option_value(multiworld, player, "puzzle_randomization")
-    discards = is_option_enabled(multiworld, player, "shuffle_discarded_panels")
-    wincon = get_option_value(multiworld, player, "victory_condition")
+    difficulty = world.options.puzzle_randomization
+    discards = world.options.shuffle_discarded_panels
+    wincon = world.options.victory_condition
 
     if discards:
         if difficulty == 1:
@@ -131,34 +179,52 @@ def get_always_hint_items(multiworld: MultiWorld, player: int):
             always.append("Triangles")
 
     if wincon == 0:
-        always.append("Mountain Bottom Floor Final Room Entry (Door)")
+        always += ["Mountain Bottom Floor Final Room Entry (Door)", "Mountain Bottom Floor Doors"]
+
+    if wincon == 1:
+        always += ["Challenge Entry (Panel)", "Caves Panels"]
 
     return always
 
 
-def get_always_hint_locations(multiworld: MultiWorld, player: int):
-    return {
+def get_always_hint_locations(_: "WitnessWorld") -> List[str]:
+    return [
         "Challenge Vault Box",
         "Mountain Bottom Floor Discard",
         "Theater Eclipse EP",
         "Shipwreck Couch EP",
         "Mountainside Cloud Cycle EP",
-    }
+    ]
 
 
-def get_priority_hint_items(multiworld: MultiWorld, player: int):
+def get_priority_hint_items(world: "WitnessWorld") -> List[str]:
     priority = {
         "Caves Mountain Shortcut (Door)",
         "Caves Swamp Shortcut (Door)",
-        "Negative Shapers",
-        "Sound Dots",
-        "Colored Dots",
-        "Stars + Same Colored Symbol",
         "Swamp Entry (Panel)",
         "Swamp Laser Shortcut (Door)",
     }
 
-    if is_option_enabled(multiworld, player, "shuffle_lasers"):
+    if world.options.shuffle_symbols:
+        symbols = [
+            "Progressive Dots",
+            "Progressive Stars",
+            "Shapers",
+            "Rotated Shapers",
+            "Negative Shapers",
+            "Arrows",
+            "Triangles",
+            "Eraser",
+            "Black/White Squares",
+            "Colored Squares",
+            "Colored Dots",
+            "Sound Dots",
+            "Symmetry"
+        ]
+
+        priority.update(world.random.sample(symbols, 5))
+
+    if world.options.shuffle_lasers:
         lasers = [
             "Symmetry Laser",
             "Town Laser",
@@ -172,19 +238,19 @@ def get_priority_hint_items(multiworld: MultiWorld, player: int):
             "Shadows Laser",
         ]
 
-        if get_option_value(multiworld, player, "shuffle_doors") >= 2:
+        if world.options.shuffle_doors >= 2:
             priority.add("Desert Laser")
-            priority.update(multiworld.per_slot_randoms[player].sample(lasers, 5))
+            priority.update(world.random.sample(lasers, 5))
 
         else:
             lasers.append("Desert Laser")
-            priority.update(multiworld.per_slot_randoms[player].sample(lasers, 6))
+            priority.update(world.random.sample(lasers, 6))
 
-    return priority
+    return sorted(priority)
 
 
-def get_priority_hint_locations(multiworld: MultiWorld, player: int):
-    return {
+def get_priority_hint_locations(_: "WitnessWorld") -> List[str]:
+    return [
         "Swamp Purple Underwater",
         "Shipwreck Vault Box",
         "Town RGB Room Left",
@@ -198,115 +264,131 @@ def get_priority_hint_locations(multiworld: MultiWorld, player: int):
         "Tunnels Theater Flowers EP",
         "Boat Shipwreck Green EP",
         "Quarry Stoneworks Control Room Left",
-    }
+    ]
 
 
-def make_hint_from_item(multiworld: MultiWorld, player: int, item: str):
-    location_obj = multiworld.find_item(item, player).item.location
+def make_hint_from_item(world: "WitnessWorld", item_name: str, own_itempool: List[Item]):
+    locations = [item.location for item in own_itempool if item.name == item_name and item.location]
+
+    if not locations:
+        return None
+
+    location_obj = world.random.choice(locations)
     location_name = location_obj.name
-    if location_obj.player != player:
-        location_name += " (" + multiworld.get_player_name(location_obj.player) + ")"
 
-    return location_name, item, location_obj.address if (location_obj.player == player) else -1
+    if location_obj.player != world.player:
+        location_name += " (" + world.multiworld.get_player_name(location_obj.player) + ")"
+
+    return location_name, item_name, location_obj.address if (location_obj.player == world.player) else -1
 
 
-def make_hint_from_location(multiworld: MultiWorld, player: int, location: str):
-    location_obj = multiworld.get_location(location, player)
-    item_obj = multiworld.get_location(location, player).item
+def make_hint_from_location(world: "WitnessWorld", location: str):
+    location_obj = world.multiworld.get_location(location, world.player)
+    item_obj = world.multiworld.get_location(location, world.player).item
     item_name = item_obj.name
-    if item_obj.player != player:
-        item_name += " (" + multiworld.get_player_name(item_obj.player) + ")"
+    if item_obj.player != world.player:
+        item_name += " (" + world.multiworld.get_player_name(item_obj.player) + ")"
 
-    return location, item_name, location_obj.address if (location_obj.player == player) else -1
+    return location, item_name, location_obj.address if (location_obj.player == world.player) else -1
 
 
-def make_hints(multiworld: MultiWorld, player: int, hint_amount: int):
+def make_hints(world: "WitnessWorld", hint_amount: int, own_itempool: List[Item]):
     hints = list()
 
     prog_items_in_this_world = {
-        item.name for item in multiworld.get_items()
-        if item.player == player and item.code and item.advancement
+        item.name for item in own_itempool if item.advancement and item.code and item.location
     }
     loc_in_this_world = {
-        location.name for location in multiworld.get_locations()
-        if location.player == player and location.address
+        location.name for location in world.multiworld.get_locations(world.player) if location.address
     }
 
     always_locations = [
-        location for location in get_always_hint_locations(multiworld, player)
+        location for location in get_always_hint_locations(world)
         if location in loc_in_this_world
     ]
     always_items = [
-        item for item in get_always_hint_items(multiworld, player)
+        item for item in get_always_hint_items(world)
         if item in prog_items_in_this_world
     ]
     priority_locations = [
-        location for location in get_priority_hint_locations(multiworld, player)
+        location for location in get_priority_hint_locations(world)
         if location in loc_in_this_world
     ]
     priority_items = [
-        item for item in get_priority_hint_items(multiworld, player)
+        item for item in get_priority_hint_items(world)
         if item in prog_items_in_this_world
     ]
 
     always_hint_pairs = dict()
 
     for item in always_items:
-        hint_pair = make_hint_from_item(multiworld, player, item)
+        hint_pair = make_hint_from_item(world, item, own_itempool)
 
-        if hint_pair[2] == 158007:  # Tutorial Gate Open
+        if not hint_pair or hint_pair[2] == 158007:  # Tutorial Gate Open
             continue
 
         always_hint_pairs[hint_pair[0]] = (hint_pair[1], True, hint_pair[2])
 
     for location in always_locations:
-        hint_pair = make_hint_from_location(multiworld, player, location)
+        hint_pair = make_hint_from_location(world, location)
         always_hint_pairs[hint_pair[0]] = (hint_pair[1], False, hint_pair[2])
 
     priority_hint_pairs = dict()
 
     for item in priority_items:
-        hint_pair = make_hint_from_item(multiworld, player, item)
+        hint_pair = make_hint_from_item(world, item, own_itempool)
 
-        if hint_pair[2] == 158007:  # Tutorial Gate Open
+        if not hint_pair or hint_pair[2] == 158007:  # Tutorial Gate Open
             continue
 
         priority_hint_pairs[hint_pair[0]] = (hint_pair[1], True, hint_pair[2])
 
     for location in priority_locations:
-        hint_pair = make_hint_from_location(multiworld, player, location)
+        hint_pair = make_hint_from_location(world, location)
         priority_hint_pairs[hint_pair[0]] = (hint_pair[1], False, hint_pair[2])
 
+    already_hinted_locations = set()
+
     for loc, item in always_hint_pairs.items():
+        if loc in already_hinted_locations:
+            continue
+
         if item[1]:
             hints.append((f"{item[0]} can be found at {loc}.", item[2]))
         else:
             hints.append((f"{loc} contains {item[0]}.", item[2]))
 
-    multiworld.per_slot_randoms[player].shuffle(hints)  # shuffle always hint order in case of low hint amount
+        already_hinted_locations.add(loc)
+
+    world.random.shuffle(hints)  # shuffle always hint order in case of low hint amount
 
     remaining_hints = hint_amount - len(hints)
     priority_hint_amount = int(max(0.0, min(len(priority_hint_pairs) / 2, remaining_hints / 2)))
 
-    prog_items_in_this_world = sorted(list(prog_items_in_this_world))
-    locations_in_this_world = sorted(list(loc_in_this_world))
+    prog_items_in_this_world = sorted(prog_items_in_this_world)
+    locations_in_this_world = sorted(loc_in_this_world)
 
-    multiworld.per_slot_randoms[player].shuffle(prog_items_in_this_world)
-    multiworld.per_slot_randoms[player].shuffle(locations_in_this_world)
+    world.random.shuffle(prog_items_in_this_world)
+    world.random.shuffle(locations_in_this_world)
 
     priority_hint_list = list(priority_hint_pairs.items())
-    multiworld.per_slot_randoms[player].shuffle(priority_hint_list)
+    world.random.shuffle(priority_hint_list)
     for _ in range(0, priority_hint_amount):
         next_priority_hint = priority_hint_list.pop()
         loc = next_priority_hint[0]
         item = next_priority_hint[1]
 
+        if loc in already_hinted_locations:
+            continue
+
         if item[1]:
             hints.append((f"{item[0]} can be found at {loc}.", item[2]))
         else:
             hints.append((f"{loc} contains {item[0]}.", item[2]))
 
-    next_random_hint_is_item = multiworld.per_slot_randoms[player].randint(0, 2)
+        already_hinted_locations.add(loc)
+
+    next_random_hint_is_item = world.random.randrange(0, 2)
 
     while len(hints) < hint_amount:
         if next_random_hint_is_item:
@@ -314,16 +396,28 @@ def make_hints(multiworld: MultiWorld, player: int, hint_amount: int):
                 next_random_hint_is_item = not next_random_hint_is_item
                 continue
 
-            hint = make_hint_from_item(multiworld, player, prog_items_in_this_world.pop())
+            hint = make_hint_from_item(world, prog_items_in_this_world.pop(), own_itempool)
+
+            if not hint or hint[0] in already_hinted_locations:
+                continue
+
             hints.append((f"{hint[1]} can be found at {hint[0]}.", hint[2]))
+
+            already_hinted_locations.add(hint[0])
         else:
-            hint = make_hint_from_location(multiworld, player, locations_in_this_world.pop())
+            hint = make_hint_from_location(world, locations_in_this_world.pop())
+
+            if hint[0] in already_hinted_locations:
+                continue
+
             hints.append((f"{hint[0]} contains {hint[1]}.", hint[2]))
 
+            already_hinted_locations.add(hint[0])
+
         next_random_hint_is_item = not next_random_hint_is_item
 
     return hints
 
 
-def generate_joke_hints(multiworld: MultiWorld, player: int, amount: int):
-    return [(x, -1) for x in multiworld.per_slot_randoms[player].sample(joke_hints, amount)]
+def generate_joke_hints(world: "WitnessWorld", amount: int) -> List[Tuple[str, int]]:
+    return [(x, -1) for x in world.random.sample(joke_hints, amount)]
diff --git a/worlds/witness/items.py b/worlds/witness/items.py
index 82c79047f3..a8c889de93 100644
--- a/worlds/witness/items.py
+++ b/worlds/witness/items.py
@@ -2,18 +2,20 @@
 Defines progression, junk and event items for The Witness
 """
 import copy
+
 from dataclasses import dataclass
-from typing import Optional, Dict, List, Set
+from typing import Optional, Dict, List, Set, TYPE_CHECKING
 
 from BaseClasses import Item, MultiWorld, ItemClassification
-from .Options import get_option_value, is_option_enabled, the_witness_options
-
 from .locations import ID_START, WitnessPlayerLocations
 from .player_logic import WitnessPlayerLogic
 from .static_logic import ItemDefinition, DoorItemDefinition, ProgressiveItemDefinition, ItemCategory, \
     StaticWitnessLogic, WeightedItemDefinition
 from .utils import build_weighted_int_list
 
+if TYPE_CHECKING:
+    from . import WitnessWorld
+
 NUM_ENERGY_UPGRADES = 4
 
 
@@ -59,7 +61,7 @@ class StaticWitnessItems:
                 classification = ItemClassification.progression
                 StaticWitnessItems.item_groups.setdefault("Doors", []).append(item_name)
             elif definition.category is ItemCategory.LASER:
-                classification = ItemClassification.progression
+                classification = ItemClassification.progression_skip_balancing
                 StaticWitnessItems.item_groups.setdefault("Lasers", []).append(item_name)
             elif definition.category is ItemCategory.USEFUL:
                 classification = ItemClassification.useful
@@ -90,11 +92,12 @@ class WitnessPlayerItems:
     Class that defines Items for a single world
     """
 
-    def __init__(self, multiworld: MultiWorld, player: int, logic: WitnessPlayerLogic, locat: WitnessPlayerLocations):
+    def __init__(self, world: "WitnessWorld", logic: WitnessPlayerLogic, locat: WitnessPlayerLocations):
         """Adds event items after logic changes due to options"""
 
-        self._world: MultiWorld = multiworld
-        self._player_id: int = player
+        self._world: "WitnessWorld" = world
+        self._multiworld: MultiWorld = world.multiworld
+        self._player_id: int = world.player
         self._logic: WitnessPlayerLogic = logic
         self._locations: WitnessPlayerLocations = locat
 
@@ -102,28 +105,48 @@ class WitnessPlayerItems:
         self.item_data: Dict[str, ItemData] = copy.deepcopy(StaticWitnessItems.item_data)
 
         # Remove all progression items that aren't actually in the game.
-        self.item_data = {name: data for (name, data) in self.item_data.items()
-                          if data.classification is not ItemClassification.progression or
-                          name in logic.PROG_ITEMS_ACTUALLY_IN_THE_GAME}
+        self.item_data = {
+            name: data for (name, data) in self.item_data.items()
+            if data.classification not in
+            {ItemClassification.progression, ItemClassification.progression_skip_balancing}
+            or name in logic.PROG_ITEMS_ACTUALLY_IN_THE_GAME
+        }
 
         # Adjust item classifications based on game settings.
-        eps_shuffled = get_option_value(self._world, self._player_id, "shuffle_EPs") != 0
+        eps_shuffled = self._world.options.shuffle_EPs
+        come_to_you = self._world.options.elevators_come_to_you
+        difficulty = self._world.options.puzzle_randomization
         for item_name, item_data in self.item_data.items():
-            if not eps_shuffled and item_name in ["Monastery Garden Entry (Door)", "Monastery Shortcuts"]:
+            if not eps_shuffled and item_name in {"Monastery Garden Entry (Door)",
+                                                  "Monastery Shortcuts",
+                                                  "Quarry Boathouse Hook Control (Panel)",
+                                                  "Windmill Turn Control (Panel)"}:
                 # Downgrade doors that only gate progress in EP shuffle.
                 item_data.classification = ItemClassification.useful
-            elif item_name in ["River Monastery Shortcut (Door)", "Jungle & River Shortcuts",
-                               "Monastery Shortcut (Door)",
-                               "Orchard Second Gate (Door)"]:
+            elif not come_to_you and not eps_shuffled and item_name in {"Quarry Elevator Control (Panel)",
+                                                                        "Swamp Long Bridge (Panel)"}:
+                # These Bridges/Elevators are not logical access because they may leave you stuck.
+                item_data.classification = ItemClassification.useful
+            elif item_name in {"River Monastery Garden Shortcut (Door)",
+                               "Monastery Laser Shortcut (Door)",
+                               "Orchard Second Gate (Door)",
+                               "Jungle Bamboo Laser Shortcut (Door)",
+                               "Caves Elevator Controls (Panel)"}:
                 # Downgrade doors that don't gate progress.
                 item_data.classification = ItemClassification.useful
+            elif item_name == "Keep Pressure Plates 2 Exit (Door)" and not (difficulty == "none" and eps_shuffled):
+                # PP2EP requires the door in vanilla puzzles, otherwise it's unnecessary
+                item_data.classification = ItemClassification.useful
 
         # Build the mandatory item list.
         self._mandatory_items: Dict[str, int] = {}
 
         # Add progression items to the mandatory item list.
-        for item_name, item_data in {name: data for (name, data) in self.item_data.items()
-                                     if data.classification == ItemClassification.progression}.items():
+        progression_dict = {
+            name: data for (name, data) in self.item_data.items()
+            if data.classification in {ItemClassification.progression, ItemClassification.progression_skip_balancing}
+        }
+        for item_name, item_data in progression_dict.items():
             if isinstance(item_data.definition, ProgressiveItemDefinition):
                 num_progression = len(self._logic.MULTI_LISTS[item_name])
                 self._mandatory_items[item_name] = num_progression
@@ -170,7 +193,7 @@ class WitnessPlayerItems:
         remaining_quantity -= len(output)
 
         # Read trap configuration data.
-        trap_weight = get_option_value(self._world, self._player_id, "trap_percentage") / 100
+        trap_weight = self._world.options.trap_percentage / 100
         filler_weight = 1 - trap_weight
 
         # Add filler items to the list.
@@ -198,15 +221,14 @@ class WitnessPlayerItems:
         Returns items that are ideal for placing on extremely early checks, like the tutorial gate.
         """
         output: Set[str] = set()
-        if "shuffle_symbols" not in the_witness_options.keys() \
-                or is_option_enabled(self._world, self._player_id, "shuffle_symbols"):
-            if get_option_value(self._world, self._player_id, "shuffle_doors") > 0:
+        if self._world.options.shuffle_symbols:
+            if self._world.options.shuffle_doors:
                 output = {"Dots", "Black/White Squares", "Symmetry"}
             else:
                 output = {"Dots", "Black/White Squares", "Symmetry", "Shapers", "Stars"}
 
-            if is_option_enabled(self._world, self._player_id, "shuffle_discarded_panels"):
-                if get_option_value(self._world, self._player_id, "puzzle_randomization") == 1:
+            if self._world.options.shuffle_discarded_panels:
+                if self._world.options.puzzle_randomization == 1:
                     output.add("Arrows")
                 else:
                     output.add("Triangles")
@@ -217,7 +239,7 @@ class WitnessPlayerItems:
         # Remove items that are mentioned in any plando options. (Hopefully, in the future, plando will get resolved
         #   before create_items so that we'll be able to check placed items instead of just removing all items mentioned
         #   regardless of whether or not they actually wind up being manually placed.
-        for plando_setting in self._world.plando_items[self._player_id]:
+        for plando_setting in self._multiworld.plando_items[self._player_id]:
             if plando_setting.get("from_pool", True):
                 for item_setting_key in [key for key in ["item", "items"] if key in plando_setting]:
                     if type(plando_setting[item_setting_key]) is str:
@@ -243,6 +265,7 @@ class WitnessPlayerItems:
         for item_name, item_data in {name: data for name, data in self.item_data.items()
                                      if isinstance(data.definition, DoorItemDefinition)}.items():
             output += [int(hex_string, 16) for hex_string in item_data.definition.panel_id_hexes]
+
         return output
 
     def get_symbol_ids_not_in_pool(self) -> List[int]:
diff --git a/worlds/witness/locations.py b/worlds/witness/locations.py
index b33e276e3a..d20be27940 100644
--- a/worlds/witness/locations.py
+++ b/worlds/witness/locations.py
@@ -1,11 +1,14 @@
 """
 Defines constants for different types of locations in the game
 """
+from typing import TYPE_CHECKING
 
-from .Options import is_option_enabled, get_option_value
 from .player_logic import WitnessPlayerLogic
 from .static_logic import StaticWitnessLogic
 
+if TYPE_CHECKING:
+    from . import WitnessWorld
+
 
 ID_START = 158000
 
@@ -19,22 +22,29 @@ class StaticWitnessLocations:
         "Tutorial Front Left",
         "Tutorial Back Left",
         "Tutorial Back Right",
+        "Tutorial Patio Floor",
         "Tutorial Gate Open",
 
         "Outside Tutorial Vault Box",
         "Outside Tutorial Discard",
         "Outside Tutorial Shed Row 5",
         "Outside Tutorial Tree Row 9",
+        "Outside Tutorial Outpost Entry Panel",
+        "Outside Tutorial Outpost Exit Panel",
 
         "Glass Factory Discard",
         "Glass Factory Back Wall 5",
         "Glass Factory Front 3",
         "Glass Factory Melting 3",
 
+        "Symmetry Island Lower Panel",
         "Symmetry Island Right 5",
         "Symmetry Island Back 6",
         "Symmetry Island Left 7",
+        "Symmetry Island Upper Panel",
         "Symmetry Island Scenery Outlines 5",
+        "Symmetry Island Laser Yellow 3",
+        "Symmetry Island Laser Blue 3",
         "Symmetry Island Laser Panel",
 
         "Orchard Apple Tree 5",
@@ -49,9 +59,15 @@ class StaticWitnessLocations:
         "Desert Final Bent 3",
         "Desert Laser Panel",
 
+        "Quarry Entry 1 Panel",
+        "Quarry Entry 2 Panel",
+        "Quarry Stoneworks Entry Left Panel",
+        "Quarry Stoneworks Entry Right Panel",
         "Quarry Stoneworks Lower Row 6",
         "Quarry Stoneworks Upper Row 8",
+        "Quarry Stoneworks Control Room Left",
         "Quarry Stoneworks Control Room Right",
+        "Quarry Stoneworks Stairs Panel",
         "Quarry Boathouse Intro Right",
         "Quarry Boathouse Intro Left",
         "Quarry Boathouse Front Row 5",
@@ -84,15 +100,32 @@ class StaticWitnessLocations:
         "Monastery Inside 4",
         "Monastery Laser Panel",
 
+        "Town Cargo Box Entry Panel",
         "Town Cargo Box Discard",
         "Town Tall Hexagonal",
+        "Town Church Entry Panel",
         "Town Church Lattice",
+        "Town Maze Panel",
         "Town Rooftop Discard",
         "Town Red Rooftop 5",
         "Town Wooden Roof Lower Row 5",
         "Town Wooden Rooftop",
+        "Town Windmill Entry Panel",
+        "Town RGB House Entry Panel",
         "Town Laser Panel",
 
+        "Town RGB Room Left",
+        "Town RGB Room Right",
+        "Town Sound Room Right",
+
+        "Windmill Theater Entry Panel",
+        "Theater Exit Left Panel",
+        "Theater Exit Right Panel",
+        "Theater Tutorial Video",
+        "Theater Desert Video",
+        "Theater Jungle Video",
+        "Theater Shipwreck Video",
+        "Theater Mountain Video",
         "Theater Discard",
 
         "Jungle Discard",
@@ -102,24 +135,33 @@ class StaticWitnessLocations:
         "Jungle Laser Panel",
 
         "River Vault Box",
+        "River Monastery Garden Shortcut Panel",
 
+        "Bunker Entry Panel",
         "Bunker Intro Left 5",
         "Bunker Intro Back 4",
         "Bunker Glass Room 3",
         "Bunker UV Room 2",
         "Bunker Laser Panel",
 
+        "Swamp Entry Panel",
         "Swamp Intro Front 6",
         "Swamp Intro Back 8",
         "Swamp Between Bridges Near Row 4",
         "Swamp Cyan Underwater 5",
         "Swamp Platform Row 4",
+        "Swamp Platform Shortcut Right Panel",
         "Swamp Between Bridges Far Row 4",
         "Swamp Red Underwater 4",
+        "Swamp Purple Underwater",
         "Swamp Beyond Rotating Bridge 4",
         "Swamp Blue Underwater 5",
         "Swamp Laser Panel",
+        "Swamp Laser Shortcut Right Panel",
 
+        "Treehouse First Door Panel",
+        "Treehouse Second Door Panel",
+        "Treehouse Third Door Panel",
         "Treehouse Yellow Bridge 9",
         "Treehouse First Purple Bridge 5",
         "Treehouse Second Purple Bridge 7",
@@ -129,22 +171,11 @@ class StaticWitnessLocations:
         "Treehouse Laser Discard",
         "Treehouse Right Orange Bridge 12",
         "Treehouse Laser Panel",
+        "Treehouse Drawbridge Panel",
 
         "Mountainside Discard",
         "Mountainside Vault Box",
-
         "Mountaintop River Shape",
-        "Tutorial Patio Floor",
-        "Quarry Stoneworks Control Room Left",
-        "Theater Tutorial Video",
-        "Theater Desert Video",
-        "Theater Jungle Video",
-        "Theater Shipwreck Video",
-        "Theater Mountain Video",
-        "Town RGB Room Left",
-        "Town RGB Room Right",
-        "Town Sound Room Right",
-        "Swamp Purple Underwater",
 
         "First Hallway EP",
         "Tutorial Cloud EP",
@@ -316,6 +347,77 @@ class StaticWitnessLocations:
         "Town Obelisk Side 4",
         "Town Obelisk Side 5",
         "Town Obelisk Side 6",
+
+        "Caves Mountain Shortcut Panel",
+        "Caves Swamp Shortcut Panel",
+
+        "Caves Blue Tunnel Right First 4",
+        "Caves Blue Tunnel Left First 1",
+        "Caves Blue Tunnel Left Second 5",
+        "Caves Blue Tunnel Right Second 5",
+        "Caves Blue Tunnel Right Third 1",
+        "Caves Blue Tunnel Left Fourth 1",
+        "Caves Blue Tunnel Left Third 1",
+
+        "Caves First Floor Middle",
+        "Caves First Floor Right",
+        "Caves First Floor Left",
+        "Caves First Floor Grounded",
+        "Caves Lone Pillar",
+        "Caves First Wooden Beam",
+        "Caves Second Wooden Beam",
+        "Caves Third Wooden Beam",
+        "Caves Fourth Wooden Beam",
+        "Caves Right Upstairs Left Row 8",
+        "Caves Right Upstairs Right Row 3",
+        "Caves Left Upstairs Single",
+        "Caves Left Upstairs Left Row 5",
+
+        "Caves Challenge Entry Panel",
+        "Challenge Tunnels Entry Panel",
+
+        "Tunnels Vault Box",
+        "Theater Challenge Video",
+
+        "Tunnels Town Shortcut Panel",
+
+        "Caves Skylight EP",
+        "Challenge Water EP",
+        "Tunnels Theater Flowers EP",
+        "Tutorial Gate EP",
+
+        "Mountaintop Mountain Entry Panel",
+
+        "Mountain Floor 1 Light Bridge Controller",
+
+        "Mountain Floor 1 Right Row 5",
+        "Mountain Floor 1 Left Row 7",
+        "Mountain Floor 1 Back Row 3",
+        "Mountain Floor 1 Trash Pillar 2",
+        "Mountain Floor 2 Near Row 5",
+        "Mountain Floor 2 Far Row 6",
+
+        "Mountain Floor 2 Light Bridge Controller Near",
+        "Mountain Floor 2 Light Bridge Controller Far",
+
+        "Mountain Bottom Floor Yellow Bridge EP",
+        "Mountain Bottom Floor Blue Bridge EP",
+        "Mountain Floor 2 Pink Bridge EP",
+
+        "Mountain Floor 2 Elevator Discard",
+        "Mountain Bottom Floor Giant Puzzle",
+
+        "Mountain Bottom Floor Final Room Entry Left",
+        "Mountain Bottom Floor Final Room Entry Right",
+
+        "Mountain Bottom Floor Caves Entry Panel",
+
+        "Mountain Final Room Left Pillar 4",
+        "Mountain Final Room Right Pillar 4",
+
+        "Challenge Vault Box",
+        "Theater Challenge Video",
+        "Mountain Bottom Floor Discard",
     }
 
     OBELISK_SIDES = {
@@ -355,94 +457,30 @@ class StaticWitnessLocations:
         "Town Obelisk Side 6",
     }
 
-    CAVES_LOCATIONS = {
-        "Caves Blue Tunnel Right First 4",
-        "Caves Blue Tunnel Left First 1",
-        "Caves Blue Tunnel Left Second 5",
-        "Caves Blue Tunnel Right Second 5",
-        "Caves Blue Tunnel Right Third 1",
-        "Caves Blue Tunnel Left Fourth 1",
-        "Caves Blue Tunnel Left Third 1",
-
-        "Caves First Floor Middle",
-        "Caves First Floor Right",
-        "Caves First Floor Left",
-        "Caves First Floor Grounded",
-        "Caves Lone Pillar",
-        "Caves First Wooden Beam",
-        "Caves Second Wooden Beam",
-        "Caves Third Wooden Beam",
-        "Caves Fourth Wooden Beam",
-        "Caves Right Upstairs Left Row 8",
-        "Caves Right Upstairs Right Row 3",
-        "Caves Left Upstairs Single",
-        "Caves Left Upstairs Left Row 5",
-
-        "Tunnels Vault Box",
-        "Theater Challenge Video",
-
-        "Caves Skylight EP",
-        "Challenge Water EP",
-        "Tunnels Theater Flowers EP",
-        "Tutorial Gate EP",
-    }
-
-    MOUNTAIN_UNREACHABLE_FROM_BEHIND = {
-        "Mountaintop Trap Door Triple Exit",
-
-        "Mountain Floor 1 Right Row 5",
-        "Mountain Floor 1 Left Row 7",
-        "Mountain Floor 1 Back Row 3",
-        "Mountain Floor 1 Trash Pillar 2",
-        "Mountain Floor 2 Near Row 5",
-        "Mountain Floor 2 Far Row 6",
-
-        "Mountain Floor 2 Light Bridge Controller Near",
-        "Mountain Floor 2 Light Bridge Controller Far",
-
-        "Mountain Bottom Floor Yellow Bridge EP",
-        "Mountain Bottom Floor Blue Bridge EP",
-        "Mountain Floor 2 Pink Bridge EP",
-    }
-
-    MOUNTAIN_REACHABLE_FROM_BEHIND = {
-        "Mountain Floor 2 Elevator Discard",
-        "Mountain Bottom Floor Giant Puzzle",
-
-        "Mountain Final Room Left Pillar 4",
-        "Mountain Final Room Right Pillar 4",
-    }
-
-    MOUNTAIN_EXTRAS = {
-        "Challenge Vault Box",
-        "Theater Challenge Video",
-        "Mountain Bottom Floor Discard"
-    }
-
     ALL_LOCATIONS_TO_ID = dict()
 
     @staticmethod
-    def get_id(chex):
+    def get_id(chex: str):
         """
         Calculates the location ID for any given location
         """
 
-        return StaticWitnessLogic.CHECKS_BY_HEX[chex]["id"]
+        return StaticWitnessLogic.ENTITIES_BY_HEX[chex]["id"]
 
     @staticmethod
-    def get_event_name(panel_hex):
+    def get_event_name(panel_hex: str):
         """
         Returns the event name of any given panel.
         """
 
-        action = " Opened" if StaticWitnessLogic.CHECKS_BY_HEX[panel_hex]["panelType"] == "Door" else " Solved"
+        action = " Opened" if StaticWitnessLogic.ENTITIES_BY_HEX[panel_hex]["entityType"] == "Door" else " Solved"
 
-        return StaticWitnessLogic.CHECKS_BY_HEX[panel_hex]["checkName"] + action
+        return StaticWitnessLogic.ENTITIES_BY_HEX[panel_hex]["checkName"] + action
 
     def __init__(self):
         all_loc_to_id = {
             panel_obj["checkName"]: self.get_id(chex)
-            for chex, panel_obj in StaticWitnessLogic.CHECKS_BY_HEX.items()
+            for chex, panel_obj in StaticWitnessLogic.ENTITIES_BY_HEX.items()
             if panel_obj["id"]
         }
 
@@ -459,84 +497,44 @@ class WitnessPlayerLocations:
     Class that defines locations for a single player
     """
 
-    def __init__(self, world, player, player_logic: WitnessPlayerLogic):
+    def __init__(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic):
         """Defines locations AFTER logic changes due to options"""
 
         self.PANEL_TYPES_TO_SHUFFLE = {"General", "Laser"}
         self.CHECK_LOCATIONS = StaticWitnessLocations.GENERAL_LOCATIONS.copy()
 
-        doors = get_option_value(world, player, "shuffle_doors") >= 2
-        earlyutm = is_option_enabled(world, player, "early_secret_area")
-        victory = get_option_value(world, player, "victory_condition")
-        mount_lasers = get_option_value(world, player, "mountain_lasers")
-        chal_lasers = get_option_value(world, player, "challenge_lasers")
-        # laser_shuffle = get_option_value(world, player, "shuffle_lasers")
-
-        postgame = set()
-        postgame = postgame | StaticWitnessLocations.CAVES_LOCATIONS
-        postgame = postgame | StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND
-        postgame = postgame | StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND
-        postgame = postgame | StaticWitnessLocations.MOUNTAIN_EXTRAS
-
-        self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | postgame
-
-        mountain_enterable_from_top = victory == 0 or victory == 1 or (victory == 3 and chal_lasers > mount_lasers)
-
-        if earlyutm or doors:  # in non-doors, there is no way to get symbol-locked by the final pillars (currently)
-            postgame -= StaticWitnessLocations.CAVES_LOCATIONS
-
-        if (doors or earlyutm) and (victory == 0 or (victory == 2 and mount_lasers > chal_lasers)):
-            postgame -= {"Challenge Vault Box", "Theater Challenge Video"}
-
-        if doors or mountain_enterable_from_top:
-            postgame -= StaticWitnessLocations.MOUNTAIN_REACHABLE_FROM_BEHIND
-
-        if mountain_enterable_from_top:
-            postgame -= StaticWitnessLocations.MOUNTAIN_UNREACHABLE_FROM_BEHIND
-
-        if (victory == 0 and doors) or victory == 1 or (victory == 2 and mount_lasers > chal_lasers and doors):
-            postgame -= {"Mountain Bottom Floor Discard"}
-
-        if is_option_enabled(world, player, "shuffle_discarded_panels"):
+        if world.options.shuffle_discarded_panels:
             self.PANEL_TYPES_TO_SHUFFLE.add("Discard")
 
-        if is_option_enabled(world, player, "shuffle_vault_boxes"):
+        if world.options.shuffle_vault_boxes:
             self.PANEL_TYPES_TO_SHUFFLE.add("Vault")
 
-        if get_option_value(world, player, "shuffle_EPs") == 1:
+        if world.options.shuffle_EPs == 1:
             self.PANEL_TYPES_TO_SHUFFLE.add("EP")
-        elif get_option_value(world, player, "shuffle_EPs") == 2:
+        elif world.options.shuffle_EPs == 2:
             self.PANEL_TYPES_TO_SHUFFLE.add("Obelisk Side")
 
             for obelisk_loc in StaticWitnessLocations.OBELISK_SIDES:
-                obelisk_loc_hex = StaticWitnessLogic.CHECKS_BY_NAME[obelisk_loc]["checkHex"]
+                obelisk_loc_hex = StaticWitnessLogic.ENTITIES_BY_NAME[obelisk_loc]["entity_hex"]
                 if player_logic.REQUIREMENTS_BY_HEX[obelisk_loc_hex] == frozenset({frozenset()}):
                     self.CHECK_LOCATIONS.discard(obelisk_loc)
 
         self.CHECK_LOCATIONS = self.CHECK_LOCATIONS | player_logic.ADDED_CHECKS
 
-        if not is_option_enabled(world, player, "shuffle_postgame"):
-            self.CHECK_LOCATIONS -= postgame
-
-        self.CHECK_LOCATIONS -= {
-            StaticWitnessLogic.CHECKS_BY_HEX[panel]["checkName"]
-            for panel in player_logic.PRECOMPLETED_LOCATIONS
-        }
-
-        self.CHECK_LOCATIONS.discard(StaticWitnessLogic.CHECKS_BY_HEX[player_logic.VICTORY_LOCATION]["checkName"])
+        self.CHECK_LOCATIONS.discard(StaticWitnessLogic.ENTITIES_BY_HEX[player_logic.VICTORY_LOCATION]["checkName"])
 
         self.CHECK_LOCATIONS = self.CHECK_LOCATIONS - {
-            StaticWitnessLogic.CHECKS_BY_HEX[check_hex]["checkName"]
-            for check_hex in player_logic.COMPLETELY_DISABLED_CHECKS
+            StaticWitnessLogic.ENTITIES_BY_HEX[entity_hex]["checkName"]
+            for entity_hex in player_logic.COMPLETELY_DISABLED_ENTITIES | player_logic.PRECOMPLETED_LOCATIONS
         }
 
         self.CHECK_PANELHEX_TO_ID = {
-            StaticWitnessLogic.CHECKS_BY_NAME[ch]["checkHex"]: StaticWitnessLocations.ALL_LOCATIONS_TO_ID[ch]
+            StaticWitnessLogic.ENTITIES_BY_NAME[ch]["entity_hex"]: StaticWitnessLocations.ALL_LOCATIONS_TO_ID[ch]
             for ch in self.CHECK_LOCATIONS
-            if StaticWitnessLogic.CHECKS_BY_NAME[ch]["panelType"] in self.PANEL_TYPES_TO_SHUFFLE
+            if StaticWitnessLogic.ENTITIES_BY_NAME[ch]["entityType"] in self.PANEL_TYPES_TO_SHUFFLE
         }
 
-        dog_hex = StaticWitnessLogic.CHECKS_BY_NAME["Town Pet the Dog"]["checkHex"]
+        dog_hex = StaticWitnessLogic.ENTITIES_BY_NAME["Town Pet the Dog"]["entity_hex"]
         dog_id = StaticWitnessLocations.ALL_LOCATIONS_TO_ID["Town Pet the Dog"]
         self.CHECK_PANELHEX_TO_ID[dog_hex] = dog_id
 
@@ -554,9 +552,14 @@ class WitnessPlayerLocations:
         }
 
         check_dict = {
-            StaticWitnessLogic.CHECKS_BY_HEX[location]["checkName"]:
-            StaticWitnessLocations.get_id(StaticWitnessLogic.CHECKS_BY_HEX[location]["checkHex"])
+            StaticWitnessLogic.ENTITIES_BY_HEX[location]["checkName"]:
+            StaticWitnessLocations.get_id(StaticWitnessLogic.ENTITIES_BY_HEX[location]["entity_hex"])
             for location in self.CHECK_PANELHEX_TO_ID
         }
 
         self.CHECK_LOCATION_TABLE = {**self.EVENT_LOCATION_TABLE, **check_dict}
+
+    def add_location_late(self, entity_name: str):
+        entity_hex = StaticWitnessLogic.ENTITIES_BY_NAME[entity_name]["entity_hex"]
+        self.CHECK_LOCATION_TABLE[entity_hex] = entity_name
+        self.CHECK_PANELHEX_TO_ID[entity_hex] = StaticWitnessLocations.get_id(entity_hex)
diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index be1a34aedf..e1ef1ae431 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -16,22 +16,22 @@ When the world has parsed its options, a second function is called to finalize t
 """
 
 import copy
-from typing import Set, Dict, cast, List
+from collections import defaultdict
+from typing import cast, TYPE_CHECKING
 from logging import warning
 
-from BaseClasses import MultiWorld
 from .static_logic import StaticWitnessLogic, DoorItemDefinition, ItemCategory, ProgressiveItemDefinition
-from .utils import define_new_region, get_disable_unrandomized_list, parse_lambda, get_early_utm_list, \
-    get_symbol_shuffle_list, get_door_panel_shuffle_list, get_doors_complex_list, get_doors_max_list, \
-    get_doors_simple_list, get_laser_shuffle, get_ep_all_individual, get_ep_obelisks, get_ep_easy, get_ep_no_eclipse, \
-    get_ep_no_caves, get_ep_no_mountain, get_ep_no_videos
-from .Options import is_option_enabled, get_option_value, the_witness_options
+from .utils import *
+
+if TYPE_CHECKING:
+    from . import WitnessWorld
 
 
 class WitnessPlayerLogic:
     """WITNESS LOGIC CLASS"""
 
-    def reduce_req_within_region(self, panel_hex):
+    @lru_cache(maxsize=None)
+    def reduce_req_within_region(self, panel_hex: str) -> FrozenSet[FrozenSet[str]]:
         """
         Panels in this game often only turn on when other panels are solved.
         Those other panels may have different item requirements.
@@ -40,14 +40,14 @@ class WitnessPlayerLogic:
         Panels outside of the same region will still be checked manually.
         """
 
-        if panel_hex in self.COMPLETELY_DISABLED_CHECKS or panel_hex in self.PRECOMPLETED_LOCATIONS:
+        if panel_hex in self.COMPLETELY_DISABLED_ENTITIES or panel_hex in self.IRRELEVANT_BUT_NOT_DISABLED_ENTITIES:
             return frozenset()
 
-        check_obj = self.REFERENCE_LOGIC.CHECKS_BY_HEX[panel_hex]
+        entity_obj = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[panel_hex]
 
         these_items = frozenset({frozenset()})
 
-        if check_obj["id"]:
+        if entity_obj["id"]:
             these_items = self.DEPENDENT_REQUIREMENTS_BY_HEX[panel_hex]["items"]
 
         these_items = frozenset({
@@ -58,6 +58,8 @@ class WitnessPlayerLogic:
         for subset in these_items:
             self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI.update(subset)
 
+        these_panels = self.DEPENDENT_REQUIREMENTS_BY_HEX[panel_hex]["panels"]
+
         if panel_hex in self.DOOR_ITEMS_BY_ID:
             door_items = frozenset({frozenset([item]) for item in self.DOOR_ITEMS_BY_ID[panel_hex]})
 
@@ -68,14 +70,25 @@ class WitnessPlayerLogic:
                 for items_option in these_items:
                     all_options.add(items_option.union(dependentItem))
 
-            if panel_hex != "0x28A0D":
-                return frozenset(all_options)
-            else:  # 0x28A0D depends on another entity for *non-power* reasons -> This dependency needs to be preserved
+            # 0x28A0D depends on another entity for *non-power* reasons -> This dependency needs to be preserved,
+            # except in Expert, where that dependency doesn't exist, but now there *is* a power dependency.
+            # In the future, it would be wise to make a distinction between "power dependencies" and other dependencies.
+            if panel_hex == "0x28A0D" and not any("0x28998" in option for option in these_panels):
                 these_items = all_options
 
-        these_panels = self.DEPENDENT_REQUIREMENTS_BY_HEX[panel_hex]["panels"]
+            # Another dependency that is not power-based: The Symmetry Island Upper Panel latches
+            elif panel_hex == "0x1C349":
+                these_items = all_options
 
-        these_panels = frozenset({panels - self.PRECOMPLETED_LOCATIONS for panels in these_panels})
+            # For any other door entity, we just return a set with the item that opens it & disregard power dependencies
+            else:
+                return frozenset(all_options)
+
+        disabled_eps = {eHex for eHex in self.COMPLETELY_DISABLED_ENTITIES
+                        if self.REFERENCE_LOGIC.ENTITIES_BY_HEX[eHex]["entityType"] == "EP"}
+
+        these_panels = frozenset({panels - disabled_eps
+                                  for panels in these_panels})
 
         if these_panels == frozenset({frozenset()}):
             return these_items
@@ -85,40 +98,30 @@ class WitnessPlayerLogic:
         for option in these_panels:
             dependent_items_for_option = frozenset({frozenset()})
 
-            for option_panel in option:
-                dep_obj = self.REFERENCE_LOGIC.CHECKS_BY_HEX.get(option_panel)
+            for option_entity in option:
+                dep_obj = self.REFERENCE_LOGIC.ENTITIES_BY_HEX.get(option_entity)
 
-                if option_panel in self.COMPLETELY_DISABLED_CHECKS:
-                    new_items = frozenset()
-                elif option_panel in {"7 Lasers", "11 Lasers", "PP2 Weirdness", "Theater to Tunnels"}:
-                    new_items = frozenset({frozenset([option_panel])})
-                # If a panel turns on when a panel in a different region turns on,
-                # the latter panel will be an "event panel", unless it ends up being
-                # a location itself. This prevents generation failures.
-                elif dep_obj["region"]["name"] != check_obj["region"]["name"]:
-                    new_items = frozenset({frozenset([option_panel])})
-                    self.EVENT_PANELS_FROM_PANELS.add(option_panel)
-                elif option_panel in self.ALWAYS_EVENT_NAMES_BY_HEX.keys():
-                    new_items = frozenset({frozenset([option_panel])})
-                    self.EVENT_PANELS_FROM_PANELS.add(option_panel)
+                if option_entity in self.EVENT_NAMES_BY_HEX:
+                    new_items = frozenset({frozenset([option_entity])})
+                elif option_entity in {"7 Lasers", "11 Lasers", "PP2 Weirdness", "Theater to Tunnels"}:
+                    new_items = frozenset({frozenset([option_entity])})
                 else:
-                    new_items = self.reduce_req_within_region(option_panel)
+                    new_items = self.reduce_req_within_region(option_entity)
+                    if dep_obj["region"] and entity_obj["region"] != dep_obj["region"]:
+                        new_items = frozenset(
+                            frozenset(possibility | {dep_obj["region"]["name"]})
+                            for possibility in new_items
+                        )
 
-                updated_items = set()
-
-                for items_option in dependent_items_for_option:
-                    for items_option2 in new_items:
-                        updated_items.add(items_option.union(items_option2))
-
-                dependent_items_for_option = updated_items
+                dependent_items_for_option = dnf_and([dependent_items_for_option, new_items])
 
             for items_option in these_items:
                 for dependentItem in dependent_items_for_option:
                     all_options.add(items_option.union(dependentItem))
 
-        return frozenset(all_options)
+        return dnf_remove_redundancies(frozenset(all_options))
 
-    def make_single_adjustment(self, adj_type, line):
+    def make_single_adjustment(self, adj_type: str, line: str):
         from . import StaticWitnessItems
         """Makes a single logic adjustment based on additional logic file"""
 
@@ -148,9 +151,9 @@ class WitnessPlayerLogic:
 
             self.THEORETICAL_ITEMS.discard(item_name)
             if isinstance(StaticWitnessLogic.all_items[item_name], ProgressiveItemDefinition):
-                self.THEORETICAL_ITEMS_NO_MULTI\
-                    .difference_update(cast(ProgressiveItemDefinition,
-                                            StaticWitnessLogic.all_items[item_name]).child_item_names)
+                self.THEORETICAL_ITEMS_NO_MULTI.difference_update(
+                    cast(ProgressiveItemDefinition, StaticWitnessLogic.all_items[item_name]).child_item_names
+                )
             else:
                 self.THEORETICAL_ITEMS_NO_MULTI.discard(item_name)
 
@@ -165,25 +168,15 @@ class WitnessPlayerLogic:
 
         if adj_type == "Event Items":
             line_split = line.split(" - ")
+            new_event_name = line_split[0]
             hex_set = line_split[1].split(",")
 
+            for entity, event_name in self.EVENT_NAMES_BY_HEX.items():
+                if event_name == new_event_name:
+                    self.DONT_MAKE_EVENTS.add(entity)
+
             for hex_code in hex_set:
-                self.ALWAYS_EVENT_NAMES_BY_HEX[hex_code] = line_split[0]
-
-            """
-            Should probably do this differently...
-            Events right now depend on a panel.
-            That seems bad.
-            """
-
-            to_remove = set()
-
-            for hex_code, event_name in self.ALWAYS_EVENT_NAMES_BY_HEX.items():
-                if hex_code not in hex_set and event_name == line_split[0]:
-                    to_remove.add(hex_code)
-
-            for remove in to_remove:
-                del self.ALWAYS_EVENT_NAMES_BY_HEX[remove]
+                self.EVENT_NAMES_BY_HEX[hex_code] = new_event_name
 
             return
 
@@ -196,9 +189,10 @@ class WitnessPlayerLogic:
 
             if len(line_split) > 2:
                 required_items = parse_lambda(line_split[2])
-                items_actually_in_the_game = [item_name for item_name, item_definition
-                                              in StaticWitnessLogic.all_items.items()
-                                              if item_definition.category is ItemCategory.SYMBOL]
+                items_actually_in_the_game = [
+                    item_name for item_name, item_definition in StaticWitnessLogic.all_items.items()
+                    if item_definition.category is ItemCategory.SYMBOL
+                ]
                 required_items = frozenset(
                     subset.intersection(items_actually_in_the_game)
                     for subset in required_items
@@ -213,116 +207,204 @@ class WitnessPlayerLogic:
         if adj_type == "Disabled Locations":
             panel_hex = line[:7]
 
-            self.COMPLETELY_DISABLED_CHECKS.add(panel_hex)
+            self.COMPLETELY_DISABLED_ENTITIES.add(panel_hex)
+
+            return
+
+        if adj_type == "Irrelevant Locations":
+            panel_hex = line[:7]
+
+            self.IRRELEVANT_BUT_NOT_DISABLED_ENTITIES.add(panel_hex)
 
             return
 
         if adj_type == "Region Changes":
             new_region_and_options = define_new_region(line + ":")
-            
+
             self.CONNECTIONS_BY_REGION_NAME[new_region_and_options[0]["name"]] = new_region_and_options[1]
 
             return
 
+        if adj_type == "New Connections":
+            line_split = line.split(" - ")
+            source_region = line_split[0]
+            target_region = line_split[1]
+            panel_set_string = line_split[2]
+
+            for connection in self.CONNECTIONS_BY_REGION_NAME[source_region]:
+                if connection[0] == target_region:
+                    self.CONNECTIONS_BY_REGION_NAME[source_region].remove(connection)
+
+                    if panel_set_string == "TrueOneWay":
+                        self.CONNECTIONS_BY_REGION_NAME[source_region].add(
+                            (target_region, frozenset({frozenset(["TrueOneWay"])}))
+                        )
+                    else:
+                        new_lambda = connection[1] | parse_lambda(panel_set_string)
+                        self.CONNECTIONS_BY_REGION_NAME[source_region].add((target_region, new_lambda))
+                    break
+            else:  # Execute if loop did not break. TIL this is a thing you can do!
+                new_conn = (target_region, parse_lambda(panel_set_string))
+                self.CONNECTIONS_BY_REGION_NAME[source_region].add(new_conn)
+
         if adj_type == "Added Locations":
             if "0x" in line:
-                line = StaticWitnessLogic.CHECKS_BY_HEX[line]["checkName"]
+                line = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[line]["checkName"]
             self.ADDED_CHECKS.add(line)
 
-        if adj_type == "Precompleted Locations":
-            self.PRECOMPLETED_LOCATIONS.add(line)
-
-    def make_options_adjustments(self, world, player):
+    def make_options_adjustments(self, world: "WitnessWorld"):
         """Makes logic adjustments based on options"""
         adjustment_linesets_in_order = []
 
-        if get_option_value(world, player, "victory_condition") == 0:
+        # Postgame
+
+        doors = world.options.shuffle_doors >= 2
+        lasers = world.options.shuffle_lasers
+        early_caves = world.options.early_caves > 0
+        victory = world.options.victory_condition
+        mnt_lasers = world.options.mountain_lasers
+        chal_lasers = world.options.challenge_lasers
+
+        mountain_enterable_from_top = victory == 0 or victory == 1 or (victory == 3 and chal_lasers > mnt_lasers)
+
+        if not world.options.shuffle_postgame:
+            if not (early_caves or doors):
+                adjustment_linesets_in_order.append(get_caves_exclusion_list())
+                if not victory == 1:
+                    adjustment_linesets_in_order.append(get_path_to_challenge_exclusion_list())
+                    adjustment_linesets_in_order.append(get_challenge_vault_box_exclusion_list())
+                    adjustment_linesets_in_order.append(get_beyond_challenge_exclusion_list())
+
+            if not ((doors or early_caves) and (victory == 0 or (victory == 2 and mnt_lasers > chal_lasers))):
+                adjustment_linesets_in_order.append(get_beyond_challenge_exclusion_list())
+                if not victory == 1:
+                    adjustment_linesets_in_order.append(get_challenge_vault_box_exclusion_list())
+
+            if not (doors or mountain_enterable_from_top):
+                adjustment_linesets_in_order.append(get_mountain_lower_exclusion_list())
+
+            if not mountain_enterable_from_top:
+                adjustment_linesets_in_order.append(get_mountain_upper_exclusion_list())
+
+            if not ((victory == 0 and doors) or victory == 1 or (victory == 2 and mnt_lasers > chal_lasers and doors)):
+                if doors:
+                    adjustment_linesets_in_order.append(get_bottom_floor_discard_exclusion_list())
+                else:
+                    adjustment_linesets_in_order.append(get_bottom_floor_discard_nondoors_exclusion_list())
+
+            if victory == 2 and chal_lasers >= mnt_lasers:
+                adjustment_linesets_in_order.append(["Disabled Locations:", "0xFFF00 (Mountain Box Long)"])
+
+        # Exclude Discards / Vaults
+
+        if not world.options.shuffle_discarded_panels:
+            # In disable_non_randomized, the discards are needed for alternate activation triggers, UNLESS both
+            # (remote) doors and lasers are shuffled.
+            if not world.options.disable_non_randomized_puzzles or (doors and lasers):
+                adjustment_linesets_in_order.append(get_discard_exclusion_list())
+
+            if doors:
+                adjustment_linesets_in_order.append(get_bottom_floor_discard_exclusion_list())
+
+        if not world.options.shuffle_vault_boxes:
+            adjustment_linesets_in_order.append(get_vault_exclusion_list())
+            if not victory == 1:
+                adjustment_linesets_in_order.append(get_challenge_vault_box_exclusion_list())
+
+        # Victory Condition
+
+        if victory == 0:
             self.VICTORY_LOCATION = "0x3D9A9"
-        elif get_option_value(world, player, "victory_condition") == 1:
+        elif victory == 1:
             self.VICTORY_LOCATION = "0x0356B"
-        elif get_option_value(world, player, "victory_condition") == 2:
+        elif victory == 2:
             self.VICTORY_LOCATION = "0x09F7F"
-        elif get_option_value(world, player, "victory_condition") == 3:
+        elif victory == 3:
             self.VICTORY_LOCATION = "0xFFF00"
 
-        if get_option_value(world, player, "challenge_lasers") <= 7:
+        if chal_lasers <= 7:
             adjustment_linesets_in_order.append([
                 "Requirement Changes:",
                 "0xFFF00 - 11 Lasers - True",
             ])
 
-        if is_option_enabled(world, player, "disable_non_randomized_puzzles"):
+        if world.options.disable_non_randomized_puzzles:
             adjustment_linesets_in_order.append(get_disable_unrandomized_list())
 
-        if is_option_enabled(world, player, "shuffle_symbols") or "shuffle_symbols" not in the_witness_options.keys():
+        if world.options.shuffle_symbols:
             adjustment_linesets_in_order.append(get_symbol_shuffle_list())
 
-        if get_option_value(world, player, "EP_difficulty") == 0:
+        if world.options.EP_difficulty == 0:
             adjustment_linesets_in_order.append(get_ep_easy())
-        elif get_option_value(world, player, "EP_difficulty") == 1:
+        elif world.options.EP_difficulty == 1:
             adjustment_linesets_in_order.append(get_ep_no_eclipse())
 
-        if not is_option_enabled(world, player, "shuffle_vault_boxes"):
-            adjustment_linesets_in_order.append(get_ep_no_videos())
+        if world.options.door_groupings == 1:
+            if world.options.shuffle_doors == 1:
+                adjustment_linesets_in_order.append(get_simple_panels())
+            elif world.options.shuffle_doors == 2:
+                adjustment_linesets_in_order.append(get_simple_doors())
+            elif world.options.shuffle_doors == 3:
+                adjustment_linesets_in_order.append(get_simple_doors())
+                adjustment_linesets_in_order.append(get_simple_additional_panels())
+        else:
+            if world.options.shuffle_doors == 1:
+                adjustment_linesets_in_order.append(get_complex_door_panels())
+                adjustment_linesets_in_order.append(get_complex_additional_panels())
+            elif world.options.shuffle_doors == 2:
+                adjustment_linesets_in_order.append(get_complex_doors())
+            elif world.options.shuffle_doors == 3:
+                adjustment_linesets_in_order.append(get_complex_doors())
+                adjustment_linesets_in_order.append(get_complex_additional_panels())
 
-        doors = get_option_value(world, player, "shuffle_doors") >= 2
-        earlyutm = is_option_enabled(world, player, "early_secret_area")
-        victory = get_option_value(world, player, "victory_condition")
-        mount_lasers = get_option_value(world, player, "mountain_lasers")
-        chal_lasers = get_option_value(world, player, "challenge_lasers")
+        if world.options.shuffle_boat:
+            adjustment_linesets_in_order.append(get_boat())
 
-        excluse_postgame = not is_option_enabled(world, player, "shuffle_postgame")
+        if world.options.early_caves == 2:
+            adjustment_linesets_in_order.append(get_early_caves_start_list())
 
-        if excluse_postgame and not (earlyutm or doors):
-            adjustment_linesets_in_order.append(get_ep_no_caves())
+        if world.options.early_caves == 1 and not doors:
+            adjustment_linesets_in_order.append(get_early_caves_list())
 
-        mountain_enterable_from_top = victory == 0 or victory == 1 or (victory == 3 and chal_lasers > mount_lasers)
-        if excluse_postgame and not mountain_enterable_from_top:
-            adjustment_linesets_in_order.append(get_ep_no_mountain())
-
-        if get_option_value(world, player, "shuffle_doors") == 1:
-            adjustment_linesets_in_order.append(get_door_panel_shuffle_list())
-
-        if get_option_value(world, player, "shuffle_doors") == 2:
-            adjustment_linesets_in_order.append(get_doors_simple_list())
-
-        if get_option_value(world, player, "shuffle_doors") == 3:
-            adjustment_linesets_in_order.append(get_doors_complex_list())
-
-        if get_option_value(world, player, "shuffle_doors") == 4:
-            adjustment_linesets_in_order.append(get_doors_max_list())
-
-        if is_option_enabled(world, player, "early_secret_area"):
-            adjustment_linesets_in_order.append(get_early_utm_list())
+        if world.options.elevators_come_to_you:
+            adjustment_linesets_in_order.append(get_elevators_come_to_you())
 
         for item in self.YAML_ADDED_ITEMS:
             adjustment_linesets_in_order.append(["Items:", item])
 
-        if is_option_enabled(world, player, "shuffle_lasers"):
+        if lasers:
             adjustment_linesets_in_order.append(get_laser_shuffle())
 
-        if get_option_value(world, player, "shuffle_EPs") == 0:  # No EP Shuffle
-            adjustment_linesets_in_order.append(["Disabled Locations:"] + get_ep_all_individual()[1:])
+        if world.options.shuffle_EPs == "obelisk_sides":
+            ep_gen = ((ep_hex, ep_obj) for (ep_hex, ep_obj) in self.REFERENCE_LOGIC.ENTITIES_BY_HEX.items()
+                      if ep_obj["entityType"] == "EP")
+
+            for ep_hex, ep_obj in ep_gen:
+                obelisk = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[self.REFERENCE_LOGIC.EP_TO_OBELISK_SIDE[ep_hex]]
+                obelisk_name = obelisk["checkName"]
+                ep_name = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[ep_hex]["checkName"]
+                self.EVENT_NAMES_BY_HEX[ep_hex] = f"{obelisk_name} - {ep_name}"
+        else:
             adjustment_linesets_in_order.append(["Disabled Locations:"] + get_ep_obelisks()[1:])
 
-        elif get_option_value(world, player, "shuffle_EPs") == 1:  # Individual EPs
-            adjustment_linesets_in_order.append(["Disabled Locations:"] + get_ep_obelisks()[1:])
+        if world.options.shuffle_EPs == 0:
+            adjustment_linesets_in_order.append(["Irrelevant Locations:"] + get_ep_all_individual()[1:])
 
         yaml_disabled_eps = []
 
         for yaml_disabled_location in self.YAML_DISABLED_LOCATIONS:
-            if yaml_disabled_location not in StaticWitnessLogic.CHECKS_BY_NAME:
+            if yaml_disabled_location not in self.REFERENCE_LOGIC.ENTITIES_BY_NAME:
                 continue
 
-            loc_obj = StaticWitnessLogic.CHECKS_BY_NAME[yaml_disabled_location]
+            loc_obj = self.REFERENCE_LOGIC.ENTITIES_BY_NAME[yaml_disabled_location]
 
-            if loc_obj["panelType"] == "EP" and get_option_value(world, player, "shuffle_EPs") == 2:
-                yaml_disabled_eps.append(loc_obj["checkHex"])
+            if loc_obj["entityType"] == "EP" and world.options.shuffle_EPs != 0:
+                yaml_disabled_eps.append(loc_obj["entity_hex"])
 
-            if loc_obj["panelType"] in {"EP", "General"}:
-                self.EXCLUDED_LOCATIONS.add(loc_obj["checkHex"])
+            if loc_obj["entityType"] in {"EP", "General", "Vault", "Discard"}:
+                self.EXCLUDED_LOCATIONS.add(loc_obj["entity_hex"])
 
-        adjustment_linesets_in_order.append(["Precompleted Locations:"] + yaml_disabled_eps)
+        adjustment_linesets_in_order.append(["Disabled Locations:"] + yaml_disabled_eps)
 
         for adjustment_lineset in adjustment_linesets_in_order:
             current_adjustment_type = None
@@ -337,15 +419,19 @@ class WitnessPlayerLogic:
 
                 self.make_single_adjustment(current_adjustment_type, line)
 
+        for entity_id in self.COMPLETELY_DISABLED_ENTITIES:
+            if entity_id in self.DOOR_ITEMS_BY_ID:
+                del self.DOOR_ITEMS_BY_ID[entity_id]
+
     def make_dependency_reduced_checklist(self):
         """
         Turns dependent check set into semi-independent check set
         """
 
-        for check_hex in self.DEPENDENT_REQUIREMENTS_BY_HEX.keys():
-            indep_requirement = self.reduce_req_within_region(check_hex)
+        for entity_hex in self.DEPENDENT_REQUIREMENTS_BY_HEX.keys():
+            indep_requirement = self.reduce_req_within_region(entity_hex)
 
-            self.REQUIREMENTS_BY_HEX[check_hex] = indep_requirement
+            self.REQUIREMENTS_BY_HEX[entity_hex] = indep_requirement
 
         for item in self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI:
             if item not in self.THEORETICAL_ITEMS:
@@ -360,71 +446,76 @@ class WitnessPlayerLogic:
             else:
                 self.PROG_ITEMS_ACTUALLY_IN_THE_GAME.add(item)
 
-    def make_event_item_pair(self, panel):
+        for region, connections in self.CONNECTIONS_BY_REGION_NAME.items():
+            new_connections = []
+
+            for connection in connections:
+                overall_requirement = frozenset()
+
+                for option in connection[1]:
+                    individual_entity_requirements = []
+                    for entity in option:
+                        if entity in self.EVENT_NAMES_BY_HEX or entity not in self.REFERENCE_LOGIC.ENTITIES_BY_HEX:
+                            individual_entity_requirements.append(frozenset({frozenset({entity})}))
+                        else:
+                            entity_req = self.reduce_req_within_region(entity)
+
+                            if self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity]["region"]:
+                                region_name = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[entity]["region"]["name"]
+                                entity_req = dnf_and([entity_req, frozenset({frozenset({region_name})})])
+
+                            individual_entity_requirements.append(entity_req)
+
+                    overall_requirement |= dnf_and(individual_entity_requirements)
+
+                new_connections.append((connection[0], overall_requirement))
+
+            self.CONNECTIONS_BY_REGION_NAME[region] = new_connections
+
+    def make_event_item_pair(self, panel: str):
         """
         Makes a pair of an event panel and its event item
         """
-        action = " Opened" if StaticWitnessLogic.CHECKS_BY_HEX[panel]["panelType"] == "Door" else " Solved"
+        action = " Opened" if self.REFERENCE_LOGIC.ENTITIES_BY_HEX[panel]["entityType"] == "Door" else " Solved"
 
-        name = StaticWitnessLogic.CHECKS_BY_HEX[panel]["checkName"] + action
-        if panel not in self.EVENT_ITEM_NAMES:
-            if StaticWitnessLogic.CHECKS_BY_HEX[panel]["panelType"] == "EP":
-                obelisk = StaticWitnessLogic.CHECKS_BY_HEX[StaticWitnessLogic.EP_TO_OBELISK_SIDE[panel]]["checkName"]
-
-                self.EVENT_ITEM_NAMES[panel] = obelisk + " - " + StaticWitnessLogic.CHECKS_BY_HEX[panel]["checkName"]
-
-            else:
-                warning("Panel \"" + name + "\" does not have an associated event name.")
-                self.EVENT_ITEM_NAMES[panel] = name + " Event"
-        pair = (name, self.EVENT_ITEM_NAMES[panel])
+        name = self.REFERENCE_LOGIC.ENTITIES_BY_HEX[panel]["checkName"] + action
+        if panel not in self.EVENT_NAMES_BY_HEX:
+            warning("Panel \"" + name + "\" does not have an associated event name.")
+            self.EVENT_NAMES_BY_HEX[panel] = name + " Event"
+        pair = (name, self.EVENT_NAMES_BY_HEX[panel])
         return pair
 
     def make_event_panel_lists(self):
-        """
-        Special event panel data structures
-        """
+        self.EVENT_NAMES_BY_HEX[self.VICTORY_LOCATION] = "Victory"
 
-        self.ALWAYS_EVENT_NAMES_BY_HEX[self.VICTORY_LOCATION] = "Victory"
-
-        for region_name, connections in self.CONNECTIONS_BY_REGION_NAME.items():
-            for connection in connections:
-                for panel_req in connection[1]:
-                    for panel in panel_req:
-                        if panel == "TrueOneWay":
-                            continue
-
-                        if self.REFERENCE_LOGIC.CHECKS_BY_HEX[panel]["region"]["name"] != region_name:
-                            self.EVENT_PANELS_FROM_REGIONS.add(panel)
-
-        self.EVENT_PANELS.update(self.EVENT_PANELS_FROM_PANELS)
-        self.EVENT_PANELS.update(self.EVENT_PANELS_FROM_REGIONS)
-
-        for always_hex, always_item in self.ALWAYS_EVENT_NAMES_BY_HEX.items():
-            self.ALWAYS_EVENT_HEX_CODES.add(always_hex)
-            self.EVENT_PANELS.add(always_hex)
-            self.EVENT_ITEM_NAMES[always_hex] = always_item
+        for event_hex, event_name in self.EVENT_NAMES_BY_HEX.items():
+            if event_hex in self.COMPLETELY_DISABLED_ENTITIES or event_hex in self.IRRELEVANT_BUT_NOT_DISABLED_ENTITIES:
+                continue
+            self.EVENT_PANELS.add(event_hex)
 
         for panel in self.EVENT_PANELS:
             pair = self.make_event_item_pair(panel)
             self.EVENT_ITEM_PAIRS[pair[0]] = pair[1]
 
-    def __init__(self, world: MultiWorld, player: int, disabled_locations: Set[str], start_inv: Dict[str, int]):
+    def __init__(self, world: "WitnessWorld", disabled_locations: Set[str], start_inv: Dict[str, int]):
         self.YAML_DISABLED_LOCATIONS = disabled_locations
         self.YAML_ADDED_ITEMS = start_inv
 
         self.EVENT_PANELS_FROM_PANELS = set()
         self.EVENT_PANELS_FROM_REGIONS = set()
 
+        self.IRRELEVANT_BUT_NOT_DISABLED_ENTITIES = set()
+
         self.THEORETICAL_ITEMS = set()
         self.THEORETICAL_ITEMS_NO_MULTI = set()
-        self.MULTI_AMOUNTS = dict()
+        self.MULTI_AMOUNTS = defaultdict(lambda: 1)
         self.MULTI_LISTS = dict()
         self.PROG_ITEMS_ACTUALLY_IN_THE_GAME_NO_MULTI = set()
         self.PROG_ITEMS_ACTUALLY_IN_THE_GAME = set()
-        self.DOOR_ITEMS_BY_ID: Dict[str, List[int]] = {}
+        self.DOOR_ITEMS_BY_ID: Dict[str, List[str]] = {}
         self.STARTING_INVENTORY = set()
 
-        self.DIFFICULTY = get_option_value(world, player, "puzzle_randomization")
+        self.DIFFICULTY = world.options.puzzle_randomization.value
 
         if self.DIFFICULTY == 0:
             self.REFERENCE_LOGIC = StaticWitnessLogic.sigma_normal
@@ -441,106 +532,30 @@ class WitnessPlayerLogic:
         # At the end, we will have EVENT_ITEM_PAIRS for all the necessary ones.
         self.EVENT_PANELS = set()
         self.EVENT_ITEM_PAIRS = dict()
-        self.ALWAYS_EVENT_HEX_CODES = set()
-        self.COMPLETELY_DISABLED_CHECKS = set()
+        self.DONT_MAKE_EVENTS = set()
+        self.COMPLETELY_DISABLED_ENTITIES = set()
         self.PRECOMPLETED_LOCATIONS = set()
         self.EXCLUDED_LOCATIONS = set()
         self.ADDED_CHECKS = set()
         self.VICTORY_LOCATION = "0x0356B"
-        self.EVENT_ITEM_NAMES = {
-            "0x09D9B": "Monastery Shutters Open",
-            "0x193A6": "Monastery Laser Panel Activates",
-            "0x00037": "Monastery Branch Panels Activate",
-            "0x0A079": "Access to Bunker Laser",
-            "0x0A3B5": "Door to Tutorial Discard Opens",
-            "0x00139": "Keep Hedges 1 Knowledge",
-            "0x019DC": "Keep Hedges 2 Knowledge",
-            "0x019E7": "Keep Hedges 3 Knowledge",
-            "0x01A0F": "Keep Hedges 4 Knowledge",
-            "0x033EA": "Pressure Plates 1 Knowledge",
-            "0x01BE9": "Pressure Plates 2 Knowledge",
-            "0x01CD3": "Pressure Plates 3 Knowledge",
-            "0x01D3F": "Pressure Plates 4 Knowledge",
-            "0x09F7F": "Mountain Access",
-            "0x0367C": "Quarry Laser Stoneworks Requirement Met",
-            "0x009A1": "Swamp Between Bridges Far 1 Activates",
-            "0x00006": "Swamp Cyan Water Drains",
-            "0x00990": "Swamp Between Bridges Near Row 1 Activates",
-            "0x0A8DC": "Intro 6 Activates",
-            "0x0000A": "Swamp Beyond Rotating Bridge 1 Access",
-            "0x09E86": "Mountain Floor 2 Blue Bridge Access",
-            "0x09ED8": "Mountain Floor 2 Yellow Bridge Access",
-            "0x0A3D0": "Quarry Laser Boathouse Requirement Met",
-            "0x00596": "Swamp Red Water Drains",
-            "0x00E3A": "Swamp Purple Water Drains",
-            "0x0343A": "Door to Symmetry Island Powers On",
-            "0xFFF00": "Mountain Bottom Floor Discard Turns On",
-            "0x17CA6": "All Boat Panels Turn On",
-            "0x17CDF": "All Boat Panels Turn On",
-            "0x09DB8": "All Boat Panels Turn On",
-            "0x17C95": "All Boat Panels Turn On",
-            "0x0A054": "Couch EP solvable",
-            "0x03BB0": "Town Church Lattice Vision From Outside",
-            "0x28AC1": "Town Wooden Rooftop Turns On",
-            "0x28A69": "Town Tower 1st Door Opens",
-            "0x28ACC": "Town Tower 2nd Door Opens",
-            "0x28AD9": "Town Tower 3rd Door Opens",
-            "0x28B39": "Town Tower 4th Door Opens",
-            "0x03675": "Quarry Stoneworks Ramp Activation From Above",
-            "0x03679": "Quarry Stoneworks Lift Lowering While Standing On It",
-            "0x2FAF6": "Tutorial Gate Secret Solution Knowledge",
-            "0x079DF": "Town Tall Hexagonal Turns On",
-            "0x17DA2": "Right Orange Bridge Fully Extended",
-            "0x19B24": "Shadows Intro Patterns Visible",
-            "0x2700B": "Open Door to Treehouse Laser House",
-            "0x00055": "Orchard Apple Trees 4 Turns On",
-            "0x17DDB": "Left Orange Bridge Fully Extended",
-            "0x03535": "Shipwreck Video Pattern Knowledge",
-            "0x03542": "Mountain Video Pattern Knowledge",
-            "0x0339E": "Desert Video Pattern Knowledge",
-            "0x03481": "Tutorial Video Pattern Knowledge",
-            "0x03702": "Jungle Video Pattern Knowledge",
-            "0x0356B": "Challenge Video Pattern Knowledge",
-            "0x0A15F": "Desert Laser Panel Shutters Open (1)",
-            "0x012D7": "Desert Laser Panel Shutters Open (2)",
-            "0x03613": "Treehouse Orange Bridge 13 Turns On",
-            "0x17DEC": "Treehouse Laser House Access Requirement",
-            "0x03C08": "Town Church Entry Opens",
-            "0x17D02": "Windmill Blades Spinning",
-            "0x0A0C9": "Cargo Box EP completable",
-            "0x09E39": "Pink Light Bridge Extended",
-            "0x17CC4": "Rails EP available",
-            "0x2896A": "Bridge Underside EP available",
-            "0x00064": "First Tunnel EP visible",
-            "0x03553": "Tutorial Video EPs availble",
-            "0x17C79": "Bunker Door EP available",
-            "0x275FF": "Stoneworks Light EPs available",
-            "0x17E2B": "Remaining Purple Sand EPs available",
-            "0x03852": "Ramp EPs requirement",
-            "0x334D8": "RGB panels & EPs solvable",
-            "0x03750": "Left Garden EP available",
-            "0x03C0C": "RGB Flowers EP requirement",
-            "0x01CD5": "Pressure Plates 3 EP requirement",
-            "0x3865F": "Ramp EPs access requirement",
-        }
 
-        self.ALWAYS_EVENT_NAMES_BY_HEX = {
-            "0x00509": "Symmetry Laser Activation",
-            "0x012FB": "Desert Laser Activation",
+        self.EVENT_NAMES_BY_HEX = {
+            "0x00509": "+1 Laser (Symmetry Laser)",
+            "0x012FB": "+1 Laser (Desert Laser)",
             "0x09F98": "Desert Laser Redirection",
-            "0x01539": "Quarry Laser Activation",
-            "0x181B3": "Shadows Laser Activation",
-            "0x014BB": "Keep Laser Activation",
-            "0x17C65": "Monastery Laser Activation",
-            "0x032F9": "Town Laser Activation",
-            "0x00274": "Jungle Laser Activation",
-            "0x0C2B2": "Bunker Laser Activation",
-            "0x00BF6": "Swamp Laser Activation",
-            "0x028A4": "Treehouse Laser Activation",
-            "0x09F7F": "Mountaintop Trap Door Turns On",
-            "0x17C34": "Mountain Access",
+            "0x01539": "+1 Laser (Quarry Laser)",
+            "0x181B3": "+1 Laser (Shadows Laser)",
+            "0x014BB": "+1 Laser (Keep Laser)",
+            "0x17C65": "+1 Laser (Monastery Laser)",
+            "0x032F9": "+1 Laser (Town Laser)",
+            "0x00274": "+1 Laser (Jungle Laser)",
+            "0x0C2B2": "+1 Laser (Bunker Laser)",
+            "0x00BF6": "+1 Laser (Swamp Laser)",
+            "0x028A4": "+1 Laser (Treehouse Laser)",
+            "0x09F7F": "Mountain Entry",
+            "0xFFF00": "Bottom Floor Discard Turns On",
         }
 
-        self.make_options_adjustments(world, player)
+        self.make_options_adjustments(world)
         self.make_dependency_reduced_checklist()
         self.make_event_panel_lists()
diff --git a/worlds/witness/regions.py b/worlds/witness/regions.py
index 0e15cafe10..e097024805 100644
--- a/worlds/witness/regions.py
+++ b/worlds/witness/regions.py
@@ -2,13 +2,17 @@
 Defines Region for The Witness, assigns locations to them,
 and connects them with the proper requirements
 """
+from typing import FrozenSet, TYPE_CHECKING, Dict, Tuple, List
 
-from BaseClasses import MultiWorld, Entrance
+from BaseClasses import Entrance, Region
+from Utils import KeyedDefaultDict
 from .static_logic import StaticWitnessLogic
-from .Options import get_option_value
 from .locations import WitnessPlayerLocations, StaticWitnessLocations
 from .player_logic import WitnessPlayerLogic
 
+if TYPE_CHECKING:
+    from . import WitnessWorld
+
 
 class WitnessRegions:
     """Class that defines Witness Regions"""
@@ -16,62 +20,81 @@ class WitnessRegions:
     locat = None
     logic = None
 
-    def make_lambda(self, panel_hex_to_solve_set, world, player, player_logic):
+    @staticmethod
+    def make_lambda(item_requirement: FrozenSet[FrozenSet[str]], world: "WitnessWorld"):
+        from .rules import _meets_item_requirements
+
         """
         Lambdas are made in a for loop, so the values have to be captured
         This function is for that purpose
         """
 
-        return lambda state: state._witness_can_solve_panels(
-            panel_hex_to_solve_set, world, player, player_logic, self.locat
-        )
+        return _meets_item_requirements(item_requirement, world)
 
-    def connect(self, world: MultiWorld, player: int, source: str, target: str, player_logic: WitnessPlayerLogic,
-                panel_hex_to_solve_set=frozenset({frozenset()}), backwards: bool = False):
+    def connect_if_possible(self, world: "WitnessWorld", source: str, target: str, req: FrozenSet[FrozenSet[str]],
+                            regions_by_name: Dict[str, Region], backwards: bool = False):
         """
         connect two regions and set the corresponding requirement
         """
-        source_region = world.get_region(source, player)
-        target_region = world.get_region(target, player)
+
+        # Remove any possibilities where being in the target region would be required anyway.
+        real_requirement = frozenset({option for option in req if target not in option})
+
+        # There are some connections that should only be done one way. If this is a backwards connection, check for that
+        if backwards:
+            real_requirement = frozenset({option for option in real_requirement if "TrueOneWay" not in option})
+
+        # Dissolve any "True" or "TrueOneWay"
+        real_requirement = frozenset({option - {"True", "TrueOneWay"} for option in real_requirement})
+
+        # If there is no way to actually use this connection, don't even bother making it.
+        if not real_requirement:
+            return
+
+        # We don't need to check for the accessibility of the source region.
+        final_requirement = frozenset({option - frozenset({source}) for option in real_requirement})
+
+        source_region = regions_by_name[source]
+        target_region = regions_by_name[target]
 
         backwards = " Backwards" if backwards else ""
+        connection_name = source + " to " + target + backwards
 
         connection = Entrance(
-            player,
-            source + " to " + target + backwards,
+            world.player,
+            connection_name,
             source_region
         )
 
-        connection.access_rule = self.make_lambda(panel_hex_to_solve_set, world, player, player_logic)
+        connection.access_rule = self.make_lambda(final_requirement, world)
 
         source_region.exits.append(connection)
         connection.connect(target_region)
 
-    def create_regions(self, world, player: int, player_logic: WitnessPlayerLogic):
+        self.created_entrances[source, target].append(connection)
+
+        # Register any necessary indirect connections
+        mentioned_regions = {
+            single_unlock for option in final_requirement for single_unlock in option
+            if single_unlock in self.reference_logic.ALL_REGIONS_BY_NAME
+        }
+
+        for dependent_region in mentioned_regions:
+            world.multiworld.register_indirect_condition(regions_by_name[dependent_region], connection)
+
+    def create_regions(self, world: "WitnessWorld", player_logic: WitnessPlayerLogic):
         """
         Creates all the regions for The Witness
         """
         from . import create_region
 
-        world.regions += [
-            create_region(world, player, 'Menu', self.locat, None, ["The Splashscreen?"]),
-        ]
-
-        difficulty = get_option_value(world, player, "puzzle_randomization")
-
-        if difficulty == 1:
-            reference_logic = StaticWitnessLogic.sigma_expert
-        elif difficulty == 0:
-            reference_logic = StaticWitnessLogic.sigma_normal
-        else:
-            reference_logic = StaticWitnessLogic.vanilla
-
         all_locations = set()
+        regions_by_name = dict()
 
-        for region_name, region in reference_logic.ALL_REGIONS_BY_NAME.items():
+        for region_name, region in self.reference_logic.ALL_REGIONS_BY_NAME.items():
             locations_for_this_region = [
-                reference_logic.CHECKS_BY_HEX[panel]["checkName"] for panel in region["panels"]
-                if reference_logic.CHECKS_BY_HEX[panel]["checkName"] in self.locat.CHECK_LOCATION_TABLE
+                self.reference_logic.ENTITIES_BY_HEX[panel]["checkName"] for panel in region["panels"]
+                if self.reference_logic.ENTITIES_BY_HEX[panel]["checkName"] in self.locat.CHECK_LOCATION_TABLE
             ]
             locations_for_this_region += [
                 StaticWitnessLocations.get_event_name(panel) for panel in region["panels"]
@@ -80,34 +103,45 @@ class WitnessRegions:
 
             all_locations = all_locations | set(locations_for_this_region)
 
-            world.regions += [
-                create_region(world, player, region_name, self.locat, locations_for_this_region)
-            ]
+            new_region = create_region(world, region_name, self.locat, locations_for_this_region)
 
-        for region_name, region in reference_logic.ALL_REGIONS_BY_NAME.items():
+            regions_by_name[region_name] = new_region
+
+        for region_name, region in self.reference_logic.ALL_REGIONS_BY_NAME.items():
             for connection in player_logic.CONNECTIONS_BY_REGION_NAME[region_name]:
-                if connection[1] == frozenset({frozenset(["TrueOneWay"])}):
-                    self.connect(world, player, region_name, connection[0], player_logic, frozenset({frozenset()}))
+                self.connect_if_possible(world, region_name, connection[0], connection[1], regions_by_name)
+                self.connect_if_possible(world, connection[0], region_name, connection[1], regions_by_name, True)
+
+        # find regions that are completely disconnected from the start node and remove them
+        regions_to_check = {"Menu"}
+        reachable_regions = {"Menu"}
+
+        while regions_to_check:
+            next_region = regions_to_check.pop()
+            region_obj = regions_by_name[next_region]
+
+            for exit in region_obj.exits:
+                target = exit.connected_region
+
+                if target.name in reachable_regions:
                     continue
 
-                backwards_connections = set()
+                regions_to_check.add(target.name)
+                reachable_regions.add(target.name)
 
-                for subset in connection[1]:
-                    if all({panel in player_logic.DOOR_ITEMS_BY_ID for panel in subset}):
-                        if all({reference_logic.CHECKS_BY_HEX[panel]["id"] is None for panel in subset}):
-                            backwards_connections.add(subset)
+        final_regions_list = [v for k, v in regions_by_name.items() if k in reachable_regions]
 
-                if backwards_connections:
-                    self.connect(
-                        world, player, connection[0], region_name, player_logic,
-                        frozenset(backwards_connections), True
-                    )
+        world.multiworld.regions += final_regions_list
 
-                self.connect(world, player, region_name, connection[0], player_logic, connection[1])
+    def __init__(self, locat: WitnessPlayerLocations, world: "WitnessWorld"):
+        difficulty = world.options.puzzle_randomization.value
 
-        world.get_entrance("The Splashscreen?", player).connect(
-            world.get_region('First Hallway', player)
-        )
+        if difficulty == 0:
+            self.reference_logic = StaticWitnessLogic.sigma_normal
+        elif difficulty == 1:
+            self.reference_logic = StaticWitnessLogic.sigma_expert
+        elif difficulty == 2:
+            self.reference_logic = StaticWitnessLogic.vanilla
 
-    def __init__(self, locat: WitnessPlayerLocations):
         self.locat = locat
+        self.created_entrances: Dict[Tuple[str, str], List[Entrance]] = KeyedDefaultDict(lambda _: [])
diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py
index 4cf3054af6..75c662ac0f 100644
--- a/worlds/witness/rules.py
+++ b/worlds/witness/rules.py
@@ -3,223 +3,218 @@ Defines the rules by which locations can be accessed,
 depending on the items received
 """
 
-# pylint: disable=E1101
+from typing import TYPE_CHECKING, Callable, FrozenSet
 
-from BaseClasses import MultiWorld
+from BaseClasses import CollectionState
 from .player_logic import WitnessPlayerLogic
-from .Options import is_option_enabled, get_option_value
 from .locations import WitnessPlayerLocations
-from . import StaticWitnessLogic
-from worlds.AutoWorld import LogicMixin
+from . import StaticWitnessLogic, WitnessRegions
 from worlds.generic.Rules import set_rule
 
+if TYPE_CHECKING:
+    from . import WitnessWorld
 
-class WitnessLogic(LogicMixin):
+laser_hexes = [
+    "0x028A4",
+    "0x00274",
+    "0x032F9",
+    "0x01539",
+    "0x181B3",
+    "0x0C2B2",
+    "0x00509",
+    "0x00BF6",
+    "0x014BB",
+    "0x012FB",
+    "0x17C65",
+]
+
+
+def _has_laser(laser_hex: str, world: "WitnessWorld", player: int) -> Callable[[CollectionState], bool]:
+    if laser_hex == "0x012FB":
+        return lambda state: (
+            _can_solve_panel(laser_hex, world, world.player, world.player_logic, world.locat)(state)
+            and state.has("Desert Laser Redirection", player)
+        )
+    else:
+        return _can_solve_panel(laser_hex, world, world.player, world.player_logic, world.locat)
+
+
+def _has_lasers(amount: int, world: "WitnessWorld") -> Callable[[CollectionState], bool]:
+    laser_lambdas = []
+
+    for laser_hex in laser_hexes:
+        has_laser_lambda = _has_laser(laser_hex, world, world.player)
+
+        laser_lambdas.append(has_laser_lambda)
+
+    return lambda state: sum(laser_lambda(state) for laser_lambda in laser_lambdas) >= amount
+
+
+def _can_solve_panel(panel: str, world: "WitnessWorld", player: int, player_logic: WitnessPlayerLogic,
+                     locat: WitnessPlayerLocations) -> Callable[[CollectionState], bool]:
     """
-    Logic macros that get reused
+    Determines whether a panel can be solved
     """
 
-    def _witness_has_lasers(self, world, player: int, amount: int) -> bool:
-        regular_lasers = not is_option_enabled(world, player, "shuffle_lasers")
+    panel_obj = player_logic.REFERENCE_LOGIC.ENTITIES_BY_HEX[panel]
+    entity_name = panel_obj["checkName"]
 
-        lasers = 0
-
-        place_names = [
-            "Symmetry", "Desert", "Town", "Monastery", "Keep",
-            "Quarry", "Treehouse", "Jungle", "Bunker", "Swamp", "Shadows"
-        ]
-
-        for place in place_names:
-            has_laser = self.has(place + " Laser", player)
-
-            has_laser = has_laser or (regular_lasers and self.has(place + " Laser Activation", player))
-
-            if place == "Desert":
-                has_laser = has_laser and self.has("Desert Laser Redirection", player)
-
-            lasers += int(has_laser)
-
-        return lasers >= amount
-
-    def _witness_can_solve_panel(self, panel, world, player, player_logic: WitnessPlayerLogic, locat):
-        """
-        Determines whether a panel can be solved
-        """
-
-        panel_obj = StaticWitnessLogic.CHECKS_BY_HEX[panel]
-        check_name = panel_obj["checkName"]
-
-        if (check_name + " Solved" in locat.EVENT_LOCATION_TABLE
-                and not self.has(player_logic.EVENT_ITEM_PAIRS[check_name + " Solved"], player)):
-            return False
-        if (check_name + " Solved" not in locat.EVENT_LOCATION_TABLE
-                and not self._witness_meets_item_requirements(panel, world, player, player_logic, locat)):
-            return False
-        return True
-
-    def _witness_meets_item_requirements(self, panel, world, player, player_logic: WitnessPlayerLogic, locat):
-        """
-        Checks whether item and panel requirements are met for
-        a panel
-        """
-
-        panel_req = player_logic.REQUIREMENTS_BY_HEX[panel]
-
-        for option in panel_req:
-            if len(option) == 0:
-                return True
-
-            valid_option = True
-
-            for item in option:
-                if item == "7 Lasers":
-                    laser_req = get_option_value(world, player, "mountain_lasers")
-
-                    if not self._witness_has_lasers(world, player, laser_req):
-                        valid_option = False
-                        break
-                elif item == "11 Lasers":
-                    laser_req = get_option_value(world, player, "challenge_lasers")
-
-                    if not self._witness_has_lasers(world, player, laser_req):
-                        valid_option = False
-                        break
-                elif item == "PP2 Weirdness":
-                    hedge_2_access = (
-                        self.can_reach("Keep 2nd Maze to Keep", "Entrance", player)
-                        or self.can_reach("Keep to Keep 2nd Maze", "Entrance", player)
-                    )
-
-                    hedge_3_access = (
-                        self.can_reach("Keep 3rd Maze to Keep", "Entrance", player)
-                        or self.can_reach("Keep 2nd Maze to Keep 3rd Maze", "Entrance", player)
-                        and hedge_2_access
-                    )
-
-                    hedge_4_access = (
-                        self.can_reach("Keep 4th Maze to Keep", "Entrance", player)
-                        or self.can_reach("Keep 3rd Maze to Keep 4th Maze", "Entrance", player)
-                        and hedge_3_access
-                    )
-
-                    hedge_access = (
-                        self.can_reach("Keep 4th Maze to Keep Tower", "Entrance", player)
-                        and self.can_reach("Keep", "Region", player)
-                        and hedge_4_access
-                    )
-
-                    backwards_to_fourth = (
-                        self.can_reach("Keep", "Region", player)
-                        and self.can_reach("Keep 4th Pressure Plate to Keep Tower", "Entrance", player)
-                        and (
-                            self.can_reach("Keep Tower to Keep", "Entrance", player)
-                            or hedge_access
-                        )
-                    )
-                    
-                    shadows_shortcut = (
-                        self.can_reach("Main Island", "Region", player)
-                        and self.can_reach("Keep 4th Pressure Plate to Shadows", "Entrance", player)
-                    )
-
-                    backwards_access = (
-                        self.can_reach("Keep 3rd Pressure Plate to Keep 4th Pressure Plate", "Entrance", player)
-                        and (backwards_to_fourth or shadows_shortcut)
-                    )
-
-                    front_access = (
-                        self.can_reach("Keep to Keep 2nd Pressure Plate", 'Entrance', player)
-                        and self.can_reach("Keep", "Region", player)
-                    )
-
-                    if not (front_access and backwards_access):
-                        valid_option = False
-                        break
-                elif item == "Theater to Tunnels":
-                    direct_access = (
-                        self.can_reach("Tunnels to Windmill Interior", "Entrance", player)
-                        and self.can_reach("Windmill Interior to Theater", "Entrance", player)
-                    )
-
-                    theater_from_town = (
-                        self.can_reach("Town to Windmill Interior", "Entrance", player)
-                        and self.can_reach("Windmill Interior to Theater", "Entrance", player)
-                        or self.can_reach("Theater to Town", "Entrance", player)
-                    )
-
-                    tunnels_from_town = (
-                        self.can_reach("Tunnels to Windmill Interior", "Entrance", player)
-                        and self.can_reach("Town to Windmill Interior", "Entrance", player)
-                        or self.can_reach("Tunnels to Town", "Entrance", player)
-                    )
-
-                    if not (direct_access or theater_from_town and tunnels_from_town):
-                        valid_option = False
-                        break
-                elif item in player_logic.EVENT_PANELS:
-                    if not self._witness_can_solve_panel(item, world, player, player_logic, locat):
-                        valid_option = False
-                        break
-                elif not self.has(item, player):
-                    # The player doesn't have the item. Check to see if it's part of a progressive item and, if so, the
-                    #   player has enough of that.
-                    prog_item = StaticWitnessLogic.get_parent_progressive_item(item)
-                    if prog_item is item or not self.has(prog_item, player, player_logic.MULTI_AMOUNTS[item]):
-                        valid_option = False
-                        break
-
-            if valid_option:
-                return True
-
-        return False
-
-    def _witness_can_solve_panels(self, panel_hex_to_solve_set, world, player, player_logic: WitnessPlayerLogic, locat):
-        """
-        Checks whether a set of panels can be solved.
-        """
-
-        for option in panel_hex_to_solve_set:
-            if len(option) == 0:
-                return True
-
-            valid_option = True
-
-            for panel in option:
-                if not self._witness_can_solve_panel(panel, world, player, player_logic, locat):
-                    valid_option = False
-                    break
-
-            if valid_option:
-                return True
-        return False
+    if entity_name + " Solved" in locat.EVENT_LOCATION_TABLE:
+        return lambda state: state.has(player_logic.EVENT_ITEM_PAIRS[entity_name + " Solved"], player)
+    else:
+        return make_lambda(panel, world)
 
 
-def make_lambda(check_hex, world, player, player_logic, locat):
-    """
-    Lambdas are created in a for loop so values need to be captured
-    """
-    return lambda state: state._witness_meets_item_requirements(
-        check_hex, world, player, player_logic, locat
+def _can_move_either_direction(state: CollectionState, source: str, target: str, regio: WitnessRegions) -> bool:
+    entrance_forward = regio.created_entrances[source, target]
+    entrance_backward = regio.created_entrances[target, source]
+
+    return (
+        any(entrance.can_reach(state) for entrance in entrance_forward)
+        or
+        any(entrance.can_reach(state) for entrance in entrance_backward)
     )
 
 
-def set_rules(world: MultiWorld, player: int, player_logic: WitnessPlayerLogic, locat: WitnessPlayerLocations):
+def _can_do_expert_pp2(state: CollectionState, world: "WitnessWorld") -> bool:
+    player = world.player
+
+    hedge_2_access = (
+        _can_move_either_direction(state, "Keep 2nd Maze", "Keep", world.regio)
+    )
+
+    hedge_3_access = (
+            _can_move_either_direction(state, "Keep 3rd Maze", "Keep", world.regio)
+            or _can_move_either_direction(state, "Keep 3rd Maze", "Keep 2nd Maze", world.regio)
+            and hedge_2_access
+    )
+
+    hedge_4_access = (
+            _can_move_either_direction(state, "Keep 4th Maze", "Keep", world.regio)
+            or _can_move_either_direction(state, "Keep 4th Maze", "Keep 3rd Maze", world.regio)
+            and hedge_3_access
+    )
+
+    hedge_access = (
+            _can_move_either_direction(state, "Keep 4th Maze", "Keep Tower", world.regio)
+            and state.can_reach("Keep", "Region", player)
+            and hedge_4_access
+    )
+
+    backwards_to_fourth = (
+            state.can_reach("Keep", "Region", player)
+            and _can_move_either_direction(state, "Keep 4th Pressure Plate", "Keep Tower", world.regio)
+            and (
+                    _can_move_either_direction(state, "Keep", "Keep Tower", world.regio)
+                    or hedge_access
+            )
+    )
+
+    shadows_shortcut = (
+            state.can_reach("Main Island", "Region", player)
+            and _can_move_either_direction(state, "Keep 4th Pressure Plate", "Shadows", world.regio)
+    )
+
+    backwards_access = (
+            _can_move_either_direction(state, "Keep 3rd Pressure Plate", "Keep 4th Pressure Plate", world.regio)
+            and (backwards_to_fourth or shadows_shortcut)
+    )
+
+    front_access = (
+            _can_move_either_direction(state, "Keep 2nd Pressure Plate", "Keep", world.regio)
+            and state.can_reach("Keep", "Region", player)
+    )
+
+    return front_access and backwards_access
+
+
+def _can_do_theater_to_tunnels(state: CollectionState, world: "WitnessWorld") -> bool:
+    direct_access = (
+            _can_move_either_direction(state, "Tunnels", "Windmill Interior", world.regio)
+            and _can_move_either_direction(state, "Theater", "Windmill Interior", world.regio)
+    )
+
+    theater_from_town = (
+            _can_move_either_direction(state, "Town", "Windmill Interior", world.regio)
+            and _can_move_either_direction(state, "Theater", "Windmill Interior", world.regio)
+            or _can_move_either_direction(state, "Town", "Theater", world.regio)
+    )
+
+    tunnels_from_town = (
+            _can_move_either_direction(state, "Tunnels", "Windmill Interior", world.regio)
+            and _can_move_either_direction(state, "Town", "Windmill Interior", world.regio)
+            or _can_move_either_direction(state, "Tunnels", "Town", world.regio)
+    )
+
+    return direct_access or theater_from_town and tunnels_from_town
+
+
+def _has_item(item: str, world: "WitnessWorld", player: int,
+              player_logic: WitnessPlayerLogic, locat: WitnessPlayerLocations) -> Callable[[CollectionState], bool]:
+    if item in player_logic.REFERENCE_LOGIC.ALL_REGIONS_BY_NAME:
+        return lambda state: state.can_reach(item, "Region", player)
+    if item == "7 Lasers":
+        laser_req = world.options.mountain_lasers.value
+        return _has_lasers(laser_req, world)
+    if item == "11 Lasers":
+        laser_req = world.options.challenge_lasers.value
+        return _has_lasers(laser_req, world)
+    elif item == "PP2 Weirdness":
+        return lambda state: _can_do_expert_pp2(state, world)
+    elif item == "Theater to Tunnels":
+        return lambda state: _can_do_theater_to_tunnels(state, world)
+    if item in player_logic.EVENT_PANELS:
+        return _can_solve_panel(item, world, player, player_logic, locat)
+
+    prog_item = StaticWitnessLogic.get_parent_progressive_item(item)
+    return lambda state: state.has(prog_item, player, player_logic.MULTI_AMOUNTS[item])
+
+
+def _meets_item_requirements(requirements: FrozenSet[FrozenSet[str]],
+                             world: "WitnessWorld") -> Callable[[CollectionState], bool]:
+    """
+    Checks whether item and panel requirements are met for
+    a panel
+    """
+
+    lambda_conversion = [
+        [_has_item(item, world, world.player, world.player_logic, world.locat) for item in subset]
+        for subset in requirements
+    ]
+
+    return lambda state: any(
+        all(condition(state) for condition in sub_requirement)
+        for sub_requirement in lambda_conversion
+    )
+
+
+def make_lambda(entity_hex: str, world: "WitnessWorld") -> Callable[[CollectionState], bool]:
+    """
+    Lambdas are created in a for loop so values need to be captured
+    """
+    entity_req = world.player_logic.REQUIREMENTS_BY_HEX[entity_hex]
+
+    return _meets_item_requirements(entity_req, world)
+
+
+def set_rules(world: "WitnessWorld"):
     """
     Sets all rules for all locations
     """
 
-    for location in locat.CHECK_LOCATION_TABLE:
+    for location in world.locat.CHECK_LOCATION_TABLE:
         real_location = location
 
-        if location in locat.EVENT_LOCATION_TABLE:
+        if location in world.locat.EVENT_LOCATION_TABLE:
             real_location = location[:-7]
 
-        panel = StaticWitnessLogic.CHECKS_BY_NAME[real_location]
-        check_hex = panel["checkHex"]
+        associated_entity = world.player_logic.REFERENCE_LOGIC.ENTITIES_BY_NAME[real_location]
+        entity_hex = associated_entity["entity_hex"]
 
-        rule = make_lambda(check_hex, world, player, player_logic, locat)
+        rule = make_lambda(entity_hex, world)
 
-        set_rule(world.get_location(location, player), rule)
+        location = world.multiworld.get_location(location, world.player)
 
-    world.completion_condition[player] = \
-        lambda state: state.has('Victory', player)
+        set_rule(location, rule)
+
+    world.multiworld.completion_condition[world.player] = lambda state: state.has('Victory', world.player)
diff --git a/worlds/witness/settings/Door_Panel_Shuffle.txt b/worlds/witness/settings/Door_Panel_Shuffle.txt
deleted file mode 100644
index 80195cfb99..0000000000
--- a/worlds/witness/settings/Door_Panel_Shuffle.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Items:
-Glass Factory Entry (Panel)
-Symmetry Island Lower (Panel)
-Symmetry Island Upper (Panel)
-Desert Light Room Entry (Panel)
-Desert Flood Controls (Panel)
-Quarry Stoneworks Entry (Panel)
-Quarry Stoneworks Ramp Controls (Panel)
-Quarry Stoneworks Lift Controls (Panel)
-Quarry Boathouse Ramp Height Control (Panel)
-Quarry Boathouse Ramp Horizontal Control (Panel)
-Shadows Door Timer (Panel)
-Monastery Entry Left (Panel)
-Monastery Entry Right (Panel)
-Town Tinted Glass Door (Panel)
-Town Church Entry (Panel)
-Town Maze Panel (Drop-Down Staircase) (Panel)
-Windmill Entry (Panel)
-Treehouse First & Second Doors (Panel)
-Treehouse Third Door (Panel)
-Treehouse Laser House Door Timer (Panel)
-Treehouse Drawbridge (Panel)
-Jungle Popup Wall (Panel)
-Bunker Entry (Panel)
-Bunker Tinted Glass Door (Panel)
-Bunker Elevator Control (Panel)
-Swamp Entry (Panel)
-Swamp Sliding Bridge (Panel)
-Swamp Rotating Bridge (Panel)
-Swamp Maze Control (Panel)
-Boat
\ No newline at end of file
diff --git a/worlds/witness/settings/Door_Shuffle/Boat.txt b/worlds/witness/settings/Door_Shuffle/Boat.txt
new file mode 100644
index 0000000000..6494b455cf
--- /dev/null
+++ b/worlds/witness/settings/Door_Shuffle/Boat.txt
@@ -0,0 +1,2 @@
+Items:
+Boat
\ No newline at end of file
diff --git a/worlds/witness/settings/Door_Shuffle/Complex_Additional_Panels.txt b/worlds/witness/settings/Door_Shuffle/Complex_Additional_Panels.txt
new file mode 100644
index 0000000000..79bda7ea22
--- /dev/null
+++ b/worlds/witness/settings/Door_Shuffle/Complex_Additional_Panels.txt
@@ -0,0 +1,25 @@
+Items:
+Desert Flood Controls (Panel)
+Desert Light Control (Panel)
+Quarry Elevator Control (Panel)
+Quarry Stoneworks Ramp Controls (Panel)
+Quarry Stoneworks Lift Controls (Panel)
+Quarry Boathouse Ramp Height Control (Panel)
+Quarry Boathouse Ramp Horizontal Control (Panel)
+Quarry Boathouse Hook Control (Panel)
+Monastery Shutters Control (Panel)
+Town Maze Rooftop Bridge (Panel)
+Town RGB Control (Panel)
+Windmill Turn Control (Panel)
+Theater Video Input (Panel)
+Bunker Drop-Down Door Controls (Panel)
+Bunker Elevator Control (Panel)
+Swamp Sliding Bridge (Panel)
+Swamp Rotating Bridge (Panel)
+Swamp Long Bridge (Panel)
+Swamp Maze Controls (Panel)
+Mountain Floor 1 Light Bridge (Panel)
+Mountain Floor 2 Light Bridge Near (Panel)
+Mountain Floor 2 Light Bridge Far (Panel)
+Mountain Floor 2 Elevator Control (Panel)
+Caves Elevator Controls (Panel)
\ No newline at end of file
diff --git a/worlds/witness/settings/Door_Shuffle/Complex_Door_Panels.txt b/worlds/witness/settings/Door_Shuffle/Complex_Door_Panels.txt
new file mode 100644
index 0000000000..4724039620
--- /dev/null
+++ b/worlds/witness/settings/Door_Shuffle/Complex_Door_Panels.txt
@@ -0,0 +1,38 @@
+Items:
+Glass Factory Entry (Panel)
+Tutorial Outpost Entry (Panel)
+Tutorial Outpost Exit (Panel)
+Symmetry Island Lower (Panel)
+Symmetry Island Upper (Panel)
+Desert Light Room Entry (Panel)
+Desert Flood Room Entry (Panel)
+Quarry Entry 1 (Panel)
+Quarry Entry 2 (Panel)
+Quarry Stoneworks Entry (Panel)
+Shadows Door Timer (Panel)
+Keep Hedge Maze 1 (Panel)
+Keep Hedge Maze 2 (Panel)
+Keep Hedge Maze 3 (Panel)
+Keep Hedge Maze 4 (Panel)
+Monastery Entry Left (Panel)
+Monastery Entry Right (Panel)
+Town RGB House Entry (Panel)
+Town Church Entry (Panel)
+Town Maze Stairs (Panel)
+Town Windmill Entry (Panel)
+Town Cargo Box Entry (Panel)
+Theater Entry (Panel)
+Theater Exit (Panel)
+Treehouse First & Second Doors (Panel)
+Treehouse Third Door (Panel)
+Treehouse Laser House Door Timer (Panel)
+Treehouse Drawbridge (Panel)
+Jungle Popup Wall (Panel)
+Bunker Entry (Panel)
+Bunker Tinted Glass Door (Panel)
+Swamp Entry (Panel)
+Swamp Platform Shortcut (Panel)
+Caves Entry (Panel)
+Challenge Entry (Panel)
+Tunnels Entry (Panel)
+Tunnels Town Shortcut (Panel)
\ No newline at end of file
diff --git a/worlds/witness/settings/Doors_Complex.txt b/worlds/witness/settings/Door_Shuffle/Complex_Doors.txt
similarity index 94%
rename from worlds/witness/settings/Doors_Complex.txt
rename to worlds/witness/settings/Door_Shuffle/Complex_Doors.txt
index d8da6783b0..2f2b321710 100644
--- a/worlds/witness/settings/Doors_Complex.txt
+++ b/worlds/witness/settings/Door_Shuffle/Complex_Doors.txt
@@ -12,6 +12,7 @@ Desert Light Room Entry (Door)
 Desert Pond Room Entry (Door)
 Desert Flood Room Entry (Door)
 Desert Elevator Room Entry (Door)
+Desert Elevator (Door)
 Quarry Entry 1 (Door)
 Quarry Entry 2 (Door)
 Quarry Stoneworks Entry (Door)
@@ -39,13 +40,13 @@ Keep Pressure Plates 3 Exit (Door)
 Keep Pressure Plates 4 Exit (Door)
 Keep Shadows Shortcut (Door)
 Keep Tower Shortcut (Door)
-Monastery Shortcut (Door)
+Monastery Laser Shortcut (Door)
 Monastery Entry Inner (Door)
 Monastery Entry Outer (Door)
 Monastery Garden Entry (Door)
 Town Cargo Box Entry (Door)
 Town Wooden Roof Stairs (Door)
-Town Tinted Glass Door
+Town RGB House Entry (Door)
 Town Church Entry (Door)
 Town Maze Stairs (Door)
 Town Windmill Entry (Door)
@@ -59,7 +60,7 @@ Theater Exit Left (Door)
 Theater Exit Right (Door)
 Jungle Bamboo Laser Shortcut (Door)
 Jungle Popup Wall (Door)
-River Monastery Shortcut (Door)
+River Monastery Garden Shortcut (Door)
 Bunker Entry (Door)
 Bunker Tinted Glass Door
 Bunker UV Room Entry (Door)
@@ -115,7 +116,7 @@ Quarry Stoneworks Entry Right Panel
 Quarry Stoneworks Entry Left Panel
 Quarry Stoneworks Side Exit Panel
 Quarry Stoneworks Roof Exit Panel
-Quarry Stoneworks Stair Control
+Quarry Stoneworks Stairs Panel
 Quarry Boathouse Second Barrier Panel
 Shadows Door Timer Inside
 Shadows Door Timer Outside
@@ -133,15 +134,15 @@ Keep Pressure Plates 3
 Keep Pressure Plates 4
 Keep Shadows Shortcut Panel
 Keep Tower Shortcut Panel
-Monastery Shortcut Panel
+Monastery Laser Shortcut Panel
 Monastery Entry Left
 Monastery Entry Right
 Monastery Outside 3
 Town Cargo Box Entry Panel
 Town Wooden Roof Lower Row 5
-Town Tinted Glass Door Panel
+Town RGB House Entry Panel
 Town Church Entry Panel
-Town Maze Stair Control
+Town Maze Panel
 Town Windmill Entry Panel
 Town Sound Room Right
 Town Red Rooftop 5
@@ -153,7 +154,7 @@ Theater Exit Left Panel
 Theater Exit Right Panel
 Jungle Laser Shortcut Panel
 Jungle Popup Wall Control
-River Monastery Shortcut Panel
+River Monastery Garden Shortcut Panel
 Bunker Entry Panel
 Bunker Tinted Glass Door Panel
 Bunker Glass Room 3
@@ -171,10 +172,10 @@ Swamp Laser Shortcut Right Panel
 Treehouse First Door Panel
 Treehouse Second Door Panel
 Treehouse Third Door Panel
-Treehouse Bridge Control
+Treehouse Drawbridge Panel
 Treehouse Left Orange Bridge 15
 Treehouse Right Orange Bridge 12
-Treehouse Laser House Door Timer Outside Control
+Treehouse Laser House Door Timer Outside
 Treehouse Laser House Door Timer Inside
 Mountain Floor 1 Left Row 7
 Mountain Floor 1 Right Row 5
diff --git a/worlds/witness/settings/Door_Shuffle/Elevators_Come_To_You.txt b/worlds/witness/settings/Door_Shuffle/Elevators_Come_To_You.txt
new file mode 100644
index 0000000000..78d245f9f0
--- /dev/null
+++ b/worlds/witness/settings/Door_Shuffle/Elevators_Come_To_You.txt
@@ -0,0 +1,11 @@
+New Connections:
+Quarry - Quarry Elevator - TrueOneWay
+Outside Quarry - Quarry Elevator - TrueOneWay
+Outside Bunker - Bunker Elevator - TrueOneWay
+Outside Swamp - Swamp Long Bridge - TrueOneWay
+Swamp Near Boat - Swamp Long Bridge - TrueOneWay
+Town Red Rooftop - Town Maze Rooftop - TrueOneWay
+
+
+Requirement Changes:
+0x035DE - 0x17E2B - True
\ No newline at end of file
diff --git a/worlds/witness/settings/Door_Shuffle/Simple_Additional_Panels.txt b/worlds/witness/settings/Door_Shuffle/Simple_Additional_Panels.txt
new file mode 100644
index 0000000000..c16ce73762
--- /dev/null
+++ b/worlds/witness/settings/Door_Shuffle/Simple_Additional_Panels.txt
@@ -0,0 +1,11 @@
+Items:
+Desert Control Panels
+Quarry Elevator Control (Panel)
+Quarry Stoneworks Control Panels
+Quarry Boathouse Control Panels
+Monastery Shutters Control (Panel)
+Town Control Panels
+Windmill & Theater Control Panels
+Bunker Control Panels
+Swamp Control Panels
+Mountain & Caves Control Panels
\ No newline at end of file
diff --git a/worlds/witness/settings/Doors_Simple.txt b/worlds/witness/settings/Door_Shuffle/Simple_Doors.txt
similarity index 74%
rename from worlds/witness/settings/Doors_Simple.txt
rename to worlds/witness/settings/Door_Shuffle/Simple_Doors.txt
index 309874b131..91a7132ec1 100644
--- a/worlds/witness/settings/Doors_Simple.txt
+++ b/worlds/witness/settings/Door_Shuffle/Simple_Doors.txt
@@ -1,44 +1,33 @@
 Items:
-Glass Factory Back Wall (Door)
-Quarry Boathouse Dock (Door)
 Outside Tutorial Outpost Doors
-Glass Factory Entry (Door)
+Glass Factory Doors
 Symmetry Island Doors
 Orchard Gates
-Desert Doors
-Quarry Main Entry
-Quarry Stoneworks Entry (Door)
-Quarry Stoneworks Shortcuts
-Quarry Boathouse Barriers
-Shadows Timed Door
-Shadows Laser Room Door
-Shadows Barriers
+Desert Doors & Elevator
+Quarry Entry Doors
+Quarry Stoneworks Doors
+Quarry Boathouse Doors
+Shadows Laser Room Doors
+Shadows Lower Doors
 Keep Hedge Maze Doors
 Keep Pressure Plates Doors
 Keep Shortcuts
-Monastery Entry
+Monastery Entry Doors
 Monastery Shortcuts
 Town Doors
 Town Tower Doors
-Theater Entry (Door)
-Theater Exit
-Jungle & River Shortcuts
-Jungle Popup Wall (Door)
+Windmill & Theater Doors
+Jungle Doors
 Bunker Doors
 Swamp Doors
-Swamp Laser Shortcut (Door)
+Swamp Shortcuts
 Swamp Water Pumps
 Treehouse Entry Doors
-Treehouse Drawbridge (Door)
-Treehouse Laser House Entry (Door)
-Mountain Floor 1 Exit (Door)
-Mountain Floor 2 Stairs & Doors
-Mountain Bottom Floor Giant Puzzle Exit (Door)
-Mountain Bottom Floor Final Room Entry (Door)
-Mountain Bottom Floor Doors to Caves
-Caves Doors to Challenge
-Caves Exits to Main Island
-Challenge Tunnels Entry (Door)
+Treehouse Upper Doors
+Mountain Floor 1 & 2 Doors
+Mountain Bottom Floor Doors
+Caves Doors
+Caves Shortcuts
 Tunnels Doors
 
 Added Locations:
@@ -60,7 +49,7 @@ Quarry Stoneworks Entry Right Panel
 Quarry Stoneworks Entry Left Panel
 Quarry Stoneworks Side Exit Panel
 Quarry Stoneworks Roof Exit Panel
-Quarry Stoneworks Stair Control
+Quarry Stoneworks Stairs Panel
 Quarry Boathouse Second Barrier Panel
 Shadows Door Timer Inside
 Shadows Door Timer Outside
@@ -78,15 +67,15 @@ Keep Pressure Plates 3
 Keep Pressure Plates 4
 Keep Shadows Shortcut Panel
 Keep Tower Shortcut Panel
-Monastery Shortcut Panel
+Monastery Laser Shortcut Panel
 Monastery Entry Left
 Monastery Entry Right
 Monastery Outside 3
 Town Cargo Box Entry Panel
 Town Wooden Roof Lower Row 5
-Town Tinted Glass Door Panel
+Town RGB House Entry Panel
 Town Church Entry Panel
-Town Maze Stair Control
+Town Maze Panel
 Town Windmill Entry Panel
 Town Sound Room Right
 Town Red Rooftop 5
@@ -98,7 +87,7 @@ Theater Exit Left Panel
 Theater Exit Right Panel
 Jungle Laser Shortcut Panel
 Jungle Popup Wall Control
-River Monastery Shortcut Panel
+River Monastery Garden Shortcut Panel
 Bunker Entry Panel
 Bunker Tinted Glass Door Panel
 Bunker Glass Room 3
@@ -116,10 +105,10 @@ Swamp Laser Shortcut Right Panel
 Treehouse First Door Panel
 Treehouse Second Door Panel
 Treehouse Third Door Panel
-Treehouse Bridge Control
+Treehouse Drawbridge Panel
 Treehouse Left Orange Bridge 15
 Treehouse Right Orange Bridge 12
-Treehouse Laser House Door Timer Outside Control
+Treehouse Laser House Door Timer Outside
 Treehouse Laser House Door Timer Inside
 Mountain Floor 1 Left Row 7
 Mountain Floor 1 Right Row 5
diff --git a/worlds/witness/settings/Door_Shuffle/Simple_Panels.txt b/worlds/witness/settings/Door_Shuffle/Simple_Panels.txt
new file mode 100644
index 0000000000..79da154491
--- /dev/null
+++ b/worlds/witness/settings/Door_Shuffle/Simple_Panels.txt
@@ -0,0 +1,22 @@
+Items:
+Symmetry Island Panels
+Tutorial Outpost Panels
+Desert Panels
+Quarry Outside Panels
+Quarry Stoneworks Panels
+Quarry Boathouse Panels
+Keep Hedge Maze Panels
+Monastery Panels
+Town Church & RGB House Panels
+Town Maze Panels
+Windmill & Theater Panels
+Town Cargo Box Entry (Panel)
+Treehouse Panels
+Bunker Panels
+Swamp Panels
+Mountain Panels
+Caves Panels
+Tunnels Panels
+Glass Factory Entry (Panel)
+Shadows Door Timer (Panel)
+Jungle Popup Wall (Panel)
\ No newline at end of file
diff --git a/worlds/witness/settings/Doors_Max.txt b/worlds/witness/settings/Doors_Max.txt
deleted file mode 100644
index e722b61ca0..0000000000
--- a/worlds/witness/settings/Doors_Max.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-Items:
-Outside Tutorial Outpost Path (Door)
-Outside Tutorial Outpost Entry (Door)
-Outside Tutorial Outpost Exit (Door)
-Glass Factory Entry (Door)
-Glass Factory Back Wall (Door)
-Symmetry Island Lower (Door)
-Symmetry Island Upper (Door)
-Orchard First Gate (Door)
-Orchard Second Gate (Door)
-Desert Light Room Entry (Door)
-Desert Pond Room Entry (Door)
-Desert Flood Room Entry (Door)
-Desert Elevator Room Entry (Door)
-Quarry Entry 1 (Door)
-Quarry Entry 2 (Door)
-Quarry Stoneworks Entry (Door)
-Quarry Stoneworks Side Exit (Door)
-Quarry Stoneworks Roof Exit (Door)
-Quarry Stoneworks Stairs (Door)
-Quarry Boathouse Dock (Door)
-Quarry Boathouse First Barrier (Door)
-Quarry Boathouse Second Barrier (Door)
-Shadows Timed Door
-Shadows Laser Entry Right (Door)
-Shadows Laser Entry Left (Door)
-Shadows Quarry Barrier (Door)
-Shadows Ledge Barrier (Door)
-Keep Hedge Maze 1 Exit (Door)
-Keep Pressure Plates 1 Exit (Door)
-Keep Hedge Maze 2 Shortcut (Door)
-Keep Hedge Maze 2 Exit (Door)
-Keep Hedge Maze 3 Shortcut (Door)
-Keep Hedge Maze 3 Exit (Door)
-Keep Hedge Maze 4 Shortcut (Door)
-Keep Hedge Maze 4 Exit (Door)
-Keep Pressure Plates 2 Exit (Door)
-Keep Pressure Plates 3 Exit (Door)
-Keep Pressure Plates 4 Exit (Door)
-Keep Shadows Shortcut (Door)
-Keep Tower Shortcut (Door)
-Monastery Shortcut (Door)
-Monastery Entry Inner (Door)
-Monastery Entry Outer (Door)
-Monastery Garden Entry (Door)
-Town Cargo Box Entry (Door)
-Town Wooden Roof Stairs (Door)
-Town Tinted Glass Door
-Town Church Entry (Door)
-Town Maze Stairs (Door)
-Town Windmill Entry (Door)
-Town RGB House Stairs (Door)
-Town Tower Second (Door)
-Town Tower First (Door)
-Town Tower Fourth (Door)
-Town Tower Third (Door)
-Theater Entry (Door)
-Theater Exit Left (Door)
-Theater Exit Right (Door)
-Jungle Bamboo Laser Shortcut (Door)
-Jungle Popup Wall (Door)
-River Monastery Shortcut (Door)
-Bunker Entry (Door)
-Bunker Tinted Glass Door
-Bunker UV Room Entry (Door)
-Bunker Elevator Room Entry (Door)
-Swamp Entry (Door)
-Swamp Between Bridges First Door
-Swamp Platform Shortcut Door
-Swamp Cyan Water Pump (Door)
-Swamp Between Bridges Second Door
-Swamp Red Water Pump (Door)
-Swamp Red Underwater Exit (Door)
-Swamp Blue Water Pump (Door)
-Swamp Purple Water Pump (Door)
-Swamp Laser Shortcut (Door)
-Treehouse First (Door)
-Treehouse Second (Door)
-Treehouse Third (Door)
-Treehouse Drawbridge (Door)
-Treehouse Laser House Entry (Door)
-Mountain Floor 1 Exit (Door)
-Mountain Floor 2 Staircase Near (Door)
-Mountain Floor 2 Exit (Door)
-Mountain Floor 2 Staircase Far (Door)
-Mountain Bottom Floor Giant Puzzle Exit (Door)
-Mountain Bottom Floor Final Room Entry (Door)
-Mountain Bottom Floor Rock (Door)
-Caves Entry (Door)
-Caves Pillar Door
-Caves Mountain Shortcut (Door)
-Caves Swamp Shortcut (Door)
-Challenge Entry (Door)
-Challenge Tunnels Entry (Door)
-Tunnels Theater Shortcut (Door)
-Tunnels Desert Shortcut (Door)
-Tunnels Town Shortcut (Door)
-
-Desert Flood Controls (Panel)
-Quarry Stoneworks Ramp Controls (Panel)
-Quarry Stoneworks Lift Controls (Panel)
-Quarry Boathouse Ramp Height Control (Panel)
-Quarry Boathouse Ramp Horizontal Control (Panel)
-Bunker Elevator Control (Panel)
-Swamp Sliding Bridge (Panel)
-Swamp Rotating Bridge (Panel)
-Swamp Maze Control (Panel)
-Boat
-
-Added Locations:
-Outside Tutorial Outpost Entry Panel
-Outside Tutorial Outpost Exit Panel
-Glass Factory Entry Panel
-Glass Factory Back Wall 5
-Symmetry Island Lower Panel
-Symmetry Island Upper Panel
-Orchard Apple Tree 3
-Orchard Apple Tree 5
-Desert Light Room Entry Panel
-Desert Light Room 3
-Desert Flood Room Entry Panel
-Desert Flood Room 6
-Quarry Entry 1 Panel
-Quarry Entry 2 Panel
-Quarry Stoneworks Entry Right Panel
-Quarry Stoneworks Entry Left Panel
-Quarry Stoneworks Side Exit Panel
-Quarry Stoneworks Roof Exit Panel
-Quarry Stoneworks Stair Control
-Quarry Boathouse Second Barrier Panel
-Shadows Door Timer Inside
-Shadows Door Timer Outside
-Shadows Far 8
-Shadows Near 5
-Shadows Intro 3
-Shadows Intro 5
-Keep Hedge Maze 1
-Keep Pressure Plates 1
-Keep Hedge Maze 2
-Keep Hedge Maze 3
-Keep Hedge Maze 4
-Keep Pressure Plates 2
-Keep Pressure Plates 3
-Keep Pressure Plates 4
-Keep Shadows Shortcut Panel
-Keep Tower Shortcut Panel
-Monastery Shortcut Panel
-Monastery Entry Left
-Monastery Entry Right
-Monastery Outside 3
-Town Cargo Box Entry Panel
-Town Wooden Roof Lower Row 5
-Town Tinted Glass Door Panel
-Town Church Entry Panel
-Town Maze Stair Control
-Town Windmill Entry Panel
-Town Sound Room Right
-Town Red Rooftop 5
-Town Church Lattice
-Town Tall Hexagonal
-Town Wooden Rooftop
-Windmill Theater Entry Panel
-Theater Exit Left Panel
-Theater Exit Right Panel
-Jungle Laser Shortcut Panel
-Jungle Popup Wall Control
-River Monastery Shortcut Panel
-Bunker Entry Panel
-Bunker Tinted Glass Door Panel
-Bunker Glass Room 3
-Bunker UV Room 2
-Swamp Entry Panel
-Swamp Platform Row 4
-Swamp Platform Shortcut Right Panel
-Swamp Blue Underwater 5
-Swamp Between Bridges Near Row 4
-Swamp Cyan Underwater 5
-Swamp Red Underwater 4
-Swamp Beyond Rotating Bridge 4
-Swamp Beyond Rotating Bridge 4
-Swamp Laser Shortcut Right Panel
-Treehouse First Door Panel
-Treehouse Second Door Panel
-Treehouse Third Door Panel
-Treehouse Bridge Control
-Treehouse Left Orange Bridge 15
-Treehouse Right Orange Bridge 12
-Treehouse Laser House Door Timer Outside Control
-Treehouse Laser House Door Timer Inside
-Mountain Floor 1 Left Row 7
-Mountain Floor 1 Right Row 5
-Mountain Floor 1 Back Row 3
-Mountain Floor 1 Trash Pillar 2
-Mountain Floor 2 Near Row 5
-Mountain Floor 2 Light Bridge Controller Near
-Mountain Floor 2 Light Bridge Controller Far
-Mountain Floor 2 Far Row 6
-Mountain Bottom Floor Giant Puzzle
-Mountain Bottom Floor Final Room Entry Left
-Mountain Bottom Floor Final Room Entry Right
-Mountain Bottom Floor Discard
-Mountain Bottom Floor Rock Control
-Mountain Bottom Floor Caves Entry Panel
-Caves Lone Pillar
-Caves Mountain Shortcut Panel
-Caves Swamp Shortcut Panel
-Caves Challenge Entry Panel
-Challenge Tunnels Entry Panel
-Tunnels Theater Shortcut Panel
-Tunnels Desert Shortcut Panel
-Tunnels Town Shortcut Panel
\ No newline at end of file
diff --git a/worlds/witness/settings/EP_Shuffle/EP_All.txt b/worlds/witness/settings/EP_Shuffle/EP_All.txt
index 51af5e3850..939adc36e8 100644
--- a/worlds/witness/settings/EP_Shuffle/EP_All.txt
+++ b/worlds/witness/settings/EP_Shuffle/EP_All.txt
@@ -1,136 +1,136 @@
 Added Locations:
-0x0332B
-0x03367
-0x28B8A
-0x037B6
-0x037B2
-0x000F7
-0x3351D
-0x0053C
-0x00771
-0x335C8
-0x335C9
-0x337F8
-0x037BB
-0x220E4
-0x220E5
-0x334B9
-0x334BC
-0x22106
-0x0A14C
-0x0A14D
-0x03ABC
-0x03ABE
-0x03AC0
-0x03AC4
-0x03AC5
-0x03BE2
-0x03BE3
-0x0A409
-0x006E5
-0x006E6
-0x006E7
-0x034A7
-0x034AD
-0x034AF
-0x03DAB
-0x03DAC
-0x03DAD
-0x03E01
-0x289F4
-0x289F5
-0x0053D
-0x0053E
-0x00769
-0x33721
-0x220A7
-0x220BD
-0x03B22
-0x03B23
-0x03B24
-0x03B25
-0x03A79
-0x28ABD
-0x28ABE
-0x3388F
-0x28B29
-0x28B2A
-0x018B6
-0x033BE
-0x033BF
-0x033DD
-0x033E5
-0x28AE9
-0x3348F
-0x001A3
-0x335AE
-0x000D3
-0x035F5
-0x09D5D
-0x09D5E
-0x09D63
-0x3370E
-0x035DE
-0x03601
-0x03603
-0x03D0D
-0x3369A
-0x336C8
-0x33505
-0x03A9E
-0x016B2
-0x3365F
-0x03731
-0x036CE
-0x03C07
-0x03A93
-0x03AA6
-0x3397C
-0x0105D
-0x0A304
-0x035CB
-0x035CF
-0x28A7B
-0x005F6
-0x00859
-0x17CB9
-0x28A4A
-0x334B6
-0x0069D
-0x00614
-0x28A4C
-0x289CF
-0x289D1
-0x33692
-0x03E77
-0x03E7C
-0x035C7
-0x01848
-0x03D06
-0x33530
-0x33600
-0x28A2F
-0x28A37
-0x334A3
-0x3352F
-0x33857
-0x33879
-0x03C19
-0x28B30
-0x035C9
-0x03335
-0x03412
-0x038A6
-0x038AA
-0x03E3F
-0x03E40
-0x28B8E
-0x28B91
-0x03BCE
-0x03BCF
-0x03BD1
-0x339B6
-0x33A20
-0x33A29
-0x33A2A
-0x33B06
\ No newline at end of file
+0x0332B (Glass Factory Black Line Reflection EP)
+0x03367 (Glass Factory Black Line EP)
+0x28B8A (Vase EP)
+0x037B6 (Windmill First Blade EP)
+0x037B2 (Windmill Second Blade EP)
+0x000F7 (Windmill Third Blade EP)
+0x3351D (Sand Snake EP)
+0x0053C (Facade Right EP)
+0x00771 (Facade Left EP)
+0x335C8 (Stairs Left EP)
+0x335C9 (Stairs Right EP)
+0x337F8 (Flood Room EP)
+0x037BB (Elevator EP)
+0x220E4 (Broken Wall Straight EP)
+0x220E5 (Broken Wall Bend EP)
+0x334B9 (Shore EP)
+0x334BC (Island EP)
+0x22106 (Desert EP)
+0x0A14C (Pond Room Near Reflection EP)
+0x0A14D (Pond Room Far Reflection EP)
+0x03ABC (Long Arch Moss EP)
+0x03ABE (Straight Left Moss EP)
+0x03AC0 (Pop-up Wall Moss EP)
+0x03AC4 (Short Arch Moss EP)
+0x03AC5 (Green Leaf Moss EP)
+0x03BE2 (Monastery Garden Left EP)
+0x03BE3 (Monastery Garden Right EP)
+0x0A409 (Monastery Wall EP)
+0x006E5 (Facade Left Near EP)
+0x006E6 (Facade Left Far Short EP)
+0x006E7 (Facade Left Far Long EP)
+0x034A7 (Left Shutter EP)
+0x034AD (Middle Shutter EP)
+0x034AF (Right Shutter EP)
+0x03DAB (Facade Right Near EP)
+0x03DAC (Facade Left Stairs EP)
+0x03DAD (Facade Right Stairs EP)
+0x03E01 (Grass Stairs EP)
+0x289F4 (Entrance EP)
+0x289F5 (Tree Halo EP)
+0x0053D (Rock Shadow EP)
+0x0053E (Sand Shadow EP)
+0x00769 (Burned House Beach EP)
+0x33721 (Buoy EP)
+0x220A7 (Right Orange Bridge EP)
+0x220BD (Both Orange Bridges EP)
+0x03B22 (Circle Far EP)
+0x03B23 (Circle Left EP)
+0x03B24 (Circle Near EP)
+0x03B25 (Shipwreck CCW Underside EP)
+0x03A79 (Stern EP)
+0x28ABD (Rope Inner EP)
+0x28ABE (Rope Outer EP)
+0x3388F (Couch EP)
+0x28B29 (Shipwreck Green EP)
+0x28B2A (Shipwreck CW Underside EP)
+0x018B6 (Pressure Plates 4 Right Exit EP)
+0x033BE (Pressure Plates 1 EP)
+0x033BF (Pressure Plates 2 EP)
+0x033DD (Pressure Plates 3 EP)
+0x033E5 (Pressure Plates 4 Left Exit EP)
+0x28AE9 (Path EP)
+0x3348F (Hedges EP)
+0x001A3 (River Shape EP)
+0x335AE (Cloud Cycle EP)
+0x000D3 (Green Room Flowers EP)
+0x035F5 (Tinted Door EP)
+0x09D5D (Yellow Bridge EP)
+0x09D5E (Blue Bridge EP)
+0x09D63 (Pink Bridge EP)
+0x3370E (Arch Black EP)
+0x035DE (Purple Sand Bottom EP)
+0x03601 (Purple Sand Top EP)
+0x03603 (Purple Sand Middle EP)
+0x03D0D (Bunker Yellow Line EP)
+0x3369A (Arch White Left EP)
+0x336C8 (Arch White Right EP)
+0x33505 (Bush EP)
+0x03A9E (Purple Underwater Right EP)
+0x016B2 (Rotating Bridge CCW EP)
+0x3365F (Boat EP)
+0x03731 (Long Bridge Side EP)
+0x036CE (Rotating Bridge CW EP)
+0x03C07 (Apparent River EP)
+0x03A93 (Purple Underwater Left EP)
+0x03AA6 (Cyan Underwater Sliding Bridge EP)
+0x3397C (Skylight EP)
+0x0105D (Sliding Bridge Left EP)
+0x0A304 (Sliding Bridge Right EP)
+0x035CB (Bamboo CCW EP)
+0x035CF (Bamboo CW EP)
+0x28A7B (Quarry Stoneworks Rooftop Vent EP)
+0x005F6 (Hook EP)
+0x00859 (Moving Ramp EP)
+0x17CB9 (Railroad EP)
+0x28A4A (Shore EP)
+0x334B6 (Entrance Pipe EP)
+0x0069D (Ramp EP)
+0x00614 (Lift EP)
+0x28A4C (Sand Pile EP)
+0x289CF (Rock Line EP)
+0x289D1 (Rock Line Reflection EP)
+0x33692 (Brown Bridge EP)
+0x03E77 (Red Flowers EP)
+0x03E7C (Purple Flowers EP)
+0x035C7 (Tractor EP)
+0x01848 (EP)
+0x03D06 (Garden EP)
+0x33530 (Cloud EP)
+0x33600 (Patio Flowers EP)
+0x28A2F (Town Sewer EP)
+0x28A37 (Town Long Sewer EP)
+0x334A3 (Path EP)
+0x3352F (Gate EP)
+0x33857 (Tutorial EP)
+0x33879 (Tutorial Reflection EP)
+0x03C19 (Tutorial Moss EP)
+0x28B30 (Water EP)
+0x035C9 (Cargo Box EP)
+0x03335 (Tower Underside Third EP)
+0x03412 (Tower Underside Fourth EP)
+0x038A6 (Tower Underside First EP)
+0x038AA (Tower Underside Second EP)
+0x03E3F (RGB House Red EP)
+0x03E40 (RGB House Green EP)
+0x28B8E (Maze Bridge Underside EP)
+0x28B91 (Thundercloud EP)
+0x03BCE (Black Line Tower EP)
+0x03BCF (Black Line Redirect EP)
+0x03BD1 (Black Line Church EP)
+0x339B6 (Eclipse EP)
+0x33A20 (Theater Flowers EP)
+0x33A29 (Window EP)
+0x33A2A (Door EP)
+0x33B06 (Church EP)
diff --git a/worlds/witness/settings/EP_Shuffle/EP_Easy.txt b/worlds/witness/settings/EP_Shuffle/EP_Easy.txt
index 939055169a..6f9c80fc0a 100644
--- a/worlds/witness/settings/EP_Shuffle/EP_Easy.txt
+++ b/worlds/witness/settings/EP_Shuffle/EP_Easy.txt
@@ -1,14 +1,17 @@
-Precompleted Locations:
-0x339B6
-0x335AE
-0x3388F
-0x33A20
-0x037B2
-0x000F7
-0x28B29
-0x33857
-0x33879
-0x016B2
-0x036CE
-0x03B25
-0x28B2A
\ No newline at end of file
+Disabled Locations:
+0x339B6 (Eclipse EP)
+0x335AE (Cloud Cycle EP)
+0x3388F (Couch EP)
+0x33A20 (Theater Flowers EP)
+0x037B2 (Windmill Second Blade EP)
+0x000F7 (Windmill Third Blade EP)
+0x28B29 (Shipwreck Green EP)
+0x33857 (Tutorial EP)
+0x33879 (Tutorial Reflection EP)
+0x016B2 (Rotating Bridge CCW EP)
+0x036CE (Rotating Bridge CW EP)
+0x03B25 (Shipwreck CCW Underside EP)
+0x28B2A (Shipwreck CW Underside EP)
+0x09D63 (Mountain Pink Bridge EP)
+0x09D5E (Mountain Blue Bridge EP)
+0x09D5D (Mountain Yellow Bridge EP)
diff --git a/worlds/witness/settings/EP_Shuffle/EP_NoCavesEPs.txt b/worlds/witness/settings/EP_Shuffle/EP_NoCavesEPs.txt
deleted file mode 100644
index 3bb318a69e..0000000000
--- a/worlds/witness/settings/EP_Shuffle/EP_NoCavesEPs.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Precompleted Locations:
-0x3397C
-0x33A20
-0x3352F
-0x28B30
\ No newline at end of file
diff --git a/worlds/witness/settings/EP_Shuffle/EP_NoEclipse.txt b/worlds/witness/settings/EP_Shuffle/EP_NoEclipse.txt
index d41badfa18..f241957c82 100644
--- a/worlds/witness/settings/EP_Shuffle/EP_NoEclipse.txt
+++ b/worlds/witness/settings/EP_Shuffle/EP_NoEclipse.txt
@@ -1,2 +1,2 @@
-Precompleted Locations:
-0x339B6
\ No newline at end of file
+Disabled Locations:
+0x339B6 (Eclipse EP)
diff --git a/worlds/witness/settings/EP_Shuffle/EP_NoMountainEPs.txt b/worlds/witness/settings/EP_Shuffle/EP_NoMountainEPs.txt
deleted file mode 100644
index 3558d77ad8..0000000000
--- a/worlds/witness/settings/EP_Shuffle/EP_NoMountainEPs.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Precompleted Locations:
-0x09D63
-0x09D5D
-0x09D5E
\ No newline at end of file
diff --git a/worlds/witness/settings/EP_Shuffle/EP_Sides.txt b/worlds/witness/settings/EP_Shuffle/EP_Sides.txt
index 1da52ffb89..82ab633295 100644
--- a/worlds/witness/settings/EP_Shuffle/EP_Sides.txt
+++ b/worlds/witness/settings/EP_Shuffle/EP_Sides.txt
@@ -1,34 +1,35 @@
 Added Locations:
-0xFFE00
-0xFFE01
-0xFFE02
-0xFFE03
-0xFFE04
-0xFFE10
-0xFFE11
-0xFFE12
-0xFFE13
-0xFFE14
-0xFFE15
-0xFFE20
-0xFFE21
-0xFFE22
-0xFFE23
-0xFFE24
-0xFFE25
-0xFFE30
-0xFFE31
-0xFFE32
-0xFFE33
-0xFFE34
-0xFFE35
-0xFFE40
-0xFFE41
-0xFFE42
-0xFFE43
-0xFFE50
-0xFFE51
-0xFFE52
-0xFFE53
-0xFFE54
-0xFFE55
\ No newline at end of file
+0xFFE00 (Desert Obelisk Side 1)
+0xFFE01 (Desert Obelisk Side 2)
+0xFFE02 (Desert Obelisk Side 3)
+0xFFE03 (Desert Obelisk Side 4)
+0xFFE04 (Desert Obelisk Side 5)
+0xFFE10 (Monastery Obelisk Side 1)
+0xFFE11 (Monastery Obelisk Side 2)
+0xFFE12 (Monastery Obelisk Side 3)
+0xFFE13 (Monastery Obelisk Side 4)
+0xFFE14 (Monastery Obelisk Side 5)
+0xFFE15 (Monastery Obelisk Side 6)
+0xFFE20 (Treehouse Obelisk Side 1)
+0xFFE21 (Treehouse Obelisk Side 2)
+0xFFE22 (Treehouse Obelisk Side 3)
+0xFFE23 (Treehouse Obelisk Side 4)
+0xFFE24 (Treehouse Obelisk Side 5)
+0xFFE25 (Treehouse Obelisk Side 6)
+0xFFE30 (River Obelisk Side 1)
+0xFFE31 (River Obelisk Side 2)
+0xFFE32 (River Obelisk Side 3)
+0xFFE33 (River Obelisk Side 4)
+0xFFE34 (River Obelisk Side 5)
+0xFFE35 (River Obelisk Side 6)
+0xFFE40 (Quarry Obelisk Side 1)
+0xFFE41 (Quarry Obelisk Side 2)
+0xFFE42 (Quarry Obelisk Side 3)
+0xFFE43 (Quarry Obelisk Side 4)
+0xFFE44 (Quarry Obelisk Side 5)
+0xFFE50 (Town Obelisk Side 1)
+0xFFE51 (Town Obelisk Side 2)
+0xFFE52 (Town Obelisk Side 3)
+0xFFE53 (Town Obelisk Side 4)
+0xFFE54 (Town Obelisk Side 5)
+0xFFE55 (Town Obelisk Side 6)
diff --git a/worlds/witness/settings/EP_Shuffle/EP_Videos.txt b/worlds/witness/settings/EP_Shuffle/EP_Videos.txt
deleted file mode 100644
index c4aaca13a6..0000000000
--- a/worlds/witness/settings/EP_Shuffle/EP_Videos.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Precompleted Locations:
-0x339B6
-0x33A29
-0x33A2A
-0x33B06
-0x33A20
\ No newline at end of file
diff --git a/worlds/witness/settings/Early_Caves.txt b/worlds/witness/settings/Early_Caves.txt
new file mode 100644
index 0000000000..48c8056bc7
--- /dev/null
+++ b/worlds/witness/settings/Early_Caves.txt
@@ -0,0 +1,6 @@
+Items:
+Caves Shortcuts
+
+Remove Items:
+Caves Mountain Shortcut (Door)
+Caves Swamp Shortcut (Door)
\ No newline at end of file
diff --git a/worlds/witness/settings/Early_UTM.txt b/worlds/witness/settings/Early_Caves_Start.txt
similarity index 65%
rename from worlds/witness/settings/Early_UTM.txt
rename to worlds/witness/settings/Early_Caves_Start.txt
index b04aa3d339..a16a6d02bb 100644
--- a/worlds/witness/settings/Early_UTM.txt
+++ b/worlds/witness/settings/Early_Caves_Start.txt
@@ -1,8 +1,8 @@
 Items:
-Caves Exits to Main Island
+Caves Shortcuts
 
 Starting Inventory:
-Caves Exits to Main Island
+Caves Shortcuts
 
 Remove Items:
 Caves Mountain Shortcut (Door)
diff --git a/worlds/witness/settings/Disable_Unrandomized.txt b/worlds/witness/settings/Exclusions/Disable_Unrandomized.txt
similarity index 69%
rename from worlds/witness/settings/Disable_Unrandomized.txt
rename to worlds/witness/settings/Exclusions/Disable_Unrandomized.txt
index f7a0fcb7cb..2419bde06c 100644
--- a/worlds/witness/settings/Disable_Unrandomized.txt
+++ b/worlds/witness/settings/Exclusions/Disable_Unrandomized.txt
@@ -2,16 +2,20 @@ Event Items:
 Monastery Laser Activation - 0x00A5B,0x17CE7,0x17FA9
 Bunker Laser Activation - 0x00061,0x17D01,0x17C42
 Shadows Laser Activation - 0x00021,0x17D28,0x17C71
+Town Tower 4th Door Opens - 0x17CFB,0x3C12B,0x17CF7
+Jungle Popup Wall Lifts - 0x17FA0,0x17D27,0x17F9B,0x17CAB
 
 Requirement Changes:
 0x17C65 - 0x00A5B | 0x17CE7 | 0x17FA9
 0x0C2B2 - 0x00061 | 0x17D01 | 0x17C42
 0x181B3 - 0x00021 | 0x17D28 | 0x17C71
-0x28B39 - True - Reflection
 0x17CAB - True - True
-0x2779A - True - 0x17CFB | 0x3C12B | 0x17CF7
+0x17CA4 - True - True
+0x1475B - 0x17FA0 | 0x17D27 | 0x17F9B | 0x17CAB
+0x2779A - 0x17CFB | 0x3C12B | 0x17CF7
 
 Disabled Locations:
+0x28B39 (Town Tall Hexagonal)
 0x03505 (Tutorial Gate Close)
 0x0C335 (Tutorial Pillar)
 0x0C373 (Tutorial Patio Floor)
@@ -25,6 +29,11 @@ Disabled Locations:
 0x00055 (Orchard Apple Tree 3)
 0x032F7 (Orchard Apple Tree 4)
 0x032FF (Orchard Apple Tree 5)
+0x334DB (Door Timer Outside)
+0x334DC (Door Timer Inside)
+0x19B24 (Timed Door) - 0x334DB
+0x194B2 (Laser Entry Right)
+0x19665 (Laser Entry Left)
 0x198B5 (Shadows Intro 1)
 0x198BD (Shadows Intro 2)
 0x198BF (Shadows Intro 3)
@@ -47,11 +56,22 @@ Disabled Locations:
 0x197E8 (Shadows Near 4)
 0x197E5 (Shadows Near 5)
 0x19650 (Shadows Laser)
+0x19865 (Quarry Barrier)
+0x0A2DF (Quarry Barrier 2)
+0x1855B (Ledge Barrier)
+0x19ADE (Ledge Barrier 2)
 0x00139 (Keep Hedge Maze 1)
 0x019DC (Keep Hedge Maze 2)
 0x019E7 (Keep Hedge Maze 3)
 0x01A0F (Keep Hedge Maze 4)
 0x0360E (Laser Hedges)
+0x01954 (Hedge 1 Exit)
+0x018CE (Hedge 2 Shortcut)
+0x019D8 (Hedge 2 Exit)
+0x019B5 (Hedge 3 Shortcut)
+0x019E6 (Hedge 3 Exit)
+0x0199A (Hedge 4 Shortcut)
+0x01A0E (Hedge 4 Exit)
 0x03307 (First Gate)
 0x03313 (Second Gate)
 0x0C128 (Entry Inner)
@@ -61,16 +81,20 @@ Disabled Locations:
 0x00290 (Monastery Outside 1)
 0x00038 (Monastery Outside 2)
 0x00037 (Monastery Outside 3)
+0x03750 (Garden Entry)
+0x09D9B (Monastery Shutters Control)
 0x193A7 (Monastery Inside 1)
 0x193AA (Monastery Inside 2)
 0x193AB (Monastery Inside 3)
 0x193A6 (Monastery Inside 4)
-0x17CA4 (Monastery Laser)
+0x17CA4 (Monastery Laser Panel)
+0x0364E (Monastery Laser Shortcut Door)
+0x03713 (Monastery Laser Shortcut Panel)
 0x18590 (Transparent) - True - Symmetry & Environment
 0x28AE3 (Vines) - 0x18590 - Shadows Follow & Environment
 0x28938 (Apple Tree) - 0x28AE3 - Environment
 0x079DF (Triple Exit) - 0x28938 - Shadows Avoid & Environment & Reflection
-0x28B39 (Tall Hexagonal) - 0x079DF & 0x2896A - Reflection
+0x00815 (Theater Video Input)
 0x03553 (Theater Tutorial Video)
 0x03552 (Theater Desert Video)
 0x0354E (Theater Jungle Video)
@@ -84,7 +108,8 @@ Disabled Locations:
 0x0070F (Second Row 2)
 0x0087D (Second Row 3)
 0x002C7 (Second Row 4)
-0x17CAA (Monastery Shortcut Panel)
+0x17CAA (Monastery Garden Shortcut Panel)
+0x0CF2A (Monastery Garden Shortcut)
 0x0C2A4 (Bunker Entry)
 0x17C79 (Tinted Glass Door)
 0x0C2A3 (UV Room Entry)
@@ -110,19 +135,16 @@ Disabled Locations:
 0x09DE0 (Bunker Laser)
 0x0A079 (Bunker Elevator Control)
 
-0x17CAA (River Garden Entry Panel)
-
-Precompleted Locations:
-0x034A7
-0x034AD
-0x034AF
-0x339B6
-0x33A29
-0x33A2A
-0x33B06
-0x3352F
-0x33600
-0x035F5
-0x000D3
-0x33A20
-0x03BE2
\ No newline at end of file
+0x034A7 (Monastery Left Shutter EP)
+0x034AD (Monastery Middle Shutter EP)
+0x034AF (Monastery Right Shutter EP)
+0x339B6 (Theater Eclipse EP)
+0x33A29 (Theater Window EP)
+0x33A2A (Theater Door EP)
+0x33B06 (Theater Church EP)
+0x3352F (Tutorial Gate EP)
+0x33600 (Tutorial Patio Flowers EP)
+0x035F5 (Bunker Tinted Door EP)
+0x000D3 (Bunker Green Room Flowers EP)
+0x33A20 (Theater Flowers EP)
+0x03BE2 (Monastery Garden Left EP)
diff --git a/worlds/witness/settings/Exclusions/Discards.txt b/worlds/witness/settings/Exclusions/Discards.txt
new file mode 100644
index 0000000000..e46d1dd82b
--- /dev/null
+++ b/worlds/witness/settings/Exclusions/Discards.txt
@@ -0,0 +1,15 @@
+Disabled Locations:
+0x17CFB (Outside Tutorial Discard)
+0x3C12B (Glass Factory Discard)
+0x17CE7 (Desert Discard)
+0x17CF0 (Quarry Discard)
+0x17D27 (Keep Discard)
+0x17D28 (Shipwreck Discard)
+0x17D01 (Town Cargo Box Discard)
+0x17C71 (Town Rooftop Discard)
+0x17CF7 (Theater Discard)
+0x17F9B (Jungle Discard)
+0x17FA9 (Treehouse Green Bridge Discard)
+0x17C42 (Mountainside Discard)
+0x17F93 (Mountain Floor 2 Elevator Discard)
+0x17FA0 (Treehouse Laser Discard)
diff --git a/worlds/witness/settings/Exclusions/Vaults.txt b/worlds/witness/settings/Exclusions/Vaults.txt
new file mode 100644
index 0000000000..f23a131833
--- /dev/null
+++ b/worlds/witness/settings/Exclusions/Vaults.txt
@@ -0,0 +1,31 @@
+Disabled Locations:
+0x033D4 (Outside Tutorial Vault)
+0x03481 (Outside Tutorial Vault Box)
+0x033D0 (Outside Tutorial Vault Door)
+0x0CC7B (Desert Vault)
+0x0339E (Desert Vault Box)
+0x03444 (Desert Vault Door)
+0x00AFB (Shipwreck Vault)
+0x03535 (Shipwreck Vault Box)
+0x17BB4 (Shipwreck Vault Door)
+0x15ADD (River Vault)
+0x03702 (River Vault Box)
+0x15287 (River Vault Door)
+0x002A6 (Mountainside Vault)
+0x03542 (Mountainside Vault Box)
+0x00085 (Mountainside Vault Door)
+0x2FAF6 (Tunnels Vault Box)
+0x00815 (Theater Video Input)
+0x03553 (Theater Tutorial Video)
+0x03552 (Theater Desert Video)
+0x0354E (Theater Jungle Video)
+0x03549 (Theater Challenge Video)
+0x0354F (Theater Shipwreck Video)
+0x03545 (Theater Mountain Video)
+0x03505 (Tutorial Gate Close)
+0x339B6 (Theater clipse EP)
+0x33A29 (Theater Window EP)
+0x33A2A (Theater Door EP)
+0x33B06 (Theater Church EP)
+0x33A20 (Theater Flowers EP)
+0x3352F (Tutorial Gate EP)
diff --git a/worlds/witness/settings/Postgame/Beyond_Challenge.txt b/worlds/witness/settings/Postgame/Beyond_Challenge.txt
new file mode 100644
index 0000000000..5cd20b6a5e
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Beyond_Challenge.txt
@@ -0,0 +1,4 @@
+Disabled Locations:
+0x03549 (Challenge Video)
+
+0x339B6 (Eclipse EP)
diff --git a/worlds/witness/settings/Postgame/Bottom_Floor_Discard.txt b/worlds/witness/settings/Postgame/Bottom_Floor_Discard.txt
new file mode 100644
index 0000000000..8f7d6a257a
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Bottom_Floor_Discard.txt
@@ -0,0 +1,2 @@
+Disabled Locations:
+0x17FA2 (Mountain Bottom Floor Discard)
diff --git a/worlds/witness/settings/Postgame/Bottom_Floor_Discard_NonDoors.txt b/worlds/witness/settings/Postgame/Bottom_Floor_Discard_NonDoors.txt
new file mode 100644
index 0000000000..5ea7c578d8
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Bottom_Floor_Discard_NonDoors.txt
@@ -0,0 +1,6 @@
+Disabled Locations:
+0x17FA2 (Mountain Bottom Floor Discard)
+0x17F33 (Rock Open Door)
+0x00FF8 (Caves Entry Panel)
+0x334E1 (Rock Control)
+0x2D77D (Caves Entry Door)
diff --git a/worlds/witness/settings/Postgame/Caves.txt b/worlds/witness/settings/Postgame/Caves.txt
new file mode 100644
index 0000000000..aadb4c3f96
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Caves.txt
@@ -0,0 +1,65 @@
+Disabled Locations:
+0x335AB (Elevator Inside Control)
+0x335AC (Elevator Upper Outside Control)
+0x3369D (Elevator Lower Outside Control)
+0x00190 (Blue Tunnel Right First 1)
+0x00558 (Blue Tunnel Right First 2)
+0x00567 (Blue Tunnel Right First 3)
+0x006FE (Blue Tunnel Right First 4)
+0x01A0D (Blue Tunnel Left First 1)
+0x008B8 (Blue Tunnel Left Second 1)
+0x00973 (Blue Tunnel Left Second 2)
+0x0097B (Blue Tunnel Left Second 3)
+0x0097D (Blue Tunnel Left Second 4)
+0x0097E (Blue Tunnel Left Second 5)
+0x00994 (Blue Tunnel Right Second 1)
+0x334D5 (Blue Tunnel Right Second 2)
+0x00995 (Blue Tunnel Right Second 3)
+0x00996 (Blue Tunnel Right Second 4)
+0x00998 (Blue Tunnel Right Second 5)
+0x009A4 (Blue Tunnel Left Third 1)
+0x018A0 (Blue Tunnel Right Third 1)
+0x00A72 (Blue Tunnel Left Fourth 1)
+0x32962 (First Floor Left)
+0x32966 (First Floor Grounded)
+0x01A31 (First Floor Middle)
+0x00B71 (First Floor Right)
+0x288EA (First Wooden Beam)
+0x288FC (Second Wooden Beam)
+0x289E7 (Third Wooden Beam)
+0x288AA (Fourth Wooden Beam)
+0x17FB9 (Left Upstairs Single)
+0x0A16B (Left Upstairs Left Row 1)
+0x0A2CE (Left Upstairs Left Row 2)
+0x0A2D7 (Left Upstairs Left Row 3)
+0x0A2DD (Left Upstairs Left Row 4)
+0x0A2EA (Left Upstairs Left Row 5)
+0x0008F (Right Upstairs Left Row 1)
+0x0006B (Right Upstairs Left Row 2)
+0x0008B (Right Upstairs Left Row 3)
+0x0008C (Right Upstairs Left Row 4)
+0x0008A (Right Upstairs Left Row 5)
+0x00089 (Right Upstairs Left Row 6)
+0x0006A (Right Upstairs Left Row 7)
+0x0006C (Right Upstairs Left Row 8)
+0x00027 (Right Upstairs Right Row 1)
+0x00028 (Right Upstairs Right Row 2)
+0x00029 (Right Upstairs Right Row 3)
+0x021D7 (Mountain Shortcut Panel)
+0x2D73F (Mountain Shortcut Door)
+0x17CF2 (Swamp Shortcut Panel)
+0x2D859 (Swamp Shortcut Door)
+0x039B4 (Tunnels Entry Panel)
+0x0348A (Tunnels Entry Door)
+0x2FAF6 (Vault Box)
+0x27732 (Tunnels Theater Shortcut Panel)
+0x27739 (Tunnels Theater Shortcut Door)
+0x2773D (Tunnels Desert Shortcut Panel)
+0x27263 (Tunnels Desert Shortcut Door)
+0x09E85 (Tunnels Town Shortcut Panel)
+0x09E87 (Tunnels Town Shortcut Door)
+
+0x3397C (Skylight EP)
+0x28B30 (Water EP)
+0x33A20 (Theater Flowers EP)
+0x3352F (Gate EP)
diff --git a/worlds/witness/settings/Postgame/Challenge_Vault_Box.txt b/worlds/witness/settings/Postgame/Challenge_Vault_Box.txt
new file mode 100644
index 0000000000..8b431694b3
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Challenge_Vault_Box.txt
@@ -0,0 +1,22 @@
+Disabled Locations:
+0x0356B (Challenge Vault Box)
+0x04D75 (Vault Door)
+0x0A332 (Start Timer)
+0x0088E (Small Basic)
+0x00BAF (Big Basic)
+0x00BF3 (Square)
+0x00C09 (Maze Map)
+0x00CDB (Stars and Dots)
+0x0051F (Symmetry)
+0x00524 (Stars and Shapers)
+0x00CD4 (Big Basic 2)
+0x00CB9 (Choice Squares Right)
+0x00CA1 (Choice Squares Middle)
+0x00C80 (Choice Squares Left)
+0x00C68 (Choice Squares 2 Right)
+0x00C59 (Choice Squares 2 Middle)
+0x00C22 (Choice Squares 2 Left)
+0x034F4 (Maze Hidden 1)
+0x034EC (Maze Hidden 2)
+0x1C31A (Dots Pillar)
+0x1C319 (Squares Pillar)
diff --git a/worlds/witness/settings/Postgame/Mountain_Lower.txt b/worlds/witness/settings/Postgame/Mountain_Lower.txt
new file mode 100644
index 0000000000..354e3feb82
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Mountain_Lower.txt
@@ -0,0 +1,27 @@
+Disabled Locations:
+0x17F93 (Elevator Discard)
+0x09EEB (Elevator Control Panel)
+0x09FC1 (Giant Puzzle Bottom Left)
+0x09F8E (Giant Puzzle Bottom Right)
+0x09F01 (Giant Puzzle Top Right)
+0x09EFF (Giant Puzzle Top Left)
+0x09FDA (Giant Puzzle)
+0x09F89 (Exit Door)
+0x01983 (Final Room Entry Left)
+0x01987 (Final Room Entry Right)
+0x0C141 (Final Room Entry Door)
+0x0383A (Right Pillar 1)
+0x09E56 (Right Pillar 2)
+0x09E5A (Right Pillar 3)
+0x33961 (Right Pillar 4)
+0x0383D (Left Pillar 1)
+0x0383F (Left Pillar 2)
+0x03859 (Left Pillar 3)
+0x339BB (Left Pillar 4)
+0x3D9A6 (Elevator Door Closer Left)
+0x3D9A7 (Elevator Door Close Right)
+0x3C113 (Elevator Entry Left)
+0x3C114 (Elevator Entry Right)
+0x3D9AA (Back Wall Left)
+0x3D9A8 (Back Wall Right)
+0x3D9A9 (Elevator Start)
diff --git a/worlds/witness/settings/Postgame/Mountain_Upper.txt b/worlds/witness/settings/Postgame/Mountain_Upper.txt
new file mode 100644
index 0000000000..e2b0765f53
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Mountain_Upper.txt
@@ -0,0 +1,41 @@
+Disabled Locations:
+0x17C34 (Mountain Entry Panel)
+0x09E39 (Light Bridge Controller)
+0x09E7A (Right Row 1)
+0x09E71 (Right Row 2)
+0x09E72 (Right Row 3)
+0x09E69 (Right Row 4)
+0x09E7B (Right Row 5)
+0x09E73 (Left Row 1)
+0x09E75 (Left Row 2)
+0x09E78 (Left Row 3)
+0x09E79 (Left Row 4)
+0x09E6C (Left Row 5)
+0x09E6F (Left Row 6)
+0x09E6B (Left Row 7)
+0x33AF5 (Back Row 1)
+0x33AF7 (Back Row 2)
+0x09F6E (Back Row 3)
+0x09EAD (Trash Pillar 1)
+0x09EAF (Trash Pillar 2)
+0x09E54 (Mountain Floor 1 Exit Door)
+0x09FD3 (Near Row 1)
+0x09FD4 (Near Row 2)
+0x09FD6 (Near Row 3)
+0x09FD7 (Near Row 4)
+0x09FD8 (Near Row 5)
+0x09FFB (Staircase Near Door)
+0x09EDD (Elevator Room Entry Door)
+0x09E86 (Light Bridge Controller Near)
+0x09FCC (Far Row 1)
+0x09FCE (Far Row 2)
+0x09FCF (Far Row 3)
+0x09FD0 (Far Row 4)
+0x09FD1 (Far Row 5)
+0x09FD2 (Far Row 6)
+0x09E07 (Staircase Far Door)
+0x09ED8 (Light Bridge Controller Far)
+
+0x09D63 (Pink Bridge EP)
+0x09D5D (Yellow Bridge EP)
+0x09D5E (Blue Bridge EP)
diff --git a/worlds/witness/settings/Postgame/Path_To_Challenge.txt b/worlds/witness/settings/Postgame/Path_To_Challenge.txt
new file mode 100644
index 0000000000..3f9239cc48
--- /dev/null
+++ b/worlds/witness/settings/Postgame/Path_To_Challenge.txt
@@ -0,0 +1,30 @@
+Disabled Locations:
+0x0356B (Vault Box)
+0x04D75 (Vault Door)
+0x17F33 (Rock Open Door)
+0x00FF8 (Caves Entry Panel)
+0x334E1 (Rock Control)
+0x2D77D (Caves Entry Door)
+0x09DD5 (Lone Pillar)
+0x019A5 (Caves Pillar Door)
+0x0A16E (Challenge Entry Panel)
+0x0A19A (Challenge Entry Door)
+0x0A332 (Start Timer)
+0x0088E (Small Basic)
+0x00BAF (Big Basic)
+0x00BF3 (Square)
+0x00C09 (Maze Map)
+0x00CDB (Stars and Dots)
+0x0051F (Symmetry)
+0x00524 (Stars and Shapers)
+0x00CD4 (Big Basic 2)
+0x00CB9 (Choice Squares Right)
+0x00CA1 (Choice Squares Middle)
+0x00C80 (Choice Squares Left)
+0x00C68 (Choice Squares 2 Right)
+0x00C59 (Choice Squares 2 Middle)
+0x00C22 (Choice Squares 2 Left)
+0x034F4 (Maze Hidden 1)
+0x034EC (Maze Hidden 2)
+0x1C31A (Dots Pillar)
+0x1C319 (Squares Pillar)
diff --git a/worlds/witness/static_logic.py b/worlds/witness/static_logic.py
index 8dc2a05de5..29c171d45c 100644
--- a/worlds/witness/static_logic.py
+++ b/worlds/witness/static_logic.py
@@ -73,31 +73,34 @@ class StaticWitnessLogicObj:
 
             location_id = line_split.pop(0)
 
-            check_name_full = line_split.pop(0)
+            entity_name_full = line_split.pop(0)
 
-            check_hex = check_name_full[0:7]
-            check_name = check_name_full[9:-1]
+            entity_hex = entity_name_full[0:7]
+            entity_name = entity_name_full[9:-1]
 
             required_panel_lambda = line_split.pop(0)
 
-            full_check_name = current_region["shortName"] + " " + check_name
+            full_entity_name = current_region["shortName"] + " " + entity_name
 
             if location_id == "Door" or location_id == "Laser":
-                self.CHECKS_BY_HEX[check_hex] = {
-                    "checkName": full_check_name,
-                    "checkHex": check_hex,
-                    "region": current_region,
+                self.ENTITIES_BY_HEX[entity_hex] = {
+                    "checkName": full_entity_name,
+                    "entity_hex": entity_hex,
+                    "region": None,
                     "id": None,
-                    "panelType": location_id
+                    "entityType": location_id
                 }
 
-                self.CHECKS_BY_NAME[self.CHECKS_BY_HEX[check_hex]["checkName"]] = self.CHECKS_BY_HEX[check_hex]
+                self.ENTITIES_BY_NAME[self.ENTITIES_BY_HEX[entity_hex]["checkName"]] = self.ENTITIES_BY_HEX[entity_hex]
 
-                self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[check_hex] = {
+                self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[entity_hex] = {
                     "panels": parse_lambda(required_panel_lambda)
                 }
 
-                current_region["panels"].append(check_hex)
+                # Lasers and Doors exist in a region, but don't have a regional *requirement*
+                # If a laser is activated, you don't need to physically walk up to it for it to count
+                # As such, logically, they behave more as if they were part of the "Entry" region
+                self.ALL_REGIONS_BY_NAME["Entry"]["panels"].append(entity_hex)
                 continue
 
             required_item_lambda = line_split.pop(0)
@@ -108,18 +111,18 @@ class StaticWitnessLogicObj:
                 "Laser Pressure Plates",
                 "Desert Laser Redirect"
             }
-            is_vault_or_video = "Vault" in check_name or "Video" in check_name
+            is_vault_or_video = "Vault" in entity_name or "Video" in entity_name
 
-            if "Discard" in check_name:
+            if "Discard" in entity_name:
                 location_type = "Discard"
-            elif is_vault_or_video or check_name == "Tutorial Gate Close":
+            elif is_vault_or_video or entity_name == "Tutorial Gate Close":
                 location_type = "Vault"
-            elif check_name in laser_names:
+            elif entity_name in laser_names:
                 location_type = "Laser"
-            elif "Obelisk Side" in check_name:
+            elif "Obelisk Side" in entity_name:
                 location_type = "Obelisk Side"
-                full_check_name = check_name
-            elif "EP" in check_name:
+                full_entity_name = entity_name
+            elif "EP" in entity_name:
                 location_type = "EP"
             else:
                 location_type = "General"
@@ -140,32 +143,35 @@ class StaticWitnessLogicObj:
 
                 eps_ints = {int(h, 16) for h in eps}
 
-                self.OBELISK_SIDE_ID_TO_EP_HEXES[int(check_hex, 16)] = eps_ints
+                self.OBELISK_SIDE_ID_TO_EP_HEXES[int(entity_hex, 16)] = eps_ints
                 for ep_hex in eps:
-                    self.EP_TO_OBELISK_SIDE[ep_hex] = check_hex
+                    self.EP_TO_OBELISK_SIDE[ep_hex] = entity_hex
 
-            self.CHECKS_BY_HEX[check_hex] = {
-                "checkName": full_check_name,
-                "checkHex": check_hex,
+            self.ENTITIES_BY_HEX[entity_hex] = {
+                "checkName": full_entity_name,
+                "entity_hex": entity_hex,
                 "region": current_region,
                 "id": int(location_id),
-                "panelType": location_type
+                "entityType": location_type
             }
 
-            self.ENTITY_ID_TO_NAME[check_hex] = full_check_name
+            self.ENTITY_ID_TO_NAME[entity_hex] = full_entity_name
 
-            self.CHECKS_BY_NAME[self.CHECKS_BY_HEX[check_hex]["checkName"]] = self.CHECKS_BY_HEX[check_hex]
-            self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[check_hex] = requirement
+            self.ENTITIES_BY_NAME[self.ENTITIES_BY_HEX[entity_hex]["checkName"]] = self.ENTITIES_BY_HEX[entity_hex]
+            self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX[entity_hex] = requirement
 
-            current_region["panels"].append(check_hex)
+            current_region["panels"].append(entity_hex)
+
+    def __init__(self, lines=None):
+        if lines is None:
+            lines = get_sigma_normal_logic()
 
-    def __init__(self, lines=get_sigma_normal_logic()):
         # All regions with a list of panels in them and the connections to other regions, before logic adjustments
         self.ALL_REGIONS_BY_NAME = dict()
         self.STATIC_CONNECTIONS_BY_REGION_NAME = dict()
 
-        self.CHECKS_BY_HEX = dict()
-        self.CHECKS_BY_NAME = dict()
+        self.ENTITIES_BY_HEX = dict()
+        self.ENTITIES_BY_NAME = dict()
         self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX = dict()
 
         self.OBELISK_SIDE_ID_TO_EP_HEXES = dict()
@@ -187,8 +193,8 @@ class StaticWitnessLogic:
 
     OBELISK_SIDE_ID_TO_EP_HEXES = dict()
 
-    CHECKS_BY_HEX = dict()
-    CHECKS_BY_NAME = dict()
+    ENTITIES_BY_HEX = dict()
+    ENTITIES_BY_NAME = dict()
     STATIC_DEPENDENT_REQUIREMENTS_BY_HEX = dict()
 
     EP_TO_OBELISK_SIDE = dict()
@@ -262,8 +268,8 @@ class StaticWitnessLogic:
         self.ALL_REGIONS_BY_NAME.update(self.sigma_normal.ALL_REGIONS_BY_NAME)
         self.STATIC_CONNECTIONS_BY_REGION_NAME.update(self.sigma_normal.STATIC_CONNECTIONS_BY_REGION_NAME)
 
-        self.CHECKS_BY_HEX.update(self.sigma_normal.CHECKS_BY_HEX)
-        self.CHECKS_BY_NAME.update(self.sigma_normal.CHECKS_BY_NAME)
+        self.ENTITIES_BY_HEX.update(self.sigma_normal.ENTITIES_BY_HEX)
+        self.ENTITIES_BY_NAME.update(self.sigma_normal.ENTITIES_BY_NAME)
         self.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX.update(self.sigma_normal.STATIC_DEPENDENT_REQUIREMENTS_BY_HEX)
 
         self.OBELISK_SIDE_ID_TO_EP_HEXES.update(self.sigma_normal.OBELISK_SIDE_ID_TO_EP_HEXES)
diff --git a/worlds/witness/utils.py b/worlds/witness/utils.py
index 72dc10fd06..fbb670fd08 100644
--- a/worlds/witness/utils.py
+++ b/worlds/witness/utils.py
@@ -1,6 +1,6 @@
 from functools import lru_cache
 from math import floor
-from typing import List, Collection
+from typing import List, Collection, FrozenSet, Tuple, Dict, Any, Set
 from pkgutil import get_data
 
 
@@ -33,7 +33,7 @@ def build_weighted_int_list(inputs: Collection[float], total: int) -> List[int]:
     return rounded_output
 
 
-def define_new_region(region_string):
+def define_new_region(region_string: str) -> Tuple[Dict[str, Any], Set[Tuple[str, FrozenSet[FrozenSet[str]]]]]:
     """
     Returns a region object by parsing a line in the logic file
     """
@@ -66,7 +66,7 @@ def define_new_region(region_string):
     return region_obj, options
 
 
-def parse_lambda(lambda_string):
+def parse_lambda(lambda_string) -> FrozenSet[FrozenSet[str]]:
     """
     Turns a lambda String literal like this: a | b & c
     into a set of sets like this: {{a}, {b, c}}
@@ -97,86 +97,168 @@ class lazy(object):
 
 
 @lru_cache(maxsize=None)
-def get_adjustment_file(adjustment_file):
+def get_adjustment_file(adjustment_file: str) -> List[str]:
     data = get_data(__name__, adjustment_file).decode('utf-8')
     return [line.strip() for line in data.split("\n")]
 
 
-def get_disable_unrandomized_list():
-    return get_adjustment_file("settings/Disable_Unrandomized.txt")
+def get_disable_unrandomized_list() -> List[str]:
+    return get_adjustment_file("settings/Exclusions/Disable_Unrandomized.txt")
 
 
-def get_early_utm_list():
-    return get_adjustment_file("settings/Early_UTM.txt")
+def get_early_caves_list() -> List[str]:
+    return get_adjustment_file("settings/Early_Caves.txt")
 
 
-def get_symbol_shuffle_list():
+def get_early_caves_start_list() -> List[str]:
+    return get_adjustment_file("settings/Early_Caves_Start.txt")
+
+
+def get_symbol_shuffle_list() -> List[str]:
     return get_adjustment_file("settings/Symbol_Shuffle.txt")
 
 
-def get_door_panel_shuffle_list():
-    return get_adjustment_file("settings/Door_Panel_Shuffle.txt")
+def get_complex_doors() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Complex_Doors.txt")
 
 
-def get_doors_simple_list():
-    return get_adjustment_file("settings/Doors_Simple.txt")
+def get_simple_doors() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Simple_Doors.txt")
 
 
-def get_doors_complex_list():
-    return get_adjustment_file("settings/Doors_Complex.txt")
+def get_complex_door_panels() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Complex_Door_Panels.txt")
 
 
-def get_doors_max_list():
-    return get_adjustment_file("settings/Doors_Max.txt")
+def get_complex_additional_panels() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Complex_Additional_Panels.txt")
 
 
-def get_laser_shuffle():
+def get_simple_panels() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Simple_Panels.txt")
+
+
+def get_simple_additional_panels() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Simple_Additional_Panels.txt")
+
+
+def get_boat() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Boat.txt")
+
+
+def get_laser_shuffle() -> List[str]:
     return get_adjustment_file("settings/Laser_Shuffle.txt")
 
 
-def get_audio_logs():
+def get_audio_logs() -> List[str]:
     return get_adjustment_file("settings/Audio_Logs.txt")
 
 
-def get_ep_all_individual():
+def get_ep_all_individual() -> List[str]:
     return get_adjustment_file("settings/EP_Shuffle/EP_All.txt")
 
 
-def get_ep_obelisks():
+def get_ep_obelisks() -> List[str]:
     return get_adjustment_file("settings/EP_Shuffle/EP_Sides.txt")
 
 
-def get_ep_easy():
+def get_ep_easy() -> List[str]:
     return get_adjustment_file("settings/EP_Shuffle/EP_Easy.txt")
 
 
-def get_ep_no_eclipse():
+def get_ep_no_eclipse() -> List[str]:
     return get_adjustment_file("settings/EP_Shuffle/EP_NoEclipse.txt")
 
 
-def get_ep_no_caves():
-    return get_adjustment_file("settings/EP_Shuffle/EP_NoCavesEPs.txt")
+def get_vault_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Exclusions/Vaults.txt")
 
 
-def get_ep_no_mountain():
-    return get_adjustment_file("settings/EP_Shuffle/EP_NoMountainEPs.txt")
+def get_discard_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Exclusions/Discards.txt")
 
 
-def get_ep_no_videos():
-    return get_adjustment_file("settings/EP_Shuffle/EP_Videos.txt")
+def get_caves_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Caves.txt")
 
 
-def get_sigma_normal_logic():
+def get_beyond_challenge_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Beyond_Challenge.txt")
+
+
+def get_bottom_floor_discard_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Bottom_Floor_Discard.txt")
+
+
+def get_bottom_floor_discard_nondoors_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Bottom_Floor_Discard_NonDoors.txt")
+
+
+def get_mountain_upper_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Mountain_Upper.txt")
+
+
+def get_challenge_vault_box_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Challenge_Vault_Box.txt")
+
+
+def get_path_to_challenge_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Path_To_Challenge.txt")
+
+
+def get_mountain_lower_exclusion_list() -> List[str]:
+    return get_adjustment_file("settings/Postgame/Mountain_Lower.txt")
+
+
+def get_elevators_come_to_you() -> List[str]:
+    return get_adjustment_file("settings/Door_Shuffle/Elevators_Come_To_You.txt")
+
+
+def get_sigma_normal_logic() -> List[str]:
     return get_adjustment_file("WitnessLogic.txt")
 
 
-def get_sigma_expert_logic():
+def get_sigma_expert_logic() -> List[str]:
     return get_adjustment_file("WitnessLogicExpert.txt")
 
 
-def get_vanilla_logic():
+def get_vanilla_logic() -> List[str]:
     return get_adjustment_file("WitnessLogicVanilla.txt")
 
 
-def get_items():
+def get_items() -> List[str]:
     return get_adjustment_file("WitnessItems.txt")
+
+
+def dnf_remove_redundancies(dnf_requirement: FrozenSet[FrozenSet[str]]) -> FrozenSet[FrozenSet[str]]:
+    """Removes any redundant terms from a logical formula in disjunctive normal form.
+    This means removing any terms that are a superset of any other term get removed.
+    This is possible because of the boolean absorption law: a | (a & b) = a"""
+    to_remove = set()
+
+    for option1 in dnf_requirement:
+        for option2 in dnf_requirement:
+            if option2 < option1:
+                to_remove.add(option1)
+
+    return dnf_requirement - to_remove
+
+
+def dnf_and(dnf_requirements: List[FrozenSet[FrozenSet[str]]]) -> FrozenSet[FrozenSet[str]]:
+    """
+    performs the "and" operator on a list of logical formula in disjunctive normal form, represented as a set of sets.
+    A logical formula might look like this: {{a, b}, {c, d}}, which would mean "a & b | c & d".
+    These can be easily and-ed by just using the boolean distributive law: (a | b) & c = a & c | a & b.
+    """
+    current_overall_requirement = frozenset({frozenset()})
+
+    for next_dnf_requirement in dnf_requirements:
+        new_requirement: Set[FrozenSet[str]] = set()
+
+        for option1 in current_overall_requirement:
+            for option2 in next_dnf_requirement:
+                new_requirement.add(option1 | option2)
+
+        current_overall_requirement = frozenset(new_requirement)
+
+    return dnf_remove_redundancies(current_overall_requirement)
diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index 7c927c10eb..3f441d12ab 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -10,10 +10,9 @@ import logging
 
 from BaseClasses import ItemClassification, LocationProgressType, \
     MultiWorld, Item, CollectionState, Entrance, Tutorial
-from .config import detect_test
 from .logic import cs_to_zz_locs
 from .region import ZillionLocation, ZillionRegion
-from .options import ZillionStartChar, zillion_options, validate
+from .options import ZillionOptions, ZillionStartChar, validate
 from .id_maps import item_name_to_id as _item_name_to_id, \
     loc_name_to_id as _loc_name_to_id, make_id_to_others, \
     zz_reg_name_to_reg_name, base_id
@@ -34,6 +33,7 @@ class ZillionSettings(settings.Group):
         """File name of the Zillion US rom"""
         description = "Zillion US ROM File"
         copy_to = "Zillion (UE) [!].sms"
+        assert ZillionDeltaPatch.hash
         md5s = [ZillionDeltaPatch.hash]
 
     class RomStart(str):
@@ -70,8 +70,12 @@ class ZillionWorld(World):
     game = "Zillion"
     web = ZillionWebWorld()
 
-    option_definitions = zillion_options
-    settings: typing.ClassVar[ZillionSettings]
+    options_dataclass = ZillionOptions
+    options: ZillionOptions  # type: ignore
+
+    settings: typing.ClassVar[ZillionSettings]  # type: ignore
+    # these type: ignore are because of this issue: https://github.com/python/typing/discussions/1486
+
     topology_present = True  # indicate if world type has any meaningful layout/pathing
 
     # map names to their IDs
@@ -142,13 +146,14 @@ class ZillionWorld(World):
         if not hasattr(self.multiworld, "zillion_logic_cache"):
             setattr(self.multiworld, "zillion_logic_cache", {})
 
-        zz_op, item_counts = validate(self.multiworld, self.player)
+        zz_op, item_counts = validate(self.options)
+
+        if zz_op.early_scope:
+            self.multiworld.early_items[self.player]["Scope"] = 1
 
         self._item_counts = item_counts
 
-        rom_dir_name = "" if detect_test() else os.path.dirname(get_base_rom_path())
         with redirect_stdout(self.lsi):  # type: ignore
-            self.zz_system.make_patcher(rom_dir_name)
             self.zz_system.make_randomizer(zz_op)
 
             self.zz_system.seed(self.multiworld.seed)
@@ -299,7 +304,8 @@ class ZillionWorld(World):
                     elif start_char_counts["Champ"] > start_char_counts["Apple"]:
                         to_stay = "Champ"
                     else:  # equal
-                        to_stay = multiworld.random.choice(("Apple", "Champ"))
+                        choices: Tuple[Literal['Apple', 'Champ', 'JJ'], ...] = ("Apple", "Champ")
+                        to_stay = multiworld.random.choice(choices)
 
                     for p, sc in players_start_chars:
                         if sc != to_stay:
@@ -317,6 +323,8 @@ class ZillionWorld(World):
         """
         sync zilliandomizer item locations with AP item locations
         """
+        rom_dir_name = os.path.dirname(get_base_rom_path())
+        self.zz_system.make_patcher(rom_dir_name)
         assert self.zz_system.randomizer and self.zz_system.patcher, "generate_early hasn't been called"
         zz_options = self.zz_system.randomizer.options
 
@@ -324,23 +332,22 @@ class ZillionWorld(World):
         empty = zz_items[4]
         multi_item = empty  # a different patcher method differentiates empty from ap multi item
         multi_items: Dict[str, Tuple[str, str]] = {}  # zz_loc_name to (item_name, player_name)
-        for loc in self.multiworld.get_locations():
-            if loc.player == self.player:
-                z_loc = cast(ZillionLocation, loc)
-                # debug_zz_loc_ids[z_loc.zz_loc.name] = id(z_loc.zz_loc)
-                if z_loc.item is None:
-                    self.logger.warn("generate_output location has no item - is that ok?")
-                    z_loc.zz_loc.item = empty
-                elif z_loc.item.player == self.player:
-                    z_item = cast(ZillionItem, z_loc.item)
-                    z_loc.zz_loc.item = z_item.zz_item
-                else:  # another player's item
-                    # print(f"put multi item in {z_loc.zz_loc.name}")
-                    z_loc.zz_loc.item = multi_item
-                    multi_items[z_loc.zz_loc.name] = (
-                        z_loc.item.name,
-                        self.multiworld.get_player_name(z_loc.item.player)
-                    )
+        for loc in self.multiworld.get_locations(self.player):
+            z_loc = cast(ZillionLocation, loc)
+            # debug_zz_loc_ids[z_loc.zz_loc.name] = id(z_loc.zz_loc)
+            if z_loc.item is None:
+                self.logger.warn("generate_output location has no item - is that ok?")
+                z_loc.zz_loc.item = empty
+            elif z_loc.item.player == self.player:
+                z_item = cast(ZillionItem, z_loc.item)
+                z_loc.zz_loc.item = z_item.zz_item
+            else:  # another player's item
+                # print(f"put multi item in {z_loc.zz_loc.name}")
+                z_loc.zz_loc.item = multi_item
+                multi_items[z_loc.zz_loc.name] = (
+                    z_loc.item.name,
+                    self.multiworld.get_player_name(z_loc.item.player)
+                )
         # debug_zz_loc_ids.sort()
         # for name, id_ in debug_zz_loc_ids.items():
         #     print(id_)
@@ -367,7 +374,9 @@ class ZillionWorld(World):
                                    zz_options.start_char,
                                    self.zz_system.randomizer.loc_name_2_pretty)
         self.slot_data_ready.set()
-        zz_patcher.all_fixes_and_options(zz_options)
+        rm = self.zz_system.resource_managers
+        assert rm, "missing resource_managers from generate_early"
+        zz_patcher.all_fixes_and_options(zz_options, rm)
         zz_patcher.set_external_item_interface(zz_options.start_char, zz_options.max_level)
         zz_patcher.set_multiworld_items(multi_items)
         game_id = self.multiworld.player_name[self.player].encode() + b'\x00' + self.multiworld.seed_name[-6:].encode()
@@ -378,7 +387,7 @@ class ZillionWorld(World):
         If you need any last-second randomization, use MultiWorld.per_slot_randoms[slot] instead."""
         self.finalize_item_locations()
 
-        assert self.zz_system.patcher, "didn't get patcher from generate_early"
+        assert self.zz_system.patcher, "didn't get patcher from finalize_item_locations"
         # original_rom_bytes = self.zz_patcher.rom
         patched_rom_bytes = self.zz_system.patcher.get_patched_bytes()
 
@@ -409,12 +418,12 @@ class ZillionWorld(World):
         # TODO: tell client which canisters are keywords
         # so it can open and get those when restoring doors
 
-        zz_patcher = self.zz_system.patcher
-        assert zz_patcher, "didn't get patcher from generate_early"
         assert self.zz_system.randomizer, "didn't get randomizer from generate_early"
 
         rescues: Dict[str, Any] = {}
         self.slot_data_ready.wait()
+        zz_patcher = self.zz_system.patcher
+        assert zz_patcher, "didn't get patcher from generate_output"
         for i in (0, 1):
             if i in zz_patcher.rescue_locations:
                 ri = zz_patcher.rescue_locations[i]
diff --git a/worlds/zillion/client.py b/worlds/zillion/client.py
new file mode 100644
index 0000000000..ac73f6db50
--- /dev/null
+++ b/worlds/zillion/client.py
@@ -0,0 +1,501 @@
+import asyncio
+import base64
+import platform
+from typing import Any, ClassVar, Coroutine, Dict, List, Optional, Protocol, Tuple, cast
+
+from CommonClient import CommonContext, server_loop, gui_enabled, \
+    ClientCommandProcessor, logger, get_base_parser
+from NetUtils import ClientStatus
+from Utils import async_start
+
+import colorama
+
+from zilliandomizer.zri.memory import Memory
+from zilliandomizer.zri import events
+from zilliandomizer.utils.loc_name_maps import id_to_loc
+from zilliandomizer.options import Chars
+from zilliandomizer.patch import RescueInfo
+
+from .id_maps import make_id_to_others
+from .config import base_id, zillion_map
+
+
+class ZillionCommandProcessor(ClientCommandProcessor):
+    ctx: "ZillionContext"
+
+    def _cmd_sms(self) -> None:
+        """ Tell the client that Zillion is running in RetroArch. """
+        logger.info("ready to look for game")
+        self.ctx.look_for_retroarch.set()
+
+    def _cmd_map(self) -> None:
+        """ Toggle view of the map tracker. """
+        self.ctx.ui_toggle_map()
+
+
+class ToggleCallback(Protocol):
+    def __call__(self) -> None: ...
+
+
+class SetRoomCallback(Protocol):
+    def __call__(self, rooms: List[List[int]]) -> None: ...
+
+
+class ZillionContext(CommonContext):
+    game = "Zillion"
+    command_processor = ZillionCommandProcessor
+    items_handling = 1  # receive items from other players
+
+    known_name: Optional[str]
+    """ This is almost the same as `auth` except `auth` is reset to `None` when server disconnects, and this isn't. """
+
+    from_game: "asyncio.Queue[events.EventFromGame]"
+    to_game: "asyncio.Queue[events.EventToGame]"
+    ap_local_count: int
+    """ local checks watched by server """
+    next_item: int
+    """ index in `items_received` """
+    ap_id_to_name: Dict[int, str]
+    ap_id_to_zz_id: Dict[int, int]
+    start_char: Chars = "JJ"
+    rescues: Dict[int, RescueInfo] = {}
+    loc_mem_to_id: Dict[int, int] = {}
+    got_room_info: asyncio.Event
+    """ flag for connected to server """
+    got_slot_data: asyncio.Event
+    """ serves as a flag for whether I am logged in to the server """
+
+    look_for_retroarch: asyncio.Event
+    """
+    There is a bug in Python in Windows
+    https://github.com/python/cpython/issues/91227
+    that makes it so if I look for RetroArch before it's ready,
+    it breaks the asyncio udp transport system.
+
+    As a workaround, we don't look for RetroArch until this event is set.
+    """
+
+    ui_toggle_map: ToggleCallback
+    ui_set_rooms: SetRoomCallback
+    """ parameter is y 16 x 8 numbers to show in each room """
+
+    def __init__(self,
+                 server_address: str,
+                 password: str) -> None:
+        super().__init__(server_address, password)
+        self.known_name = None
+        self.from_game = asyncio.Queue()
+        self.to_game = asyncio.Queue()
+        self.got_room_info = asyncio.Event()
+        self.got_slot_data = asyncio.Event()
+        self.ui_toggle_map = lambda: None
+        self.ui_set_rooms = lambda rooms: None
+
+        self.look_for_retroarch = asyncio.Event()
+        if platform.system() != "Windows":
+            # asyncio udp bug is only on Windows
+            self.look_for_retroarch.set()
+
+        self.reset_game_state()
+
+    def reset_game_state(self) -> None:
+        for _ in range(self.from_game.qsize()):
+            self.from_game.get_nowait()
+        for _ in range(self.to_game.qsize()):
+            self.to_game.get_nowait()
+        self.got_slot_data.clear()
+
+        self.ap_local_count = 0
+        self.next_item = 0
+        self.ap_id_to_name = {}
+        self.ap_id_to_zz_id = {}
+        self.rescues = {}
+        self.loc_mem_to_id = {}
+
+        self.locations_checked.clear()
+        self.missing_locations.clear()
+        self.checked_locations.clear()
+        self.finished_game = False
+        self.items_received.clear()
+
+    # override
+    def on_deathlink(self, data: Dict[str, Any]) -> None:
+        self.to_game.put_nowait(events.DeathEventToGame())
+        return super().on_deathlink(data)
+
+    # override
+    async def server_auth(self, password_requested: bool = False) -> None:
+        if password_requested and not self.password:
+            await super().server_auth(password_requested)
+        if not self.auth:
+            logger.info('waiting for connection to game...')
+            return
+        logger.info("logging in to server...")
+        await self.send_connect()
+
+    # override
+    def run_gui(self) -> None:
+        from kvui import GameManager
+        from kivy.core.text import Label as CoreLabel
+        from kivy.graphics import Ellipse, Color, Rectangle
+        from kivy.uix.layout import Layout
+        from kivy.uix.widget import Widget
+
+        class ZillionManager(GameManager):
+            logging_pairs = [
+                ("Client", "Archipelago")
+            ]
+            base_title = "Archipelago Zillion Client"
+
+            class MapPanel(Widget):
+                MAP_WIDTH: ClassVar[int] = 281
+
+                _number_textures: List[Any] = []
+                rooms: List[List[int]] = []
+
+                def __init__(self, **kwargs: Any) -> None:
+                    super().__init__(**kwargs)
+
+                    self.rooms = [[0 for _ in range(8)] for _ in range(16)]
+
+                    self._make_numbers()
+                    self.update_map()
+
+                    self.bind(pos=self.update_map)
+                    # self.bind(size=self.update_bg)
+
+                def _make_numbers(self) -> None:
+                    self._number_textures = []
+                    for n in range(10):
+                        label = CoreLabel(text=str(n), font_size=22, color=(0.1, 0.9, 0, 1))
+                        label.refresh()
+                        self._number_textures.append(label.texture)
+
+                def update_map(self, *args: Any) -> None:
+                    self.canvas.clear()
+
+                    with self.canvas:
+                        Color(1, 1, 1, 1)
+                        Rectangle(source=zillion_map,
+                                  pos=self.pos,
+                                  size=(ZillionManager.MapPanel.MAP_WIDTH,
+                                        int(ZillionManager.MapPanel.MAP_WIDTH * 1.456)))  # aspect ratio of that image
+                        for y in range(16):
+                            for x in range(8):
+                                num = self.rooms[15 - y][x]
+                                if num > 0:
+                                    Color(0, 0, 0, 0.4)
+                                    pos = [self.pos[0] + 17 + x * 32, self.pos[1] + 14 + y * 24]
+                                    Ellipse(size=[22, 22], pos=pos)
+                                    Color(1, 1, 1, 1)
+                                    pos = [self.pos[0] + 22 + x * 32, self.pos[1] + 12 + y * 24]
+                                    num_texture = self._number_textures[num]
+                                    Rectangle(texture=num_texture, size=num_texture.size, pos=pos)
+
+            def build(self) -> Layout:
+                container = super().build()
+                self.map_widget = ZillionManager.MapPanel(size_hint_x=None, width=0)
+                self.main_area_container.add_widget(self.map_widget)
+                return container
+
+            def toggle_map_width(self) -> None:
+                if self.map_widget.width == 0:
+                    self.map_widget.width = ZillionManager.MapPanel.MAP_WIDTH
+                else:
+                    self.map_widget.width = 0
+                self.container.do_layout()
+
+            def set_rooms(self, rooms: List[List[int]]) -> None:
+                self.map_widget.rooms = rooms
+                self.map_widget.update_map()
+
+        self.ui = ZillionManager(self)
+        self.ui_toggle_map = lambda: self.ui.toggle_map_width()
+        self.ui_set_rooms = lambda rooms: self.ui.set_rooms(rooms)
+        run_co: Coroutine[Any, Any, None] = self.ui.async_run()
+        self.ui_task = asyncio.create_task(run_co, name="UI")
+
+    def on_package(self, cmd: str, args: Dict[str, Any]) -> None:
+        self.room_item_numbers_to_ui()
+        if cmd == "Connected":
+            logger.info("logged in to Archipelago server")
+            if "slot_data" not in args:
+                logger.warn("`Connected` packet missing `slot_data`")
+                return
+            slot_data = args["slot_data"]
+
+            if "start_char" not in slot_data:
+                logger.warn("invalid Zillion `Connected` packet, `slot_data` missing `start_char`")
+                return
+            self.start_char = slot_data['start_char']
+            if self.start_char not in {"Apple", "Champ", "JJ"}:
+                logger.warn("invalid Zillion `Connected` packet, "
+                            f"`slot_data` `start_char` has invalid value: {self.start_char}")
+
+            if "rescues" not in slot_data:
+                logger.warn("invalid Zillion `Connected` packet, `slot_data` missing `rescues`")
+                return
+            rescues = slot_data["rescues"]
+            self.rescues = {}
+            for rescue_id, json_info in rescues.items():
+                assert rescue_id in ("0", "1"), f"invalid rescue_id in Zillion slot_data: {rescue_id}"
+                # TODO: just take start_char out of the RescueInfo so there's no opportunity for a mismatch?
+                assert json_info["start_char"] == self.start_char, \
+                    f'mismatch in Zillion slot data: {json_info["start_char"]} {self.start_char}'
+                ri = RescueInfo(json_info["start_char"],
+                                json_info["room_code"],
+                                json_info["mask"])
+                self.rescues[0 if rescue_id == "0" else 1] = ri
+
+            if "loc_mem_to_id" not in slot_data:
+                logger.warn("invalid Zillion `Connected` packet, `slot_data` missing `loc_mem_to_id`")
+                return
+            loc_mem_to_id = slot_data["loc_mem_to_id"]
+            self.loc_mem_to_id = {}
+            for mem_str, id_str in loc_mem_to_id.items():
+                mem = int(mem_str)
+                id_ = int(id_str)
+                room_i = mem // 256
+                assert 0 <= room_i < 74
+                assert id_ in id_to_loc
+                self.loc_mem_to_id[mem] = id_
+
+            if len(self.loc_mem_to_id) != 394:
+                logger.warn("invalid Zillion `Connected` packet, "
+                            f"`slot_data` missing locations in `loc_mem_to_id` - len {len(self.loc_mem_to_id)}")
+
+            self.got_slot_data.set()
+
+            payload = {
+                "cmd": "Get",
+                "keys": [f"zillion-{self.auth}-doors"]
+            }
+            async_start(self.send_msgs([payload]))
+        elif cmd == "Retrieved":
+            if "keys" not in args:
+                logger.warning(f"invalid Retrieved packet to ZillionClient: {args}")
+                return
+            keys = cast(Dict[str, Optional[str]], args["keys"])
+            doors_b64 = keys.get(f"zillion-{self.auth}-doors", None)
+            if doors_b64:
+                logger.info("received door data from server")
+                doors = base64.b64decode(doors_b64)
+                self.to_game.put_nowait(events.DoorEventToGame(doors))
+        elif cmd == "RoomInfo":
+            self.seed_name = args["seed_name"]
+            self.got_room_info.set()
+
+    def room_item_numbers_to_ui(self) -> None:
+        rooms = [[0 for _ in range(8)] for _ in range(16)]
+        for loc_id in self.missing_locations:
+            loc_id_small = loc_id - base_id
+            loc_name = id_to_loc[loc_id_small]
+            y = ord(loc_name[0]) - 65
+            x = ord(loc_name[2]) - 49
+            if y == 9 and x == 5:
+                # don't show main computer in numbers
+                continue
+            assert (0 <= y < 16) and (0 <= x < 8), f"invalid index from location name {loc_name}"
+            rooms[y][x] += 1
+        # TODO: also add locations with locals lost from loading save state or reset
+        self.ui_set_rooms(rooms)
+
+    def process_from_game_queue(self) -> None:
+        if self.from_game.qsize():
+            event_from_game = self.from_game.get_nowait()
+            if isinstance(event_from_game, events.AcquireLocationEventFromGame):
+                server_id = event_from_game.id + base_id
+                loc_name = id_to_loc[event_from_game.id]
+                self.locations_checked.add(server_id)
+                if server_id in self.missing_locations:
+                    self.ap_local_count += 1
+                    n_locations = len(self.missing_locations) + len(self.checked_locations) - 1  # -1 to ignore win
+                    logger.info(f'New Check: {loc_name} ({self.ap_local_count}/{n_locations})')
+                    async_start(self.send_msgs([
+                        {"cmd": 'LocationChecks', "locations": [server_id]}
+                    ]))
+                else:
+                    # This will happen a lot in Zillion,
+                    # because all the key words are local and unwatched by the server.
+                    logger.debug(f"DEBUG: {loc_name} not in missing")
+            elif isinstance(event_from_game, events.DeathEventFromGame):
+                async_start(self.send_death())
+            elif isinstance(event_from_game, events.WinEventFromGame):
+                if not self.finished_game:
+                    async_start(self.send_msgs([
+                        {"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}
+                    ]))
+                    self.finished_game = True
+            elif isinstance(event_from_game, events.DoorEventFromGame):
+                if self.auth:
+                    doors_b64 = base64.b64encode(event_from_game.doors).decode()
+                    payload = {
+                        "cmd": "Set",
+                        "key": f"zillion-{self.auth}-doors",
+                        "operations": [{"operation": "replace", "value": doors_b64}]
+                    }
+                    async_start(self.send_msgs([payload]))
+            else:
+                logger.warning(f"WARNING: unhandled event from game {event_from_game}")
+
+    def process_items_received(self) -> None:
+        if len(self.items_received) > self.next_item:
+            zz_item_ids = [self.ap_id_to_zz_id[item.item] for item in self.items_received]
+            for index in range(self.next_item, len(self.items_received)):
+                ap_id = self.items_received[index].item
+                from_name = self.player_names[self.items_received[index].player]
+                # TODO: colors in this text, like sni client?
+                logger.info(f'received {self.ap_id_to_name[ap_id]} from {from_name}')
+            self.to_game.put_nowait(
+                events.ItemEventToGame(zz_item_ids)
+            )
+            self.next_item = len(self.items_received)
+
+
+def name_seed_from_ram(data: bytes) -> Tuple[str, str]:
+    """ returns player name, and end of seed string """
+    if len(data) == 0:
+        # no connection to game
+        return "", "xxx"
+    null_index = data.find(b'\x00')
+    if null_index == -1:
+        logger.warning(f"invalid game id in rom {repr(data)}")
+        null_index = len(data)
+    name = data[:null_index].decode()
+    null_index_2 = data.find(b'\x00', null_index + 1)
+    if null_index_2 == -1:
+        null_index_2 = len(data)
+    seed_name = data[null_index + 1:null_index_2].decode()
+
+    return name, seed_name
+
+
+async def zillion_sync_task(ctx: ZillionContext) -> None:
+    logger.info("started zillion sync task")
+
+    # to work around the Python bug where we can't check for RetroArch
+    if not ctx.look_for_retroarch.is_set():
+        logger.info("Start Zillion in RetroArch, then use the /sms command to connect to it.")
+    await asyncio.wait((
+        asyncio.create_task(ctx.look_for_retroarch.wait()),
+        asyncio.create_task(ctx.exit_event.wait())
+    ), return_when=asyncio.FIRST_COMPLETED)
+
+    last_log = ""
+
+    def log_no_spam(msg: str) -> None:
+        nonlocal last_log
+        if msg != last_log:
+            last_log = msg
+            logger.info(msg)
+
+    # to only show this message once per client run
+    help_message_shown = False
+
+    with Memory(ctx.from_game, ctx.to_game) as memory:
+        while not ctx.exit_event.is_set():
+            ram = await memory.read()
+            game_id = memory.get_rom_to_ram_data(ram)
+            name, seed_end = name_seed_from_ram(game_id)
+            if len(name):
+                if name == ctx.known_name:
+                    ctx.auth = name
+                    # this is the name we know
+                    if ctx.server and ctx.server.socket:  # type: ignore
+                        if ctx.got_room_info.is_set():
+                            if ctx.seed_name and ctx.seed_name.endswith(seed_end):
+                                # correct seed
+                                if memory.have_generation_info():
+                                    log_no_spam("everything connected")
+                                    await memory.process_ram(ram)
+                                    ctx.process_from_game_queue()
+                                    ctx.process_items_received()
+                                else:  # no generation info
+                                    if ctx.got_slot_data.is_set():
+                                        memory.set_generation_info(ctx.rescues, ctx.loc_mem_to_id)
+                                        ctx.ap_id_to_name, ctx.ap_id_to_zz_id, _ap_id_to_zz_item = \
+                                            make_id_to_others(ctx.start_char)
+                                        ctx.next_item = 0
+                                        ctx.ap_local_count = len(ctx.checked_locations)
+                                    else:  # no slot data yet
+                                        async_start(ctx.send_connect())
+                                        log_no_spam("logging in to server...")
+                                        await asyncio.wait((
+                                            asyncio.create_task(ctx.got_slot_data.wait()),
+                                            asyncio.create_task(ctx.exit_event.wait()),
+                                            asyncio.create_task(asyncio.sleep(6))
+                                        ), return_when=asyncio.FIRST_COMPLETED)  # to not spam connect packets
+                            else:  # not correct seed name
+                                log_no_spam("incorrect seed - did you mix up roms?")
+                        else:  # no room info
+                            # If we get here, it looks like `RoomInfo` packet got lost
+                            log_no_spam("waiting for room info from server...")
+                    else:  # server not connected
+                        log_no_spam("waiting for server connection...")
+                else:  # new game
+                    log_no_spam("connected to new game")
+                    await ctx.disconnect()
+                    ctx.reset_server_state()
+                    ctx.seed_name = None
+                    ctx.got_room_info.clear()
+                    ctx.reset_game_state()
+                    memory.reset_game_state()
+
+                    ctx.auth = name
+                    ctx.known_name = name
+                    async_start(ctx.connect())
+                    await asyncio.wait((
+                        asyncio.create_task(ctx.got_room_info.wait()),
+                        asyncio.create_task(ctx.exit_event.wait()),
+                        asyncio.create_task(asyncio.sleep(6))
+                    ), return_when=asyncio.FIRST_COMPLETED)
+            else:  # no name found in game
+                if not help_message_shown:
+                    logger.info('In RetroArch, make sure "Settings > Network > Network Commands" is on.')
+                    help_message_shown = True
+                log_no_spam("looking for connection to game...")
+                await asyncio.sleep(0.3)
+
+            await asyncio.sleep(0.09375)
+        logger.info("zillion sync task ending")
+
+
+async def main() -> None:
+    parser = get_base_parser()
+    parser.add_argument('diff_file', default="", type=str, nargs="?",
+                        help='Path to a .apzl Archipelago Binary Patch file')
+    # SNI parser.add_argument('--loglevel', default='info', choices=['debug', 'info', 'warning', 'error', 'critical'])
+    args = parser.parse_args()
+    print(args)
+
+    if args.diff_file:
+        import Patch
+        logger.info("patch file was supplied - creating sms rom...")
+        meta, rom_file = Patch.create_rom_file(args.diff_file)
+        if "server" in meta:
+            args.connect = meta["server"]
+        logger.info(f"wrote rom file to {rom_file}")
+
+    ctx = ZillionContext(args.connect, args.password)
+    if ctx.server_task is None:
+        ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
+
+    if gui_enabled:
+        ctx.run_gui()
+    ctx.run_cli()
+
+    sync_task = asyncio.create_task(zillion_sync_task(ctx))
+
+    await ctx.exit_event.wait()
+
+    ctx.server_address = None
+    logger.debug("waiting for sync task to end")
+    await sync_task
+    logger.debug("sync task ended")
+    await ctx.shutdown()
+
+
+def launch() -> None:
+    colorama.init()
+    asyncio.run(main())
+    colorama.deinit()
diff --git a/worlds/zillion/config.py b/worlds/zillion/config.py
index db61d0c453..ca02f9a99f 100644
--- a/worlds/zillion/config.py
+++ b/worlds/zillion/config.py
@@ -2,20 +2,3 @@ import os
 
 base_id = 8675309
 zillion_map = os.path.join(os.path.dirname(__file__), "empty-zillion-map-row-col-labels-281.png")
-
-
-def detect_test() -> bool:
-    """
-    Parts of generation that are in unit tests need the rom.
-    This is to detect whether we are running unit tests
-    so we can work around the need for the rom.
-    """
-    import __main__
-    try:
-        if "test" in __main__.__file__:
-            return True
-    except AttributeError:
-        # In some environments, __main__ doesn't have __file__
-        # We'll assume that's not unit tests.
-        pass
-    return False
diff --git a/worlds/zillion/docs/en_Zillion.md b/worlds/zillion/docs/en_Zillion.md
index b5d37cc202..06a11b7d79 100644
--- a/worlds/zillion/docs/en_Zillion.md
+++ b/worlds/zillion/docs/en_Zillion.md
@@ -67,8 +67,16 @@ Note that in "restrictive" mode, Champ is the only one that can get Zillion powe
 
 Canisters retain their original appearance, so you won't know if an item belongs to another player until you collect it.
 
-When you collect an item, you see the name of the player it goes to. You can see in the client log what item was collected.
+When you collect an item, you see the name of the player it goes to. You can see in the client log what item was
+collected.
 
 ## When the player receives an item, what happens?
 
 The item collect sound is played. You can see in the client log what item was received.
+
+## Unique Local Commands
+
+The following commands are only available when using the ZillionClient to play with Archipelago.
+
+- `/sms` Tell the client that Zillion is running in RetroArch.
+- `/map` Toggle view of the map tracker.
diff --git a/worlds/zillion/docs/setup_en.md b/worlds/zillion/docs/setup_en.md
index 16000dbe3b..22dee5ee55 100644
--- a/worlds/zillion/docs/setup_en.md
+++ b/worlds/zillion/docs/setup_en.md
@@ -51,7 +51,7 @@ 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](/mysterycheck).
+If you would like to validate your config file to make sure it works, you may do so on the [YAML Validator page](/check).
 
 ## Generating a Single-Player Game
 
diff --git a/worlds/zillion/logic.py b/worlds/zillion/logic.py
index e99867c742..305546c78b 100644
--- a/worlds/zillion/logic.py
+++ b/worlds/zillion/logic.py
@@ -38,10 +38,10 @@ def item_counts(cs: CollectionState, p: int) -> Tuple[Tuple[str, int], ...]:
 
     ((item_name, count), (item_name, count), ...)
     """
-    return tuple((item_name, cs.item_count(item_name, p)) for item_name in item_name_to_id)
+    return tuple((item_name, cs.count(item_name, p)) for item_name in item_name_to_id)
 
 
-LogicCacheType = Dict[int, Tuple[_Counter[Tuple[str, int]], FrozenSet[Location]]]
+LogicCacheType = Dict[int, Tuple[Dict[int, _Counter[str]], FrozenSet[Location]]]
 """ { hash: (cs.prog_items, accessible_locations) } """
 
 
diff --git a/worlds/zillion/options.py b/worlds/zillion/options.py
index 6aa88f5b22..cb861e9621 100644
--- a/worlds/zillion/options.py
+++ b/worlds/zillion/options.py
@@ -1,16 +1,17 @@
 from collections import Counter
-# import logging
-from typing import TYPE_CHECKING, Any, Dict, Tuple, cast
-from Options import AssembleOptions, DefaultOnToggle, Range, SpecialRange, Toggle, Choice
+from dataclasses import dataclass
+from typing import Dict, Tuple
+from typing_extensions import TypeGuard  # remove when Python >= 3.10
+
+from Options import DefaultOnToggle, NamedRange, PerGameCommonOptions, Range, Toggle, Choice
+
 from zilliandomizer.options import \
     Options as ZzOptions, char_to_gun, char_to_jump, ID, \
     VBLR as ZzVBLR, chars, Chars, ItemCounts as ZzItemCounts
 from zilliandomizer.options.parsing import validate as zz_validate
-if TYPE_CHECKING:
-    from BaseClasses import MultiWorld
 
 
-class ZillionContinues(SpecialRange):
+class ZillionContinues(NamedRange):
     """
     number of continues before game over
 
@@ -41,6 +42,19 @@ class VBLR(Choice):
     option_restrictive = 3
     default = 1
 
+    def to_zz_vblr(self) -> ZzVBLR:
+        def is_vblr(o: str) -> TypeGuard[ZzVBLR]:
+            """
+            This function is because mypy doesn't support narrowing with `in`,
+            https://github.com/python/mypy/issues/12535
+            so this is the only way I see to get type narrowing to `Literal`.
+            """
+            return o in ("vanilla", "balanced", "low", "restrictive")
+
+        key = self.current_key
+        assert is_vblr(key), f"{key=}"
+        return key
+
 
 class ZillionGunLevels(VBLR):
     """
@@ -204,7 +218,7 @@ class ZillionSkill(Range):
     default = 2
 
 
-class ZillionStartingCards(SpecialRange):
+class ZillionStartingCards(NamedRange):
     """
     how many ID Cards to start the game with
 
@@ -225,27 +239,27 @@ class ZillionRoomGen(Toggle):
     display_name = "room generation"
 
 
-zillion_options: Dict[str, AssembleOptions] = {
-    "continues": ZillionContinues,
-    "floppy_req": ZillionFloppyReq,
-    "gun_levels": ZillionGunLevels,
-    "jump_levels": ZillionJumpLevels,
-    "randomize_alarms": ZillionRandomizeAlarms,
-    "max_level": ZillionMaxLevel,
-    "start_char": ZillionStartChar,
-    "opas_per_level": ZillionOpasPerLevel,
-    "id_card_count": ZillionIDCardCount,
-    "bread_count": ZillionBreadCount,
-    "opa_opa_count": ZillionOpaOpaCount,
-    "zillion_count": ZillionZillionCount,
-    "floppy_disk_count": ZillionFloppyDiskCount,
-    "scope_count": ZillionScopeCount,
-    "red_id_card_count": ZillionRedIDCardCount,
-    "early_scope": ZillionEarlyScope,
-    "skill": ZillionSkill,
-    "starting_cards": ZillionStartingCards,
-    "room_gen": ZillionRoomGen,
-}
+@dataclass
+class ZillionOptions(PerGameCommonOptions):
+    continues: ZillionContinues
+    floppy_req: ZillionFloppyReq
+    gun_levels: ZillionGunLevels
+    jump_levels: ZillionJumpLevels
+    randomize_alarms: ZillionRandomizeAlarms
+    max_level: ZillionMaxLevel
+    start_char: ZillionStartChar
+    opas_per_level: ZillionOpasPerLevel
+    id_card_count: ZillionIDCardCount
+    bread_count: ZillionBreadCount
+    opa_opa_count: ZillionOpaOpaCount
+    zillion_count: ZillionZillionCount
+    floppy_disk_count: ZillionFloppyDiskCount
+    scope_count: ZillionScopeCount
+    red_id_card_count: ZillionRedIDCardCount
+    early_scope: ZillionEarlyScope
+    skill: ZillionSkill
+    starting_cards: ZillionStartingCards
+    room_gen: ZillionRoomGen
 
 
 def convert_item_counts(ic: "Counter[str]") -> ZzItemCounts:
@@ -262,47 +276,34 @@ def convert_item_counts(ic: "Counter[str]") -> ZzItemCounts:
     return tr
 
 
-def validate(world: "MultiWorld", p: int) -> "Tuple[ZzOptions, Counter[str]]":
+def validate(options: ZillionOptions) -> "Tuple[ZzOptions, Counter[str]]":
     """
     adjusts options to make game completion possible
 
-    `world` parameter is MultiWorld object that has my options on it
-    `p` is my player id
+    `options` parameter is ZillionOptions object that was put on my world by the core
     """
-    for option_name in zillion_options:
-        assert hasattr(world, option_name), f"Zillion option {option_name} didn't get put in world object"
-    wo = cast(Any, world)  # so I don't need getattr on all the options
 
-    skill = wo.skill[p].value
+    skill = options.skill.value
 
-    jump_levels = cast(ZillionJumpLevels, wo.jump_levels[p])
-    jump_option = jump_levels.current_key
-    required_level = char_to_jump["Apple"][cast(ZzVBLR, jump_option)].index(3) + 1
+    jump_option = options.jump_levels.to_zz_vblr()
+    required_level = char_to_jump["Apple"][jump_option].index(3) + 1
     if skill == 0:
         # because of hp logic on final boss
         required_level = 8
 
-    gun_levels = cast(ZillionGunLevels, wo.gun_levels[p])
-    gun_option = gun_levels.current_key
-    guns_required = char_to_gun["Champ"][cast(ZzVBLR, gun_option)].index(3)
+    gun_option = options.gun_levels.to_zz_vblr()
+    guns_required = char_to_gun["Champ"][gun_option].index(3)
 
-    floppy_req = cast(ZillionFloppyReq, wo.floppy_req[p])
+    floppy_req = options.floppy_req
 
-    card = cast(ZillionIDCardCount, wo.id_card_count[p])
-    bread = cast(ZillionBreadCount, wo.bread_count[p])
-    opa = cast(ZillionOpaOpaCount, wo.opa_opa_count[p])
-    gun = cast(ZillionZillionCount, wo.zillion_count[p])
-    floppy = cast(ZillionFloppyDiskCount, wo.floppy_disk_count[p])
-    scope = cast(ZillionScopeCount, wo.scope_count[p])
-    red = cast(ZillionRedIDCardCount, wo.red_id_card_count[p])
     item_counts = Counter({
-        "ID Card": card,
-        "Bread": bread,
-        "Opa-Opa": opa,
-        "Zillion": gun,
-        "Floppy Disk": floppy,
-        "Scope": scope,
-        "Red ID Card": red
+        "ID Card": options.id_card_count,
+        "Bread": options.bread_count,
+        "Opa-Opa": options.opa_opa_count,
+        "Zillion": options.zillion_count,
+        "Floppy Disk": options.floppy_disk_count,
+        "Scope": options.scope_count,
+        "Red ID Card": options.red_id_card_count
     })
     minimums = Counter({
         "ID Card": 0,
@@ -335,10 +336,10 @@ def validate(world: "MultiWorld", p: int) -> "Tuple[ZzOptions, Counter[str]]":
     item_counts["Empty"] += diff
     assert sum(item_counts.values()) == 144
 
-    max_level = cast(ZillionMaxLevel, wo.max_level[p])
+    max_level = options.max_level
     max_level.value = max(required_level, max_level.value)
 
-    opas_per_level = cast(ZillionOpasPerLevel, wo.opas_per_level[p])
+    opas_per_level = options.opas_per_level
     while (opas_per_level.value > 1) and (1 + item_counts["Opa-Opa"] // opas_per_level.value < max_level.value):
         # logging.warning(
         #     "zillion options validate: option opas_per_level incompatible with options max_level and opa_opa_count"
@@ -347,39 +348,34 @@ def validate(world: "MultiWorld", p: int) -> "Tuple[ZzOptions, Counter[str]]":
 
     # that should be all of the level requirements met
 
-    name_capitalization = {
+    name_capitalization: Dict[str, Chars] = {
         "jj": "JJ",
         "apple": "Apple",
         "champ": "Champ",
     }
 
-    start_char = cast(ZillionStartChar, wo.start_char[p])
+    start_char = options.start_char
     start_char_name = name_capitalization[start_char.current_key]
     assert start_char_name in chars
-    start_char_name = cast(Chars, start_char_name)
 
-    starting_cards = cast(ZillionStartingCards, wo.starting_cards[p])
+    starting_cards = options.starting_cards
 
-    room_gen = cast(ZillionRoomGen, wo.room_gen[p])
-
-    early_scope = cast(ZillionEarlyScope, wo.early_scope[p])
-    if early_scope:
-        world.early_items[p]["Scope"] = 1
+    room_gen = options.room_gen
 
     zz_item_counts = convert_item_counts(item_counts)
     zz_op = ZzOptions(
         zz_item_counts,
-        cast(ZzVBLR, jump_option),
-        cast(ZzVBLR, gun_option),
+        jump_option,
+        gun_option,
         opas_per_level.value,
         max_level.value,
         False,  # tutorial
         skill,
         start_char_name,
         floppy_req.value,
-        wo.continues[p].value,
-        wo.randomize_alarms[p].value,
-        False,  # early scope is done with AP early_items API
+        options.continues.value,
+        bool(options.randomize_alarms.value),
+        bool(options.early_scope.value),
         True,  # balance defense
         starting_cards.value,
         bool(room_gen.value)
diff --git a/worlds/zillion/requirements.txt b/worlds/zillion/requirements.txt
index 2af057dece..c8944925ac 100644
--- a/worlds/zillion/requirements.txt
+++ b/worlds/zillion/requirements.txt
@@ -1 +1,2 @@
-zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@4b27d115269db25fe73b0471b73495f41df1323c#0.5.3
+zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@ae00a4b186be897c7cfaf429a0e0ff83c4ecf28c#0.6.0
+typing-extensions>=4.7, <5
diff --git a/worlds/zillion/test/TestOptions.py b/worlds/zillion/test/TestOptions.py
index 1ec186dae5..c4f02d4bd3 100644
--- a/worlds/zillion/test/TestOptions.py
+++ b/worlds/zillion/test/TestOptions.py
@@ -1,6 +1,6 @@
 from . import ZillionTestBase
 
-from worlds.zillion.options import ZillionJumpLevels, ZillionGunLevels, validate
+from worlds.zillion.options import ZillionJumpLevels, ZillionGunLevels, ZillionOptions, validate
 from zilliandomizer.options import VBLR_CHOICES
 
 
@@ -9,7 +9,9 @@ class OptionsTest(ZillionTestBase):
 
     def test_validate_default(self) -> None:
         self.world_setup()
-        validate(self.multiworld, 1)
+        options = self.multiworld.worlds[1].options
+        assert isinstance(options, ZillionOptions)
+        validate(options)
 
     def test_vblr_ap_to_zz(self) -> None:
         """ all of the valid values for the AP options map to valid values for ZZ options """
@@ -20,7 +22,9 @@ class OptionsTest(ZillionTestBase):
             for value in vblr_class.name_lookup.values():
                 self.options = {option_name: value}
                 self.world_setup()
-                zz_options, _item_counts = validate(self.multiworld, 1)
+                options = self.multiworld.worlds[1].options
+                assert isinstance(options, ZillionOptions)
+                zz_options, _item_counts = validate(options)
                 assert getattr(zz_options, option_name) in VBLR_CHOICES
 
     # TODO: test validate with invalid combinations of options
diff --git a/worlds/zillion/test/__init__.py b/worlds/zillion/test/__init__.py
index 3b7edebef8..93c0512fb0 100644
--- a/worlds/zillion/test/__init__.py
+++ b/worlds/zillion/test/__init__.py
@@ -1,5 +1,5 @@
 from typing import cast
-from test.TestBase import WorldTestBase
+from test.bases import WorldTestBase
 from worlds.zillion import ZillionWorld