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
This commit is contained in:
TakaRikka
2023-08-27 01:39:15 -07:00
committed by GitHub
parent 73cdbf5495
commit d369e2908c
47 changed files with 1211 additions and 2054 deletions
+1 -1
View File
@@ -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;
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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);