From 7ac893f3e007698c8ae19db3992840a432ecd131 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 3 Mar 2021 01:59:33 +0100 Subject: [PATCH] fix adjuster crash --- Main.py | 6 ++++-- Rom.py | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Main.py b/Main.py index 2d4ce2de..b22067a8 100644 --- a/Main.py +++ b/Main.py @@ -289,8 +289,10 @@ def main(args, seed=None): palettes_options['link']=args.link_palettes[player] apply_rom_settings(rom, args.heartbeep[player], args.heartcolor[player], args.quickswap[player], - args.fastmenu[player], args.disablemusic[player], args.triforcehud[player], args.sprite[player], - palettes_options, world, player, True, reduceflashing=args.reduceflashing[player] if not args.race else True) + args.fastmenu[player], args.disablemusic[player], args.sprite[player], + palettes_options, world, player, True, + reduceflashing=args.reduceflashing[player] if not args.race else True, + triforcehud=args.triforcehud[player]) mcsb_name = '' if all([world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player], diff --git a/Rom.py b/Rom.py index 44fa0f2e..1e7081dc 100644 --- a/Rom.py +++ b/Rom.py @@ -1671,8 +1671,8 @@ def hud_format_text(text): return output[:32] -def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, triforcehud, sprite: str, palettes_options, - world=None, player=1, allow_random_on_event=False, reduceflashing=False): +def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, sprite: str, palettes_options, + world=None, player=1, allow_random_on_event=False, reduceflashing=False, triforcehud:str = None): local_random = random if not world else world.rom_seeds[player] # enable instant item menu @@ -1745,9 +1745,10 @@ def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, tri rom.write_byte(0x6FA30, {'red': 0x24, 'blue': 0x2C, 'green': 0x3C, 'yellow': 0x28}[color]) rom.write_byte(0x65561, {'red': 0x05, 'blue': 0x0D, 'green': 0x19, 'yellow': 0x09}[color]) - # set triforcehud - triforce_flag = (rom.read_byte(0x180167) & 0x80) | {'normal': 0x00, 'hide_goal': 0x01, 'hide_required': 0x02, 'hide_both': 0x03}[triforcehud] - rom.write_byte(0x180167, triforce_flag) + if triforcehud: + # set triforcehud + triforce_flag = (rom.read_byte(0x180167) & 0x80) | {'normal': 0x00, 'hide_goal': 0x01, 'hide_required': 0x02, 'hide_both': 0x03}[triforcehud] + rom.write_byte(0x180167, triforce_flag) if z3pr: def buildAndRandomize(option_name, mode):