Skip to content

Commit 49233c9

Browse files
committed
oops
1 parent 61ddcda commit 49233c9

File tree

4 files changed

+24
-53
lines changed

4 files changed

+24
-53
lines changed

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -306,41 +306,6 @@ void TestProgram::on_press(){
306306

307307

308308

309-
310-
void increment_day(ProControllerContext& context, bool date_us){
311-
ssf_press_button(context, BUTTON_A, 208ms, 80ms);
312-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
313-
ssf_issue_scroll(context, SSF_SCROLL_UP, 24ms, 48ms, 24ms);
314-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
315-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
316-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
317-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
318-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
319-
ssf_press_button(context, BUTTON_A, 256ms, 80ms);
320-
}
321-
void init_view(ProControllerContext& context){
322-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
323-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
324-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
325-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
326-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
327-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
328-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
329-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
330-
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 3);
331-
ssf_press_button(context, BUTTON_A, 256ms, 80ms);
332-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
333-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
334-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
335-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
336-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
337-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
338-
ssf_press_button(context, BUTTON_A, 256ms, 80ms);
339-
}
340-
341-
342-
343-
344309
void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
345310
using namespace Kernels;
346311
using namespace Kernels::Waterfill;
@@ -360,12 +325,6 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
360325
ProControllerContext context(scope, console.pro_controller());
361326
VideoOverlaySet overlays(overlay);
362327

363-
init_view(context);
364-
365-
// while (true){
366-
// increment_day(context, true);
367-
// }
368-
369328

370329

371330
#if 0

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,19 @@ void DaySkipperEU::run_switch2(SingleSwitchProgramEnvironment& env, ProControlle
168168
// Setup starting state.
169169
init_view(context);
170170

171+
uint8_t day = 1;
171172
while (remaining_skips > 0){
172173
send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
173174

174175
increment_day_eu(context);
175176

176-
remaining_skips--;
177-
stats.issued++;
178-
// env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
179-
env.update_stats();
177+
if (day == 31){
178+
day = 1;
179+
}else{
180+
remaining_skips--;
181+
stats.issued++;
182+
env.update_stats();
183+
}
180184
}
181185

182186
// Prevent the Switch from sleeping and the time from advancing.

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,19 @@ void DaySkipperJPN::run_switch2(SingleSwitchProgramEnvironment& env, ProControll
149149
// Setup starting state.
150150
init_view(context);
151151

152+
uint8_t day = 1;
152153
while (remaining_skips > 0){
153154
send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
154155

155156
increment_day_jp(context);
156157

157-
remaining_skips--;
158-
stats.issued++;
159-
// env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
160-
env.update_stats();
158+
if (day == 31){
159+
day = 1;
160+
}else{
161+
remaining_skips--;
162+
stats.issued++;
163+
env.update_stats();
164+
}
161165
}
162166

163167
// Prevent the Switch from sleeping and the time from advancing.

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,19 @@ void DaySkipperUS::run_switch2(SingleSwitchProgramEnvironment& env, ProControlle
167167
// Setup starting state.
168168
init_view(context);
169169

170+
uint8_t day = 1;
170171
while (remaining_skips > 0){
171172
send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
172173

173174
increment_day_us(context);
174175

175-
remaining_skips--;
176-
stats.issued++;
177-
// env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
178-
env.update_stats();
176+
if (day == 31){
177+
day = 1;
178+
}else{
179+
remaining_skips--;
180+
stats.issued++;
181+
env.update_stats();
182+
}
179183
}
180184

181185
// Prevent the Switch from sleeping and the time from advancing.

0 commit comments

Comments
 (0)