Audio cleanup

Makefile

@@ -440,62 +440,37 @@ clean:
 
 # Per-file flag definitions
 build/us/src/dk64_boot/dk64_boot_3390.c.o: OPT_FLAGS = -O1
-build/us/src/dk64_boot/dk64_boot_3C00.c.o: OPT_FLAGS = -O1
 build/us/src/dk64_boot/dk64_boot_3D20.c.o: OPT_FLAGS = -O1
+build/us/src/dk64_boot/dk64_boot_3C00.c.o: OPT_FLAGS = -O1
+build/us/src/dk64_boot/dk64_boot_5C70.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/dk64_boot_61D0.c.o: OPT_FLAGS = -O1
 build/us/src/dk64_boot/dk64_boot_62F0.c.o: OPT_FLAGS = -O1
 build/us/src/dk64_boot/dk64_boot_7F60.c.o: OPT_FLAGS = -O1
+build/us/src/dk64_boot/dk64_boot_CA20.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/gu/%.c.o: OPT_FLAGS = -O3
 build/us/src/dk64_boot/gu/nonmatching/%.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/%.c.o: OPT_FLAGS = -O1
+
 build/us/src/dk64_boot/io/conteepprobe.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/conteepwrite.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/conteepread.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/sirawdma.c.o: OPT_FLAGS = -O2
-
-
 build/us/src/dk64_boot/io/pimgr.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/pfsgetstatus.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/epirawwrite.c.o: OPT_FLAGS = -O2
-
 build/us/src/dk64_boot/io/crc.c.o: OPT_FLAGS = -O2
-
 build/us/src/dk64_boot/io/viswapcontext.c.o: OPT_FLAGS = -O2
-
 build/us/src/dk64_boot/io/contpfs.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/contpfs.c.o: MIPSISET := -mips3 -o32
 build/us/src/dk64_boot/io/motor.c.o: OPT_FLAGS = -O2
 build/us/src/dk64_boot/io/crc.c.o: OPT_FLAGS = -O2
+
 build/us/src/dk64_boot/libc/%.c.o: OPT_FLAGS = -O3
 build/us/src/dk64_boot/libc/ll%.o: MIPSISET := -mips3 -o32
 build/us/src/dk64_boot/libc/ll%.o: OPT_FLAGS := -O1
 build/us/src/dk64_boot/os/%.c.o: OPT_FLAGS = -O1
-build/us/src/dk64_boot/dk64_boot_CA20.c.o: OPT_FLAGS = -O2
-
-build/us/src/dk64_boot/dk64_boot_5C70.c.o: OPT_FLAGS = -O2
 
 build/us/src/global_asm/audio/%.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_137120.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_1371D0.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_137630.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_137C10.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13A750.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13A7A0.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13C920.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13CB30.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13CB50.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13CE70.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13CFA0.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13D0B0.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13D020.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13D100.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_13ECE0.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_140260.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_140600.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_141520.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_1435A0.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_1435C0.c.o: OPT_FLAGS = -g
-build/us/src/global_asm/code_145950.c.o: OPT_FLAGS = -g
 
 #build/us/src/dk64_boot/gu/%.c.o: INCLUDE_CFLAGS = -I . -I include -I include/2.0L -I include/2.0L/PR
 

progress/progress.global_asm.csv

@@ -594,7 +594,7 @@ us,.code,func_806CC8B8,56,yes
 us,.code,func_806E2E6C,60,yes
 us,.code,func_806EAE04,92,yes
 us,.code,func_8071509C,468,no
-us,.code,func_80738BA0,8,yes
+us,.code,func_80738BA0,24,yes
 us,.code,func_806CEFBC,276,no
 us,.code,func_8073749C,324,no
 us,.code,func_80650998,108,yes
@@ -639,7 +639,6 @@ us,.code,func_8062FBC8,840,no
 us,.code,func_80649BF0,388,no
 us,.code,func_806D3FA0,112,yes
 us,.code,func_806ECAC4,272,yes
-us,.code,func_80738BA8,8,yes
 us,.code,func_80725B38,108,yes
 us,.code,func_806EAFEC,8,yes
 us,.code,func_80738470,384,no
