alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

The Great Renaming

Browse Source 
This is the Great renaming. Renaming to match V27. I've renamed pretty
much all Item locations to match, with a small number kept deliberatly
deferent for clarity.

There is probably more renaming that should be done at the Enterance and
Region levels, but that can be done later.
This commit is contained in:
Kevin Cathcart
2017-10-28 23:42:35 -04:00
parent 2017b65a97
commit cdf04b8a45
10 changed files with 814 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
EntranceShuffle.py
View File

@@ -87,7 +87,7 @@ def link_entrances(world):
# at this point only Light World death mountain entrances remain
# place old man, has limited options
remaining_entrances = ['Old Man Cave (West)', 'Old Man House (Bottom)', 'Death Mountain Return Cave (West)', '7 Chest Cave (Bottom)', '7 Chest Cave (Middle)', '7 Chest Cave (Top)',
remaining_entrances = ['Old Man Cave (West)', 'Old Man House (Bottom)', 'Death Mountain Return Cave (West)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)',
'Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Top)', 'Spiral Cave', 'Spiral Cave (Bottom)']
random.shuffle(old_man_entrances)
old_man_exit = old_man_entrances.pop()
@@ -263,7 +263,7 @@ def link_entrances(world):
dw_entrances = list(DW_Entrances + DW_Dungeon_Entrances)
dw_entrances_must_exits = list(DW_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit)
lw_doors = list(LW_Entrances + LW_Dungeon_Entrances + LW_Dungeon_Entrances_Must_Exit) + ['Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Thieves Forest Hideout Stump',
lw_doors = list(LW_Entrances + LW_Dungeon_Entrances + LW_Dungeon_Entrances_Must_Exit) + ['Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Lost Woods Hideout Stump',
'Lumberjack Tree Cave', 'Hyrule Castle Secret Entrance Stairs'] + list(Old_Man_Entrances)
dw_doors = list(DW_Entrances + DW_Dungeon_Entrances + DW_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit) + ['Skull Woods First Section Door', 'Skull Woods Second Section Door (East)', 'Skull Woods Second Section Door (West)']
@@ -274,7 +274,7 @@ def link_entrances(world):
dw_entrances.append('Skull Woods Second Section Door (East)')
dw_entrances.append('Skull Woods First Section Door')
lw_entrances.extend(['Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Thieves Forest Hideout Stump', 'Lumberjack Tree Cave', 'Hyrule Castle Entrance (South)'])
lw_entrances.extend(['Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Lost Woods Hideout Stump', 'Lumberjack Tree Cave', 'Hyrule Castle Entrance (South)'])
lw_entrances_must_exits = list(LW_Dungeon_Entrances_Must_Exit)
old_man_entrances = list(Old_Man_Entrances)
@@ -285,13 +285,13 @@ def link_entrances(world):
# shuffle up holes
lw_hole_entrances = ['Kakariko Well Drop', 'Bat Cave Drop', 'North Fairy Cave Drop', 'Thieves Forest Hideout Drop', 'Lumberjack Tree Tree', 'Sanctuary Grave']
lw_hole_entrances = ['Kakariko Well Drop', 'Bat Cave Drop', 'North Fairy Cave Drop', 'Lost Woods Hideout Drop', 'Lumberjack Tree Tree', 'Sanctuary Grave']
dw_hole_entrances = ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)', 'Skull Woods Second Section Hole']
hole_targets = [('Kakariko Well Exit', 'Kakariko Well (top)'),
('Bat Cave Exit', 'Bat Cave (right)'),
('North Fairy Cave Exit', 'North Fairy Cave'),
('Thieves Forest Hideout Exit', 'Thieves Forest Hideout (top)'),
('Lost Woods Hideout Exit', 'Lost Woods Hideout (top)'),
('Lumberjack Tree Exit', 'Lumberjack Tree (top)'),
(('Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)'), 'Skull Woods Second Section')]
@@ -501,10 +501,10 @@ def link_entrances(world):
elif world.shuffle == 'insanity':
# beware ye who enter here
entrances = LW_Entrances + LW_Dungeon_Entrances + DW_Entrances + DW_Dungeon_Entrances + ['Skull Woods Second Section Door (East)', 'Skull Woods First Section Door', 'Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Thieves Forest Hideout Stump', 'Lumberjack Tree Cave', 'Hyrule Castle Entrance (South)']
entrances = LW_Entrances + LW_Dungeon_Entrances + DW_Entrances + DW_Dungeon_Entrances + ['Skull Woods Second Section Door (East)', 'Skull Woods First Section Door', 'Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Lost Woods Hideout Stump', 'Lumberjack Tree Cave', 'Hyrule Castle Entrance (South)']
entrances_must_exits = DW_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit + LW_Dungeon_Entrances_Must_Exit + ['Skull Woods Second Section Door (West)']
doors = LW_Entrances + LW_Dungeon_Entrances + LW_Dungeon_Entrances_Must_Exit + ['Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Thieves Forest Hideout Stump', 'Lumberjack Tree Cave', 'Hyrule Castle Secret Entrance Stairs'] + Old_Man_Entrances +\
doors = LW_Entrances + LW_Dungeon_Entrances + LW_Dungeon_Entrances_Must_Exit + ['Kakariko Well Cave', 'Bat Cave Cave', 'North Fairy Cave', 'Sanctuary', 'Lost Woods Hideout Stump', 'Lumberjack Tree Cave', 'Hyrule Castle Secret Entrance Stairs'] + Old_Man_Entrances +\
DW_Entrances + DW_Dungeon_Entrances + DW_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit + ['Skull Woods First Section Door', 'Skull Woods Second Section Door (East)', 'Skull Woods Second Section Door (West)']
random.shuffle(doors)
@@ -512,14 +512,14 @@ def link_entrances(world):
old_man_entrances = list(Old_Man_Entrances)
caves = Cave_Exits + Dungeon_Exits + Cave_Three_Exits + ['Old Man House Exit (Bottom)', 'Old Man House Exit (Top)', 'Skull Woods First Section Exit', 'Skull Woods Second Section Exit (East)', 'Skull Woods Second Section Exit (West)',
'Kakariko Well Exit', 'Bat Cave Exit', 'North Fairy Cave Exit', 'Thieves Forest Hideout Exit', 'Lumberjack Tree Exit', 'Sanctuary Exit']
'Kakariko Well Exit', 'Bat Cave Exit', 'North Fairy Cave Exit', 'Lost Woods Hideout Exit', 'Lumberjack Tree Exit', 'Sanctuary Exit']
# shuffle up holes
hole_entrances = ['Kakariko Well Drop', 'Bat Cave Drop', 'North Fairy Cave Drop', 'Thieves Forest Hideout Drop', 'Lumberjack Tree Tree', 'Sanctuary Grave',
hole_entrances = ['Kakariko Well Drop', 'Bat Cave Drop', 'North Fairy Cave Drop', 'Lost Woods Hideout Drop', 'Lumberjack Tree Tree', 'Sanctuary Grave',
'Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)', 'Skull Woods Second Section Hole']
hole_targets = ['Kakariko Well (top)', 'Bat Cave (right)', 'North Fairy Cave', 'Thieves Forest Hideout (top)', 'Lumberjack Tree (top)', 'Sewer Drop', 'Skull Woods Second Section',
hole_targets = ['Kakariko Well (top)', 'Bat Cave (right)', 'North Fairy Cave', 'Lost Woods Hideout (top)', 'Lumberjack Tree (top)', 'Sewer Drop', 'Skull Woods Second Section',
'Skull Woods First Section (Left)', 'Skull Woods First Section (Right)', 'Skull Woods First Section (Top)']
if world.mode == 'standard':
@@ -712,14 +712,14 @@ def scramble_holes(world):
hole_entrances = [('Kakariko Well Cave', 'Kakariko Well Drop'),
('Bat Cave Cave', 'Bat Cave Drop'),
('North Fairy Cave', 'North Fairy Cave Drop'),
('Thieves Forest Hideout Stump', 'Thieves Forest Hideout Drop'),
('Lost Woods Hideout Stump', 'Lost Woods Hideout Drop'),
('Lumberjack Tree Cave', 'Lumberjack Tree Tree'),
('Sanctuary', 'Sanctuary Grave')]
hole_targets = [('Kakariko Well Exit', 'Kakariko Well (top)'),
('Bat Cave Exit', 'Bat Cave (right)'),
('North Fairy Cave Exit', 'North Fairy Cave'),
('Thieves Forest Hideout Exit', 'Thieves Forest Hideout (top)'),
('Lost Woods Hideout Exit', 'Lost Woods Hideout (top)'),
('Lumberjack Tree Exit', 'Lumberjack Tree (top)')]
if not world.shuffle_ganon:
@@ -843,7 +843,7 @@ def simple_shuffle_dungeons(world):
skull_woods_shuffle(world)
dungeon_entrances = ['Eastern Palace', 'Tower of Hera', 'Thieves Town', 'Skull Woods Final Section', 'Palace of Darkness', 'Ice Palace', 'Misery Mire', 'Swamp Palace']
dungeon_exits = ['Eastern Palace Exit', 'Tower of Hera Exit', 'Thieves Town Exit', 'Skull Woods Final Section Exit', 'Dark Palace Exit', 'Ice Palace Exit', 'Misery Mire Exit', 'Swamp Palace Exit']
dungeon_exits = ['Eastern Palace Exit', 'Tower of Hera Exit', 'Thieves Town Exit', 'Skull Woods Final Section Exit', 'Palace of Darkness Exit', 'Ice Palace Exit', 'Misery Mire Exit', 'Swamp Palace Exit']
if not world.shuffle_ganon:
connect_two_way(world, 'Ganons Tower', 'Ganons Tower Exit')
@@ -951,7 +951,7 @@ Dungeon_Exits = [('Desert Palace Exit (South)', 'Desert Palace Exit (West)', 'De
'Skull Woods Final Section Exit',
'Ice Palace Exit',
'Misery Mire Exit',
'Dark Palace Exit',
'Palace of Darkness Exit',
'Swamp Palace Exit',
'Agahnims Tower Exit',
('Turtle Rock Exit (Front)', 'Turtle Rock Ledge Exit (East)', 'Turtle Rock Ledge Exit (West)', 'Turtle Rock Isolated Ledge Exit')]
@@ -982,7 +982,7 @@ Cave_Exits = [('Elder House Exit (East)', 'Elder House Exit (West)'),
('Hookshot Cave Exit (South)', 'Hookshot Cave Exit (North)')]
Cave_Three_Exits = [('Spectacle Rock Cave Exit (Peak)', 'Spectacle Rock Cave Exit (Top)', 'Spectacle Rock Cave Exit'),
('7 Chest Cave Exit (Top)', '7 Chest Cave Exit (Middle)', '7 Chest Cave Exit (Bottom)')]
('Paradox Cave Exit (Top)', 'Paradox Cave Exit (Middle)', 'Paradox Cave Exit (Bottom)')]
LW_Entrances = ['Elder House (East)',
'Elder House (West)',
@@ -991,9 +991,9 @@ LW_Entrances = ['Elder House (East)',
'Old Man Cave (West)',
'Old Man House (Bottom)',
'Death Mountain Return Cave (West)',
'7 Chest Cave (Bottom)',
'7 Chest Cave (Middle)',
'7 Chest Cave (Top)',
'Paradox Cave (Bottom)',
'Paradox Cave (Middle)',
'Paradox Cave (Top)',
'Fairy Ascension Cave (Bottom)',
'Fairy Ascension Cave (Top)',
'Spiral Cave',
@@ -1004,7 +1004,7 @@ DW_Entrances = ['Bumper Cave (Bottom)',
'Dark Death Mountain Ascend (Bottom)',
'Hookshot Cave']
Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
Blacksmith_Single_Cave_Doors = ['Blinds Hideout',
'Lake Hylia Fairy',
'Swamp Fairy',
'Desert Fairy',
@@ -1027,9 +1027,9 @@ Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
'Good Bee Cave',
'20 Rupee Cave',
'50 Rupee Cave',
'Ice Cave',
'Ice Rod Cave',
'Library',
'Witch Hut',
'Potion Shop',
'Dam',
'Lumberjack House',
'Lake Hylia Fortune Teller',
@@ -1040,7 +1040,7 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Bonk Rock Cave',
'Graveyard Cave',
'Checkerboard Cave',
'Cave South of Haunted Grove',
'Cave 45',
'Kings Grave',
'Bonk Fairy (Light)',
'Hookshot Fairy',
@@ -1052,7 +1052,7 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Dark Lake Hylia Ledge Hint',
'Dark Swamp Cave',
'Bonk Fairy (Dark)',
'Doorless Hut',
'Brewery',
'C-Shaped House',
'Chest Game',
'Dark World Hammer Peg Cave',
@@ -1063,7 +1063,7 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Dark World Lumberjack Shop',
'Dark World Potion Shop',
'Archery Game',
'Dark Desert Cave',
'Mire Shed',
'Dark Desert Hint',
'Dark Desert Fairy',
'Spike Cave',
@@ -1075,7 +1075,7 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
Single_Cave_Doors = ['Pyramid Fairy']
Single_Cave_Targets = ['Thiefs Hut',
Single_Cave_Targets = ['Blinds Hideout',
'Bonk Fairy',
'Healer Fairy',
'Healer Fairy',
@@ -1094,7 +1094,7 @@ Single_Cave_Targets = ['Thiefs Hut',
'Tavern (Front)',
'Light World Bomb Hut',
'Kakariko Shop',
'Cave South of Haunted Grove',
'Cave 45',
'Graveyard Cave',
'Checkerboard Cave',
'Mini Moldorm Cave',
@@ -1102,10 +1102,10 @@ Single_Cave_Targets = ['Thiefs Hut',
'Good Bee Cave',
'20 Rupee Cave',
'50 Rupee Cave',
'Ice Cave',
'Ice Rod Cave',
'Bonk Rock Cave',
'Library',
'Witch Hut',
'Potion Shop',
'Hookshot Fairy',
'Waterfall of Wishing',
'Capacity Upgrade',
@@ -1118,7 +1118,7 @@ Single_Cave_Targets = ['Thiefs Hut',
'Dark Lake Hylia Ledge Hint',
'Dark Swamp Cave',
'Bonk Fairy',
'Doorless Hut',
'Brewery',
'C-Shaped House',
'Chest Game',
'Dark World Hammer Peg Cave',
@@ -1129,7 +1129,7 @@ Single_Cave_Targets = ['Thiefs Hut',
'Dark World Shop',
'Dark World Shop',
'Archery Game',
'Dark Desert Cave',
'Mire Shed',
'Dark Desert Hint',
'Healer Fairy',
'Spike Cave',
@@ -1155,7 +1155,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('Desert Palace East Wing', 'Desert Palace East'),
('Bat Cave Drop Ledge', 'Bat Cave Drop Ledge'),
('Bat Cave Door', 'Bat Cave (left)'),
('Thieves Forest Hideout (top to bottom)', 'Thieves Forest Hideout (bottom)'),
('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
('Lumberjack Tree (top to bottom)', 'Lumberjack Tree (bottom)'),
('Desert Palace Stairs', 'Desert Palace Stairs'),
('Desert Palace Stairs Drop', 'Light World'),
@@ -1214,10 +1214,10 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('South Hyrule Teleporter', 'South Dark World'),
('Kakariko Teleporter', 'West Dark World'),
('Death Mountain Teleporter', 'Dark Death Mountain (West Bottom)'),
('7 Chest Cave Push Block Reverse', '7 Chest Cave Chest Area'),
('7 Chest Cave Push Block', '7 Chest Cave Front'),
('7 Chest Cave Bomb Jump', '7 Chest Cave'),
('7 Chest Cave Drop', '7 Chest Cave Chest Area'),
('Paradox Cave Push Block Reverse', 'Paradox Cave Chest Area'),
('Paradox Cave Push Block', 'Paradox Cave Front'),
('Paradox Cave Bomb Jump', 'Paradox Cave'),
('Paradox Cave Drop', 'Paradox Cave Chest Area'),
('Fairy Ascension Rocks', 'Fairy Ascension Plateau'),
('Fairy Ascension Mirror Spot', 'Fairy Ascension Plateau'),
('Fairy Ascension Drop', 'East Death Mountain (Bottom)'),
@@ -1270,14 +1270,14 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('Turtle Rock (Dark Room) (South)', 'Turtle Rock (Eye Bridge)'),
('Turtle Rock Dark Room (South)', 'Turtle Rock (Dark Room)'),
('Turtle Rock (Trinexx)', 'Turtle Rock (Trinexx)'),
('Dark Palace Bridge Room', 'Dark Palace (Center)'),
('Dark Palace Bonk Wall', 'Dark Palace (Bonk Section)'),
('Dark Palace Big Key Chest Staircase', 'Dark Palace (Big Key Chest)'),
('Dark Palace (North)', 'Dark Palace (North)'),
('Dark Palace Big Key Door', 'Dark Palace (Final Section)'),
('Dark Palace Hammer Peg Drop', 'Dark Palace (Center)'),
('Dark Palace Spike Statue Room Door', 'Dark Palace (Spike Statue Room)'),
('Dark Palace Maze Door', 'Dark Palace (Maze)'),
('Palace of Darkness Bridge Room', 'Palace of Darkness (Center)'),
('Palace of Darkness Bonk Wall', 'Palace of Darkness (Bonk Section)'),
('Palace of Darkness Big Key Chest Staircase', 'Palace of Darkness (Big Key Chest)'),
('Palace of Darkness (North)', 'Palace of Darkness (North)'),
('Palace of Darkness Big Key Door', 'Palace of Darkness (Final Section)'),
('Palace of Darkness Hammer Peg Drop', 'Palace of Darkness (Center)'),
('Palace of Darkness Spike Statue Room Door', 'Palace of Darkness (Spike Statue Room)'),
('Palace of Darkness Maze Door', 'Palace of Darkness (Maze)'),
('Ganons Tower (Tile Room)', 'Ganons Tower (Tile Room)'),
('Ganons Tower (Tile Room) Key Door', 'Ganons Tower (Compass Room)'),
('Ganons Tower (Bottom) (East)', 'Ganons Tower (Bottom)'),
@@ -1296,7 +1296,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
# non-shuffled entrance links
default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
("Thiefs Hut", "Thiefs Hut"),
("Blinds Hideout", "Blinds Hideout"),
('Dam', 'Dam'),
('Lumberjack House', 'Lumberjack House'),
("Hyrule Castle Secret Entrance Drop", "Hyrule Castle Secret Entrance"),
@@ -1337,13 +1337,13 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Tavern (Front)', 'Tavern (Front)'),
('Light World Bomb Hut', 'Light World Bomb Hut'),
('Kakariko Shop', 'Kakariko Shop'),
('Thieves Forest Hideout Drop', 'Thieves Forest Hideout (top)'),
('Thieves Forest Hideout Stump', 'Thieves Forest Hideout (bottom)'),
('Thieves Forest Hideout Exit', 'Light World'),
('Lost Woods Hideout Drop', 'Lost Woods Hideout (top)'),
('Lost Woods Hideout Stump', 'Lost Woods Hideout (bottom)'),
('Lost Woods Hideout Exit', 'Light World'),
('Lumberjack Tree Tree', 'Lumberjack Tree (top)'),
('Lumberjack Tree Cave', 'Lumberjack Tree (bottom)'),
('Lumberjack Tree Exit', 'Light World'),
('Cave South of Haunted Grove', 'Cave South of Haunted Grove'),
('Cave 45', 'Cave 45'),
('Graveyard Cave', 'Graveyard Cave'),
('Checkerboard Cave', 'Checkerboard Cave'),
('Mini Moldorm Cave', 'Mini Moldorm Cave'),
@@ -1351,11 +1351,11 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Good Bee Cave', 'Good Bee Cave'),
('20 Rupee Cave', '20 Rupee Cave'),
('50 Rupee Cave', '50 Rupee Cave'),
('Ice Cave', 'Ice Cave'),
('Ice Rod Cave', 'Ice Rod Cave'),
('Bonk Rock Cave', 'Bonk Rock Cave'),
('Library', 'Library'),
('Kakariko Gamble Game', 'Kakariko Gamble Game'),
('Witch Hut', 'Witch Hut'),
('Potion Shop', 'Potion Shop'),
('Two Brothers House (East)', 'Two Brothers House'),
('Two Brothers House (West)', 'Two Brothers House'),
('Two Brothers House Exit (East)', 'Light World'),
@@ -1383,12 +1383,12 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Spectacle Rock Cave Exit', 'Death Mountain'),
('Spectacle Rock Cave Exit (Top)', 'Death Mountain'),
('Spectacle Rock Cave Exit (Peak)', 'Death Mountain'),
('7 Chest Cave (Bottom)', '7 Chest Cave Front'),
('7 Chest Cave (Middle)', '7 Chest Cave'),
('7 Chest Cave (Top)', '7 Chest Cave'),
('7 Chest Cave Exit (Bottom)', 'East Death Mountain (Bottom)'),
('7 Chest Cave Exit (Middle)', 'East Death Mountain (Bottom)'),
('7 Chest Cave Exit (Top)', 'East Death Mountain (Top)'),
('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)'),
('Hookshot Fairy', 'Hookshot Fairy'),
('Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave'),
('Fairy Ascension Cave (Top)', 'Fairy Ascension Cave'),
@@ -1410,7 +1410,7 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'),
('Dark Swamp Cave', 'Dark Swamp Cave'),
('Bonk Fairy (Dark)', 'Bonk Fairy'),
('Doorless Hut', 'Doorless Hut'),
('Brewery', 'Brewery'),
('C-Shaped House', 'C-Shaped House'),
('Chest Game', 'Chest Game'),
('Dark World Hammer Peg Cave', 'Dark World Hammer Peg Cave'),
@@ -1425,7 +1425,7 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Archery Game', 'Archery Game'),
('Bumper Cave Exit (Top)', 'Bumper Cave Ledge'),
('Bumper Cave Exit (Bottom)', 'West Dark World'),
('Dark Desert Cave', 'Dark Desert Cave'),
('Mire Shed', 'Mire Shed'),
('Dark Desert Hint', 'Dark Desert Hint'),
('Dark Desert Fairy', 'Healer Fairy'),
('Spike Cave', 'Spike Cave'),
@@ -1488,8 +1488,8 @@ default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert Palace
('Ice Palace Exit', 'Dark Lake Hylia Central Island'),
('Misery Mire', 'Misery Mire (Entrance)'),
('Misery Mire Exit', 'Dark Desert'),
('Palace of Darkness', 'Dark Palace (Entrance)'),
('Dark Palace Exit', 'East Dark World'),
('Palace of Darkness', 'Palace of Darkness (Entrance)'),
('Palace of Darkness Exit', 'East Dark World'),
('Swamp Palace', 'Swamp Palace (Entrance)'), # requires additional patch for flooding moat if moved
('Swamp Palace Exit', 'South Dark World'),
@@ -1537,7 +1537,7 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Elder House (East)': ((0xDBB80, 0x15B0C),),
'Elder House (West)': ((0xDBB7F, 0x15B0A),),
'North Fairy Cave': ((0xDBBAA, 0x15B60),),
'Thieves Forest Hideout Stump': ((0xDBB9E, 0x15B5A),),
'Lost Woods Hideout Stump': ((0xDBB9E, 0x15B5A),),
'Lumberjack Tree Cave': ((0xDBB84, 0x15B14),),
'Two Brothers House (East)': ((0xDBB82, 0x15B10),),
'Two Brothers House (West)': ((0xDBB81, 0x15B0E),),
@@ -1551,9 +1551,9 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Spectacle Rock Cave Peak': ((0xDBB95, 0x15B36),),
'Spectacle Rock Cave': ((0xDBB94, 0x15B34),),
'Spectacle Rock Cave (Bottom)': ((0xDBB93, 0x15B32),),
'7 Chest Cave (Bottom)': ((0xDBB90, 0x15B2C),),
'7 Chest Cave (Middle)': ((0xDBB91, 0x15B2E),),
'7 Chest Cave (Top)': ((0xDBB92, 0x15B30),),
'Paradox Cave (Bottom)': ((0xDBB90, 0x15B2C),),
'Paradox Cave (Middle)': ((0xDBB91, 0x15B2E),),
'Paradox Cave (Top)': ((0xDBB92, 0x15B30),),
'Fairy Ascension Cave (Bottom)': ((0xDBB8C, 0x15B24),),
'Fairy Ascension Cave (Top)': ((0xDBB8D, 0x15B26),),
'Spiral Cave': ((0xDBB8F, 0x15B2A),),
@@ -1573,7 +1573,7 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Pyramid Hole': ((0xDB854, 0xDB855, 0xDB856),),
'Waterfall of Wishing': (0xDBBCE, 'Waterfall of Wishing'),
'Dam': (0xDBBC0, 'Dam'),
'Thiefs Hut': (0xDBBD3, 'Thiefs Hut'),
'Blinds Hideout': (0xDBBD3, 'Blinds Hideout'),
'Hyrule Castle Secret Entrance Drop': (0xDB858,),
'Bonk Fairy (Light)': (0xDBBE9, 'Bonk Fairy'),
'Lake Hylia Fairy': (0xDBBD0, 'Healer Fairy'),
@@ -1599,9 +1599,9 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Tavern (Front)': (0xDBBB4, 'Tavern (Front)'),
'Light World Bomb Hut': (0xDBBBC, 'Light World Bomb Hut'),
'Kakariko Shop': (0xDBBB8, 'Kakariko Shop'),
'Thieves Forest Hideout Drop': (0xDB853,),
'Lost Woods Hideout Drop': (0xDB853,),
'Lumberjack Tree Tree': (0xDB85B,),
'Cave South of Haunted Grove': (0xDBBC3, 'Cave South of Haunted Grove'),
'Cave 45': (0xDBBC3, 'Cave 45'),
'Graveyard Cave': (0xDBBC4, 'Graveyard Cave'),
'Checkerboard Cave': (0xDBBF0, 'Checkerboard Cave'),
'Mini Moldorm Cave': (0xDBBEF, 'Mini Moldorm Cave'),
@@ -1609,10 +1609,10 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Good Bee Cave': (0xDBBDD, 'Good Bee Cave'),
'20 Rupee Cave': (0xDBBED, '20 Rupee Cave'),
'50 Rupee Cave': (0xDBBEB, '50 Rupee Cave'),
'Ice Cave': (0xDBBF2, 'Ice Cave'),
'Ice Rod Cave': (0xDBBF2, 'Ice Rod Cave'),
'Bonk Rock Cave': (0xDBBEC, 'Bonk Rock Cave'),
'Library': (0xDBBBB, 'Library'),
'Witch Hut': (0xDBBBE, 'Witch Hut'),
'Potion Shop': (0xDBBBE, 'Potion Shop'),
'Sanctuary Grave': (0xDB85E,),
'Hookshot Fairy': (0xDBBC2, 'Hookshot Fairy'),
'Pyramid Fairy': (0xDBBD5, 'Pyramid Fairy'),
@@ -1624,7 +1624,7 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Dark Lake Hylia Ledge Hint': (0xDBBDC, 'Dark Lake Hylia Ledge Hint'),
'Dark Swamp Cave': (0xDBBAF, 'Dark Swamp Cave'),
'Bonk Fairy (Dark)': (0xDBBEA, 'Bonk Fairy'),
'Doorless Hut': (0xDBBBA, 'Doorless Hut'),
'Brewery': (0xDBBBA, 'Brewery'),
'C-Shaped House': (0xDBBC6, 'C-Shaped House'),
'Chest Game': (0xDBBB9, 'Chest Game'),
'Dark World Hammer Peg Cave': (0xDBBF1, 'Dark World Hammer Peg Cave'),
@@ -1635,7 +1635,7 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Dark World Lumberjack Shop': (0xDBBC9, 'Dark World Shop'),
'Dark World Potion Shop': (0xDBBE1, 'Dark World Shop'),
'Archery Game': (0xDBBCB, 'Archery Game'),
'Dark Desert Cave': (0xDBBD1, 'Dark Desert Cave'),
'Mire Shed': (0xDBBD1, 'Mire Shed'),
'Dark Desert Hint': (0xDBBD4, 'Dark Desert Hint'),
'Dark Desert Fairy': (0xDBBC8, 'Healer Fairy'),
'Spike Cave': (0xDBBB3, 'Spike Cave'),
@@ -1665,7 +1665,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Skull Woods Final Section Exit': (0x2B, 0x59),
'Ice Palace Exit': (0x2D, 0x0E),
'Misery Mire Exit': (0x27, 0x98),
'Dark Palace Exit': (0x26, 0x4A),
'Palace of Darkness Exit': (0x26, 0x4A),
'Swamp Palace Exit': (0x25, 0x28),
'Turtle Rock Exit (Front)': (0x35, 0xD6),
'Turtle Rock Ledge Exit (West)': (0x15, 0x23),
@@ -1677,7 +1677,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Elder House Exit (East)': (0x0E, 0xF3),
'Elder House Exit (West)': (0x0D, 0xF2),
'North Fairy Cave Exit': (0x38, 0x08),
'Thieves Forest Hideout Exit': (0x2C, 0xE1),
'Lost Woods Hideout Exit': (0x2C, 0xE1),
'Lumberjack Tree Exit': (0x12, 0xE2),
'Two Brothers House Exit (East)': (0x10, 0xF5),
'Two Brothers House Exit (West)': (0x0F, 0xF4),
@@ -1691,9 +1691,9 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Spectacle Rock Cave Exit': (0x21, 0xF9),
'Spectacle Rock Cave Exit (Top)': (0x22, 0xFA),
'Spectacle Rock Cave Exit (Peak)': (0x23, 0xEA),
'7 Chest Cave Exit (Bottom)': (0x1E, 0xFF),
'7 Chest Cave Exit (Middle)': (0x1F, 0xEF),
'7 Chest Cave Exit (Top)': (0x20, 0xDF),
'Paradox Cave Exit (Bottom)': (0x1E, 0xFF),
'Paradox Cave Exit (Middle)': (0x1F, 0xEF),
'Paradox Cave Exit (Top)': (0x20, 0xDF),
'Fairy Ascension Cave Exit (Bottom)': (0x1A, 0xFD),
'Fairy Ascension Cave Exit (Top)': (0x1B, 0xED),
'Spiral Cave Exit': (0x1C, 0xFE),
@@ -1708,7 +1708,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Pyramid Exit': (0x36, 0x10),
'Waterfall of Wishing': 0x5C,
'Dam': 0x4E,
'Thiefs Hut': 0x61,
'Blinds Hideout': 0x61,
'Lumberjack House': 0x6B,
'Bonk Fairy': 0x71,
'Healer Fairy': 0x5E,
@@ -1729,7 +1729,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Tavern (Front)': 0x42,
'Light World Bomb Hut': 0x4A,
'Kakariko Shop': 0x46,
'Cave South of Haunted Grove': 0x51,
'Cave 45': 0x51,
'Graveyard Cave': 0x52,
'Checkerboard Cave': 0x72,
'Mini Moldorm Cave': 0x6C,
@@ -1737,11 +1737,11 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Good Bee Cave': 0x56,
'20 Rupee Cave': 0x6F,
'50 Rupee Cave': 0x6D,
'Ice Cave': 0x84,
'Ice Rod Cave': 0x84,
'Bonk Rock Cave': 0x6E,
'Library': 0x49,
'Kakariko Gamble Game': 0x67,
'Witch Hut': 0x4C,
'Potion Shop': 0x4C,
'Hookshot Fairy': 0x50,
'Pyramid Fairy': 0x63,
'East Dark World Hint': 0x69,
@@ -1751,7 +1751,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Dark Lake Hylia Ledge Spike Cave': 0x70,
'Dark Lake Hylia Ledge Hint': 0x6A,
'Dark Swamp Cave': 0x3D,
'Doorless Hut': 0x48,
'Brewery': 0x48,
'C-Shaped House': 0x54,
'Chest Game': 0x47,
'Dark World Hammer Peg Cave': 0x83,
@@ -1759,7 +1759,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Dark Sanctuary Hint': 0x5A,
'Fortune Teller (Dark)': 0x66,
'Archery Game': 0x59,
'Dark Desert Cave': 0x5F,
'Mire Shed': 0x5F,
'Dark Desert Hint': 0x62,
'Spike Cave': 0x41,
'Mimic Cave': 0x4F,
@@ -1767,7 +1767,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Hyrule Castle Secret Entrance': 0x7D,
'Bat Cave (right)': 0x7E,
'North Fairy Cave': 0x7C,
'Thieves Forest Hideout (top)': 0x7A,
'Lost Woods Hideout (top)': 0x7A,
'Lumberjack Tree (top)': 0x7F,
'Sewer Drop': 0x81,
'Skull Woods Second Section': 0x79,