Skip to content

match d_lyt_map_capture#328

Merged
robojumper merged 5 commits into
zeldaret:mainfrom
compugab:match-d_lyt_map_capture
Jun 3, 2026
Merged

match d_lyt_map_capture#328
robojumper merged 5 commits into
zeldaret:mainfrom
compugab:match-d_lyt_map_capture

Conversation

@compugab

@compugab compugab commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

Matching main/d/lyt/d_lyt_map_capture at 95%,

I forgot to remove the commented field in d_stage.h.

@decomp-dev

decomp-dev Bot commented Jun 1, 2026

Copy link
Copy Markdown

Report for SOUE01 (560ff18 - 21c7dac)

📈 Matched code: 25.81% (+0.01%, +680 bytes)

✅ 5 new matches
Unit Item Bytes Before After
main/d/lyt/d_lyt_map_capture dLytMapCapture_c::fn_8012D800(nw4r::lyt::Pane*, const _GXTexObj*) +236 0.00% 100.00%
main/d/lyt/d_lyt_map_capture dLytMapCapture_c::fn_8012D6F0() +228 0.00% 100.00%
main/d/lyt/d_lyt_map_capture dLytMapCapture_c::fn_8012D610(mVec3_c*) +92 0.00% 100.00%
main/d/lyt/d_lyt_map_capture dLytMapCapture_c::fn_8012D670(mVec3_c*) +92 0.00% 100.00%
main/d/lyt/d_lyt_map_capture dLytMapCapture_c::fn_8012D6D0(mVec3_c*) +32 0.00% 100.00%
📈 1 improvement in an unmatched item
Unit Item Bytes Before After
main/d/lyt/d_lyt_map_capture .sdata2 +4 0.00% 28.57%

@robojumper robojumper left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please run any files you changed through clang-format.

When implementing functions that you had to manually map in objdiff, run tools/custom/apply_objdiff_mappings.py to make the names known to the rest of the tooling. Right now the PR report says "no changes", which is not right.

Comment thread src/d/lyt/d_lyt_map_capture.cpp Outdated
out->z = z;
}

extern int fn_801B5970(MapRelated*, const GXTexObj*);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please declare as a member function of MapRelated. C++ member functions typically implicitly take this as the first argument.

Comment thread src/d/lyt/d_lyt_map_capture.cpp Outdated
float x = v.x;
out->y = y;
out->x = x;
out->z = z;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Try *out = ... or out->set(...) or out->copyFrom(...), the temps are almost certainly unnecessary.

Comment thread src/d/lyt/d_lyt_map_capture.cpp Outdated
mStateMgr.executeState();
}

void fn_8012D6D0(mVec3_c *ignored, mVec3_c *out) {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

These might also be member functions of dLytMapCapture_c?

@compugab

compugab commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

I did the changes, but now it doesn't build... I don't know what I did wrong...

@robojumper

Copy link
Copy Markdown
Collaborator

The function at 0x8012D670 is wrongly labelled in symbols.txt

@robojumper

Copy link
Copy Markdown
Collaborator

Okay now there is a regression, please undo the change at 0x80144690 in symbols.txt

@robojumper robojumper merged commit 9aac632 into zeldaret:main Jun 3, 2026
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.

2 participants