@@ -1015,7 +1014,6 @@ us,.code,func_8060B8F8,112,yes
 us,.code,func_8066AC10,148,no
 us,.code,func_806E1864,8,yes
 us,.code,func_806DB0C4,744,no
-us,.code,func_80738BB0,8,yes
 us,.code,func_806F70A8,84,yes
 us,.code,func_80738E58,576,no
 us,.code,func_806FDF54,292,no

progress/progress.total.csv

@@ -594,7 +594,7 @@ us,.code,func_806CC8B8,56,yes
 us,.code,func_806E2E6C,60,yes
 us,.code,func_806EAE04,92,yes
 us,.code,func_8071509C,468,no
-us,.code,func_80738BA0,8,yes
+us,.code,func_80738BA0,24,yes
 us,.code,func_806CEFBC,276,no
 us,.code,func_8073749C,324,no
 us,.code,func_80650998,108,yes
@@ -639,7 +639,6 @@ us,.code,func_8062FBC8,840,no
 us,.code,func_80649BF0,388,no
 us,.code,func_806D3FA0,112,yes
 us,.code,func_806ECAC4,272,yes
-us,.code,func_80738BA8,8,yes
 us,.code,func_80725B38,108,yes
 us,.code,func_806EAFEC,8,yes
 us,.code,func_80738470,384,no
@@ -1015,7 +1014,6 @@ us,.code,func_8060B8F8,112,yes
 us,.code,func_8066AC10,148,no
 us,.code,func_806E1864,8,yes
 us,.code,func_806DB0C4,744,no
-us,.code,func_80738BB0,8,yes
 us,.code,func_806F70A8,84,yes
 us,.code,func_80738E58,576,no
 us,.code,func_806FDF54,292,no

src/global_asm/audio/code_137630.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137630/func_80732930.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137630/func_80732930.s")
 
 extern f32 D_80760190;
 

src/global_asm/audio/code_137C10.c

