mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00
Code Issues Projects Releases Wiki Activity

Audio WIP (#836)

Browse source 
* being code_800EC960

* wip

* wip

* more audio progress

* migrate data in code_800E11F0

* wip

* make ok

* remove asm

* wip

* move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094

* more progress

* wip

* wip

* split code_800E11F0

* migrate rodata in code_800E11F0

* match functions that couldn't because of data issues

* move code_800E4FE0 asm files

* wip

* more wip

* fix global functions, and forward declarations

* wip

* wip

* wip

* ocarina wip

* match a couple functions

* some progress

* separate some bss

* match func_800EDA3C

* some matching

* more matches

* migrate audio rodata

* some matches

* more matchess

* start on synthesis

* work on synthesis

* fix function declaration

* Merge branch 'master' into audio

* match a few more functions

* wip

* wip

* more matching, rename Audio_SetBGM to Audio_QueueSeqCmd

* name several audio functions, and audiocontext members

* more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis

* audio wip

* match a few more functions.

* wip

* add missing NON_MATCHING directive

* wip

* some matching, data reogranization

* match cursed function

* wip

* wip

* formatting

* remove prefix from struct memebers

* missed function rename

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
krimtonz 2021-07-27 18:44:58 -05:00 • committed by GitHub
parent cc9a04feb4
commit d1a5ea5110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 9047 additions and 17038 deletions
Download patch file Download diff file Expand all files Collapse all files

142
include/variables.h
View file

@ -340,7 +340,7 @@ extern s32 gDebugArenaLogSeverity;
//extern ? D_8012DDDC;
//extern ? sUCodeDisasModeHMacros;
//extern ? sUCodeDisasModeLMacros;
extern s16* gWaveSamples[6];
extern s16* gWaveSamples[9];
extern f32 gPitchBendFrequencyScale[256];
//extern ? D_8012F098;
//extern ? D_8012F0B0;
@ -366,14 +366,8 @@ extern s16 D_80130328[];
//extern ? D_801304A0;
//extern ? D_801304AC;
//extern ? D_801304C0;
//extern ? D_801304D0;
//extern ? D_801304D8;
//extern ? D_801304DC;
//extern ? D_801304E0;
//extern ? D_801304E4;
extern s32 gAudioContextInitalized;
//extern ? D_801304E8;
//extern ? D_801304EC;
//extern ? D_801304F0;
//extern ? D_80130500;
extern f32 D_80130510;
extern s32 D_80130514;
@ -386,7 +380,7 @@ extern u8 D_80130594[4][7];
//extern ? D_801305BC;
//extern ? D_801305C0;
//extern ? D_801305CC;
//extern ? D_801305E0;
//extern ? sPrevChargeLevel;
//extern ? D_801305F4;
//extern ? D_801305FF;
//extern ? D_80130600;
@ -412,45 +406,45 @@ extern u8 D_80130594[4][7];
//extern ? D_80130654;
//extern ? D_80130658;
//extern ? D_801306DC;
//extern ? D_80130EFC;
//extern ? D_80130F00;
//extern ? D_80130F04;
//extern ? D_80130F08;
//extern ? D_80130F0C;
//extern ? sOcarinaAllowedBtnMask;
//extern ? sOcarinaABtnMap;
//extern ? sOcarinaCUPBtnMap;
//extern ? sOcarinaCDownBtnMap;
//extern ? sOcarinaInpEnabled;
//extern ? D_80130F10;
//extern ? D_80130F14;
//extern ? D_80130F18;
//extern ? D_80130F1C;
//extern ? D_80130F20;
//extern ? sCurOcarinaBtnVal;
//extern ? sPrevOcarinaNoteVal;
//extern ? sCurOcarinaBtnIdx;
//extern ? sLearnSongLastBtn;
//extern ? D_80130F24;
//extern ? D_80130F28;
//extern ? D_80130F2C;
//extern ? D_80130F30;
//extern ? D_80130F34;
//extern ? D_80130F38;
//extern ? sPlaybackState;
//extern ? D_80130F3C;
//extern ? D_80130F3E;
//extern ? D_80130F40;
//extern ? D_80130F44;
//extern ? D_80130F48;
//extern ? sNotePlaybackTimer;
//extern ? sPlaybackNotePos;
//extern ? sStaffPlaybackPos;
//extern ? D_80130F4C;
//extern ? D_80130F50;
//extern ? D_80130F54;
//extern ? D_80130F58;
//extern ? D_80130F5C;
//extern ? D_80130F60;
//extern ? D_80130F64;
//extern ? sDisplayedNoteValue;
//extern ? sNotePlaybackVolume;
//extern ? sNotePlaybackVibrato;
//extern ? sNotePlaybackTone;
//extern ? sNormalizedNotePlaybackTone;
//extern ? sNormalizedNotePlaybackVolume;
//extern ? D_80130F68;
//extern ? D_80130F6C;
//extern ? D_80130F74;
//extern ? D_80130F78;
//extern ? D_80130F80;
//extern ? sOcarinaNoteValues;
//extern ? sOcaMinigameApndPos;
//extern ? sOcaMinigameEndPos;
//extern ? sOcarinaSongs;
//extern ? D_80131100;
//extern ? D_8013170C;
//extern ? D_80131840;
extern u8* gFrogsSongPtr; // D_80131854: pointer to a u8 array of the notes you need to play for the frogs
//extern ? D_80131858;
//extern ? D_8013185C;
//extern ? sRecordSongPos;
//extern ? D_80131860;
//extern ? D_80131864;
//extern ? D_80131868;
@ -460,13 +454,13 @@ extern u8* gFrogsSongPtr; // D_80131854: pointer to a u8 array of the notes you
//extern ? D_80131878;
//extern ? D_8013187C;
//extern ? D_80131880;
//extern ? D_80131884;
//extern ? sPierresSong;
//extern ? D_8013188C;
extern u8* gScarecrowCustomSongPtr;
extern OcarinaSong* gScarecrowCustomSongPtr;
extern u8* gScarecrowSpawnSongPtr;
//extern ? D_80131BEC;
//extern ? D_80131BF0;
extern u8 D_80131C00[][9];
extern OcarinaSongInfo gOcarinaSongNotes[];
//extern ? D_80131C80;
//extern ? D_80131C84;
//extern ? D_80131C88;
@ -518,7 +512,7 @@ extern u8 D_80131C00[][9];
//extern ? D_80131F64;
//extern ? D_80131F68;
//extern ? D_80131F6C;
//extern ? D_8013331C;
extern Struct_8013331C *D_8013331C[];
extern u8 D_80133340[4];
//extern ? D_80133344;
extern s32 D_8013338C;
@ -532,17 +526,17 @@ extern u8 D_801333CC;
extern u16 D_801333D0;
extern Vec3f D_801333D4;
extern f32 D_801333E0;
extern f32 D_801333E8;
extern s8 D_801333E8;
extern u8 D_801333F0;
extern u8 D_801333F4;
extern u8 D_801333F8;
//extern ? D_80133400;
//extern ? D_80133404;
//extern ? sSeqCmdWrPos;
//extern ? sSeqCmdRdPos;
//extern ? D_80133408;
//extern ? D_8013340C;
//extern ? D_80133414;
//extern ? D_80133418;
extern AudioSessionSettings gAudioSessionPresets[];
extern AudioSessionSettings gAudioSessionPresets[18];
extern s32 gOverlayLogSeverity;
//extern ? D_80134480;
//extern ? D_80134484;
@ -2732,10 +2726,9 @@ extern char D_80146238[];
//extern ? D_8014A450;
//extern ? D_8014A45C;
//extern ? D_8014A460;
extern s16 gTatumsPerBeat;
//extern ? D_8014A6C4;
//extern ? D_8014A6C8;
//extern ? D_8014A6CC;
extern const s16 D_8014A6C0[];
#define gTatumsPerBeat (D_8014A6C0[1])
extern const AudioContextInitSizes D_8014A6C4;
//extern ? D_8014A710;
//extern ? D_8014A728;
//extern ? D_8014A730;
@ -2990,10 +2983,10 @@ extern s16 D_80153960[];
//extern ? D_80154AE8;
//extern ? D_80154AFC;
//extern ? D_80154B00;
//extern ? D_801550D0;
//extern ? D_80155340;
//extern ? D_80155500;
//extern ? D_80155BF0;
extern u8 gAudioBankTable[];
extern u8 D_80155340[];
extern u8 gSequenceTable[];
extern u8 gAudioTable[];
//extern ? D_80155C70;
extern u8 D_80155F50[];
extern u8 D_80157580[];
@ -3229,11 +3222,12 @@ extern FaultThreadStruct gFaultStruct;
//extern ? D_8016B6A0;
//extern ? D_8016B6B5;
//extern ? D_8016B6B8;
//extern ? D_8016B6E0;
//extern ? D_8016B6F8;
//extern ? D_8016B780;
//extern ? D_8016B7A0;
//extern ? D_8016B7A4;
extern OSMesgQueue D_8016B6E0;
//extern OSMesg D_8016B6F8;
extern u8* D_8016B738[];
//extern u32 D_8016B780;
//extern ? sAudioUpdateStartTime;
//extern ? sAudioUpdateEndTime;
//extern ? D_8016B7A8;
//extern ? D_8016B7AC;
//extern ? D_8016B7B0;
@ -3258,33 +3252,31 @@ extern FaultThreadStruct gFaultStruct;
//extern ? D_8016B9F6;
//extern ? D_8016B9F8;
//extern ? D_8016B9F9;
//extern ? D_8016B9FC;
//extern ? D_8016BA00;
//extern ? D_8016BA04;
//extern ? D_8016BA08;
//extern ? D_8016BA09;
//extern ? D_8016BA0C;
//extern ? sCurOcarinaBtnPress;
//extern ? D_8016BA10;
//extern ? D_8016BA14;
//extern ? sPrevOcarinaBtnPress;
//extern ? D_8016BA18;
//extern ? D_8016BA20;
//extern ? D_8016BA28;
//extern ? D_8016BA29;
//extern ? D_8016BA2A;
//extern ? D_8016BA2B;
//extern ? D_8016BA2C;
//extern ? sCurOcarinaSong;
//extern ? sOcarinaSongAppendPos;
//extern ? sOcarinaHasStartedSong;
//extern ? gOcarinaSongNotestartIdx;
//extern ? sOcarinaSongCnt;
//extern ? sOcarinaAvailSongs;
//extern ? D_8016BA2E;
//extern ? D_8016BA30;
//extern ? D_8016BA50;
//extern ? D_8016BA70;
//extern ? D_8016BA90;
//extern ? sLearnSongExpectedNote;
//extern ? D_8016BAA0;
//extern ? D_8016BAA8;
//extern ? D_8016BAB0;
//extern ? D_8016BAB4;
//extern ? D_8016BAB8;
//extern ? D_8016BABC;
//extern ? D_8016BAC0;
//extern ? sDebugPadPressRaw;
//extern ? sDebugPadPress;
//extern ? sAudioUpdateTaskStart;
//extern ? sAudioUpdateTaskEnd;
extern SoundBankEntry D_8016BAD0[9];
extern SoundBankEntry D_8016BC80[12];
extern SoundBankEntry D_8016BEC0[22];
@ -3296,7 +3288,7 @@ extern SoundBankEntry D_8016C8B0[5];
extern u8 D_8016E1A0[7];
extern u8 D_8016E1A8[7];
extern u8 D_8016E1B0[7];
//extern ? D_8016E1B8;
extern Struct_800F7CEC D_8016E1B8[7][3]; // total size = 0xA8
extern u8 D_8016E260;
extern u8 D_8016E264[];
//extern ? D_8016E270;
@ -3305,12 +3297,10 @@ extern u16 D_8016E2F8[];
extern u8 D_8016E310[];
//extern ? D_8016E320;
//extern ? D_8016E348;
//extern ? D_8016E350;
//extern ? D_8016E750;
//extern ? D_8016E9A4;
//extern ? sAudioSeqCmds;
extern unk_D_8016E750 D_8016E750[4];
//extern ? D_8016EE8B;
extern AudioContext gAudioContext; // at 0x8016f180
extern NotePool gNoteFreeLists; // probably includes this and further members, too
extern AudioContext gAudioContext; // at 0x8016F180
//extern ? D_80174D28;
//extern ? D_80174D38;
//extern ? D_80174D48;
@ -3321,7 +3311,7 @@ extern NotePool gNoteFreeLists; // probably includes this and further members, t
//extern ? D_80174DB8;
//extern ? D_80174DBC;
//extern ? D_80174DC0;
//extern ? D_801755D0;
extern void(*D_801755D0)(void); // not sure about arguments yet.
extern u32 __osMalloc_FreeBlockTest_Enable;
//extern ? D_80175640;
//extern ? D_80175670;