Critical fixes for bunny logic

This commit is contained in:
Kevin Cathcart
2018-01-18 01:38:28 -05:00
parent 7c8d0dada2
commit e002672503
4 changed files with 23 additions and 17 deletions

View File

@@ -1069,7 +1069,7 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Spike Cave',
'Cave Shop (Dark Death Mountain)',
'Dark Death Mountain Fairy',
'Mimic Cave Mirror Spot',
'Mimic Cave',
'Big Bomb Shop',
'Dark Lake Hylia Shop']
@@ -1210,7 +1210,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('Bumper Cave Ledge Mirror Spot', 'Death Mountain Return Ledge'),
('Skull Woods Forest', 'Skull Woods Forest'),
('Desert Ledge Mirror Spot', 'Desert Ledge'),
('Desert Ledge (West) Mirror Spot', 'Desert Ledge (West)'),
('Desert Ledge (Northeast) Mirror Spot', 'Desert Ledge (Northeast)'),
('Desert Palace Entrance (North) Mirror Spot', 'Desert Palace Entrance (North) Spot'),
('Dark Desert Teleporter', 'Dark Desert'),
('Desert Palace Stairs Mirror Spot', 'Desert Palace Stairs'),
@@ -1238,6 +1238,9 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('East Death Mountain Teleporter', 'Dark Death Mountain (East Bottom)'),
('Isolated Ledge Mirror Spot', 'Fairy Ascension Ledge'),
('Spiral Cave Mirror Spot', 'Spiral Cave Ledge'),
('Mimic Cave Mirror Spot', 'Mimic Cave Ledge'),
('Cave 45 Mirror Spot', 'Cave 45 Ledge'),
('Graveyard Ledge Mirror Spot', 'Graveyard Ledge'),
('Swamp Palace Moat', 'Swamp Palace (First Room)'),
('Swamp Palace Small Key Door', 'Swamp Palace (Starting Area)'),
@@ -1445,7 +1448,7 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Hookshot Cave Exit (South)', 'Dark Death Mountain (Top)'),
('Hookshot Cave Exit (North)', 'Death Mountain Floating Island (Dark World)'),
('Hookshot Cave Back Entrance', 'Hookshot Cave'),
('Mimic Cave Mirror Spot', 'Mimic Cave'),
('Mimic Cave', 'Mimic Cave'),
('Pyramid Hole', 'Pyramid'),
('Pyramid Exit', 'Pyramid Ledge'),
@@ -1647,7 +1650,7 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Spike Cave': (0xDBBB3, 'Spike Cave'),
'Cave Shop (Dark Death Mountain)': (0xDBBE0, 'Cave Shop'),
'Dark Death Mountain Fairy': (0xDBBE2, 'Healer Fairy'),
'Mimic Cave Mirror Spot': (0xDBBC1, 'Mimic Cave'),
'Mimic Cave': (0xDBBC1, 'Mimic Cave'),
'Big Bomb Shop': (0xDBBC5, 'Big Bomb Shop'),
'Dark Lake Hylia Shop': (0xDBBE6, 'Dark World Shop'),
'Lumberjack House': (0xDBBE8, 'Lumberjack House'),