From 044fec8706f7e480deb085482dcc1f9c23ddcee2 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 8 Nov 2023 00:05:32 -0800 Subject: [PATCH] JASWaveBankMgr match --- configure.py | 2 +- src/JSystem/JAudio/JASWaveBankMgr.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index a53d992ab..46522a152 100644 --- a/configure.py +++ b/configure.py @@ -684,7 +684,7 @@ config.libs = [ Object(NonMatching, "JSystem/JAudio/JASWSParser.cpp"), Object(NonMatching, "JSystem/JAudio/JASBNKParser.cpp"), Object(NonMatching, "JSystem/JAudio/JASWaveArcLoader.cpp"), - Object(NonMatching, "JSystem/JAudio/JASWaveBankMgr.cpp"), + Object(Matching, "JSystem/JAudio/JASWaveBankMgr.cpp"), Object(NonMatching, "JSystem/JAudio/JASBankMgr.cpp"), Object(NonMatching, "JSystem/JAudio/JASAudioThread.cpp"), Object(NonMatching, "JSystem/JAudio/JASDSPBuf.cpp"), diff --git a/src/JSystem/JAudio/JASWaveBankMgr.cpp b/src/JSystem/JAudio/JASWaveBankMgr.cpp index a1438f222..20f51845c 100644 --- a/src/JSystem/JAudio/JASWaveBankMgr.cpp +++ b/src/JSystem/JAudio/JASWaveBankMgr.cpp @@ -39,7 +39,6 @@ JASystem::TWaveBank* JASystem::WaveBankMgr::getWaveBank(int banknum) { /* 80288390-80288444 .text registWaveBank__Q28JASystem11WaveBankMgrFiPQ28JASystem9TWaveBank */ bool JASystem::WaveBankMgr::registWaveBank(int banknum, TWaveBank* param_2) { - /* Nonmatching */ JUT_ASSERT(57, banknum >= 0); JUT_ASSERT(58, banknum < sTableSize); sWaveBank[banknum] = param_2; @@ -48,7 +47,6 @@ bool JASystem::WaveBankMgr::registWaveBank(int banknum, TWaveBank* param_2) { /* 80288444-802884BC .text registWaveBankWS__Q28JASystem11WaveBankMgrFiPv */ bool JASystem::WaveBankMgr::registWaveBankWS(int param_1, void* param_2) { - /* Nonmatching */ TWaveBank* bank; if (WSParser::getGroupCount(param_2) == 1) { bank = WSParser::createSimpleWaveBank(param_2); @@ -81,10 +79,9 @@ bool JASystem::WaveBankMgr::loadWave(int banknum, int param_2, Kernel::THeap* pa /* 80288550-80288594 .text eraseWave__Q28JASystem11WaveBankMgrFii */ bool JASystem::WaveBankMgr::eraseWave(int banknum, int param_2) { - /* Nonmatching */ TWaveArc* arc = getWaveArc(banknum, param_2); if (arc == NULL) { return false; } - return arc->erase() != false; + return !!arc->erase(); }