mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 12:54:40 +00:00
Code Issues Projects Releases Wiki Activity

audio_seqplayer, the easy half (#369)

Browse source 
* func_800E9340

* Audio_SequenceChannelDisable

* Audio_SeqChannelLayerFree

* Audio_SeqChannelLayerDisable

* Rename functions

* Audio_SeqChannelSetLayer

* Move gSequenceChannelNone into gAudioContext

* Audio_SequenceChannelInit

* Name functions

* Audio_M64ReadU8

* Audio_M64ReadS16

* Audio_M64ReadCompressedU16

* Audio_AudioListPopBack

* Audio_AudioListPushBack

* Audio_InitLayerFreelist

* Audio_SequencePlayerDisableAsFinished

* incomplete Audio_SequencePlayerDisable

* Audio_SequenceChannelEnable

* Audio_SequencePlayerDisableChannels

* Audio_SequencePlayerInitChannels

* struct fixes

* func_800E9ED8

* Name more functions

* Audio_SequenceChannelSetVolume

* Audio_SetInstrument

* Audio_GetInstrument

* confirm structs

* Audio_ResetSequencePlayer

* Audio_InitSequencePlayer

* Audio_InitSequencePlayers

* func_800EC734

* Find the right Audio_SoundAlloc

* Prune functions.h

* Move global vars into gAudioContext

* func_800EAEF4

* Audio_SeqChannelLayerProcessScript

* Audio_HandleScriptFlowControl

* func_800E9F64

* func_800EA0C0

* func_800EA440

* func_800EAAE0

* unbreak audio_effects

* Audio_ProcessSequence

* Audio_ProcessSequences

* Some audio_heap struct work and function naming

* Audio_SequencePlayerDisable

* ? instead of ! in z64audio.h

* Revert makefile change

* Formatting, player -> seqPlayerIndex

* Index -> Idx

Co-authored-by: zelda2774 <zelda2774@invalid>
This commit is contained in:
zelda2774 2020-09-01 23:23:30 +02:00 • committed by GitHub
parent b8da64ee01
commit c033b4b28e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
137 changed files with 2447 additions and 4327 deletions
Download patch file Download diff file Expand all files Collapse all files

72
include/functions.h
View file

@ -1925,20 +1925,20 @@ void FaultDrawer_SetDefault();
// ? func_800DE238(?);
// ? func_800DE258(?);
// ? func_800DE2B0(?);
void* Audio_SoundAlloc(SoundAllocPool* pool, u32 size);
void* Audio_AllocDmaMemory(SoundAllocPool* pool, u32 size);
// ? func_800DE344(?);
// ? func_800DE380(?);
// ? func_800DE3DC(?);
// ? func_800DE434(?);
// ? func_800DE45C(?);
// ? func_800DE470(?);
// ? func_800DE4B0(?);
// ? func_800DE5F0(?);
// ? func_800DE650(?);
// ? func_800DE6D4(?);
// ? func_800DE758(?);
// ? func_800DE81C(?);
// ? func_800DE8E0(?);
void* Audio_AllocZeroed(SoundAllocPool* pool, u32 size);
void* Audio_Alloc(SoundAllocPool* pool, u32 size);
void Audio_SoundAllocPoolInit(SoundAllocPool* pool, void* memAddr, u32 size);
void Audio_PersistentPoolClear(PersistentPool* persistent);
void Audio_TemporaryPoolClear(TemporaryPool* temporary);
void func_800DE4B0(SoundAllocPool* pool);
void Audio_InitMainPools(s32 sizeForAudioInitPool);
// void Audio_SessionPoolsInit(?);
// void Audio_SeqAndBankPoolInit(?);
// void Audio_PersistentPoolsInit(?);
// void Audio_TemporaryPoolsInit(?);
// void* Audio_AllocBankOrSeq(?);
// ? func_800DF074(?);
// ? func_800DF0CC(?);
// ? func_800DF5DC(?);
@ -1968,10 +1968,10 @@ void* Audio_SoundAlloc(SoundAllocPool* pool, u32 size);
// ? func_800E11F0(?);
// ? func_800E12DC(?);
// ? func_800E1618(?);
s32 func_800E18B0(s32);
// ? func_800E1928(?);
// ? func_800E1A18(?);
// ? func_800E1A48(?);
s32 Audio_IsBankLoadComplete(s32 bankId);
s32 Audio_IsSeqLoadComplete(s32 seqId);
void Audio_SetBankLoadStatus(s32 bankId, u8 status);
void Audio_SetSeqLoadStatus(s32 seqId, u8 status);
// ? func_800E1A78(?);
// ? func_800E1AD8(?);
// ? func_800E1B08(?);
@ -2104,42 +2104,16 @@ void Audio_NoteVibratoInit(Note* note);
void Audio_NotePortamentoInit(Note* note);
void Audio_AdsrInit(AdsrState* adsr, AdsrEnvelope* envelope, s16* volOut);
f32 Audio_AdsrUpdate(AdsrState* adsr);
// ? func_800E9340(?);
// ? func_800E93A8(?);
// ? func_800E9584(?);
// ? func_800E96D8(?);
// ? func_800E97FC(?);
// ? func_800E9878(?);
void Audio_SequenceChannelDisable(SequenceChannel* seqChannel);
// ? func_800E9934(?);
// ? func_800E9A2C(?);
// ? func_800E9AAC(?);
// ? func_800E9B44(?);
void Audio_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer);
void Audio_SequencePlayerDisable(SequencePlayer* seqPlayer);
void Audio_AudioListPushBack(AudioListItem* list, AudioListItem* item);
void* Audio_AudioListPopBack(AudioListItem* list);
// ? func_800E9CA8(?);
// ? func_800E9D48(?);
// ? func_800E9D5C(?);
// ? func_800E9D94(?);
// ? func_800E9DD4(?);
// ? func_800E9ED8(?);
// ? func_800E9F64(?);
// ? func_800EA0C0(?);
// ? func_800EA440(?);
// ? func_800EAAE0(?);
// ? func_800EAEF4(?);
// ? func_800EAF24(?);
// ? func_800EAF98(?);
// ? func_800EB044(?);
// ? func_800EB068(?);
// ? func_800EBD58(?);
// ? func_800EC564(?);
// ? func_800EC618(?);
// ? func_800EC668(?);
// ? func_800EC734(?);
// ? func_800EC80C(?);
// ? func_800EC8DC(?);
void Audio_ProcessSequences(s32 arg0);
void Audio_ProcessSequence(SequencePlayer* seqPlayer);
void Audio_ResetSequencePlayer(SequencePlayer* seqPlayer);
void func_800EC734(s32 seqPlayerIdx);
void Audio_InitSequencePlayers(void);
// ? func_800ECA00(?);
// ? func_800ECA60(?);
// ? func_800ECAF0(?);

