Skip to content
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

Jump to bottom

Account for removed object dependency in Deku Scrub Leader #3878

Merged
merged 2 commits into from
Feb 2, 2024
Merged

Account for removed object dependency in Deku Scrub Leader #3878

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b33534
Account for removed object dependency in Deku Scrub Leader
Rozelette Jan 24, 2024
90dcad5
Update soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
garrettjoecox Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ void EnDntJiji_Destroy(Actor* thisx, PlayState* play) {
}

void EnDntJiji_SetFlower(EnDntJiji* this, PlayState* play) {
// SOH: Due to removed object dependencies, parent was still NULL when Init was called. In order to properly set
// stage, redo it here now that we are a frame later.
this->stage = (EnDntDemo*)this->actor.parent;
if (this->actor.bgCheckFlags & 1) {
this->flowerPos = this->actor.world.pos;
this->actionFunc = EnDntJiji_SetupWait;
Expand Down