From 6e9d949439c5df5933d19052764d85cb774365c7 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Mon, 13 Jun 2022 20:38:24 +0200
Subject: [PATCH] Shuffle Back of Tavern

---
 BaseClasses.py                                |   7 ++-
 CLI.py                                        |   5 +-
 ER_hint_reference.txt                         |   2 +
 EntranceShuffle.py                            |   4 +-
 Main.py                                       |   3 +-
 README.md                                     |   5 ++
 Rom.py                                        |   6 ++-
 data/base2current.bps                         | Bin 93021 -> 93118 bytes
 mystery_testsuite.yml                         |   3 ++
 resources/app/cli/args.json                   |   4 ++
 resources/app/cli/lang/en.json                |   3 ++
 resources/app/gui/lang/en.json                |   1 +
 .../app/gui/randomize/entrando/widgets.json   |   1 +
 source/classes/CustomSettings.py              |   2 +
 source/classes/constants.py                   |   1 +
 source/overworld/EntranceShuffle2.py          |  44 ++++++++++--------
 source/tools/MysteryUtils.py                  |   1 +
 17 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 2b56d39f..fd9e0c9c 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -2460,6 +2460,7 @@ class Spoiler(object):
                          'goal': self.world.goal,
                          'shuffle': self.world.shuffle,
                          'shufflelinks': self.world.shufflelinks,
+                         'shuffletavern': self.world.shuffletavern,
                          'door_shuffle': self.world.doorShuffle,
                          'intensity': self.world.intensity,
                          'item_pool': self.world.difficulty,
@@ -2541,7 +2542,8 @@ class Spoiler(object):
                 outfile.write('Difficulty:                      %s\n' % self.metadata['item_pool'][player])
                 outfile.write('Item Functionality:              %s\n' % self.metadata['item_functionality'][player])
                 outfile.write('Entrance Shuffle:                %s\n' % self.metadata['shuffle'][player])
-                outfile.write(f"Link's House Shuffled:           {yn(self.metadata['shufflelinks'])}\n")
+                outfile.write(f"Link's House Shuffled:           {yn(self.metadata['shufflelinks'][player])}\n")
+                outfile.write(f"Back of Tavern Shuffled:         {yn(self.metadata['shuffletavern'][player])}\n")
                 outfile.write('Door Shuffle:                    %s\n' % self.metadata['door_shuffle'][player])
                 outfile.write('Intensity:                       %s\n' % self.metadata['intensity'][player])
                 outfile.write(f"Drop Shuffle:                    {yn(self.metadata['dropshuffle'][player])}\n")
@@ -2827,7 +2829,7 @@ class Settings(object):
 
             (0x80 if w.bigkeyshuffle[p] else 0) | (0x40 if w.keyshuffle[p] else 0)
             | (0x20 if w.mapshuffle[p] else 0) | (0x10 if w.compassshuffle[p] else 0)
-            | (enemy_mode[w.enemy_shuffle[p]]),
+            | (0x8 if w.shuffletavern[p] else 0) | (enemy_mode[w.enemy_shuffle[p]]),
 
             (e_health[w.enemy_health[p]] << 5) | (e_dmg[w.enemy_damage[p]] << 3) | (0x4 if w.potshuffle[p] else 0)
             | (0x2 if w.bombbag[p] else 0) | (1 if w.shufflelinks[p] else 0),
@@ -2885,6 +2887,7 @@ class Settings(object):
         args.mapshuffle[p] = True if settings[7] & 0x20 else False
         args.compassshuffle[p] = True if settings[7] & 0x10 else False
         # args.shufflebosses[p] = r(boss_mode)[(settings[7] & 0xc) >> 2]
+        args.shuffletavern[p] = True if settings[7] & 0x8 else False
         args.shuffleenemies[p] = r(enemy_mode)[settings[7] & 0x3]
 
         args.enemy_health[p] = r(e_health)[(settings[8] & 0xE0) >> 5]
diff --git a/CLI.py b/CLI.py
index c659d3b5..62fee1b3 100644
--- a/CLI.py
+++ b/CLI.py
@@ -119,8 +119,8 @@ def parse_cli(argv, no_defaults=False):
                          'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
                          'usestartinventory', 'bombbag', 'overworld_map', 'restrict_boss_items',
                          'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
