FRLG auto catch tweaks - #1414
Merged
theastrogoth merged 1 commit intoAug 23, 2026
Merged
Conversation
Dalton-V
reviewed
Aug 23, 2026
| COLOR_RED, | ||
| &console.overlay(), | ||
| BattleConfirmationOption::YES | ||
| ); |
Member
There was a problem hiding this comment.
Is this not needed anymore? I think this is the detector you asked me to add to this method because I added it to the safari auto catcher.
Contributor
Author
There was a problem hiding this comment.
I didn't think about the fact that it would also detect the "Send out next Pokemon?" selection box for a non-safari battle if something faints, so I took it out of the pre-catch loop there.
It's still useful to watch for it while exiting, I think, and leaving it here means that the behavior for the safari catcher is unchanged.
Dalton-V
approved these changes
Aug 23, 2026
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.
Switches to using the same approach for exiting the battle for both
auto_catch()andauto_catch_safari(). Moves a couple of things to shared helper functions.The only change to
auto_catch_safari()behavior is an extra guard in case none of the detectors ever catch anything