moved strings + decompile simple store functions

This commit is contained in:
Julgodis
2021-04-10 07:02:38 +02:00
parent 2661db6aaa
commit 0ad6ebe7b4
1299 changed files with 51830 additions and 43634 deletions
+7 -12
View File
@@ -86,7 +86,7 @@ struct cAngle {
template <typename A1>
void Adjust(/* ... */);
/* 80271BA8 */ /* cAngle::Adjust<f32> */
void func_80271BA8(f32, f32, f32);
void func_80271BA8(void* _this, f32, f32, f32);
};
//
@@ -144,7 +144,7 @@ extern "C" void Xyz__7cSGlobeCFv();
extern "C" void Polar__7cSGlobeCFP7cSPolar();
extern "C" void Norm__7cSGlobeCFv();
extern "C" void Invert__7cSGlobeFv();
extern "C" void func_80271BA8(f32, f32, f32);
extern "C" void func_80271BA8(void* _this, f32, f32, f32);
extern "C" void __sinit_c_angle_cpp();
extern "C" u8 _0__7cSAngle[2 + 2 /* padding */];
extern "C" u8 _1__7cSAngle[2 + 2 /* padding */];
@@ -208,15 +208,10 @@ asm void cSAngle::Val(cSAngle const& param_0) {
}
#pragma pop
/* 80271004-8027100C 26B944 0008+00 4/4 7/7 0/0 .text Val__7cSAngleFs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cSAngle::Val(s16 param_0) {
nofralloc
#include "asm/SSystem/SComponent/c_angle/Val__7cSAngleFs.s"
/* 80271004-8027100C -00001 0008+00 0/0 0/0 0/0 .text Val__7cSAngleFs */
void cSAngle::Val(s16 param_0) {
*(u16*)this = (u16)(param_0);
}
#pragma pop
/* ############################################################################################## */
/* 80455208-8045520C 003808 0004+00 1/1 0/0 0/0 .sdata2 @2248 */
@@ -734,7 +729,7 @@ asm void cSGlobe::Invert() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_80271BA8(f32 param_0, f32 param_1, f32 param_2) {
extern "C" asm void func_80271BA8(void* _this, f32 param_0, f32 param_1, f32 param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_angle/func_80271BA8.s"
}
@@ -795,5 +790,5 @@ asm void __sinit_c_angle_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80271BD4 = (void*)__sinit_c_angle_cpp;
REGISTER_CTORS(0x80271BD4, __sinit_c_angle_cpp);
#pragma pop
+3 -9
View File
@@ -129,16 +129,10 @@ asm void cBgS_PolyInfo::ChkSafe(void const* param_0, unsigned int param_1) const
}
#pragma pop
/* 802681A4-802681AC 262AE4 0008+00 0/0 11/11 0/0 .text SetPolyIndex__13cBgS_PolyInfoFi
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_PolyInfo::SetPolyIndex(int param_0) {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_poly_info/SetPolyIndex__13cBgS_PolyInfoFi.s"
/* 802681A4-802681AC -00001 0008+00 0/0 0/0 0/0 .text SetPolyIndex__13cBgS_PolyInfoFi */
void cBgS_PolyInfo::SetPolyIndex(int param_0) {
*(u16*)this = (u16)(param_0);
}
#pragma pop
/* 802681AC-802681C0 262AEC 0014+00 0/0 3/3 0/0 .text ChkBgIndex__13cBgS_PolyInfoCFv */
#pragma push
+4 -9
View File
@@ -97,14 +97,9 @@ asm void cBgS_ShdwDraw::Set(cXyz& param_0, cXyz& param_1) {
}
#pragma pop
/* 8026806C-80268074 2629AC 0008+00 0/0 1/1 0/0 .text
/* 8026806C-80268074 -00001 0008+00 0/0 0/0 0/0 .text
* SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_ShdwDraw::SetCallback(int (*)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int,
cM3dGPla*)) {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i.s"
void cBgS_ShdwDraw::SetCallback(int (*param_0)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int,
cM3dGPla*)) {
*(u32*)(((u8*)this) + 48) /* this->field_0x30 */ = (u32)(param_0);
}
#pragma pop
+3 -8
View File
@@ -36,15 +36,10 @@ extern "C" void cBgW_CheckBWall__Ff();
// Declarations:
//
/* 802681C0-802681C8 262B00 0008+00 0/0 1/1 0/0 .text Regist__9cBgW_BgIdFi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgW_BgId::Regist(int param_0) {
nofralloc
#include "asm/SSystem/SComponent/c_bg_w/Regist__9cBgW_BgIdFi.s"
/* 802681C0-802681C8 -00001 0008+00 0/0 0/0 0/0 .text Regist__9cBgW_BgIdFi */
void cBgW_BgId::Regist(int param_0) {
*(u16*)this = (u16)(param_0);
}
#pragma pop
/* 802681C8-802681D4 262B08 000C+00 0/0 2/2 0/0 .text Release__9cBgW_BgIdFv */
#pragma push
+26 -26
View File
@@ -43,7 +43,6 @@ struct cM3dGAab {
/* 8026EE68 */ void PlusR(f32);
};
struct cCcD_TriAttr;
struct cCcD_ShapeAttr {
struct Shape {};
@@ -57,12 +56,13 @@ struct cCcD_ShapeAttr {
static f32 m_virtual_center[3];
};
struct cCcD_AabAttr {};
struct cCcD_CpsAttr;
struct cCcD_TriAttr;
struct cCcD_SphAttr;
struct cCcD_PntAttr {};
struct cCcD_AabAttr {};
struct cCcD_CpsAttr;
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
@@ -86,6 +86,26 @@ struct cCcD_CylAttr {
/* 802644B8 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80085450 */ ~cCcD_CpsAttr();
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_SphAttr {
/* 80084B44 */ void GetCoCP() const;
/* 80037A54 */ void GetCoCP();
@@ -109,26 +129,6 @@ struct cCcD_SphAttr {
/* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80085450 */ ~cCcD_CpsAttr();
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_TriAttr {
/* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
@@ -436,7 +436,7 @@ SECTION_RODATA static u8 const l_base[128] = {
0x01, 0xFF, 0xFF, 0xFF, 0x03, 0xFF, 0xFF, 0xFF, 0x07, 0xFF, 0xFF, 0xFF, 0x0F, 0xFF, 0xFF, 0xFF,
0x1F, 0xFF, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
COMPILER_STRIP_GATE(8039A7E8, &l_base);
COMPILER_STRIP_GATE(0x8039A7E8, &l_base);
/* 802634D4-802636A0 25DE14 01CC+00 0/0 2/2 0/0 .text
* CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl */
@@ -1303,7 +1303,7 @@ asm void __sinit_c_cc_d_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802649F8 = (void*)__sinit_c_cc_d_cpp;
REGISTER_CTORS(0x802649F8, __sinit_c_cc_d_cpp);
#pragma pop
/* 80264A4C-80264A54 25F38C 0008+00 1/0 0/0 0/0 .text @32@__dt__12cCcD_TriAttrFv */
+6 -6
View File
@@ -21,8 +21,14 @@ struct cM3dGAab {
/* 8026EE24 */ void CalcCenter(cXyz*) const;
};
struct cCcD_GStts {};
struct cCcD_GObjInf {};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 8026395C */ void ClrCcMove();
@@ -30,12 +36,6 @@ struct cCcD_Stts {
/* 80263984 */ void GetWeightF() const;
};
struct cCcD_GStts {};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcS {
/* 80030BDC */ ~cCcS();
/* 80264A6C */ cCcS();
+3 -2
View File
@@ -38,7 +38,7 @@ extern "C" void cNdIt_Judge__FP10node_classPFP10node_classPv_PvPv();
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cLsIt_Method(node_list_class* param_0, int (*)(node_class*, void*), void* param_2) {
asm void cLsIt_Method(node_list_class* param_0, int (*param_1)(node_class*, void*), void* param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_list_iter/cLsIt_Method__FP15node_list_classPFP10node_classPv_iPv.s"
}
@@ -49,7 +49,8 @@ asm void cLsIt_Method(node_list_class* param_0, int (*)(node_class*, void*), voi
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cLsIt_Judge(node_list_class* param_0, void* (*)(node_class*, void*), void* param_2) {
asm void cLsIt_Judge(node_list_class* param_0, void* (*param_1)(node_class*, void*),
void* param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_list_iter/cLsIt_Judge__FP15node_list_classPFP10node_classPv_PvPv.s"
}
+1 -1
View File
@@ -1027,5 +1027,5 @@ asm void __sinit_c_m3d_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8026EC3C = (void*)__sinit_c_m3d_cpp;
REGISTER_CTORS(0x8026EC3C, __sinit_c_m3d_cpp);
#pragma pop
+2 -2
View File
@@ -13,13 +13,13 @@
struct Vec {};
struct cM3dGCyl {};
struct cM3dGPla {
/* 8026F52C */ void SetupNP(Vec const&, Vec const&);
/* 8026F624 */ void Set(cM3dGPla const*);
};
struct cM3dGCyl {};
struct cM3dGTri {
/* 8026F7B0 */ void cross(cM3dGCyl const*, Vec*) const;
/* 8026F7DC */ void setPos(Vec const*, Vec const*, Vec const*);
+2 -2
View File
@@ -38,7 +38,7 @@ extern "C" void _restgpr_29();
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cNdIt_Method(node_class* param_0, int (*)(node_class*, void*), void* param_2) {
asm void cNdIt_Method(node_class* param_0, int (*param_1)(node_class*, void*), void* param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_node_iter/cNdIt_Method__FP10node_classPFP10node_classPv_iPv.s"
}
@@ -49,7 +49,7 @@ asm void cNdIt_Method(node_class* param_0, int (*)(node_class*, void*), void* pa
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cNdIt_Judge(node_class* param_0, void* (*)(node_class*, void*), void* param_2) {
asm void cNdIt_Judge(node_class* param_0, void* (*param_1)(node_class*, void*), void* param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_node_iter/cNdIt_Judge__FP10node_classPFP10node_classPv_PvPv.s"
}
+3 -2
View File
@@ -49,7 +49,7 @@ asm void cPhs_Reset(request_of_phase_process_class* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cPhs_Set(request_of_phase_process_class* param_0, int (**)(void*)) {
asm void cPhs_Set(request_of_phase_process_class* param_0, int (**param_1)(void*)) {
nofralloc
#include "asm/SSystem/SComponent/c_phase/cPhs_Set__FP30request_of_phase_process_classPPFPv_i.s"
}
@@ -104,7 +104,8 @@ asm void cPhs_Do(request_of_phase_process_class* param_0, void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cPhs_Handler(request_of_phase_process_class* param_0, int (**)(void*), void* param_2) {
asm void cPhs_Handler(request_of_phase_process_class* param_0, int (**param_1)(void*),
void* param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_phase/cPhs_Handler__FP30request_of_phase_process_classPPFPv_iPv.s"
}
+1 -1
View File
@@ -122,5 +122,5 @@ asm void __sinit_c_sxyz_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8026758C = (void*)__sinit_c_sxyz_cpp;
REGISTER_CTORS(0x8026758C, __sinit_c_sxyz_cpp);
#pragma pop
+4 -2
View File
@@ -44,7 +44,8 @@ extern "C" void _restgpr_28();
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cTrIt_Method(node_lists_tree_class* param_0, int (*)(node_class*, void*), void* param_2) {
asm void cTrIt_Method(node_lists_tree_class* param_0, int (*param_1)(node_class*, void*),
void* param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_tree_iter/cTrIt_Method__FP21node_lists_tree_classPFP10node_classPv_iPv.s"
}
@@ -55,7 +56,8 @@ asm void cTrIt_Method(node_lists_tree_class* param_0, int (*)(node_class*, void*
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cTrIt_Judge(node_lists_tree_class* param_0, void* (*)(node_class*, void*), void* param_2) {
asm void cTrIt_Judge(node_lists_tree_class* param_0, void* (*param_1)(node_class*, void*),
void* param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_tree_iter/cTrIt_Judge__FP21node_lists_tree_classPFP10node_classPv_PvPv.s"
}
+2 -2
View File
@@ -221,7 +221,7 @@ SECTION_RODATA static u8 const lit_2299[12 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(8039A868, &lit_2299);
COMPILER_STRIP_GATE(0x8039A868, &lit_2299);
/* 80455078-8045507C 003678 0004+00 1/1 0/0 0/0 .sdata2 @2325 */
SECTION_SDATA2 static f32 lit_2325 = 1.25f;
@@ -431,5 +431,5 @@ asm void __sinit_c_xyz_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80267290 = (void*)__sinit_c_xyz_cpp;
REGISTER_CTORS(0x80267290, __sinit_c_xyz_cpp);
#pragma pop