Skip to content

Fix music sample wave replacements #2671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PJB3005 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix music sample wave replacements #2671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions docs/imhex/jaudio/wsys.hexpat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,7 @@ struct THeader {
u32 mSize;

/**
* ID of wave bank.
* This matches the value passed to the BAA load command.
* The game originally does not use this value itself, but Dusklight does rely on it.
* ID of wave bank? Usage unknown.
*/
u32 mId;

Expand Down
6 changes: 3 additions & 3 deletions libs/JSystem/include/JSystem/JAudio2/JASWSParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ class JASWSParser {
};

static u32 getGroupCount(void const*);
static JASWaveBank* createWaveBank(void const*, JKRHeap*);
static JASBasicWaveBank* createBasicWaveBank(void const*, JKRHeap*);
static JASSimpleWaveBank* createSimpleWaveBank(void const*, JKRHeap*);
static JASWaveBank* createWaveBank(void const*, JKRHeap* IF_DUSK_ARG(u32 bank_no));
static JASBasicWaveBank* createBasicWaveBank(void const*, JKRHeap* IF_DUSK_ARG(u32 bank_no));
static JASSimpleWaveBank* createSimpleWaveBank(void const*, JKRHeap* IF_DUSK_ARG(u32 bank_no));

static DUSK_GAME_DATA u32 sUsedHeapSize;
};
Expand Down
14 changes: 7 additions & 7 deletions libs/JSystem/src/JAudio2/JASWSParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ u32 JASWSParser::getGroupCount(void const* stream) {
}


JASWaveBank* JASWSParser::createWaveBank(void const* stream, JKRHeap* heap) {
JASWaveBank* JASWSParser::createWaveBank(void const* stream, JKRHeap* heap IF_DUSK_ARG(u32 bank_no)) {
if (getGroupCount(stream) == 1) {
return createSimpleWaveBank(stream, heap);
return createSimpleWaveBank(stream, heap IF_DUSK_ARG(bank_no));
} else {
return createBasicWaveBank(stream, heap);
return createBasicWaveBank(stream, heap IF_DUSK_ARG(bank_no));
}
}

DUSK_GAME_DATA u32 JASWSParser::sUsedHeapSize;

JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap* heap) {
JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap* heap IF_DUSK_ARG(u32 bank_no)) {
if (heap == NULL) {
heap = JASDram;
}
u32 free_size = heap->getFreeSize();

THeader* header = (THeader*)stream;
JASBasicWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASBasicWaveBank IF_DUSK((header->mId));
JASBasicWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASBasicWaveBank IF_DUSK((bank_no));
if (wave_bank == NULL) {
return NULL;
}
Expand Down Expand Up @@ -70,7 +70,7 @@ JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap*
return wave_bank;
}

JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap* heap) {
JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap* heap IF_DUSK_ARG(u32 bank_no)) {
if (heap == NULL) {
heap = JASDram;
}
Expand All @@ -82,7 +82,7 @@ JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap
return NULL;
}

JASSimpleWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASSimpleWaveBank IF_DUSK((header->mId));
JASSimpleWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASSimpleWaveBank IF_DUSK((bank_no));
if (wave_bank == NULL) {
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/JSystem/src/JAudio2/JAUSectionHeap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) {
{
TPushCurrentHeap push(getHeap_());
s32 previousFree = getHeap_()->getFreeSize();
JASWaveBank* waveBank = JASWSParser::createWaveBank(param_1, getHeap_());
JASWaveBank* waveBank = JASWSParser::createWaveBank(param_1, getHeap_() IF_DUSK_ARG(bank_no));
if (waveBank) {
JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == NULL);
sectionHeap_->getWaveBankTable().registWaveBank(bank_no, waveBank);
Expand Down
Loading