From b6aebfa81ed2badd88677332900c3ae99fdcf1ac Mon Sep 17 00:00:00 2001 From: Shane Goodrick Date: Wed, 1 Oct 2025 20:12:31 -0700 Subject: [PATCH] d_a_obj_inobone OK (#2716) * d_a_obj_inobone OK * Fix d_a_obj_inobone issues --- configure.py | 2 +- include/d/actor/d_a_obj_inobone.h | 23 +- src/d/actor/d_a_obj_inobone.cpp | 502 ++++++++++++++---------------- 3 files changed, 253 insertions(+), 274 deletions(-) diff --git a/configure.py b/configure.py index e0dd3434f38..e5063396633 100755 --- a/configure.py +++ b/configure.py @@ -2012,7 +2012,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_iceleaf"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_ihasi"), ActorRel(NonMatching, "d_a_obj_ikada"), - ActorRel(NonMatching, "d_a_obj_inobone"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_inobone"), ActorRel(NonMatching, "d_a_obj_ita"), ActorRel(NonMatching, "d_a_obj_itamato"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_kabuto"), diff --git a/include/d/actor/d_a_obj_inobone.h b/include/d/actor/d_a_obj_inobone.h index fe36e2836e8..2d750cbc183 100644 --- a/include/d/actor/d_a_obj_inobone.h +++ b/include/d/actor/d_a_obj_inobone.h @@ -1,6 +1,7 @@ #ifndef D_A_OBJ_INOBONE_H #define D_A_OBJ_INOBONE_H +#include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" /** @@ -15,19 +16,23 @@ class daObjIBone_c : public fopAc_ac_c { public: /* 80C27830 */ void initBaseMtx(); /* 80C2786C */ void setBaseMtx(); - /* 80C278CC */ void Create(); - /* 80C279A8 */ void CreateHeap(); - /* 80C27A20 */ void create(); - /* 80C27C4C */ void execute(); + /* 80C278CC */ int Create(); + /* 80C279A8 */ int CreateHeap(); + /* 80C27A20 */ int create(); + /* 80C27C4C */ int execute(); /* 80C27E48 */ void setBreakEffect(); - /* 80C27FEC */ void draw(); - /* 80C28050 */ void _delete(); + /* 80C27FEC */ int draw(); + /* 80C28050 */ int _delete(); -private: - /* 0x568 */ u8 field_0x568[0x84c - 0x568]; + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ dCcD_Stts mStts; + /* 0x5B0 */ dCcD_Cyl mCyl; + /* 0x6EC */ dCcD_Cyl mCyl2; + /* 0x828 */ u8 field_0x828; + /* 0x82C */ Z2SoundObjSimple mSound; }; STATIC_ASSERT(sizeof(daObjIBone_c) == 0x84c); - #endif /* D_A_OBJ_INOBONE_H */ diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index 54b5ded6a26..35ab9841355 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -6,93 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_inobone.h" -#include "d/d_cc_d.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" static void bornTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); -extern "C" static void bornCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); -extern "C" static void s_boar_sub__FPvPv(); -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void initBaseMtx__12daObjIBone_cFv(); -extern "C" void setBaseMtx__12daObjIBone_cFv(); -extern "C" void Create__12daObjIBone_cFv(); -extern "C" void CreateHeap__12daObjIBone_cFv(); -extern "C" void create__12daObjIBone_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void execute__12daObjIBone_cFv(); -extern "C" void setBreakEffect__12daObjIBone_cFv(); -extern "C" void draw__12daObjIBone_cFv(); -extern "C" void _delete__12daObjIBone_cFv(); -extern "C" static void daObjIBone_Draw__FP12daObjIBone_c(); -extern "C" static void daObjIBone_Execute__FP12daObjIBone_c(); -extern "C" static void daObjIBone_Delete__FP12daObjIBone_c(); -extern "C" static void daObjIBone_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_obj_inobone__stringBase0; - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_createItemForDirectGet__FPC4cXyziiPC5csXyzPC4cXyzff(); -extern "C" void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void -setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -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 GetTgHitObjSe__12dCcD_GObjInfFv(); -extern "C" void getHitSeID__12dCcD_GObjInfFUci(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -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 __ct__5csXyzFsss(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[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" u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +#include "d/actor/d_a_player.h" // // Declarations: @@ -100,21 +14,41 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* 80C276B8-80C27714 000078 005C+00 1/1 0/0 0/0 .text * bornTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -static void bornTgCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2, - dCcD_GObjInf* param_3) { - // NONMATCHING +static void bornTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf, + fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) { + daObjIBone_c* a_tgActor = (daObjIBone_c*)i_tgActor; + + if (i_tgActor == NULL) return; + + if (i_atObjInf->ChkAtType(AT_TYPE_NORMAL_SWORD) || + i_atObjInf->ChkAtType(AT_TYPE_IRON_BALL) || + i_atObjInf->ChkAtType(AT_TYPE_SPINNER) || + i_atObjInf->ChkAtType(AT_TYPE_UNK) || + i_atObjInf->ChkAtType(AT_TYPE_BOMB) || + i_atObjInf->ChkAtType(AT_TYPE_HOOKSHOT)) + { + a_tgActor->field_0x828 = 2; + } else if (i_atObjInf->ChkAtType(AT_TYPE_CSTATUE_SWING)) { + a_tgActor->field_0x828 = 3; + } } /* 80C27714-80C27780 0000D4 006C+00 1/1 0/0 0/0 .text * bornCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -static void bornCoCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2, - dCcD_GObjInf* param_3) { - // NONMATCHING +static void bornCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, + fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { + daObjIBone_c* a_coActorA = (daObjIBone_c*)i_coActorA; + + if (i_coActorA != NULL && i_coActorB != NULL && + fopAcM_GetName(i_coActorB) == PROC_HORSE && + daPy_getPlayerActorClass()->checkHorseRide()) + { + a_coActorA->field_0x828 = 1; + } } -/* ############################################################################################## */ /* 80C28120-80C28164 000000 0044+00 3/3 0/0 0/0 .rodata l_cyl_src */ -const static dCcD_SrcCyl l_cyl_src = { +static const dCcD_SrcCyl l_cyl_src = { { {0x0, {{0x0, 0x0, 0x1f}, {0xd8fafdff, 0x11}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -129,9 +63,7 @@ const static dCcD_SrcCyl l_cyl_src = { }; /* 80C28164-80C281A8 000044 0044+00 0/1 0/0 0/0 .rodata l_cyl_src2 */ -#pragma push -#pragma force_active on -const static dCcD_SrcCyl l_cyl_src2 = { +static const dCcD_SrcCyl l_cyl_src2 = { { {0x0, {{0x0, 0x0, 0x1f}, {0x2000, 0x11}, 0x78}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -144,76 +76,242 @@ const static dCcD_SrcCyl l_cyl_src2 = { 70.0f // mHeight } // mCyl }; -#pragma pop - -/* 80C281A8-80C281AC 000088 0004+00 1/2 0/0 0/0 .rodata @3693 */ -SECTION_RODATA static f32 const lit_3693 = 100.0f; -COMPILER_STRIP_GATE(0x80C281A8, &lit_3693); - -/* 80C281AC-80C281B0 00008C 0004+00 1/2 0/0 0/0 .rodata @3694 */ -SECTION_RODATA static f32 const lit_3694 = 240.0f; -COMPILER_STRIP_GATE(0x80C281AC, &lit_3694); /* 80C27780-80C27810 000140 0090+00 1/1 0/0 0/0 .text s_boar_sub__FPvPv */ -static void s_boar_sub(void* param_0, void* param_1) { - // NONMATCHING +static void* s_boar_sub(void* i_actor, void* i_data) { + if (fopAc_IsActor(i_actor)) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; + fopAc_ac_c* data = (fopAc_ac_c*)i_data; + + if (fopAcM_GetName(actor) == PROC_E_WB) { + f32 xz_dist = fopAcM_searchActorDistanceXZ(data, actor); + f32 y_dist = fopAcM_searchActorDistanceY(data, actor); + + if (xz_dist < 100.0f && y_dist < 240.0f) { + return i_actor; + } + } + } + + return NULL; } /* 80C27810-80C27830 0001D0 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -static void CheckCreateHeap(fopAc_ac_c* param_0) { - // NONMATCHING +static void CheckCreateHeap(fopAc_ac_c* i_this) { + static_cast(i_this)->CreateHeap(); } /* 80C27830-80C2786C 0001F0 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjIBone_cFv */ void daObjIBone_c::initBaseMtx() { - // NONMATCHING + mpModel->setBaseScale(scale); + setBaseMtx(); } /* 80C2786C-80C278CC 00022C 0060+00 1/1 0/0 0/0 .text setBaseMtx__12daObjIBone_cFv */ void daObjIBone_c::setBaseMtx() { - // NONMATCHING -} + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(csXyz(shape_angle.x, 0, 0)); -/* ############################################################################################## */ -/* 80C281B0-80C281B4 000090 0004+00 0/1 0/0 0/0 .rodata @3738 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3738 = 27.0f / 20.0f; -COMPILER_STRIP_GATE(0x80C281B0, &lit_3738); -#pragma pop + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); +} /* 80C278CC-80C279A8 00028C 00DC+00 1/1 0/0 0/0 .text Create__12daObjIBone_cFv */ -void daObjIBone_c::Create() { - // NONMATCHING +int daObjIBone_c::Create() { + scale.setall(1.35f); + + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + + mStts.Init(0xFF, 0xFF, this); + + mCyl.Set(l_cyl_src); + mCyl.SetStts(&mStts); + mCyl.SetCoHitCallback(bornCoCallBack); + mCyl.SetTgHitCallback(bornTgCallBack); + + mCyl2.Set(l_cyl_src2); + mCyl2.SetStts(&mStts); + + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + + mSound.init(¤t.pos, 1); + + return 1; } -/* ############################################################################################## */ -/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C281C4 = "Obj_Ibone"; -SECTION_DEAD static char const* const stringBase_80C281CE = "A_InoBone.bmd"; -#pragma pop - /* 80C281F8-80C281FC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_inobone__stringBase0; +static const char* l_arcName = "Obj_Ibone"; /* 80C281FC-80C28200 -00001 0004+00 1/1 0/0 0/0 .data l_bmdName */ -SECTION_DATA static void* l_bmdName = (void*)(((char*)&d_a_obj_inobone__stringBase0) + 0xA); +static const char* l_bmdName = "A_InoBone.bmd"; /* 80C279A8-80C27A20 000368 0078+00 1/1 0/0 0/0 .text CreateHeap__12daObjIBone_cFv */ -void daObjIBone_c::CreateHeap() { - // NONMATCHING +int daObjIBone_c::CreateHeap() { + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName); + JUT_ASSERT(407, modelData != NULL); + + mpModel = + mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, + BMD_DEFAULT_DIFF_FLAGS); + + return mpModel != NULL ? 1 : 0; +} + +/* 80C27A20-80C27BBC 0003E0 019C+00 1/1 0/0 0/0 .text create__12daObjIBone_cFv */ +int daObjIBone_c::create() { + fopAcM_SetupActor(this, daObjIBone_c) + + int result = dComIfG_resLoad(&mPhase, l_arcName); + + if (result == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckCreateHeap, 0x860)) { + return cPhs_ERROR_e; + } else if (!Create()) { + return cPhs_ERROR_e; + } + } + + return result; +} + +/* 80C27C4C-80C27E48 00060C 01FC+00 1/1 0/0 0/0 .text execute__12daObjIBone_cFv */ +int daObjIBone_c::execute() { + f32 xz_distance = fopAcM_searchPlayerDistanceXZ(this); + f32 y_distance = fopAcM_searchPlayerDistanceY(this); + + if ( + xz_distance < 100.0f && + y_distance < 240.0f && + daPy_getPlayerActorClass()->checkHorseRide()) + { + field_0x828 = 1; + } + if (fopAcM_Search(s_boar_sub, this) != NULL) { + field_0x828 = 3; + } + + switch (field_0x828) { + case 0: + break; + + case 1: + fopAcM_createItemForDirectGet(¤t.pos, fpcNm_ITEM_HEART, + fopAcM_GetRoomNo(this), NULL, NULL, 0.0f, 0.0f); + setBreakEffect(); + fopAcM_delete(this); + break; + + case 2: + case 3: { + csXyz angle(0, home.angle.y, 0); + + fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, + fopAcM_GetHomeRoomNo(this), &angle, NULL, 0); + setBreakEffect(); + fopAcM_delete(this); + break; + } + } + + if (mCyl2.ChkTgHit() && mCyl2.GetTgHitObj() != NULL) { + Z2SoundID se_id = dCcD_GObjInf::getHitSeID(mCyl2.GetTgHitObjSe(), 1); + + mSound.startCollisionSE(se_id, 2, NULL); + } + + mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + mCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCyl); + + mCyl2.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCyl2); + + return 1; +} + +/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +static const char* l_effbmdName = "BreakBoarBone.bmd"; // unused + +/* 80C27E48-80C27FEC 000808 01A4+00 1/1 0/0 0/0 .text setBreakEffect__12daObjIBone_cFv */ +void daObjIBone_c::setBreakEffect() { + static const u16 particle_id[] = { dPa_RM(ID_ZM_S_BOARBONEBREAK00) }; + + cXyz pos = current.pos; + + J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20); + J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42); + + JUT_ASSERT(561, tubo_bmd != NULL); + JUT_ASSERT(562, tubo_btp != NULL); + + s8 room_no = fopAcM_GetRoomNo(this); + dPa_levelEcallBack* callback = &dPa_modelEcallBack::getEcallback(); + + JPABaseEmitter* emitter = + dComIfGp_particle_set(dPa_RM(ID_ZM_S_M_BOARBONEBREAK00), ¤t.pos, + NULL, NULL, 0xFF, callback, room_no, NULL, NULL, &scale); + + dPa_modelEcallBack::setModel(emitter, tubo_bmd, + tevStr, 3, tubo_btp, 6); + + for (int i = 0; i < 1; i++) { + dComIfGp_particle_set(particle_id[i], &pos, NULL, &scale, + 0xFF, NULL, -1, NULL, NULL, NULL); + } + + mDoAud_seStart(Z2SE_OBJ_BONES_BREAK_L, ¤t.pos, 0, 0); +} + +/* 80C27FEC-80C28050 0009AC 0064+00 1/1 0/0 0/0 .text draw__12daObjIBone_cFv */ +int daObjIBone_c::draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + mDoExt_modelUpdateDL(mpModel); + + return 1; +} + +/* 80C28050-80C28098 000A10 0048+00 1/1 0/0 0/0 .text _delete__12daObjIBone_cFv */ +int daObjIBone_c::_delete() { + mSound.deleteObject(); + dComIfG_resDelete(&mPhase, l_arcName); + + return 1; +} + +/* 80C28098-80C280B8 000A58 0020+00 1/0 0/0 0/0 .text daObjIBone_Draw__FP12daObjIBone_c + */ +static int daObjIBone_Draw(daObjIBone_c* i_this) { + return i_this->draw(); +} + +/* 80C280B8-80C280D8 000A78 0020+00 1/0 0/0 0/0 .text daObjIBone_Execute__FP12daObjIBone_c */ +static int daObjIBone_Execute(daObjIBone_c* i_this) { + return i_this->execute(); +} + +/* 80C280D8-80C280F8 000A98 0020+00 1/0 0/0 0/0 .text daObjIBone_Delete__FP12daObjIBone_c + */ +static int daObjIBone_Delete(daObjIBone_c* i_this) { + return i_this->_delete(); +} + +/* 80C280F8-80C28118 000AB8 0020+00 1/0 0/0 0/0 .text daObjIBone_Create__FP10fopAc_ac_c + */ +static int daObjIBone_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } /* ############################################################################################## */ /* 80C28200-80C28220 -00001 0020+00 1/0 0/0 0/0 .data l_daObjIBone_Method */ static actor_method_class l_daObjIBone_Method = { - (process_method_func)daObjIBone_Create__FP10fopAc_ac_c, - (process_method_func)daObjIBone_Delete__FP12daObjIBone_c, - (process_method_func)daObjIBone_Execute__FP12daObjIBone_c, - 0, - (process_method_func)daObjIBone_Draw__FP12daObjIBone_c, + (process_method_func)daObjIBone_Create, + (process_method_func)daObjIBone_Delete, + (process_method_func)daObjIBone_Execute, + (process_method_func)0, + (process_method_func)daObjIBone_Draw, }; /* 80C28220-80C28250 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_InoBone */ @@ -233,127 +331,3 @@ extern actor_process_profile_definition g_profile_Obj_InoBone = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C28250-80C2825C 000058 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C2825C-80C28268 000064 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, -}; - -/* 80C27A20-80C27BBC 0003E0 019C+00 1/1 0/0 0/0 .text create__12daObjIBone_cFv */ -void daObjIBone_c::create() { - // NONMATCHING -} - -/* 80C27BBC-80C27C04 00057C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80C27C04-80C27C4C 0005C4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C281B4-80C281B8 000094 0004+00 0/1 0/0 0/0 .rodata @3926 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3926[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C281B4, &lit_3926); -#pragma pop - -/* 80C27C4C-80C27E48 00060C 01FC+00 1/1 0/0 0/0 .text execute__12daObjIBone_cFv */ -void daObjIBone_c::execute() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C281B8-80C281BC 000098 0002+02 0/1 0/0 0/0 .rodata particle_id$3930 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const particle_id[2 + 2 /* padding */] = { - 0x82, - 0xE3, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C281B8, &particle_id); -#pragma pop - -/* 80C281BC-80C281C0 00009C 0004+00 0/1 0/0 0/0 .rodata @3963 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3963 = 1.0f; -COMPILER_STRIP_GATE(0x80C281BC, &lit_3963); -#pragma pop - -/* 80C281C0-80C281C4 0000A0 0004+00 0/1 0/0 0/0 .rodata @3964 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3964 = -1.0f; -COMPILER_STRIP_GATE(0x80C281C0, &lit_3964); -#pragma pop - -/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C281DC = "BreakBoarBone.bmd"; -SECTION_DEAD static char const* const stringBase_80C281EE = "Always"; -#pragma pop - -/* 80C27E48-80C27FEC 000808 01A4+00 1/1 0/0 0/0 .text setBreakEffect__12daObjIBone_cFv */ -void daObjIBone_c::setBreakEffect() { - // NONMATCHING -} - -/* 80C27FEC-80C28050 0009AC 0064+00 1/1 0/0 0/0 .text draw__12daObjIBone_cFv */ -void daObjIBone_c::draw() { - // NONMATCHING -} - -/* 80C28050-80C28098 000A10 0048+00 1/1 0/0 0/0 .text _delete__12daObjIBone_cFv */ -void daObjIBone_c::_delete() { - // NONMATCHING -} - -/* 80C28098-80C280B8 000A58 0020+00 1/0 0/0 0/0 .text daObjIBone_Draw__FP12daObjIBone_c - */ -static void daObjIBone_Draw(daObjIBone_c* param_0) { - // NONMATCHING -} - -/* 80C280B8-80C280D8 000A78 0020+00 1/0 0/0 0/0 .text daObjIBone_Execute__FP12daObjIBone_c */ -static void daObjIBone_Execute(daObjIBone_c* param_0) { - // NONMATCHING -} - -/* 80C280D8-80C280F8 000A98 0020+00 1/0 0/0 0/0 .text daObjIBone_Delete__FP12daObjIBone_c - */ -static void daObjIBone_Delete(daObjIBone_c* param_0) { - // NONMATCHING -} - -/* 80C280F8-80C28118 000AB8 0020+00 1/0 0/0 0/0 .text daObjIBone_Create__FP10fopAc_ac_c - */ -static void daObjIBone_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */