From e100b5cd93569c52d14b47b15923d9cebbfefded Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Fri, 2 Mar 2018 19:05:26 -0500 Subject: [PATCH 1/2] Rename Very misleading entrance/region --- EntranceShuffle.py | 8 ++++---- Regions.py | 2 +- Rules.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 4012d3cb..8cced2e6 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -1447,7 +1447,7 @@ Blacksmith_Multi_Cave_Doors = ['Eastern Palace', LW_Single_Cave_Doors = ['Blinds Hideout', 'Lake Hylia Fairy', - 'Swamp Fairy', + 'Light Hype Fairy', 'Desert Fairy', 'Chicken House', 'Aginahs Cave', @@ -1517,7 +1517,7 @@ DW_Single_Cave_Doors = ['Bonk Fairy (Dark)', Blacksmith_Single_Cave_Doors = ['Blinds Hideout', 'Lake Hylia Fairy', - 'Swamp Fairy', + 'Light Hype Fairy', 'Desert Fairy', 'Chicken House', 'Aginahs Cave', @@ -1838,7 +1838,7 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'), ('Bonk Fairy (Light)', 'Bonk Fairy (Light)'), ('Lake Hylia Fairy', 'Lake Hylia Healer Fairy'), ('Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller'), - ('Swamp Fairy', 'Swamp Healer Fairy'), + ('Light Hype Fairy', 'Swamp Healer Fairy'), ('Desert Fairy', 'Desert Healer Fairy'), ('Kings Grave', 'Kings Grave'), ('Tavern North', 'Tavern'), @@ -2117,7 +2117,7 @@ door_addresses = {'Links House': (0x00, (0x0104, 0x2c, 0x0506, 0x0a9a, 0x0832, 0 'Hyrule Castle Secret Entrance Drop': ([0xDB858], None), 'Bonk Fairy (Light)': (0x76, (0x0126, 0x2b, 0x00a0, 0x0a0a, 0x0700, 0x0a67, 0x0788, 0x0a77, 0x0785, 0x06, 0xfa, 0x0000, 0x0000)), 'Lake Hylia Fairy': (0x5D, (0x0115, 0x2e, 0x0016, 0x0a00, 0x0cb6, 0x0a37, 0x0d28, 0x0a6d, 0x0d33, 0x00, 0x00, 0x0000, 0x0000)), - 'Swamp Fairy': (0x6B, (0x0115, 0x34, 0x00a0, 0x0c04, 0x0900, 0x0c58, 0x0988, 0x0c73, 0x0985, 0x0a, 0xf6, 0x0000, 0x0000)), + 'Light Hype Fairy': (0x6B, (0x0115, 0x34, 0x00a0, 0x0c04, 0x0900, 0x0c58, 0x0988, 0x0c73, 0x0985, 0x0a, 0xf6, 0x0000, 0x0000)), 'Desert Fairy': (0x71, (0x0115, 0x3a, 0x0000, 0x0e00, 0x0400, 0x0e26, 0x0468, 0x0e6d, 0x0485, 0x00, 0x00, 0x0000, 0x0000)), 'Kings Grave': (0x5A, (0x0113, 0x14, 0x0320, 0x0456, 0x0900, 0x04a6, 0x0998, 0x04c3, 0x097d, 0x0a, 0xf6, 0x0000, 0x0000)), 'Tavern North': (0x42, (0x0103, 0x18, 0x1440, 0x08a7, 0x0206, 0x08f9, 0x0288, 0x0914, 0x0293, 0xf7, 0x09, 0xFFFF, 0x0000)), # do not use, buggy diff --git a/Regions.py b/Regions.py index d94dc22f..ddd4928e 100644 --- a/Regions.py +++ b/Regions.py @@ -14,7 +14,7 @@ def create_regions(world): 'Sanctuary', 'Sanctuary Grave', 'Death Mountain Entrance Rock', 'Flute Spot 1', 'Dark Desert Teleporter', 'East Hyrule Teleporter', 'South Hyrule Teleporter', 'Kakariko Teleporter', 'Elder House (East)', 'Elder House (West)', 'North Fairy Cave', 'North Fairy Cave Drop', 'Lost Woods Gamble', 'Snitch Lady (East)', 'Snitch Lady (West)', 'Tavern (Front)', 'Bush Covered House', 'Light World Bomb Hut', 'Kakariko Shop', 'Long Fairy Cave', 'Good Bee Cave', '20 Rupee Cave', 'Cave Shop (Lake Hylia)', 'Waterfall of Wishing', 'Hyrule Castle Main Gate', - 'Bonk Fairy (Light)', '50 Rupee Cave', 'Fortune Teller (Light)', 'Lake Hylia Fairy', 'Swamp Fairy', 'Desert Fairy', 'Lumberjack House', 'Lake Hylia Fortune Teller', 'Kakariko Gamble Game', 'Top of Pyramid']), + 'Bonk Fairy (Light)', '50 Rupee Cave', 'Fortune Teller (Light)', 'Lake Hylia Fairy', 'Light Hype Fairy', 'Desert Fairy', 'Lumberjack House', 'Lake Hylia Fortune Teller', 'Kakariko Gamble Game', 'Top of Pyramid']), create_lw_region('Death Mountain Entrance', None, ['Old Man Cave (West)', 'Death Mountain Entrance Drop']), create_lw_region('Lake Hylia Central Island', None, ['Capacity Upgrade', 'Lake Hylia Central Island Teleporter']), create_cave_region('Blinds Hideout', ["Blind\'s Hideout - Top", diff --git a/Rules.py b/Rules.py index 484abe64..b96c7fc3 100644 --- a/Rules.py +++ b/Rules.py @@ -551,7 +551,7 @@ def set_big_bomb_rules(world): Normal_LW_entrances = ['Blinds Hideout', 'Bonk Fairy (Light)', 'Lake Hylia Fairy', - 'Swamp Fairy', + 'Light Hype Fairy', 'Desert Fairy', 'Chicken House', 'Aginahs Cave', From e61dab657872b0d89f88cc766a6255499e589fc0 Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Fri, 2 Mar 2018 19:06:28 -0500 Subject: [PATCH 2/2] Fix bug where fairy could steal bow and only return a Red Bomerang --- Rom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 49ec8d77..f918db71 100644 --- a/Rom.py +++ b/Rom.py @@ -642,7 +642,7 @@ def patch_rom(world, rom, hashtable, beep='normal', color='red', sprite=None): 192, 136, 0, 96, 144, 0, 96, 232, 0, 96, 240, 0, 96, 152, 202, 192, 216, 202, 192, 216, 19, 192, 216, 82, 192, 252, 189, 133, 253, 29, 135, 255, 255, 255, 255, 240, 255, 128, 46, 97, 14, 129, 14, 255, 255]) # set Waterfall fairy prizes to be disappointing - rom.write_byte(0x348DB, 0x3A) # Red Boomerang becomes Red Boomerang + rom.write_byte(0x348DB, 0x2A) # Red Boomerang becomes Red Boomerang rom.write_byte(0x348EB, 0x05) # Blue Shield becomes Blue Shield rom.write_byte(0x180029, 0x01) # Smithy quick item give