mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 22:22:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_hata & d_a_obj_hb matching (#2752)

Browse Source 
* hata matching

* hb initial work

* obj_hb matching

* fixed error

* pr cleanup
This commit is contained in:
Carco_21
2025-10-27 22:25:15 -04:00
committed by GitHub
parent a61d0272a6
commit 54f989f16e
6 changed files with 932 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+2
View File
@@ -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
include/d/actor/d_a_obj_hata.h
+38
View File
@@ -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 */
include/d/actor/d_a_obj_hb.h
+49 -4
View File
@@ -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);