mirror of
https://github.com/zeldaret/oot
synced 2026-06-10 20:58:55 -04:00
Audio Ocarina Documentation (#1026)
* Begin ocarina documentation * Many ocarina-related docs * More ocarina docs * Introduce Ocarina Fonts Enum * Fix ocarina font enum * Fix incorrect documentation, more documentation * Ocarina recording documentation * cleanup * Small touch-ups * Fix font -> instrument * format * Better docs on playback, memory game * more cleanup * Add z64ocarina.h * Clean up names * final cleanup * typo * Fix description * better docs * Fix channel -> channelIdx * Fix old "font" name to correct "instrument" name, add io port docs * Add comments to clarify certain lines/functions * format * Rename noteIdx to pitch * Missed a name * Add comment on pitch * `reset` -> `SetInstrument` and `displayed` -> `playback` * Clarify audio_update and windmill comment * Minor PR fixes * Revert Audio_Update because there are 2 different Audio_Update functions * PR Feedback * Ocarina Idx -> Index * Introduce OCARINA_BTN_C_RIGHT_OR_C_LEFT * PR Suggestions * Next PR Suggestions * Next PR Feedback * consistency * Better docs (PR) * Better comment
This commit is contained in:
@@ -716,8 +716,8 @@ s32 AudioSeq_SeqLayerProcessScriptStep4(SequenceLayer* layer, s32 cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
temp_f2 = gNoteFrequencies[semitone2] * tuning;
|
||||
temp_f14 = gNoteFrequencies[layer->portamentoTargetNote] * tuning;
|
||||
temp_f2 = gPitchFrequencies[semitone2] * tuning;
|
||||
temp_f14 = gPitchFrequencies[layer->portamentoTargetNote] * tuning;
|
||||
|
||||
switch (PORTAMENTO_MODE(*portamento)) {
|
||||
case PORTAMENTO_MODE_1:
|
||||
@@ -767,10 +767,10 @@ s32 AudioSeq_SeqLayerProcessScriptStep4(SequenceLayer* layer, s32 cmd) {
|
||||
sound = Audio_InstrumentGetSound(instrument, semitone);
|
||||
sameSound = (sound == layer->sound);
|
||||
layer->sound = sound;
|
||||
layer->freqScale = gNoteFrequencies[semitone2] * sound->tuning;
|
||||
layer->freqScale = gPitchFrequencies[semitone2] * sound->tuning;
|
||||
} else {
|
||||
layer->sound = NULL;
|
||||
layer->freqScale = gNoteFrequencies[semitone2];
|
||||
layer->freqScale = gPitchFrequencies[semitone2];
|
||||
if (instOrWave >= 0xC0) {
|
||||
layer->sound = &gAudioContext.synthesisReverbs[instOrWave - 0xC0].sound;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user