@@ -2,24 +2,24 @@
 #include "functions.h"
 
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80732F10.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80732F10.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80733180.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80733180.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80733A88.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80733A88.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80733B88.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80733B88.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80733C34.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80733C34.s")
 
 // jumptable
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80733D8C.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80733D8C.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80735624.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80735624.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80735864.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80735864.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_137C10/func_80735958.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_137C10/func_80735958.s")
 
 typedef struct {
     s32 unk0;

src/global_asm/audio/code_13A7A0.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_80735AA0.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_80735AA0.s")
 
 void func_80735DBC(ALEvent *);                            /* extern */
 
@@ -38,7 +38,7 @@ s32 func_80735CF4(struct_80735CF4 *arg0) {
 }
 
 // jumptable
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_80735DBC.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_80735DBC.s")
 
 typedef struct {
     s32 unk0;
@@ -103,13 +103,13 @@ void func_80737028(struct_80737028_0 *arg0) {
     alEvtqPostEvent(&D_807563CC->unk14, &sp20, 0x8235);
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_807370A4.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_807370A4.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_80737198.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_80737198.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_8073726C.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_8073726C.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_8073749C.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_8073749C.s")
 
 typedef struct {
     s32 unk0;
@@ -149,7 +149,7 @@ u8 func_80737608(Struct_807375E0 *arg0) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_80737638.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_80737638.s")
 
 typedef struct Struct80737990 Struct80737990;
 
@@ -227,4 +227,4 @@ u16 func_80737B2C(u8 arg0) {
     return D_807FF0E4[arg0];
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13A7A0/func_80737B58.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13A7A0/func_80737B58.s")

src/global_asm/audio/code_13CB50.c

@@ -87,7 +87,7 @@ void func_80737F40(Struct80737F0C *arg0) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13CB50/func_80737FD8.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13CB50/func_80737FD8.s")
 
 void func_807382A0(s32, s32, u8, u8, u8);
 
@@ -97,9 +97,9 @@ void func_80737FD8(s32 arg0, s32 arg1) {
 }
 */
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13CB50/func_8073801C.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13CB50/func_8073801C.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13CB50/func_80738080.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13CB50/func_80738080.s")
 
 /*
 void func_80738080(s32 arg0, s32 arg1, u8 arg2) {
@@ -107,7 +107,7 @@ void func_80738080(s32 arg0, s32 arg1, u8 arg2) {
 }
 */
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13CB50/func_807380CC.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13CB50/func_807380CC.s")
 
 /*
 void func_807380CC(s32 arg0, s32 arg1, u8 arg2) {
@@ -115,7 +115,7 @@ void func_807380CC(s32 arg0, s32 arg1, u8 arg2) {
 }
 */
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13CB50/func_80738118.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13CB50/func_80738118.s")
 
 /*
 void func_80738118(s32 arg0, s32 arg1, u8 arg2) {

src/global_asm/audio/code_13D170.c

@@ -0,0 +1,27 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_80738470.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_807385F0.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_8073876C.s")
+
+s32 func_80738BA0(s32 *arg0) {
+    return arg0[3];
+}
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_80738BB8.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_80738C6C.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_80738D20.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_80738E58.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_80739098.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13D170/func_8073928C.s")
+

src/global_asm/audio/code_13ECE0.c

@@ -4,19 +4,19 @@
 
 // Hmm, possibly audio stuff?
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_80739FE0.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_80739FE0.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073A070.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073A070.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073A130.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073A130.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073A2A4.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073A2A4.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073A3C4.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073A3C4.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073A488.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073A488.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073A518.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073A518.s")
 
 typedef struct {
     s32 unk0;
@@ -150,7 +150,7 @@ s16 func_8073A690(Struct8073A900_arg0 *arg0, Struct8073AB00 *arg1) {
     return sp4;
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073A7B8.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073A7B8.s")
 
 /*
 // TODO: Extremely close
@@ -269,4 +269,4 @@ void func_8073AD50(Struct8073AB00 *arg0, Struct8073AD50_arg1 *arg1, s32 arg2) {
     arg0->unk60[arg2].unk31 = 0;
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13ECE0/func_8073B08C.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_13ECE0/func_8073B08C.s")

src/global_asm/audio/code_140260.c

@@ -31,6 +31,6 @@ void func_8073B640(ALPlayer *arg0) {
     osSetIntMask(sp1C);
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140260/func_8073B6B0.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140260/func_8073B6B0.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140260/func_8073B750.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140260/func_8073B750.s")

src/global_asm/audio/code_140530.c

@@ -0,0 +1,5 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140530/func_8073B830.s")

src/global_asm/audio/code_140600.c

@@ -1,11 +1,11 @@
 #include <ultra64.h>
 #include "functions.h"
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140600/func_8073B900.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140600/func_8073B900.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140600/func_8073B9B0.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140600/func_8073B9B0.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140600/func_8073BA60.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140600/func_8073BA60.s")
 
 f32 func_80611BB4(f32, f32);
 extern f32 D_807604B0;
@@ -57,7 +57,7 @@ void func_8073BC74(Struct8073BC74 *arg0) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140600/func_8073BDC4.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140600/func_8073BDC4.s")
 
 extern f32 D_807604B8;
 extern f32 D_807604BC;
@@ -115,7 +115,7 @@ void func_8073BE54(Struct8073BC74 *arg0, f32 arg1) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140600/func_8073C040.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140600/func_8073C040.s")
 
 s16 *func_80732444(s32, s32, s32, u8, s32);
 extern s32 D_80756458[];
@@ -270,4 +270,4 @@ void func_8073C040(s16 **arg0, Struct8073C040_arg1 *arg1, s16 arg2, s32 arg3) {
 }
 */
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140600/func_8073C604.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_140600/func_8073C604.s")

src/global_asm/audio/code_141520.c

@@ -1,11 +1,11 @@
 #include <ultra64.h>
 #include "functions.h"
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141520/func_8073C820.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141520/func_8073C820.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141520/func_8073C8D0.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141520/func_8073C8D0.s")
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141520/func_8073C948.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141520/func_8073C948.s")
 
 s32 func_8073DA30(s32, s16, s32);
 

src/global_asm/audio/code_1417C0.c

@@ -0,0 +1,8 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_1417C0/func_8073CAC0.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_1417C0/func_8073CC94.s")

src/global_asm/audio/code_141AD0.c

@@ -0,0 +1,5 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141AD0/func_8073CDD0.s")

src/global_asm/audio/code_141C00.c

@@ -0,0 +1,9 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141C00/func_8073CF00.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141C00/func_8073CFB0.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141C00/func_8073D060.s")

src/global_asm/audio/code_141E60.c

@@ -0,0 +1,5 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141E60/func_8073D160.s")

src/global_asm/audio/code_141EF0.c

@@ -0,0 +1,21 @@
+#include <ultra64.h>
+#include "functions.h"
+
+#include "synthinternal.h"
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073D1F0.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073DA30.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073DF50.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073E268.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073E460.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073E63C.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073E73C.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141EF0/func_8073E800.s")

src/global_asm/audio/code_1435C0.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 
 // Jumptable
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_1435C0/func_8073E8C0.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_1435C0/func_8073E8C0.s")
 
 typedef struct {
     u8 unk0[0x48 - 0x0];
@@ -58,7 +58,7 @@ s32 func_8073F1E4(Struct8073F1E4 *arg0, s32 arg1, s32 *arg2) {
     return 0;
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_1435C0/func_8073F328.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_1435C0/func_8073F328.s")
 
 extern f32 D_80760554;
 
@@ -97,7 +97,7 @@ s16 func_8073F60C(f32 arg0, f32 arg1, s32 arg2, u16 *arg3) {
     return spE;
 }
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_1435C0/func_8073F81C.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_1435C0/func_8073F81C.s")
 
 /*
 // TODO: Something wrong with the shifts
@@ -115,4 +115,4 @@ s16 func_8073F81C(s16 arg0, s32 arg1, s16 arg2, u16 arg3) {
 }
 */
 
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_1435C0/func_8073F8A0.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_1435C0/func_8073F8A0.s")

src/global_asm/audio/code_144A90.c

@@ -0,0 +1,6 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_144A90/func_8073FD90.s")

src/global_asm/audio/code_144E00.c

@@ -0,0 +1,9 @@
+#include <ultra64.h>
+#include "functions.h"
+
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_144E00/func_80740100.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_144E00/func_807407A8.s")
+
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_144E00/func_80740A90.s")

src/global_asm/audio/code_145950.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 
 // Displaylist stuff
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_145950/func_80740C50.s")
+#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_145950/func_80740C50.s")
 
 void func_807407A8(void *, s32, void*);
 

src/global_asm/code_13D170.c

@@ -1,35 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_80738470.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_807385F0.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_8073876C.s")
-
-s32 func_80738BA0(s32 *arg0) {
-    return arg0[3];
-}
-
-void func_80738BA8(void) {
-
-}
-
-void func_80738BB0(void) {
-
-}
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_80738BB8.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_80738C6C.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_80738D20.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_80738E58.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_80739098.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_13D170/func_8073928C.s")
-

src/global_asm/code_140530.c

@@ -1,5 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_140530/func_8073B830.s")

src/global_asm/code_1417C0.c

@@ -1,8 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_1417C0/func_8073CAC0.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_1417C0/func_8073CC94.s")

src/global_asm/code_141AD0.c

@@ -1,5 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141AD0/func_8073CDD0.s")

src/global_asm/code_141C00.c

@@ -1,9 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141C00/func_8073CF00.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141C00/func_8073CFB0.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141C00/func_8073D060.s")

src/global_asm/code_141E60.c

@@ -1,5 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141E60/func_8073D160.s")

src/global_asm/code_141EF0.c

@@ -1,21 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-#include "synthinternal.h"
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073D1F0.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073DA30.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073DF50.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073E268.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073E460.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073E63C.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073E73C.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_141EF0/func_8073E800.s")

src/global_asm/code_144A90.c

@@ -1,6 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_144A90/func_8073FD90.s")

src/global_asm/code_144E00.c

@@ -1,9 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_144E00/func_80740100.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_144E00/func_807407A8.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_144E00/func_80740A90.s")

subyaml/global_asm.us.yaml

@@ -126,44 +126,44 @@ segments:
       - [0x133A90, c, code_133A90]
       - [0x135D30, c, code_135D30]
       - [0x136820, c, code_136820]
-      - [0x137120, c, code_137120]
-      - [0x1371D0, c, code_1371D0]
-      - [0x137630, c, code_137630]
-      - [0x137C10, c, code_137C10]
-      - [0x13A750, c, code_13A750]
-      - [0x13A7A0, c, code_13A7A0]
-      - [0x13C920, c, code_13C920]
-      - [0x13CB30, c, code_13CB30]
-      - [0x13CB50, c, code_13CB50]
-      - [0x13CE70, c, code_13CE70]
-      - [0x13CFA0, c, code_13CFA0]
-      - [0x13D020, c, code_13D020]
-      - [0x13D0B0, c, code_13D0B0]
-      - [0x13D100, c, code_13D100]
-      - [0x13D170, c, code_13D170]
+      - [0x137120, c, audio/code_137120]
+      - [0x1371D0, c, audio/code_1371D0]
+      - [0x137630, c, audio/code_137630]
+      - [0x137C10, c, audio/code_137C10]
+      - [0x13A750, c, audio/code_13A750]
+      - [0x13A7A0, c, audio/code_13A7A0]
+      - [0x13C920, c, audio/code_13C920]
+      - [0x13CB30, c, audio/code_13CB30]
+      - [0x13CB50, c, audio/code_13CB50]
+      - [0x13CE70, c, audio/code_13CE70]
+      - [0x13CFA0, c, audio/code_13CFA0]
+      - [0x13D020, c, audio/code_13D020]
+      - [0x13D0B0, c, audio/code_13D0B0]
+      - [0x13D100, c, audio/code_13D100]
+      - [0x13D170, c, audio/code_13D170]
       - [0x13E020, c, audio/n_sl]  #DONE
       - [0x13E0E0, c, audio/link]  #DONE
       - [0x13E160, c, audio/synthesizer]
       - [0x13EC00, c, audio/seqpstop] #DONE
       - [0x13EC40, c, audio/seqpsetseq] #DONE
       - [0x13EC90, c, audio/seqpsetvol] #DONE
-      - [0x13ECE0, c, code_13ECE0]
+      - [0x13ECE0, c, audio/code_13ECE0]
       - [0x13FED0, c, audio/event] #DONE
-      - [0x140260, c, code_140260]
-      - [0x140530, c, code_140530]
-      - [0x140600, c, code_140600]
-      - [0x141520, c, code_141520]
-      - [0x1417C0, c, code_1417C0]
-      - [0x141AD0, c, code_141AD0]
-      - [0x141C00, c, code_141C00]
+      - [0x140260, c, audio/code_140260]
+      - [0x140530, c, audio/code_140530]
+      - [0x140600, c, audio/code_140600]
+      - [0x141520, c, audio/code_141520]
+      - [0x1417C0, c, audio/code_1417C0]
+      - [0x141AD0, c, audio/code_141AD0]
+      - [0x141C00, c, audio/code_141C00]
       - [0x141E40, c, audio/n_syndelete] #DONE
-      - [0x141E60, c, code_141E60]
-      - [0x141EF0, c, code_141EF0]
-      - [0x1435A0, c, code_1435A0]
-      - [0x1435C0, c, code_1435C0]
-      - [0x144A90, c, code_144A90]
-      - [0x144E00, c, code_144E00]
-      - [0x145950, c, code_145950]
+      - [0x141E60, c, audio/code_141E60]
+      - [0x141EF0, c, audio/code_141EF0]
+      - [0x1435A0, c, audio/code_1435A0]
+      - [0x1435C0, c, audio/code_1435C0]
+      - [0x144A90, c, audio/code_144A90]
+      - [0x144E00, c, audio/code_144E00]
+      - [0x145950, c, audio/code_145950]
       - [0x145D70, bin, code_145D70] #mips3
   - name: data
     type: code