Merge branch 'functions'

This commit is contained in:
Pheenoh
2021-01-31 15:39:31 -05:00
117 changed files with 3995 additions and 6091 deletions
+2 -1
View File
@@ -1,3 +1,4 @@
/* c_API_graphic.cpp autogenerated by split.py v0.3 at 2020-12-31 13:52:43.596394 */
#include "SComponent/c_API_graphic.h"
@@ -20,4 +21,4 @@ void cAPIGph_BeforeOfDraw(void) {
// cAPIGph_AfterOfDraw(void)
void cAPIGph_AfterOfDraw(void) {
lbl_803C3528[2]();
}
}
+7 -1
View File
@@ -4,7 +4,13 @@
#include "global.h"
extern "C" {
double func_8036C028(double);
double func_8036C590(double);
double func_8036C668(double);
double func_8036CA54(double);
void __ct__7cSAngleFs(void);
void cSAngle_NS_dtor(void);
void func_80361C24(void);
float cAngle_NS_Adjust(float, float, float);
}
+4
View File
@@ -2,6 +2,10 @@
#include "SComponent/c_bg_s_chk.h"
extern "C" {
void __dl__FPv(void);
}
// __ct__8cBgS_ChkFv
cBgS_Chk::cBgS_Chk(void) {
unk_0x00 = 0;
@@ -4,6 +4,15 @@
// additional symbols needed for c_bg_s_gnd_chk.cpp
// autogenerated by split.py v0.3 at 2020-12-31 14:10:48.795807
extern "C" {
void __ct__13cBgS_PolyInfoFv(void);
void __ct__8cBgS_ChkFv(void);
void __dl__FPv(void);
void __dt__11cBgS_GndChkFv(void);
void __dt__13cBgS_PolyInfoFv(void);
void __dt__8cBgS_ChkFv(void);
}
extern u8 lbl_803C3F90;
// __ct__11cBgS_GndChkFv
@@ -4,6 +4,17 @@
// additional symbols needed for c_bg_s_lin_chk.cpp
// autogenerated by split.py v0.3 at 2021-01-01 12:56:44.686018
extern "C" {
void __ct__13cBgS_PolyInfoFv(void);
void __ct__8cBgS_ChkFv(void);
void __dl__FPv(void);
void __dt__11cBgS_LinChkFv(void);
void __dt__13cBgS_PolyInfoFv(void);
void __dt__8cBgS_ChkFv(void);
void ClearPi__13cBgS_PolyInfoFv(void);
void ct__11cBgS_LinChkFv(void);
void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(void);
}
extern u8 lbl_803C3FA8;
// __ct__11cBgS_LinChkFv
@@ -2,6 +2,11 @@
#include "SComponent/c_bg_s_poly_info.h"
extern "C" {
void __dl__FPv(void);
void ClearPi__13cBgS_PolyInfoFv(void);
}
// __ct__13cBgS_PolyInfoFv
cBgS_PolyInfo::cBgS_PolyInfo(void) {
this->ClearPi();
@@ -4,6 +4,12 @@
// additional symbols needed for c_bg_s_shdw_draw.cpp
// autogenerated by split.py v0.3 at 2021-01-01 13:07:28.433195
extern "C" {
void __ct__8cBgS_ChkFv(void);
void __dl__FPv(void);
void __dt__8cBgS_ChkFv(void);
void Set__8cM3dGAabFPC4cXyzPC4cXyz(void);
}
extern u8 lbl_803C3FC0;
// __ct__13cBgS_ShdwDrawFv
+1 -6
View File
@@ -12,9 +12,6 @@ unsigned int cBgW_BgId::ChkUsed() const {
unsigned int temp = mId - 0x100;
return temp >> 0x1f;
}
extern "C" {
bool cBgW_CheckBGround(float a1) {
return a1 >= lbl_804550E8;
}
@@ -28,6 +25,4 @@ bool cBgW_CheckBWall(float a1) {
return true;
return false;
}
} // extern "C"
}
+30
View File
@@ -3,6 +3,36 @@
#include "SComponent/c_xyz.h"
#include "global.h"
extern "C" {
void __dl__FPv(void);
void cCcD_CpsAttr_NS_dtor(void);
void cCcD_CylAttr_NS_dtor(void);
void cCcD_SphAttr_NS_dtor(void);
void ClearForMinMax__8cM3dGAabFv(void);
void cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec(void);
void cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec(void);
void cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec(void);
void cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec(void);
void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf(void);
void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf(void);
void cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec(void);
void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf(void);
void cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec(void);
void cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec(void);
void cross__8cM3dGCylCFPC8cM3dGCylP4cXyz(void);
void cross__8cM3dGCylCFPC8cM3dGSphP4cXyz(void);
void cross__8cM3dGSphCFPC8cM3dGCylP4cXyz(void);
void cross__8cM3dGSphCFPC8cM3dGSphP4cXyz(void);
void cross__8cM3dGTriCFPC8cM3dGCylP3Vec(void);
void cXyz_NS_dtor(void);
void func_80361C24(void);
void PlusR__8cM3dGAabFf(void);
void Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt(void);
void Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg(void);
void Set__8cM3dGAabFPC4cXyzPC4cXyz(void);
void SetMinMax__8cM3dGAabFRC4cXyz(void);
}
extern "C" {
// Set__15cCcD_DivideInfoFUlUlUl
+21
View File
@@ -2,6 +2,27 @@
#include "global.h"
extern "C" {
void CalcCenter__8cM3dGAabCFP4cXyz(void);
void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl(void);
void cCcD_Stts_NS_PlusDmg(void);
void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(void);
void ClearForMinMax__8cM3dGAabFv(void);
void ClrCcMove__9cCcD_SttsFv(void);
void cXyz_NS_dtor(void);
void func_80361C24(void);
void GetAc__8cCcD_ObjFv(void);
void GetWeightF__9cCcD_SttsCFv(void);
void PlusCcMove__9cCcD_SttsFfff(void);
void SetArea__15cCcD_DivideAreaFRC8cM3dGAab(void);
void SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz(void);
void SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf(void);
void SetHit__10cCcD_ObjAtFP8cCcD_Obj(void);
void SetHit__10cCcD_ObjCoFP8cCcD_Obj(void);
void SetHit__10cCcD_ObjTgFP8cCcD_Obj(void);
void SetMinMax__8cM3dGAabFRC8cM3dGAab(void);
}
extern "C" {
// __ct__4cCcSFv
// cCcS::cCcS(void)
+1 -2
View File
@@ -9,7 +9,6 @@ struct counter_class {
extern counter_class lbl_80430CD8;
extern "C" {
void cCt_Counter(int resetCounter1) {
if (resetCounter1 == 1) {
lbl_80430CD8.mCounter1 = 0;
@@ -19,4 +18,4 @@ void cCt_Counter(int resetCounter1) {
lbl_80430CD8.mCounter0++;
}
};
};
+12
View File
@@ -3,6 +3,18 @@
#include "SComponent/c_lib.h"
#include "SComponent/c_math.h"
extern "C" {
int abs(int);
void __eq__4cXyzCFRC3Vec(void);
void __mi__4cXyzCFRC3Vec(void);
void __ml__4cXyzCFf(void);
void __ne__4cXyzCFRC3Vec(void);
void cM_atan2s__Fff(void);
void memcpy(void*, const void*, int);
void normZP__4cXyzCFv(void);
void* memset(void* dest, int ch, u32 count);
}
// cLib_memCpy__FPvPCvUl
// cLib_memCpy(void*, const void*, unsigned long)
void cLib_memCpy(void* dst, const void* src, unsigned long size) {
-1
View File
@@ -3,7 +3,6 @@
#include "global.h"
extern "C" {
void cLs_Init(node_list_class* pList) {
pList->mpHead = NULL;
pList->mpTail = NULL;
-1
View File
@@ -3,7 +3,6 @@
#include "global.h"
extern "C" {
int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData) {
if (pList->mSize > 0)
return cNdIt_Method(pList->mpHead, pMethod, pUserData);
+47
View File
@@ -59,6 +59,53 @@ extern u8 lbl_80455154;
extern u8 lbl_804551B0;
extern u8 lbl_80455160;
extern "C" {
void __ct__8cM3dGLinFRC4cXyzRC4cXyz(void);
void CalcPos__8cM3dGLinCFP3Vecf(void);
void cM_atan2s__Fff(void);
void cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin(void);
void cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec(void);
void cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf(void);
void cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec(void);
void cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec(void);
void cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec(void);
void cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec(void);
void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf(void);
void cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb(void);
void cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec(void);
void cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec(void);
void cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb(void);
void cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec(void);
void cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec(void);
void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf(void);
void cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec(void);
void cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec(void);
void cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec(void);
void cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec(void);
void cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf(void);
void cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec(void);
void cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec(void);
void cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf(void);
void cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf(void);
void cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf(void);
void cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec(void);
void cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec(void);
void cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf(void);
void cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff(void);
void cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf(void);
void cM3d_InDivPos1__FPC3VecPC3VecfP3Vec(void);
void cM3d_InDivPos2__FPC3VecPC3VecfP3Vec(void);
void cM3d_Len2dSq__Fffff(void);
void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(void);
void cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec(void);
void cM3d_PlaneCrossLineProcWork__FfffffffPfPf(void);
void cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec(void);
void cM3d_VectorProduct2d__Fffffff(void);
void SetC__8cM3dGSphFRC4cXyz(void);
void SetR__8cM3dGSphFf(void);
void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void);
}
// cM3d_InDivPos1__FPC3VecPC3VecfP3Vec
void cM3d_InDivPos1(const Vec* pVecA, const Vec* pVecB, f32 pF, Vec* pOut) {
Vec tmp;
+6
View File
@@ -4,6 +4,12 @@
// additional symbols needed for c_m3d_g_aab.cpp
// autogenerated by split.py v0.3 at 2021-01-01 14:25:53.390342
extern "C" {
void SetMax__8cM3dGAabFRC4cXyz(void);
void SetMin__8cM3dGAabFRC4cXyz(void);
void SetMinMax__8cM3dGAabFRC4cXyz(void);
}
extern f32 lbl_804551D4;
extern f32 lbl_804551D0;
extern f32 lbl_804551D8;
+4
View File
@@ -2,6 +2,10 @@
#include "SComponent/c_m3d_g_cir.h"
extern "C" {
void __dl__FPv(void);
}
// __ct__8cM3dGCirFv
cM3dGCir::cM3dGCir(void) {}
+7
View File
@@ -2,6 +2,13 @@
#include "SComponent/c_m3d_g_cps.h"
extern "C" {
void __dl__FPv(void);
void Set__8cM3dGCpsFRC4cXyzRC4cXyzf(void);
void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void);
void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(void);
}
// __ct__8cM3dGCpsFv
cM3dGCps::cM3dGCps(void) {}
+8
View File
@@ -3,6 +3,14 @@
#include "SComponent/c_m3d_g_cyl.h"
#include "SComponent/c_m3d.h"
extern "C" {
void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec(void);
void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf(void);
void SetC__8cM3dGCylFRC4cXyz(void);
void SetH__8cM3dGCylFf(void);
void SetR__8cM3dGCylFf(void);
}
// __ct__8cM3dGCylFPC4cXyzff
cM3dGCyl::cM3dGCyl(const cXyz* pCenter, f32 pRadius, f32 pHeight) {
this->SetC(*pCenter);
+4
View File
@@ -3,6 +3,10 @@
#include "SComponent/c_m3d_g_pla.h"
#include "SComponent/c_m3d.h"
extern "C" {
void cM3d_InDivPos2__FPC3VecPC3VecfP3Vec(void);
}
// __ct__8cM3dGPlaFPC4cXyzf
cM3dGPla::cM3dGPla(const cXyz* pNormal, f32 pD) : mNormal(*pNormal), mD(pD) {}

Some files were not shown because too many files have changed in this diff Show More