better handle throwing balls in a double wild battle #2587
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
…ly a single pokemon.
mrgriffin
approved these changes
Jan 25, 2023
Merged
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.
Fixes issues with throwing balls when the player has only a single pokemon in a double wild battle.
Description
Without this patch, if one of the player's pokemon faints and they don't have another pokemon to replace it, throwing a ball results in odd behavior, such as the player's turn getting skipped. The game already checks to ensure that if the player would like to throw a ball in a double wild battle, the player does not get multiple turns by setting the action of the player's other mon to
B_ACTION_NOTHING_FAINTED. This patch ensures that both the player's actions don't get set to that.If there's a better way to do this, I'm happy to learn. This is my first attempt at making a change to the battle engine.
Discord contact info
walkingeye#6360