From 14079b373f1a86b87339c1eb7284aec5479c34ab Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 27 Jul 2021 02:40:51 -0500 Subject: [PATCH] Fix for boss music not playing in non-DR modes --- Rom.py | 2 +- data/base2current.bps | Bin 141213 -> 141217 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index bf4275ea..55d8a929 100644 --- a/Rom.py +++ b/Rom.py @@ -31,7 +31,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'abcc9ca7e5ec6eac56a70e8b248a5883' +RANDOMIZERBASEHASH = '9f660065954a8ebdca25773531c93543' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index f66931c092e72fc563326a568893875d44bf4599..40ef303eb26adce053ddd198860789822073b4f4 100644 GIT binary patch delta 5445 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 N<*i?cVh$4E{{it~ylVge delta 5544 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