Skip to content

d_a_e_hp almost matching#2585

Merged
hatal175 merged 1 commit intozeldaret:mainfrom
caseif:d_a_e_hp-1
Aug 15, 2025
Merged

d_a_e_hp almost matching#2585
hatal175 merged 1 commit intozeldaret:mainfrom
caseif:d_a_e_hp-1

Conversation

@caseif
Copy link
Copy Markdown
Contributor

@caseif caseif commented Aug 14, 2025

d_a_e_hp is almost matching with this PR. There's a small mismatch in executeDead due to some g_dComIfG_gameInfo weirdness, and as usual setMidnaBindEffect strikes again to mess up function order.

This PR also includes a couple of miscellaneous fixes including some changes to allow debug to build successfully.

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented Aug 14, 2025

Report for GZ2E01 (8b93a87 - 343a0f8)

📈 Matched code: 77.47% (+0.14%, +15648 bytes)

✅ 41 new matches
Unit Function Bytes Before After
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::action() +2088 0.19% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::executeDown() +1745 0.23% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::draw() +1241 0.32% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::mtx_set() +1053 0.38% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::create() +992 0.40% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::executeRetMove() +845 0.47% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::executeAttack() +841 0.47% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::executeWait() +808 0.49% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::CreateHeap() +696 0.57% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::executeMove() +608 0.65% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::executeDamage() +585 0.68% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::damage_check() +521 0.76% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::cc_set() +521 0.76% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::daE_HP_c() +406 8.65% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::execute() +385 1.03% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::mChkDistance(float) +365 1.09% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::LampCtrlJoint(J3DJoint*, J3DModel*) +173 2.27% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::setBck(int, unsigned char, float, float) +169 2.33% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::ctrlJoint(J3DJoint*, J3DModel*) +156 2.50% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::_delete() +133 2.94% 100.00%
d_a_e_hp/d/actor/d_a_e_hp dBgS_ObjAcch::~dBgS_ObjAcch() +109 3.57% 100.00%
d_a_e_hp/d/actor/d_a_e_hp dBgS_AcchCir::~dBgS_AcchCir() +109 3.57% 100.00%
d_a_e_hp/d/actor/d_a_e_hp dCcD_GStts::~dCcD_GStts() +89 4.35% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::JointCallBack(J3DJoint*, int) +73 5.26% 100.00%
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::LampJointCallBack(J3DJoint*, int) +73 5.26% 100.00%
d_a_e_hp/d/actor/d_a_e_hp cM3dGPla::~cM3dGPla() +69 5.56% 100.00%
d_a_e_hp/d/actor/d_a_e_hp cM3dGSph::~cM3dGSph() +69 5.56% 100.00%
d_a_e_hp/d/actor/d_a_e_hp cM3dGCyl::~cM3dGCyl() +69 5.56% 100.00%
d_a_e_hp/d/actor/d_a_e_hp cM3dGAab::~cM3dGAab() +69 5.56% 100.00%
d_a_e_hp/d/actor/d_a_e_hp cCcD_GStts::~cCcD_GStts() +69 5.56% 100.00%

...and 11 more new matches

📈 1 improvement in unmatched functions
Unit Function Bytes Before After
d_a_e_hp/d/actor/d_a_e_hp daE_HP_c::executeDead() +692 0.57% 99.91%

};
#pragma pop
static dCcD_SrcCyl cc_hp_src = {{
{0, {{0x0, 0x0, 0x0}, {(s32)0xd8000000, 0x3}, 0x0}},
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.

are these s32 casts actually necessary? also formatting should be fixed if possible

Copy link
Copy Markdown
Contributor Author

@caseif caseif Aug 15, 2025

Choose a reason for hiding this comment

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

In this case it fixes an "error" in CLion due to the field expecting a signed integer (which 0xd8000000 overflows).

@hatal175 hatal175 merged commit 41c72dc into zeldaret:main Aug 15, 2025
1 check passed
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.

3 participants