From 2f0e27b8e2b06520a19fd5cf5d69429bcf4ef09e Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 28 Mar 2024 13:15:58 -0600 Subject: [PATCH] fix: dungeon indicator changes from rom --- RELEASENOTES.md | 6 +++++- Rom.py | 5 ++--- data/base2current.bps | Bin 117491 -> 117467 bytes 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index db0682ed..7b843e09 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -142,7 +142,11 @@ These are now independent of retro mode and have three options: None, Random, an # Patch Notes * 1.4.1.9u - * todo + * Enemy Drop Underworld: Changed enemy drop indicator to not require compass + * Experimental: Moved dark world bunny spawns out of experimental. (It is now always on) + * Fix: Red/Blue pendants were swapped for autotracking. (Thanks Muffins!) + * Fix: Red square sometimes wasn't blinking + * Updated tournament winner * 1.4.1.8u * HUD: New dungeon indicators based on common abbreviations * OWG+HMG: EG is allowed to be armed diff --git a/Rom.py b/Rom.py index fba37983..59470684 100644 --- a/Rom.py +++ b/Rom.py @@ -42,7 +42,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '67b9ede4928dac94a650e9e9396ef44a' +RANDOMIZERBASEHASH = 'deda3f2e279062c296181393dba6c51c' class JsonRom(object): @@ -569,8 +569,7 @@ def patch_rom(world, rom, player, team, is_mystery=False): rom.write_bytes(0xfb1fc, [0xc8, 0x9d, 0x69, 0xb4, 0xac, 0x5d]) if world.standardize_palettes[player] == 'original': dr_flags |= DROptions.OriginalPalettes - if world.experimental[player]: - dr_flags |= DROptions.DarkWorld_Spawns + dr_flags |= DROptions.DarkWorld_Spawns # no longer experimental if world.logic[player] not in ['owglitches', 'hybridglitches', 'nologic']: dr_flags |= DROptions.Fix_EG if world.door_type_mode[player] in ['big', 'all', 'chaos']: diff --git a/data/base2current.bps b/data/base2current.bps index 2c405d81b1fbf77c1277b1196a8966a11e127452..ea0dde9614bb5a511efad354d0fee752e1f510bf 100644 GIT binary patch delta 1459 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