Move into farming folder.

Author: Mysticial

SerialPrograms/Source/PokemonLZA/PokemonLZA_Panels.cpp

@@ -12,8 +12,10 @@
 
 //  General
 #include "Programs/PokemonLZA_ClothingBuyer.h"
-#include "Programs/PokemonLZA_RestaurantFarmer.h"
-#include "Programs/PokemonLZA_MegaShardFarmer.h"
+
+//  Farming
+#include "Programs/Farming/PokemonLZA_RestaurantFarmer.h"
+#include "Programs/Farming/PokemonLZA_MegaShardFarmer.h"
 
 //  Shiny Hunting
 #include "Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h"
@@ -45,6 +47,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
 
     ret.emplace_back("---- General ----");
     ret.emplace_back(make_single_switch_program<ClothingBuyer_Descriptor, ClothingBuyer>());
+
+    ret.emplace_back("---- Farming ----");
     ret.emplace_back(make_single_switch_program<RestaurantFarmer_Descriptor, RestaurantFarmer>());
     ret.emplace_back(make_single_switch_program<MegaShardFarmer_Descriptor, MegaShardFarmer>());
     if (PreloadSettings::instance().DEVELOPER_MODE){

…/Programs/PokemonLZA_MegaShardFarmer.cpp …s/Farming/PokemonLZA_MegaShardFarmer.cppSerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.cpp renamed to SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.cpp renamed to SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp

@@ -19,9 +19,10 @@ namespace NintendoSwitch{
 namespace PokemonLZA{
 
 
-bool attempt_one_attack(SingleSwitchProgramEnvironment& env, ProControllerContext& context,
-    bool use_move_ai, bool use_plus_moves)
-{
+bool attempt_one_attack(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool use_move_ai, bool use_plus_moves
+){
     if (!use_move_ai){
         ssf_press_button(context, BUTTON_ZL, 160ms, 800ms, 200ms);
         if (use_plus_moves){

…ZA/Programs/PokemonLZA_MegaShardFarmer.h …ams/Farming/PokemonLZA_MegaShardFarmer.hSerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.h renamed to SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.h SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.h renamed to SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.h

@@ -25,8 +25,10 @@ namespace PokemonLZA{
 //   left then bottom move in quick succession to ensure at least one of the three moves are launched
 //   despite potential move cooldown.
 // - use_plus_moves: if True, press + to launch plus moves.
-bool attempt_one_attack(SingleSwitchProgramEnvironment& env, ProControllerContext& context,
-    bool use_move_ai, bool use_plus_moves);
+bool attempt_one_attack(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool use_move_ai, bool use_plus_moves
+);
 
 }
 }

…Programs/PokemonLZA_RestaurantFarmer.cpp …/Farming/PokemonLZA_RestaurantFarmer.cppSerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.cpp renamed to SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.cpp renamed to SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp

@@ -1561,18 +1561,18 @@ file(GLOB LIBRARY_SOURCES
     Source/PokemonLZA/PokemonLZA_Panels.h
     Source/PokemonLZA/PokemonLZA_Settings.cpp
     Source/PokemonLZA/PokemonLZA_Settings.h
+    Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp
+    Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.h
+    Source/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp
+    Source/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.h
     Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp
     Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h
     Source/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.cpp
     Source/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.h
     Source/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp
     Source/PokemonLZA/Programs/PokemonLZA_GameEntry.h
-    Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.cpp
-    Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.h
     Source/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp
     Source/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h
-    Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.cpp
-    Source/PokemonLZA/Programs/PokemonLZA_RestaurantFarmer.h
     Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp
     Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h
     Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp