Fairy ocarina override #2080
Merged
Fairy ocarina override #2080
Conversation
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
fenhl
added
Type: Bug
cjohnson57
approved these changes
Sep 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #1228. The fix is accomplished by replacing the vanilla cutscene code setting the inventory slot to a fairy ocarina with a call to a new function which resolves the override, sets the inventory slot accordingly, and displays the correct text box. A previous patch for displaying the text box is removed. This also fixes an issue introduced by #2035 where the text box would say “Player 0” in multiworld.
Tested going into the cutscene with 0, 1, and 2 ocarinas. Also made sure that shuffled ocarinas (and overworld ER) remain unaffected.
Special thanks to @GSKirox who identified the vanilla code and wrote the hack to replace it.