From a688a1d4ba622043f96778b56c85cecd9c789233 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Fri, 24 Sep 2021 13:09:28 -0400
Subject: [PATCH] Move more files around to clean things up

---
 Makefile                                     |  1 -
 lib/src/{ => al/global_asm}/unknown_0C86A0.c |  3 +--
 lib/src/al/global_asm/unknown_0C91A0.c       | 11 ++++++++
 lib/src/al/global_asm/unknown_0C91A0_2.c     | 10 ++++++++
 lib/src/os/osAiSetFrequency.c                |  7 +++++
 lib/src/os/osCreateMesgQueue.c               | 15 +++++++++++
 lib/src/unknown_0C91A0.c                     | 27 --------------------
 7 files changed, 44 insertions(+), 30 deletions(-)
 rename lib/src/{ => al/global_asm}/unknown_0C86A0.c (96%)
 create mode 100644 lib/src/al/global_asm/unknown_0C91A0.c
 create mode 100644 lib/src/al/global_asm/unknown_0C91A0_2.c
 create mode 100644 lib/src/os/osAiSetFrequency.c
 create mode 100644 lib/src/os/osCreateMesgQueue.c
 delete mode 100644 lib/src/unknown_0C91A0.c

diff --git a/Makefile b/Makefile
index 485609a0..4619ae08 100755
--- a/Makefile
+++ b/Makefile
@@ -261,7 +261,6 @@ $(BUILD_DIR)/lib/src/os/%.o: OPT_FLAGS := -O1
 $(BUILD_DIR)/lib/src/os/osViMgr.o: OPT_FLAGS := -O2
 $(BUILD_DIR)/lib/src/os/osCreatePiManager.o: OPT_FLAGS := -O2
 $(BUILD_DIR)/lib/src/printf.o : OPT_FLAGS := -O3
-$(BUILD_DIR)/lib/src/unknown_0C91A0.o : OPT_FLAGS := -O1
 $(BUILD_DIR)/lib/src/unknown_0D29F0.o: OPT_FLAGS := -O1
 $(BUILD_DIR)/lib/src/unknown_0D3360.o: OPT_FLAGS := -O1
 $(BUILD_DIR)/lib/src/al/unknown_0C9C90.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0
diff --git a/lib/src/unknown_0C86A0.c b/lib/src/al/global_asm/unknown_0C86A0.c
similarity index 96%
rename from lib/src/unknown_0C86A0.c
rename to lib/src/al/global_asm/unknown_0C86A0.c
index e1b75bf4..bab28d9d 100644
--- a/lib/src/unknown_0C86A0.c
+++ b/lib/src/al/global_asm/unknown_0C86A0.c
@@ -14,8 +14,7 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/__alCSeqGetTrackEvent.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/alCSeqNew.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/alCSeqNewMarker.s")
 
-s32 alCSeqGetTicks(ALCSeq *seq)
-{
+s32 alCSeqGetTicks(ALCSeq *seq) {
     return seq->lastTicks; 
 }
 
diff --git a/lib/src/al/global_asm/unknown_0C91A0.c b/lib/src/al/global_asm/unknown_0C91A0.c
new file mode 100644
index 00000000..bfc31898
--- /dev/null
+++ b/lib/src/al/global_asm/unknown_0C91A0.c
@@ -0,0 +1,11 @@
+/* The comment below is needed for this file to be picked up by generate_ld */
+/* RAM_POS: 0x800C85A0 */
+
+#include "libultra_internal.h"
+#include "types.h"
+#include "macros.h"
+
+ALGlobals *alGlobals = NULL;
+
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPPlay.s")
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPStop.s")
diff --git a/lib/src/al/global_asm/unknown_0C91A0_2.c b/lib/src/al/global_asm/unknown_0C91A0_2.c
new file mode 100644
index 00000000..12588627
--- /dev/null
+++ b/lib/src/al/global_asm/unknown_0C91A0_2.c
@@ -0,0 +1,10 @@
+/* The comment below is needed for this file to be picked up by generate_ld */
+/* RAM_POS: 0x800C8760 */
+
+#include "types.h"
+#include "macros.h"
+
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alUnlink.s")
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alLink.s")
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alClose.s")
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alInit.s")
diff --git a/lib/src/os/osAiSetFrequency.c b/lib/src/os/osAiSetFrequency.c
new file mode 100644
index 00000000..0ecb33a8
--- /dev/null
+++ b/lib/src/os/osAiSetFrequency.c
@@ -0,0 +1,7 @@
+/* The comment below is needed for this file to be picked up by generate_ld */
+/* RAM_POS: 0x800C8600 */
+
+#include "types.h"
+#include "macros.h"
+
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/osAiSetFrequency.s")
diff --git a/lib/src/os/osCreateMesgQueue.c b/lib/src/os/osCreateMesgQueue.c
new file mode 100644
index 00000000..066c3569
--- /dev/null
+++ b/lib/src/os/osCreateMesgQueue.c
@@ -0,0 +1,15 @@
+/* The comment below is needed for this file to be picked up by generate_ld */
+/* RAM_POS: 0x800C8820 */
+
+#include "libultra_internal.h"
+#include "types.h"
+
+extern OSThread __osThreadTail;
+void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msg, s32 msgCount) {
+    mq->mtqueue = (OSThread *)&__osThreadTail;
+    mq->fullqueue = (OSThread *)&__osThreadTail;
+    mq->validCount = 0;
+    mq->first = 0;
+    mq->msgCount = msgCount;
+    mq->msg = msg;
+}
diff --git a/lib/src/unknown_0C91A0.c b/lib/src/unknown_0C91A0.c
deleted file mode 100644
index 5a115230..00000000
--- a/lib/src/unknown_0C91A0.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* The comment below is needed for this file to be picked up by generate_ld */
-/* RAM_POS: 0x800C85A0 */
-
-#include "libultra_internal.h"
-#include "types.h"
-#include "macros.h"
-
-ALGlobals *alGlobals = NULL;
-
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPPlay.s")
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPStop.s")
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/osAiSetFrequency.s")
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alUnlink.s")
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alLink.s")
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alClose.s")
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alInit.s")
-
-extern OSThread __osThreadTail;
-void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msg, s32 msgCount)
-{
-    mq->mtqueue = (OSThread *)&__osThreadTail;
-    mq->fullqueue = (OSThread *)&__osThreadTail;
-    mq->validCount = 0;
-    mq->first = 0;
-    mq->msgCount = msgCount;
-    mq->msg = msg;
-}