rename audio files (#1188)

Makefile

@@ -210,7 +210,7 @@ build/src/libultra/rmon/%.o: OPTFLAGS := -O2
 build/src/libultra/flash/%.o: OPTFLAGS := -g
 build/src/libultra/flash/%.o: MIPS_VERSION := -mips1
 
-build/src/code/audio/%.o: OPTFLAGS := -O2
+build/src/audio/%.o: OPTFLAGS := -O2
 
 build/assets/%.o: OPTFLAGS := -O1
 build/assets/%.o: ASM_PROC_FLAGS := 
@@ -238,7 +238,7 @@ build/src/libultra/%.o: CC := $(CC_OLD)
 build/src/libultra/voice/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC_OLD) -- $(AS) $(ASFLAGS) --
 
 build/src/code/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
-build/src/code/audio/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
+build/src/audio/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
 
 build/src/overlays/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
 

spec

@@ -558,8 +558,8 @@ beginseg
     include "build/data/code/PreRender.bss.o"
     include "build/src/code/TwoHeadGfxArena.o"
     include "build/src/code/TwoHeadArena.o"
-    include "build/src/code/code_80172BC0.o"
-    include "build/src/code/audioMgr.o"
+    include "build/src/code/audio_stop_all_sfx.o"
+    include "build/src/code/audio_thread_manager.o"
     include "build/src/code/title_setup.o"
     include "build/src/code/game.o"
     include "build/data/code/game.bss.o"
@@ -600,34 +600,34 @@ beginseg
     pad_text
     pad_text
     pad_text
-    include "build/src/code/audio/audio_data.o"
-    include "build/src/code/audio/audio_synthesis.o"
-    include "build/src/code/audio/audio_heap.o"
+    include "build/src/audio/lib/data.o"
+    include "build/src/audio/lib/synthesis.o"
+    include "build/src/audio/lib/heap.o"
     include "build/data/code/audio_heap.bss.o"
-    include "build/src/code/audio/audio_load.o"
-    include "build/src/code/audio/audio_thread.o"
-    include "build/src/code/audio/audio_dcache.o"
-    include "build/src/code/audio/aisetnextbuf.o"
-    include "build/src/code/audio/audio_playback.o"
-    include "build/src/code/audio/audio_effects.o"
-    include "build/src/code/audio/audio_seqplayer.o"
+    include "build/src/audio/lib/load.o"
+    include "build/src/audio/lib/thread.o"
+    include "build/src/audio/lib/dcache.o"
+    include "build/src/audio/lib/aisetnextbuf.o"
+    include "build/src/audio/lib/playback.o"
+    include "build/src/audio/lib/effects.o"
+    include "build/src/audio/lib/seqplayer.o"
     include "build/data/code/audio_dramStack.data.o"
     include "build/asm/code/code_8019AE40.text.o" // handwritten
     pad_text
     include "build/asm/code/code_8019AEC0.text.o" // handwritten
-    include "build/src/code/audio/code_8019AF00.o"
-    include "build/src/code/audio/code_801A4EB0.o"
-    include "build/data/code/code_801A4EB0.data.o"
-    include "build/src/code/audio/code_801A51F0.o"
-    include "build/data/code/code_801A51F0.data.o"
-    include "build/data/code/code_801A51F0.bss.o"
+    include "build/src/audio/code_8019AF00.o"
+    include "build/src/audio/voice_external.o"
+    include "build/data/code/voice_external.data.o"
+    include "build/src/audio/voice_internal.o"
+    include "build/data/code/voice_internal.data.o"
+    include "build/data/code/voice_internal.bss.o"
     pad_text
-    include "build/src/code/audio/audio_sfx_params.o"
-    include "build/src/code/audio/code_801A5BD0.o"
-    include "build/src/code/audio/code_801A7B10.o"
-    include "build/data/code/code_801A7B10.data.o"
-    include "build/data/code/code_801A7B10.bss.o"
-    include "build/src/code/audio/audio_init_params.o"
+    include "build/src/audio/sfx_params.o"
+    include "build/src/audio/sfx.o"
+    include "build/src/audio/sequence.o"
+    include "build/data/code/sequence.data.o"
+    include "build/data/code/sequence.bss.o"
+    include "build/src/audio/session_config.o"
     include "build/src/code/jpegutils.o"
     include "build/src/code/jpegdecoder.o"
     include_data_with_rodata "build/src/code/z_game_over.o"

