Fix Kokiri Forest Quest State Animations#6614
Open
unreference wants to merge 1 commit into
Open
Conversation
|
Thank you for working on this, hope works and gets merged. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes #6599.
Since 9.2.0, all Kokiri play their column-0 (initial state) animations regardless of quest progress. The backflipping Kokiri cuts invisible grass, the rock-lifter keeps lifting after he should have stopped, etc.
The regression was introduced when
EnKo_GetForestQuestState2was wrapped in aGameInteractor_Shouldhook withfalseas the vanilla default:Shipwright/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
Lines 1186 to 1188 in 37db034
The
falsedefault prevents the vanilla quest state calculation from running.forestQuestStatestays at 0 (ENKO_FQS_CHILD_START), sosOsAnimeLookup[ENKO_TYPE][0]is used for every Kokiri regardless of whether the player has Kokiri Emerald, Zelda's Letter, or the Forest Medallion. The fix is simply to change it fromfalsetotrue.As an aside, the
FixKokiriForestQuestStateenhancement is valid for its purpose, but the CVar is not auto-enabled by the randomizer or any preset. Randomizer players need to manually find the checkbox under Enhancements to get correct Kokiri animations when items are obtained out of vanilla order. I figured that this was a separate issue from the regression fixed here, so it is deferred from this PR.