From a50170c54f0ad5694888f4635ef456d015ee3e32 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 15 Nov 2023 14:33:11 -0700 Subject: [PATCH] fix: Flute doesn't work in rain state (even if pre-activated) except for glitched modes fix(msu): GTBK Music in DR --- RELEASENOTES.md | 5 +++-- Rom.py | 2 +- data/base2current.bps | Bin 94199 -> 90613 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a2486806..0c754ac6 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -110,11 +110,12 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes * 1.2.0.22u - * ? + * Flute can't be activated in rain state (except glitched modes) (Thanks codemann!) * ER: Minor fix for Link's House on DM in Insanity (escape cave should not be re-used) - * Fixed logic issues: + * Logic issues: * Self-locking key not allowed in Sanctuary in standard (typo fixed) * More advanced bunny-walking logic in dungeons (multiple paths considred) + * MSU: GTBK song fix for DR (Thanks codemann!) * 1.2.0.21u * Fix that should force items needed for leaving Zelda's cell to before the throne room, so S&Q isn't mandatory * Small fix for Tavern Shuffle (thanks Catobat) diff --git a/Rom.py b/Rom.py index 9351970c..637cac4b 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '9b6e57f6e9d92934ce14276afd715849' +RANDOMIZERBASEHASH = '45778dbb52eca64611fbdb43a3a11ec8' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 643e68f74b79b1aa1e7712e5e48e71831c6eedc5..f5e4d204be7572897f98e8a1cfc4ad9c9c9f9dd6 100644 GIT binary patch delta 4867 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 delta 8559 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