Merge branch 'DoorDev' into gui-improvements

This commit is contained in:
Mike A. Trethewey
2020-02-19 03:34:47 -08:00
committed by GitHub
8 changed files with 44 additions and 16 deletions

4
Rom.py
View File

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '818b2c659a610cb4112804cf612ffd37'
RANDOMIZERBASEHASH = '746b52b20a116648b624ebe58af9e54b'
class JsonRom(object):
@@ -618,6 +618,8 @@ def patch_rom(world, rom, player, team, enemized):
if builder.pre_open_stonewall.name == 'Desert Wall Slide NW':
dr_flags |= DROptions.Open_Desert_Wall
rom.write_byte(0x139006, dr_flags.value)
if dr_flags & DROptions.Town_Portal and world.mode[player] == 'inverted':
rom.write_byte(0x139008, 1)
# fix skull woods exit, if not fixed during exit patching
if world.fix_skullwoods_exit[player] and world.shuffle[player] == 'vanilla':