mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-21 22:41:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

move d_a_itembase_static / d_a_item_static / Z2StatusMgr (#123)

Browse Source 
* move d_a_itembase_static

* move d_a_item_static

* moved Z2StatusMgr

* clang

* fixes

* clang?

* move d_save

* move d_meter2_info

* some d_meter2_info fixes

* move most d_a_player

* move d_bg_s stuff

* move c_cc_s stuff

* move d_cc stuff

* move d_attention / d_event / d_stage
This commit is contained in:
TakaRikka
2021-05-02 10:13:14 -07:00
committed by GitHub
parent a9c78b5b0b
commit 2f4904dae2
234 changed files with 5861 additions and 6762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SSystem/SComponent/c_angle.cpp
+18
View File
@@ -9,6 +9,8 @@
#include "msl_c/math.h"
extern f32 cM_atan2f(f32, f32);
extern "C" void Xyz__7cSGlobeCFv();
extern "C" void __ct__7cSGlobeFfRC7cSAngleRC7cSAngle();
//
// Declarations:
@@ -340,11 +342,27 @@ void cSGlobe::Polar(cSPolar* csp) const {
csp->Val(mRadius, 0x4000 - mAzimuth.Val(), mInclination.Val());
}
/* ############################################################################################## */
/* 8045523C-80455240 00383C 0004+00 1/1 0/0 0/0 .sdata2 @2744 */
SECTION_SDATA2 static f32 lit_2744 = 1.0f;
/* 80271B30-80271B7C 004C+00 s=0 e=3 z=0 None .text Norm__7cSGlobeCFv */
// adding the dtor to class members made this stop matching, idk why
#ifdef NONMATCHING
cXyz cSGlobe::Norm(void) const {
cSGlobe glob(1.0f, mAzimuth, mInclination);
return glob.Xyz();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cXyz cSGlobe::Norm() const {
nofralloc
#include "asm/SSystem/SComponent/c_angle/Norm__7cSGlobeCFv.s"
}
#pragma pop
#endif
/* 80271B7C-80271BA8 002C+00 s=0 e=2 z=0 None .text Invert__7cSGlobeFv */
cSGlobe& cSGlobe::Invert(void) {
libs/SSystem/SComponent/c_cc_d.cpp
-215
View File
@@ -7,215 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct cXyz {
/* 80009184 */ ~cXyz();
static f32 Zero[3];
};
struct Vec {};
struct cM3dGCyl;
struct cM3dGSph {
/* 8026F710 */ void cross(cM3dGSph const*, cXyz*) const;
/* 8026F73C */ void cross(cM3dGCyl const*, cXyz*) const;
};
struct cM3dGCyl {
/* 8026F208 */ void cross(cM3dGSph const*, cXyz*) const;
/* 8026F22C */ void cross(cM3dGCyl const*, cXyz*) const;
};
struct cM3dGTri {
/* 8026F7B0 */ void cross(cM3dGCyl const*, Vec*) const;
};
struct cM3dGCps {};
struct cM3dGAab {
/* 8026EC54 */ void Set(cXyz const*, cXyz const*);
/* 8026ECF8 */ void ClearForMinMax();
/* 8026ED1C */ void SetMinMax(cXyz const&);
/* 8026EE68 */ void PlusR(f32);
};
struct cCcD_ShapeAttr {
struct Shape {};
/* 80084E38 */ void GetCoCP() const;
/* 80084E2C */ void GetCoCP();
/* 8008556C */ ~cCcD_ShapeAttr();
/* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
/* 802649D8 */ bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 802649E0 */ bool CrossCo(cCcD_ShapeAttr const&, f32*) const;
static f32 m_virtual_center[3];
};
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();
/* 8026420C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 802641C8 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084CC8 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80264250 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084CD0 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084CD8 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 8026417C */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80264288 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80264310 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084D10 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084D18 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084D20 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084D28 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 802642CC */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 800854E0 */ ~cCcD_CylAttr();
/* 80264368 */ void CalcAabBox();
/* 802643D0 */ void GetNVec(cXyz const&, cXyz*) const;
/* 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();
/* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 8008721C */ ~cCcD_SphAttr();
/* 802646E0 */ void CalcAabBox();
/* 8026476C */ void GetNVec(cXyz const&, cXyz*) const;
/* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_TriAttr {
/* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80263BCC */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084E4C */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80263B90 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084E54 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263B58 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084E9C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084EBC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80084EA4 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084E8C */ bool CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80084EAC */ bool CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084E94 */ bool CrossCo(cCcD_CylAttr const&, f32*) const;
/* 80084EB4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80263C04 */ void CalcAabBox();
/* 80263C9C */ void GetNVec(cXyz const&, cXyz*) const;
/* 80264938 */ ~cCcD_TriAttr();
};
struct cCcD_Stts {
/* 801410A4 */ ~cCcD_Stts();
/* 80263894 */ bool GetGStts() const;
/* 8026389C */ bool GetGStts();
/* 802638A4 */ void Init(int, int, void*, unsigned int);
/* 80263904 */ void Ct();
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 8026395C */ void ClrCcMove();
/* 80263970 */ void PlusDmg(int);
/* 80263984 */ void GetWeightF() const;
/* 802649E8 */ void ClrAt();
/* 802649EC */ void ClrTg();
};
struct cCcD_SrcObjTg {};
struct cCcD_SrcObjHitInf {};
struct cCcD_SrcObjAt {};
struct cCcD_SrcObj {};
struct cCcD_Obj {
/* 80263A10 */ void ct();
/* 80263A1C */ void Set(cCcD_SrcObj const&);
/* 80263A48 */ void GetAc();
};
struct cCcD_ObjTg {
/* 80264880 */ void Set(cCcD_SrcObjTg const&);
/* 80264894 */ void SetGrp(u32);
/* 802648B0 */ void ClrHit();
/* 802648C8 */ void SetHit(cCcD_Obj*);
};
struct cCcD_ObjHitInf {
/* 802639C4 */ void Set(cCcD_SrcObjHitInf const&);
};
struct cCcD_ObjCommonBase {
/* 802639B0 */ void ct();
};
struct cCcD_ObjCo {
/* 802648D8 */ void SetHit(cCcD_Obj*);
/* 802648E8 */ void ClrHit();
/* 80264900 */ void SetIGrp(u32);
/* 8026491C */ void SetVsGrp(u32);
};
struct cCcD_ObjAt {
/* 8026483C */ void SetHit(cCcD_Obj*);
/* 8026484C */ void Set(cCcD_SrcObjAt const&);
/* 80264868 */ void ClrHit();
};
struct cCcD_DivideInfo {
/* 80263358 */ void Set(u32, u32, u32);
/* 80263368 */ void Chk(cCcD_DivideInfo const&) const;
};
struct cCcD_DivideArea {
/* 802633A8 */ void SetArea(cM3dGAab const&);
/* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
/* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&);
};
//
// Forward References:
//
@@ -365,12 +156,6 @@ extern "C" void cross__8cM3dGSphCFPC8cM3dGSphP4cXyz();
extern "C" void cross__8cM3dGSphCFPC8cM3dGCylP4cXyz();
extern "C" void cross__8cM3dGTriCFPC8cM3dGCylP3Vec();
extern "C" void __dl__FPv();
extern "C" void PSVECAdd();
extern "C" void PSVECSubtract();
extern "C" void PSVECScale();
extern "C" void PSVECNormalize();
extern "C" void PSVECMag();
extern "C" void PSVECDotProduct();
extern "C" void __register_global_object();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
libs/SSystem/SComponent/c_cc_s.cpp
-89
View File
@@ -7,91 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct cM3dGAab {
/* 8026ECF8 */ void ClearForMinMax();
/* 8026ED60 */ void SetMinMax(cM3dGAab const&);
/* 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();
/* 80263970 */ void PlusDmg(int);
/* 80263984 */ void GetWeightF() const;
};
struct cCcS {
/* 80030BDC */ ~cCcS();
/* 80264A6C */ cCcS();
/* 80264A94 */ void Ct();
/* 80264B60 */ void Dt();
/* 80264B80 */ void GetWt(u8) const;
/* 80264BA8 */ void Set(cCcD_Obj*);
/* 80264C5C */ void ClrCoHitInf();
/* 80264CF0 */ void ClrTgHitInf();
/* 80264D90 */ void ClrAtHitInf();
/* 80264E2C */ void ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*);
/* 80264F40 */ void ChkAtTg();
/* 8026515C */ void ChkNoHitCo(cCcD_Obj*, cCcD_Obj*);
/* 80265230 */ void ChkCo();
/* 802653A0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
/* 802653C8 */ void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*);
/* 802655E4 */ void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
/* 80265750 */ void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
/* 80265BB4 */ void CalcArea();
/* 80265CCC */ void Move();
/* 80265D30 */ void DrawClear();
/* 80265DF4 */ void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
/* 80265DF8 */ void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
/* 80265DFC */ void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*,
cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*,
cCcD_GStts*, cXyz*);
/* 80265E00 */ bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*,
cCcD_GStts*);
/* 80265E08 */ bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*,
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
/* 80265E10 */ bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
/* 80265E18 */ void MoveAfterCheck();
};
struct cCcD_ObjTg {
/* 802648C8 */ void SetHit(cCcD_Obj*);
};
struct cCcD_ObjCo {
/* 802648D8 */ void SetHit(cCcD_Obj*);
};
struct cCcD_ObjAt {
/* 8026483C */ void SetHit(cCcD_Obj*);
};
struct cCcD_DivideInfo {
/* 80263368 */ void Chk(cCcD_DivideInfo const&) const;
};
struct cCcD_DivideArea {
/* 802633A8 */ void SetArea(cM3dGAab const&);
/* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
};
//
// Forward References:
//
@@ -146,10 +61,6 @@ extern "C" void SetHit__10cCcD_ObjCoFP8cCcD_Obj();
extern "C" void ClearForMinMax__8cM3dGAabFv();
extern "C" void SetMinMax__8cM3dGAabFRC8cM3dGAab();
extern "C" void CalcCenter__8cM3dGAabCFP4cXyz();
extern "C" void PSVECAdd();
extern "C" void PSVECSubtract();
extern "C" void PSVECScale();
extern "C" void PSVECMag();
extern "C" void __register_global_object();
extern "C" void _savegpr_21();
extern "C" void _savegpr_22();