From 750c8a98100ceaea01871255f6da813d0fd839e7 Mon Sep 17 00:00:00 2001
From: PoryGone <98504756+PoryGone@users.noreply.github.com>
Date: Wed, 27 Aug 2025 09:21:53 -0400
Subject: [PATCH] Stop using get_options (#5341)

---
 worlds/dkc3/Rom.py    | 5 +++--
 worlds/smw/Regions.py | 2 +-
 worlds/smw/Rom.py     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/worlds/dkc3/Rom.py b/worlds/dkc3/Rom.py
index fb8bc2b1..cde4d8c7 100644
--- a/worlds/dkc3/Rom.py
+++ b/worlds/dkc3/Rom.py
@@ -1,3 +1,4 @@
+
 import Utils
 from Utils import read_snes_rom
 from worlds.AutoWorld import World
@@ -735,9 +736,9 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
     return base_rom_bytes
 
 def get_base_rom_path(file_name: str = "") -> str:
-    options = Utils.get_options()
     if not file_name:
-        file_name = options["dkc3_options"]["rom_file"]
+        from settings import get_settings
+        file_name = get_settings()["dkc3_options"]["rom_file"]
     if not os.path.exists(file_name):
         file_name = Utils.user_path(file_name)
     return file_name
diff --git a/worlds/smw/Regions.py b/worlds/smw/Regions.py
index 24960498..d7950ffb 100644
--- a/worlds/smw/Regions.py
+++ b/worlds/smw/Regions.py
@@ -808,7 +808,7 @@ def create_regions(world: World, active_locations):
                                lambda state: (state.has(ItemName.blue_switch_palace, player) and
                                               (state.has(ItemName.p_switch, player) or
                                                state.has(ItemName.green_switch_palace, player) or
-                                               (state.has(ItemName.yellow_switch_palace, player) or state.has(ItemName.red_switch_palace, player)))))
+                                               (state.has(ItemName.yellow_switch_palace, player) and state.has(ItemName.red_switch_palace, player)))))
         add_location_to_region(multiworld, player, active_locations, LocationName.chocolate_island_3_region, LocationName.chocolate_island_3_dragon)
         add_location_to_region(multiworld, player, active_locations, LocationName.chocolate_island_4_region, LocationName.chocolate_island_4_dragon,
                                lambda state: (state.has(ItemName.p_switch, player) and
diff --git a/worlds/smw/Rom.py b/worlds/smw/Rom.py
index 9016e14d..081d6b4a 100644
--- a/worlds/smw/Rom.py
+++ b/worlds/smw/Rom.py
@@ -3185,9 +3185,9 @@ def get_base_rom_bytes(file_name: str = "") -> bytes:
 
 
 def get_base_rom_path(file_name: str = "") -> str:
-    options = Utils.get_options()
     if not file_name:
-        file_name = options["smw_options"]["rom_file"]
+        from settings import get_settings
+        file_name = get_settings()["smw_options"]["rom_file"]
     if not os.path.exists(file_name):
         file_name = Utils.user_path(file_name)
     return file_name