-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
proper 3-soundbank fixes #32
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| #include "sbank.h" | ||
|
|
||
| #include <cstring> | ||
|
|
||
| #include "soundcommon.h" | ||
|
|
||
| constexpr int N_BANKS = 4; | ||
| SoundBank* gBanks[N_BANKS]; | ||
| SoundBank gCommonBank; | ||
| SoundBank gLevelBank[3]; | ||
|
|
||
| void sbank_init_globals() { | ||
| gBanks[0] = &gCommonBank; | ||
| gBanks[1] = &gLevelBank[0]; | ||
| gBanks[2] = &gLevelBank[1]; | ||
| gBanks[3] = &gLevelBank[2]; | ||
| memset((void*)&gCommonBank, 0, sizeof(gCommonBank)); | ||
| memset((void*)&gLevelBank, 0, sizeof(gLevelBank)); | ||
| } | ||
|
|
||
| void InitBanks() { | ||
| for (auto& gBank : gBanks) { | ||
| gBank->bank_handle = 0; | ||
| gBank->sound_count = 0; | ||
| strcpy(gBank->name, "<unused>"); | ||
| } | ||
| } | ||
|
|
||
| SoundBank* AllocateBank() { | ||
| int idx = 0; | ||
| // find a bank with unk1 = 0, or return nullptr if none exists | ||
| while (true) { | ||
| if (idx >= N_BANKS) { | ||
| return nullptr; | ||
| } | ||
|
|
||
| if (gBanks[idx]->bank_handle == 0) { | ||
| break; | ||
| } | ||
| idx++; | ||
| } | ||
|
|
||
| // Funny hack: The loader will read this out of the destination buffer in order to determine how | ||
| // many sectors of sound name mapping it needs to read. | ||
| if (idx == 0) { | ||
| gBanks[0]->sound_count = 0x3fe; | ||
| } else { | ||
| gBanks[idx]->sound_count = 0x65; | ||
| } | ||
|
|
||
| return gBanks[idx]; | ||
| } | ||
|
|
||
| s32 LookupSoundIndex(const char* name, SoundBank** bank_out) { | ||
| int idx = 0; | ||
| while (true) { | ||
| if (idx > N_BANKS - 1) { | ||
| return -1; | ||
| } | ||
|
|
||
| auto& bank = gBanks[idx]; | ||
| if (bank->bank_handle == 0) { | ||
| break; | ||
| } | ||
|
|
||
| for (int i = 0; i < (int)bank->sound_count; i++) { | ||
| if (memcmp(bank->sound[i].name, name, 16) == 0) { | ||
| *bank_out = bank; | ||
| return i; | ||
| } | ||
| } | ||
| idx++; | ||
| } | ||
|
|
||
| return -1; | ||
| } | ||
|
|
||
| // name should be a 16-byte "sound name" | ||
| SoundBank* LookupBank(const char* name) { | ||
| int idx = N_BANKS - 1; | ||
| while (true) { | ||
| if (idx < 0) { | ||
| return nullptr; // not found. | ||
| } | ||
| auto& bank = gBanks[idx]; | ||
| // they had some weird stuff here that took advantage of the fact that this region was | ||
| // 16-byte aligned, so it probably wasn't a memcmp, but this is easier. | ||
| if (memcmp(bank->name, name, 16) == 0) { | ||
| return bank; | ||
| } | ||
| idx--; | ||
| } | ||
| } | ||
|
|
||
| void ReloadBankInfo() { | ||
| for (auto& b : gBanks) { | ||
| if (b->bank_handle) { | ||
| ReadBankSoundInfo(b, b, 1); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all the c++ changes are in these lines