Skip to content

Fix Deku Scrub Flower Flash #6610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
unreference wants to merge 3 commits into
base: develop
Choose a base branch
from
+7 −1
Open

Fix Deku Scrub Flower Flash #6610

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac569ba
fix(actors): Initialize En_Dnt_Nomal flower position before draw
unreference May 12, 2026
ad0db34
chore: Add issue link for clarification
unreference May 13, 2026
96662c0
fix: Move flowerPos initialization to Init
unreference May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) {
} else {
Actor_Kill(&this->actor);
}

// https://github.com/HarbourMasters/Shipwright/issues/2796
// Default flowerPos to the actor's spawn position so the flower doesn't render at the origin if the draw function
// is enabled before SetFlower position (which waits for ground contact) has a chance to set the real position.
this->flowerPos = this->actor.world.pos;
Comment on lines +161 to +164
Copy link
Copy Markdown
Member

@serprex serprex May 16, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

please don't apply arbitrary fixes unconditionally to decomp. this would be under fixes, ideally as a hook (maybe OnActorInit)

the report demonstrates interpolation at play since flower is rendered in logs etc while being interpolated going very quickly from 0,0,0 to deku scrub's actual location (#2796 (comment))

this->actionFunc = EnDntNomal_WaitForObject;
}

Expand Down Expand Up @@ -189,6 +194,7 @@ void EnDntNomal_WaitForObject(EnDntNomal* this, PlayState* play) {
this->morphTable, 11);
this->actor.draw = EnDntNomal_DrawStageScrub;
}

this->actionFunc = EnDntNomal_SetFlower;
}
}
Expand Down Expand Up @@ -887,4 +893,4 @@ void EnDntNomal_DrawTargetScrub(Actor* thisx, PlayState* play) {
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gHintNutsFlowerDL);
CLOSE_DISPS(play->state.gfxCtx);
}
}