Skip to content

Commit 49bcfbb

Browse files
committed
cleanup d_a_obj_wflag
1 parent bc7503c commit 49bcfbb

File tree

2 files changed

+173
-131
lines changed

2 files changed

+173
-131
lines changed

include/d/actor/d_a_obj_wflag.h

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ struct wf_tail_s {
77
~wf_tail_s() {}
88
wf_tail_s() {}
99

10-
/* 0x000 */ s16 field_0x000;
11-
/* 0x000 */ u16 field_0x002;
12-
/* 0x004 */ cXyz field_0x004[20];
13-
/* 0x0F4 */ csXyz field_0x0f4[20];
14-
/* 0x16C */ cXyz field_0x16c[20];
15-
/* 0x25C */ J3DModel* mModels[19];
16-
/* 0x2A8 */ u32 field_0x2a8;
10+
/* 0x000 */ s16 field_0x0;
11+
/* 0x000 */ u16 unk_0x2;
12+
/* 0x004 */ cXyz pos[20];
13+
/* 0x0F4 */ csXyz rot[20];
14+
/* 0x16C */ cXyz unk_0x16c[20];
15+
/* 0x25C */ J3DModel* model[19];
16+
/* 0x2A8 */ u32 unk_0x2a8;
1717
};
1818

1919
/**
@@ -24,19 +24,20 @@ struct wf_tail_s {
2424
* @details
2525
*
2626
*/
27-
class obj_wflag_class : public fopAc_ac_c {
27+
class obj_wflag_class {
2828
public:
29-
/* 0x568 */ request_of_phase_process_class mPhaseReq;
30-
/* 0x570 */ J3DModel* mpModel;
31-
/* 0x574 */ mDoExt_McaMorf* mMorf;
32-
/* 0x578 */ mDoExt_btkAnm* field_0x578;
33-
/* 0x57C */ mDoExt_btpAnm* field_0x57c;
34-
/* 0x580 */ wf_tail_s mTails[1];
35-
/* 0x82C */ u8 field_0x82c;
29+
/* 0x000 */ fopAc_ac_c actor;
30+
/* 0x568 */ request_of_phase_process_class phase;
31+
/* 0x570 */ J3DModel* pillar_model;
32+
/* 0x574 */ mDoExt_McaMorf* anm_p;
33+
/* 0x578 */ mDoExt_btkAnm* kolin_btk;
34+
/* 0x57C */ mDoExt_btpAnm* kolin_btp;
35+
/* 0x580 */ wf_tail_s tail_s[1];
36+
/* 0x82C */ u8 unk_0x82c;
3637
/* 0x82E */ s16 field_0x82e;
37-
/* 0x830 */ s16 field_0x830[2];
38-
/* 0x834 */ s16 field_0x834;
39-
/* 0x836 */ s16 field_0x836;
38+
/* 0x830 */ s16 timers[2];
39+
/* 0x834 */ s16 unk_timer;
40+
/* 0x836 */ s16 counter;
4041
/* 0x838 */ u32 field_0x838;
4142
};
4243

0 commit comments

Comments
 (0)