Don't clear active override after processing incoming Triforce piece #2406
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
I was unable to reproduce #257 using this method after scanning a range of timings from 20 frames before to 176 frames after pressing A to open the chest (note that these numbers are in 60fps, not 20fps). Even so, I think this PR has a good chance of fixing it given the evidence. I'll merge it into my branch to test to make sure it doesn't break anything else. |
|
Maybe I should try repro with a freestanding item like in the clip. |
|
Reviewed by @rrealmuto in voice. |
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.
The code for handling an incoming item from the network distinguishes 3 cases: refills (since #2069), Triforce pieces, and everything else. For Triforce pieces, the code was calling
clear_overrideeven though none of the code leading to it callsactivate_override— incoming items use the incoming override queue, not the active override. This could cause an item being picked up at the same time to lose its override and act as the “base item” used for it in the item table, usually either a Gerudo mask or a blue rupee.If I'm right, this fixes #257. I intend to test this using a BizHawk external tool that runs a short TAS to open a chest and injects an incoming item during the right frame for the bug to trigger.