From b3a3adb2f08ae1086ee7496589a783db401d19c4 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 11 Aug 2021 06:05:46 -0500 Subject: [PATCH] Various music fixes MSU-1 LW2 track changes on Aga1 Kill instead of ped pull Fixed ambient SFX stutter issue --- Rom.py | 2 +- data/base2current.bps | Bin 141129 -> 141167 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index cab4cc48..97bdfc3f 100644 --- a/Rom.py +++ b/Rom.py @@ -31,7 +31,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'b71ccf874145fd21bf215b4b553e26ad' +RANDOMIZERBASEHASH = 'cc8fc59caa0bbe6d26ac64b9d2893709' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 290c305750aca233d584940f68f1a989a6cbb82e..6a4a34e265eac6877f69ae5e8469811901ebcee0 100644 GIT binary patch delta 6003 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 Tk+u!NibXGm6xi4~8yEZ^T{o(= delta 6013 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 pv9D=