Split SComponent (#45)

* split c_math

* split c_angle

* split c_API_controller_pad

* split c_API_graphic

* split c_bg_s_chk

* c_bg_s_gnd_chk split

* more c_bg split

* split c_cc_d

* delete asm

* split c_cc_s

* split c_lib

* split c_m2d and c_m3d_g_aab

* split c_m3d_g_cir

* split c_m3d_g_cps

* split rest of c_m3d_g

* split c_m3d

* split c_malloc

* split c_request

* split c_sxyz

* split and partly decompile c_xyz

* format

* c_angle.h

* begin c_angle decomp

* c_angle

* progress adding stub classes for SComponent

* more c_m3d

* remove some asm and format

* more m3d headers

* more c_angle decomp

* c_lib headers

* add public to classes

* fix csXyz member names

* c_sxyz partly OK

* move Zero csXyz to c_sxyz header

* c_API_graphic

* delete some unused asm

* move math extern data, decompile some functions

* delete unused asm

* fix duplicated c_angle.h

* fix an inlined function name, add more inlined functions for c_angle.h (currently unused)

* format

Co-authored-by: Pheenoh <pheenoh@gmail.com>

7 files changed, 20 insertions, 23 deletions

diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 45c0cb84bc..1f57b00e04 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -1,6 +1,5 @@
 /* d_camera.cpp autogenerated by split.py v0.3 at 2021-01-02 08:13:10.853821 */
 
-#include "SComponent/c_angle/c_angle.h"
 #include "SComponent/c_bg_w.h"
 #include "SComponent/c_xyz.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
@@ -600,7 +599,7 @@ asm void _unnamed_d_camera_cpp__NS_rangef(void) {
 
 // __ct__7cSGlobeFv
 // cSGlobe::cSGlobe(void)
-asm void cSGlobe(void) {
+asm void __ct__7cSGlobeFv(void) {
     nofralloc
 #include "d/d_camera/asm/func_8016E420.s"
 }
@@ -1333,12 +1332,16 @@ asm void std_NS_fabsf(void) {
 #include "d/d_camera/asm/func_80182A3C.s"
 }
 
+extern "C" {
+
+// compiler generated from inline constructor
 // __ct__7cSAngleFv
 // cSAngle::cSAngle(void)
-asm cSAngle::cSAngle() {
+asm void __ct__7cSAngleFv(void) {
     nofralloc
 #include "d/d_camera/asm/func_80182A48.s"
 }
+}
 
 // R__7cSGlobeFf
 // cSGlobe::R(float)
diff --git a/src/f/f_pc/f_pc_base.cpp b/src/f/f_pc/f_pc_base.cpp
index 163dd4b9b3..a8a74026e5 100644
--- a/src/f/f_pc/f_pc_base.cpp
+++ b/src/f/f_pc/f_pc_base.cpp
@@ -18,8 +18,6 @@ extern s32 lbl_80450D00;  // f_pc_base::g_fpcBs_type
 
 extern "C" {
 
-extern void cMl_NS_free(void* pPtr);
-extern void* cMl_NS_memalignB(s32 pAlign, s32 pSize);
 extern void sBs_ClearArea(void* pPtr, s32 pSize);
 
 BOOL fpcBs_Is_JustOfType(s32 pType1, s32 pType2) {
@@ -56,7 +54,7 @@ s32 fpcBs_Execute(base_process_class* pProc) {
 
 void fpcBs_DeleteAppend(base_process_class* pProc) {
     if (pProc->mpUserData != NULL) {
-        cMl_NS_free(pProc->mpUserData);
+        free__3cMlFPv(pProc->mpUserData);
         pProc->mpUserData = NULL;
     }
 }
@@ -75,7 +73,7 @@ s32 fpcBs_Delete(base_process_class* pProc) {
     if (deleteResult == 1) {
         fpcBs_DeleteAppend(pProc);
         pProc->mBsType = 0;
-        cMl_NS_free(pProc);
+        free__3cMlFPv(pProc);
     }
     return deleteResult;
 }
@@ -87,7 +85,7 @@ base_process_class* fpcBs_Create(s16 pProcTypeID, u32 pProcID, void* pData) {
 
     procProfDef = fpcPf_Get(pProcTypeID);
     size = procProfDef->mSize + procProfDef->mSizeOther;
-    procClass = (base_process_class*)cMl_NS_memalignB(-4, size);
+    procClass = (base_process_class*)memalignB__3cMlFiUl(-4, size);
     if (procClass == NULL) {
         return NULL;
     } else {
diff --git a/src/f/f_pc/f_pc_create_req.cpp b/src/f/f_pc/f_pc_create_req.cpp
index f19c48416c..d828558d6e 100644
--- a/src/f/f_pc/f_pc_create_req.cpp
+++ b/src/f/f_pc/f_pc_create_req.cpp
@@ -32,7 +32,7 @@ void fpcCtRq_ToCreateQ(create_request* pReq) {
     fpcCtTg_ToCreateQ(&pReq->mBase.mBase);
 }
 
-extern void cMl_NS_free(void* pPtr);
+extern void free__3cMlFPv(void* pPtr);
 
 BOOL fpcCtRq_Delete(create_request* pReq) {
     fpcCtRq_CreateQTo(pReq);
@@ -42,7 +42,7 @@ BOOL fpcCtRq_Delete(create_request* pReq) {
         if (pReq->mpRes) {
             pReq->mpRes->mpCtRq = NULL;
         }
-        cMl_NS_free(pReq);
+        free__3cMlFPv(pReq);
         return 1;
     }
 }
@@ -104,10 +104,8 @@ void fpcCtRq_Handler(void) {
     fpcCtIt_Method((cNdIt_MethodFunc)fpcCtRq_Do, NULL);
 }
 
-extern void* cMl_NS_memalignB(s32, u32);
-
 create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, create_request_method_class* pMthd) {
-    create_request* pReq = (create_request*)cMl_NS_memalignB(-4, size);
+    create_request* pReq = (create_request*)memalignB__3cMlFiUl(-4, size);
 
     if (pReq != NULL) {
         fpcCtTg_Init(&pReq->mBase, pReq);
diff --git a/src/f/f_pc/f_pc_draw.cpp b/src/f/f_pc/f_pc_draw.cpp
index bd7b084154..5876d71266 100644
--- a/src/f/f_pc/f_pc_draw.cpp
+++ b/src/f/f_pc/f_pc_draw.cpp
@@ -1,4 +1,5 @@
 #include "f/f_pc/f_pc_draw.h"
+#include "SComponent/c_API_graphic.h"
 #include "f/f_pc/f_pc_layer.h"
 #include "f/f_pc/f_pc_pause.h"
 
@@ -9,9 +10,6 @@ typedef s32 (*cNdIt_MethodFuncFunc)(cNdIt_MethodFunc);
 
 extern "C" {
 
-extern void cAPIGph_AfterOfDraw(void);
-extern void cAPIGph_BeforeOfDraw(void);
-
 s32 fpcDw_Execute(base_process_class* pProc) {
     if (!fpcPause_IsEnable(pProc, 2)) {
         layer_class* curLay;
diff --git a/src/f/f_pc/f_pc_manager.cpp b/src/f/f_pc/f_pc_manager.cpp
index d6a0dbbe5f..7472de3557 100644
--- a/src/f/f_pc/f_pc_manager.cpp
+++ b/src/f/f_pc/f_pc_manager.cpp
@@ -1,4 +1,6 @@
 #include "f/f_pc/f_pc_manager.h"
+#include "SComponent/c_API_graphic.h"
+#include "SComponent/c_lib.h"
 #include "SComponent/c_tag.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "d/d_lib/d_lib.h"
diff --git a/src/f/f_pc/f_pc_node_req.cpp b/src/f/f_pc/f_pc_node_req.cpp
index 38473e4431..1490a50cf9 100644
--- a/src/f/f_pc/f_pc_node_req.cpp
+++ b/src/f/f_pc/f_pc_node_req.cpp
@@ -23,10 +23,8 @@ extern s8 lbl_80450D4C;
 
 extern "C" {
 
-extern void cMl_NS_free(void*);
 extern s32 fpcSCtRq_Request(layer_class*, s16, process_method_func, void*, void*);
 extern void sBs_ClearArea(void* pPtr, s32 pSize);
-extern void* cMl_NS_memalignB(s32 pAlign, s32 pSize);
 
 void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq) {
     fpcLy_CreatedMesg(pNodeCreateReq->mpLayerClass);
@@ -106,7 +104,7 @@ s32 fpcNdRq_Delete(node_create_request* pNodeCreateReq) {
         fpcMtd_Method(pNodeCreateReq->mpNodeCrReqMthCls->mpUnkFunc, pNodeCreateReq) == 0) {
         return 0;
     }
-    cMl_NS_free(pNodeCreateReq);
+    free__3cMlFPv(pNodeCreateReq);
     return 1;
 }
 
@@ -178,7 +176,7 @@ s32 fpcNdRq_IsIng(process_node_class* pProcNode) {
 }
 
 node_create_request* fpcNdRq_Create(s32 pRequestSize) {
-    node_create_request* req = (node_create_request*)cMl_NS_memalignB(-4, pRequestSize);
+    node_create_request* req = (node_create_request*)memalignB__3cMlFiUl(-4, pRequestSize);
     if (req != NULL) {
         if (lbl_80450D4C == 0) {
             lbl_80450D48 = 0;
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index cd4123a595..afc77c847b 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -28,7 +28,7 @@ void mDoRst_reset(int p1, u32 p2, int p3) {
     s32 enable;
     /* sManager */ lbl_80451550->clearIndex();
     mDoDvdErr_ThdCleanup();
-    cAPICPad_recalibrate();
+    cAPICPad_recalibrate__Fv();
     if (lbl_80450BB8 != 0) {
         do {
             // uVar2 = lbl_80451368->hasReset();
@@ -86,7 +86,7 @@ void mDoRst_reset(int p1, u32 p2, int p3) {
 void mDoRst_resetCallBack(int p1, void* p2) {
     if (/* mResetData */ m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x0 == 0) {
         if (p1 == -1) {
-            cAPICPad_recalibrate();
+            cAPICPad_recalibrate__Fv();
         } else {
             if (m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x8 != 0) {
                 lbl_80451501 = false;
@@ -96,7 +96,7 @@ void mDoRst_resetCallBack(int p1, void* p2) {
             }
             m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x8 = 1;
             m_Do_Reset_NS_mDoRst_NS_mResetData->pad_index = p1;
-            cAPICPad_recalibrate();
+            cAPICPad_recalibrate__Fv();
         }
 
         if ((DVDCheckDisk() == 0) && (DVDGetDriveStatus() != DVD_STATE_FATAL_ERROR)) {