mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-10 12:45:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missable Malon check (#6299)

Browse Source 
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.
This commit is contained in:
Jerom Venneker
2026-02-28 15:57:27 +01:00
committed by GitHub
parent 00ac1d566d
commit a393f48c7c
6 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+3 -1
View File
@@ -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;