Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing an issue with BDSP sweet scent #522

Merged
merged 2 commits into from
Dec 21, 2024
Merged

Fixing an issue with BDSP sweet scent #522

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46fe790
Update PokemonBDSP_OverworldTrigger.cpp
mb-baboul Dec 18, 2024
1e9ff7f
Merge branch 'PokemonAutomation:main' into Tests
mb-baboul Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ bool OverworldTrigger::find_encounter(ConsoleHandle& console, BotBaseContext& co
if (location >= 1 && location <= 3){
const size_t move_down_times = location;
for(size_t i = 0; i < move_down_times; ++i){
pbf_press_dpad(context, DPAD_DOWN, 1, change_pokemon_delay);
pbf_press_dpad(context, DPAD_DOWN, 20, change_pokemon_delay);
}
}else if (location >= 1){ // for location 4 and 5
const size_t move_down_times = 6 - location;
for (size_t i = 0; i < move_down_times; ++i){
pbf_press_dpad(context, DPAD_UP, 1, change_pokemon_delay);
pbf_press_dpad(context, DPAD_UP, 20, change_pokemon_delay);
}
}

Expand All @@ -147,7 +147,7 @@ bool OverworldTrigger::find_encounter(ConsoleHandle& console, BotBaseContext& co
pbf_press_button(context, BUTTON_ZL, 20, pokemon_to_pokemon_menu_delay);
// Move down one menuitem to select "Sweet Scent"
const uint16_t move_pokemon_menu_item_delay = 30;
pbf_press_dpad(context, DPAD_DOWN, 1, move_pokemon_menu_item_delay);
pbf_press_dpad(context, DPAD_DOWN, 20, move_pokemon_menu_item_delay);
// Use sweet scent
pbf_mash_button(context, BUTTON_ZL, 30);

Expand Down