Skip to content

Commit 60a1c0a

Browse files
committed
Minor fixes.
1 parent 94fb8e1 commit 60a1c0a

File tree

4 files changed

+44
-3
lines changed

4 files changed

+44
-3
lines changed

SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ CollapsibleGroupBox* make_panel_header(
109109
std::string text;
110110
do{
111111
if (required_features.contains(ControllerFeature::NintendoSwitch_DateSkip)){
112-
text = html_color_text("(This program requires advanced RPCs. It requires Serial PABotBase.)", COLOR_RED);
112+
text = html_color_text("(This program requires advanced RPCs.)", COLOR_RED);
113113
break;
114114
}
115115
if (required_features.contains(ControllerFeature::TickPrecise)){

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.cpp

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,97 @@
1010
#include "PokemonSwSh_Commands_DaySkippers.h"
1111
#include "PokemonSwSh_Messages_DaySkippers.h"
1212

13+
#ifdef PA_OFFICIAL
14+
//#define PA_CC_DAY_SKIPPERS
15+
#endif
16+
17+
#ifdef PA_CC_DAY_SKIPPERS
18+
#include "../../Internal/SerialPrograms/PokemonSwSh_DateSkippers.h"
19+
#endif
20+
1321
namespace PokemonAutomation{
1422
namespace NintendoSwitch{
1523

1624

1725
void skipper_init_view(ProControllerContext& context){
26+
#ifdef PA_CC_DAY_SKIPPERS
27+
DaySkippers::init_view(context);
28+
#else
1829
context->send_botbase_request(
1930
&context,
2031
DeviceRequest_skipper_init_view()
2132
);
33+
#endif
2234
}
2335
void skipper_auto_recovery(ProControllerContext& context){
36+
#ifdef PA_CC_DAY_SKIPPERS
37+
DaySkippers::auto_recovery(context);
38+
#else
2439
context->send_botbase_request(
2540
&context,
2641
DeviceRequest_skipper_auto_recovery()
2742
);
43+
#endif
2844
}
2945
void skipper_rollback_year_full(ProControllerContext& context, bool date_us){
46+
#ifdef PA_CC_DAY_SKIPPERS
47+
DaySkippers::rollback_year_full(context, date_us);
48+
#else
3049
context->send_botbase_request(
3150
&context,
3251
DeviceRequest_skipper_rollback_year_full(date_us)
3352
);
53+
#endif
3454
}
3555
void skipper_rollback_year_sync(ProControllerContext& context){
56+
#ifdef PA_CC_DAY_SKIPPERS
57+
DaySkippers::rollback_year_sync(context);
58+
#else
3659
context->send_botbase_request(
3760
&context,
3861
DeviceRequest_skipper_rollback_year_sync()
3962
);
63+
#endif
4064
}
4165
void skipper_increment_day(ProControllerContext& context, bool date_us){
66+
#ifdef PA_CC_DAY_SKIPPERS
67+
DaySkippers::increment_day(context, date_us);
68+
#else
4269
context->send_botbase_request(
4370
&context,
4471
DeviceRequest_skipper_increment_day(date_us)
4572
);
73+
#endif
4674
}
4775
void skipper_increment_month(ProControllerContext& context, uint8_t days){
76+
#ifdef PA_CC_DAY_SKIPPERS
77+
DaySkippers::increment_month(context, days);
78+
#else
4879
context->send_botbase_request(
4980
&context,
5081
DeviceRequest_skipper_increment_month(days)
5182
);
83+
#endif
5284
}
5385
void skipper_increment_all(ProControllerContext& context){
86+
#ifdef PA_CC_DAY_SKIPPERS
87+
DaySkippers::increment_all(context);
88+
#else
5489
context->send_botbase_request(
5590
&context,
5691
DeviceRequest_skipper_increment_all()
5792
);
93+
#endif
5894
}
5995
void skipper_increment_all_rollback(ProControllerContext& context){
96+
#ifdef PA_CC_DAY_SKIPPERS
97+
DaySkippers::increment_all_rollback(context);
98+
#else
6099
context->send_botbase_request(
61100
&context,
62101
DeviceRequest_skipper_increment_all_rollback()
63102
);
103+
#endif
64104
}
65105

66106

SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ StateMachineAction throw_balls(
348348
}
349349

350350
BattleBallReader reader(stream, language);
351-
pbf_press_button(context, BUTTON_A, 50, 75);
351+
pbf_press_button(context, BUTTON_A, 1000ms, 1000ms);
352352
context.wait_for_all_requests();
353353

354354
int16_t balls = move_to_ball(reader, stream, context, ball);

SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
namespace PokemonAutomation{
1616
namespace NintendoSwitch{
1717
namespace PokemonSwSh{
18-
using namespace Pokemon;
18+
19+
using namespace Pokemon;
1920

2021

2122
DaySkipperUS_Descriptor::DaySkipperUS_Descriptor()

0 commit comments

Comments
 (0)