diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-08-27 01:39:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-27 11:39:15 +0300 |
| commit | d369e2908cbe20165b5a2aaf6875807ffcc5da6c (patch) | |
| tree | 6140870345fef8d79bfe2e0e1fccca192478c243 /include/rel | |
| parent | 73cdbf549582522f293c45462322e3ec3ed33bf6 (diff) | |
obj_master_sword wip, fmobj mostly done, obj_usaku OK, some BG doc (#1897)
* obj_master_sword work, fix tag_chgrestart
* fmobj mostly done
* some bg documentation
* d_a_obj_usaku OK
* remove asm
Diffstat (limited to 'include/rel')
5 files changed, 32 insertions, 5 deletions
diff --git a/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h b/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h index add0773ce6..8f2852e80b 100644 --- a/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h +++ b/include/rel/d/a/d_a_bg_obj/d_a_bg_obj.h @@ -90,7 +90,7 @@ public: /* 0x5A8 */ J3DModel* field_0x5a8[2][2]; /* 0x5B8 */ mDoExt_btkAnm* field_0x5b8[2][2]; /* 0x5C8 */ mDoExt_brkAnm* field_0x5c8[2][2]; - /* 0x5D8 */ dBgW* mpBgW; + /* 0x5D8 */ dBgW* mpBgW2; /* 0x5DC */ dCcD_Stts mStts; /* 0x618 */ dCcD_Tri mTris[4]; /* 0xB88 */ dCcD_Cyl mCyl; diff --git a/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h b/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h index 2ca1f07ff8..18474ac383 100644 --- a/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h +++ b/include/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.h @@ -1,6 +1,21 @@ #ifndef D_A_OBJ_FMOBJ_H #define D_A_OBJ_FMOBJ_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class dBgW; + +class obj_fmobj_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ u8 field_0x570; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ s16 field_0x578; + /* 0x57A */ u8 field_0x57A[0x57E - 0x57A]; + /* 0x57E */ s16 field_0x57e[2]; + /* 0x582 */ u8 field_0x582[0x588 - 0x582]; + /* 0x588 */ Mtx mBgMtx; + /* 0x5B8 */ dBgW* mpBgW; +}; #endif /* D_A_OBJ_FMOBJ_H */ diff --git a/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h b/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h index e0d1572d43..0822de6541 100644 --- a/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h +++ b/include/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.h @@ -1,6 +1,6 @@ #ifndef D_A_OBJ_MASTER_SWORD_H #define D_A_OBJ_MASTER_SWORD_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #endif /* D_A_OBJ_MASTER_SWORD_H */ diff --git a/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h b/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h index a9a72fd416..3a2b658320 100644 --- a/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h +++ b/include/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.h @@ -1,6 +1,18 @@ #ifndef D_A_OBJ_USAKU_H #define D_A_OBJ_USAKU_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class dBgW; + +class obj_usaku_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ u8 field_0x570; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ u8 field_0x578[0x580 - 0x578]; + /* 0x580 */ Mtx mBgMtx; + /* 0x5B0 */ dBgW* mpBgW; +}; #endif /* D_A_OBJ_USAKU_H */ diff --git a/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h b/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h index a00f154155..a64afb0f26 100644 --- a/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h +++ b/include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h @@ -12,7 +12,7 @@ public: /* 80D568B8 */ s32 execute(); /* 80D56A84 */ s32 _delete(); - /* 0x0568 */ cXyz field_0x568[4]; + /* 0x0568 */ cXyz mVertices[4]; }; STATIC_ASSERT(sizeof(daTagChgRestart_c) == 0x598); |