Skip to content

Commit 6519691

Browse files
TtobasTtobas
andauthored
d_a_obj_udoor matching (#2337)
* d_a_obj_udoor done * Fix: Re-type unused fields to u8[] * Fix: Make padding data implicit in obj_udoor_class --------- Co-authored-by: Ttobas <anon@ym.ous>
1 parent 861e99c commit 6519691

File tree

3 files changed

+153
-221
lines changed

3 files changed

+153
-221
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2109,7 +2109,7 @@ def MatchingFor(*versions):
21092109
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tp"),
21102110
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_treesh"),
21112111
ActorRel(NonMatching, "d_a_obj_twGate"),
2112-
ActorRel(NonMatching, "d_a_obj_udoor"),
2112+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_udoor"),
21132113
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_usaku"),
21142114
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_vground"),
21152115
ActorRel(NonMatching, "d_a_obj_volcball"),

include/d/actor/d_a_obj_udoor.h

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#define D_A_OBJ_UDOOR_H
33

44
#include "f_op/f_op_actor_mng.h"
5+
#include "d/d_cc_d.h"
6+
#include "d/d_bg_w.h"
57

68
/**
79
* @ingroup actors-objects
@@ -12,8 +14,19 @@
1214
*
1315
*/
1416
class obj_udoor_class : public fopAc_ac_c {
15-
private:
16-
/* 0x568 */ u8 field_0x568[0x754 - 0x568];
17+
public:
18+
/* 0x568 */ request_of_phase_process_class mPhase;
19+
/* 0x570 */ u8 field_0x570;
20+
/* 0x574 */ J3DModel* mpModel;
21+
/* 0x578 */ u8 field_0x578[0x57c - 0x578];
22+
/* 0x57c */ s16 field_0x57c;
23+
/* 0x580 */ f32 field_0x580;
24+
/* 0x584 */ u8 field_0x584[0x588 - 0x584];
25+
/* 0x588 */ Mtx mBgMtx;
26+
/* 0x5b8 */ dBgW* mpBgW;
27+
/* 0x5bc */ dCcD_Stts mCcStts;
28+
/* 0x5f8 */ dCcD_Sph mCcSph;
29+
/* 0x730 */ u8 field_0x730[0x754 - 0x730];
1730
};
1831

1932
STATIC_ASSERT(sizeof(obj_udoor_class) == 0x754);

0 commit comments

Comments
 (0)