Not sure how this spirit temple pot broke

fenhl · Feb 9, 2022 · 2a8374b · 2a8374b
1 parent 4eb1511
commit 2a8374b
Show file tree

Hide file tree

Showing 4 changed files with 475 additions and 470 deletions.
diff --git a/LocationList.py b/LocationList.py
@@ -1546,7 +1546,7 @@ def shop_address(shop_id, shelf_id):
     ("Spirit Temple Lobby Flying Pot 1",                          ("Collectable",  0x06,  0x31, None,                        'Recovery Heart',                        ("Spirit Temple", "Vanilla", "FlyingPot"))),
     ("Spirit Temple Lobby Flying Pot 2",                          ("Collectable",  0x06,  0x32, None,                        'Recovery Heart',                        ("Spirit Temple", "Vanilla", "FlyingPot"))),
     ("Spirit Temple Child Bridge Flying Pot", ("Collectable", 0x6, 0x34, None, 'Recovery Heart', ("Spirit Temple", "Vanilla", "FlyingPot"))),
-    ("Spirit Temple Before Child Climb Small Wooden Crate 1",        ("Collectable",  0x06,  0x3F, ([0x2AF8110],None), 'Deku Nuts (5)', ("Spirit Temple", "Vanilla", "SmallCrate"))), #Overwrite original flag 0x2C because it conflicts w/ Beamos hall pot
+    ("Spirit Temple Before Child Climb Small Wooden Crate 1",        ("Collectable",  0x06,  0x3F, ([0x2B090E0],None), 'Deku Nuts (5)', ("Spirit Temple", "Vanilla", "SmallCrate"))), #Overwrite original flag 0x2C because it conflicts w/ Beamos hall pot
     ("Spirit Temple Before Child Climb Small Wooden Crate 2",        ("Collectable",  0x06,  0x2E, None, 'Bombs (5)', ("Spirit Temple", "Vanilla", "SmallCrate"))),
     #("Spirit Temple Child Anubis Pot",                               ("Collectable",  0x07,  0x2F, None,                        'Recovery Heart',                        ("Spirit Temple", "Vanilla", "Pot"))),
     #("Spirit Temple Child Anubis Pot",                               ("Collectable",  0x07,  0x2F, None,                        'Recovery Heart',                        ("Spirit Temple", "Vanilla", "Pot"))),

diff --git a/freestanding_logic.py b/freestanding_logic.py
@@ -23,7 +23,7 @@
                 locations.append(location)
                 if location_table.get(location):
                     if location_table.get(location)[5]:
-                        if 'Freestanding' in location_table.get(location)[5] or 'ActorOverride' in location_table.get(location)[5] or 'Pot' in location_table.get(location)[5] or 'Crate' in location_table.get(location)[5] or 'FlyingPot' in location_table.get(location)[5] or 'SmallCrate' in location_table.get(location)[5]:
+                        if 'ActorOverride' in location_table.get(location)[0] or 'Freestanding' in location_table.get(location)[5] or 'ActorOverride' in location_table.get(location)[5] or 'Pot' in location_table.get(location)[5] or 'Crate' in location_table.get(location)[5] or 'FlyingPot' in location_table.get(location)[5] or 'SmallCrate' in location_table.get(location)[5]:
                             if not printed_region_name:
                                 print(region.get("region_name"))
                                 new_check_file.write(region.get("region_name") + "\n")
@@ -45,7 +45,7 @@
                 locations.append(location)
                 if location_table.get(location):
                     if location_table.get(location)[5]:
-                        if 'Freestanding' in location_table.get(location)[5] or 'ActorOverride' in location_table.get(location)[5] or 'Pot' in location_table.get(location)[5] or 'Crate' in location_table.get(location)[5] or 'FlyingPot' in location_table.get(location)[5] or 'SmallCrate' in location_table.get(location)[5]:
+                        if 'Freestanding' in location_table.get(location)[5] or 'Pot' in location_table.get(location)[5] or 'Crate' in location_table.get(location)[5] or 'FlyingPot' in location_table.get(location)[5] or 'SmallCrate' in location_table.get(location)[5]:
                             if not printed_region_name:
                                 print(region.get("region_name"))
                                 new_check_file.write(region.get("region_name") + "\n")