Clear out a bunch more programs for SBB.

Mysticial · Mysticial · commit 81f7c16bb1a4 · 2025-02-16T01:27:40.000-08:00
diff --git a/Common/Cpp/LifetimeSanitizer.cpp b/Common/Cpp/LifetimeSanitizer.cpp
@@ -15,13 +15,13 @@
 #include <Windows.h>
 #endif
 
-#ifdef PA_SANITIZER_ENABLE
-
 
 
 namespace PokemonAutomation{
 
 
+#ifdef PA_SANITIZER_ENABLE
+
 //#define PA_SANITIZER_PRINT_ALL
 const std::set<std::string> SANITIZER_FILTER = {
 //    "MultiSwitchProgramSession",
@@ -91,6 +91,9 @@ LifetimeSanitizer::LifetimeSanitizer(const LifetimeSanitizer& x){
     internal_construct(x.m_name);
 }
 void LifetimeSanitizer::operator=(const LifetimeSanitizer& x){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
+        return;
+    }
     check_usage();
     x.check_usage();
 }
@@ -195,11 +198,11 @@ void LifetimeSanitizer::internal_destruct(){
     }
     m_self = nullptr;
 }
+#endif
 
 
 
 
 
 
-#endif
 }
diff --git a/Common/Cpp/LifetimeSanitizer.h b/Common/Cpp/LifetimeSanitizer.h
@@ -82,12 +82,14 @@ class LifetimeSanitizer{
 #else
 class LifetimeSanitizer{
 public:
+    LifetimeSanitizer(const char* = ""){}
+
     void check_usage() const{}
     static void disable(){}
 
-    using CheckScope = bool;
+    struct CheckScope{};
     CheckScope check_scope() const{
-        return false;
+        return CheckScope();
     }
 };
 #endif
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -1630,8 +1630,6 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h
     Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp
     Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.h
-    Source/PokemonSV/Programs/Farming/PokemonSV_WildItemFarmer.cpp
-    Source/PokemonSV/Programs/Farming/PokemonSV_WildItemFarmer.h
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp
@@ -1656,6 +1654,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h
     Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp
     Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h
+    Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp
+    Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.cpp
diff --git a/SerialPrograms/SerialPrograms.pro b/SerialPrograms/SerialPrograms.pro
@@ -803,7 +803,6 @@ SOURCES += \
     Source/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp \
     Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp \
     Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp \
-    Source/PokemonSV/Programs/Farming/PokemonSV_WildItemFarmer.cpp \
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp \
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp \
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp \
@@ -816,6 +815,7 @@ SOURCES += \
     Source/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp \
     Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp \
     Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp \
+    Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp \
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp \
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.cpp \
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp \
@@ -1970,7 +1970,6 @@ HEADERS += \
     Source/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h \
     Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h \
     Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.h \
-    Source/PokemonSV/Programs/Farming/PokemonSV_WildItemFarmer.h \
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h \
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h \
     Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h \
@@ -1983,6 +1982,7 @@ HEADERS += \
     Source/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.h \
     Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h \
     Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h \
+    Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h \
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h \
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.h \
     Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h \
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.cpp
@@ -7,6 +7,7 @@
 #include <QMessageBox>
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/PersistentSettings.h"
+//#include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Panels/PanelInstance.h"
 #include "PanelListWidget.h"
 
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
@@ -281,12 +281,15 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     ProControllerContext context(scope, console.controller());
     VideoOverlaySet overlays(overlay);
 
+//    std::terminate();
+
+
 
 //    ssf_issue_scroll(context, DPAD_LEFT, 0);
 //    ssf_press_button(context, BUTTON_A | BUTTON_L, 3);
 //    ssf_press_button(context, BUTTON_L, 0);
 
-#if 1
+#if 0
     codeboard_enter_digits(
         logger, context, KeyboardLayout::QWERTY,
         "JRH5T9",
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp
@@ -162,11 +162,15 @@ void MultiSwitchProgramSession::internal_run_program(){
             return;
         }
         AbstractController* controller = session.controller_session().controller();
-        ProController& switch_controller = *dynamic_cast<ProController*>(controller);
+        ProController* switch_controller = dynamic_cast<ProController*>(controller);
+        if (switch_controller == nullptr){
+            report_error("Cannot Start: The controller is not ready or is incompatible.");
+            return;
+        }
         handles.emplace_back(
             c,
             session.logger(),
-            switch_controller,
+            *switch_controller,
             session.video(),
             session.overlay(),
             session.audio(),
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp
@@ -124,14 +124,18 @@ void SingleSwitchProgramSession::internal_run_program(){
     );
     CancellableHolder<CancellableScope> scope;
     AbstractController* controller = m_system.controller_session().controller();
-    ProController& switch_controller = *dynamic_cast<ProController*>(controller);
+    ProController* switch_controller = dynamic_cast<ProController*>(controller);
+    if (switch_controller == nullptr){
+        report_error("Cannot Start: The controller is not ready or is incompatible.");
+        return;
+    }
     SingleSwitchProgramEnvironment env(
         program_info,
         scope,
         *this,
         current_stats_tracker(), historical_stats_tracker(),
         m_system.logger(),
-        switch_controller,
+        *switch_controller,
         m_system.video(),
         m_system.overlay(),
         m_system.audio(),
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp
@@ -12,10 +12,9 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch_FastCodeEntry.h"
 
-//  REMOVE
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp
@@ -31,7 +31,11 @@ ActivateMenuGlitch112_Descriptor::ActivateMenuGlitch112_Descriptor()
         "<font color=\"red\">(This requires game versions 1.1.0 - 1.1.2. The glitch it relies on was patched in v1.1.3.)</font>",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {
+            ControllerFeature::TickPrecise,
+            ControllerFeature::NintendoSwitch_ProController,
+        },
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp
@@ -30,7 +30,11 @@ ActivateMenuGlitch113_Descriptor::ActivateMenuGlitch113_Descriptor()
         "<font color=\"red\">(This works on game versions 1.1.1 - 1.1.3. It has been patched out in later versions.)</font>",
         FeedbackType::OPTIONAL_,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {
+            ControllerFeature::TickPrecise,
+            ControllerFeature::NintendoSwitch_ProController,
+        },
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp
@@ -31,7 +31,11 @@ CloneItemsBoxCopy2_Descriptor::CloneItemsBoxCopy2_Descriptor()
         "<font color=\"red\">(The menu glitch can only be activated on version 1.1.0 - 1.1.3.)</font>",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {
+            ControllerFeature::TickPrecise,
+            ControllerFeature::NintendoSwitch_ProController,
+        },
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct CloneItemsBoxCopy2_Descriptor::Stats : public StatsTracker{
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp
@@ -21,7 +21,8 @@ ShinyEncounterTester_Descriptor::ShinyEncounterTester_Descriptor()
         "",
         "Test the shiny encounter detector. Start this program just before an encounter.",
         FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp
@@ -30,7 +30,8 @@ DistortionWaiter_Descriptor::DistortionWaiter_Descriptor()
         "Wait for a distortion to appear.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 class DistortionWaiter_Descriptor::Stats : public StatsTracker{
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
@@ -22,7 +22,8 @@ MountDetectionTest_Descriptor::MountDetectionTest_Descriptor()
         "",
         "Test the mount detection in the bottom right corner.",
         FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
@@ -26,7 +26,8 @@ OverworldWatcher_Descriptor::OverworldWatcher_Descriptor()
         "This is a test program that simply observes the game and labels things of interest. "
         "This program doesn't really do anything.",
         FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp
@@ -133,6 +133,7 @@ void trade_current_pokemon(
         );
         if (ret < 0){
             stats.m_errors++;
+//            box_image->save("ExpectedBox.png");   //  REMOVE
             tracker.report_unrecoverable_error(stream, "Failed to return to box after 2 minutes after a trade.");
         }
         stream.log("Detected box. Trade completed.");
diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp b/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
@@ -29,7 +29,6 @@
 #include "Programs/Farming/PokemonSV_TournamentFarmer.h"
 #include "Programs/Farming/PokemonSV_TournamentFarmer2.h"
 #include "Programs/Farming/PokemonSV_FlyingTrialFarmer.h"
-#include "Programs/Farming/PokemonSV_WildItemFarmer.h"
 #include "Programs/Farming/PokemonSV_BBQSoloFarmer.h"
 #include "Programs/Farming/PokemonSV_MaterialFarmer.h"
 #include "Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h"
@@ -56,6 +55,7 @@
 
 #include "Programs/AutoStory/PokemonSV_AutoStory.h"
 
+#include "Programs/Glitches/PokemonSV_WildItemFarmer.h"
 #include "Programs/Glitches/PokemonSV_RideCloner-1.0.1.h"
 #include "Programs/Glitches/PokemonSV_CloneItems-1.0.1.h"
 
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp b/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp
@@ -32,7 +32,8 @@ MassAttachItems_Descriptor::MassAttachItems_Descriptor()
         "Mass attach items to " + STRING_POKEMON + ".",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct MassAttachItems_Descriptor::Stats : public StatsTracker{
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp
@@ -47,7 +47,8 @@ AuctionFarmer_Descriptor::AuctionFarmer_Descriptor()
         "Check auctions and bid on items.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::MUCH_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
@@ -27,7 +27,8 @@ AutonomousBallThrower_Descriptor::AutonomousBallThrower_Descriptor()
         "Repeatedly throw a ball until you catch the pokemon.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct AutonomousBallThrower_Descriptor::Stats : public StatsTracker{
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp
@@ -28,7 +28,8 @@ ClothingBuyer_Descriptor::ClothingBuyer_Descriptor()
         "Buy all the clothing in a store.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp
@@ -30,7 +30,8 @@ MassPurchase_Descriptor::MassPurchase_Descriptor()
         "Purchase a specified amount of items from a shop.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp
@@ -34,7 +34,8 @@ SizeChecker_Descriptor::SizeChecker_Descriptor()
         "Check boxes of " + STRING_POKEMON + " for size marks.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 struct SizeChecker_Descriptor::Stats : public StatsTracker{
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h
diff --git a/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp b/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp b/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@`
`15`	`15`	`#include <Windows.h>`
`16`	`16`	`#endif`
`17`	`17`
`18`		`-#ifdef PA_SANITIZER_ENABLE`
`19`		`-`
`20`	`18`
`21`	`19`
`22`	`20`	`namespace PokemonAutomation{`
`23`	`21`
`24`	`22`
	`23`	`+#ifdef PA_SANITIZER_ENABLE`
	`24`	`+`
`25`	`25`	`//#define PA_SANITIZER_PRINT_ALL`
`26`	`26`	`const std::set<std::string> SANITIZER_FILTER = {`
`27`	`27`	`// "MultiSwitchProgramSession",`
`@@ -91,6 +91,9 @@ LifetimeSanitizer::LifetimeSanitizer(const LifetimeSanitizer& x){`
`91`	`91`	`internal_construct(x.m_name);`
`92`	`92`	`}`
`93`	`93`	`void LifetimeSanitizer::operator=(const LifetimeSanitizer& x){`
	`94`	`+ if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){`
	`95`	`+ return;`
	`96`	`+ }`
`94`	`97`	`check_usage();`
`95`	`98`	`x.check_usage();`
`96`	`99`	`}`
`@@ -195,11 +198,11 @@ void LifetimeSanitizer::internal_destruct(){`
`195`	`198`	`}`
`196`	`199`	`m_self = nullptr;`
`197`	`200`	`}`
	`201`	`+#endif`
`198`	`202`
`199`	`203`
`200`	`204`
`201`	`205`
`202`	`206`
`203`	`207`
`204`		`-#endif`
`205`	`208`	`}`