-Key shuffler fix (needs some more testing)

-Mirror Scroll should now choose correct spawn point
-Desert Wall Slide fixed for Skull/Desert builders

DoorShuffle.py

@@ -861,8 +861,11 @@ def combine_layouts(recombinant_builders, dungeon_builders, entrances_map):
                 if recombine.master_sector is None:
                     recombine.master_sector = builder.master_sector
                     recombine.master_sector.name = recombine.name
+                    recombine.pre_open_stonewall = builder.pre_open_stonewall
                 else:
                     recombine.master_sector.regions.extend(builder.master_sector.regions)
+                    if builder.pre_open_stonewall:
+                        recombine.pre_open_stonewall = builder.pre_open_stonewall
         recombine.layout_starts = list(entrances_map[recombine.name])
         dungeon_builders[recombine.name] = recombine
 
@@ -1068,7 +1071,7 @@ def find_key_door_candidates(region, checked, world, player):
                                 candidates.append(d2)
                         else:
                             valid = True
-                if valid:
+                if valid and d not in candidates:
                     candidates.append(d)
                 if ext.connected_region.type != RegionType.Dungeon or ext.connected_region.dungeon == dungeon:
                     queue.append((ext.connected_region, d, current))

Main.py

@@ -23,7 +23,7 @@ from Fill import distribute_items_cutoff, distribute_items_staleness, distribute
 from ItemList import generate_itempool, difficulties, fill_prizes
 from Utils import output_path, parse_player_names
 
-__version__ = '0.0.15pre'
+__version__ = '0.0.16pre'
 
 
 def main(args, seed=None):

Rom.py

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '746b52b20a116648b624ebe58af9e54b'
+RANDOMIZERBASEHASH = '5e01caffabb4509a0987ef2f2f0bcd56'
 
 
 class JsonRom(object):

asm/overrides.asm

@@ -50,6 +50,4 @@ MirrorCheckOverride:
     + lda DRScroll : rtl
 
 MirrorCheckOverride2:
-    lda $7ef353 : cmp #$02 : beq +
-        sep #$02 ; clear zero flag, I think
-    + rtl
+    lda $7ef353 : and #$02 : rtl