From 7e5476f55717bc089f7b6b32943ed1203f51b252 Mon Sep 17 00:00:00 2001
From: Ryan Myers <ryan.p.myers@gmail.com>
Date: Wed, 22 Sep 2021 08:27:23 -0400
Subject: [PATCH] Moved osGetActiveQueue to it's own file to resolve the issue
 with the nop placement

---
 lib/src/os/osGetActiveQueue.c | 11 +++++++++++
 lib/src/unknown_0D3020.c      | 12 +-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 lib/src/os/osGetActiveQueue.c

diff --git a/lib/src/os/osGetActiveQueue.c b/lib/src/os/osGetActiveQueue.c
new file mode 100644
index 00000000..27b2fff9
--- /dev/null
+++ b/lib/src/os/osGetActiveQueue.c
@@ -0,0 +1,11 @@
+/* The comment below is needed for this file to be picked up by generate_ld */
+/* RAM_POS: 0x800D2470 */
+
+#include "types.h"
+#include "macros.h"
+#include "libultra_internal.h"
+
+extern OSThread *__osActiveQueue;
+OSThread *__osGetActiveQueue(void) {
+    return __osActiveQueue;
+}
diff --git a/lib/src/unknown_0D3020.c b/lib/src/unknown_0D3020.c
index 6ad3a205..65cf5c13 100644
--- a/lib/src/unknown_0D3020.c
+++ b/lib/src/unknown_0D3020.c
@@ -1,20 +1,10 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
-/* RAM_POS: 0x800D2470 */
+/* RAM_POS: 0x800D2480 */
 
 #include "types.h"
 #include "macros.h"
 #include "libultra_internal.h"
 
-#ifdef NON_MATCHING
-//Only fails because it doesn't generate a NOP after this. Maybe -01?
-extern OSThread *__osActiveQueue;
-OSThread *__osGetActiveQueue(void) {
-    return __osActiveQueue;
-}
-#else
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D2470.s")
-#endif
-
 #define PI_Q_BUF_LEN 1
 extern u32 __osPiAccessQueueEnabled;//__osPiAccessQueueEnabled
 extern OSMesg D_8012D1E0[PI_Q_BUF_LEN];//piAccessBuf