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

__sinit_d_com_inf_game_cpp OK (#140)

Browse Source 
* mass mng header

* d_cc_d start

* c_cc_d ok

* tmp commit

* almost, reordering of vtable functions

* progress

* more progress

* cleanup, still non matching

* mark all of d_cc_d as nonmatching to OK

* c_cc_s

* c_cc_s OK

* d_cc_mass_s OK

* cleanup

* gameinfo __sinit, not OK

* a bit of cleanup

* format

* remove asm

Co-authored-by: lepelog <lepelog@users.noreply.github.com>
This commit is contained in:
lepelog
2021-08-17 02:59:00 +02:00
committed by GitHub
parent 9765844d92
commit 38eca47ad5
114 changed files with 2085 additions and 5680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+10 -5
View File
@@ -34787,7 +34787,8 @@ asm daPy_sightPacket_c::~daPy_sightPacket_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daPy_frameCtrl_c::~daPy_frameCtrl_c() {
// asm daPy_frameCtrl_c::~daPy_frameCtrl_c() {
extern "C" asm void __dt__16daPy_frameCtrl_cFv() {
nofralloc
#include "asm/d/a/d_a_alink/__dt__16daPy_frameCtrl_cFv.s"
}
@@ -34797,7 +34798,8 @@ asm daPy_frameCtrl_c::~daPy_frameCtrl_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daPy_frameCtrl_c::daPy_frameCtrl_c() {
// asm daPy_frameCtrl_c::daPy_frameCtrl_c() {
extern "C" asm void __ct__16daPy_frameCtrl_cFv() {
nofralloc
#include "asm/d/a/d_a_alink/__ct__16daPy_frameCtrl_cFv.s"
}
@@ -34867,7 +34869,8 @@ asm dBgS_LinkAcch::~dBgS_LinkAcch() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcD_Cps::dCcD_Cps() {
// asm dCcD_Cps::dCcD_Cps() {
extern "C" asm void __ct__8dCcD_CpsFv() {
nofralloc
#include "asm/d/a/d_a_alink/__ct__8dCcD_CpsFv.s"
}
@@ -34877,7 +34880,8 @@ asm dCcD_Cps::dCcD_Cps() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcD_Cyl::dCcD_Cyl() {
// asm dCcD_Cyl::dCcD_Cyl() {
extern "C" asm void __ct__8dCcD_CylFv() {
nofralloc
#include "asm/d/a/d_a_alink/__ct__8dCcD_CylFv.s"
}
@@ -34975,7 +34979,8 @@ asm void dEvt_info_c::onCondition(u16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cM3dGPla::cM3dGPla() {
// asm cM3dGPla::cM3dGPla() {
extern "C" asm void __ct__8cM3dGPlaFv() {
nofralloc
#include "asm/d/a/d_a_alink/__ct__8cM3dGPlaFv.s"
}
src/d/cc/d_cc_d.cpp
+365 -88
View File
@@ -3,10 +3,317 @@
// Translation Unit: d/cc/d_cc_d
//
#include "d/cc/d_cc_d.h"
// #include "d/cc/d_cc_d.h"
#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:
//
@@ -201,6 +508,7 @@ 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];
@@ -640,7 +948,7 @@ asm void dCcD_GStts::Move() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcD_GStts* dCcD_Stts::GetGStts() {
asm void dCcD_Stts::GetGStts() {
nofralloc
#include "asm/d/cc/d_cc_d/GetGStts__9dCcD_SttsFv.s"
}
@@ -710,8 +1018,7 @@ asm void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_GObjInf::dCcD_GObjInf() {
extern "C" asm void __ct__12dCcD_GObjInfFv() {
asm dCcD_GObjInf::dCcD_GObjInf() {
nofralloc
#include "asm/d/cc/d_cc_d/__ct__12dCcD_GObjInfFv.s"
}
@@ -721,8 +1028,7 @@ extern "C" asm void __ct__12dCcD_GObjInfFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_GObjCo::~dCcD_GObjCo() {
extern "C" asm void __dt__11dCcD_GObjCoFv() {
asm dCcD_GObjCo::~dCcD_GObjCo() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjCoFv.s"
}
@@ -732,8 +1038,7 @@ extern "C" asm void __dt__11dCcD_GObjCoFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_GObjTg::~dCcD_GObjTg() {
extern "C" asm void __dt__11dCcD_GObjTgFv() {
asm dCcD_GObjTg::~dCcD_GObjTg() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjTgFv.s"
}
@@ -743,8 +1048,7 @@ extern "C" asm void __dt__11dCcD_GObjTgFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_GObjAt::~dCcD_GObjAt() {
extern "C" asm void __dt__11dCcD_GObjAtFv() {
asm dCcD_GObjAt::~dCcD_GObjAt() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__11dCcD_GObjAtFv.s"
}
@@ -754,8 +1058,7 @@ extern "C" asm void __dt__11dCcD_GObjAtFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() {
extern "C" asm void __dt__22dCcD_GAtTgCoCommonBaseFv() {
asm dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__22dCcD_GAtTgCoCommonBaseFv.s"
}
@@ -765,8 +1068,7 @@ extern "C" asm void __dt__22dCcD_GAtTgCoCommonBaseFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_GObjInf::~cCcD_GObjInf() {
extern "C" asm void __dt__12cCcD_GObjInfFv() {
asm cCcD_GObjInf::~cCcD_GObjInf() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__12cCcD_GObjInfFv.s"
}
@@ -776,8 +1078,7 @@ extern "C" asm void __dt__12cCcD_GObjInfFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_Obj::~cCcD_Obj() {
extern "C" asm void __dt__8cCcD_ObjFv() {
asm cCcD_Obj::~cCcD_Obj() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__8cCcD_ObjFv.s"
}
@@ -787,8 +1088,7 @@ extern "C" asm void __dt__8cCcD_ObjFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ObjHitInf::~cCcD_ObjHitInf() {
extern "C" asm void __dt__14cCcD_ObjHitInfFv() {
asm cCcD_ObjHitInf::~cCcD_ObjHitInf() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__14cCcD_ObjHitInfFv.s"
}
@@ -798,8 +1098,7 @@ extern "C" asm void __dt__14cCcD_ObjHitInfFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ObjCo::~cCcD_ObjCo() {
extern "C" asm void __dt__10cCcD_ObjCoFv() {
asm cCcD_ObjCo::~cCcD_ObjCo() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjCoFv.s"
}
@@ -809,8 +1108,7 @@ extern "C" asm void __dt__10cCcD_ObjCoFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ObjTg::~cCcD_ObjTg() {
extern "C" asm void __dt__10cCcD_ObjTgFv() {
asm cCcD_ObjTg::~cCcD_ObjTg() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjTgFv.s"
}
@@ -820,8 +1118,7 @@ extern "C" asm void __dt__10cCcD_ObjTgFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ObjAt::~cCcD_ObjAt() {
extern "C" asm void __dt__10cCcD_ObjAtFv() {
asm cCcD_ObjAt::~cCcD_ObjAt() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__10cCcD_ObjAtFv.s"
}
@@ -831,8 +1128,7 @@ extern "C" asm void __dt__10cCcD_ObjAtFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ObjCommonBase::~cCcD_ObjCommonBase() {
extern "C" asm void __dt__18cCcD_ObjCommonBaseFv() {
asm cCcD_ObjCommonBase::~cCcD_ObjCommonBase() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__18cCcD_ObjCommonBaseFv.s"
}
@@ -842,16 +1138,15 @@ extern "C" asm void __dt__18cCcD_ObjCommonBaseFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_GObjInf::~dCcD_GObjInf() {
extern "C" asm void __dt__12dCcD_GObjInfFv() {
asm dCcD_GObjInf::~dCcD_GObjInf() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__12dCcD_GObjInfFv.s"
}
#pragma pop
/* 80084268-8008426C 07EBA8 0004+00 5/0 0/0 0/0 .text GetGObjInf__12dCcD_GObjInfFv */
cCcD_GObjInf* dCcD_GObjInf::GetGObjInf() {
return this;
void dCcD_GObjInf::GetGObjInf() {
/* empty function */
}
/* 8008426C-800842C0 07EBAC 0054+00 5/0 0/0 0/0 .text ClrAtHit__12dCcD_GObjInfFv */
@@ -1059,8 +1354,8 @@ asm void dCcD_GetGObjInf(cCcD_Obj* param_0) {
#pragma pop
/* 800847C8-800847D0 07F108 0008+00 1/0 0/0 0/0 .text GetGObjInf__8cCcD_ObjFv */
cCcD_GObjInf* cCcD_Obj::GetGObjInf() {
return NULL;
bool cCcD_Obj::GetGObjInf() {
return false;
}
/* 800847D0-80084814 07F110 0044+00 0/0 1/1 20/20 .text Set__8dCcD_CpsFRC11dCcD_SrcCps */
@@ -1077,8 +1372,7 @@ asm void dCcD_Cps::Set(dCcD_SrcCps const& param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ShapeAttr *dCcD_Cps::GetShapeAttr() {
extern "C" asm void GetShapeAttr__8dCcD_CpsFv() {
asm void dCcD_Cps::GetShapeAttr() {
nofralloc
#include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_CpsFv.s"
}
@@ -1118,8 +1412,7 @@ asm void dCcD_Tri::Set(dCcD_SrcTri const& param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ShapeAttr *dCcD_Tri::GetShapeAttr() {
extern "C" asm void GetShapeAttr__8dCcD_TriFv() {
asm void dCcD_Tri::GetShapeAttr() {
nofralloc
#include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_TriFv.s"
}
@@ -1140,8 +1433,7 @@ asm void dCcD_Cyl::Set(dCcD_SrcCyl const& param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ShapeAttr *dCcD_Cyl::GetShapeAttr() {
extern "C" asm void GetShapeAttr__8dCcD_CylFv() {
asm void dCcD_Cyl::GetShapeAttr() {
nofralloc
#include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_CylFv.s"
}
@@ -1212,8 +1504,7 @@ asm void dCcD_Sph::MoveCAt(cXyz& param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() {
extern "C" asm void GetShapeAttr__8dCcD_SphFv() {
asm void dCcD_Sph::GetShapeAttr() {
nofralloc
#include "asm/d/cc/d_cc_d/GetShapeAttr__8dCcD_SphFv.s"
}
@@ -1223,7 +1514,7 @@ extern "C" asm void GetShapeAttr__8dCcD_SphFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm const cXyz& cCcD_SphAttr::GetCoCP() const {
asm void cCcD_SphAttr::GetCoCP() const {
nofralloc
#include "asm/d/cc/d_cc_d/GetCoCP__12cCcD_SphAttrCFv.s"
}
@@ -1246,7 +1537,7 @@ bool cCcD_SphAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_SphAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
asm void cCcD_SphAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_SphAttrCFRC14cCcD_ShapeAttrP4cXyz.s"
}
@@ -1275,20 +1566,20 @@ bool cCcD_SphAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_SphAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
asm void cCcD_SphAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossCo__12cCcD_SphAttrCFRC14cCcD_ShapeAttrPf.s"
}
#pragma pop
/* 80084BE4-80084BE8 07F524 0004+00 6/0 0/0 0/0 .text GetGObjInf__12cCcD_GObjInfCFv */
cCcD_GObjInf const* cCcD_GObjInf::GetGObjInf() const {
return this;
void cCcD_GObjInf::GetGObjInf() const {
/* empty function */
}
/* 80084BE8-80084BF0 07F528 0008+00 7/0 0/0 0/0 .text GetShapeAttr__8cCcD_ObjCFv */
cCcD_ShapeAttr const* cCcD_Obj::GetShapeAttr() const {
return NULL;
bool cCcD_Obj::GetShapeAttr() const {
return false;
}
/* 80084BF0-80084BF4 07F530 0004+00 7/0 0/0 0/0 .text Draw__8cCcD_ObjFRC8_GXColor */
@@ -1300,8 +1591,7 @@ void cCcD_Obj::Draw(_GXColor const& param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_Sph::~dCcD_Sph() {
extern "C" asm void __dt__8dCcD_SphFv() {
asm dCcD_Sph::~dCcD_Sph() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__8dCcD_SphFv.s"
}
@@ -1311,7 +1601,7 @@ extern "C" asm void __dt__8dCcD_SphFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm const cXyz& cCcD_CylAttr::GetCoCP() const {
asm void cCcD_CylAttr::GetCoCP() const {
nofralloc
#include "asm/d/cc/d_cc_d/GetCoCP__12cCcD_CylAttrCFv.s"
}
@@ -1334,7 +1624,7 @@ bool cCcD_CylAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_CylAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
asm void cCcD_CylAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_CylAttrCFRC14cCcD_ShapeAttrP4cXyz.s"
}
@@ -1363,7 +1653,7 @@ bool cCcD_CylAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_CylAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
asm void cCcD_CylAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossCo__12cCcD_CylAttrCFRC14cCcD_ShapeAttrPf.s"
}
@@ -1373,8 +1663,7 @@ asm bool cCcD_CylAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) cons
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_Cyl::~dCcD_Cyl() {
extern "C" asm void __dt__8dCcD_CylFv() {
asm dCcD_Cyl::~dCcD_Cyl() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__8dCcD_CylFv.s"
}
@@ -1384,7 +1673,7 @@ extern "C" asm void __dt__8dCcD_CylFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cXyz& cCcD_ShapeAttr::GetCoCP() {
asm void cCcD_ShapeAttr::GetCoCP() {
nofralloc
#include "asm/d/cc/d_cc_d/GetCoCP__14cCcD_ShapeAttrFv.s"
}
@@ -1394,7 +1683,7 @@ asm cXyz& cCcD_ShapeAttr::GetCoCP() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm const cXyz& cCcD_ShapeAttr::GetCoCP() const {
asm void cCcD_ShapeAttr::GetCoCP() const {
nofralloc
#include "asm/d/cc/d_cc_d/GetCoCP__14cCcD_ShapeAttrCFv.s"
}
@@ -1402,15 +1691,13 @@ asm const cXyz& cCcD_ShapeAttr::GetCoCP() const {
/* 80084E44-80084E4C 07F784 0008+00 1/0 1/0 0/0 .text
* CrossAtTg__12cCcD_TriAttrCFRC12cCcD_AabAttrP4cXyz */
// bool cCcD_TriAttr::CrossAtTg(cCcD_AabAttr const& param_0, cXyz* param_1) const {
extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_AabAttrP4cXyz() {
bool cCcD_TriAttr::CrossAtTg(cCcD_AabAttr const& param_0, cXyz* param_1) const {
return false;
}
/* 80084E4C-80084E54 07F78C 0008+00 1/0 1/0 0/0 .text
* CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz */
// bool cCcD_TriAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const {
extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz() {
bool cCcD_TriAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const {
return false;
}
@@ -1419,7 +1706,7 @@ extern "C" bool CrossAtTg__12cCcD_TriAttrCFRC12cCcD_PntAttrP4cXyz() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_TriAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
asm void cCcD_TriAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_TriAttrCFRC14cCcD_ShapeAttrP4cXyz.s"
}
@@ -1427,43 +1714,37 @@ asm bool cCcD_TriAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) c
/* 80084E8C-80084E94 07F7CC 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_SphAttrPf
*/
// bool cCcD_TriAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const {
extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_SphAttrPf() {
bool cCcD_TriAttr::CrossCo(cCcD_SphAttr const& param_0, f32* param_1) const {
return false;
}
/* 80084E94-80084E9C 07F7D4 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_CylAttrPf
*/
// bool cCcD_TriAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const {
extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CylAttrPf() {
bool cCcD_TriAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const {
return false;
}
/* 80084E9C-80084EA4 07F7DC 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_AabAttrPf
*/
// bool cCcD_TriAttr::CrossCo(cCcD_AabAttr const& param_0, f32* param_1) const {
extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_AabAttrPf() {
bool cCcD_TriAttr::CrossCo(cCcD_AabAttr const& param_0, f32* param_1) const {
return false;
}
/* 80084EA4-80084EAC 07F7E4 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_TriAttrPf
*/
// bool cCcD_TriAttr::CrossCo(cCcD_TriAttr const& param_0, f32* param_1) const {
extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_TriAttrPf() {
bool cCcD_TriAttr::CrossCo(cCcD_TriAttr const& param_0, f32* param_1) const {
return false;
}
/* 80084EAC-80084EB4 07F7EC 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_CpsAttrPf
*/
// bool cCcD_TriAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const {
extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_CpsAttrPf() {
bool cCcD_TriAttr::CrossCo(cCcD_CpsAttr const& param_0, f32* param_1) const {
return false;
}
/* 80084EB4-80084EBC 07F7F4 0008+00 1/0 1/0 0/0 .text CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf
*/
// bool cCcD_TriAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const {
extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf() {
bool cCcD_TriAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const {
return false;
}
@@ -1472,7 +1753,7 @@ extern "C" bool CrossCo__12cCcD_TriAttrCFRC12cCcD_PntAttrPf() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_TriAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
asm void cCcD_TriAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossCo__12cCcD_TriAttrCFRC14cCcD_ShapeAttrPf.s"
}
@@ -1482,8 +1763,7 @@ asm bool cCcD_TriAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) cons
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_Tri::~dCcD_Tri() {
extern "C" asm void __dt__8dCcD_TriFv() {
asm dCcD_Tri::~dCcD_Tri() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__8dCcD_TriFv.s"
}
@@ -1506,7 +1786,7 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_PntAttr const& param_0, cXyz* param_1) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_CpsAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
asm void cCcD_CpsAttr::CrossAtTg(cCcD_ShapeAttr const& param_0, cXyz* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossAtTg__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrP4cXyz.s"
}
@@ -1535,7 +1815,7 @@ bool cCcD_CpsAttr::CrossCo(cCcD_PntAttr const& param_0, f32* param_1) const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool cCcD_CpsAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
asm void cCcD_CpsAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) const {
nofralloc
#include "asm/d/cc/d_cc_d/CrossCo__12cCcD_CpsAttrCFRC14cCcD_ShapeAttrPf.s"
}
@@ -1545,16 +1825,14 @@ asm bool cCcD_CpsAttr::CrossCo(cCcD_ShapeAttr const& param_0, f32* param_1) cons
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_Cps::~dCcD_Cps() {
extern "C" asm void __dt__8dCcD_CpsFv() {
asm dCcD_Cps::~dCcD_Cps() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__8dCcD_CpsFv.s"
}
#pragma pop
/* 80085130-80085138 07FA70 0008+00 3/0 0/0 0/0 .text GetShapeAttr__8cCcD_ObjFv */
// cCcD_ShapeAttr *cCcD_Obj::GetShapeAttr() {
extern "C" bool GetShapeAttr__8cCcD_ObjFv() {
bool cCcD_Obj::GetShapeAttr() {
return false;
}
@@ -1589,21 +1867,20 @@ asm void cCcD_GObjInf::ClrCoHit() {
#pragma pop
/* 800851A0-800851A4 07FAE0 0004+00 1/0 0/0 0/0 .text GetGObjInf__12cCcD_GObjInfFv */
cCcD_GObjInf* cCcD_GObjInf::GetGObjInf() {
return this;
void cCcD_GObjInf::GetGObjInf() {
/* empty function */
}
/* 800851A4-800851AC 07FAE4 0008+00 1/0 0/0 0/0 .text GetGObjInf__8cCcD_ObjCFv */
cCcD_GObjInf const* cCcD_Obj::GetGObjInf() const {
return NULL;
bool cCcD_Obj::GetGObjInf() const {
return false;
}
/* 800851AC-8008523C 07FAEC 0090+00 2/1 0/0 0/0 .text __dt__9dCcD_SttsFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dCcD_Stts::~dCcD_Stts() {
extern "C" asm void __dt__9dCcD_SttsFv(void) { // should get autogenerated eventually
asm dCcD_Stts::~dCcD_Stts() {
nofralloc
#include "asm/d/cc/d_cc_d/__dt__9dCcD_SttsFv.s"
}
src/d/cc/d_cc_d_nonmatching.cpp
+475
View File
@@ -0,0 +1,475 @@
//
// Generated By: dol2asm
// Translation Unit: d/cc/d_cc_d
//
#include "d/cc/d_cc_d.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_iter.h"
#include "f_op/f_op_actor_mng.h"
#include "f_pc/f_pc_searcher.h"
//
// Declarations:
//
/* 8008364C-80083660 07DF8C 0014+00 3/3 0/0 0/0 .text ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv */
void dCcD_GAtTgCoCommonBase::ClrActorInfo() {
mApid = 0xFFFFFFFF;
mAc = NULL;
}
/* 80083660-80083678 07DFA0 0018+00 1/1 0/0 0/0 .text ct__22dCcD_GAtTgCoCommonBaseFv */
void dCcD_GAtTgCoCommonBase::ct() {
mGFlag = NULL;
mRPrm = 0;
field_0x08 = 0;
mEffCounter = 0;
}
/* 80083678-80083688 07DFB8 0010+00 0/0 2/2 0/0 .text SetHitApid__22dCcD_GAtTgCoCommonBaseFUi */
void dCcD_GAtTgCoCommonBase::SetHitApid(unsigned int hitApid) {
mApid = hitApid;
mAc = NULL;
}
/* 80083688-80083704 07DFC8 007C+00 6/6 17/17 43/43 .text GetAc__22dCcD_GAtTgCoCommonBaseFv */
fopAc_ac_c* dCcD_GAtTgCoCommonBase::GetAc() {
if (mApid == 0xFFFFFFFF) {
return NULL;
} else {
if (mAc == NULL) {
u32 apid = mApid;
mAc = static_cast<fopAc_ac_c*>(fopAcIt_Judge(fpcSch_JudgeByID, &apid));
if (mAc == NULL) {
mApid = 0xFFFFFFFF;
}
}
return mAc;
}
}
/* 80083704-80083718 07E044 0014+00 3/3 0/0 0/0 .text
* Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase */
void dCcD_GAtTgCoCommonBase::Set(dCcD_SrcGAtTgCoCommonBase const& src) {
mGFlag = src.mGFlag;
mEffCounter = 0;
}
/* 80083718-80083724 07E058 000C+00 0/0 1/1 0/0 .text
* SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv */
void dCcD_GAtTgCoCommonBase::SetEffCounterTimer() {
mEffCounter = 5;
}
/* 80083724-80083748 07E064 0024+00 3/3 0/0 0/0 .text
* SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv */
void dCcD_GAtTgCoCommonBase::SubtractEffCounter() {
mEffCounter--;
if (mEffCounter < 0) {
mEffCounter = 0;
}
}
/* 80083748-80083760 07E088 0018+00 0/0 1/1 0/0 .text ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv */
bool dCcD_GAtTgCoCommonBase::ChkEffCounter() {
return mEffCounter > 0;
}
/* 80083760-800837B0 07E0A0 0050+00 0/0 3/3 446/446 .text __ct__10dCcD_GSttsFv */
dCcD_GStts::dCcD_GStts() {
mAt = 0;
mTg = 0;
mRoomId = 0;
field_0x08 = 0xFFFF;
mAtApid = 0xFFFFFFFF;
mAtOldApid = 0xFFFFFFFF;
mTgApid = 0xFFFFFFFF;
mTgOldApid = 0xFFFFFFFF;
field_0x1C = 0;
}
/* 800837F8-80083830 07E138 0038+00 1/1 0/0 0/0 .text Ct__10dCcD_GSttsFv */
void dCcD_GStts::Ct() {
mAt = 0;
mTg = 0;
mRoomId = 0;
field_0x08 = 0xFFFF;
mAtApid = 0xFFFFFFFF;
mAtOldApid = 0xFFFFFFFF;
mTgApid = 0xFFFFFFFF;
mTgOldApid = 0xFFFFFFFF;
field_0x1C = 0;
}
/* 80083830-80083850 07E170 0020+00 0/0 3/3 160/160 .text Move__10dCcD_GSttsFv */
void dCcD_GStts::Move() {
mAtOldApid = mAtApid;
mAtApid = 0;
mTgOldApid = mTgApid;
mTgApid = 0;
}
/* 80083850-80083860 07E190 0010+00 1/0 0/0 0/0 .text GetGStts__9dCcD_SttsFv */
cCcD_GStts* dCcD_Stts::GetGStts() {
return this;
}
/* 80083860-800838F4 07E1A0 0094+00 0/0 3/3 416/416 .text Init__9dCcD_SttsFiiP10fopAc_ac_c */
void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) {
u32 actorPid;
if (pActor != NULL) {
actorPid = fopAcM_GetID(pActor);
} else {
actorPid = 0xFFFFFFFF;
}
this->cCcD_Stts::Init(param_0, param_1, pActor, actorPid);
s32 roomNo;
if (pActor != NULL) {
roomNo = fopAcM_GetRoomNo(pActor);
} else {
roomNo = 0;
field_0x1C |= 1;
}
if (roomNo != -1) {
mRoomId = roomNo;
} else {
mRoomId = 0;
}
}
/* 800838F4-80083928 07E234 0034+00 1/0 0/0 0/0 .text Ct__9dCcD_SttsFv */
void dCcD_Stts::Ct() {
this->cCcD_Stts::Ct();
this->dCcD_GStts::Ct();
}
/* 80083928-80083934 07E268 000C+00 1/0 0/0 0/0 .text ClrAt__9dCcD_SttsFv */
void dCcD_Stts::ClrAt() {
mAt = 0;
}
/* 80083934-80083944 07E274 0010+00 1/0 0/0 0/0 .text ClrTg__9dCcD_SttsFv */
void dCcD_Stts::ClrTg() {
this->cCcD_Stts::ClrTg();
this->dCcD_GStts::ClrTg();
}
/* 80083944-800839A0 07E284 005C+00 1/1 0/0 0/0 .text Set__11dCcD_GObjAtFRC14dCcD_SrcGObjAt */
void dCcD_GObjAt::Set(dCcD_SrcGObjAt const& src) {
this->dCcD_GAtTgCoCommonBase::Set(src.mBase);
this->mSe = src.mSe;
this->mMtrl = src.mMtrl;
this->mHitMark = src.mHitMark;
this->mSpl = src.mSpl;
}
/* 800839A0-80083A28 07E2E0 0088+00 1/1 0/0 0/0 .text Set__11dCcD_GObjTgFRC14dCcD_SrcGObjTg */
void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& src) {
this->dCcD_GAtTgCoCommonBase::Set(src.mBase);
this->mSe = src.mSe;
this->mMtrl = src.mMtrl;
this->mHitMark = src.mHitMark;
this->mSpl = src.mSpl;
this->mHitPos = cXyz::Zero;
this->mShieldFrontRangeYAngle = NULL;
this->mShieldRange = 0x4000;
}
/* 80083A28-80083B8C 07E368 0164+00 0/0 4/4 496/496 .text __ct__12dCcD_GObjInfFv */
dCcD_GObjInf::dCcD_GObjInf() {}
dCcD_GObjInf::~dCcD_GObjInf() {}
cCcD_GObjInf* dCcD_GObjInf::GetGObjInf() {
return this;
}
/* 8008426C-800842C0 07EBAC 0054+00 5/0 0/0 0/0 .text ClrAtHit__12dCcD_GObjInfFv */
void dCcD_GObjInf::ClrAtHit() {
mObjAt.ClrHit();
mGObjAt.ClrActorInfo();
mGObjAt.mRPrm &= ~1;
mGObjAt.mRPrm &= ~2;
mGObjAt.SubtractEffCounter();
}
/* 800842C0-80084318 07EC00 0058+00 0/0 12/12 78/78 .text ChkAtHit__12dCcD_GObjInfFv */
s32 dCcD_GObjInf::ChkAtHit() {
if ((mObjAt.getRPrm() & 1) == 0) {
return 0;
} else if ((mGObjAt.mRPrm & 2) == 0 && mGObjAt.GetAc() == NULL) {
return 0;
} else {
return 1;
}
}
/* 80084318-80084358 07EC58 0040+00 0/0 10/10 7/7 .text ResetAtHit__12dCcD_GObjInfFv */
void dCcD_GObjInf::ResetAtHit() {
this->ClrAtHit();
mGObjAt.mEffCounter = 0;
}
/* 80084358-800843A8 07EC98 0050+00 1/1 0/0 31/31 .text GetAtHitObj__12dCcD_GObjInfFv */
cCcD_Obj* dCcD_GObjInf::GetAtHitObj() {
if ((mGObjAt.mRPrm & 2) == 0 && mGObjAt.GetAc() == NULL) {
return NULL;
} else {
return mObjAt.getHitObj();
}
}
/* 800843A8-800843DC 07ECE8 0034+00 0/0 2/2 3/3 .text GetAtHitGObj__12dCcD_GObjInfFv */
cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() {
cCcD_Obj* obj = this->GetAtHitObj();
if (obj == NULL) {
return NULL;
} else {
return dCcD_GetGObjInf(obj);
}
}
/* 800843DC-800843FC 07ED1C 0020+00 0/0 1/1 0/0 .text ChkAtNoGuard__12dCcD_GObjInfFv */
#ifdef NON_MATCHING
bool dCcD_GObjInf::ChkAtNoGuard() {
return 12 < mGObjAt.mSpl;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool dCcD_GObjInf::ChkAtNoGuard() {
nofralloc
#include "asm/d/cc/d_cc_d/ChkAtNoGuard__12dCcD_GObjInfFv.s"
}
#pragma pop
#endif
/* 800843FC-80084460 07ED3C 0064+00 5/0 0/0 0/0 .text ClrTgHit__12dCcD_GObjInfFv */
void dCcD_GObjInf::ClrTgHit() {
mObjTg.ClrHit();
mGObjTg.ClrActorInfo();
mGObjTg.mRPrm &= ~1;
mGObjTg.mRPrm &= ~2;
mGObjTg.mRPrm &= ~4;
mGObjTg.SubtractEffCounter();
}
/* 80084460-800844B8 07EDA0 0058+00 0/0 6/6 305/305 .text ChkTgHit__12dCcD_GObjInfFv */
bool dCcD_GObjInf::ChkTgHit() {
if ((mObjTg.getRPrm() & 1) == 0) {
return false;
} else if ((mGObjTg.mRPrm & 1) == 0 && mGObjTg.GetAc() == NULL) {
return false;
} else {
return true;
}
}
/* 800844B8-800844F8 07EDF8 0040+00 0/0 1/1 5/5 .text ResetTgHit__12dCcD_GObjInfFv */
void dCcD_GObjInf::ResetTgHit() {
this->ClrTgHit();
mGObjTg.mEffCounter = 0;
}
/* 800844F8-80084548 07EE38 0050+00 1/1 3/3 228/228 .text GetTgHitObj__12dCcD_GObjInfFv
*/
cCcD_Obj* dCcD_GObjInf::GetTgHitObj() {
if ((mGObjTg.mRPrm & 1) == 0 && mGObjTg.GetAc() == NULL) {
return NULL;
} else {
return mObjTg.getHitObj();
}
}
/* 80084548-8008457C 07EE88 0034+00 1/1 5/5 63/63 .text GetTgHitGObj__12dCcD_GObjInfFv */
dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() {
cCcD_Obj* obj = this->GetTgHitObj();
if (obj == NULL) {
return NULL;
} else {
return dCcD_GetGObjInf(obj);
}
}
/* 8008457C-800845B0 07EEBC 0034+00 0/0 2/2 18/18 .text GetTgHitObjSe__12dCcD_GObjInfFv
*/
u8 dCcD_GObjInf::GetTgHitObjSe() {
dCcD_GObjInf* objInf = this->GetTgHitGObj();
if (objInf == NULL) {
return NULL;
} else {
return objInf->mGObjAt.mSe;
}
}
/* ############################################################################################## */
/* 8037A780-8037A7E0 006DE0 0060+00 1/1 0/0 0/0 .rodata m_hitSeID__12dCcD_GObjInf */
u32 const dCcD_GObjInf::m_hitSeID[24] = {
0x0004000F, 0x00040000, 0x00040002, 0x00040004, 0x00040009, 0x0004000B, 0x0004000C, 0x0004000D,
0x0004000E, 0x0004000F, 0x00040001, 0x00040004, 0x00040010, 0x00040011, 0x00040012, 0x00040013,
0x00040014, 0x00040015, 0x00040018, 0x00040016, 0x00040003, 0x00040005, 0x00040006, 0x00040007,
};
/* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text getHitSeID__12dCcD_GObjInfFUci */
u32 dCcD_GObjInf::getHitSeID(u8 param_0, int param_1) {
if (param_1 != 0) {
if (param_0 == 0x17) {
return 0x40017;
}
if (param_0 == 7) {
return 0x40008;
}
if (param_0 == 8) {
return 0x4000A;
}
}
return m_hitSeID[param_0];
}
/* 8008460C-80084658 07EF4C 004C+00 5/0 0/0 0/0 .text ClrCoHit__12dCcD_GObjInfFv */
void dCcD_GObjInf::ClrCoHit() {
mObjCo.ClrHit();
mGObjCo.ClrActorInfo();
mGObjCo.mRPrm &= ~1;
mGObjCo.SubtractEffCounter();
}
/* 80084658-800846B0 07EF98 0058+00 0/0 5/5 74/74 .text ChkCoHit__12dCcD_GObjInfFv */
bool dCcD_GObjInf::ChkCoHit() {
if ((mObjCo.getRPrm() & 1) == 0) {
return false;
} else if ((mGObjCo.mRPrm & 1) == 0 && mGObjCo.GetAc() == NULL) {
return false;
} else {
return true;
}
}
/* 800846B0-800846F0 07EFF0 0040+00 0/0 1/1 2/2 .text ResetCoHit__12dCcD_GObjInfFv */
void dCcD_GObjInf::ResetCoHit() {
ClrCoHit();
mGObjCo.ResetEffCounter();
}
/* 800846F0-80084740 07F030 0050+00 0/0 0/0 36/36 .text GetCoHitObj__12dCcD_GObjInfFv */
cCcD_Obj* dCcD_GObjInf::GetCoHitObj() {
if ((mGObjCo.mRPrm & 1) == 0 && mGObjCo.GetAc() == NULL) {
return NULL;
} else {
return mObjCo.getHitObj();
}
}
/* 80084740-8008479C 07F080 005C+00 4/4 0/0 0/0 .text Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf */
void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& param_0) {
this->cCcD_Obj::Set(param_0.mObj);
mGObjAt.Set(param_0.mGObjAt);
mGObjTg.Set(param_0.mGObjTg);
mGObjCo.Set(param_0.mGObjCo);
}
/* 8008479C-800847C8 07F0DC 002C+00 2/2 1/1 3/3 .text dCcD_GetGObjInf__FP8cCcD_Obj */
dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* obj) {
return (dCcD_GObjInf*)obj->GetGObjInf();
}
/* 800847D0-80084814 07F110 0044+00 0/0 1/1 20/20 .text Set__8dCcD_CpsFRC11dCcD_SrcCps */
void dCcD_Cps::Set(dCcD_SrcCps const& param_0) {
this->dCcD_GObjInf::Set(param_0.mObjInf);
this->cCcD_CpsAttr::Set(param_0.mCps);
}
/* 80084814-80084824 07F154 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_CpsFv */
cCcD_ShapeAttr* dCcD_Cps::GetShapeAttr() {
return this;
}
/* 80084824-80084854 07F164 0030+00 0/0 0/0 6/6 .text CalcAtVec__8dCcD_CpsFv */
void dCcD_Cps::CalcAtVec() {
cXyz& dest = mGObjAt.GetVec();
PSVECSubtract(&this->GetEndP(), &this->GetStartP(), &dest);
}
/* 80084854-80084884 07F194 0030+00 0/0 0/0 2/2 .text CalcTgVec__8dCcD_CpsFv */
void dCcD_Cps::CalcTgVec() {
cXyz& dest = mGObjTg.GetVec();
PSVECSubtract(&this->GetEndP(), &this->GetStartP(), &dest);
}
/* 80084884-800848A4 07F1C4 0020+00 0/0 0/0 5/5 .text Set__8dCcD_TriFRC11dCcD_SrcTri */
void dCcD_Tri::Set(dCcD_SrcTri const& param_0) {
this->dCcD_GObjInf::Set(param_0.mObjInf);
}
/* 800848A4-800848B4 07F1E4 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_TriFv */
cCcD_ShapeAttr* dCcD_Tri::GetShapeAttr() {
return this;
}
/* 800848B4-800848F8 07F1F4 0044+00 0/0 2/2 245/245 .text Set__8dCcD_CylFRC11dCcD_SrcCyl
*/
void dCcD_Cyl::Set(dCcD_SrcCyl const& param_0) {
this->dCcD_GObjInf::Set(param_0.mObjInf);
this->cCcD_CylAttr::Set(param_0.mCyl);
}
/* 800848F8-80084908 07F238 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_CylFv */
cCcD_ShapeAttr* dCcD_Cyl::GetShapeAttr() {
return this;
}
/* 80084908-80084954 07F248 004C+00 0/0 3/3 3/3 .text StartCAt__8dCcD_CylFR4cXyz */
void dCcD_Cyl::StartCAt(cXyz& param_0) {
cXyz zero = cXyz::Zero;
mGObjAt.SetVec(zero);
this->SetC(param_0);
}
inline void vecDiff(cXyz& out, const cXyz& a, const cXyz& b) {
out = a - b;
}
/* 80084954-800849C4 07F294 0070+00 0/0 3/3 4/4 .text MoveCAt__8dCcD_CylFR4cXyz */
void dCcD_Cyl::MoveCAt(cXyz& param_0) {
cXyz diff;
vecDiff(diff, param_0, this->GetCP());
mGObjAt.SetVec(diff);
this->SetC(param_0);
}
/* 800849C4-80084A34 07F304 0070+00 0/0 0/0 1/1 .text MoveCTg__8dCcD_CylFR4cXyz */
void dCcD_Cyl::MoveCTg(cXyz& param_0) {
cXyz diff;
vecDiff(diff, param_0, this->GetCP());
mGObjTg.SetVec(diff);
this->SetC(param_0);
}
/* 80084A34-80084A78 07F374 0044+00 0/0 2/2 196/196 .text Set__8dCcD_SphFRC11dCcD_SrcSph
*/
void dCcD_Sph::Set(dCcD_SrcSph const& param_0) {
this->dCcD_GObjInf::Set(param_0.mObjInf);
this->cCcD_SphAttr::Set(param_0.mSph);
}
/* 80084A78-80084AC4 07F3B8 004C+00 0/0 3/3 25/25 .text StartCAt__8dCcD_SphFR4cXyz */
void dCcD_Sph::StartCAt(cXyz& xyz) {
cXyz zero(cXyz::Zero);
SetAtVec(zero);
this->cM3dGSph::SetC(xyz);
}
/* 80084AC4-80084B34 07F404 0070+00 0/0 2/2 23/23 .text MoveCAt__8dCcD_SphFR4cXyz */
void dCcD_Sph::MoveCAt(cXyz& param_0) {
cXyz diff;
vecDiff(diff, param_0, GetC());
mGObjAt.SetVec(diff);
this->SetC(param_0);
}
cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() {
return this;
}
src/d/cc/d_cc_mass_s.cpp
+191 -304
View File
@@ -3,359 +3,246 @@
// Translation Unit: d/cc/d_cc_mass_s
//
//#include "d/cc/d_cc_mass_s.h"
#include "d/cc/d_cc_mass_s.h"
#include "SSystem/SComponent/c_math.h"
#include "d/cc/d_cc_d.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {};
struct cXyz {};
struct cCcD_Obj {};
struct dCcMassS_Obj {
/* 800300F4 */ ~dCcMassS_Obj();
/* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32));
/* 800852F0 */ void Clear();
/* 800855C8 */ dCcMassS_Obj();
};
struct cM3dGCps {
/* 8026EF88 */ cM3dGCps();
/* 8026EFA4 */ ~cM3dGCps();
/* 8026F080 */ void SetCps(cM3dGCps const&);
};
struct Vec {};
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
};
struct dCcMassS_Mng {
/* 80085350 */ dCcMassS_Mng();
/* 800855E4 */ void Ct();
/* 80085630 */ void SetAttr(f32, f32, u8, u8);
/* 80085690 */ void Prepare();
/* 800858AC */ void Chk(cXyz*, fopAc_ac_c**, dCcMassS_HitInf*);
/* 80085CF0 */ void Clear();
/* 80085D98 */ void Set(cCcD_Obj*, u8);
/* 80085E6C */ void SetCam(cM3dGCps const&);
/* 80085EB0 */ void GetResultCam() const;
/* 80085EB8 */ void GetCamTopPos(Vec*);
};
struct cM3dGCyl {
/* 8026F1DC */ void SetC(cXyz const&);
/* 8026F1F8 */ void SetH(f32);
/* 8026F200 */ void SetR(f32);
};
struct cM3dGAab {
/* 8026ECF8 */ void ClearForMinMax();
/* 8026ED60 */ void SetMinMax(cM3dGAab const&);
};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
};
struct cCcD_ShapeAttr {
/* 8008556C */ ~cCcD_ShapeAttr();
};
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&);
};
struct cCcD_CylAttr {
/* 800854E0 */ ~cCcD_CylAttr();
};
struct cCcD_CpsAttr {
/* 80085450 */ ~cCcD_CpsAttr();
};
//
// Forward References:
//
extern "C" void Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v();
extern "C" void Clear__12dCcMassS_ObjFv();
extern "C" void ClearPointer__15dCcMassS_HitInfFv();
extern "C" void __ct__12dCcMassS_MngFv();
extern "C" void __dt__12cCcD_CpsAttrFv();
extern "C" void __dt__12cCcD_CylAttrFv();
extern "C" void __dt__14cCcD_ShapeAttrFv();
extern "C" void __ct__12dCcMassS_ObjFv();
extern "C" void Ct__12dCcMassS_MngFv();
extern "C" void SetAttr__12dCcMassS_MngFffUcUc();
extern "C" void Prepare__12dCcMassS_MngFv();
extern "C" void Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf();
extern "C" void Clear__12dCcMassS_MngFv();
extern "C" void Set__12dCcMassS_MngFP8cCcD_ObjUc();
extern "C" void SetCam__12dCcMassS_MngFRC8cM3dGCps();
extern "C" void GetResultCam__12dCcMassS_MngCFv();
extern "C" void GetCamTopPos__12dCcMassS_MngFP3Vec();
//
// External References:
//
extern "C" void __dt__12dCcMassS_ObjFv();
extern "C" void Set__15cCcD_DivideInfoFUlUlUl();
extern "C" void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo();
extern "C" void SetArea__15cCcD_DivideAreaFRC8cM3dGAab();
extern "C" void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl();
extern "C" void CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab();
extern "C" void PlusCcMove__9cCcD_SttsFfff();
extern "C" void cM_rndF__Ff();
extern "C" void ClearForMinMax__8cM3dGAabFv();
extern "C" void SetMinMax__8cM3dGAabFRC8cM3dGAab();
extern "C" void __ct__8cM3dGCpsFv();
extern "C" void __dt__8cM3dGCpsFv();
extern "C" void SetCps__8cM3dGCpsFRC8cM3dGCps();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void SetH__8cM3dGCylFf();
extern "C" void SetR__8cM3dGCylFf();
extern "C" void __dl__FPv();
extern "C" void PSVECSubtract();
extern "C" void PSVECScale();
extern "C" void PSVECMag();
extern "C" void PSVECSquareDistance();
extern "C" void __construct_array();
extern "C" void _savegpr_23();
extern "C" void _savegpr_25();
extern "C" void _savegpr_29();
extern "C" void _restgpr_23();
extern "C" void _restgpr_25();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__12dCcMassS_Obj[3];
extern "C" extern void* __vt__15cCcD_DivideArea[3];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__15cCcD_DivideInfo[3];
extern "C" extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__12cCcD_CpsAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
//
// Declarations:
//
/* 800852E0-800852F0 07FC20 0010+00 1/1 0/0 0/0 .text
* Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Obj::Set(cCcD_Obj* param_0, u8 param_1,
void (*param_2)(fopAc_ac_c*, cXyz*, u32)) {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s"
void dCcMassS_Obj::Set(cCcD_Obj* obj, u8 priority, dCcMassS_ObjCallback callback) {
mpObj = obj;
mPriority = priority;
mpCallback = callback;
}
#pragma pop
/* 800852F0-80085334 07FC30 0044+00 1/1 0/0 0/0 .text Clear__12dCcMassS_ObjFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Obj::Clear() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_ObjFv.s"
void dCcMassS_Obj::Clear() {
mpObj = NULL;
mPriority = 5;
mpCallback = NULL;
mDivideInfo.Set(0, 0, 0);
}
#pragma pop
/* ############################################################################################## */
/* 80452760-80452764 000D60 0004+00 5/5 0/0 0/0 .sdata2 @3627 */
SECTION_SDATA2 static u8 lit_3627[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80085334-80085350 07FC74 001C+00 1/1 0/0 0/0 .text ClearPointer__15dCcMassS_HitInfFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_HitInf::ClearPointer() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/ClearPointer__15dCcMassS_HitInfFv.s"
void dCcMassS_HitInf::ClearPointer() {
mpArea = NULL;
mpAtObj = NULL;
mpCoObj = NULL;
mCoHitLen = 0.0f;
}
#pragma pop
/* 80085350-80085450 07FC90 0100+00 0/0 1/1 0/0 .text __ct__12dCcMassS_MngFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcMassS_Mng::dCcMassS_Mng() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_MngFv.s"
dCcMassS_Mng::dCcMassS_Mng() {
this->Ct();
}
#pragma pop
/* 80085450-800854E0 07FD90 0090+00 0/0 2/1 0/0 .text __dt__12cCcD_CpsAttrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcD_CpsAttr::~cCcD_CpsAttr() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/__dt__12cCcD_CpsAttrFv.s"
}
#pragma pop
/* 800854E0-8008556C 07FE20 008C+00 0/0 2/1 0/0 .text __dt__12cCcD_CylAttrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcD_CylAttr::~cCcD_CylAttr() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/__dt__12cCcD_CylAttrFv.s"
}
#pragma pop
/* 8008556C-800855C8 07FEAC 005C+00 0/0 1/0 0/0 .text __dt__14cCcD_ShapeAttrFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcD_ShapeAttr::~cCcD_ShapeAttr() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/__dt__14cCcD_ShapeAttrFv.s"
}
#pragma pop
/* 800855C8-800855E4 07FF08 001C+00 1/1 0/0 0/0 .text __ct__12dCcMassS_ObjFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcMassS_Obj::dCcMassS_Obj() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/__ct__12dCcMassS_ObjFv.s"
}
#pragma pop
/* ############################################################################################## */
/* 80452764-80452768 000D64 0004+00 2/2 0/0 0/0 .sdata2 @3724 */
SECTION_SDATA2 static f32 lit_3724 = -1000000000.0f;
dCcMassS_Obj::dCcMassS_Obj() {}
/* 800855E4-80085630 07FF24 004C+00 1/1 1/1 0/0 .text Ct__12dCcMassS_MngFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::Ct() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Ct__12dCcMassS_MngFv.s"
void dCcMassS_Mng::Ct() {
field_0x202 = 0;
mResultCam = 0;
mCamTopPos.set(0, -1000000000.0f, 0);
mCamBottomPos.set(0, -1000000000.0f, 0);
this->Clear();
}
#pragma pop
/* 80085630-80085690 07FF70 0060+00 0/0 0/0 2/2 .text SetAttr__12dCcMassS_MngFffUcUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3) {
nofralloc
#include "asm/d/cc/d_cc_mass_s/SetAttr__12dCcMassS_MngFffUcUc.s"
void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3) {
mCylAttr.SetR(param_0);
mCylAttr.SetH(param_1);
field_0x200 = param_2;
field_0x201 = param_3;
}
#pragma pop
/* ############################################################################################## */
/* 80452768-8045276C 000D68 0004+00 1/1 0/0 0/0 .sdata2 @3780 */
SECTION_SDATA2 static f32 lit_3780 = 1000000000.0f;
/* 80085690-800858AC 07FFD0 021C+00 0/0 1/1 1/1 .text Prepare__12dCcMassS_MngFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::Prepare() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Prepare__12dCcMassS_MngFv.s"
void dCcMassS_Mng::Prepare() {
cM3dGAab aab;
aab.ClearForMinMax();
for (dCcMassS_Obj* pObj = mMassObjs; pObj < mMassObjs + mMassObjCount; ++pObj) {
cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr();
objShape->CalcAabBox();
aab.SetMinMax(objShape->GetWorkAab());
}
for (dCcMassS_Obj* pObj = mMassAreas; pObj < mMassAreas + mMassAreaCount; ++pObj) {
cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr();
objShape->CalcAabBox();
aab.SetMinMax(objShape->GetWorkAab());
}
if (field_0x202 & 1) {
mCpsAttr.CalcAabBox();
aab.SetMinMax(mCpsAttr.GetWorkAab());
}
mDivideArea.SetArea(aab);
for (dCcMassS_Obj* pObj = mMassObjs; pObj < mMassObjs + mMassObjCount; ++pObj) {
cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr();
cCcD_DivideInfo* divideInfo = &pObj->GetDivideInfo();
mDivideArea.CalcDivideInfo(divideInfo, objShape->GetWorkAab(), 0);
}
for (dCcMassS_Obj* pObj = mMassAreas; pObj < mMassAreas + mMassAreaCount; ++pObj) {
cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr();
cCcD_DivideInfo* divideInfo = &pObj->GetDivideInfo();
mDivideArea.CalcDivideInfo(divideInfo, objShape->GetWorkAab(), 0);
}
if (field_0x202 & 1) {
mDivideArea.CalcDivideInfo(&mDivideInfo, mCpsAttr.GetWorkAab(), 0);
}
mCamTopPos.set(0, -1000000000.0f, 0);
mCamTopDist = 1000000000.0f;
mCamBottomPos.set(0, -1000000000.0f, 0);
mCamBottomDist = 1000000000.0f;
}
#pragma pop
/* ############################################################################################## */
/* 8045276C-80452770 000D6C 0004+00 2/2 0/0 0/0 .sdata2 @3899 */
SECTION_SDATA2 static f32 lit_3899 = 1.0f;
/* 80452770-80452774 000D70 0004+00 1/1 0/0 0/0 .sdata2 @3900 */
SECTION_SDATA2 static f32 lit_3900 = 20.0f;
/* 800858AC-80085CF0 0801EC 0444+00 0/0 0/0 2/2 .text
* Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::Chk(cXyz* param_0, fopAc_ac_c** param_1, dCcMassS_HitInf* param_2) {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf.s"
u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) {
cCcD_DivideInfo divideInfo;
u32 flagsMaybe = 0;
*pActor = NULL;
mCylAttr.SetC(*xyz);
mCylAttr.CalcAabBox();
mDivideArea.CalcDivideInfoOverArea(&divideInfo, mCylAttr.GetWorkAab());
hitInf->ClearPointer();
if (field_0x200 & 8) {
for (dCcMassS_Obj* massObj = mMassAreas; massObj < mMassAreas + mMassAreaCount; ++massObj) {
if (massObj->GetDivideInfo().Chk(divideInfo)) {
cCcD_Obj* obj = massObj->GetObj();
cCcD_ShapeAttr* objShape = obj->GetShapeAttr();
f32 f;
if (obj->ChkCoSet() && mCylAttr.CrossCo(*objShape, &f)) {
flagsMaybe |= 4;
*pActor = obj->GetStts()->GetAc();
if (hitInf != NULL) {
hitInf->SetAreaHitObj(obj);
}
if (massObj->GetCallback() != NULL) {
massObj->GetCallback()(obj->GetStts()->GetAc(), xyz, field_0x201);
}
}
}
}
}
for (dCcMassS_Obj* massObj = mMassObjs; massObj < mMassObjs + mMassObjCount; ++massObj) {
if (massObj->GetDivideInfo().Chk(divideInfo)) {
cCcD_Obj* obj = massObj->GetObj();
dCcD_GObjInf* gobjInf = (dCcD_GObjInf*)obj->GetGObjInf();
cCcD_ShapeAttr* objShape = obj->GetShapeAttr();
cXyz unusedVec;
if (obj->ChkAtSet() && !gobjInf->ChkAtNoMass() &&
mCylAttr.CrossAtTg(*objShape, &unusedVec) && (field_0x200 & 1)) {
flagsMaybe |= 1;
*pActor = obj->GetStts()->GetAc();
if (hitInf != NULL) {
hitInf->SetAtHitObj(obj);
}
}
f32 f;
if (obj->ChkCoSet() && mCylAttr.CrossCo(*objShape, &f) && (field_0x200 & 2)) {
flagsMaybe |= 2;
*pActor = obj->GetStts()->GetAc();
if (field_0x200 & 0x10) {
Vec vec;
PSVECSubtract(&(*pActor)->mCurrent.mPosition, xyz, &vec);
vec.y = 0;
f32 vecMag = PSVECMag(&vec);
if (cM3d_IsZero(vecMag)) {
vec.x = 1;
} else {
PSVECScale(&vec, &vec, f / vecMag);
}
obj->GetStts()->PlusCcMove(vec.x, vec.y, vec.z);
}
if (hitInf != NULL) {
hitInf->SetCoHitObj(obj);
hitInf->SetCoHitLen(f);
}
}
}
}
f32 f;
if ((field_0x202 & 1) && mDivideInfo.Chk(divideInfo) && mCylAttr.CrossCo(mCpsAttr, &f)) {
mResultCam |= 1;
mResultCam |= 1 << (field_0x201 + 1);
if ((mResultCam & 2) || (mResultCam & 8)) {
cXyz tmpVec;
f32 plusH = xyz->y + mCylAttr.GetH();
tmpVec.x = xyz->x;
tmpVec.y = plusH;
tmpVec.z = xyz->z;
if (mCamTopPos.y < (20.0f + plusH)) {
f32 newCamTopDist = PSVECSquareDistance(&tmpVec, &mCpsAttr.GetStartP());
if (mCamTopDist > newCamTopDist) {
mCamTopDist = newCamTopDist;
mCamTopPos = tmpVec;
}
}
if (mCamBottomPos.y < (20.0f + plusH)) {
f32 newCamBottomDist = PSVECSquareDistance(&tmpVec, &mCpsAttr.GetEndP());
if (mCamBottomDist > newCamBottomDist) {
mCamBottomDist = newCamBottomDist;
mCamBottomPos = tmpVec;
}
}
}
}
return flagsMaybe;
}
#pragma pop
/* 80085CF0-80085D98 080630 00A8+00 1/1 2/2 0/0 .text Clear__12dCcMassS_MngFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::Clear() {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Clear__12dCcMassS_MngFv.s"
void dCcMassS_Mng::Clear() {
mMassObjCount = 0;
mMassAreaCount = 0;
for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) {
mMassObjs[i].Clear();
}
for (int i = 0; i < (s32)ARRAY_SIZE(mMassAreas); ++i) {
mMassAreas[i].Clear();
}
mCylAttr.SetR(0.0f);
mCylAttr.SetH(0.0f);
field_0x200 = 0;
field_0x201 = 4;
}
#pragma pop
/* ############################################################################################## */
/* 80452774-80452778 000D74 0004+00 1/1 0/0 0/0 .sdata2 @3941 */
SECTION_SDATA2 static f32 lit_3941 = 0.5f;
/* 80085D98-80085E6C 0806D8 00D4+00 0/0 4/4 7/7 .text Set__12dCcMassS_MngFP8cCcD_ObjUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::Set(cCcD_Obj* param_0, u8 param_1) {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Set__12dCcMassS_MngFP8cCcD_ObjUc.s"
void dCcMassS_Mng::Set(cCcD_Obj* obj, u8 priority) {
if (mMassObjCount >= (s32)ARRAY_SIZE(mMassObjs)) {
for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) {
int prevPrio = mMassObjs[i].GetPriority();
if (prevPrio > priority || (prevPrio == priority && cM_rndF(1.0f) < 0.5f)) {
mMassObjs[i].Set(obj, priority, NULL);
break;
}
}
} else {
mMassObjs[mMassObjCount].Set(obj, priority, NULL);
mMassObjCount++;
}
}
#pragma pop
/* 80085E6C-80085EB0 0807AC 0044+00 0/0 1/1 0/0 .text SetCam__12dCcMassS_MngFRC8cM3dGCps
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::SetCam(cM3dGCps const& param_0) {
nofralloc
#include "asm/d/cc/d_cc_mass_s/SetCam__12dCcMassS_MngFRC8cM3dGCps.s"
void dCcMassS_Mng::SetCam(cM3dGCps const& cps) {
mCpsAttr.SetCps(cps);
field_0x202 |= 1;
mResultCam = 0;
}
#pragma pop
/* 80085EB0-80085EB8 0807F0 0008+00 0/0 1/1 0/0 .text GetResultCam__12dCcMassS_MngCFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::GetResultCam() const {
nofralloc
#include "asm/d/cc/d_cc_mass_s/GetResultCam__12dCcMassS_MngCFv.s"
u8 dCcMassS_Mng::GetResultCam() const {
return mResultCam;
}
#pragma pop
/* 80085EB8-80085ED4 0807F8 001C+00 0/0 1/1 0/0 .text GetCamTopPos__12dCcMassS_MngFP3Vec
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Mng::GetCamTopPos(Vec* param_0) {
nofralloc
#include "asm/d/cc/d_cc_mass_s/GetCamTopPos__12dCcMassS_MngFP3Vec.s"
void dCcMassS_Mng::GetCamTopPos(Vec* out) {
*out = mCamTopPos;
}
#pragma pop
src/d/com/d_com_inf_game.cpp
+14 -449
View File
@@ -35,14 +35,6 @@ struct dSmplMdl_draw_c {
/* 80049058 */ void removeModel(J3DModelData*, int);
};
struct dRes_control_c {
/* 8003BFB0 */ ~dRes_control_c();
/* 8003C078 */ void setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*);
/* 8003C160 */ void syncRes(char const*, dRes_info_c*, int);
/* 8003C194 */ void deleteRes(char const*, dRes_info_c*, int);
/* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int);
};
struct dPa_control_c {
/* 8004BACC */ dPa_control_c();
};
@@ -431,15 +423,15 @@ void dComIfG_play_c::ct(void) {
/* ############################################################################################## */
/* 804061A0-804061B4 032EC0 0014+00 1/1 0/0 0/0 .bss dComIfG_mTimerInfo */
static u8 dComIfG_mTimerInfo[20];
static __d_timer_info_c dComIfG_mTimerInfo;
/* 804061B4-804061C0 032ED4 000C+00 1/1 0/0 0/0 .bss @5065 */
static u8 lit_5065[12];
// static u8 lit_5065[12];
/* 804061C0-80423FD0 032EE0 1DE10+00 99/99 2264/2264 7115/7115 .bss g_dComIfG_gameInfo
*/
extern u8 g_dComIfG_gameInfo[122384];
u8 g_dComIfG_gameInfo[122384];
// extern u8 g_dComIfG_gameInfo[122384];
dComIfG_inf_c g_dComIfG_gameInfo;
/* 8002B22C-8002B2A8 025B6C 007C+00 1/1 1/1 0/0 .text init__14dComIfG_play_cFv */
#ifdef NONMATCHING
@@ -705,46 +697,46 @@ asm u32 dComIfG_play_c::entrySimpleModel(J3DModel* param_0, int param_1) {
#pragma pop
void dComIfG_play_c::setTimerNowTimeMs(int time) {
mTimerNowTimeMs = time;
mTimerInfo.mTimerNowTimeMs = time;
}
int dComIfG_play_c::getTimerNowTimeMs() {
return mTimerNowTimeMs;
return mTimerInfo.mTimerNowTimeMs;
}
void dComIfG_play_c::setTimerLimitTimeMs(int time) {
mTimerLimitTimeMs = time;
mTimerInfo.mTimerLimitTimeMs = time;
}
int dComIfG_play_c::getTimerLimitTimeMs() {
return mTimerLimitTimeMs;
return mTimerInfo.mTimerLimitTimeMs;
}
void dComIfG_play_c::setTimerMode(int mode) {
mTimerMode = mode;
mTimerInfo.mTimerMode = mode;
}
int dComIfG_play_c::getTimerMode(void) {
return mTimerMode;
return mTimerInfo.mTimerMode;
}
void dComIfG_play_c::setTimerType(u8 type) {
mTimerType = type;
mTimerInfo.mTimerType = type;
}
u8 dComIfG_play_c::getTimerType(void) {
return mTimerType;
return mTimerInfo.mTimerType;
}
/* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */
void dComIfG_play_c::setTimerPtr(dTimer_c* pTimerPtr) {
mTimerPtr = pTimerPtr;
mTimerInfo.mTimerPtr = pTimerPtr;
}
/* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text getTimerPtr__14dComIfG_play_cFv
*/
dTimer_c* dComIfG_play_c::getTimerPtr() {
return mTimerPtr;
return mTimerInfo.mTimerPtr;
}
/* 8002CBE4-8002CC54 027524 0070+00 1/1 1/1 0/0 .text ct__13dComIfG_inf_cFv */
@@ -2045,433 +2037,6 @@ asm void dComIfGs_staffroll_next_go_check() {
}
#pragma pop
/* 8002FD18-8002FD74 02A658 005C+00 0/0 1/0 0/0 .text __sinit_d_com_inf_game_cpp */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void __sinit_d_com_inf_game_cpp() {
nofralloc
#include "asm/d/com/d_com_inf_game/__sinit_d_com_inf_game_cpp.s"
}
#pragma pop
#pragma push
#pragma force_active on
REGISTER_CTORS(0x8002FD18, __sinit_d_com_inf_game_cpp);
#pragma pop
/* 8002FD74-8002FDE8 02A6B4 0074+00 1/1 0/0 0/0 .text __dt__13dComIfG_inf_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dComIfG_inf_c::~dComIfG_inf_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__13dComIfG_inf_cFv.s"
}
#pragma pop
/* 8002FDE8-8002FEF8 02A728 0110+00 1/1 0/0 0/0 .text __dt__14dComIfG_play_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dComIfG_play_c::~dComIfG_play_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__14dComIfG_play_cFv.s"
}
#pragma pop
/* 8002FEF8-8002FF40 02A838 0048+00 4/4 1/0 0/0 .text __dt__11cBgS_ChkElmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_ChkElm::~cBgS_ChkElm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__11cBgS_ChkElmFv.s"
}
#pragma pop
/* ############################################################################################## */
/* 803A71E8-803A71F4 004308 000C+00 1/1 1/1 0/0 .data __vt__25mDoExt_McaMorfCallBack1_c
*/
SECTION_DATA extern void* __vt__25mDoExt_McaMorfCallBack1_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
};
/* 803A71F4-803A7200 004314 000C+00 1/1 1/1 0/0 .data __vt__12dCcMassS_Obj */
SECTION_DATA extern void* __vt__12dCcMassS_Obj[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dCcMassS_ObjFv,
};
/* 803A7200-803A720C 004320 000C+00 4/4 2/2 0/0 .data __vt__15cCcD_DivideArea */
SECTION_DATA extern void* __vt__15cCcD_DivideArea[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__15cCcD_DivideAreaFv,
};
/* 803A720C-803A7218 00432C 000C+00 3/3 11/11 0/0 .data __vt__8cM3dGCyl */
SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGCylFv,
};
/* 803A7218-803A7224 004338 000C+00 5/5 28/28 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 803A7224-803A7230 004344 000C+00 4/4 9/9 0/0 .data __vt__15cCcD_DivideInfo */
SECTION_DATA extern void* __vt__15cCcD_DivideInfo[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__15cCcD_DivideInfoFv,
};
/* 803A7230-803A7240 004350 000C+04 2/2 1/1 0/0 .data __vt__12dCcMassS_Mng */
SECTION_DATA extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dCcMassS_MngFv,
/* padding */
NULL,
};
/* 8002FF40-800300F4 02A880 01B4+00 1/1 1/0 0/0 .text __dt__4dCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcS::~dCcS() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__4dCcSFv.s"
}
#pragma pop
/* 800300F4-80030154 02AA34 0060+00 3/2 1/1 0/0 .text __dt__12dCcMassS_ObjFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcMassS_Obj::~dCcMassS_Obj() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__12dCcMassS_ObjFv.s"
}
#pragma pop
/* 80030154-80030190 02AA94 003C+00 1/1 1/1 0/0 .text __dt__12dEvt_order_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dEvt_order_c::~dEvt_order_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__12dEvt_order_cFv.s"
}
#pragma pop
/* 80030190-800301CC 02AAD0 003C+00 1/1 1/1 0/0 .text __dt__11dEvDtBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dEvDtBase_c::~dEvDtBase_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__11dEvDtBase_cFv.s"
}
#pragma pop
/* 800301CC-80030208 02AB0C 003C+00 2/2 0/0 0/0 .text __dt__14dDlst_window_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dDlst_window_c::~dDlst_window_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__14dDlst_window_cFv.s"
}
#pragma pop
/* 80030208-80030244 02AB48 003C+00 2/2 0/0 0/0 .text __dt__25dComIfG_camera_info_classFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dComIfG_camera_info_class::~dComIfG_camera_info_class() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__25dComIfG_camera_info_classFv.s"
}
#pragma pop
/* 80030244-800304C8 02AB84 0284+00 1/1 0/0 0/0 .text __ct__13dComIfG_inf_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dComIfG_inf_c::dComIfG_inf_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__13dComIfG_inf_cFv.s"
}
#pragma pop
/* 800304C8-800304CC 02AE08 0004+00 1/1 0/0 0/0 .text __ct__25dComIfG_camera_info_classFv
*/
dComIfG_camera_info_class::dComIfG_camera_info_class() {
/* empty function */
}
/* 800304CC-800304D0 02AE0C 0004+00 1/1 0/0 0/0 .text __ct__14dDlst_window_cFv */
dDlst_window_c::dDlst_window_c() {
/* empty function */
}
/* 800304D0-8003050C 02AE10 003C+00 1/1 2/2 0/0 .text __dt__10dAttList_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dAttList_c::~dAttList_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__10dAttList_cFv.s"
}
#pragma pop
/* 8003050C-80030510 02AE4C 0004+00 1/1 1/1 0/0 .text __ct__10dAttList_cFv */
dAttList_c::dAttList_c() {
/* empty function */
}
/* 80030510-8003054C 02AE50 003C+00 0/0 9/9 0/0 .text __dt__7cSAngleFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" void asm __dt__7cSAngleFv() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__7cSAngleFv.s"
}
#pragma pop
/* 8003054C-800306A0 02AE8C 0154+00 1/1 2/2 0/0 .text __dt__10dAttDraw_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dAttDraw_c::~dAttDraw_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__10dAttDraw_cFv.s"
}
#pragma pop
/* 800306A0-800306F4 02AFE0 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_bckAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_bckAnm::~mDoExt_bckAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_bckAnmFv.s"
}
#pragma pop
/* 800306F4-80030748 02B034 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_bpkAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_bpkAnm::~mDoExt_bpkAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_bpkAnmFv.s"
}
#pragma pop
/* 80030748-8003079C 02B088 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_brkAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_brkAnm::~mDoExt_brkAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_brkAnmFv.s"
}
#pragma pop
/* 8003079C-800307F0 02B0DC 0054+00 2/2 0/0 0/0 .text __dt__13mDoExt_btkAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_btkAnm::~mDoExt_btkAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__13mDoExt_btkAnmFv.s"
}
#pragma pop
/* 800307F0-80030954 02B130 0164+00 1/1 1/1 0/0 .text __ct__10dAttDraw_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dAttDraw_c::dAttDraw_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__10dAttDraw_cFv.s"
}
#pragma pop
/* 80030954-8003099C 02B294 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_btkAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_btkAnm::mDoExt_btkAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_btkAnmFv.s"
}
#pragma pop
/* 8003099C-800309E4 02B2DC 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_brkAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_brkAnm::mDoExt_brkAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_brkAnmFv.s"
}
#pragma pop
/* 800309E4-80030A2C 02B324 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_bpkAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_bpkAnm::mDoExt_bpkAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_bpkAnmFv.s"
}
#pragma pop
/* 80030A2C-80030A74 02B36C 0048+00 1/1 0/0 0/0 .text __ct__13mDoExt_bckAnmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm mDoExt_bckAnm::mDoExt_bckAnm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__13mDoExt_bckAnmFv.s"
}
#pragma pop
/* 80030A74-80030BDC 02B3B4 0168+00 1/0 0/0 0/0 .text __dt__12dCcMassS_MngFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcMassS_Mng::~dCcMassS_Mng() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__12dCcMassS_MngFv.s"
}
#pragma pop
/* 80030BDC-80030C50 02B51C 0074+00 0/0 1/0 0/0 .text __dt__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcS::~cCcS() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__4cCcSFv.s"
}
#pragma pop
/* 80030C50-80030CCC 02B590 007C+00 0/0 1/0 0/0 .text __dt__4dBgSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dBgS::~dBgS() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__4dBgSFv.s"
}
#pragma pop
/* 80030CCC-80030D38 02B60C 006C+00 0/0 1/0 0/0 .text __dt__4cBgSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS::~cBgS() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__4cBgSFv.s"
}
#pragma pop
/* 80030D38-80030D74 02B678 003C+00 1/1 0/0 0/0 .text __ct__11cBgS_ChkElmFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_ChkElm::cBgS_ChkElm() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__11cBgS_ChkElmFv.s"
}
#pragma pop
/* 80030D74-80030D80 02B6B4 000C+00 1/1 0/0 0/0 .text __ct__10dSv_zone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dSv_zone_c::dSv_zone_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__10dSv_zone_cFv.s"
}
#pragma pop
/* 80030D80-80030DB0 02B6C0 0030+00 1/1 1/1 0/0 .text __ct__13dSv_memory2_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dSv_memory2_c::dSv_memory2_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__13dSv_memory2_cFv.s"
}
#pragma pop
/* 80030DB0-80030DE0 02B6F0 0030+00 1/1 1/1 0/0 .text __ct__12dSv_memory_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dSv_memory_c::dSv_memory_c() {
nofralloc
#include "asm/d/com/d_com_inf_game/__ct__12dSv_memory_cFv.s"
}
#pragma pop
/* 80030DE0-80030E3C 02B720 005C+00 1/0 0/0 0/0 .text __dt__15cCcD_DivideAreaFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcD_DivideArea::~cCcD_DivideArea() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__15cCcD_DivideAreaFv.s"
}
#pragma pop
/* 80030E3C-80030E84 02B77C 0048+00 1/0 1/1 0/0 .text __dt__8cM3dGCylFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cM3dGCyl::~cM3dGCyl() {
extern "C" asm void __dt__8cM3dGCylFv(void) { // should be autogenerated eventually
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__8cM3dGCylFv.s"
}
#pragma pop
/* 80030E84-80030ECC 02B7C4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cM3dGAab::~cM3dGAab() {
extern "C" asm void __dt__8cM3dGAabFv(void) { // should be autogenerated eventually
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__8cM3dGAabFv.s"
}
#pragma pop
/* 80030ECC-80030F14 02B80C 0048+00 1/0 0/0 0/0 .text __dt__15cCcD_DivideInfoFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcD_DivideInfo::~cCcD_DivideInfo() {
nofralloc
#include "asm/d/com/d_com_inf_game/__dt__15cCcD_DivideInfoFv.s"
}
#pragma pop
/* ############################################################################################## */
/* 80450608-8045060C 000088 0004+00 0/0 6/6 11/11 .sdata g_whiteColor */
SECTION_SDATA extern u32 g_whiteColor = 0xFFFFFFFF;
src/d/d_attention.cpp
+8 -4
View File
@@ -315,7 +315,8 @@ SECTION_SDATA2 static f32 lit_4073 = 1.0f;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dAttParam_c::dAttParam_c(s32 param_0) {
// asm dAttParam_c::dAttParam_c(s32 param_0) {
extern "C" asm void __ct__11dAttParam_cFl() {
nofralloc
#include "asm/d/d_attention/__ct__11dAttParam_cFl.s"
}
@@ -325,7 +326,8 @@ asm dAttParam_c::dAttParam_c(s32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dAttParam_c::~dAttParam_c() {
// asm dAttParam_c::~dAttParam_c() {
extern "C" asm void __dt__11dAttParam_cFv() {
nofralloc
#include "asm/d/d_attention/__dt__11dAttParam_cFv.s"
}
@@ -342,7 +344,8 @@ SECTION_SDATA2 static f32 lit_4085 = 2.0f;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dAttDrawParam_c::dAttDrawParam_c() {
// asm dAttDrawParam_c::dAttDrawParam_c() {
extern "C" asm void __ct__15dAttDrawParam_cFv() {
nofralloc
#include "asm/d/d_attention/__ct__15dAttDrawParam_cFv.s"
}
@@ -357,7 +360,8 @@ SECTION_SDATA2 static f32 lit_4092 = 3.0f / 5.0f;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) {
// asm void dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) {
extern "C" asm void execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo() {
nofralloc
#include "asm/d/d_attention/execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo.s"
}
src/d/d_stage.cpp
+14 -361
View File
@@ -33,10 +33,6 @@ struct dSvBit_HIO_c {
/* 8025C1F8 */ void init();
};
struct dStage_KeepDoorInfo {
/* 80028418 */ ~dStage_KeepDoorInfo();
};
struct dRes_info_c {};
struct dRes_control_c {
@@ -460,7 +456,7 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void sprintf();
extern "C" void snprintf(char*, u32, char*, ...);
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern J3DLightInfo const j3dDefaultLightInfo;
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */];
extern "C" extern u8 data_804505F0[8];
@@ -500,10 +496,10 @@ static void dStage_SetErrorStage() {
/* ############################################################################################## */
/* 803F4E68-803F4E74 021B88 000C+00 1/1 0/0 0/0 .bss @3926 */
static u8 lit_3926[12];
// static u8 lit_3926[12];
/* 803F4E74-803F5778 021B94 0904+00 3/4 0/0 0/0 .bss DoorInfo */
static u8 DoorInfo[2308];
static dStage_KeepDoorInfo DoorInfo;
/* 80023EF4-80023F00 01E834 000C+00 0/0 1/1 0/0 .text dStage_GetKeepDoorInfo__Fv */
#pragma push
@@ -549,13 +545,13 @@ static asm void dStage_KeepDoorInfoProc(dStage_dt_c* param_0, stage_tgsc_class*
/* ############################################################################################## */
/* 803F5778-803F5784 022498 000C+00 0/1 0/0 0/0 .bss @3981 */
#pragma push
#pragma force_active on
static u8 lit_3981[12];
#pragma pop
// #pragma push
// #pragma force_active on
// static u8 lit_3981[12];
// #pragma pop
/* 803F5784-803F6088 0224A4 0904+00 3/4 0/0 0/0 .bss l_RoomKeepDoorInfo */
static u8 l_RoomKeepDoorInfo[2308];
static dStage_KeepDoorInfo l_RoomKeepDoorInfo;
/* 8002405C-80024068 01E99C 000C+00 0/0 1/1 0/0 .text dStage_GetRoomKeepDoorInfo__Fv */
#pragma push
@@ -615,14 +611,14 @@ SECTION_DEAD static char const* const stringBase_80378ADD = "name.bin";
SECTION_DEAD static char const* const stringBase_80378AE6 = "bank.bin";
#pragma pop
/* 803F6088-803F6094 022DA8 000C+00 0/1 0/0 0/0 .bss @5376 */
#pragma push
#pragma force_active on
static u8 lit_5376[12];
#pragma pop
// /* 803F6088-803F6094 022DA8 000C+00 0/1 0/0 0/0 .bss @5376 */
// #pragma push
// #pragma force_active on
// static u8 lit_5376[12];
// #pragma pop
/* 803F6094-80406194 022DB4 10100+00 12/12 31/31 16/16 .bss mStatus__20dStage_roomControl_c */
u8 dStage_roomControl_c::mStatus[65792];
dStage_roomStatus_c dStage_roomControl_c::mStatus[0x40];
/* 80450D58-80450D60 000258 0008+00 1/1 0/0 0/0 .sbss tmp_name$4456 */
static char tmp_name[8];
@@ -3131,349 +3127,6 @@ void dStage_stageDt_c::setElst(dStage_Elst_c* i_Elst) {
mElst = i_Elst;
}
/* 8002824C-80028328 022B8C 00DC+00 0/0 1/0 0/0 .text __sinit_d_stage_cpp */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void __sinit_d_stage_cpp() {
nofralloc
#include "asm/d/d_stage/__sinit_d_stage_cpp.s"
}
#pragma pop
#pragma push
#pragma force_active on
REGISTER_CTORS(0x8002824C, __sinit_d_stage_cpp);
#pragma pop
/* 80028328-80028360 022C68 0038+00 1/1 0/0 0/0 .text __arraydtor$5375 */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void func_80028328() {
nofralloc
#include "asm/d/d_stage/func_80028328.s"
}
#pragma pop
dStage_roomStatus_c::~dStage_roomStatus_c() {}
/* ############################################################################################## */
/* 803A6AAC-803A6C20 003BCC 0174+00 1/1 0/0 0/0 .data __vt__15dStage_roomDt_c */
SECTION_DATA extern void* __vt__15dStage_roomDt_c[93] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)init__15dStage_roomDt_cFv,
(void*)setCamera__15dStage_roomDt_cFP18stage_camera_class,
(void*)getCamera__15dStage_roomDt_cCFv,
(void*)setArrow__15dStage_roomDt_cFP17stage_arrow_class,
(void*)getArrow__15dStage_roomDt_cCFv,
(void*)setPlayer__15dStage_roomDt_cFP17stage_actor_class,
(void*)getPlayer__15dStage_roomDt_cCFv,
(void*)setPlayerNum__15dStage_roomDt_cFUs,
(void*)getPlayerNum__15dStage_roomDt_cCFv,
(void*)setRoom__15dStage_roomDt_cFP14roomRead_class,
(void*)getRoom__15dStage_roomDt_cCFv,
(void*)setMapInfo__15dStage_roomDt_cFP20stage_map_info_class,
(void*)getMapInfo__15dStage_roomDt_cCFv,
(void*)getMapInfo2__15dStage_roomDt_cCFi,
(void*)setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class,
(void*)getMapInfoBase__15dStage_roomDt_cCFv,
(void*)setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class,
(void*)getPaletteInfo__15dStage_roomDt_cCFv,
(void*)setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class,
(void*)getPselectInfo__15dStage_roomDt_cCFv,
(void*)setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class,
(void*)getEnvrInfo__15dStage_roomDt_cCFv,
(void*)setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class,
(void*)getVrboxInfo__15dStage_roomDt_cCFv,
(void*)setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class,
(void*)getVrboxcolInfo__15dStage_roomDt_cCFv,
(void*)setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class,
(void*)getPlightInfo__15dStage_roomDt_cCFv,
(void*)setPaletteNumInfo__15dStage_roomDt_cFi,
(void*)getPaletteNumInfo__15dStage_roomDt_cCFv,
(void*)setPselectNumInfo__15dStage_roomDt_cFi,
(void*)getPselectNumInfo__15dStage_roomDt_cCFv,
(void*)setEnvrNumInfo__15dStage_roomDt_cFi,
(void*)getEnvrNumInfo__15dStage_roomDt_cCFv,
(void*)setVrboxNumInfo__15dStage_roomDt_cFi,
(void*)getVrboxNumInfo__15dStage_roomDt_cCFv,
(void*)setVrboxcolNumInfo__15dStage_roomDt_cFi,
(void*)getVrboxcolNumInfo__15dStage_roomDt_cCFv,
(void*)setPlightNumInfo__15dStage_roomDt_cFi,
(void*)getPlightNumInfo__15dStage_roomDt_cCFv,
(void*)setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class,
(void*)getLightVecInfo__15dStage_roomDt_cCFv,
(void*)setLightVecInfoNum__15dStage_roomDt_cFi,
(void*)getLightVecInfoNum__15dStage_roomDt_cCFv,
(void*)setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class,
(void*)getStagInfo__15dStage_roomDt_cCFv,
(void*)setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class,
(void*)getSclsInfo__15dStage_roomDt_cCFv,
(void*)setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c,
(void*)getPntInf__15dStage_roomDt_cCFv,
(void*)setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c,
(void*)getPathInf__15dStage_roomDt_cCFv,
(void*)setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c,
(void*)getPnt2Inf__15dStage_roomDt_cCFv,
(void*)setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c,
(void*)getPath2Inf__15dStage_roomDt_cCFv,
(void*)setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c,
(void*)getSoundInf__15dStage_roomDt_cCFv,
(void*)setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c,
(void*)getSoundInfCL__15dStage_roomDt_cCFv,
(void*)setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c,
(void*)getMapEventInfo__15dStage_roomDt_cCFv,
(void*)setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c,
(void*)getFileList2Info__15dStage_roomDt_cCFv,
(void*)setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c,
(void*)getFileListInfo__15dStage_roomDt_cCFv,
(void*)setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c,
(void*)getFloorInfo__15dStage_roomDt_cCFv,
(void*)setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c,
(void*)getMemoryConfig__15dStage_roomDt_cCFv,
(void*)setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c,
(void*)getMemoryMap__15dStage_roomDt_cCFv,
(void*)setMulti__15dStage_roomDt_cFP14dStage_Multi_c,
(void*)getMulti__15dStage_roomDt_cCFv,
(void*)setOldMulti__15dStage_roomDt_cFv,
(void*)resetOldMulti__15dStage_roomDt_cFv,
(void*)getOldMulti__15dStage_roomDt_cCFv,
(void*)setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c,
(void*)getLbnk__15dStage_roomDt_cCFv,
(void*)setTresure__15dStage_roomDt_cFP19stage_tresure_class,
(void*)getTresure__15dStage_roomDt_cCFv,
(void*)setDMap__15dStage_roomDt_cFP13dStage_DMap_c,
(void*)getDMap__15dStage_roomDt_cCFv,
(void*)setDrTg__15dStage_roomDt_cFP16stage_tgsc_class,
(void*)getDrTg__15dStage_roomDt_cCFv,
(void*)setDoor__15dStage_roomDt_cFP16stage_tgsc_class,
(void*)getDoor__15dStage_roomDt_cCFv,
(void*)setMapPath__15dStage_roomDt_cFPv,
(void*)getMapPath__15dStage_roomDt_cFv,
(void*)setElst__15dStage_roomDt_cFP13dStage_Elst_c,
(void*)getElst__15dStage_roomDt_cFv,
};
/* 803A6C20-803A6D94 003D40 0174+00 0/0 1/1 0/0 .data __vt__16dStage_stageDt_c */
SECTION_DATA extern void* __vt__16dStage_stageDt_c[93] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)init__16dStage_stageDt_cFv,
(void*)setCamera__16dStage_stageDt_cFP18stage_camera_class,
(void*)getCamera__16dStage_stageDt_cCFv,
(void*)setArrow__16dStage_stageDt_cFP17stage_arrow_class,
(void*)getArrow__16dStage_stageDt_cCFv,
(void*)setPlayer__16dStage_stageDt_cFP17stage_actor_class,
(void*)getPlayer__16dStage_stageDt_cCFv,
(void*)setPlayerNum__16dStage_stageDt_cFUs,
(void*)getPlayerNum__16dStage_stageDt_cCFv,
(void*)setRoom__16dStage_stageDt_cFP14roomRead_class,
(void*)getRoom__16dStage_stageDt_cCFv,
(void*)setMapInfo__16dStage_stageDt_cFP20stage_map_info_class,
(void*)getMapInfo__16dStage_stageDt_cCFv,
(void*)getMapInfo2__16dStage_stageDt_cCFi,
(void*)setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class,
(void*)getMapInfoBase__16dStage_stageDt_cCFv,
(void*)setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class,
(void*)getPaletteInfo__16dStage_stageDt_cCFv,
(void*)setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class,
(void*)getPselectInfo__16dStage_stageDt_cCFv,
(void*)setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class,
(void*)getEnvrInfo__16dStage_stageDt_cCFv,
(void*)setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class,
(void*)getVrboxInfo__16dStage_stageDt_cCFv,
(void*)setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class,
(void*)getVrboxcolInfo__16dStage_stageDt_cCFv,
(void*)setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class,
(void*)getPlightInfo__16dStage_stageDt_cCFv,
(void*)setPaletteNumInfo__16dStage_stageDt_cFi,
(void*)getPaletteNumInfo__16dStage_stageDt_cCFv,
(void*)setPselectNumInfo__16dStage_stageDt_cFi,
(void*)getPselectNumInfo__16dStage_stageDt_cCFv,
(void*)setEnvrNumInfo__16dStage_stageDt_cFi,
(void*)getEnvrNumInfo__16dStage_stageDt_cCFv,
(void*)setVrboxNumInfo__16dStage_stageDt_cFi,
(void*)getVrboxNumInfo__16dStage_stageDt_cCFv,
(void*)setVrboxcolNumInfo__16dStage_stageDt_cFi,
(void*)getVrboxcolNumInfo__16dStage_stageDt_cCFv,
(void*)setPlightNumInfo__16dStage_stageDt_cFi,
(void*)getPlightNumInfo__16dStage_stageDt_cCFv,
(void*)setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class,
(void*)getLightVecInfo__16dStage_stageDt_cCFv,
(void*)setLightVecInfoNum__16dStage_stageDt_cFi,
(void*)getLightVecInfoNum__16dStage_stageDt_cCFv,
(void*)setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class,
(void*)getStagInfo__16dStage_stageDt_cCFv,
(void*)setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class,
(void*)getSclsInfo__16dStage_stageDt_cCFv,
(void*)setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c,
(void*)getPntInf__16dStage_stageDt_cCFv,
(void*)setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c,
(void*)getPathInf__16dStage_stageDt_cCFv,
(void*)setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c,
(void*)getPnt2Inf__16dStage_stageDt_cCFv,
(void*)setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c,
(void*)getPath2Inf__16dStage_stageDt_cCFv,
(void*)setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c,
(void*)getSoundInf__16dStage_stageDt_cCFv,
(void*)setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c,
(void*)getSoundInfCL__16dStage_stageDt_cCFv,
(void*)setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c,
(void*)getMapEventInfo__16dStage_stageDt_cCFv,
(void*)setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c,
(void*)getFileList2Info__16dStage_stageDt_cCFv,
(void*)setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c,
(void*)getFileListInfo__16dStage_stageDt_cCFv,
(void*)setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c,
(void*)getFloorInfo__16dStage_stageDt_cCFv,
(void*)setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c,
(void*)getMemoryConfig__16dStage_stageDt_cCFv,
(void*)setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c,
(void*)getMemoryMap__16dStage_stageDt_cCFv,
(void*)setMulti__16dStage_stageDt_cFP14dStage_Multi_c,
(void*)getMulti__16dStage_stageDt_cCFv,
(void*)setOldMulti__16dStage_stageDt_cFv,
(void*)resetOldMulti__16dStage_stageDt_cFv,
(void*)getOldMulti__16dStage_stageDt_cCFv,
(void*)setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c,
(void*)getLbnk__16dStage_stageDt_cCFv,
(void*)setTresure__16dStage_stageDt_cFP19stage_tresure_class,
(void*)getTresure__16dStage_stageDt_cCFv,
(void*)setDMap__16dStage_stageDt_cFP13dStage_DMap_c,
(void*)getDMap__16dStage_stageDt_cCFv,
(void*)setDrTg__16dStage_stageDt_cFP16stage_tgsc_class,
(void*)getDrTg__16dStage_stageDt_cCFv,
(void*)setDoor__16dStage_stageDt_cFP16stage_tgsc_class,
(void*)getDoor__16dStage_stageDt_cCFv,
(void*)setMapPath__16dStage_stageDt_cFPv,
(void*)getMapPath__16dStage_stageDt_cFv,
(void*)setElst__16dStage_stageDt_cFP13dStage_Elst_c,
(void*)getElst__16dStage_stageDt_cFv,
};
/* 803A6D94-803A6F08 003EB4 0174+00 1/1 1/1 0/0 .data __vt__11dStage_dt_c */
SECTION_DATA extern void* __vt__11dStage_dt_c[93] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 8002839C-80028418 022CDC 007C+00 1/1 0/0 0/0 .text __ct__19dStage_roomStatus_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dStage_roomStatus_c::dStage_roomStatus_c() {
nofralloc
#include "asm/d/d_stage/__ct__19dStage_roomStatus_cFv.s"
}
#pragma pop
/* 80028418-8002847C 022D58 0064+00 1/1 0/0 0/0 .text __dt__19dStage_KeepDoorInfoFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dStage_KeepDoorInfo::~dStage_KeepDoorInfo() {
nofralloc
#include "asm/d/d_stage/__dt__19dStage_KeepDoorInfoFv.s"
}
#pragma pop
stage_tgsc_data_class::~stage_tgsc_data_class() {}
stage_tgsc_data_class::stage_tgsc_data_class() {}
/* ############################################################################################## */
/* 80450D7C-80450D80 -00001 0004+00 0/0 0/0 0/0 .sbss None */
#pragma push
src/d/kankyo/d_kankyo.cpp
-1
View File
@@ -568,7 +568,6 @@ extern "C" void cos();
extern "C" void sin();
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 const j3dDefaultMtx[48];
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
src/d/particle/d_particle.cpp
-1
View File
@@ -670,7 +670,6 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void sprintf();
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__19JPAParticleCallBack[5];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" u8 j_o_id__8dPa_name[10 + 2 /* padding */];
src/f_op/f_op_actor.cpp
+6 -15
View File
@@ -4,6 +4,7 @@
//
#include "f_op/f_op_actor.h"
#include "d/d_stage.h"
#include "dol2asm.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
@@ -23,18 +24,6 @@ struct daSus_c {
/* 800314D4 */ void check(fopAc_ac_c*);
};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dStage_roomDt_c {
/* 800193FC */ void getFileListInfo() const;
};
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
};
struct J3DModelData {};
struct dScnKy_env_light_c {
@@ -157,7 +146,6 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
extern "C" void __construct_array();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" f32 Zero__4cXyz[3];
@@ -195,7 +183,8 @@ extern "C" asm void __dt__5csXyzFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DLightObj::J3DLightObj() {
// asm J3DLightObj::J3DLightObj() {
extern "C" asm void __ct__11J3DLightObjFv() {
nofralloc
#include "asm/f_op/f_op_actor/__ct__11J3DLightObjFv.s"
}
@@ -330,9 +319,11 @@ static asm void fopAc_Create(void* param_0) {
/* 800193FC-80019404 013D3C 0008+00 0/0 1/0 0/0 .text getFileListInfo__15dStage_roomDt_cCFv */
#pragma push
#pragma force_active on
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dStage_roomDt_c::getFileListInfo() const {
// asm void dStage_roomDt_c::getFileListInfo() const {
extern "C" asm void getFileListInfo__15dStage_roomDt_cCFv() {
nofralloc
#include "asm/f_op/f_op_actor/getFileListInfo__15dStage_roomDt_cCFv.s"
}
src/m_Do/m_Do_ext.cpp
+2 -1
View File
@@ -2714,7 +2714,8 @@ asm mDoExt_morf_c::mDoExt_morf_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DFrameCtrl::~J3DFrameCtrl() {
// asm J3DFrameCtrl::~J3DFrameCtrl() {
extern "C" asm void __dt__12J3DFrameCtrlFv() {
nofralloc
#include "asm/m_Do/m_Do_ext/__dt__12J3DFrameCtrlFv.s"
}