Merge branch 'DoorDevVolatile' into StandingItems

# Conflicts: # Rom.py # data/base2current.bps
2022-01-06 16:09:42 -07:00
parent 515f6dafed fab5f5bb70
commit f9c1219785
8 changed files with 38 additions and 6 deletions
--- a/Regions.py
+++ b/Regions.py
@@ -966,6 +966,7 @@ def create_shops(world, player):
        if world.mode[player] == 'inverted' and region_name == 'Dark Lake Hylia Shop':
            locked = True
            inventory = [('Blue Potion', 160), ('Blue Shield', 50), ('Bombs (10)', 50)]
+            custom = True
        region = world.get_region(region_name, player)
        shop = Shop(region, room_id, type, shopkeeper, custom, locked, sram)
        region.shop = shop