mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 12:24:45 -04:00
move d_a_itembase_static / d_a_item_static / Z2StatusMgr (#123)
* 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
@@ -7,313 +7,6 @@
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct fopAc_ac_c {};
|
||||
|
||||
struct dCcD_SrcTri {};
|
||||
|
||||
struct dCcD_Tri {
|
||||
/* 80084884 */ void Set(dCcD_SrcTri const&);
|
||||
/* 800848A4 */ void GetShapeAttr();
|
||||
/* 80084EF4 */ ~dCcD_Tri();
|
||||
};
|
||||
|
||||
struct dCcD_Stts {
|
||||
/* 80083850 */ void GetGStts();
|
||||
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
|
||||
/* 800838F4 */ void Ct();
|
||||
/* 80083928 */ void ClrAt();
|
||||
/* 80083934 */ void ClrTg();
|
||||
/* 800851AC */ ~dCcD_Stts();
|
||||
};
|
||||
|
||||
struct dCcD_SrcSph {};
|
||||
|
||||
struct dCcD_SrcGObjTg {};
|
||||
|
||||
struct dCcD_SrcGObjInf {};
|
||||
|
||||
struct dCcD_SrcGObjAt {};
|
||||
|
||||
struct dCcD_SrcGAtTgCoCommonBase {};
|
||||
|
||||
struct dCcD_SrcCyl {};
|
||||
|
||||
struct dCcD_SrcCps {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct cXyz {
|
||||
/* 80266B34 */ void operator-(Vec const&) const;
|
||||
|
||||
static f32 Zero[3];
|
||||
};
|
||||
|
||||
struct dCcD_Sph {
|
||||
/* 80084A34 */ void Set(dCcD_SrcSph const&);
|
||||
/* 80084A78 */ void StartCAt(cXyz&);
|
||||
/* 80084AC4 */ void MoveCAt(cXyz&);
|
||||
/* 80084B34 */ void GetShapeAttr();
|
||||
/* 80084BF4 */ ~dCcD_Sph();
|
||||
};
|
||||
|
||||
struct dCcD_GStts {
|
||||
/* 80083760 */ dCcD_GStts();
|
||||
/* 800837F8 */ void Ct();
|
||||
/* 80083830 */ void Move();
|
||||
/* 8008523C */ ~dCcD_GStts();
|
||||
};
|
||||
|
||||
struct dCcD_GObjTg {
|
||||
/* 800839A0 */ void Set(dCcD_SrcGObjTg const&);
|
||||
/* 80083BE8 */ ~dCcD_GObjTg();
|
||||
};
|
||||
|
||||
struct dCcD_GObjInf {
|
||||
/* 80083A28 */ dCcD_GObjInf();
|
||||
/* 800840E4 */ ~dCcD_GObjInf();
|
||||
/* 80084268 */ void GetGObjInf();
|
||||
/* 8008426C */ void ClrAtHit();
|
||||
/* 800842C0 */ void ChkAtHit();
|
||||
/* 80084318 */ void ResetAtHit();
|
||||
/* 80084358 */ void GetAtHitObj();
|
||||
/* 800843A8 */ void GetAtHitGObj();
|
||||
/* 800843DC */ void ChkAtNoGuard();
|
||||
/* 800843FC */ void ClrTgHit();
|
||||
/* 80084460 */ void ChkTgHit();
|
||||
/* 800844B8 */ void ResetTgHit();
|
||||
/* 800844F8 */ void GetTgHitObj();
|
||||
/* 80084548 */ void GetTgHitGObj();
|
||||
/* 8008457C */ void GetTgHitObjSe();
|
||||
/* 800845B0 */ void getHitSeID(u8, int);
|
||||
/* 8008460C */ void ClrCoHit();
|
||||
/* 80084658 */ void ChkCoHit();
|
||||
/* 800846B0 */ void ResetCoHit();
|
||||
/* 800846F0 */ void GetCoHitObj();
|
||||
/* 80084740 */ void Set(dCcD_SrcGObjInf const&);
|
||||
|
||||
static u8 const m_hitSeID[96];
|
||||
};
|
||||
|
||||
struct dCcD_GObjCo {
|
||||
/* 80083B8C */ ~dCcD_GObjCo();
|
||||
};
|
||||
|
||||
struct dCcD_GObjAt {
|
||||
/* 80083944 */ void Set(dCcD_SrcGObjAt const&);
|
||||
/* 80083C44 */ ~dCcD_GObjAt();
|
||||
};
|
||||
|
||||
struct dCcD_GAtTgCoCommonBase {
|
||||
/* 8008364C */ void ClrActorInfo();
|
||||
/* 80083660 */ void ct();
|
||||
/* 80083678 */ void SetHitApid(unsigned int);
|
||||
/* 80083688 */ void GetAc();
|
||||
/* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&);
|
||||
/* 80083718 */ void SetEffCounterTimer();
|
||||
/* 80083724 */ void SubtractEffCounter();
|
||||
/* 80083748 */ void ChkEffCounter();
|
||||
/* 80083CA0 */ ~dCcD_GAtTgCoCommonBase();
|
||||
};
|
||||
|
||||
struct dCcD_Cyl {
|
||||
/* 800848B4 */ void Set(dCcD_SrcCyl const&);
|
||||
/* 800848F8 */ void GetShapeAttr();
|
||||
/* 80084908 */ void StartCAt(cXyz&);
|
||||
/* 80084954 */ void MoveCAt(cXyz&);
|
||||
/* 800849C4 */ void MoveCTg(cXyz&);
|
||||
/* 80084D60 */ ~dCcD_Cyl();
|
||||
};
|
||||
|
||||
struct dCcD_Cps {
|
||||
/* 800847D0 */ void Set(dCcD_SrcCps const&);
|
||||
/* 80084814 */ void GetShapeAttr();
|
||||
/* 80084824 */ void CalcAtVec();
|
||||
/* 80084854 */ void CalcTgVec();
|
||||
/* 8008506C */ ~dCcD_Cps();
|
||||
};
|
||||
|
||||
struct cM3dGSphS {};
|
||||
|
||||
struct cM3dGSph {
|
||||
/* 8026F648 */ void SetC(cXyz const&);
|
||||
/* 8026F6A8 */ void Set(cM3dGSphS const&);
|
||||
};
|
||||
|
||||
struct cM3dGCylS {};
|
||||
|
||||
struct cM3dGCyl {
|
||||
/* 8026F114 */ void Set(cM3dGCylS const&);
|
||||
/* 8026F1DC */ void SetC(cXyz const&);
|
||||
};
|
||||
|
||||
struct cM3dGCpsS {};
|
||||
|
||||
struct cM3dGCps {
|
||||
/* 8026EFA4 */ ~cM3dGCps();
|
||||
/* 8026F03C */ void Set(cM3dGCpsS const&);
|
||||
};
|
||||
|
||||
struct cCcD_ShapeAttr {
|
||||
struct Shape {};
|
||||
|
||||
/* 80084E38 */ void GetCoCP() const;
|
||||
/* 80084E2C */ void GetCoCP();
|
||||
/* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
|
||||
|
||||
static f32 m_virtual_center[3];
|
||||
};
|
||||
|
||||
struct cCcD_TriAttr;
|
||||
struct cCcD_PntAttr {};
|
||||
|
||||
struct cCcD_AabAttr {};
|
||||
|
||||
struct cCcD_SphAttr;
|
||||
struct cCcD_CpsAttr;
|
||||
struct cCcD_CylAttr {
|
||||
/* 80084CC0 */ void GetCoCP() const;
|
||||
/* 80037A4C */ void GetCoCP();
|
||||
/* 8026420C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
|
||||
/* 80084CC8 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
|
||||
/* 802641C8 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
|
||||
/* 80084CD0 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
|
||||
/* 80264250 */ void CrossAtTg(cCcD_TriAttr 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;
|
||||
/* 80084D10 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
|
||||
/* 80264310 */ void CrossCo(cCcD_CpsAttr 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;
|
||||
/* 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;
|
||||
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
|
||||
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
|
||||
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
|
||||
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
|
||||
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
|
||||
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
|
||||
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
|
||||
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
|
||||
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
|
||||
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
|
||||
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
|
||||
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
|
||||
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
|
||||
/* 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;
|
||||
/* 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;
|
||||
/* 80084E4C */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
|
||||
/* 80263BCC */ void CrossAtTg(cCcD_TriAttr 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;
|
||||
/* 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;
|
||||
/* 80084E9C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
|
||||
/* 80263C04 */ void CalcAabBox();
|
||||
/* 80263C9C */ void GetNVec(cXyz const&, cXyz*) const;
|
||||
};
|
||||
|
||||
struct cCcD_Stts {
|
||||
/* 80263894 */ bool GetGStts() const;
|
||||
/* 802638A4 */ void Init(int, int, void*, unsigned int);
|
||||
/* 80263904 */ void Ct();
|
||||
};
|
||||
|
||||
struct cCcD_SrcObj {};
|
||||
|
||||
struct cCcD_ObjTg {
|
||||
/* 80083FE4 */ ~cCcD_ObjTg();
|
||||
/* 802648B0 */ void ClrHit();
|
||||
};
|
||||
|
||||
struct cCcD_ObjHitInf {
|
||||
/* 80083EC8 */ ~cCcD_ObjHitInf();
|
||||
};
|
||||
|
||||
struct cCcD_ObjCommonBase {
|
||||
/* 8008409C */ ~cCcD_ObjCommonBase();
|
||||
/* 802639B0 */ void ct();
|
||||
};
|
||||
|
||||
struct cCcD_ObjCo {
|
||||
/* 80083F88 */ ~cCcD_ObjCo();
|
||||
/* 802648E8 */ void ClrHit();
|
||||
};
|
||||
|
||||
struct cCcD_ObjAt {
|
||||
/* 80084040 */ ~cCcD_ObjAt();
|
||||
/* 80264868 */ void ClrHit();
|
||||
};
|
||||
|
||||
struct _GXColor {};
|
||||
|
||||
struct cCcD_Obj {
|
||||
/* 80083DE0 */ ~cCcD_Obj();
|
||||
/* 800851A4 */ bool GetGObjInf() const;
|
||||
/* 800847C8 */ bool GetGObjInf();
|
||||
/* 80084BE8 */ bool GetShapeAttr() const;
|
||||
/* 80085130 */ bool GetShapeAttr();
|
||||
/* 80084BF0 */ void Draw(_GXColor const&);
|
||||
/* 80263A10 */ void ct();
|
||||
/* 80263A1C */ void Set(cCcD_SrcObj const&);
|
||||
};
|
||||
|
||||
struct cCcD_GStts {
|
||||
/* 800837B0 */ ~cCcD_GStts();
|
||||
};
|
||||
|
||||
struct cCcD_GObjInf {
|
||||
/* 80083CE8 */ ~cCcD_GObjInf();
|
||||
/* 800851A0 */ void GetGObjInf();
|
||||
/* 80084BE4 */ void GetGObjInf() const;
|
||||
/* 80085138 */ void ClrAtHit();
|
||||
/* 80085158 */ void ClrTgHit();
|
||||
/* 8008517C */ void ClrCoHit();
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
@@ -508,7 +201,6 @@ extern "C" void SetC__8cM3dGCylFRC4cXyz();
|
||||
extern "C" void SetC__8cM3dGSphFRC4cXyz();
|
||||
extern "C" void Set__8cM3dGSphFRC9cM3dGSphS();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void PSVECSubtract();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* __vt__8cM3dGPla[3];
|
||||
|
||||
Reference in New Issue
Block a user