River_Sound OK and Documented + River_Sound Related `z_actor`/`Audio` Functions (#661)

* First pass of `func_800BCCDC`

* river_sound OK (copy progress from audio WIP)

* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)

* More docs

* feedback

* Add in `code_8019AF00.c` functions

* format

* params

* Minor cleanup

* Small fix

* one more

* Better names

* Add comment, cleanup Idx

* Fix bss

* Fix BSS

include/functions.h

@@ -777,7 +777,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type);
 void Actor_SetColorFilter(Actor* actor, u16 colorFlag, u16 colorIntensityMax, u16 xluFlag, u16 duration);
 Hilite* func_800BCBF4(Vec3f* arg0, GlobalContext* globalCtx);
 Hilite* func_800BCC68(Vec3f* arg0, GlobalContext* globalCtx);
-void func_800BCCDC(Vec3s* points, s32 pathCount, Vec3f* pos1, Vec3f* pos2, s32 parm5);
+void Actor_GetClosestPosOnPath(Vec3s* points, s32 numPoints, Vec3f* srcPos, Vec3f* dstPos, s32 isPathLoop);
 s32 func_800BD2B4(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, u16 (*textIdCallback)(GlobalContext*, Actor*), s16 (*arg5)(GlobalContext*, Actor*));
 void func_800BD888(Actor* actor, struct_800BD888_arg1* arg1, s16 arg2, s16 arg3);
 void func_800BD9E0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, Actor* actor, s16 alpha);
@@ -3359,7 +3359,7 @@ AudioTask* func_80192BE0(void);
 // void func_8019380C(void);
 // void func_80193858(void);
 // void func_8019387C(void);
-// void func_801938A0(void);
+void Audio_QueueCmdS8(u32 opArgs, s8 data);
 // void func_801938D0(void);
 // void func_80193900(void);
 // void func_80193990(void);
@@ -3537,24 +3537,24 @@ void func_8019FDC8(UNK_PTR arg0, u16 sfxId, UNK_TYPE arg2);
 void func_8019FE74(f32* arg0, f32 arg1, s32 arg2);
 // void func_8019FEDC(void);
 // void func_8019FF38(void);
-// void func_8019FF9C(void);
-// void func_801A0048(void);
-// void func_801A00EC(void);
+void Audio_PlaySfxForRiver(Vec3f* pos, f32 freqScale);
+// void Audio_PlaySfxForWaterfall(void);
+// void Audio_StepFreqLerp(void);
 void func_801A0124(Vec3f* pos, u8 arg1);
 // void func_801A0184(void);
 // void func_801A01C4(void);
 void func_801A0204(s8 seqId);
 void func_801A0238(s32 arg0, s32 arg1);
-// void func_801A026C(void);
-// void func_801A0318(void);
-// void func_801A046C(void);
+// void Audio_SetGanonsTowerBgmVolumeLevel(void);
+// void Audio_SetGanonsTowerBgmVolume(void);
+// void Audio_UpdateRiverSoundVolumes(void);
 // void func_801A0554(void);
 // void func_801A05F0(void);
 void func_801A0654(Vec3f* arg0, u16 sfxId, s32 arg2);
 void func_801A0810(Vec3f* arg0, u16 sfxId, u8 arg2);
 // void func_801A0868(void);
 // void func_801A09D4(void);
-// void func_801A0CB0(void);
+// void Audio_SplitBgmChannels(void);
 // void func_801A0E44(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
 // void func_801A1290(void);
 // void func_801A1348(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
@@ -3678,16 +3678,16 @@ void func_801A75E8(u16 sfxId);
 void func_801A7794(u32 param_1, u32 param_2, u32 param_3);
 // void func_801A7828(void);
 // void func_801A787C(void);
-// void func_801A78E4(void);
+u8 Audio_IsSfxPlaying(u32 sfxId);
 // void func_801A794C(void);
 // void func_801A7B10(void);
 // void func_801A7D04(void);
 // void func_801A7D84(void);
-void Audio_QueueSeqCmd(u32 arg0);
+void Audio_QueueSeqCmd(u32 cmd);
 // void func_801A89D0(void);
 s32 func_801A8A50(s32 param1);
 // void func_801A8ABC(void);
-// void func_801A8BD0(void);
+void Audio_SetVolumeScale(u8 playerIdx, u8 scaleIdx, u8 targetVol, u8 volFadeTimer);
 // void func_801A8D5C(void);
 // void func_801A8E90(void);
 // void func_801A9768(void);

include/variables.h

@@ -3008,7 +3008,7 @@ extern f32 D_801E05B4;
 extern f32 D_801E05B8;
 extern f32 D_801E05D0;
 extern f32 D_801E05D4;
-// extern UNK_TYPE1 D_801E0BD0;
+extern const u16 gAudioEnvironmentalSfx[];
 // extern UNK_TYPE1 D_801E0BFC;
 extern f32 D_801E0CEC;
 extern f32 D_801E0CF0;

spec

@@ -965,8 +965,7 @@ beginseg
     name "ovl_En_River_Sound"
     compress
     include "build/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.o"
-    include "build/data/ovl_En_River_Sound/ovl_En_River_Sound.data.o"
-    include "build/data/ovl_En_River_Sound/ovl_En_River_Sound.reloc.o"
+    include "build/src/overlays/actors/ovl_En_River_Sound/ovl_En_River_Sound_reloc.o"
 endseg
 
 beginseg

src/code/audio/code_80192BE0.c

@@ -18,7 +18,7 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_8019387C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801938A0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/Audio_QueueCmdS8.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_80192BE0/func_801938D0.s")
 

src/code/audio/code_8019AF00.c

@@ -66,6 +66,9 @@ typedef struct {
     /* 0xC */ s32 remainingFrames;
 } FreqLerp; // size = 0x10
 
+s32 Audio_SetGanonsTowerBgmVolume(u8 targetVolume);
+void func_801A3238(s8 playerIndex, u16 seqId, u8 fadeTimer, s8 arg3, u8 arg4);
+
 // Sfx bss
 SfxSettings sSfxSettings[8];
 u8 sSfxSettingsFlags;
