Skip to content

obj_brakeeff_class Matching#2430

Merged
hatal175 merged 12 commits intozeldaret:mainfrom
Joaqstarr:obj_brakeeff_class
May 15, 2025
Merged

obj_brakeeff_class Matching#2430
hatal175 merged 12 commits intozeldaret:mainfrom
Joaqstarr:obj_brakeeff_class

Conversation

@Joaqstarr
Copy link
Copy Markdown
Contributor

No description provided.

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented May 8, 2025

Report for GZ2E01 (958916a - e84994f)

📈 Matched code: 59.90% (+0.02%, +2144 bytes)
📈 Linked code: 26.32% (+0.02%, +2152 bytes)

d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | daObj_Brakeeff_Draw(obj_brakeeff_class*) +124 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | obj_brakeeff_1(obj_brakeeff_class*) +580 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | action(obj_brakeeff_class*) +44 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | daObj_Brakeeff_Execute(obj_brakeeff_class*) +229 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | daObj_Brakeeff_Delete(obj_brakeeff_class*) +76 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | useHeapInit(fopAc_ac_c*) +444 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | J3DFrameCtrl::~J3DFrameCtrl() +68 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | daObj_Brakeeff_Create(fopAc_ac_c*) +404 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | cM3dGSph::~cM3dGSph() +68 bytes -> 100.00%
d_a_obj_brakeeff/d/actor/d_a_obj_brakeeff | cM3dGAab::~cM3dGAab() +68 bytes -> 100.00%

public:
/* 0x568 */ request_of_phase_process_class mRequestOfPhase;
/* 0x570 */ unsigned char mEffectType;
//alignment bytes /* 0x571 */ u8 padding_0x571[3];
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for alignment comments

/* 0x704 */ u8 padding_0x704[4];
/* 0x708 */ Mtx mStoredMatrix;
/* 0x738 */ dBgW* mpDBgW;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unnecessary new lines

//alignment bytes /* 0x571 */ u8 padding_0x571[3];
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ mDoExt_brkAnm* mpBrk;
/* 0x57C */ short mMiscTimer1;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use s16 instead of short (standard in codebase)

/* 0x568 */ u8 field_0x568[0x73c - 0x568];
public:
/* 0x568 */ request_of_phase_process_class mRequestOfPhase;
/* 0x570 */ unsigned char mEffectType;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use u8


//model data per effect type
u32 bef_bmd[2] = {
5, 6,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

format


a_this->mpDBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);

return 1;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

formatting



if(!is_heap_set){
return cPhs_ERROR_e;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

formatting

}

if(dComIfG_Bgsp().Regist(a_this->mpDBgW, i_this)){
return cPhs_ERROR_e;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

formatting

/* 8046E098-8046E0A0 000458 0008+00 1/0 0/0 0/0 .text
* daObj_Brakeeff_IsDelete__FP18obj_brakeeff_class */
static bool daObj_Brakeeff_IsDelete(obj_brakeeff_class* param_0) {
bool daObj_Brakeeff_IsDelete(obj_brakeeff_class* i_this) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These functions (IsDelete, draw, execute etc return int, so change return type and return 1

@hatal175 hatal175 merged commit c3660c3 into zeldaret:main May 15, 2025
1 check passed
@Joaqstarr Joaqstarr deleted the obj_brakeeff_class branch May 18, 2025 14:05
@Joaqstarr
Copy link
Copy Markdown
Contributor Author

#953 Resolved

meintte pushed a commit to meintte/tp that referenced this pull request May 28, 2025
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants