diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-02-05 11:39:21 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-05 00:39:21 +0000 |
| commit | bcdd99df08f58fed2cb7f99331b21550fda1f1ca (patch) | |
| tree | 8230b53ffdb5986e57b6ecff5b1c1a5c51832a6b /include | |
| parent | 69d7a2e585a5d063fcbfe2519d586c5c81ef7817 (diff) | |
Importing audio_data.c (#473)
* import audio_data.c
* frequency of -> harmonic
* Name remaining filter data
* Note to Pitch
Diffstat (limited to 'include')
| -rw-r--r-- | include/variables.h | 32 | ||||
| -rw-r--r-- | include/z64audio.h | 34 |
2 files changed, 33 insertions, 33 deletions
diff --git a/include/variables.h b/include/variables.h index b9b66c3ca..93cec7fe0 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1629,29 +1629,29 @@ extern MtxF gIdentityMtxF; // extern u64* initialgspUcodeText; // extern u64* initialgspUcodeData; // extern UNK_TYPE1 D_801D1E70; -// extern UNK_TYPE1 D_801D2E80; -// extern UNK_TYPE1 D_801D2F80; -// extern UNK_TYPE1 D_801D3070; -// extern UNK_TYPE1 D_801D3700; -// extern UNK_TYPE1 D_801D3D90; -// extern UNK_TYPE1 D_801D3F90; -// extern UNK_TYPE1 D_801D4190; -// extern UNK_TYPE1 D_801D4390; -// extern UNK_TYPE1 D_801D4590; +// extern UNK_TYPE1 gLowPassFilterData; +// extern UNK_TYPE1 gHighPassFilterData; +// extern UNK_TYPE1 gBandStopFilterData; +// extern UNK_TYPE1 gBandPassFilterData; +// extern UNK_TYPE1 gSawtoothWaveSample; +// extern UNK_TYPE1 gTriangleWaveSample; +// extern UNK_TYPE1 gSineWaveSample; +// extern UNK_TYPE1 gSquareWaveSample; +// extern UNK_TYPE1 gWhiteNoiseSample; // extern UNK_TYPE1 D_801D4790; -// extern UNK_TYPE1 D_801D4990; -// extern UNK_TYPE1 D_801D4B90; +// extern UNK_TYPE1 gEighthPulseWaveSample; +// extern UNK_TYPE1 gQuarterPulseWaveSample; extern s16* gWaveSamples[9]; extern UNK_PTR D_801D4D98; extern UNK_PTR D_801D4DB0; extern f32 gBendPitchOneOctaveFrequencies[256]; // extern UNK_TYPE1 D_801D4FB4; -// extern UNK_TYPE4 D_801D51B4; +// extern UNK_TYPE4 gBendPitchTwoSemitonesFrequencies; // extern UNK_TYPE4 D_801D53B4; -// extern UNK_TYPE1 D_801D55B4; -// extern UNK_TYPE1 D_801D57B4; -// extern UNK_TYPE1 D_801D57C4; -// extern UNK_TYPE1 D_801D57D4; +// extern UNK_TYPE1 gPitchFrequencies; +// extern UNK_TYPE1 gDefaultShortNoteVelocityTable; +// extern UNK_TYPE1 gDefaultShortNoteGateTimeTable; +// extern UNK_TYPE1 gDefaultEnvelope; extern NoteSubEu gZeroNoteSub; extern NoteSubEu gDefaultNoteSub; extern u16 gHeadsetPanQuantization[]; diff --git a/include/z64audio.h b/include/z64audio.h index 9baa9911e..89fff01c7 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -109,23 +109,23 @@ typedef enum { } OcarinaButtonIdx; typedef enum { - /* 0x0 */ NOTE_C4, - /* 0x1 */ NOTE_DFLAT4, - /* 0x2 */ NOTE_D4, - /* 0x3 */ NOTE_EFLAT4, - /* 0x4 */ NOTE_E4, - /* 0x5 */ NOTE_F4, - /* 0x6 */ NOTE_GFLAT4, - /* 0x7 */ NOTE_G4, - /* 0x8 */ NOTE_AFLAT4, - /* 0x9 */ NOTE_A4, - /* 0xA */ NOTE_BFLAT4, - /* 0xB */ NOTE_B4, - /* 0xC */ NOTE_C5, - /* 0xD */ NOTE_DFLAT5, - /* 0xE */ NOTE_D5, - /* 0xF */ NOTE_EFLAT5, - /* -1 */ NOTE_NONE = 0xFF + /* 0x0 */ OCARINA_PITCH_C4, + /* 0x1 */ OCARINA_PITCH_DFLAT4, + /* 0x2 */ OCARINA_PITCH_D4, + /* 0x3 */ OCARINA_PITCH_EFLAT4, + /* 0x4 */ OCARINA_PITCH_E4, + /* 0x5 */ OCARINA_PITCH_F4, + /* 0x6 */ OCARINA_PITCH_GFLAT4, + /* 0x7 */ OCARINA_PITCH_G4, + /* 0x8 */ OCARINA_PITCH_AFLAT4, + /* 0x9 */ OCARINA_PITCH_A4, + /* 0xA */ OCARINA_PITCH_BFLAT4, + /* 0xB */ OCARINA_PITCH_B4, + /* 0xC */ OCARINA_PITCH_C5, + /* 0xD */ OCARINA_PITCH_DFLAT5, + /* 0xE */ OCARINA_PITCH_D5, + /* 0xF */ OCARINA_PITCH_EFLAT5, + /* -1 */ OCARINA_PITCH_NONE = 0xFF } OcarinaNoteIdx; typedef s32 (*DmaHandler)(OSPiHandle* handle, OSIoMesg* mb, s32 direction); |