diff --git a/Rom.py b/Rom.py index 69d46fda..56637ee3 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'b5e862bd5dee7ca32f8a80cfdf1cb8aa' +RANDOMIZERBASEHASH = 'e8fee7a4a2f70d9e24f3f2d583ae8aad' class JsonRom(object): @@ -989,13 +989,6 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): rom.write_byte(0x13f000+dungeon_id, opposite_door.roomIndex) elif not opposite_door: rom.write_byte(0x13f000+dungeon_id, 0) # no supertile preceeding boss - # fix for resuming Hera music after leaving boss room - boss_door = world.get_door('Hera Boss Down Stairs', player) - quadrant = boss_door.dest.quadrant if boss_door.dest.quadrant is not None else 0x7f - write_int16(rom, 0x13f0fe, quadrant << 9 | boss_door.dest.roomIndex) # room to resume music - boss_door = boss_door.entrance.parent_region.entrances[0].door - quadrant = boss_door.quadrant if boss_door.quadrant is not None else 0x7f - write_int16(rom, 0x13f0fc, quadrant << 9 | boss_door.roomIndex) # room to fade out if is_mystery: dr_flags |= DROptions.Hide_Total rom.write_byte(0x138004, dr_flags.value & 0xff) diff --git a/data/base2current.bps b/data/base2current.bps index d923d50f..b5f54fd1 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