Audio_Heap OK and Documented (#621)

* copy audio_heap progress from main branch

* Add filter bugs

* PR Review + Docs

* format

* typo

* Improve audio buffer notes

* Add documentation

* PR Feedback

* PR Suggestions

* Fix bss

* PR Suggestions

* PR typo

* Fix warning

include/functions.h

@@ -3301,57 +3301,25 @@ s32 osFlashReadArray(OSIoMesg* mb, s32 priority, u32 pageNum, void* dramAddr, u3
 // void func_8018A808(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6);
 // void func_8018ACC4(void);
 // void func_8018AE34(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
-// void func_8018B0F0(void);
-// void func_8018B10C(void);
-// void func_8018B250(void);
 void AudioHeap_DiscardFont(s32 fontId);
-// void func_8018B474(void);
-void* AudioHeap_WritebackDCache(void* mem, size_t size);
-// void func_8018B520(void);
+void* AudioHeap_WritebackDCache(void* addr, size_t size);
 void* AudioHeap_AllocAttemptExternal(AudioAllocPool* pool, size_t size);
-void* AudioHeap_AllocDmaMemory(AudioAllocPool* pool, u32 size);
-// void func_8018B608(void);
+void* AudioHeap_AllocDmaMemory(AudioAllocPool* pool, size_t size);
 void* AudioHeap_AllocZeroed(AudioAllocPool* pool, size_t size);
-// void func_8018B69C(void);
 void* AudioHeap_Alloc(AudioAllocPool* pool, size_t size);
-void AudioHeap_AllocPoolInit(AudioAllocPool* pool, void* mem, size_t size);
-// void func_8018B768(void);
-// void func_8018B77C(void);
-// void func_8018B7BC(void);
-void AudioHeap_InitMainPool(s32 initPoolSize);
-// void func_8018B95C(void);
-// void func_8018B9E0(void);
-// void func_8018BA64(void);
-// void func_8018BB28(void);
+void AudioHeap_AllocPoolInit(AudioAllocPool* pool, void* addr, size_t size);
+void AudioHeap_PopCache(s32 tableType);
+void AudioHeap_InitMainPool(size_t initPoolSize);
 void* AudioHeap_AllocCached(s32 tableType, size_t size, s32 cache, s32 id);
 void* AudioHeap_SearchCaches(s32 tableType, s32 cache, s32 id);
-// void func_8018C3D8(void);
-// void func_8018C8E8(void);
-// void func_8018C93C(void);
-// void func_8018C994(void);
-// void func_8018CB70(void);
-// void func_8018CB78(void);
-// void func_8018CC3C(void);
+void AudioHeap_LoadFilter(s16* filter, s32 lowPassCutoff, s32 highPassCutoff);
 s32 AudioHeap_ResetStep(void);
-// void func_8018CFAC(void);
+void AudioHeap_Init(void);
 void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id);
 void* AudioHeap_AllocPermanent(s32 tableType, s32 id, size_t size);
-void* AudioHeap_AllocSampleCache(size_t size, s32 fontId, void* sampleAddr, s8 medium, s32 cache);
-// void func_8018D6C8(void);
-// void func_8018D760(void);
-// void func_8018DA50(void);
-// void func_8018DBC4(void);
-// void func_8018DCB4(void);
-// void func_8018DCF8(void);
-// void func_8018DD98(void);
-// void func_8018DDD4(void);
-// void func_8018DF24(void);
-// void func_8018DFE0(void);
+void* AudioHeap_AllocSampleCache(size_t size, s32 sampleBankId, void* sampleAddr, s8 medium, s32 cache);
 void AudioHeap_ApplySampleBankCache(s32 sampleBankId);
-// void func_8018E03C(void);
-// void func_8018E2A8(void);
-// void func_8018E344(void);
-// void func_8018E8C8(void);
+void AudioHeap_SetReverbData(s32 reverbIndex, u32 dataType, s32 data, s32 flags);
 void AudioLoad_DecreaseSampleDmaTtls(void);
 void* AudioLoad_DmaSampleData(uintptr_t devAddr, size_t size, s32 arg2, u8* dmaIndexRef, s32 medium);
 void AudioLoad_InitSampleDmaBuffers(s32 numNotes);
@@ -3453,7 +3421,7 @@ void AudioSeq_SequenceChannelDisable(SequenceChannel* channel);
 // void func_80197B14(void);
 // void func_80197C0C(void);
 // void func_80197C8C(void);
-// void func_80197D24(void);
+void AudioSeq_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer);
 void AudioSeq_SequencePlayerDisable(SequencePlayer* seqPlayer);
 void AudioSeq_AudioListPushBack(AudioListItem* list, AudioListItem* item);
 void* AudioSeq_AudioListPopBack(AudioListItem* list);
