The last of the renaming

Courtesy of KevinCathcart
This commit is contained in:
AmazingAmpharos
2017-11-11 18:03:42 -06:00
committed by GitHub
parent 6644863007
commit ad047e6c9c
6 changed files with 44 additions and 45 deletions

View File

@@ -963,7 +963,7 @@ Two_Door_Caves_Directional = [('Bumper Cave (Bottom)', 'Bumper Cave (Top)'),
Two_Door_Caves = [('Elder House (East)', 'Elder House (West)'),
('Two Brothers House (East)', 'Two Brothers House (West)'),
('Dark Death Mountain Ascend (Bottom)', 'Dark Death Mountain Ascend (Top)')]
('Superbunny Cave (Bottom)', 'Superbunny Cave (Top)')]
Old_Man_Entrances = ['Old Man Cave (East)',
'Old Man House (Top)',
@@ -978,7 +978,7 @@ Cave_Exits = [('Elder House Exit (East)', 'Elder House Exit (West)'),
('Fairy Ascension Cave Exit (Bottom)', 'Fairy Ascension Cave Exit (Top)'),
('Spiral Cave Exit (Top)', 'Spiral Cave Exit'),
('Bumper Cave Exit (Top)', 'Bumper Cave Exit (Bottom)'),
('Dark Death Mountain Ascend Exit (Bottom)', 'Dark Death Mountain Ascend Exit (Top)'),
('Superbunny Cave Exit (Bottom)', 'Superbunny Cave Exit (Top)'),
('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'),
@@ -1000,8 +1000,8 @@ LW_Entrances = ['Elder House (East)',
'Spiral Cave (Bottom)']
DW_Entrances = ['Bumper Cave (Bottom)',
'Dark Death Mountain Ascend (Top)',
'Dark Death Mountain Ascend (Bottom)',
'Superbunny Cave (Top)',
'Superbunny Cave (Bottom)',
'Hookshot Cave']
Blacksmith_Single_Cave_Doors = ['Blinds Hideout',
@@ -1050,7 +1050,7 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Dark Lake Hylia Ledge Fairy',
'Dark Lake Hylia Ledge Spike Cave',
'Dark Lake Hylia Ledge Hint',
'Dark Swamp Cave',
'Hype Cave',
'Bonk Fairy (Dark)',
'Brewery',
'C-Shaped House',
@@ -1116,7 +1116,7 @@ Single_Cave_Targets = ['Blinds Hideout',
'Healer Fairy',
'Dark Lake Hylia Ledge Spike Cave',
'Dark Lake Hylia Ledge Hint',
'Dark Swamp Cave',
'Hype Cave',
'Bonk Fairy',
'Brewery',
'C-Shaped House',
@@ -1264,10 +1264,10 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('Turtle Rock (Chain Chomp Room) (South)', 'Turtle Rock (First Section)'),
('Turtle Rock Chain Chomp Staircase', 'Turtle Rock (Chain Chomp Room)'),
('Turtle Rock (Big Chest) (North)', 'Turtle Rock (Second Section)'),
('Turtle Rock Big Key Door', 'Turtle Rock (Roller Switch Room)'),
('Turtle Rock Big Key Door', 'Turtle Rock (Crystaroller Room)'),
('Turtle Rock Big Key Door Reverse', 'Turtle Rock (Second Section)'),
('Turtle Rock Dark Room Staircase', 'Turtle Rock (Dark Room)'),
('Turtle Rock (Dark Room) (North)', 'Turtle Rock (Roller Switch Room)'),
('Turtle Rock (Dark Room) (North)', 'Turtle Rock (Crystaroller Room)'),
('Turtle Rock (Dark Room) (South)', 'Turtle Rock (Eye Bridge)'),
('Turtle Rock Dark Room (South)', 'Turtle Rock (Dark Room)'),
('Turtle Rock (Trinexx)', 'Turtle Rock (Trinexx)'),
@@ -1277,7 +1277,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('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 Spike Statue Room Door', 'Palace of Darkness (Harmless Hellway)'),
('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)'),
@@ -1409,7 +1409,7 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Dark Lake Hylia Ledge Fairy', 'Healer Fairy'),
('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave'),
('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'),
('Dark Swamp Cave', 'Dark Swamp Cave'),
('Hype Cave', 'Hype Cave'),
('Bonk Fairy (Dark)', 'Bonk Fairy'),
('Brewery', 'Brewery'),
('C-Shaped House', 'C-Shaped House'),
@@ -1431,12 +1431,12 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Dark Desert Fairy', 'Healer Fairy'),
('Spike Cave', 'Spike Cave'),
('Hookshot Cave', 'Hookshot Cave'),
('Dark Death Mountain Ascend (Top)', 'Dark Death Mountain Ascend'),
('Superbunny Cave (Top)', 'Superbunny Cave'),
('Cave Shop (Dark Death Mountain)', 'Cave Shop'),
('Dark Death Mountain Fairy', 'Healer Fairy'),
('Dark Death Mountain Ascend (Bottom)', 'Dark Death Mountain Ascend'),
('Dark Death Mountain Ascend Exit (Top)', 'Dark Death Mountain (Top)'),
('Dark Death Mountain Ascend Exit (Bottom)', 'Dark Death Mountain (East Bottom)'),
('Superbunny Cave (Bottom)', 'Superbunny Cave'),
('Superbunny Cave Exit (Top)', 'Dark Death Mountain (Top)'),
('Superbunny Cave Exit (Bottom)', 'Dark Death Mountain (East Bottom)'),
('Hookshot Cave Exit (South)', 'Dark Death Mountain (Top)'),
('Hookshot Cave Exit (North)', 'Death Mountain Floating Island'),
('Hookshot Cave Back Entrance', 'Hookshot Cave'),
@@ -1561,8 +1561,8 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Spiral Cave (Bottom)': ((0xDBB8E, 0x15B28),),
'Bumper Cave (Bottom)': ((0xDBB88, 0x15B1C),),
'Bumper Cave (Top)': ((0xDBB89, 0x15B1E),),
'Dark Death Mountain Ascend (Top)': ((0xDBB86, 0x15B18),),
'Dark Death Mountain Ascend (Bottom)': ((0xDBB85, 0x15B16),),
'Superbunny Cave (Top)': ((0xDBB86, 0x15B18),),
'Superbunny Cave (Bottom)': ((0xDBB85, 0x15B16),),
'Hookshot Cave': ((0xDBBAC, 0x15B64),),
'Hookshot Cave Back Entrance': ((0xDBBAD, 0x15B66),),
'Ganons Tower': ((0xDBBA9, 0x15B5E),),
@@ -1623,7 +1623,7 @@ door_addresses = {'Desert Palace Entrance (South)': ((0xDBB7B, 0x15B02),),
'Dark Lake Hylia Ledge Fairy': (0xDBBF3, 'Healer Fairy'),
'Dark Lake Hylia Ledge Spike Cave': (0xDBBEE, 'Dark Lake Hylia Ledge Spike Cave'),
'Dark Lake Hylia Ledge Hint': (0xDBBDC, 'Dark Lake Hylia Ledge Hint'),
'Dark Swamp Cave': (0xDBBAF, 'Dark Swamp Cave'),
'Hype Cave': (0xDBBAF, 'Hype Cave'),
'Bonk Fairy (Dark)': (0xDBBEA, 'Bonk Fairy'),
'Brewery': (0xDBBBA, 'Brewery'),
'C-Shaped House': (0xDBBC6, 'C-Shaped House'),
@@ -1701,8 +1701,8 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Spiral Cave Exit (Top)': (0x1D, 0xEE),
'Bumper Cave Exit (Top)': (0x17, 0xEB),
'Bumper Cave Exit (Bottom)': (0x16, 0xFB),
'Dark Death Mountain Ascend Exit (Top)': (0x14, 0xE8),
'Dark Death Mountain Ascend Exit (Bottom)': (0x13, 0xF8),
'Superbunny Cave Exit (Top)': (0x14, 0xE8),
'Superbunny Cave Exit (Bottom)': (0x13, 0xF8),
'Hookshot Cave Exit (South)': (0x3A, 0x3C),
'Hookshot Cave Exit (North)': (0x3B, 0x2C),
'Ganons Tower Exit': (0x37, 0x0C),
@@ -1751,7 +1751,7 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
'Dark World Shop': 0x60,
'Dark Lake Hylia Ledge Spike Cave': 0x70,
'Dark Lake Hylia Ledge Hint': 0x6A,
'Dark Swamp Cave': 0x3D,
'Hype Cave': 0x3D,
'Brewery': 0x48,
'C-Shaped House': 0x54,
'Chest Game': 0x47,