Audio Misc Cleanup 2 (#1303)

* Misc cleanup

* PR Suggestions

1 files changed, 11 insertions, 11 deletions

diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c
index 28b2e9aea..c1a75de4a 100644
--- a/src/code/code_800E4FE0.c
+++ b/src/code/code_800E4FE0.c
@@ -333,7 +333,7 @@ void func_800E5584(AudioCmd* cmd) {
             break;
 
         case 0xE3:
-            AudioHeap_PopCache(cmd->asInt);
+            AudioHeap_PopPersistentCache(cmd->asInt);
             break;
 
         default:
@@ -596,7 +596,7 @@ s8 func_800E60C4(s32 playerIdx, s32 port) {
 }
 
 void Audio_InitExternalPool(void* ramAddr, u32 size) {
-    AudioHeap_AllocPoolInit(&gAudioContext.externalPool, ramAddr, size);
+    AudioHeap_InitPool(&gAudioContext.externalPool, ramAddr, size);
 }
 
 void Audio_DestroyExternalPool(void) {
@@ -834,8 +834,8 @@ void func_800E66A0(void) {
 
 s32 func_800E66C0(s32 arg0) {
     s32 phi_v1;
-    NotePlaybackState* temp_a2;
-    NoteSubEu* temp_a3;
+    NotePlaybackState* playbackState;
+    NoteSubEu* noteSubEu;
     s32 i;
     Note* note;
     TunedSample* tunedSample;
@@ -843,13 +843,13 @@ s32 func_800E66C0(s32 arg0) {
     phi_v1 = 0;
     for (i = 0; i < gAudioContext.numNotes; i++) {
         note = &gAudioContext.notes[i];
-        temp_a2 = &note->playbackState;
+        playbackState = &note->playbackState;
         if (note->noteSubEu.bitField0.enabled) {
-            temp_a3 = &note->noteSubEu;
-            if (temp_a2->adsr.action.s.state != 0) {
+            noteSubEu = &note->noteSubEu;
+            if (playbackState->adsr.action.s.state != 0) {
                 if (arg0 >= 2) {
-                    tunedSample = temp_a3->tunedSample;
-                    if (tunedSample == NULL || temp_a3->bitField1.isSyntheticWave) {
+                    tunedSample = noteSubEu->tunedSample;
+                    if (tunedSample == NULL || noteSubEu->bitField1.isSyntheticWave) {
                         continue;
                     }
                     if (tunedSample->sample->medium == MEDIUM_RAM) {
@@ -859,8 +859,8 @@ s32 func_800E66C0(s32 arg0) {
 
                 phi_v1++;
                 if ((arg0 & 1) == 1) {
-                    temp_a2->adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv;
-                    temp_a2->adsr.action.s.release = 1;
+                    playbackState->adsr.fadeOutVel = gAudioContext.audioBufferParameters.updatesPerFrameInv;
+                    playbackState->adsr.action.s.release = 1;
                 }
             }
         }