src/audio/sequence.c

@@ -0,0 +1,31 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/Audio_StartSequence.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/Audio_StopSequence.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A7D84.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/Audio_QueueSeqCmd.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A89D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/Audio_GetActiveSequence.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A8ABC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A8B14.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A8B2C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/Audio_SetVolumeScale.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A8D5C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A9768.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A982C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A99B8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/sequence/func_801A9A74.s")

src/audio/voice_external.c

@@ -0,0 +1,17 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A4EB0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A4EB8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A4FD8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A5080.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A50C0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A5100.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A510C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_external/func_801A5118.s")

src/audio/voice_internal.c

@@ -0,0 +1,42 @@
+#include "global.h"
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/D_801E0EC0.s")
+
+UNK_TYPE func_801A51F0(UNK_TYPE arg0) {
+    switch (arg0) {
+        case 1:
+        case 4:
+        case 5:
+        case 11:
+        case 13:
+        case 14:
+        case 15:
+            return -1;
+        default:
+            return 0;
+    }
+}
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A5228.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A5390.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A53DC.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A53E8.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A541C.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A5488.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A54C4.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A54D0.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A5680.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A5808.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A5A10.s")
+
+#pragma GLOBAL_ASM("asm/non_matchings/code/voice_internal/func_801A5A1C.s")

src/code/audio/code_801A4EB0.c

@@ -1,17 +0,0 @@
-#include "global.h"
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4EB0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4EB8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4FD8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5080.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A50C0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5100.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A510C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5118.s")

src/code/audio/code_801A51F0.c

@@ -1,42 +0,0 @@
-#include "global.h"
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/D_801E0EC0.s")
-
-UNK_TYPE func_801A51F0(UNK_TYPE arg0) {
-    switch (arg0) {
-        case 1:
-        case 4:
-        case 5:
-        case 11:
-        case 13:
-        case 14:
-        case 15:
-            return -1;
-        default:
-            return 0;
-    }
-}
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5228.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5390.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A53DC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A53E8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A541C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5488.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A54C4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A54D0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5680.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5808.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5A10.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A51F0/func_801A5A1C.s")

src/code/audio/code_801A7B10.c

@@ -1,31 +0,0 @@
-#include "global.h"
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/Audio_StartSequence.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/Audio_StopSequence.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A7D84.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/Audio_QueueSeqCmd.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A89D0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/Audio_GetActiveSequence.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8ABC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8B14.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A8B2C.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")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9768.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A982C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A99B8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9A74.s")

tools/disasm/files.txt

@@ -453,8 +453,8 @@
             0x8016FCF0 : "PreRender",
             0x801727F0 : "TwoHeadGfxArena",
             0x80172A00 : "TwoHeadArena",
-            0x80172BC0 : "code_80172BC0",
-            0x80172C30 : "audioMgr",
+            0x80172BC0 : "audio_stop_all_sfx",
+            0x80172C30 : "audio_thread_manager",
             0x80173130 : "title_setup",
             0x80173360 : "game",
             0x80173BF0 : "gamealloc",
@@ -495,11 +495,11 @@
             0x8019AEB0 : "[PADDING]",
             0x8019AEC0 : "code_8019AEC0",
             0x8019AF00 : "code_8019AF00",
-            0x801A4EB0 : "code_801A4EB0",
-            0x801A51F0 : "code_801A51F0",
+            0x801A4EB0 : "voice_external",
+            0x801A51F0 : "voice_internal",
             0x801A5BC0 : "[PADDING]",
             0x801A5BD0 : "code_801A5BD0",
-            0x801A7B10 : "code_801A7B10",
+            0x801A7B10 : "sequence",
             0x801A9B10 : "jpegutils",
             0x801AA020 : "jpegdecoder",
             0x801AA610 : "z_game_over",
