diff --git a/LocationList.py b/LocationList.py index a8af4d8c9..87b31f474 100644 --- a/LocationList.py +++ b/LocationList.py @@ -1892,20 +1892,20 @@ def shop_address(shop_id, shelf_id): ("Ganons Tower Boss Key Chest", ("Chest", 0x0A, 0x0B, None, 'Boss Key (Ganons Castle)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest"))), # Ganon's Tower Pots - ("Ganons Tower Pot 1", ("Collectable", 0x19, 0x20, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 2", ("Collectable", 0x19, 0x21, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 3", ("Collectable", 0x19, 0x25, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 4", ("Collectable", 0x19, 0x22, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 5", ("Collectable", 0x19, 0x26, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 6", ("Collectable", 0x19, 0x27, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 7", ("Collectable", 0x19, 0x23, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 8", ("Collectable", 0x19, 0x24, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 9", ("Collectable", 0x19, 0x2A, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 10", ("Collectable", 0x19, 0x2B, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 11", ("Collectable", 0x19, 0x2C, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 12", ("Collectable", 0x19, 0x2D, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 13", ("Collectable", 0x19, 0x2E, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Pot"))), - ("Ganons Tower Pot 14", ("Collectable", 0x19, 0x31, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Pot"))), + ("Ganons Tower Pot 1", ("Collectable", 0x19, 0x20, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 2", ("Collectable", 0x19, 0x21, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 3", ("Collectable", 0x19, 0x25, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 4", ("Collectable", 0x19, 0x22, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 5", ("Collectable", 0x19, 0x26, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 6", ("Collectable", 0x19, 0x27, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 7", ("Collectable", 0x19, 0x23, None, 'Rupees (5)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 8", ("Collectable", 0x19, 0x24, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 9", ("Collectable", 0x19, 0x2A, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 10", ("Collectable", 0x19, 0x2B, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 11", ("Collectable", 0x19, 0x2C, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 12", ("Collectable", 0x19, 0x2D, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 13", ("Collectable", 0x19, 0x2E, None, 'Recovery Heart', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), + ("Ganons Tower Pot 14", ("Collectable", 0x19, 0x31, None, 'Arrows (10)', ("Ganon's Castle", "Ganon's Tower", "Vanilla", "Master Quest", "Pot"))), ## Events and Drops ("Pierre", ("Event", None, None, None, 'Scarecrow Song', None)),