Merge branch 'main' into breaking_changes

# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py

test/dungeons/TestDungeon.py

@@ -5,7 +5,8 @@ from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
 from worlds.alttp.EntranceShuffle import mandatory_connections, connect_simple
 from worlds.alttp.ItemPool import difficulties, generate_itempool
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions, create_shops
+from worlds.alttp.Regions import create_regions
+from Shops import create_shops
 from worlds.alttp.Rules import set_rules
 
 

test/inverted/TestInverted.py

@@ -4,7 +4,8 @@ from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
 from worlds.alttp.ItemPool import generate_itempool, difficulties
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import mark_light_world_regions, create_shops
+from worlds.alttp.Regions import mark_light_world_regions
+from Shops import create_shops
 from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 

test/inverted_minor_glitches/TestInvertedMinor.py

@@ -4,7 +4,8 @@ from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
 from worlds.alttp.ItemPool import generate_itempool, difficulties
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import mark_light_world_regions, create_shops
+from worlds.alttp.Regions import mark_light_world_regions
+from Shops import create_shops
 from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 

test/inverted_owg/TestInvertedOWG.py

@@ -4,7 +4,8 @@ from worlds.alttp.EntranceShuffle import link_inverted_entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
 from worlds.alttp.ItemPool import generate_itempool, difficulties
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import mark_light_world_regions, create_shops
+from worlds.alttp.Regions import mark_light_world_regions
+from Shops import create_shops
 from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 

test/minor_glitches/TestMinor.py

@@ -4,7 +4,8 @@ from worlds.alttp.EntranceShuffle import link_entrances
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
 from worlds.alttp.ItemPool import difficulties, generate_itempool
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions, create_shops
+from worlds.alttp.Regions import create_regions
+from Shops import create_shops
 from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 

test/owg/TestVanillaOWG.py

@@ -4,7 +4,8 @@ from worlds.alttp.EntranceShuffle import link_entrances
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
 from worlds.alttp.ItemPool import difficulties, generate_itempool
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions, create_shops
+from worlds.alttp.Regions import create_regions
+from Shops import create_shops
 from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase
 

test/shops/TestSram.py

@@ -0,0 +1,13 @@
+from Shops import shop_table
+from test.TestBase import TestBase
+
+
+class TestSram(TestBase):
+    def testUniqueOffset(self):
+        sram_ids = set()
+        for shop_name, shopdata in shop_table.items():
+            for x in range(3):
+                new = shopdata.sram_offset + x
+                with self.subTest(shop_name, slot=x + 1, offset=new):
+                    self.assertNotIn(new, sram_ids)
+                sram_ids.add(new)

test/vanilla/TestVanilla.py

@@ -4,7 +4,8 @@ from worlds.alttp.EntranceShuffle import link_entrances
 from worlds.alttp.InvertedRegions import mark_dark_world_regions
 from worlds.alttp.ItemPool import difficulties, generate_itempool
 from worlds.alttp.Items import ItemFactory
-from worlds.alttp.Regions import create_regions, create_shops
+from worlds.alttp.Regions import create_regions
+from Shops import create_shops
 from worlds.alttp.Rules import set_rules
 from test.TestBase import TestBase