diff options
| author | Jeff Padgham <jeff.ookami@gmail.com> | 2024-02-25 21:54:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-25 21:54:23 -0800 |
| commit | 0e41460e3e8f8baede7679d7e71a84008d44f34b (patch) | |
| tree | 8912caaf1669e9ad64a9697eaaffbfb1b0030d92 /include | |
| parent | d72e2c95e57f04cac7df3e55c049ae2fb0da1b2f (diff) | |
d_a_obj_table OK (#2076)
* Initial pass, 1 nonmatching
* Some cleanup, got the last mostly matching
* d_a_obj_table decomp OK
* Format pass
* Minor cleanup pass
* Removing unused asm files
* Updating a magic number with an appropriate method
* fix compiler zip endpoint (#2077)
* remove dkp dependency (#2078)
* Some changes and cleanup to address PR feedback
* Cleaning up static Create method with Taka's help
---------
Co-authored-by: GinNoOokami <noreply>
Co-authored-by: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h b/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h index 89760ffbc6..1c4ef68211 100644 --- a/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h +++ b/include/rel/d/a/obj/d_a_obj_table/d_a_obj_table.h @@ -2,8 +2,30 @@ #define D_A_OBJ_TABLE_H #include "d/bg/d_bg_s_movebg_actor.h" -#include "d/com/d_com_inf_game.h" #include "d/msg/d_msg_flow.h" #include "f_op/f_op_actor_mng.h" +class daObjTable_c : public dBgS_MoveBgActor { +public: + /* 80D06560 */ int CreateHeap(); + /* 80D065D0 */ int Create(); + /* 80D0695C */ int Execute(Mtx**); + /* 80D06AD8 */ int Draw(); + /* 80D06BC8 */ int Delete(); + + inline void initBaseMtx(); + inline void setBaseMtx(); + inline int create(); + + s16 getMessageNo() { return (s16)fopAcM_GetParamBit(this, 0, 16); } + + /* 0x5A0 */ J3DModel* mpModel; + /* 0x5A4 */ request_of_phase_process_class mPhaseReq; + /* 0x5AC */ dMsgFlow_c mMsgFlow; + /* 0x5F8 */ u32 mShadowKey; + /* 0x5FC */ s16 mEventID; +}; // Size: 0x600 + +STATIC_ASSERT(sizeof(daObjTable_c) == 0x600); + #endif /* D_A_OBJ_TABLE_H */ |