Skip to content

Commit a159f3b

Browse files
authored
d_a_obj_ihasi Matching (#2373)
* d_a_obj_ihasi matching * d_a_obj_ihasi cleanup * d_a_obj_ihasi style
1 parent 716c506 commit a159f3b

File tree

3 files changed

+211
-239
lines changed

3 files changed

+211
-239
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1921,7 +1921,7 @@ def MatchingFor(*versions):
19211921
ActorRel(NonMatching, "d_a_obj_ice_s"),
19221922
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_iceblock"),
19231923
ActorRel(NonMatching, "d_a_obj_iceleaf"),
1924-
ActorRel(NonMatching, "d_a_obj_ihasi"),
1924+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ihasi"),
19251925
ActorRel(NonMatching, "d_a_obj_ikada"),
19261926
ActorRel(NonMatching, "d_a_obj_inobone"),
19271927
ActorRel(NonMatching, "d_a_obj_ita"),

include/d/actor/d_a_obj_ihasi.h

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#ifndef D_A_OBJ_IHASI_H
22
#define D_A_OBJ_IHASI_H
33

4-
#include "f_op/f_op_actor_mng.h"
4+
#include "SSystem/SComponent/c_phase.h"
5+
6+
#include "d/d_bg_w.h"
7+
#include "f_op/f_op_actor.h"
58

69
/**
710
* @ingroup actors-objects
@@ -12,11 +15,21 @@
1215
*
1316
*/
1417
class obj_ihasi_class : public fopAc_ac_c {
15-
private:
16-
/* 0x568 */ u8 field_0x568[0x5c4 - 0x568];
18+
public:
19+
/* 0x568 */ request_of_phase_process_class mPhaseReq;
20+
/* 0x570 */ J3DModel* mpModel1;
21+
/* 0x574 */ J3DModel* mpModel2;
22+
/* 0x578 */ mDoExt_btkAnm* mpBtkAnm;
23+
/* 0x57C */ s16 field_0x57c;
24+
/* 0x57E */ s16 mFlag1;
25+
/* 0x580 */ s16 field_0x580;
26+
/* 0x582 */ s16 mArr[2];
27+
/* 0x586 */ s8 mFlag2;
28+
/* 0x588 */ Mtx mMtx;
29+
/* 0x5B8 */ dBgW* mpBgW;
30+
/* 0x5BC */ u8 field_0x5bc[8];
1731
};
1832

1933
STATIC_ASSERT(sizeof(obj_ihasi_class) == 0x5c4);
2034

21-
2235
#endif /* D_A_OBJ_IHASI_H */

0 commit comments

Comments
 (0)