Library split (#5)

* fixed

* and cleanup

* format

* let's all go to the library

* split

* small cleanup

src/libultra/206B0.c

@@ -0,0 +1,25 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FAB0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FAE4.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FB04.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FB24.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FB58.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FB88.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FBA8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FBC8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FBE8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FD0C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FE00.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/206B0/func_8001FE30.s")

src/libultra/28330.c

@@ -0,0 +1,9 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28330/__osTimerServicesInit.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28330/__osTimerInterrupt.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28330/__osSetTimerIntr.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28330/__osInsertTimer.s")

src/libultra/28820.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28820/__osViGetCurrentContext.s")

src/libultra/28B90.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28B90/func_80027F90.s")

src/libultra/28C90.c

@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28C90/func_80028090.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28C90/func_800280E0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/28C90/func_80028124.s")

src/libultra/294F0.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/294F0/func_800288F0.s")

src/libultra/297E0.c

@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/297E0/func_80028BE0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/297E0/func_80028C30.s")

src/libultra/2A7A0.c

@@ -0,0 +1,11 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2A7A0/func_80029BA0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2A7A0/func_80029BF8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2A7A0/func_80029C6C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2A7A0/func_80029CD8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2A7A0/func_80029DA8.s")

src/libultra/2AAB0.c

@@ -0,0 +1,11 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2AAB0/func_80029EB0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2AAB0/func_80029F80.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2AAB0/func_80029FF4.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2AAB0/func_8002A044.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2AAB0/func_8002A0B0.s")

src/libultra/2AD80.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2AD80/func_8002A180.s")

src/libultra/2B830.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2B830/func_8002AC30.s")

src/libultra/2BD50.c

@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2BD50/func_8002B150.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2BD50/func_8002B15C.s")

src/libultra/2EDE0.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2EDE0/func_8002E1E0.s")

src/libultra/2EE30.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2EE30/func_8002E230.s")

src/libultra/gu/cosf.c

@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/cosf/__cosf.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/cosf/D_800C9390.s")

src/libultra/gu/perspective.c

@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/perspective/guPerspectiveF.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/perspective/guPerspective.s")

src/libultra/gu/sinf.c

@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/sinf/__sinf.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/sinf/D_800C9340.s")

src/libultra/io/devmgr.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/devmgr/__osDevMgrMain.s")

src/libultra/os/stopthread.c

@@ -0,0 +1,35 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/osStopThread.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E340.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E364.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E3A8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E3BC.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E3E0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E4F8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E548.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E5E0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E604.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E628.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E64C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E670.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E694.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E6B8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/func_8002E6DC.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/stopthread/D_800C9A50.s")

src/libultra/os/thread.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/thread/__osDequeueThread.s")

src/libultra/rmon/xldtob.c

@@ -0,0 +1,9 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/rmon/xldtob/func_80029080.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/rmon/xldtob/D_800C9580.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/rmon/xldtob/_Ldtob.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/rmon/xldtob/D_800C95D0.s")

src/main/1FA70.c

@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/1FA70/func_8001EE70.s")

src/main/1FB10.c

@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/1FB10/func_8001EF10.s")

src/main/21520.c

@@ -0,0 +1,9 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/21520/func_80020920.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/21520/func_80020A88.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/21520/func_80020BF4.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/21520/func_80020D70.s")

src/main/233A0.c

@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/233A0/func_800227A0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/233A0/func_8002296C.s")

src/main/23760.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/23760/func_80022B60.s")

src/main/24C60.c

@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/24C60/func_80024060.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/24C60/_Printf.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/24C60/D_800C93EC.s")

src/main/25950.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/25950/func_80024D50.s")

src/main/25AC0.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/25AC0/func_80024EC0.s")

src/main/25CA0.c

@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/25CA0/osAiSetNextBuffer.s")

src/main/25E10.c

@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/25E10/__osSiCreateAccessQueue.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/25E10/__osSiGetAccess.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/25E10/__osSiRelAccess.s")

src/main/271C0.c

@@ -0,0 +1,9 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/271C0/func_800265C0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/271C0/func_800267C4.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/271C0/func_80026940.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/271C0/func_80026B5C.s")

src/main/2DF00.c

@@ -0,0 +1,29 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002D300.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002D3AC.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002D494.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002D654.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002D660.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002D7BC.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002D9E4.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002DA78.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002DB3C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002DB7C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002DC38.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002DC68.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002DCD0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/2DF00/func_8002DD00.s")

src/main/5A20.c

@@ -1,11 +1,5 @@
-#include "common.h"
+#include "global.h"
 
-extern f32 D_800C80FC;
-extern f32 D_800C80D8;
-extern f32 D_800C80DC;
-extern f32 D_800C80E0;
-extern f32 D_800C80E4;
-extern f32 D_800C8100;
 extern s32 D_8013B3A0;
 extern s32 D_8013B3A4;
 extern s32 D_8013B3A8;
@@ -44,17 +38,17 @@ f32 func_80005100(f32 arg0, f32 arg1) {
 
     if (arg1 == 0.0f) {
         if (arg0 < 0.0f) {
-            return D_800C80D8;
+            return -M_PI / 2.0f;
         } else {
-            return D_800C80DC;
+            return M_PI / 2.0f;
         }
     }
 
     if (arg1 < 0.0f) {
         if (arg0 < 0.0f) {
-            return -(D_800C80E0 - func_8001FBE8(fabsf(arg0 / arg1)));
+            return -(M_PI - func_8001FBE8(fabsf(arg0 / arg1)));
         } else {
-            return D_800C80E4 - func_8001FBE8(fabsf(arg0 / arg1));
+            return M_PI - func_8001FBE8(fabsf(arg0 / arg1));
         }
     } else {
         return func_8001FBE8(arg0 / arg1);
@@ -70,9 +64,9 @@ f32 func_80005320(f32 arg0, f32 arg1) {
 
     if (arg0 == 0.0f) {
         if (arg1 < 0.0f) {
-            return D_800C80FC;
+            return -M_PI / 2.0f;
         }
-        return D_800C8100;
+        return M_PI / 2.0f;
     }
 
     if (arg1 == 0.0f) {
@@ -125,46 +119,3 @@ void func_80005604(s32* arg0, s32* arg1, s32 arg2, s32 arg3, s32 arg4) {
     }
     *arg0 = arg4;
 }
-
-// https://decomp.me/scratch/8H8k4 100%
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005680.s")
-
-void func_80005708(s32* arg0) {
-    func_80005680(*arg0 + 64, *arg0);
-    *arg0 += 0x40;
-}
-
-void func_80005740(s32* arg0) {
-    *arg0 -= 64;
-}
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005754.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005B00.s")
-
-// https://decomp.me/scratch/v4KEJ 91%
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005C34.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005D44.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005E90.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005FE0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_8000612C.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006500.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_8000671C.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006970.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006A20.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006AB8.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006C7C.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006E3C.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006EB8.s")

src/main/6280.c

@@ -0,0 +1,44 @@
+#include "global.h"
+
+// https://decomp.me/scratch/8H8k4 100%
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80005680.s")
+
+void func_80005708(s32* arg0) {
+    func_80005680(*arg0 + 64, *arg0);
+    *arg0 += 0x40;
+}
+
+void func_80005740(s32* arg0) {
+    *arg0 -= 64;
+}
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80005754.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80005B00.s")
+
+// https://decomp.me/scratch/v4KEJ 91%
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80005C34.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80005D44.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80005E90.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80005FE0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_8000612C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80006500.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_8000671C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80006970.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80006A20.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80006AB8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80006C7C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80006E3C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/6280/func_80006EB8.s")

src/main/7D30.c

@@ -1,3 +1,5 @@
+
+
 #include "common.h"
 
 extern s64 osClockRate;
@@ -36,3 +38,5 @@ s32 func_8000716C(s32 arg0, s32 arg1) {
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/7D30/func_800071FC.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/7D30/func_800072E0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7D30/D_800C8120.s")