@@ -574,7 +574,7 @@
             0x801D0D00 : "z_fbdemo_circle",
             0x801D0D50 : "z_play",
             0x801D0D80 : "z_play_hireso",
-            0x801D14F0 : "audioMgr",
+            0x801D14F0 : "audio_thread_manager",
             0x801D1500 : "game",
             0x801D1510 : "graph",
             0x801D1520 : "main",
@@ -596,12 +596,12 @@
             0x801D61A0 : "audio_seqplayer",
             0x801D6200 : "audio_dramStack",
             0x801D6600 : "code_8019AF00",
-            0x801D8BE0 : "code_801A4EB0",
-            0x801D8E50 : "code_801A51F0",
+            0x801D8BE0 : "voice_external",
+            0x801D8E50 : "voice_internal",
             0x801D9090 : "audio_sound_params",
             0x801DB470 : "code_801A5BD0",
-            0x801DB4C0 : "code_801A7B10",
-            0x801DB4E0 : "audio_init_params",
+            0x801DB4C0 : "sequence",
+            0x801DB4E0 : "session_config",
 
             # .rodata section
             0x801DBDF0 : "z_en_item00",
@@ -658,8 +658,8 @@
             0x801DFA00 : "z_play",
             0x801DFC50 : "z_play_hireso",
             0x801DFC60 : "PreRender",
-            0x801DFC70 : "code_80172BC0",
-            0x801DFC80 : "audioMgr",
+            0x801DFC70 : "audio_stop_all_sfx",
+            0x801DFC80 : "audio_thread_manager",
             0x801DFCC0 : "game",
             0x801DFCE0 : "graph",
             0x801DFD70 : "main",
@@ -679,10 +679,10 @@
             0x801E0510 : "audio_effects",
             0x801E0540 : "audio_seqplayer",
             0x801E0BD0 : "code_8019AF00",
-            0x801E0EC0 : "code_801A51F0",
+            0x801E0EC0 : "voice_internal",
             0x801E1050 : "code_801A5BD0",
-            0x801E1070 : "code_801A7B10",
-            0x801E1100 : "audio_init_params",
+            0x801E1070 : "sequence",
+            0x801E1100 : "session_config",
             0x801E1110 : "z_game_over",
             0x801E1180 : "audio_tables",
             0x801E1E80 : "aspMain",
@@ -742,9 +742,9 @@
             0x801FD120 : "audio_heap",
             0x801FD140 : "audio_load",
             0x801FD1F0 : "code_8019AF00",
-            0x801FD5A0 : "code_801A51F0",
+            0x801FD5A0 : "voice_internal",
             0x801FD710 : "code_801A5BD0",
-            0x801FFD00 : "code_801A7B10",
+            0x801FFD00 : "sequence",
             0x80208E90 : "jpegdecoder",
             0x80208EA0 : "gfxbuffers",
             0x8024A4C0 : "buffers",

tools/sizes/code_functions.csv

@@ -2623,13 +2623,13 @@ asm/non_matchings/code/TwoHeadArena/THA_IsCrash.s,THA_IsCrash,0x80172B18,0x9
 asm/non_matchings/code/TwoHeadArena/THA_Init.s,THA_Init,0x80172B3C,0x7
 asm/non_matchings/code/TwoHeadArena/THA_Ct.s,THA_Ct,0x80172B58,0x11
 asm/non_matchings/code/TwoHeadArena/THA_Dt.s,THA_Dt,0x80172B9C,0x9
