mirror of https://github.com/zeldaret/tp.git
d_a_obj_hata & d_a_obj_hb matching (#2752)
* hata matching * hb initial work * obj_hb matching * fixed error * pr cleanup
This commit is contained in:
parent
a61d0272a6
commit
54f989f16e
|
|
@ -2028,8 +2028,8 @@ config.libs = [
|
|||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_hakai_brl"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_hakai_ftr"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_hasu2"),
|
||||
ActorRel(NonMatching, "d_a_obj_hata"),
|
||||
ActorRel(NonMatching, "d_a_obj_hb"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_hata"),
|
||||
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hb"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_hbombkoya"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_heavySw"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_hfuta"),
|
||||
|
|
|
|||
|
|
@ -376,6 +376,8 @@ public:
|
|||
u32 ChkAtSPrm(u32 prm) { return mObjAt.ChkSPrm(prm); }
|
||||
u32 ChkCoSPrm(u32 prm) const { return mObjCo.ChkSPrm(prm); }
|
||||
void OnTgNoSlingHitInfSet() { mObjTg.OnSPrmBit(0x40); }
|
||||
void OnAtVsBitSet(u32 prm) { mObjAt.OnSPrmBit(prm); }
|
||||
void OffAtVsBitSet(u32 prm) { mObjAt.OffSPrmBit(prm); }
|
||||
|
||||
}; // Size = 0x40
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,44 @@
|
|||
#ifndef D_A_OBJ_HATA_H
|
||||
#define D_A_OBJ_HATA_H
|
||||
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-objects
|
||||
* @class daObjHata_c
|
||||
* @brief Flag ???
|
||||
*
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
|
||||
class daObjHata_c : public fopAc_ac_c, request_of_phase_process_class {
|
||||
public:
|
||||
/* 80C18D08 */ daObjHata_c();
|
||||
/* 80C18D68 */ virtual ~daObjHata_c();
|
||||
/* 80C18E00 */ int createHeap();
|
||||
/* 80C18E70 */ cPhs__Step create();
|
||||
/* 80C18F88 */ int Delete();
|
||||
/* 80C18FBC */ int draw();
|
||||
/* 80C19060 */ int execute();
|
||||
/* 80C19098 */ void setModelMtx();
|
||||
/* 80C190FC */ void init();
|
||||
/* 80C1919C */ void moveSwing();
|
||||
|
||||
void getJntAngle(csXyz* angle, int idx) { *angle = jnt_angle[idx]; }
|
||||
|
||||
/* 0x574 */ csXyz jnt_angle[3];
|
||||
/* 0x588 */ J3DModel* model;
|
||||
/* 0x58C */ f32 field_0x58c[3];
|
||||
/* 0x598 */ f32 field_0x598[3];
|
||||
/* 0x5A4 */ f32 field_0x5a4[3];
|
||||
/* 0x5B0 */ f32 field_0x5b0[3];
|
||||
/* 0x5BC */ s8 field_0x5bc[3];
|
||||
/* 0x5BF */ s8 field_0x5bf[3];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daObjHata_c) == 0x5C4);
|
||||
|
||||
#endif /* D_A_OBJ_HATA_H */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
#ifndef D_A_OBJ_HB_H
|
||||
#define D_A_OBJ_HB_H
|
||||
|
||||
#include "d/d_bg_s_acch.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_cc_uty.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
/**
|
||||
|
|
@ -10,10 +13,52 @@
|
|||
*
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
class obj_hb_class : public fopAc_ac_c {
|
||||
private:
|
||||
/* 0x568 */ u8 field_0x568[0xa8c - 0x568];
|
||||
*/
|
||||
|
||||
class obj_hb_class {
|
||||
public:
|
||||
/* 0x000 */ fopEn_enemy_c actor;
|
||||
/* 0x5AC */ request_of_phase_process_class mPhase;
|
||||
/* 0x5B4 */ u8 arg0;
|
||||
/* 0x5B8 */ J3DModel* mpModel;
|
||||
/* 0x5BC */ u32 mShadowKey;
|
||||
/* 0x5C0 */ Z2Creature mSound;
|
||||
/* 0x650 */ s16 field_0x650;
|
||||
/* 0x652 */ s16 mAction;
|
||||
/* 0x654 */ s16 mMode;
|
||||
/* 0x658 */ cXyz field_0x658;
|
||||
/* 0x664 */ u8 field_0x664[0x670 - 0x664];
|
||||
/* 0x670 */ s16 mTimers[2];
|
||||
/* 0x674 */ s16 mInvulnerabilityTimer;
|
||||
/* 0x676 */ csXyz field_0x676;
|
||||
/* 0x67C */ s16 field_0x67c;
|
||||
/* 0x67E */ s16 field_0x67e;
|
||||
/* 0x680 */ f32 mGroundCross;
|
||||
/* 0x684 */ s16 mShapeAngleXOffset;
|
||||
/* 0x688 */ f32 field_0x688;
|
||||
/* 0x68C */ s16 field_0x68c;
|
||||
/* 0x68E */ s16 field_0x68e;
|
||||
/* 0x690 */ s16 field_0x690;
|
||||
/* 0x694 */ f32 field_0x694;
|
||||
/* 0x698 */ f32 field_0x698;
|
||||
/* 0x69C */ fpc_ProcID field_0x69c;
|
||||
/* 0x6A0 */ f32 mCurrentPosStep;
|
||||
/* 0x6A4 */ s16 field_0x6a4;
|
||||
/* 0x6A8 */ fpc_ProcID mChildActorID;
|
||||
/* 0x6AC */ f32 mChildPlaySpeed;
|
||||
/* 0x6B0 */ s8 field_0x6b0;
|
||||
/* 0x6B1 */ s8 field_0x6b1;
|
||||
/* 0x6B4 */ f32 field_0x6b4;
|
||||
/* 0x6B8 */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x6F8 */ dBgS_ObjAcch mBgc;
|
||||
/* 0x8D0 */ dCcD_Stts mStts;
|
||||
/* 0x90C */ dCcD_Sph mSph;
|
||||
/* 0xA44 */ dCcU_AtInfo mAtInfo;
|
||||
/* 0xA68 */ u32 field_0xa68;
|
||||
/* 0xA6C */ u32 field_0xa6c;
|
||||
/* 0xA70 */ u32 mPrtcls[4];
|
||||
/* 0xA80 */ u32 mHamonPrtcl;
|
||||
/* 0xA84 */ u8 field_0xa84[0xa8c - 0xa84];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(obj_hb_class) == 0xa8c);
|
||||
|
|
|
|||
|
|
@ -7,281 +7,216 @@
|
|||
|
||||
#include "d/actor/d_a_obj_hata.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
struct daObjHata_c {
|
||||
/* 80C18D08 */ daObjHata_c();
|
||||
/* 80C18D68 */ ~daObjHata_c();
|
||||
/* 80C18E00 */ void createHeap();
|
||||
/* 80C18E70 */ void create();
|
||||
/* 80C18F88 */ void Delete();
|
||||
/* 80C18FBC */ void draw();
|
||||
/* 80C19060 */ void execute();
|
||||
/* 80C19098 */ void setModelMtx();
|
||||
/* 80C190FC */ void init();
|
||||
/* 80C1919C */ void moveSwing();
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" static void daObjHata_c_createHeap__FP10fopAc_ac_c();
|
||||
extern "C" static void nodeCallBack__FP8J3DJointi();
|
||||
extern "C" void __dt__5csXyzFv();
|
||||
extern "C" void __ct__11daObjHata_cFv();
|
||||
extern "C" void __ct__5csXyzFv();
|
||||
extern "C" void __dt__11daObjHata_cFv();
|
||||
extern "C" void createHeap__11daObjHata_cFv();
|
||||
extern "C" void create__11daObjHata_cFv();
|
||||
extern "C" void Delete__11daObjHata_cFv();
|
||||
extern "C" void draw__11daObjHata_cFv();
|
||||
extern "C" void execute__11daObjHata_cFv();
|
||||
extern "C" void setModelMtx__11daObjHata_cFv();
|
||||
extern "C" void init__11daObjHata_cFv();
|
||||
extern "C" void moveSwing__11daObjHata_cFv();
|
||||
extern "C" static void daObjHata_create__FP11daObjHata_c();
|
||||
extern "C" static void daObjHata_Delete__FP11daObjHata_c();
|
||||
extern "C" static void daObjHata_execute__FP11daObjHata_c();
|
||||
extern "C" static void daObjHata_draw__FP11daObjHata_c();
|
||||
extern "C" extern char const* const d_a_obj_hata__stringBase0;
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void mDoMtx_YrotM__FPA4_fs();
|
||||
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 __dt__10fopAc_ac_cFv();
|
||||
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
|
||||
extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
|
||||
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 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
|
||||
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
|
||||
extern "C" void cM_rndF__Ff();
|
||||
extern "C" void cM_rndFX__Ff();
|
||||
extern "C" void cLib_chaseF__FPfff();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void __destroy_arr();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_21();
|
||||
extern "C" void _savegpr_26();
|
||||
extern "C" void _restgpr_21();
|
||||
extern "C" void _restgpr_26();
|
||||
extern "C" u8 now__14mDoMtx_stack_c[48];
|
||||
extern "C" u8 mCurrentMtx__6J3DSys[48];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 80C18BB8-80C18BD8 000078 0020+00 1/1 0/0 0/0 .text daObjHata_c_createHeap__FP10fopAc_ac_c */
|
||||
static void daObjHata_c_createHeap(fopAc_ac_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObjHata_c_createHeap(fopAc_ac_c* a_this) {
|
||||
return static_cast<daObjHata_c*>(a_this)->createHeap();
|
||||
}
|
||||
|
||||
/* 80C18BD8-80C18CCC 000098 00F4+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */
|
||||
static void nodeCallBack(J3DJoint* param_0, int param_1) {
|
||||
// NONMATCHING
|
||||
}
|
||||
static int nodeCallBack(J3DJoint* i_joint, int param_2) {
|
||||
if (param_2 != 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C194C0-80C194C0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80C194C0 = "Hata";
|
||||
#pragma pop
|
||||
int jntNo = i_joint->getJntNo();
|
||||
if (jntNo < 0 || jntNo >= 3) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
J3DModel* model = j3dSys.getModel();
|
||||
daObjHata_c* i_this = (daObjHata_c*)model->getUserArea();
|
||||
if (model == NULL || i_this == NULL) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
csXyz angle;
|
||||
i_this->getJntAngle(&angle, jntNo);
|
||||
MTXCopy(model->getAnmMtx(jntNo), mDoMtx_stack_c::get());
|
||||
mDoMtx_stack_c::ZXYrotM(angle);
|
||||
model->setAnmMtx(jntNo, mDoMtx_stack_c::get());
|
||||
mDoMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C194C8-80C194CC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
|
||||
SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hata__stringBase0;
|
||||
|
||||
/* 80C194CC-80C194EC -00001 0020+00 1/0 0/0 0/0 .data daObjHata_METHODS */
|
||||
SECTION_DATA static void* daObjHata_METHODS[8] = {
|
||||
(void*)daObjHata_create__FP11daObjHata_c,
|
||||
(void*)daObjHata_Delete__FP11daObjHata_c,
|
||||
(void*)daObjHata_execute__FP11daObjHata_c,
|
||||
(void*)NULL,
|
||||
(void*)daObjHata_draw__FP11daObjHata_c,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
};
|
||||
|
||||
/* 80C194EC-80C1951C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Hata */
|
||||
SECTION_DATA extern void* g_profile_Obj_Hata[12] = {
|
||||
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
|
||||
(void*)0x01A80000, (void*)&g_fpcLf_Method,
|
||||
(void*)0x000005C4, (void*)NULL,
|
||||
(void*)NULL, (void*)&g_fopAc_Method,
|
||||
(void*)0x02EB0000, (void*)&daObjHata_METHODS,
|
||||
(void*)0x00040180, (void*)0x030E0000,
|
||||
};
|
||||
|
||||
/* 80C1951C-80C19528 000054 000C+00 2/2 0/0 0/0 .data __vt__11daObjHata_c */
|
||||
SECTION_DATA extern void* __vt__11daObjHata_c[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__11daObjHata_cFv,
|
||||
};
|
||||
static char* l_arcName = "Hata";
|
||||
|
||||
/* 80C18D08-80C18D64 0001C8 005C+00 2/2 0/0 0/0 .text __ct__11daObjHata_cFv */
|
||||
daObjHata_c::daObjHata_c() {
|
||||
// NONMATCHING
|
||||
}
|
||||
daObjHata_c::daObjHata_c() {}
|
||||
|
||||
/* 80C18D68-80C18E00 000228 0098+00 1/0 0/0 0/0 .text __dt__11daObjHata_cFv */
|
||||
daObjHata_c::~daObjHata_c() {
|
||||
// NONMATCHING
|
||||
dComIfG_resDelete(this, l_arcName);
|
||||
}
|
||||
|
||||
/* 80C18E00-80C18E70 0002C0 0070+00 1/1 0/0 0/0 .text createHeap__11daObjHata_cFv */
|
||||
void daObjHata_c::createHeap() {
|
||||
// NONMATCHING
|
||||
int daObjHata_c::createHeap() {
|
||||
J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
|
||||
JUT_ASSERT(109, a_model_data_p != NULL);
|
||||
model = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084);
|
||||
if (model == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C18E70-80C18F88 000330 0118+00 1/1 0/0 0/0 .text create__11daObjHata_cFv */
|
||||
void daObjHata_c::create() {
|
||||
// NONMATCHING
|
||||
cPhs__Step daObjHata_c::create() {
|
||||
fopAcM_ct(this, daObjHata_c);
|
||||
|
||||
cPhs__Step phase_step = (cPhs__Step)dComIfG_resLoad(this, l_arcName);
|
||||
if (phase_step == cPhs_COMPLEATE_e) {
|
||||
if (!fopAcM_entrySolidHeap(this, daObjHata_c_createHeap, 0x870)) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
init();
|
||||
setModelMtx();
|
||||
fopAcM_SetMtx(this, model->getBaseTRMtx());
|
||||
fopAcM_setCullSizeBox2(this, model->getModelData());
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
J3DJoint* jnt_node_p = model->getModelData()->getJointNodePointer(i);
|
||||
if (jnt_node_p != NULL) {
|
||||
jnt_node_p->setCallBack(nodeCallBack);
|
||||
model->setUserArea((uintptr_t)this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return phase_step;
|
||||
}
|
||||
|
||||
/* 80C18F88-80C18FBC 000448 0034+00 1/1 0/0 0/0 .text Delete__11daObjHata_cFv */
|
||||
void daObjHata_c::Delete() {
|
||||
// NONMATCHING
|
||||
int daObjHata_c::Delete() {
|
||||
this->~daObjHata_c();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C18FBC-80C19060 00047C 00A4+00 1/1 0/0 0/0 .text draw__11daObjHata_cFv */
|
||||
void daObjHata_c::draw() {
|
||||
// NONMATCHING
|
||||
int daObjHata_c::draw() {
|
||||
g_env_light.settingTevStruct(16, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
|
||||
dComIfGd_setListBG();
|
||||
mDoExt_modelUpdateDL(model);
|
||||
dComIfGd_setList();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C19060-80C19098 000520 0038+00 1/1 0/0 0/0 .text execute__11daObjHata_cFv */
|
||||
void daObjHata_c::execute() {
|
||||
// NONMATCHING
|
||||
int daObjHata_c::execute() {
|
||||
moveSwing();
|
||||
setModelMtx();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80C19098-80C190FC 000558 0064+00 2/2 0/0 0/0 .text setModelMtx__11daObjHata_cFv */
|
||||
void daObjHata_c::setModelMtx() {
|
||||
// NONMATCHING
|
||||
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
|
||||
mDoMtx_stack_c::YrotM(shape_angle.y);
|
||||
model->setBaseTRMtx(mDoMtx_stack_c::get());
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C19478-80C1947C 000000 0004+00 2/2 0/0 0/0 .rodata @3788 */
|
||||
SECTION_RODATA static f32 const lit_3788 = 1280.0f;
|
||||
COMPILER_STRIP_GATE(0x80C19478, &lit_3788);
|
||||
|
||||
/* 80C1947C-80C19480 000004 0004+00 1/2 0/0 0/0 .rodata @3789 */
|
||||
SECTION_RODATA static f32 const lit_3789 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x80C1947C, &lit_3789);
|
||||
|
||||
/* 80C190FC-80C1919C 0005BC 00A0+00 1/1 0/0 0/0 .text init__11daObjHata_cFv */
|
||||
void daObjHata_c::init() {
|
||||
// NONMATCHING
|
||||
for (int i = 0; i < 3; i++) {
|
||||
field_0x58c[i] = cM_rndFX(1280.0f);
|
||||
field_0x598[i] = cM_rndFX(1280.0f);
|
||||
field_0x5bc[i] = 1;
|
||||
field_0x5bf[i] = -1;
|
||||
field_0x5a4[i] = cM_rndF(1.0f);
|
||||
field_0x5b0[i] = cM_rndF(1.0f);
|
||||
}
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80C19480-80C1948C 000008 000C+00 0/1 0/0 0/0 .rodata SING$3793 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
#define SING_BAK SING
|
||||
#undef SING
|
||||
SECTION_RODATA static u8 const SING[12] = {
|
||||
0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C19480, &SING);
|
||||
#define SING SING_BAK
|
||||
#undef SING_BAK
|
||||
#pragma pop
|
||||
|
||||
/* 80C1948C-80C19498 000014 000C+00 0/1 0/0 0/0 .rodata AIM_ANGLE_X$3794 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const AIM_ANGLE_X[12] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xBC, 0x00, 0x00, 0x02, 0xBC,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C1948C, &AIM_ANGLE_X);
|
||||
#pragma pop
|
||||
|
||||
/* 80C19498-80C194A4 000020 000C+00 0/1 0/0 0/0 .rodata STEP_ANGLE_X$3795 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const STEP_ANGLE_X[12] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x5A,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C19498, &STEP_ANGLE_X);
|
||||
#pragma pop
|
||||
|
||||
/* 80C194A4-80C194A8 00002C 0004+00 0/1 0/0 0/0 .rodata @3823 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3823 = 50.0f;
|
||||
COMPILER_STRIP_GATE(0x80C194A4, &lit_3823);
|
||||
#pragma pop
|
||||
|
||||
/* 80C194A8-80C194AC 000030 0004+00 0/1 0/0 0/0 .rodata @3824 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3824 = 1500.0f;
|
||||
COMPILER_STRIP_GATE(0x80C194A8, &lit_3824);
|
||||
#pragma pop
|
||||
|
||||
/* 80C194AC-80C194B0 000034 0004+00 0/1 0/0 0/0 .rodata @3825 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3825 = 1.0f / 10.0f;
|
||||
COMPILER_STRIP_GATE(0x80C194AC, &lit_3825);
|
||||
#pragma pop
|
||||
|
||||
/* 80C194B0-80C194B8 000038 0004+04 0/1 0/0 0/0 .rodata @3826 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3826[1 + 1 /* padding */] = {
|
||||
0.5f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C194B0, &lit_3826);
|
||||
#pragma pop
|
||||
|
||||
/* 80C194B8-80C194C0 000040 0008+00 0/1 0/0 0/0 .rodata @3828 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3828[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80C194B8, &lit_3828);
|
||||
#pragma pop
|
||||
|
||||
/* 80C1919C-80C193BC 00065C 0220+00 1/1 0/0 0/0 .text moveSwing__11daObjHata_cFv */
|
||||
void daObjHata_c::moveSwing() {
|
||||
// NONMATCHING
|
||||
#undef SING
|
||||
static int const SING[3] = {
|
||||
1, -1, 1,
|
||||
};
|
||||
|
||||
static int const AIM_ANGLE_X[3] = {
|
||||
0, 0x2BC, 0x2BC,
|
||||
};
|
||||
|
||||
static int const STEP_ANGLE_X[3] = {
|
||||
0, 0x3C, 0x5A,
|
||||
};
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
f32 fVar1 = jnt_angle[i].x;
|
||||
f32 fVar2 = jnt_angle[i].z;
|
||||
if (cLib_chaseF(&fVar2, field_0x598[i] * (field_0x5bc[i] * SING[i]), field_0x5a4[i] * 50.0f) != 0) {
|
||||
field_0x598[i] = cM_rndF(1500.0f);
|
||||
|
||||
if (i == 2) {
|
||||
field_0x5bc[i] *= -1;
|
||||
field_0x5a4[i] = cM_rndF(1.0f) + 0.1f;
|
||||
}
|
||||
}
|
||||
|
||||
if (cLib_chaseF(&fVar1, field_0x58c[i] * (field_0x5bf[i] * SING[i]), field_0x5b0[i] * STEP_ANGLE_X[i]) != 0) {
|
||||
field_0x58c[i] = cM_rndF(AIM_ANGLE_X[i]);
|
||||
|
||||
if (i == 2) {
|
||||
field_0x5bf[i] *= -1;
|
||||
field_0x5b0[i] = cM_rndF(1.0f) + 0.5f;
|
||||
}
|
||||
}
|
||||
|
||||
jnt_angle[i].x = fVar1;
|
||||
jnt_angle[i].z = fVar2;
|
||||
}
|
||||
}
|
||||
|
||||
/* 80C193BC-80C19410 00087C 0054+00 1/0 0/0 0/0 .text daObjHata_create__FP11daObjHata_c
|
||||
*/
|
||||
static void daObjHata_create(daObjHata_c* param_0) {
|
||||
// NONMATCHING
|
||||
/* 80C193BC-80C19410 00087C 0054+00 1/0 0/0 0/0 .text daObjHata_create__FP11daObjHata_c */
|
||||
static int daObjHata_create(daObjHata_c* i_this) {
|
||||
fopAcM_ct(i_this, daObjHata_c);
|
||||
return i_this->create();
|
||||
}
|
||||
|
||||
/* 80C19410-80C19430 0008D0 0020+00 1/0 0/0 0/0 .text daObjHata_Delete__FP11daObjHata_c
|
||||
*/
|
||||
static void daObjHata_Delete(daObjHata_c* param_0) {
|
||||
// NONMATCHING
|
||||
/* 80C19410-80C19430 0008D0 0020+00 1/0 0/0 0/0 .text daObjHata_Delete__FP11daObjHata_c */
|
||||
static int daObjHata_Delete(daObjHata_c* i_this) {
|
||||
return i_this->Delete();
|
||||
}
|
||||
|
||||
/* 80C19430-80C19450 0008F0 0020+00 1/0 0/0 0/0 .text daObjHata_execute__FP11daObjHata_c
|
||||
*/
|
||||
static void daObjHata_execute(daObjHata_c* param_0) {
|
||||
// NONMATCHING
|
||||
/* 80C19430-80C19450 0008F0 0020+00 1/0 0/0 0/0 .text daObjHata_execute__FP11daObjHata_c */
|
||||
static int daObjHata_execute(daObjHata_c* i_this) {
|
||||
return i_this->execute();
|
||||
}
|
||||
|
||||
/* 80C19450-80C19470 000910 0020+00 1/0 0/0 0/0 .text daObjHata_draw__FP11daObjHata_c */
|
||||
static void daObjHata_draw(daObjHata_c* param_0) {
|
||||
// NONMATCHING
|
||||
static int daObjHata_draw(daObjHata_c* i_this) {
|
||||
return i_this->draw();
|
||||
}
|
||||
|
||||
/* 80C194C0-80C194C0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
/* 80C194CC-80C194EC -00001 0020+00 1/0 0/0 0/0 .data daObjHata_METHODS */
|
||||
static actor_method_class daObjHata_METHODS = {
|
||||
(process_method_func)daObjHata_create,
|
||||
(process_method_func)daObjHata_Delete,
|
||||
(process_method_func)daObjHata_execute,
|
||||
(process_method_func)NULL,
|
||||
(process_method_func)daObjHata_draw,
|
||||
};
|
||||
|
||||
/* 80C194EC-80C1951C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Hata */
|
||||
extern actor_process_profile_definition g_profile_Obj_Hata = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
7, // mListID
|
||||
fpcPi_CURRENT_e, // mListPrio
|
||||
PROC_Obj_Hata, // mProcName
|
||||
&g_fpcLf_Method.base, // sub_method
|
||||
sizeof(daObjHata_c), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // sub_method
|
||||
747, // mPriority
|
||||
&daObjHata_METHODS, // sub_method
|
||||
0x00040180, // mStatus
|
||||
fopAc_ENV_e, // mActorType
|
||||
fopAc_CULLBOX_CUSTOM_e, // cullType
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue