From c0a127503dbdfc2a7a92063879edb8ec635c5c48 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 22 Oct 2025 23:19:53 -0700 Subject: [PATCH 1/3] constexpr compile fix --- .../AutoStory/PokemonSV_AutoStory_Segment_34.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h index fb4c227761..b2d6149b6e 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h @@ -26,24 +26,22 @@ class AutoStory_Segment_34 : public AutoStory_Segment{ ) const override; }; -static constexpr std::string segment_num = "34"; +static constexpr const char* segment_num = "34"; - - -inline std::string checkpoint90_start(){ return segment_num + ": Beat Geeta. At Pokemon League Pokecenter.";} -inline std::string checkpoint90_end(){ return segment_num + ": Beat Nemona. At dormitory room, next to bed.";} +inline std::string checkpoint90_start(){ return std::string(segment_num) + ": Beat Geeta. At Pokemon League Pokecenter.";} +inline std::string checkpoint90_end(){ return std::string(segment_num) + ": Beat Nemona. At dormitory room, next to bed.";} // start: Beat Geeta. At Pokemon League Pokecenter. // end: Beat Nemona. At dormitory room, next to bed. void checkpoint_90(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats); inline std::string checkpoint91_start(){ return checkpoint90_end();} -inline std::string checkpoint91_end(){ return segment_num + ": Beat Penny. At Academy fly point.";} +inline std::string checkpoint91_end(){ return std::string(segment_num) + ": Beat Penny. At Academy fly point.";} // start: Beat Nemona. At dormitory room, next to bed." // end: Beat Penny. At Academy fly point. void checkpoint_91(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats); inline std::string checkpoint92_start(){ return checkpoint91_end();} -inline std::string checkpoint92_end(){ return segment_num + ": Beat Arven. At Los Platos Pokecenter.";} +inline std::string checkpoint92_end(){ return std::string(segment_num) + ": Beat Arven. At Los Platos Pokecenter.";} // start: Beat Penny. At Academy fly point. // end: Beat Arven. At Los Platos Pokecenter. void checkpoint_92(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats); From 667d5b980ca3596d999c0c7ab6e54dbb5a0f85de Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Thu, 23 Oct 2025 18:32:23 -0700 Subject: [PATCH 2/3] Moved resources location for Mac package build --- SerialPrograms/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 2570267d2a..0bea65851d 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -57,7 +57,11 @@ else() endif() if(PACKAGE_BUILD) - set(DEST_DIR "$/Output") + if(APPLE) + set(DEST_DIR "$/../") + else() + set(DEST_DIR "$/Output") + endif() set(DEPLOY_DIR "${DEST_DIR}/Binaries64") else() set(DEST_DIR "$") From eb29a038c470d861fe4e69c7814a16d27ffbf5ed Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Fri, 24 Oct 2025 09:20:15 -0700 Subject: [PATCH 3/3] Added sstream header directly --- .../Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SerialPrograms/Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp b/SerialPrograms/Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp index 1ac2d63763..92011c20ac 100644 --- a/SerialPrograms/Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp +++ b/SerialPrograms/Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp @@ -4,6 +4,7 @@ * */ +#include #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h"