mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-23 21:46:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895)

Browse Source 
* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes
This commit is contained in:
TakaRikka
2025-11-30 14:23:42 -08:00
committed by GitHub
parent 434415337d
commit a6e76c0841
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Z2AudioLib/Z2SoundMgr.cpp
-22
View File
@@ -11,7 +11,6 @@
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include "d/d_com_inf_game.h"
/* 802A9BC8-802A9E80 2A4508 02B8+00 1/0 1/1 0/0 .text seqCallback__FP8JASTrackUs */
u16 seqCallback(JASTrack* track, u16 command) {
switch (command) {
case 0x1000:
@@ -101,7 +100,6 @@ u16 seqCallback(JASTrack* track, u16 command) {
return 0;
}
/* 802A9E80-802A9EE8 2A47C0 0068+00 0/0 1/1 0/0 .text __ct__10Z2SoundMgrFv */
Z2SoundMgr::Z2SoundMgr() :
JASGlobalInstance<Z2SoundMgr>(true),
seMgr_(true),
@@ -111,8 +109,6 @@ Z2SoundMgr::Z2SoundMgr() :
soundID_.setAnonymous();
}
/* 802A9EE8-802AA1B0 2A4828 02C8+00 1/0 0/0 0/0 .text
* startSound__10Z2SoundMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
bool Z2SoundMgr::startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr) {
int soundType = Z2GetSoundInfo()->getSoundType(soundID);
switch (soundType) {
@@ -185,7 +181,6 @@ bool Z2SoundMgr::startSound(JAISoundID soundID, JAISoundHandle* handle, const JG
return false;
}
/* 802AA1B0-802AA270 2A4AF0 00C0+00 2/2 0/0 0/0 .text calc__10Z2SoundMgrFv */
void Z2SoundMgr::calc() {
seMgr_.calc();
if (!soundID_.isAnonymous() && !isPlayingSoundID(soundID_)) {
@@ -198,8 +193,6 @@ void Z2SoundMgr::calc() {
streamMgr_.calc();
}
/* 802AA270-802AA33C 2A4BB0 00CC+00 1/1 2/2 0/0 .text setIIR__10Z2SoundMgrFP8JAISoundPCs
*/
void Z2SoundMgr::setIIR(JAISound* sound, const s16* iir) {
if (sound != NULL) {
JASTrack* track = sound->getTrack();
@@ -219,12 +212,10 @@ void Z2SoundMgr::setIIR(JAISound* sound, const s16* iir) {
}
}
/* 8039B9C0-8039B9D0 028020 0010+00 1/1 0/0 0/0 .rodata cResetFilterTable */
static s16 const cResetFilterTable[8] = {
0x7FFF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
};
/* 802AA33C-802AA430 2A4C7C 00F4+00 1/1 0/0 0/0 .text setFilterOff__10Z2SoundMgrFP8JAISound */
void Z2SoundMgr::setFilterOff(JAISound* sound) {
if (sound != NULL) {
JASTrack* track = sound->getTrack();
@@ -246,7 +237,6 @@ void Z2SoundMgr::setFilterOff(JAISound* sound) {
}
}
/* 802AA430-802AA528 2A4D70 00F8+00 0/0 1/1 0/0 .text resetFilterAll__10Z2SoundMgrFv */
void Z2SoundMgr::resetFilterAll() {
int i = 1;
if (Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING) {
@@ -274,7 +264,6 @@ void Z2SoundMgr::resetFilterAll() {
}
}
/* 802AA528-802AA67C 2A4E68 0154+00 2/2 0/0 0/0 .text mixOut__10Z2SoundMgrFv */
void Z2SoundMgr::mixOut() {
if (Z2Param::DARK_SE_FILTER_ON && Z2GetSceneMgr()->isInDarkness()) {
int i = 1;
@@ -308,14 +297,11 @@ void Z2SoundMgr::mixOut() {
streamMgr_.mixOut();
}
/* 802AA67C-802AA6B0 2A4FBC 0034+00 0/0 1/1 0/0 .text framework__10Z2SoundMgrFv */
void Z2SoundMgr::framework() {
calc();
mixOut();
}
/* 802AA6B0-802AA7DC 2A4FF0 012C+00 0/0 1/1 0/0 .text pauseAllGameSound__10Z2SoundMgrFb
*/
void Z2SoundMgr::pauseAllGameSound(bool paused) {
seMgr_.getCategory(0)->pause(paused);
seMgr_.getCategory(1)->pause(paused);
@@ -341,14 +327,12 @@ void Z2SoundMgr::pauseAllGameSound(bool paused) {
}
}
/* 802AA7DC-802AA84C 2A511C 0070+00 0/0 1/1 0/0 .text stopSoundID__10Z2SoundMgrF10JAISoundID */
void Z2SoundMgr::stopSoundID(JAISoundID soundID) {
seMgr_.stopSoundID(soundID);
seqMgr_.stopSoundID(soundID);
streamMgr_.stopSoundID(soundID);
}
/* 802AA84C-802AA8C8 2A518C 007C+00 0/0 1/1 0/0 .text stopSync__10Z2SoundMgrFv */
void Z2SoundMgr::stopSync() {
stop();
while (seMgr_.getNumActiveSe() > 0 || seqMgr_.getNumActiveSeqs() > 0) {
@@ -361,14 +345,12 @@ void Z2SoundMgr::stopSync() {
}
}
/* 802AA8C8-802AA908 2A5208 0040+00 1/1 0/0 0/0 .text stop__10Z2SoundMgrFv */
void Z2SoundMgr::stop() {
seMgr_.stop();
seqMgr_.stop();
streamMgr_.stop();
}
/* 802AA908-802AA9E8 2A5248 00E0+00 0/0 1/1 0/0 .text initParams__10Z2SoundMgrFv */
void Z2SoundMgr::initParams() {
JUT_ASSERT(613, ! seMgr_.isActive());
JUT_ASSERT(614, ! seqMgr_.isActive());
@@ -378,8 +360,6 @@ void Z2SoundMgr::initParams() {
streamMgr_.getParams()->init();
}
/* 802AA9E8-802AAAC4 2A5328 00DC+00 0/0 1/1 0/0 .text
* multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf */
void Z2SoundMgr::multiVolumeSoundID(JAISoundID soundID, f32 volume) {
if (!soundID.isAnonymous() && Z2GetSoundInfo()->getSoundType(soundID) == 0) {
int category = Z2GetSoundInfo()->getCategory(soundID);
@@ -391,8 +371,6 @@ void Z2SoundMgr::multiVolumeSoundID(JAISoundID soundID, f32 volume) {
}
}
/* 802AAAC4-802AAB94 2A5404 00D0+00 1/1 0/0 0/0 .text isPlayingSoundID__10Z2SoundMgrF10JAISoundID
*/
bool Z2SoundMgr::isPlayingSoundID(JAISoundID soundID) {
if (soundID.isAnonymous()) {
return false;