diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-10-19 12:01:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 02:01:46 -0700 |
| commit | 3dadc80c5e314907020b033131f8f9dadbbce684 (patch) | |
| tree | 14931d4195f62eb752db028d77dff2c84178cfd4 /include/d | |
| parent | 69dc7cbbf15ece9533ca6afc85f9500ba1b2647b (diff) | |
d_a_obj_tp OK + other rels that matched almost as is (#2218)
* d_a_tag_yami OK
* d_a_tag_watchge matched as is
* d_a_tag_wara_howl matched as is
* d_a_tag_waterfall matched as is
* daTagTheBHint_c matched as is
* daZraFreeze_c Matched as is
* Revert nosyminline argument
* d_a_obj_tp OK
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/actor/d_a_obj_tp.h | 36 | ||||
| -rw-r--r-- | include/d/d_com_inf_game.h | 5 | ||||
| -rw-r--r-- | include/d/d_drawlist.h | 2 |
3 files changed, 41 insertions, 2 deletions
diff --git a/include/d/actor/d_a_obj_tp.h b/include/d/actor/d_a_obj_tp.h index 6261920d0c..f7bd52df59 100644 --- a/include/d/actor/d_a_obj_tp.h +++ b/include/d/actor/d_a_obj_tp.h @@ -1,6 +1,10 @@ #ifndef D_A_OBJ_TP_H #define D_A_OBJ_TP_H +#include "JSystem/J3DGraphAnimator/J3DModel.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/d_bg_w.h" +#include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" /** @@ -12,8 +16,36 @@ * */ class obj_tp_class : public fopAc_ac_c { -private: - /* 0x568 */ u8 field_0x568[0x784 - 0x568]; +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ mDoExt_McaMorf* mMorf; + /* 0x574 */ int field_0x574; + /* 0x578 */ mDoExt_brkAnm* mBrk; + /* 0x57C */ J3DModel* mModels[2]; + /* 0x584 */ mDoExt_btkAnm* mBtks[2]; + /* 0x58C */ mDoExt_brkAnm* mBrks[2]; + /* 0x594 */ u8 field_0x594; + /* 0x595 */ u8 field_0x595; + /* 0x596 */ u8 field_0x596; + /* 0x597 */ u8 field_0x597; + /* 0x598 */ u8 field_0x598; + /* 0x59C */ int field_0x59c; + /* 0x5A0 */ int field_0x5a0; + /* 0x5A4 */ u8 field_0x5a4; + /* 0x5A5 */ u8 field_0x5a5; + /* 0x5A6 */ s16 field_0x5a6; + /* 0x5A8 */ s16 field_0x5a8; + /* 0x5AC */ cXyz field_0x5ac; + /* 0x5B8 */ s16 field_0x5b8[2]; + /* 0x5BC */ s16 field_0x5bc; + /* 0x5C0 */ cXyz field_0x5c0; + /* 0x5CC */ s16 field_0x5cc; + /* 0x5D0 */ int field_0x5d0; + /* 0x5D4 */ Mtx field_0x5d4; + /* 0x604 */ dBgW* mBgw; + /* 0x608 */ dCcD_Stts mStts; + /* 0x644 */ dCcD_Cyl mCyl; + /* 0x780 */ int field_0x780; }; STATIC_ASSERT(sizeof(obj_tp_class) == 0x784); diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 80a8b3a470..4b3781cb0d 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3980,6 +3980,11 @@ inline J3DDrawBuffer* dComIfGd_getXluListBG() { return g_dComIfG_gameInfo.drawlist.getXluListBG(); } +inline void dComIfGd_setListFilter() { + g_dComIfG_gameInfo.drawlist.setOpaListFilter(); + g_dComIfG_gameInfo.drawlist.setXluListFilter(); +} + inline void dComIfGd_init() { g_dComIfG_gameInfo.drawlist.init(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index a916ea6d9c..0ef98b382d 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -342,6 +342,8 @@ public: void setOpaListMiddle() { setOpaDrawList(mDrawBuffers[DB_LIST_MIDDLE]); } void setOpaListZxlu() { setOpaDrawList(mDrawBuffers[DB_LIST_Z_XLU]); } void setXluListZxlu() { setXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); } + void setOpaListFilter() { setOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); } + void setXluListFilter() { setXluDrawList(mDrawBuffers[DB_LIST_FILTER]); } void set3DlineMat(mDoExt_3DlineMat_c *param_1) { #ifndef NON_VIRTUAL_3DLINEMAT m3DLineMatSortPacket[param_1->getMaterialID()].setMat(param_1); |