Fix Baton Pass for when Ace mon is the last alive #3067
Merged
Conversation
This file contains 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
AsparagusEduardo
requested changes
Jun 20, 2023
| @@ -990,8 +990,7 @@ u8 GetMostSuitableMonToSwitchInto(void) | |||
| return bestMonId; | |||
|
|
|||
| // If ace mon is the last available Pokemon and U-Turn/Volt Switch was used - switch to the mon. | |||
| if (aceMonId != PARTY_SIZE | |||
| && (gBattleMoves[gLastUsedMove].effect == EFFECT_HIT_ESCAPE || gBattleMoves[gLastUsedMove].effect == EFFECT_PARTING_SHOT)) | |||
| if (aceMonId != PARTY_SIZE) | |||
There was a problem hiding this comment.
This is the part that I think is truly fixing the bug.
There was a problem hiding this comment.
Yep, this is the actual fix. I am honestly not sure why I added the check above yesterday.
remove not needed check
AlexOn1ine
force-pushed
the
baton_pass_ace_mon
branch
from
e2b9fba
to
d449c95
Compare
AsparagusEduardo
approved these changes
Jun 21, 2023
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.
Description
When the AI used Baton Pass with The Ace mon flag it switched into an invalid(bugged) mon.
This fix checks if only one mon is alive to avoid calling the function
GetBestMonBatonPass.Also removes the checks for last used moves because checking if the acemon is the last mon alive should be enough.
Images
Issue(s) that this PR fixes
Fixes #3066
Discord contact info
rainonline