obj_brakeeff_class Matching (#2430)

* Laid out obj_brakeeff_class members

* Matched daObj_Brakeeff_Draw

* obj_brakeeff::action almost matching

* brakeeff_Delete matching

* daObj_Brakeeff_Execute matching

* work on obj_brakeeff_1

* Matched action and brakeff1

* obj_brakeeff_create almost matching

* d_a_obj_brakeeff Matching

* d_a_obj_brakeeff additional cleanup

* Revert line deleted

* Fix tab indentation

---------

Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
This commit is contained in:
Joaquin Royer 2025-05-15 04:06:51 -04:00 committed by GitHub
parent 3c79fdd2b9
commit c3660c3fe0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 237 additions and 235 deletions

View File

@ -1479,7 +1479,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag00"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag04"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag17"),
ActorRel(NonMatching, "d_a_obj_brakeeff"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_brakeeff"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_burnbox"),
ActorRel(NonMatching, "d_a_obj_carry"),
ActorRel(NonMatching, "d_a_obj_ito"),

View File

@ -2,6 +2,13 @@
#define D_A_OBJ_BRAKEEFF_H
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_cc_d.h"
#include "mtx.h"
class J3DModel;
class mDoExt_brkAnm;
class dBgW;
/**
* @ingroup actors-objects
@ -12,11 +19,23 @@
*
*/
class obj_brakeeff_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x73c - 0x568];
public:
/* 0x568 */ request_of_phase_process_class mRequestOfPhase;
/* 0x570 */ u8 mEffectType;
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ mDoExt_brkAnm* mpBrk;
/* 0x57C */ s16 mMiscTimer1;
/* 0x57E */ s16 mMiscTimer2;
/* 0x580 */ s16 mMiscTimer3;
/* 0x582 */ s16 mMiscTimers[2];
/* 0x588 */ dCcD_Stts mDCcD_Stts;
/* 0x5C4 */ dCcD_Sph mDCcD_Sph;
/* 0x6FC */ u32 mRuntimeParticleIds[2];
/* 0x704 */ u8 padding_0x704[4];
/* 0x708 */ Mtx mStoredMatrix;
/* 0x738 */ dBgW* mpDBgW;
};
STATIC_ASSERT(sizeof(obj_brakeeff_class) == 0x73c);
#endif /* D_A_OBJ_BRAKEEFF_H */

View File

