diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-05-10 02:59:23 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 18:59:23 +0200 |
| commit | 95b431793182bd021cb4234255f90b996edd8d4d (patch) | |
| tree | 13b56539e1ecab971892ebe3d333b13113262245 /src/code/audio_seqplayer.c | |
| parent | 6cd8029cd5e039a1094260da49d50b35a36f4f2a (diff) | |
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
Diffstat (limited to 'src/code/audio_seqplayer.c')
| -rw-r--r-- | src/code/audio_seqplayer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/audio_seqplayer.c b/src/code/audio_seqplayer.c index e405309ca..3f4b15978 100644 --- a/src/code/audio_seqplayer.c +++ b/src/code/audio_seqplayer.c @@ -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; } |