Skip to content

Commit acad3db

Browse files
authored
d_a_obj_ganonwall matching (#2346)
* d_a_obj_ganonwall matching * applied suggestions * Rework l_idx into 2d array
1 parent c33ddb3 commit acad3db

File tree

3 files changed

+156
-192
lines changed

3 files changed

+156
-192
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1892,7 +1892,7 @@ def MatchingFor(*versions):
18921892
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_food"),
18931893
ActorRel(NonMatching, "d_a_obj_fw"),
18941894
ActorRel(NonMatching, "d_a_obj_gadget"),
1895-
ActorRel(NonMatching, "d_a_obj_ganonwall"),
1895+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ganonwall"),
18961896
ActorRel(NonMatching, "d_a_obj_ganonwall2"),
18971897
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_gb"),
18981898
ActorRel(NonMatching, "d_a_obj_geyser"),

include/d/actor/d_a_obj_ganonwall.h

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

4-
#include "d/d_com_inf_game.h"
54
#include "f_op/f_op_actor_mng.h"
65

76
/**
@@ -31,9 +30,9 @@ class daObjGWall_c : public fopAc_ac_c {
3130
/* 0x568 */ request_of_phase_process_class mPhaseReq;
3231
/* 0x570 */ J3DModel* mpModel;
3332
/* 0x574 */ mDoExt_btkAnm* mpBtkAnm;
34-
/* 0x578 */ u16 field_0x578;
35-
/* 0x57A */ u16 field_0x57a;
36-
/* 0x57C */ s16 field_0x57c;
33+
/* 0x578 */ u16 mEventBit1;
34+
/* 0x57A */ u16 mEventBit2;
35+
/* 0x57C */ u16 mMatIdx;
3736
};
3837

3938
STATIC_ASSERT(sizeof(daObjGWall_c) == 0x580);

0 commit comments

Comments
 (0)