-asm/non_matchings/code/code_80172BC0/AudioMgr_StopAllSfxExceptSystem.s,AudioMgr_StopAllSfxExceptSystem,0x80172BC0,0x1C
-asm/non_matchings/code/audioMgr/func_80172C30.s,func_80172C30,0x80172C30,0xE
-asm/non_matchings/code/audioMgr/AudioMgr_HandleRetrace.s,AudioMgr_HandleRetrace,0x80172C68,0x91
-asm/non_matchings/code/audioMgr/AudioMgr_HandlePRENMI.s,AudioMgr_HandlePRENMI,0x80172EAC,0x9
-asm/non_matchings/code/audioMgr/AudioMgr_ThreadEntry.s,AudioMgr_ThreadEntry,0x80172ED0,0x5E
-asm/non_matchings/code/audioMgr/AudioMgr_Unlock.s,AudioMgr_Unlock,0x80173048,0xB
-asm/non_matchings/code/audioMgr/AudioMgr_Init.s,AudioMgr_Init,0x80173074,0x2F
+asm/non_matchings/code/audio_stop_all_sfx/AudioMgr_StopAllSfxExceptSystem.s,AudioMgr_StopAllSfxExceptSystem,0x80172BC0,0x1C
+asm/non_matchings/code/audio_thread_manager/func_80172C30.s,func_80172C30,0x80172C30,0xE
+asm/non_matchings/code/audio_thread_manager/AudioMgr_HandleRetrace.s,AudioMgr_HandleRetrace,0x80172C68,0x91
+asm/non_matchings/code/audio_thread_manager/AudioMgr_HandlePRENMI.s,AudioMgr_HandlePRENMI,0x80172EAC,0x9
+asm/non_matchings/code/audio_thread_manager/AudioMgr_ThreadEntry.s,AudioMgr_ThreadEntry,0x80172ED0,0x5E
+asm/non_matchings/code/audio_thread_manager/AudioMgr_Unlock.s,AudioMgr_Unlock,0x80173048,0xB
+asm/non_matchings/code/audio_thread_manager/AudioMgr_Init.s,AudioMgr_Init,0x80173074,0x2F
 asm/non_matchings/code/title_setup/Setup_SetRegs.s,Setup_SetRegs,0x80173130,0x6B
 asm/non_matchings/code/title_setup/Setup_InitImpl.s,Setup_InitImpl,0x801732DC,0x14
 asm/non_matchings/code/title_setup/Setup_Destroy.s,Setup_Destroy,0x8017332C,0x3
@@ -3525,27 +3525,27 @@ asm/non_matchings/code/code_8019AF00/func_801A4D50.s,func_801A4D50,0x801A4D50,0x
 asm/non_matchings/code/code_8019AF00/func_801A4DA4.s,func_801A4DA4,0x801A4DA4,0x14
 asm/non_matchings/code/code_8019AF00/func_801A4DF4.s,func_801A4DF4,0x801A4DF4,0x1C
 asm/non_matchings/code/code_8019AF00/func_801A4E64.s,func_801A4E64,0x801A4E64,0x13
