Skip to content

Commit efcf241

Browse files
authored
d_a_npc_seib Equivalent (weak func order) (#2431)
* d_a_npc_seib fmt * d_a_npc_seib equivalent
1 parent a7d2807 commit efcf241

File tree

3 files changed

+151
-193
lines changed

3 files changed

+151
-193
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,7 @@ def MatchingFor(*versions) -> bool:
18161816
ActorRel(NonMatching, "d_a_npc_raca"),
18171817
ActorRel(NonMatching, "d_a_npc_rafrel"),
18181818
ActorRel(NonMatching, "d_a_npc_saru"),
1819-
ActorRel(NonMatching, "d_a_npc_seib"),
1819+
ActorRel(Equivalent, "d_a_npc_seib"), # weak func order
18201820
ActorRel(NonMatching, "d_a_npc_seic"),
18211821
ActorRel(NonMatching, "d_a_npc_seid"),
18221822
ActorRel(NonMatching, "d_a_npc_seira"),

include/d/actor/d_a_npc_seib.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class daNpc_seiB_Param_c {
5252
/* 0x84 */ f32 field_0x84;
5353
/* 0x88 */ f32 field_0x88;
5454
/* 0x8C */ f32 field_0x8c;
55-
/* 0x90 */ f32 field_0x90;
55+
/* 0x90 */ f32 mDist;
5656
};
5757

5858
static const Data m;
@@ -104,13 +104,12 @@ class daNpc_seiB_c : public daNpcT_c {
104104
static cutFunc mCutList[1];
105105

106106
private:
107-
/* 0xE40 */ daNpc_seiB_Param_c* field_0xe40;
107+
/* 0xE40 */ daNpc_seiB_Param_c* mpParam;
108108
/* 0xE44 */ u8 mType;
109-
/* 0xE45 */ u8 field_0xe45[0xe48 - 0xe45];
110-
/* 0xE48 */ actionFunc field_0xe48;
111-
/* 0xE54 */ actionFunc field_0xe54;
112-
/* 0xE60 */ int field_0xe60;
113-
/* 0xE64 */ int field_0xe64;
109+
/* 0xE48 */ actionFunc mActionFunc1;
110+
/* 0xE54 */ actionFunc mActionFunc2;
111+
/* 0xE60 */ int mAnim;
112+
/* 0xE64 */ void* field_0xe64;
114113
};
115114

116115
STATIC_ASSERT(sizeof(daNpc_seiB_c) == 0xe68);

0 commit comments

Comments
 (0)