Merge branch 'PokemonAutomation:main' into main

Author: ZacharyPL

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -36,7 +36,7 @@ namespace PokemonAutomation{
 #endif
 
 #ifndef PA_VERSION_PATCH
-#define PA_VERSION_PATCH 1
+#define PA_VERSION_PATCH 2
 #endif
 
 const bool IS_BETA_VERSION = PA_IS_BETA;

SerialPrograms/Source/PanelLists.cpp

@@ -55,9 +55,9 @@ ProgramSelect::ProgramSelect(QWidget& parent, PanelHolder& holder)
     add(std::make_unique<NintendoSwitch::PokemonSV::PanelListFactory>());
 
     add(std::make_unique<NintendoSwitch::PokemonLZA::PanelListFactory>());
+    add(std::make_unique<NintendoSwitch::PokemonFRLG::PanelListFactory>());
     if (PreloadSettings::instance().DEVELOPER_MODE){
         add(std::make_unique<NintendoSwitch::PokemonRSE::PanelListFactory>());
-        add(std::make_unique<NintendoSwitch::PokemonFRLG::PanelListFactory>());
     }
 
     add(std::make_unique<NintendoSwitch::ZeldaTotK::PanelListFactory>());

SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Panels.cpp

@@ -35,10 +35,14 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     //ret.emplace_back("---- General ----");
 
     ret.emplace_back("---- Shiny Hunting  ----");
-    ret.emplace_back(make_single_switch_program<GiftReset_Descriptor, GiftReset>());
-    ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>());
-    ret.emplace_back(make_single_switch_program<LegendaryRunAway_Descriptor, LegendaryRunAway>());
-    ret.emplace_back(make_single_switch_program<PrizeCornerReset_Descriptor, PrizeCornerReset>());
+    if (IS_BETA_VERSION){
+        ret.emplace_back(make_single_switch_program<GiftReset_Descriptor, GiftReset>());
+        ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>());
+    }
+    if (PreloadSettings::instance().DEVELOPER_MODE){
+        ret.emplace_back(make_single_switch_program<LegendaryRunAway_Descriptor, LegendaryRunAway>());
+        ret.emplace_back(make_single_switch_program<PrizeCornerReset_Descriptor, PrizeCornerReset>());
+    }
 
 
     if (PreloadSettings::instance().DEVELOPER_MODE){

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp

@@ -35,7 +35,7 @@ int get_current_selector_index(
     const ImageFloatBox& box,
     double spacing
 ){
-    const ImageViewRGB32& screen = console.video().snapshot();
+    VideoSnapshot screen = console.video().snapshot();
     SelectionArrowWatcher arrow(
         COLOR_GREEN,
         &console.overlay(),