Universal keys don't despawn in shops, and will never get placed in bee shop

ItemList.py

@@ -872,7 +872,7 @@ def set_up_shops(world, player):
                 rss.locked = True
                 cap_shop = world.get_region('Capacity Upgrade', player).shop
                 cap_shop.inventory[1] = None  # remove arrow capacity upgrades in retro
-            for shop in random.sample([s for s in world.shops[player] if not s.locked and s.region.player == player], 5):
+            for shop in random.sample([s for s in world.shops[player] if not s.locked and s.region.name != "Red Shield Shop" and s.region.player == player], 5):
                 shop.custom = True
                 shop.locked = True
                 if retro_bow:

Rom.py

@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
 from Versions import DRVersion, GKVersion, ORVersion
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'cd81a8bfc1d67c6a13fe806c7f35a15f'
+RANDOMIZERBASEHASH = 'abaa7ce289fd18e0ab898f2ca1263db1'
 
 
 class JsonRom(object):
@@ -948,7 +948,7 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None):
             rom.write_byte(cr_pc+0x1e, 0xEE)  # slash
             rom.write_byte(cr_pc+0x1f, thousands_bot)
             # modify stat config
-            stat_address = 0x23983E
+            stat_address = 0xA39895
             stat_pc = snes_to_pc(stat_address)
             rom.write_byte(stat_pc, 0xa9)  # change to pos 21 (from b1)
             rom.write_byte(stat_pc+2, 0xc0)  # change to 12 bits (from a0)

Text.py

@@ -376,31 +376,30 @@ Sahasrahla_names = [
 
 Kakariko_texts = ["{}'s homecoming"]
 Blacksmiths_texts = [
-    'frogs for bread',
+    "Frogs for bread",
-    'That\'s not a sword',
+    "That's not a sword",
-    'The Rupeesmiths'
+    "The rupeesmiths",
-] * 1 + [
+    "The dwarven breadsmiths",
-    "the dwarven breadsmiths"
 ]
 DeathMountain_texts = [
-    "the lost old man",
+    "The lost old man",
-    "gary the old man",
+    "Gary the old man",
-    "Your ad here"
+    "Your ad here",
 ]
 LostWoods_texts = [
-    'thieves\' stump',
+    "Thieves' stump",
-] * 2 + [
+    "Thieves' stump",
-    "the forest thief",
+    "The forest thief",
-    "dancing pickles",
+    "Dancing pickles",
-    "flying crows",
+    "Flying crows",
 ]
 WishingWell_texts = [
-    "venus. queen of faeries",
+    "Venus, Queen of Faeries",
     "Venus was her name",
     "I'm your Venus",
-    "Yeah, baby, shes got it",
+    "Yeah, baby, she's got it",
     "Venus, I'm your fire",
-    "Venus, At your desire",
+    "Venus, at your desire",
     "Venus Love Chain",
     "Venus Crescent Beam",
 ]
@@ -1870,7 +1869,7 @@ class TextTable(object):
         # 100
         text['dark_sanctuary_no'] = CompressedTextMapper.convert("Then go away!")
         text['dark_sanctuary_hint_1'] = CompressedTextMapper.convert("There is a thief in the desert, he can open creepy chests that follow you. But now that we have that out of the way, Do you like my hair? I've spent eons getting it this way.")
-        text['dark_sanctuary_yes'] = CompressedTextMapper.convert("With Crystals 5&6, you can find a great fairy in the pyramid.\n\nFlomp Flomp, Whizzle Whomp")
+        text['dark_sanctuary_yes'] = CompressedTextMapper.convert("With crystals 5 and 6, you can find a great fairy in the pyramid.\n\nFlomp Flomp, Whizzle Whomp")
         text['dark_sanctuary_hint_2'] = CompressedTextMapper.convert(
             "All I can say is that my life is pretty plain,\n"
             + "I like watchin' the puddles gather rain,\n"