@@ -2071,11 +2074,50 @@ const char sAudioOcarinaUnusedText7[] = "check is over!!! %d %d %d\n";
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FF38.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_8019FF9C.s")
+/**
+ * Used for EnRiverSound
+ */
+void Audio_PlaySfxForRiver(Vec3f* pos, f32 freqScale) {
+    if (!Audio_IsSfxPlaying(NA_SE_EV_RIVER_STREAM - SFX_FLAG)) {
+        sRiverFreqScaleLerp.value = freqScale;
+    } else if (freqScale != sRiverFreqScaleLerp.value) {
+        sRiverFreqScaleLerp.target = freqScale;
+        sRiverFreqScaleLerp.remainingFrames = 40;
+        sRiverFreqScaleLerp.step = (sRiverFreqScaleLerp.target - sRiverFreqScaleLerp.value) / 40;
+    }
+    Audio_PlaySfxGeneral(NA_SE_EV_RIVER_STREAM - SFX_FLAG, pos, 4, &sRiverFreqScaleLerp.value, &D_801DB4B0,
+                         &D_801DB4B8);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0048.s")
+/**
+ * Unused remnant of OoT's EnRiverSound
+ * Used for Zora's River Waterfall
+ */
+void Audio_PlaySfxForWaterfall(Vec3f* pos, f32 freqScale) {
+    if (!Audio_IsSfxPlaying(NA_SE_EV_WATER_WALL_BIG - SFX_FLAG)) {
+        sWaterfallFreqScaleLerp.value = freqScale;
+    } else if (freqScale != sWaterfallFreqScaleLerp.value) {
+        sWaterfallFreqScaleLerp.target = freqScale;
+        sWaterfallFreqScaleLerp.remainingFrames = 40;
+        sWaterfallFreqScaleLerp.step = (sWaterfallFreqScaleLerp.target - sWaterfallFreqScaleLerp.value) / 40;
+    }
+    Audio_PlaySfxGeneral(NA_SE_EV_WATER_WALL_BIG - SFX_FLAG, pos, 4, &sWaterfallFreqScaleLerp.value,
+                         &sWaterfallFreqScaleLerp.value, &D_801DB4B8);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A00EC.s")
+/**
+ * Used for EnRiverSound variables
+ */
+void Audio_StepFreqLerp(FreqLerp* lerp) {
+    if (lerp->remainingFrames != 0) {
+        lerp->remainingFrames--;
+        if (lerp->remainingFrames != 0) {
+            lerp->value += lerp->step;
+        } else {
+            lerp->value = lerp->target;
+        }
+    }
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0124.s")
 
@@ -2087,13 +2129,131 @@ const char sAudioOcarinaUnusedText7[] = "check is over!!! %d %d %d\n";
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0238.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A026C.s")
+/**
+ * Unused remnant from OoT's EnRiverSound
+ * Was designed to incrementally increase volume of NA_BGM_GANON_TOWER for each new room during the climb of Ganon's
+ * Tower
+ */
+void Audio_SetGanonsTowerBgmVolumeLevel(u8 ganonsTowerLevel) {
+    u8 channelIndex;
+    s8 pan = 0;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0318.s")
+    // Ganondorfs's Lair
+    if (ganonsTowerLevel == 0) {
+        pan = 0x7F;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0450.s")
+    for (channelIndex = 0; channelIndex < 16; channelIndex++) {
+        // CHAN_UPD_PAN_UNSIGNED
+        Audio_QueueCmdS8(((u8)(u32)channelIndex << 8) | 0x7000000, pan);
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A046C.s")
+    // Lowest room in Ganon's Tower (Entrance Room)
+    if (ganonsTowerLevel == 7) {
+        // Adds a delay to setting the volume in the first room
+        sEnterGanonsTowerTimer = 2;
+    } else {
+        Audio_SetGanonsTowerBgmVolume(sGanonsTowerLevelsVol[ganonsTowerLevel % ARRAY_COUNTU(sGanonsTowerLevelsVol)]);
+    }
+}
+
+/**
+ * Unused remnant from OoT's EnRiverSound
+ * If a new volume is requested for ganon's tower, update the volume and
+ * calculate a new low-pass filter cutoff and reverb based on the new volume
+ */
+s32 Audio_SetGanonsTowerBgmVolume(u8 targetVolume) {
+    u8 lowPassFilterCutoff;
+    u8 channelIndex;
+    u16 reverb;
+
+    if (sGanonsTowerVol != targetVolume) {
+        // Sets the volume
+        Audio_SetVolumeScale(SEQ_PLAYER_BGM_MAIN, 0, targetVolume, 2);
+
+        // Sets the filter cutoff of the form (lowPassFilterCutoff << 4) | (highPassFilter & 0xF). highPassFilter is
+        // always set to 0
+        if (targetVolume < 0x40) {
+            // Only the first room
+            lowPassFilterCutoff = 0x10;
+        } else {
+            // Higher volume leads to a higher cut-off frequency in the low-pass filtering
+            lowPassFilterCutoff = (((targetVolume - 0x40) >> 2) + 1) << 4;
+        }
+
+        Audio_QueueSeqCmd((8 << 28) | ((u8)(SEQ_PLAYER_BGM_MAIN) << 24) | ((u8)(4) << 16) | ((u8)(15) << 8) |
+                          (u8)(lowPassFilterCutoff));
+
+        // Sets the reverb
+        for (channelIndex = 0; channelIndex < ARRAY_COUNT(gAudioContext.seqPlayers[SEQ_PLAYER_BGM_MAIN].channels);
+             channelIndex++) {
+            if (&gAudioContext.sequenceChannelNone !=
+                gAudioContext.seqPlayers[SEQ_PLAYER_BGM_MAIN].channels[channelIndex]) {
+                // soundScriptIO[5] was set to 0x40 in channels 0, 1, and 4 (BGM no longer in OoT)
+                if ((u8)gAudioContext.seqPlayers[SEQ_PLAYER_BGM_MAIN].channels[channelIndex]->soundScriptIO[5] !=
+                    0xFF) {
+                    // Higher volume leads to lower reverb
+                    reverb =
+                        (((u16)gAudioContext.seqPlayers[SEQ_PLAYER_BGM_MAIN].channels[channelIndex]->soundScriptIO[5] -
+                          targetVolume) +
+                         0x7F);
+
+                    if (reverb > 0x7F) {
+                        reverb = 0x7F;
+                    }
+
+                    // CHAN_UPD_REVERB
+                    Audio_QueueCmdS8(_SHIFTL(5, 24, 8) | _SHIFTL(SEQ_PLAYER_BGM_MAIN, 16, 8) |
+                                         _SHIFTL(channelIndex, 8, 8),
+                                     (u8)reverb);
+                }
+            }
+        }
+
+        sGanonsTowerVol = targetVolume;
+    }
+    return -1;
+}
+
+/**
+ * Unused remnant from OoT's EnRiverSound
+ * Responsible for lowering market bgm in Child Market Entrance and Child Market Back Alley
+ * Only lowers volume for 1 frame, so must be called every frame to maintain lower volume
+ */
+void Audio_LowerMainBgmVolume(u8 volume) {
+    sRiverSoundMainBgmVol = volume;
+    sRiverSoundMainBgmLower = true;
+}
+
+/**
+ * Unused remnant from OoT's EnRiverSound
+ * Still called by Audio_Update every frame, but none of these processes get initialized
+ */
+void Audio_UpdateRiverSoundVolumes(void) {
+    // Updates Main Bgm Volume (RiverSound of type RS_LOWER_MAIN_BGM_VOLUME)
+    if (sRiverSoundMainBgmLower == true) {
+        if (sRiverSoundMainBgmCurrentVol != sRiverSoundMainBgmVol) {
+            // lowers the volume for 1 frame
+            Audio_SetVolumeScale(SEQ_PLAYER_BGM_MAIN, 0, sRiverSoundMainBgmVol, 10);
+            sRiverSoundMainBgmCurrentVol = sRiverSoundMainBgmVol;
+            sRiverSoundMainBgmRestore = true;
+        }
+        sRiverSoundMainBgmLower = false;
+    } else if ((sRiverSoundMainBgmRestore == true) && !sAudioIsWindowOpen) {
+        // restores the volume every frame
+        Audio_SetVolumeScale(SEQ_PLAYER_BGM_MAIN, 0, 0x7F, 10);
+        sRiverSoundMainBgmCurrentVol = 0x7F;
+        sRiverSoundMainBgmRestore = false;
+    }
+
+    // Update Ganon's Tower Volume (RiverSound of type RS_GANON_TOWER_7)
+    if (sEnterGanonsTowerTimer != 0) {
+        sEnterGanonsTowerTimer--;
+        if (sEnterGanonsTowerTimer == 0) {
+            Audio_SetGanonsTowerBgmVolume(sGanonsTowerLevelsVol[7]);
+        }
+    }
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0554.s")
 
@@ -2107,13 +2267,71 @@ const char sAudioOcarinaUnusedText7[] = "check is over!!! %d %d %d\n";
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0868.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A09D4.s")
+/**
+ * Unused remnant of OoT's EnRiverSound (func_800F4E30)
+ */
+void func_801A09D4(Vec3f* pos, f32 xzDistToPlayer) {
+    f32 volumeRel;
+    s8 pan;
+    u8 channelIndex;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0C70.s")
+    if (sRiverSoundBgmPos == NULL) {
+        sRiverSoundBgmPos = pos;
+        sRiverSoundXZDistToPlayer = xzDistToPlayer;
+    } else if (sRiverSoundBgmPos != pos) {
+        if (sRiverSoundXZDistToPlayer > xzDistToPlayer) {
+            sRiverSoundBgmPos = pos;
+            sRiverSoundXZDistToPlayer = xzDistToPlayer;
+        }
+    } else {
+        sRiverSoundXZDistToPlayer = xzDistToPlayer;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0C90.s")
+    if (sRiverSoundBgmPos->x > 100.0f) {
+        pan = 0x7F;
+    } else if (sRiverSoundBgmPos->x < -100.0f) {
+        pan = 0;
+    } else {
+        pan = ((sRiverSoundBgmPos->x / 100.0f) * 64.0f) + 64.0f;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0CB0.s")
+    if (sRiverSoundXZDistToPlayer > 400.0f) {
+        volumeRel = 0.1f;
+    } else if (sRiverSoundXZDistToPlayer < 120.0f) {
+        volumeRel = 1.0f;
+    } else {
+        volumeRel = ((1.0f - ((sRiverSoundXZDistToPlayer - 120.0f) / 280.0f)) * 0.9f) + 0.1f;
+    }
+
+    for (channelIndex = 0; channelIndex < 16; channelIndex++) {
+        if (channelIndex != 9) {
+            Audio_QueueSeqCmd(((u32)(6) << 28) | ((u32)(SEQ_PLAYER_BGM_MAIN) << 24) | ((u32)(2) << 16) |
+                              ((u32)(channelIndex) << 8) | ((u8)(127.0f * volumeRel)));
+            Audio_QueueCmdS8(0x03000000 | ((u8)((u32)channelIndex) << 8), pan);
+        }
+    }
+}
+
+/**
+ * Unused remnant of OoT's EnRiverSound
+ */
+void Audio_ClearSariaBgm(void) {
+    if (sRiverSoundBgmPos != NULL) {
+        sRiverSoundBgmPos = NULL;
+    }
+}
+
+/**
+ * Unused remnant of OoT's EnRiverSound
+ */
+void Audio_ClearSariaBgmAtPos(Vec3f* pos) {
+    if (sRiverSoundBgmPos == pos) {
+        sRiverSoundBgmPos = NULL;
+    }
+}
+
+void Audio_SplitBgmChannels(s8 volumeSplit);
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/Audio_SplitBgmChannels.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A0E44.s")
 
@@ -2147,9 +2365,58 @@ const char sAudioOcarinaUnusedText7[] = "check is over!!! %d %d %d\n";
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2090.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A21FC.s")
+/**
+ * Unused remnant of OoT's EnRiverSound
+ */
+void Audio_PlaySariaBgm(Vec3f* pos, u16 seqId, u16 distMax) {
+    f32 absY;
+    f32 dist;
+    u8 targetVolume;
+    f32 prevDist;
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A2460.s")
+    if (sRiverSoundBgmTimer != 0) {
+        sRiverSoundBgmTimer--;
+        return;
+    }
+
+    dist = sqrtf(SQ(pos->z) + (SQ(pos->x) + SQ(pos->y)));
+
+    if (sRiverSoundBgmPos == NULL) {
+        sRiverSoundBgmPos = pos;
+        func_801A3238(SEQ_PLAYER_BGM_SUB, seqId, 0, 7, 2);
+    } else {
+        prevDist = sqrtf(SQ(sRiverSoundBgmPos->z) + SQ(sRiverSoundBgmPos->x));
+        if (dist < prevDist) {
+            sRiverSoundBgmPos = pos;
+        } else {
+            dist = prevDist;
+        }
+    }
+
+    absY = ABS_ALT(pos->y);
+
+    if ((distMax / 15.0f) < absY) {
+        targetVolume = 0;
+    } else if (dist < distMax) {
+        targetVolume = (1.0f - (dist / distMax)) * 127.0f;
+    } else {
+        targetVolume = 0;
+    }
+
+    if (seqId != NA_BGM_FAIRY_FOUNTAIN) {
+        Audio_SplitBgmChannels(targetVolume);
+    }
+
+    Audio_SetVolumeScale(SEQ_PLAYER_BGM_SUB, 3, targetVolume, 0);
+    Audio_SetVolumeScale(SEQ_PLAYER_BGM_MAIN, 3, 0x7F - targetVolume, 0);
+}
+
+/**
+ * Unused remnant of OoT's EnRiverSound
+ */
+void Audio_ClearSariaBgm2(void) {
+    sRiverSoundBgmPos = NULL;
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A246C.s")
 

src/code/audio/code_801A5BD0.c

@@ -40,6 +40,6 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A787C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A78E4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/Audio_IsSfxPlaying.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A794C.s")

src/code/audio/code_801A7B10.c

@@ -18,7 +18,7 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8B2C.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8BD0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/Audio_SetVolumeScale.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8D5C.s")
 

src/code/z_actor.c

@@ -3908,104 +3908,148 @@ Hilite* func_800BCC68(Vec3f* arg0, GlobalContext* globalCtx) {
     return Hilite_DrawXlu(arg0, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx);
 }
 
-void func_800BCCDC(Vec3s* points, s32 pathCount, Vec3f* pos1, Vec3f* pos2, s32 arg4) {
-    s32 spB4;
-    s32 spB0;
-    s32 spA8[2] = { 0, 0 };
-    s32 spA0[2] = { 0, 0 };
-    Vec3f sp94;
-    Vec3f sp7C[2];
-    Vec3f sp70;
-    Vec3f sp64;
-    f32 sp60;
-    f32 sp5C;
-    f32 sp54[2];
+/**
+ * Calculates the closest position `dstPos` to the input position `srcPos` along the path given by `points`/`numPoints`
+ * Whether the points provided forms a closed-loop path is indicated by `isPathLoop`
+ */
+void Actor_GetClosestPosOnPath(Vec3s* points, s32 numPoints, Vec3f* srcPos, Vec3f* dstPos, s32 isPathLoop) {
+    s32 pointIndex;
+    s32 closestPointIndex;
+    s32 useAdjacentLines[2] = {
+        false, // determines whether to use line connecting to previous point in calculations
+        false, // determines whether to use line connecting to next point in calculations
+    };
+    s32 isRightSideOfAdjacentLines[2] = {
+        false, // determines whether srcPos is on the right side of the line from prev to curr point
+        false, // determines whether srcPos is on the right side of the line from curr to next point
+    };
+    Vec3f closestPoint;
+    Vec3f closestPos[2];
+    Vec3f closestPointNext;
+    Vec3f closestPointPrev;
+    f32 distSq; // First used as distSq to closest point, then used as distSq to closest position
+    f32 closestPointDistSq;
+    f32 loopDistSq[2];
+    s32 i;
 
-    spB0 = 0;
-    sp5C = SQ(40000.0f);
+    closestPointIndex = 0;
+    closestPointDistSq = SQ(40000.0f);
 
-    for (spB4 = 0; spB4 < pathCount; spB4++) {
-        sp60 = Math3D_XZDistanceSquared(pos1->x, pos1->z, points[spB4].x, points[spB4].z);
-        if (sp60 < sp5C) {
-            sp5C = sp60;
-            spB0 = spB4;
+    // Find the point closest to srcPos
+    for (pointIndex = 0; pointIndex < numPoints; pointIndex++) {
+        distSq = Math3D_XZDistanceSquared(srcPos->x, srcPos->z, points[pointIndex].x, points[pointIndex].z);
+        if (distSq < closestPointDistSq) {
+            closestPointDistSq = distSq;
+            closestPointIndex = pointIndex;
         }
     }
 
-    sp94.x = (points + spB0)->x;
-    sp94.z = (points + spB0)->z;
-    pos2->y = (points + spB0)->y;
-    if (spB0 != 0) {
-        sp64.x = (points + spB0 - 1)->x;
-        sp64.z = (points + spB0 - 1)->z;
-    } else if (arg4) {
-        sp64.x = (points + pathCount - 1)->x;
-        sp64.z = (points + pathCount - 1)->z;
+    closestPoint.x = (points + closestPointIndex)->x;
+    closestPoint.z = (points + closestPointIndex)->z;
+    dstPos->y = (points + closestPointIndex)->y;
+
+    // Analyze point on path immediately previous to the closest point
+    if (closestPointIndex != 0) {
+        // The point previous to the closest point
+        closestPointPrev.x = (points + closestPointIndex - 1)->x;
+        closestPointPrev.z = (points + closestPointIndex - 1)->z;
+    } else if (isPathLoop) {
+        // Closest point is the first point in the path list
+        // Set the previous point to loop around to the the final point on the path
+        closestPointPrev.x = (points + numPoints - 1)->x;
+        closestPointPrev.z = (points + numPoints - 1)->z;
+    }
+    if ((closestPointIndex != 0) || isPathLoop) {
+        // Use the adjacent line
+        useAdjacentLines[0] =
+            Math3D_PointDistToLine2D(srcPos->x, srcPos->z, closestPointPrev.x, closestPointPrev.z, closestPoint.x,
+                                     closestPoint.z, &closestPos[0].x, &closestPos[0].z, &distSq);
     }
 
-    if ((spB0 != 0) || arg4) {
-        spA8[0] =
-            Math3D_PointDistToLine2D(pos1->x, pos1->z, sp64.x, sp64.z, sp94.x, sp94.z, &sp7C[0].x, &sp7C[0].z, &sp60);
+    // Analyze point on path immediately next to the closest point
+    if (closestPointIndex + 1 != numPoints) {
+        // The point next to the closest point
+        closestPointNext.x = (points + closestPointIndex + 1)->x;
+        closestPointNext.z = (points + closestPointIndex + 1)->z;
+    } else if (isPathLoop) {
+        // Closest point is the final point in the path list
+        // Set the next point to loop around to the the first point on the path
+        closestPointNext.x = (points + 0)->x;
+        closestPointNext.z = (points + 0)->z;
+    }
+    if ((closestPointIndex + 1 != numPoints) || isPathLoop) {
+        useAdjacentLines[1] =
+            Math3D_PointDistToLine2D(srcPos->x, srcPos->z, closestPoint.x, closestPoint.z, closestPointNext.x,
+                                     closestPointNext.z, &closestPos[1].x, &closestPos[1].z, &distSq);
     }
 
-    if (spB0 + 1 != pathCount) {
-        sp70.x = (points + spB0 + 1)->x;
-        sp70.z = (points + spB0 + 1)->z;
-    } else if (arg4) {
-        sp70.x = points->x;
-        sp70.z = points->z;
-    }
+    /**
+     * For close-looped paths, they must be defined in a clockwise orientation looking from the top down.
+     * Therefore, `srcPos` being interior of the loop will lead to both lines of `isRightSideOfAdjacentLines`
+     * returning true.
+     */
+    if (isPathLoop) {
+        isRightSideOfAdjacentLines[0] = ((closestPointPrev.x - srcPos->x) * (closestPoint.z - srcPos->z)) <
+                                        ((closestPointPrev.z - srcPos->z) * (closestPoint.x - srcPos->x));
 
-    if ((spB0 + 1 != pathCount) || arg4) {
-        spA8[1] =
-            Math3D_PointDistToLine2D(pos1->x, pos1->z, sp94.x, sp94.z, sp70.x, sp70.z, &sp7C[1].x, &sp7C[1].z, &sp60);
-    }
+        isRightSideOfAdjacentLines[1] = ((closestPointNext.z - srcPos->z) * (closestPoint.x - srcPos->x)) <
+                                        ((closestPoint.z - srcPos->z) * (closestPointNext.x - srcPos->x));
 
-    if (arg4) {
-        s32 phi_s0_2;
-
-        spA0[0] = ((sp64.x - pos1->x) * (sp94.z - pos1->z)) < ((sp64.z - pos1->z) * (sp94.x - pos1->x));
-        spA0[1] = ((sp70.z - pos1->z) * (sp94.x - pos1->x)) < ((sp94.z - pos1->z) * (sp70.x - pos1->x));
-
-        for (phi_s0_2 = 0; phi_s0_2 < ARRAY_COUNT(sp54); phi_s0_2++) {
-            if (spA8[phi_s0_2] != 0) {
-                sp54[phi_s0_2] = Math3D_XZDistanceSquared(pos1->x, pos1->z, sp7C[phi_s0_2].x, sp7C[phi_s0_2].z);
+        for (i = 0; i < ARRAY_COUNT(loopDistSq); i++) {
+            if (useAdjacentLines[i]) {
+                // Get distSq from srcPos to closestPos
+                loopDistSq[i] = Math3D_XZDistanceSquared(srcPos->x, srcPos->z, closestPos[i].x, closestPos[i].z);
             } else {
-                sp54[phi_s0_2] = SQ(40000.0f);
+                // The closest Pos is not contained within the line-segment
+                loopDistSq[i] = SQ(40000.0f);
             }
         }
     }
 
-    if (arg4 && (((spA0[0] != 0) && (spA0[1] != 0)) || ((spA0[0] != 0) && (spA8[0] != 0) && (sp54[0] < sp54[1])) ||
-                 ((spA0[1] != 0) && (spA8[1] != 0) && (sp54[1] < sp54[0])))) {
-        pos2->x = pos1->x;
-        pos2->z = pos1->z;
-    } else if ((spA8[0] != 0) && (spA8[1] != 0)) {
-        if ((spA0[0] == 0) && (spA0[1] == 0)) {
-            if (Math3D_PointDistToLine2D(pos1->x, pos1->z, sp7C[0].x, sp7C[0].z, sp7C[1].x, sp7C[1].z, &pos2->x,
-                                         &pos2->z, &sp60) == 0) {
-                pos2->x = (sp7C[1].x + sp7C[0].x) * 0.5f;
-                pos2->z = (sp7C[1].z + sp7C[0].z) * 0.5f;
+    // Calculate closest position along path
+    if (isPathLoop && ((isRightSideOfAdjacentLines[0] && isRightSideOfAdjacentLines[1]) ||
+                       (isRightSideOfAdjacentLines[0] && useAdjacentLines[0] && (loopDistSq[0] < loopDistSq[1])) ||
+                       (isRightSideOfAdjacentLines[1] && useAdjacentLines[1] && (loopDistSq[1] < loopDistSq[0])))) {
+        // srcPos is contained within the closed loop
+        dstPos->x = srcPos->x;
+        dstPos->z = srcPos->z;
+    } else if (useAdjacentLines[0] && useAdjacentLines[1]) {
+        // srcPos is somewhere withing the bend of the path
+        if (!isRightSideOfAdjacentLines[0] && !isRightSideOfAdjacentLines[1]) {
+            // srcPos is not inside a loop
+            if (!Math3D_PointDistToLine2D(srcPos->x, srcPos->z, closestPos[0].x, closestPos[0].z, closestPos[1].x,
+                                          closestPos[1].z, &dstPos->x, &dstPos->z, &distSq)) {
+                // The dstPos calculated in Math3D_PointDistToLine2D was not valid.
+                // Take the midpoint of the two closest ponits instead
+                dstPos->x = (closestPos[1].x + closestPos[0].x) * 0.5f;
+                dstPos->z = (closestPos[1].z + closestPos[0].z) * 0.5f;
             }
-        } else if (sp54[1] < sp54[0]) {
-            pos2->x = sp7C[1].x;
-            pos2->z = sp7C[1].z;
+        } else if (loopDistSq[1] < loopDistSq[0]) {
+            // Use closest position along the line in the loop connecting the closest point and the next point
+            dstPos->x = closestPos[1].x;
+            dstPos->z = closestPos[1].z;
         } else {
-            pos2->x = sp7C[0].x;
-            pos2->z = sp7C[0].z;
+            // Use closest position along the ling in the loop connecting the closest point and the prev point
+            dstPos->x = closestPos[0].x;
+            dstPos->z = closestPos[0].z;
         }
-    } else if (spA8[0] != 0) {
-        pos2->x = sp7C[0].x;
-        pos2->z = sp7C[0].z;
-    } else if (spA8[1] != 0) {
-        pos2->x = sp7C[1].x;
-        pos2->z = sp7C[1].z;
-    } else if (arg4 && ((((sp64.x - pos1->x) * (sp70.z - pos1->z)) < ((sp64.z - pos1->z) * (sp70.x - pos1->x))))) {
-        pos2->x = pos1->x;
-        pos2->z = pos1->z;
+    } else if (useAdjacentLines[0]) {
+        // Use closest position along line segment connecting the closest point and the prev point
+        dstPos->x = closestPos[0].x;
+        dstPos->z = closestPos[0].z;
+    } else if (useAdjacentLines[1]) {
+        // Use closest position along line segment connecting the closest point and the next point
+        dstPos->x = closestPos[1].x;
+        dstPos->z = closestPos[1].z;
+    } else if (isPathLoop && ((((closestPointPrev.x - srcPos->x) * (closestPointNext.z - srcPos->z)) <
+                               ((closestPointPrev.z - srcPos->z) * (closestPointNext.x - srcPos->x))))) {
+        // Inside the line that directly connects the previous point to the next point (inside the bend of a corner)
+        dstPos->x = srcPos->x;
+        dstPos->z = srcPos->z;
     } else {
-        pos2->x = sp94.x;
-        pos2->z = sp94.z;
+        // The closest point and the closest position are the same (srcPos is near the outer region of a corner)
+        dstPos->x = closestPoint.x;
+        dstPos->z = closestPoint.z;
     }
 }
 

src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c

@@ -7,6 +7,7 @@
 #include "prevent_bss_reordering.h"
 #include "z_bg_hakugin_post.h"
 #include "objects/object_hakugin_obj/object_hakugin_obj.h"
+#include "prevent_bss_reordering.h"
 
 #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
 

src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c

@@ -1,7 +1,7 @@
 /*
  * File: z_en_river_sound.c
  * Overlay: ovl_En_River_Sound
- * Description: Various environment Sfx (e.g., ocean waves, gulls, waterfall, lava, etc)
+ * Description: Various environment Sfx along a path (e.g., ocean waves, gulls, waterfall, lava, etc)
  */
 
 #include "z_en_river_sound.h"
@@ -14,7 +14,6 @@ void EnRiverSound_Init(Actor* thisx, GlobalContext* globalCtx);
 void EnRiverSound_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-#if 0
 const ActorInit En_River_Sound_InitVars = {
     ACTOR_EN_RIVER_SOUND,
     ACTORCAT_ITEMACTION,
@@ -27,10 +26,68 @@ const ActorInit En_River_Sound_InitVars = {
     (ActorFunc)EnRiverSound_Draw,
 };
 
-#endif
+void EnRiverSound_Init(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnRiverSound* this = THIS;
+    Path* path;
+    s32 pathIndex;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_River_Sound/EnRiverSound_Init.s")
+    this->playSound = false;
+    pathIndex = RS_GET_PATH_INDEX(&this->actor);
+    this->actor.params = RS_GET_TYPE(&this->actor);
+    if (pathIndex == 0xFF) {
+        Actor_MarkForDeath(&this->actor);
+        return;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_River_Sound/EnRiverSound_Update.s")
+    path = &globalCtx->setupPathList[pathIndex];
+    this->pathPoints = Lib_SegmentedToVirtual(path->points);
+    this->numPoints = path->count;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_River_Sound/EnRiverSound_Draw.s")
+void EnRiverSound_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnRiverSound* this = THIS;
+    Vec3f* worldPos = &this->actor.world.pos;
+    Vec3f eye;
+    s32 bgId;
+
+    Math_Vec3f_Copy(&eye, &globalCtx->view.eye);
+
+    if (this->actor.params < RS_RIVER_DEFAULT_LOW_FREQ) {
+        // All sfx from river_sound that accesses gAudioEnvironmentalSfx is associated with a closed-loop
+        // path that is used to play a regional sfx
+        Actor_GetClosestPosOnPath(this->pathPoints, this->numPoints, &eye, worldPos, true);
+    } else {
+        Actor_GetClosestPosOnPath(this->pathPoints, this->numPoints, &eye, worldPos, false);
+        if (BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &this->actor.floorPoly, &bgId, &this->actor, worldPos) !=
+            BGCHECK_Y_MIN) {
+            this->soundFreqIndex = SurfaceType_GetConveyorSpeed(&globalCtx->colCtx, this->actor.floorPoly, bgId);
+        } else {
+            this->soundFreqIndex = 0;
+        }
+
+        if (this->soundFreqIndex == 0) {
+            this->soundFreqIndex = this->actor.params - RS_RIVER_DEFAULT_LOW_FREQ;
+        } else {
+            this->soundFreqIndex--;
+        }
+
+        this->soundFreqIndex = CLAMP_MAX(this->soundFreqIndex, 2);
+    }
+}
+
+void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    static f32 freqScale[] = {
+        0.7f, // 1 / sqrt(2)
+        1.0f, // 1
+        1.4f, // sqrt(2)
+    };
+    EnRiverSound* this = THIS;
+    s16 params = this->actor.params;
+
+    if (params < RS_RIVER_DEFAULT_LOW_FREQ) {
+        Actor_PlaySfxAtPos(&this->actor, gAudioEnvironmentalSfx[params]);
+    } else {
+        Audio_PlaySfxForRiver(&this->actor.projectedPos, freqScale[this->soundFreqIndex]);
+    }
+}

src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h

@@ -5,9 +5,44 @@
 
 struct EnRiverSound;
 
+#define RS_GET_TYPE(thisx) ((thisx)->params & 0xFF);
+#define RS_GET_PATH_INDEX(thisx) (((thisx)->params >> 8) & 0xFF);
+
+// Any param not as one of these values will result in UB
+typedef enum {
+    /* 0x00 */ RS_RIVER_STREAM,   
+    /* 0x01 */ RS_WAVE,
+    /* 0x02 */ RS_WATER_WALL_BIG, 
+    /* 0x03 */ RS_WATER_WALL,
+    /* 0x04 */ RS_MAGMA_LEVEL,    
+    /* 0x05 */ RS_MAGMA_LEVEL_M,
+    /* 0x06 */ RS_MAGMA_LEVEL_L,  
+    /* 0x07 */ RS_TORCH,
+    /* 0x08 */ RS_FOUNTAIN,       
+    /* 0x09 */ RS_DRAIN,
+    /* 0x0A */ RS_CROWD,          
+    /* 0x0B */ RS_WATER_CONVECTION,
+    /* 0x0C */ RS_GORON_CHEER,    
+    /* 0x0D */ RS_WATER_WALL_BIG_SILENT,
+    /* 0x0E */ RS_WATER_BUBBLE,   
+    /* 0x0F */ RS_COW_CRY_LV,
+    /* 0x10 */ RS_MAKE_TURRET,    
+    /* 0x11 */ RS_BOILED_WATER_S,
+    /* 0x12 */ RS_BOILED_WATER_L, 
+    /* 0x13 */ RS_WAVE_0,
+    /* 0x14 */ RS_WAVE_1,         
+    /* 0x15 */ RS_WAVE_2,
+    /* 0xFD */ RS_RIVER_DEFAULT_LOW_FREQ = 0xFD,
+    /* 0xFE */ RS_RIVER_DEFAULT_MEDIUM_FREQ,
+    /* 0xFF */ RS_RIVER_DEFAULT_HIGH_FREQ
+} RiverSoundType;
+
 typedef struct EnRiverSound {
     /* 0x000 */ Actor actor;
-    /* 0x144 */ char unk_144[0x8];
+    /* 0x144 */ u8 playSound; // Unused remnant of OoT
+    /* 0x145 */ u8 soundFreqIndex;
+    /* 0x146 */ u8 numPoints;
+    /* 0x148 */ Vec3s* pathPoints;
 } EnRiverSound; // size = 0x14C
 
 extern const ActorInit En_River_Sound_InitVars;

src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

@@ -422,8 +422,8 @@ void func_809672DC(EnWeatherTag* this, GlobalContext* globalCtx) {
     f32 range;
     f32 strength = 0.0f;
 
-    func_800BCCDC(this->pathPoints, this->pathCount, &GET_PLAYER(globalCtx)->actor.world.pos, &this->actor.world.pos,
-                  0);
+    Actor_GetClosestPosOnPath(this->pathPoints, this->pathCount, &GET_PLAYER(globalCtx)->actor.world.pos,
+                              &this->actor.world.pos, false);
 
     distance = Actor_XZDistanceBetweenActors(&player->actor, &this->actor);
     range = WEATHER_TAG_RANGE100(this);

tools/disasm/functions.txt

@@ -867,7 +867,7 @@
     0x800BCB70:("Actor_SetColorFilter",),
     0x800BCBF4:("func_800BCBF4",),
     0x800BCC68:("func_800BCC68",),
-    0x800BCCDC:("func_800BCCDC",),
+    0x800BCCDC:("Actor_GetClosestPosOnPath",),
     0x800BD2B4:("func_800BD2B4",),
     0x800BD384:("func_800BD384",),
     0x800BD6B8:("func_800BD6B8",),
@@ -3689,7 +3689,7 @@
     0x8019380C:("func_8019380C",),
     0x80193858:("func_80193858",),
     0x8019387C:("func_8019387C",),
-    0x801938A0:("func_801938A0",),
+    0x801938A0:("Audio_QueueCmdS8",),
     0x801938D0:("func_801938D0",),
     0x80193900:("func_80193900",),
     0x80193990:("func_80193990",),
@@ -3897,18 +3897,18 @@
     0x8019FE74:("func_8019FE74",),
     0x8019FEDC:("func_8019FEDC",),
     0x8019FF38:("func_8019FF38",),
-    0x8019FF9C:("func_8019FF9C",),
-    0x801A0048:("func_801A0048",),
-    0x801A00EC:("func_801A00EC",),
+    0x8019FF9C:("Audio_PlaySfxForRiver",),
+    0x801A0048:("Audio_PlaySfxForWaterfall",),
+    0x801A00EC:("Audio_StepFreqLerp",),
     0x801A0124:("func_801A0124",),
     0x801A0184:("func_801A0184",),
     0x801A01C4:("func_801A01C4",),
     0x801A0204:("func_801A0204",),
     0x801A0238:("func_801A0238",),
-    0x801A026C:("func_801A026C",),
-    0x801A0318:("func_801A0318",),
-    0x801A0450:("func_801A0450",),
-    0x801A046C:("func_801A046C",),
+    0x801A026C:("Audio_SetGanonsTowerBgmVolumeLevel",),
+    0x801A0318:("Audio_SetGanonsTowerBgmVolume",),
+    0x801A0450:("Audio_LowerMainBgmVolume",),
+    0x801A046C:("Audio_UpdateRiverSoundVolumes",),
     0x801A0554:("func_801A0554",),
     0x801A05E4:("func_801A05E4",),
     0x801A05F0:("func_801A05F0",),
@@ -3916,9 +3916,9 @@
     0x801A0810:("func_801A0810",),
     0x801A0868:("func_801A0868",),
     0x801A09D4:("func_801A09D4",),
-    0x801A0C70:("func_801A0C70",),
-    0x801A0C90:("func_801A0C90",),
-    0x801A0CB0:("func_801A0CB0",),
+    0x801A0C70:("Audio_ClearSariaBgm",),
+    0x801A0C90:("Audio_ClearSariaBgmAtPos",),
+    0x801A0CB0:("Audio_SplitBgmChannels",),
     0x801A0E44:("func_801A0E44",),
     0x801A1290:("func_801A1290",),
     0x801A1348:("func_801A1348",),
@@ -3935,8 +3935,8 @@
     0x801A1F88:("func_801A1F88",),
     0x801A1FB4:("func_801A1FB4",),
     0x801A2090:("func_801A2090",),
-    0x801A21FC:("func_801A21FC",),
-    0x801A2460:("func_801A2460",),
+    0x801A21FC:("Audio_PlaySariaBgm",),
+    0x801A2460:("Audio_ClearSariaBgm2",),
     0x801A246C:("func_801A246C",),
     0x801A2544:("func_801A2544",),
     0x801A257C:("func_801A257C",),
@@ -4050,7 +4050,7 @@
     0x801A7794:("func_801A7794",),
     0x801A7828:("func_801A7828",),
     0x801A787C:("func_801A787C",),
-    0x801A78E4:("func_801A78E4",),
+    0x801A78E4:("Audio_IsSfxPlaying",),
     0x801A794C:("func_801A794C",),
     0x801A7B10:("func_801A7B10",),
     0x801A7D04:("func_801A7D04",),
@@ -4061,7 +4061,7 @@
     0x801A8ABC:("func_801A8ABC",),
     0x801A8B14:("func_801A8B14",),
     0x801A8B2C:("func_801A8B2C",),
-    0x801A8BD0:("func_801A8BD0",),
+    0x801A8BD0:("Audio_SetVolumeScale",),
     0x801A8D5C:("func_801A8D5C",),
     0x801A9768:("func_801A9768",),
     0x801A982C:("func_801A982C",),

tools/sizes/code_functions.csv

@@ -381,7 +381,7 @@ asm/non_matchings/code/z_actor/Actor_SpawnShieldParticlesMetal.s,Actor_SpawnShie
 asm/non_matchings/code/z_actor/Actor_SetColorFilter.s,Actor_SetColorFilter,0x800BCB70,0x21
 asm/non_matchings/code/z_actor/func_800BCBF4.s,func_800BCBF4,0x800BCBF4,0x1D
 asm/non_matchings/code/z_actor/func_800BCC68.s,func_800BCC68,0x800BCC68,0x1D
-asm/non_matchings/code/z_actor/func_800BCCDC.s,func_800BCCDC,0x800BCCDC,0x176
+asm/non_matchings/code/z_actor/Actor_GetClosestPosOnPath.s,Actor_GetClosestPosOnPath,0x800BCCDC,0x176
 asm/non_matchings/code/z_actor/func_800BD2B4.s,func_800BD2B4,0x800BD2B4,0x34
 asm/non_matchings/code/z_actor/func_800BD384.s,func_800BD384,0x800BD384,0xCD
 asm/non_matchings/code/z_actor/func_800BD6B8.s,func_800BD6B8,0x800BD6B8,0xB
@@ -3205,7 +3205,7 @@ asm/non_matchings/code/code_80192BE0/func_80193774.s,func_80193774,0x80193774,0x
 asm/non_matchings/code/code_80192BE0/func_8019380C.s,func_8019380C,0x8019380C,0x13
 asm/non_matchings/code/code_80192BE0/func_80193858.s,func_80193858,0x80193858,0x9
 asm/non_matchings/code/code_80192BE0/func_8019387C.s,func_8019387C,0x8019387C,0x9
-asm/non_matchings/code/code_80192BE0/func_801938A0.s,func_801938A0,0x801938A0,0xC
+asm/non_matchings/code/code_80192BE0/Audio_QueueCmdS8.s,Audio_QueueCmdS8,0x801938A0,0xC
 asm/non_matchings/code/code_80192BE0/func_801938D0.s,func_801938D0,0x801938D0,0xC
 asm/non_matchings/code/code_80192BE0/func_80193900.s,func_80193900,0x80193900,0x24
 asm/non_matchings/code/code_80192BE0/func_80193990.s,func_80193990,0x80193990,0x6
@@ -3413,18 +3413,18 @@ asm/non_matchings/code/code_8019AF00/func_8019FE1C.s,func_8019FE1C,0x8019FE1C,0x
 asm/non_matchings/code/code_8019AF00/func_8019FE74.s,func_8019FE74,0x8019FE74,0x1A
 asm/non_matchings/code/code_8019AF00/func_8019FEDC.s,func_8019FEDC,0x8019FEDC,0x17
 asm/non_matchings/code/code_8019AF00/func_8019FF38.s,func_8019FF38,0x8019FF38,0x19
-asm/non_matchings/code/code_8019AF00/func_8019FF9C.s,func_8019FF9C,0x8019FF9C,0x2B
-asm/non_matchings/code/code_8019AF00/func_801A0048.s,func_801A0048,0x801A0048,0x29
-asm/non_matchings/code/code_8019AF00/func_801A00EC.s,func_801A00EC,0x801A00EC,0xE
+asm/non_matchings/code/code_8019AF00/Audio_PlaySfxForRiver.s,Audio_PlaySfxForRiver,0x8019FF9C,0x2B
+asm/non_matchings/code/code_8019AF00/Audio_PlaySfxForWaterfall.s,Audio_PlaySfxForWaterfall,0x801A0048,0x29
+asm/non_matchings/code/code_8019AF00/Audio_StepFreqLerp.s,Audio_StepFreqLerp,0x801A00EC,0xE
 asm/non_matchings/code/code_8019AF00/func_801A0124.s,func_801A0124,0x801A0124,0x18
 asm/non_matchings/code/code_8019AF00/func_801A0184.s,func_801A0184,0x801A0184,0x10
 asm/non_matchings/code/code_8019AF00/func_801A01C4.s,func_801A01C4,0x801A01C4,0x10
 asm/non_matchings/code/code_8019AF00/func_801A0204.s,func_801A0204,0x801A0204,0xD
 asm/non_matchings/code/code_8019AF00/func_801A0238.s,func_801A0238,0x801A0238,0xD
-asm/non_matchings/code/code_8019AF00/func_801A026C.s,func_801A026C,0x801A026C,0x2B
-asm/non_matchings/code/code_8019AF00/func_801A0318.s,func_801A0318,0x801A0318,0x4E
-asm/non_matchings/code/code_8019AF00/func_801A0450.s,func_801A0450,0x801A0450,0x7
-asm/non_matchings/code/code_8019AF00/func_801A046C.s,func_801A046C,0x801A046C,0x3A
+asm/non_matchings/code/code_8019AF00/Audio_SetGanonsTowerBgmVolumeLevel.s,Audio_SetGanonsTowerBgmVolumeLevel,0x801A026C,0x2B
+asm/non_matchings/code/code_8019AF00/Audio_SetGanonsTowerBgmVolume.s,Audio_SetGanonsTowerBgmVolume,0x801A0318,0x4E
+asm/non_matchings/code/code_8019AF00/Audio_LowerMainBgmVolume.s,Audio_LowerMainBgmVolume,0x801A0450,0x7
+asm/non_matchings/code/code_8019AF00/Audio_UpdateRiverSoundVolumes.s,Audio_UpdateRiverSoundVolumes,0x801A046C,0x3A
 asm/non_matchings/code/code_8019AF00/func_801A0554.s,func_801A0554,0x801A0554,0x24
 asm/non_matchings/code/code_8019AF00/func_801A05E4.s,func_801A05E4,0x801A05E4,0x3
 asm/non_matchings/code/code_8019AF00/func_801A05F0.s,func_801A05F0,0x801A05F0,0x19
@@ -3432,9 +3432,9 @@ asm/non_matchings/code/code_8019AF00/func_801A0654.s,func_801A0654,0x801A0654,0x
 asm/non_matchings/code/code_8019AF00/func_801A0810.s,func_801A0810,0x801A0810,0x16
 asm/non_matchings/code/code_8019AF00/func_801A0868.s,func_801A0868,0x801A0868,0x5B
 asm/non_matchings/code/code_8019AF00/func_801A09D4.s,func_801A09D4,0x801A09D4,0xA7
-asm/non_matchings/code/code_8019AF00/func_801A0C70.s,func_801A0C70,0x801A0C70,0x8
-asm/non_matchings/code/code_8019AF00/func_801A0C90.s,func_801A0C90,0x801A0C90,0x8
-asm/non_matchings/code/code_8019AF00/func_801A0CB0.s,func_801A0CB0,0x801A0CB0,0x65
+asm/non_matchings/code/code_8019AF00/Audio_ClearSariaBgm.s,Audio_ClearSariaBgm,0x801A0C70,0x8
+asm/non_matchings/code/code_8019AF00/Audio_ClearSariaBgmAtPos.s,Audio_ClearSariaBgmAtPos,0x801A0C90,0x8
+asm/non_matchings/code/code_8019AF00/Audio_SplitBgmChannels.s,Audio_SplitBgmChannels,0x801A0CB0,0x65
 asm/non_matchings/code/code_8019AF00/func_801A0E44.s,func_801A0E44,0x801A0E44,0x113
 asm/non_matchings/code/code_8019AF00/func_801A1290.s,func_801A1290,0x801A1290,0x2E
 asm/non_matchings/code/code_8019AF00/func_801A1348.s,func_801A1348,0x801A1348,0x1D
@@ -3451,8 +3451,8 @@ asm/non_matchings/code/code_8019AF00/func_801A1F00.s,func_801A1F00,0x801A1F00,0x
 asm/non_matchings/code/code_8019AF00/func_801A1F88.s,func_801A1F88,0x801A1F88,0xB
 asm/non_matchings/code/code_8019AF00/func_801A1FB4.s,func_801A1FB4,0x801A1FB4,0x37
 asm/non_matchings/code/code_8019AF00/func_801A2090.s,func_801A2090,0x801A2090,0x5B
-asm/non_matchings/code/code_8019AF00/func_801A21FC.s,func_801A21FC,0x801A21FC,0x99
-asm/non_matchings/code/code_8019AF00/func_801A2460.s,func_801A2460,0x801A2460,0x3
+asm/non_matchings/code/code_8019AF00/Audio_PlaySariaBgm.s,Audio_PlaySariaBgm,0x801A21FC,0x99
+asm/non_matchings/code/code_8019AF00/Audio_ClearSariaBgm2.s,Audio_ClearSariaBgm2,0x801A2460,0x3
 asm/non_matchings/code/code_8019AF00/func_801A246C.s,func_801A246C,0x801A246C,0x36
 asm/non_matchings/code/code_8019AF00/func_801A2544.s,func_801A2544,0x801A2544,0xE
 asm/non_matchings/code/code_8019AF00/func_801A257C.s,func_801A257C,0x801A257C,0x1A
@@ -3566,7 +3566,7 @@ asm/non_matchings/code/code_801A5BD0/func_801A7720.s,func_801A7720,0x801A7720,0x
 asm/non_matchings/code/code_801A5BD0/func_801A7794.s,func_801A7794,0x801A7794,0x25
 asm/non_matchings/code/code_801A5BD0/func_801A7828.s,func_801A7828,0x801A7828,0x15
 asm/non_matchings/code/code_801A5BD0/func_801A787C.s,func_801A787C,0x801A787C,0x1A
-asm/non_matchings/code/code_801A5BD0/func_801A78E4.s,func_801A78E4,0x801A78E4,0x1A
+asm/non_matchings/code/code_801A5BD0/Audio_IsSfxPlaying.s,Audio_IsSfxPlaying,0x801A78E4,0x1A
 asm/non_matchings/code/code_801A5BD0/func_801A794C.s,func_801A794C,0x801A794C,0x71
 asm/non_matchings/code/code_801A7B10/func_801A7B10.s,func_801A7B10,0x801A7B10,0x7D
 asm/non_matchings/code/code_801A7B10/func_801A7D04.s,func_801A7D04,0x801A7D04,0x20
@@ -3577,7 +3577,7 @@ asm/non_matchings/code/code_801A7B10/func_801A8A50.s,func_801A8A50,0x801A8A50,0x
 asm/non_matchings/code/code_801A7B10/func_801A8ABC.s,func_801A8ABC,0x801A8ABC,0x16
 asm/non_matchings/code/code_801A7B10/func_801A8B14.s,func_801A8B14,0x801A8B14,0x6
 asm/non_matchings/code/code_801A7B10/func_801A8B2C.s,func_801A8B2C,0x801A8B2C,0x29
-asm/non_matchings/code/code_801A7B10/func_801A8BD0.s,func_801A8BD0,0x801A8BD0,0x63
+asm/non_matchings/code/code_801A7B10/Audio_SetVolumeScale.s,Audio_SetVolumeScale,0x801A8BD0,0x63
 asm/non_matchings/code/code_801A7B10/func_801A8D5C.s,func_801A8D5C,0x801A8D5C,0x283
 asm/non_matchings/code/code_801A7B10/func_801A9768.s,func_801A9768,0x801A9768,0x31
 asm/non_matchings/code/code_801A7B10/func_801A982C.s,func_801A982C,0x801A982C,0x63