mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-10 11:05:07 -04:00
project cleanup (#2895)
* 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:
@@ -1,8 +1,3 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: JASBasicWaveBank
|
||||
//
|
||||
|
||||
#include "JSystem/JSystem.h" // IWYU pragma: keep
|
||||
|
||||
#include "JSystem/JAudio2/JASBasicWaveBank.h"
|
||||
@@ -10,7 +5,6 @@
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
|
||||
/* 802984F8-80298558 292E38 0060+00 0/0 1/1 0/0 .text __ct__16JASBasicWaveBankFv */
|
||||
JASBasicWaveBank::JASBasicWaveBank() {
|
||||
mWaveTable = NULL;
|
||||
mWaveGroupArray = NULL;
|
||||
@@ -19,14 +13,11 @@ JASBasicWaveBank::JASBasicWaveBank() {
|
||||
OSInitMutex(&field_0x4);
|
||||
}
|
||||
|
||||
/* 80298558-802985E4 292E98 008C+00 1/0 0/0 0/0 .text __dt__16JASBasicWaveBankFv */
|
||||
JASBasicWaveBank::~JASBasicWaveBank() {
|
||||
delete[] mWaveTable;
|
||||
delete[] mWaveGroupArray;
|
||||
}
|
||||
|
||||
/* 80298640-80298664 292F80 0024+00 1/1 1/1 0/0 .text getWaveGroup__16JASBasicWaveBankFUl
|
||||
*/
|
||||
JASBasicWaveBank::TWaveGroup* JASBasicWaveBank::getWaveGroup(u32 param_0) {
|
||||
if (param_0 >= mGroupCount) {
|
||||
return NULL;
|
||||
@@ -34,8 +25,6 @@ JASBasicWaveBank::TWaveGroup* JASBasicWaveBank::getWaveGroup(u32 param_0) {
|
||||
return mWaveGroupArray + param_0;
|
||||
}
|
||||
|
||||
/* 80298664-80298710 292FA4 00AC+00 0/0 1/1 0/0 .text
|
||||
* setGroupCount__16JASBasicWaveBankFUlP7JKRHeap */
|
||||
void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
|
||||
delete[] mWaveGroupArray;
|
||||
mGroupCount = param_0;
|
||||
@@ -46,8 +35,6 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80298710-80298790 293050 0080+00 0/0 1/1 0/0 .text
|
||||
* setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap */
|
||||
void JASBasicWaveBank::setWaveTableSize(u32 param_0, JKRHeap* param_1) {
|
||||
delete[] mWaveTable;
|
||||
mWaveTable = new(param_1, 0) TWaveHandle[param_0];
|
||||
@@ -55,8 +42,6 @@ void JASBasicWaveBank::setWaveTableSize(u32 param_0, JKRHeap* param_1) {
|
||||
mHandleCount = param_0;
|
||||
}
|
||||
|
||||
/* 80298790-8029883C 2930D0 00AC+00 1/1 0/0 0/0 .text
|
||||
* incWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup */
|
||||
void JASBasicWaveBank::incWaveTable(JASBasicWaveBank::TWaveGroup const* param_0) {
|
||||
JASMutexLock lock(&field_0x4);
|
||||
for (u32 i = 0; i < param_0->getWaveCount(); i++) {
|
||||
@@ -69,11 +54,8 @@ void JASBasicWaveBank::incWaveTable(JASBasicWaveBank::TWaveGroup const* param_0)
|
||||
}
|
||||
}
|
||||
|
||||
/* 80451278-80451280 000778 0004+04 2/2 0/0 0/0 .sbss mNoLoad__16JASBasicWaveBank */
|
||||
u32 JASBasicWaveBank::mNoLoad;
|
||||
|
||||
/* 8029883C-802988DC 29317C 00A0+00 1/1 0/0 0/0 .text
|
||||
* decWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup */
|
||||
void JASBasicWaveBank::decWaveTable(JASBasicWaveBank::TWaveGroup const* param_0) {
|
||||
JASMutexLock lock(&field_0x4);
|
||||
for (u32 i = 0; i < param_0->getWaveCount(); i++) {
|
||||
@@ -86,7 +68,6 @@ void JASBasicWaveBank::decWaveTable(JASBasicWaveBank::TWaveGroup const* param_0)
|
||||
}
|
||||
}
|
||||
|
||||
/* 802988DC-80298910 29321C 0034+00 1/0 0/0 0/0 .text getWaveHandle__16JASBasicWaveBankCFUl */
|
||||
JASWaveHandle* JASBasicWaveBank::getWaveHandle(u32 param_0) const {
|
||||
if (param_0 >= mHandleCount) {
|
||||
return NULL;
|
||||
@@ -97,8 +78,6 @@ JASWaveHandle* JASBasicWaveBank::getWaveHandle(u32 param_0) const {
|
||||
return mWaveTable + param_0;
|
||||
}
|
||||
|
||||
/* 80298910-802989C0 293250 00B0+00 0/0 1/1 0/0 .text
|
||||
* setWaveInfo__16JASBasicWaveBankFPQ216JASBasicWaveBank10TWaveGroupiUsRC11JASWaveInfo */
|
||||
void JASBasicWaveBank::setWaveInfo(JASBasicWaveBank::TWaveGroup* wgrp, int index,
|
||||
u16 param_2, JASWaveInfo const& param_3) {
|
||||
JUT_ASSERT(204, wgrp);
|
||||
@@ -111,20 +90,16 @@ void JASBasicWaveBank::setWaveInfo(JASBasicWaveBank::TWaveGroup* wgrp, int index
|
||||
wgrp->mCtrlWaveArray[index].field_0x4 = param_3.field_0x08;
|
||||
}
|
||||
|
||||
/* 802989C0-80298A0C 293300 004C+00 1/1 0/0 0/0 .text __ct__Q216JASBasicWaveBank10TWaveGroupFv */
|
||||
JASBasicWaveBank::TWaveGroup::TWaveGroup() {
|
||||
mBank = NULL;
|
||||
mCtrlWaveArray = NULL;
|
||||
mWaveCount = 0;
|
||||
}
|
||||
|
||||
/* 80298A0C-80298A84 29334C 0078+00 3/2 0/0 0/0 .text __dt__Q216JASBasicWaveBank10TWaveGroupFv */
|
||||
JASBasicWaveBank::TWaveGroup::~TWaveGroup() {
|
||||
delete[] mCtrlWaveArray;
|
||||
}
|
||||
|
||||
/* 80298A84-80298B04 2933C4 0080+00 0/0 1/1 0/0 .text
|
||||
* setWaveCount__Q216JASBasicWaveBank10TWaveGroupFUlP7JKRHeap */
|
||||
void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) {
|
||||
delete[] mCtrlWaveArray;
|
||||
mWaveCount = param_0;
|
||||
@@ -132,31 +107,23 @@ void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) {
|
||||
JUT_ASSERT(255, mCtrlWaveArray != NULL);
|
||||
}
|
||||
|
||||
/* 80298B04-80298B2C 293444 0028+00 1/0 0/0 0/0 .text
|
||||
* onLoadDone__Q216JASBasicWaveBank10TWaveGroupFv */
|
||||
void JASBasicWaveBank::TWaveGroup::onLoadDone() {
|
||||
JUT_ASSERT(286, mBank);
|
||||
mBank->incWaveTable(this);
|
||||
}
|
||||
|
||||
/* 80298B2C-80298B54 29346C 0028+00 1/0 0/0 0/0 .text
|
||||
* onEraseDone__Q216JASBasicWaveBank10TWaveGroupFv */
|
||||
void JASBasicWaveBank::TWaveGroup::onEraseDone() {
|
||||
JUT_ASSERT(292, mBank);
|
||||
mBank->decWaveTable(this);
|
||||
}
|
||||
|
||||
|
||||
/* 80298B54-80298B64 293494 0010+00 2/2 0/0 0/0 .text
|
||||
* getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi */
|
||||
u32 JASBasicWaveBank::TWaveGroup::getWaveID(int index) const {
|
||||
JUT_ASSERT(298, index < mWaveCount);
|
||||
JUT_ASSERT(299, index >= 0);
|
||||
return mCtrlWaveArray[index].field_0x0;
|
||||
}
|
||||
|
||||
/* 80298B64-80298B88 2934A4 0024+00 1/0 0/0 0/0 .text
|
||||
* getWavePtr__Q216JASBasicWaveBank11TWaveHandleCFv */
|
||||
int JASBasicWaveBank::TWaveHandle::getWavePtr() const {
|
||||
JUT_ASSERT(313, mHeap);
|
||||
void* base = mHeap->getBase();
|
||||
|
||||
Reference in New Issue
Block a user