From 14ced2435c4ae4829ee27f26198160fce25e805f Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 6 Mar 2023 16:29:58 -0700 Subject: [PATCH] Update for enemizer bits --- RELEASENOTES.md | 3 ++- Rom.py | 4 ++-- source/classes/CustomSettings.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ac51ccda..e87d4a22 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -112,8 +112,9 @@ These are now independent of retro mode and have three options: None, Random, an * Fixed an issue with lower layer doors in Standard * Fix for doors in cave state (will no longer be vanilla) * Added a logic rule for th murderdactyl near bumper ledge for OHKO purposes + * Enemizer alteration for Hovers and normal enemies in shallow water * Fix for beemizer including modes with an increased item pool - * Fix for district algoritm + * Fix for district algorithm * 1.2.0.10u * Fixed overrun issues with edge transitions * Better support for customized start_inventory with dungeon items diff --git a/Rom.py b/Rom.py index 981b554a..13b4f133 100644 --- a/Rom.py +++ b/Rom.py @@ -1684,8 +1684,8 @@ def write_custom_shops(rom, world, player): def write_enemizer_tweaks(rom, world, player): if world.enemy_shuffle[player] != 'none': - rom.write_byte(snes_to_pc(0x1DF6D8, 0)) # lets enemies walk on water instead of clipping into infinity? - rom.write_byte(snes_to_pc(0x0DB6B3, 0x82)) # hovers don't need water necessarily? + rom.write_byte(snes_to_pc(0x1DF6D8), 0) # lets enemies walk on water instead of clipping into infinity? + rom.write_byte(snes_to_pc(0x0DB6B3), 0x82) # hovers don't need water necessarily? def hud_format_text(text): output = bytes() diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py index fd15253f..53105764 100644 --- a/source/classes/CustomSettings.py +++ b/source/classes/CustomSettings.py @@ -129,8 +129,8 @@ class CustomSettings(object): args.mapshuffle[p] = True args.compassshuffle[p] = True - args.shufflebosses[p] = get_setting(settings['shufflebosses'], args.shufflebosses[p]) - args.shuffleenemies[p] = get_setting(settings['shuffleenemies'], args.shuffleenemies[p]) + args.shufflebosses[p] = get_setting(settings['boss_shuffle'], args.shufflebosses[p]) + args.shuffleenemies[p] = get_setting(settings['enemy_shuffle'], args.shuffleenemies[p]) args.enemy_health[p] = get_setting(settings['enemy_health'], args.enemy_health[p]) args.enemy_damage[p] = get_setting(settings['enemy_damage'], args.enemy_damage[p]) args.shufflepots[p] = get_setting(settings['shufflepots'], args.shufflepots[p])