Skip to content

Commit 109b919

Browse files
Joaqstarrhatal175
authored andcommitted
obj_brakeeff_class Matching (zeldaret#2430)
* Laid out obj_brakeeff_class members * Matched daObj_Brakeeff_Draw * obj_brakeeff::action almost matching * brakeeff_Delete matching * daObj_Brakeeff_Execute matching * work on obj_brakeeff_1 * Matched action and brakeff1 * obj_brakeeff_create almost matching * d_a_obj_brakeeff Matching * d_a_obj_brakeeff additional cleanup * Revert line deleted * Fix tab indentation --------- Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
1 parent 8167be9 commit 109b919

File tree

3 files changed

+230
-228
lines changed

3 files changed

+230
-228
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ def MatchingFor(*versions) -> bool:
14791479
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag00"),
14801480
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag04"),
14811481
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag17"),
1482-
ActorRel(NonMatching, "d_a_obj_brakeeff"),
1482+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_brakeeff"),
14831483
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_burnbox"),
14841484
ActorRel(NonMatching, "d_a_obj_carry"),
14851485
ActorRel(NonMatching, "d_a_obj_ito"),

include/d/actor/d_a_obj_brakeeff.h

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
#define D_A_OBJ_BRAKEEFF_H
33

44
#include "f_op/f_op_actor_mng.h"
5+
#include "SSystem/SComponent/c_phase.h"
6+
#include "d/d_cc_d.h"
7+
#include "mtx.h"
8+
9+
class J3DModel;
10+
class mDoExt_brkAnm;
11+
class dBgW;
512

613
/**
714
* @ingroup actors-objects
@@ -12,11 +19,23 @@
1219
*
1320
*/
1421
class obj_brakeeff_class : public fopAc_ac_c {
15-
private:
16-
/* 0x568 */ u8 field_0x568[0x73c - 0x568];
22+
public:
23+
/* 0x568 */ request_of_phase_process_class mRequestOfPhase;
24+
/* 0x570 */ u8 mEffectType;
25+
/* 0x574 */ J3DModel* mpModel;
26+
/* 0x578 */ mDoExt_brkAnm* mpBrk;
27+
/* 0x57C */ s16 mMiscTimer1;
28+
/* 0x57E */ s16 mMiscTimer2;
29+
/* 0x580 */ s16 mMiscTimer3;
30+
/* 0x582 */ s16 mMiscTimers[2];
31+
/* 0x588 */ dCcD_Stts mDCcD_Stts;
32+
/* 0x5C4 */ dCcD_Sph mDCcD_Sph;
33+
/* 0x6FC */ u32 mRuntimeParticleIds[2];
34+
/* 0x704 */ u8 padding_0x704[4];
35+
/* 0x708 */ Mtx mStoredMatrix;
36+
/* 0x738 */ dBgW* mpDBgW;
1737
};
1838

1939
STATIC_ASSERT(sizeof(obj_brakeeff_class) == 0x73c);
2040

21-
2241
#endif /* D_A_OBJ_BRAKEEFF_H */

0 commit comments

Comments
 (0)