Remove a bunch of deprecated SwSh programs.

Author: Mysticial

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp

@@ -7,7 +7,6 @@
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonSwSh/PokemonSwSh_Settings.h"
 #include "PokemonSwSh_Commands_GameEntry.h"
 //#include "PokemonSwSh_Messages_GameEntry.h"

SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp

@@ -30,7 +30,6 @@
 #include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h"
 #include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.h"
 
-#include "Programs/DenHunting/PokemonSwSh_BeamReset.h"
 #include "Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h"
 #include "Programs/DenHunting/PokemonSwSh_EventBeamFinder.h"
 #include "Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h"
@@ -57,11 +56,6 @@
 #include "Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h"
 
 #include "Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.h"
 #include "Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h"
 
 #include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h"
@@ -193,14 +187,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
 #if 0
     ret.emplace_back("---- Deprecated Programs ----");
     ret.emplace_back(make_single_switch_program<BallThrower_Descriptor, BallThrower>());
-    ret.emplace_back(make_single_switch_program<BeamReset_Descriptor, BeamReset>());
     ret.emplace_back(make_single_switch_program<EggCombined2_Descriptor, EggCombined2>());
     ret.emplace_back(make_single_switch_program<EggSuperCombined2_Descriptor, EggSuperCombined2>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedRegi_Descriptor, ShinyHuntUnattendedRegi>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedSwordsOfJustice_Descriptor, ShinyHuntUnattendedSwordsOfJustice>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedStrongSpawn_Descriptor, ShinyHuntUnattendedStrongSpawn>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedRegigigas2_Descriptor, ShinyHuntUnattendedRegigigas2>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedIoATrade_Descriptor, ShinyHuntUnattendedIoATrade>());
 #endif
 
     if (PreloadSettings::instance().DEVELOPER_MODE){

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

@@ -171,23 +171,6 @@ void reset_game_from_home_with_inference(
     //  Wait for game to load.
     enter_loading_game(console, context, backup_save, post_wait_time);
 }
-void reset_game_from_home_old(
-    ConsoleHandle& console, ProControllerContext& context,
-    bool tolerate_update_menu
-){
-    if (!ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET && !tolerate_update_menu){
-        fast_reset_game(
-            context,
-            GameSettings::instance().START_GAME_WAIT0,
-            GameSettings::instance().ENTER_GAME_MASH0,
-            GameSettings::instance().ENTER_GAME_WAIT0
-        );
-        return;
-    }
-
-    close_game_from_home(console, context);
-    start_game_from_home(context, tolerate_update_menu, 0, 0, false);
-}
 
 
 

SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.h

@@ -54,10 +54,6 @@ void reset_game_from_home_with_inference(
     bool backup_save = false,
     Milliseconds post_wait_time = Milliseconds(1000)
 );
-void reset_game_from_home_old(
-    ConsoleHandle& console, ProControllerContext& device,
-    bool tolerate_update_menu
-);
 
 
 

SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp

@@ -4,26 +4,14 @@
  *
  */
 
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-//#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
 #include "PokemonSwSh_ShinyHuntTools.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
 
 
-void run_away_with_lights(ProControllerContext& context){
-//    set_leds(context, true);
-    pbf_press_dpad(context, DPAD_UP, 80ms, 0ms);
-    pbf_press_button(context, BUTTON_A, 80ms, 3000ms);
-//    set_leds(context, false);
-}
 void enter_summary(ProControllerContext& context, bool regi_move_right){
     pbf_press_dpad(context, DPAD_DOWN, 80ms, 0ms);
     pbf_press_button(context, BUTTON_A, 80ms, 2000ms);
@@ -34,46 +22,6 @@ void enter_summary(ProControllerContext& context, bool regi_move_right){
     pbf_press_dpad(context, DPAD_DOWN, 80ms, 0ms);
     pbf_press_button(context, BUTTON_A, 80ms, 80ms);    //  For Regi, this clears the dialog after running.
 }
-void close_game_if_overworld(
-    ConsoleHandle& console, ProControllerContext& context,
-    bool touch_date,
-    uint8_t rollback_hours
-){
-    //  Enter Y-COMM.
-    ssf_press_button(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY0, 80ms);
-
-    //  Move the cursor as far away from Link Trade and Surprise Trade as possible.
-    //  This is added safety in case connect to internet takes too long.
-    pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
-    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
-    pbf_press_dpad(context, DPAD_RIGHT, 40ms, 0ms);
-
-    //  Connect to internet.
-    pbf_press_button(context, BUTTON_PLUS, 80ms, 1000ms);
-
-    //  Enter Switch Home.
-    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
-
-    if (touch_date){
-        touch_date_from_home(console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
-    }
-    if (rollback_hours > 0){
-        rollback_hours_from_home(console, context, rollback_hours, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
-    }
-
-    //  Enter profile.
-    pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
-    pbf_press_button(context, BUTTON_A, 80ms, GameSettings::instance().ENTER_PROFILE_DELAY0);
-
-    //  Back out.
-    pbf_press_dpad(context, DPAD_LEFT, 80ms, 80ms);
-    pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
-    pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
-
-    //  Close and restart game.
-    close_game_from_home(console, context);
-    pbf_press_button(context, BUTTON_HOME, 80ms, 1520ms);
-}
 
 
 }

SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h

@@ -7,22 +7,14 @@
 #ifndef PokemonAutomation_PokemonSwSh_ShinyHuntingTools_H
 #define PokemonAutomation_PokemonSwSh_ShinyHuntingTools_H
 
-#include "CommonFramework/Tools/VideoStream.h"
 #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
-#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
 
 
-void run_away_with_lights(ProControllerContext& context);
 void enter_summary(ProControllerContext& context, bool regi_move_right);
-void close_game_if_overworld(
-    ConsoleHandle& console, ProControllerContext& context,
-    bool touch_date,
-    uint8_t rollback_hours
-);