@@ -3476,9 +3444,9 @@ void func_80199268(s32* param_1);
 // void func_8019AA3C(void);
 // void func_8019AAF0(void);
 void AudioSeq_ResetSequencePlayer(SequencePlayer* seqPlayer);
-// void func_8019AC10(void);
+void AudioSeq_InitSequencePlayerChannels(s32 playerIdx);
 // void func_8019ACEC(void);
-// void func_8019ADBC(void);
+void AudioSeq_InitSequencePlayers(void);
 void func_8019AE40(s32 param_1, s32 param_2, u32 param_3, s32 param_4);
 void func_8019AEC0(UNK_PTR param_1, UNK_PTR param_2);
 // void func_8019AF00(void);

include/variables.h

@@ -1617,18 +1617,10 @@ extern Vec3s gZeroVec3s;
 extern Mtx gIdentityMtx;
 extern MtxF gIdentityMtxF;
 // extern UNK_TYPE1 D_801D1E70;
-// 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 gEighthPulseWaveSample;
-// extern UNK_TYPE1 gQuarterPulseWaveSample;
+extern s16 gLowPassFilterData[];
+extern s16 gHighPassFilterData[];
+extern s16 gBandStopFilterData[];
+extern s16 gBandPassFilterData[];
 extern s16* gWaveSamples[9];
 extern UNK_PTR D_801D4D98;
 extern UNK_PTR D_801D4DB0;
@@ -1837,7 +1829,7 @@ extern s8 D_801DB4B8;
 // extern UNK_TYPE1 D_801DB8B8;
 // extern UNK_TYPE1 D_801DB900;
 extern UNK_PTR D_801DB930;
-extern AudioSpec D_801DB958[21];
+extern AudioSpec gAudioSpecs[21];
 
 // rodata
 extern f32 D_801DBDF0;
@@ -3466,7 +3458,7 @@ extern StackEntry sys_flashromStackEntry;
 extern OSThread sys_flashromOSThread;
 extern s80185D40 D_801FD008;
 extern OSMesg D_801FD034;
-// extern UNK_TYPE1 D_801FD120;
+extern s32 D_801FD120;
 // extern UNK_TYPE1 D_801FD140;
 // extern UNK_TYPE1 D_801FD158;
 // extern UNK_TYPE1 D_801FD198;

src/code/audio/audio_init_params.c

