diff options
| author | Rozelette <Rozelette@users.noreply.github.com> | 2024-02-01 19:58:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-01 19:58:22 -0600 |
| commit | bb1078e99ca1789a2de696a4229dd27b1ec5da3c (patch) | |
| tree | a0de3d0fe52bd00f2c967ef1dd73e0433887ab2f | |
| parent | 2529dc59bd5ab3be95ed7d5530cde90bc48758de (diff) | |
Account for removed object dependency in Deku Scrub Leader (#3878)
* Account for removed object dependency in Deku Scrub Leader
* Update soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
---------
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
| -rw-r--r-- | soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index ae09cb438..9ce27f4c1 100644 --- a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -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; |