diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-03 18:09:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-03 15:09:56 -0800 |
| commit | f97d334732201e5a8e1250318925c90d0c715225 (patch) | |
| tree | dffb749eaa0db03a031d854c319dc7e8f6d8e7b5 /src/Z2AudioLib/Z2AudioMgr.cpp | |
| parent | 5716efc4c86f5e7e03263f0ed426c5e9ae834cd3 (diff) | |
Debug+retail matches and clean up some fakematches (#2910)
* Debug matches
* Match daAlink_c::procGrassWhistleWait
* Match JASAramStream::channelProc
* More debug matches
* Match JAUStreamStaticAramMgr_::deleteStreamAram and bitset inlines
* Fix some fakematches
* Fix gameinfo player info not being a struct
* Update bug comments
* Fix procids in alink
* d_a_scene_exit OK
Diffstat (limited to 'src/Z2AudioLib/Z2AudioMgr.cpp')
| -rw-r--r-- | src/Z2AudioLib/Z2AudioMgr.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Z2AudioLib/Z2AudioMgr.cpp b/src/Z2AudioLib/Z2AudioMgr.cpp index 14af97ccd0..8a4a3930bd 100644 --- a/src/Z2AudioLib/Z2AudioMgr.cpp +++ b/src/Z2AudioLib/Z2AudioMgr.cpp @@ -24,7 +24,6 @@ Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) { field_0x519 = false; } -// NONMATCHING JASPoolAllocObject<_> locations void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive* seqArc) { JAU_JASInitializer JASInitializer; JASInitializer.audioMemSize_ = memSize; @@ -62,6 +61,10 @@ void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive categoryArrangement.mItems[8].mMaxInactiveSe = 5; categoryArrangement.mItems[9].mMaxActiveSe = 8; categoryArrangement.mItems[9].mMaxInactiveSe = 4; + #if PLATFORM_WII || PLATFORM_SHIELD + categoryArrangement.mItems[10].mMaxInactiveSe = 4; + categoryArrangement.mItems[11].mMaxInactiveSe = 2; + #endif seMgr->setCategoryArrangement(categoryArrangement); seMgr->getCategory(0)->getParams()->moveVolume(Z2Param::VOL_SE_SYSTEM_DEFAULT, 0); @@ -74,6 +77,9 @@ void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive seMgr->getCategory(7)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_DEFAULT, 0); seMgr->getCategory(8)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_DEFAULT, 0); seMgr->getCategory(9)->getParams()->moveVolume(Z2Param::VOL_SE_ATMOSPHERE_DEFAULT, 0); + #if PLATFORM_WII || PLATFORM_SHIELD + seMgr->getCategory(10)->getParams()->moveVolume(1.0f, 0); + #endif seMgr->getParams()->moveVolume(1.0f, 0); |