128
include/variables.h
View file

@ -621,10 +621,11 @@ extern s16* gWaveSamples[6];
extern f32 gPitchBendFrequencyScale[256];
//extern ? D_8012F098;
//extern ? D_8012F0B0;
//extern ? D_8012F8B4;
//extern ? D_8012FAB4;
//extern ? D_8012FAC4;
//extern ? D_8012FAD4;
extern f32 D_8012F4B4[256];
extern f32 gNoteFrequencies[];
extern u8 gDefaultShortNoteVelocityTable[16];
extern u8 gDefaultShortNoteDurationTable[16];
extern AdsrEnvelope gDefaultEnvelope[3];
extern NoteSubEu gZeroNoteSub;
extern NoteSubEu gDefaultNoteSub;
extern u16 gHeadsetPanQuantization[0x10];
@ -3595,123 +3596,8 @@ extern FaultThreadStruct gFaultStruct;
//extern ? D_8016E750;
//extern ? D_8016E9A4;
//extern ? D_8016EE8B;
extern AudioContext gAudioContext;
//extern ? D_8016F181;
//extern ? D_8016F186;
//extern ? D_8016F188;
//extern ? D_8016F18C;
//extern ? D_8016F190;
//extern ? D_8016F198;
//extern ? D_8016F1B0;
//extern ? D_8016F200;
//extern ? D_8016F248;
//extern ? D_8016F280;
//extern ? D_8016F420;
//extern ? D_8016F430;
//extern ? D_8016F700;
//extern ? D_8016FCA0;
//extern ? D_80170001;
//extern ? D_801708EC;
//extern ? D_80170E70;
//extern ? D_80170EC8;
//extern ? D_80170FA0;
//extern ? D_80170FB8;
//extern ? D_80170FF8;
//extern ? D_80171010;
//extern ? D_80171050;
//extern ? D_80171068;
//extern ? D_80171180;
//extern ? D_80171768;
//extern ? D_80171780;
//extern ? D_80171784;
//extern ? D_801719B8;
//extern ? D_801719BC;
//extern ? D_801719C0;
//extern ? D_801719C4;
//extern ? D_801719C8;
//extern ? D_801719D4;
//extern ? D_801719DC;
extern f32 D_801719EC;
//extern ? D_80171A14;
//extern ? D_80171A18;
extern s8 gSoundMode;
//extern ? D_80171A1C;
//extern ? D_80171AFC;
//extern ? D_80171B10;
//extern ? D_80171B20;
//extern ? D_80171B30;
//extern ? D_80171B40;
//extern ? D_80171B44;
//extern ? D_80171B48;
//extern ? D_80171B70;
//extern ? D_80171B80;
//extern ? D_80171B90;
//extern ? D_80171BA0;
//extern ? D_80171BA4;
//extern ? D_80171BA8;
//extern ? D_80171BAC;
//extern ? D_80171C74;
//extern ? D_80171C78;
//extern ? D_80171C80;
//extern ? D_80171C8C;
//extern ? D_80171C93;
//extern ? D_80171C98;
//extern ? D_80171C9F;
//extern ? D_80171CB0;
//extern ? D_80171CB4;
//extern ? D_80171CB8;
//extern ? D_80171CBC;
//extern ? D_80171D84;
//extern ? D_80171D88;
//extern ? D_80171D90;
//extern ? D_80171D9C;
//extern ? D_80171DA2;
//extern ? D_80171DA3;
//extern ? D_80171DA8;
//extern ? D_80171DAE;
//extern ? D_80171DAF;
//extern ? D_80171DC0;
//extern ? D_80171DC4;
//extern ? D_80171E94;
//extern ? D_80171E98;
//extern ? D_80171EB2;
//extern ? D_80171EBE;
//extern ? D_80171ED0;
//extern ? D_80171ED4;
//extern ? D_80171ED8;
//extern ? D_80171EDC;
//extern ? D_80172060;
//extern ? D_80172068;
//extern ? D_80172070;
//extern ? D_801722F0;
//extern ? D_801722F4;
//extern ? D_801722F8;
//extern ? D_80172304;
//extern ? D_80172584;
//extern ? D_80172588;
//extern ? D_80172594;
//extern ? D_80172598;
//extern ? D_801725A0;
//extern ? D_801725AC;
//extern ? D_801725B8;
//extern ? D_801725E8;
//extern ? D_80172618;
//extern ? D_80172699;
extern f32* D_801726A0;
//extern ? D_801726A4;
//extern ? D_801726AC;
//extern ? D_801726B0;
//extern ? D_8017280A;
//extern ? D_8017280B;
//extern ? D_8017280C;
//extern ? D_8017280D;
//extern ? D_801729A8;
//extern ? D_80172C30;
//extern ? D_80172CA0;
//extern ? D_80174C30;
//extern ? D_80174CA0;
//extern ? D_80174D08;
extern NotePool gNoteFreeLists;
extern AudioContext gAudioContext; // at 0x8016f180
extern NotePool gNoteFreeLists; // probably includes this and further members, too
//extern ? D_80174D28;
//extern ? D_80174D38;
//extern ? D_80174D48;

1043
include/z64audio.h
View file

File diff suppressed because it is too large Load diff