Skip to content

d_a_npc_kn work#2274

Merged
hatal175 merged 23 commits intozeldaret:mainfrom
Pheenoh:d_a_npc_kn
Jun 8, 2025
Merged

d_a_npc_kn work#2274
hatal175 merged 23 commits intozeldaret:mainfrom
Pheenoh:d_a_npc_kn

Conversation

@Pheenoh
Copy link
Copy Markdown
Contributor

@Pheenoh Pheenoh commented Dec 29, 2024

PR'ing in what I've done so far so others can continue building off of it

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented Jun 8, 2025

Report for GZ2E01 (1a7b145 - 3528883)

📈 Matched code: 64.65% (+0.16%, +18140 bytes)

✅ 107 new matches:
Unit Function Bytes Before After
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::daNpc_Kn_c(const daNpcT_faceMotionAnmData_c*, const daNpcT_motionAnmData_c*, const daNpcT_MotionSeqMngr_c::sequenceStepData_c*, int, const daNpcT_MotionSeqMngr_c::sequenceStepData_c*, int, const daNpcT_evtData_c*, char**) +1218 3.06% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::~daNpc_Kn_c() +1133 6.91% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::execute() +645 0.62% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setParam() +636 0.62% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::reset() +633 0.63% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setCollision() +516 0.77% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::wait(void*) +485 0.82% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::talk(void*) +461 0.86% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setFootPos() +453 0.88% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setParamTeach01() +376 1.05% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach06_waitDivide(void*) +349 1.14% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach07_waitDivide(void*) +349 1.14% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::evtOrder() +345 1.15% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach02_start(void*) +313 1.27% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach01_start(void*) +313 1.27% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::afterSetMotionAnm(int, int, float, int) +308 1.28% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setSlipPrtcl() +292 1.35% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpcT_JntAnm_c::setEyeAngleY(cXyz, short, int, float, short) +280 1.41% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::evtChange() +252 1.56% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpcT_JntAnm_c::~daNpcT_JntAnm_c() +248 1.59% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setCollisionTeach01() +229 1.72% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::evtTalk() +225 1.75% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setCollisionTeach02() +225 1.75% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setCollisionTeach04() +216 1.82% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::calcMagicBallPos() +213 1.85% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::resetType() +209 1.89% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn dCcD_Sph::~dCcD_Sph() +200 1.96% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::resetCol() +193 2.04% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::drawGhost() +193 2.04% 100.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::checkCollisionSword() +185 2.13% 100.00%

...and 77 more new matches

📈 47 improvements in unmatched functions:
Unit Function Bytes Before After
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::ECut_thirdSkillExplain(int) +2151 0.19% 99.92%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::ECut_sixthSkillGet(int) +1586 0.25% 99.93%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach05_surpriseAttackWait(void*) +1456 0.27% 99.95%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach03_attackWait(void*) +1435 0.28% 99.95%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setSwordChargePtcl() +1011 0.34% 86.24%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach04_finishWait(void*) +944 0.42% 99.92%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach01_swordAttackWait(void*) +944 0.42% 99.95%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach01_swordFinishWait(void*) +935 0.43% 99.94%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setSe() +930 0.40% 92.29%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach04_attackWait(void*) +899 0.44% 99.95%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::CreateHeap() +892 0.43% 95.74%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach02_shieldBashWait(void*) +884 0.45% 99.92%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::ECut_secondEncount(int) +745 0.34% 64.64%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::ECut_noneEquipChangeTalkStand(int) +739 0.54% 99.94%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach04_headBreakWait(void*) +700 0.57% 99.93%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::ECut_largeDamageTalk(int) +695 0.57% 99.94%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setParamTeach02() +687 0.58% 99.95%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::create() +670 0.59% 99.78%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach06_superJumpWait(void*) +629 0.22% 34.85%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach02_finishWait(void*) +584 0.68% 99.90%
d_a_npc_kn/d/actor/d_a_npc_kn __sinit_d_a_npc_kn_cpp +550 0.57% 78.65%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::drawOtherMdl() +536 0.74% 99.91%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::calcSlip() +532 0.75% 99.92%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::ECut_noneEquipChangeTalk(int) +528 0.75% 99.92%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach06_divideMove(void*) +524 0.76% 99.95%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::selectAction() +520 0.76% 99.86%
d_a_npc_kn/d/actor/d_a_npc_kn daNpcT_JntAnm_c::setEyeAngleX(cXyz, float, short) +515 0.77% 99.95%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setAttnPos() +511 0.76% 97.37%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::setCollisionSword() +424 0.93% 99.96%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::teach01_attackWait(void*) +375 1.05% 99.96%

...and 17 more improvements in unmatched functions

📉 3 regressions in unmatched functions:
Unit Function Bytes Before After
d_a_npc_kn/d/actor/d_a_npc_kn dAttention_c::getDistTable(int) -4 20.00% 0.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c) -3 8.33% 0.00%
d_a_npc_kn/d/actor/d_a_npc_kn daNpc_Kn_c::getMotionAnm(daNpcT_motionAnmData_c) -3 8.33% 0.00%

@Pheenoh Pheenoh marked this pull request as ready for review June 8, 2025 04:05
Copy link
Copy Markdown
Contributor

@TakaRikka TakaRikka left a comment

Choose a reason for hiding this comment

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

can you check what happened with the two broken matches? its just a 1 byte change so it shouldnt be anything major to fix

Comment thread include/dolphin/gx/GXStruct.h Outdated
@Pheenoh
Copy link
Copy Markdown
Contributor Author

Pheenoh commented Jun 8, 2025

can you check what happened with the two broken matches? its just a 1 byte change so it shouldnt be anything major to fix

Should be good to go now

@hatal175 hatal175 merged commit 5ec7e42 into zeldaret:main Jun 8, 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