-                         'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
-                         'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
+                         'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'shuffletavern',
+                         'pseudoboots', 'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
                          'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots',
                          'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor',
                          'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery', 'keydropshuffle',
@@ -170,6 +170,7 @@ def parse_settings():
         "shuffleganon": True,
         "shuffle": "vanilla",
         "shufflelinks": False,
+        "shuffletavern": False,
         "overworld_map": "default",
         "pseudoboots": False,
 
diff --git a/ER_hint_reference.txt b/ER_hint_reference.txt
index 999fb436..018dfb3a 100644
--- a/ER_hint_reference.txt
+++ b/ER_hint_reference.txt
@@ -91,6 +91,7 @@ While the exact verbage of location names and item names can be found in the sou
 
 Overworld Entrance naming:
 
+Links House: The hero's old residence
 Turtle Rock: Turtle Rock Main
 Misery Mire: Misery Mire
 Ice Palace: Ice Palace
@@ -141,6 +142,7 @@ Lake Hylia Fairy: A cave NE of Lake Hylia
 Light Hype Fairy: The cave south of your house
 Desert Fairy: The cave near the desert
 Chicken House: The chicken lady's house
+Tavern North: A backdoor
 Aginahs Cave: The open desert cave
 Sahasrahlas Hut: The house near armos
 Cave Shop (Lake Hylia): The cave NW Lake Hylia
