From 8f2b068313710462d7aa3195e00375ab6d58bf2d Mon Sep 17 00:00:00 2001
From: compiling <8335770+compiling@users.noreply.github.com>
Date: Mon, 26 Oct 2020 18:01:19 +1100
Subject: [PATCH] Refine hints for crossed dungeon shuffle regardless of the
 hints setting, since they are also used for the Ganon silvers hint. Move Hera
 Basement to the list of inconvenient dungeon locations to exclude it from
 crossed shuffle.

---
 DoorShuffle.py | 3 +--
 Dungeons.py    | 4 ++--
 Rom.py         | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/DoorShuffle.py b/DoorShuffle.py
index b4b91adb..8134f73b 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -545,8 +545,7 @@ def cross_dungeon(world, player):
         reassign_boss('GT Lanmolas 2', 'middle', builder, gt, world, player)
         reassign_boss('GT Moldorm', 'top', builder, gt, world, player)
 
-    if world.hints[player]:
-        refine_hints(dungeon_builders)
+    refine_hints(dungeon_builders)
 
 
 def assign_cross_keys(dungeon_builders, world, player):
diff --git a/Dungeons.py b/Dungeons.py
index b85b6b61..007392f5 100644
--- a/Dungeons.py
+++ b/Dungeons.py
@@ -390,9 +390,9 @@ dungeon_hints = {
     'Tower of Hera': 'in Tower of Hera',
     'Agahnims Tower': 'in Castle Tower',
     'Palace of Darkness': 'in Palace of Darkness',
-    'Swamp Palace': 'in Swamp Palace)',
+    'Swamp Palace': 'in Swamp Palace',
     'Skull Woods': 'in Skull Woods',
-    'Thieves Town': 'in Thieves\' Town)',
+    'Thieves Town': 'in Thieves\' Town',
     'Ice Palace': 'in Ice Palace',
     'Misery Mire': 'in Misery Mire',
     'Turtle Rock': 'in Turtle Rock',
diff --git a/Rom.py b/Rom.py
index f967e00a..3af7222f 100644
--- a/Rom.py
+++ b/Rom.py
@@ -2358,12 +2358,12 @@ HintLocations = ['telepathic_tile_eastern_palace',
 InconvenientLocations = ['Spike Cave',
                          'Sahasrahla',
                          'Purple Chest',
-                         'Tower of Hera - Big Key Chest',
                          'Magic Bat']
 
 InconvenientDungeonLocations = ['Swamp Left',
                                 'Mire Left',
                                 'Eastern Palace - Big Key Chest',
+                                'Tower of Hera - Big Key Chest',
                                 'Thieves\' Town - Big Chest',
                                 'Ice Palace - Big Chest',
                                 'Ganons Tower - Big Chest']