d_a_e_yd_leaf and d_a_e_ph done (#2070)

* d_a_e_yd_leaf done

* d_a_e_ph OK

* remove asm

* some e_ph doc

* match dBgS_Acch, fix f_op_actor_mng weak funcs

* dBgS_Acch done

* cleanup dBgS Chk TUs

* d_a_obj done
This commit is contained in:
TakaRikka
2024-02-13 10:21:57 -08:00
committed by GitHub
parent d183f6593a
commit e1c5bdb539
201 changed files with 5249 additions and 11440 deletions
+11 -11
View File
@@ -1,20 +1,20 @@
#ifndef D_A_D_A_OBJ_H
#define D_A_D_A_OBJ_H
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class dCcD_GObjInf;
namespace daObj {
/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*);
/* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*);
/* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*);
/* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*);
/* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32);
/* 80037620 */ void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*,
f32, f32, cXyz const*);
/* 80037788 */ void quat_rotBaseY(Quaternion*, cXyz const&);
/* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32);
void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
void make_eff_break_kotubo(fopAc_ac_c*);
void make_eff_break_kotubo2(fopAc_ac_c*);
void make_eff_break_gm_kotubo(fopAc_ac_c*);
void make_eff_break_gm_ootubo(fopAc_ac_c*);
void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32);
void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*, f32, f32,
cXyz const*);
void quat_rotBaseY(Quaternion*, cXyz const&);
void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32);
}; // namespace daObj
#endif /* D_A_D_A_OBJ_H */
+4 -4
View File
@@ -567,8 +567,8 @@ public:
virtual MtxP getBottleMtx();
virtual BOOL checkPlayerGuard() const;
virtual u32 checkPlayerFly() const { return 0; }
virtual BOOL checkFrontRoll() const { return false; }
virtual BOOL checkWolfDash() const { return false; }
virtual BOOL checkFrontRoll() const; // weak
virtual BOOL checkWolfDash() const; // weak
virtual BOOL checkAutoJump() const;
virtual bool checkSideStep() const;
virtual bool checkWolfTriggerJump() const;
@@ -612,7 +612,7 @@ public:
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const { return -1; }
virtual s32 getItemID() const;
virtual s32 getGrabActorID() const { return -1; }
virtual s32 getGrabActorID() const; // weak
virtual bool exchangeGrabActor(fopAc_ac_c*);
virtual bool setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
@@ -624,7 +624,7 @@ public:
virtual void setOutPower(f32, short, int);
virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*);
virtual void onMagneGrab(f32, f32);
virtual void onFrollCrashFlg(u8, int) {}
virtual void onFrollCrashFlg(u8, int); // weak
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
+6 -3
View File
@@ -117,6 +117,7 @@ public:
cXyz* GetOldPos() { return pm_old_pos; }
f32 GetGroundH() const { return m_ground_h; }
f32 GetRoofHeight() const { return m_roof_height; }
int GetTblSize() { return m_tbl_size; }
void SetLin() { m_lin.SetStartEnd(*pm_old_pos, *pm_pos); }
bool ChkGroundFind() { return m_flags & GROUND_FIND; }
bool ChkGroundHit() { return m_flags & GROUND_HIT; }
@@ -142,7 +143,7 @@ public:
void ClrGroundFind() { m_flags &= ~GROUND_FIND; }
u32 MaskRoofHit() { return m_flags & ROOF_HIT; }
bool ChkRoofHit() { return MaskRoofHit(); }
bool ChkClrSpeedY() { return m_flags & CLR_SPEED_Y; }
bool ChkClrSpeedY() { return !(m_flags & CLR_SPEED_Y); }
void SetGroundFind() { m_flags |= GROUND_FIND; }
void SetGroundHit() { m_flags |= GROUND_HIT; }
void SetGroundLanding() { m_flags |= GROUND_LANDING; }
@@ -163,7 +164,9 @@ public:
void OnLineCheckNone() { m_flags |= LINE_CHECK_NONE; }
void OffLineCheckNone() { m_flags &= ~LINE_CHECK_NONE; }
void SetWallNone() { m_flags |= WALL_NONE; }
void OnLineCheckHit() { m_flags |= LINE_CHECK_HIT; }
cM3dGCyl* GetWallBmdCylP() { return &m_wall_cyl; }
f32 GetWallH(int i_no) { return pm_acch_cir[i_no].GetWallH(); }
// inline dupe
void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; }
@@ -183,7 +186,7 @@ public:
/* 0x080 */ u32 field_0x80;
/* 0x084 */ fopAc_ac_c* m_my_ac;
/* 0x088 */ int m_tbl_size;
/* 0x08C */ dBgS_AcchCir* field_0x8c;
/* 0x08C */ dBgS_AcchCir* pm_acch_cir;
/* 0x090 */ f32 field_0x90;
/* 0x094 */ f32 field_0x94;
/* 0x098 */ f32 m_ground_h;
@@ -197,7 +200,7 @@ public:
/* 0x0C8 */ f32 m_roof_crr_height;
/* 0x0CC */ f32 field_0xcc;
/* 0x0D0 */ f32 m_wtr_chk_offset;
/* 0x0D4 */ int field_0xd4;
/* 0x0D4 */ cBgS_PolyInfo* pm_out_poly_info;
/* 0x0D8 */ f32 field_0xd8;
/* 0x0DC */ dBgS_GndChk m_gnd;
/* 0x130 */ dBgS_RoofChk m_roof;
+1 -1
View File
@@ -20,7 +20,7 @@ class dBgS_ObjGndChk : public dBgS_GndChk {
public:
dBgS_ObjGndChk() { SetObj(); }
/* 8001E020 */ virtual ~dBgS_ObjGndChk(); // should be inlined
/* 8001E020 */ virtual ~dBgS_ObjGndChk() {}
};
class dBgS_ObjGndChk_Wtr : public dBgS_ObjGndChk {
+1 -1
View File
@@ -5,7 +5,7 @@
class cBgS_PolyPassChk {
public:
virtual ~cBgS_PolyPassChk();
virtual ~cBgS_PolyPassChk() {}
};
class dBgS_PolyPassChk : public cBgS_PolyPassChk {
+7
View File
@@ -31,4 +31,11 @@ public:
/* 80140E40 */ virtual ~dBgS_LinkRoofChk() {}
};
class dBgS_ObjRoofChk : public dBgS_RoofChk {
public:
dBgS_ObjRoofChk() { SetObj(); }
virtual ~dBgS_ObjRoofChk() {}
};
#endif /* D_BG_D_BG_S_ROOF_CHK_H */
+1 -1
View File
@@ -7,7 +7,7 @@ class dBgS_WtrChk : public dBgS_SplGrpChk {
public:
/* 80079164 */ dBgS_WtrChk();
/* 8001DF30 */ virtual ~dBgS_WtrChk();
/* 8001DF30 */ virtual ~dBgS_WtrChk() {}
}; // Size: 0x54
#endif /* D_BG_D_BG_S_WTR_CHK_H */
+1
View File
@@ -357,6 +357,7 @@ public:
f32 TrimHeight() { return mTrimHeight; }
int Type() { return mCurType; }
int Mode() { return mNextMode; }
f32 Fovy() { return mFovY + mShake.field_0x3c; }
bool i_chkFlag(u32 i_flag) { return mEventFlags & i_flag; }
void i_setFlag(u32 i_flag) { mEventFlags |= i_flag; }
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/types.h"
#include "d/particle/d_particle_name.h"
#include "d/kankyo/d_kankyo.h"
class J3DAnmTexPattern;
File diff suppressed because it is too large Load Diff