Skip to content
Open
Changes from 3 commits
Commits
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
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 thread
unreference marked this conversation as resolved.
Outdated
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);
}
}