Fix Slingshot scrub game softlock when hitting target before receiving item#2560
Open
djevangelia wants to merge 2 commits into
Open
Fix Slingshot scrub game softlock when hitting target before receiving item#2560djevangelia wants to merge 2 commits into
djevangelia wants to merge 2 commits into
Conversation
fenhl
added
Type: Bug
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
2 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.
Make player unable to re-trigger the Slingshot game after scrub has given an item before player has received it. Fixes #1703.
When scrub has returned to its flower and burrowed, it re-enters the "wait for target hit" state (not in later versions). When player receives item, a flag is set and prevents player from activating scrub again.
If player mashes Slingshot and manages to win the game again, before receiving this item and flag, the scrub will perform a weird cutscene (cut short in randomizer) and this cutscene will never end, resulting in a softlock.
When the scrub gives an item, a variable within the scrub is set,
spawnedItem. So, the softlock is easily prevented by adding an additional requirement for the scrub to activate:if (!LINK_IS_ADULT && !GET_ITEMGETINF(ITEMGETINF_1D) && !this->spawnedItem)Disassembly
NTSC 1.0 matching disassembly for modified function
EnDntNomal_TargetWaithereTesting
Tested in Ares 1.47, Project64 3.0.1 and Mupen64plus 2.8.
Softlock and fix look like this: https://www.youtube.com/watch?v=s9u17DWz5f4