diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index a563c586fa..04fe0c28b8 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -1801,12 +1801,12 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandDisconnect(u8* _Input) ERROR_LOG(WII_IPC_WIIMOTE, "IPC CommandDisconnect: WiiMote emulation is out of sync.\n" "This message will be shot one time only, because dolphin does\n" "not executes the disconnect at all and some times you can play\n" - "anyway. It is strongly recommed to save and/or restart the\n" + "anyway. It is strongly recommended to save and/or restart the\n" "emulation."); PanicAlert("IPC CommandDisconnect: WiiMote emulation is out of sync.\n" "This message will be shot one time only, because dolphin does\n" "not executes the disconnect at all and some times you can play\n" - "anyway. It is strongly recommed to save and/or restart the\n" + "anyway. It is strongly recommended to save and/or restart the\n" "emulation."); } INFO_LOG(CONSOLE, "IPC CommandDisconnect\n"); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp index 78ad0ecd47..45aec0055a 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp @@ -113,6 +113,11 @@ void DSPConfigDialogHLE::AddBackend(const char* backend) #endif } +void DSPConfigDialogHLE::ClearBackends() +{ + m_BackendSelection->Clear(); +} + DSPConfigDialogHLE::~DSPConfigDialogHLE() { } diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h index 37a1292783..36e6968b57 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h @@ -35,6 +35,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE); virtual ~DSPConfigDialogHLE(); void AddBackend(const char *backend); + void ClearBackends(); private: DECLARE_EVENT_TABLE(); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp index d98573f922..f11769fe9d 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp @@ -176,6 +176,8 @@ void DllConfig(HWND _hParent) else if (!m_ConfigFrame->GetParent()->IsShown()) m_ConfigFrame->Close(true); + m_ConfigFrame->ClearBackends(); + // add backends std::vector backends = AudioCommon::GetSoundBackends(); diff --git a/docs/DSP/DSP_UC_Zelda.txt b/docs/DSP/DSP_UC_Zelda.txt index 2bb82bdb28..74bcaea043 100644 --- a/docs/DSP/DSP_UC_Zelda.txt +++ b/docs/DSP/DSP_UC_Zelda.txt @@ -3680,16 +3680,16 @@ void 0ab3_Decoder0x21Core(AC1.M, AR3) { // 0abb 0292 0ad1 jg 0x0ad1 - if ([0x043a,0x043b] > AC1.M) { + if ([0x043a,0x043b] <= AC1.M) { // Happens when sound has finished playing? // 0abd 8900 clr $ACC1 // 0abe 00c0 043b lr $AR0, @0x043b ACC1 = 0; - AR0 = 0x043b; + AR0 = *0x043b; // 0ac0 02bf 0af6 call 0x0af6 // 0af6_Decoder0x21_MoreStuff() - 0af6_Decoder0x21_MoreStuff(AR0=0x043b, AR3); + 0af6_Decoder0x21_MoreStuff(AR0=*0x043b, AR3); // 0ac2 8100 clr $ACC0 // 0ac3 1fd8 mrr $AC0.M, $AX0.L