Merged in DR v1.2.0.14 (2nd)

This commit is contained in:
codemann8
2023-04-07 12:04:12 -05:00
parent c2b3d8ce6c
commit 793f3b30b0
28 changed files with 633 additions and 618 deletions

View File

@@ -499,9 +499,6 @@ def do_links_house(entrances, exits, avail, cross_world):
if not avail.world.shufflelinks[avail.player]:
links_house = 'Big Bomb Shop' if avail.world.is_bombshop_start(avail.player) else 'Links House'
else:
# lobby shuffle means you ought to keep links house in the same world
sanc_spawn_can_be_dark = (not avail.inverted and avail.world.doorShuffle[avail.player] == 'crossed'
and avail.world.intensity[avail.player] >= 3)
entrance_pool = entrances if avail.coupled else avail.decoupled_entrances
forbidden = list(Isolated_LH_Doors)
@@ -512,10 +509,10 @@ def do_links_house(entrances, exits, avail, cross_world):
if avail.inverted:
dark_sanc_region = avail.world.get_entrance('Dark Sanctuary Hint Exit', avail.player).connected_region.name
forbidden.extend(get_nearby_entrances(avail, dark_sanc_region))
if avail.world.owShuffle[avail.player] == 'vanilla':
shuffle_mode = avail.world.shuffle[avail.player]
if shuffle_mode == 'vanilla':
# simple shuffle -
if avail.world.shuffle[avail.player] == 'simple':
if shuffle_mode == 'simple':
avail.links_on_mountain = True # taken care of by the logic below
if avail.world.is_tile_swapped(0x03, avail.player): # in inverted, links house cannot be on the mountain
forbidden.extend(['Spike Cave', 'Dark Death Mountain Fairy', 'Hookshot Fairy'])
@@ -528,16 +525,21 @@ def do_links_house(entrances, exits, avail, cross_world):
# can't have links house on eddm in restricted because Inverted Aga Tower isn't available
# todo: inverted full may have the same problem if both links house and a mandatory connector is chosen
# from the 3 inverted options
if avail.world.shuffle[avail.player] in ['restricted', 'lite', 'lean'] and avail.world.is_tile_swapped(0x03, avail.player):
if shuffle_mode == 'restricted' and avail.world.is_tile_swapped(0x03, avail.player):
avail.links_on_mountain = True
forbidden.extend(['Spike Cave', 'Dark Death Mountain Fairy'])
if avail.world.shuffle[avail.player] in ['lite', 'lean']:
if shuffle_mode in ['lite', 'lean']:
forbidden.extend(['Spike Cave', 'Mire Shed'])
if avail.world.is_tile_swapped(0x05, avail.player):
avail.links_on_mountain = True
forbidden.extend(['Cave Shop (Dark Death Mountain)'])
forbidden.extend(['Dark Death Mountain Shop'])
else:
avail.links_on_mountain = True
# lobby shuffle means you ought to keep links house in the same world
sanc_spawn_can_be_dark = (not avail.inverted and avail.world.doorShuffle[avail.player] in ['partitioned', 'crossed']
and avail.world.intensity[avail.player] >= 3)
if cross_world and not sanc_spawn_can_be_dark:
possible = [e for e in entrance_pool if e not in forbidden]
@@ -1350,8 +1352,7 @@ inverted_sub_table = {
'Pyramid Entrance': 'Inverted Pyramid Entrance'
}
inverted_exit_sub_table = {
}
inverted_exit_sub_table = { }
def inverted_substitution(avail_pool, collection, is_entrance, is_set=False):
@@ -1570,18 +1571,18 @@ modes = {
'fixed_non_items': {
'special': 'vanilla',
'condition': '',
'entrances': ['Dark Desert Fairy', 'Archery Game', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint',
'entrances': ['Mire Fairy', 'Archery Game', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint',
'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Fairy', 'Dark Lake Hylia Shop',
'East Dark World Hint', 'Kakariko Gamble Game', 'Long Fairy Cave',
'Bush Covered House', 'Fortune Teller (Light)', 'Lost Woods Gamble',
'Lake Hylia Fortune Teller', 'Lake Hylia Fairy', 'Bonk Fairy (Light)', 'Inverted Dark Sanctuary'],
'Lake Hylia Fortune Teller', 'Lake Hylia Fairy', 'Bonk Fairy (Light)'],
},
'fixed_shops': {
'special': 'vanilla',
'condition': 'shopsanity',
'entrances': ['Cave Shop (Dark Death Mountain)', 'Dark World Potion Shop', 'Dark World Lumberjack Shop',
'entrances': ['Dark Death Mountain Shop', 'Dark Potion Shop', 'Dark Lumberjack Shop',
'Dark World Shop', 'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade',
'Cave Shop (Lake Hylia)'],
'Lake Hylia Shop'],
},
'fixed_takeanys': {
'special': 'vanilla',
@@ -1595,7 +1596,7 @@ modes = {
'entrances': ['Lumberjack House', 'Snitch Lady (West)', 'Snitch Lady (East)', 'Tavern (Front)',
'Light World Bomb Hut', '20 Rupee Cave', '50 Rupee Cave', 'Hookshot Fairy',
'Palace of Darkness Hint', 'Dark Lake Hylia Ledge Spike Cave',
'Dark Desert Hint']
'Mire Hint']
},
'fixed_bonk': {
'special': 'vanilla',
@@ -1603,18 +1604,18 @@ modes = {
'entrances': ['Good Bee Cave']
},
'item_caves': { # shuffles shops/pottery if they weren't fixed in the last steps
'entrances': ['Mimic Cave', 'Spike Cave', 'Mire Shed', 'Dark World Hammer Peg Cave', 'Chest Game',
'entrances': ['Mimic Cave', 'Spike Cave', 'Mire Shed', 'Hammer Peg Cave', 'Chest Game',
'C-Shaped House', 'Brewery', 'Hype Cave', 'Big Bomb Shop', 'Pyramid Fairy',
'Ice Rod Cave', 'Dam', 'Bonk Rock Cave', 'Library', 'Potion Shop', 'Mini Moldorm Cave',
'Checkerboard Cave', 'Graveyard Cave', 'Cave 45', 'Sick Kids House', 'Blacksmiths Hut',
'Sahasrahlas Hut', 'Aginahs Cave', 'Chicken House', 'Kings Grave', 'Blinds Hideout',
'Waterfall of Wishing', 'Cave Shop (Dark Death Mountain)', 'Good Bee Cave',
'Dark World Potion Shop', 'Dark World Lumberjack Shop', 'Dark World Shop',
'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade', 'Cave Shop (Lake Hylia)',
'Waterfall of Wishing', 'Dark Death Mountain Shop', 'Good Bee Cave',
'Dark Potion Shop', 'Dark Lumberjack Shop', 'Dark World Shop',
'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade', 'Lake Hylia Shop',
'Lumberjack House', 'Snitch Lady (West)', 'Snitch Lady (East)', 'Tavern (Front)',
'Light World Bomb Hut', '20 Rupee Cave', '50 Rupee Cave', 'Hookshot Fairy',
'Palace of Darkness Hint', 'Dark Lake Hylia Ledge Spike Cave',
'Dark Desert Hint', 'Desert Fairy', 'Light Hype Fairy', 'Dark Death Mountain Fairy',
'Mire Hint', 'Desert Fairy', 'Light Hype Fairy', 'Dark Death Mountain Fairy',
'Dark Lake Hylia Ledge Fairy', 'Bonk Fairy (Dark)',
'Links House', 'Tavern North']
},
@@ -1661,18 +1662,18 @@ modes = {
'fixed_non_items': {
'special': 'vanilla',
'condition': '',
'entrances': ['Dark Desert Fairy', 'Archery Game', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint',
'entrances': ['Mire Fairy', 'Archery Game', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint',
'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Fairy', 'Dark Lake Hylia Shop',
'East Dark World Hint', 'Kakariko Gamble Game', 'Long Fairy Cave',
'Bush Covered House', 'Fortune Teller (Light)', 'Lost Woods Gamble',
'Lake Hylia Fortune Teller', 'Lake Hylia Fairy', 'Bonk Fairy (Light)', 'Inverted Dark Sanctuary'],
'Lake Hylia Fortune Teller', 'Lake Hylia Fairy', 'Bonk Fairy (Light)'],
},
'fixed_shops': {
'special': 'vanilla',
'condition': 'shopsanity',
'entrances': ['Cave Shop (Dark Death Mountain)', 'Dark World Potion Shop', 'Dark World Lumberjack Shop',
'entrances': ['Dark Death Mountain Shop', 'Dark Potion Shop', 'Dark Lumberjack Shop',
'Dark World Shop', 'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade',
'Cave Shop (Lake Hylia)'],
'Lake Hylia Shop'],
},
'fixed_takeanys': {
'special': 'vanilla',
@@ -1686,7 +1687,7 @@ modes = {
'entrances': ['Lumberjack House', 'Snitch Lady (West)', 'Snitch Lady (East)', 'Tavern (Front)',
'Light World Bomb Hut', '20 Rupee Cave', '50 Rupee Cave', 'Hookshot Fairy',
'Palace of Darkness Hint', 'Dark Lake Hylia Ledge Spike Cave',
'Dark Desert Hint']
'Mire Hint']
},
'fixed_bonk': {
'special': 'vanilla',
@@ -1694,18 +1695,18 @@ modes = {
'entrances': ['Good Bee Cave']
},
'item_caves': { # shuffles shops/pottery if they weren't fixed in the last steps
'entrances': ['Mimic Cave', 'Spike Cave', 'Mire Shed', 'Dark World Hammer Peg Cave', 'Chest Game',
'entrances': ['Mimic Cave', 'Spike Cave', 'Mire Shed', 'Hammer Peg Cave', 'Chest Game',
'C-Shaped House', 'Brewery', 'Hype Cave', 'Big Bomb Shop', 'Pyramid Fairy',
'Ice Rod Cave', 'Dam', 'Bonk Rock Cave', 'Library', 'Potion Shop', 'Mini Moldorm Cave',
'Checkerboard Cave', 'Graveyard Cave', 'Cave 45', 'Sick Kids House', 'Blacksmiths Hut',
'Sahasrahlas Hut', 'Aginahs Cave', 'Chicken House', 'Kings Grave', 'Blinds Hideout',
'Waterfall of Wishing', 'Cave Shop (Dark Death Mountain)', 'Good Bee Cave',
'Dark World Potion Shop', 'Dark World Lumberjack Shop', 'Dark World Shop',
'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade', 'Cave Shop (Lake Hylia)',
'Waterfall of Wishing', 'Dark Death Mountain Shop', 'Good Bee Cave',
'Dark Potion Shop', 'Dark Lumberjack Shop', 'Dark World Shop',
'Red Shield Shop', 'Kakariko Shop', 'Capacity Upgrade', 'Lake Hylia Shop',
'Lumberjack House', 'Snitch Lady (West)', 'Snitch Lady (East)', 'Tavern (Front)',
'Light World Bomb Hut', '20 Rupee Cave', '50 Rupee Cave', 'Hookshot Fairy',
'Palace of Darkness Hint', 'Dark Lake Hylia Ledge Spike Cave',
'Dark Desert Hint', 'Desert Fairy', 'Light Hype Fairy', 'Dark Death Mountain Fairy',
'Mire Hint', 'Desert Fairy', 'Light Hype Fairy', 'Dark Death Mountain Fairy',
'Dark Lake Hylia Ledge Fairy', 'Bonk Fairy (Dark)',
'Links House', 'Tavern North'] # inverted links house gets substituted
}
@@ -1963,12 +1964,12 @@ entrance_map = {
single_entrance_map = {
'Mimic Cave': 'Mimic Cave', 'Dark Death Mountain Fairy': 'Dark Death Mountain Healer Fairy',
'Cave Shop (Dark Death Mountain)': 'Cave Shop (Dark Death Mountain)', 'Spike Cave': 'Spike Cave',
'Dark Desert Fairy': 'Dark Desert Healer Fairy', 'Dark Desert Hint': 'Dark Desert Hint', 'Mire Shed': 'Mire Shed',
'Archery Game': 'Archery Game', 'Dark World Potion Shop': 'Dark World Potion Shop',
'Dark World Lumberjack Shop': 'Dark World Lumberjack Shop', 'Dark World Shop': 'Village of Outcasts Shop',
'Dark Death Mountain Shop': 'Dark Death Mountain Shop', 'Spike Cave': 'Spike Cave',
'Mire Fairy': 'Mire Healer Fairy', 'Mire Hint': 'Mire Hint', 'Mire Shed': 'Mire Shed',
'Archery Game': 'Archery Game', 'Dark Potion Shop': 'Dark Potion Shop',
'Dark Lumberjack Shop': 'Dark Lumberjack Shop', 'Dark World Shop': 'Village of Outcasts Shop',
'Fortune Teller (Dark)': 'Fortune Teller (Dark)', 'Dark Sanctuary Hint': 'Dark Sanctuary Hint',
'Red Shield Shop': 'Red Shield Shop', 'Dark World Hammer Peg Cave': 'Dark World Hammer Peg Cave',
'Red Shield Shop': 'Red Shield Shop', 'Hammer Peg Cave': 'Hammer Peg Cave',
'Chest Game': 'Chest Game', 'C-Shaped House': 'C-Shaped House', 'Brewery': 'Brewery',
'Bonk Fairy (Dark)': 'Bonk Fairy (Dark)', 'Hype Cave': 'Hype Cave',
'Dark Lake Hylia Ledge Hint': 'Dark Lake Hylia Ledge Hint',
@@ -1987,9 +1988,9 @@ single_entrance_map = {
'Snitch Lady (West)': 'Snitch Lady (West)', 'Snitch Lady (East)': 'Snitch Lady (East)',
'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',
'Lake Hylia Shop': 'Lake Hylia Shop', 'Sahasrahlas Hut': 'Sahasrahlas Hut',
'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',
'Kings Grave': 'Kings Grave', 'Desert Fairy': 'Desert Healer Fairy', 'Light Hype Fairy': 'Light Hype 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'
@@ -2001,9 +2002,9 @@ DW_Entrances = []
Isolated_LH_Doors = ['Kings Grave', 'Waterfall of Wishing', 'Desert Palace Entrance (South)',
'Desert Palace Entrance (North)', 'Capacity Upgrade', 'Ice Palace',
'Skull Woods Final Section', 'Skull Woods Second Section Door (West)',
'Dark World Hammer Peg Cave', 'Turtle Rock Isolated Ledge Entrance',
'Hammer Peg Cave', 'Turtle Rock Isolated Ledge Entrance',
'Dark Death Mountain Ledge (West)', 'Dark Death Mountain Ledge (East)',
'Dark World Shop', 'Dark World Potion Shop']
'Dark World Shop', 'Dark Potion Shop']
# inverted doesn't like really like - Paradox Top or Tower of Hera
LH_DM_Connector_List = {
@@ -2012,14 +2013,14 @@ LH_DM_Connector_List = {
'Tower of Hera', 'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Spectacle Rock Cave',
'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)', 'Hookshot Fairy', 'Spike Cave',
'Dark Death Mountain Fairy', 'Ganons Tower', 'Superbunny Cave (Top)', 'Superbunny Cave (Bottom)',
'Hookshot Cave', 'Cave Shop (Dark Death Mountain)', 'Turtle Rock'}
'Hookshot Cave', 'Dark Death Mountain Shop', 'Turtle Rock'}
LH_DM_Exit_Forbidden = {
'Turtle Rock Isolated Ledge Entrance', 'Mimic Cave', 'Hookshot Cave Back Entrance',
'Dark Death Mountain Ledge (West)', 'Dark Death Mountain Ledge (East)', 'Desert Palace Entrance (South)',
'Ice Palace', 'Waterfall of Wishing', 'Kings Grave', 'Dark World Hammer Peg Cave', 'Capacity Upgrade',
'Ice Palace', 'Waterfall of Wishing', 'Kings Grave', 'Hammer Peg Cave', 'Capacity Upgrade',
'Skull Woods Final Section', 'Skull Woods Second Section Door (West)'
} # omissions from Isolated Starts: 'Desert Palace Entrance (North)', 'Dark World Shop', 'Dark World Potion Shop'
} # omissions from Isolated Starts: 'Desert Palace Entrance (North)', 'Dark World Shop', 'Dark Potion Shop'
Connector_List = [['Elder House Exit (East)', 'Elder House Exit (West)'],
['Two Brothers House Exit (East)', 'Two Brothers House Exit (West)'],
@@ -2080,189 +2081,188 @@ Simple_DM_Non_Connectors = {'Old Man Cave Ledge', 'Spiral Cave (Top)', 'Superbun
# They link together underworld regions
mandatory_connections = [('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
('Lumberjack Tree (top to bottom)', 'Lumberjack Tree (bottom)'),
('Kakariko Well (top to bottom)', 'Kakariko Well (bottom)'),
('Kakariko Well (top to back)', 'Kakariko Well (back)'),
('Blinds Hideout N', 'Blinds Hideout (Top)'),
('Bat Cave Door', 'Bat Cave (left)'),
('Sewer Drop', 'Sewers Rat Path'),
('Old Man Cave Dropdown', 'Old Man Cave'),
('Old Man House Front to Back', 'Old Man House Back'),
('Old Man House Back to Front', 'Old Man House'),
('Spectacle Rock Cave Drop', 'Spectacle Rock Cave (Bottom)'),
('Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave (Bottom)'),
('Death Mountain Return Cave E', 'Death Mountain Return Cave (right)'),
('Death Mountain Return Cave W', 'Death Mountain Return Cave (left)'),
('Old Man Cave Dropdown', 'Old Man Cave'),
('Spectacle Rock Cave Drop', 'Spectacle Rock Cave (Bottom)'),
('Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave (Bottom)'),
('Old Man House Front to Back', 'Old Man House Back'),
('Old Man House Back to Front', 'Old Man House'),
('Spiral Cave (top to bottom)', 'Spiral Cave (Bottom)'),
('Light World Death Mountain Shop', 'Light World Death Mountain Shop'),
('Paradox Cave Push Block Reverse', 'Paradox Cave Chest Area'),
('Paradox Cave Push Block', 'Paradox Cave Front'),
('Paradox Cave Chest Area NE', 'Paradox Cave Bomb Area'),
('Paradox Cave Bomb Jump', 'Paradox Cave'),
('Paradox Cave Drop', 'Paradox Cave Chest Area'),
('Paradox Shop', 'Paradox Shop'),
('Fairy Ascension Cave Climb', 'Fairy Ascension Cave (Top)'),
('Fairy Ascension Cave Pots', 'Fairy Ascension Cave (Bottom)'),
('Fairy Ascension Cave Drop', 'Fairy Ascension Cave (Drop)'),
('Kakariko Well (top to bottom)', 'Kakariko Well (bottom)'),
('Kakariko Well (top to back)', 'Kakariko Well (back)'),
('Blinds Hideout N', 'Blinds Hideout (Top)'),
('Sewer Drop', 'Sewers Rat Path'),
('Missing Smith', 'Missing Smith'),
('Bumper Cave Bottom to Top', 'Bumper Cave (top)'),
('Bumper Cave Top To Bottom', 'Bumper Cave (bottom)'),
('Superbunny Cave Climb', 'Superbunny Cave (Top)'),
('Bat Cave Door', 'Bat Cave (left)'),
('Hookshot Cave Front to Middle', 'Hookshot Cave (Middle)'),
('Hookshot Cave Middle to Front', 'Hookshot Cave (Front)'),
('Hookshot Cave Middle to Back', 'Hookshot Cave (Back)'),
('Hookshot Cave Back to Middle', 'Hookshot Cave (Middle)'),
('Hookshot Cave Bonk Path', 'Hookshot Cave (Bonk Islands)'),
('Hookshot Cave Hook Path', 'Hookshot Cave (Hook Islands)'),
('Superbunny Cave Climb', 'Superbunny Cave (Top)'),
('Bumper Cave Bottom to Top', 'Bumper Cave (top)'),
('Bumper Cave Top To Bottom', 'Bumper Cave (bottom)'),
('Ganon Drop', 'Bottom of Pyramid')
]
# non-shuffled entrance links
default_connections = {'Links House': 'Links House',
'Links House Exit': 'Links House Area',
'Waterfall of Wishing': 'Waterfall of Wishing',
'Blinds Hideout': 'Blinds Hideout',
'Dam': 'Dam',
'Lumberjack House': 'Lumberjack House',
'Hyrule Castle Secret Entrance Drop': 'Hyrule Castle Secret Entrance',
'Hyrule Castle Secret Entrance Stairs': 'Hyrule Castle Secret Entrance',
'Hyrule Castle Secret Entrance Exit': 'Hyrule Castle Courtyard',
'Bonk Fairy (Light)': 'Bonk Fairy (Light)',
'Lake Hylia Fairy': 'Lake Hylia Healer Fairy',
'Lake Hylia Fortune Teller': 'Lake Hylia Fortune Teller',
'Light Hype Fairy': 'Swamp Healer Fairy',
'Desert Fairy': 'Desert Healer Fairy',
'Kings Grave': 'Kings Grave',
'Tavern North': 'Tavern',
'Chicken House': 'Chicken House',
'Aginahs Cave': 'Aginahs Cave',
'Sahasrahlas Hut': 'Sahasrahlas Hut',
'Cave Shop (Lake Hylia)': 'Cave Shop (Lake Hylia)',
'Capacity Upgrade': 'Capacity Upgrade',
'Kakariko Well Drop': 'Kakariko Well (top)',
'Kakariko Well Cave': 'Kakariko Well (bottom)',
'Kakariko Well Exit': 'Kakariko Area',
'Blacksmiths Hut': 'Blacksmiths Hut',
'Bat Cave Drop': 'Bat Cave (right)',
'Bat Cave Cave': 'Bat Cave (left)',
'Bat Cave Exit': 'Blacksmith Area',
'Sick Kids House': 'Sick Kids House',
'Elder House (East)': 'Elder House',
'Elder House (West)': 'Elder House',
'Elder House Exit (East)': 'Kakariko Area',
'Elder House Exit (West)': 'Kakariko Area',
'North Fairy Cave Drop': 'North Fairy Cave',
'North Fairy Cave': 'North Fairy Cave',
'North Fairy Cave Exit': 'River Bend Area',
'Lost Woods Gamble': 'Lost Woods Gamble',
'Fortune Teller (Light)': 'Fortune Teller (Light)',
'Snitch Lady (East)': 'Snitch Lady (East)',
'Snitch Lady (West)': 'Snitch Lady (West)',
'Bush Covered House': 'Bush Covered House',
'Tavern (Front)': 'Tavern (Front)',
'Light World Bomb Hut': 'Light World Bomb Hut',
'Kakariko Shop': 'Kakariko Shop',
default_connections = {'Lost Woods Gamble': 'Lost Woods Gamble',
'Lost Woods Hideout Drop': 'Lost Woods Hideout (top)',
'Lost Woods Hideout Stump': 'Lost Woods Hideout (bottom)',
'Lost Woods Hideout Exit': 'Lost Woods East Area',
'Lumberjack House': 'Lumberjack House',
'Lumberjack Tree Tree': 'Lumberjack Tree (top)',
'Lumberjack Tree Cave': 'Lumberjack Tree (bottom)',
'Lumberjack Tree Exit': 'Lumberjack Area',
'Cave 45': 'Cave 45',
'Graveyard Cave': 'Graveyard Cave',
'Checkerboard Cave': 'Checkerboard Cave',
'Mini Moldorm Cave': 'Mini Moldorm Cave',
'Long Fairy Cave': 'Long Fairy Cave', # near East Light World Teleporter
'Good Bee Cave': 'Good Bee Cave',
'20 Rupee Cave': '20 Rupee Cave',
'50 Rupee Cave': '50 Rupee Cave',
'Ice Rod Cave': 'Ice Rod Cave',
'Bonk Rock Cave': 'Bonk Rock Cave',
'Library': 'Library',
'Kakariko Gamble Game': 'Kakariko Gamble Game',
'Potion Shop': 'Potion Shop',
'Two Brothers House (East)': 'Two Brothers House',
'Two Brothers House (West)': 'Two Brothers House',
'Two Brothers House Exit (East)': 'Kakariko Suburb Area',
'Two Brothers House Exit (West)': 'Maze Race Ledge',
'Sanctuary': 'Sanctuary Portal',
'Sanctuary Grave': 'Sewer Drop',
'Sanctuary Exit': 'Sanctuary Area',
'Old Man Cave (West)': 'Old Man Cave Ledge',
'Death Mountain Return Cave (East)': 'Death Mountain Return Cave (right)',
'Death Mountain Return Cave Exit (East)': 'West Death Mountain (Bottom)',
'Old Man Cave (East)': 'Old Man Cave',
'Old Man Cave Exit (West)': 'Mountain Entry Entrance',
'Old Man Cave Exit (East)': 'West Death Mountain (Bottom)',
'Spectacle Rock Cave': 'Spectacle Rock Cave (Top)',
'Spectacle Rock Cave Exit (Top)': 'West Death Mountain (Bottom)',
'Spectacle Rock Cave Peak': 'Spectacle Rock Cave (Peak)',
'Spectacle Rock Cave Exit (Peak)': 'West Death Mountain (Bottom)',
'Spectacle Rock Cave (Bottom)': 'Spectacle Rock Cave (Bottom)',
'Spectacle Rock Cave Exit': 'West Death Mountain (Bottom)',
'Old Man House (Bottom)': 'Old Man House',
'Old Man House Exit (Bottom)': 'West Death Mountain (Bottom)',
'Old Man House (Top)': 'Old Man House Back',
'Old Man House Exit (Top)': 'West Death Mountain (Bottom)',
'Death Mountain Return Cave (East)': 'Death Mountain Return Cave (right)',
'Death Mountain Return Cave (West)': 'Death Mountain Return Cave (left)',
'Death Mountain Return Cave Exit (West)': 'Mountain Entry Ledge',
'Death Mountain Return Cave Exit (East)': 'West Death Mountain (Bottom)',
'Spectacle Rock Cave Peak': 'Spectacle Rock Cave (Peak)',
'Spectacle Rock Cave (Bottom)': 'Spectacle Rock Cave (Bottom)',
'Spectacle Rock Cave': 'Spectacle Rock Cave (Top)',
'Spectacle Rock Cave Exit': 'West Death Mountain (Bottom)',
'Spectacle Rock Cave Exit (Top)': 'West Death Mountain (Bottom)',
'Spectacle Rock Cave Exit (Peak)': 'West Death Mountain (Bottom)',
'Paradox Cave (Bottom)': 'Paradox Cave Front',
'Paradox Cave (Middle)': 'Paradox Cave',
'Paradox Cave (Top)': 'Paradox Cave',
'Paradox Cave Exit (Bottom)': 'East Death Mountain (Bottom)',
'Paradox Cave Exit (Middle)': 'East Death Mountain (Bottom)',
'Paradox Cave Exit (Top)': 'East Death Mountain (Top East)',
'Hookshot Fairy': 'Hookshot Fairy',
'Fairy Ascension Cave (Bottom)': 'Fairy Ascension Cave (Bottom)',
'Fairy Ascension Cave (Top)': 'Fairy Ascension Cave (Top)',
'Fairy Ascension Cave Exit (Bottom)': 'Fairy Ascension Plateau',
'Fairy Ascension Cave Exit (Top)': 'Fairy Ascension Ledge',
'Spiral Cave': 'Spiral Cave (Top)',
'Spiral Cave Exit (Top)': 'Spiral Cave Ledge',
'Spiral Cave (Bottom)': 'Spiral Cave (Bottom)',
'Spiral Cave Exit': 'East Death Mountain (Bottom)',
'Spiral Cave Exit (Top)': 'Spiral Cave Ledge',
'Mimic Cave': 'Mimic Cave',
'Fairy Ascension Cave (Top)': 'Fairy Ascension Cave (Top)',
'Fairy Ascension Cave Exit (Top)': 'Fairy Ascension Ledge',
'Fairy Ascension Cave (Bottom)': 'Fairy Ascension Cave (Bottom)',
'Fairy Ascension Cave Exit (Bottom)': 'Fairy Ascension Plateau',
'Hookshot Fairy': 'Hookshot Fairy',
'Paradox Cave (Top)': 'Paradox Cave',
'Paradox Cave Exit (Top)': 'East Death Mountain (Top East)',
'Paradox Cave (Middle)': 'Paradox Cave',
'Paradox Cave Exit (Middle)': 'East Death Mountain (Bottom)',
'Paradox Cave (Bottom)': 'Paradox Cave Front',
'Paradox Cave Exit (Bottom)': 'East Death Mountain (Bottom)',
'Death Mountain Return Cave (West)': 'Death Mountain Return Cave (left)',
'Death Mountain Return Cave Exit (West)': 'Mountain Entry Ledge',
'Old Man Cave (West)': 'Old Man Cave Ledge',
'Old Man Cave Exit (West)': 'Mountain Entry Entrance',
'Waterfall of Wishing': 'Waterfall of Wishing',
'Fortune Teller (Light)': 'Fortune Teller (Light)',
'Bonk Rock Cave': 'Bonk Rock Cave',
'Sanctuary': 'Sanctuary Portal',
'Sanctuary Grave': 'Sewer Drop',
'Sanctuary Exit': 'Sanctuary Area',
'Graveyard Cave': 'Graveyard Cave',
'Kings Grave': 'Kings Grave',
'North Fairy Cave Drop': 'North Fairy Cave',
'North Fairy Cave': 'North Fairy Cave',
'North Fairy Cave Exit': 'River Bend Area',
'Potion Shop': 'Potion Shop',
'Kakariko Well Drop': 'Kakariko Well (top)',
'Kakariko Well Cave': 'Kakariko Well (bottom)',
'Kakariko Well Exit': 'Kakariko Area',
'Blinds Hideout': 'Blinds Hideout',
'Elder House (West)': 'Elder House',
'Elder House Exit (West)': 'Kakariko Area',
'Elder House (East)': 'Elder House',
'Elder House Exit (East)': 'Kakariko Area',
'Snitch Lady (West)': 'Snitch Lady (West)',
'Snitch Lady (East)': 'Snitch Lady (East)',
'Chicken House': 'Chicken House',
'Sick Kids House': 'Sick Kids House',
'Bush Covered House': 'Bush Covered House',
'Light World Bomb Hut': 'Light World Bomb Hut',
'Kakariko Shop': 'Kakariko Shop',
'Tavern North': 'Tavern',
'Tavern (Front)': 'Tavern (Front)',
'Hyrule Castle Secret Entrance Drop': 'Hyrule Castle Secret Entrance',
'Hyrule Castle Secret Entrance Stairs': 'Hyrule Castle Secret Entrance',
'Hyrule Castle Secret Entrance Exit': 'Hyrule Castle Courtyard',
'Sahasrahlas Hut': 'Sahasrahlas Hut',
'Blacksmiths Hut': 'Blacksmiths Hut',
'Bat Cave Drop': 'Bat Cave (right)',
'Bat Cave Cave': 'Bat Cave (left)',
'Bat Cave Exit': 'Blacksmith Area',
'Two Brothers House (West)': 'Two Brothers House',
'Two Brothers House Exit (West)': 'Maze Race Ledge',
'Two Brothers House (East)': 'Two Brothers House',
'Two Brothers House Exit (East)': 'Kakariko Suburb Area',
'Library': 'Library',
'Kakariko Gamble Game': 'Kakariko Gamble Game',
'Bonk Fairy (Light)': 'Bonk Fairy (Light)',
'Links House': 'Links House',
'Links House Exit': 'Links House Area',
'Lake Hylia Fairy': 'Lake Hylia Healer Fairy',
'Long Fairy Cave': 'Long Fairy Cave',
'Checkerboard Cave': 'Checkerboard Cave',
'Aginahs Cave': 'Aginahs Cave',
'Cave 45': 'Cave 45',
'Light Hype Fairy': 'Light Hype Fairy',
'Lake Hylia Fortune Teller': 'Lake Hylia Fortune Teller',
'Lake Hylia Shop': 'Lake Hylia Shop',
'Capacity Upgrade': 'Capacity Upgrade',
'Mini Moldorm Cave': 'Mini Moldorm Cave',
'Ice Rod Cave': 'Ice Rod Cave',
'Good Bee Cave': 'Good Bee Cave',
'20 Rupee Cave': '20 Rupee Cave',
'Desert Fairy': 'Desert Healer Fairy',
'50 Rupee Cave': '50 Rupee Cave',
'Dam': 'Dam',
'Pyramid Fairy': 'Pyramid Fairy',
'East Dark World Hint': 'East Dark World Hint',
'Palace of Darkness Hint': 'Palace of Darkness Hint',
'Big Bomb Shop': 'Big Bomb Shop',
'Dark Lake Hylia Shop': 'Dark Lake Hylia Shop',
'Dark Lake Hylia Fairy': 'Dark Lake Hylia Healer Fairy',
'Dark Lake Hylia Ledge Fairy': 'Dark Lake Hylia Ledge Healer Fairy',
'Dark Lake Hylia Ledge Spike Cave': 'Dark Lake Hylia Ledge Spike Cave',
'Dark Lake Hylia Ledge Hint': 'Dark Lake Hylia Ledge Hint',
'Hype Cave': 'Hype Cave',
'Bonk Fairy (Dark)': 'Bonk Fairy (Dark)',
'Brewery': 'Brewery',
'C-Shaped House': 'C-Shaped House',
'Chest Game': 'Chest Game',
'Dark World Hammer Peg Cave': 'Dark World Hammer Peg Cave',
'Bumper Cave (Bottom)': 'Bumper Cave (bottom)',
'Bumper Cave (Top)': 'Bumper Cave (top)',
'Red Shield Shop': 'Red Shield Shop',
'Dark Sanctuary Hint': 'Dark Sanctuary Hint',
'Fortune Teller (Dark)': 'Fortune Teller (Dark)',
'Dark World Shop': 'Village of Outcasts Shop',
'Dark World Lumberjack Shop': 'Dark World Lumberjack Shop',
'Dark World Potion Shop': 'Dark World Potion Shop',
'Archery Game': 'Archery Game',
'Bumper Cave Exit (Top)': 'Bumper Cave Ledge',
'Bumper Cave Exit (Bottom)': 'Bumper Cave Entrance',
'Mire Shed': 'Mire Shed',
'Dark Desert Hint': 'Dark Desert Hint',
'Dark Desert Fairy': 'Dark Desert Healer Fairy',
'Spike Cave': 'Spike Cave',
'Hookshot Cave': 'Hookshot Cave (Front)',
'Superbunny Cave (Top)': 'Superbunny Cave (Top)',
'Cave Shop (Dark Death Mountain)': 'Cave Shop (Dark Death Mountain)',
'Dark Lumberjack Shop': 'Dark Lumberjack Shop',
'Dark Death Mountain Fairy': 'Dark Death Mountain Healer Fairy',
'Superbunny Cave (Bottom)': 'Superbunny Cave (Bottom)',
'Superbunny Cave Exit (Top)': 'East Dark Death Mountain (Top)',
'Superbunny Cave Exit (Bottom)': 'East Dark Death Mountain (Bottom)',
'Hookshot Cave Front Exit': 'East Dark Death Mountain (Top)',
'Hookshot Cave Back Exit': 'Dark Death Mountain Floating Island',
'Spike Cave': 'Spike Cave',
'Hookshot Cave Back Entrance': 'Hookshot Cave (Back)',
'Mimic Cave': 'Mimic Cave'}
'Hookshot Cave Back Exit': 'Dark Death Mountain Floating Island',
'Hookshot Cave': 'Hookshot Cave (Front)',
'Hookshot Cave Front Exit': 'East Dark Death Mountain (Top)',
'Superbunny Cave (Top)': 'Superbunny Cave (Top)',
'Superbunny Cave Exit (Top)': 'East Dark Death Mountain (Top)',
'Superbunny Cave (Bottom)': 'Superbunny Cave (Bottom)',
'Superbunny Cave Exit (Bottom)': 'East Dark Death Mountain (Bottom)',
'Dark Death Mountain Shop': 'Dark Death Mountain Shop',
'Bumper Cave (Top)': 'Bumper Cave (top)',
'Bumper Cave Exit (Top)': 'Bumper Cave Ledge',
'Bumper Cave (Bottom)': 'Bumper Cave (bottom)',
'Bumper Cave Exit (Bottom)': 'Bumper Cave Entrance',
'Fortune Teller (Dark)': 'Fortune Teller (Dark)',
'Dark Sanctuary Hint': 'Dark Sanctuary Hint',
'Dark Potion Shop': 'Dark Potion Shop',
'Chest Game': 'Chest Game',
'C-Shaped House': 'C-Shaped House',
'Dark World Shop': 'Village of Outcasts Shop',
'Brewery': 'Brewery',
'Red Shield Shop': 'Red Shield Shop',
'Pyramid Fairy': 'Pyramid Fairy',
'Palace of Darkness Hint': 'Palace of Darkness Hint',
'Hammer Peg Cave': 'Hammer Peg Cave',
'Archery Game': 'Archery Game',
'Bonk Fairy (Dark)': 'Bonk Fairy (Dark)',
'Big Bomb Shop': 'Big Bomb Shop',
'Dark Lake Hylia Fairy': 'Dark Lake Hylia Healer Fairy',
'East Dark World Hint': 'East Dark World Hint',
'Mire Shed': 'Mire Shed',
'Mire Hint': 'Mire Hint',
'Mire Fairy': 'Mire Healer Fairy',
'Hype Cave': 'Hype Cave',
'Dark Lake Hylia Shop': 'Dark Lake Hylia Shop',
'Dark Lake Hylia Ledge Fairy': 'Dark Lake Hylia Ledge Healer Fairy',
'Dark Lake Hylia Ledge Hint': 'Dark Lake Hylia Ledge Hint',
'Dark Lake Hylia Ledge Spike Cave': 'Dark Lake Hylia Ledge Spike Cave'}
open_default_connections = {'Pyramid Hole': 'Pyramid',
'Pyramid Exit': 'Pyramid Ledge',
@@ -2358,7 +2358,7 @@ door_addresses = {'Links House': (0x00, (0x0104, 0x2c
'Chicken House': (0x4A, (0x0108, 0x18, 0x1120, 0x0837, 0x0106, 0x0888, 0x0188, 0x08a4, 0x0193, 0x07, 0xf9, 0x1530, 0x0000), 0x00),
'Aginahs Cave': (0x70, (0x010a, 0x30, 0x0656, 0x0cc6, 0x02aa, 0x0d18, 0x0328, 0x0d33, 0x032f, 0x08, 0xf8, 0x0000, 0x0000), 0x00),
'Sahasrahlas Hut': (0x44, (0x0105, 0x1e, 0x0610, 0x06d4, 0x0c76, 0x0727, 0x0cf0, 0x0743, 0x0cfb, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Cave Shop (Lake Hylia)': (0x57, (0x0112, 0x35, 0x0022, 0x0c00, 0x0b1a, 0x0c26, 0x0b98, 0x0c6d, 0x0b9f, 0x00, 0x00, 0x0000, 0x0000), 0x00),
'Lake Hylia Shop': (0x57, (0x0112, 0x35, 0x0022, 0x0c00, 0x0b1a, 0x0c26, 0x0b98, 0x0c6d, 0x0b9f, 0x00, 0x00, 0x0000, 0x0000), 0x00),
'Capacity Upgrade': (0x5C, (0x0115, 0x35, 0x0a46, 0x0d36, 0x0c2a, 0x0d88, 0x0ca8, 0x0da3, 0x0caf, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Kakariko Well Drop': ([0xDB85C, 0xDB85D], None),
'Blacksmiths Hut': (0x63, (0x0121, 0x22, 0x010c, 0x081a, 0x0466, 0x0868, 0x04d8, 0x0887, 0x04e3, 0x06, 0xfa, 0x041A, 0x0000), 0x00),
@@ -2401,19 +2401,19 @@ door_addresses = {'Links House': (0x00, (0x0104, 0x2c
'Brewery': (0x47, (0x0106, 0x58, 0x16a8, 0x08e4, 0x013e, 0x0938, 0x01b8, 0x0953, 0x01c3, 0x0a, 0xf6, 0x1AB6, 0x0000), 0x02),
'C-Shaped House': (0x53, (0x011c, 0x58, 0x09d8, 0x0744, 0x02ce, 0x0797, 0x0348, 0x07b3, 0x0353, 0x0a, 0xf6, 0x0DE8, 0x0000), 0x00),
'Chest Game': (0x46, (0x0106, 0x58, 0x078a, 0x0705, 0x004e, 0x0758, 0x00c8, 0x0774, 0x00d3, 0x09, 0xf7, 0x0B98, 0x0000), 0x00),
'Dark World Hammer Peg Cave': (0x7E, (0x0127, 0x62, 0x0894, 0x091e, 0x0492, 0x09a6, 0x0508, 0x098b, 0x050f, 0x00, 0x00, 0x0000, 0x0000), 0x20),
'Hammer Peg Cave': (0x7E, (0x0127, 0x62, 0x0894, 0x091e, 0x0492, 0x09a6, 0x0508, 0x098b, 0x050f, 0x00, 0x00, 0x0000, 0x0000), 0x20),
'Red Shield Shop': (0x74, (0x0110, 0x5a, 0x079a, 0x06e8, 0x04d6, 0x0738, 0x0548, 0x0755, 0x0553, 0x08, 0xf8, 0x0AA8, 0x0000), 0x00),
'Dark Sanctuary Hint': (0x59, (0x0112, 0x53, 0x001e, 0x0400, 0x06e2, 0x0446, 0x0758, 0x046d, 0x075f, 0x00, 0x00, 0x0000, 0x0000), 0x00),
'Fortune Teller (Dark)': (0x65, (0x0122, 0x51, 0x0610, 0x04b4, 0x027e, 0x0507, 0x02f8, 0x0523, 0x0303, 0x0a, 0xf6, 0x091E, 0x0000), 0x00),
'Dark World Shop': (0x5F, (0x010f, 0x58, 0x1058, 0x0814, 0x02be, 0x0868, 0x0338, 0x0883, 0x0343, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Dark World Lumberjack Shop': (0x56, (0x010f, 0x42, 0x041c, 0x0074, 0x04e2, 0x00c7, 0x0558, 0x00e3, 0x055f, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Dark World Potion Shop': (0x6E, (0x010f, 0x56, 0x080e, 0x04f4, 0x0c66, 0x0548, 0x0cd8, 0x0563, 0x0ce3, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Dark Lumberjack Shop': (0x56, (0x010f, 0x42, 0x041c, 0x0074, 0x04e2, 0x00c7, 0x0558, 0x00e3, 0x055f, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Dark Potion Shop': (0x6E, (0x010f, 0x56, 0x080e, 0x04f4, 0x0c66, 0x0548, 0x0cd8, 0x0563, 0x0ce3, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Archery Game': (0x58, (0x0111, 0x69, 0x069e, 0x0ac4, 0x02ea, 0x0b18, 0x0368, 0x0b33, 0x036f, 0x0a, 0xf6, 0x09AC, 0x0000), 0x00),
'Mire Shed': (0x5E, (0x010d, 0x70, 0x0384, 0x0c69, 0x001e, 0x0cb6, 0x0098, 0x0cd6, 0x00a3, 0x07, 0xf9, 0x0000, 0x0000), 0x00),
'Dark Desert Hint': (0x61, (0x0114, 0x70, 0x0654, 0x0cc5, 0x02aa, 0x0d16, 0x0328, 0x0d32, 0x032f, 0x09, 0xf7, 0x0000, 0x0000), 0x00),
'Dark Desert Fairy': (0x55, (0x0115, 0x70, 0x03a8, 0x0c6a, 0x013a, 0x0cb7, 0x01b8, 0x0cd7, 0x01bf, 0x06, 0xfa, 0x0000, 0x0000), 0x00),
'Mire Hint': (0x61, (0x0114, 0x70, 0x0654, 0x0cc5, 0x02aa, 0x0d16, 0x0328, 0x0d32, 0x032f, 0x09, 0xf7, 0x0000, 0x0000), 0x00),
'Mire Fairy': (0x55, (0x0115, 0x70, 0x03a8, 0x0c6a, 0x013a, 0x0cb7, 0x01b8, 0x0cd7, 0x01bf, 0x06, 0xfa, 0x0000, 0x0000), 0x00),
'Spike Cave': (0x40, (0x0117, 0x43, 0x0ed4, 0x01e4, 0x08aa, 0x0236, 0x0928, 0x0253, 0x092f, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Cave Shop (Dark Death Mountain)': (0x6D, (0x0112, 0x45, 0x0ee0, 0x01e3, 0x0d00, 0x0236, 0x0daa, 0x0252, 0x0d7d, 0x0b, 0xf5, 0x0000, 0x0000), 0x00),
'Dark Death Mountain Shop': (0x6D, (0x0112, 0x45, 0x0ee0, 0x01e3, 0x0d00, 0x0236, 0x0daa, 0x0252, 0x0d7d, 0x0b, 0xf5, 0x0000, 0x0000), 0x00),
'Dark Death Mountain Fairy': (0x6F, (0x0115, 0x43, 0x1400, 0x0294, 0x0600, 0x02e8, 0x0678, 0x0303, 0x0685, 0x0a, 0xf6, 0x0000, 0x0000), 0x00),
'Mimic Cave': (0x4E, (0x010c, 0x05, 0x07e0, 0x0103, 0x0d00, 0x0156, 0x0d78, 0x0172, 0x0d7d, 0x0b, 0xf5, 0x0000, 0x0000), 0x00),
'Big Bomb Shop': (0x52, (0x011c, 0x6c, 0x0506, 0x0a9a, 0x0832, 0x0ae7, 0x08b8, 0x0b07, 0x08bf, 0x06, 0xfa, 0x0816, 0x0000), 0x00),
@@ -2493,11 +2493,11 @@ exit_ids = {'Links House Exit': (0x01, 0x00),
'Bonk Fairy (Light)': 0x71,
'Bonk Fairy (Dark)': 0x71,
'Lake Hylia Healer Fairy': 0x5E,
'Swamp Healer Fairy': 0x5E,
'Light Hype Fairy': 0x5E,
'Desert Healer Fairy': 0x5E,
'Dark Lake Hylia Healer Fairy': 0x5E,
'Dark Lake Hylia Ledge Healer Fairy': 0x5E,
'Dark Desert Healer Fairy': 0x5E,
'Mire Healer Fairy': 0x5E,
'Dark Death Mountain Healer Fairy': 0x5E,
'Fortune Teller (Light)': 0x65,
'Lake Hylia Fortune Teller': 0x65,
@@ -2506,8 +2506,8 @@ exit_ids = {'Links House Exit': (0x01, 0x00),
'Chicken House': 0x4B,
'Aginahs Cave': 0x4D,
'Sahasrahlas Hut': 0x45,
'Cave Shop (Lake Hylia)': 0x58,
'Cave Shop (Dark Death Mountain)': 0x58,
'Lake Hylia Shop': 0x58,
'Dark Death Mountain Shop': 0x58,
'Capacity Upgrade': 0x5D,
'Blacksmiths Hut': 0x64,
'Sick Kids House': 0x40,
@@ -2538,21 +2538,21 @@ exit_ids = {'Links House Exit': (0x01, 0x00),
'Big Bomb Shop': 0x53,
'Village of Outcasts Shop': 0x60,
'Dark Lake Hylia Shop': 0x60,
'Dark World Lumberjack Shop': 0x60,
'Dark World Potion Shop': 0x60,
'Dark Lumberjack Shop': 0x60,
'Dark Potion Shop': 0x60,
'Dark Lake Hylia Ledge Spike Cave': 0x70,
'Dark Lake Hylia Ledge Hint': 0x6A,
'Hype Cave': 0x3D,
'Brewery': 0x48,
'C-Shaped House': 0x54,
'Chest Game': 0x47,
'Dark World Hammer Peg Cave': 0x83,
'Hammer Peg Cave': 0x83,
'Red Shield Shop': 0x57,
'Dark Sanctuary Hint': 0x5A,
'Fortune Teller (Dark)': 0x66,
'Archery Game': 0x59,
'Mire Shed': 0x5F,
'Dark Desert Hint': 0x62,
'Mire Hint': 0x62,
'Spike Cave': 0x41,
'Mimic Cave': 0x4F,
'Kakariko Well (top)': 0x80,