From bfa8f20cf95fd81cad484c9ba0537e6fedd9c0cc Mon Sep 17 00:00:00 2001 From: sornerol <47842483+sornerol@users.noreply.github.com> Date: Mon, 13 May 2019 13:45:27 -0500 Subject: [PATCH] Set state.spu.ch1.master = true (Fixes #1539) This fixes #1539. Prior to 2.2.2, state.spu.ch1.master was set to false when using a BIOS. Starting with 2.2.2, the Game Boy BIOS is required. Setting this to true causes a buzzing sound while the Nintendo logo drops during BIOS. --- libgambatte/src/initstate.cpp | 2 +- output/dll/libgambatte.dll | Bin 170496 -> 170496 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libgambatte/src/initstate.cpp b/libgambatte/src/initstate.cpp index f8c488efcc..6f6e3a6e7c 100644 --- a/libgambatte/src/initstate.cpp +++ b/libgambatte/src/initstate.cpp @@ -1278,7 +1278,7 @@ void gambatte::setInitState(SaveState &state, const bool cgb, const bool gbaCgbM state.spu.ch1.lcounter.counter = SoundUnit::COUNTER_DISABLED; state.spu.ch1.lcounter.lengthCounter = 0; state.spu.ch1.nr4 = 0; - state.spu.ch1.master = true; + state.spu.ch1.master = false; state.spu.ch2.duty.nextPosUpdate = SoundUnit::COUNTER_DISABLED; state.spu.ch2.duty.nr3 = 0; diff --git a/output/dll/libgambatte.dll b/output/dll/libgambatte.dll index 6b005e507a671b2cd9d373febd482676f80d9a8f..03e8ecd3795aa1a79f1a3e1a4ead98f60f0141ea 100644 GIT binary patch delta 8839 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 S6K%b>$(C-ytqwdWC;bo2WiE99 delta 8775 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 A-T(jq