Skip to content

obj_brakeeff_class Matching #2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 12 commits into from
May 15, 2025
Merged

obj_brakeeff_class Matching #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d1da56
Laid out obj_brakeeff_class members
Joaqstarr May 4, 2025
11bbb14
Matched daObj_Brakeeff_Draw
Joaqstarr May 4, 2025
0d9b187
obj_brakeeff::action almost matching
Joaqstarr May 4, 2025
6a6689a
brakeeff_Delete matching
Joaqstarr May 4, 2025
908e552
daObj_Brakeeff_Execute matching
Joaqstarr May 4, 2025
0a1035f
work on obj_brakeeff_1
Joaqstarr May 5, 2025
df73be7
Matched action and brakeff1
Joaqstarr May 6, 2025
f545c40
obj_brakeeff_create almost matching
Joaqstarr May 7, 2025
2ac2cd9
d_a_obj_brakeeff Matching
Joaqstarr May 8, 2025
2ff1159
d_a_obj_brakeeff additional cleanup
Joaqstarr May 15, 2025
f5d9770
Revert line deleted
hatal175 May 15, 2025
e84994f
Fix tab indentation
hatal175 May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag00"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag04"),
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag17"),
ActorRel(NonMatching, "d_a_obj_brakeeff"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_brakeeff"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_burnbox"),
ActorRel(NonMatching, "d_a_obj_carry"),
ActorRel(NonMatching, "d_a_obj_ito"),
Expand Down
25 changes: 22 additions & 3 deletions include/d/actor/d_a_obj_brakeeff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
#define D_A_OBJ_BRAKEEFF_H

#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_cc_d.h"
#include "mtx.h"

class J3DModel;
class mDoExt_brkAnm;
class dBgW;

/**
* @ingroup actors-objects
Expand All @@ -12,11 +19,23 @@
*
*/
class obj_brakeeff_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x73c - 0x568];
public:
/* 0x568 */ request_of_phase_process_class mRequestOfPhase;
/* 0x570 */ u8 mEffectType;
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ mDoExt_brkAnm* mpBrk;
/* 0x57C */ s16 mMiscTimer1;
/* 0x57E */ s16 mMiscTimer2;
/* 0x580 */ s16 mMiscTimer3;
/* 0x582 */ s16 mMiscTimers[2];
/* 0x588 */ dCcD_Stts mDCcD_Stts;
/* 0x5C4 */ dCcD_Sph mDCcD_Sph;
/* 0x6FC */ u32 mRuntimeParticleIds[2];
/* 0x704 */ u8 padding_0x704[4];
/* 0x708 */ Mtx mStoredMatrix;
/* 0x738 */ dBgW* mpDBgW;
};

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


#endif /* D_A_OBJ_BRAKEEFF_H */
Loading