rename to rse, starter reset test

Author: kichithewolf

SerialPrograms/CMakeLists.txt

@@ -1075,12 +1075,6 @@ file(GLOB MAIN_SOURCES
     Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h
     Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp
     Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h
-    Source/PokemonEmerald/Programs/ShinyHunting/PokemonEmerald_StarterReset.cpp
-    Source/PokemonEmerald/Programs/ShinyHunting/PokemonEmerald_StarterReset.h
-    Source/PokemonEmerald/PokemonEmerald_Panels.cpp
-    Source/PokemonEmerald/PokemonEmerald_Panels.h
-    Source/PokemonEmerald/PokemonEmerald_Settings.cpp
-    Source/PokemonEmerald/PokemonEmerald_Settings.h
     Source/PokemonHome/Inference/PokemonHome_BallReader.cpp
     Source/PokemonHome/Inference/PokemonHome_BallReader.h
     Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp
@@ -1297,6 +1291,16 @@ file(GLOB MAIN_SOURCES
     Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
+    Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp
+    Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h
+    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp
+    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h
+    Source/PokemonRSE/PokemonRSE_Navigation.cpp
+    Source/PokemonRSE/PokemonRSE_Navigation.h
+    Source/PokemonRSE/PokemonRSE_Panels.cpp
+    Source/PokemonRSE/PokemonRSE_Panels.h
+    Source/PokemonRSE/PokemonRSE_Settings.cpp
+    Source/PokemonRSE/PokemonRSE_Settings.h
     Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp
     Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h
     Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp

SerialPrograms/Source/PanelLists.cpp

@@ -16,8 +16,8 @@
 #include "PokemonSwSh/PokemonSwSh_Panels.h"
 #include "PokemonHome/PokemonHome_Panels.h"
 #include "PokemonBDSP/PokemonBDSP_Panels.h"
-#include "PokemonEmerald/PokemonEmerald_Panels.h"
 #include "PokemonLA/PokemonLA_Panels.h"
+#include "PokemonRSE/PokemonRSE_Panels.h"
 #include "PokemonSV/PokemonSV_Panels.h"
 #include "ZeldaTotK/ZeldaTotK_Panels.h"
 #include "PanelLists.h"
@@ -48,7 +48,7 @@ ProgramSelect::ProgramSelect(QWidget& parent, PanelHolder& holder)
     add(std::make_unique<NintendoSwitch::PokemonBDSP::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonLA::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonSV::PanelListFactory>());
-    add(std::make_unique<NintendoSwitch::PokemonEmerald::PanelListFactory>());
+    add(std::make_unique<NintendoSwitch::PokemonRSE::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::ZeldaTotK::PanelListFactory>());
 
 

SerialPrograms/Source/PokemonEmerald/Programs/ShinyHunting/PokemonEmerald_StarterReset.cpp

@@ -0,0 +1,41 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "CommonFramework/Inference/SpectrogramMatcher.h"
+#include "CommonFramework/Inference/AudioTemplateCache.h"
+#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_ShinySoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+ShinySoundDetector::ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback)
+    // Use a yellow as the detection color because the shiny animation is yellow.
+    : AudioPerSpectrumDetectorBase("ShinySoundDetector", "Shiny sound", COLOR_YELLOW, console, detected_callback)
+{}
+
+
+float ShinySoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Shiny Sound",
+        AudioTemplateCache::instance().get_throw("PokemonRSE/ShinySound", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+}
+}
+}

SerialPrograms/Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp

@@ -0,0 +1,36 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_ShinySoundDetector_H
+#define PokemonAutomation_PokemonRSE_ShinySoundDetector_H
+
+#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    //  Warning: The callback will be called from the audio inference thread.
+    ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+}
+}
+}
+#endif

SerialPrograms/Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h

@@ -0,0 +1,46 @@
+/*  Pokemon RSE Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ *  Soft reset, menus, etc.
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "PokemonRSE_Navigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+void soft_reset(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
+	// A + B + Select + Start
+	pbf_press_button(context, BUTTON_B | BUTTON_Y | BUTTON_MINUS | BUTTON_PLUS, 10, 180);
+
+	pbf_mash_button(context, BUTTON_PLUS, 500);
+	context.wait_for_all_requests();
+
+	pbf_press_button(context, BUTTON_A, 20, 40);
+
+	//Wait for game to load in
+	pbf_wait(context, 300);
+	context.wait_for_all_requests();
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.cpp

@@ -0,0 +1,29 @@
+/*  Pokemon RSE Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ *  Soft reset, menus, etc.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_Navigation_H
+#define PokemonAutomation_PokemonRSE_Navigation_H
+
+#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class ConsoleHandle;
+    class BotBaseContext;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+// Press A+B+Select+Start at the same time to soft reset, then re-enters the game.
+// This assumes no dry battery. Adding detection for that is a TODO.
+void soft_reset(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
+
+
+}
+}
+}
+#endif

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.h

@@ -1,24 +1,24 @@
-/*  Pokemon Emerald Panels
+/*  Pokemon RSE Panels
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
  */
 
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonEmerald_Panels.h"
+#include "PokemonRSE_Panels.h"
 
 //#include "PokemonSV_Settings.h"
 
-#include "Programs/ShinyHunting/PokemonEmerald_StarterReset.h"
+#include "Programs/ShinyHunting/PokemonRSE_StarterReset.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
-namespace PokemonEmerald{
+namespace PokemonRSE{
 
 
 
 PanelListFactory::PanelListFactory()
-    : PanelListDescriptor("Pokemon Emerald")
+    : PanelListDescriptor("Pokemon Ruby, Sapphire, and Emerald")
 {}
 
 std::vector<PanelEntry> PanelListFactory::make_panels() const{

…PokemonEmerald/PokemonEmerald_Panels.cpp …/Source/PokemonRSE/PokemonRSE_Panels.cppSerialPrograms/Source/PokemonEmerald/PokemonEmerald_Panels.cpp renamed to SerialPrograms/Source/PokemonRSE/PokemonRSE_Panels.cpp SerialPrograms/Source/PokemonEmerald/PokemonEmerald_Panels.cpp renamed to SerialPrograms/Source/PokemonRSE/PokemonRSE_Panels.cpp

@@ -1,17 +1,17 @@
-/*  Pokemon Emerald Panels
+/*  Pokemon RSE Panels
  *
  *  From: https://github.com/PokemonAutomation/Arduino-Source
  *
  */
 
-#ifndef PokemonAutomation_PokemonEmerald_Panels_H
-#define PokemonAutomation_PokemonEmerald_Panels_H
+#ifndef PokemonAutomation_PokemonRSE_Panels_H
+#define PokemonAutomation_PokemonRSE_Panels_H
 
 #include "CommonFramework/Panels/PanelList.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
-namespace PokemonEmerald{
+namespace PokemonRSE{