From b570aa2ec6c811db280a835827aa3983f145a1a6 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Mon, 27 Jan 2025 07:25:31 -0800
Subject: [PATCH] Pokemon Emerald: Clean up free fly blacklist (#4552)

---
 worlds/pokemon_emerald/locations.py | 10 +++++++++-
 worlds/pokemon_emerald/options.py   | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/worlds/pokemon_emerald/locations.py b/worlds/pokemon_emerald/locations.py
index 2bae8e00..49ce1470 100644
--- a/worlds/pokemon_emerald/locations.py
+++ b/worlds/pokemon_emerald/locations.py
@@ -34,6 +34,11 @@ VISITED_EVENT_NAME_TO_ID = {
 }
 
 BLACKLIST_OPTION_TO_VISITED_EVENT = {
+    "Littleroot Town": "EVENT_VISITED_LITTLEROOT_TOWN",
+    "Oldale Town": "EVENT_VISITED_OLDALE_TOWN",
+    "Petalburg City": "EVENT_VISITED_PETALBURG_CITY",
+    "Rustboro City": "EVENT_VISITED_RUSTBORO_CITY",
+    "Dewford Town": "EVENT_VISITED_DEWFORD_TOWN",
     "Slateport City": "EVENT_VISITED_SLATEPORT_CITY",
     "Mauville City": "EVENT_VISITED_MAUVILLE_CITY",
     "Verdanturf Town": "EVENT_VISITED_VERDANTURF_TOWN",
@@ -46,6 +51,9 @@ BLACKLIST_OPTION_TO_VISITED_EVENT = {
     "Ever Grande City": "EVENT_VISITED_EVER_GRANDE_CITY",
 }
 
+VISITED_EVENTS = frozenset(BLACKLIST_OPTION_TO_VISITED_EVENT.values())
+
+
 class PokemonEmeraldLocation(Location):
     game: str = "Pokemon Emerald"
     item_address: Optional[int]
@@ -142,7 +150,7 @@ def set_free_fly(world: "PokemonEmeraldWorld") -> None:
     fly_location_name = "EVENT_VISITED_LITTLEROOT_TOWN"
     if world.options.free_fly_location:
         blacklisted_locations = set(BLACKLIST_OPTION_TO_VISITED_EVENT[city] for city in world.options.free_fly_blacklist.value)
-        free_fly_locations = sorted(set(BLACKLIST_OPTION_TO_VISITED_EVENT.values()) - blacklisted_locations)
+        free_fly_locations = sorted(VISITED_EVENTS - blacklisted_locations)
         if free_fly_locations:
             fly_location_name = world.random.choice(free_fly_locations)
 
diff --git a/worlds/pokemon_emerald/options.py b/worlds/pokemon_emerald/options.py
index 32644d52..29929bd6 100644
--- a/worlds/pokemon_emerald/options.py
+++ b/worlds/pokemon_emerald/options.py
@@ -725,13 +725,20 @@ class FreeFlyLocation(Toggle):
     """
     display_name = "Free Fly Location"
 
+
 class FreeFlyBlacklist(OptionSet):
     """
     Disables specific locations as valid free fly locations.
+
     Has no effect if Free Fly Location is disabled.
     """
     display_name = "Free Fly Blacklist"
     valid_keys = [
+        "Littleroot Town",
+        "Oldale Town",
+        "Petalburg City",
+        "Rustboro City",
+        "Dewford Town",
         "Slateport City",
         "Mauville City",
         "Verdanturf Town",
@@ -743,6 +750,14 @@ class FreeFlyBlacklist(OptionSet):
         "Sootopolis City",
         "Ever Grande City",
     ]
+    default = [
+        "Littleroot Town",
+        "Oldale Town",
+        "Petalburg City",
+        "Rustboro City",
+        "Dewford Town",
+    ]
+
 
 class HmRequirements(Choice):
     """