diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-09-12 03:14:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 03:14:40 -0700 |
| commit | 85b77c336ba7672a9ebb5bb276d78f06d9f25b00 (patch) | |
| tree | 0a39e1d78a2d7761ba91d97f6d62f5f941ec3466 /include/d/d_tree.h | |
| parent | 06ec97aade63b6a358cd7c2985511aa633035256 (diff) | |
work on m_Do_audio and d_com_inf_game (#18)
* fix float issues and add decompctx.py tool
* work on m_Do_audio and d_com_inf_game
* fix build
Diffstat (limited to 'include/d/d_tree.h')
| -rw-r--r-- | include/d/d_tree.h | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/include/d/d_tree.h b/include/d/d_tree.h index d609ec8b..50fd9476 100644 --- a/include/d/d_tree.h +++ b/include/d/d_tree.h @@ -7,46 +7,46 @@ class dTree_data_c { public: - ~dTree_data_c(); + ~dTree_data_c(); dTree_data_c(); - void WorkCo(fopAc_ac_c*, u32, int); - void WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*); - void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*); - void hitCheck(fopAc_ac_c*, int); - void animation(int); - - /* 0x000 */ u8 field_0x000; - /* 0x001 */ u8 field_0x001; - /* 0x002 */ u8 mAnimIdx; - /* 0x003 */ s8 field_0x003; - /* 0x004 */ cXyz mPos; - /* 0x010 */ Mtx field_0x010; - /* 0x040 */ Mtx field_0x040; - /* 0x070 */ Mtx field_0x070; - /* 0x0A0 */ Mtx mShadowMtx; - /* 0x0D0 */ u8 field_0x0D0[0x100 - 0x0D0]; - /* 0x100 */ dTree_data_c* mpNext; + void WorkCo(fopAc_ac_c*, u32, int); + void WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*); + void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*); + void hitCheck(fopAc_ac_c*, int); + void animation(int); + + /* 0x000 */ u8 field_0x000; + /* 0x001 */ u8 field_0x001; + /* 0x002 */ u8 mAnimIdx; + /* 0x003 */ s8 field_0x003; + /* 0x004 */ cXyz mPos; + /* 0x010 */ Mtx field_0x010; + /* 0x040 */ Mtx field_0x040; + /* 0x070 */ Mtx field_0x070; + /* 0x0A0 */ Mtx mShadowMtx; + /* 0x0D0 */ u8 field_0x0D0[0x100 - 0x0D0]; + /* 0x100 */ dTree_data_c* mpNext; }; class dTree_anm_c { public: - ~dTree_anm_c(); - dTree_anm_c(); + ~dTree_anm_c(); + dTree_anm_c(); - /* 0x00 */ u8 field_0x00[0x02 - 0x00]; - /* 0x02 */ s16 field_0x02; - /* 0x04 */ s16 field_0x04; - /* 0x06 */ u8 field_0x06[0x08 - 0x06]; - /* 0x08 */ s16 field_0x08; - /* 0x0A */ s16 field_0x0a; - /* 0x0C */ f32 mAnimTimer; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ Mtx field_0x24; + /* 0x00 */ u8 field_0x00[0x02 - 0x00]; + /* 0x02 */ s16 field_0x02; + /* 0x04 */ s16 field_0x04; + /* 0x06 */ u8 field_0x06[0x08 - 0x06]; + /* 0x08 */ s16 field_0x08; + /* 0x0A */ s16 field_0x0a; + /* 0x0C */ f32 mAnimTimer; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ Mtx field_0x24; /* 0x54 */ u8 field_0x54[0x84 - 0x54]; }; @@ -54,34 +54,34 @@ class dTree_room_c { public: dTree_room_c(); - void newData(dTree_data_c*); - void deleteData(); + void newData(dTree_data_c*); + void deleteData(); - /* 0x0 */ dTree_data_c* mpHead; + /* 0x0 */ dTree_data_c* mpHead; }; class dTree_packet_c : public J3DPacket { public: - dTree_packet_c(); + dTree_packet_c(); - void calc(); - void update(); - void setData(dTree_data_c*, int, cXyz&, u8, int); - void newData(cXyz&, u8, int); - void newAnm(s16); - void setAnm(int, s16); + void calc(); + void update(); + void setData(dTree_data_c*, int, cXyz&, u8, int); + void newData(cXyz&, u8, int); + void newAnm(s16); + void setAnm(int, s16); virtual void draw(); virtual ~dTree_packet_c(); - /* 0x0010 */ s16 field_0x0010; - /* 0x0014 */ dTree_data_c mData[64]; - /* 0x4114 */ dTree_anm_c mAnm[72]; - /* 0x6634 */ dTree_room_c mRoom[64]; - /* 0x6734 */ u8 field_0x6734; - /* 0x6736 */ s16 field_0x6736; - /* 0x6738 */ s16 field_0x6738; - /* 0x673C */ cXyz field_0x673c; + /* 0x0010 */ s16 field_0x0010; + /* 0x0014 */ dTree_data_c mData[64]; + /* 0x4114 */ dTree_anm_c mAnm[72]; + /* 0x6634 */ dTree_room_c mRoom[64]; + /* 0x6734 */ u8 field_0x6734; + /* 0x6736 */ s16 field_0x6736; + /* 0x6738 */ s16 field_0x6738; + /* 0x673C */ cXyz field_0x673c; }; #endif /* D_TREE_H */
\ No newline at end of file |