@ -4,269 +4,252 @@
*/
#include "d/actor/d_a_obj_brakeeff.h"
#include "d/d_cc_d.h"
#include "dol2asm.h"
#include "d/d_kankyo.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s.h"
#include "d/d_bg_w.h"
#include "dolphin/mtx.h"
#include "d/d_com_inf_game.h"
#include "d/d_cc_uty.h"
//Particle IDS
u16 e_name[5] = {
0x00, 0x00, 0x00, 0x00, 0x00
};
//
// Forward References:
//
//model data per effect type
u32 bef_bmd[2] = {
5,
6,
};
extern "C" static void daObj_Brakeeff_Draw__FP18obj_brakeeff_class();
extern "C" static void obj_brakeeff_1__FP18obj_brakeeff_class();
extern "C" static void action__FP18obj_brakeeff_class();
extern "C" static void daObj_Brakeeff_Execute__FP18obj_brakeeff_class();
extern "C" static bool daObj_Brakeeff_IsDelete__FP18obj_brakeeff_class();
extern "C" static void daObj_Brakeeff_Delete__FP18obj_brakeeff_class();
extern "C" static void useHeapInit__FP10fopAc_ac_c();
extern "C" void __dt__12J3DFrameCtrlFv();
extern "C" static void daObj_Brakeeff_Create__FP10fopAc_ac_c();
extern "C" void __dt__8cM3dGSphFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" extern char const* const d_a_obj_brakeeff__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoMtx_ZrotM__FPA4_fs();
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss();
extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void
set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void Release__4cBgSFP9dBgW_Base();
extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f();
extern "C" void __ct__4dBgWFv();
extern "C" void Move__4dBgWFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void ChkTgHit__12dCcD_GObjInfFv();
extern "C" void GetTgHitObj__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
extern "C" void at_power_check__FP11dCcU_AtInfo();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void cM_atan2s__Fff();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void init__12J3DFrameCtrlFs();
extern "C" void _savegpr_24();
extern "C" void _savegpr_29();
extern "C" void _restgpr_24();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
//J3DAnmTevRegKey per effect type
u32 bef_brk[2] = {
9,
10,
};
/* 8046DCB8-8046DD38 000078 0080+00 1/0 0/0 0/0 .text daObj_Brakeeff_Draw__FP18obj_brakeeff_class
*/
static void daObj_Brakeeff_Draw(obj_brakeeff_class* param_0) {
// NONMATCHING
int daObj_Brakeeff_Draw(obj_brakeeff_class* i_this) {
J3DModel* model = i_this->mpModel;
g_env_light.settingTevStruct(64, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr);
i_this->mpBrk->entry(model->getModelData());
mDoExt_modelUpdateDL(model);
return 1;
}
/* ############################################################################################## */
/* 8046E528-8046E52C 000000 0004+00 2/2 0/0 0/0 .rodata @3879 */
SECTION_RODATA static f32 const lit_3879 = 1.0f;
COMPILER_STRIP_GATE(0x8046E528, &lit_3879);
/* 8046E52C-8046E530 000004 0004+00 0/1 0/0 0/0 .rodata @3880 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3880 = 75.0f;
COMPILER_STRIP_GATE(0x8046E52C, &lit_3880);
#pragma pop
/* 8046E530-8046E534 000008 0004+00 0/1 0/0 0/0 .rodata @3881 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3881 = 50.0f;
COMPILER_STRIP_GATE(0x8046E530, &lit_3881);
#pragma pop
/* 8046E534-8046E538 00000C 0004+00 0/1 0/0 0/0 .rodata @3882 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3882 = 14.0f / 25.0f;
COMPILER_STRIP_GATE(0x8046E534, &lit_3882);
#pragma pop
/* 8046E540-8046E54C 000000 000A+02 1/1 0/0 0/0 .data e_name */
SECTION_DATA static u8 e_name[10 + 2 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
/* padding */
0x00,
0x00,
};
/* 8046DD38-8046DF80 0000F8 0248+00 1/1 0/0 0/0 .text obj_brakeeff_1__FP18obj_brakeeff_class */
static void obj_brakeeff_1(obj_brakeeff_class* param_0) {
// NONMATCHING
void obj_brakeeff_1(obj_brakeeff_class* i_this) {
cXyz pos (i_this->current.pos);
cXyz misc_vector(1.0f, 1.0f, 1.0f);
if(i_this->mEffectType == 0){
pos.y += 75.0f;
}
else if(i_this->mEffectType == 1){
pos.y += 50.0f;
misc_vector.set(0.56f, 0.56f, 0.56f);
}
switch (i_this->mMiscTimer3) {
default:
return;
case 0:
i_this->mMiscTimer3 = 1;
i_this->mMiscTimers[0] = 60;
break;
case 1:
break;
}
for(int i = 0; i < 2; i++){
i_this->mRuntimeParticleIds[i] = dComIfGp_particle_set(i_this->mRuntimeParticleIds[i], e_name[i],&pos, &i_this->current.angle, &misc_vector);
}
if(i_this->mMiscTimers[0] == 0){
i_this->mDCcD_Sph.SetC(pos);
dComIfG_Ccsp()->Set(&i_this->mDCcD_Sph);
if(i_this->mDCcD_Sph.ChkTgHit()){
i_this->mMiscTimer3 = 2;
dCcU_AtInfo atInfo;
atInfo.mpCollider = i_this->mDCcD_Sph.GetTgHitObj();
at_power_check(&atInfo);
cXyz result = i_this->current.pos - atInfo.mpActor->current.pos;
i_this->current.angle.y = cM_atan2s(result.x, result.z);
for(int i = 2; i < 5; i++){
dComIfGp_particle_set(e_name[i], &pos, &i_this->current.angle, &misc_vector);
}
fopAcM_delete(i_this);
}
}
}
/* 8046DF80-8046DFB0 000340 0030+00 1/1 0/0 0/0 .text action__FP18obj_brakeeff_class */
static void action(obj_brakeeff_class* param_0) {
// NONMATCHING
void action(obj_brakeeff_class* i_this) {
switch (i_this->mMiscTimer2){
case 0:
obj_brakeeff_1(i_this);
break;
}
}
/* 8046DFB0-8046E098 000370 00E8+00 2/1 0/0 0/0 .text
* daObj_Brakeeff_Execute__FP18obj_brakeeff_class */
static void daObj_Brakeeff_Execute(obj_brakeeff_class* param_0) {
// NONMATCHING
int daObj_Brakeeff_Execute(obj_brakeeff_class* i_this) {
i_this->mMiscTimer1++;
for(int i = 0; i < 2; i++) {
if(i_this->mMiscTimers[i] != 0){
i_this->mMiscTimers[i]--;
}
}
action(i_this);
mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
mDoMtx_stack_c::YrotM(i_this->shape_angle.y);
mDoMtx_stack_c::XrotM(i_this->shape_angle.x);
mDoMtx_stack_c::ZrotM(i_this->shape_angle.z);
i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), i_this->mStoredMatrix);
i_this->mpDBgW->Move();
i_this->mpBrk->play();
return 1;
}
/* 8046E098-8046E0A0 000458 0008+00 1/0 0/0 0/0 .text
* daObj_Brakeeff_IsDelete__FP18obj_brakeeff_class */
static bool daObj_Brakeeff_IsDelete(obj_brakeeff_class* param_0) {
return true;
int daObj_Brakeeff_IsDelete(obj_brakeeff_class* i_this) {
return 1;
}
/* ############################################################################################## */
/* 8046E538-8046E538 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8046E538 = "Obj_Bef";
#pragma pop
/* 8046E0A0-8046E0F0 000460 0050+00 1/0 0/0 0/0 .text
* daObj_Brakeeff_Delete__FP18obj_brakeeff_class */
static void daObj_Brakeeff_Delete(obj_brakeeff_class* param_0) {
// NONMATCHING
int daObj_Brakeeff_Delete(obj_brakeeff_class* i_this) {
dComIfG_resDelete(&i_this->mRequestOfPhase, "Obj_Bef");
dComIfG_Bgsp().Release(i_this->mpDBgW);
return 1;
}
/* ############################################################################################## */
/* 8046E54C-8046E554 00000C 0008+00 1/1 0/0 0/0 .data bef_bmd */
SECTION_DATA static u8 bef_bmd[8] = {
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06,
};
/* 8046E0F0-8046E2B0 0004B0 01C0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
int useHeapInit(fopAc_ac_c* i_this) {
obj_brakeeff_class* a_this = static_cast<obj_brakeeff_class*>(i_this);
/* 8046E554-8046E55C 000014 0008+00 1/1 0/0 0/0 .data bef_brk */
SECTION_DATA static u8 bef_brk[8] = {
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A,
};
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Obj_Bef", bef_bmd[a_this->mEffectType]));
a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000,0x11000084);
if (a_this->mpModel == NULL) {
return 0;
}
a_this->mpBrk = new mDoExt_brkAnm();
if(!a_this->mpBrk){
return 0;
}
J3DAnmTevRegKey* tev_anm = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Obj_Bef", bef_brk[a_this->mEffectType]));
if (!a_this->mpBrk->init(a_this->mpModel->getModelData(), tev_anm, 1,0,1.0f,0,-1)) {
return 0;
}
a_this->mpDBgW = new dBgW();
if(!a_this->mpDBgW){
return 0;
}
cBgD_t* cbgd = (cBgD_t *)dComIfG_getObjectRes("Obj_Bef", 13);
u32 res = a_this->mpDBgW->Set(cbgd, 1, &a_this->mStoredMatrix);
if(res == 1){
return 0;
}
a_this->mpDBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
return 1;
}
/* 8046E2F8-8046E490 0006B8 0198+00 1/0 0/0 0/0 .text daObj_Brakeeff_Create__FP10fopAc_ac_c */
int daObj_Brakeeff_Create(fopAc_ac_c* i_this) {
static dCcD_SrcSph cc_sph_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x20, 0x11}, 0x0}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
} // mSphAttr
};
obj_brakeeff_class* a_this = static_cast<obj_brakeeff_class*>(i_this);
fopAcM_SetupActor(a_this, obj_brakeeff_class);
int res_load_result = dComIfG_resLoad(&a_this->mRequestOfPhase, "Obj_Bef");
if(res_load_result == cPhs_COMPLEATE_e){
a_this->mEffectType = fopAcM_GetParam(i_this);
bool is_heap_set = fopAcM_entrySolidHeap(i_this, useHeapInit,0x4b000);
if(!is_heap_set) return cPhs_ERROR_e;
bool is_registered = dComIfG_Bgsp().Regist(a_this->mpDBgW, i_this);
if(is_registered) return cPhs_ERROR_e;
fopAcM_SetMtx(i_this, a_this->mpModel->getBaseTRMtx());
a_this->mDCcD_Stts.Init(255, 0, i_this);
a_this->mDCcD_Sph.Set(cc_sph_src);
a_this->mDCcD_Sph.SetStts(&a_this->mDCcD_Stts);
daObj_Brakeeff_Execute(a_this);
}
return res_load_result;
}
/* 8046E55C-8046E59C 00001C 0040+00 1/1 0/0 0/0 .data cc_sph_src$4003 */
static dCcD_SrcSph cc_sph_src = {
{
{0x0, {{0x0, 0x0, 0x0}, {0x20, 0x11}, 0x0}}, // mObj
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
} // mSphAttr
};
/* 8046E59C-8046E5BC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Brakeeff_Method */
static actor_method_class l_daObj_Brakeeff_Method = {
(process_method_func)daObj_Brakeeff_Create__FP10fopAc_ac_c,
(process_method_func)daObj_Brakeeff_Delete__FP18obj_brakeeff_class,
(process_method_func)daObj_Brakeeff_Execute__FP18obj_brakeeff_class,
(process_method_func)daObj_Brakeeff_IsDelete__FP18obj_brakeeff_class,
(process_method_func)daObj_Brakeeff_Draw__FP18obj_brakeeff_class,
actor_method_class l_daObj_Brakeeff_Method = {
(process_method_func)daObj_Brakeeff_Create,
(process_method_func)daObj_Brakeeff_Delete,
(process_method_func)daObj_Brakeeff_Execute,
(process_method_func)daObj_Brakeeff_IsDelete,
(process_method_func)daObj_Brakeeff_Draw,
};
/* 8046E5BC-8046E5EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_BEF */
extern actor_process_profile_definition g_profile_OBJ_BEF = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_OBJ_BEF, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(obj_brakeeff_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
39, // mPriority
&l_daObj_Brakeeff_Method, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_7_e, // cullType
};
/* 8046E5EC-8046E5F8 0000AC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */
SECTION_DATA extern void* __vt__8cM3dGSph[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGSphFv,
};
/* 8046E5F8-8046E604 0000B8 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 8046E604-8046E610 0000C4 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */
SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12J3DFrameCtrlFv,
};
/* 8046E0F0-8046E2B0 0004B0 01C0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
static void useHeapInit(fopAc_ac_c* param_0) {
// NONMATCHING
}
/* 8046E2B0-8046E2F8 000670 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */
// J3DFrameCtrl::~J3DFrameCtrl() {
extern "C" void __dt__12J3DFrameCtrlFv() {
// NONMATCHING
}
/* 8046E2F8-8046E490 0006B8 0198+00 1/0 0/0 0/0 .text daObj_Brakeeff_Create__FP10fopAc_ac_c */
static void daObj_Brakeeff_Create(fopAc_ac_c* param_0) {
// NONMATCHING
}
/* 8046E490-8046E4D8 000850 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
// cM3dGSph::~cM3dGSph() {
extern "C" void __dt__8cM3dGSphFv() {
// NONMATCHING
}
/* 8046E4D8-8046E520 000898 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 8046E538-8046E538 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_OBJ_BEF, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(obj_brakeeff_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
39, // mPriority
&l_daObj_Brakeeff_Method, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_7_e, // cullType
};