diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-21 18:52:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-21 15:52:16 -0800 |
| commit | e2fddadf320e8d35cbb3542645122e086efbfe9f (patch) | |
| tree | f0e11b2955fd092ad3022c192aed36bddd77fb48 /src/JSystem/JAudio2 | |
| parent | 31621c3daccccc0a582eceafec7e373d872f072a (diff) | |
Misc matches (#2845)
* Misc debug matches
* Fix d_map weak function order
* Remove old nonmatching comments
* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment
* More misc matches
Diffstat (limited to 'src/JSystem/JAudio2')
| -rw-r--r-- | src/JSystem/JAudio2/JASDSPInterface.cpp | 4 | ||||
| -rw-r--r-- | src/JSystem/JAudio2/JAUSectionHeap.cpp | 10 | ||||
| -rw-r--r-- | src/JSystem/JAudio2/JAUSeqCollection.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp index 927e76f363..6f454458a7 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/src/JSystem/JAudio2/JASDSPInterface.cpp @@ -85,7 +85,7 @@ void JASDsp::invalChannelAll() { } /* 8039B360-8039B3A0 0279C0 0040+00 1/1 0/0 0/0 .rodata DSPADPCM_FILTER__6JASDsp */ -u8 const JASDsp::DSPADPCM_FILTER[64] = { +u8 const ALIGN_DECL(32) JASDsp::DSPADPCM_FILTER[64] = { 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x04, 0x00, 0x10, 0x00, 0xF8, 0x00, 0x0E, 0x00, 0xFA, 0x00, 0x0C, 0x00, 0xFC, 0x00, 0x12, 0x00, 0xF6, 0x00, 0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00, @@ -93,7 +93,7 @@ u8 const JASDsp::DSPADPCM_FILTER[64] = { }; /* 8039B3A0-8039B8A0 -00001 0500+00 1/1 0/0 0/0 .rodata DSPRES_FILTER__6JASDsp */ -u32 const JASDsp::DSPRES_FILTER[320] = { +u32 const ALIGN_DECL(32) JASDsp::DSPRES_FILTER[320] = { 0x0C3966AD, 0x0D46FFDF, 0x0B396696, diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index 3cf6c7f204..1defae3172 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -317,7 +317,7 @@ JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) { s32 r27 = getHeap_()->getFreeSize(); JASWaveBank* waveBank = JASWSParser::createWaveBank(param_1, getHeap_()); if (waveBank) { - JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == 0); + JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == NULL); sectionHeap_->getWaveBankTable().registWaveBank(bank_no, waveBank); data_.registeredWaveBankTables.set(bank_no, true); data_.field_0xa0 += r27 - getHeap_()->getFreeSize(); @@ -355,10 +355,10 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) { JASBank* bank = JASBNKParser::createBank(param_0, getHeap_()); if (bank) { if (buildingBankTable_) { - JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == 0); + JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == NULL); buildingBankTable_->registBank(bank_no, bank); } else { - JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == 0); + JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL); JASDefaultBankTable::getInstance()->registBank(bank_no, bank); data_.registeredBankTables.set(bank_no, true); } @@ -380,10 +380,10 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) { JASBank* voiceBank = new JASVoiceBank(); if (voiceBank) { if (buildingBankTable_) { - JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == 0); + JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == NULL); buildingBankTable_->registBank(bank_no, voiceBank); } else { - JUT_ASSERT(701, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == 0); + JUT_ASSERT(701, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL); JASDefaultBankTable::getInstance()->registBank(bank_no, voiceBank); data_.registeredBankTables.set(bank_no, true); } diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/src/JSystem/JAudio2/JAUSeqCollection.cpp index 5316545061..4cc4b1c3d9 100644 --- a/src/JSystem/JAudio2/JAUSeqCollection.cpp +++ b/src/JSystem/JAudio2/JAUSeqCollection.cpp @@ -60,7 +60,7 @@ JAUSeqDataMgr_SeqCollection::JAUSeqDataMgr_SeqCollection() { /* 802A67D0-802A67DC 2A1110 000C+00 1/0 0/0 0/0 .text * setSeqDataUser__27JAUSeqDataMgr_SeqCollectionFP14JAISeqDataUser */ bool JAUSeqDataMgr_SeqCollection::setSeqDataUser(JAISeqDataUser* param_0) { - JUT_ASSERT(60, user_ == 0); + JUT_ASSERT(60, user_ == NULL); user_ = param_0; return true; } |