Merged in DR v1.2.0.12

Main.py

@@ -36,7 +36,7 @@ from source.overworld.EntranceShuffle2 import link_entrances_new
 from source.tools.BPS import create_bps_from_data
 from source.classes.CustomSettings import CustomSettings
 
-__version__ = '1.2.0.11u'
+__version__ = '1.2.0.12u'
 
 from source.classes.BabelFish import BabelFish
 

RELEASENOTES.md

@@ -108,12 +108,16 @@ These are now independent of retro mode and have three options: None, Random, an
 * Bonk Fairy (Dark)
 
 # Bug Fixes and Notes
+* 1.2.0.12u
+  * Fix for mirror portal in inverted
+  * Yet another fix for blocked door in Standard ER
 * 1.2.0.11u
   * Fixed an issue with lower layer doors in Standard
   * Fix for doors in cave state (will no longer be vanilla)
   * Added a logic rule for th murderdactyl near bumper ledge for OHKO purposes
+  * Enemizer alteration for Hovers and normal enemies in shallow water
   * Fix for beemizer including modes with an increased item pool 
-  * Fix for district algoritm
+  * Fix for district algorithm
 * 1.2.0.10u
   * Fixed overrun issues with edge transitions
   * Better support for customized start_inventory with dungeon items

Rom.py

@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '9ea9fca9e2c9a2cc37287368a860105b'
+RANDOMIZERBASEHASH = '2b14cd0bbab8a7fb943c8bc1ca75ed1f'
 
 
 class JsonRom(object):
@@ -1788,8 +1788,8 @@ def write_custom_shops(rom, world, player):
 
 def write_enemizer_tweaks(rom, world, player):
     if world.enemy_shuffle[player] != 'none':
-        rom.write_byte(snes_to_pc(0x1DF6D8, 0))  # lets enemies walk on water instead of clipping into infinity?
-        rom.write_byte(snes_to_pc(0x0DB6B3, 0x82))  # hovers don't need water necessarily?
+        rom.write_byte(snes_to_pc(0x1DF6D8), 0)  # lets enemies walk on water instead of clipping into infinity?
+        rom.write_byte(snes_to_pc(0x0DB6B3), 0x82)  # hovers don't need water necessarily?
 
 def hud_format_text(text):
     output = bytes()

source/classes/CustomSettings.py

@@ -130,8 +130,8 @@ class CustomSettings(object):
                     args.mapshuffle[p] = True
                     args.compassshuffle[p] = True
 
-                args.shufflebosses[p] = get_setting(settings['shufflebosses'], args.shufflebosses[p])
-                args.shuffleenemies[p] = get_setting(settings['shuffleenemies'], args.shuffleenemies[p])
+                args.shufflebosses[p] = get_setting(settings['boss_shuffle'], args.shufflebosses[p])
+                args.shuffleenemies[p] = get_setting(settings['enemy_shuffle'], args.shuffleenemies[p])
                 args.enemy_health[p] = get_setting(settings['enemy_health'], args.enemy_health[p])
                 args.enemy_damage[p] = get_setting(settings['enemy_damage'], args.enemy_damage[p])
                 args.shufflepots[p] = get_setting(settings['shufflepots'], args.shufflepots[p])