izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Importing audio_data.c (#473)

Browse Source 
* import audio_data.c

* frequency of -> harmonic

* Name remaining filter data

* Note to Pitch
This commit is contained in:
engineer124
2022-02-05 00:39:21 +00:00
committed by GitHub
parent 69d7a2e585
commit bcdd99df08
5 changed files with 1003 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+16 -16
View File
@@ -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[];
include/z64audio.h
+17 -17
View File
@@ -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);
spec
+1 -1
View File
@@ -621,7 +621,7 @@ beginseg
pad_text
pad_text
pad_text
include "build/data/code/audio_data.data.o"
include "build/src/code/audio/audio_data.o"
include "build/src/code/audio/audio_synthesis.o"
include "build/data/code/audio_synthesis.data.o"
include "build/src/code/audio/audio_heap.o"
src/code/audio/audio_data.c
+949
View File
File diff suppressed because it is too large Load Diff
tools/disasm/variables.txt
+20 -22
View File
@@ -2249,32 +2249,30 @@
0x801D1E60:("initialgspUcodeText","UNK_PTR","",0x4),
0x801D1E64:("initialgspUcodeData","UNK_PTR","",0x4),
0x801D1E70:("D_801D1E70","UNK_TYPE1","",0x1),
0x801D2E80:("D_801D2E80","UNK_TYPE1","",0x1),
0x801D2F80:("D_801D2F80","UNK_TYPE1","",0x1),
0x801D3070:("D_801D3070","UNK_TYPE1","",0x1),
0x801D3700:("D_801D3700","UNK_TYPE1","",0x1),
0x801D3D90:("D_801D3D90","UNK_TYPE1","",0x1),
0x801D3F90:("D_801D3F90","UNK_TYPE1","",0x1),
0x801D4190:("D_801D4190","UNK_TYPE1","",0x1),
0x801D4390:("D_801D4390","UNK_TYPE1","",0x1),
0x801D4590:("D_801D4590","UNK_TYPE1","",0x1),
0x801D2E80:("gLowPassFilterData","UNK_TYPE1","",0x1),
0x801D2F80:("gHighPassFilterData","UNK_TYPE1","",0x1),
0x801D3070:("gBandStopFilterData","UNK_TYPE1","",0x1),
0x801D3700:("gBandPassFilterData","UNK_TYPE1","",0x1),
0x801D3D90:("gSawtoothWaveSample","UNK_TYPE1","",0x1),
0x801D3F90:("gTriangleWaveSample","UNK_TYPE1","",0x1),
0x801D4190:("gSineWaveSample","UNK_TYPE1","",0x1),
0x801D4390:("gSquareWaveSample","UNK_TYPE1","",0x1),
0x801D4590:("gWhiteNoiseSample","UNK_TYPE1","",0x1),
0x801D4790:("D_801D4790","UNK_TYPE1","",0x1),
0x801D4990:("D_801D4990","UNK_TYPE1","",0x1),
0x801D4B90:("D_801D4B90","UNK_TYPE1","",0x1),
0x801D4D90:("gWaveSamples","UNK_PTR","",0x4),
0x801D4D98:("D_801D4D98","UNK_PTR","",0x4),
0x801D4DB0:("D_801D4DB0","UNK_PTR","",0x4),
0x801D4990:("gEighthPulseWaveSample","UNK_TYPE1","",0x1),
0x801D4B90:("gQuarterPulseWaveSample","UNK_TYPE1","",0x1),
0x801D4D90:("gWaveSamples","s16*","[9]",0x24),
0x801D4DB4:("gBendPitchOneOctaveFrequencies","f32","[256]",0x400),
0x801D51B4:("D_801D51B4","f32","[256]",0x400),
0x801D55B4:("D_801D55B4","f32","[128]",0x200),
0x801D57B4:("D_801D57B4","UNK_TYPE1","",0x1),
0x801D57C4:("D_801D57C4","UNK_TYPE1","",0x1),
0x801D57D4:("D_801D57D4","UNK_TYPE1","",0x1),
0x801D51B4:("gBendPitchTwoSemitonesFrequencies","f32","[256]",0x400),
0x801D55B4:("gPitchFrequencies","f32","[128]",0x200),
0x801D57B4:("gDefaultShortNoteVelocityTable","UNK_TYPE1","",0x1),
0x801D57C4:("gDefaultShortNoteGateTimeTable","UNK_TYPE1","",0x1),
0x801D57D4:("gDefaultEnvelope","UNK_TYPE1","",0x1),
0x801D57E4:("gZeroNoteSub","UNK_TYPE4","",0x4),
0x801D5804:("gDefaultNoteSub","UNK_TYPE4","",0x4),
0x801D5824:("gHeadsetPanQuantization","UNK_TYPE2","",0x2),
0x801D58A2:("D_801D58A2","UNK_TYPE2","",0x2),
0x801D58AA:("D_801D58AA","UNK_TYPE1","",0x1),
0x801D5824:("gHeadsetPanQuantization","u16","[64]",0x80),
0x801D58A4:("D_801D58A4","s32","",0x4),
0x801D58A8:("D_801D58A8","s16","[64]",0x80),
0x801D5928:("gHeadsetPanVolume","f32","[128]",0x200),
0x801D5B28:("gStereoPanVolume","f32","[128]",0x200),
0x801D5D28:("gDefaultPanVolume","f32","[128]",0x200),