diff --git a/Rom.py b/Rom.py index b37c2d5e..6344dd97 100644 --- a/Rom.py +++ b/Rom.py @@ -44,7 +44,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'd07afe36de0db3b74653570ab03a18fe' +RANDOMIZERBASEHASH = 'a9a84bfe3dd2a55f81f5353b11fba3e7' class JsonRom(object): @@ -1460,7 +1460,11 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None): rom.write_byte(0x1CFF11, 0x00) if world.doorShuffle[player] != 'vanilla': - rom.write_byte(0x1CFF00, 0x04) + if world.showloot[player] == 'always': + rom.write_byte(0x1CFF01, 0x01) + else: + rom.write_byte(0x1CFF00, 0x00) + rom.write_bytes(0x1CFF01, [0x05, 0x01, 0x04]) loot_icons = 0x1CF900 if world.bombbag[player]: diff --git a/Text.py b/Text.py index 81a5a6a1..24a799d7 100644 --- a/Text.py +++ b/Text.py @@ -1780,7 +1780,7 @@ class TextTable(object): text['mastersword_pedestal_translated'] = CompressedTextMapper.convert("A test of strength: If you have 3 pendants, I'm yours.") text['telepathic_tile_spectacle_rock'] = CompressedTextMapper.convert("{NOBORDER}\n{NOBORDER}\nUse the Mirror, or the Hookshot and Hammer, to get to Tower of Hera!") text['telepathic_tile_swamp_entrance'] = CompressedTextMapper.convert("{NOBORDER}\nDrain the floodgate to raise the water here!") - text['telepathic_tile_thieves_town_upstairs'] = CompressedTextMapper.convert("{NOBORDER}\nBlind hate's bright light.") + text['telepathic_tile_thieves_town_upstairs'] = CompressedTextMapper.convert("{NOBORDER}\nBlind hates bright light.") text['telepathic_tile_misery_mire'] = CompressedTextMapper.convert("{NOBORDER}\nLighting 4 torches will open your way forward!") text['hylian_text_2'] = CompressedTextMapper.convert("%%^= %==%\n ^ =%^=\n==%= ^^%^") text['desert_entry_translated'] = CompressedTextMapper.convert("Kneel before this stone, and magic will move around you.") diff --git a/data/base2current.bps b/data/base2current.bps index 88d3abee..9028ac7c 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