github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

More Cleanup

Browse source
This commit is contained in:
Christopher Leggett 2022-08-27 09:30:49 -04:00
commit 928a39fe9e
No known key found for this signature in database
GPG key ID: 7093AE5FF7037D79
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -309,9 +309,11 @@ void EnMa1_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.targetMode = 6; this->actor.targetMode = 6;
this->unk_1E8.unk_00 = 0; this->unk_1E8.unk_00 = 0;
// If Talon has not left Hyrule Castle, we are randomized and ahve not obtained Malon's HC Check, we are not randomized // To avoid missing a check, we want Malon to have the actionFunc for singing, but not reacting to Ocarina, if any of
// and have Epona's Song, or we are randomized and have obtained Malon's Epona's Song Check. This sets Malon's idle // the following are true.
// singing animation in such a way that she has dialog but does not give items or respond to the Ocarina. // 1. Talon has not left Hyrule Castle.
// 2. We are Randomized and have not obtained Malon's Weird Egg Check.
// 3. We are not Randomized and have obtained Epona's Song
if (!(gSaveContext.eventChkInf[1] & 0x10) || (gSaveContext.n64ddFlag && !Randomizer_ObtainedMalonHCReward()) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA) && !gSaveContext.n64ddFlag) || if (!(gSaveContext.eventChkInf[1] & 0x10) || (gSaveContext.n64ddFlag && !Randomizer_ObtainedMalonHCReward()) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA) && !gSaveContext.n64ddFlag) ||
(gSaveContext.n64ddFlag && Flags_GetTreasure(globalCtx, 0x1F))) { (gSaveContext.n64ddFlag && Flags_GetTreasure(globalCtx, 0x1F))) {
this->actionFunc = func_80AA0D88; this->actionFunc = func_80AA0D88;
@ -345,15 +347,15 @@ void func_80AA0D88(EnMa1* this, GlobalContext* globalCtx) {
} }
} }
// If we're at Hyrule Castle, and either Talon has left or we're randomized and have obtained Malon's HC Check // We want to Kill Malon's Actor outside of randomizer when Talon is freed. In Randomizer we don't kill Malon's
if ((globalCtx->sceneNum == SCENE_SPOT15) && ((!gSaveContext.n64ddFlag && gSaveContext.eventChkInf[1] & 0x10) || (gSaveContext.n64ddFlag && Randomizer_ObtainedMalonHCReward()))) { // Actor here, otherwise if we wake up Talon first and then get her check she will spontaneously
// Only kill Malon's Actor here in vanilla. If we're in rando and speak to her we don't want her to pop // disappear.
// out of existence immediately. The init function will properly kill her actor on the next scene load. if ((globalCtx->sceneNum == SCENE_SPOT15) && (!gSaveContext.n64ddFlag && gSaveContext.eventChkInf[1] & 0x10)) {
if (!gSaveContext.n64ddFlag) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} // We want Malon to give the Weird Egg Check (see function below) in the following situations:
// If Talon has not run away, or we're randomized and have not received Malon's HC Check, or we're // 1. Talon as not left Hyrule Castle (Vanilla) OR
// not randomized and have obtained Epona's Song, put Malon in the state to give Link the HC reward. // 2. We haven't obtained Malon's Weird Egg Check (Randomizer only) OR
// 3. We have Epona's Song? (Vanilla only, not sure why it's here but I didn't write that one)
} else if ((!(gSaveContext.eventChkInf[1] & 0x10) || (gSaveContext.n64ddFlag && !Randomizer_ObtainedMalonHCReward())) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA) && !gSaveContext.n64ddFlag)) { } else if ((!(gSaveContext.eventChkInf[1] & 0x10) || (gSaveContext.n64ddFlag && !Randomizer_ObtainedMalonHCReward())) || (CHECK_QUEST_ITEM(QUEST_SONG_EPONA) && !gSaveContext.n64ddFlag)) {
if (this->unk_1E8.unk_00 == 2) { if (this->unk_1E8.unk_00 == 2) {
this->actionFunc = func_80AA0EA0; this->actionFunc = func_80AA0EA0;