Skip to content

d_lyt_draw_mark OK#275

Merged
robojumper merged 4 commits intozeldaret:mainfrom
robojumper:d_lyt_draw_mark
Nov 28, 2025
Merged

d_lyt_draw_mark OK#275
robojumper merged 4 commits intozeldaret:mainfrom
robojumper:d_lyt_draw_mark

Conversation

@robojumper
Copy link
Copy Markdown
Collaborator

No description provided.

@decomp-dev
Copy link
Copy Markdown

decomp-dev bot commented Nov 23, 2025

Report for SOUE01 (a67ebab - cb5e001)

📈 Matched code: 22.36% (+0.06%, +7560 bytes)
📈 Linked code: 13.87% (+0.06%, +7560 bytes)

✅ 46 new matches
Unit Function Bytes Before After
main/d/lyt/d_lyt_draw_mark __sinit_\d_lyt_draw_mark_cpp +1604 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::detectSwordSwing() +952 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::build(int) +520 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::loadPanePos() +324 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::buildVariant01() +316 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::buildVariant02() +316 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::buildVariant03() +316 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::executeState_MoveFix() +300 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::initializeState_MoveFix() +232 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::execute() +188 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::executeState_MoveWait() +188 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::initializeState_In() +172 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::initializeState_MoveWait() +168 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::initializeState_Complete() +164 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::executeState_MoveEnd() +156 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::executeState_MoveDraw() +140 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark sFStateID_c<dLytDrawMark_c>::isSameName(const char*) const +136 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::initializeState_RingIn() +128 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::executeState_Complete() +128 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::executeState_RingIn() +104 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::executeState_In() +96 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::initializeState_MoveEnd() +96 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_HIO_c::dLytDrawMark_HIO_c() +92 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark sFStateID_c<dLytDrawMark_c>::~sFStateID_c() +88 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::initializeState_MoveDraw() +80 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::convertScreenPosToDpdPos(mVec2_c*, mVec2_c*) const +80 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_HIO_c::~dLytDrawMark_HIO_c() +64 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::remove() +60 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark dLytDrawMark_c::fn_800ADC10(mVec2_c) const +56 0.00% 100.00%
main/d/lyt/d_lyt_draw_mark sFStateID_c<dLytDrawMark_c>::finalizeState(dLytDrawMark_c&) const +48 0.00% 100.00%

...and 16 more new matches

@robojumper robojumper marked this pull request as ready for review November 27, 2025 13:26
@robojumper robojumper changed the title d_lyt_draw_mark d_lyt_draw_mark OK Nov 27, 2025
Copy link
Copy Markdown
Collaborator

@elijah-thomas774 elijah-thomas774 left a comment

Choose a reason for hiding this comment

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

Provided some comments on what I can easily read through logically.

Comment thread src/d/lyt/d_lyt_draw_mark.cpp Outdated
#define DRAW_MARK_NUM_PANES 13

bool dLytDrawMark_c::build(UNKWORD) {
mVariant = dScGame_c::currentSpawnInfo.layer == 3 ? 1 : dScGame_c::currentSpawnInfo.layer == 4 ? 2 : 0;
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.

Layer 2 -> Imp1 (Variant 0)
Layer 3 -> Imp2 (Variant 1)
Layer 4 -> Imp3 (Variant 2)

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.

Easy to notice when reading the file, and the context of the class.

I think they omitted the Stage check since there is no need due to this only existing post imprisoned fight.

fn_800ADC10(mVec2_c(0.0f, 0.0f));
field_0x884.x = field_0x884.y = 0.0f;
field_0x87C.set(0.0f, 0.0f);
dLytDobutton_c::setActionTextStuff(dLytDobutton_c::ICON_2, dLytDobutton_c::ACT_DO_70, true);
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.

ACT_DO_70 -> this corresponds to the swing prompts correct?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

ACT_DO_70 is empty. ICON_2 corresponds to N_swing_00 though. We'll clean this up in dLytDoButton_c at some point...

Comment thread src/d/lyt/d_lyt_draw_mark.cpp Outdated
if (mAnm[mLineLoopIndex + DRAW_MARK_ANIM_DRAW_LINE_LOOP_OFFSET].getFrame() == 1.0f) {
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_SEAL_LINE_BLINK);
}
if (field_0x941) {
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.

Anything externally change this variable? This would seem to act as a force complete flag

Comment thread src/d/lyt/d_lyt_draw_mark.cpp Outdated
field_0x874 = mStartPositions[mLineLoopIndex];
// unused
mVec2_c _ = mEndPositions[mLineLoopIndex] - mStartPositions[mLineLoopIndex];
if (field_0x8F4 == -1) {
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.

This variable seems to indicate the current line index. -1 indicating failure or a reset for the next line to draw?

Comment thread src/d/lyt/d_lyt_draw_mark.cpp Outdated
Comment on lines +337 to +340
if (field_0x904 > 0) {
field_0x87C = field_0x884;
field_0x904--;
}
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.

First Frame position save? (0x904 is set to 1 usually?)

Comment thread src/d/lyt/d_lyt_draw_mark.cpp Outdated
Comment on lines +342 to +345
if (field_0x908 > 0) {
field_0x908--;
field_0x87C = field_0x884;
} else {
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.

This seems to act as a cooldown time?

@robojumper robojumper merged commit 2c19043 into zeldaret:main Nov 28, 2025
1 check passed
@robojumper robojumper deleted the d_lyt_draw_mark branch November 28, 2025 10:49
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