Merged in DR v0.5.0.1

This commit is contained in:
codemann8
2021-07-28 17:09:31 -05:00
18 changed files with 140 additions and 168 deletions

View File

@@ -2058,7 +2058,7 @@ Cave_Exits_Base = [['Elder House Exit (East)', 'Elder House Exit (West)'],
['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)'],
['Fairy Ascension Cave Exit (Bottom)', 'Fairy Ascension Cave Exit (Top)'],
['Bumper Cave Exit (Top)', 'Bumper Cave Exit (Bottom)'],
['Hookshot Cave Exit (South)', 'Hookshot Cave Exit (North)']]
['Hookshot Cave Back Exit', 'Hookshot Cave Front Exit']]
Cave_Exits_Base += [('Superbunny Cave Exit (Bottom)', 'Superbunny Cave Exit (Top)'),
('Spiral Cave Exit (Top)', 'Spiral Cave Exit')]
@@ -2718,6 +2718,10 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
('Fairy Ascension Cave Pots', 'Fairy Ascension Cave (Bottom)'),
('Fairy Ascension Cave Drop', 'Fairy Ascension Cave (Drop)'),
('Superbunny Cave Climb', 'Superbunny Cave (Top)'),
('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)'),
('Ganon Drop', 'Bottom of Pyramid')
]
@@ -2862,16 +2866,16 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Dark Desert Hint', 'Dark Desert Hint'),
('Dark Desert Fairy', 'Dark Desert Healer Fairy'),
('Spike Cave', 'Spike Cave'),
('Hookshot Cave', 'Hookshot Cave'),
('Hookshot Cave', 'Hookshot Cave (Front)'),
('Superbunny Cave (Top)', 'Superbunny Cave (Top)'),
('Cave Shop (Dark Death Mountain)', 'Cave Shop (Dark Death Mountain)'),
('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 Exit (South)', 'East Dark Death Mountain (Top)'),
('Hookshot Cave Exit (North)', 'Dark Death Mountain Floating Island'),
('Hookshot Cave Back Entrance', 'Hookshot Cave'),
('Superbunny Cave Exit (Top)', 'Dark Death Mountain (Top)'),
('Superbunny Cave Exit (Bottom)', 'Dark Death Mountain (East Bottom)'),
('Hookshot Cave Front Exit', 'East Dark Death Mountain (Top)'),
('Hookshot Cave Back Exit', 'Dark Death Mountain Floating Island'),
('Hookshot Cave Back Entrance', 'Hookshot Cave (Back)'),
('Mimic Cave', 'Mimic Cave'),
('Pyramid Exit', 'Pyramid Exit Ledge')
@@ -3198,8 +3202,8 @@ exit_ids = {'Links House Exit': (0x01, 0x00),
'Bumper Cave Exit (Bottom)': (0x16, 0x17),
'Superbunny Cave Exit (Top)': (0x14, 0x15),
'Superbunny Cave Exit (Bottom)': (0x13, 0x14),
'Hookshot Cave Exit (South)': (0x3A, 0x3B),
'Hookshot Cave Exit (North)': (0x3B, 0x3C),
'Hookshot Cave Front Exit': (0x3A, 0x3B),
'Hookshot Cave Back Exit': (0x3B, 0x3C),
'Ganons Tower Exit': (0x37, 0x38),
'Pyramid Exit': (0x36, 0x37),
'Waterfall of Wishing': 0x5C,