Fix Ingo talk post race having wrong textid in overworld ER#2592
Open
djevangelia wants to merge 2 commits into
Open
Fix Ingo talk post race having wrong textid in overworld ER#2592djevangelia 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.
Fixes #857. See issue and video below.
It's an overworld ER problem because Epona acquired flag is then set directly after winning the race.
The textid is set in
EnIn_GetTextIdAdult. The vanilla post race talking text is 0x203c "I'll never let you leave this ranch!", but if Epona acquired flag is set, it is checked before race state and Ingo will incorrectly get textid 0x205f "Hi there, how are you? I am Ingo. I feel so honored..."This adds a check in
EnIn_GetTextIdAdultbefore the Epona check if race state is "trapped, won race" and if so sets textid to correct 0x203c.Testing
Tested in ares recent nightly build and Project64 3.0.1.
Looks like this: https://www.youtube.com/watch?v=KOhMCSLBPKI
First with fix code, then nop'ing the check for race state to show current textid.
This is in debug build, but also tested in dev build. Tested talking to Ingo after returning to ranch too.