mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-11 13:10:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match some audio functions (#896)

Browse Source 
* cleanups

* Improve Audio_SequencePlayerProcessSequence

* cleanup

* labeling

* progress on func_800E5000

* func_800F6268

* func_800ECDF8

* Improve func_800F2464

* reorder variables

* labelling

* non-equivalent func_800EEA50

* minor doc

* func_800E6590

* minor doc

* Reformat abi.h

* Very slight improvements

* func_800DC384

* func_800E1618

* formatting

Co-authored-by: zelda2774 <zelda2774@invalid>
This commit is contained in:
zelda2774
2021-08-12 21:37:37 +02:00
committed by GitHub
parent 1b1487a504
commit a0d2cceeca
23 changed files with 1321 additions and 1813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/audio_seqplayer.c
+7 -7
View File
@@ -121,7 +121,7 @@ void Audio_SequenceChannelInit(SequenceChannel* seqChannel) {
seqChannel->largeNotes = false;
seqChannel->bookOffset = 0;
seqChannel->reverbBits.asByte = 0;
seqChannel->changes.asByte = 0xff;
seqChannel->changes.asByte = 0xFF;
seqChannel->scriptState.depth = 0;
seqChannel->newPan = 0x40;
seqChannel->panChannelWeight = 0x80;
@@ -135,7 +135,7 @@ void Audio_SequenceChannelInit(SequenceChannel* seqChannel) {
seqChannel->someOtherPriority = 1;
seqChannel->delay = 0;
seqChannel->adsr.envelope = gDefaultEnvelope;
seqChannel->adsr.releaseRate = 0xf0;
seqChannel->adsr.releaseRate = 0xF0;
seqChannel->adsr.sustain = 0;
seqChannel->vibratoRateTarget = 0x800;
seqChannel->vibratoRateStart = 0x800;
@@ -200,7 +200,7 @@ s32 Audio_SeqChannelSetLayer(SequenceChannel* seqChannel, s32 layerIdx) {
layer->freqScale = 1.0f;
layer->unk_34 = 1.0f;
layer->velocitySquare2 = 0.0f;
layer->instOrWave = 0xff;
layer->instOrWave = 0xFF;
return 0;
}
@@ -287,7 +287,7 @@ void Audio_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer) {
}
void Audio_SequencePlayerDisable(SequencePlayer* seqPlayer) {
Audio_SequencePlayerDisableChannels(seqPlayer, 0xffff);
Audio_SequencePlayerDisableChannels(seqPlayer, 0xFFFF);
Audio_NotePoolClear(&seqPlayer->notePool);
if (!seqPlayer->enabled) {
return;
@@ -363,7 +363,7 @@ s16 Audio_M64ReadS16(M64ScriptState* state) {
u16 Audio_M64ReadCompressedU16(M64ScriptState* state) {
u16 ret = *(state->pc++);
if (ret & 0x80) {
ret = (ret << 8) & 0x7f00;
ret = (ret << 8) & 0x7F00;
ret = *(state->pc++) | ret;
}
return ret;
@@ -1640,9 +1640,9 @@ void Audio_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) {
case 0xCE:
command = Audio_M64ReadU8(seqScript);
if (command == 0) {
seqScript->value = gAudioContext.audioRandom / 4;
seqScript->value = (gAudioContext.audioRandom >> 2) & 0xFF;
} else {
seqScript->value = (gAudioContext.audioRandom / 4) % command;
seqScript->value = (gAudioContext.audioRandom >> 2) % command;
}
break;
case 0xCD: {