From f21dace6d5253aab3c3f1941caef548c1491fcb2 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 6 Jul 2021 13:45:45 -0700 Subject: [PATCH] A couple minor generation issues Updated release note --- Main.py | 4 +--- RELEASENOTES.md | 4 ++++ Rom.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Main.py b/Main.py index 9600fa8f..513f5a84 100644 --- a/Main.py +++ b/Main.py @@ -253,12 +253,10 @@ def main(args, seed=None, fish=None): or world.enemy_health[player] != 'default' or world.enemy_damage[player] != 'default' or sprite_random_on_hit) - if use_enemizer: - base_patch = LocalRom(args.rom) # update base2current.json - rom = JsonRom() if args.jsonout or use_enemizer else LocalRom(args.rom) if use_enemizer and (args.enemizercli or not args.jsonout): + base_patch = LocalRom(args.rom) # update base2current.json (side effect) if args.rom and not(os.path.isfile(args.rom)): raise RuntimeError("Could not find valid base rom for enemizing at expected path %s." % args.rom) if os.path.exists(args.enemizercli): diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 01f54a07..b6258011 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,10 @@ Thanks to qadan, cheuer, & compiling * Fixed some enemizer Mystery settings * Added a setting that's random enemy shuffle without Unkillable Thieves possible * Fixed shop spoiler when money balancing/multiworld balancing + * Fixed a problem with insanity + * Fixed an issue with the credit stats specific to DR (e.g. collection rate total) + * More helpful error message when bps is missing? + * Minor generation issues involving enemizer and the link sprite * 0.4.0.7 * Reduce flashing option added * Sprite author credit added diff --git a/Rom.py b/Rom.py index b0c7d989..7611aaa8 100644 --- a/Rom.py +++ b/Rom.py @@ -1643,7 +1643,7 @@ def hud_format_text(text): def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, sprite, ow_palettes, uw_palettes, reduce_flashing): - if not os.path.exists("data/sprites/official/001.link.1.zspr"): + if not os.path.exists("data/sprites/official/001.link.1.zspr") and rom.orig_buffer: dump_zspr(rom.orig_buffer[0x80000:0x87000], rom.orig_buffer[0xdd308:0xdd380], rom.orig_buffer[0xdedf5:0xdedf9], "data/sprites/official/001.link.1.zspr", "Nintendo", "Link")