From 2da8dc72ccb3a160dbe704ba9f7fd18c4e6ec422 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 7 Apr 2023 15:47:56 -0500 Subject: [PATCH] Better fix for Hera music silence This reverts commit c2b3d8ce6cf33ed735a6819e5d39c6e0b589ba23, reversing changes made to 1bf95fe2d77fe55906d0f16e9d78f9f5ede4c118. --- Rom.py | 9 +-------- data/base2current.bps | Bin 106126 -> 106120 bytes 2 files changed, 1 insertion(+), 8 deletions(-) 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 d923d50f84a63b859add903f538d6f7c43a319bb..b5f54fd1665d907ce86fc6afb392c96a90a09438 100644 GIT binary patch delta 3078 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