mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-08 18:43:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

checkpoint

Browse Source
This commit is contained in:
Pheenoh
2023-01-04 09:21:20 -07:00
parent 63afb14d8b
commit 67fc1447da
4 changed files with 176 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/bg/d_bg_s_acch.h
+3 -3
View File
@@ -38,7 +38,7 @@ public:
/* 80075F58 */ void SetWall(f32, f32);
/* 80075F80 */ void SetWallHDirect(f32);
/* 80077414 */ virtual ~dBgS_AcchCir();
/* 80077414 */ virtual ~dBgS_AcchCir() {}
f32 GetWallH() { return m_wall_h; }
f32 GetWallR() { return m_wall_r; }
@@ -108,7 +108,7 @@ public:
/* 800D00DC */ void ClrGroundHit();
/* 80141404 */ bool ChkGroundHit() const;
/* 80075F94 */ virtual ~dBgS_Acch();
/* 80075F94 */ virtual ~dBgS_Acch() {}
cXyz* GetPos() { return pm_pos; }
cXyz* GetOldPos() { return pm_old_pos; }
@@ -205,7 +205,7 @@ public:
SetObj();
}
/* 80BB336C */ virtual ~dBgS_ObjAcch();
/* 80BB336C */ virtual ~dBgS_ObjAcch() {}
};
class dBgS_StatueAcch : public dBgS_Acch {
include/rel/d/a/d_a_do/d_a_do.h
+105 -83
View File
@@ -4,6 +4,8 @@
#include "dolphin/types.h"
#include "d/a/d_a_player.h"
// #include "d/a/d_a_item_static.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "d/msg/d_msg_flow.h"
#include "d/particle/d_particle.h"
#include "f_op/f_op_actor.h"
@@ -12,32 +14,82 @@
#include "m_Do/m_Do_controller_pad.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "SSystem/SComponent/c_phase.h"
#include "Z2AudioLib/Z2SoundObject.h"
struct do_class : public fopAc_ac_c {
// this might actually inherit from npc_tr_class?
class do_class : public fopAc_ac_c {
public:
/* 0x56C */ u8 field_0x56c[138];
/* 0x56C */ u8 field_0x56c[68];
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ u8 field_0x5b4[20];
/* 0x5C8 */ float field_0x5c8;
/* 0x5CC */ u8 field_0x5cc[4];
/* 0x5D0 */ int field_0x5d0;
/* 0x5D4 */ u8 field_0x5d4[4];
/* 0x5D8 */ mDoExt_McaMorf* mpMorf;
/* 0x5DC */ u8 field_0x5dc[8];
/* 0x5E4 */ u8 field_0x5e4;
/* 0x5E5 */ u8 field_0x5e5[3];
/* 0x5E8 */ float field_0x5e8;
/* 0x5EC */ float field_0x5ec;
/* 0x5F0 */ u8 field_0x5f0[2];
/* 0x5F2 */ s16 field_0x5f2;
/* 0x5F4 */ u8 field_0x5f4[2];
/* 0x5F6 */ u16 field_0x5f6;
/* 0x5F8 */ u8 field_0x5f8[140];
/* 0x684 */ u32 isFood;
/* 0x5F8 */ u8 field_0x5f8[4];
/* 0x5FC */ u16 field_0x5fc;
/* 0x5FE */ u8 field_0x5fe[6];
/* 0x604 */ u16 field_0x604;
/* 0x606 */ u8 field_0x606[10];
/* 0x610 */ float field_0x610;
/* 0x614 */ u16 field_0x614;
/* 0x616 */ u8 field_0x616[30];
/* 0x634 */ u32 field_0x634;
/* 0x638 */ u8 field_0x638[16];
/* 0x648 */ u32 field_0x648;
/* 0x64c */ u8 field_0x64c[12];
/* 0x658 */ float field_0x658;
/* 0x65C */ u8 field_0x65c[32];
/* 0x67C */ float field_0x67c;
/* 0x680 */ u8 field_0x680[4];
/* 0x684 */ u32 isFood; // maybe can pick a better name here
/* 0x688 */ u8 field_0x688[4];
/* 0x68C */ float field_0x68c;
/* 0x690 */ float field_0x690;
/* 0x694 */ float field_0x694;
/* 0x698 */ u8 field_0x698[36];
/* 0x6BC */ dBgS_AcchCir mBgS_AcchCir;
/* 0x6FC */ dBgS_Acch mBgS_Acch;
/* 0x8D4 */ u8 field_0x8d4[24];
/* 0x8EC */ dCcD_GStts mCcD_GStts;
/* 0x90C */ u8 field_0x90c[4];
/* 0x910 */ dCcD_GObjInf mCcD_GObjInf1;
/* 0xA14 */ u8 field_0xa14[52];
/* 0xA48 */ dCcD_GObjInf mCcD_GObjInf2;
/* 0xB4C */ u8 field_0xb4c[152];
/* 0xBE4 */ Z2SoundObjSimple mSound;
/* 0xC04 */ u8 field_0xc04[8];
/* 0xC0C */ dMsgFlow_c mMsg;
/* 0xC58 */ u8 field_0xc58[104];
/* 0xCC0 */ u8 field_0xcc0;
public:
/* 8066EAE4 */ do_class();
};
class daDo_HIO_c : public J3DFrameCtrl {
class daDo_HIO_c : public do_class {
private:
/* 0x14 */ u32 field_0x14;
/* 0x18 */ u32 field_0x18;
/* 0x1C */ u8 field_0x1c;
/* 0x1D */ u8 field_0x1d;
/* 0x1E */ u16 field_0x1e;
/* 0x14 */ u32 field_0x14;
/* 0x18 */ u32 field_0x18;
/* 0x1C */ u8 field_0x1c;
/* 0x1D */ u8 field_0x1d;
/* 0x1E */ u16 field_0x1e;
public:
/* 80667D4C */ daDo_HIO_c();
/* 8066ED40 */ virtual ~daDo_HIO_c();
/* 8066ED40 */ virtual ~daDo_HIO_c() {};
};
struct daItem_c {
@@ -49,88 +101,58 @@ struct dEvt_control_c {
/* 80042468 */ void reset();
};
struct dCcD_Stts {
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
};
// struct dBgS_PolyPassChk {
// /* 80078E68 */ void SetObj();
// };
struct dCcD_SrcSph {};
// struct dBgS_ObjGndChk_Spl {
// /* 800777B0 */ dBgS_ObjGndChk_Spl();
// /* 80077848 */ ~dBgS_ObjGndChk_Spl();
// };
struct dCcD_Sph {
/* 80084A34 */ void Set(dCcD_SrcSph const&);
};
// struct dBgS_ObjAcch {
// /* 8066ECD0 */ ~dBgS_ObjAcch();
// };
struct dCcD_GStts {
/* 80083760 */ dCcD_GStts();
};
// struct dBgS_LinChk {
// /* 80077C68 */ dBgS_LinChk();
// /* 80077CDC */ ~dBgS_LinChk();
// /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
// };
struct dCcD_GObjInf {
/* 80083A28 */ dCcD_GObjInf();
};
// struct dBgS_GndChk {
// /* 8007757C */ dBgS_GndChk();
// /* 800775F0 */ ~dBgS_GndChk();
// };
struct dBgS_PolyPassChk {
/* 80078E68 */ void SetObj();
};
// struct dBgS_AcchCir {
// /* 80075EAC */ dBgS_AcchCir();
// /* 80075F58 */ void SetWall(f32, f32);
// };
struct dBgS_ObjGndChk_Spl {
/* 800777B0 */ dBgS_ObjGndChk_Spl();
/* 80077848 */ ~dBgS_ObjGndChk_Spl();
};
// struct dBgS {};
struct dBgS_ObjAcch {
/* 8066ECD0 */ ~dBgS_ObjAcch();
};
// struct dBgS_Acch {
// /* 80075F94 */ ~dBgS_Acch();
// /* 800760A0 */ dBgS_Acch();
// /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
// /* 80076AAC */ void CrrPos(dBgS&);
// };
struct dBgS_LinChk {
/* 80077C68 */ dBgS_LinChk();
/* 80077CDC */ ~dBgS_LinChk();
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
// struct cCcS {
// /* 80264BA8 */ void Set(cCcD_Obj*);
// };
struct dBgS_GndChk {
/* 8007757C */ dBgS_GndChk();
/* 800775F0 */ ~dBgS_GndChk();
};
// struct cBgS_LinChk {};
struct dBgS_AcchCir {
/* 80075EAC */ dBgS_AcchCir();
/* 80075F58 */ void SetWall(f32, f32);
};
// struct cBgS_GndChk {
// /* 80267D28 */ void SetPos(cXyz const*);
// /* 80267D0C */ void SetPos(Vec const*);
// };
struct dBgS {};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
/* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
/* 80076AAC */ void CrrPos(dBgS&);
};
struct cM3dGSph {
/* 8026F648 */ void SetC(cXyz const&);
/* 8026F708 */ void SetR(f32);
/* 8066EC40 */ ~cM3dGSph();
};
struct cM3dGAab {
/* 8066EC88 */ ~cM3dGAab();
};
struct cCcD_Obj {};
struct cCcS {
/* 80264BA8 */ void Set(cCcD_Obj*);
};
struct cBgS_LinChk {};
struct cBgS_GndChk {
/* 80267D28 */ void SetPos(cXyz const*);
/* 80267D0C */ void SetPos(Vec const*);
};
struct cBgS {
/* 800743B4 */ void LineCross(cBgS_LinChk*);
/* 800744A0 */ void GroundCross(cBgS_GndChk*);
};
// struct cBgS {
// /* 800743B4 */ void LineCross(cBgS_LinChk*);
// /* 800744A0 */ void GroundCross(cBgS_GndChk*);
// };
#endif /* D_A_DO_H */