-asm/non_matchings/code/code_8019AF00/func_801A4EB0.s,func_801A4EB0,0x801A4EB0,0x2
-asm/non_matchings/code/code_8019AF00/func_801A4EB8.s,func_801A4EB8,0x801A4EB8,0x48
-asm/non_matchings/code/code_8019AF00/func_801A4FD8.s,func_801A4FD8,0x801A4FD8,0x2A
-asm/non_matchings/code/code_8019AF00/func_801A5080.s,func_801A5080,0x801A5080,0x10
-asm/non_matchings/code/code_8019AF00/func_801A50C0.s,func_801A50C0,0x801A50C0,0x10
-asm/non_matchings/code/code_8019AF00/func_801A5100.s,func_801A5100,0x801A5100,0x3
-asm/non_matchings/code/code_8019AF00/func_801A510C.s,func_801A510C,0x801A510C,0x3
-asm/non_matchings/code/code_8019AF00/func_801A5118.s,func_801A5118,0x801A5118,0x36
-asm/non_matchings/code/code_801A51F0/func_801A51F0.s,func_801A51F0,0x801A51F0,0xE
-asm/non_matchings/code/code_801A51F0/func_801A5228.s,func_801A5228,0x801A5228,0x5A
-asm/non_matchings/code/code_801A51F0/func_801A5390.s,func_801A5390,0x801A5390,0x13
-asm/non_matchings/code/code_801A51F0/func_801A53DC.s,func_801A53DC,0x801A53DC,0x3
-asm/non_matchings/code/code_801A51F0/func_801A53E8.s,func_801A53E8,0x801A53E8,0xD
-asm/non_matchings/code/code_801A51F0/func_801A541C.s,func_801A541C,0x801A541C,0x1B
-asm/non_matchings/code/code_801A51F0/func_801A5488.s,func_801A5488,0x801A5488,0xF
-asm/non_matchings/code/code_801A51F0/func_801A54C4.s,func_801A54C4,0x801A54C4,0x3
-asm/non_matchings/code/code_801A51F0/func_801A54D0.s,func_801A54D0,0x801A54D0,0x6C
-asm/non_matchings/code/code_801A51F0/func_801A5680.s,func_801A5680,0x801A5680,0x62
-asm/non_matchings/code/code_801A51F0/func_801A5808.s,func_801A5808,0x801A5808,0x82
-asm/non_matchings/code/code_801A51F0/func_801A5A10.s,func_801A5A10,0x801A5A10,0x3
-asm/non_matchings/code/code_801A51F0/func_801A5A1C.s,func_801A5A1C,0x801A5A1C,0x69
+asm/non_matchings/code/voice_external/func_801A4EB0.s,func_801A4EB0,0x801A4EB0,0x2
+asm/non_matchings/code/voice_external/func_801A4EB8.s,func_801A4EB8,0x801A4EB8,0x48
+asm/non_matchings/code/voice_external/func_801A4FD8.s,func_801A4FD8,0x801A4FD8,0x2A
+asm/non_matchings/code/voice_external/func_801A5080.s,func_801A5080,0x801A5080,0x10
+asm/non_matchings/code/voice_external/func_801A50C0.s,func_801A50C0,0x801A50C0,0x10
+asm/non_matchings/code/voice_external/func_801A5100.s,func_801A5100,0x801A5100,0x3
+asm/non_matchings/code/voice_external/func_801A510C.s,func_801A510C,0x801A510C,0x3
+asm/non_matchings/code/voice_external/func_801A5118.s,func_801A5118,0x801A5118,0x36
+asm/non_matchings/code/voice_internal/func_801A51F0.s,func_801A51F0,0x801A51F0,0xE
+asm/non_matchings/code/voice_internal/func_801A5228.s,func_801A5228,0x801A5228,0x5A
+asm/non_matchings/code/voice_internal/func_801A5390.s,func_801A5390,0x801A5390,0x13
+asm/non_matchings/code/voice_internal/func_801A53DC.s,func_801A53DC,0x801A53DC,0x3
+asm/non_matchings/code/voice_internal/func_801A53E8.s,func_801A53E8,0x801A53E8,0xD
+asm/non_matchings/code/voice_internal/func_801A541C.s,func_801A541C,0x801A541C,0x1B
+asm/non_matchings/code/voice_internal/func_801A5488.s,func_801A5488,0x801A5488,0xF
+asm/non_matchings/code/voice_internal/func_801A54C4.s,func_801A54C4,0x801A54C4,0x3
+asm/non_matchings/code/voice_internal/func_801A54D0.s,func_801A54D0,0x801A54D0,0x6C
+asm/non_matchings/code/voice_internal/func_801A5680.s,func_801A5680,0x801A5680,0x62
+asm/non_matchings/code/voice_internal/func_801A5808.s,func_801A5808,0x801A5808,0x82
+asm/non_matchings/code/voice_internal/func_801A5A10.s,func_801A5A10,0x801A5A10,0x3
+asm/non_matchings/code/voice_internal/func_801A5A1C.s,func_801A5A1C,0x801A5A1C,0x69
 asm/non_matchings/code/code_801A5BD0/AudioSfx_MuteBanks.s,AudioSfx_MuteBanks,0x801A5BD0,0x16
 asm/non_matchings/code/code_801A5BD0/AudioSfx_LowerBgmVolume.s,AudioSfx_LowerBgmVolume,0x801A5C28,0x19
 asm/non_matchings/code/code_801A5BD0/AudioSfx_RestoreBgmVolume.s,AudioSfx_RestoreBgmVolume,0x801A5C8C,0x1C
