Merged in DR v1.4.8

ItemList.py

@@ -355,6 +355,16 @@ def generate_itempool(world, player):
                                 or (item.map and world.mapshuffle[player] not in ['none', 'nearby'])
                                 or (item.compass and world.compassshuffle[player] not in ['none', 'nearby']))])
     
+    if world.logic[player] == 'hybridglitches' and world.pottery[player] not in ['none', 'cave']:
+        keys_to_remove = 2
+        to_remove = []
+        for wix, wi in enumerate(world.itempool):
+            if wi.name == 'Small Key (Swamp Palace)' and wi.player == player:
+                to_remove.append(wix)
+            if keys_to_remove == len(to_remove):
+                break
+        for wix in reversed(to_remove):
+            del world.itempool[wix]
 
     # logic has some branches where having 4 hearts is one possible requirement (of several alternatives)
     # rather than making all hearts/heart pieces progression items (which slows down generation considerably)