mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-04 15:04:31 +00:00
Introduce Sfx Flags (#1278)
* Sfx Flags * Discord Discussion * Move macro to sound_params * Oops * PR Suggestions * Clarify comment * Missed switch * More suggestions * Update src/code/audio_sound_params.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * sfxs * PR Suggestions * revert back to flag Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
engineer124
GitHub
parent
56e52a89c1
commit
b602276fef
6 changed files with 1322 additions and 241 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -3740,14 +3740,14 @@ f32 Audio_ComputeSoundVolume(u8 bankId, u8 entryIdx) {
|
|||
f32 baseDist;
|
||||
f32 ret;
|
||||
|
||||
if (bankEntry->sfxParams & 0x2000) {
|
||||
if (bankEntry->sfxParams & SFX_FLAG_13) {
|
||||
return 1.0f;
|
||||
}
|
||||
|
||||
if (bankEntry->dist > 10000.0f) {
|
||||
ret = 0.0f;
|
||||
} else {
|
||||
switch (bankEntry->sfxParams & 3) {
|
||||
switch ((bankEntry->sfxParams & SFX_PARAM_01_MASK) >> SFX_PARAM_01_SHIFT) {
|
||||
case 1:
|
||||
baseDist = 10000.0f / 15.0f;
|
||||
break;
|
||||
|
|
@ -3785,7 +3785,7 @@ s8 Audio_ComputeSoundReverb(u8 bankId, u8 entryIdx, u8 channelIdx) {
|
|||
SoundBankEntry* entry = &gSoundBanks[bankId][entryIdx];
|
||||
s32 reverb;
|
||||
|
||||
if (!(entry->sfxParams & 0x1000)) {
|
||||
if (!(entry->sfxParams & SFX_FLAG_12)) {
|
||||
if (entry->dist < 2500.0f) {
|
||||
distAdd = *entry->posZ > 0.0f ? (entry->dist / 2500.0f) * 70.0f : (entry->dist / 2500.0f) * 91.0f;
|
||||
} else {
|
||||
|
|
@ -3861,7 +3861,7 @@ f32 Audio_ComputeSoundFreqScale(u8 bankId, u8 entryIdx) {
|
|||
f32 unk1C;
|
||||
f32 freq = 1.0f;
|
||||
|
||||
if (entry->sfxParams & 0x4000) {
|
||||
if (entry->sfxParams & SFX_FLAG_14) {
|
||||
freq = 1.0f - ((gAudioContext.audioRandom & 0xF) / 192.0f);
|
||||
}
|
||||
|
||||
|
|
@ -3885,14 +3885,14 @@ f32 Audio_ComputeSoundFreqScale(u8 bankId, u8 entryIdx) {
|
|||
}
|
||||
|
||||
if (phi_v0 == 1) {
|
||||
if (!(entry->sfxParams & 0x800)) {
|
||||
if (!(entry->sfxParams & SFX_FLAG_11)) {
|
||||
freq *= (1.0293 - ((gAudioContext.audioRandom & 0xF) / 144.0f));
|
||||
}
|
||||
}
|
||||
|
||||
unk1C = entry->dist;
|
||||
if (!(entry->sfxParams & 0x2000)) {
|
||||
if (!(entry->sfxParams & 0x8000)) {
|
||||
if (!(entry->sfxParams & SFX_FLAG_13)) {
|
||||
if (!(entry->sfxParams & SFX_FLAG_15)) {
|
||||
if (unk1C >= 10000.0f) {
|
||||
freq += 0.2f;
|
||||
} else {
|
||||
|
|
@ -3901,7 +3901,7 @@ f32 Audio_ComputeSoundFreqScale(u8 bankId, u8 entryIdx) {
|
|||
}
|
||||
}
|
||||
|
||||
if (entry->sfxParams & 0xC0) {
|
||||
if ((entry->sfxParams & SFX_PARAM_67_MASK) != (0 << SFX_PARAM_67_SHIFT)) {
|
||||
freq += (entry->unk_2F / 192.0f);
|
||||
}
|
||||
|
||||
|
|
@ -3930,12 +3930,12 @@ u8 func_800F37B8(f32 behindScreenZ, SoundBankEntry* arg1, s8 arg2) {
|
|||
}
|
||||
|
||||
if (phi_v1 == 0) {
|
||||
if (arg1->sfxParams & 0x200) {
|
||||
if (arg1->sfxParams & SFX_FLAG_9) {
|
||||
phi_v1 = 0xF;
|
||||
}
|
||||
}
|
||||
|
||||
switch (arg1->sfxParams & 3) {
|
||||
switch ((arg1->sfxParams & SFX_PARAM_01_MASK) >> SFX_PARAM_01_SHIFT) {
|
||||
case 1:
|
||||
phi_f0 = 12.0f;
|
||||
break;
|
||||
|
|
@ -3998,8 +3998,8 @@ void Audio_SetSoundProperties(u8 bankId, u8 entryIdx, u8 channelIdx) {
|
|||
panSigned = Audio_ComputeSoundPanSigned(*entry->posX, *entry->posZ, entry->token);
|
||||
freqScale = Audio_ComputeSoundFreqScale(bankId, entryIdx) * *entry->freqScale;
|
||||
if (D_80130604 == 2) {
|
||||
behindScreenZ = sBehindScreenZ[(entry->sfxParams & 0x400) >> 10];
|
||||
if (!(entry->sfxParams & 0x800)) {
|
||||
behindScreenZ = sBehindScreenZ[(entry->sfxParams & SFX_FLAG_10) >> SFX_FLAG_10_SHIFT];
|
||||
if (!(entry->sfxParams & SFX_FLAG_11)) {
|
||||
if (*entry->posZ < behindScreenZ) {
|
||||
stereoBits = 0x10;
|
||||
}
|
||||
|
|
@ -4023,7 +4023,7 @@ void Audio_SetSoundProperties(u8 bankId, u8 entryIdx, u8 channelIdx) {
|
|||
|
||||
if ((baseFilter | sAudioExtraFilter) != 0) {
|
||||
filter = (baseFilter | sAudioExtraFilter);
|
||||
} else if (D_80130604 == 2 && (entry->sfxParams & 0x2000) == 0) {
|
||||
} else if (D_80130604 == 2 && !(entry->sfxParams & SFX_FLAG_13)) {
|
||||
filter = func_800F37B8(behindScreenZ, entry, panSigned);
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ void Audio_ProcessSoundRequest(void) {
|
|||
index = gSoundBanks[bankId][0].next;
|
||||
while (index != 0xFF && index != 0) {
|
||||
if (gSoundBanks[bankId][index].posX == &req->pos->x) {
|
||||
if ((gSoundParams[SFX_BANK_SHIFT(req->sfxId)][SFX_INDEX(req->sfxId)].params & 0x20) &&
|
||||
if ((gSoundParams[SFX_BANK_SHIFT(req->sfxId)][SFX_INDEX(req->sfxId)].params & SFX_FLAG_5) &&
|
||||
gSoundParams[SFX_BANK_SHIFT(req->sfxId)][SFX_INDEX(req->sfxId)].importance ==
|
||||
gSoundBanks[bankId][index].sfxImportance) {
|
||||
return;
|
||||
|
|
@ -261,8 +261,8 @@ void Audio_ProcessSoundRequest(void) {
|
|||
}
|
||||
if (count == gUsedChannelsPerBank[gSfxChannelLayout][bankId]) {
|
||||
soundParams = &gSoundParams[SFX_BANK_SHIFT(req->sfxId)][SFX_INDEX(req->sfxId)];
|
||||
if ((req->sfxId & 0xC00) || (soundParams->params & 4) || (index == evictIndex)) {
|
||||
if ((gSoundBanks[bankId][index].sfxParams & 8) &&
|
||||
if ((req->sfxId & 0xC00) || (soundParams->params & SFX_FLAG_2) || (index == evictIndex)) {
|
||||
if ((gSoundBanks[bankId][index].sfxParams & SFX_FLAG_3) &&
|
||||
gSoundBanks[bankId][index].state != SFX_STATE_QUEUED) {
|
||||
Audio_ClearBGMMute(gSoundBanks[bankId][index].channelIdx);
|
||||
}
|
||||
|
|
@ -314,7 +314,7 @@ void Audio_RemoveSoundBankEntry(u8 bankId, u8 entryIndex) {
|
|||
SoundBankEntry* entry = &gSoundBanks[bankId][entryIndex];
|
||||
u8 i;
|
||||
|
||||
if (entry->sfxParams & 8) {
|
||||
if (entry->sfxParams & SFX_FLAG_3) {
|
||||
Audio_ClearBGMMute(entry->channelIdx);
|
||||
}
|
||||
if (entryIndex == sSoundBankListEnd[bankId]) {
|
||||
|
|
@ -382,7 +382,7 @@ void Audio_ChooseActiveSounds(u8 bankId) {
|
|||
entry->dist = (SQ(*entry->posX) + SQ(tempf1) + SQ(*entry->posZ)) * 1;
|
||||
}
|
||||
sfxImportance = entry->sfxImportance;
|
||||
if (entry->sfxParams & 0x10) {
|
||||
if (entry->sfxParams & SFX_FLAG_4) {
|
||||
entry->priority = SQ(0xFF - sfxImportance) * SQ(76);
|
||||
} else {
|
||||
if (entry->dist > 0x7FFFFFD0) {
|
||||
|
|
@ -506,18 +506,18 @@ void Audio_PlayActiveSounds(u8 bankId) {
|
|||
channel = gAudioContext.seqPlayers[SEQ_PLAYER_SFX].channels[sCurSfxPlayerChannelIdx];
|
||||
if (entry->state == SFX_STATE_READY) {
|
||||
entry->channelIdx = sCurSfxPlayerChannelIdx;
|
||||
if (entry->sfxParams & 8) {
|
||||
if (entry->sfxParams & SFX_FLAG_3) {
|
||||
Audio_QueueSeqCmdMute(sCurSfxPlayerChannelIdx);
|
||||
}
|
||||
if (entry->sfxParams & 0xC0) {
|
||||
switch (entry->sfxParams & 0xC0) {
|
||||
case 0x40:
|
||||
if ((entry->sfxParams & SFX_PARAM_67_MASK) != (0 << SFX_PARAM_67_SHIFT)) {
|
||||
switch (entry->sfxParams & SFX_PARAM_67_MASK) {
|
||||
case (1 << SFX_PARAM_67_SHIFT):
|
||||
entry->unk_2F = Audio_NextRandom() & 0xF;
|
||||
break;
|
||||
case 0x80:
|
||||
case (2 << SFX_PARAM_67_SHIFT):
|
||||
entry->unk_2F = Audio_NextRandom() & 0x1F;
|
||||
break;
|
||||
case 0xC0:
|
||||
case (3 << SFX_PARAM_67_SHIFT):
|
||||
entry->unk_2F = Audio_NextRandom() & 0x3F;
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue