Various region/rule reorganization to match DR
This commit is contained in:
codemann8
@@ -470,7 +470,7 @@ def link_overworld(world, player):
|
||||
target_spots = len(new_spots) + spots_to_place
|
||||
logging.getLogger('').debug(f'Sector of {sector[0]} regions gets {spots_to_place} spot(s)')
|
||||
|
||||
if 'Desert Palace Teleporter Ledge' in sector[1] or 'Misery Mire Teleporter Ledge' in sector[1]:
|
||||
if 'Desert Teleporter Ledge' in sector[1] or 'Mire Teleporter Ledge' in sector[1]:
|
||||
addSpot(0x38, False) # guarantee desert/mire access
|
||||
|
||||
random.shuffle(sector[1])
|
||||
@@ -887,7 +887,6 @@ def create_flute_exits(world, player):
|
||||
exitname = 'Flute From ' + region.name
|
||||
exit = Entrance(region.player, exitname, region)
|
||||
exit.spot_type = 'Flute'
|
||||
exit.access_rule = lambda state: state.can_flute(player)
|
||||
exit.connect(world.get_region('Flute Sky', player))
|
||||
region.exits.append(exit)
|
||||
|
||||
@@ -1128,17 +1127,17 @@ def validate_layout(world, player):
|
||||
'East Death Mountain (Bottom)': ['East Death Mountain (Top East)'],
|
||||
'Kakariko Suburb Area': ['Maze Race Ledge'],
|
||||
'Maze Race Ledge': ['Kakariko Suburb Area'],
|
||||
'Desert Area': ['Desert Ledge', 'Desert Palace Mouth'],
|
||||
'Desert Area': ['Desert Ledge', 'Desert Mouth'],
|
||||
'East Dark Death Mountain (Top)': ['Dark Death Mountain Floating Island'],
|
||||
'East Dark Death Mountain (Bottom)': ['East Dark Death Mountain (Top)'],
|
||||
'Turtle Rock Area': ['Dark Death Mountain Ledge',
|
||||
'Dark Death Mountain Isolated Ledge'],
|
||||
'Dark Death Mountain Ledge': ['Turtle Rock Area'],
|
||||
'Dark Death Mountain Isolated Ledge': ['Turtle Rock Area'],
|
||||
'Mountain Entry Entrance': ['West Death Mountain (Bottom)'],
|
||||
'Mountain Entry Ledge': ['West Death Mountain (Bottom)'],
|
||||
'West Death Mountain (Bottom)': ['Mountain Entry Ledge'],
|
||||
'Bumper Cave Entrance': ['Bumper Cave Ledge']
|
||||
'Mountain Pass Entry': ['West Death Mountain (Bottom)'],
|
||||
'Mountain Pass Ledge': ['West Death Mountain (Bottom)'],
|
||||
'West Death Mountain (Bottom)': ['Mountain Pass Ledge'],
|
||||
'Bumper Cave Entry': ['Bumper Cave Ledge']
|
||||
}
|
||||
sane_connectors = {
|
||||
# guaranteed dungeon access
|
||||
@@ -1197,9 +1196,9 @@ def validate_layout(world, player):
|
||||
explore_region(start_region)
|
||||
|
||||
if not world.is_tile_swapped(0x30, player):
|
||||
start_region = 'Desert Palace Teleporter Ledge'
|
||||
start_region = 'Desert Teleporter Ledge'
|
||||
else:
|
||||
start_region = 'Misery Mire Teleporter Ledge'
|
||||
start_region = 'Mire Teleporter Ledge'
|
||||
explore_region(start_region)
|
||||
|
||||
if not world.is_tile_swapped(0x1b, player):
|
||||
@@ -1259,201 +1258,207 @@ test_connections = [
|
||||
]
|
||||
|
||||
# these are connections that cannot be shuffled and always exist. They link together separate parts of the world we need to divide into regions
|
||||
mandatory_connections = [('Old Man S&Q', 'Old Man House'),
|
||||
mandatory_connections = [
|
||||
('Old Man S&Q', 'Old Man House'),
|
||||
|
||||
# Intra-tile OW Connections
|
||||
('Lost Woods Bush (West)', 'Lost Woods East Area'), #pearl
|
||||
('Lost Woods Bush (East)', 'Lost Woods West Area'), #pearl
|
||||
('West Death Mountain Drop', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Drop', 'West Death Mountain (Top)'),
|
||||
('Old Man Drop Off', 'Old Man Drop Off'),
|
||||
('DM Hammer Bridge (West)', 'East Death Mountain (Top East)'), #hammer
|
||||
('DM Hammer Bridge (East)', 'East Death Mountain (Top West)'), #hammer
|
||||
('East Death Mountain Spiral Ledge Drop', 'Spiral Cave Ledge'),
|
||||
('Spiral Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('East Death Mountain Fairy Ledge Drop', 'Fairy Ascension Ledge'),
|
||||
('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Plateau Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Fairy Ascension Rocks (North)', 'East Death Mountain (Bottom)'), #mitts
|
||||
('Fairy Ascension Rocks (South)', 'Fairy Ascension Plateau'), #mitts
|
||||
('DM Broken Bridge (West)', 'East Death Mountain (Bottom)'), #hookshot
|
||||
('DM Broken Bridge (East)', 'East Death Mountain (Bottom Left)'), #hookshot
|
||||
('TR Pegs Ledge Entry', 'Death Mountain TR Pegs Ledge'), #mitts
|
||||
('TR Pegs Ledge Leave', 'Death Mountain TR Pegs'), #mitts
|
||||
('TR Pegs Ledge Drop', 'Death Mountain TR Pegs'),
|
||||
('Mountain Entry Entrance Rock (West)', 'Mountain Entry Entrance'), #glove
|
||||
('Mountain Entry Entrance Rock (East)', 'Mountain Entry Area'), #glove
|
||||
('Mountain Entry Entrance Ledge Drop', 'Mountain Entry Area'),
|
||||
('Mountain Entry Ledge Drop', 'Mountain Entry Area'),
|
||||
('Zora Waterfall Landing', 'Zora Waterfall Area'),
|
||||
('Zora Waterfall Water Drop', 'Zora Waterfall Water'), #flippers
|
||||
('Zora Waterfall Water Entry', 'Zora Waterfall Water'), #flippers
|
||||
('Zora Waterfall Water Approach', 'Zora Waterfall Entryway'), #flippers
|
||||
('Lost Woods Pass Hammer (North)', 'Lost Woods Pass Portal Area'), #hammer
|
||||
('Lost Woods Pass Hammer (South)', 'Lost Woods Pass East Top Area'), #hammer
|
||||
('Lost Woods Pass Rock (North)', 'Lost Woods Pass East Bottom Area'), #mitts
|
||||
('Lost Woods Pass Rock (South)', 'Lost Woods Pass Portal Area'), #mitts
|
||||
('Bonk Rock Ledge Drop', 'Sanctuary Area'),
|
||||
('Graveyard Ledge Drop', 'Graveyard Area'),
|
||||
('Kings Grave Outer Rocks', 'Kings Grave Area'), #mitts
|
||||
('Kings Grave Inner Rocks', 'Graveyard Area'), #mitts
|
||||
('River Bend Water Drop', 'River Bend Water'), #flippers
|
||||
('River Bend East Water Drop', 'River Bend Water'), #flippers
|
||||
('River Bend West Pier', 'River Bend Area'),
|
||||
('River Bend East Pier', 'River Bend East Bank'),
|
||||
('Potion Shop Water Drop', 'Potion Shop Water'), #flippers
|
||||
('Potion Shop Northeast Water Drop', 'Potion Shop Water'), #flippers
|
||||
('Potion Shop Rock (South)', 'Potion Shop Northeast'), #glove
|
||||
('Potion Shop Rock (North)', 'Potion Shop Area'), #glove
|
||||
('Zora Approach Water Drop', 'Zora Approach Water'), #flippers
|
||||
('Zora Approach Rocks (West)', 'Zora Approach Ledge'), #mitts/boots
|
||||
('Zora Approach Rocks (East)', 'Zora Approach Area'), #mitts/boots
|
||||
('Zora Approach Bottom Ledge Drop', 'Zora Approach Ledge'),
|
||||
('Zora Approach Ledge Drop', 'Zora Approach Area'),
|
||||
('Kakariko Southwest Bush (North)', 'Kakariko Southwest'), #pearl
|
||||
('Kakariko Southwest Bush (South)', 'Kakariko Area'), #pearl
|
||||
('Kakariko Yard Bush (South)', 'Kakariko Grass Yard'), #pearl
|
||||
('Kakariko Yard Bush (North)', 'Kakariko Area'), #pearl
|
||||
('Hyrule Castle Southwest Bush (North)', 'Hyrule Castle Southwest'), #pearl
|
||||
('Hyrule Castle Southwest Bush (South)', 'Hyrule Castle Area'), #pearl
|
||||
('Hyrule Castle Courtyard Bush (North)', 'Hyrule Castle Courtyard'), #pearl
|
||||
('Hyrule Castle Courtyard Bush (South)', 'Hyrule Castle Courtyard Northeast'), #pearl
|
||||
('Hyrule Castle Main Gate (South)', 'Hyrule Castle Courtyard'), #aga+mirror
|
||||
('Hyrule Castle Main Gate (North)', 'Hyrule Castle Area'), #aga+mirror
|
||||
('Hyrule Castle Ledge Drop', 'Hyrule Castle Area'),
|
||||
('Hyrule Castle Ledge Courtyard Drop', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle Inner East Rock', 'Hyrule Castle East Entry'), #glove
|
||||
('Hyrule Castle Outer East Rock', 'Hyrule Castle Area'), #glove
|
||||
('Wooden Bridge Bush (South)', 'Wooden Bridge Northeast'), #pearl
|
||||
('Wooden Bridge Bush (North)', 'Wooden Bridge Area'), #pearl
|
||||
('Wooden Bridge Water Drop', 'Wooden Bridge Water'), #flippers
|
||||
('Wooden Bridge Northeast Water Drop', 'Wooden Bridge Water'), #flippers
|
||||
('Bat Cave Ledge Peg', 'Bat Cave Ledge'), #hammer
|
||||
('Bat Cave Ledge Peg (East)', 'Blacksmith Area'), #hammer
|
||||
('Maze Race Game', 'Maze Race Prize'), #pearl
|
||||
('Maze Race Ledge Drop', 'Maze Race Area'),
|
||||
('Stone Bridge Southbound', 'Stone Bridge South Area'),
|
||||
('Stone Bridge Northbound', 'Stone Bridge North Area'),
|
||||
('Desert Palace Statue Move', 'Desert Palace Stairs'), #book
|
||||
('Desert Ledge Drop', 'Desert Area'),
|
||||
('Desert Ledge Outer Rocks', 'Desert Palace Entrance (North) Spot'), #glove
|
||||
('Desert Ledge Inner Rocks', 'Desert Ledge'), #glove
|
||||
('Checkerboard Ledge Drop', 'Desert Area'),
|
||||
('Desert Mouth Drop', 'Desert Area'),
|
||||
('Desert Teleporter Drop', 'Desert Area'),
|
||||
('Bombos Tablet Drop', 'Desert Area'),
|
||||
('Flute Boy Bush (North)', 'Flute Boy Approach Area'), #pearl
|
||||
('Flute Boy Bush (South)', 'Flute Boy Bush Entry'), #pearl
|
||||
('C Whirlpool Water Entry', 'C Whirlpool Water'), #flippers
|
||||
('C Whirlpool Landing', 'C Whirlpool Area'),
|
||||
('C Whirlpool Rock (Bottom)', 'C Whirlpool Outer Area'), #glove
|
||||
('C Whirlpool Rock (Top)', 'C Whirlpool Area'), #glove
|
||||
('C Whirlpool Pegs (Right)', 'C Whirlpool Portal Area'), #hammer
|
||||
('C Whirlpool Pegs (Left)', 'C Whirlpool Area'), #hammer
|
||||
('Statues Water Entry', 'Statues Water'), #flippers
|
||||
('Statues Landing', 'Statues Area'),
|
||||
('Lake Hylia Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia South Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Northeast Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Central Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Island Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'),
|
||||
('Lake Hylia West Pier', 'Lake Hylia Area'),
|
||||
('Lake Hylia East Pier', 'Lake Hylia Northeast Bank'),
|
||||
('Lake Hylia Water D Approach', 'Lake Hylia Water D'),
|
||||
('Lake Hylia Water D Leave', 'Lake Hylia Water'), #flippers
|
||||
('Desert Pass Ledge Drop', 'Desert Pass Area'),
|
||||
('Desert Pass Rocks (North)', 'Desert Pass Southeast'), #glove
|
||||
('Desert Pass Rocks (South)', 'Desert Pass Area'), #glove
|
||||
('Middle Aged Man', 'Middle Aged Man'),
|
||||
('Octoballoon Water Drop', 'Octoballoon Water'), #flippers
|
||||
('Octoballoon Waterfall Water Drop', 'Octoballoon Water'), #flippers
|
||||
('Octoballoon Pier', 'Octoballoon Area'),
|
||||
# Intra-tile OW Connections
|
||||
('Lost Woods Bush (West)', 'Lost Woods East Area'), #pearl
|
||||
('Lost Woods Bush (East)', 'Lost Woods West Area'), #pearl
|
||||
('West Death Mountain Drop', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Ledge Drop', 'West Death Mountain (Top)'),
|
||||
('Old Man Drop Off', 'Old Man Drop Off'),
|
||||
('DM Hammer Bridge (West)', 'East Death Mountain (Top East)'), #hammer
|
||||
('DM Hammer Bridge (East)', 'East Death Mountain (Top West)'), #hammer
|
||||
('EDM To Spiral Ledge Drop', 'Spiral Cave Ledge'),
|
||||
('EDM To Fairy Ledge Drop', 'Fairy Ascension Ledge'),
|
||||
('EDM Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Spiral Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Plateau Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Fairy Ascension Rocks (Inner)', 'East Death Mountain (Bottom)'), #mitts
|
||||
('Fairy Ascension Rocks (Outer)', 'Fairy Ascension Plateau'), #mitts
|
||||
('DM Broken Bridge (West)', 'East Death Mountain (Bottom)'), #hookshot
|
||||
('DM Broken Bridge (East)', 'East Death Mountain (Bottom Left)'), #hookshot
|
||||
('TR Pegs Ledge Entry', 'Death Mountain TR Pegs Ledge'), #mitts
|
||||
('TR Pegs Ledge Leave', 'Death Mountain TR Pegs Area'), #mitts
|
||||
('Mountain Pass Rock (Outer)', 'Mountain Pass Entry'), #glove
|
||||
('Mountain Pass Rock (Inner)', 'Mountain Pass Area'), #glove
|
||||
('Mountain Pass Entry Ledge Drop', 'Mountain Pass Area'),
|
||||
('Mountain Pass Ledge Drop', 'Mountain Pass Area'),
|
||||
('Zora Waterfall Landing', 'Zora Waterfall Area'),
|
||||
('Zora Waterfall Water Drop', 'Zora Waterfall Water'), #flippers
|
||||
('Zora Waterfall Water Entry', 'Zora Waterfall Water'), #flippers
|
||||
('Zora Waterfall Approach', 'Zora Waterfall Entryway'), #flippers
|
||||
('Lost Woods Pass Hammer (North)', 'Lost Woods Pass Portal Area'), #hammer
|
||||
('Lost Woods Pass Hammer (South)', 'Lost Woods Pass East Top Area'), #hammer
|
||||
('Lost Woods Pass Rock (North)', 'Lost Woods Pass East Bottom Area'), #mitts
|
||||
('Lost Woods Pass Rock (South)', 'Lost Woods Pass Portal Area'), #mitts
|
||||
('Bonk Rock Ledge Drop', 'Sanctuary Area'),
|
||||
('Graveyard Ledge Drop', 'Graveyard Area'),
|
||||
('Kings Grave Rocks (Outer)', 'Kings Grave Area'), #mitts
|
||||
('Kings Grave Rocks (Inner)', 'Graveyard Area'), #mitts
|
||||
('River Bend Water Drop', 'River Bend Water'), #flippers
|
||||
('River Bend East Water Drop', 'River Bend Water'), #flippers
|
||||
('River Bend West Pier', 'River Bend Area'),
|
||||
('River Bend East Pier', 'River Bend East Bank'),
|
||||
('Potion Shop Water Drop', 'Potion Shop Water'), #flippers
|
||||
('Potion Shop Northeast Water Drop', 'Potion Shop Water'), #flippers
|
||||
('Potion Shop Rock (South)', 'Potion Shop Northeast'), #glove
|
||||
('Potion Shop Rock (North)', 'Potion Shop Area'), #glove
|
||||
('Zora Approach Water Drop', 'Zora Approach Water'), #flippers
|
||||
('Zora Approach Rocks (West)', 'Zora Approach Ledge'), #mitts/boots
|
||||
('Zora Approach Rocks (East)', 'Zora Approach Area'), #mitts/boots
|
||||
('Zora Approach Bottom Ledge Drop', 'Zora Approach Ledge'),
|
||||
('Zora Approach Ledge Drop', 'Zora Approach Area'),
|
||||
('Kakariko Southwest Bush (North)', 'Kakariko Southwest'), #pearl
|
||||
('Kakariko Southwest Bush (South)', 'Kakariko Village'), #pearl
|
||||
('Kakariko Yard Bush (South)', 'Kakariko Bush Yard'), #pearl
|
||||
('Kakariko Yard Bush (North)', 'Kakariko Village'), #pearl
|
||||
('Hyrule Castle Southwest Bush (North)', 'Hyrule Castle Southwest'), #pearl
|
||||
('Hyrule Castle Southwest Bush (South)', 'Hyrule Castle Area'), #pearl
|
||||
('Hyrule Castle Courtyard Bush (North)', 'Hyrule Castle Courtyard'), #pearl
|
||||
('Hyrule Castle Courtyard Bush (South)', 'Hyrule Castle Courtyard Northeast'), #pearl
|
||||
('Hyrule Castle Main Gate (South)', 'Hyrule Castle Courtyard'), #aga+mirror
|
||||
('Hyrule Castle Main Gate (North)', 'Hyrule Castle Area'), #aga+mirror
|
||||
('Hyrule Castle Ledge Drop', 'Hyrule Castle Area'),
|
||||
('Hyrule Castle Ledge Courtyard Drop', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle East Rock (Inner)', 'Hyrule Castle East Entry'), #glove
|
||||
('Hyrule Castle East Rock (Outer)', 'Hyrule Castle Area'), #glove
|
||||
('Wooden Bridge Bush (South)', 'Wooden Bridge Northeast'), #pearl
|
||||
('Wooden Bridge Bush (North)', 'Wooden Bridge Area'), #pearl
|
||||
('Wooden Bridge Water Drop', 'Wooden Bridge Water'), #flippers
|
||||
('Wooden Bridge Northeast Water Drop', 'Wooden Bridge Water'), #flippers
|
||||
('Blacksmith Ledge Peg (West)', 'Blacksmith Ledge'), #hammer
|
||||
('Blacksmith Ledge Peg (East)', 'Blacksmith Area'), #hammer
|
||||
('Maze Race Game', 'Maze Race Prize'), #pearl
|
||||
('Maze Race Ledge Drop', 'Maze Race Area'),
|
||||
('Stone Bridge (Southbound)', 'Stone Bridge South Area'),
|
||||
('Stone Bridge (Northbound)', 'Stone Bridge North Area'),
|
||||
('Desert Statue Move', 'Desert Stairs'), #book
|
||||
('Desert Ledge Drop', 'Desert Area'),
|
||||
('Desert Ledge Rocks (Outer)', 'Desert Ledge Keep'), #glove
|
||||
('Desert Ledge Rocks (Inner)', 'Desert Ledge'), #glove
|
||||
('Checkerboard Ledge Drop', 'Desert Area'),
|
||||
('Desert Mouth Drop', 'Desert Area'),
|
||||
('Desert Teleporter Drop', 'Desert Area'),
|
||||
('Bombos Tablet Drop', 'Desert Area'),
|
||||
('Flute Boy Bush (North)', 'Flute Boy Approach Area'), #pearl
|
||||
('Flute Boy Bush (South)', 'Flute Boy Bush Entry'), #pearl
|
||||
('C Whirlpool Water Entry', 'C Whirlpool Water'), #flippers
|
||||
('C Whirlpool Landing', 'C Whirlpool Area'),
|
||||
('C Whirlpool Rock (Bottom)', 'C Whirlpool Outer Area'), #glove
|
||||
('C Whirlpool Rock (Top)', 'C Whirlpool Area'), #glove
|
||||
('C Whirlpool Pegs (Outer)', 'C Whirlpool Portal Area'), #hammer
|
||||
('C Whirlpool Pegs (Inner)', 'C Whirlpool Area'), #hammer
|
||||
('Statues Water Entry', 'Statues Water'), #flippers
|
||||
('Statues Landing', 'Statues Area'),
|
||||
('Lake Hylia Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia South Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Northeast Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Central Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Island Water Drop', 'Lake Hylia Water'), #flippers
|
||||
('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'),
|
||||
('Lake Hylia West Pier', 'Lake Hylia Northwest Bank'),
|
||||
('Lake Hylia East Pier', 'Lake Hylia Northeast Bank'),
|
||||
('Lake Hylia Water D Approach', 'Lake Hylia Water D'),
|
||||
('Lake Hylia Water D Leave', 'Lake Hylia Water'), #flippers
|
||||
('Ice Cave Water Drop', 'Ice Cave Water'), #flippers
|
||||
('Ice Cave Pier', 'Ice Cave Area'),
|
||||
('Desert Pass Ledge Drop', 'Desert Pass Area'),
|
||||
('Desert Pass Rocks (North)', 'Desert Pass Southeast'), #glove
|
||||
('Desert Pass Rocks (South)', 'Desert Pass Area'), #glove
|
||||
('Middle Aged Man', 'Middle Aged Man'),
|
||||
('Octoballoon Water Drop', 'Octoballoon Water'), #flippers
|
||||
('Octoballoon Waterfall Water Drop', 'Octoballoon Water'), #flippers
|
||||
('Octoballoon Pier', 'Octoballoon Area'),
|
||||
|
||||
('Skull Woods Bush Rock (West)', 'Skull Woods Forest'), #glove
|
||||
('Skull Woods Bush Rock (East)', 'Skull Woods Portal Entry'), #glove
|
||||
('Skull Woods Forgotten Bush (West)', 'Skull Woods Forgotten Path (Northeast)'), #pearl
|
||||
('Skull Woods Forgotten Bush (East)', 'Skull Woods Forgotten Path (Southwest)'), #pearl
|
||||
('Dark Death Mountain Drop (West)', 'West Dark Death Mountain (Bottom)'),
|
||||
('GT Entry Approach', 'GT Approach'),
|
||||
('GT Entry Leave', 'West Dark Death Mountain (Top)'),
|
||||
('Floating Island Drop', 'East Dark Death Mountain (Top)'),
|
||||
('Dark Death Mountain Drop (East)', 'East Dark Death Mountain (Bottom)'),
|
||||
('East Dark Death Mountain Bushes', 'East Dark Death Mountain (Bushes)'),
|
||||
('Turtle Rock Ledge Drop', 'Turtle Rock Area'),
|
||||
('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'), #glove
|
||||
('Bumper Cave Ledge Drop', 'Bumper Cave Area'),
|
||||
('Bumper Cave Entrance Drop', 'Bumper Cave Area'),
|
||||
('Skull Woods Pass Bush Row (West)', 'Skull Woods Pass East Top Area'), #pearl
|
||||
('Skull Woods Pass Bush Row (East)', 'Skull Woods Pass West Area'), #pearl
|
||||
('Skull Woods Pass Bush (North)', 'Skull Woods Pass Portal Area'), #pearl
|
||||
('Skull Woods Pass Bush (South)', 'Skull Woods Pass East Top Area'), #pearl
|
||||
('Skull Woods Pass Rock (North)', 'Skull Woods Pass East Bottom Area'), #mitts
|
||||
('Skull Woods Pass Rock (South)', 'Skull Woods Pass Portal Area'), #mitts
|
||||
('Dark Graveyard Bush (South)', 'Dark Graveyard North'), #pearl
|
||||
('Dark Graveyard Bush (North)', 'Dark Graveyard Area'), #pearl
|
||||
('Qirn Jump Water Drop', 'Qirn Jump Water'), #flippers
|
||||
('Qirn Jump East Water Drop', 'Qirn Jump Water'), #flippers
|
||||
('Qirn Jump Pier', 'Qirn Jump East Bank'),
|
||||
('Dark Witch Water Drop', 'Dark Witch Water'), #flippers
|
||||
('Dark Witch Northeast Water Drop', 'Dark Witch Water'), #flippers
|
||||
('Dark Witch Rock (North)', 'Dark Witch Area'), #glove
|
||||
('Dark Witch Rock (South)', 'Dark Witch Northeast'), #glove
|
||||
('Catfish Approach Rocks (West)', 'Catfish Approach Ledge'), #mitts/boots
|
||||
('Catfish Approach Rocks (East)', 'Catfish Approach Area'), #mitts/boots
|
||||
('Catfish Approach Bottom Ledge Drop', 'Catfish Approach Ledge'),
|
||||
('Catfish Approach Ledge Drop', 'Catfish Approach Area'),
|
||||
('Catfish Approach Water Drop', 'Catfish Approach Water'), #flippers
|
||||
('Village of Outcasts Pegs', 'Dark Grassy Lawn'), #hammer
|
||||
('Grassy Lawn Pegs', 'Village of Outcasts Area'), #hammer
|
||||
('Shield Shop Fence (Outer) Ledge Drop', 'Shield Shop Fence'),
|
||||
('Shield Shop Fence (Inner) Ledge Drop', 'Shield Shop Area'),
|
||||
('Pyramid Exit Ledge Drop', 'Pyramid Area'),
|
||||
('Pyramid Crack', 'Pyramid Crack'),
|
||||
('Broken Bridge Hammer Rock (South)', 'Broken Bridge Northeast'), #hammer/glove
|
||||
('Broken Bridge Hammer Rock (North)', 'Broken Bridge Area'), #hammer/glove
|
||||
('Broken Bridge Hookshot Gap', 'Broken Bridge West'), #hookshot
|
||||
('Broken Bridge Water Drop', 'Broken Bridge Water'), #flippers
|
||||
('Broken Bridge Northeast Water Drop', 'Broken Bridge Water'), #flippers
|
||||
('Broken Bridge West Water Drop', 'Broken Bridge Water'), #flippers
|
||||
('Peg Area Rocks (West)', 'Hammer Pegs Area'), #mitts
|
||||
('Peg Area Rocks (East)', 'Hammer Pegs Entry'), #mitts
|
||||
('Dig Game To Ledge Drop', 'Dig Game Ledge'), #mitts
|
||||
('Dig Game Ledge Drop', 'Dig Game Area'),
|
||||
('Frog Ledge Drop', 'Archery Game Area'),
|
||||
('Frog Rock (Inner)', 'Frog Area'), #mitts
|
||||
('Frog Rock (Outer)', 'Frog Prison'), #mitts
|
||||
('Archery Game Rock (North)', 'Archery Game Area'), #mitts
|
||||
('Archery Game Rock (South)', 'Frog Area'), #mitts
|
||||
('Hammer Bridge Pegs (North)', 'Hammer Bridge South Area'), #hammer
|
||||
('Hammer Bridge Pegs (South)', 'Hammer Bridge North Area'), #hammer
|
||||
('Hammer Bridge Water Drop', 'Hammer Bridge Water'), #flippers
|
||||
('Hammer Bridge Pier', 'Hammer Bridge North Area'),
|
||||
('Misery Mire Teleporter Ledge Drop', 'Misery Mire Area'),
|
||||
('Stumpy Approach Bush (North)', 'Stumpy Approach Area'), #pearl
|
||||
('Stumpy Approach Bush (South)', 'Stumpy Approach Bush Entry'), #pearl
|
||||
('Dark C Whirlpool Water Entry', 'Dark C Whirlpool Water'), #flippers
|
||||
('Dark C Whirlpool Landing', 'Dark C Whirlpool Area'),
|
||||
('Dark C Whirlpool Rock (Bottom)', 'Dark C Whirlpool Outer Area'), #glove
|
||||
('Dark C Whirlpool Rock (Top)', 'Dark C Whirlpool Area'), #glove
|
||||
('Dark C Whirlpool Pegs (Right)', 'Dark C Whirlpool Portal Area'), #hammer
|
||||
('Dark C Whirlpool Pegs (Left)', 'Dark C Whirlpool Area'), #hammer
|
||||
('Hype Cave Water Entry', 'Hype Cave Water'), #flippers
|
||||
('Hype Cave Landing', 'Hype Cave Area'),
|
||||
('Ice Lake Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Northeast Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Southwest Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Southeast Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Moat Water Entry', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Northeast Pier', 'Ice Lake Northeast Bank'),
|
||||
('Bomber Corner Water Drop', 'Bomber Corner Water'), #flippers
|
||||
('Bomber Corner Waterfall Water Drop', 'Bomber Corner Water'), #flippers
|
||||
('Bomber Corner Pier', 'Bomber Corner Area'),
|
||||
('Skull Woods Rock (West)', 'Skull Woods Forest'), #glove
|
||||
('Skull Woods Rock (East)', 'Skull Woods Portal Entry'), #glove
|
||||
('Skull Woods Forgotten Bush (West)', 'Skull Woods Forgotten Path (Northeast)'), #pearl
|
||||
('Skull Woods Forgotten Bush (East)', 'Skull Woods Forgotten Path (Southwest)'), #pearl
|
||||
('West Dark Death Mountain Drop', 'West Dark Death Mountain (Bottom)'),
|
||||
('GT Approach', 'GT Stairs'),
|
||||
('GT Leave', 'West Dark Death Mountain (Top)'),
|
||||
('Floating Island Drop', 'East Dark Death Mountain (Top)'),
|
||||
('East Dark Death Mountain Drop', 'East Dark Death Mountain (Bottom)'),
|
||||
('East Dark Death Mountain Bushes', 'East Dark Death Mountain (Bushes)'),
|
||||
('Turtle Rock Ledge Drop', 'Turtle Rock Area'),
|
||||
('Bumper Cave Rock (Outer)', 'Bumper Cave Entry'), #glove
|
||||
('Bumper Cave Rock (Inner)', 'Bumper Cave Area'), #glove
|
||||
('Bumper Cave Ledge Drop', 'Bumper Cave Area'),
|
||||
('Bumper Cave Entry Drop', 'Bumper Cave Area'),
|
||||
('Skull Woods Pass Bush Row (West)', 'Skull Woods Pass East Top Area'), #pearl
|
||||
('Skull Woods Pass Bush Row (East)', 'Skull Woods Pass West Area'), #pearl
|
||||
('Skull Woods Pass Bush (North)', 'Skull Woods Pass Portal Area'), #pearl
|
||||
('Skull Woods Pass Bush (South)', 'Skull Woods Pass East Top Area'), #pearl
|
||||
('Skull Woods Pass Rock (North)', 'Skull Woods Pass East Bottom Area'), #mitts
|
||||
('Skull Woods Pass Rock (South)', 'Skull Woods Pass Portal Area'), #mitts
|
||||
('Dark Graveyard Bush (South)', 'Dark Graveyard North'), #pearl
|
||||
('Dark Graveyard Bush (North)', 'Dark Graveyard Area'), #pearl
|
||||
('Qirn Jump Water Drop', 'Qirn Jump Water'), #flippers
|
||||
('Qirn Jump East Water Drop', 'Qirn Jump Water'), #flippers
|
||||
('Qirn Jump Pier', 'Qirn Jump East Bank'),
|
||||
('Dark Witch Water Drop', 'Dark Witch Water'), #flippers
|
||||
('Dark Witch Northeast Water Drop', 'Dark Witch Water'), #flippers
|
||||
('Dark Witch Rock (North)', 'Dark Witch Area'), #glove
|
||||
('Dark Witch Rock (South)', 'Dark Witch Northeast'), #glove
|
||||
('Catfish Approach Water Drop', 'Catfish Approach Water'), #flippers
|
||||
('Catfish Approach Rocks (West)', 'Catfish Approach Ledge'), #mitts/boots
|
||||
('Catfish Approach Rocks (East)', 'Catfish Approach Area'), #mitts/boots
|
||||
('Catfish Approach Bottom Ledge Drop', 'Catfish Approach Ledge'),
|
||||
('Catfish Approach Ledge Drop', 'Catfish Approach Area'),
|
||||
('Bush Yard Pegs (Outer)', 'Village of Outcasts Bush Yard'), #hammer
|
||||
('Bush Yard Pegs (Inner)', 'Village of Outcasts'), #hammer
|
||||
('Shield Shop Fence Drop (Outer)', 'Shield Shop Fence'),
|
||||
('Shield Shop Fence Drop (Inner)', 'Shield Shop Area'),
|
||||
('Pyramid Exit Ledge Drop', 'Pyramid Area'),
|
||||
('Pyramid Crack', 'Pyramid Crack'),
|
||||
('Broken Bridge Hammer Rock (South)', 'Broken Bridge Northeast'), #hammer/glove
|
||||
('Broken Bridge Hammer Rock (North)', 'Broken Bridge Area'), #hammer/glove
|
||||
('Broken Bridge Hookshot Gap', 'Broken Bridge West'), #hookshot
|
||||
('Broken Bridge Water Drop', 'Broken Bridge Water'), #flippers
|
||||
('Broken Bridge Northeast Water Drop', 'Broken Bridge Water'), #flippers
|
||||
('Broken Bridge West Water Drop', 'Broken Bridge Water'), #flippers
|
||||
('Peg Area Rocks (West)', 'Hammer Pegs Area'), #mitts
|
||||
('Peg Area Rocks (East)', 'Hammer Pegs Entry'), #mitts
|
||||
('Dig Game To Ledge Drop', 'Dig Game Ledge'), #mitts
|
||||
('Dig Game Ledge Drop', 'Dig Game Area'),
|
||||
('Frog Ledge Drop', 'Archery Game Area'),
|
||||
('Frog Rock (Inner)', 'Frog Area'), #mitts
|
||||
('Frog Rock (Outer)', 'Frog Prison'), #mitts
|
||||
('Archery Game Rock (North)', 'Archery Game Area'), #mitts
|
||||
('Archery Game Rock (South)', 'Frog Area'), #mitts
|
||||
('Hammer Bridge Pegs (North)', 'Hammer Bridge South Area'), #hammer
|
||||
('Hammer Bridge Pegs (South)', 'Hammer Bridge North Area'), #hammer
|
||||
('Hammer Bridge Water Drop', 'Hammer Bridge Water'), #flippers
|
||||
('Hammer Bridge Pier', 'Hammer Bridge North Area'),
|
||||
('Mire Teleporter Ledge Drop', 'Mire Area'),
|
||||
('Stumpy Approach Bush (North)', 'Stumpy Approach Area'), #pearl
|
||||
('Stumpy Approach Bush (South)', 'Stumpy Approach Bush Entry'), #pearl
|
||||
('Dark C Whirlpool Water Entry', 'Dark C Whirlpool Water'), #flippers
|
||||
('Dark C Whirlpool Landing', 'Dark C Whirlpool Area'),
|
||||
('Dark C Whirlpool Rock (Bottom)', 'Dark C Whirlpool Outer Area'), #glove
|
||||
('Dark C Whirlpool Rock (Top)', 'Dark C Whirlpool Area'), #glove
|
||||
('Dark C Whirlpool Pegs (Outer)', 'Dark C Whirlpool Portal Area'), #hammer
|
||||
('Dark C Whirlpool Pegs (Inner)', 'Dark C Whirlpool Area'), #hammer
|
||||
('Hype Cave Water Entry', 'Hype Cave Water'), #flippers
|
||||
('Hype Cave Landing', 'Hype Cave Area'),
|
||||
('Ice Lake Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Northeast Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Southwest Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Southeast Water Drop', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Iceberg Water Entry', 'Ice Lake Water'), #flippers
|
||||
('Ice Lake Northeast Pier', 'Ice Lake Northeast Bank'),
|
||||
('Shopping Mall Water Drop', 'Shopping Mall Water'), #flippers
|
||||
('Shopping Mall Pier', 'Shopping Mall Area'),
|
||||
('Bomber Corner Water Drop', 'Bomber Corner Water'), #flippers
|
||||
('Bomber Corner Waterfall Water Drop', 'Bomber Corner Water'), #flippers
|
||||
('Bomber Corner Pier', 'Bomber Corner Area'),
|
||||
|
||||
# OWG In-Bounds Connections
|
||||
('Ice Lake Northeast Pier Hop', 'Ice Lake Northeast Bank'),
|
||||
('Ice Lake Moat Bomb Jump', 'Ice Lake Moat')
|
||||
]
|
||||
# OWG In-Bounds Connections
|
||||
('Ice Lake Northeast Pier Hop', 'Ice Lake Northeast Bank'),
|
||||
('Ice Lake Iceberg Bomb Jump', 'Ice Lake Iceberg')
|
||||
]
|
||||
|
||||
default_whirlpool_connections = [
|
||||
((0x33, 'C Whirlpool', 'C Whirlpool Water'), (0x15, 'River Bend Whirlpool', 'River Bend Water')),
|
||||
@@ -1479,17 +1484,18 @@ ow_connections = {
|
||||
], [
|
||||
('Floating Island Bridge (West)', 'East Death Mountain (Top East)'),
|
||||
('Floating Island Bridge (East)', 'Death Mountain Floating Island'),
|
||||
('East Death Mountain Mimic Ledge Drop', 'Mimic Cave Ledge'),
|
||||
('EDM To Mimic Ledge Drop', 'Mimic Cave Ledge'),
|
||||
('Mimic Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Spiral Mimic Bridge (West)', 'Spiral Mimic Ledge Extend'),
|
||||
('Spiral Mimic Bridge (East)', 'Spiral Mimic Ledge Extend'),
|
||||
('Spiral Ledge Approach', 'Spiral Cave Ledge'),
|
||||
('Mimic Ledge Approach', 'Mimic Cave Ledge'),
|
||||
('Spiral Mimic Ledge Drop', 'Fairy Ascension Ledge'),
|
||||
('Dark Death Mountain Teleporter (East)', 'East Death Mountain (Bottom)')
|
||||
('East Dark Death Mountain Teleporter', 'East Death Mountain (Bottom)')
|
||||
]),
|
||||
0x07: ([
|
||||
('TR Pegs Teleporter', 'Turtle Rock Ledge')
|
||||
('TR Pegs Teleporter', 'Turtle Rock Ledge'),
|
||||
('TR Pegs Ledge Drop', 'Death Mountain TR Pegs Area')
|
||||
], [
|
||||
('Turtle Rock Tail Ledge Drop', 'Turtle Rock Ledge'),
|
||||
('Turtle Rock Teleporter', 'Death Mountain TR Pegs Ledge')
|
||||
@@ -1509,21 +1515,21 @@ ow_connections = {
|
||||
('Castle Gate Teleporter', 'Pyramid Area'),
|
||||
('Castle Gate Teleporter (Inner)', 'Pyramid Area')
|
||||
], [
|
||||
('Post Aga Inverted Teleporter', 'Hyrule Castle Area')
|
||||
('Post Aga Teleporter', 'Hyrule Castle Area')
|
||||
]),
|
||||
0x1e: ([
|
||||
('Eastern Palace Ledge Drop', 'Eastern Palace Area'), # OWG
|
||||
('Palace of Darkness Ledge Drop', 'Palace of Darkness Area') # OWG
|
||||
('Eastern Palace Cliff Ledge Drop', 'Eastern Palace Area'), # OWG
|
||||
('Palace of Darkness Cliff Ledge Drop', 'Palace of Darkness Area') # OWG
|
||||
], [
|
||||
('Eastern Palace Ledge Drop', 'Palace of Darkness Area'), # OWG
|
||||
('Palace of Darkness Ledge Drop', 'Eastern Palace Area') # OWG
|
||||
('Eastern Palace Cliff Ledge Drop', 'Palace of Darkness Area'), # OWG
|
||||
('Palace of Darkness Cliff Ledge Drop', 'Eastern Palace Area') # OWG
|
||||
]),
|
||||
0x25: ([
|
||||
('Sand Dunes Ledge Drop', 'Sand Dunes Area'), # OWG
|
||||
('Dark Dunes Ledge Drop', 'Dark Dunes Area') # OWG
|
||||
('Sand Dunes Cliff Ledge Drop', 'Sand Dunes Area'), # OWG
|
||||
('Dark Dunes Cliff Ledge Drop', 'Dark Dunes Area') # OWG
|
||||
], [
|
||||
('Sand Dunes Ledge Drop', 'Dark Dunes Area'), # OWG
|
||||
('Dark Dunes Ledge Drop', 'Sand Dunes Area') # OWG
|
||||
('Sand Dunes Cliff Ledge Drop', 'Dark Dunes Area'), # OWG
|
||||
('Dark Dunes Cliff Ledge Drop', 'Sand Dunes Area') # OWG
|
||||
]),
|
||||
0x29: ([
|
||||
('Suburb Cliff Ledge Drop', 'Kakariko Suburb Area'), # OWG
|
||||
@@ -1547,8 +1553,8 @@ ow_connections = {
|
||||
('Bomb Shop Cliff Ledge Drop', 'Links House Area') # OWG
|
||||
]),
|
||||
0x2d: ([
|
||||
('Stone Bridge East Ledge Drop', 'Stone Bridge North Area'), # OWG
|
||||
('Hammer Bridge North Ledge Drop', 'Hammer Bridge North Area'), # OWG
|
||||
('Stone Bridge East Cliff Ledge Drop', 'Stone Bridge North Area'), # OWG
|
||||
('Hammer Bridge North Cliff Ledge Drop', 'Hammer Bridge North Area'), # OWG
|
||||
('Stone Bridge Cliff Ledge Drop', 'Stone Bridge South Area'), # OWG
|
||||
('Hammer Bridge South Cliff Ledge Drop', 'Hammer Bridge South Area'), # OWG
|
||||
('Stone Bridge EC Cliff Water Drop', 'Stone Bridge Water'), # fake flipper
|
||||
@@ -1556,8 +1562,8 @@ ow_connections = {
|
||||
('Tree Line WC Cliff Water Drop', 'Tree Line Water'), # fake flipper
|
||||
('Dark Tree Line WC Cliff Water Drop', 'Dark Tree Line Water') # fake flipper
|
||||
], [
|
||||
('Stone Bridge East Ledge Drop', 'Hammer Bridge North Area'), # OWG
|
||||
('Hammer Bridge North Ledge Drop', 'Stone Bridge North Area'), # OWG
|
||||
('Stone Bridge East Cliff Ledge Drop', 'Hammer Bridge North Area'), # OWG
|
||||
('Hammer Bridge North Cliff Ledge Drop', 'Stone Bridge North Area'), # OWG
|
||||
('Stone Bridge Cliff Ledge Drop', 'Hammer Bridge South Area'), # OWG
|
||||
('Hammer Bridge South Cliff Ledge Drop', 'Stone Bridge South Area'), # OWG
|
||||
('Stone Bridge EC Cliff Water Drop', 'Hammer Bridge Water'), # fake flipper
|
||||
@@ -1566,29 +1572,27 @@ ow_connections = {
|
||||
('Dark Tree Line WC Cliff Water Drop', 'Tree Line Water') # fake flipper
|
||||
]),
|
||||
0x2e: ([
|
||||
('Tree Line Ledge Drop', 'Tree Line Area'), # OWG
|
||||
('Dark Tree Line Ledge Drop', 'Dark Tree Line Area') # OWG
|
||||
('Tree Line Cliff Ledge Drop', 'Tree Line Area'), # OWG
|
||||
('Dark Tree Line Cliff Ledge Drop', 'Dark Tree Line Area') # OWG
|
||||
], [
|
||||
('Tree Line Ledge Drop', 'Dark Tree Line Area'), # OWG
|
||||
('Dark Tree Line Ledge Drop', 'Tree Line Area') # OWG
|
||||
('Tree Line Cliff Ledge Drop', 'Dark Tree Line Area'), # OWG
|
||||
('Dark Tree Line Cliff Ledge Drop', 'Tree Line Area') # OWG
|
||||
]),
|
||||
0x2f: ([
|
||||
('East Hyrule Teleporter', 'Palace of Darkness Nook Area')
|
||||
('East Hyrule Teleporter', 'Darkness Nook Area')
|
||||
], [
|
||||
('East Dark World Teleporter', 'Eastern Nook Area')
|
||||
]),
|
||||
0x30: ([
|
||||
('Mirror To Bombos Tablet Ledge', 'Bombos Tablet Ledge'), # OWG
|
||||
('Desert Teleporter', 'Misery Mire Teleporter Ledge'),
|
||||
('Desert Boss Cliff Ledge Drop', 'Desert Palace Entrance (North) Spot'), # OWG
|
||||
('Mire Cliff Ledge Drop', 'Misery Mire Area'), # OWG
|
||||
('Desert Teleporter', 'Mire Teleporter Ledge'),
|
||||
('Mire Cliff Ledge Drop', 'Mire Area'), # OWG
|
||||
('Checkerboard Cliff Ledge Drop', 'Desert Checkerboard Ledge') # OWG
|
||||
], [
|
||||
('Checkerboard Ledge Approach', 'Desert Checkerboard Ledge'),
|
||||
('Checkerboard Ledge Leave', 'Desert Area'),
|
||||
('Misery Mire Teleporter', 'Desert Palace Teleporter Ledge'),
|
||||
('Desert Boss Cliff Ledge Drop', 'Misery Mire Area'), # OWG
|
||||
('Mire Cliff Ledge Drop', 'Desert Palace Entrance (North) Spot'), # OWG
|
||||
('Mire Teleporter', 'Desert Teleporter Ledge'),
|
||||
('Mire Cliff Ledge Drop', 'Desert Ledge Keep'), # OWG
|
||||
('Dark Checkerboard Cliff Ledge Drop', 'Desert Checkerboard Ledge') # OWG
|
||||
]),
|
||||
0x32: ([
|
||||
@@ -1596,8 +1600,8 @@ ow_connections = {
|
||||
('Cave 45 Cliff Ledge Drop', 'Cave 45 Ledge'), # OWG
|
||||
('Stumpy Approach Cliff Ledge Drop', 'Stumpy Approach Area') # OWG
|
||||
], [
|
||||
('Cave 45 Inverted Leave', 'Flute Boy Approach Area'),
|
||||
('Cave 45 Inverted Approach', 'Cave 45 Ledge'),
|
||||
('Cave 45 Leave', 'Flute Boy Approach Area'),
|
||||
('Cave 45 Approach', 'Cave 45 Ledge'),
|
||||
('Cave 45 Cliff Ledge Drop', 'Stumpy Approach Area'), # OWG
|
||||
('Stumpy Approach Cliff Ledge Drop', 'Cave 45 Ledge') # OWG
|
||||
]),
|
||||
@@ -1631,17 +1635,16 @@ ow_connections = {
|
||||
]),
|
||||
0x35: ([
|
||||
('Lake Hylia Teleporter', 'Ice Palace Area'),
|
||||
#('Ice Palace Ledge Drop', 'Ice Lake Moat'),
|
||||
('Lake Hylia Area Cliff Ledge Drop', 'Lake Hylia Area'), # OWG
|
||||
('Ice Lake Area Cliff Ledge Drop', 'Ice Lake Area'), # OWG
|
||||
('Lake Hylia Northwest Cliff Ledge Drop', 'Lake Hylia Northwest Bank'), # OWG
|
||||
('Ice Lake Northwest Cliff Ledge Drop', 'Ice Lake Northwest Bank'), # OWG
|
||||
('Lake Hylia Island FAWT Ledge Drop', 'Lake Hylia Island'), # OWG
|
||||
('Ice Palace Island FAWT Ledge Drop', 'Ice Lake Moat') # OWG
|
||||
('Ice Palace Island FAWT Ledge Drop', 'Ice Lake Iceberg') # OWG
|
||||
], [
|
||||
('Lake Hylia Island Pier', 'Lake Hylia Island'),
|
||||
('Ice Palace Teleporter', 'Lake Hylia Water D'),
|
||||
('Lake Hylia Area Cliff Ledge Drop', 'Ice Lake Area'), # OWG
|
||||
('Ice Lake Area Cliff Ledge Drop', 'Lake Hylia Area'), # OWG
|
||||
('Lake Hylia Island FAWT Ledge Drop', 'Ice Lake Moat'), # OWG
|
||||
('Ice Lake Teleporter', 'Lake Hylia Water D'),
|
||||
('Lake Hylia Northwest Cliff Ledge Drop', 'Ice Lake Northwest Bank'), # OWG
|
||||
('Ice Lake Northwest Cliff Ledge Drop', 'Lake Hylia Northwest Bank'), # OWG
|
||||
('Lake Hylia Island FAWT Ledge Drop', 'Ice Lake Iceberg'), # OWG
|
||||
('Ice Palace Island FAWT Ledge Drop', 'Lake Hylia Island') # OWG
|
||||
]),
|
||||
0x3a: ([
|
||||
@@ -1681,11 +1684,11 @@ mirror_connections = {
|
||||
'East Dark Death Mountain (Bushes)': ['Fairy Ascension Plateau'],
|
||||
'East Dark Death Mountain (Bottom Left)': ['East Death Mountain (Bottom Left)'],
|
||||
|
||||
'Turtle Rock Area': ['Death Mountain TR Pegs'],
|
||||
'Turtle Rock Area': ['Death Mountain TR Pegs Area'],
|
||||
|
||||
'Bumper Cave Area': ['Mountain Entry Area'],
|
||||
'Bumper Cave Entrance': ['Mountain Entry Entrance'],
|
||||
'Bumper Cave Ledge': ['Mountain Entry Ledge'],
|
||||
'Bumper Cave Area': ['Mountain Pass Area'],
|
||||
'Bumper Cave Entry': ['Mountain Pass Entry'],
|
||||
'Bumper Cave Ledge': ['Mountain Pass Ledge'],
|
||||
|
||||
'Catfish Area': ['Zora Waterfall Area'],
|
||||
|
||||
@@ -1712,8 +1715,8 @@ mirror_connections = {
|
||||
'Catfish Approach Area': ['Zora Approach Area'],
|
||||
'Catfish Approach Ledge': ['Zora Approach Ledge'],
|
||||
|
||||
'Village of Outcasts Area': ['Kakariko Area'],
|
||||
'Dark Grassy Lawn': ['Kakariko Area'],
|
||||
'Village of Outcasts': ['Kakariko Village'],
|
||||
'Village of Outcasts Bush Yard': ['Kakariko Village'],
|
||||
|
||||
'Shield Shop Area': ['Forgotten Forest Area'],
|
||||
'Shield Shop Fence': ['Forgotten Forest Area'],
|
||||
@@ -1728,7 +1731,7 @@ mirror_connections = {
|
||||
|
||||
'Palace of Darkness Area': ['Eastern Palace Area'],
|
||||
|
||||
'Hammer Pegs Area': ['Blacksmith Area', 'Bat Cave Ledge'],
|
||||
'Hammer Pegs Area': ['Blacksmith Area', 'Blacksmith Ledge'],
|
||||
'Hammer Pegs Entry': ['Blacksmith Area'],
|
||||
|
||||
'Dark Dunes Area': ['Sand Dunes Area'],
|
||||
@@ -1752,9 +1755,9 @@ mirror_connections = {
|
||||
|
||||
'Dark Tree Line Area': ['Tree Line Area'],
|
||||
|
||||
'Palace of Darkness Nook Area': ['Eastern Nook Area'],
|
||||
'Darkness Nook Area': ['Eastern Nook Area'],
|
||||
|
||||
'Misery Mire Area': ['Desert Area', 'Desert Ledge', 'Desert Checkerboard Ledge', 'Desert Palace Stairs', 'Desert Palace Entrance (North) Spot'],
|
||||
'Mire Area': ['Desert Area', 'Desert Ledge', 'Desert Checkerboard Ledge', 'Desert Stairs', 'Desert Ledge Keep'],
|
||||
|
||||
'Stumpy Approach Area': ['Cave 45 Ledge'],
|
||||
'Stumpy Approach Bush Entry': ['Flute Boy Bush Entry'],
|
||||
@@ -1764,13 +1767,13 @@ mirror_connections = {
|
||||
|
||||
'Hype Cave Area': ['Statues Area'],
|
||||
|
||||
'Ice Lake Area': ['Lake Hylia Area'],
|
||||
'Ice Lake Northwest Bank': ['Lake Hylia Northwest Bank'],
|
||||
'Ice Lake Northeast Bank': ['Lake Hylia Northeast Bank'],
|
||||
'Ice Lake Ledge (West)': ['Lake Hylia South Shore'],
|
||||
'Ice Lake Ledge (East)': ['Lake Hylia South Shore'],
|
||||
'Ice Lake Southwest Ledge': ['Lake Hylia South Shore'],
|
||||
'Ice Lake Southeast Ledge': ['Lake Hylia South Shore'],
|
||||
'Ice Lake Water': ['Lake Hylia Island'],
|
||||
'Ice Palace Area': ['Lake Hylia Central Island'],
|
||||
'Ice Lake Moat': ['Lake Hylia Water', 'Lake Hylia Water D'], #needs flippers
|
||||
'Ice Lake Iceberg': ['Lake Hylia Water', 'Lake Hylia Water D'], #first one needs flippers
|
||||
|
||||
'Shopping Mall Area': ['Ice Cave Area'],
|
||||
|
||||
@@ -1803,12 +1806,12 @@ mirror_connections = {
|
||||
'East Death Mountain (Bottom)': ['East Dark Death Mountain (Bottom)'],
|
||||
'Death Mountain Floating Island': ['Dark Death Mountain Floating Island'],
|
||||
|
||||
'Death Mountain TR Pegs': ['Turtle Rock Area'],
|
||||
'Death Mountain TR Pegs Area': ['Turtle Rock Area'],
|
||||
'Death Mountain TR Pegs Ledge': ['Turtle Rock Ledge'],
|
||||
|
||||
'Mountain Entry Area': ['Bumper Cave Area'],
|
||||
'Mountain Entry Entrance': ['Bumper Cave Entrance'],
|
||||
'Mountain Entry Ledge': ['Bumper Cave Ledge'],
|
||||
'Mountain Pass Area': ['Bumper Cave Area'],
|
||||
'Mountain Pass Entry': ['Bumper Cave Entry'],
|
||||
'Mountain Pass Ledge': ['Bumper Cave Ledge'],
|
||||
|
||||
'Zora Waterfall Area': ['Catfish Area'],
|
||||
|
||||
@@ -1837,9 +1840,9 @@ mirror_connections = {
|
||||
'Zora Approach Area': ['Catfish Approach Area'],
|
||||
'Zora Approach Ledge': ['Catfish Approach Ledge'],
|
||||
|
||||
'Kakariko Area': ['Village of Outcasts Area'],
|
||||
'Kakariko Southwest': ['Village of Outcasts Area'],
|
||||
'Kakariko Grass Yard': ['Dark Grassy Lawn'],
|
||||
'Kakariko Village': ['Village of Outcasts'],
|
||||
'Kakariko Southwest': ['Village of Outcasts'],
|
||||
'Kakariko Bush Yard': ['Village of Outcasts Bush Yard'],
|
||||
|
||||
'Forgotten Forest Area': ['Shield Shop Area'],
|
||||
|
||||
@@ -1877,13 +1880,13 @@ mirror_connections = {
|
||||
|
||||
'Tree Line Area': ['Dark Tree Line Area'],
|
||||
|
||||
'Eastern Nook Area': ['Palace of Darkness Nook Area'],
|
||||
'Eastern Nook Area': ['Darkness Nook Area'],
|
||||
|
||||
'Desert Area': ['Misery Mire Area'],
|
||||
'Desert Ledge': ['Misery Mire Area'],
|
||||
'Desert Palace Entrance (North) Spot': ['Misery Mire Area'],
|
||||
'Desert Checkerboard Ledge': ['Misery Mire Area'],
|
||||
'Desert Palace Stairs': ['Misery Mire Area'],
|
||||
'Desert Area': ['Mire Area'],
|
||||
'Desert Ledge': ['Mire Area'],
|
||||
'Desert Ledge Keep': ['Mire Area'],
|
||||
'Desert Checkerboard Ledge': ['Mire Area'],
|
||||
'Desert Stairs': ['Mire Area'],
|
||||
|
||||
'Flute Boy Approach Area': ['Stumpy Approach Area'],
|
||||
'Cave 45 Ledge': ['Stumpy Approach Area'],
|
||||
@@ -1894,11 +1897,11 @@ mirror_connections = {
|
||||
|
||||
'Statues Area': ['Hype Cave Area'],
|
||||
|
||||
'Lake Hylia Area': ['Ice Lake Area'],
|
||||
'Lake Hylia South Shore': ['Ice Lake Ledge (West)', 'Ice Lake Ledge (East)'],
|
||||
'Lake Hylia Northwest Bank': ['Ice Lake Northwest Bank'],
|
||||
'Lake Hylia South Shore': ['Ice Lake Southwest Ledge', 'Ice Lake Southeast Ledge'],
|
||||
'Lake Hylia Northeast Bank': ['Ice Lake Northeast Bank'],
|
||||
'Lake Hylia Central Island': ['Ice Palace Area'],
|
||||
'Lake Hylia Water D': ['Ice Lake Moat'],
|
||||
'Lake Hylia Water D': ['Ice Lake Iceberg'],
|
||||
|
||||
'Ice Cave Area': ['Shopping Mall Area'],
|
||||
|
||||
@@ -1923,8 +1926,8 @@ default_connections = [('Lost Woods NW', 'Master Sword Meadow SC'),
|
||||
('Lost Woods SC', 'Lost Woods Pass NE'),
|
||||
('Lost Woods SE', 'Kakariko Fortune NE'),
|
||||
('Lost Woods EN', 'Lumberjack WN'),
|
||||
('Lumberjack SW', 'Mountain Entry NW'),
|
||||
('Mountain Entry SE', 'Kakariko Pond NE'),
|
||||
('Lumberjack SW', 'Mountain Pass NW'),
|
||||
('Mountain Pass SE', 'Kakariko Pond NE'),
|
||||
('Zora Waterfall NE', 'Zoras Domain SW'),
|
||||
('Lost Woods Pass SW', 'Kakariko NW'),
|
||||
('Lost Woods Pass SE', 'Kakariko NC'),
|
||||
@@ -2068,7 +2071,7 @@ one_way_ledges = {
|
||||
'East Death Mountain (Bottom)': {'East Death Mountain (Top East)',
|
||||
'Spiral Cave Ledge'},
|
||||
'Fairy Ascension Plateau': {'Fairy Ascension Ledge'},
|
||||
'Mountain Entry Area': {'Mountain Entry Ledge'},
|
||||
'Mountain Pass Area': {'Mountain Pass Ledge'},
|
||||
'Sanctuary Area': {'Bonk Rock Ledge'},
|
||||
'Graveyard Area': {'Graveyard Ledge'},
|
||||
'Potion Shop Water': {'Potion Shop Area',
|
||||
@@ -2083,9 +2086,9 @@ one_way_ledges = {
|
||||
'Flute Boy Approach Area': {'Cave 45 Ledge'},
|
||||
'Desert Area': {'Desert Ledge',
|
||||
'Desert Checkerboard Ledge',
|
||||
'Desert Palace Mouth',
|
||||
'Desert Mouth',
|
||||
'Bombos Tablet Ledge',
|
||||
'Desert Palace Teleporter Ledge'},
|
||||
'Desert Teleporter Ledge'},
|
||||
'Desert Pass Area': {'Desert Pass Ledge'},
|
||||
'Lake Hylia Water': {'Lake Hylia South Shore',
|
||||
'Lake Hylia Island'},
|
||||
@@ -2102,22 +2105,22 @@ one_way_ledges = {
|
||||
'Broken Bridge Water': {'Broken Bridge West',
|
||||
'Broken Bridge Area',
|
||||
'Broken Bridge Northeast'},
|
||||
'Misery Mire Area': {'Misery Mire Teleporter Ledge'},
|
||||
'Ice Lake Water': {'Ice Lake Area',
|
||||
'Ice Lake Ledge (West)',
|
||||
'Ice Lake Ledge (East)'}
|
||||
'Mire Area': {'Mire Teleporter Ledge'},
|
||||
'Ice Lake Water': {'Ice Lake Northwest Bank',
|
||||
'Ice Lake Southwest Ledge',
|
||||
'Ice Lake Southeast Ledge'}
|
||||
}
|
||||
|
||||
isolated_regions = [
|
||||
'Death Mountain Floating Island',
|
||||
'Mimic Cave Ledge',
|
||||
'Spiral Mimic Ledge Extend',
|
||||
'Mountain Entry Ledge',
|
||||
'Mountain Pass Ledge',
|
||||
'Maze Race Prize',
|
||||
'Maze Race Ledge',
|
||||
'Desert Ledge',
|
||||
'Desert Palace Entrance (North) Spot',
|
||||
'Desert Palace Mouth',
|
||||
'Desert Ledge Keep',
|
||||
'Desert Mouth',
|
||||
'Dark Death Mountain Floating Island',
|
||||
'Dark Death Mountain Ledge',
|
||||
'Dark Death Mountain Isolated Ledge',
|
||||
@@ -2133,8 +2136,8 @@ flute_data = {
|
||||
0x02: (['Lumberjack Area', 'Dark Lumberjack Area'], 0x02, 0x059c, 0x00d6, 0x04e6, 0x0138, 0x0558, 0x0143, 0x0563, 0xfffa, 0xfffa, 0x0138, 0x0550),
|
||||
0x0b: (['West Death Mountain (Bottom)', 'West Dark Death Mountain (Top)'], 0x03, 0x1600, 0x02ca, 0x060e, 0x0328, 0x0678, 0x0337, 0x0683, 0xfff6, 0xfff2, 0x035b, 0x0680, 0x0118, 0x0860, 0x05c0, 0x00b8, 0x07ec, 0x0127, 0x086b, 0xfff8, 0x0004, 0x0148, 0x0850),
|
||||
0x0e: (['East Death Mountain (Bottom)', 'East Dark Death Mountain (Bottom)'], 0x05, 0x1860, 0x031e, 0x0d00, 0x0388, 0x0da8, 0x038d, 0x0d7d, 0x0000, 0x0000, 0x0388, 0x0da8),
|
||||
0x07: (['Death Mountain TR Pegs', 'Turtle Rock Area'], 0x07, 0x0804, 0x0102, 0x0e1a, 0x0160, 0x0e90, 0x016f, 0x0e97, 0xfffe, 0x0006, 0x0160, 0x0f20),
|
||||
0x0a: (['Mountain Entry Area', 'Bumper Cave Area'], 0x0a, 0x0180, 0x0220, 0x0406, 0x0280, 0x0488, 0x028f, 0x0493, 0x0000, 0xfffa, 0x0280, 0x0488),
|
||||
0x07: (['Death Mountain TR Pegs Area', 'Turtle Rock Area'], 0x07, 0x0804, 0x0102, 0x0e1a, 0x0160, 0x0e90, 0x016f, 0x0e97, 0xfffe, 0x0006, 0x0160, 0x0f20),
|
||||
0x0a: (['Mountain Pass Area', 'Bumper Cave Area'], 0x0a, 0x0180, 0x0220, 0x0406, 0x0280, 0x0488, 0x028f, 0x0493, 0x0000, 0xfffa, 0x0280, 0x0488),
|
||||
0x0f: (['Zora Waterfall Area', 'Catfish Area'], 0x0f, 0x0316, 0x025c, 0x0eb2, 0x02c0, 0x0f28, 0x02cb, 0x0f2f, 0x0002, 0xfffe, 0x02d0, 0x0f38),
|
||||
0x10: (['Lost Woods Pass West Area', 'Skull Woods Pass West Area'], 0x10, 0x0080, 0x0400, 0x0000, 0x0448, 0x0058, 0x046f, 0x0085, 0x0000, 0x0000, 0x0448, 0x0058),
|
||||
0x11: (['Kakariko Fortune Area', 'Dark Fortune Area'], 0x11, 0x0912, 0x051e, 0x0292, 0x0588, 0x0318, 0x058d, 0x031f, 0x0000, 0xfffe, 0x0588, 0x0318),
|
||||
@@ -2144,7 +2147,7 @@ flute_data = {
|
||||
0x15: (['River Bend East Bank', 'Qirn Jump East Bank'], 0x15, 0x041a, 0x0486, 0x0ad2, 0x04e8, 0x0b48, 0x04f3, 0x0b4f, 0x0008, 0xfffe, 0x04f8, 0x0b60),
|
||||
0x16: (['Potion Shop Area', 'Dark Witch Area'], 0x16, 0x0888, 0x0516, 0x0c4e, 0x0578, 0x0cc8, 0x0583, 0x0cd3, 0xfffa, 0xfff2, 0x0598, 0x0ccf),
|
||||
0x17: (['Zora Approach Ledge', 'Catfish Approach Ledge'], 0x17, 0x039e, 0x047e, 0x0ef2, 0x04e0, 0x0f68, 0x04eb, 0x0f6f, 0x0000, 0xfffe, 0x04e0, 0x0f68),
|
||||
0x18: (['Kakariko Area', 'Village of Outcasts Area'], 0x18, 0x0b30, 0x0759, 0x017e, 0x07b7, 0x0200, 0x07c6, 0x020b, 0x0007, 0x0002, 0x07c0, 0x0210, 0x07c8, 0x01f8),
|
||||
0x18: (['Kakariko Village', 'Village of Outcasts'], 0x18, 0x0b30, 0x0759, 0x017e, 0x07b7, 0x0200, 0x07c6, 0x020b, 0x0007, 0x0002, 0x07c0, 0x0210, 0x07c8, 0x01f8),
|
||||
0x1a: (['Forgotten Forest Area', 'Shield Shop Fence'], 0x1a, 0x081a, 0x070f, 0x04d2, 0x0770, 0x0548, 0x077c, 0x054f, 0xffff, 0xfffe, 0x0770, 0x0548),
|
||||
0x1b: (['Hyrule Castle Courtyard', 'Pyramid Area'], 0x1b, 0x0c30, 0x077a, 0x0786, 0x07d8, 0x07f8, 0x07e7, 0x0803, 0x0006, 0xfffa, 0x07d8, 0x07f8),
|
||||
0x1d: (['Wooden Bridge Area', 'Broken Bridge Northeast'], 0x1d, 0x0602, 0x06c2, 0x0a0e, 0x0720, 0x0a80, 0x072f, 0x0a8b, 0xfffe, 0x0002, 0x0720, 0x0a80),
|
||||
@@ -2158,13 +2161,13 @@ flute_data = {
|
||||
0x2c: (['Links House Area', 'Big Bomb Shop Area'], 0x2c, 0x0588, 0x0ab9, 0x0840, 0x0b17, 0x08b8, 0x0b26, 0x08bf, 0xfff7, 0x0000, 0x0b20, 0x08b8),
|
||||
0x2d: (['Stone Bridge South Area', 'Hammer Bridge South Area'], 0x2d, 0x0886, 0x0b1e, 0x0a2a, 0x0ba0, 0x0aa8, 0x0b8b, 0x0aaf, 0x0000, 0x0006, 0x0bc4, 0x0ad0),
|
||||
0x2e: (['Tree Line Area', 'Dark Tree Line Area'], 0x2e, 0x0100, 0x0a1a, 0x0c00, 0x0a78, 0x0c30, 0x0a87, 0x0c7d, 0x0006, 0x0000, 0x0a78, 0x0c58),
|
||||
0x2f: (['Eastern Nook Area', 'Palace of Darkness Nook Area'], 0x2f, 0x0798, 0x0afa, 0x0eb2, 0x0b58, 0x0f30, 0x0b67, 0x0f37, 0xfff6, 0x000e, 0x0b50, 0x0f30),
|
||||
0x38: (['Desert Palace Teleporter Ledge', 'Misery Mire Teleporter Ledge'], 0x30, 0x1880, 0x0f1e, 0x0000, 0x0fa8, 0x0078, 0x0f8d, 0x008d, 0x0000, 0x0000, 0x0fb0, 0x0070),
|
||||
0x2f: (['Eastern Nook Area', 'Darkness Nook Area'], 0x2f, 0x0798, 0x0afa, 0x0eb2, 0x0b58, 0x0f30, 0x0b67, 0x0f37, 0xfff6, 0x000e, 0x0b50, 0x0f30),
|
||||
0x38: (['Desert Teleporter Ledge', 'Mire Teleporter Ledge'], 0x30, 0x1880, 0x0f1e, 0x0000, 0x0fa8, 0x0078, 0x0f8d, 0x008d, 0x0000, 0x0000, 0x0fb0, 0x0070),
|
||||
0x32: (['Flute Boy Approach Area', 'Stumpy Approach Area'], 0x32, 0x03a0, 0x0c6c, 0x0500, 0x0cd0, 0x05a8, 0x0cdb, 0x0585, 0x0002, 0x0000, 0x0cd6, 0x0568),
|
||||
0x33: (['C Whirlpool Outer Area', 'Dark C Whirlpool Outer Area'], 0x33, 0x0180, 0x0c20, 0x0600, 0x0c80, 0x0628, 0x0c8f, 0x067d, 0x0000, 0x0000, 0x0c80, 0x0628),
|
||||
0x34: (['Statues Area', 'Hype Cave Area'], 0x34, 0x088e, 0x0d00, 0x0866, 0x0d60, 0x08d8, 0x0d6f, 0x08e3, 0x0000, 0x000a, 0x0d60, 0x08d8),
|
||||
#0x35: (['Lake Hylia Area', 'Ice Lake Area'], 0x35, 0x0d00, 0x0da6, 0x0a06, 0x0e08, 0x0a80, 0x0e13, 0x0a8b, 0xfffa, 0xfffa, 0x0d88, 0x0a88),
|
||||
0x3e: (['Lake Hylia South Shore', 'Ice Lake Ledge (East)'], 0x35, 0x1860, 0x0f1e, 0x0d00, 0x0f98, 0x0da8, 0x0f8b, 0x0d85, 0x0000, 0x0000, 0x0f90, 0x0da4),
|
||||
#0x35: (['Lake Hylia Northwest Bank', 'Ice Lake Northwest Bank'], 0x35, 0x0d00, 0x0da6, 0x0a06, 0x0e08, 0x0a80, 0x0e13, 0x0a8b, 0xfffa, 0xfffa, 0x0d88, 0x0a88),
|
||||
0x3e: (['Lake Hylia South Shore', 'Ice Lake Southeast Ledge'], 0x35, 0x1860, 0x0f1e, 0x0d00, 0x0f98, 0x0da8, 0x0f8b, 0x0d85, 0x0000, 0x0000, 0x0f90, 0x0da4),
|
||||
0x37: (['Ice Cave Area', 'Shopping Mall Area'], 0x37, 0x0786, 0x0cf6, 0x0e2e, 0x0d58, 0x0ea0, 0x0d63, 0x0eab, 0x000a, 0x0002, 0x0d48, 0x0ed0),
|
||||
0x3a: (['Desert Pass Area', 'Swamp Nook Area'], 0x3a, 0x001a, 0x0e08, 0x04c6, 0x0e70, 0x0540, 0x0e7d, 0x054b, 0x0006, 0x000a, 0x0e70, 0x0540),
|
||||
0x3b: (['Dam Area', 'Swamp Area'], 0x3b, 0x069e, 0x0edf, 0x06f2, 0x0f3d, 0x0778, 0x0f4c, 0x077f, 0xfff1, 0xfffe, 0x0f30, 0x0770),
|
||||
|
||||
Reference in New Issue
Block a user