Skip to content

Commit 8d49b9b

Browse files
committed
Clear the two BDSP trade programs for SBB. Untested, but unlikely to fail.
1 parent 4a02836 commit 8d49b9b

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,13 @@ void determine_shiny_status(
177177
}
178178

179179
#if 0
180-
cout << "Wild End: " << std::chrono::duration_cast<Milliseconds>(tracker.wild_animation_end_timestmap() - tracker.m_start_time) << endl; // REMOVE
181-
cout << "Your Start: " << std::chrono::duration_cast<Milliseconds>(tracker.your_animation_start_timestamp() - tracker.m_start_time) << endl; // REMOVE
180+
cout << "Wild End: " << std::chrono::duration_cast<Milliseconds>(tracker.wild_animation_end_timestmap() - tracker.m_start_time) << endl;
181+
cout << "Your Start: " << std::chrono::duration_cast<Milliseconds>(tracker.your_animation_start_timestamp() - tracker.m_start_time) << endl;
182182
for (WallClock time : shiny_sound_timestamps){
183-
cout << "Shiny Sound: " << std::chrono::duration_cast<Milliseconds>(time - tracker.m_start_time) << endl; // REMOVE
183+
cout << "Shiny Sound: " << std::chrono::duration_cast<Milliseconds>(time - tracker.m_start_time) << endl;
184184
}
185185
#endif
186-
186+
187187
bool wild_shiny_sound_detected = false;
188188
bool own_shiny_sound_detected = false;
189189
for (const WallClock& timestamp: shiny_sound_timestamps){

SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
#include "CommonFramework/Notifications/ProgramNotifications.h"
8-
#include "Controllers/SerialPABotBase/SerialPABotBase.h"
98
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
109
#include "Pokemon/Pokemon_Strings.h"
1110
#include "PokemonBDSP/PokemonBDSP_Settings.h"
@@ -15,7 +14,8 @@
1514
namespace PokemonAutomation{
1615
namespace NintendoSwitch{
1716
namespace PokemonBDSP{
18-
using namespace Pokemon;
17+
18+
using namespace Pokemon;
1919

2020

2121
SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
@@ -26,7 +26,7 @@ SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
2626
"Trade boxes of " + STRING_POKEMON + " between two local Switches.",
2727
FeedbackType::REQUIRED,
2828
AllowCommandsWhenRunning::DISABLE_COMMANDS,
29-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS},
29+
{ControllerFeature::NintendoSwitch_ProController},
3030
FasterIfTickPrecise::NOT_FASTER,
3131
2, 2, 2
3232
)

SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
#include "CommonFramework/Notifications/ProgramNotifications.h"
8-
#include "Controllers/SerialPABotBase/SerialPABotBase.h"
98
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
109
#include "Pokemon/Pokemon_Strings.h"
1110
#include "PokemonBDSP/PokemonBDSP_Settings.h"
@@ -27,7 +26,7 @@ SelfTouchTrade_Descriptor::SelfTouchTrade_Descriptor()
2726
"Touch trade boxes of " + STRING_POKEMON + " between two local Switches.",
2827
FeedbackType::REQUIRED,
2928
AllowCommandsWhenRunning::DISABLE_COMMANDS,
30-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS},
29+
{ControllerFeature::NintendoSwitch_ProController},
3130
FasterIfTickPrecise::NOT_FASTER,
3231
2, 2, 2
3332
)

0 commit comments

Comments
 (0)