diff --git a/Rom.py b/Rom.py
index 261db448..67369cfa 100644
--- a/Rom.py
+++ b/Rom.py
@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '1fde4fa24bc9d3efe450c3bc30e4cf2c'
+RANDOMIZERBASEHASH = 'e2e7241bfb0085ab7ba12167565e814a'
 
 
 class JsonRom(object):
@@ -439,6 +439,8 @@ def patch_rom(world, rom, player, team, is_mystery=False):
                 location.pot.item = valid_pot_items[location.item.name]
             else:
                 code = itemid
+                if world.pottery[player] == 'none' or location.locked:
+                    code = handle_native_dungeon(location, itemid)
                 standing_item_flag = 0x80
                 if location.item.player != player:
                     standing_item_flag |= 0x40
diff --git a/data/base2current.bps b/data/base2current.bps
index b8544acb..30a30355 100644
Binary files a/data/base2current.bps and b/data/base2current.bps differ
diff --git a/source/dungeon/EnemyList.py b/source/dungeon/EnemyList.py
index 331fd310..315554a4 100644
--- a/source/dungeon/EnemyList.py
+++ b/source/dungeon/EnemyList.py
@@ -558,6 +558,10 @@ class Sprite(object):
         if self.location is not None:
             item_id = self.location.item.code if self.location.item is not None else 0x5A
             code = 0xF9 if self.location.item.player != self.location.player else 0xF8
+            if code == 0xF8:
+                world = self.location.parent_region.world
+                if world.dropshuffle[self.location.player] == 'none' or self.location.locked:
+                    item_id = handle_native_dungeon(self.location, item_id)
             data.append(item_id)
             data.append(0 if code == 0xF8 else self.location.item.player)
             data.append(code)