diff options
| author | Jerom Venneker <jerom.venneker@gmail.com> | 2026-02-28 15:57:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 14:57:27 +0000 |
| commit | a393f48c7cfcd135415843ae42111cd692c2d727 (patch) | |
| tree | ba1c1aac8f847810115deac34c352c94da9bb922 /soh/src | |
| parent | 00ac1d566dacf460e87851e78eded52099a3ada3 (diff) | |
Fix missable Malon check (#6299)
Added a case for the VB_MALON_RETURN_FROM_CASTLE vanilla behavior flag.
This lets Malon stay until you both get the egg and wake up Talon making the egg flag unmissable.
Diffstat (limited to 'soh/src')
| -rw-r--r-- | soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 81057f34c..91f3c6ab7 100644 --- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -329,7 +329,9 @@ void func_80AA0D88(EnMa1* this, PlayState* play) { } if ((play->sceneNum == SCENE_HYRULE_CASTLE) && malonReturnedFromCastle) { - Actor_Kill(&this->actor); + if (GameInteractor_Should(VB_SEND_MALON_HOME, true)) { + Actor_Kill(&this->actor); + } } else if (!malonReturnedFromCastle || malonTaughtEponasSong) { if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) { this->actionFunc = func_80AA0EA0; |