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

move d_a_alink and some related stuff (#130)

Browse Source 
* clean up d_a_player

* move some of daalink

* more daalink / daplayer

* setup some daalink members

* rest of daalink members setup

* remove comment

* few more matches

* remove asm

* more matches

* more matches + move e_wb_class

* fix some d_save classes

Co-authored-by: lepelog <lepelog@users.noreply.github.com>
This commit is contained in:
TakaRikka
2021-05-23 03:09:59 -07:00
committed by GitHub
parent 462d71cbef
commit e915df66c8
196 changed files with 5322 additions and 6569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_op/f_op_actor.h
+23 -13
View File
@@ -3,27 +3,37 @@
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "f_pc/f_pc_base.h"
#include "dolphin/mtx/mtx.h"
#include "f_pc/f_pc_leaf.h"
struct JKRSolidHeap;
class fopAc_ac_c : public base_process_class {
struct actor_place {
cXyz mPosition;
csXyz mAngle;
u8 mRoomNo;
u8 field_0x13;
};
class fopAc_ac_c : public leafdraw_class {
public:
/* 0x0B8 */ u8 unk_0x0B8[0xF0 - 0xB8];
/* 0x0C0 */ int mAcType;
/* 0x0C4 */ create_tag_class mAcTg;
/* 0x0D8 */ create_tag_class mDwTg;
/* 0x0EC */ profile_method_class* mSubMtd;
/* 0x0F0 */ JKRSolidHeap* unk_0x0F0;
/* 0x0F4 */ u8 unk_0x0F4[0x496 - 0xF4];
/* 0x496 */ u8 unk_0x496;
/* 0x497 */ u8 unk_0x497[0x499 - 0x497];
/* 0x499 */ s8 unk_0x499;
/* 0x497 */ u8 unk_0x49A[0x4D0 - 0x49A];
/* 0x4D0 */ cXyz mPosition;
/* 0x4DC */ csXyz mAngle;
/* 0x4E2 */ s8 mRoomNo;
/* 0x4E3 */ u8 unk_0x4E3[0x4E6 - 0x4E3];
/* 0x4E6 */ s16 unk_0x4E6;
/* 0x4E8 */ u8 unk_0x4E8[0x4F8 - 0x4E8];
/* 0x49A */ u8 unk_0x49A[0x4A8 - 0x49A];
/* 0x4A8 */ actor_place mOrig;
/* 0x4BC */ actor_place mNext;
/* 0x4D0 */ actor_place mCurrent;
/* 0x4E4 */ csXyz mCollisionRot;
/* 0x4EC */ cXyz mScale;
/* 0x4F8 */ cXyz mSpeed;
/* 0x504 */ u8 unk_0x504[4];
/* 0x504 */ Mtx* mCullMtx;
/* 0x508 */ cXyz mCullMin;
/* 0x514 */ cXyz mCullMax;
/* 0x520 */ u8 unk_0x520[0xC];
@@ -36,8 +46,8 @@ public:
static u8 stopStatus[4];
const cXyz& getPosition() const { return mPosition; }
const csXyz& getAngle() const { return mAngle; }
const cXyz& getPosition() const { return mCurrent.mPosition; }
const csXyz& getAngle() const { return mCurrent.mAngle; }
}; // Size: unknown
#endif
include/f_op/f_op_actor_mng.h
+18 -2
View File
@@ -32,6 +32,8 @@ struct fopAcM_prm_class {
class fopAcM_lc_c {
public:
static bool lineCheck(const cXyz*, const cXyz*, const fopAc_ac_c*);
static u8 mLineCheck[112];
};
class fopAcM_rc_c {
@@ -42,11 +44,17 @@ public:
class fopAcM_gc_c {
public:
static bool gndCheck(const cXyz*);
static u8 mGndCheck[84];
static f32 mGroundY;
};
class fopAcM_wt_c {
public:
static bool waterCheck(const cXyz*);
static u8 mWaterCheck[84 + 4 /* padding */];
static f32 mWaterY[1 + 1 /* padding */];
};
struct dKy_tevstr_c;
@@ -59,7 +67,15 @@ struct DOUBLE_POS {
};
inline s32 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) {
return pActor->mRoomNo;
return pActor->mCurrent.mRoomNo;
}
inline u32 fopAcM_GetID(const void* pActor) {
return fpcM_GetID(pActor);
}
inline s16 fopAcM_GetName(fopAc_ac_c* pActor) {
return fpcM_GetName(pActor);
}
void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData);
@@ -94,7 +110,7 @@ void fopAcM_setCullSizeSphere(fopAc_ac_c*, f32, f32, f32, f32);
void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*);
bool fopAcM_addAngleY(fopAc_ac_c*, s16, s16);
inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
return pActor->mAngle;
return pActor->mCurrent.mAngle;
}
void fopAcM_calcSpeed(fopAc_ac_c*);
void fopAcM_posMove(fopAc_ac_c*, const cXyz*);