@@ -3568,21 +3568,21 @@ asm/non_matchings/code/code_801A5BD0/AudioSfx_StepBankLerp.s,AudioSfx_StepBankLe
 asm/non_matchings/code/code_801A5BD0/AudioSfx_ProcessActiveSfx.s,AudioSfx_ProcessActiveSfx,0x801A787C,0x1A
 asm/non_matchings/code/code_801A5BD0/AudioSfx_IsPlaying.s,AudioSfx_IsPlaying,0x801A78E4,0x1A
 asm/non_matchings/code/code_801A5BD0/AudioSfx_Reset.s,AudioSfx_Reset,0x801A794C,0x71
-asm/non_matchings/code/code_801A7B10/Audio_StartSequence.s,Audio_StartSequence,0x801A7B10,0x7D
-asm/non_matchings/code/code_801A7B10/Audio_StopSequence.s,Audio_StopSequence,0x801A7D04,0x20
-asm/non_matchings/code/code_801A7B10/func_801A7D84.s,func_801A7D84,0x801A7D84,0x309
-asm/non_matchings/code/code_801A7B10/Audio_QueueSeqCmd.s,Audio_QueueSeqCmd,0x801A89A8,0xA
-asm/non_matchings/code/code_801A7B10/func_801A89D0.s,func_801A89D0,0x801A89D0,0x20
-asm/non_matchings/code/code_801A7B10/Audio_GetActiveSequence.s,Audio_GetActiveSequence,0x801A8A50,0x1B
-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/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
-asm/non_matchings/code/code_801A7B10/func_801A99B8.s,func_801A99B8,0x801A99B8,0x2F
-asm/non_matchings/code/code_801A7B10/func_801A9A74.s,func_801A9A74,0x801A9A74,0x27
+asm/non_matchings/code/sequence/Audio_StartSequence.s,Audio_StartSequence,0x801A7B10,0x7D
+asm/non_matchings/code/sequence/Audio_StopSequence.s,Audio_StopSequence,0x801A7D04,0x20
+asm/non_matchings/code/sequence/func_801A7D84.s,func_801A7D84,0x801A7D84,0x309
+asm/non_matchings/code/sequence/Audio_QueueSeqCmd.s,Audio_QueueSeqCmd,0x801A89A8,0xA
+asm/non_matchings/code/sequence/func_801A89D0.s,func_801A89D0,0x801A89D0,0x20
+asm/non_matchings/code/sequence/Audio_GetActiveSequence.s,Audio_GetActiveSequence,0x801A8A50,0x1B
+asm/non_matchings/code/sequence/func_801A8ABC.s,func_801A8ABC,0x801A8ABC,0x16
+asm/non_matchings/code/sequence/func_801A8B14.s,func_801A8B14,0x801A8B14,0x6
+asm/non_matchings/code/sequence/func_801A8B2C.s,func_801A8B2C,0x801A8B2C,0x29
+asm/non_matchings/code/sequence/Audio_SetVolumeScale.s,Audio_SetVolumeScale,0x801A8BD0,0x63
+asm/non_matchings/code/sequence/func_801A8D5C.s,func_801A8D5C,0x801A8D5C,0x283
+asm/non_matchings/code/sequence/func_801A9768.s,func_801A9768,0x801A9768,0x31
+asm/non_matchings/code/sequence/func_801A982C.s,func_801A982C,0x801A982C,0x63
+asm/non_matchings/code/sequence/func_801A99B8.s,func_801A99B8,0x801A99B8,0x2F
+asm/non_matchings/code/sequence/func_801A9A74.s,func_801A9A74,0x801A9A74,0x27
 asm/non_matchings/code/jpegutils/JpegUtils_ProcessQuantizationTable.s,JpegUtils_ProcessQuantizationTable,0x801A9B10,0x1A
 asm/non_matchings/code/jpegutils/JpegUtils_ParseHuffmanCodesLengths.s,JpegUtils_ParseHuffmanCodesLengths,0x801A9B78,0x21
 asm/non_matchings/code/jpegutils/JpegUtils_GetHuffmanCodes.s,JpegUtils_GetHuffmanCodes,0x801A9BFC,0x1B