Max lair/added save on the go#1101
Open
Boombaastical wants to merge 18 commits intoPokemonAutomation:mainfrom
Open
Max lair/added save on the go#1101Boombaastical wants to merge 18 commits intoPokemonAutomation:mainfrom
Boombaastical wants to merge 18 commits intoPokemonAutomation:mainfrom
Conversation
… regions' coordinates
Collaborator
|
Looks like you included a ton of your local changes that are irrelevant. |
Mysticial
reviewed
Feb 27, 2026
| console, context, | ||
| save_path, | ||
| global_state | ||
| ); |
Collaborator
There was a problem hiding this comment.
Try not to deviate too much from our formatting standard. While we don't document it, there is a pattern to try to adhere to.
Contributor
Author
There was a problem hiding this comment.
Updated this, I thought I reverted back to the original, should've checked before sending the PR, sorry.
Mysticial
reviewed
Feb 27, 2026
| #include "Common/Cpp/Options/BooleanCheckBoxOption.h" | ||
| #include "Common/Cpp/Options/ConfigOption.h" | ||
| #include <vector> | ||
| #include <memory> |
Collaborator
There was a problem hiding this comment.
Same here applies with general formatting. We generally order our includes as:
- C++ system headers <>
- OS-specific system headers <>
- Qt system headers <>
- Our headers in approximate order of dependency. So "Common/" is almost always at the top.
Contributor
Author
There was a problem hiding this comment.
Now should be the right logic, indeed I didn't notice the order, but thanks for clarifying!
Mysticial
reviewed
Feb 28, 2026
| VideoStream& stream, | ||
| Language language, | ||
| const ImageViewRGB32& screen | ||
| ) { |
Mysticial
reviewed
Feb 28, 2026
| for (int i = 0; i < 3; ++i) { | ||
| auto cropped = extract_box_reference(screen, NAME_BOXES[i]); | ||
| OCR::StringMatchResult result = PokemonNameReader::instance().read_substring( | ||
| stream.logger(), language, cropped, OCR::BLACK_OR_WHITE_TEXT_FILTERS(), |
Mysticial
reviewed
Feb 28, 2026
| // Read the three currently saved paths (if any) from the entrance screen and return the index of the first slot that is NOT protected, returns -1 otherwise | ||
| int find_unprotected_slot( | ||
| const std::vector<std::string>& current_slugs, | ||
| const EndBattleDecider& actions, |
Mysticial
reviewed
Feb 28, 2026
| AdventureRuntime& runtime, | ||
| ProgramEnvironment& env, size_t console_index, | ||
| VideoStream& stream, ProControllerContext& context, | ||
| bool followed_path, |
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.
As I often ran these Max Lair adventures, I thought that stopping on each new boss that one wants to save takes quite a bit more time than saving them automatically on the go. This would be especially interesting for those who just start with the Max Lair and keep the paths for the difficult bosses (e.g. Zygarde) directly.
Not sure if the code is proper, I tried to use the same style as was there before with a while loop. I tested it a few times and it works smoothly, I added extra time to make sure not to lose button presses because it's quite an important task.