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")