@@ -7,6 +7,6 @@ const s16 gAudioTatumInit[] = {
 
 const AudioContextInitSizes gAudioContextInitSizes = {
     0x137F00, // heapSize
-    0x1C480,  // initPoolSize
+    0x1C480,  // mainPoolSplitSize
     0x1A000,  // permanentPoolSize
 };

src/code/audio/audio_seqplayer.c

@@ -20,7 +20,7 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197C8C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_80197D24.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/AudioSeq_SequencePlayerDisableAsFinished.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/AudioSeq_SequencePlayerDisable.s")
 
@@ -66,8 +66,8 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/AudioSeq_ResetSequencePlayer.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019AC10.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/AudioSeq_InitSequencePlayerChannels.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019ACEC.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_8019ADBC.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/AudioSeq_InitSequencePlayers.s")

tools/disasm/functions.txt

@@ -3548,59 +3548,59 @@
     0x8018AE34:("func_8018AE34",),
     0x8018B0F0:("func_8018B0F0",),
     0x8018B10C:("func_8018B10C",),
-    0x8018B250:("func_8018B250",),
+    0x8018B250:("AudioHeap_ResetLoadStatus",),
     0x8018B318:("AudioHeap_DiscardFont",),
-    0x8018B3FC:("func_8018B3FC",),
-    0x8018B474:("func_8018B474",),
+    0x8018B3FC:("AudioHeap_ReleaseNotesForFont",),
+    0x8018B474:("AudioHeap_DiscardSequence",),
     0x8018B4F8:("AudioHeap_WritebackDCache",),
-    0x8018B520:("func_8018B520",),
+    0x8018B520:("AudioHeap_AllocZeroedAttemptExternal",),
     0x8018B578:("AudioHeap_AllocAttemptExternal",),
     0x8018B5D0:("AudioHeap_AllocDmaMemory",),
-    0x8018B608:("func_8018B608",),
+    0x8018B608:("AudioHeap_AllocDmaMemoryZeroed",),
     0x8018B640:("AudioHeap_AllocZeroed",),
-    0x8018B69C:("func_8018B69C",),
+    0x8018B69C:("AudioHeap_TestAlloc",),
     0x8018B6E8:("AudioHeap_Alloc",),
     0x8018B740:("AudioHeap_AllocPoolInit",),
-    0x8018B768:("func_8018B768",),
-    0x8018B77C:("func_8018B77C",),
-    0x8018B7AC:("func_8018B7AC",),
-    0x8018B7BC:("func_8018B7BC",),
+    0x8018B768:("AudioHeap_ClearPersistentCache",),
+    0x8018B77C:("AudioHeap_ClearTemporaryCache",),
+    0x8018B7AC:("AudioHeap_ResetPool",),
+    0x8018B7BC:("AudioHeap_PopCache",),
     0x8018B8FC:("AudioHeap_InitMainPool",),
-    0x8018B95C:("func_8018B95C",),
-    0x8018B9E0:("func_8018B9E0",),
-    0x8018BA64:("func_8018BA64",),
-    0x8018BB28:("func_8018BB28",),
+    0x8018B95C:("AudioHeap_InitSessionPool",),
+    0x8018B9E0:("AudioHeap_InitCachePool",),
+    0x8018BA64:("AudioHeap_InitPersistentCache",),
+    0x8018BB28:("AudioHeap_InitTemporaryCache",),
     0x8018BBEC:("AudioHeap_AllocCached",),
     0x8018C380:("AudioHeap_SearchCaches",),
-    0x8018C3D8:("func_8018C3D8",),
+    0x8018C3D8:("AudioHeap_SearchRegularCaches",),
     0x8018C4E4:("func_8018C4E4",),
-    0x8018C8B8:("func_8018C8B8",),
-    0x8018C8E8:("func_8018C8E8",),
-    0x8018C93C:("func_8018C93C",),
-    0x8018C994:("func_8018C994",),
-    0x8018CB70:("func_8018CB70",),
-    0x8018CB78:("func_8018CB78",),
-    0x8018CC3C:("func_8018CC3C",),
+    0x8018C8B8:("AudioHeap_ClearFilter",),
+    0x8018C8E8:("AudioHeap_LoadLowPassFilter",),
+    0x8018C93C:("AudioHeap_LoadHighPassFilter",),
+    0x8018C994:("AudioHeap_LoadFilter",),
+    0x8018CB70:("AudioHeap_UpdateReverb",),
+    0x8018CB78:("AudioHeap_UpdateReverbs",),
+    0x8018CC3C:("AudioHeap_ClearAiBuffers",),
     0x8018CCA8:("AudioHeap_ResetStep",),
-    0x8018CFAC:("func_8018CFAC",),
+    0x8018CFAC:("AudioHeap_Init",),
     0x8018D57C:("AudioHeap_SearchPermanentCache",),
     0x8018D5D4:("AudioHeap_AllocPermanent",),
     0x8018D658:("AudioHeap_AllocSampleCache",),
-    0x8018D6C8:("func_8018D6C8",),
-    0x8018D760:("func_8018D760",),
-    0x8018DA50:("func_8018DA50",),
-    0x8018DBC4:("func_8018DBC4",),
-    0x8018DCB4:("func_8018DCB4",),
-    0x8018DCF8:("func_8018DCF8",),
-    0x8018DD98:("func_8018DD98",),
-    0x8018DDD4:("func_8018DDD4",),
-    0x8018DF24:("func_8018DF24",),
-    0x8018DFE0:("func_8018DFE0",),
+    0x8018D6C8:("AudioHeap_InitSampleCaches",),
+    0x8018D760:("AudioHeap_AllocTemporarySampleCacheEntry",),
+    0x8018DA50:("AudioHeap_UnapplySampleCacheForFont",),
+    0x8018DBC4:("AudioHeap_DiscardSampleCacheEntry",),
+    0x8018DCB4:("AudioHeap_UnapplySampleCache",),
+    0x8018DCF8:("AudioHeap_AllocPersistentSampleCacheEntry",),
+    0x8018DD98:("AudioHeap_DiscardSampleCacheForFont",),
+    0x8018DDD4:("AudioHeap_DiscardSampleCaches",),
+    0x8018DF24:("AudioHeap_ChangeStorage",),
+    0x8018DFE0:("AudioHeap_DiscardSampleBank",),
     0x8018E00C:("AudioHeap_ApplySampleBankCache",),
-    0x8018E03C:("func_8018E03C",),
-    0x8018E2A8:("func_8018E2A8",),
-    0x8018E344:("func_8018E344",),
-    0x8018E8C8:("func_8018E8C8",),
+    0x8018E03C:("AudioHeap_ApplySampleBankCacheInternal",),
+    0x8018E2A8:("AudioHeap_DiscardSampleBanks",),
+    0x8018E344:("AudioHeap_SetReverbData",),
+    0x8018E8C8:("AudioHeap_InitReverb",),
     0x8018EB60:("AudioLoad_DecreaseSampleDmaTtls",),
     0x8018EC4C:("AudioLoad_DmaSampleData",),
     0x8018EF88:("AudioLoad_InitSampleDmaBuffers",),
@@ -3777,7 +3777,7 @@
     0x80197B14:("func_80197B14",),
     0x80197C0C:("func_80197C0C",),
     0x80197C8C:("func_80197C8C",),
-    0x80197D24:("func_80197D24",),
+    0x80197D24:("AudioSeq_SequencePlayerDisableAsFinished",),
     0x80197D4C:("AudioSeq_SequencePlayerDisable",),
     0x80197E08:("AudioSeq_AudioListPushBack",),
     0x80197E48:("AudioSeq_AudioListPopBack",),
@@ -3800,9 +3800,9 @@
     0x8019AA3C:("func_8019AA3C",),
     0x8019AAF0:("func_8019AAF0",),
     0x8019AB40:("AudioSeq_ResetSequencePlayer",),
-    0x8019AC10:("func_8019AC10",),
+    0x8019AC10:("AudioSeq_InitSequencePlayerChannels",),
     0x8019ACEC:("func_8019ACEC",),
-    0x8019ADBC:("func_8019ADBC",),
+    0x8019ADBC:("AudioSeq_InitSequencePlayers",),
     0x8019AE40:("func_8019AE40",),
     0x8019AEC0:("func_8019AEC0",),
     0x8019AF00:("func_8019AF00",),

tools/disasm/variables.txt

@@ -2461,7 +2461,7 @@
     0x801DB8B8:("D_801DB8B8","UNK_TYPE1","",0x1),
     0x801DB900:("D_801DB900","UNK_TYPE1","",0x1),
     0x801DB930:("D_801DB930","UNK_PTR","",0x4),
-    0x801DB958:("D_801DB958","AudioSpec","[21]",0x498),
+    0x801DB958:("gAudioSpecs","AudioSpec","[21]",0x498),
     0x801DBDF0:("D_801DBDF0","f32","",0x4),
     0x801DBDF4:("jtbl_801DBDF4","UNK_PTR","",0x4),
     0x801DBE68:("D_801DBE68","f32","",0x4),

tools/sizes/code_functions.csv

@@ -3064,61 +3064,59 @@ asm/non_matchings/code/audio_synthesis/func_8018A768.s,func_8018A768,0x8018A768,
 asm/non_matchings/code/audio_synthesis/func_8018A808.s,func_8018A808,0x8018A808,0x12F
 asm/non_matchings/code/audio_synthesis/func_8018ACC4.s,func_8018ACC4,0x8018ACC4,0x5C
 asm/non_matchings/code/audio_synthesis/func_8018AE34.s,func_8018AE34,0x8018AE34,0xAF
-asm/non_matchings/code/audio_heap/func_8018B0F0.s,func_8018B0F0,0x8018B0F0,0x7
-asm/non_matchings/code/audio_heap/func_8018B10C.s,func_8018B10C,0x8018B10C,0x51
-asm/non_matchings/code/audio_heap/func_8018B250.s,func_8018B250,0x8018B250,0x32
+asm/non_matchings/code/audio_heap/AudioHeap_ResetLoadStatus.s,AudioHeap_ResetLoadStatus,0x8018B250,0x32
 asm/non_matchings/code/audio_heap/AudioHeap_DiscardFont.s,AudioHeap_DiscardFont,0x8018B318,0x39
-asm/non_matchings/code/audio_heap/func_8018B3FC.s,func_8018B3FC,0x8018B3FC,0x1E
-asm/non_matchings/code/audio_heap/func_8018B474.s,func_8018B474,0x8018B474,0x21
+asm/non_matchings/code/audio_heap/AudioHeap_ReleaseNotesForFont.s,AudioHeap_ReleaseNotesForFont,0x8018B3FC,0x1E
+asm/non_matchings/code/audio_heap/AudioHeap_DiscardSequence.s,AudioHeap_DiscardSequence,0x8018B474,0x21
 asm/non_matchings/code/audio_heap/AudioHeap_WritebackDCache.s,AudioHeap_WritebackDCache,0x8018B4F8,0xA
-asm/non_matchings/code/audio_heap/func_8018B520.s,func_8018B520,0x8018B520,0x16
+asm/non_matchings/code/audio_heap/AudioHeap_AllocZeroedAttemptExternal.s,AudioHeap_AllocZeroedAttemptExternal,0x8018B520,0x16
 asm/non_matchings/code/audio_heap/AudioHeap_AllocAttemptExternal.s,AudioHeap_AllocAttemptExternal,0x8018B578,0x16
 asm/non_matchings/code/audio_heap/AudioHeap_AllocDmaMemory.s,AudioHeap_AllocDmaMemory,0x8018B5D0,0xE
-asm/non_matchings/code/audio_heap/func_8018B608.s,func_8018B608,0x8018B608,0xE
+asm/non_matchings/code/audio_heap/AudioHeap_AllocDmaMemoryZeroed.s,AudioHeap_AllocDmaMemoryZeroed,0x8018B608,0xE
 asm/non_matchings/code/audio_heap/AudioHeap_AllocZeroed.s,AudioHeap_AllocZeroed,0x8018B640,0x17
-asm/non_matchings/code/audio_heap/func_8018B69C.s,func_8018B69C,0x8018B69C,0x13
-asm/non_matchings/code/audio_heap/AudioHeap_Alloc.s,AudioHeap_Alloc,0x8018B6E8,0x16
+asm/non_matchings/code/audio_heap/AudioHeap_TestAlloc.s,AudioHeap_TestAlloc,0x8018B69C,0x13
+asm/non_matchings/code/audio_heap/Audio_Alloc.s,Audio_Alloc,0x8018B6E8,0x16
 asm/non_matchings/code/audio_heap/AudioHeap_AllocPoolInit.s,AudioHeap_AllocPoolInit,0x8018B740,0xA
-asm/non_matchings/code/audio_heap/func_8018B768.s,func_8018B768,0x8018B768,0x5
-asm/non_matchings/code/audio_heap/func_8018B77C.s,func_8018B77C,0x8018B77C,0xC
-asm/non_matchings/code/audio_heap/func_8018B7AC.s,func_8018B7AC,0x8018B7AC,0x4
-asm/non_matchings/code/audio_heap/func_8018B7BC.s,func_8018B7BC,0x8018B7BC,0x50
+asm/non_matchings/code/audio_heap/AudioHeap_ClearPersistentCache.s,AudioHeap_ClearPersistentCache,0x8018B768,0x5
+asm/non_matchings/code/audio_heap/AudioHeap_ClearTemporaryCache.s,AudioHeap_ClearTemporaryCache,0x8018B77C,0xC
+asm/non_matchings/code/audio_heap/AudioHeap_ResetPool.s,AudioHeap_ResetPool,0x8018B7AC,0x4
+asm/non_matchings/code/audio_heap/AudioHeap_PopCache.s,AudioHeap_PopCache,0x8018B7BC,0x50
 asm/non_matchings/code/audio_heap/AudioHeap_InitMainPool.s,AudioHeap_InitMainPool,0x8018B8FC,0x18
-asm/non_matchings/code/audio_heap/func_8018B95C.s,func_8018B95C,0x8018B95C,0x21
-asm/non_matchings/code/audio_heap/func_8018B9E0.s,func_8018B9E0,0x8018B9E0,0x21
-asm/non_matchings/code/audio_heap/func_8018BA64.s,func_8018BA64,0x8018BA64,0x31
-asm/non_matchings/code/audio_heap/func_8018BB28.s,func_8018BB28,0x8018BB28,0x31
+asm/non_matchings/code/audio_heap/AudioHeap_InitSessionPool.s,AudioHeap_InitSessionPool,0x8018B95C,0x21
+asm/non_matchings/code/audio_heap/AudioHeap_InitCachePool.s,AudioHeap_InitCachePool,0x8018B9E0,0x21
+asm/non_matchings/code/audio_heap/AudioHeap_InitPersistentCache.s,AudioHeap_InitPersistentCache,0x8018BA64,0x31
+asm/non_matchings/code/audio_heap/AudioHeap_InitTemporaryCache.s,AudioHeap_InitTemporaryCache,0x8018BB28,0x31
 asm/non_matchings/code/audio_heap/AudioHeap_AllocCached.s,AudioHeap_AllocCached,0x8018BBEC,0x1E5
 asm/non_matchings/code/audio_heap/AudioHeap_SearchCaches.s,AudioHeap_SearchCaches,0x8018C380,0x16
-asm/non_matchings/code/audio_heap/func_8018C3D8.s,func_8018C3D8,0x8018C3D8,0x43
+asm/non_matchings/code/audio_heap/AudioHeap_SearchRegularCaches.s,AudioHeap_SearchRegularCaches,0x8018C3D8,0x43
 asm/non_matchings/code/audio_heap/func_8018C4E4.s,func_8018C4E4,0x8018C4E4,0xF5
-asm/non_matchings/code/audio_heap/func_8018C8B8.s,func_8018C8B8,0x8018C8B8,0xC
-asm/non_matchings/code/audio_heap/func_8018C8E8.s,func_8018C8E8,0x8018C8E8,0x15
-asm/non_matchings/code/audio_heap/func_8018C93C.s,func_8018C93C,0x8018C93C,0x16
-asm/non_matchings/code/audio_heap/func_8018C994.s,func_8018C994,0x8018C994,0x77
-asm/non_matchings/code/audio_heap/func_8018CB70.s,func_8018CB70,0x8018CB70,0x2
-asm/non_matchings/code/audio_heap/func_8018CB78.s,func_8018CB78,0x8018CB78,0x31
-asm/non_matchings/code/audio_heap/func_8018CC3C.s,func_8018CC3C,0x8018CC3C,0x1B
+asm/non_matchings/code/audio_heap/AudioHeap_ClearFilter.s,AudioHeap_ClearFilter,0x8018C8B8,0xC
+asm/non_matchings/code/audio_heap/AudioHeap_LoadLowPassFilter.s,AudioHeap_LoadLowPassFilter,0x8018C8E8,0x15
+asm/non_matchings/code/audio_heap/AudioHeap_LoadHighPassFilter.s,AudioHeap_LoadHighPassFilter,0x8018C93C,0x16
+asm/non_matchings/code/audio_heap/AudioHeap_LoadFilter.s,AudioHeap_LoadFilter,0x8018C994,0x77
+asm/non_matchings/code/audio_heap/AudioHeap_UpdateReverb.s,AudioHeap_UpdateReverb,0x8018CB70,0x2
+asm/non_matchings/code/audio_heap/AudioHeap_UpdateReverbs.s,AudioHeap_UpdateReverbs,0x8018CB78,0x31
+asm/non_matchings/code/audio_heap/AudioHeap_ClearAiBuffers.s,AudioHeap_ClearAiBuffers,0x8018CC3C,0x1B
 asm/non_matchings/code/audio_heap/AudioHeap_ResetStep.s,AudioHeap_ResetStep,0x8018CCA8,0xC1
-asm/non_matchings/code/audio_heap/func_8018CFAC.s,func_8018CFAC,0x8018CFAC,0x174
+asm/non_matchings/code/audio_heap/AudioHeap_Init.s,AudioHeap_Init,0x8018CFAC,0x174
 asm/non_matchings/code/audio_heap/AudioHeap_SearchPermanentCache.s,AudioHeap_SearchPermanentCache,0x8018D57C,0x16
 asm/non_matchings/code/audio_heap/AudioHeap_AllocPermanent.s,AudioHeap_AllocPermanent,0x8018D5D4,0x21
 asm/non_matchings/code/audio_heap/AudioHeap_AllocSampleCache.s,AudioHeap_AllocSampleCache,0x8018D658,0x1C
-asm/non_matchings/code/audio_heap/func_8018D6C8.s,func_8018D6C8,0x8018D6C8,0x26
-asm/non_matchings/code/audio_heap/func_8018D760.s,func_8018D760,0x8018D760,0xBC
-asm/non_matchings/code/audio_heap/func_8018DA50.s,func_8018DA50,0x8018DA50,0x5D
-asm/non_matchings/code/audio_heap/func_8018DBC4.s,func_8018DBC4,0x8018DBC4,0x3C
-asm/non_matchings/code/audio_heap/func_8018DCB4.s,func_8018DCB4,0x8018DCB4,0x11
-asm/non_matchings/code/audio_heap/func_8018DCF8.s,func_8018DCF8,0x8018DCF8,0x28
-asm/non_matchings/code/audio_heap/func_8018DD98.s,func_8018DD98,0x8018DD98,0xF
-asm/non_matchings/code/audio_heap/func_8018DDD4.s,func_8018DDD4,0x8018DDD4,0x54
-asm/non_matchings/code/audio_heap/func_8018DF24.s,func_8018DF24,0x8018DF24,0x2F
-asm/non_matchings/code/audio_heap/func_8018DFE0.s,func_8018DFE0,0x8018DFE0,0xB
+asm/non_matchings/code/audio_heap/AudioHeap_InitSampleCaches.s,AudioHeap_InitSampleCaches,0x8018D6C8,0x26
+asm/non_matchings/code/audio_heap/AudioHeap_AllocTemporarySampleCacheEntry.s,AudioHeap_AllocTemporarySampleCacheEntry,0x8018D760,0xBC
+asm/non_matchings/code/audio_heap/AudioHeap_UnapplySampleCacheForFont.s,AudioHeap_UnapplySampleCacheForFont,0x8018DA50,0x5D
+asm/non_matchings/code/audio_heap/AudioHeap_DiscardSampleCacheEntry.s,AudioHeap_DiscardSampleCacheEntry,0x8018DBC4,0x3C
+asm/non_matchings/code/audio_heap/AudioHeap_UnapplySampleCache.s,AudioHeap_UnapplySampleCache,0x8018DCB4,0x11
+asm/non_matchings/code/audio_heap/AudioHeap_AllocPersistentSampleCacheEntry.s,AudioHeap_AllocPersistentSampleCacheEntry,0x8018DCF8,0x28
+asm/non_matchings/code/audio_heap/AudioHeap_DiscardSampleCacheForFont.s,AudioHeap_DiscardSampleCacheForFont,0x8018DD98,0xF
+asm/non_matchings/code/audio_heap/AudioHeap_DiscardSampleCaches.s,AudioHeap_DiscardSampleCaches,0x8018DDD4,0x54
+asm/non_matchings/code/audio_heap/AudioHeap_ChangeStorage.s,AudioHeap_ChangeStorage,0x8018DF24,0x2F
+asm/non_matchings/code/audio_heap/AudioHeap_DiscardSampleBank.s,AudioHeap_DiscardSampleBank,0x8018DFE0,0xB
 asm/non_matchings/code/audio_heap/AudioHeap_ApplySampleBankCache.s,AudioHeap_ApplySampleBankCache,0x8018E00C,0xC
-asm/non_matchings/code/audio_heap/func_8018E03C.s,func_8018E03C,0x8018E03C,0x9B
-asm/non_matchings/code/audio_heap/func_8018E2A8.s,func_8018E2A8,0x8018E2A8,0x27
-asm/non_matchings/code/audio_heap/func_8018E344.s,func_8018E344,0x8018E344,0x161
-asm/non_matchings/code/audio_heap/func_8018E8C8.s,func_8018E8C8,0x8018E8C8,0xA6
+asm/non_matchings/code/audio_heap/AudioHeap_ApplySampleBankCacheInternal.s,AudioHeap_ApplySampleBankCacheInternal,0x8018E03C,0x9B
+asm/non_matchings/code/audio_heap/AudioHeap_DiscardSampleBanks.s,AudioHeap_DiscardSampleBanks,0x8018E2A8,0x27
+asm/non_matchings/code/audio_heap/AudioHeap_SetReverbData.s,AudioHeap_SetReverbData,0x8018E344,0x161
+asm/non_matchings/code/audio_heap/AudioHeap_InitReverb.s,AudioHeap_InitReverb,0x8018E8C8,0xA6
 asm/non_matchings/code/audio_load/AudioLoad_DecreaseSampleDmaTtls.s,AudioLoad_DecreaseSampleDmaTtls,0x8018EB60,0x3B
 asm/non_matchings/code/audio_load/AudioLoad_DmaSampleData.s,AudioLoad_DmaSampleData,0x8018EC4C,0xCF
 asm/non_matchings/code/audio_load/AudioLoad_InitSampleDmaBuffers.s,AudioLoad_InitSampleDmaBuffers,0x8018EF88,0xA6
@@ -3295,7 +3293,7 @@ asm/non_matchings/code/audio_seqplayer/AudioSeq_SequenceChannelDisable.s,AudioSe
 asm/non_matchings/code/audio_seqplayer/func_80197B14.s,func_80197B14,0x80197B14,0x3E
 asm/non_matchings/code/audio_seqplayer/func_80197C0C.s,func_80197C0C,0x80197C0C,0x20
 asm/non_matchings/code/audio_seqplayer/func_80197C8C.s,func_80197C8C,0x80197C8C,0x26
-asm/non_matchings/code/audio_seqplayer/func_80197D24.s,func_80197D24,0x80197D24,0xA
+asm/non_matchings/code/audio_seqplayer/AudioSeq_SequencePlayerDisableAsFinished.s,AudioSeq_SequencePlayerDisableAsFinished,0x80197D24,0xA
 asm/non_matchings/code/audio_seqplayer/AudioSeq_SequencePlayerDisable.s,AudioSeq_SequencePlayerDisable,0x80197D4C,0x2F
 asm/non_matchings/code/audio_seqplayer/AudioSeq_AudioListPushBack.s,AudioSeq_AudioListPushBack,0x80197E08,0x10
 asm/non_matchings/code/audio_seqplayer/AudioSeq_AudioListPopBack.s,AudioSeq_AudioListPopBack,0x80197E48,0x10
@@ -3318,9 +3316,9 @@ asm/non_matchings/code/audio_seqplayer/func_8019A0BC.s,func_8019A0BC,0x8019A0BC,
 asm/non_matchings/code/audio_seqplayer/func_8019AA3C.s,func_8019AA3C,0x8019AA3C,0x2D
 asm/non_matchings/code/audio_seqplayer/func_8019AAF0.s,func_8019AAF0,0x8019AAF0,0x14
 asm/non_matchings/code/audio_seqplayer/AudioSeq_ResetSequencePlayer.s,AudioSeq_ResetSequencePlayer,0x8019AB40,0x34
-asm/non_matchings/code/audio_seqplayer/func_8019AC10.s,func_8019AC10,0x8019AC10,0x37
+asm/non_matchings/code/audio_seqplayer/AudioSeq_InitSequencePlayerChannels.s,AudioSeq_InitSequencePlayerChannels,0x8019AC10,0x37
 asm/non_matchings/code/audio_seqplayer/func_8019ACEC.s,func_8019ACEC,0x8019ACEC,0x34
-asm/non_matchings/code/audio_seqplayer/func_8019ADBC.s,func_8019ADBC,0x8019ADBC,0x21
+asm/non_matchings/code/audio_seqplayer/AudioSeq_InitSequencePlayers.s,AudioSeq_InitSequencePlayers,0x8019ADBC,0x21
 asm/non_matchings/code/code_8019AE40/func_8019AE40.s,func_8019AE40,0x8019AE40,0x1C
 asm/non_matchings/code/code_8019AEC0/func_8019AEC0.s,func_8019AEC0,0x8019AEC0,0x10
 asm/non_matchings/code/code_8019AF00/func_8019AF00.s,func_8019AF00,0x8019AF00,0x16