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

d_a_obj_cboard / finish f_op_actor / rels cleanup (#268)

Browse Source 
* d_a_obj_cboard / finish f_op_actor / clean up some rel files

* rename some actor vars / remove asm

* progress
This commit is contained in:
TakaRikka
2023-02-03 20:24:26 -08:00
committed by GitHub
parent f030d04b14
commit 0f1c727725
85 changed files with 1038 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_op/f_op_actor.h
+11 -10
View File
@@ -8,17 +8,16 @@
#include "f_pc/f_pc_leaf.h"
struct actor_method_class {
/* 0x00 */ process_method_class mBase;
/* 0x10 */ process_method_func mpDrawFunc;
/* 0x00 */ leafdraw_method_class base;
/* 0x14 */ u8 field_0x14[0xC]; // Likely padding
};
struct actor_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ actor_method_class* mSubMtd;
/* 0x28 */ int field_0x28; // mStatus
/* 0x2C */ u8 field_0x2c; // mActorType
/* 0x2D */ u8 field_0x2d; // mCullType
/* 0x28 */ u32 mStatus;
/* 0x2C */ u8 mActorType;
/* 0x2D */ u8 mCullType;
/* 0x2E */ u8 field_0x2e[2]; // Likely padding
};
@@ -77,7 +76,7 @@ struct actor_place {
/* 0x00 */ cXyz pos;
/* 0x0C */ csXyz angle;
/* 0x12 */ s8 mRoomNo;
/* 0x12 */ s8 roomNo;
/* 0x13 */ u8 field_0x13;
};
@@ -117,7 +116,7 @@ public:
/* 0x4D0 */ actor_place current;
/* 0x4E4 */ csXyz shape_angle;
/* 0x4EC */ cXyz mScale;
/* 0x4F8 */ cXyz mSpeed;
/* 0x4F8 */ cXyz speed;
/* 0x504 */ MtxP mCullMtx;
union {
struct {
@@ -132,7 +131,7 @@ public:
/* 0x520 */ f32 mCullSizeFar;
/* 0x524 */ J3DModel* field_0x524;
/* 0x528 */ dJntCol_c* mJntCol;
/* 0x52C */ f32 mSpeedF;
/* 0x52C */ f32 speedF;
/* 0x530 */ f32 mGravity;
/* 0x534 */ f32 mMaxFallSpeed;
/* 0x538 */ cXyz mEyePos;
@@ -148,7 +147,7 @@ public:
const cXyz& getPosition() const { return current.pos; }
const csXyz& getAngle() const { return current.angle; }
s8 getRoomNo() const { return current.mRoomNo; }
s8 getRoomNo() const { return current.roomNo; }
}; // Size: 0x568
STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x568);
@@ -156,7 +155,7 @@ STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x568);
class fopEn_enemy_c : public fopAc_ac_c {
public:
/* 80019404 */ bool initBallModel();
/* 800194FC */ int checkBallModelDraw();
/* 800194FC */ bool checkBallModelDraw();
/* 80019520 */ void setBallModelEffect(dKy_tevstr_c*);
/* 800196A0 */ void drawBallModel(dKy_tevstr_c*);
@@ -182,4 +181,6 @@ public:
s32 fopAc_IsActor(void* actor);
extern actor_method_class g_fopAc_Method;
#endif
include/f_op/f_op_actor_mng.h
+8 -8
View File
@@ -105,7 +105,7 @@ struct DOUBLE_POS {
};
inline s32 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) {
return (s8)pActor->current.mRoomNo;
return (s8)pActor->current.roomNo;
}
inline u32 fopAcM_GetID(const void* pActor) {
@@ -195,7 +195,7 @@ inline cXyz& fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) {
}
inline cXyz& fopAcM_GetSpeed_p(fopAc_ac_c* pActor) {
return pActor->mSpeed;
return pActor->speed;
}
inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
@@ -223,7 +223,7 @@ inline BOOL fopAcM_IsActor(void* actor) {
}
inline void fopAcM_SetRoomNo(fopAc_ac_c* actor, s8 roomNo) {
actor->current.mRoomNo = roomNo;
actor->current.roomNo = roomNo;
}
inline void fopAcM_setHookCarryNow(fopAc_ac_c* actor) {
@@ -235,7 +235,7 @@ inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) {
}
inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* pActor) {
return pActor->orig.mRoomNo;
return pActor->orig.roomNo;
}
inline void fopAcM_SetGravity(fopAc_ac_c* actor, f32 gravity) {
@@ -247,11 +247,11 @@ inline void fopAcM_SetMtx(fopAc_ac_c* actor, MtxP m) {
}
inline void fopAcM_SetSpeed(fopAc_ac_c* actor, f32 x, f32 y, f32 z) {
actor->mSpeed.set(x, y, z);
actor->speed.set(x, y, z);
}
inline void fopAcM_SetSpeedF(fopAc_ac_c* actor, f32 f) {
actor->mSpeedF = f;
actor->speedF = f;
}
inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 status) {
@@ -267,7 +267,7 @@ inline BOOL fopAcM_IsExecuting(unsigned int id) {
}
inline f32 fopAcM_GetSpeedF(const fopAc_ac_c* p_actor) {
return p_actor->mSpeedF;
return p_actor->speedF;
}
inline f32 fopAcM_GetGravity(const fopAc_ac_c* p_actor) {
@@ -279,7 +279,7 @@ inline f32 fopAcM_GetMaxFallSpeed(const fopAc_ac_c* p_actor) {
}
inline const cXyz& fopAcM_GetSpeed_p(const fopAc_ac_c* p_actor) {
return p_actor->mSpeed;
return p_actor->speed;
}
inline const cXyz& fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) {