diff --git a/EntranceShuffle.py b/EntranceShuffle.py
index 0d3f502b..2899b28b 100644
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -3364,7 +3364,7 @@ door_addresses = {'Links House': (0x00, (0x0104, 0x2c, 0x0506, 0x0a9a, 0x0832, 0
                   'Light Hype Fairy': (0x6B, (0x0115, 0x34, 0x00a0, 0x0c04, 0x0900, 0x0c58, 0x0988, 0x0c73, 0x0985, 0x0a, 0xf6, 0x0000, 0x0000)),
                   'Desert Fairy': (0x71, (0x0115, 0x3a, 0x0000, 0x0e00, 0x0400, 0x0e26, 0x0468, 0x0e6d, 0x0485, 0x00, 0x00, 0x0000, 0x0000)),
                   'Kings Grave': (0x5A, (0x0113, 0x14, 0x0320, 0x0456, 0x0900, 0x04a6, 0x0998, 0x04c3, 0x097d, 0x0a, 0xf6, 0x0000, 0x0000)),
-                  'Tavern North': (0x42, (0x0103, 0x18, 0x1440, 0x08a7, 0x0206, 0x08f9, 0x0288, 0x0914, 0x0293, 0xf7, 0x09, 0xFFFF, 0x0000)),  # do not use, buggy
+                  'Tavern North': (0x42, (0x0103, 0x18, 0x1440, 0x08a7, 0x0206, 0x091b, 0x0288, 0x0914, 0x0293, 0xf7, 0x09, 0xFFFF, 0x0000)),
                   'Chicken House': (0x4A, (0x0108, 0x18, 0x1120, 0x0837, 0x0106, 0x0888, 0x0188, 0x08a4, 0x0193, 0x07, 0xf9, 0x1530, 0x0000)),
                   'Aginahs Cave': (0x70, (0x010a, 0x30, 0x0656, 0x0cc6, 0x02aa, 0x0d18, 0x0328, 0x0d33, 0x032f, 0x08, 0xf8, 0x0000, 0x0000)),
                   'Sahasrahlas Hut': (0x44, (0x0105, 0x1e, 0x0610, 0x06d4, 0x0c76, 0x0727, 0x0cf0, 0x0743, 0x0cfb, 0x0a, 0xf6, 0x0000, 0x0000)),
@@ -3653,7 +3653,7 @@ ow_prize_table = {'Links House': (0x8b1, 0xb2d), 'Inverted Big Bomb Shop': (0x8b
                   'Light Hype Fairy': (0x940, 0xc80),
                   'Desert Fairy': (0x420, 0xe00),
                   'Kings Grave': (0x920, 0x520),
-                  'Tavern North': None,  # can't mark this one technically
+                  'Tavern North': (0x270, 0x900),
                   'Chicken House': (0x120, 0x880),
                   'Aginahs Cave': (0x2e0, 0xd00),
                   'Sahasrahlas Hut': (0xcf0, 0x6c0),
diff --git a/Main.py b/Main.py
index 1c2357bb..19515022 100644
--- a/Main.py
+++ b/Main.py
@@ -118,6 +118,7 @@ def main(args, seed=None, fish=None):
     world.treasure_hunt_count = {k: int(v) for k, v in args.triforce_goal.items()}
     world.treasure_hunt_total = {k: int(v) for k, v in args.triforce_pool.items()}
     world.shufflelinks = args.shufflelinks.copy()
+    world.shuffletavern = args.shuffletavern.copy()
     world.pseudoboots = args.pseudoboots.copy()
     world.overworld_map = args.overworld_map.copy()
     world.restrict_boss_items = args.restrict_boss_items.copy()
@@ -192,7 +193,7 @@ def main(args, seed=None, fish=None):
     logger.info(world.fish.translate("cli","cli","shuffling.world"))
 
     for player in range(1, world.players + 1):
-        if world.experimental[player] or (world.customizer and world.customizer.get_entrances()):
+        if world.experimental[player] or world.shuffle[player] in ['lite', 'lean'] or world.shuffletavern[player] or (world.customizer and world.customizer.get_entrances()):
             link_entrances_new(world, player)
         else:
             if world.mode[player] != 'inverted':
diff --git a/README.md b/README.md
index f419292f..f2980840 100644
--- a/README.md
+++ b/README.md
@@ -333,6 +333,11 @@ Start with dash ability, but no way to use boots to accomplish checks
 
 Whether to shuffle links house in most ER modes.
 
+```
+--shuffletavern
+```
+
+Whether to shuffle the back of the tavern in most ER modes.
 
 ```
 --bombbag
diff --git a/Rom.py b/Rom.py
index 616b7978..6289874a 100644
--- a/Rom.py
+++ b/Rom.py
@@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '01166fb16b38b49ef79acc9993dc4f02'
+RANDOMIZERBASEHASH = 'e5556450b16f74709c666e419f2a42ad'
 
 
 class JsonRom(object):
@@ -730,6 +730,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
                 else:
                     # patch door table
                     rom.write_byte(0xDBB73 + exit.addresses, exit.target)
+                    if exit.name == 'Tavern North':
+                        rom.write_byte(0x157D0, exit.target)
     if world.mode[player] == 'inverted':
         patch_shuffled_dark_sanc(world, rom, player)
 
@@ -2048,6 +2050,8 @@ def write_strings(rom, world, player, team):
                 entrances_to_hint.update({'Inverted Links House': 'The hero\'s old residence'})
             else:
                 entrances_to_hint.update({'Links House': 'The hero\'s old residence'})
+        if world.shuffletavern[player] and world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull']:
+            entrances_to_hint.update({'Tavern North': 'A backdoor'})
         if world.mode[player] == 'inverted':
             entrances_to_hint.update({'Inverted Dark Sanctuary': 'The dark sanctuary cave'})
             entrances_to_hint.update({'Inverted Big Bomb Shop': 'The old hero\'s dark home'})
diff --git a/data/base2current.bps b/data/base2current.bps
index bd6417a47ef665eabc70d7f6055e50cdcb4562a4..d44d2e2d89935611c1bbf1e5eee7fb9a50bb251f 100644
GIT binary patch
delta 7654
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
K{mEBG82=AhtZ_&H

delta 7235
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

diff --git a/mystery_testsuite.yml b/mystery_testsuite.yml
index fa99cf91..283069ee 100644
--- a/mystery_testsuite.yml
+++ b/mystery_testsuite.yml
@@ -35,6 +35,9 @@ entrance_shuffle:
 shufflelinks:
   on: 1
   off: 1
+shuffletavern:
+  on: 1
+  off: 1
 world_state:
   standard: 1
   open: 1
diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json
index 7c438cbf..2f0c6948 100644
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -360,6 +360,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "shuffletavern": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "overworld_map": {
     "choices": [
       "default",
diff --git a/resources/app/cli/lang/en.json b/resources/app/cli/lang/en.json
index 4e805b12..af362d80 100644
--- a/resources/app/cli/lang/en.json
+++ b/resources/app/cli/lang/en.json
@@ -314,6 +314,9 @@
     "shufflelinks": [
       "Include Link's House in the entrance shuffle pool. (default: %(default)s)"
     ],
+    "shuffletavern": [
+      "Include the back of the tavern in the entrance shuffle pool. (default: %(default)s)"
+    ],
     "overworld_map": [
       "Control if and how the overworld map indicators show the locations of dungeons (default: %(default)s)"
     ],
diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json
index c0ab9367..13383ac6 100644
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -129,6 +129,7 @@
     "randomizer.entrance.openpyramid": "Pre-open Pyramid Hole",
     "randomizer.entrance.shuffleganon": "Include Ganon's Tower and Pyramid Hole in shuffle pool",
     "randomizer.entrance.shufflelinks": "Include Link's House in the shuffle pool",
+    "randomizer.entrance.shuffletavern": "Include the back of the tavern in the entrance shuffle pool",
     "randomizer.entrance.overworld_map": "Overworld Map",
     "randomizer.entrance.overworld_map.default": "Default (no location display)",
     "randomizer.entrance.overworld_map.compass": "Compass indicates location",
diff --git a/resources/app/gui/randomize/entrando/widgets.json b/resources/app/gui/randomize/entrando/widgets.json
index c7dde4f6..b4c6698c 100644
--- a/resources/app/gui/randomize/entrando/widgets.json
+++ b/resources/app/gui/randomize/entrando/widgets.json
@@ -18,6 +18,7 @@
       ]
     },
     "shufflelinks":     { "type": "checkbox" },
+    "shuffletavern":     { "type": "checkbox" },
     "overworld_map": {
       "type": "selectbox",
       "options": [
diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py
index 016b3b64..03a203f9 100644
--- a/source/classes/CustomSettings.py
+++ b/source/classes/CustomSettings.py
@@ -110,6 +110,7 @@ class CustomSettings(object):
                 args.shufflepots[p] = get_setting(settings['shufflepots'], args.shufflepots[p])
                 args.bombbag[p] = get_setting(settings['bombbag'], args.bombbag[p])
                 args.shufflelinks[p] = get_setting(settings['shufflelinks'], args.shufflelinks[p])
+                args.shuffletavern[p] = get_setting(settings['shuffletavern'], args.shuffletavern[p])
                 args.restrict_boss_items[p] = get_setting(settings['restrict_boss_items'], args.restrict_boss_items[p])
                 args.overworld_map[p] = get_setting(settings['overworld_map'], args.overworld_map[p])
                 args.pseudoboots[p] = get_setting(settings['pseudoboots'], args.pseudoboots[p])
@@ -211,6 +212,7 @@ class CustomSettings(object):
             settings_dict[p]['shufflepots'] = world.potshuffle[p]
             settings_dict[p]['bombbag'] = world.bombbag[p]
             settings_dict[p]['shufflelinks'] = world.shufflelinks[p]
+            settings_dict[p]['shuffletavern'] = world.shuffletavern[p]
             settings_dict[p]['overworld_map'] = world.overworld_map[p]
             settings_dict[p]['pseudoboots'] = world.pseudoboots[p]
             settings_dict[p]['triforce_goal'] = world.treasure_hunt_count[p]
diff --git a/source/classes/constants.py b/source/classes/constants.py
index 4de4ac13..a1fff0f6 100644
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -79,6 +79,7 @@ SETTINGSTOPROCESS = {
       "openpyramid": "openpyramid",
       "shuffleganon": "shuffleganon",
       "shufflelinks": "shufflelinks",
+      "shuffletavern": "shuffletavern",
       "entranceshuffle": "shuffle",
       "overworld_map": "overworld_map",
     },
diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py
index 20578cc5..79687b38 100644
--- a/source/overworld/EntranceShuffle2.py
+++ b/source/overworld/EntranceShuffle2.py
@@ -77,9 +77,6 @@ def link_entrances_new(world, player):
         for exit_name, region_name in inverted_mandatory_connections:
             connect_simple(world, exit_name, region_name, player)
 
-    # not randomized at this time
-    connect_simple(world, 'Tavern North', 'Tavern', player)
-
     connect_custom(avail_pool, world, player)
 
     if world.shuffle[player] == 'vanilla':
@@ -191,6 +188,14 @@ def do_main_shuffle(entrances, exits, avail, mode_def):
                 avail.decoupled_entrances.remove('Ganons Tower')
                 avail.decoupled_exits.remove('Ganons Tower Exit')
 
+    # back of tavern
+    if not avail.world.shuffletavern[avail.player] and 'Tavern North' in entrances:
+        connect_entrance('Tavern North', 'Tavern', avail)
+        entrances.remove('Tavern North')
+        exits.remove('Tavern')
+        if not avail.coupled:
+            avail.decoupled_entrances.remove('Tavern North')
+
     # links house / houlihan
     do_links_house(entrances, exits, avail, cross_world)
 
@@ -1061,13 +1066,12 @@ def connect_entrance(entrancename, exit_name, avail):
     addresses = door_addresses[entrance.name][0]
 
     entrance.connect(region, addresses, target)
-    if entrancename != 'Tavern North':
-        avail.entrances.remove(entrancename)
-        if avail.coupled:
-            if exit_name == 'Inverted Dark Sanctuary':
-                avail.exits.remove('Inverted Dark Sanctuary Exit')
-            else:
-                avail.exits.remove(exit_name)
+    avail.entrances.remove(entrancename)
+    if avail.coupled:
+        if exit_name == 'Inverted Dark Sanctuary':
+            avail.exits.remove('Inverted Dark Sanctuary Exit')
+        else:
+            avail.exits.remove(exit_name)
     world.spoiler.set_entrance(entrance.name, exit.name if exit is not None else region.name, 'entrance', player)
     logging.getLogger('').debug(f'Connected (entr) {entrance.name} to {exit.name if exit is not None else region.name}')
 
@@ -1211,7 +1215,7 @@ modes = {
                               'Waterfall of Wishing', 'Inverted Bomb Shop', 'Cave Shop (Dark Death Mountain)',
                               'Dark World Potion Shop', 'Dark World Lumberjack Shop', 'Dark World Shop',
                               'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade', 'Cave Shop (Lake Hylia)',
-                              'Links House', 'Inverted Links House']
+                              'Links House', 'Inverted Links House', 'Tavern North']
             },
             'old_man_cave': {  # have to do old man cave first so lw dungeon don't use up everything
                 'special': 'old_man_cave_east',
@@ -1277,7 +1281,7 @@ modes = {
                               'Waterfall of Wishing', 'Inverted Bomb Shop', 'Cave Shop (Dark Death Mountain)',
                               'Dark World Potion Shop', 'Dark World Lumberjack Shop', 'Dark World Shop',
                               'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade', 'Cave Shop (Lake Hylia)',
-                              'Links House', 'Inverted Links House']
+                              'Links House', 'Inverted Links House', 'Tavern North']
             }
         }
     },
@@ -1575,8 +1579,8 @@ single_entrance_map = {
     'Fortune Teller (Light)': 'Fortune Teller (Light)', 'Lost Woods Gamble': 'Lost Woods Gamble',
     'Sick Kids House': 'Sick Kids House', 'Blacksmiths Hut': 'Blacksmiths Hut', 'Capacity Upgrade': 'Capacity Upgrade',
     'Cave Shop (Lake Hylia)': 'Cave Shop (Lake Hylia)', 'Sahasrahlas Hut': 'Sahasrahlas Hut',
-    'Aginahs Cave': 'Aginahs Cave', 'Chicken House': 'Chicken House', 'Kings Grave': 'Kings Grave',
-    'Desert Fairy': 'Desert Healer Fairy', 'Light Hype Fairy': 'Swamp Healer Fairy',
+    'Aginahs Cave': 'Aginahs Cave', 'Chicken House': 'Chicken House', 'Tavern North': 'Tavern',
+    'Kings Grave': 'Kings Grave', 'Desert Fairy': 'Desert Healer Fairy', 'Light Hype Fairy': 'Swamp Healer Fairy',
     'Lake Hylia Fortune Teller': 'Lake Hylia Fortune Teller', 'Lake Hylia Fairy': 'Lake Hylia Healer Fairy',
     'Bonk Fairy (Light)': 'Bonk Fairy (Light)', 'Lumberjack House': 'Lumberjack House', 'Dam': 'Dam',
     'Blinds Hideout': 'Blinds Hideout', 'Waterfall of Wishing': 'Waterfall of Wishing',
@@ -1613,7 +1617,7 @@ default_lw = {
     'Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Top)', 'Fairy Ascension Cave Exit (Bottom)',
     'Fairy Ascension Cave Exit (Top)', 'Spiral Cave Exit', 'Spiral Cave Exit (Top)', 'Waterfall of Wishing', 'Dam',
     'Blinds Hideout', 'Lumberjack House', 'Bonk Fairy (Light)', 'Bonk Fairy (Dark)', 'Lake Hylia Healer Fairy',
-    'Swamp Healer Fairy', 'Desert Healer Fairy', 'Fortune Teller (Light)', 'Lake Hylia Fortune Teller', 'Kings Grave',
+    'Swamp Healer Fairy', 'Desert Healer Fairy', 'Fortune Teller (Light)', 'Lake Hylia Fortune Teller', 'Kings Grave', 'Tavern',
     'Chicken House', 'Aginahs Cave', 'Sahasrahlas Hut', 'Cave Shop (Lake Hylia)', 'Capacity Upgrade', 'Blacksmiths Hut',
     'Sick Kids House', 'Lost Woods Gamble', 'Snitch Lady (East)', 'Snitch Lady (West)', 'Bush Covered House',
     'Tavern (Front)', 'Light World Bomb Hut', 'Kakariko Shop', 'Cave 45', 'Graveyard Cave', 'Checkerboard Cave',
@@ -1631,7 +1635,7 @@ LW_Entrances = ['Elder House (East)', 'Elder House (West)', 'Two Brothers House
                 'Desert Palace Entrance (South)', 'Desert Palace Entrance (West)', 'Desert Palace Entrance (North)',
                 'Desert Palace Entrance (East)', 'Eastern Palace', 'Tower of Hera', 'Hyrule Castle Entrance (West)',
                 'Hyrule Castle Entrance (East)', 'Hyrule Castle Entrance (South)', 'Agahnims Tower', 'Blinds Hideout',
-                'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Chicken House', 'Aginahs Cave',
+                'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Tavern North', 'Chicken House', 'Aginahs Cave',
                 'Sahasrahlas Hut', 'Cave Shop (Lake Hylia)', 'Blacksmiths Hut', 'Sick Kids House', 'Lost Woods Gamble',
                 'Fortune Teller (Light)', 'Snitch Lady (East)', 'Snitch Lady (West)', 'Bush Covered House',
                 'Tavern (Front)', 'Light World Bomb Hut', 'Kakariko Shop', 'Mini Moldorm Cave', 'Long Fairy Cave',
@@ -1774,8 +1778,8 @@ Simple_DM_Non_Connectors = {'Old Man Cave Ledge', 'Spiral Cave (Top)', 'Superbun
                             'Spectacle Rock Cave (Peak)', 'Spectacle Rock Cave (Top)'}
 
 Blacksmith_Options = [
-    'Blinds Hideout', 'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Chicken House', 'Aginahs Cave',
-    'Sahasrahlas Hut', 'Cave Shop (Lake Hylia)', 'Blacksmiths Hut', 'Sick Kids House', 'Lost Woods Gamble',
+    'Blinds Hideout', 'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Tavern North', 'Chicken House',
+    'Aginahs Cave', 'Sahasrahlas Hut', 'Cave Shop (Lake Hylia)', 'Blacksmiths Hut', 'Sick Kids House', 'Lost Woods Gamble',
     'Fortune Teller (Light)', 'Snitch Lady (East)', 'Snitch Lady (West)', 'Bush Covered House', 'Tavern (Front)',
     'Light World Bomb Hut', 'Kakariko Shop', 'Mini Moldorm Cave', 'Long Fairy Cave', 'Good Bee Cave', '20 Rupee Cave',
     '50 Rupee Cave', 'Ice Rod Cave', 'Library', 'Potion Shop', 'Dam', 'Lumberjack House', 'Lake Hylia Fortune Teller',
@@ -2651,7 +2655,7 @@ door_addresses = {'Links House': (0x00, (0x0104, 0x2c, 0x0506, 0x0a9a, 0x0832, 0
                   'Light Hype Fairy': (0x6B, (0x0115, 0x34, 0x00a0, 0x0c04, 0x0900, 0x0c58, 0x0988, 0x0c73, 0x0985, 0x0a, 0xf6, 0x0000, 0x0000)),
                   'Desert Fairy': (0x71, (0x0115, 0x3a, 0x0000, 0x0e00, 0x0400, 0x0e26, 0x0468, 0x0e6d, 0x0485, 0x00, 0x00, 0x0000, 0x0000)),
                   'Kings Grave': (0x5A, (0x0113, 0x14, 0x0320, 0x0456, 0x0900, 0x04a6, 0x0998, 0x04c3, 0x097d, 0x0a, 0xf6, 0x0000, 0x0000)),
-                  'Tavern North': (0x42, (0x0103, 0x18, 0x1440, 0x08a7, 0x0206, 0x08f9, 0x0288, 0x0914, 0x0293, 0xf7, 0x09, 0xFFFF, 0x0000)),  # do not use, buggy
+                  'Tavern North': (0x42, (0x0103, 0x18, 0x1440, 0x08a7, 0x0206, 0x091b, 0x0288, 0x0914, 0x0293, 0xf7, 0x09, 0xFFFF, 0x0000)),
                   'Chicken House': (0x4A, (0x0108, 0x18, 0x1120, 0x0837, 0x0106, 0x0888, 0x0188, 0x08a4, 0x0193, 0x07, 0xf9, 0x1530, 0x0000)),
                   'Aginahs Cave': (0x70, (0x010a, 0x30, 0x0656, 0x0cc6, 0x02aa, 0x0d18, 0x0328, 0x0d33, 0x032f, 0x08, 0xf8, 0x0000, 0x0000)),
                   'Sahasrahlas Hut': (0x44, (0x0105, 0x1e, 0x0610, 0x06d4, 0x0c76, 0x0727, 0x0cf0, 0x0743, 0x0cfb, 0x0a, 0xf6, 0x0000, 0x0000)),
@@ -2940,7 +2944,7 @@ ow_prize_table = {'Links House': (0x8b1, 0xb2d), 'Inverted Big Bomb Shop': (0x8b
                   'Light Hype Fairy': (0x940, 0xc80),
                   'Desert Fairy': (0x420, 0xe00),
                   'Kings Grave': (0x920, 0x520),
-                  'Tavern North': None,  # can't mark this one technically
+                  'Tavern North': (0x270, 0x900),
                   'Chicken House': (0x120, 0x880),
                   'Aginahs Cave': (0x2e0, 0xd00),
                   'Sahasrahlas Hut': (0xcf0, 0x6c0),
diff --git a/source/tools/MysteryUtils.py b/source/tools/MysteryUtils.py
index 415433c0..d86a1150 100644
--- a/source/tools/MysteryUtils.py
+++ b/source/tools/MysteryUtils.py
@@ -85,6 +85,7 @@ def roll_settings(weights):
         ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off'
 
     ret.shufflelinks = get_choice('shufflelinks') == 'on'
+    ret.shuffletavern = get_choice('shuffletavern') == 'on'
     ret.pseudoboots = get_choice('pseudoboots') == 'on'
     ret.shopsanity = get_choice('shopsanity') == 'on'
     keydropshuffle = get_choice('keydropshuffle') == 'on'