From 8eaa20653b51dedfbc46336416b3820634bb6f71 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 8 Apr 2022 20:17:20 -0500 Subject: [PATCH] Added missing references to Activated Flute --- BaseClasses.py | 2 +- Rom.py | 3 ++- source/item/FillUtil.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 275ffc6a..593ae269 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -949,7 +949,7 @@ class CollectionState(object): 'Golden Sword', 'Progressive Sword', 'Progressive Glove', 'Silver Arrows', 'Green Pendant', 'Blue Pendant', 'Red Pendant', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7', 'Blue Boomerang', 'Red Boomerang', 'Blue Shield', 'Red Shield', - 'Mirror Shield', 'Progressive Shield', 'Bug Catching Net', 'Cane of Byrna', + 'Mirror Shield', 'Progressive Shield', 'Bug Catching Net', 'Cane of Byrna', 'Ocarina (Activated)' 'Boss Heart Container', 'Sanctuary Heart Container', 'Piece of Heart', 'Magic Upgrade (1/2)', 'Magic Upgrade (1/4)'] or item_name.startswith(('Bottle', 'Small Key', 'Big Key')) diff --git a/Rom.py b/Rom.py index 92530aa7..8d65c23b 100644 --- a/Rom.py +++ b/Rom.py @@ -1385,7 +1385,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): 'Big Key (Turtle Rock)': (0x366, 0x08), 'Compass (Turtle Rock)': (0x364, 0x08), 'Map (Turtle Rock)': (0x368, 0x08), 'Big Key (Ganons Tower)': (0x366, 0x04), 'Compass (Ganons Tower)': (0x364, 0x04), 'Map (Ganons Tower)': (0x368, 0x04)} set_or_table = {'Flippers': (0x356, 1, 0x379, 0x02),'Pegasus Boots': (0x355, 1, 0x379, 0x04), - 'Shovel': (0x34C, 1, 0x38C, 0x04), 'Ocarina': (0x34C, 3, 0x38C, 0x01), + 'Shovel': (0x34C, 1, 0x38C, 0x04), 'Ocarina': (0x34C, 3, 0x38C, 0x01), 'Ocarina (Activated)': (0x34C, 3, 0x38C, 0x01), 'Mushroom': (0x344, 1, 0x38C, 0x20 | 0x08), 'Magic Powder': (0x344, 2, 0x38C, 0x10), 'Blue Boomerang': (0x341, 1, 0x38C, 0x80), 'Red Boomerang': (0x341, 2, 0x38C, 0x40)} keys = {'Small Key (Eastern Palace)': [0x37E], 'Small Key (Desert Palace)': [0x37F], @@ -2988,6 +2988,7 @@ RelevantItems = ['Bow', 'Hookshot', 'Magic Mirror', 'Ocarina', + 'Ocarina (Activated)', 'Pegasus Boots', 'Power Glove', 'Cape', diff --git a/source/item/FillUtil.py b/source/item/FillUtil.py index e6d787ff..bd0a9895 100644 --- a/source/item/FillUtil.py +++ b/source/item/FillUtil.py @@ -477,6 +477,7 @@ vanilla_mapping = { 'Hookshot': ['Swamp Palace - Big Chest'], 'Magic Mirror': ['Old Man'], 'Ocarina': ['Flute Spot'], + 'Ocarina (Activated)': ['Flute Spot'], 'Pegasus Boots': ['Sahasrahla'], 'Power Glove': ['Desert Palace - Big Chest'], 'Cape': ["King's Tomb"], @@ -793,7 +794,7 @@ major_items = {'Bombos', 'Book of Mudora', 'Cane of Somaria', 'Ether', 'Fire Rod 'Bug Catching Net', 'Cane of Byrna', 'Blue Boomerang', 'Red Boomerang', 'Progressive Glove', 'Power Glove', 'Titans Mitts', 'Bottle', 'Bottle (Red Potion)', 'Bottle (Green Potion)', 'Magic Mirror', 'Bottle (Blue Potion)', 'Bottle (Fairy)', 'Bottle (Bee)', 'Bottle (Good Bee)', 'Magic Upgrade (1/2)', - 'Sanctuary Heart Container', 'Boss Heart Container', 'Progressive Shield', + 'Sanctuary Heart Container', 'Boss Heart Container', 'Progressive Shield', 'Ocarina (Activated)', 'Mirror Shield', 'Progressive Armor', 'Blue Mail', 'Red Mail', 'Progressive Sword', 'Fighter Sword', 'Master Sword', 'Tempered Sword', 'Golden Sword', 'Bow', 'Silver Arrows', 'Triforce Piece', 'Moon Pearl', 'Progressive Bow', 'Progressive Bow (Alt)'}