From 32da5987f8ddf734589410d1fd04c68937f3b0bb Mon Sep 17 00:00:00 2001 From: PA Dev Bot <344001113+pa-devbot@users.noreply.github.com> Date: Thu, 29 Oct 2026 05:13:31 +0000 Subject: [PATCH 1/3] Remove compile-verified unnecessary includes Every removed #include was verified by deleting it and compiling the resulting translation unit with the exact flags from compile_commands.json (all distinct flag sets for each file). The removal was kept only if the resulting object file was functionally byte-identical (objdump: section headers, section contents, symbol table, and disassembly) to the object file compiled from the original source. This is stricter than "it still compiles": it proves the removal changes nothing in the emitted machine code. Includes that could not be proven safe were kept: - Macro-gate providers (headers that supply macros tested by #if gates in the file, e.g. / for QT_VERSION_MAJOR). - Template implementation (.tpp) includes used by dependent code. - Platform backend headers that switch behavior via macros. Verification: - pa-build passes (full compile + link). - All 744 changed translation units produce functionally identical object files under every flag set they are built with, so the linked binary is functionally identical to main's. The full test suite (pa-test) was passed on this host by a functionally identical binary; the host has since developed intermittent, unrelated kernel-level futex deadlocks (at startup and mid-suite, reproducible on unmodified main as well). - The 4 changed files containing x86 SIMD dispatch regions were additionally compiled with the x86 intrinsics toolchain and pass. 1760 include lines removed from 744 files; pure deletions. --- Common/Cpp/CancellableScope.cpp | 1 - Common/Cpp/Concurrency/SpinLock.cpp | 1 - Common/Cpp/CpuUtilization/CpuUtilization.cpp | 1 - Common/Cpp/ExpressionEvaluator.cpp | 1 - Common/Cpp/Filesystem/Filesystem.cpp | 1 - Common/Cpp/Hardware/Hardware.cpp | 1 - Common/Cpp/Json/JsonValue.cpp | 1 - .../MemoryUtilization/MemoryUtilization.cpp | 1 - Common/Cpp/Options/CheckboxDropdownOption.cpp | 1 - .../Cpp/SerialConnection/SerialConnection.cpp | 1 - Common/Cpp/Sockets/ClientSocket.cpp | 1 - Common/Cpp/Strings/StringTools.cpp | 1 - Common/Cpp/Time.cpp | 1 - .../PABotBase2_ConnectionDebug.cpp | 1 - Common/Qt/CodeValidator.cpp | 1 - Common/Qt/CollapsibleGroupBox.cpp | 1 - Common/Qt/Options/BatchWidget.cpp | 1 - Common/Qt/Options/BooleanCheckBoxWidget.cpp | 1 - Common/Qt/Options/BoxFloatWidget.cpp | 1 - Common/Qt/Options/ButtonWidget.cpp | 2 - Common/Qt/Options/DateWidget.cpp | 1 - Common/Qt/Options/EditableTableWidget.cpp | 2 - Common/Qt/Options/EnumDropdownWidget.cpp | 1 - Common/Qt/Options/FloatingPointWidget.cpp | 2 - Common/Qt/Options/IntegerRangeWidget.cpp | 2 - Common/Qt/Options/MacAddressWidget.cpp | 2 - Common/Qt/Options/PathWidget.cpp | 2 - Common/Qt/Options/SimpleIntegerWidget.cpp | 2 - Common/Qt/Options/StaticTableWidget.cpp | 2 - Common/Qt/Options/StaticTextWidget.cpp | 1 - Common/Qt/Options/StringWidget.cpp | 1 - Common/Qt/Options/TextEditWidget.cpp | 1 - Common/Qt/Options/TimeDurationWidget.cpp | 1 - Common/Qt/QtThreadPool_Tests.cpp | 3 - Common/Qt/StringToolsQt.cpp | 1 - Common/Qt/TimeQt.cpp | 1 - .../Source/CommandLine/CommandLine_Main.cpp | 1 - .../AudioPipeline/AudioInfo.cpp | 1 - .../AudioPipeline/AudioInfo_Tests.cpp | 1 - .../AudioPipeline/AudioSourceDescriptor.cpp | 1 - .../Backends/AudioPassthroughPairQt.cpp | 3 - .../AudioPipeline/ChannelMixer.cpp | 1 - .../AudioPipeline/IO/AudioFileLoader.cpp | 3 - .../IO/AudioFileLoader_Tests.cpp | 3 - .../AudioPipeline/IO/AudioInputFile.cpp | 3 - .../AudioPipeline/SinkPipeline_Tests.cpp | 4 - .../AudioPipeline/Tools/AudioFormatUtils.cpp | 1 - .../AudioPipeline/UI/AudioDisplayWidget.cpp | 1 - .../AudioPipeline/UI/AudioSelectorWidget.cpp | 4 - .../Environment/Environment.cpp | 1 - .../Environment/SystemSleep.cpp | 1 - .../ErrorReports/ErrorReports.cpp | 4 - .../Exceptions/FatalProgramException.cpp | 1 - .../Exceptions/OperationFailedException.cpp | 1 - ...OperationFailedExceptionWithScreenshot.cpp | 2 - .../Exceptions/ProgramFinishedException.cpp | 2 - .../Source/CommonFramework/GlobalServices.cpp | 1 - .../CommonFramework/GlobalSettingsPanel.cpp | 2 - .../CommonFramework/ImageTools/ImageBoxes.cpp | 1 - .../CommonFramework/ImageTools/ImageDiff.cpp | 1 - .../CommonFramework/ImageTools/ImageStats.cpp | 1 - .../CommonFramework/ImageTypes/ImageHSV32.cpp | 1 - .../CommonFramework/ImageTypes/ImageRGB32.cpp | 1 - .../Source/CommonFramework/Logging/Logger.cpp | 1 - .../CommonFramework/Logging/LoggerWindow.cpp | 1 - .../CommonFramework/Logging/QueuedLogger.cpp | 1 - .../Source/CommonFramework/Main.cpp | 5 -- .../Notifications/EventNotificationWidget.cpp | 1 - .../Notifications/ProgramNotifications.cpp | 1 - .../Notifications/SenderNotificationTable.cpp | 1 - .../Environment/ThemeSelectorOption.cpp | 2 - .../Options/NestedBoxDrawOption.cpp | 1 - .../Options/QtWidget/LabelCellWidget.cpp | 1 - .../Options/QtWidget/WallpaperWidget.cpp | 1 - .../Options/ResolutionOption.cpp | 1 - .../CommonFramework/Panels/OptionsPanel.cpp | 1 - .../Panels/PanelDescriptor.cpp | 1 - .../Panels/UI/PanelElements.cpp | 2 - .../CommonFramework/Panels/UI/PanelWidget.cpp | 5 -- .../CommonFramework/PersistentSettings.cpp | 1 - .../Source/CommonFramework/ProgramSession.cpp | 3 - .../Recording/StreamHistorySession.cpp | 2 - .../Recording/StreamRecorder.cpp | 4 - .../GlobalResourceDownloadManager.cpp | 2 - .../ProgramResourceDownloadWidget.cpp | 3 - .../ResourceDownload/ResourceDownload.cpp | 1 - .../SettingsResourceDownloadOptions.cpp | 1 - .../SettingsResourceDownloadTable.cpp | 1 - .../SettingsResourceDownloadWidget.cpp | 2 - .../Startup/NewVersionCheck.cpp | 1 - .../CommonFramework/Startup/SetupSettings.cpp | 3 - .../CommonFramework/Tools/DebugDumper.cpp | 1 - .../CommonFramework/Tools/ErrorDumper.cpp | 3 - .../CommonFramework/Tools/FileDownloader.cpp | 7 -- .../Tools/GlobalThreadPools.cpp | 1 - .../Tools/ProgramEnvironment.cpp | 2 - .../Backends/CameraImplementations.cpp | 2 - .../Backends/CameraWidgetQt6.5.cpp | 2 - .../Backends/CameraWidgetQt6.cpp | 1 - .../Backends/CameraWidgetQt6_QQuickWidget.cpp | 4 - .../VideoPipeline/Backends/VideoFrameQt.cpp | 1 - .../VideoPipeline/UI/VideoDisplayWidget.cpp | 1 - .../VideoPipeline/UI/VideoDisplayWindow.cpp | 3 - .../VideoPipeline/UI/VideoOverlayWidget.cpp | 1 - .../UI/VideoSourceSelectorWidget.cpp | 2 - .../VideoPipeline/VideoOverlay.cpp | 1 - .../VideoPipeline/VideoSourceDescriptor.cpp | 1 - .../VideoSources/VideoSource_StillImage.cpp | 1 - .../CommonFramework/Windows/ButtonDiagram.cpp | 2 - .../CommonFramework/Windows/DpiScaler.cpp | 2 - .../CommonFramework/Windows/MainWindow.cpp | 3 - .../CommonFramework/Windows/WindowTracker.cpp | 1 - .../CommonTools/Async/InferenceRoutines.cpp | 1 - .../CommonTools/Async/InferenceSession.cpp | 2 - .../Audio/AudioPerSpectrumDetectorBase.cpp | 1 - .../CommonTools/Audio/SpectrogramMatcher.cpp | 2 - .../CroppedImageDictionaryMatcher.cpp | 1 - .../ExactImageDictionaryMatcher.cpp | 2 - .../CommonTools/ImageMatch/FilterToAlpha.cpp | 1 - .../ImageMatch/ImageMatchOption.cpp | 1 - .../SilhouetteDictionaryMatcher.cpp | 2 - .../Images/BinaryImage_FilterRgb32.cpp | 1 - .../CommonTools/Images/ColorClustering.cpp | 1 - .../Source/CommonTools/Images/ImageFilter.cpp | 3 - .../Source/CommonTools/Images/ImageTools.cpp | 3 - .../CommonTools/Images/SolidColorTest.cpp | 1 - .../CommonTools/Images/WaterfillUtilities.cpp | 3 - .../InferencePivots/VisualInferencePivot.cpp | 1 - .../Options/QtWidgets/LanguageOCRWidget.cpp | 2 - .../Options/QtWidgets/ScreenWatchWidget.cpp | 3 - .../Options/QtWidgets/StringSelectWidget.cpp | 1 - .../CommonTools/Options/ScreenWatchOption.cpp | 3 - SerialPrograms/Source/CommonTools/Random.cpp | 1 - .../CommonTools/Resources/SpriteDatabase.cpp | 1 - .../StartupChecks/VideoResolutionCheck.cpp | 2 - .../VisualDetectors/BlackBorderDetector.cpp | 1 - .../VisualDetectors/FrozenImageDetector.cpp | 1 - .../VisualDetectors/ImageMatchDetector.cpp | 2 - .../ComputerPrograms/ComputerProgram.cpp | 1 - .../Framework/ComputerProgramSession.cpp | 5 -- .../Framework/ComputerProgramWidget.cpp | 1 - .../ControllerInput/ControllerInput.cpp | 1 - .../Keyboard/GlobalKeyboardHidTracker.cpp | 1 - .../Keyboard/GlobalQtKeyMap.cpp | 1 - .../Keyboard/KeyBindingWidget.cpp | 2 - .../Keyboard/KeyboardInput_State.cpp | 1 - .../Source/Controllers/ControllerOption.cpp | 1 - .../Controllers/ControllerSelectorWidget.cpp | 1 - .../Controllers/ControllerStateTable.cpp | 1 - .../Controllers/NullControllerWidget.cpp | 1 - .../PABotBase2/PABotBase2_Connection.cpp | 1 - .../PABotBase2/PABotBase2_MessageHandler.cpp | 1 - .../SerialPABotBase2_Connection.cpp | 1 - .../SerialPABotBase2_SelectorWidget.cpp | 1 - .../StandardHid/StandardHid_Keyboard.cpp | 1 - .../Source/GameConsole/ConsoleHandle.cpp | 1 - .../Source/GameConsole/ConsolePanel.cpp | 1 - .../Source/GameConsole/ConsoleProgram.cpp | 3 - .../Source/GameConsole/MultiConsolePanel.cpp | 1 - .../GameConsole/MultiConsoleProgram.cpp | 3 - .../Panels/GameConsole_SnapshotDumper.cpp | 2 - .../GameConsole_WaterfillTemplateMaker.cpp | 1 - .../GameConsole/UI/ConsoleSystemWidget.cpp | 2 - .../UI/MultiConsoleSystemWidget.cpp | 1 - .../DiscordIntegrationSettings.cpp | 1 - .../Integrations/DiscordSettingsOption.cpp | 1 - .../Source/Integrations/DiscordWebhook.cpp | 2 - .../Source/Integrations/ProgramTracker.cpp | 1 - .../Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp | 1 - .../AbsFFT/Kernels_AbsFFT_Core_Default.cpp | 1 - .../AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp | 1 - .../Kernels_AudioChannelInterleave.cpp | 1 - .../Kernels_AudioPipeline_Tests.cpp | 1 - .../AudioResampler/Kernels_AudioResampler.cpp | 1 - ..._AudioResampler_BlockKernel_ARM64_NEON.cpp | 1 - .../Kernels_AudioResampler_Tests.cpp | 1 - .../Kernels_BinaryMatrix_Tests.cpp | 1 - .../ImageFilters/Kernels_ImageFilter_Misc.cpp | 1 - .../Kernels_ImageFilter_Tests.cpp | 1 - .../Kernels_ImageFilter_RGB32_Euclidean.cpp | 1 - ...ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp | 2 - ...ls_ImageFilter_RGB32_Euclidean_Default.cpp | 1 - ...nels_ImageFilter_RGB32_Euclidean_Tests.cpp | 2 - ...els_ImageFilter_RGB32_Range_ARM64_NEON.cpp | 2 - .../Kernels_ImageScaleBrightness.cpp | 1 - .../Kernels_ImageScaleBrightness_Tests.cpp | 1 - .../Kernels_ImagePixelSumSqrDev_Default.cpp | 1 - .../Kernels_ImagePixelSumSqr_Default.cpp | 1 - .../Kernels_ImagePixelSumSqr_arm64_NEON.cpp | 1 - .../Source/Kernels/Kernels_Tests.cpp | 1 - .../Kernels_SpikeConvolution.cpp | 1 - .../Waterfill/Kernels_Waterfill_Tests.cpp | 3 - .../ML/DataLabeling/ML_AnnotationIO.cpp | 1 - .../DataLabeling/ML_SegmentAnythingModel.cpp | 1 - .../Source/ML/Inference/ML_YOLONavigation.cpp | 6 -- .../Source/ML/Inference/ML_YOLOv5Detector.cpp | 5 -- SerialPrograms/Source/ML/ML_Panels.cpp | 2 - .../ML/Models/ML_ONNXRuntimeHelpers.cpp | 2 - .../Source/ML/Programs/ML_LabelImages.cpp | 1 - .../Source/ML/Programs/ML_RunYOLO.cpp | 4 - .../NintendoSwitch_Commands_PushButtons.cpp | 1 - .../Joycon/NintendoSwitch_Joycon.cpp | 2 - .../NintendoSwitch_ControllerSettings.cpp | 1 - .../Procon/NintendoSwitch_ProController.cpp | 1 - .../SysbotBase/SysbotBase_Connection.cpp | 1 - .../SysbotBase/SysbotBase_Descriptor.cpp | 1 - .../TestDudunsparceFormDetector.cpp | 4 - .../DevPrograms/TestProgramComputer.cpp | 56 -------------- .../DevPrograms/TestProgramSwitch.cpp | 77 ------------------- .../NintendoSwitch_UpdatePopupDetector.cpp | 2 - .../NintendoSwitch_ConsoleHandle.cpp | 5 -- .../NintendoSwitch_MultiSwitchProgram.cpp | 1 - .../NintendoSwitch_SingleSwitchProgram.cpp | 2 - .../Options/TurboMacroTable.cpp | 6 -- .../NintendoSwitch2_DateSkippers.cpp | 1 - .../DateManip/NintendoSwitch_DateManip.cpp | 4 - .../NintendoSwitch_DateManip_24h.cpp | 1 - .../DateManip/NintendoSwitch_DateManip_US.cpp | 1 - .../DateManip/NintendoSwitch_DateSkippers.cpp | 1 - .../NintendoSwitch1_HomeToDateTime.cpp | 1 - .../NintendoSwitch2_HomeToDateTime.cpp | 1 - .../NintendoSwitch_HomeToDateTime.cpp | 1 - .../NintendoSwitch_NeutralDateSkip.cpp | 2 - .../NintendoSwitch_RollDateBackwardN.cpp | 1 - .../NintendoSwitch_RollDateForward1.cpp | 1 - .../NintendoSwitch_KeyboardCodeEntry.cpp | 1 - .../Programs/NintendoSwitch_GameEntry.cpp | 1 - .../NintendoSwitch_Typewriter_Tests.cpp | 1 - SerialPrograms/Source/PanelLists.cpp | 1 - .../Inference/Pokemon_AbilityReader.cpp | 1 - .../Inference/Pokemon_BerryNameReader.cpp | 1 - .../Inference/Pokemon_BoxGenderDetector.cpp | 3 - .../Inference/Pokemon_NatureReader.cpp | 1 - .../Inference/Pokemon_TrainIVCheckerOCR.cpp | 1 - .../Inference/Pokemon_TrainPokemonOCR.cpp | 1 - .../Pokemon/Inference/Pokemon_TypeReader.cpp | 1 - .../Pokemon/Options/Pokemon_IvJudgeOption.cpp | 1 - .../Source/Pokemon/Pokemon_Notification.cpp | 2 - .../Pokemon/Pokemon_ShinySparkleSet.cpp | 1 - .../Battles/PokemonBDSP_BattleBallReader.cpp | 1 - .../Battles/PokemonBDSP_EndBattleDetector.cpp | 5 -- .../PokemonBDSP_ExperienceGainDetector.cpp | 2 - .../PokemonBDSP_StartBattleDetector.cpp | 2 - .../BoxSystem/PokemonBDSP_BoxDetector.cpp | 1 - .../PokemonBDSP_BoxGenderDetector.cpp | 3 - .../PokemonBDSP_BoxNatureDetector.cpp | 1 - .../PokemonBDSP_BoxShinyDetector.cpp | 1 - .../BoxSystem/PokemonBDSP_IvJudgeReader.cpp | 1 - .../Inference/PokemonBDSP_DialogDetector.cpp | 1 - .../Inference/PokemonBDSP_MarkFinder.cpp | 1 - .../Inference/PokemonBDSP_MenuDetector.cpp | 1 - .../PokemonBDSP_PokeballSpriteMatcher.cpp | 1 - .../Inference/PokemonBDSP_SelectionArrow.cpp | 2 - .../PokemonBDSP_VSSeekerReaction.cpp | 2 - .../Rng/PokemonBDSP_EyeBlinkDetector.cpp | 1 - .../Rng/PokemonBDSP_SummaryReader.cpp | 4 - .../PokemonBDSP_ShinyEncounterDetector.cpp | 1 - .../PokemonBDSP_EncounterFilterOption.cpp | 1 - .../PokemonBDSP_EncounterFilterOverride.cpp | 1 - .../PokemonBDSP_EncounterFilterWidget.cpp | 4 - .../Source/PokemonBDSP/PokemonBDSP_Tests.cpp | 1 - .../Eggs/PokemonBDSP_EggAutonomous.cpp | 2 - .../Eggs/PokemonBDSP_EggAutonomousState.cpp | 3 - .../Programs/Eggs/PokemonBDSP_EggFeedback.cpp | 3 - .../Programs/Eggs/PokemonBDSP_EggRoutines.cpp | 1 - .../Farming/PokemonBDSP_DoublesLeveling.cpp | 4 - .../Farming/PokemonBDSP_GiftBerryReset.cpp | 2 - .../Farming/PokemonBDSP_PoffinCooker.cpp | 1 - .../PokemonBDSP_AutonomousBallThrower.cpp | 1 - .../Programs/PokemonBDSP_BoxRelease.cpp | 1 - .../PokemonBDSP_EncounterDetection.cpp | 1 - .../Programs/PokemonBDSP_GameEntry.cpp | 1 - .../Programs/PokemonBDSP_GameNavigation.cpp | 1 - .../Programs/PokemonBDSP_GlobalRoomHeal.cpp | 1 - .../Programs/PokemonBDSP_RunFromBattle.cpp | 1 - .../PokemonBDSP_BedroomSeedFinder.cpp | 3 - .../PokemonBDSP_BlinkRecovery.cpp | 2 - .../PokemonBDSP_IntroSeedFinder.cpp | 4 - .../PokemonBDSP_StateSolver.cpp | 1 - .../PokemonBDSP_LegendaryReset.cpp | 3 - .../PokemonBDSP_ShinyHunt-Fishing.cpp | 4 - .../PokemonBDSP_ShinyHunt-Overworld.cpp | 3 - .../PokemonBDSP_ShinyHunt-Shaymin.cpp | 3 - .../ShinyHunting/PokemonBDSP_StarterReset.cpp | 2 - .../PokemonBDSP_SoundListener.cpp | 2 - .../PokemonBDSP_SummaryReaderTester.cpp | 1 - .../Source/StaticRegistrationQt.cpp | 3 - .../Source/Tests/CommandLineTests.cpp | 1 - .../Dialogs/PokemonFRLG_DialogDetector.cpp | 5 -- .../Dialogs/PokemonFRLG_PartyDialogs.cpp | 1 - .../PokemonFRLG_PrizeSelectDetector.cpp | 6 -- .../Inference/Map/PokemonFRLG_MapDetector.cpp | 6 -- .../PokemonFRLG_PokemonLeagueDetectors.cpp | 5 -- .../Menus/PokemonFRLG_BagDetector.cpp | 7 -- .../Menus/PokemonFRLG_LoadMenuDetector.cpp | 6 -- .../PokemonFRLG_PartyEmptySlotDetector.cpp | 1 - .../PokemonFRLG_PartyHeldItemDetector.cpp | 1 - .../Menus/PokemonFRLG_PartyMenuDetector.cpp | 8 -- .../Menus/PokemonFRLG_StartMenuDetector.cpp | 2 - .../Menus/PokemonFRLG_SummaryDetector.cpp | 6 -- .../Menus/PokemonFRLG_TrainerCardDetector.cpp | 6 -- .../PokemonFRLG_BattleLevelUpReader.cpp | 7 -- .../PokemonFRLG_BattlePokemonDetector.cpp | 6 -- ...kemonFRLG_BattleSelectionArrowDetector.cpp | 1 - .../PokemonFRLG_DaycareManDetector.cpp | 5 -- .../Inference/PokemonFRLG_DigitReader.cpp | 2 - .../PokemonFRLG_OcrPreprocessing.cpp | 1 - .../PokemonFRLG_PartyLevelUpReader.cpp | 7 -- .../PokemonFRLG_PokedexRegisteredDetector.cpp | 1 - .../PokemonFRLG_PokemonSpriteReader.cpp | 3 - .../PokemonFRLG_ShinySymbolDetector.cpp | 4 - .../Inference/PokemonFRLG_StatsReader.cpp | 3 - .../Inference/PokemonFRLG_TrainerIdReader.cpp | 6 -- .../PokemonFRLG_WildEncounterReader.cpp | 5 -- .../PokemonFRLG_CatchFanfareDetector.cpp | 1 - .../Sounds/PokemonFRLG_ShinySoundDetector.cpp | 1 - .../PokemonFRLG/PokemonFRLG_Navigation.cpp | 1 - .../PokemonFRLG/PokemonFRLG_Tests.cpp | 1 - .../Farming/PokemonFRLG_EliteFourFarmer.cpp | 1 - .../Farming/PokemonFRLG_EvTrainer.cpp | 5 -- .../PokemonFRLG_HeldItemFarmer-SafariZone.cpp | 5 -- .../Farming/PokemonFRLG_PickupFarmer.cpp | 3 - .../PokemonFRLG_BattleMenuNavigation.cpp | 1 - .../PokemonFRLG_BlindNavigation.cpp | 2 - .../RngManipulation/PokemonFRLG_EggRng.cpp | 5 -- .../RngManipulation/PokemonFRLG_GiftRng.cpp | 7 -- .../RngManipulation/PokemonFRLG_HardReset.cpp | 2 - .../PokemonFRLG_RngCalibration.cpp | 2 - .../RngManipulation/PokemonFRLG_RngHelper.cpp | 2 - .../PokemonFRLG_RngLoopRoutines.cpp | 1 - .../PokemonFRLG_RngNavigation.cpp | 4 - .../PokemonFRLG_RoamingLegendaryRng.cpp | 4 - .../RngManipulation/PokemonFRLG_SidHelper.cpp | 2 - .../PokemonFRLG_StarterRng.cpp | 5 -- .../RngManipulation/PokemonFRLG_StaticRng.cpp | 5 -- .../RngManipulation/PokemonFRLG_WildRng.cpp | 5 -- .../ShinyHunting/PokemonFRLG_GiftReset.cpp | 1 - .../PokemonFRLG_LegendaryReset.cpp | 2 - .../PokemonFRLG_LegendaryRunAway.cpp | 1 - .../PokemonFRLG_PrizeCornerReset.cpp | 2 - .../PokemonFRLG_ShinyHunt-Fishing.cpp | 2 - .../PokemonFRLG_ShinyHunt-Overworld.cpp | 1 - .../PokemonFRLG_ReadBattleLevelUp.cpp | 3 - .../PokemonFRLG_ReadEncounter.cpp | 1 - .../TestPrograms/PokemonFRLG_ReadStats.cpp | 1 - .../PokemonFRLG_ReadTrainerId.cpp | 3 - .../PokemonFRLG_SafariOptimalActionTest.cpp | 1 - .../PokemonFRLG_TestPartyInference.cpp | 1 - .../Inference/PokemonHome_AlphaDetector.cpp | 2 - .../Inference/PokemonHome_BallReader.cpp | 1 - .../PokemonHome_BoxGenderDetector.cpp | 3 - .../Inference/PokemonHome_BoxViewDetector.cpp | 5 -- .../Inference/PokemonHome_ButtonDetector.cpp | 2 - .../PokemonHome_GigantamaxDetector.cpp | 1 - .../PokemonHome_OriginMarkReader.cpp | 3 - .../PokemonHome_SelectionArrowDetector.cpp | 1 - .../Inference/PokemonHome_ShinyDetector.cpp | 2 - .../Inference/PokemonHome_SummaryReader.cpp | 3 - .../PokemonHome_SummaryScreenDetector.cpp | 2 - .../Inference/PokemonHome_TeraTypeReader.cpp | 2 - .../PokemonHome/PokemonHome_Panels.cpp | 1 - .../PokemonHome/PokemonHome_Tests.cpp | 2 - .../Programs/PokemonHome_BoxNavigation.cpp | 4 - .../Programs/PokemonHome_BoxSorter.cpp | 4 - .../PokemonHome_BoxSorterLivingDex.cpp | 4 - .../Programs/PokemonHome_GenerateNameOCR.cpp | 1 - .../PokemonHome_ReadSummaryScreen.cpp | 1 - .../PokemonHome_TestDatabaseGenerator.cpp | 5 -- .../Battles/PokemonLA_BattleMenuDetector.cpp | 1 - .../PokemonLA_BattleMoveSelectionDetector.cpp | 1 - .../PokemonLA_BattlePokemonSwitchDetector.cpp | 1 - .../Battles/PokemonLA_BattleSpriteWatcher.cpp | 1 - .../Battles/PokemonLA_BattleStartDetector.cpp | 3 - .../PokemonLA_MMOSpriteStarSymbolDetector.cpp | 1 - .../Map/PokemonLA_MapMarkerLocator.cpp | 3 - .../Map/PokemonLA_MapMissionTabReader.cpp | 3 - .../Map/PokemonLA_MapWeatherAndTimeReader.cpp | 3 - .../Map/PokemonLA_MapZoomLevelReader.cpp | 1 - .../Map/PokemonLA_OutbreakReader.cpp | 1 - .../Map/PokemonLA_PokemonMapSpriteReader.cpp | 5 -- .../Map/PokemonLA_SelectedRegionDetector.cpp | 1 - .../Objects/PokemonLA_BubbleDetector.cpp | 1 - .../PokemonLA_DialogYellowArrowDetector.cpp | 1 - .../Objects/PokemonLA_FlagTracker.cpp | 1 - .../Inference/PokemonLA_BerryTreeDetector.cpp | 1 - .../Inference/PokemonLA_CommonColorCheck.cpp | 1 - .../Inference/PokemonLA_DialogDetector.cpp | 1 - .../Inference/PokemonLA_MountDetector.cpp | 1 - .../PokemonLA_NotificationReader.cpp | 1 - .../PokemonLA_StatusInfoScreenDetector.cpp | 3 - .../PokemonLA_UnderAttackDetector.cpp | 1 - .../PokemonLA_WildPokemonFocusDetector.cpp | 4 - .../Options/PokemonLA_ShinyDetectedAction.cpp | 2 - .../PokemonLA_CustomPathTableWidget.cpp | 2 - .../VideoGames/PokemonLA/PokemonLA_Tests.cpp | 3 - .../PokemonLA/PokemonLA_TravelLocations.cpp | 1 - .../Farming/PokemonLA_IngoBattleGrinder.cpp | 2 - .../Farming/PokemonLA_IngoMoveGrinder.cpp | 1 - .../Farming/PokemonLA_LeapGrinder.cpp | 1 - .../Farming/PokemonLA_TenacityCandyFarmer.cpp | 1 - .../General/PokemonLA_OutbreakFinder.cpp | 1 - .../General/PokemonLA_PokedexTasksReader.cpp | 1 - ...monLA_GeneratePokemonImageTrainingData.cpp | 1 - .../Programs/PokemonLA_FlagNavigationAir.cpp | 1 - .../Programs/PokemonLA_GameEntry.cpp | 1 - .../PokemonLA/Programs/PokemonLA_GameSave.cpp | 7 -- .../Programs/PokemonLA_LeapPokemonActions.cpp | 2 - .../Programs/PokemonLA_RegionNavigation.cpp | 3 - .../ShinyHunting/PokemonLA_AutoMultiSpawn.cpp | 2 - .../ShinyHunting/PokemonLA_BurmyFinder.cpp | 1 - .../ShinyHunting/PokemonLA_FroslassFinder.cpp | 1 - .../ShinyHunting/PokemonLA_GalladeFinder.cpp | 1 - .../PokemonLA_PostMMOSpawnReset.cpp | 1 - .../PokemonLA_ShinyHunt-CustomPath.cpp | 1 - .../ShinyHunting/PokemonLA_UnownFinder.cpp | 1 - .../PokemonLA_FlagNavigationTest.cpp | 1 - .../PokemonLA_MountDetectionTest.cpp | 1 - .../TestPrograms/PokemonLA_SoundListener.cpp | 2 - .../Trading/PokemonLA_SelfBoxTrade.cpp | 1 - .../Trading/PokemonLA_SelfTouchTrade.cpp | 1 - .../Trading/PokemonLA_TradeRoutines.cpp | 1 - .../Resources/PokemonLA_PokemonInfo.cpp | 1 - .../Commands/PokemonLGPE_DateSpam.cpp | 1 - .../PokemonLGPE_BattleArrowDetector.cpp | 1 - .../PokemonLGPE_ShinySymbolDetector.cpp | 4 - .../Sounds/PokemonLGPE_ShinySoundDetector.cpp | 1 - .../Programs/PokemonLGPE_GameEntry.cpp | 1 - .../PokemonLGPE_FossilRevival.cpp | 1 - .../PokemonLZA_MoveEffectivenessSymbol.cpp | 1 - .../Boxes/PokemonLZA_BoxDetection.cpp | 5 -- .../Boxes/PokemonLZA_BoxInfoDetector.cpp | 6 -- .../Boxes/PokemonLZA_IvJudgeReader.cpp | 1 - .../PokemonLZA_DonutBerriesDetector.cpp | 5 -- .../Donuts/PokemonLZA_FlavorPowerDetector.cpp | 5 -- .../PokemonLZA_FlavorPowerScreenDetector.cpp | 2 - .../Map/PokemonLZA_DirectionArrowDetector.cpp | 2 - .../Map/PokemonLZA_LocationNameReader.cpp | 1 - .../Inference/Map/PokemonLZA_MapDetector.cpp | 1 - .../Inference/PokemonLZA_AlertEyeDetector.cpp | 1 - .../Inference/PokemonLZA_ButtonDetector.cpp | 2 - .../PokemonLZA_DayNightChangeDetector.cpp | 3 - .../Inference/PokemonLZA_DialogDetector.cpp | 4 - .../PokemonLZA_HyperspaceCalorieDetector.cpp | 2 - .../Inference/PokemonLZA_MainMenuDetector.cpp | 3 - ...monLZA_OverworldPartySelectionDetector.cpp | 4 - .../PokemonLZA_SelectionArrowDetector.cpp | 1 - .../Inference/PokemonLZA_WeatherDetector.cpp | 1 - .../PokemonLZA_GenerateLocationNameOCR.cpp | 2 - .../Options/PokemonLZA_DonutBerriesOption.cpp | 1 - .../PokemonLZA_HyperspaceRewardOption.cpp | 1 - .../PokemonLZA_HyperspaceRewardTable.cpp | 1 - .../PokemonLZA_ShinyDetectedAction.cpp | 1 - .../PokemonLZA/PokemonLZA_Tests.cpp | 1 - .../Farming/PokemonLZA_DonutMaker.cpp | 9 --- .../Farming/PokemonLZA_FriendshipFarmer.cpp | 2 - .../PokemonLZA_HyperspaceRewardReset.cpp | 3 - .../PokemonLZA_JacintheInfiniteFarmer.cpp | 3 - .../Farming/PokemonLZA_RestaurantFarmer.cpp | 1 - .../Farming/PokemonLZA_WigglytuffFarmer.cpp | 1 - .../NonShinyHunting/PokemonLZA_StatsReset.cpp | 4 - .../PokemonLZA_WeatherFinder.cpp | 2 - .../Programs/PokemonLZA_BoxSorter.cpp | 5 -- .../Programs/PokemonLZA_GameEntry.cpp | 2 - .../PokemonLZA_HyperspaceNavigation.cpp | 2 - .../Programs/PokemonLZA_MenuNavigation.cpp | 1 - .../Programs/PokemonLZA_TrainerBattle.cpp | 1 - .../ShinyHunting/PokemonLZA_AutoFossil.cpp | 1 - .../PokemonLZA_ShinyHunt_BenchSit.cpp | 1 - .../PokemonLZA_ShinyHunt_HelioptileHunter.cpp | 3 - ...kemonLZA_ShinyHunt_HyperspaceLegendary.cpp | 6 -- .../ShinyHunting/PokemonLZA_WildZoneCafe.cpp | 1 - .../PokemonLZA_WildZoneEntrance.cpp | 1 - .../Trading/PokemonLZA_SelfBoxTrade.cpp | 1 - .../Resources/PokemonLZA_AvailablePokemon.cpp | 1 - .../PokemonPokopia_ButtonDetector.cpp | 2 - .../PokemonPokopia_MovesDetection.cpp | 3 - .../Inference/PokemonPokopia_PCDetection.cpp | 1 - .../PokemonPokopia_SelectionArrowDetector.cpp | 1 - .../PokemonPokopia_SettingsScreenDetector.cpp | 3 - .../PokemonPokopia_CloudIslandReset.cpp | 3 - .../Programs/PokemonPokopia_DailyFarmer.cpp | 2 - .../Programs/PokemonPokopia_PCNavigation.cpp | 2 - .../Dialogs/PokemonRSE_BattleDialogs.cpp | 5 -- .../Dialogs/PokemonRSE_DialogDetector.cpp | 6 -- .../Menus/PokemonRSE_LoadMenuDetector.cpp | 6 -- .../Menus/PokemonRSE_PartyMenuDetector.cpp | 7 -- .../Menus/PokemonRSE_StartMenuDetector.cpp | 3 - .../Menus/PokemonRSE_SummaryDetector.cpp | 6 -- .../PokemonRSE_SelectionDetector.cpp | 4 - .../PokemonRSE_ShinyNumberDetector.cpp | 4 - .../Sounds/PokemonRSE_ShinySoundDetector.cpp | 1 - .../PokemonRSE/PokemonRSE_Navigation.cpp | 2 - .../PokemonRSE/PokemonRSE_Tests.cpp | 1 - .../ShinyHunting/PokemonRSE_GiftReset.cpp | 1 - .../PokemonRSE_LegendaryReset.cpp | 2 - .../PokemonRSE_LegendaryRunAway-Emerald.cpp | 2 - .../PokemonRSE_ShinyHunt-Deoxys.cpp | 2 - .../ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp | 2 - .../ShinyHunting/PokemonRSE_StarterReset.cpp | 1 - .../Battles/PokemonSV_BattleBallReader.cpp | 2 - .../Battles/PokemonSV_NormalBattleMenus.cpp | 1 - .../Boxes/PokemonSV_BoxDetection.cpp | 1 - .../Boxes/PokemonSV_BoxEggDetector.cpp | 5 -- .../Boxes/PokemonSV_BoxNatureDetector.cpp | 1 - .../Boxes/PokemonSV_IvJudgeReader.cpp | 1 - .../Boxes/PokemonSV_StatsResetChecker.cpp | 1 - .../Dialogs/PokemonSV_DialogArrowDetector.cpp | 4 - .../PokemonSV_GradientArrowDetector.cpp | 2 - .../PokemonSV_ItemPrinterJobsDetector.cpp | 2 - .../PokemonSV_ItemPrinterMaterialDetector.cpp | 2 - .../PokemonSV_ItemPrinterPrizeReader.cpp | 1 - .../PokemonSV_DestinationMarkerDetector.cpp | 2 - .../Map/PokemonSV_FastTravelDetector.cpp | 2 - .../Inference/Map/PokemonSV_MapDetector.cpp | 2 - .../Map/PokemonSV_MapMenuDetector.cpp | 3 - .../PokemonSV_MapPokeCenterIconDetector.cpp | 3 - .../PokemonSV_AreaZeroSkyDetector.cpp | 2 - .../Overworld/PokemonSV_DirectionDetector.cpp | 3 - .../Overworld/PokemonSV_OliveDetector.cpp | 2 - .../Overworld/PokemonSV_OverworldDetector.cpp | 1 - .../PokemonSV_StationaryOverworldWatcher.cpp | 1 - .../Picnics/PokemonSV_PicnicDetector.cpp | 1 - .../Inference/PokemonSV_BagDetector.cpp | 1 - .../PokemonSV_BlueberryQuestDetector.cpp | 3 - .../PokemonSV_ClothingTopDetector.cpp | 1 - .../PokemonSV_ESPEmotionDetector.cpp | 1 - .../Inference/PokemonSV_MoneyReader.cpp | 2 - .../PokemonSV_PokemonMovesReader.cpp | 2 - .../PokemonSV_PokemonSummaryReader.cpp | 1 - .../Inference/PokemonSV_StatHexagonReader.cpp | 3 - .../PokemonSV_SweatBubbleDetector.cpp | 2 - .../PokemonSV_WhiteButtonDetector.cpp | 3 - .../PokemonSV_WhiteTriangleDetector.cpp | 3 - .../Tera/PokemonSV_TeraCardDetector.cpp | 3 - .../Tera/PokemonSV_TeraCodeReader.cpp | 2 - .../Tera/PokemonSV_TeraRaidSearchDetector.cpp | 1 - .../Options/PokemonSV_AuctionItemTable.cpp | 1 - .../Options/PokemonSV_TeraRollFilter.cpp | 1 - .../PokemonSV_TournamentPrizeSelectOption.cpp | 1 - .../PokemonSV_TournamentPrizeTable.cpp | 1 - .../VideoGames/PokemonSV/PokemonSV_Panels.cpp | 1 - .../VideoGames/PokemonSV/PokemonSV_Tests.cpp | 9 --- .../AutoStory/PokemonSV_AutoStory.cpp | 5 -- .../AutoStory/PokemonSV_AutoStoryTools.cpp | 4 - .../PokemonSV_AutoStory_Segment_00.cpp | 1 - .../PokemonSV_AutoStory_Segment_01.cpp | 5 -- .../PokemonSV_AutoStory_Segment_02.cpp | 5 -- .../PokemonSV_AutoStory_Segment_03.cpp | 6 -- .../PokemonSV_AutoStory_Segment_04.cpp | 6 -- .../PokemonSV_AutoStory_Segment_05.cpp | 6 -- .../PokemonSV_AutoStory_Segment_06.cpp | 7 -- .../PokemonSV_AutoStory_Segment_07.cpp | 6 -- .../PokemonSV_AutoStory_Segment_08.cpp | 6 -- .../PokemonSV_AutoStory_Segment_09.cpp | 6 -- .../PokemonSV_AutoStory_Segment_10.cpp | 6 -- .../PokemonSV_AutoStory_Segment_11.cpp | 5 -- .../PokemonSV_AutoStory_Segment_12.cpp | 8 -- .../PokemonSV_AutoStory_Segment_13.cpp | 5 -- .../PokemonSV_AutoStory_Segment_14.cpp | 6 -- .../PokemonSV_AutoStory_Segment_15.cpp | 4 - .../PokemonSV_AutoStory_Segment_16.cpp | 7 -- .../PokemonSV_AutoStory_Segment_17.cpp | 7 -- .../PokemonSV_AutoStory_Segment_18.cpp | 4 - .../PokemonSV_AutoStory_Segment_19.cpp | 7 -- .../PokemonSV_AutoStory_Segment_20.cpp | 7 -- .../PokemonSV_AutoStory_Segment_21.cpp | 4 - .../PokemonSV_AutoStory_Segment_22.cpp | 3 - .../PokemonSV_AutoStory_Segment_23.cpp | 4 - .../PokemonSV_AutoStory_Segment_24.cpp | 6 -- .../PokemonSV_AutoStory_Segment_25.cpp | 7 -- .../PokemonSV_AutoStory_Segment_26.cpp | 5 -- .../PokemonSV_AutoStory_Segment_27.cpp | 6 -- .../PokemonSV_AutoStory_Segment_28.cpp | 7 -- .../PokemonSV_AutoStory_Segment_29.cpp | 6 -- .../PokemonSV_AutoStory_Segment_30.cpp | 5 -- .../PokemonSV_AutoStory_Segment_31.cpp | 7 -- .../PokemonSV_AutoStory_Segment_32.cpp | 6 -- .../PokemonSV_AutoStory_Segment_33.cpp | 6 -- .../PokemonSV_AutoStory_Segment_34.cpp | 4 - .../PokemonSV_AutoStory_Segment_35.cpp | 5 -- .../PokemonSV_AutoStory_Segment_36.cpp | 4 - .../PokemonSV_AutoStory_Segment_37.cpp | 4 - .../PokemonSV_AutoStory_Segment_38.cpp | 4 - .../PokemonSV_AutoStory_Segment_39.cpp | 4 - .../PokemonSV_AutoStory_Segment_40.cpp | 2 - .../Battles/PokemonSV_BasicCatcher.cpp | 2 - .../Programs/Battles/PokemonSV_Battles.cpp | 4 - .../Battles/PokemonSV_SinglesBattler.cpp | 1 - .../Programs/Boxes/PokemonSV_BoxAttach.cpp | 1 - .../Programs/Boxes/PokemonSV_BoxRelease.cpp | 1 - .../Programs/Boxes/PokemonSV_BoxRoutines.cpp | 4 - .../Boxes/PokemonSV_MassAttachItems.cpp | 2 - .../Programs/Boxes/PokemonSV_MassRelease.cpp | 2 - .../Programs/Eggs/PokemonSV_EggAutonomous.cpp | 3 - .../Programs/Eggs/PokemonSV_EggFetcher.cpp | 1 - .../Programs/Eggs/PokemonSV_EggRoutines.cpp | 7 -- .../Farming/PokemonSV_AuctionFarmer.cpp | 2 - .../Farming/PokemonSV_BBQSoloFarmer.cpp | 1 - .../Farming/PokemonSV_BlueberryCatchPhoto.cpp | 7 -- .../Farming/PokemonSV_BlueberryQuests.cpp | 12 --- .../Farming/PokemonSV_ClaimMysteryGift.cpp | 1 - .../Farming/PokemonSV_MaterialFarmer.cpp | 2 - .../Farming/PokemonSV_MaterialFarmerTools.cpp | 6 -- .../Farming/PokemonSV_TournamentFarmer.cpp | 1 - .../Farming/PokemonSV_TournamentFarmer2.cpp | 1 - .../PokemonSV_ClipboardFastCodeEntry.cpp | 1 - .../FastCodeEntry/PokemonSV_CodeEntry.cpp | 1 - .../FastCodeEntry/PokemonSV_FastCodeEntry.cpp | 1 - .../PokemonSV_VideoFastCodeEntry.cpp | 1 - .../General/PokemonSV_MassPurchase.cpp | 1 - .../General/PokemonSV_SizeChecker.cpp | 2 - .../Programs/General/PokemonSV_StatsReset.cpp | 3 - .../PokemonSV_StatsResetEventBattle.cpp | 5 -- .../Glitches/PokemonSV_CloneItems-1.0.1.cpp | 2 - .../Glitches/PokemonSV_RideCloner-1.0.1.cpp | 3 - .../Glitches/PokemonSV_WildItemFarmer.cpp | 3 - .../ItemPrinter/PokemonSV_ItemPrinterRNG.cpp | 5 -- .../PokemonSV/Programs/PokemonSV_AreaZero.cpp | 1 - .../Programs/PokemonSV_ConnectToInternet.cpp | 3 - .../Programs/PokemonSV_GameEntry.cpp | 3 - .../Programs/PokemonSV_MenuNavigation.cpp | 6 -- .../PokemonSV/Programs/PokemonSV_SaveGame.cpp | 1 - .../PokemonSV/Programs/PokemonSV_Terarium.cpp | 5 -- .../Programs/PokemonSV_WorldNavigation.cpp | 7 -- .../PokemonSV_AreaZeroPlatform.cpp | 1 - .../ShinyHunting/PokemonSV_LetsGoTools.cpp | 2 - .../PokemonSV_ShinyHunt-AreaZeroPlatform.cpp | 5 -- .../PokemonSV_ShinyHunt-Scatterbug.cpp | 4 - .../Programs/TeraRaids/PokemonSV_AutoHost.cpp | 6 -- .../TeraRaids/PokemonSV_AutoHostTools.cpp | 2 - .../TeraRaids/PokemonSV_TeraBattler.cpp | 1 - .../TeraRaids/PokemonSV_TeraMultiFarmer.cpp | 7 -- .../TeraRaids/PokemonSV_TeraRoller.cpp | 2 - .../TeraRaids/PokemonSV_TeraRoutines.cpp | 1 - .../TeraRaids/PokemonSV_TeraSelfFarmer.cpp | 1 - .../Trading/PokemonSV_TradeRoutines.cpp | 2 - .../PokemonSwSh_Commands_AutoHosts.cpp | 1 - .../PokemonSwSh_Commands_EggRoutines.cpp | 1 - .../Commands/PokemonSwSh_Commands_Misc.cpp | 1 - .../Battles/PokemonSwSh_BattleBallReader.cpp | 1 - .../PokemonSwSh_BattleDialogDetector.cpp | 1 - .../PokemonSwSh_BattleDialogTracker.cpp | 1 - .../PokemonSwSh_StartBattleDetector.cpp | 1 - .../Inference/Dens/PokemonSwSh_BeamSetter.cpp | 1 - .../Dens/PokemonSwSh_RaidCatchDetector.cpp | 1 - .../Dens/PokemonSwSh_RaidLobbyReader.cpp | 2 - .../Inference/PokemonSwSh_BoxEggDetector.cpp | 2 - .../PokemonSwSh_BoxEmptySlotDetector.cpp | 2 - .../PokemonSwSh_BoxNatureDetector.cpp | 4 - .../PokemonSwSh_BoxShinySymbolDetector.cpp | 2 - .../PokemonSwSh_DialogBoxDetector.cpp | 1 - .../PokemonSwSh_DialogTriangleDetector.cpp | 1 - .../Inference/PokemonSwSh_FishingDetector.cpp | 1 - .../Inference/PokemonSwSh_IvJudgeReader.cpp | 1 - .../Inference/PokemonSwSh_MarkFinder.cpp | 2 - .../PokemonSwSh_PokemonSpriteReader.cpp | 2 - .../PokemonSwSh_ReceivePokemonDetector.cpp | 2 - .../PokemonSwSh_SelectionArrowFinder.cpp | 2 - .../Inference/PokemonSwSh_YCommDetector.cpp | 2 - ...onSwSh_OrbeetleAttackAnimationDetector.cpp | 1 - .../PokemonSwSh_ShinyEncounterDetector.cpp | 1 - .../PokemonSwSh_SparkleDetectorSquare.cpp | 1 - .../PokemonSwSh_GenerateNameOCRPokedex.cpp | 2 - .../MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp | 1 - .../AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp | 1 - .../PokemonSwSh_MaxLair_AI_SelectStarter.cpp | 2 - .../AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp | 1 - .../PokemonSwSh_MaxLair_AI_SwapProfessor.cpp | 2 - .../AI/PokemonSwSh_MaxLair_AI_Tools.cpp | 2 - ...PokemonSwSh_MaxLair_CatchScreenTracker.cpp | 1 - .../PokemonSwSh_MaxLair_Notifications.cpp | 1 - .../Framework/PokemonSwSh_MaxLair_State.cpp | 1 - .../PokemonSwSh_MaxLair_StateMachine.cpp | 3 - .../PokemonSwSh_MaxLair_Detect_Entrance.cpp | 1 - .../PokemonSwSh_MaxLair_Detect_HPPP.cpp | 1 - .../PokemonSwSh_MaxLair_Detect_Lobby.cpp | 2 - .../PokemonSwSh_MaxLair_Detect_PathMap.cpp | 1 - .../PokemonSwSh_MaxLair_Detect_PathSelect.cpp | 2 - .../PokemonSwSh_MaxLair_Detect_PathSide.cpp | 2 - ...kemonSwSh_MaxLair_Detect_PokemonReader.cpp | 1 - ...nSwSh_MaxLair_Detect_PokemonSelectMenu.cpp | 3 - ...monSwSh_MaxLair_Detect_PokemonSwapMenu.cpp | 2 - ...kemonSwSh_MaxLair_Detect_ProfessorSwap.cpp | 1 - .../PokemonSwSh_MaxLair_Run_CaughtScreen.cpp | 3 - .../PokemonSwSh_MaxLair_Run_EnterLobby.cpp | 3 - .../PokemonSwSh_MaxLair_Run_Entrance.cpp | 1 - .../PokemonSwSh_MaxLair_Run_PathSelect.cpp | 3 - .../PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp | 1 - .../Program/PokemonSwSh_MaxLair_Run_Start.cpp | 1 - .../PokemonSwSh_MaxLair_Run_StartSolo.cpp | 1 - .../PokemonSwSh_EncounterFilterOption.cpp | 1 - .../PokemonSwSh_EncounterFilterWidget.cpp | 4 - .../Options/PokemonSwSh_BallSelectOption.cpp | 1 - .../PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp | 1 - .../PokemonSwSh/PokemonSwSh_Panels.cpp | 1 - .../PokemonSwSh/PokemonSwSh_Tests.cpp | 2 - .../PokemonSwSh_DateSpam-BerryFarmer.cpp | 1 - .../PokemonSwSh_DateSpam-BerryFarmer2.cpp | 2 - ...emonSwSh_DateSpam-DailyHighlightFarmer.cpp | 1 - .../PokemonSwSh_DateSpam-LotoFarmer.cpp | 2 - .../PokemonSwSh_DateSpam-StowOnSideFarmer.cpp | 1 - .../PokemonSwSh_DateSpam-WattFarmer.cpp | 4 - .../DenHunting/PokemonSwSh_DaySkipperEU.cpp | 1 - .../PokemonSwSh_DaySkipperJPN-7.8k.cpp | 1 - .../DenHunting/PokemonSwSh_DaySkipperJPN.cpp | 1 - .../DenHunting/PokemonSwSh_DaySkipperUS.cpp | 1 - .../EggPrograms/PokemonSwSh_EggAutonomous.cpp | 6 -- .../EggPrograms/PokemonSwSh_EggHatcher.cpp | 1 - .../PokemonSwSh_GodEggItemDupe.cpp | 1 - .../PokemonSwSh_AutonomousBallThrower.cpp | 1 - .../PokemonSwSh_BoxReorderNationalDex.cpp | 2 - .../General/PokemonSwSh_DexRecFinder.cpp | 1 - .../General/PokemonSwSh_SurpriseTrade.cpp | 1 - .../Programs/General/PokemonSwSh_TradeBot.cpp | 1 - .../PokemonSwSh_AutoHost-MultiGame.cpp | 1 - .../Hosting/PokemonSwSh_AutoHost-Rolling.cpp | 2 - .../Programs/Hosting/PokemonSwSh_AutoHost.cpp | 3 - .../Hosting/PokemonSwSh_DenRoller.cpp | 2 - .../PokemonSwSh_StatsReset-Calyrex.cpp | 1 - .../PokemonSwSh_StatsReset-Moltres.cpp | 2 - .../PokemonSwSh_StatsReset-Regi.cpp | 1 - .../PokemonSwSh_StatsReset.cpp | 1 - .../PokemonSwSh_OverworldMovement.cpp | 1 - .../PokemonSwSh_OverworldTargetTracker.cpp | 2 - ...emonSwSh_ShinyHuntAutonomous-Overworld.cpp | 3 - .../Programs/PokemonSwSh_BoxHelpers.cpp | 3 - .../PokemonSwSh_EncounterDetection.cpp | 2 - .../Programs/PokemonSwSh_EncounterHandler.cpp | 1 - .../Programs/PokemonSwSh_GameEntry.cpp | 1 - .../Programs/PokemonSwSh_Internet.cpp | 2 - .../Programs/PokemonSwSh_MenuNavigation.cpp | 1 - .../PokemonSwSh_RaidItemFarmerOKHO.cpp | 1 - .../RNG/PokemonSwSh_CramomaticRNG.cpp | 1 - .../RNG/PokemonSwSh_DailyHighlightRNG.cpp | 1 - ...emonSwSh_ShinyHuntAutonomous-BerryTree.cpp | 2 - ...okemonSwSh_ShinyHuntAutonomous-Fishing.cpp | 2 - .../PokemonSwSh_ShinyHuntAutonomous-Regi.cpp | 2 - ...monSwSh_ShinyHuntAutonomous-Regigigas2.cpp | 1 - ...onSwSh_ShinyHuntAutonomous-StrongSpawn.cpp | 1 - ...Sh_ShinyHuntAutonomous-SwordsOfJustice.cpp | 2 - ...emonSwSh_ShinyHuntAutonomous-Whistling.cpp | 2 - .../PokemonSwSh_CurryHunter.cpp | 1 - .../PokemonSwSh_ShinyHuntTools.cpp | 1 - .../Resources/PokemonSwSh_TypeSprites.cpp | 1 - 744 files changed, 1760 deletions(-) diff --git a/Common/Cpp/CancellableScope.cpp b/Common/Cpp/CancellableScope.cpp index e890ffe575..18b0c0cf99 100644 --- a/Common/Cpp/CancellableScope.cpp +++ b/Common/Cpp/CancellableScope.cpp @@ -10,7 +10,6 @@ #include "Common/Cpp/Concurrency/Mutex.h" #include "Common/Cpp/Concurrency/ConditionVariable.h" #include "Containers/Pimpl.tpp" -#include "Concurrency/SpinLock.h" #include "Exceptions.h" #include "ListenerSet.h" #include "CancellableScope.h" diff --git a/Common/Cpp/Concurrency/SpinLock.cpp b/Common/Cpp/Concurrency/SpinLock.cpp index b0d91e6058..89097b496f 100644 --- a/Common/Cpp/Concurrency/SpinLock.cpp +++ b/Common/Cpp/Concurrency/SpinLock.cpp @@ -8,7 +8,6 @@ #include #include #include "Common/Cpp/CpuId/CpuId.h" -#include "SpinPause.h" #include "SpinLock.h" #if 0 diff --git a/Common/Cpp/CpuUtilization/CpuUtilization.cpp b/Common/Cpp/CpuUtilization/CpuUtilization.cpp index d47db026e0..b8a43481ca 100644 --- a/Common/Cpp/CpuUtilization/CpuUtilization.cpp +++ b/Common/Cpp/CpuUtilization/CpuUtilization.cpp @@ -4,7 +4,6 @@ * */ -#include "CpuUtilization.h" #if _WIN32 diff --git a/Common/Cpp/ExpressionEvaluator.cpp b/Common/Cpp/ExpressionEvaluator.cpp index b246d43983..f6102ab178 100644 --- a/Common/Cpp/ExpressionEvaluator.cpp +++ b/Common/Cpp/ExpressionEvaluator.cpp @@ -9,7 +9,6 @@ #include #include #include "Common/Cpp/Exceptions.h" -#include "ExpressionEvaluator.h" //#include //using std::cout; diff --git a/Common/Cpp/Filesystem/Filesystem.cpp b/Common/Cpp/Filesystem/Filesystem.cpp index 9925ebd69a..ebd8d0e089 100644 --- a/Common/Cpp/Filesystem/Filesystem.cpp +++ b/Common/Cpp/Filesystem/Filesystem.cpp @@ -11,7 +11,6 @@ #include #include #include "CompileTimeBackends.h" -#include "FilePath.h" #include "Filesystem.h" #ifdef _WIN32 diff --git a/Common/Cpp/Hardware/Hardware.cpp b/Common/Cpp/Hardware/Hardware.cpp index 5df9a5af44..2f04cac5fb 100644 --- a/Common/Cpp/Hardware/Hardware.cpp +++ b/Common/Cpp/Hardware/Hardware.cpp @@ -4,7 +4,6 @@ * */ #include "Common/Cpp/CpuId/CpuId.h" -#include "Hardware.h" #if _M_IX86 || _M_X64 || __i386__ || __x86_64__ #include "Hardware_x86.tpp" diff --git a/Common/Cpp/Json/JsonValue.cpp b/Common/Cpp/Json/JsonValue.cpp index d7d99df846..ff134fc743 100644 --- a/Common/Cpp/Json/JsonValue.cpp +++ b/Common/Cpp/Json/JsonValue.cpp @@ -6,7 +6,6 @@ #include "3rdParty-Core/nlohmann/json.hpp" #include "Common/Cpp/Filesystem/FileIO.h" -#include "JsonValue.h" #include "JsonArray.h" #include "JsonObject.h" #include "JsonTools.h" diff --git a/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp b/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp index 785e01b539..5177b70a76 100644 --- a/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp +++ b/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp @@ -5,7 +5,6 @@ */ -#include "MemoryUtilization.h" #if 0 diff --git a/Common/Cpp/Options/CheckboxDropdownOption.cpp b/Common/Cpp/Options/CheckboxDropdownOption.cpp index d69473e646..0c9a307e07 100644 --- a/Common/Cpp/Options/CheckboxDropdownOption.cpp +++ b/Common/Cpp/Options/CheckboxDropdownOption.cpp @@ -4,7 +4,6 @@ * */ -#include "CheckboxDropdownOption.h" namespace PokemonAutomation{ diff --git a/Common/Cpp/SerialConnection/SerialConnection.cpp b/Common/Cpp/SerialConnection/SerialConnection.cpp index 40435809bc..962844f673 100644 --- a/Common/Cpp/SerialConnection/SerialConnection.cpp +++ b/Common/Cpp/SerialConnection/SerialConnection.cpp @@ -7,7 +7,6 @@ #include #include "Common/Cpp/Time.h" #include "Common/Cpp/Concurrency/Mutex.h" -#include "SerialConnection.h" namespace PokemonAutomation{ diff --git a/Common/Cpp/Sockets/ClientSocket.cpp b/Common/Cpp/Sockets/ClientSocket.cpp index 66d38393e0..63b00b8fed 100644 --- a/Common/Cpp/Sockets/ClientSocket.cpp +++ b/Common/Cpp/Sockets/ClientSocket.cpp @@ -4,7 +4,6 @@ * */ -#include "ClientSocket.h" namespace PokemonAutomation{ diff --git a/Common/Cpp/Strings/StringTools.cpp b/Common/Cpp/Strings/StringTools.cpp index 590cc82cf6..b438d7de35 100644 --- a/Common/Cpp/Strings/StringTools.cpp +++ b/Common/Cpp/Strings/StringTools.cpp @@ -8,7 +8,6 @@ #include #include #include -#include "StringTools.h" namespace PokemonAutomation{ namespace StringTools{ diff --git a/Common/Cpp/Time.cpp b/Common/Cpp/Time.cpp index 35a0474a9b..21d7acb31c 100644 --- a/Common/Cpp/Time.cpp +++ b/Common/Cpp/Time.cpp @@ -8,7 +8,6 @@ //#include #include #include "Common/Cpp/PrettyPrint.h" -#include "Time.h" namespace PokemonAutomation{ diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp index 79315b76fc..7b30b7cb68 100644 --- a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp +++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp @@ -8,7 +8,6 @@ #include "Common/CRC32/pabb_CRC32.h" #include "PABotBase2_PacketSender.h" #include "PABotBase2_StreamCoalescer.h" -#include "PABotBase2_ConnectionDebug.h" namespace PokemonAutomation{ namespace PABotBase2{ diff --git a/Common/Qt/CodeValidator.cpp b/Common/Qt/CodeValidator.cpp index 1cc9b5bf0f..fc5d7ba038 100644 --- a/Common/Qt/CodeValidator.cpp +++ b/Common/Qt/CodeValidator.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "CodeValidator.h" namespace PokemonAutomation{ diff --git a/Common/Qt/CollapsibleGroupBox.cpp b/Common/Qt/CollapsibleGroupBox.cpp index 8f718b48cc..56b9421d55 100644 --- a/Common/Qt/CollapsibleGroupBox.cpp +++ b/Common/Qt/CollapsibleGroupBox.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include "CollapsibleGroupBox.h" diff --git a/Common/Qt/Options/BatchWidget.cpp b/Common/Qt/Options/BatchWidget.cpp index c7ced97007..1f973c98fa 100644 --- a/Common/Qt/Options/BatchWidget.cpp +++ b/Common/Qt/Options/BatchWidget.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include "BatchWidget.h" diff --git a/Common/Qt/Options/BooleanCheckBoxWidget.cpp b/Common/Qt/Options/BooleanCheckBoxWidget.cpp index 38d60176b2..86c19a2159 100644 --- a/Common/Qt/Options/BooleanCheckBoxWidget.cpp +++ b/Common/Qt/Options/BooleanCheckBoxWidget.cpp @@ -6,7 +6,6 @@ #include #include -#include #include "BooleanCheckBoxWidget.h" namespace PokemonAutomation{ diff --git a/Common/Qt/Options/BoxFloatWidget.cpp b/Common/Qt/Options/BoxFloatWidget.cpp index 31f72d50bc..d2c4d56bbb 100644 --- a/Common/Qt/Options/BoxFloatWidget.cpp +++ b/Common/Qt/Options/BoxFloatWidget.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include #include "Common/Cpp/Strings/StringTools.h" diff --git a/Common/Qt/Options/ButtonWidget.cpp b/Common/Qt/Options/ButtonWidget.cpp index 68e04ca16f..4c1b4723db 100644 --- a/Common/Qt/Options/ButtonWidget.cpp +++ b/Common/Qt/Options/ButtonWidget.cpp @@ -6,8 +6,6 @@ #include #include -#include -#include #include "ButtonWidget.h" //using std::cout; diff --git a/Common/Qt/Options/DateWidget.cpp b/Common/Qt/Options/DateWidget.cpp index 7430089653..4a81adfed1 100644 --- a/Common/Qt/Options/DateWidget.cpp +++ b/Common/Qt/Options/DateWidget.cpp @@ -6,7 +6,6 @@ #include #include -#include #include "DateWidget.h" //#include diff --git a/Common/Qt/Options/EditableTableWidget.cpp b/Common/Qt/Options/EditableTableWidget.cpp index 35cf628759..ec6440eaa1 100644 --- a/Common/Qt/Options/EditableTableWidget.cpp +++ b/Common/Qt/Options/EditableTableWidget.cpp @@ -7,8 +7,6 @@ #include #include #include -#include -#include #include #include #include "Common/Cpp/Json/JsonValue.h" diff --git a/Common/Qt/Options/EnumDropdownWidget.cpp b/Common/Qt/Options/EnumDropdownWidget.cpp index 1a82c4821c..22f16f812c 100644 --- a/Common/Qt/Options/EnumDropdownWidget.cpp +++ b/Common/Qt/Options/EnumDropdownWidget.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include "EnumDropdownWidget.h" namespace PokemonAutomation{ diff --git a/Common/Qt/Options/FloatingPointWidget.cpp b/Common/Qt/Options/FloatingPointWidget.cpp index ec91dfd02f..5a95bda330 100644 --- a/Common/Qt/Options/FloatingPointWidget.cpp +++ b/Common/Qt/Options/FloatingPointWidget.cpp @@ -6,9 +6,7 @@ #include #include -#include #include "Common/Cpp/PrettyPrint.h" -#include "ConfigWidget.h" #include "FloatingPointWidget.h" //#include diff --git a/Common/Qt/Options/IntegerRangeWidget.cpp b/Common/Qt/Options/IntegerRangeWidget.cpp index 90ea350b34..a668fe9629 100644 --- a/Common/Qt/Options/IntegerRangeWidget.cpp +++ b/Common/Qt/Options/IntegerRangeWidget.cpp @@ -6,8 +6,6 @@ #include #include -#include -#include "ConfigWidget.h" #include "IntegerRangeWidget.h" namespace PokemonAutomation{ diff --git a/Common/Qt/Options/MacAddressWidget.cpp b/Common/Qt/Options/MacAddressWidget.cpp index 097154c712..eb291392a6 100644 --- a/Common/Qt/Options/MacAddressWidget.cpp +++ b/Common/Qt/Options/MacAddressWidget.cpp @@ -4,8 +4,6 @@ * */ -#include -#include "ConfigWidget.h" #include "MacAddressWidget.h" //#include diff --git a/Common/Qt/Options/PathWidget.cpp b/Common/Qt/Options/PathWidget.cpp index ebf214e425..52330cb2d8 100644 --- a/Common/Qt/Options/PathWidget.cpp +++ b/Common/Qt/Options/PathWidget.cpp @@ -6,8 +6,6 @@ #include #include -#include -#include #include #include "PathWidget.h" diff --git a/Common/Qt/Options/SimpleIntegerWidget.cpp b/Common/Qt/Options/SimpleIntegerWidget.cpp index 5db4f209a0..950cdb10ed 100644 --- a/Common/Qt/Options/SimpleIntegerWidget.cpp +++ b/Common/Qt/Options/SimpleIntegerWidget.cpp @@ -6,8 +6,6 @@ #include #include -#include -#include "ConfigWidget.h" #include "SimpleIntegerWidget.h" //#include diff --git a/Common/Qt/Options/StaticTableWidget.cpp b/Common/Qt/Options/StaticTableWidget.cpp index 23c63f4552..b7036b5bfc 100644 --- a/Common/Qt/Options/StaticTableWidget.cpp +++ b/Common/Qt/Options/StaticTableWidget.cpp @@ -7,10 +7,8 @@ #include #include #include -#include #include #include -#include #include "Common/Cpp/Json/JsonValue.h" #include "Common/Qt/AutoHeightTable.h" #include "StaticTableWidget.h" diff --git a/Common/Qt/Options/StaticTextWidget.cpp b/Common/Qt/Options/StaticTextWidget.cpp index d8f6380a36..34a7c5681a 100644 --- a/Common/Qt/Options/StaticTextWidget.cpp +++ b/Common/Qt/Options/StaticTextWidget.cpp @@ -5,7 +5,6 @@ */ #include -#include #include #include "StaticTextWidget.h" diff --git a/Common/Qt/Options/StringWidget.cpp b/Common/Qt/Options/StringWidget.cpp index 8a21bf6cab..3e5eaa6fdb 100644 --- a/Common/Qt/Options/StringWidget.cpp +++ b/Common/Qt/Options/StringWidget.cpp @@ -6,7 +6,6 @@ #include #include -#include #include "StringWidget.h" // #include diff --git a/Common/Qt/Options/TextEditWidget.cpp b/Common/Qt/Options/TextEditWidget.cpp index 2a5ab59ca5..2c3a27bb96 100644 --- a/Common/Qt/Options/TextEditWidget.cpp +++ b/Common/Qt/Options/TextEditWidget.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/Common/Qt/Options/TimeDurationWidget.cpp b/Common/Qt/Options/TimeDurationWidget.cpp index 7973c29ffc..57f5c25ad1 100644 --- a/Common/Qt/Options/TimeDurationWidget.cpp +++ b/Common/Qt/Options/TimeDurationWidget.cpp @@ -6,7 +6,6 @@ #include #include -#include #include "TimeDurationWidget.h" //#include diff --git a/Common/Qt/QtThreadPool_Tests.cpp b/Common/Qt/QtThreadPool_Tests.cpp index e2b7d8e51e..bb916fbc0f 100644 --- a/Common/Qt/QtThreadPool_Tests.cpp +++ b/Common/Qt/QtThreadPool_Tests.cpp @@ -7,13 +7,10 @@ #include #include #include -#include #include "Common/Cpp/Concurrency/Mutex.h" #include "Common/Cpp/Concurrency/ThreadPool.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "GlobalThreadPoolsQt.h" -#include "QtThreadPool.h" -#include "QtThreadPool_Tests.h" namespace PokemonAutomation{ diff --git a/Common/Qt/StringToolsQt.cpp b/Common/Qt/StringToolsQt.cpp index df13d1aac4..eb83a145ff 100644 --- a/Common/Qt/StringToolsQt.cpp +++ b/Common/Qt/StringToolsQt.cpp @@ -5,7 +5,6 @@ */ #include -#include "StringToolsQt.h" namespace PokemonAutomation{ diff --git a/Common/Qt/TimeQt.cpp b/Common/Qt/TimeQt.cpp index 6973f78799..b93468372b 100644 --- a/Common/Qt/TimeQt.cpp +++ b/Common/Qt/TimeQt.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" diff --git a/SerialPrograms/Source/CommandLine/CommandLine_Main.cpp b/SerialPrograms/Source/CommandLine/CommandLine_Main.cpp index b94f5ecc39..99881384c3 100644 --- a/SerialPrograms/Source/CommandLine/CommandLine_Main.cpp +++ b/SerialPrograms/Source/CommandLine/CommandLine_Main.cpp @@ -12,7 +12,6 @@ #include "Common/Cpp/Logging/LastLogTracker.h" #include "Common/Cpp/Logging/FileLogger.h" #include "Common/Cpp/Logging/GlobalLogger.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/Logging/Logger.h" // #include "CommonFramework/Logging/OutputRedirector.h" #include "CommonFramework/Tools/GlobalThreadPools.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp index e046fed4d3..85cbca5ed6 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp @@ -14,7 +14,6 @@ #include "Common/Cpp/Containers/Pimpl.tpp" #include "Kernels/AudioPipeline/Kernels_AudioPipeline.h" #include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h" #include "AudioInfo.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp index 0608b1a7f6..69ecd91246 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp @@ -14,7 +14,6 @@ #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/AudioPipeline/AudioInfo.h" -#include "AudioInfo_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp index b3c834dabf..b93dba79a8 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp @@ -4,7 +4,6 @@ * */ -#include "AudioSourceDescriptor.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp index b3e8379200..383e7bc54a 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp @@ -4,7 +4,6 @@ * */ -#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/Pimpl.tpp" #include "Common/Cpp/Logging/AbstractLogger.h" @@ -12,8 +11,6 @@ #include "Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h" #include "Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h" #include "Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.h" -#include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h" #include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h" #include "CommonFramework/AudioPipeline/ChannelMixer.h" #include "CommonFramework/AudioPipeline/IO/AudioSource.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/ChannelMixer.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/ChannelMixer.cpp index 43a94bfbc2..76f0a7374e 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/ChannelMixer.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/ChannelMixer.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "ChannelMixer.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp index 4a4ee9a587..a347d586b8 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp @@ -6,11 +6,8 @@ #include #include -#include #include -#include #include -#include #include "3rdParty/QtWavFile/WavFile.h" #include "Common/Qt/StringToolsQt.h" #include "Common/Qt/GlobalThreadPoolsQt.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp index 9e1d108ea3..b95d0fef31 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp @@ -15,9 +15,7 @@ #include #include #include -#include #include -#include #include #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" @@ -25,7 +23,6 @@ #include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h" #include "CommonFramework/AudioPipeline/IO/AudioFileLoader.h" #include "CommonFramework/AudioPipeline/IO/AudioInputFile.h" -#include "AudioFileLoader_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp index c17dc78347..39ad24b89d 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp @@ -5,11 +5,8 @@ */ #include -#include #include -#include #include -#include #include #include "3rdParty/QtWavFile/WavFile.h" #include "Common/Cpp/Exceptions.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp index 780b66398c..77cf93cbdd 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp @@ -28,9 +28,7 @@ #include #include #include -#include #include -#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/TestRunners/UnitTest.h" @@ -42,10 +40,8 @@ #include "Kernels/AudioResampler/Kernels_AudioResampler.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/AudioPipeline/ChannelMixer.h" -#include "CommonFramework/AudioPipeline/AudioInfo.h" #include "CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h" #include "CommonFramework/AudioPipeline/AudioSources/AudioSource_File.h" -#include "SinkPipeline_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp index 384371610b..cebff40b60 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp @@ -9,7 +9,6 @@ #include #include #include "Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h" -#include "AudioFormatUtils.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp index 067856b751..2e8856192b 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp @@ -6,7 +6,6 @@ #include -#include #include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" #include "AudioDisplayWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp index 5094dc1ec2..46718c426c 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp @@ -4,20 +4,16 @@ * */ -#include #include #include -#include #include #include #include "Common/Qt/NoWheelComboBox.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Panels/ConsoleSettingsStretch.h" -#include "CommonFramework/AudioPipeline/AudioSession.h" #include "CommonFramework/AudioPipeline/AudioPipelineOptions.h" #include "CommonFramework/AudioPipeline/AudioSources/AudioSource_File.h" #include "CommonFramework/AudioPipeline/AudioSources/AudioSource_Device.h" -#include "AudioDisplayWidget.h" #include "AudioSelectorWidget.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp b/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp index cedecd4e2f..99a2917d85 100644 --- a/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp +++ b/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp @@ -4,7 +4,6 @@ * */ -#include "Environment.h" #if _WIN32 #include "Environment_Windows.tpp" diff --git a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp index 3988946c81..a42e6aa334 100644 --- a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp +++ b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp @@ -4,7 +4,6 @@ * */ -#include "SystemSleep.h" #if 0 #elif _WIN32 diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp index 450c3e6398..24fcef320f 100644 --- a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp +++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp @@ -5,7 +5,6 @@ */ #include -#include #include "Common/Cpp/Filesystem/FileIO.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/PrettyPrint.h" @@ -19,11 +18,8 @@ #include "CommonFramework/Globals.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/Recording/StreamHistorySession.h" -#include "CommonFramework/Tools/GlobalThreadPools.h" #include "ProgramDumper.h" #include "ErrorReports.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp index e39abc8f4d..6ac37c993a 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp @@ -8,7 +8,6 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/VideoStream.h" #include "CommonFramework/Tools/ProgramEnvironment.h" -#include "CommonFramework/Notifications/EventNotificationOption.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "FatalProgramException.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp index 4805d744df..207b8fa96b 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Tools/ProgramEnvironment.h" -#include "CommonFramework/Notifications/EventNotificationOption.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "OperationFailedException.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp index 984f6be2f8..0b3d724c70 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp @@ -4,10 +4,8 @@ * */ -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ProgramEnvironment.h" -#include "CommonFramework/Notifications/EventNotificationOption.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "OperationFailedExceptionWithScreenshot.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp index a47c52dde4..66f2875689 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp @@ -4,8 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "ProgramFinishedException.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/GlobalServices.cpp b/SerialPrograms/Source/CommonFramework/GlobalServices.cpp index a9257efb8c..08f76dcb9d 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalServices.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalServices.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Concurrency/Watchdog.h" #include "Common/Cpp/Concurrency/PeriodicRunner.h" #include "CommonFramework/Tools/GlobalThreadPools.h" -#include "GlobalServices.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index bcca35843e..9e645c9ac1 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -17,8 +17,6 @@ #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" #include "Common/Cpp/Options/KeyboardLayoutOption.h" -#include "CommonFramework/Globals.h" -#include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Options/CheckForUpdatesOption.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp index af2735aae2..97f6e8807a 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Rectangle.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/ImageTypes/ImageViewHSV32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "ImageBoxes.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp index 888fa2b3db..b1f750a372 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp @@ -10,7 +10,6 @@ #include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h" #include "Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h" #include "Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "ImageDiff.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp index 4a916423e8..b7100c2df7 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp @@ -9,7 +9,6 @@ #include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "ImageBoxes.h" #include "ImageStats.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp index 92a2761dab..a3895ad335 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Containers/Pimpl.tpp" #include "Common/Cpp/Containers/AlignedVector.tpp" #include "ImageViewRGB32.h" -#include "ImageViewHSV32.h" #include "ImageHSV32.h" #ifndef M_PI diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp index c6d9dc5b7a..2f919b367f 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp @@ -7,7 +7,6 @@ #include #include "Common/Cpp/Containers/AlignedVector.tpp" #include "CompileTimeBackends.h" -#include "ImageViewRGB32.h" #include "ImageRGB32.h" #ifdef PA_IMAGE_BACKEND_Qt diff --git a/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp b/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp index d9c31e627a..96c58fd70f 100644 --- a/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp +++ b/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp @@ -8,7 +8,6 @@ #include "Common/Cpp/Logging/TaggedLogger.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Options/BooleanCheckBoxOption.h" -#include "Logger.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.cpp b/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.cpp index 5cf36ef1b4..ae4f51fcc7 100644 --- a/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.cpp +++ b/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include #include "Common/Cpp/Logging/LastLogTracker.h" diff --git a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp index 2e245aff3f..e1d9c1ebaf 100644 --- a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp +++ b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Strings/Unicode.h" -#include "QueuedLogger.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Main.cpp b/SerialPrograms/Source/CommonFramework/Main.cpp index 64037a5526..98a1d89e6d 100644 --- a/SerialPrograms/Source/CommonFramework/Main.cpp +++ b/SerialPrograms/Source/CommonFramework/Main.cpp @@ -2,7 +2,6 @@ #include //#include #include -#include #include "Common/Cpp/Logging/LastLogTracker.h" #include "Common/Cpp/Logging/FileLogger.h" #include "Common/Cpp/Logging/GlobalLogger.h" @@ -25,8 +24,6 @@ #include "ControllerInput/ControllerInput.h" #include "Controllers/SerialPort/SerialPortPollerQt.h" #include "Integrations/DiscordSettingsOption.h" -#include "Integrations/DiscordSocial/DiscordSocial.h" -#include "Integrations/DppIntegration/DppClient.h" #include "Integrations/DiscordWebhook.h" #include "VideoPipeline/Backends/MediaServicesQt6.h" #include "ErrorReports/ProgramDumper.h" @@ -34,12 +31,10 @@ #include "Environment/HardwareValidation.h" //#include "Tools/StatsDatabase.h" //#include "Windows/DpiScaler.h" -#include "Logging/Logger.h" #include "Logging/OutputRedirector.h" #include "Startup/SetupSettings.h" #include "Startup/NewVersionCheck.h" #include "Windows/MainWindow.h" -#include "Globals.h" #include "GlobalSettingsPanel.h" #include "GlobalServices.h" #include "PersistentSettings.h" diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp index cbfd45f991..5f4df92ca6 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Notifications/ProgramNotifications.h" diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp index 61d8843dde..1271aa9b06 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp @@ -16,7 +16,6 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "Integrations/DiscordSettingsOption.h" #include "Integrations/DiscordWebhook.h" -#include "Integrations/DppIntegration/DppClient.h" #include "ProgramNotifications.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp b/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp index 79bef4d739..a78d74be47 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp @@ -4,7 +4,6 @@ * */ -#include "SenderNotificationTable.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp index 0ec28eb330..3cb7ec26c2 100644 --- a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp @@ -5,8 +5,6 @@ */ #include -#include -#include #include "CommonFramework/Windows/DpiScaler.h" #include "ThemeSelectorOption.h" diff --git a/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.cpp b/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.cpp index 62c78bf735..f6f03159e0 100644 --- a/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NestedBoxDrawOption.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp b/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp index bb1aa799db..562189d795 100644 --- a/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp @@ -5,7 +5,6 @@ */ #include -#include #include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" #include "LabelCellWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp index 253807ae5a..7f4c5f148a 100644 --- a/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include "CommonFramework/GlobalAutoPaths.h" diff --git a/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp index b2bb683fb7..cc15e58962 100644 --- a/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Windows/DpiScaler.h" #include "ResolutionOption.h" diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp index 0738c56844..00b469c57a 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Json/JsonValue.h" -#include "OptionsPanel.h" #include "OptionsPanelSession.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp index 016d3cedc9..f6e98935d5 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp @@ -4,7 +4,6 @@ * */ -#include "PanelDescriptor.h" #include "PanelSession.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp index 0427b5d8ba..9853f1c21d 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp @@ -7,11 +7,9 @@ #include #include #include -#include #include #include "Common/Cpp/ColoredText.h" #include "Common/Qt/Options/ConfigWidget.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/Panels/PanelSession.h" #include "CommonFramework/ProgramSession.h" #include "GameConsole/ConsoleProgram.h" diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp index a2fb33fbd9..e64b232141 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp @@ -4,12 +4,7 @@ * */ -#include -#include -#include #include "Common/Qt/CollapsibleGroupBox.h" -#include "CommonFramework/Panels/PanelDescriptor.h" -#include "CommonFramework/Panels/PanelSession.h" #include "PanelElements.h" #include "PanelWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp b/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp index 49062381db..db6beef5b7 100644 --- a/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp +++ b/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp @@ -8,7 +8,6 @@ #include "Common/Cpp/Json/JsonValue.h" //#include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" -#include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Logging/Logger.h" diff --git a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp index f4176b9199..f7ba20faf9 100644 --- a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp +++ b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp @@ -12,18 +12,15 @@ #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Options/Environment/SleepSuppressOption.h" #include "CommonFramework/ProgramSession.h" #include "CommonFramework/ProgramStats/StatsDatabase.h" -#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/Panels/ProgramDescriptor.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h" #include "CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h" -#include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h" #include "Integrations/ProgramTracker.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp index 48f35792a5..17674e69d1 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp @@ -10,8 +10,6 @@ #include "Common/Cpp/Containers/Pimpl.tpp" // Pimpl (AudioFormat) instantiations #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/AudioPipeline/AudioInfo.h" -#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" #include "CommonFramework/Recording/StreamHistoryOption.h" #if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8) diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp index e693ed6480..7931b21f8d 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp @@ -8,19 +8,15 @@ #if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8) #include #include -#include #include #include #include #include -#include -#include #include "Common/Cpp/Filesystem/Filesystem.h" //#include "Common/Qt/Redispatch.h" #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Concurrency/SpinPause.h" #include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" #include "CommonFramework/Recording/StreamHistoryOption.h" #include "StreamRecorder.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp index bdf6e944f5..695d36acd1 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp @@ -6,8 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h" -#include "CommonFramework/ResourceDownload/ResourceDownload.h" #include "GlobalResourceDownloadManager.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp index 8fb6224444..a75c784ee1 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp @@ -4,9 +4,6 @@ * */ -#include -#include -#include "CommonFramework/ProgramSession.h" #include "ProgramResourceDownloadWidget.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp index 8b1f097b90..2d5572f0b6 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp @@ -6,7 +6,6 @@ #include -#include "CommonFramework/GlobalSettingsPanel.h" #include "GlobalResourceDownloadManager.h" #include "ResourceDownload.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp index da332ff555..cc566273df 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp @@ -4,7 +4,6 @@ * */ -#include "SettingsResourceDownloadRow.h" #include "SettingsResourceDownloadOptions.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp index 771a40c464..2f1e65aabc 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "ResourceDownload.h" #include "SettingsResourceDownloadRow.h" #include "SettingsResourceDownloadTable.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp index c8338b0ad5..15da01ba61 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp @@ -5,8 +5,6 @@ */ #include -#include -#include #include #include #include "SettingsResourceDownloadWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp index 0b97087853..25f72e6154 100644 --- a/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp +++ b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp @@ -14,7 +14,6 @@ #include "CommonFramework/Tools/FileDownloader.h" #include "CommonFramework/Globals.h" #include "CommonFramework/GlobalSettingsPanel.h" -#include "NewVersionCheck.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp index 615379189d..3bfab5b0ca 100644 --- a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp +++ b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp @@ -6,17 +6,14 @@ #include #include -#include #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #if QT_CONFIG(permissions) -#include #endif #endif #include "Common/Compiler.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Logging/AbstractLogger.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "SetupSettings.h" using std::cout; using std::endl; diff --git a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp index 9a225c78f0..6743d0cee7 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp @@ -9,7 +9,6 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "DebugDumper.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp index 08eb18ce12..a44f2438cc 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp @@ -9,10 +9,7 @@ #include "Common/Cpp/Concurrency/Mutex.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" //#include "CommonFramework/Notifications/EventNotificationOption.h" -#include "CommonFramework/Notifications/ProgramInfo.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ErrorReports/ErrorReports.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" //#include "CommonFramework/VideoPipeline/VideoOverlay.h" diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp index 9a71651d9b..5f7818a250 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp @@ -5,15 +5,8 @@ */ #include -#include -#include -#include -#include -#include #include -#include #include -#include #include "Common/Cpp/Filesystem/FileIO.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Json/JsonValue.h" diff --git a/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp index 82b9aefe2b..e34e9c20a7 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Concurrency/Backends/ThreadPool_Default.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Options/Environment/PerformanceOptions.h" -#include "GlobalThreadPools.h" namespace PokemonAutomation{ namespace GlobalThreadPools{ diff --git a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp index 07e95a1a16..783219f4db 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp @@ -5,9 +5,7 @@ */ #include "CommonFramework/ProgramSession.h" -#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "ProgramEnvironment.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp index 05f6ad6544..9943fdec93 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp @@ -4,13 +4,11 @@ * */ -#include //#include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Globals.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/VideoPipeline/VideoPipelineOptions.h" -#include "CameraImplementations.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp index 71a0977507..3d6a8e7935 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp @@ -4,9 +4,7 @@ * */ -#include #include -#include #include "Common/Qt/Redispatch.h" #include "CommonFramework/Logging/Logger.h" #include "VideoFrameQt.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp index 13b6dff18d..d01359c103 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include #include "Common/Qt/Redispatch.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp index 086a02421c..e66be301ab 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp @@ -4,10 +4,6 @@ * */ -#include -#include -#include -#include #include #include #include "Common/Qt/Redispatch.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp index d663439275..35169a8b9f 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp @@ -4,7 +4,6 @@ * */ -#include #include "VideoFrameQt.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp index 5c4e5c8a03..914d8a0e8b 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp @@ -11,7 +11,6 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "Common/Qt/Redispatch.h" -#include "VideoDisplayWidget.h" #include "VideoDisplayWindow.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp index 028bc3e4f2..190abbca39 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp @@ -4,12 +4,9 @@ * */ -#include -#include #include #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Windows/WindowTracker.h" -#include "VideoDisplayWidget.h" #include "VideoDisplayWindow.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp index 8a2ba7cfd7..1991c3b38a 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp @@ -5,7 +5,6 @@ */ #include -#include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" #include "CommonFramework/GlobalServices.h" #include "VideoOverlayWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp index 2b9932a2be..efee5a4eb8 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp @@ -6,13 +6,11 @@ #include #include -#include #include #include "Common/Qt/NoWheelComboBox.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/VideoPipeline/VideoPipelineOptions.h" #include "CommonFramework/Panels/ConsoleSettingsStretch.h" -#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h" #include "CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.h" #include "CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp index 645d252435..5277cc16d0 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp @@ -4,7 +4,6 @@ * */ #include "Common/Cpp/Containers/Pimpl.tpp" -#include "VideoOverlay.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp index 777e7b96cb..2c85ec4e52 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp @@ -12,7 +12,6 @@ #include "VideoSources/VideoSource_StillImage.h" #include "VideoSources/VideoSource_Camera.h" -#include "VideoSourceDescriptor.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp index 3cf22bde94..41fa6798e9 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" diff --git a/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp b/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp index 8c922ff074..f1b85c31e9 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp @@ -4,8 +4,6 @@ * */ -#include -#include #include #include "CommonFramework/GlobalAutoPaths.h" #include "WindowTracker.h" diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp index 56f64de14a..e94a9fe38b 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp @@ -4,8 +4,6 @@ * */ -#include -#include #include "DpiScaler.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp index c592430897..df6e62bb99 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp @@ -8,11 +8,9 @@ #include //#include #include -#include #include #include #include -#include #include #include #include "Common/Cpp/ScopeExit.h" @@ -24,7 +22,6 @@ #include "Common/Cpp/ColoredText.h" #include "Common/Qt/CollapsibleGroupBox.h" #include "Common/Qt/UiStateQtWidget.h" -#include "PanelLists.h" #include "CommonFramework/Globals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/GlobalSettingsPanel.h" diff --git a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp index bacbd465d6..9952814144 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp @@ -7,7 +7,6 @@ #include #include #include "Common/Cpp/Concurrency/Mutex.h" -#include "WindowTracker.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp index 16864dae68..18d06855a3 100644 --- a/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp +++ b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/CancellableScope.h" #include "Common/Cpp/Concurrency/AsyncTask.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "InferenceSession.h" #include "InferenceRoutines.h" diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp b/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp index 4373312088..fe5c66115a 100644 --- a/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp +++ b/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp @@ -6,8 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Tools/VideoStream.h" -#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" -#include "CommonTools/InferenceCallbacks/AudioInferenceCallback.h" #include "CommonTools/InferencePivots/VisualInferencePivot.h" #include "CommonTools/InferencePivots/AudioInferencePivot.h" #include "InferenceSession.h" diff --git a/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp index db1ef063a6..297f111674 100644 --- a/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp +++ b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/AudioPipeline/AudioFeed.h" #include "SpectrogramMatcher.h" #include "AudioPerSpectrumDetectorBase.h" diff --git a/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp index 1ee4c7ac09..9b3aec2d0f 100644 --- a/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp @@ -8,8 +8,6 @@ #include "Common/Cpp/Containers/AlignedVector.tpp" #include "Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h" #include "Kernels/SpikeConvolution/Kernels_SpikeConvolution.h" -#include "CommonFramework/AudioPipeline/AudioFeed.h" -#include "CommonFramework/AudioPipeline/AudioTemplate.h" #include "SpectrogramMatcher.h" //#include diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp index 63802485c9..8e4db82d73 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp @@ -8,7 +8,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/DebugDumper.h" //#include "ImageDiff.h" #include "ImageCropper.h" diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp index 711a1dcff0..015617d9c2 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp @@ -7,9 +7,7 @@ #include #include #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageDiff.h" #include "ExactImageDictionaryMatcher.h" //#include diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp index 682bd1ffd9..853c62d936 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/CpuId/CpuId.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "FilterToAlpha.h" #ifdef PA_ARCH_x86 #include diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.cpp index a84a8ba519..defc7f6a1e 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.cpp @@ -4,7 +4,6 @@ * */ -#include "ImageMatchOption.h" namespace PokemonAutomation{ namespace ImageMatch{ diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp index 0c2b424177..0a6c775f5b 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp @@ -6,8 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Concurrency/SpinLock.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "ImageCropper.h" #include "SilhouetteDictionaryMatcher.h" diff --git a/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp index a0d3cb2239..c54582d6f3 100644 --- a/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp +++ b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/FixedLimitVector.tpp" -#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" diff --git a/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp b/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp index 56d712501a..40f4c42ea1 100644 --- a/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp +++ b/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp @@ -5,7 +5,6 @@ */ #include -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "ColorClustering.h" //#include diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp index 3b9303468c..38c766ee0e 100644 --- a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp +++ b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp @@ -8,10 +8,7 @@ #include "Kernels/ImageFilters/Kernels_ImageFilter_Misc.h" #include "Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h" #include "Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h" -#include "Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h" -#include "CommonFramework/ImageTypes/ImageViewHSV32.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "ImageFilter.h" diff --git a/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp b/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp index be6233e449..8cdf25e233 100644 --- a/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp +++ b/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp @@ -4,10 +4,7 @@ * */ #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/FloatPixel.h" #include "CommonTools/Images/SolidColorTest.h" -#include "ImageTools.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp index faf0a8e65f..60bedfca81 100644 --- a/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp +++ b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp @@ -7,7 +7,6 @@ #include #include #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "SolidColorTest.h" using std::cout; diff --git a/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp index 577b21a89b..84b8dc5059 100644 --- a/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp +++ b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp @@ -7,11 +7,8 @@ #include #include "Common/Cpp/Color.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp index 5e3a430b90..384e1ba015 100644 --- a/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp +++ b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Tools/GlobalThreadPools.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "VisualInferencePivot.h" //#include diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp index 3da7906c33..3626d167fd 100644 --- a/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp +++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp @@ -5,10 +5,8 @@ */ #include -#include #include #include -#include #include "Common/Qt/NoWheelComboBox.h" #include "CommonFramework/Globals.h" #include "LanguageOCRWidget.h" diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp index 7896c5498d..97af10f8ae 100644 --- a/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp +++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp @@ -9,10 +9,7 @@ #include #include #include -#include #include -#include -#include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "ScreenWatchWidget.h" diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp index 78bcec9d02..f64b47e7a7 100644 --- a/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp +++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp index 5824c2f265..962ee6477e 100644 --- a/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp +++ b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp @@ -4,10 +4,7 @@ * */ -#include -#include #include -#include #include #include "Common/Cpp/Containers/Pimpl.tpp" #include "CommonFramework/Logging/Logger.h" diff --git a/SerialPrograms/Source/CommonTools/Random.cpp b/SerialPrograms/Source/CommonTools/Random.cpp index b96e43ce3c..48f6867f5f 100644 --- a/SerialPrograms/Source/CommonTools/Random.cpp +++ b/SerialPrograms/Source/CommonTools/Random.cpp @@ -7,7 +7,6 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/CRC32/pabb_CRC32.h" -#include "Random.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp index 9a615e8b4c..322ebc0dee 100644 --- a/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp +++ b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonObject.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "SpriteDatabase.h" diff --git a/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp index cb01c5ee7e..bd2eab6e1b 100644 --- a/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp +++ b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp @@ -5,9 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "VideoResolutionCheck.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp index ba1c67e9ff..889dd471e8 100644 --- a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp +++ b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "BlackBorderDetector.h" diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp index d3d07d81b7..b581a59e18 100644 --- a/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp +++ b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "FrozenImageDetector.h" diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp index f9c9544e59..76883c5990 100644 --- a/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp +++ b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp @@ -5,11 +5,9 @@ */ #include -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "ImageMatchDetector.h" //#include diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp index 68eccd5d0f..7848bf8e8c 100644 --- a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp +++ b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp @@ -5,7 +5,6 @@ */ #include "ComputerPrograms/Framework/ComputerProgramSession.h" -#include "ComputerProgram.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp index 33e98d3a3c..5e09b6382d 100644 --- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp +++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp @@ -5,11 +5,6 @@ */ #include "Common/Cpp/Json/JsonValue.h" -#include "CommonFramework/Exceptions/FatalProgramException.h" -#include "CommonFramework/Exceptions/ProgramFinishedException.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramInfo.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "ComputerProgramSession.h" //#include diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp index 0387b85c13..51b805f72e 100644 --- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp +++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp @@ -7,7 +7,6 @@ #include #include "Common/Cpp/ScopeExit.h" #include "CommonFramework/Panels/PanelTools.h" -#include "CommonFramework/Panels/UI/PanelElements.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h" #include "ComputerProgramWidget.h" diff --git a/SerialPrograms/Source/ControllerInput/ControllerInput.cpp b/SerialPrograms/Source/ControllerInput/ControllerInput.cpp index 3e6b059654..f91dcd3983 100644 --- a/SerialPrograms/Source/ControllerInput/ControllerInput.cpp +++ b/SerialPrograms/Source/ControllerInput/ControllerInput.cpp @@ -6,7 +6,6 @@ #include #include "Keyboard/GlobalKeyboardHidTracker.h" -#include "ControllerInput.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp index 734b7d64a3..bb83e72075 100644 --- a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp +++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Logging/GlobalLogger.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Tools/GlobalThreadPools.h" -#include "KeyboardInput_State.h" #include "KeyboardInput_KeyMappings.h" #include "GlobalKeyboardHidTracker.h" diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp index f2218a3d72..0b2fe0e002 100644 --- a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp +++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp @@ -4,7 +4,6 @@ * */ -#include #include "Common/Cpp/Concurrency/SpinLock.h" #include "GlobalQtKeyMap.h" diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp index a7e3c957b7..2af91009e9 100644 --- a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp +++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp @@ -4,9 +4,7 @@ * */ -#include #include "CommonFramework/Logging/Logger.h" -#include "ControllerInput/Keyboard/GlobalQtKeyMap.h" #include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h" #include "KeyBindingWidget.h" diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.cpp index 8518f2c73d..750649d0eb 100644 --- a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.cpp +++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.cpp @@ -4,7 +4,6 @@ * */ -#include "KeyboardInput_State.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Controllers/ControllerOption.cpp b/SerialPrograms/Source/Controllers/ControllerOption.cpp index cfe095ab9a..b37bc5a5bb 100644 --- a/SerialPrograms/Source/Controllers/ControllerOption.cpp +++ b/SerialPrograms/Source/Controllers/ControllerOption.cpp @@ -8,7 +8,6 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonObject.h" #include "ControllerTypeStrings.h" -#include "ControllerDescriptor.h" #include "ControllerOption.h" #include "NullController.h" diff --git a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp index edb904f191..d6bdc47349 100644 --- a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp +++ b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp @@ -5,7 +5,6 @@ */ #include -#include #include #include #include "Common/Qt/NoWheelComboBox.h" diff --git a/SerialPrograms/Source/Controllers/ControllerStateTable.cpp b/SerialPrograms/Source/Controllers/ControllerStateTable.cpp index dcb4c0713a..0eec204553 100644 --- a/SerialPrograms/Source/Controllers/ControllerStateTable.cpp +++ b/SerialPrograms/Source/Controllers/ControllerStateTable.cpp @@ -15,7 +15,6 @@ #include "NintendoSwitch/Options/TurboMacroTable.h" #include "ControllerTypeStrings.h" -#include "ControllerStateTable.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/Controllers/NullControllerWidget.cpp b/SerialPrograms/Source/Controllers/NullControllerWidget.cpp index 84e005d034..3de9ab4b5c 100644 --- a/SerialPrograms/Source/Controllers/NullControllerWidget.cpp +++ b/SerialPrograms/Source/Controllers/NullControllerWidget.cpp @@ -4,7 +4,6 @@ * */ -#include "NullControllerWidget.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp index 144d781703..ace0b54794 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp @@ -6,7 +6,6 @@ //#include "Common/Cpp/CancellableScope.h" #include "NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h" -#include "PABotBase2_Connection.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp index 78e8ce3d5d..c082f2eda1 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "PABotBase2_MessageHandler.h" namespace PokemonAutomation{ namespace PABotBase2{ diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp index 4e9e7630bd..a61f3e60be 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp @@ -5,7 +5,6 @@ */ #ifdef QT_CORE_LIB -#include #include #include "Controllers/SerialPort/SerialPortPollerQt.h" #endif diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp index 1df5607b2b..e9dff8d221 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Filesystem/Filesystem.h" -#include "SerialPABotBase2_Descriptor.h" #include "SerialPABotBase2_SelectorWidget.h" //#include diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp index 364ee27502..18fee8262d 100644 --- a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp +++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Containers/Pimpl.tpp" -#include "ControllerInput/ControllerInput.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" #ifdef QT_CORE_LIB #include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h" diff --git a/SerialPrograms/Source/GameConsole/ConsoleHandle.cpp b/SerialPrograms/Source/GameConsole/ConsoleHandle.cpp index 54633abbfd..0b02773118 100644 --- a/SerialPrograms/Source/GameConsole/ConsoleHandle.cpp +++ b/SerialPrograms/Source/GameConsole/ConsoleHandle.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/Pimpl.tpp" #include "CommonFramework/Tools/GlobalThreadPools.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h" #include "Controllers/NullController.h" #include "Framework/ConsoleSystemSession.h" diff --git a/SerialPrograms/Source/GameConsole/ConsolePanel.cpp b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp index 8736d5af45..4dfeeb899e 100644 --- a/SerialPrograms/Source/GameConsole/ConsolePanel.cpp +++ b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Framework/ConsolePanelSession.h" -#include "ConsolePanel.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp b/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp index 814305cf83..b6e8ec9ce5 100644 --- a/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp +++ b/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp @@ -4,11 +4,8 @@ * */ -#include "CommonFramework/Panels/PanelSession.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" -#include "Framework/ConsoleSystemSession.h" #include "Framework/ConsoleProgramSession.h" -#include "ConsoleProgram.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp index 604dfd8649..39562f4f02 100644 --- a/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp +++ b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp @@ -5,7 +5,6 @@ */ #include "Framework/MultiConsolePanelSession.h" -#include "MultiConsolePanel.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp index 332ade785c..4900803e14 100644 --- a/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp +++ b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp @@ -5,13 +5,10 @@ */ #include "Common/Cpp/ScopeExit.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h" -#include "CommonFramework/Panels/PanelSession.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "Framework/MultiConsoleProgramSession.h" -#include "MultiConsoleProgram.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp index 0115a0abf9..a6dec6a35c 100644 --- a/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp +++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp @@ -4,11 +4,9 @@ * */ -#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp index 2a9a1ed5ab..dffc7690b0 100644 --- a/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp +++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp @@ -6,7 +6,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "GameConsole/Framework/ConsoleSystemSession.h" #include "GameConsole_WaterfillTemplateMaker.h" diff --git a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp index ec02dd74e1..bc35832793 100644 --- a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp +++ b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp @@ -4,8 +4,6 @@ * */ -#include -#include #include "CommandRowWidget.h" #include "ConsoleSystemWidget.h" diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp index 78f391080c..719b06d60f 100644 --- a/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp +++ b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp @@ -4,7 +4,6 @@ * */ -#include #include #include #include "Common/Qt/Redispatch.h" diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp index ec1fe03cd2..f3c2d592f0 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Strings/Unicode.h" #include "Common/Qt/StringToolsQt.h" -#include "Integrations/DppIntegration/DppClient.h" #include "DiscordIntegrationSettings.h" //#include diff --git a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp index 9787872593..8f781792ec 100644 --- a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp +++ b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp @@ -5,7 +5,6 @@ */ #include "Common/Qt/Options/BatchWidget.h" -#include "CommonFramework/GlobalSettingsPanel.h" #include "DiscordSettingsOption.h" //#include diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp index 30e58621a6..d830bc23fc 100644 --- a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp +++ b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp @@ -5,11 +5,9 @@ */ #include -#include #include #include #include -#include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Json/JsonArray.h" diff --git a/SerialPrograms/Source/Integrations/ProgramTracker.cpp b/SerialPrograms/Source/Integrations/ProgramTracker.cpp index ca3c242416..f2e547f0d3 100644 --- a/SerialPrograms/Source/Integrations/ProgramTracker.cpp +++ b/SerialPrograms/Source/Integrations/ProgramTracker.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "Controllers/ControllerSession.h" #include "ProgramTracker.h" diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp index e03d55a2f9..447224602f 100644 --- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp +++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp @@ -7,7 +7,6 @@ #include #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels_AbsFFT.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp index 917e2fe5d8..c602305117 100644 --- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp +++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp @@ -4,7 +4,6 @@ * */ -#include "Kernels_AbsFFT_Arch_Default.h" #include "Kernels_AbsFFT_TwiddleTable.tpp" #include "Kernels_AbsFFT_FullTransform.tpp" diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp index 0102f8776d..a851779ead 100644 --- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp @@ -7,7 +7,6 @@ #ifdef PA_AutoDispatch_arm64_20_M1 #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels_AbsFFT_Arch_arm64_NEON.h" #include "Kernels_AbsFFT_BaseTransform_arm64_NEON.h" #include "Kernels_AbsFFT_TwiddleTable.tpp" #include "Kernels_AbsFFT_FullTransform.tpp" diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp index 2a546c3eff..4be58a7054 100644 --- a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp +++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/CpuId/CpuId.h" -#include "Kernels_AudioChannelInterleave.h" #include "Kernels_AudioChannelInterleave_Default.h" diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp index 0a64a5f847..69ecbf1d6c 100644 --- a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp +++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp @@ -16,7 +16,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/AudioResampler/Kernels_AudioResampler.h" #include "CommonFramework/AudioPipeline/ChannelMixer.h" -#include "Kernels_AudioPipeline.h" #include "Kernels_RawAudio2WorkingAudio.h" #include "Kernels_WorkingAudio2RawAudio.h" #include "Kernels_AudioPipeline_RoundTrip_TestInfra.h" diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp index 62ddf2f92a..2ff6853dd1 100644 --- a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp +++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp @@ -13,7 +13,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Containers/AlignedVector.tpp" #include "Kernels/Kernels_Alignment.h" -#include "Kernels_AudioResampler_BlockKernels.h" #include "Kernels_AudioResampler.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp index 7332a6f059..38181daa1e 100644 --- a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp @@ -9,7 +9,6 @@ #include #include "Common/Compiler.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels_AudioResampler_BlockKernels.h" #include "Kernels_AudioResampler_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp index f9d2c642c4..4815ef2a71 100644 --- a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp +++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp @@ -17,7 +17,6 @@ #include "Common/Cpp/Containers/GuardPageBuffer.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/KaiserWindow/Kernels_KaiserWindow.h" -#include "Kernels_AudioResampler_BlockKernels.h" #include "Kernels_AudioResampler_Tests.h" #include "Kernels_AudioResampler.h" diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp index 788f3c36ea..c0bacdff98 100644 --- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp +++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp @@ -21,7 +21,6 @@ #include "Kernels_BinaryMatrixTile_64x8_arm64_NEON.h" #endif #include "Tests/GuardPageImage.h" -#include "Kernels_BinaryMatrix_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp index c64000c503..f82e32218f 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Kernels_ImageFilter_Misc.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp index bf52143442..8039327150 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp @@ -14,7 +14,6 @@ #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Tests/GuardPageImage.h" #include "RGB32_Range/Kernels_ImageFilter_RGB32_Range.h" -#include "Kernels_ImageFilter_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp index 6fe7d5c0ea..daeaf1bcbc 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/CpuId/CpuId.h" -#include "Kernels_ImageFilter_RGB32_Euclidean.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp index 5a3c5c4b9b..6b129fa11d 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp @@ -8,9 +8,7 @@ #include #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h" -#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h" #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h" -#include "Kernels_ImageFilter_RGB32_Euclidean.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp index cbfb1504d1..2fc0ba065e 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp @@ -6,7 +6,6 @@ #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h" #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h" -#include "Kernels_ImageFilter_RGB32_Euclidean.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp index da9cc8166f..4f26e7be5e 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp @@ -24,9 +24,7 @@ #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/Containers/AlignedVector.tpp" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h" #include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" -#include "Kernels_ImageFilter_RGB32_Euclidean_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp index c9962dbdc8..336e41bb8b 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp @@ -5,10 +5,8 @@ */ #ifdef PA_AutoDispatch_arm64_20_M1 -#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h" #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h" #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h" -#include "Kernels_ImageFilter_RGB32_Range_Routines.h" #include "Kernels_ImageFilter_RGB32_Range.h" diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp index f2f2afd678..c177704a51 100644 --- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp +++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/CpuId/CpuId.h" -#include "Kernels_ImageScaleBrightness.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp index 398247f723..067fc556a2 100644 --- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp +++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp @@ -12,7 +12,6 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Tests/GuardPageImage.h" -#include "Kernels_ImageScaleBrightness_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp index cd76ac1fd8..5344f351e7 100644 --- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp +++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp @@ -8,7 +8,6 @@ #include "Common/Compiler.h" #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels_ImagePixelSumSqrDev.h" #include "Kernels_ImagePixelSumSqrDev_TestInfra.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp index bae7806331..d43319cddb 100644 --- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp +++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels_ImagePixelSumSqr.h" #include "Kernels_ImagePixelSumSqr_TestInfra.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp index 22c69238ed..94a9468428 100644 --- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp @@ -11,7 +11,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/Kernels_arm64_NEON.h" #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h" -#include "Kernels_ImagePixelSumSqr.h" #include "Kernels_ImagePixelSumSqr_TestInfra.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/Kernels_Tests.cpp b/SerialPrograms/Source/Kernels/Kernels_Tests.cpp index 5ffc505c80..0b8ee7e957 100644 --- a/SerialPrograms/Source/Kernels/Kernels_Tests.cpp +++ b/SerialPrograms/Source/Kernels/Kernels_Tests.cpp @@ -18,7 +18,6 @@ #include "ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h" #include "SpikeConvolution/Kernels_SpikeConvolution.h" #include "Waterfill/Kernels_Waterfill_Tests.h" -#include "Kernels_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp index e44910295d..cc5384966f 100644 --- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp +++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels_SpikeConvolution.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp index bd2654116d..aa49122057 100644 --- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp +++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp @@ -8,14 +8,11 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h" #include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Tests/GuardPageImage.h" #include "Tests/TestUtils.h" -#include "Kernels_Waterfill_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp index d05a3edbd2..8ad09998b4 100644 --- a/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp +++ b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp @@ -21,7 +21,6 @@ #include "Common/Cpp/Strings/StringTools.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/PrettyPrint.h" -#include "ML_AnnotationIO.h" #include "ML_SegmentAnythingModelConstants.h" #include "ML_ObjectAnnotation.h" diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp index 98e36dd0e1..e76076f998 100644 --- a/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp +++ b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp index 1cd6c7b67a..3b6fa5d94f 100644 --- a/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp +++ b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp @@ -8,17 +8,11 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Async/InferenceRoutines.h" -#include "ML/Inference/ML_YOLOv5Detector.h" #include "ML/Models/ML_YOLOv5Model.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h" #include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h" -#include "ML_YOLONavigation.h" using namespace std::chrono_literals; diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp index 9afe072c44..2cc79e0453 100644 --- a/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp +++ b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp @@ -6,18 +6,13 @@ #include #include -#include -#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Options/Environment/PerformanceOptions.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "ML_YOLOv5Detector.h" //#include diff --git a/SerialPrograms/Source/ML/ML_Panels.cpp b/SerialPrograms/Source/ML/ML_Panels.cpp index 41945ac10e..c77cceb557 100644 --- a/SerialPrograms/Source/ML/ML_Panels.cpp +++ b/SerialPrograms/Source/ML/ML_Panels.cpp @@ -5,8 +5,6 @@ */ #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/Panels/PanelTools.h" -#include "GameConsole/ConsolePanel.h" #include "Programs/ML_LabelImages.h" #include "Programs/ML_RunYOLO.h" #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h" diff --git a/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp index d0dac9d2a8..c5031e7bb7 100644 --- a/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp +++ b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp @@ -8,14 +8,12 @@ #include #include #include -#include #include "3rdParty/ONNX/OnnxToolsPA.h" #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Tools/FileHash.h" #include "ML_OrtEnv.h" -#include "ML_ONNXRuntimeHelpers.h" namespace PokemonAutomation{ namespace ML{ diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp index cfb0b365e3..0f2cf7631f 100644 --- a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp +++ b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp @@ -22,7 +22,6 @@ #include "CommonFramework/Options/Environment/PerformanceOptions.h" #include "CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.h" #include "ML/DataLabeling/ML_AnnotationIO.h" -#include "ML/DataLabeling/ML_SegmentAnythingModel.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" #include "GameConsole/Framework/ConsoleSystemSession.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/ML/Programs/ML_RunYOLO.cpp b/SerialPrograms/Source/ML/Programs/ML_RunYOLO.cpp index a43e80a884..734ea44557 100644 --- a/SerialPrograms/Source/ML/Programs/ML_RunYOLO.cpp +++ b/SerialPrograms/Source/ML/Programs/ML_RunYOLO.cpp @@ -7,11 +7,7 @@ //#include //#include -#include -#include -#include //#include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/Async/InferenceRoutines.h" //#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp index 4614183e44..ecb39bbd5a 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp @@ -5,7 +5,6 @@ */ #include "NintendoSwitch/NintendoSwitch_Settings.h" -#include "NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch_Commands_Superscalar.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp index f69914f1b7..59c32937e9 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp @@ -6,9 +6,7 @@ #include "Common/Cpp/Strings/StringTools.h" #include "Common/Cpp/Containers/Pimpl.tpp" -#include "ControllerInput/ControllerInput.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" -#include "Controllers/ControllerTypes.h" #include "Controllers/RumbleListener.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp index 659f0b848c..cbb6543162 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/Logging/Logger.h" //#include "CommonFramework/PersistentSettings.h" #ifdef QT_CORE_LIB -#include "CommonFramework/Panels/PanelTools.h" #include "NintendoSwitch/NintendoSwitch_SettingsPanel.h" #endif #include "NintendoSwitch_ControllerSettings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp index f9a8389e5c..9cb1447f9a 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Strings/StringTools.h" #include "Common/Cpp/Containers/Pimpl.tpp" -#include "ControllerInput/ControllerInput.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" #include "Controllers/RumbleListener.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp index 960be46ec0..d536ec641e 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp @@ -4,7 +4,6 @@ * */ -#include #include "Common/Cpp/Time.h" #include "Common/Cpp/ColoredText.h" #include "CommonFramework/Logging/Logger.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp index f22f10fa1f..1013c4a601 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Json/JsonValue.h" #include "SysbotBase_Descriptor.h" -#include "SysbotBase_Connection.h" #include "SysbotBase3_ProController.h" //#include diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp index 6dcc2d4543..c0019abd2c 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp @@ -8,14 +8,10 @@ #include #include #include -#include #include #include "3rdParty/ONNX/OnnxToolsPA.h" #include "Common/Cpp/Time.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp index 3c0ff98793..6cdbe2c1bf 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp @@ -15,11 +15,6 @@ #include #include #include -#include -#include -#include -#include -#include #include "3rdParty-Core/nlohmann/json.hpp" #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/CpuId/CpuId.h" @@ -40,55 +35,12 @@ #include "Common/Cpp/TestRunners/ParallelUnitTestRunner.h" #include "Common/Qt/TimeQt.h" #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h" -#include "Kernels/Waterfill/Kernels_Waterfill.h" -#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" -#include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h" #include "Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.h" #include "Kernels/AudioPipeline/Kernels_AudioPipeline.h" -#include "CommonFramework/Exceptions/ProgramFinishedException.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Tools/FileDownloader.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageHSV32.h" -#include "CommonFramework/Environment/Environment.h" -#include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/Environment/Environment.h" #include "CommonFramework/Tools/GlobalThreadPools.h" -#include "CommonFramework/Tools/FileUnzip.h" -#include "CommonTools/OCR/OCR_Routines.h" -#include "CommonTools/OCR/OCR_NumberReader.h" -#include "CommonTools/Images/ImageFilter.h" -#include "Integrations/DiscordWebhook.h" -#include "Integrations/PybindSwitchController.h" -#include "Pokemon/Inference/Pokemon_NameReader.h" -#include "Pokemon/Inference/Pokemon_IvJudgeReader.h" -#include "Pokemon/Resources/Pokemon_PokemonSlugs.h" -#include "Pokemon/Resources/Pokemon_PokemonNames.h" -#include "Pokemon/Pokemon_StatsCalculation.h" -#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h" -#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" -#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" //#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h" -#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" -#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" -#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h" #ifdef PA_ARCH_x86 //#include "Kernels/Kernels_x64_SSE41.h" @@ -106,15 +58,7 @@ //#include "Kernels/ImageScaling/Kernels_ImageScaling_Default.h" //#include "Kernels/ImageScaling/Kernels_ImageScaling_x64_SSE41.h" #endif -#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h" //#include "Common/SerialPABotBase/LightweightWallClock_StdChrono.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" -#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" -#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h" -#include "VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.h" //#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_Default.h" //#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.h" //#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.h" diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp index 8f088da04a..bbd7c4d8e9 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp @@ -7,10 +7,6 @@ #include //#include -#include -#include -#include -#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Common/Cpp/Concurrency/BusyPeriodicRunner.h" @@ -19,93 +15,20 @@ #include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h" #include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h" #include "Common/Cpp/StreamConnections/MockDevice.h" -#include "Kernels/Waterfill/Kernels_Waterfill.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/Exceptions/ProgramFinishedException.h" -#include "CommonFramework/ErrorReports/ErrorReports.h" -#include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/OCR/OCR_NumberReader.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/BinaryImage_FilterRgb32.h" -#include "CommonTools/Async/InterruptableCommands.h" -#include "CommonTools/OCR/OCR_Routines.h" -#include "CommonTools/Images/ImageTools.h" -#include "Controllers/RumbleListener.h" -#include "NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h" -#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h" -#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h" -#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h" -#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h" -#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" -#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" -#include "PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h" -#include "VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h" -#include "VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h" -#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h" -#include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h" //#include "CommonFramework/Environment/SystemSleep.h" -#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h" -#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" //#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" -#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h" -#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h" -#include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h" -#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h" -#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" -#include "VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h" -#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" -#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" -#include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h" -#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" -#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h" //#include "Integrations/PybindSwitchController.h" -#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h" -#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h" #include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h" -#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" -#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" -#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" -#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" -#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h" -#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h" -#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" //#include "Kernels/Kernels_x64_AVX512.h" //#include "Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX512.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h" -#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h" //#include #include "TestProgramSwitch.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp index b475b82d5b..798e932da5 100644 --- a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp @@ -7,8 +7,6 @@ #include "Common/Compiler.h" #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "GameConsole/Framework/ConsoleSystemSession.h" diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp index 303cc301fd..29ae7ffb28 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp @@ -5,11 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/Tools/GlobalThreadPools.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h" -#include "GameConsole/Framework/ConsoleSystemSession.h" -#include "NintendoSwitch_ConsoleHandle.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp index 9835daf347..b0b2aca150 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp @@ -6,7 +6,6 @@ #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "Framework/NintendoSwitch_MultiSwitchProgramSession.h" -#include "NintendoSwitch_MultiSwitchProgram.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp index 9399dcb4ea..e9a59b5db8 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp @@ -5,14 +5,12 @@ */ //#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "Commands/NintendoSwitch_Commands_PushButtons.h" #include "Framework/NintendoSwitch_SingleSwitchProgramSession.h" -#include "NintendoSwitch_SingleSwitchProgram.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp index 21f05575e4..9421d8fba4 100644 --- a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp @@ -4,12 +4,6 @@ * */ #include -#include -#include -#include -#include -#include -#include #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonObject.h" #include "NintendoSwitch/Options/TurboMacroTable.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp index 80c323acc4..1eeaa9aa32 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp @@ -9,7 +9,6 @@ #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" //#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h" -#include "NintendoSwitch_DateSkippers.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp index e597e2d958..835e5da65f 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp @@ -5,12 +5,8 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp index 51d74af237..1f304c2195 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/VideoStream.h" -#include "NintendoSwitch_DateManipTools.h" #include "NintendoSwitch_DateManip_24h.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp index 02569fd907..9a78866ce4 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp @@ -14,7 +14,6 @@ #include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/OCR/OCR_StringNormalization.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "NintendoSwitch_DateManipTools.h" #include "NintendoSwitch_DateManip_US.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp index e943786942..a87182ec4b 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp @@ -8,7 +8,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h" -#include "NintendoSwitch_DateSkippers.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp index 2f8dda3da1..6f9c40c58e 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/RecursiveThrottler.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" //#include "CommonFramework/VideoPipeline/VideoFeed.h" //#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp index decda674a3..1a2e27ea37 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp @@ -11,7 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp index ee43ae0384..7bb698a91d 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" //#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" //#include "CommonTools/Async/InferenceRoutines.h" -#include "Controllers/ControllerTypes.h" //#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" //#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp index ff1014ecdc..51132478d1 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp @@ -5,9 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" -#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp index d0d4f00c94..8c276108aa 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch_RollDateBackwardN.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp index 38de6ba320..73033c973c 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch_RollDateForward1.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp index dc584c48ca..8193d1186b 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp @@ -11,7 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "NintendoSwitch_CodeEntryTools.h" -#include "NintendoSwitch_KeyboardEntryMappings.h" #include "NintendoSwitch_KeyboardCodeEntry.h" //#include diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp index 5120debad5..9fbb558d00 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp index a9f189502d..5f9add8f40 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp @@ -11,7 +11,6 @@ #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/Exceptions/OperationFailedException.h" -#include "NintendoSwitch_Typewriter_Tests.h" #include "NintendoSwitch_TypewriterTextMapping.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PanelLists.cpp b/SerialPrograms/Source/PanelLists.cpp index 562f48fb22..c30038751a 100644 --- a/SerialPrograms/Source/PanelLists.cpp +++ b/SerialPrograms/Source/PanelLists.cpp @@ -6,7 +6,6 @@ #include #include -#include #include "Common/Qt/NoWheelComboBox.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/PersistentSettings.h" diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp index 4f54c79206..41db21fea9 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonTools/OCR/OCR_Routines.h" #include "Pokemon_AbilityReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp index d537f6b9ff..a3901c57ae 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonTools/OCR/OCR_Routines.h" #include "Pokemon_BerryNameReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp index 207cbf3f85..5481ccd642 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp @@ -9,10 +9,7 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "Pokemon_BoxGenderDetector.h" diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp index d34c90b0d3..60bffab8d5 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonTools/OCR/OCR_Routines.h" #include "Pokemon_NatureReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp index 012e9d2033..42c962f2ec 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp @@ -5,7 +5,6 @@ */ #include -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/OCR/OCR_TrainingTools.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon_IvJudgeReader.h" diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp index 9e2854b761..4619a44931 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp @@ -7,7 +7,6 @@ #include #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/OCR/OCR_TrainingTools.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp index 30d49c095d..a43f72ffc2 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp @@ -7,7 +7,6 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp index 47aa0294ab..89785fb5b0 100644 --- a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp +++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp @@ -4,7 +4,6 @@ * */ -#include "Pokemon/Pokemon_IvJudge.h" #include "Pokemon_IvJudgeOption.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp index 31e8c7ccb8..58f587b377 100644 --- a/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp +++ b/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp @@ -6,8 +6,6 @@ #include #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Resources/Pokemon_PokeballNames.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" diff --git a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp index b4ff3d19ad..1ee5be31fb 100644 --- a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp +++ b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Logging/AbstractLogger.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "Pokemon_ShinySparkleSet.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp index 3e1229b7e3..2f6726c1ba 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/ImageFilter.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp index d45fba2463..278e55b846 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp @@ -3,11 +3,6 @@ * From: https://github.com/PokemonAutomation/ * */ -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" -#include "PokemonBDSP_EndBattleDetector.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp index 325b1e8da9..bd2210d8cc 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp @@ -5,8 +5,6 @@ */ #include "Common/Cpp/Containers/FixedLimitVector.tpp" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_ExperienceGainDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp index 834e6c2299..4b78b46161 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp @@ -4,9 +4,7 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "PokemonBDSP_StartBattleDetector.h" //#include diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp index be76c12127..8e93393773 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp index bafa0195b4..1bdffe31c2 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp @@ -7,12 +7,9 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" -#include "Pokemon/Options/Pokemon_StatsHuntFilter.h" #include "PokemonBDSP_BoxGenderDetector.h" //#include diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp index 27c51e82c1..654cc45826 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonBDSP_BoxNatureDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp index 1cf3dbde2b..774b12f2a4 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_BoxShinyDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp index c3a05264d4..06ed6c7ceb 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" #include "PokemonBDSP_IvJudgeReader.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp index c8636d99cb..61bda2b78d 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_DialogDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp index 4f7f726487..076f6745fb 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp @@ -6,7 +6,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonBDSP_MarkFinder.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp index 12da43966e..3b800be36f 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_MenuDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp index 6390a96cd7..45dfa80873 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h" #include "PokemonBDSP_PokeballSpriteMatcher.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp index 7857b0622c..4383d5cc25 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp @@ -6,8 +6,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonBDSP_SelectionArrow.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp index 39880dbe44..f07a959fc5 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp @@ -6,9 +6,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageDiff.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonBDSP_VSSeekerReaction.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp index 28878066b4..0f94d8f6ff 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp @@ -7,7 +7,6 @@ #include #include #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonBDSP_EyeBlinkDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp index 48f0ac42f7..c7837f7f6f 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp @@ -6,11 +6,7 @@ #include #include "Common/Cpp/Logging/AbstractLogger.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/OCR/OCR_NumberReader.h" -#include "CommonTools/OCR/OCR_Routines.h" -#include "Pokemon/Inference/Pokemon_NatureReader.h" #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h" #include "PokemonBDSP_SummaryReader.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp index 531e206128..fafde2af68 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Globals.h" #include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp index a46b0bd623..7dbfa34049 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp @@ -4,7 +4,6 @@ * */ -#include "PokemonBDSP_EncounterFilterEnums.h" #include "PokemonBDSP_EncounterFilterOption.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp index 72002bc967..48785b6927 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp @@ -10,7 +10,6 @@ #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Resources/Pokemon_PokeballNames.h" #include "PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h" -#include "PokemonBDSP_EncounterFilterEnums.h" #include "PokemonBDSP_EncounterFilterOverride.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp index d91cbf41ea..7cee7adc55 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp @@ -4,12 +4,8 @@ * */ -#include -#include #include "Common/Cpp/Exceptions.h" #include "Common/Qt/NoWheelComboBox.h" -#include "PokemonBDSP_EncounterFilterEnums.h" -#include "PokemonBDSP_EncounterFilterWidget.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp index b8ff5e26a5..bc23e5bce0 100644 --- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp +++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "PokemonBDSP_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp index f8c83844b5..b925bca51d 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp @@ -11,12 +11,10 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Inference/Pokemon_IvJudgeReader.h" #include "PokemonBDSP/PokemonBDSP_Settings.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" -#include "PokemonBDSP_EggAutonomousState.h" #include "PokemonBDSP_EggAutonomous.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp index b71cd64c7b..eeeda9aae8 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp @@ -6,9 +6,6 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp index f9ef665430..8927f38895 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp @@ -5,17 +5,14 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "CommonTools/VisualDetectors/ImageMatchDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonBDSP/PokemonBDSP_Settings.h" #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h" -#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h" #include "PokemonBDSP_EggRoutines.h" -#include "PokemonBDSP_EggFeedback.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp index e1c05d2a8e..cb659779e1 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp @@ -8,7 +8,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "PokemonBDSP/PokemonBDSP_Settings.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h" -#include "PokemonBDSP_EggRoutines.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp index 954e2baa07..3cd63df597 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp @@ -5,15 +5,11 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" -#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h" -#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_DoublesLeveling.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp index c77383ba55..83b62cd76b 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp @@ -5,9 +5,7 @@ */ #include -#include "CommonFramework/Language.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ProgramStats/StatsTracking.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp index 59adb7cbe2..34c57d0879 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp @@ -7,7 +7,6 @@ #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp index a1453c7218..5fc29a68f1 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp index c25660bb23..47197f6de8 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp @@ -5,7 +5,6 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "PokemonBDSP_BoxRelease.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp index 76c77756cc..ddbe923c7b 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp @@ -7,7 +7,6 @@ //#include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramInfo.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp index 685c274c4f..78731555c2 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp @@ -11,7 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "PokemonBDSP/PokemonBDSP_Settings.h" -#include "PokemonBDSP_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp index 35d8083ce7..0c201a30f1 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp @@ -10,7 +10,6 @@ #include "PokemonBDSP/PokemonBDSP_Settings.h" #include "PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h" #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h" -#include "PokemonBDSP_GameNavigation.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp index b94c77b358..9fcbb06884 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp @@ -8,7 +8,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" -#include "PokemonBDSP_GlobalRoomHeal.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp index 34c703903d..ee62fa8b34 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp @@ -7,7 +7,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "PokemonBDSP_RunFromBattle.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp index 52d98a572c..1238174349 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp @@ -10,11 +10,8 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/Globals.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h" -#include "PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h" #include "PokemonBDSP_BedroomSeedFinder.h" #include "PokemonBDSP_BlinkRecovery.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp index 2a5169dfa7..12370df775 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp @@ -14,10 +14,8 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceSession.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "PokemonBDSP_BlinkModel.h" #include "PokemonBDSP_BlinkRecovery.h" #include "PokemonBDSP_StateReidentifier.h" -#include "PokemonBDSP_StateSolver.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp index 343aa55903..ae25418267 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp @@ -10,16 +10,12 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/Globals.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceSession.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h" -#include "PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h" #include "PokemonBDSP_IntroSeedFinder.h" -#include "PokemonBDSP_StateSolver.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp index 71dd8a5ac5..13c7f65f2e 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Logging/AbstractLogger.h" -#include "Pokemon/Pokemon_Gf2Matrix.h" #include "PokemonBDSP_StateSolver.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp index a7067492fc..724cfe153a 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp @@ -4,14 +4,11 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h" -#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" -#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp index 76897a64e3..7b17f87af7 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp @@ -4,15 +4,11 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h" #include "PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h" -#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" -#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_ShinyHunt-Fishing.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp index 5ab04eb410..f4fdfba4e4 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp @@ -5,11 +5,8 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp index 094ef9379b..6cf2ce7823 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp @@ -4,15 +4,12 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h" -#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" -#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_ShinyHunt-Shaymin.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp index 8cef1b6d60..13e263c8a1 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp @@ -6,7 +6,6 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/ImageMatchDetector.h" @@ -17,7 +16,6 @@ #include "Pokemon/Pokemon_Notification.h" #include "PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" -#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_StarterReset.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp index 1d614e2704..5aca3da259 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp @@ -12,8 +12,6 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/AlignedVector.tpp" -#include "CommonFramework/AudioPipeline/AudioFeed.h" -#include "CommonFramework/AudioPipeline/AudioTemplate.h" #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" #include "CommonTools/Async/InferenceSession.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp index 7d488e8f9c..d5d89a880c 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "Pokemon/Pokemon_NatureChecker.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h" #include "PokemonBDSP_SummaryReaderTester.h" diff --git a/SerialPrograms/Source/StaticRegistrationQt.cpp b/SerialPrograms/Source/StaticRegistrationQt.cpp index 7416075c0c..af2d65d566 100644 --- a/SerialPrograms/Source/StaticRegistrationQt.cpp +++ b/SerialPrograms/Source/StaticRegistrationQt.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonTools/Options/QtWidgets/ScreenWatchWidget.h" #include "Common/Qt/Options/BatchWidget.h" // Basic Options @@ -51,7 +50,6 @@ // Controllers //#include "Controllers/NullControllerWidget.h" -#include "Controllers/ControllerSelectorWidget.h" #include "Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h" #include "GameConsole/UI/ConsoleSystemWidget.h" @@ -68,7 +66,6 @@ //#include "NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h" // Pokemon LA -#include "StaticRegistration.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Tests/CommandLineTests.cpp b/SerialPrograms/Source/Tests/CommandLineTests.cpp index a723fef213..dcf2f182a6 100644 --- a/SerialPrograms/Source/Tests/CommandLineTests.cpp +++ b/SerialPrograms/Source/Tests/CommandLineTests.cpp @@ -9,7 +9,6 @@ #include "CommonFramework/Logging/Logger.h" #include "ComputerPrograms/ComputerPrograms_UnitTestRunner.h" -#include "CommandLineTests.h" using std::cout; using std::endl; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp index 8f57212bcc..9b6b84a069 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp @@ -5,11 +5,6 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ImageFilter.h" //#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp index 8903a2d386..fe523cbaa2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp @@ -5,7 +5,6 @@ */ #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PartyDialogs.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp index 7dcc3779f0..04ea94bda6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp @@ -5,13 +5,7 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PrizeSelectDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp index 575e7f806b..e2576fd4b5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_MapDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp index 71807a44ce..aa7ead5fe2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp @@ -6,12 +6,7 @@ #include #include -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PokemonLeagueDetectors.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp index 6aa53884e1..3e61ec8725 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp @@ -5,14 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonFRLG_BagDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp index a5145818de..f0b54f9bb2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_LoadMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp index 5d2dd9bf15..42c571c66b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PartyEmptySlotDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp index 8a5c6aebf1..96f57a01f6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp index 58276954ab..f68a8a1efa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp @@ -5,16 +5,8 @@ */ #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/WaterfillUtilities.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PartyMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp index 3931a6336c..76b1febc3a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp @@ -5,8 +5,6 @@ */ #include "Common/Cpp/Color.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp index d1794892ad..977b5a5243 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_SummaryDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp index bae2f30fa3..2330f6dbd2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_TrainerCardDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp index 777bccaa73..dd76537d06 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp @@ -4,18 +4,11 @@ * */ -#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/OCR/OCR_NumberReader.h" -#include "Pokemon/Pokemon_StatsCalculation.h" -#include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h" #include "PokemonFRLG_DigitReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp index a07f83998a..5c3f604a9b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_BattlePokemonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp index a28c23362a..a1c35fc9dd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp index c378a56cd7..92df952ca1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp @@ -5,11 +5,6 @@ */ #include "Common/Cpp/Color.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_DaycareManDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp index 5ee34a7e48..d74c5c2df2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp @@ -17,8 +17,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp index fd5b0f63bc..3b060b81bb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp @@ -7,7 +7,6 @@ #include #include #include "Common/Cpp/Color.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" #include "PokemonFRLG_OcrPreprocessing.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp index 42df14685b..32ee82db4a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp @@ -4,18 +4,11 @@ * */ -#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/OCR/OCR_NumberReader.h" -#include "Pokemon/Pokemon_StatsCalculation.h" -#include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h" #include "PokemonFRLG_DigitReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp index b3693f5c4e..cf3153f332 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp index 6e2c516038..54792ee024 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp @@ -4,9 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp index d53047b0b4..089b4fdccf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp @@ -6,11 +6,7 @@ #include "Common/Cpp/Color.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_ShinySymbolDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp index 93252ec101..668601a8b2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp @@ -4,17 +4,14 @@ * */ -#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/OCR/OCR_NumberReader.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "Pokemon/Inference/Pokemon_NatureReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp index a811debf03..fb81d2a2e5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp @@ -4,17 +4,11 @@ * */ -#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Filesystem/Filesystem.h" -#include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/OCR/OCR_NumberReader.h" -#include "CommonTools/OCR/OCR_Routines.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_TrainerIdReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp index 91d183120c..9e7c139e42 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp @@ -4,22 +4,17 @@ * */ -#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "CommonFramework/GlobalSettingsPanel.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/OCR/OCR_NumberReader.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_WildEncounterReader.h" #include "PokemonFRLG_OcrPreprocessing.h" -#include "PokemonFRLG_DigitReader.h" namespace PokemonAutomation { namespace NintendoSwitch { namespace PokemonFRLG { diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp index 7eee32c505..65a925c75a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp @@ -6,7 +6,6 @@ #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_CatchFanfareDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp index edf02b50cb..35acc2b9e4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp @@ -6,7 +6,6 @@ #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_ShinySoundDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp index e0f04d4332..1184742abb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp @@ -19,7 +19,6 @@ #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp index d51e585590..99478407a7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp @@ -25,7 +25,6 @@ #include "Inference/PokemonFRLG_WildEncounterReader.h" #include "PokemonFRLG_Navigation.h" -#include "PokemonFRLG_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ namespace PokemonFRLG{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp index 9d678de5c2..7dc8a5e6ff 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp @@ -31,7 +31,6 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp index a51b90cc04..456e3f78d6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp @@ -7,20 +7,15 @@ #include #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" -#include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" -#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h" -#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_EvTrainer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp index c3d9716701..dfaaeee2c1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp @@ -6,13 +6,10 @@ #include "Common/Cpp/Options/ButtonOption.h" #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Language.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" @@ -24,8 +21,6 @@ #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" -#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h" -#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h" #include "PokemonFRLG_HeldItemFarmer-SafariZone.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp index 4d5638c2c1..b9b90f7a06 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp @@ -5,16 +5,13 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h" -#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_PickupFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp index bb7ac34c24..02b29f5877 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp @@ -11,7 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" -#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h" #include "PokemonFRLG_BattleMenuNavigation.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp index cf7315312d..8dd117b503 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp @@ -11,8 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" -#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_RngCalibration.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp index 483b5fd0d9..2135a9140f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp @@ -8,21 +8,16 @@ #include #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Language.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" -#include "PokemonFRLG_RngCalibration.h" -#include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_EncountersDatabase.h" #include "PokemonFRLG_EggRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp index a728d41d69..a9332119b2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp @@ -6,20 +6,13 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Language.h" -#include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "NintendoSwitch/NintendoSwitch_Settings.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" -#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_GiftRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp index 2f16c80592..0645cbf34b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -14,7 +13,6 @@ #include "NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h" #include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_HardReset.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp index 614a799ed9..dbb5f8fc0e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp @@ -9,8 +9,6 @@ #include #include #include -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_RngCalibration.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp index 16065cbda0..9810d6e183 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp @@ -4,13 +4,11 @@ * */ -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_HardReset.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp index e1e30bf6d4..d929d57828 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp @@ -11,7 +11,6 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Random.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_RngLoopRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp index cd76174ab6..843efb29c9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp @@ -9,8 +9,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" -#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" @@ -22,8 +20,6 @@ #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" -#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp index fe284e8a2c..2be94ee92e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp @@ -6,17 +6,13 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Language.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" -#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_RoamingLegendaryRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp index 0c3ac9bd67..7c57ce8623 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp @@ -13,12 +13,10 @@ #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Pokemon_AdvRng.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" -#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_SidHelper.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp index 2bf0fe76fe..47b7c7f119 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp @@ -6,24 +6,19 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "NintendoSwitch/NintendoSwitch_Settings.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" -#include "PokemonFRLG_SeedsDatabase.h" #include "PokemonFRLG_StarterRng.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp index 1a05279fb1..6312a2db3e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp @@ -5,18 +5,13 @@ */ #include "Common/Cpp/Strings/StringTools.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Language.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" -#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_StaticRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp index 9aeb97fb45..bf0d183258 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp @@ -6,20 +6,15 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/Language.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h" -#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" -#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_LocationsDatabase.h" #include "PokemonFRLG_RngStatsDatabase.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp index cc6e5a70bc..60e8dbacf9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp index 70e6a7bd89..b2573aeecf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp @@ -4,8 +4,6 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp index 88015c253a..0642fd3501 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp index 9e5928f186..acec25b1f9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp @@ -5,14 +5,12 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp index 33d35413d4..47b0a4c760 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp @@ -15,10 +15,8 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_ShinyHunt-Fishing.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp index fa6fc5ae3a..82bbc3ea90 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp index d382e106fd..6bb4a2265f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp @@ -8,11 +8,8 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Inference/Pokemon_NameReader.h" -#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h" #include "PokemonFRLG_ReadBattleLevelUp.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp index 9d783094a7..dfcf44ce16 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp index 79da08d574..7966c0d736 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp index c8180d5763..25a6b69d32 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp @@ -8,10 +8,7 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h" #include "PokemonFRLG_ReadTrainerId.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp index caad863fa0..18df501e5b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp index 82bb323a72..7e634551ea 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/CancellableScope.h" #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp index 6c38eaec40..68e68dcdd7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp @@ -6,8 +6,6 @@ #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "Tests/TestUtils.h" #include "PokemonHome_AlphaDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp index 974ed223cc..7885f806d8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Recording/StreamHistorySession.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp index c1be13d4f5..93796ef019 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp @@ -8,10 +8,7 @@ #include "Common/Cpp/Color.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "PokemonHome_BoxGenderDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp index 790be7214c..88711b34f2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp @@ -7,12 +7,7 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" -#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h" #include "PokemonHome_BoxViewDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp index f1624dbc7c..7d20c3688d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp @@ -4,9 +4,7 @@ * */ -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp index 14c2a40e6c..8c1d52b200 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp index edaef13bae..803dcd3188 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp @@ -6,11 +6,8 @@ #include #include -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/WaterfillUtilities.h" -#include "CommonTools/DetectedBoxes.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonHome_OriginMarkReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp index 69ec9a70e2..9cfbf8a74b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp index 4d940a4fea..de9198087b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp @@ -6,8 +6,6 @@ #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "Tests/TestUtils.h" #include "PokemonHome_ShinyDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp index b9879c46d6..888c0dcfa5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp @@ -13,12 +13,9 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Strings/Unicode.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" -#include "CommonTools/OCR/OCR_DictionaryMatcher.h" -#include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/OCR/OCR_StringNormalization.h" #include "Pokemon/Inference/Pokemon_AbilityReader.h" #include "Pokemon/Inference/Pokemon_NatureReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp index 997f35ddd8..6a4266b477 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp @@ -6,9 +6,7 @@ #include #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" -#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h" #include "PokemonHome_SummaryScreenDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp index 40193e5bc9..c4a853a229 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp @@ -6,11 +6,9 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" -#include "Pokemon/Pokemon_Types.h" #include "PokemonHome_GigantamaxDetector.h" #include "PokemonHome_TeraTypeReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp index 97b5a1a31a..f9b2b9d08e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Globals.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp index 0ac5e1bd97..83819c1ee8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp @@ -9,7 +9,6 @@ #include "Inference/PokemonHome_BallReader.h" #include "Inference/PokemonHome_BoxGenderDetector.h" #include "Inference/PokemonHome_BoxViewDetector.h" -#include "Inference/PokemonHome_ButtonDetector.h" #include "Inference/PokemonHome_GigantamaxDetector.h" #include "Inference/PokemonHome_OriginMarkReader.h" #include "Inference/PokemonHome_SelectionArrowDetector.h" @@ -17,7 +16,6 @@ #include "Inference/PokemonHome_SummaryReader.h" #include "Inference/PokemonHome_SummaryScreenDetector.h" #include "Inference/PokemonHome_TeraTypeReader.h" -#include "PokemonHome_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp index a9970703fe..7aebc4e597 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp @@ -9,13 +9,9 @@ #include #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Resources/Pokemon_PokemonSlugs.h" #include "Pokemon/Inference/Pokemon_TypeReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp index 3d66109da0..f0f9d26af5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp @@ -31,15 +31,11 @@ language #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Pokemon_BoxCursor.h" -#include "Pokemon/Pokemon_CollectedPokemonInfo.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h" #include "PokemonHome_BoxNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp index b5ca46d962..f1d6580c2a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp @@ -18,16 +18,12 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/OCR/OCR_StringNormalization.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Pokemon_BoxCursor.h" -#include "Pokemon/Pokemon_CollectedPokemonInfo.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h" #include "PokemonHome_BoxNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp index c59301f5c5..a25a320cc7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp index 5247ee0f46..d28a998775 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/CancellableScope.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "Pokemon/Pokemon_CollectedPokemonInfo.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h" #include "VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp index c9c10139f8..4b4b9eb477 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp @@ -14,13 +14,8 @@ #include #include #include "Common/Cpp/Filesystem/Filesystem.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "Pokemon/Options/Pokemon_StatsHuntFilter.h" -#include "Pokemon/Pokemon_OriginMarks.h" #include "Pokemon/Resources/Pokemon_PokemonSlugs.h" #include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Pokemon_Types.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp index 04595a4f4e..a13a30122c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonLA_BattleMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp index 510de4b4df..204c4f2ffc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Logging/AbstractLogger.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonLA_BattleMoveSelectionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp index 0619d3cedf..3fa8ac965a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp index 40ec64e9e1..7cd187c02f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp index 4e9aaad181..bbcbe8962a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp @@ -6,9 +6,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageGradient.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp index 9403396b89..6ddbf11f18 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonLA_MMOSpriteStarSymbolDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp index eda120811f..7e42e32221 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp @@ -10,9 +10,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp index b260431487..46c206d066 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp @@ -7,11 +7,8 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/SolidColorTest.h" //#include "Tests/TestUtils.h" -#include "PokemonLA_MapMissionTabReader.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp index 5b5c97f5b6..78581a54e8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp @@ -9,14 +9,11 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h" -#include "PokemonLA_MapWeatherAndTimeReader.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp index d67db2d2ae..82834d0811 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp @@ -12,7 +12,6 @@ #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/ImageFilter.h" //#include "Tests/TestUtils.h" -#include "PokemonLA_MapZoomLevelReader.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp index 4e0ebca76f..c78736a477 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" //#include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp index 28064a0dca..d42aec002a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp @@ -24,14 +24,9 @@ #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Resources/SpriteDatabase.h" -#include "CommonTools/Images/ImageFilter.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp index 732316214e..888ec7105b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp index 4f3c9eae88..426265b31c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" #include "CommonTools/DetectedBoxes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp index 4696125159..fccdbb95f1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp index bd315bcc79..30321b5534 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp @@ -9,7 +9,6 @@ #include #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "Tests/TestUtils.h" #include "PokemonLA_FlagTracker.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp index 6983fa46a5..2fba7b4465 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp @@ -16,7 +16,6 @@ #include "Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonLA/PokemonLA_Locations.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp index f6b974f9ff..c04b62cc86 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/ImageTools/ImageStats.h" -#include "PokemonLA_CommonColorCheck.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp index 5062902e0f..b03355dc12 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonLA_CommonColorCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp index 8bd5fc479f..d787fd794c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp @@ -13,7 +13,6 @@ #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" -#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h" #include "PokemonLA_MountDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp index 94867de036..67a79f8af9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp @@ -5,7 +5,6 @@ */ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" -#include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonLA_NotificationReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp index 28a31540bc..e6bda9b325 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp @@ -7,13 +7,10 @@ #include #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" -#include "PokemonLA_CommonColorCheck.h" #include "PokemonLA_StatusInfoScreenDetector.h" using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp index adbcb471ef..7757d52091 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonLA_UnderAttackDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp index f3fce43192..5b6a033a03 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp @@ -6,12 +6,8 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/ImageGradient.h" -#include "CommonTools/OCR/OCR_Routines.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp index b079b55c96..42e5c35ea1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp @@ -7,8 +7,6 @@ #include #include "Common/Cpp/ColoredText.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonLA/PokemonLA_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp index 84c8adaf41..3472c1211f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp @@ -5,9 +5,7 @@ */ #include -#include #include -#include #include #include #include diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp index 429a55fe62..b0a6a95533 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp @@ -10,7 +10,6 @@ #include "Inference/PokemonLA_StatusInfoScreenDetector.h" #include "Inference/PokemonLA_WildPokemonFocusDetector.h" #include "Inference/PokemonLA_BerryTreeDetector.h" -#include "Inference/Objects/PokemonLA_DialogYellowArrowDetector.h" #include "Inference/Objects/PokemonLA_FlagTracker.h" #include "Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h" #include "Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h" @@ -23,10 +22,8 @@ #include "Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h" #include "Inference/Battles/PokemonLA_BattleSpriteWatcher.h" -#include "Inference/Battles/PokemonLA_BattleStartDetector.h" #include "Inference/Sounds/PokemonLA_ShinySoundDetector.h" #include "Programs/PokemonLA_GameSave.h" -#include "PokemonLA_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp index 88693d5a8a..3be2db795a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h" #include "PokemonLA_TravelLocations.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp index 07b93ac6b3..4f1f20a6b0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp @@ -7,7 +7,6 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -16,7 +15,6 @@ #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h" #include "PokemonLA_IngoBattleGrinder.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp index 7d6a423f66..253126d587 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp index 82e030ae77..e6984d7891 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp index 0c569aa62f..b104e96733 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp @@ -16,7 +16,6 @@ #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h" #include "PokemonLA_TenacityCandyFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp index 92d267d149..e2fe21c072 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp index 3c64dca785..c196e59bd4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp @@ -6,7 +6,6 @@ #include #include -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp index 33ef2883ab..8bd2a3c82f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h" #include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h" #include "PokemonLA_GeneratePokemonImageTrainingData.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp index 1c67205602..18fd2ddc2c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp @@ -6,7 +6,6 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InterruptableCommands.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonLA_FlagNavigationAir.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp index 911e41fae6..c10eaba5bf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp @@ -12,7 +12,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonLA/PokemonLA_Settings.h" -#include "PokemonLA_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp index b64f89d5cd..80e894f11c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp @@ -7,18 +7,11 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" #include "Tests/TestUtils.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" -#include "PokemonLA_GameSave.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp index 514445f8e0..f2ccb5d8a6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp @@ -7,12 +7,10 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h" #include "PokemonLA_MountChange.h" -#include "PokemonLA_RegionNavigation.h" #include "PokemonLA_BattleRoutines.h" #include "PokemonLA_LeapPokemonActions.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp index 203c87b158..11b0acaf23 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp @@ -6,12 +6,9 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h" #include "VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp index 6bea56baa7..90beaf8b85 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp @@ -23,8 +23,6 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" -#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h" #include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp index 1aa754b039..55a010e112 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp index e403631f2b..2ee63509b2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp index 7328dd9812..d74a38a1a9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp index f9698c8651..802b3b2238 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp index ba15b04f49..922fdde45f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp index 282828c9f6..a1fda8f9ae 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp index 29b400555f..4964cc6449 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Globals.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp index d6c7208e15..ceec7bfcd5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp @@ -6,7 +6,6 @@ #include "CommonTools/Async/InferenceSession.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h" #include "PokemonLA_MountDetectionTest.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp index 1fbf297c8f..a04d8e32e7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp @@ -14,8 +14,6 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/AlignedVector.h" #include "Common/Cpp/Containers/AlignedVector.tpp" -#include "CommonFramework/AudioPipeline/AudioFeed.h" -#include "CommonFramework/AudioPipeline/AudioTemplate.h" #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" #include "CommonTools/Async/InferenceSession.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp index d4f8c7fa66..d3b613afb9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp @@ -6,7 +6,6 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp index db90307c97..4bc3de7785 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp index d6f904743c..9414e2461f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp index 577a5b48a6..62fbd68735 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp @@ -3,7 +3,6 @@ * From: https://github.com/PokemonAutomation/ * */ -#include "PokemonLA_PokemonInfo.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp index 61a8ad3cac..13eb36a80c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp @@ -5,7 +5,6 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "PokemonLGPE_DateSpam.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp index 0e02396af0..3111232f43 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp index 122d4bb499..2e232107cb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp @@ -5,11 +5,7 @@ */ #include "Common/Cpp/Color.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Images/ImageFilter.h" #include "PokemonLGPE_ShinySymbolDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp index 5b7d6cfb7d..8c27a23b1d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp @@ -6,7 +6,6 @@ #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "VideoGames/PokemonLGPE/PokemonLGPE_Settings.h" #include "PokemonLGPE_ShinySoundDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp index ae7f31aace..c79b86ee3a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp @@ -14,7 +14,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonLGPE/PokemonLGPE_Settings.h" -#include "PokemonLGPE_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp index 1259be9687..e92f758bcb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp @@ -11,7 +11,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" -#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h" //#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp index 9ffcb64b92..f72f0371c0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp @@ -6,7 +6,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" //#include "CommonFramework/Logging/Logger.h" -#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonLZA_MoveEffectivenessSymbol.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp index 1212531843..5baf1f29d5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp @@ -11,18 +11,13 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/FatalProgramException.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/VideoStream.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "Tests/TestUtils.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp index 7da1bf511b..ce0d994e65 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp @@ -4,12 +4,6 @@ * */ -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp index 137be02a06..675745b03d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonLZA_IvJudgeReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp index 98d62bff91..52eaf2110f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp @@ -7,15 +7,10 @@ #include #include "Common/Cpp/Filesystem/FilePath.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Images/WaterfillUtilities.h" //#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/ImageMatch/ImageCropper.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp index b7faf4ddad..152c51240f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp @@ -7,13 +7,8 @@ #include #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/WaterfillUtilities.h" -#include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp index 484fe7eb0a..2548c99051 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp @@ -8,11 +8,9 @@ #include #include "Common/Cpp/Filesystem/FilePath.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Logging/Logger.h" //#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonLZA_FlavorPowerDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp index d1750880ff..687941410e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp @@ -8,10 +8,8 @@ #include #include #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" //#include "Tests/TestUtils.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonLZA_DirectionArrowDetector.h" // #define DEBUG_DIRECTION_ARROW diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp index 4077333317..e2e71142f1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp @@ -6,7 +6,6 @@ #include #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/OCR/OCR_Routines.h" #include "PokemonLZA_LocationNameReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp index 3b8ed3aa04..4715586663 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp index 7e412e4dbf..91d775ee43 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp @@ -5,7 +5,6 @@ */ //#include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp index ba46b3e413..9fbca9093e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp @@ -5,10 +5,8 @@ */ #include -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp index 25892d6034..ec042b74d8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp @@ -5,9 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" -#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonLZA_DayNightChangeDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp index bb4d199c6f..2d84594c4a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp @@ -5,11 +5,7 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp index 3794d204a6..473731f15d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp @@ -5,8 +5,6 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/Language.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/OCR/OCR_NumberReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp index 31cd48050d..bc2057dcd6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp @@ -5,9 +5,6 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" #include "PokemonLZA_MainMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp index 52749b4828..9ac612a0b8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp @@ -8,10 +8,6 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/FatalProgramException.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" #include "PokemonLZA_OverworldPartySelectionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp index 0691d8b609..326d760adf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp index a1de589877..16a42ad786 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp @@ -16,7 +16,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTools/ImageDiff.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp index 4368ecaa62..59a48498b7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp @@ -8,9 +8,7 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp index eea4cf26dc..a5e3b2c957 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/Logging/Logger.h" #include "VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h" #include "PokemonLZA_DonutBerriesOption.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp index 3a6ef7cacb..5901bce22c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Logging/Logger.h" #include "VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h" #include "PokemonLZA_HyperspaceRewardOption.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp index d117feb27b..769c68206d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp @@ -4,7 +4,6 @@ * */ -#include "VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h" #include "PokemonLZA_HyperspaceRewardTable.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp index 2688b47b62..3bf72a782a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp @@ -6,7 +6,6 @@ #include //#include "Common/Cpp/Exceptions.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Notification.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp index ead2ea2d67..4d4bbd8b29 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp @@ -9,7 +9,6 @@ #include "Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h" #include "Inference/PokemonLZA_AlertEyeDetector.h" #include "Inference/Boxes/PokemonLZA_BoxDetection.h" -#include "Inference/PokemonLZA_ButtonDetector.h" #include "Inference/Map/PokemonLZA_DirectionArrowDetector.h" #include "Inference/PokemonLZA_DialogDetector.h" #include "Inference/PokemonLZA_WeatherDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp index 1e353e3ff8..be76bbfc68 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp @@ -5,26 +5,17 @@ */ #include -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" -#include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h" #include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.h" #include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" -#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h" #include "PokemonLZA_DonutMaker.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp index 76a3fdf8a5..052f180af5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp @@ -11,11 +11,9 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp index 17558cde44..b251e151d7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp @@ -4,14 +4,11 @@ * */ -#include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp index fd97313fda..d1bc788076 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp @@ -4,12 +4,9 @@ * */ -#include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonTools/Async/InterruptableCommands.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp index 1a5f7c5da0..d7e5afa0d7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp @@ -20,7 +20,6 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp index 1d1224b4b7..8250196567 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp @@ -14,7 +14,6 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp index ddfbec45ba..976c29d60c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp @@ -8,8 +8,6 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" @@ -17,9 +15,7 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" -#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp index 9ee5898c42..a38748af2f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp @@ -13,9 +13,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" -#include "VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h" #include "PokemonLZA_WeatherFinder.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp index df39f983a2..7c1ccd02e0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp @@ -9,12 +9,9 @@ #include #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Inference/Pokemon_TypeReader.h" @@ -22,8 +19,6 @@ #include "Pokemon/Resources/Pokemon_PokemonNames.h" #include "Pokemon/Pokemon_BoxCursor.h" #include "Pokemon/Pokemon_CollectedPokemonInfo.h" -#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h" -#include "VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h" #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h" #include "VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp index ba8192c809..7098eb76ef 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp @@ -6,7 +6,6 @@ #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -15,7 +14,6 @@ #include "VideoGames/PokemonLZA/PokemonLZA_Settings.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" -#include "PokemonLZA_GameEntry.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp index 801ff678a3..d486d4708f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp @@ -6,8 +6,6 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp index 11d0c91b90..46684f5c7c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp @@ -19,7 +19,6 @@ #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" -#include "PokemonLZA_MenuNavigation.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp index 3439e6ab17..adfd989f90 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp @@ -5,7 +5,6 @@ */ // #include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/Async/InterruptableCommands.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp index 5606625c3e..4510e87eca 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp @@ -7,7 +7,6 @@ #include #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp index 3c93118ed6..1695ff84aa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp @@ -16,7 +16,6 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "PokemonLZA_ShinyHunt_BenchSit.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp index c5d78dcc20..fda15df63a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp @@ -13,17 +13,14 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h" -#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h" #include "PokemonLZA_ShinyHunt_HelioptileHunter.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp index 2648b8c5de..e2daba086b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp @@ -6,16 +6,11 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewHSV32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" @@ -28,7 +23,6 @@ #include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h" -#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp index ee1f5ce5e1..7c24f470df 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp @@ -11,7 +11,6 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp index 479f904e1b..d659cba1fb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp @@ -11,7 +11,6 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp index 1a00d6c9a4..1188f238d0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp index 76151f8cc4..977bdf5343 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" -#include "PokemonLZA_AvailablePokemon.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp index d653bc1d33..b332ca1aae 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp @@ -5,9 +5,7 @@ */ #include -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonPokopia_ButtonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp index e1fb7ff230..ad00d878fb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp @@ -5,9 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" -#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonPokopia_MovesDetection.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp index 7aa74e712e..f6ac615313 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp @@ -6,7 +6,6 @@ #include #include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp index 4ac6ee767f..91f4d3008b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonPokopia_SelectionArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp index 2f4ddc06e4..4a65189440 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp @@ -4,9 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonPokopia_SettingsScreenDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp index 6fccc39675..904f23eafc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp @@ -7,15 +7,12 @@ //#include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h" -#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h" #include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h" #include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp index 6241a142b6..4177e53b01 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp @@ -9,10 +9,8 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp index 3bcd66622b..0888ed604a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp @@ -10,8 +10,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" -#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h" -#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h" #include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp index 58eb9f2770..8dde36916f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp @@ -4,11 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp index f32ac092cf..1e83708e74 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp @@ -5,14 +5,8 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ImageFilter.h" -#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_DialogDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp index 0536ede11a..7370b5d81c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_LoadMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp index 01ea1a7ad7..686bec42ef 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp @@ -5,14 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonRSE_PartyMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp index 5ef7074bad..ee9ee2dbd8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp @@ -7,9 +7,6 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_StartMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp index b13a7a6df2..0166759b9d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/ImageFilter.h" -#include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_SummaryDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp index 60122476d4..1b43fde808 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp @@ -4,10 +4,6 @@ * */ -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp index 192aef5e24..7af7d15d90 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp @@ -5,11 +5,7 @@ */ #include "Common/Cpp/Color.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "PokemonRSE_ShinyNumberDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp index 006016436d..391bde6760 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp @@ -6,7 +6,6 @@ #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_ShinySoundDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp index 1424b783d7..faad896a67 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp @@ -11,7 +11,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" @@ -21,7 +20,6 @@ #include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.h" #include "VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" -#include "PokemonRSE_Navigation.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp index 5f47f387c2..29ff0753d6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h" -#include "PokemonRSE_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp index 5316d7cd3d..b7102e8235 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp index d4a8ae87bc..ed71eb5e2b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp @@ -4,8 +4,6 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp index 7a29886d55..f5877dfa72 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp @@ -10,11 +10,9 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h" #include "PokemonRSE_LegendaryRunAway-Emerald.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp index 09d97ea1e4..670d63cf0c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp @@ -10,11 +10,9 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h" #include "PokemonRSE_ShinyHunt-Deoxys.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp index 983829016f..e998988f55 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp @@ -10,11 +10,9 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h" #include "PokemonRSE_ShinyHunt-Mew.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp index 7c8e00c137..36bfcfc5ee 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp index 63c1162cbb..62bbe63f95 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp @@ -4,8 +4,6 @@ * */ -#include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "PokemonSV_BattleBallReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp index 5fe3326ac6..ee7cad0cdc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp @@ -9,7 +9,6 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Inference/Pokemon_NameReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp index d02028bfd0..b881adf3ac 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp index 94614e1f99..c327323192 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp @@ -6,14 +6,9 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Common/Cpp/Exceptions.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/WaterfillUtilities.h" -#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "PokemonSV_BoxEggDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp index ffb871dc23..db53cd64cc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSV_BoxNatureDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp index 1d500bfeef..5002357523 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSV_IvJudgeReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp index 19bea16f74..e7b0ef02d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp @@ -10,7 +10,6 @@ #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" -#include "PokemonSV_StatsResetChecker.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp index b9c221bc42..83f9f6f357 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp @@ -6,12 +6,8 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTypes/BinaryImage.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Images/WaterfillUtilities.h" -#include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_DialogArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp index 9d67331ecf..5fe6092a78 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp @@ -7,8 +7,6 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonSV_GradientArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp index 3dacb1b548..18bfb0efc4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp @@ -8,8 +8,6 @@ #include "Common/Cpp/Concurrency/SpinLock.h" #include "Common/Cpp/Concurrency/AsyncTask.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp index 9c88b938a6..d122921a5f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp @@ -7,8 +7,6 @@ #include #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp index 313f1bdcee..b7eb69216a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Concurrency/AsyncTask.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp index 599052e4e0..d1fb9fb8cb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp @@ -5,8 +5,6 @@ */ #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_DestinationMarkerDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp index 76c0863fa0..289b6ed5c7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp @@ -7,8 +7,6 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_FastTravelDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp index c7261aaab7..7cd99b2c02 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp @@ -7,9 +7,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" -#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" #include "PokemonSV_MapDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp index dd741e32fb..7fb029c43e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp @@ -5,9 +5,6 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonSV_MapMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp index b87b0e4c65..7da1d811e2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp @@ -7,10 +7,7 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" -#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_MapDetector.h" #include "PokemonSV_MapPokeCenterIconDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp index 2666c355e7..01ac8e6468 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp @@ -6,11 +6,9 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Async/InterruptableCommands.h" #include "CommonTools/Async/InferenceSession.h" -#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV_AreaZeroSkyDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp index e805f3c28f..163c7b88af 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp @@ -7,15 +7,12 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "PokemonSV_DirectionDetector.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp index 57c44f345b..f6106033f4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp @@ -5,9 +5,7 @@ */ #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" -#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp index 52a33dbc79..d0b90a1438 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp @@ -9,7 +9,6 @@ #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" -#include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_OverworldDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp index c5344bef91..08bbda4277 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp @@ -6,7 +6,6 @@ #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" -#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonSV_StationaryOverworldWatcher.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp index bef716d16c..180780ccd6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSV_PicnicDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp index 47c1a8e0aa..f56d40b4fb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSV_PokemonSummaryReader.h" #include "PokemonSV_BagDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp index 378cb5236f..9efcb6037d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp @@ -5,9 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.h" #include "PokemonSV_BlueberryQuestDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp index 1be66a13be..512f1e3499 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Tools/ErrorDumper.h" #include "PokemonSV_ClothingTopDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp index 42f8538153..36a7e0855b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSV_ESPEmotionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp index 2411710731..6e7d441065 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp @@ -6,9 +6,7 @@ #include #include "Common/Cpp/Logging/AbstractLogger.h" -#include "CommonFramework/Language.h" #include "CommonTools/OCR/OCR_Routines.h" -#include "PokemonSV_MoneyReader.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp index 0ef47c255d..ea119bb5de 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp @@ -5,8 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "PokemonSV_PokemonMovesReader.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp index 7f7f791082..cccaafdf0a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSV_PokemonSummaryReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp index 2806843d40..e94b7ace51 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp @@ -6,10 +6,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "PokemonSV_StatHexagonReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp index db46c330f2..27519b7dd3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp @@ -6,8 +6,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonSV_SweatBubbleDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp index 308af5728b..9465f0c08f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp @@ -7,9 +7,6 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTypes/BinaryImage.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" //#include "Tests/TestUtils.h" #include "PokemonSV_WhiteButtonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp index 28d18e5447..eaf6f8f410 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp @@ -5,9 +5,6 @@ */ #include "Common/Cpp/Containers/FixedLimitVector.tpp" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_WhiteTriangleDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp index 2b2839ab23..61e2dc9e04 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp @@ -12,9 +12,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/BinaryImage.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp index cd4696fdf9..a6ae858c1c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp @@ -8,7 +8,6 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/Images/ImageManip.h" @@ -16,7 +15,6 @@ #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/OCR/OCR_Routines.h" -#include "PokemonSV_TeraCodeReader.h" //#define PA_ENABLE_CODE_DEBUG diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp index a2fa8a514b..236586a4d9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp @@ -6,7 +6,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp index 74b23b6785..2227893367 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp @@ -4,7 +4,6 @@ * */ -#include "VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.h" #include "PokemonSV_AuctionItemTable.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp index 98fab4984d..04599d4a80 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp index 90919f1625..fe8d50cbaf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Logging/Logger.h" #include "VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h" #include "PokemonSV_TournamentPrizeSelectOption.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp index 50e1f500a1..2296e02bef 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp @@ -4,7 +4,6 @@ * */ -#include "VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h" #include "PokemonSV_TournamentPrizeTable.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp index 7dc00f5eb0..62706f9f83 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp @@ -6,7 +6,6 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "Pokemon/Pokemon_Strings.h" #include "PokemonSV_Panels.h" #include "PokemonSV_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp index 7788036545..fc04e5e1cb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp @@ -5,29 +5,20 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Inference/PokemonSV_WhiteButtonDetector.h" -#include "Inference/Boxes/PokemonSV_BoxDetection.h" #include "Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "Inference/Map/PokemonSV_MapDetector.h" #include "Inference/Overworld/PokemonSV_OverworldDetector.h" #include "Inference/Picnics/PokemonSV_PicnicDetector.h" -#include "Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "Inference/Tera/PokemonSV_TeraCardDetector.h" -#include "Inference/Tera/PokemonSV_TeraSilhouetteReader.h" -#include "Inference/Tera/PokemonSV_TeraTypeReader.h" -#include "Inference/Dialogs/PokemonSV_DialogDetector.h" #include "Inference/Map/PokemonSV_FastTravelDetector.h" #include "Inference/Map/PokemonSV_MapMenuDetector.h" #include "Inference/Map/PokemonSV_MapPokeCenterIconDetector.h" #include "Inference/PokemonSV_ESPEmotionDetector.h" #include "Inference/Picnics/PokemonSV_SandwichIngredientDetector.h" #include "Inference/Picnics/PokemonSV_SandwichPlateDetector.h" -#include "Inference/Overworld/PokemonSV_LetsGoKillDetector.h" #include "Inference/Picnics/PokemonSV_SandwichRecipeDetector.h" #include "Inference/Picnics/PokemonSV_SandwichHandDetector.h" -#include "Options/PokemonSV_BBQuests.h" #include "Programs/Farming/PokemonSV_BlueberryQuests.h" -#include "PokemonSV_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp index de95149d82..8689512be5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp @@ -16,24 +16,19 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "ML/Inference/ML_YOLOv5Detector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "PokemonSV_AutoStory_Segment_00.h" #include "PokemonSV_AutoStory_Segment_01.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp index c2d61152df..45ae634743 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp @@ -5,10 +5,8 @@ */ #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -16,10 +14,8 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp index 67918894f2..f26a69baaa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp @@ -7,7 +7,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_00.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp index edae2ee161..b577a11b00 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp @@ -5,16 +5,11 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_01.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp index c608ab5ad1..d15d80438b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp @@ -4,14 +4,9 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_02.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp index 99ba043e80..74ffa3b1c5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp @@ -4,15 +4,9 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_03.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp index b1cf8ab557..d5d6ec57a4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp @@ -5,15 +5,9 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_04.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp index 7ca732efce..2f139263c2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp @@ -4,15 +4,9 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_05.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp index 124726a7d0..a0303df6f1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp @@ -4,14 +4,7 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_06.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp index 3003ccd752..d4528f6aa9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp @@ -4,15 +4,9 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_07.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp index cd4d46dda5..bb9250fb13 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp @@ -4,13 +4,7 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_08.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp index bf0b01ed37..c4f1ba9783 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp @@ -4,14 +4,8 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_09.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp index 90c9352178..281bf93e9e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp @@ -4,16 +4,10 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_10.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp index 7d30011e67..e7d8a6e354 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" @@ -13,15 +12,11 @@ #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "PokemonSV_OliveActionFailedException.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_11.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp index cc619957f9..e7e99aee3b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp @@ -4,20 +4,12 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_12.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp index 0315d4d16c..aeb507c773 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp @@ -5,13 +5,8 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_13.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp index 38e974451b..5a512cc344 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp @@ -5,14 +5,8 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_14.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp index ef4ea3dc5d..9bf207ec52 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp @@ -4,17 +4,13 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_15.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp index f71964737a..5c4cbc46bb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp @@ -4,17 +4,10 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_16.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp index bf7cff12cc..99cdda50e7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp @@ -4,17 +4,10 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_17.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp index 997665eaa8..8f0ae61822 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp @@ -9,11 +9,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_18.h" // #include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp index b04e6bbc5b..ba53b4bfcb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp @@ -4,17 +4,10 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_19.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp index 239c37fc5e..932e38f34e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp @@ -4,19 +4,12 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_20.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp index 9e1b6ffed0..4727d187cd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp @@ -3,17 +3,13 @@ * From: https://github.com/PokemonAutomation/ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_21.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp index 755a2e04a1..f7f836b79b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -13,8 +12,6 @@ #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_22.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp index fa612f7429..a4f41d3a4d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp @@ -4,11 +4,7 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_23.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp index 334361d463..c6464f4666 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp @@ -3,16 +3,10 @@ * From: https://github.com/PokemonAutomation/ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_24.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp index 0ede4b9b95..6e2b7f07eb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp @@ -4,19 +4,12 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_25.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp index f918bbc551..3628dbba21 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp @@ -4,18 +4,13 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_26.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp index c2aec6f55d..58d722c11d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp @@ -4,16 +4,10 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_27.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp index af634490df..d06be3b488 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp @@ -3,19 +3,12 @@ * From: https://github.com/PokemonAutomation/ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_28.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp index c1444ce3c9..8c38541c42 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp @@ -4,16 +4,10 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_29.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp index 607656259a..25df03b888 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp @@ -7,13 +7,8 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_30.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp index 91e0c2a3e9..db008fd914 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp @@ -4,19 +4,12 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_31.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp index 6a02c4c85b..ec16eb6d50 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp @@ -4,17 +4,11 @@ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_32.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp index 40d91c2d80..0840e24ed7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp @@ -3,8 +3,6 @@ * From: https://github.com/PokemonAutomation/ * */ -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" @@ -15,11 +13,7 @@ #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_33.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp index aa49de6bb6..e289831bd2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp @@ -7,11 +7,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_34.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp index 16e6bba254..31b1f9a4e5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp @@ -8,13 +8,8 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonFramework/VideoPipeline/VideoFeed.h" //#include "CommonTools/Async/InferenceRoutines.h" -#include "ML/Inference/ML_YOLOv5Detector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_35.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp index 92e3b12476..ea9ed8f6c6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp @@ -8,11 +8,7 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_36.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp index fa23e10b24..f899e76ba4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp @@ -8,11 +8,7 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_37.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp index 638ffc2baf..9f396f0109 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp @@ -8,11 +8,7 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_38.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp index 21518003fc..aa80892c45 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp @@ -8,11 +8,7 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_39.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp index 0682ba3248..53081e99f5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp @@ -11,8 +11,6 @@ #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_40.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp index 04d8e5355b..a4410a4c01 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp @@ -5,11 +5,9 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp index 689ae62fe8..edb2b3189e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp @@ -11,12 +11,8 @@ #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "Pokemon/Pokemon_DataTypes.h" -#include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "PokemonSV_BasicCatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp index 80cdb4b8df..bcb3083875 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp @@ -8,7 +8,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "PokemonSV_SinglesBattler.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp index 542270c234..60c0933857 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp @@ -12,7 +12,6 @@ //#include "PokemonSV_BoxRoutines.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" -#include "PokemonSV_BoxAttach.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp index 9391b71cac..5a42d0797e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp @@ -11,7 +11,6 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "PokemonSV_BoxRoutines.h" -#include "PokemonSV_BoxRelease.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp index 2b56a9337a..83d929e06c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp @@ -7,14 +7,10 @@ //#include //#include //#include -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" -#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp index 2e19ed0c5d..ed45491264 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp @@ -9,10 +9,8 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp index 0a358d36d0..2e77e065e9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp @@ -9,10 +9,8 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp index bb22e16677..b0d61c0fa0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp @@ -11,8 +11,6 @@ #include "CommonFramework/Exceptions/FatalProgramException.h" //#include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" @@ -25,7 +23,6 @@ #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp index 06841a5c38..f86cb34d2f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp @@ -8,7 +8,6 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp index 63bda58186..60996aa451 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp @@ -7,17 +7,11 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" -#include "CommonTools/Options/LanguageOCROption.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "Pokemon/Options/Pokemon_StatsHuntFilter.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h" @@ -30,7 +24,6 @@ #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" -#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" #include "PokemonSV_EggRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp index ab4a2cd3cd..fe53a5e4d8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp @@ -10,10 +10,8 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp index fcfa3182fa..0f70d6932e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp index 3a24e1d187..756960a821 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -13,14 +12,8 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp index 8bec917a63..5431e938dd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp @@ -6,37 +6,25 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" -#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h" #include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" -#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" -#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h" #include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp index 3b98758e8b..23a5322ad5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp @@ -25,7 +25,6 @@ //#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h" -#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h" #include "PokemonSV_ClaimMysteryGift.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp index 93bc21a3b0..8ec02dea9c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp @@ -6,10 +6,8 @@ #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp index 426e85f38e..7c74f52e57 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp @@ -8,24 +8,18 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/StaticGlobals.h" -#include "CommonFramework/Exceptions/ProgramFinishedException.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" -#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h" #include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h" #include "PokemonSV_MaterialFarmerTools.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp index eb4bf5626e..9133ba1487 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp index 06c0f1f8da..4552b353ce 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp @@ -13,7 +13,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp index 70381696f4..e61f203ef5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp @@ -11,7 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "Pokemon/Pokemon_Strings.h" -#include "PokemonSV_CodeEntry.h" #include "PokemonSV_ClipboardFastCodeEntry.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp index adcab091ca..c0fa755991 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp @@ -6,7 +6,6 @@ #include #include "Common/Cpp/Containers/FixedLimitVector.tpp" -#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h" #include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp index c77a0790a3..d2d653d5ed 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp @@ -11,7 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "Pokemon/Pokemon_Strings.h" -#include "PokemonSV_CodeEntry.h" #include "PokemonSV_FastCodeEntry.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp index 9060ec77a3..c2a456d849 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp @@ -15,7 +15,6 @@ #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h" -#include "PokemonSV_CodeEntry.h" #include "PokemonSV_VideoFastCodeEntry.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp index 5adc1f718f..d69c8c7171 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp @@ -8,7 +8,6 @@ #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp index 555972a49c..c4e6ddd0b8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp @@ -12,9 +12,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp index 3ed84c05fa..e51f96e138 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp @@ -5,16 +5,13 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonTools/Options/LanguageOCROption.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp index 284a0fbecb..5b19b85dac 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp @@ -5,10 +5,8 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonTools/Options/LanguageOCROption.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -17,11 +15,8 @@ #include "VideoGames/PokemonSV/PokemonSV_Settings.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" -#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h" -#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp index 81008b4b4b..c2e69dc51b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp @@ -8,7 +8,6 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -17,7 +16,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp index 4dca93fecc..5a1718ea5b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp @@ -6,9 +6,7 @@ #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" @@ -21,7 +19,6 @@ #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp index 4ce5bd27b5..3a05115bfb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp @@ -13,9 +13,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp index d833157fc9..1766f51b56 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp @@ -10,8 +10,6 @@ #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" @@ -21,12 +19,9 @@ #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h" #include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h" -#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "PokemonSV_ItemPrinterSeedCalc.h" #include "PokemonSV_ItemPrinterDatabase.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp index dc8a07acb3..248d1b590f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp @@ -14,7 +14,6 @@ #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_AreaZero.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp index 530753bdd6..844faa08b2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp @@ -5,15 +5,12 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "PokemonSV_ConnectToInternet.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp index 5aa261f986..5333c7bcf4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp @@ -8,15 +8,12 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/SolidColorTest.h" -#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "PokemonSV_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp index 4058c951a5..3e402d0652 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp @@ -3,7 +3,6 @@ */ #include "Common/Cpp/RecursiveThrottler.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" @@ -14,16 +13,11 @@ //#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h" //#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" -#include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" -#include "PokemonSV_ConnectToInternet.h" #include "PokemonSV_MenuNavigation.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp index 82401f11c7..efe757779b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp index aae34299d3..43ed211cb6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp @@ -5,19 +5,14 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" -#include "PokemonSV_Terarium.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp index 9867d96edd..48d2c48e32 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp @@ -10,28 +10,21 @@ #include //#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" //#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" -#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" //#include "VideoGames/PokemonSV/PokemonSV_Settings.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h" #include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" -#include "VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" -#include "PokemonSV_ConnectToInternet.h" #include "PokemonSV_WorldNavigation.h" using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp index 8ab03c2d0f..01d180d279 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp @@ -8,7 +8,6 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp index d21bb3b405..032cf403e0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp @@ -7,7 +7,6 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/Exceptions/ProgramFinishedException.h" //#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" //#include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Tools/ProgramEnvironment.h" @@ -16,7 +15,6 @@ //#include "Pokemon/Pokemon_Notification.h" //#include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h" -#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" //#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h" #include "PokemonSV_LetsGoTools.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp index 9f5916ed83..85246b25d2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp @@ -11,24 +11,19 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" #include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" -#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" -#include "PokemonSV_LetsGoTools.h" #include "PokemonSV_ShinyHunt-AreaZeroPlatform.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp index 95f2e03686..b060d3a11b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp @@ -10,15 +10,11 @@ #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h" -#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp index 643cca0e5c..dc04665377 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp @@ -6,25 +6,19 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" -#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h" -#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" #include "PokemonSV_AutoHostTools.h" #include "PokemonSV_AutoHostLobbyWaiter.h" #include "PokemonSV_AutoHost.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp index adc2f78aff..36b46d6c4e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp @@ -10,11 +10,9 @@ #include "Common/Qt/TimeQt.h" #include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/Exceptions/FatalProgramException.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/FileDownloader.h" #include "CommonFramework/Tools/ProgramEnvironment.h" -#include "VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h" #include "PokemonSV_AutoHostTools.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp index 5631a5c252..69fc40c7c0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Concurrency/Mutex.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp index 81170d4e43..2e5ce81e69 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp @@ -8,9 +8,6 @@ //#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" @@ -18,16 +15,12 @@ #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" //#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" -#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h" -#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h" -#include "PokemonSV_TeraRoutines.h" #include "PokemonSV_TeraBattler.h" -#include "PokemonSV_AutoHostTools.h" #include "PokemonSV_AutoHostLobbyWaiter.h" #include "PokemonSV_TeraMultiFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp index 8c21a0cb74..e836882db4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp @@ -6,9 +6,7 @@ #include #include "CommonFramework/Exceptions/ProgramFinishedException.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp index d0766fde74..20563e6637 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp @@ -17,7 +17,6 @@ #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" -#include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp index b6562eebb2..74c4196e32 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp @@ -10,7 +10,6 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp index 64de6ba8d9..e4ba4deb00 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp @@ -10,8 +10,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" -#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" #include "PokemonSV_TradeRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp index 30a16530c5..75737470b0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp @@ -10,7 +10,6 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" -#include "PokemonSwSh_Commands_AutoHosts.h" //#include "PokemonSwSh_Messages_AutoHosts.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp index 850e3e5bb5..323f2a172d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp @@ -5,7 +5,6 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "PokemonSwSh_Commands_EggRoutines.h" //#include "PokemonSwSh_Messages_EggRoutines.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp index ca452e9ded..0d4fa73861 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp @@ -5,7 +5,6 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "PokemonSwSh_Commands_Misc.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp index 9b66bc07b0..21314c7687 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/ImageFilter.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp index 25bcb3e5cb..883a88b4c4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_BattleDialogDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp index fc794dff15..b57a2f21eb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSwSh_BattleDialogTracker.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp index 23d1f28956..5deef64b4c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp @@ -3,7 +3,6 @@ * From: https://github.com/PokemonAutomation/ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_StartBattleDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp index 4aa83547c1..6513a4f6e2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp @@ -8,7 +8,6 @@ */ #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/Tools/StatAccumulator.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp index 1601fdbc0c..1c4e0ad743 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ColorClustering.h" #include "PokemonSwSh_RaidCatchDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp index 632029452b..7262e0678d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp @@ -8,8 +8,6 @@ */ #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "PokemonSwSh_RaidLobbyReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp index d5af29fbbd..b33c761fe2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp @@ -8,8 +8,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" //#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp index d4001dca90..a81f460ae0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp @@ -6,8 +6,6 @@ #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_BoxEmptySlotDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp index 47b4e6da67..06b1c92154 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp @@ -5,11 +5,7 @@ */ #include "Common/Cpp/Color.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "PokemonSwSh_BoxNatureDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp index 232403065f..2eeb1e1c5a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp @@ -10,9 +10,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_BoxShinySymbolDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp index d193f05a87..c5e5447e7c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp @@ -9,7 +9,6 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_DialogBoxDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp index ecd710a437..67b5134d7e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp @@ -8,7 +8,6 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp index c62f1a85bb..f1d9d56440 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MarkFinder.h" #include "PokemonSwSh_FishingDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp index ca7b4d0219..a37bab120a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSwSh_IvJudgeReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp index 96bd6ff1c8..5ff354ca30 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp @@ -8,9 +8,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" -#include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" -#include "PokemonSwSh_MarkFinder.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp index d7cff2eba6..b5751ddf7f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp @@ -4,8 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h" #include "PokemonSwSh_PokemonSpriteReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp index 80d9dcd034..6c7ac63a74 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp @@ -4,8 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_ReceivePokemonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp index a0d04a775b..3d8a02f253 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp @@ -12,10 +12,8 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Notifications/ProgramInfo.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/DebugDumper.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp index ae35afaeb4..299d26391a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp @@ -5,9 +5,7 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" -#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp index 6fb6ed0264..a8099b7276 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp @@ -8,7 +8,6 @@ */ #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp index df6a22b947..2c9df6f181 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp index c9637fa73a..631d9824c0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp @@ -11,7 +11,6 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonTools/Images/DistanceToLine.h" -#include "PokemonSwSh_SparkleDetectorSquare.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp index d66491a849..79dee868eb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp @@ -8,9 +8,7 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" -#include "CommonFramework/Globals.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp index 2edbd3e9c6..4252434b76 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp @@ -5,7 +5,6 @@ */ //#include "CommonFramework/Environment/Environment.h" #include "CommonTools/Random.h" -#include "PokemonSwSh_MaxLair_AI.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp index 6edc227f3b..096753d6ad 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp @@ -5,7 +5,6 @@ */ #include -#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_PathMatchup.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp index 6ee91c28dc..b2cdd48345 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp @@ -4,8 +4,6 @@ * */ -#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h" -#include "PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" #include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp index e1e2de0163..417a0461cc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp @@ -5,7 +5,6 @@ */ #include -#include "PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp index 74fa33ede8..c89b2cd8b0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp @@ -5,9 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" -#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h" #include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h" -#include "PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp index f1d5a477c2..47034773eb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp @@ -6,8 +6,6 @@ #include #include "Common/Cpp/Exceptions.h" -#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h" -#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" #include "PokemonSwSh_MaxLair_AI_PathMatchup.h" #include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp index 26c374a27d..f0569ec058 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp @@ -6,7 +6,6 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp index 7b6dda5677..1170e039d7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp @@ -7,7 +7,6 @@ //#include "CommonFramework/Globals.h" //#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Pokemon_Notification.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp index eb935fdfb9..7a08805b61 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp @@ -4,7 +4,6 @@ * */ #include "Common/Cpp/PrettyPrint.h" -#include "Pokemon/Pokemon_Types.h" #include "PokemonSwSh_MaxLair_State.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp index 747d4d5bba..bf448957eb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp @@ -5,10 +5,8 @@ */ #include "Common/Cpp/Containers/FixedLimitVector.tpp" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramInfo.h" -#include "CommonTools/Async/InterruptableCommands.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "Pokemon/Pokemon_Strings.h" @@ -29,7 +27,6 @@ #include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h" #include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h" #include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h" -#include "PokemonSwSh_MaxLair_StateMachine.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp index 4dc758854a..abdc07e011 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_MaxLair_Detect_Entrance.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp index 72b501b149..83108151ce 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Strings/Unicode.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/OCR/OCR_StringNormalization.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp index b9c0271c14..06f08a0e38 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp @@ -4,8 +4,6 @@ * */ -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MaxLair_Detect_Lobby.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp index 68dfeae36e..bad6cbf9ea 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp index 8fbd3e9376..41ad4452b5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp @@ -5,13 +5,11 @@ */ #include "CommonFramework/Notifications/ProgramInfo.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "Pokemon/Inference/Pokemon_ReadHpBar.h" #include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h" #include "PokemonSwSh_MaxLair_Detect_PathSide.h" #include "PokemonSwSh_MaxLair_Detect_PathMap.h" #include "PokemonSwSh_MaxLair_Detect_PathSelect.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp index fcdba0d9b7..c95430fe1f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp @@ -7,11 +7,9 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/DistanceToLine.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" -#include "PokemonSwSh_MaxLair_Detect_PathSide.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp index 6cd925c7c2..54c59d0063 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp @@ -5,7 +5,6 @@ */ #include "Common/Cpp/Exceptions.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp index 25a3c38650..7fca6f6449 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp @@ -4,9 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" -#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MaxLair_Detect_PokemonReader.h" #include "PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp index 4b9ee75ba6..dffa0cd3f4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp @@ -4,9 +4,7 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "Pokemon/Inference/Pokemon_ReadHpBar.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp index 524eafb51c..1e569e9e53 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MaxLair_Detect_ProfessorSwap.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp index 9cb02a38e3..e6e3207dfa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/FatalProgramException.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -14,7 +13,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h" @@ -23,7 +21,6 @@ #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h" -#include "PokemonSwSh_MaxLair_Run_CaughtScreen.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp index ffebd58916..96206cceda 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp @@ -5,9 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/ImageTypes/ImageRGB32.h" -#include "CommonFramework/ImageTools/ImageStats.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/ImageManip.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp index 9f244962b5..940046b6ca 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp index 242e460b5d..9f3030c1cd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp @@ -5,10 +5,7 @@ */ #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonTools/Async/InterruptableCommands.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h" #include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_Run_PathSelect.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp index 456ea1cdfa..d9bef02ced 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp @@ -9,7 +9,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h" #include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_Run_ProfessorSwap.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp index b657df1a52..657d68b42c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp @@ -13,7 +13,6 @@ #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h" #include "PokemonSwSh_MaxLair_Run_EnterLobby.h" -#include "PokemonSwSh_MaxLair_Run_Start.h" #include "PokemonSwSh_MaxLair_Run_StartSolo.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp index 63ee5b295e..dd5e20f456 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp @@ -13,7 +13,6 @@ #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h" #include "PokemonSwSh_MaxLair_Run_EnterLobby.h" -#include "PokemonSwSh_MaxLair_Run_StartSolo.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp index 2f9057cebe..4517b593e9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp @@ -4,7 +4,6 @@ * */ -#include "PokemonSwSh_EncounterFilterEnums.h" #include "PokemonSwSh_EncounterFilterOption.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp index c2b8a141c3..c2708a824c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp @@ -4,12 +4,8 @@ * */ -#include -#include #include "Common/Cpp/Exceptions.h" #include "Common/Qt/NoWheelComboBox.h" -#include "PokemonSwSh_EncounterFilterEnums.h" -#include "PokemonSwSh_EncounterFilterWidget.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp index d3b4b5987b..dbeb8c2aa8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Logging/Logger.h" #include "Pokemon/Resources/Pokemon_PokeballNames.h" #include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h" #include "PokemonSwSh_BallSelectOption.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp index 2d6d9686ca..6e8c325079 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp @@ -10,7 +10,6 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonObject.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "PokemonSwSh_PkmnLib_Types.h" #include "PokemonSwSh_PkmnLib_Moves.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp index b0a31f06b2..6b2ebf0a5b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp @@ -8,7 +8,6 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "PokemonSwSh_Panels.h" -#include "PokemonSwSh_Settings.h" #include "Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h" #include "Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp index 704212d3d6..1c547e76a2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp @@ -6,14 +6,12 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h" -#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" -#include "PokemonSwSh_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp index 137eaeba9a..9837089f98 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp index af10a2c800..560d48dc03 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp @@ -14,10 +14,8 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" -#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" #include "VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp index 79ac425162..75753831d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp index 6218bdbb3f..669fa3bc1f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp @@ -6,8 +6,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "CommonFramework/Notifications/EventNotificationsTable.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp index 8d014c1d8e..c157b2e285 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp index a2bb30f226..c052a12fd4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp @@ -8,12 +8,8 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" -#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" -#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h" #include "VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h" #include "PokemonSwSh_DateSpam-WattFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp index b9981a5b96..2fb6bc44c2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp index f0e2fabc77..3f01903e18 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp index fb2fbf5cd9..131edb3018 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp index 082a8a3552..2a65c9bbce 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp @@ -6,7 +6,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" -#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp index 51d1198098..c774f426c0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp @@ -7,11 +7,7 @@ #include #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/Tools/ErrorDumper.h" -#include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" @@ -27,9 +23,7 @@ #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" -#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h" -#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h" #include "PokemonSwSh_EggHelpers.h" #include "PokemonSwSh_EggAutonomous.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp index 1a97188e0c..d75e8c251d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp @@ -11,7 +11,6 @@ //#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" -#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h" #include "PokemonSwSh_EggHelpers.h" #include "PokemonSwSh_EggHatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp index a21d37c517..2bec1192df 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp index 16e4b13772..2612af9288 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp index b7f044809c..02dff47bfa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp @@ -7,9 +7,7 @@ #include #include #include -#include "CommonFramework/Language.h" //#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp index 24ff860d79..64b1c5a3f2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp index e1c517ba11..de6acfc60a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp @@ -7,7 +7,6 @@ #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp index 243d09411e..cdd388b3fd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp @@ -7,7 +7,6 @@ #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp index 68f2d5735f..dda073dd42 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp @@ -10,7 +10,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" -#include "Pokemon/Pokemon_Strings.h" //#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" //#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp index 51c40e6167..668a386836 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp @@ -11,8 +11,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "PokemonSwSh_DenTools.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp index 4d8d7cbe80..192532ac9f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp @@ -10,9 +10,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h" -#include "Pokemon/Pokemon_Strings.h" -#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" -#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h" #include "PokemonSwSh_DenTools.h" #include "PokemonSwSh_AutoHostStats.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp index 229a7e880d..c2ca4a0485 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp @@ -12,9 +12,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" -#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "PokemonSwSh_DenTools.h" #include "PokemonSwSh_DenRoller.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp index 4293ea9406..407d83965a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp index 1ddf7cedab..6ce0c6360d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp @@ -5,7 +5,6 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -17,7 +16,6 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" -#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "PokemonSwSh_StatsReset-Moltres.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp index 419d803740..65e3c80bb1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp index cf517d0ec9..6ed135fbd7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp @@ -11,7 +11,6 @@ #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp index b4ac0d1e0c..0556187793 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp @@ -5,7 +5,6 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "PokemonSwSh_OverworldMovement.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp index 8ed438603e..ead89b0420 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp @@ -5,8 +5,6 @@ */ #include "Common/Cpp/PrettyPrint.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" -#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h" #include "PokemonSwSh_OverworldTargetTracker.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp index 146aaaa9d4..e28bfb2f0a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp @@ -13,13 +13,10 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" -#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" -#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_OverworldMovement.h" -#include "PokemonSwSh_OverworldTrajectory.h" #include "PokemonSwSh_OverworldTrigger.h" #include "PokemonSwSh_ShinyHuntAutonomous-Overworld.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp index c96b436064..23d7e3e6ea 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp @@ -4,14 +4,11 @@ * */ -#include "CommonFramework/Tools/VideoStream.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" -#include "PokemonSwSh_BoxHelpers.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp index 9cc8316fbe..e52dea6771 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp @@ -6,11 +6,9 @@ //#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h" //#include "CommonFramework/Globals.h" -#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" -#include "CommonTools/Async/InterruptableCommands.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "PokemonSwSh_EncounterDetection.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp index 678fb4b91c..ad115f7297 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp @@ -10,7 +10,6 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h" #include "PokemonSwSh_EncounterHandler.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp index 6d255e92e5..797d7f070b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp @@ -13,7 +13,6 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" -#include "PokemonSwSh_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp index fcf2238b69..cd3f353e0a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp @@ -5,12 +5,10 @@ */ #include "CommonFramework/VideoPipeline/VideoFeed.h" -#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" -#include "PokemonSwSh_Internet.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp index 9eeb3be630..571e690686 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp @@ -6,7 +6,6 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" -#include "CommonFramework/Tools/ErrorDumper.h" //#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp index 831408933b..b448afe2dd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp @@ -10,7 +10,6 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" -#include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp index 43ccbac48c..b2b91305cf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp @@ -14,7 +14,6 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" -#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp index 519fe43390..3bc0f5527b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp @@ -6,7 +6,6 @@ * */ -#include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp index d46a2f549c..9af20ee118 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp @@ -14,8 +14,6 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" -#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" -#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-BerryTree.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp index f46094e134..a16cc25541 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp @@ -13,9 +13,7 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" -#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h" -#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-Fishing.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp index 737978ab4a..450c3ceffa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp @@ -4,14 +4,12 @@ * */ -#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" -#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp index 8195618461..5a8404b505 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp @@ -17,7 +17,6 @@ #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" #include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h" -#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp index f236ac682e..c752e3581f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp @@ -13,7 +13,6 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" //#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" -#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp index f0e921c631..11642c3f72 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp @@ -13,8 +13,6 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" -#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" -#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp index c7620a2463..e6bc0160eb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp @@ -12,8 +12,6 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" -#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" -#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-Whistling.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp index ebc9268c73..d3a0e5048b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp @@ -4,7 +4,6 @@ * */ -#include "CommonFramework/Globals.h" #include "CommonTools/Async/InferenceSession.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp index 9a8feed819..dc28a348e6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp @@ -5,7 +5,6 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" -#include "PokemonSwSh_ShinyHuntTools.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp index f7bda427b5..09b278b5e7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp @@ -7,7 +7,6 @@ #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" -#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonSwSh_TypeSprites.h" From 2a140418902a7c37121fbdbb7e328a79927eef21 Mon Sep 17 00:00:00 2001 From: PA Dev Bot <344001113+pa-devbot@users.noreply.github.com> Date: Thu, 29 Oct 2026 14:13:54 +0000 Subject: [PATCH 2/3] Re-verify removals against all platforms; keep only statically-safe ones The first CI pass exposed removals that were unsafe on platforms not represented by this host's aarch64 build: - SpinPause.h in SpinLock.cpp: on aarch64 the missing header made pause() silently bind to glibc's pause() system call (verified in the emitted machine code), and on x86/Windows the identifier is undeclared. - DppClient.h in ProgramNotifications.cpp: only referenced inside #ifdef PA_DPP, which is defined on x86 CI but not on aarch64. Compile-verification under a single platform's flags cannot prove an include is unused on other platforms, so the removal set was re-audited statically: a removal is kept only if the removed header declares no identifier (class, struct, enum, function, macro, alias) that is referenced anywhere in the file (including in #if-disabled regions). Result: 263 include lines removed from 193 files, pure deletions. pa-build passes; x86-gated files re-verified with the x86 toolchain. --- Common/Cpp/CancellableScope.cpp | 1 + Common/Cpp/Concurrency/SpinLock.cpp | 1 + Common/Cpp/ExpressionEvaluator.cpp | 1 + Common/Cpp/Filesystem/Filesystem.cpp | 1 + Common/Cpp/Json/JsonValue.cpp | 1 + .../MemoryUtilization/MemoryUtilization.cpp | 1 + Common/Cpp/Strings/StringTools.cpp | 1 + Common/Cpp/Time.cpp | 1 + .../PABotBase2_ConnectionDebug.cpp | 1 + Common/Qt/CodeValidator.cpp | 1 + Common/Qt/CollapsibleGroupBox.cpp | 1 + Common/Qt/Options/BatchWidget.cpp | 1 + Common/Qt/Options/BooleanCheckBoxWidget.cpp | 1 + Common/Qt/Options/BoxFloatWidget.cpp | 1 + Common/Qt/Options/ButtonWidget.cpp | 1 + Common/Qt/Options/EditableTableWidget.cpp | 1 + Common/Qt/Options/EnumDropdownWidget.cpp | 1 + Common/Qt/Options/FloatingPointWidget.cpp | 2 + Common/Qt/Options/IntegerRangeWidget.cpp | 2 + Common/Qt/Options/MacAddressWidget.cpp | 2 + Common/Qt/Options/PathWidget.cpp | 2 + Common/Qt/Options/SimpleIntegerWidget.cpp | 2 + Common/Qt/Options/StaticTextWidget.cpp | 1 + Common/Qt/Options/StringWidget.cpp | 1 + Common/Qt/Options/TimeDurationWidget.cpp | 1 + Common/Qt/QtThreadPool_Tests.cpp | 3 + Common/Qt/StringToolsQt.cpp | 1 + Common/Qt/TimeQt.cpp | 1 + .../AudioPipeline/AudioInfo_Tests.cpp | 1 + .../Backends/AudioPassthroughPairQt.cpp | 2 + .../AudioPipeline/IO/AudioFileLoader.cpp | 3 + .../IO/AudioFileLoader_Tests.cpp | 3 + .../AudioPipeline/IO/AudioInputFile.cpp | 3 + .../AudioPipeline/SinkPipeline_Tests.cpp | 2 + .../AudioPipeline/Tools/AudioFormatUtils.cpp | 1 + .../AudioPipeline/Tools/ChannelMixer.cpp | 1 + .../AudioPipeline/UI/AudioDisplayWidget.cpp | 1 + .../AudioPipeline/UI/AudioSelectorWidget.cpp | 2 + .../Environment/SystemSleep.cpp | 1 + .../ErrorReports/ErrorReports.cpp | 4 ++ .../Exceptions/FatalProgramException.cpp | 1 + .../Exceptions/OperationFailedException.cpp | 1 + ...OperationFailedExceptionWithScreenshot.cpp | 2 + .../Exceptions/ProgramFinishedException.cpp | 2 + .../Source/CommonFramework/GlobalServices.cpp | 1 + .../CommonFramework/GlobalSettingsPanel.cpp | 1 + .../CommonFramework/ImageTools/ImageBoxes.cpp | 1 + .../CommonFramework/ImageTools/ImageDiff.cpp | 1 + .../CommonFramework/ImageTools/ImageStats.cpp | 1 + .../CommonFramework/ImageTypes/ImageHSV32.cpp | 1 + .../CommonFramework/ImageTypes/ImageRGB32.cpp | 1 + .../Source/CommonFramework/Logging/Logger.cpp | 1 + .../CommonFramework/Logging/QueuedLogger.cpp | 1 + .../Source/CommonFramework/Main.cpp | 3 + .../Notifications/EventNotificationWidget.cpp | 1 + .../Notifications/ProgramNotifications.cpp | 1 + .../Environment/ThemeSelectorOption.cpp | 2 + .../Options/QtWidget/WallpaperWidget.cpp | 1 + .../Options/ResolutionOption.cpp | 1 + .../CommonFramework/Panels/OptionsPanel.cpp | 1 + .../Panels/PanelDescriptor.cpp | 1 + .../Panels/UI/PanelElements.cpp | 1 + .../CommonFramework/Panels/UI/PanelWidget.cpp | 2 + .../CommonFramework/PersistentSettings.cpp | 1 + .../Source/CommonFramework/ProgramSession.cpp | 3 + .../Recording/StreamHistorySession.cpp | 2 + .../Recording/StreamRecorder.cpp | 4 ++ .../GlobalResourceDownloadManager.cpp | 2 + .../ProgramResourceDownloadWidget.cpp | 2 + .../ResourceDownload/ResourceDownload.cpp | 1 + .../SettingsResourceDownloadOptions.cpp | 1 + .../SettingsResourceDownloadTable.cpp | 1 + .../SettingsResourceDownloadWidget.cpp | 2 + .../Startup/NewVersionCheck.cpp | 1 + .../CommonFramework/Startup/SetupSettings.cpp | 1 + .../CommonFramework/Tools/DebugDumper.cpp | 1 + .../CommonFramework/Tools/ErrorDumper.cpp | 3 + .../CommonFramework/Tools/FileDownloader.cpp | 7 ++ .../Tools/GlobalThreadPools.cpp | 1 + .../Tools/ProgramEnvironment.cpp | 2 + .../Backends/CameraImplementations.cpp | 1 + .../Backends/CameraWidgetQt6.5.cpp | 1 + .../Backends/CameraWidgetQt6.cpp | 1 + .../Backends/CameraWidgetQt6_QQuickWidget.cpp | 3 + .../VideoPipeline/Backends/VideoFrameQt.cpp | 1 + .../Sources/VideoSource_StillImage.cpp | 1 + .../VideoPipeline/UI/VideoDisplayWidget.cpp | 1 + .../VideoPipeline/UI/VideoDisplayWindow.cpp | 2 + .../VideoPipeline/UI/VideoOverlayWidget.cpp | 1 + .../UI/VideoSourceSelectorWidget.cpp | 1 + .../VideoPipeline/VideoOverlay.cpp | 1 + .../CommonFramework/Windows/DpiScaler.cpp | 1 + .../CommonFramework/Windows/MainWindow.cpp | 3 + .../CommonFramework/Windows/WindowTracker.cpp | 1 + .../CommonTools/Async/InferenceRoutines.cpp | 1 + .../CommonTools/Async/InferenceSession.cpp | 2 + .../Audio/AudioPerSpectrumDetectorBase.cpp | 1 + .../CommonTools/Audio/SpectrogramMatcher.cpp | 2 + .../CroppedImageDictionaryMatcher.cpp | 1 + .../ExactImageDictionaryMatcher.cpp | 2 + .../CommonTools/ImageMatch/FilterToAlpha.cpp | 1 + .../SilhouetteDictionaryMatcher.cpp | 2 + .../Images/BinaryImage_FilterRgb32.cpp | 1 + .../CommonTools/Images/ColorClustering.cpp | 1 + .../Source/CommonTools/Images/ImageFilter.cpp | 3 + .../Source/CommonTools/Images/ImageTools.cpp | 3 + .../CommonTools/Images/SolidColorTest.cpp | 1 + .../CommonTools/Images/WaterfillUtilities.cpp | 3 + .../InferencePivots/VisualInferencePivot.cpp | 1 + .../Options/QtWidgets/LanguageOCRWidget.cpp | 2 + .../Options/QtWidgets/ScreenWatchWidget.cpp | 2 + .../CommonTools/Options/ScreenWatchOption.cpp | 2 + SerialPrograms/Source/CommonTools/Random.cpp | 1 + .../CommonTools/Resources/SpriteDatabase.cpp | 1 + .../StartupChecks/VideoResolutionCheck.cpp | 2 + .../VisualDetectors/BlackBorderDetector.cpp | 1 + .../VisualDetectors/FrozenImageDetector.cpp | 1 + .../VisualDetectors/ImageMatchDetector.cpp | 2 + .../ComputerPrograms/ComputerProgram.cpp | 1 + .../Framework/ComputerProgramSession.cpp | 5 ++ .../Framework/ComputerProgramWidget.cpp | 1 + .../ControllerInput/ControllerInput.cpp | 1 + .../Keyboard/GlobalKeyboardHidTracker.cpp | 1 + .../Keyboard/GlobalQtKeyMap.cpp | 1 + .../Keyboard/KeyBindingWidget.cpp | 2 + .../Source/Controllers/ControllerOption.cpp | 1 + .../Controllers/ControllerSelectorWidget.cpp | 1 + .../Controllers/ControllerStateTable.cpp | 1 + .../Controllers/NullControllerWidget.cpp | 1 + .../PABotBase2/PABotBase2_Connection.cpp | 1 + .../PABotBase2/PABotBase2_MessageHandler.cpp | 1 + .../SerialPABotBase2_Connection.cpp | 1 + .../SerialPABotBase2_SelectorWidget.cpp | 1 + .../StandardHid/StandardHid_Keyboard.cpp | 1 + .../Source/GameConsole/ConsolePanel.cpp | 1 + .../Source/GameConsole/ConsoleProgram.cpp | 3 + .../Source/GameConsole/MultiConsolePanel.cpp | 1 + .../GameConsole/MultiConsoleProgram.cpp | 2 + .../Panels/GameConsole_SnapshotDumper.cpp | 1 + .../GameConsole_WaterfillTemplateMaker.cpp | 1 + .../GameConsole/UI/ConsoleSystemWidget.cpp | 2 + .../UI/MultiConsoleSystemWidget.cpp | 1 + .../DiscordIntegrationSettings.cpp | 1 + .../Integrations/DiscordSettingsOption.cpp | 1 + .../Source/Integrations/DiscordWebhook.cpp | 2 + .../Source/Integrations/ProgramTracker.cpp | 1 + .../Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp | 1 + .../AbsFFT/Kernels_AbsFFT_Core_Default.cpp | 1 + .../AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp | 1 + .../Kernels_AudioChannelInterleave.cpp | 1 + .../AudioResampler/Kernels_AudioResampler.cpp | 1 + ..._AudioResampler_BlockKernel_ARM64_NEON.cpp | 1 + .../Kernels_AudioResampler_Tests.cpp | 1 + .../Kernels_BinaryMatrix_Tests.cpp | 1 + .../ImageFilters/Kernels_ImageFilter_Misc.cpp | 1 + .../Kernels_ImageFilter_Tests.cpp | 1 + .../Kernels_ImageFilter_RGB32_Euclidean.cpp | 1 + ...ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp | 1 + ...nels_ImageFilter_RGB32_Euclidean_Tests.cpp | 2 + ...els_ImageFilter_RGB32_Range_ARM64_NEON.cpp | 1 + .../Kernels_ImageScaleBrightness.cpp | 1 + .../Kernels_ImageScaleBrightness_Tests.cpp | 1 + .../Kernels_ImagePixelSumSqrDev_Default.cpp | 1 + .../Kernels_ImagePixelSumSqr_Default.cpp | 1 + .../Kernels_ImagePixelSumSqr_arm64_NEON.cpp | 1 + .../Source/Kernels/Kernels_Tests.cpp | 1 + .../Kernels_SpikeConvolution.cpp | 1 + .../Waterfill/Kernels_Waterfill_Tests.cpp | 3 + .../ML/DataLabeling/ML_AnnotationIO.cpp | 1 + .../DataLabeling/ML_SegmentAnythingModel.cpp | 1 + .../Source/ML/Inference/ML_YOLONavigation.cpp | 5 ++ .../Source/ML/Inference/ML_YOLOv5Detector.cpp | 3 + SerialPrograms/Source/ML/ML_Panels.cpp | 2 + .../ML/Models/ML_ONNXRuntimeHelpers.cpp | 2 + .../Source/ML/Programs/ML_LabelImages.cpp | 1 + .../NintendoSwitch_Commands_PushButtons.cpp | 1 + .../Joycon/NintendoSwitch_Joycon.cpp | 1 + .../NintendoSwitch_ControllerSettings.cpp | 1 + .../Procon/NintendoSwitch_ProController.cpp | 1 + .../SysbotBase/SysbotBase_Descriptor.cpp | 1 + .../TestDudunsparceFormDetector.cpp | 4 ++ .../DevPrograms/TestProgramComputer.cpp | 48 ++++++++++++++ .../DevPrograms/TestProgramSwitch.cpp | 66 +++++++++++++++++++ .../NintendoSwitch_UpdatePopupDetector.cpp | 2 + .../NintendoSwitch_MultiSwitchProgram.cpp | 1 + .../NintendoSwitch_SingleSwitchProgram.cpp | 1 + .../DateManip/NintendoSwitch_DateManip.cpp | 4 ++ .../NintendoSwitch_DateManip_24h.cpp | 1 + .../DateManip/NintendoSwitch_DateManip_US.cpp | 1 + .../NintendoSwitch1_HomeToDateTime.cpp | 1 + .../NintendoSwitch2_HomeToDateTime.cpp | 1 + .../NintendoSwitch_NeutralDateSkip.cpp | 1 + .../NintendoSwitch_KeyboardCodeEntry.cpp | 1 + .../Programs/NintendoSwitch_GameEntry.cpp | 1 + .../NintendoSwitch_Typewriter_Tests.cpp | 1 + .../Inference/Pokemon_AbilityReader.cpp | 1 + .../Inference/Pokemon_BerryNameReader.cpp | 1 + .../Inference/Pokemon_BoxGenderDetector.cpp | 3 + .../Inference/Pokemon_NatureReader.cpp | 1 + .../Inference/Pokemon_TrainIVCheckerOCR.cpp | 1 + .../Inference/Pokemon_TrainPokemonOCR.cpp | 1 + .../Pokemon/Inference/Pokemon_TypeReader.cpp | 1 + .../Pokemon/Options/Pokemon_IvJudgeOption.cpp | 1 + .../Source/Pokemon/Pokemon_Notification.cpp | 2 + .../Pokemon/Pokemon_ShinySparkleSet.cpp | 1 + .../Battles/PokemonBDSP_BattleBallReader.cpp | 1 + .../Battles/PokemonBDSP_EndBattleDetector.cpp | 4 ++ .../PokemonBDSP_ExperienceGainDetector.cpp | 2 + .../PokemonBDSP_StartBattleDetector.cpp | 2 + .../BoxSystem/PokemonBDSP_BoxDetector.cpp | 1 + .../PokemonBDSP_BoxGenderDetector.cpp | 3 + .../PokemonBDSP_BoxNatureDetector.cpp | 1 + .../PokemonBDSP_BoxShinyDetector.cpp | 1 + .../BoxSystem/PokemonBDSP_IvJudgeReader.cpp | 1 + .../Inference/PokemonBDSP_DialogDetector.cpp | 1 + .../Inference/PokemonBDSP_MarkFinder.cpp | 1 + .../Inference/PokemonBDSP_MenuDetector.cpp | 1 + .../PokemonBDSP_PokeballSpriteMatcher.cpp | 1 + .../Inference/PokemonBDSP_SelectionArrow.cpp | 2 + .../PokemonBDSP_VSSeekerReaction.cpp | 2 + .../Rng/PokemonBDSP_EyeBlinkDetector.cpp | 1 + .../Rng/PokemonBDSP_SummaryReader.cpp | 4 ++ .../PokemonBDSP_EncounterFilterOption.cpp | 1 + .../PokemonBDSP_EncounterFilterOverride.cpp | 1 + .../PokemonBDSP_EncounterFilterWidget.cpp | 3 + .../Source/PokemonBDSP/PokemonBDSP_Tests.cpp | 1 + .../Eggs/PokemonBDSP_EggAutonomous.cpp | 1 + .../Eggs/PokemonBDSP_EggAutonomousState.cpp | 3 + .../Programs/Eggs/PokemonBDSP_EggFeedback.cpp | 3 + .../Programs/Eggs/PokemonBDSP_EggRoutines.cpp | 1 + .../Farming/PokemonBDSP_DoublesLeveling.cpp | 4 ++ .../Farming/PokemonBDSP_GiftBerryReset.cpp | 2 + .../Farming/PokemonBDSP_PoffinCooker.cpp | 1 + .../PokemonBDSP_AutonomousBallThrower.cpp | 1 + .../Programs/PokemonBDSP_BoxRelease.cpp | 1 + .../PokemonBDSP_EncounterDetection.cpp | 1 + .../Programs/PokemonBDSP_GameEntry.cpp | 1 + .../Programs/PokemonBDSP_GameNavigation.cpp | 1 + .../Programs/PokemonBDSP_GlobalRoomHeal.cpp | 1 + .../Programs/PokemonBDSP_RunFromBattle.cpp | 1 + .../PokemonBDSP_BedroomSeedFinder.cpp | 2 + .../PokemonBDSP_BlinkRecovery.cpp | 1 + .../PokemonBDSP_IntroSeedFinder.cpp | 3 + .../PokemonBDSP_StateSolver.cpp | 1 + .../PokemonBDSP_LegendaryReset.cpp | 3 + .../PokemonBDSP_ShinyHunt-Fishing.cpp | 4 ++ .../PokemonBDSP_ShinyHunt-Overworld.cpp | 2 + .../PokemonBDSP_ShinyHunt-Shaymin.cpp | 3 + .../ShinyHunting/PokemonBDSP_StarterReset.cpp | 2 + .../PokemonBDSP_SoundListener.cpp | 2 + .../PokemonBDSP_SummaryReaderTester.cpp | 1 + .../Source/StaticRegistrationQt.cpp | 3 + .../Source/Tests/CommandLineTests.cpp | 1 + .../Dialogs/PokemonFRLG_DialogDetector.cpp | 5 ++ .../Dialogs/PokemonFRLG_PartyDialogs.cpp | 1 + .../PokemonFRLG_PrizeSelectDetector.cpp | 6 ++ .../Inference/Map/PokemonFRLG_MapDetector.cpp | 6 ++ .../PokemonFRLG_PokemonLeagueDetectors.cpp | 5 ++ .../Menus/PokemonFRLG_BagDetector.cpp | 6 ++ .../Menus/PokemonFRLG_LoadMenuDetector.cpp | 6 ++ .../PokemonFRLG_PartyEmptySlotDetector.cpp | 1 + .../PokemonFRLG_PartyHeldItemDetector.cpp | 1 + .../Menus/PokemonFRLG_PartyMenuDetector.cpp | 8 +++ .../Menus/PokemonFRLG_StartMenuDetector.cpp | 2 + .../Menus/PokemonFRLG_SummaryDetector.cpp | 6 ++ .../Menus/PokemonFRLG_TrainerCardDetector.cpp | 6 ++ .../PokemonFRLG_BattleLevelUpReader.cpp | 7 ++ .../PokemonFRLG_BattlePokemonDetector.cpp | 6 ++ ...kemonFRLG_BattleSelectionArrowDetector.cpp | 1 + .../PokemonFRLG_DaycareManDetector.cpp | 4 ++ .../Inference/PokemonFRLG_DigitReader.cpp | 2 + .../PokemonFRLG_OcrPreprocessing.cpp | 1 + .../PokemonFRLG_PartyLevelUpReader.cpp | 7 ++ .../PokemonFRLG_PokedexRegisteredDetector.cpp | 1 + .../PokemonFRLG_PokemonSpriteReader.cpp | 3 + .../PokemonFRLG_ShinySymbolDetector.cpp | 4 ++ .../Inference/PokemonFRLG_StatsReader.cpp | 3 + .../Inference/PokemonFRLG_TrainerIdReader.cpp | 5 ++ .../PokemonFRLG_WildEncounterReader.cpp | 5 ++ .../PokemonFRLG/PokemonFRLG_Navigation.cpp | 1 + .../PokemonFRLG/PokemonFRLG_Tests.cpp | 1 + .../Farming/PokemonFRLG_EliteFourFarmer.cpp | 1 + .../Farming/PokemonFRLG_EvTrainer.cpp | 4 ++ .../PokemonFRLG_HeldItemFarmer-SafariZone.cpp | 4 ++ .../Farming/PokemonFRLG_PickupFarmer.cpp | 3 + .../PokemonFRLG_BattleMenuNavigation.cpp | 1 + .../PokemonFRLG_BlindNavigation.cpp | 2 + .../RngManipulation/PokemonFRLG_EggRng.cpp | 5 ++ .../RngManipulation/PokemonFRLG_GiftRng.cpp | 4 ++ .../RngManipulation/PokemonFRLG_HardReset.cpp | 1 + .../PokemonFRLG_RngCalibration.cpp | 1 + .../RngManipulation/PokemonFRLG_RngHelper.cpp | 2 + .../PokemonFRLG_RngLoopRoutines.cpp | 1 + .../PokemonFRLG_RngNavigation.cpp | 3 + .../PokemonFRLG_RoamingLegendaryRng.cpp | 4 ++ .../RngManipulation/PokemonFRLG_SidHelper.cpp | 2 + .../PokemonFRLG_StarterRng.cpp | 3 + .../RngManipulation/PokemonFRLG_StaticRng.cpp | 4 ++ .../RngManipulation/PokemonFRLG_WildRng.cpp | 5 ++ .../ShinyHunting/PokemonFRLG_GiftReset.cpp | 1 + .../PokemonFRLG_LegendaryReset.cpp | 2 + .../PokemonFRLG_LegendaryRunAway.cpp | 1 + .../PokemonFRLG_PrizeCornerReset.cpp | 2 + .../PokemonFRLG_ShinyHunt-Fishing.cpp | 2 + .../PokemonFRLG_ShinyHunt-Overworld.cpp | 1 + .../PokemonFRLG_ReadBattleLevelUp.cpp | 2 + .../PokemonFRLG_ReadTrainerId.cpp | 1 + .../PokemonFRLG_SafariOptimalActionTest.cpp | 1 + .../PokemonFRLG_TestPartyInference.cpp | 1 + .../Inference/PokemonHome_AlphaDetector.cpp | 1 + .../Inference/PokemonHome_BallReader.cpp | 1 + .../PokemonHome_BoxGenderDetector.cpp | 3 + .../Inference/PokemonHome_BoxViewDetector.cpp | 5 ++ .../Inference/PokemonHome_ButtonDetector.cpp | 2 + .../PokemonHome_GigantamaxDetector.cpp | 1 + .../PokemonHome_OriginMarkReader.cpp | 3 + .../PokemonHome_SelectionArrowDetector.cpp | 1 + .../Inference/PokemonHome_ShinyDetector.cpp | 1 + .../Inference/PokemonHome_SummaryReader.cpp | 3 + .../PokemonHome_SummaryScreenDetector.cpp | 2 + .../Inference/PokemonHome_TeraTypeReader.cpp | 2 + .../PokemonHome/PokemonHome_Tests.cpp | 2 + .../Programs/PokemonHome_BoxNavigation.cpp | 3 + .../Programs/PokemonHome_BoxSorter.cpp | 3 + .../PokemonHome_BoxSorterLivingDex.cpp | 3 + .../Programs/PokemonHome_GenerateNameOCR.cpp | 1 + .../PokemonHome_ReadSummaryScreen.cpp | 1 + .../PokemonHome_TestDatabaseGenerator.cpp | 5 ++ .../Battles/PokemonLA_BattleMenuDetector.cpp | 1 + .../PokemonLA_BattleMoveSelectionDetector.cpp | 1 + .../PokemonLA_BattlePokemonSwitchDetector.cpp | 1 + .../Battles/PokemonLA_BattleSpriteWatcher.cpp | 1 + .../Battles/PokemonLA_BattleStartDetector.cpp | 3 + .../PokemonLA_MMOSpriteStarSymbolDetector.cpp | 1 + .../Map/PokemonLA_MapMarkerLocator.cpp | 3 + .../Map/PokemonLA_MapMissionTabReader.cpp | 3 + .../Map/PokemonLA_MapWeatherAndTimeReader.cpp | 3 + .../Map/PokemonLA_MapZoomLevelReader.cpp | 1 + .../Map/PokemonLA_OutbreakReader.cpp | 1 + .../Map/PokemonLA_PokemonMapSpriteReader.cpp | 5 ++ .../Map/PokemonLA_SelectedRegionDetector.cpp | 1 + .../Objects/PokemonLA_BubbleDetector.cpp | 1 + .../PokemonLA_DialogYellowArrowDetector.cpp | 1 + .../Objects/PokemonLA_FlagTracker.cpp | 1 + .../Inference/PokemonLA_BerryTreeDetector.cpp | 1 + .../Inference/PokemonLA_CommonColorCheck.cpp | 1 + .../Inference/PokemonLA_DialogDetector.cpp | 1 + .../Inference/PokemonLA_MountDetector.cpp | 1 + .../PokemonLA_NotificationReader.cpp | 1 + .../PokemonLA_StatusInfoScreenDetector.cpp | 3 + .../PokemonLA_UnderAttackDetector.cpp | 1 + .../PokemonLA_WildPokemonFocusDetector.cpp | 4 ++ .../Options/PokemonLA_ShinyDetectedAction.cpp | 2 + .../PokemonLA_CustomPathTableWidget.cpp | 1 + .../VideoGames/PokemonLA/PokemonLA_Tests.cpp | 3 + .../Farming/PokemonLA_IngoBattleGrinder.cpp | 2 + .../Farming/PokemonLA_IngoMoveGrinder.cpp | 1 + .../Farming/PokemonLA_LeapGrinder.cpp | 1 + .../Farming/PokemonLA_TenacityCandyFarmer.cpp | 1 + .../General/PokemonLA_OutbreakFinder.cpp | 1 + .../General/PokemonLA_PokedexTasksReader.cpp | 1 + .../Programs/PokemonLA_FlagNavigationAir.cpp | 1 + .../Programs/PokemonLA_GameEntry.cpp | 1 + .../PokemonLA/Programs/PokemonLA_GameSave.cpp | 6 ++ .../Programs/PokemonLA_LeapPokemonActions.cpp | 2 + .../Programs/PokemonLA_RegionNavigation.cpp | 3 + .../ShinyHunting/PokemonLA_AutoMultiSpawn.cpp | 2 + .../ShinyHunting/PokemonLA_BurmyFinder.cpp | 1 + .../PokemonLA_MountDetectionTest.cpp | 1 + .../TestPrograms/PokemonLA_SoundListener.cpp | 2 + .../Trading/PokemonLA_SelfBoxTrade.cpp | 1 + .../Trading/PokemonLA_SelfTouchTrade.cpp | 1 + .../Trading/PokemonLA_TradeRoutines.cpp | 1 + .../Commands/PokemonLGPE_DateSpam.cpp | 1 + .../PokemonLGPE_BattleArrowDetector.cpp | 1 + .../PokemonLGPE_ShinySymbolDetector.cpp | 4 ++ .../Programs/PokemonLGPE_GameEntry.cpp | 1 + .../PokemonLGPE_FossilRevival.cpp | 1 + .../PokemonLZA_MoveEffectivenessSymbol.cpp | 1 + .../Boxes/PokemonLZA_BoxDetection.cpp | 5 ++ .../Boxes/PokemonLZA_BoxInfoDetector.cpp | 6 ++ .../Boxes/PokemonLZA_IvJudgeReader.cpp | 1 + .../PokemonLZA_DonutBerriesDetector.cpp | 5 ++ .../Donuts/PokemonLZA_FlavorPowerDetector.cpp | 5 ++ .../PokemonLZA_FlavorPowerScreenDetector.cpp | 2 + .../Map/PokemonLZA_DirectionArrowDetector.cpp | 2 + .../Map/PokemonLZA_LocationNameReader.cpp | 1 + .../Inference/Map/PokemonLZA_MapDetector.cpp | 1 + .../Inference/PokemonLZA_AlertEyeDetector.cpp | 1 + .../Inference/PokemonLZA_ButtonDetector.cpp | 2 + .../PokemonLZA_DayNightChangeDetector.cpp | 1 + .../Inference/PokemonLZA_DialogDetector.cpp | 4 ++ .../PokemonLZA_HyperspaceCalorieDetector.cpp | 2 + .../Inference/PokemonLZA_MainMenuDetector.cpp | 3 + ...monLZA_OverworldPartySelectionDetector.cpp | 4 ++ .../PokemonLZA_SelectionArrowDetector.cpp | 1 + .../Inference/PokemonLZA_WeatherDetector.cpp | 1 + .../PokemonLZA_GenerateLocationNameOCR.cpp | 1 + .../PokemonLZA_ShinyDetectedAction.cpp | 1 + .../PokemonLZA/PokemonLZA_Tests.cpp | 1 + .../Farming/PokemonLZA_DonutMaker.cpp | 8 +++ .../Farming/PokemonLZA_FriendshipFarmer.cpp | 2 + .../PokemonLZA_HyperspaceRewardReset.cpp | 1 + .../Farming/PokemonLZA_RestaurantFarmer.cpp | 1 + .../Farming/PokemonLZA_WigglytuffFarmer.cpp | 1 + .../NonShinyHunting/PokemonLZA_StatsReset.cpp | 4 ++ .../PokemonLZA_WeatherFinder.cpp | 2 + .../Programs/PokemonLZA_BoxSorter.cpp | 3 + .../Programs/PokemonLZA_GameEntry.cpp | 1 + .../Programs/PokemonLZA_MenuNavigation.cpp | 1 + .../Programs/PokemonLZA_TrainerBattle.cpp | 1 + .../ShinyHunting/PokemonLZA_AutoFossil.cpp | 1 + .../PokemonLZA_ShinyHunt_BenchSit.cpp | 1 + .../PokemonLZA_ShinyHunt_HelioptileHunter.cpp | 3 + ...kemonLZA_ShinyHunt_HyperspaceLegendary.cpp | 5 ++ .../ShinyHunting/PokemonLZA_WildZoneCafe.cpp | 1 + .../PokemonLZA_WildZoneEntrance.cpp | 1 + .../Trading/PokemonLZA_SelfBoxTrade.cpp | 1 + .../Resources/PokemonLZA_AvailablePokemon.cpp | 1 + .../PokemonPokopia_ButtonDetector.cpp | 2 + .../PokemonPokopia_MovesDetection.cpp | 1 + .../Inference/PokemonPokopia_PCDetection.cpp | 1 + .../PokemonPokopia_SelectionArrowDetector.cpp | 1 + .../PokemonPokopia_SettingsScreenDetector.cpp | 2 + .../PokemonPokopia_CloudIslandReset.cpp | 3 + .../Programs/PokemonPokopia_DailyFarmer.cpp | 1 + .../Programs/PokemonPokopia_PCNavigation.cpp | 2 + .../Dialogs/PokemonRSE_BattleDialogs.cpp | 5 ++ .../Dialogs/PokemonRSE_DialogDetector.cpp | 6 ++ .../Menus/PokemonRSE_LoadMenuDetector.cpp | 6 ++ .../Menus/PokemonRSE_PartyMenuDetector.cpp | 6 ++ .../Menus/PokemonRSE_StartMenuDetector.cpp | 3 + .../Menus/PokemonRSE_SummaryDetector.cpp | 6 ++ .../PokemonRSE_SelectionDetector.cpp | 4 ++ .../PokemonRSE_ShinyNumberDetector.cpp | 4 ++ .../PokemonRSE/PokemonRSE_Navigation.cpp | 2 + .../PokemonRSE/PokemonRSE_Tests.cpp | 1 + .../ShinyHunting/PokemonRSE_GiftReset.cpp | 1 + .../PokemonRSE_LegendaryReset.cpp | 1 + .../PokemonRSE_LegendaryRunAway-Emerald.cpp | 1 + .../PokemonRSE_ShinyHunt-Deoxys.cpp | 1 + .../ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp | 1 + .../ShinyHunting/PokemonRSE_StarterReset.cpp | 1 + .../Battles/PokemonSV_BattleBallReader.cpp | 2 + .../Battles/PokemonSV_NormalBattleMenus.cpp | 1 + .../Boxes/PokemonSV_BoxDetection.cpp | 1 + .../Boxes/PokemonSV_BoxEggDetector.cpp | 5 ++ .../Boxes/PokemonSV_BoxNatureDetector.cpp | 1 + .../Boxes/PokemonSV_IvJudgeReader.cpp | 1 + .../Boxes/PokemonSV_StatsResetChecker.cpp | 1 + .../Dialogs/PokemonSV_DialogArrowDetector.cpp | 4 ++ .../PokemonSV_GradientArrowDetector.cpp | 2 + .../PokemonSV_ItemPrinterJobsDetector.cpp | 2 + .../PokemonSV_ItemPrinterMaterialDetector.cpp | 2 + .../PokemonSV_ItemPrinterPrizeReader.cpp | 1 + .../PokemonSV_DestinationMarkerDetector.cpp | 2 + .../Map/PokemonSV_FastTravelDetector.cpp | 2 + .../Inference/Map/PokemonSV_MapDetector.cpp | 2 + .../Map/PokemonSV_MapMenuDetector.cpp | 3 + .../PokemonSV_MapPokeCenterIconDetector.cpp | 3 + .../PokemonSV_AreaZeroSkyDetector.cpp | 2 + .../Overworld/PokemonSV_DirectionDetector.cpp | 3 + .../Overworld/PokemonSV_OliveDetector.cpp | 2 + .../Overworld/PokemonSV_OverworldDetector.cpp | 1 + .../PokemonSV_StationaryOverworldWatcher.cpp | 1 + .../Picnics/PokemonSV_PicnicDetector.cpp | 1 + .../Inference/PokemonSV_BagDetector.cpp | 1 + .../PokemonSV_BlueberryQuestDetector.cpp | 3 + .../PokemonSV_ClothingTopDetector.cpp | 1 + .../PokemonSV_ESPEmotionDetector.cpp | 1 + .../Inference/PokemonSV_MoneyReader.cpp | 2 + .../PokemonSV_PokemonMovesReader.cpp | 2 + .../PokemonSV_PokemonSummaryReader.cpp | 1 + .../Inference/PokemonSV_StatHexagonReader.cpp | 3 + .../PokemonSV_SweatBubbleDetector.cpp | 2 + .../PokemonSV_WhiteButtonDetector.cpp | 3 + .../PokemonSV_WhiteTriangleDetector.cpp | 3 + .../Tera/PokemonSV_TeraCardDetector.cpp | 3 + .../Tera/PokemonSV_TeraCodeReader.cpp | 2 + .../Tera/PokemonSV_TeraRaidSearchDetector.cpp | 1 + .../Options/PokemonSV_TeraRollFilter.cpp | 1 + .../PokemonSV_TournamentPrizeSelectOption.cpp | 1 + .../VideoGames/PokemonSV/PokemonSV_Tests.cpp | 8 +++ .../AutoStory/PokemonSV_AutoStory.cpp | 4 ++ .../AutoStory/PokemonSV_AutoStoryTools.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_00.cpp | 1 + .../PokemonSV_AutoStory_Segment_01.cpp | 2 + .../PokemonSV_AutoStory_Segment_02.cpp | 3 + .../PokemonSV_AutoStory_Segment_03.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_04.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_05.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_06.cpp | 6 ++ .../PokemonSV_AutoStory_Segment_07.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_08.cpp | 6 ++ .../PokemonSV_AutoStory_Segment_09.cpp | 3 + .../PokemonSV_AutoStory_Segment_10.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_11.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_12.cpp | 6 ++ .../PokemonSV_AutoStory_Segment_13.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_14.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_15.cpp | 2 + .../PokemonSV_AutoStory_Segment_16.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_17.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_18.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_19.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_20.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_21.cpp | 2 + .../PokemonSV_AutoStory_Segment_22.cpp | 2 + .../PokemonSV_AutoStory_Segment_23.cpp | 2 + .../PokemonSV_AutoStory_Segment_24.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_25.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_26.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_27.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_28.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_29.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_30.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_31.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_32.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_33.cpp | 6 ++ .../PokemonSV_AutoStory_Segment_34.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_35.cpp | 5 ++ .../PokemonSV_AutoStory_Segment_36.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_37.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_38.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_39.cpp | 4 ++ .../PokemonSV_AutoStory_Segment_40.cpp | 2 + .../Battles/PokemonSV_BasicCatcher.cpp | 2 + .../Programs/Battles/PokemonSV_Battles.cpp | 2 + .../Battles/PokemonSV_SinglesBattler.cpp | 1 + .../Programs/Boxes/PokemonSV_BoxAttach.cpp | 1 + .../Programs/Boxes/PokemonSV_BoxRelease.cpp | 1 + .../Programs/Boxes/PokemonSV_BoxRoutines.cpp | 3 + .../Boxes/PokemonSV_MassAttachItems.cpp | 1 + .../Programs/Boxes/PokemonSV_MassRelease.cpp | 1 + .../Programs/Eggs/PokemonSV_EggAutonomous.cpp | 3 + .../Programs/Eggs/PokemonSV_EggRoutines.cpp | 6 ++ .../Farming/PokemonSV_AuctionFarmer.cpp | 2 + .../Farming/PokemonSV_BBQSoloFarmer.cpp | 1 + .../Farming/PokemonSV_BlueberryCatchPhoto.cpp | 7 ++ .../Farming/PokemonSV_BlueberryQuests.cpp | 12 ++++ .../Farming/PokemonSV_ClaimMysteryGift.cpp | 1 + .../Farming/PokemonSV_MaterialFarmer.cpp | 1 + .../Farming/PokemonSV_MaterialFarmerTools.cpp | 6 ++ .../Farming/PokemonSV_TournamentFarmer.cpp | 1 + .../Farming/PokemonSV_TournamentFarmer2.cpp | 1 + .../PokemonSV_ClipboardFastCodeEntry.cpp | 1 + .../FastCodeEntry/PokemonSV_CodeEntry.cpp | 1 + .../FastCodeEntry/PokemonSV_FastCodeEntry.cpp | 1 + .../PokemonSV_VideoFastCodeEntry.cpp | 1 + .../General/PokemonSV_MassPurchase.cpp | 1 + .../General/PokemonSV_SizeChecker.cpp | 2 + .../Programs/General/PokemonSV_StatsReset.cpp | 2 + .../PokemonSV_StatsResetEventBattle.cpp | 3 + .../Glitches/PokemonSV_CloneItems-1.0.1.cpp | 2 + .../Glitches/PokemonSV_RideCloner-1.0.1.cpp | 3 + .../Glitches/PokemonSV_WildItemFarmer.cpp | 3 + .../ItemPrinter/PokemonSV_ItemPrinterRNG.cpp | 5 ++ .../PokemonSV/Programs/PokemonSV_AreaZero.cpp | 1 + .../Programs/PokemonSV_ConnectToInternet.cpp | 3 + .../Programs/PokemonSV_GameEntry.cpp | 3 + .../Programs/PokemonSV_MenuNavigation.cpp | 6 ++ .../PokemonSV/Programs/PokemonSV_SaveGame.cpp | 1 + .../PokemonSV/Programs/PokemonSV_Terarium.cpp | 5 ++ .../Programs/PokemonSV_WorldNavigation.cpp | 7 ++ .../PokemonSV_AreaZeroPlatform.cpp | 1 + .../ShinyHunting/PokemonSV_LetsGoTools.cpp | 2 + .../PokemonSV_ShinyHunt-AreaZeroPlatform.cpp | 3 + .../PokemonSV_ShinyHunt-Scatterbug.cpp | 3 + .../Programs/TeraRaids/PokemonSV_AutoHost.cpp | 6 ++ .../TeraRaids/PokemonSV_AutoHostTools.cpp | 2 + .../TeraRaids/PokemonSV_TeraMultiFarmer.cpp | 6 ++ .../TeraRaids/PokemonSV_TeraRoller.cpp | 1 + .../TeraRaids/PokemonSV_TeraRoutines.cpp | 1 + .../Trading/PokemonSV_TradeRoutines.cpp | 2 + .../PokemonSwSh_Commands_AutoHosts.cpp | 1 + .../PokemonSwSh_Commands_EggRoutines.cpp | 1 + .../Commands/PokemonSwSh_Commands_Misc.cpp | 1 + .../Battles/PokemonSwSh_BattleBallReader.cpp | 1 + .../PokemonSwSh_BattleDialogDetector.cpp | 1 + .../PokemonSwSh_BattleDialogTracker.cpp | 1 + .../PokemonSwSh_StartBattleDetector.cpp | 1 + .../Inference/Dens/PokemonSwSh_BeamSetter.cpp | 1 + .../Dens/PokemonSwSh_RaidCatchDetector.cpp | 1 + .../Dens/PokemonSwSh_RaidLobbyReader.cpp | 2 + .../Inference/PokemonSwSh_BoxEggDetector.cpp | 2 + .../PokemonSwSh_BoxEmptySlotDetector.cpp | 1 + .../PokemonSwSh_BoxNatureDetector.cpp | 3 + .../PokemonSwSh_BoxShinySymbolDetector.cpp | 2 + .../PokemonSwSh_DialogBoxDetector.cpp | 1 + .../PokemonSwSh_DialogTriangleDetector.cpp | 1 + .../Inference/PokemonSwSh_FishingDetector.cpp | 1 + .../Inference/PokemonSwSh_IvJudgeReader.cpp | 1 + .../Inference/PokemonSwSh_MarkFinder.cpp | 2 + .../PokemonSwSh_PokemonSpriteReader.cpp | 2 + .../PokemonSwSh_ReceivePokemonDetector.cpp | 2 + .../PokemonSwSh_SelectionArrowFinder.cpp | 2 + .../Inference/PokemonSwSh_YCommDetector.cpp | 2 + .../PokemonSwSh_ShinyEncounterDetector.cpp | 1 + .../PokemonSwSh_SparkleDetectorSquare.cpp | 1 + .../PokemonSwSh_GenerateNameOCRPokedex.cpp | 1 + .../MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp | 1 + .../AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp | 1 + .../PokemonSwSh_MaxLair_AI_SelectStarter.cpp | 2 + .../AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp | 1 + .../PokemonSwSh_MaxLair_AI_SwapProfessor.cpp | 2 + .../AI/PokemonSwSh_MaxLair_AI_Tools.cpp | 2 + ...PokemonSwSh_MaxLair_CatchScreenTracker.cpp | 1 + .../PokemonSwSh_MaxLair_Notifications.cpp | 1 + .../Framework/PokemonSwSh_MaxLair_State.cpp | 1 + .../PokemonSwSh_MaxLair_StateMachine.cpp | 3 + .../PokemonSwSh_MaxLair_Detect_Entrance.cpp | 1 + .../PokemonSwSh_MaxLair_Detect_HPPP.cpp | 1 + .../PokemonSwSh_MaxLair_Detect_Lobby.cpp | 2 + .../PokemonSwSh_MaxLair_Detect_PathMap.cpp | 1 + .../PokemonSwSh_MaxLair_Detect_PathSelect.cpp | 2 + .../PokemonSwSh_MaxLair_Detect_PathSide.cpp | 2 + ...kemonSwSh_MaxLair_Detect_PokemonReader.cpp | 1 + ...nSwSh_MaxLair_Detect_PokemonSelectMenu.cpp | 3 + ...monSwSh_MaxLair_Detect_PokemonSwapMenu.cpp | 2 + ...kemonSwSh_MaxLair_Detect_ProfessorSwap.cpp | 1 + .../PokemonSwSh_MaxLair_Run_CaughtScreen.cpp | 2 + .../PokemonSwSh_MaxLair_Run_EnterLobby.cpp | 3 + .../PokemonSwSh_MaxLair_Run_Entrance.cpp | 1 + .../PokemonSwSh_MaxLair_Run_PathSelect.cpp | 3 + .../Program/PokemonSwSh_MaxLair_Run_Start.cpp | 1 + .../PokemonSwSh_MaxLair_Run_StartSolo.cpp | 1 + .../PokemonSwSh_EncounterFilterOption.cpp | 1 + .../PokemonSwSh_EncounterFilterWidget.cpp | 3 + .../Options/PokemonSwSh_BallSelectOption.cpp | 1 + .../PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp | 1 + .../PokemonSwSh/PokemonSwSh_Panels.cpp | 1 + .../PokemonSwSh/PokemonSwSh_Tests.cpp | 2 + .../PokemonSwSh_DateSpam-BerryFarmer2.cpp | 1 + .../PokemonSwSh_DateSpam-WattFarmer.cpp | 1 + .../DenHunting/PokemonSwSh_DaySkipperEU.cpp | 1 + .../PokemonSwSh_DaySkipperJPN-7.8k.cpp | 1 + .../DenHunting/PokemonSwSh_DaySkipperJPN.cpp | 1 + .../DenHunting/PokemonSwSh_DaySkipperUS.cpp | 1 + .../EggPrograms/PokemonSwSh_EggAutonomous.cpp | 4 ++ .../EggPrograms/PokemonSwSh_EggHatcher.cpp | 1 + .../PokemonSwSh_GodEggItemDupe.cpp | 1 + .../PokemonSwSh_AutonomousBallThrower.cpp | 1 + .../PokemonSwSh_BoxReorderNationalDex.cpp | 2 + .../General/PokemonSwSh_DexRecFinder.cpp | 1 + .../General/PokemonSwSh_SurpriseTrade.cpp | 1 + .../Programs/General/PokemonSwSh_TradeBot.cpp | 1 + .../Hosting/PokemonSwSh_AutoHost-Rolling.cpp | 1 + .../Programs/Hosting/PokemonSwSh_AutoHost.cpp | 2 + .../Hosting/PokemonSwSh_DenRoller.cpp | 1 + .../PokemonSwSh_StatsReset-Calyrex.cpp | 1 + .../PokemonSwSh_StatsReset-Moltres.cpp | 2 + .../PokemonSwSh_StatsReset-Regi.cpp | 1 + .../PokemonSwSh_StatsReset.cpp | 1 + .../PokemonSwSh_OverworldMovement.cpp | 1 + .../PokemonSwSh_OverworldTargetTracker.cpp | 2 + ...emonSwSh_ShinyHuntAutonomous-Overworld.cpp | 3 + .../Programs/PokemonSwSh_BoxHelpers.cpp | 3 + .../PokemonSwSh_EncounterDetection.cpp | 2 + .../Programs/PokemonSwSh_EncounterHandler.cpp | 1 + .../Programs/PokemonSwSh_GameEntry.cpp | 1 + .../Programs/PokemonSwSh_Internet.cpp | 2 + .../Programs/PokemonSwSh_MenuNavigation.cpp | 1 + .../RNG/PokemonSwSh_CramomaticRNG.cpp | 1 + ...emonSwSh_ShinyHuntAutonomous-BerryTree.cpp | 2 + ...okemonSwSh_ShinyHuntAutonomous-Fishing.cpp | 2 + .../PokemonSwSh_ShinyHuntAutonomous-Regi.cpp | 1 + ...monSwSh_ShinyHuntAutonomous-Regigigas2.cpp | 1 + ...onSwSh_ShinyHuntAutonomous-StrongSpawn.cpp | 1 + ...Sh_ShinyHuntAutonomous-SwordsOfJustice.cpp | 2 + ...emonSwSh_ShinyHuntAutonomous-Whistling.cpp | 2 + .../PokemonSwSh_CurryHunter.cpp | 1 + .../PokemonSwSh_ShinyHuntTools.cpp | 1 + .../Resources/PokemonSwSh_TypeSprites.cpp | 1 + 673 files changed, 1490 insertions(+) diff --git a/Common/Cpp/CancellableScope.cpp b/Common/Cpp/CancellableScope.cpp index 18b0c0cf99..e890ffe575 100644 --- a/Common/Cpp/CancellableScope.cpp +++ b/Common/Cpp/CancellableScope.cpp @@ -10,6 +10,7 @@ #include "Common/Cpp/Concurrency/Mutex.h" #include "Common/Cpp/Concurrency/ConditionVariable.h" #include "Containers/Pimpl.tpp" +#include "Concurrency/SpinLock.h" #include "Exceptions.h" #include "ListenerSet.h" #include "CancellableScope.h" diff --git a/Common/Cpp/Concurrency/SpinLock.cpp b/Common/Cpp/Concurrency/SpinLock.cpp index 89097b496f..b0d91e6058 100644 --- a/Common/Cpp/Concurrency/SpinLock.cpp +++ b/Common/Cpp/Concurrency/SpinLock.cpp @@ -8,6 +8,7 @@ #include #include #include "Common/Cpp/CpuId/CpuId.h" +#include "SpinPause.h" #include "SpinLock.h" #if 0 diff --git a/Common/Cpp/ExpressionEvaluator.cpp b/Common/Cpp/ExpressionEvaluator.cpp index f6102ab178..b246d43983 100644 --- a/Common/Cpp/ExpressionEvaluator.cpp +++ b/Common/Cpp/ExpressionEvaluator.cpp @@ -9,6 +9,7 @@ #include #include #include "Common/Cpp/Exceptions.h" +#include "ExpressionEvaluator.h" //#include //using std::cout; diff --git a/Common/Cpp/Filesystem/Filesystem.cpp b/Common/Cpp/Filesystem/Filesystem.cpp index ebd8d0e089..9925ebd69a 100644 --- a/Common/Cpp/Filesystem/Filesystem.cpp +++ b/Common/Cpp/Filesystem/Filesystem.cpp @@ -11,6 +11,7 @@ #include #include #include "CompileTimeBackends.h" +#include "FilePath.h" #include "Filesystem.h" #ifdef _WIN32 diff --git a/Common/Cpp/Json/JsonValue.cpp b/Common/Cpp/Json/JsonValue.cpp index ff134fc743..d7d99df846 100644 --- a/Common/Cpp/Json/JsonValue.cpp +++ b/Common/Cpp/Json/JsonValue.cpp @@ -6,6 +6,7 @@ #include "3rdParty-Core/nlohmann/json.hpp" #include "Common/Cpp/Filesystem/FileIO.h" +#include "JsonValue.h" #include "JsonArray.h" #include "JsonObject.h" #include "JsonTools.h" diff --git a/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp b/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp index 5177b70a76..785e01b539 100644 --- a/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp +++ b/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp @@ -5,6 +5,7 @@ */ +#include "MemoryUtilization.h" #if 0 diff --git a/Common/Cpp/Strings/StringTools.cpp b/Common/Cpp/Strings/StringTools.cpp index b438d7de35..590cc82cf6 100644 --- a/Common/Cpp/Strings/StringTools.cpp +++ b/Common/Cpp/Strings/StringTools.cpp @@ -8,6 +8,7 @@ #include #include #include +#include "StringTools.h" namespace PokemonAutomation{ namespace StringTools{ diff --git a/Common/Cpp/Time.cpp b/Common/Cpp/Time.cpp index 21d7acb31c..35a0474a9b 100644 --- a/Common/Cpp/Time.cpp +++ b/Common/Cpp/Time.cpp @@ -8,6 +8,7 @@ //#include #include #include "Common/Cpp/PrettyPrint.h" +#include "Time.h" namespace PokemonAutomation{ diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp index 7b30b7cb68..79315b76fc 100644 --- a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp +++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp @@ -8,6 +8,7 @@ #include "Common/CRC32/pabb_CRC32.h" #include "PABotBase2_PacketSender.h" #include "PABotBase2_StreamCoalescer.h" +#include "PABotBase2_ConnectionDebug.h" namespace PokemonAutomation{ namespace PABotBase2{ diff --git a/Common/Qt/CodeValidator.cpp b/Common/Qt/CodeValidator.cpp index fc5d7ba038..1cc9b5bf0f 100644 --- a/Common/Qt/CodeValidator.cpp +++ b/Common/Qt/CodeValidator.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CodeValidator.h" namespace PokemonAutomation{ diff --git a/Common/Qt/CollapsibleGroupBox.cpp b/Common/Qt/CollapsibleGroupBox.cpp index 56b9421d55..8f718b48cc 100644 --- a/Common/Qt/CollapsibleGroupBox.cpp +++ b/Common/Qt/CollapsibleGroupBox.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "CollapsibleGroupBox.h" diff --git a/Common/Qt/Options/BatchWidget.cpp b/Common/Qt/Options/BatchWidget.cpp index 1f973c98fa..c7ced97007 100644 --- a/Common/Qt/Options/BatchWidget.cpp +++ b/Common/Qt/Options/BatchWidget.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include "BatchWidget.h" diff --git a/Common/Qt/Options/BooleanCheckBoxWidget.cpp b/Common/Qt/Options/BooleanCheckBoxWidget.cpp index 86c19a2159..38d60176b2 100644 --- a/Common/Qt/Options/BooleanCheckBoxWidget.cpp +++ b/Common/Qt/Options/BooleanCheckBoxWidget.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "BooleanCheckBoxWidget.h" namespace PokemonAutomation{ diff --git a/Common/Qt/Options/BoxFloatWidget.cpp b/Common/Qt/Options/BoxFloatWidget.cpp index d2c4d56bbb..31f72d50bc 100644 --- a/Common/Qt/Options/BoxFloatWidget.cpp +++ b/Common/Qt/Options/BoxFloatWidget.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include #include "Common/Cpp/Strings/StringTools.h" diff --git a/Common/Qt/Options/ButtonWidget.cpp b/Common/Qt/Options/ButtonWidget.cpp index 4c1b4723db..d5f2f9726d 100644 --- a/Common/Qt/Options/ButtonWidget.cpp +++ b/Common/Qt/Options/ButtonWidget.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "ButtonWidget.h" //using std::cout; diff --git a/Common/Qt/Options/EditableTableWidget.cpp b/Common/Qt/Options/EditableTableWidget.cpp index ec6440eaa1..d5d0e02729 100644 --- a/Common/Qt/Options/EditableTableWidget.cpp +++ b/Common/Qt/Options/EditableTableWidget.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include "Common/Cpp/Json/JsonValue.h" diff --git a/Common/Qt/Options/EnumDropdownWidget.cpp b/Common/Qt/Options/EnumDropdownWidget.cpp index 22f16f812c..1a82c4821c 100644 --- a/Common/Qt/Options/EnumDropdownWidget.cpp +++ b/Common/Qt/Options/EnumDropdownWidget.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "EnumDropdownWidget.h" namespace PokemonAutomation{ diff --git a/Common/Qt/Options/FloatingPointWidget.cpp b/Common/Qt/Options/FloatingPointWidget.cpp index 5a95bda330..ec91dfd02f 100644 --- a/Common/Qt/Options/FloatingPointWidget.cpp +++ b/Common/Qt/Options/FloatingPointWidget.cpp @@ -6,7 +6,9 @@ #include #include +#include #include "Common/Cpp/PrettyPrint.h" +#include "ConfigWidget.h" #include "FloatingPointWidget.h" //#include diff --git a/Common/Qt/Options/IntegerRangeWidget.cpp b/Common/Qt/Options/IntegerRangeWidget.cpp index a668fe9629..90ea350b34 100644 --- a/Common/Qt/Options/IntegerRangeWidget.cpp +++ b/Common/Qt/Options/IntegerRangeWidget.cpp @@ -6,6 +6,8 @@ #include #include +#include +#include "ConfigWidget.h" #include "IntegerRangeWidget.h" namespace PokemonAutomation{ diff --git a/Common/Qt/Options/MacAddressWidget.cpp b/Common/Qt/Options/MacAddressWidget.cpp index eb291392a6..097154c712 100644 --- a/Common/Qt/Options/MacAddressWidget.cpp +++ b/Common/Qt/Options/MacAddressWidget.cpp @@ -4,6 +4,8 @@ * */ +#include +#include "ConfigWidget.h" #include "MacAddressWidget.h" //#include diff --git a/Common/Qt/Options/PathWidget.cpp b/Common/Qt/Options/PathWidget.cpp index 52330cb2d8..ebf214e425 100644 --- a/Common/Qt/Options/PathWidget.cpp +++ b/Common/Qt/Options/PathWidget.cpp @@ -6,6 +6,8 @@ #include #include +#include +#include #include #include "PathWidget.h" diff --git a/Common/Qt/Options/SimpleIntegerWidget.cpp b/Common/Qt/Options/SimpleIntegerWidget.cpp index 950cdb10ed..5db4f209a0 100644 --- a/Common/Qt/Options/SimpleIntegerWidget.cpp +++ b/Common/Qt/Options/SimpleIntegerWidget.cpp @@ -6,6 +6,8 @@ #include #include +#include +#include "ConfigWidget.h" #include "SimpleIntegerWidget.h" //#include diff --git a/Common/Qt/Options/StaticTextWidget.cpp b/Common/Qt/Options/StaticTextWidget.cpp index 34a7c5681a..d8f6380a36 100644 --- a/Common/Qt/Options/StaticTextWidget.cpp +++ b/Common/Qt/Options/StaticTextWidget.cpp @@ -5,6 +5,7 @@ */ #include +#include #include #include "StaticTextWidget.h" diff --git a/Common/Qt/Options/StringWidget.cpp b/Common/Qt/Options/StringWidget.cpp index 3e5eaa6fdb..8a21bf6cab 100644 --- a/Common/Qt/Options/StringWidget.cpp +++ b/Common/Qt/Options/StringWidget.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "StringWidget.h" // #include diff --git a/Common/Qt/Options/TimeDurationWidget.cpp b/Common/Qt/Options/TimeDurationWidget.cpp index 57f5c25ad1..7973c29ffc 100644 --- a/Common/Qt/Options/TimeDurationWidget.cpp +++ b/Common/Qt/Options/TimeDurationWidget.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "TimeDurationWidget.h" //#include diff --git a/Common/Qt/QtThreadPool_Tests.cpp b/Common/Qt/QtThreadPool_Tests.cpp index bb916fbc0f..e2b7d8e51e 100644 --- a/Common/Qt/QtThreadPool_Tests.cpp +++ b/Common/Qt/QtThreadPool_Tests.cpp @@ -7,10 +7,13 @@ #include #include #include +#include #include "Common/Cpp/Concurrency/Mutex.h" #include "Common/Cpp/Concurrency/ThreadPool.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "GlobalThreadPoolsQt.h" +#include "QtThreadPool.h" +#include "QtThreadPool_Tests.h" namespace PokemonAutomation{ diff --git a/Common/Qt/StringToolsQt.cpp b/Common/Qt/StringToolsQt.cpp index eb83a145ff..df13d1aac4 100644 --- a/Common/Qt/StringToolsQt.cpp +++ b/Common/Qt/StringToolsQt.cpp @@ -5,6 +5,7 @@ */ #include +#include "StringToolsQt.h" namespace PokemonAutomation{ diff --git a/Common/Qt/TimeQt.cpp b/Common/Qt/TimeQt.cpp index b93468372b..6973f78799 100644 --- a/Common/Qt/TimeQt.cpp +++ b/Common/Qt/TimeQt.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp index aa761067a0..353444aaec 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp @@ -14,6 +14,7 @@ #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/AudioPipeline/AudioInfo.h" +#include "AudioInfo_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp index 7acc40937a..efdeefb9f3 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp @@ -4,6 +4,7 @@ * */ +#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/Pimpl.tpp" #include "Common/Cpp/Logging/AbstractLogger.h" @@ -11,6 +12,7 @@ #include "Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h" #include "Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h" #include "Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.h" +#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h" #include "CommonFramework/AudioPipeline/Tools/ChannelMixer.h" #include "CommonFramework/AudioPipeline/AudioSource.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp index a347d586b8..4a4ee9a587 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp @@ -6,8 +6,11 @@ #include #include +#include #include +#include #include +#include #include "3rdParty/QtWavFile/WavFile.h" #include "Common/Qt/StringToolsQt.h" #include "Common/Qt/GlobalThreadPoolsQt.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp index b95d0fef31..9e1d108ea3 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp @@ -15,7 +15,9 @@ #include #include #include +#include #include +#include #include #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" @@ -23,6 +25,7 @@ #include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h" #include "CommonFramework/AudioPipeline/IO/AudioFileLoader.h" #include "CommonFramework/AudioPipeline/IO/AudioInputFile.h" +#include "AudioFileLoader_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp index 39ad24b89d..c17dc78347 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp @@ -5,8 +5,11 @@ */ #include +#include #include +#include #include +#include #include #include "3rdParty/QtWavFile/WavFile.h" #include "Common/Cpp/Exceptions.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp index f47bf6e87a..a85292a357 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp @@ -28,7 +28,9 @@ #include #include #include +#include #include +#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/TestRunners/UnitTest.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp index cebff40b60..384371610b 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp @@ -9,6 +9,7 @@ #include #include #include "Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h" +#include "AudioFormatUtils.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp index 76f0a7374e..43a94bfbc2 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "ChannelMixer.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp index 2e8856192b..067856b751 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp @@ -6,6 +6,7 @@ #include +#include #include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" #include "AudioDisplayWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp index fd4c17fc09..a592971bfb 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp @@ -6,11 +6,13 @@ #include #include +#include #include #include #include "Common/Qt/NoWheelComboBox.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Panels/ConsoleSettingsStretch.h" +#include "CommonFramework/AudioPipeline/AudioSession.h" #include "CommonFramework/AudioPipeline/AudioPipelineOptions.h" #include "CommonFramework/AudioPipeline/Sources/AudioSource_Null.h" diff --git a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp index a42e6aa334..3988946c81 100644 --- a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp +++ b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp @@ -4,6 +4,7 @@ * */ +#include "SystemSleep.h" #if 0 #elif _WIN32 diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp index 24fcef320f..450c3e6398 100644 --- a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp +++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp @@ -5,6 +5,7 @@ */ #include +#include #include "Common/Cpp/Filesystem/FileIO.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/PrettyPrint.h" @@ -18,8 +19,11 @@ #include "CommonFramework/Globals.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Logging/Logger.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/Recording/StreamHistorySession.h" +#include "CommonFramework/Tools/GlobalThreadPools.h" #include "ProgramDumper.h" #include "ErrorReports.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp index 6ac37c993a..e39abc8f4d 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp @@ -8,6 +8,7 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/VideoStream.h" #include "CommonFramework/Tools/ProgramEnvironment.h" +#include "CommonFramework/Notifications/EventNotificationOption.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "FatalProgramException.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp index 207b8fa96b..4805d744df 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Tools/ProgramEnvironment.h" +#include "CommonFramework/Notifications/EventNotificationOption.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "OperationFailedException.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp index 0b3d724c70..984f6be2f8 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp @@ -4,8 +4,10 @@ * */ +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ProgramEnvironment.h" +#include "CommonFramework/Notifications/EventNotificationOption.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "OperationFailedExceptionWithScreenshot.h" diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp index 66f2875689..a47c52dde4 100644 --- a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp +++ b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp @@ -4,6 +4,8 @@ * */ +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "ProgramFinishedException.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/GlobalServices.cpp b/SerialPrograms/Source/CommonFramework/GlobalServices.cpp index 08f76dcb9d..a9257efb8c 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalServices.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalServices.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Concurrency/Watchdog.h" #include "Common/Cpp/Concurrency/PeriodicRunner.h" #include "CommonFramework/Tools/GlobalThreadPools.h" +#include "GlobalServices.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index b9b4132c65..a47e919dfa 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -17,6 +17,7 @@ #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" #include "Common/Cpp/Options/KeyboardLayoutOption.h" +#include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Options/CheckForUpdatesOption.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp index 97f6e8807a..af2735aae2 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Rectangle.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/ImageTypes/ImageViewHSV32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "ImageBoxes.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp index b1f750a372..888fa2b3db 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp @@ -10,6 +10,7 @@ #include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h" #include "Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h" #include "Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "ImageDiff.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp index b7100c2df7..4a916423e8 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp @@ -9,6 +9,7 @@ #include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "ImageBoxes.h" #include "ImageStats.h" diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp index a3895ad335..92a2761dab 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Containers/Pimpl.tpp" #include "Common/Cpp/Containers/AlignedVector.tpp" #include "ImageViewRGB32.h" +#include "ImageViewHSV32.h" #include "ImageHSV32.h" #ifndef M_PI diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp index 2f919b367f..c6d9dc5b7a 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp @@ -7,6 +7,7 @@ #include #include "Common/Cpp/Containers/AlignedVector.tpp" #include "CompileTimeBackends.h" +#include "ImageViewRGB32.h" #include "ImageRGB32.h" #ifdef PA_IMAGE_BACKEND_Qt diff --git a/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp b/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp index 96c58fd70f..d9c31e627a 100644 --- a/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp +++ b/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp @@ -8,6 +8,7 @@ #include "Common/Cpp/Logging/TaggedLogger.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Options/BooleanCheckBoxOption.h" +#include "Logger.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp index e1d9c1ebaf..2e245aff3f 100644 --- a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp +++ b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Strings/Unicode.h" +#include "QueuedLogger.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Main.cpp b/SerialPrograms/Source/CommonFramework/Main.cpp index 98a1d89e6d..da51bec2d6 100644 --- a/SerialPrograms/Source/CommonFramework/Main.cpp +++ b/SerialPrograms/Source/CommonFramework/Main.cpp @@ -24,6 +24,8 @@ #include "ControllerInput/ControllerInput.h" #include "Controllers/SerialPort/SerialPortPollerQt.h" #include "Integrations/DiscordSettingsOption.h" +#include "Integrations/DiscordSocial/DiscordSocial.h" +#include "Integrations/DppIntegration/DppClient.h" #include "Integrations/DiscordWebhook.h" #include "VideoPipeline/Backends/MediaServicesQt6.h" #include "ErrorReports/ProgramDumper.h" @@ -31,6 +33,7 @@ #include "Environment/HardwareValidation.h" //#include "Tools/StatsDatabase.h" //#include "Windows/DpiScaler.h" +#include "Logging/Logger.h" #include "Logging/OutputRedirector.h" #include "Startup/SetupSettings.h" #include "Startup/NewVersionCheck.h" diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp index 5f4df92ca6..cbfd45f991 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Notifications/ProgramNotifications.h" diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp index 1271aa9b06..61d8843dde 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp @@ -16,6 +16,7 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "Integrations/DiscordSettingsOption.h" #include "Integrations/DiscordWebhook.h" +#include "Integrations/DppIntegration/DppClient.h" #include "ProgramNotifications.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp index 3cb7ec26c2..0ec28eb330 100644 --- a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp @@ -5,6 +5,8 @@ */ #include +#include +#include #include "CommonFramework/Windows/DpiScaler.h" #include "ThemeSelectorOption.h" diff --git a/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp index 7f4c5f148a..253807ae5a 100644 --- a/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include "CommonFramework/GlobalAutoPaths.h" diff --git a/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp index cc15e58962..b2bb683fb7 100644 --- a/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Windows/DpiScaler.h" #include "ResolutionOption.h" diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp index 00b469c57a..0738c56844 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Json/JsonValue.h" +#include "OptionsPanel.h" #include "OptionsPanelSession.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp index f6e98935d5..016d3cedc9 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp @@ -4,6 +4,7 @@ * */ +#include "PanelDescriptor.h" #include "PanelSession.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp index 9853f1c21d..a61d84b49c 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "Common/Cpp/ColoredText.h" #include "Common/Qt/Options/ConfigWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp index e64b232141..9d0dd998dd 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp @@ -5,6 +5,8 @@ */ #include "Common/Qt/CollapsibleGroupBox.h" +#include "CommonFramework/Panels/PanelDescriptor.h" +#include "CommonFramework/Panels/PanelSession.h" #include "PanelElements.h" #include "PanelWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp b/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp index db6beef5b7..49062381db 100644 --- a/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp +++ b/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp @@ -8,6 +8,7 @@ #include "Common/Cpp/Json/JsonValue.h" //#include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" +#include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Logging/Logger.h" diff --git a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp index f7ba20faf9..f4176b9199 100644 --- a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp +++ b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp @@ -12,15 +12,18 @@ #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Options/Environment/SleepSuppressOption.h" #include "CommonFramework/ProgramSession.h" #include "CommonFramework/ProgramStats/StatsDatabase.h" +#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/Panels/ProgramDescriptor.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h" #include "CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h" +#include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h" #include "Integrations/ProgramTracker.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp index 17674e69d1..48f35792a5 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp @@ -10,6 +10,8 @@ #include "Common/Cpp/Containers/Pimpl.tpp" // Pimpl (AudioFormat) instantiations #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/AudioPipeline/AudioInfo.h" +#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" #include "CommonFramework/Recording/StreamHistoryOption.h" #if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8) diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp index 7931b21f8d..e693ed6480 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp @@ -8,15 +8,19 @@ #if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8) #include #include +#include #include #include #include #include +#include +#include #include "Common/Cpp/Filesystem/Filesystem.h" //#include "Common/Qt/Redispatch.h" #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Concurrency/SpinPause.h" #include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" #include "CommonFramework/Recording/StreamHistoryOption.h" #include "StreamRecorder.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp index 695d36acd1..bdf6e944f5 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp @@ -6,6 +6,8 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h" +#include "CommonFramework/ResourceDownload/ResourceDownload.h" #include "GlobalResourceDownloadManager.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp index a75c784ee1..ac9b7ab058 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp @@ -4,6 +4,8 @@ * */ +#include +#include "CommonFramework/ProgramSession.h" #include "ProgramResourceDownloadWidget.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp index 2d5572f0b6..8b1f097b90 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp @@ -6,6 +6,7 @@ #include +#include "CommonFramework/GlobalSettingsPanel.h" #include "GlobalResourceDownloadManager.h" #include "ResourceDownload.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp index cc566273df..da332ff555 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp @@ -4,6 +4,7 @@ * */ +#include "SettingsResourceDownloadRow.h" #include "SettingsResourceDownloadOptions.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp index 2f1e65aabc..771a40c464 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "ResourceDownload.h" #include "SettingsResourceDownloadRow.h" #include "SettingsResourceDownloadTable.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp index 15da01ba61..c8338b0ad5 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp @@ -5,6 +5,8 @@ */ #include +#include +#include #include #include #include "SettingsResourceDownloadWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp index 25f72e6154..0b97087853 100644 --- a/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp +++ b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp @@ -14,6 +14,7 @@ #include "CommonFramework/Tools/FileDownloader.h" #include "CommonFramework/Globals.h" #include "CommonFramework/GlobalSettingsPanel.h" +#include "NewVersionCheck.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp index 3bfab5b0ca..92773fb09a 100644 --- a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp +++ b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp @@ -14,6 +14,7 @@ #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Logging/AbstractLogger.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "SetupSettings.h" using std::cout; using std::endl; diff --git a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp index 6743d0cee7..9a225c78f0 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp @@ -9,6 +9,7 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "DebugDumper.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp index a44f2438cc..08eb18ce12 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp @@ -9,7 +9,10 @@ #include "Common/Cpp/Concurrency/Mutex.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" //#include "CommonFramework/Notifications/EventNotificationOption.h" +#include "CommonFramework/Notifications/ProgramInfo.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ErrorReports/ErrorReports.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" //#include "CommonFramework/VideoPipeline/VideoOverlay.h" diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp index 5f7818a250..9a71651d9b 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp @@ -5,8 +5,15 @@ */ #include +#include +#include +#include +#include +#include #include +#include #include +#include #include "Common/Cpp/Filesystem/FileIO.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Json/JsonValue.h" diff --git a/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp index e34e9c20a7..82b9aefe2b 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Concurrency/Backends/ThreadPool_Default.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Options/Environment/PerformanceOptions.h" +#include "GlobalThreadPools.h" namespace PokemonAutomation{ namespace GlobalThreadPools{ diff --git a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp index 783219f4db..07e95a1a16 100644 --- a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp +++ b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp @@ -5,7 +5,9 @@ */ #include "CommonFramework/ProgramSession.h" +#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "ProgramEnvironment.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp index 9943fdec93..3f42cbe10f 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp @@ -9,6 +9,7 @@ #include "CommonFramework/Globals.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/VideoPipeline/VideoPipelineOptions.h" +#include "CameraImplementations.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp index 3d6a8e7935..fc6ceeceaf 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include "Common/Qt/Redispatch.h" #include "CommonFramework/Logging/Logger.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp index d01359c103..13b6dff18d 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include #include "Common/Qt/Redispatch.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp index e66be301ab..5264a3aea9 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp @@ -4,6 +4,9 @@ * */ +#include +#include +#include #include #include #include "Common/Qt/Redispatch.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp index 35169a8b9f..d663439275 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp @@ -4,6 +4,7 @@ * */ +#include #include "VideoFrameQt.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp index 41fa6798e9..3cf22bde94 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp index 914d8a0e8b..5c4e5c8a03 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp @@ -11,6 +11,7 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "Common/Qt/Redispatch.h" +#include "VideoDisplayWidget.h" #include "VideoDisplayWindow.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp index 190abbca39..a95e131d33 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp @@ -4,9 +4,11 @@ * */ +#include #include #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Windows/WindowTracker.h" +#include "VideoDisplayWidget.h" #include "VideoDisplayWindow.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp index 1991c3b38a..8a2ba7cfd7 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp @@ -5,6 +5,7 @@ */ #include +#include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" #include "CommonFramework/GlobalServices.h" #include "VideoOverlayWidget.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp index 94e0ef5a5e..10957abbd6 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include "Common/Qt/NoWheelComboBox.h" #include "CommonFramework/GlobalSettingsPanel.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp index 5277cc16d0..645d252435 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp @@ -4,6 +4,7 @@ * */ #include "Common/Cpp/Containers/Pimpl.tpp" +#include "VideoOverlay.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp index e94a9fe38b..171e00177a 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp @@ -4,6 +4,7 @@ * */ +#include #include "DpiScaler.h" //#include diff --git a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp index df6e62bb99..c592430897 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp @@ -8,9 +8,11 @@ #include //#include #include +#include #include #include #include +#include #include #include #include "Common/Cpp/ScopeExit.h" @@ -22,6 +24,7 @@ #include "Common/Cpp/ColoredText.h" #include "Common/Qt/CollapsibleGroupBox.h" #include "Common/Qt/UiStateQtWidget.h" +#include "PanelLists.h" #include "CommonFramework/Globals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/GlobalSettingsPanel.h" diff --git a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp index 9952814144..bacbd465d6 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp @@ -7,6 +7,7 @@ #include #include #include "Common/Cpp/Concurrency/Mutex.h" +#include "WindowTracker.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp index 18d06855a3..16864dae68 100644 --- a/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp +++ b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/CancellableScope.h" #include "Common/Cpp/Concurrency/AsyncTask.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "InferenceSession.h" #include "InferenceRoutines.h" diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp b/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp index fe5c66115a..4373312088 100644 --- a/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp +++ b/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp @@ -6,6 +6,8 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Tools/VideoStream.h" +#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" +#include "CommonTools/InferenceCallbacks/AudioInferenceCallback.h" #include "CommonTools/InferencePivots/VisualInferencePivot.h" #include "CommonTools/InferencePivots/AudioInferencePivot.h" #include "InferenceSession.h" diff --git a/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp index 297f111674..db1ef063a6 100644 --- a/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp +++ b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/AudioPipeline/AudioFeed.h" #include "SpectrogramMatcher.h" #include "AudioPerSpectrumDetectorBase.h" diff --git a/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp index 9b3aec2d0f..1ee4c7ac09 100644 --- a/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp @@ -8,6 +8,8 @@ #include "Common/Cpp/Containers/AlignedVector.tpp" #include "Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h" #include "Kernels/SpikeConvolution/Kernels_SpikeConvolution.h" +#include "CommonFramework/AudioPipeline/AudioFeed.h" +#include "CommonFramework/AudioPipeline/AudioTemplate.h" #include "SpectrogramMatcher.h" //#include diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp index 8e4db82d73..63802485c9 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp @@ -8,6 +8,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Logging/Logger.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/DebugDumper.h" //#include "ImageDiff.h" #include "ImageCropper.h" diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp index 015617d9c2..711a1dcff0 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp @@ -7,7 +7,9 @@ #include #include #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageDiff.h" #include "ExactImageDictionaryMatcher.h" //#include diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp index 853c62d936..682bd1ffd9 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/CpuId/CpuId.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "FilterToAlpha.h" #ifdef PA_ARCH_x86 #include diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp index 0a6c775f5b..0c2b424177 100644 --- a/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp +++ b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp @@ -6,6 +6,8 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Concurrency/SpinLock.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "ImageCropper.h" #include "SilhouetteDictionaryMatcher.h" diff --git a/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp index c54582d6f3..a0d3cb2239 100644 --- a/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp +++ b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/FixedLimitVector.tpp" +#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" diff --git a/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp b/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp index 40f4c42ea1..56d712501a 100644 --- a/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp +++ b/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp @@ -5,6 +5,7 @@ */ #include +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "ColorClustering.h" //#include diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp index 38c766ee0e..3b9303468c 100644 --- a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp +++ b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp @@ -8,7 +8,10 @@ #include "Kernels/ImageFilters/Kernels_ImageFilter_Misc.h" #include "Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h" #include "Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h" +#include "Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h" +#include "CommonFramework/ImageTypes/ImageViewHSV32.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "ImageFilter.h" diff --git a/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp b/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp index 8cdf25e233..be6233e449 100644 --- a/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp +++ b/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp @@ -4,7 +4,10 @@ * */ #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/FloatPixel.h" #include "CommonTools/Images/SolidColorTest.h" +#include "ImageTools.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp index 60bedfca81..faf0a8e65f 100644 --- a/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp +++ b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp @@ -7,6 +7,7 @@ #include #include #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "SolidColorTest.h" using std::cout; diff --git a/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp index 84b8dc5059..577b21a89b 100644 --- a/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp +++ b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp @@ -7,8 +7,11 @@ #include #include "Common/Cpp/Color.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Logging/Logger.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp index 384e1ba015..5e3a430b90 100644 --- a/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp +++ b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Tools/GlobalThreadPools.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "VisualInferencePivot.h" //#include diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp index 3626d167fd..3da7906c33 100644 --- a/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp +++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp @@ -5,8 +5,10 @@ */ #include +#include #include #include +#include #include "Common/Qt/NoWheelComboBox.h" #include "CommonFramework/Globals.h" #include "LanguageOCRWidget.h" diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp index 97af10f8ae..f9aa615c71 100644 --- a/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp +++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp @@ -9,7 +9,9 @@ #include #include #include +#include #include +#include #include "CommonFramework/ImageTypes/ImageRGB32_Qt.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "ScreenWatchWidget.h" diff --git a/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp index 962ee6477e..7ec5ca95b9 100644 --- a/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp +++ b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp @@ -4,6 +4,8 @@ * */ +#include +#include #include #include #include "Common/Cpp/Containers/Pimpl.tpp" diff --git a/SerialPrograms/Source/CommonTools/Random.cpp b/SerialPrograms/Source/CommonTools/Random.cpp index 48f6867f5f..b96e43ce3c 100644 --- a/SerialPrograms/Source/CommonTools/Random.cpp +++ b/SerialPrograms/Source/CommonTools/Random.cpp @@ -7,6 +7,7 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/CRC32/pabb_CRC32.h" +#include "Random.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp index 322ebc0dee..9a615e8b4c 100644 --- a/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp +++ b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonObject.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "SpriteDatabase.h" diff --git a/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp index bd2eab6e1b..cb01c5ee7e 100644 --- a/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp +++ b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp @@ -5,7 +5,9 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "VideoResolutionCheck.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp index 889dd471e8..ba1c67e9ff 100644 --- a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp +++ b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "BlackBorderDetector.h" diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp index b581a59e18..d3d07d81b7 100644 --- a/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp +++ b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "FrozenImageDetector.h" diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp index 76883c5990..f9c9544e59 100644 --- a/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp +++ b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp @@ -5,9 +5,11 @@ */ #include +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "ImageMatchDetector.h" //#include diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp index 7848bf8e8c..68eccd5d0f 100644 --- a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp +++ b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp @@ -5,6 +5,7 @@ */ #include "ComputerPrograms/Framework/ComputerProgramSession.h" +#include "ComputerProgram.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp index 5e09b6382d..33e98d3a3c 100644 --- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp +++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp @@ -5,6 +5,11 @@ */ #include "Common/Cpp/Json/JsonValue.h" +#include "CommonFramework/Exceptions/FatalProgramException.h" +#include "CommonFramework/Exceptions/ProgramFinishedException.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramInfo.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "ComputerProgramSession.h" //#include diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp index 51b805f72e..0387b85c13 100644 --- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp +++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp @@ -7,6 +7,7 @@ #include #include "Common/Cpp/ScopeExit.h" #include "CommonFramework/Panels/PanelTools.h" +#include "CommonFramework/Panels/UI/PanelElements.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h" #include "ComputerProgramWidget.h" diff --git a/SerialPrograms/Source/ControllerInput/ControllerInput.cpp b/SerialPrograms/Source/ControllerInput/ControllerInput.cpp index f91dcd3983..3e6b059654 100644 --- a/SerialPrograms/Source/ControllerInput/ControllerInput.cpp +++ b/SerialPrograms/Source/ControllerInput/ControllerInput.cpp @@ -6,6 +6,7 @@ #include #include "Keyboard/GlobalKeyboardHidTracker.h" +#include "ControllerInput.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp index bb83e72075..734b7d64a3 100644 --- a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp +++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Logging/GlobalLogger.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Tools/GlobalThreadPools.h" +#include "KeyboardInput_State.h" #include "KeyboardInput_KeyMappings.h" #include "GlobalKeyboardHidTracker.h" diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp index 0b2fe0e002..f2218a3d72 100644 --- a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp +++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp @@ -4,6 +4,7 @@ * */ +#include #include "Common/Cpp/Concurrency/SpinLock.h" #include "GlobalQtKeyMap.h" diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp index 2af91009e9..a7e3c957b7 100644 --- a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp +++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp @@ -4,7 +4,9 @@ * */ +#include #include "CommonFramework/Logging/Logger.h" +#include "ControllerInput/Keyboard/GlobalQtKeyMap.h" #include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h" #include "KeyBindingWidget.h" diff --git a/SerialPrograms/Source/Controllers/ControllerOption.cpp b/SerialPrograms/Source/Controllers/ControllerOption.cpp index b37bc5a5bb..cfe095ab9a 100644 --- a/SerialPrograms/Source/Controllers/ControllerOption.cpp +++ b/SerialPrograms/Source/Controllers/ControllerOption.cpp @@ -8,6 +8,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonObject.h" #include "ControllerTypeStrings.h" +#include "ControllerDescriptor.h" #include "ControllerOption.h" #include "NullController.h" diff --git a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp index d6bdc47349..edb904f191 100644 --- a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp +++ b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp @@ -5,6 +5,7 @@ */ #include +#include #include #include #include "Common/Qt/NoWheelComboBox.h" diff --git a/SerialPrograms/Source/Controllers/ControllerStateTable.cpp b/SerialPrograms/Source/Controllers/ControllerStateTable.cpp index 0eec204553..dcb4c0713a 100644 --- a/SerialPrograms/Source/Controllers/ControllerStateTable.cpp +++ b/SerialPrograms/Source/Controllers/ControllerStateTable.cpp @@ -15,6 +15,7 @@ #include "NintendoSwitch/Options/TurboMacroTable.h" #include "ControllerTypeStrings.h" +#include "ControllerStateTable.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/Controllers/NullControllerWidget.cpp b/SerialPrograms/Source/Controllers/NullControllerWidget.cpp index 3de9ab4b5c..84e005d034 100644 --- a/SerialPrograms/Source/Controllers/NullControllerWidget.cpp +++ b/SerialPrograms/Source/Controllers/NullControllerWidget.cpp @@ -4,6 +4,7 @@ * */ +#include "NullControllerWidget.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp index ace0b54794..144d781703 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp @@ -6,6 +6,7 @@ //#include "Common/Cpp/CancellableScope.h" #include "NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h" +#include "PABotBase2_Connection.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp index c082f2eda1..78e8ce3d5d 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "PABotBase2_MessageHandler.h" namespace PokemonAutomation{ namespace PABotBase2{ diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp index a61f3e60be..4e9e7630bd 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp @@ -5,6 +5,7 @@ */ #ifdef QT_CORE_LIB +#include #include #include "Controllers/SerialPort/SerialPortPollerQt.h" #endif diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp index e9dff8d221..1df5607b2b 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Filesystem/Filesystem.h" +#include "SerialPABotBase2_Descriptor.h" #include "SerialPABotBase2_SelectorWidget.h" //#include diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp index 18fee8262d..364ee27502 100644 --- a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp +++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Containers/Pimpl.tpp" +#include "ControllerInput/ControllerInput.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" #ifdef QT_CORE_LIB #include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h" diff --git a/SerialPrograms/Source/GameConsole/ConsolePanel.cpp b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp index 4dfeeb899e..8736d5af45 100644 --- a/SerialPrograms/Source/GameConsole/ConsolePanel.cpp +++ b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Framework/ConsolePanelSession.h" +#include "ConsolePanel.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp b/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp index b6e8ec9ce5..814305cf83 100644 --- a/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp +++ b/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp @@ -4,8 +4,11 @@ * */ +#include "CommonFramework/Panels/PanelSession.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" +#include "Framework/ConsoleSystemSession.h" #include "Framework/ConsoleProgramSession.h" +#include "ConsoleProgram.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp index 39562f4f02..604dfd8649 100644 --- a/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp +++ b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp @@ -5,6 +5,7 @@ */ #include "Framework/MultiConsolePanelSession.h" +#include "MultiConsolePanel.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp index 4900803e14..1902ce6ab6 100644 --- a/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp +++ b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp @@ -6,9 +6,11 @@ #include "Common/Cpp/ScopeExit.h" #include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h" +#include "CommonFramework/Panels/PanelSession.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "Framework/MultiConsoleProgramSession.h" +#include "MultiConsoleProgram.h" namespace PokemonAutomation{ namespace GameConsole{ diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp index a6dec6a35c..f08cb88b21 100644 --- a/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp +++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/Globals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp index dffc7690b0..2a9a1ed5ab 100644 --- a/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp +++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp @@ -6,6 +6,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/Logging/Logger.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "GameConsole/Framework/ConsoleSystemSession.h" #include "GameConsole_WaterfillTemplateMaker.h" diff --git a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp index bc35832793..ec02dd74e1 100644 --- a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp +++ b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp @@ -4,6 +4,8 @@ * */ +#include +#include #include "CommandRowWidget.h" #include "ConsoleSystemWidget.h" diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp index 719b06d60f..78f391080c 100644 --- a/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp +++ b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp @@ -4,6 +4,7 @@ * */ +#include #include #include #include "Common/Qt/Redispatch.h" diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp index f3c2d592f0..ec1fe03cd2 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Strings/Unicode.h" #include "Common/Qt/StringToolsQt.h" +#include "Integrations/DppIntegration/DppClient.h" #include "DiscordIntegrationSettings.h" //#include diff --git a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp index 8f781792ec..9787872593 100644 --- a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp +++ b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp @@ -5,6 +5,7 @@ */ #include "Common/Qt/Options/BatchWidget.h" +#include "CommonFramework/GlobalSettingsPanel.h" #include "DiscordSettingsOption.h" //#include diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp index d830bc23fc..30e58621a6 100644 --- a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp +++ b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp @@ -5,9 +5,11 @@ */ #include +#include #include #include #include +#include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Json/JsonArray.h" diff --git a/SerialPrograms/Source/Integrations/ProgramTracker.cpp b/SerialPrograms/Source/Integrations/ProgramTracker.cpp index f2e547f0d3..ca3c242416 100644 --- a/SerialPrograms/Source/Integrations/ProgramTracker.cpp +++ b/SerialPrograms/Source/Integrations/ProgramTracker.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Logging/Logger.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "Controllers/ControllerSession.h" #include "ProgramTracker.h" diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp index 447224602f..e03d55a2f9 100644 --- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp +++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp @@ -7,6 +7,7 @@ #include #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels_AbsFFT.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp index c602305117..917e2fe5d8 100644 --- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp +++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp @@ -4,6 +4,7 @@ * */ +#include "Kernels_AbsFFT_Arch_Default.h" #include "Kernels_AbsFFT_TwiddleTable.tpp" #include "Kernels_AbsFFT_FullTransform.tpp" diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp index a851779ead..0102f8776d 100644 --- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp @@ -7,6 +7,7 @@ #ifdef PA_AutoDispatch_arm64_20_M1 #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels_AbsFFT_Arch_arm64_NEON.h" #include "Kernels_AbsFFT_BaseTransform_arm64_NEON.h" #include "Kernels_AbsFFT_TwiddleTable.tpp" #include "Kernels_AbsFFT_FullTransform.tpp" diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp index 4be58a7054..2a546c3eff 100644 --- a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp +++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/CpuId/CpuId.h" +#include "Kernels_AudioChannelInterleave.h" #include "Kernels_AudioChannelInterleave_Default.h" diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp index 2ff6853dd1..62ddf2f92a 100644 --- a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp +++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp @@ -13,6 +13,7 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Containers/AlignedVector.tpp" #include "Kernels/Kernels_Alignment.h" +#include "Kernels_AudioResampler_BlockKernels.h" #include "Kernels_AudioResampler.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp index 38181daa1e..7332a6f059 100644 --- a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp @@ -9,6 +9,7 @@ #include #include "Common/Compiler.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels_AudioResampler_BlockKernels.h" #include "Kernels_AudioResampler_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp index 4815ef2a71..f9d2c642c4 100644 --- a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp +++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp @@ -17,6 +17,7 @@ #include "Common/Cpp/Containers/GuardPageBuffer.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/KaiserWindow/Kernels_KaiserWindow.h" +#include "Kernels_AudioResampler_BlockKernels.h" #include "Kernels_AudioResampler_Tests.h" #include "Kernels_AudioResampler.h" diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp index c0bacdff98..788f3c36ea 100644 --- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp +++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp @@ -21,6 +21,7 @@ #include "Kernels_BinaryMatrixTile_64x8_arm64_NEON.h" #endif #include "Tests/GuardPageImage.h" +#include "Kernels_BinaryMatrix_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp index f82e32218f..c64000c503 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "Kernels_ImageFilter_Misc.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp index 8039327150..bf52143442 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp @@ -14,6 +14,7 @@ #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Tests/GuardPageImage.h" #include "RGB32_Range/Kernels_ImageFilter_RGB32_Range.h" +#include "Kernels_ImageFilter_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp index daeaf1bcbc..6fe7d5c0ea 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/CpuId/CpuId.h" +#include "Kernels_ImageFilter_RGB32_Euclidean.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp index 6b129fa11d..c0b85069fa 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp @@ -8,6 +8,7 @@ #include #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h" +#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h" #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp index 4f26e7be5e..da9cc8166f 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp @@ -24,7 +24,9 @@ #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/Containers/AlignedVector.tpp" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h" #include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" +#include "Kernels_ImageFilter_RGB32_Euclidean_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp index 336e41bb8b..c0838d14bc 100644 --- a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp @@ -7,6 +7,7 @@ #ifdef PA_AutoDispatch_arm64_20_M1 #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h" #include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h" +#include "Kernels_ImageFilter_RGB32_Range_Routines.h" #include "Kernels_ImageFilter_RGB32_Range.h" diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp index c177704a51..f2f2afd678 100644 --- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp +++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/CpuId/CpuId.h" +#include "Kernels_ImageScaleBrightness.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp index 067fc556a2..398247f723 100644 --- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp +++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp @@ -12,6 +12,7 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Tests/GuardPageImage.h" +#include "Kernels_ImageScaleBrightness_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp index 5344f351e7..cd76ac1fd8 100644 --- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp +++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp @@ -8,6 +8,7 @@ #include "Common/Compiler.h" #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels_ImagePixelSumSqrDev.h" #include "Kernels_ImagePixelSumSqrDev_TestInfra.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp index d43319cddb..bae7806331 100644 --- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp +++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels_ImagePixelSumSqr.h" #include "Kernels_ImagePixelSumSqr_TestInfra.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp index 94a9468428..22c69238ed 100644 --- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp +++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp @@ -11,6 +11,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/Kernels_arm64_NEON.h" #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h" +#include "Kernels_ImagePixelSumSqr.h" #include "Kernels_ImagePixelSumSqr_TestInfra.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Kernels/Kernels_Tests.cpp b/SerialPrograms/Source/Kernels/Kernels_Tests.cpp index 0b8ee7e957..5ffc505c80 100644 --- a/SerialPrograms/Source/Kernels/Kernels_Tests.cpp +++ b/SerialPrograms/Source/Kernels/Kernels_Tests.cpp @@ -18,6 +18,7 @@ #include "ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h" #include "SpikeConvolution/Kernels_SpikeConvolution.h" #include "Waterfill/Kernels_Waterfill_Tests.h" +#include "Kernels_Tests.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp index cc5384966f..e44910295d 100644 --- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp +++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels_SpikeConvolution.h" namespace PokemonAutomation{ namespace Kernels{ diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp index aa49122057..bd2654116d 100644 --- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp +++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp @@ -8,11 +8,14 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/CpuId/CpuId.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h" #include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Tests/GuardPageImage.h" #include "Tests/TestUtils.h" +#include "Kernels_Waterfill_Tests.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp index 8ad09998b4..d05a3edbd2 100644 --- a/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp +++ b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp @@ -21,6 +21,7 @@ #include "Common/Cpp/Strings/StringTools.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/PrettyPrint.h" +#include "ML_AnnotationIO.h" #include "ML_SegmentAnythingModelConstants.h" #include "ML_ObjectAnnotation.h" diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp index e76076f998..98e36dd0e1 100644 --- a/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp +++ b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp index 3b6fa5d94f..8772d02c9a 100644 --- a/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp +++ b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp @@ -8,11 +8,16 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "ML/Inference/ML_YOLOv5Detector.h" #include "ML/Models/ML_YOLOv5Model.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h" #include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h" +#include "ML_YOLONavigation.h" using namespace std::chrono_literals; diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp index 2cc79e0453..715f6bbf36 100644 --- a/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp +++ b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp @@ -11,8 +11,11 @@ #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Options/Environment/PerformanceOptions.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "ML_YOLOv5Detector.h" //#include diff --git a/SerialPrograms/Source/ML/ML_Panels.cpp b/SerialPrograms/Source/ML/ML_Panels.cpp index c77cceb557..41945ac10e 100644 --- a/SerialPrograms/Source/ML/ML_Panels.cpp +++ b/SerialPrograms/Source/ML/ML_Panels.cpp @@ -5,6 +5,8 @@ */ #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/Panels/PanelTools.h" +#include "GameConsole/ConsolePanel.h" #include "Programs/ML_LabelImages.h" #include "Programs/ML_RunYOLO.h" #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h" diff --git a/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp index c5031e7bb7..d0dac9d2a8 100644 --- a/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp +++ b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp @@ -8,12 +8,14 @@ #include #include #include +#include #include "3rdParty/ONNX/OnnxToolsPA.h" #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Tools/FileHash.h" #include "ML_OrtEnv.h" +#include "ML_ONNXRuntimeHelpers.h" namespace PokemonAutomation{ namespace ML{ diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp index 9ba72b8985..90ef31dac4 100644 --- a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp +++ b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp @@ -22,6 +22,7 @@ #include "CommonFramework/Options/Environment/PerformanceOptions.h" #include "CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.h" #include "ML/DataLabeling/ML_AnnotationIO.h" +#include "ML/DataLabeling/ML_SegmentAnythingModel.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" #include "GameConsole/Framework/ConsoleSystemSession.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp index ecb39bbd5a..4614183e44 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp @@ -5,6 +5,7 @@ */ #include "NintendoSwitch/NintendoSwitch_Settings.h" +#include "NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch_Commands_Superscalar.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp index 59c32937e9..58c2f474f5 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Strings/StringTools.h" #include "Common/Cpp/Containers/Pimpl.tpp" +#include "ControllerInput/ControllerInput.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" #include "Controllers/RumbleListener.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp index cbb6543162..659f0b848c 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp @@ -10,6 +10,7 @@ #include "CommonFramework/Logging/Logger.h" //#include "CommonFramework/PersistentSettings.h" #ifdef QT_CORE_LIB +#include "CommonFramework/Panels/PanelTools.h" #include "NintendoSwitch/NintendoSwitch_SettingsPanel.h" #endif #include "NintendoSwitch_ControllerSettings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp index 9cb1447f9a..f9a8389e5c 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Strings/StringTools.h" #include "Common/Cpp/Containers/Pimpl.tpp" +#include "ControllerInput/ControllerInput.h" #include "ControllerInput/Keyboard/KeyboardInput_State.h" #include "Controllers/RumbleListener.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp index 1013c4a601..f22f10fa1f 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "SysbotBase_Descriptor.h" +#include "SysbotBase_Connection.h" #include "SysbotBase3_ProController.h" //#include diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp index c0019abd2c..6dcc2d4543 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp @@ -8,10 +8,14 @@ #include #include #include +#include #include #include "3rdParty/ONNX/OnnxToolsPA.h" #include "Common/Cpp/Time.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp index 6cdbe2c1bf..4af8e509da 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include "3rdParty-Core/nlohmann/json.hpp" #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/CpuId/CpuId.h" @@ -35,12 +36,51 @@ #include "Common/Cpp/TestRunners/ParallelUnitTestRunner.h" #include "Common/Qt/TimeQt.h" #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h" +#include "Kernels/Waterfill/Kernels_Waterfill.h" +#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h" +#include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h" #include "Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.h" #include "Kernels/AudioPipeline/Kernels_AudioPipeline.h" +#include "CommonFramework/Exceptions/ProgramFinishedException.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Tools/FileDownloader.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageHSV32.h" +#include "CommonFramework/Environment/Environment.h" +#include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonFramework/Environment/Environment.h" #include "CommonFramework/Tools/GlobalThreadPools.h" +#include "CommonFramework/Tools/FileUnzip.h" +#include "CommonTools/OCR/OCR_Routines.h" +#include "CommonTools/OCR/OCR_NumberReader.h" +#include "CommonTools/Images/ImageFilter.h" +#include "Integrations/DiscordWebhook.h" +#include "Integrations/PybindSwitchController.h" +#include "Pokemon/Inference/Pokemon_NameReader.h" +#include "Pokemon/Resources/Pokemon_PokemonSlugs.h" +#include "Pokemon/Resources/Pokemon_PokemonNames.h" +#include "Pokemon/Pokemon_StatsCalculation.h" +#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h" +#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h" +#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" +#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" +#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" //#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" +#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h" +#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" +#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h" +#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h" +#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" +#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" +#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h" #ifdef PA_ARCH_x86 //#include "Kernels/Kernels_x64_SSE41.h" @@ -58,7 +98,15 @@ //#include "Kernels/ImageScaling/Kernels_ImageScaling_Default.h" //#include "Kernels/ImageScaling/Kernels_ImageScaling_x64_SSE41.h" #endif +#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h" //#include "Common/SerialPABotBase/LightweightWallClock_StdChrono.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" +#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" +#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h" +#include "VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.h" //#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_Default.h" //#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.h" //#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.h" diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp index bbd7c4d8e9..494cbd21b4 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp @@ -15,20 +15,86 @@ #include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h" #include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h" #include "Common/Cpp/StreamConnections/MockDevice.h" +#include "Kernels/Waterfill/Kernels_Waterfill.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonFramework/Exceptions/ProgramFinishedException.h" +#include "CommonFramework/ErrorReports/ErrorReports.h" +#include "CommonTools/Async/InferenceRoutines.h" +#include "CommonTools/OCR/OCR_NumberReader.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/BinaryImage_FilterRgb32.h" +#include "CommonTools/Async/InterruptableCommands.h" +#include "CommonTools/OCR/OCR_Routines.h" +#include "CommonTools/Images/ImageTools.h" +#include "Controllers/RumbleListener.h" +#include "NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h" +#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h" +#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h" +#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h" +#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h" +#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" +#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" +#include "PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h" +#include "VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h" +#include "VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h" +#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" +#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h" +#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" +#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" +#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" +#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h" +#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h" //#include "CommonFramework/Environment/SystemSleep.h" +#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h" +#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" //#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" +#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h" +#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h" +#include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h" +#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h" +#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" +#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" +#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" +#include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h" +#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" +#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h" //#include "Integrations/PybindSwitchController.h" +#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h" +#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h" #include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h" +#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" +#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" +#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" +#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" +#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h" +#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h" +#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" //#include "Kernels/Kernels_x64_AVX512.h" //#include "Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX512.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h" +#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h" //#include #include "TestProgramSwitch.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp index 798e932da5..b475b82d5b 100644 --- a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp @@ -7,6 +7,8 @@ #include "Common/Compiler.h" #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "GameConsole/Framework/ConsoleSystemSession.h" diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp index b0b2aca150..9835daf347 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp @@ -6,6 +6,7 @@ #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "Framework/NintendoSwitch_MultiSwitchProgramSession.h" +#include "NintendoSwitch_MultiSwitchProgram.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp index e9a59b5db8..8f4e94ab65 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp @@ -11,6 +11,7 @@ #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "Commands/NintendoSwitch_Commands_PushButtons.h" #include "Framework/NintendoSwitch_SingleSwitchProgramSession.h" +#include "NintendoSwitch_SingleSwitchProgram.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp index 835e5da65f..e597e2d958 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp @@ -5,8 +5,12 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp index 1f304c2195..51d74af237 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp @@ -10,6 +10,7 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/VideoStream.h" +#include "NintendoSwitch_DateManipTools.h" #include "NintendoSwitch_DateManip_24h.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp index 9a78866ce4..02569fd907 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp @@ -14,6 +14,7 @@ #include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/OCR/OCR_StringNormalization.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "NintendoSwitch_DateManipTools.h" #include "NintendoSwitch_DateManip_US.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp index 6f9c40c58e..2f8dda3da1 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/RecursiveThrottler.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" //#include "CommonFramework/VideoPipeline/VideoFeed.h" //#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp index 1a2e27ea37..decda674a3 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp @@ -11,6 +11,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h" +#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp index 51132478d1..2886308ee4 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" +#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp index 8193d1186b..dc584c48ca 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp @@ -11,6 +11,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "NintendoSwitch_CodeEntryTools.h" +#include "NintendoSwitch_KeyboardEntryMappings.h" #include "NintendoSwitch_KeyboardCodeEntry.h" //#include diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp index 9fbb558d00..5120debad5 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp @@ -10,6 +10,7 @@ #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp index 5f9add8f40..a9f189502d 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp @@ -11,6 +11,7 @@ #include "Common/Cpp/TestRunners/UnitTest.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/Exceptions/OperationFailedException.h" +#include "NintendoSwitch_Typewriter_Tests.h" #include "NintendoSwitch_TypewriterTextMapping.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp index 41db21fea9..4f54c79206 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonTools/OCR/OCR_Routines.h" #include "Pokemon_AbilityReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp index a3901c57ae..d537f6b9ff 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonTools/OCR/OCR_Routines.h" #include "Pokemon_BerryNameReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp index 5481ccd642..207cbf3f85 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp @@ -9,7 +9,10 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "Pokemon_BoxGenderDetector.h" diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp index 60bffab8d5..d34c90b0d3 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonTools/OCR/OCR_Routines.h" #include "Pokemon_NatureReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp index 42c962f2ec..012e9d2033 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp @@ -5,6 +5,7 @@ */ #include +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/OCR/OCR_TrainingTools.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon_IvJudgeReader.h" diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp index 4619a44931..9e2854b761 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp @@ -7,6 +7,7 @@ #include #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/OCR/OCR_TrainingTools.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp index a43f72ffc2..30d49c095d 100644 --- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp +++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp @@ -7,6 +7,7 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp index 89785fb5b0..47aa0294ab 100644 --- a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp +++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp @@ -4,6 +4,7 @@ * */ +#include "Pokemon/Pokemon_IvJudge.h" #include "Pokemon_IvJudgeOption.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp index 58f587b377..31e8c7ccb8 100644 --- a/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp +++ b/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp @@ -6,6 +6,8 @@ #include #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Resources/Pokemon_PokeballNames.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" diff --git a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp index 1ee5be31fb..b4ff3d19ad 100644 --- a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp +++ b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Logging/AbstractLogger.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "Pokemon_ShinySparkleSet.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp index 2f6726c1ba..3e1229b7e3 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/ImageFilter.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp index 278e55b846..eaa30e52ea 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp @@ -3,6 +3,10 @@ * From: https://github.com/PokemonAutomation/ * */ +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/Images/SolidColorTest.h" +#include "PokemonBDSP_EndBattleDetector.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp index bd2210d8cc..325b1e8da9 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp @@ -5,6 +5,8 @@ */ #include "Common/Cpp/Containers/FixedLimitVector.tpp" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_ExperienceGainDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp index 4b78b46161..834e6c2299 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp @@ -4,7 +4,9 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "PokemonBDSP_StartBattleDetector.h" //#include diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp index 8e93393773..be76c12127 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp index 1bdffe31c2..bafa0195b4 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp @@ -7,9 +7,12 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" +#include "Pokemon/Options/Pokemon_StatsHuntFilter.h" #include "PokemonBDSP_BoxGenderDetector.h" //#include diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp index 654cc45826..27c51e82c1 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonBDSP_BoxNatureDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp index 774b12f2a4..1cf3dbde2b 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_BoxShinyDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp index 06ed6c7ceb..c3a05264d4 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" #include "PokemonBDSP_IvJudgeReader.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp index 61bda2b78d..c8636d99cb 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_DialogDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp index 076f6745fb..4f7f726487 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp @@ -6,6 +6,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonBDSP_MarkFinder.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp index 3b800be36f..12da43966e 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonBDSP_MenuDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp index 45dfa80873..6390a96cd7 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h" #include "PokemonBDSP_PokeballSpriteMatcher.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp index 4383d5cc25..7857b0622c 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp @@ -6,6 +6,8 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonBDSP_SelectionArrow.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp index f07a959fc5..39880dbe44 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp @@ -6,7 +6,9 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageDiff.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonBDSP_VSSeekerReaction.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp index 0f94d8f6ff..28878066b4 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp @@ -7,6 +7,7 @@ #include #include #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonBDSP_EyeBlinkDetector.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp index c7837f7f6f..48f0ac42f7 100644 --- a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp @@ -6,7 +6,11 @@ #include #include "Common/Cpp/Logging/AbstractLogger.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/OCR/OCR_NumberReader.h" +#include "CommonTools/OCR/OCR_Routines.h" +#include "Pokemon/Inference/Pokemon_NatureReader.h" #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h" #include "PokemonBDSP_SummaryReader.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp index 7dbfa34049..a46b0bd623 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp @@ -4,6 +4,7 @@ * */ +#include "PokemonBDSP_EncounterFilterEnums.h" #include "PokemonBDSP_EncounterFilterOption.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp index 48785b6927..72002bc967 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp @@ -10,6 +10,7 @@ #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Resources/Pokemon_PokeballNames.h" #include "PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h" +#include "PokemonBDSP_EncounterFilterEnums.h" #include "PokemonBDSP_EncounterFilterOverride.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp index 7cee7adc55..0e501e22ba 100644 --- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp @@ -4,8 +4,11 @@ * */ +#include +#include #include "Common/Cpp/Exceptions.h" #include "Common/Qt/NoWheelComboBox.h" +#include "PokemonBDSP_EncounterFilterWidget.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp index bc23e5bce0..b8ff5e26a5 100644 --- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp +++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "PokemonBDSP_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp index b925bca51d..0869611ca5 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp @@ -15,6 +15,7 @@ #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" +#include "PokemonBDSP_EggAutonomousState.h" #include "PokemonBDSP_EggAutonomous.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp index eeeda9aae8..b71cd64c7b 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp @@ -6,6 +6,9 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp index 8927f38895..f9ef665430 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp @@ -5,14 +5,17 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "CommonTools/VisualDetectors/ImageMatchDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonBDSP/PokemonBDSP_Settings.h" #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h" +#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h" #include "PokemonBDSP_EggRoutines.h" +#include "PokemonBDSP_EggFeedback.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp index cb659779e1..e1c05d2a8e 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp @@ -8,6 +8,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "PokemonBDSP/PokemonBDSP_Settings.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h" +#include "PokemonBDSP_EggRoutines.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp index 3cd63df597..954e2baa07 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp @@ -5,11 +5,15 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" +#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h" +#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_DoublesLeveling.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp index 83b62cd76b..c77383ba55 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp @@ -5,7 +5,9 @@ */ #include +#include "CommonFramework/Language.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ProgramStats/StatsTracking.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp index 34c57d0879..59adb7cbe2 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp @@ -7,6 +7,7 @@ #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp index 5fc29a68f1..a1453c7218 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp index 47197f6de8..c25660bb23 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp @@ -5,6 +5,7 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "PokemonBDSP_BoxRelease.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp index ddbe923c7b..76c77756cc 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp @@ -7,6 +7,7 @@ //#include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramInfo.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp index 78731555c2..685c274c4f 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp @@ -11,6 +11,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "PokemonBDSP/PokemonBDSP_Settings.h" +#include "PokemonBDSP_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp index 0c201a30f1..35d8083ce7 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp @@ -10,6 +10,7 @@ #include "PokemonBDSP/PokemonBDSP_Settings.h" #include "PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h" #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h" +#include "PokemonBDSP_GameNavigation.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp index 9fcbb06884..b94c77b358 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp @@ -8,6 +8,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" +#include "PokemonBDSP_GlobalRoomHeal.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp index ee62fa8b34..34c703903d 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp @@ -7,6 +7,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "PokemonBDSP_RunFromBattle.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp index 1238174349..fbbaaa91eb 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp @@ -10,8 +10,10 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h" +#include "PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h" #include "PokemonBDSP_BedroomSeedFinder.h" #include "PokemonBDSP_BlinkRecovery.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp index 12370df775..4119e3ce07 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp @@ -16,6 +16,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonBDSP_BlinkRecovery.h" #include "PokemonBDSP_StateReidentifier.h" +#include "PokemonBDSP_StateSolver.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp index ae25418267..77d0aeca58 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp @@ -10,12 +10,15 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceSession.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h" +#include "PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h" #include "PokemonBDSP_IntroSeedFinder.h" +#include "PokemonBDSP_StateSolver.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp index 13c7f65f2e..71dd8a5ac5 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Logging/AbstractLogger.h" +#include "Pokemon/Pokemon_Gf2Matrix.h" #include "PokemonBDSP_StateSolver.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp index 724cfe153a..a7067492fc 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp @@ -4,11 +4,14 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h" +#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" +#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp index 7b17f87af7..76897a64e3 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp @@ -4,11 +4,15 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h" #include "PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h" +#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" +#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_ShinyHunt-Fishing.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp index f4fdfba4e4..352e787c33 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp @@ -5,8 +5,10 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp index 6cf2ce7823..094ef9379b 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp @@ -4,12 +4,15 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h" +#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h" +#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_ShinyHunt-Shaymin.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp index 13e263c8a1..8cef1b6d60 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/ImageMatchDetector.h" @@ -16,6 +17,7 @@ #include "Pokemon/Pokemon_Notification.h" #include "PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h" #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h" +#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h" #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "PokemonBDSP_StarterReset.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp index 5aca3da259..1d614e2704 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp @@ -12,6 +12,8 @@ #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/AlignedVector.tpp" +#include "CommonFramework/AudioPipeline/AudioFeed.h" +#include "CommonFramework/AudioPipeline/AudioTemplate.h" #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" #include "CommonTools/Async/InferenceSession.h" diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp index d5d89a880c..7d488e8f9c 100644 --- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp +++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp @@ -10,6 +10,7 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "Pokemon/Pokemon_NatureChecker.h" #include "Pokemon/Pokemon_Strings.h" #include "PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h" #include "PokemonBDSP_SummaryReaderTester.h" diff --git a/SerialPrograms/Source/StaticRegistrationQt.cpp b/SerialPrograms/Source/StaticRegistrationQt.cpp index af2d65d566..7416075c0c 100644 --- a/SerialPrograms/Source/StaticRegistrationQt.cpp +++ b/SerialPrograms/Source/StaticRegistrationQt.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonTools/Options/QtWidgets/ScreenWatchWidget.h" #include "Common/Qt/Options/BatchWidget.h" // Basic Options @@ -50,6 +51,7 @@ // Controllers //#include "Controllers/NullControllerWidget.h" +#include "Controllers/ControllerSelectorWidget.h" #include "Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h" #include "GameConsole/UI/ConsoleSystemWidget.h" @@ -66,6 +68,7 @@ //#include "NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h" // Pokemon LA +#include "StaticRegistration.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Tests/CommandLineTests.cpp b/SerialPrograms/Source/Tests/CommandLineTests.cpp index dcf2f182a6..a723fef213 100644 --- a/SerialPrograms/Source/Tests/CommandLineTests.cpp +++ b/SerialPrograms/Source/Tests/CommandLineTests.cpp @@ -9,6 +9,7 @@ #include "CommonFramework/Logging/Logger.h" #include "ComputerPrograms/ComputerPrograms_UnitTestRunner.h" +#include "CommandLineTests.h" using std::cout; using std::endl; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp index 9b6b84a069..8f57212bcc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp @@ -5,6 +5,11 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ImageFilter.h" //#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp index fe523cbaa2..8903a2d386 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp @@ -5,6 +5,7 @@ */ #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PartyDialogs.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp index 04ea94bda6..7dcc3779f0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp @@ -5,7 +5,13 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PrizeSelectDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp index e2576fd4b5..575e7f806b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_MapDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp index aa7ead5fe2..71807a44ce 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp @@ -6,7 +6,12 @@ #include #include +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PokemonLeagueDetectors.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp index 3e61ec8725..efd44bf464 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp @@ -5,7 +5,13 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonFRLG_BagDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp index f0b54f9bb2..a5145818de 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_LoadMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp index 42c571c66b..5d2dd9bf15 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PartyEmptySlotDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp index 96f57a01f6..8a5c6aebf1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp index f68a8a1efa..58276954ab 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp @@ -5,8 +5,16 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/WaterfillUtilities.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_PartyMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp index 76b1febc3a..3931a6336c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp @@ -5,6 +5,8 @@ */ #include "Common/Cpp/Color.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp index 977b5a5243..d1794892ad 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_SummaryDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp index 2330f6dbd2..bae2f30fa3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_TrainerCardDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp index dd76537d06..777bccaa73 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp @@ -4,11 +4,18 @@ * */ +#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/OCR/OCR_NumberReader.h" +#include "Pokemon/Pokemon_StatsCalculation.h" +#include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h" #include "PokemonFRLG_DigitReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp index 5c3f604a9b..a07f83998a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_BattlePokemonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp index a1c35fc9dd..a28c23362a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp index 92df952ca1..cc4fe12292 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp @@ -5,6 +5,10 @@ */ #include "Common/Cpp/Color.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_DaycareManDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp index d74c5c2df2..5ee34a7e48 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp @@ -17,6 +17,8 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp index 3b060b81bb..fd5b0f63bc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp @@ -7,6 +7,7 @@ #include #include #include "Common/Cpp/Color.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" #include "PokemonFRLG_OcrPreprocessing.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp index 32ee82db4a..42df14685b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp @@ -4,11 +4,18 @@ * */ +#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/OCR/OCR_NumberReader.h" +#include "Pokemon/Pokemon_StatsCalculation.h" +#include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h" #include "PokemonFRLG_DigitReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp index cf3153f332..b3693f5c4e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp index 54792ee024..6e2c516038 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp @@ -4,6 +4,9 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp index 089b4fdccf..d53047b0b4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp @@ -6,7 +6,11 @@ #include "Common/Cpp/Color.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_ShinySymbolDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp index 668601a8b2..93252ec101 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp @@ -4,14 +4,17 @@ * */ +#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/OCR/OCR_NumberReader.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "Pokemon/Inference/Pokemon_NatureReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp index fb81d2a2e5..1ba1f934e5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp @@ -6,9 +6,14 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/Filesystem/Filesystem.h" +#include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/OCR/OCR_NumberReader.h" +#include "CommonTools/OCR/OCR_Routines.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_TrainerIdReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp index 9e7c139e42..91d183120c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp @@ -4,17 +4,22 @@ * */ +#include #include "Common/Cpp/Color.h" #include "Common/Cpp/Filesystem/Filesystem.h" #include "CommonFramework/GlobalSettingsPanel.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/OCR/OCR_NumberReader.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "PokemonFRLG_WildEncounterReader.h" #include "PokemonFRLG_OcrPreprocessing.h" +#include "PokemonFRLG_DigitReader.h" namespace PokemonAutomation { namespace NintendoSwitch { namespace PokemonFRLG { diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp index 1184742abb..e0f04d4332 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp @@ -19,6 +19,7 @@ #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp index 99478407a7..d51e585590 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp @@ -25,6 +25,7 @@ #include "Inference/PokemonFRLG_WildEncounterReader.h" #include "PokemonFRLG_Navigation.h" +#include "PokemonFRLG_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ namespace PokemonFRLG{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp index 7dc8a5e6ff..9d678de5c2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp @@ -31,6 +31,7 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp index 456e3f78d6..18aaacc7d2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp @@ -7,15 +7,19 @@ #include #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" +#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" +#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h" +#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_EvTrainer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp index dfaaeee2c1..6db116ec08 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp @@ -7,9 +7,11 @@ #include "Common/Cpp/Options/ButtonOption.h" #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Language.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" @@ -21,6 +23,8 @@ #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" +#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h" +#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h" #include "PokemonFRLG_HeldItemFarmer-SafariZone.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp index b9b90f7a06..4d5638c2c1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp @@ -5,13 +5,16 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h" +#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_PickupFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp index 02b29f5877..bb7ac34c24 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp @@ -11,6 +11,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" +#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h" #include "PokemonFRLG_BattleMenuNavigation.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp index 8dd117b503..cf7315312d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp @@ -11,6 +11,8 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" +#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" +#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_RngCalibration.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp index 2135a9140f..483b5fd0d9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp @@ -8,16 +8,21 @@ #include #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Language.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" +#include "PokemonFRLG_RngCalibration.h" +#include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_EncountersDatabase.h" #include "PokemonFRLG_EggRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp index a9332119b2..3341d8cef2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp @@ -6,13 +6,17 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Language.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" +#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_GiftRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp index 0645cbf34b..c6fe887c03 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp @@ -13,6 +13,7 @@ #include "NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h" #include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_HardReset.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp index dbb5f8fc0e..379b9c6d33 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp @@ -9,6 +9,7 @@ #include #include #include +#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_RngCalibration.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp index 9810d6e183..16065cbda0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp @@ -4,11 +4,13 @@ * */ +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_HardReset.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp index d929d57828..e1e30bf6d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp @@ -11,6 +11,7 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Random.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_RngLoopRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp index 843efb29c9..ef1ce62790 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp @@ -9,6 +9,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" @@ -20,6 +21,8 @@ #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" +#include "PokemonFRLG_BlindNavigation.h" #include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp index 2be94ee92e..fe284e8a2c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp @@ -6,13 +6,17 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Language.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" +#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_RoamingLegendaryRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp index 7c57ce8623..0c3ac9bd67 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp @@ -13,10 +13,12 @@ #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "Pokemon/Pokemon_AdvRng.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h" +#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_SidHelper.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp index 47b7c7f119..5b22bee42f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" @@ -17,8 +18,10 @@ #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" +#include "PokemonFRLG_SeedsDatabase.h" #include "PokemonFRLG_StarterRng.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp index 6312a2db3e..30bdaaea7a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp @@ -5,13 +5,17 @@ */ #include "Common/Cpp/Strings/StringTools.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Language.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" +#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_StaticRng.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp index bf0d183258..9aeb97fb45 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp @@ -6,15 +6,20 @@ #include "Common/Cpp/Strings/StringTools.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/Language.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h" #include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h" +#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_RngNavigation.h" #include "PokemonFRLG_HardReset.h" +#include "PokemonFRLG_RngCalibration.h" #include "PokemonFRLG_RngLoopRoutines.h" #include "PokemonFRLG_LocationsDatabase.h" #include "PokemonFRLG_RngStatsDatabase.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp index 60e8dbacf9..cc6e5a70bc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp index b2573aeecf..70e6a7bd89 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp @@ -4,6 +4,8 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp index 0642fd3501..88015c253a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp index acec25b1f9..9e5928f186 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp @@ -5,12 +5,14 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp index 47b0a4c760..33d35413d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp @@ -15,8 +15,10 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h" #include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h" #include "PokemonFRLG_ShinyHunt-Fishing.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp index 82bbc3ea90..fa6fc5ae3a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp index 6bb4a2265f..694769f707 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp @@ -8,8 +8,10 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Inference/Pokemon_NameReader.h" +#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h" #include "PokemonFRLG_ReadBattleLevelUp.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp index 25a6b69d32..0d1f539aea 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h" #include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp index 18df501e5b..caad863fa0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp index 7e634551ea..82bb323a72 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/CancellableScope.h" #include "Common/Cpp/Color.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h" #include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp index 68e68dcdd7..cb84393731 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "PokemonHome_AlphaDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp index 7885f806d8..974ed223cc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Recording/StreamHistorySession.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp index 93796ef019..c1be13d4f5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp @@ -8,7 +8,10 @@ #include "Common/Cpp/Color.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "PokemonHome_BoxGenderDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp index 88711b34f2..790be7214c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp @@ -7,7 +7,12 @@ #include #include "Common/Cpp/Color.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" +#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h" #include "PokemonHome_BoxViewDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp index 7d20c3688d..f1624dbc7c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp @@ -4,7 +4,9 @@ * */ +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp index 8c1d52b200..14c2a40e6c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp index 803dcd3188..edaef13bae 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp @@ -6,8 +6,11 @@ #include #include +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/WaterfillUtilities.h" +#include "CommonTools/DetectedBoxes.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonHome_OriginMarkReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp index 9cfbf8a74b..69ec9a70e2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp index de9198087b..78223cb1bf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "PokemonHome_ShinyDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp index 888c0dcfa5..b9879c46d6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp @@ -13,9 +13,12 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Strings/Unicode.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" +#include "CommonTools/OCR/OCR_DictionaryMatcher.h" +#include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/OCR/OCR_StringNormalization.h" #include "Pokemon/Inference/Pokemon_AbilityReader.h" #include "Pokemon/Inference/Pokemon_NatureReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp index 6a4266b477..997f35ddd8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp @@ -6,7 +6,9 @@ #include #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" +#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h" #include "PokemonHome_SummaryScreenDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp index c4a853a229..40193e5bc9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp @@ -6,9 +6,11 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" +#include "Pokemon/Pokemon_Types.h" #include "PokemonHome_GigantamaxDetector.h" #include "PokemonHome_TeraTypeReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp index 83819c1ee8..0ac5e1bd97 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp @@ -9,6 +9,7 @@ #include "Inference/PokemonHome_BallReader.h" #include "Inference/PokemonHome_BoxGenderDetector.h" #include "Inference/PokemonHome_BoxViewDetector.h" +#include "Inference/PokemonHome_ButtonDetector.h" #include "Inference/PokemonHome_GigantamaxDetector.h" #include "Inference/PokemonHome_OriginMarkReader.h" #include "Inference/PokemonHome_SelectionArrowDetector.h" @@ -16,6 +17,7 @@ #include "Inference/PokemonHome_SummaryReader.h" #include "Inference/PokemonHome_SummaryScreenDetector.h" #include "Inference/PokemonHome_TeraTypeReader.h" +#include "PokemonHome_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp index 7aebc4e597..2791d67ddf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp @@ -9,9 +9,12 @@ #include #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Resources/Pokemon_PokemonSlugs.h" #include "Pokemon/Inference/Pokemon_TypeReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp index f0f9d26af5..2deea9ade5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp @@ -31,11 +31,14 @@ language #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "Pokemon/Pokemon_BoxCursor.h" +#include "Pokemon/Pokemon_CollectedPokemonInfo.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h" #include "PokemonHome_BoxNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp index f1d6580c2a..8db9e688dc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp @@ -18,12 +18,15 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/OCR/OCR_StringNormalization.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "Pokemon/Pokemon_BoxCursor.h" +#include "Pokemon/Pokemon_CollectedPokemonInfo.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h" #include "PokemonHome_BoxNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp index a25a320cc7..c59301f5c5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp index d28a998775..5247ee0f46 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/CancellableScope.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "Pokemon/Pokemon_CollectedPokemonInfo.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h" #include "VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp index 4b4b9eb477..c9c10139f8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp @@ -14,8 +14,13 @@ #include #include #include "Common/Cpp/Filesystem/Filesystem.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "Pokemon/Options/Pokemon_StatsHuntFilter.h" +#include "Pokemon/Pokemon_OriginMarks.h" #include "Pokemon/Resources/Pokemon_PokemonSlugs.h" #include "Pokemon/Pokemon_Strings.h" +#include "Pokemon/Pokemon_Types.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h" #include "VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp index a13a30122c..04595a4f4e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonLA_BattleMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp index 204c4f2ffc..510de4b4df 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Logging/AbstractLogger.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonLA_BattleMoveSelectionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp index 3fa8ac965a..0619d3cedf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp index 7cd187c02f..40ec64e9e1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp index bbcbe8962a..4e9aaad181 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp @@ -6,6 +6,9 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageGradient.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp index 6ddbf11f18..9403396b89 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonLA_MMOSpriteStarSymbolDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp index 7e42e32221..eda120811f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp @@ -10,6 +10,9 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp index 46c206d066..b260431487 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp @@ -7,8 +7,11 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/SolidColorTest.h" //#include "Tests/TestUtils.h" +#include "PokemonLA_MapMissionTabReader.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp index 78581a54e8..5b5c97f5b6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp @@ -9,11 +9,14 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h" +#include "PokemonLA_MapWeatherAndTimeReader.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp index 82834d0811..d67db2d2ae 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp @@ -12,6 +12,7 @@ #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/ImageFilter.h" //#include "Tests/TestUtils.h" +#include "PokemonLA_MapZoomLevelReader.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp index c78736a477..4e0ebca76f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" //#include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp index d42aec002a..28064a0dca 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp @@ -24,9 +24,14 @@ #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Resources/SpriteDatabase.h" +#include "CommonTools/Images/ImageFilter.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp index 888ec7105b..732316214e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp index 426265b31c..4f3c9eae88 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" #include "CommonTools/DetectedBoxes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp index fccdbb95f1..4696125159 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp index 30321b5534..bd315bcc79 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp @@ -9,6 +9,7 @@ #include #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "Tests/TestUtils.h" #include "PokemonLA_FlagTracker.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp index 2fba7b4465..6983fa46a5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp @@ -16,6 +16,7 @@ #include "Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonLA/PokemonLA_Locations.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp index c04b62cc86..f6b974f9ff 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/ImageTools/ImageStats.h" +#include "PokemonLA_CommonColorCheck.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp index b03355dc12..5062902e0f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonLA_CommonColorCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp index d787fd794c..8bd5fc479f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp @@ -13,6 +13,7 @@ #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" +#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h" #include "PokemonLA_MountDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp index 67a79f8af9..94867de036 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp @@ -5,6 +5,7 @@ */ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" +#include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonLA_NotificationReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp index e6bda9b325..28a31540bc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp @@ -7,10 +7,13 @@ #include #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" +#include "PokemonLA_CommonColorCheck.h" #include "PokemonLA_StatusInfoScreenDetector.h" using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp index 7757d52091..adbcb471ef 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonLA_UnderAttackDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp index 5b6a033a03..f3fce43192 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp @@ -6,8 +6,12 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/ImageGradient.h" +#include "CommonTools/OCR/OCR_Routines.h" #include "Tests/TestUtils.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp index 42e5c35ea1..b079b55c96 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp @@ -7,6 +7,8 @@ #include #include "Common/Cpp/ColoredText.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonLA/PokemonLA_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp index 3472c1211f..9344eec94d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp index b0a6a95533..429a55fe62 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp @@ -10,6 +10,7 @@ #include "Inference/PokemonLA_StatusInfoScreenDetector.h" #include "Inference/PokemonLA_WildPokemonFocusDetector.h" #include "Inference/PokemonLA_BerryTreeDetector.h" +#include "Inference/Objects/PokemonLA_DialogYellowArrowDetector.h" #include "Inference/Objects/PokemonLA_FlagTracker.h" #include "Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h" #include "Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h" @@ -22,8 +23,10 @@ #include "Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h" #include "Inference/Battles/PokemonLA_BattleSpriteWatcher.h" +#include "Inference/Battles/PokemonLA_BattleStartDetector.h" #include "Inference/Sounds/PokemonLA_ShinySoundDetector.h" #include "Programs/PokemonLA_GameSave.h" +#include "PokemonLA_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp index 4f1f20a6b0..07b93ac6b3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp @@ -7,6 +7,7 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -15,6 +16,7 @@ #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h" +#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h" #include "PokemonLA_IngoBattleGrinder.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp index 253126d587..7d6a423f66 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp index e6984d7891..82e030ae77 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp index b104e96733..0c569aa62f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp @@ -16,6 +16,7 @@ #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h" #include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h" +#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h" #include "PokemonLA_TenacityCandyFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp index e2fe21c072..92d267d149 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp @@ -10,6 +10,7 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp index c196e59bd4..3c64dca785 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp @@ -6,6 +6,7 @@ #include #include +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp index 18fd2ddc2c..1c67205602 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp @@ -6,6 +6,7 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InterruptableCommands.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonLA_FlagNavigationAir.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp index c10eaba5bf..911e41fae6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp @@ -12,6 +12,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonLA/PokemonLA_Settings.h" +#include "PokemonLA_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp index 80e894f11c..5c1c8ef86f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp @@ -7,11 +7,17 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" #include "Tests/TestUtils.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" +#include "PokemonLA_GameSave.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp index f2ccb5d8a6..514445f8e0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp @@ -7,10 +7,12 @@ #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h" #include "PokemonLA_MountChange.h" +#include "PokemonLA_RegionNavigation.h" #include "PokemonLA_BattleRoutines.h" #include "PokemonLA_LeapPokemonActions.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp index 11b0acaf23..203c87b158 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp @@ -6,9 +6,12 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h" #include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h" #include "VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp index 90beaf8b85..6bea56baa7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp @@ -23,6 +23,8 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h" #include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h" +#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" +#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h" #include "VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h" #include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp index 55a010e112..1aa754b039 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp index ceec7bfcd5..d6c7208e15 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp @@ -6,6 +6,7 @@ #include "CommonTools/Async/InferenceSession.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h" #include "PokemonLA_MountDetectionTest.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp index a04d8e32e7..1fbf297c8f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp @@ -14,6 +14,8 @@ #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Containers/AlignedVector.h" #include "Common/Cpp/Containers/AlignedVector.tpp" +#include "CommonFramework/AudioPipeline/AudioFeed.h" +#include "CommonFramework/AudioPipeline/AudioTemplate.h" #include "CommonTools/Audio/AudioTemplateCache.h" #include "CommonTools/Audio/SpectrogramMatcher.h" #include "CommonTools/Async/InferenceSession.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp index d3b613afb9..d4f8c7fa66 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp index 4bc3de7785..db90307c97 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp index 9414e2461f..d6f904743c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp index 13eb36a80c..61a8ad3cac 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp @@ -5,6 +5,7 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "PokemonLGPE_DateSpam.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp index 3111232f43..0e02396af0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp index 2e232107cb..122d4bb499 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp @@ -5,7 +5,11 @@ */ #include "Common/Cpp/Color.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/Images/ImageFilter.h" #include "PokemonLGPE_ShinySymbolDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp index c79b86ee3a..ae7f31aace 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp @@ -14,6 +14,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonLGPE/PokemonLGPE_Settings.h" +#include "PokemonLGPE_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp index e92f758bcb..1259be9687 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp @@ -11,6 +11,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" +#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h" //#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp index f72f0371c0..9ffcb64b92 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp @@ -6,6 +6,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" //#include "CommonFramework/Logging/Logger.h" +#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonLZA_MoveEffectivenessSymbol.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp index 5baf1f29d5..1212531843 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp @@ -11,13 +11,18 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/FatalProgramException.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/VideoStream.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "Tests/TestUtils.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp index ce0d994e65..7da1bf511b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp @@ -4,6 +4,12 @@ * */ +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp index 675745b03d..137be02a06 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonLZA_IvJudgeReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp index 52eaf2110f..98d62bff91 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp @@ -7,10 +7,15 @@ #include #include "Common/Cpp/Filesystem/FilePath.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/Images/WaterfillUtilities.h" //#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/ImageMatch/ImageCropper.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp index 152c51240f..b7faf4ddad 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp @@ -7,8 +7,13 @@ #include #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedException.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/WaterfillUtilities.h" +#include "CommonTools/OCR/OCR_Routines.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp index 2548c99051..484fe7eb0a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp @@ -8,9 +8,11 @@ #include #include "Common/Cpp/Filesystem/FilePath.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Logging/Logger.h" //#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonLZA_FlavorPowerDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp index 687941410e..d1750880ff 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp @@ -8,8 +8,10 @@ #include #include #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" //#include "Tests/TestUtils.h" #include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonLZA_DirectionArrowDetector.h" // #define DEBUG_DIRECTION_ARROW diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp index e2e71142f1..4077333317 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp @@ -6,6 +6,7 @@ #include #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/OCR/OCR_Routines.h" #include "PokemonLZA_LocationNameReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp index 4715586663..3b8ed3aa04 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp index 91d775ee43..7e412e4dbf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp @@ -5,6 +5,7 @@ */ //#include "Common/Cpp/Exceptions.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp index 9fbca9093e..ba46b3e413 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp @@ -5,8 +5,10 @@ */ #include +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp index ec042b74d8..b07dc7d787 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonLZA_DayNightChangeDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp index 2d84594c4a..bb4d199c6f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp @@ -5,7 +5,11 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp index 473731f15d..3794d204a6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp @@ -5,6 +5,8 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/Language.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/OCR/OCR_NumberReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp index bc2057dcd6..31cd48050d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp @@ -5,6 +5,9 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" #include "PokemonLZA_MainMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp index 9ac612a0b8..52749b4828 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp @@ -8,6 +8,10 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Exceptions/FatalProgramException.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "Tests/TestUtils.h" #include "PokemonLZA_OverworldPartySelectionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp index 326d760adf..0691d8b609 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp index 16a42ad786..a1de589877 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp @@ -16,6 +16,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTools/ImageDiff.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp index 59a48498b7..c2b67948c4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp index 3bf72a782a..2688b47b62 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp @@ -6,6 +6,7 @@ #include //#include "Common/Cpp/Exceptions.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Notification.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp index 4d4bbd8b29..ead2ea2d67 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp @@ -9,6 +9,7 @@ #include "Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h" #include "Inference/PokemonLZA_AlertEyeDetector.h" #include "Inference/Boxes/PokemonLZA_BoxDetection.h" +#include "Inference/PokemonLZA_ButtonDetector.h" #include "Inference/Map/PokemonLZA_DirectionArrowDetector.h" #include "Inference/PokemonLZA_DialogDetector.h" #include "Inference/PokemonLZA_WeatherDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp index be76bbfc68..2b0b2ac499 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp @@ -5,17 +5,25 @@ */ #include +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" +#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" +#include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h" #include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.h" #include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" +#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h" #include "PokemonLZA_DonutMaker.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp index 052f180af5..76a3fdf8a5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp @@ -11,9 +11,11 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" +#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp index b251e151d7..30963acac4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp @@ -8,6 +8,7 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp index d7e5afa0d7..1a5f7c5da0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp @@ -20,6 +20,7 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp index 8250196567..1d1224b4b7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp @@ -14,6 +14,7 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp index 976c29d60c..ddfbec45ba 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp @@ -8,6 +8,8 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonTools/Async/InferenceRoutines.h" +#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" @@ -15,7 +17,9 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h" #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" +#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp index a38748af2f..9ee5898c42 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp @@ -13,7 +13,9 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" +#include "VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h" #include "PokemonLZA_WeatherFinder.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp index 7c1ccd02e0..b97569e37f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp @@ -9,7 +9,9 @@ #include #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" @@ -19,6 +21,7 @@ #include "Pokemon/Resources/Pokemon_PokemonNames.h" #include "Pokemon/Pokemon_BoxCursor.h" #include "Pokemon/Pokemon_CollectedPokemonInfo.h" +#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h" #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h" #include "VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp index 7098eb76ef..0e3d06242b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp @@ -14,6 +14,7 @@ #include "VideoGames/PokemonLZA/PokemonLZA_Settings.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h" +#include "PokemonLZA_GameEntry.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp index 46684f5c7c..11d0c91b90 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp @@ -19,6 +19,7 @@ #include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h" +#include "PokemonLZA_MenuNavigation.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp index adfd989f90..3439e6ab17 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp @@ -5,6 +5,7 @@ */ // #include "CommonFramework/Exceptions/OperationFailedException.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/Async/InterruptableCommands.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp index 4510e87eca..5606625c3e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp @@ -7,6 +7,7 @@ #include #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp index 1695ff84aa..3c93118ed6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp @@ -16,6 +16,7 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "PokemonLZA_ShinyHunt_BenchSit.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp index fda15df63a..c5d78dcc20 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp @@ -13,14 +13,17 @@ #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h" +#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h" #include "PokemonLZA_ShinyHunt_HelioptileHunter.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp index e2daba086b..e87f4f425a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp @@ -6,8 +6,12 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTypes/ImageHSV32.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewHSV32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" @@ -23,6 +27,7 @@ #include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h" #include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h" +#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h" #include "VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp index 7c24f470df..ee1f5ce5e1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp @@ -11,6 +11,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Globals.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp index d659cba1fb..479f904e1b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp @@ -11,6 +11,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/Globals.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp index 1188f238d0..1a00d6c9a4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp index 977bdf5343..76151f8cc4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" +#include "PokemonLZA_AvailablePokemon.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp index b332ca1aae..d653bc1d33 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp @@ -5,7 +5,9 @@ */ #include +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonPokopia_ButtonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp index ad00d878fb..1a2e189186 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonPokopia_MovesDetection.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp index f6ac615313..7aa74e712e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp @@ -6,6 +6,7 @@ #include #include "Common/Cpp/Exceptions.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp index 91f4d3008b..4ac6ee767f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonPokopia_SelectionArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp index 4a65189440..3607592b99 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp @@ -4,6 +4,8 @@ * */ +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonPokopia_SettingsScreenDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp index 904f23eafc..6fccc39675 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp @@ -7,12 +7,15 @@ //#include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h" +#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h" #include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h" #include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp index 4177e53b01..04bbeb0f4f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp @@ -9,6 +9,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp index 0888ed604a..3bcd66622b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp @@ -10,6 +10,8 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" +#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h" +#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h" #include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp index 8dde36916f..58eb9f2770 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp @@ -4,6 +4,11 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp index 1e83708e74..f32ac092cf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp @@ -5,8 +5,14 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ImageFilter.h" +#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_DialogDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp index 7370b5d81c..0536ede11a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_LoadMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp index 686bec42ef..b4a57c68f2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp @@ -5,7 +5,13 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonRSE_PartyMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp index ee9ee2dbd8..5ef7074bad 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp @@ -7,6 +7,9 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_StartMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp index 0166759b9d..b13a7a6df2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/ImageFilter.h" +#include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" #include "PokemonRSE_SummaryDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp index 1b43fde808..60122476d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp @@ -4,6 +4,10 @@ * */ +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp index 7af7d15d90..192aef5e24 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp @@ -5,7 +5,11 @@ */ #include "Common/Cpp/Color.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "PokemonRSE_ShinyNumberDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp index faad896a67..1424b783d7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp @@ -11,6 +11,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" +#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" @@ -20,6 +21,7 @@ #include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.h" #include "VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Settings.h" +#include "PokemonRSE_Navigation.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp index 29ff0753d6..5f47f387c2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h" +#include "PokemonRSE_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp index b7102e8235..5316d7cd3d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp index ed71eb5e2b..8ef4c8ea02 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp index f5877dfa72..340eafea6f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp @@ -13,6 +13,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h" #include "PokemonRSE_LegendaryRunAway-Emerald.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp index 670d63cf0c..3fa82e118b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp @@ -13,6 +13,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h" #include "PokemonRSE_ShinyHunt-Deoxys.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp index e998988f55..3eb6cdb7e5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp @@ -13,6 +13,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h" #include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h" #include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h" #include "PokemonRSE_ShinyHunt-Mew.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp index 36bfcfc5ee..7c8e00c137 100644 --- a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp index 62bbe63f95..63c1162cbb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp @@ -4,6 +4,8 @@ * */ +#include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "PokemonSV_BattleBallReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp index ee7cad0cdc..5fe3326ac6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp @@ -9,6 +9,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Inference/Pokemon_NameReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp index b881adf3ac..d02028bfd0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp index c327323192..94614e1f99 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp @@ -6,9 +6,14 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Common/Cpp/Exceptions.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/WaterfillUtilities.h" +#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "PokemonSV_BoxEggDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp index db53cd64cc..ffb871dc23 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSV_BoxNatureDetector.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp index 5002357523..1d500bfeef 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSV_IvJudgeReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp index e7b0ef02d4..19bea16f74 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp @@ -10,6 +10,7 @@ #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" +#include "PokemonSV_StatsResetChecker.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp index 83f9f6f357..b9c221bc42 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp @@ -6,8 +6,12 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTypes/BinaryImage.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Images/WaterfillUtilities.h" +#include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_DialogArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp index 5fe6092a78..9d67331ecf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp @@ -7,6 +7,8 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonSV_GradientArrowDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp index 18bfb0efc4..3dacb1b548 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp @@ -8,6 +8,8 @@ #include "Common/Cpp/Concurrency/SpinLock.h" #include "Common/Cpp/Concurrency/AsyncTask.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp index d122921a5f..9c88b938a6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp @@ -7,6 +7,8 @@ #include #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp index b7eb69216a..313f1bdcee 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Concurrency/AsyncTask.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp index d1fb9fb8cb..599052e4e0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp @@ -5,6 +5,8 @@ */ #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_DestinationMarkerDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp index 289b6ed5c7..76c0863fa0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp @@ -7,6 +7,8 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_FastTravelDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp index 7cd99b2c02..c7261aaab7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp @@ -7,7 +7,9 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" +#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "Tests/TestUtils.h" #include "PokemonSV_MapDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp index 7fb029c43e..dd741e32fb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp @@ -5,6 +5,9 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/SolidColorTest.h" #include "Tests/TestUtils.h" #include "PokemonSV_MapMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp index 7da1d811e2..b87b0e4c65 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp @@ -7,7 +7,10 @@ #include "Common/Cpp/Containers/FixedLimitVector.tpp" #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" +#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_MapDetector.h" #include "PokemonSV_MapPokeCenterIconDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp index 01ac8e6468..2666c355e7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp @@ -6,9 +6,11 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/Async/InterruptableCommands.h" #include "CommonTools/Async/InferenceSession.h" +#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV_AreaZeroSkyDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp index 163c7b88af..e805f3c28f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp @@ -7,12 +7,15 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "PokemonSV_DirectionDetector.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp index f6106033f4..57c44f345b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp @@ -5,7 +5,9 @@ */ #include "Kernels/Waterfill/Kernels_Waterfill_Types.h" +#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp index d0b90a1438..52a33dbc79 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp @@ -9,6 +9,7 @@ #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" +#include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_OverworldDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp index 08bbda4277..c5344bef91 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" +#include "CommonTools/Images/WaterfillUtilities.h" #include "PokemonSV_StationaryOverworldWatcher.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp index 180780ccd6..bef716d16c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSV_PicnicDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp index f56d40b4fb..47c1a8e0aa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSV_PokemonSummaryReader.h" #include "PokemonSV_BagDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp index 9efcb6037d..378cb5236f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp @@ -5,6 +5,9 @@ */ #include "CommonFramework/Exceptions/OperationFailedException.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/ImageFilter.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.h" #include "PokemonSV_BlueberryQuestDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp index 512f1e3499..1be66a13be 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Tools/ErrorDumper.h" #include "PokemonSV_ClothingTopDetector.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp index 36a7e0855b..42f8538153 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSV_ESPEmotionDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp index 6e7d441065..2411710731 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp @@ -6,7 +6,9 @@ #include #include "Common/Cpp/Logging/AbstractLogger.h" +#include "CommonFramework/Language.h" #include "CommonTools/OCR/OCR_Routines.h" +#include "PokemonSV_MoneyReader.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp index ea119bb5de..0ef47c255d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp @@ -5,6 +5,8 @@ */ #include "CommonFramework/Exceptions/OperationFailedException.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "PokemonSV_PokemonMovesReader.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp index cccaafdf0a..7f7f791082 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSV_PokemonSummaryReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp index e94b7ace51..2806843d40 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp @@ -6,7 +6,10 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/Exceptions/OperationFailedException.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "PokemonSV_StatHexagonReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp index 27519b7dd3..db46c330f2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp @@ -6,6 +6,8 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "PokemonSV_SweatBubbleDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp index 9465f0c08f..308af5728b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp @@ -7,6 +7,9 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTypes/BinaryImage.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" //#include "Tests/TestUtils.h" #include "PokemonSV_WhiteButtonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp index eaf6f8f410..28d18e5447 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp @@ -5,6 +5,9 @@ */ #include "Common/Cpp/Containers/FixedLimitVector.tpp" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" #include "PokemonSV_WhiteTriangleDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp index 61e2dc9e04..2b2839ab23 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp @@ -12,6 +12,9 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/BinaryImage.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp index a6ae858c1c..cd4696fdf9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp @@ -8,6 +8,7 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Tools/GlobalThreadPools.h" #include "CommonTools/Images/ImageManip.h" @@ -15,6 +16,7 @@ #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/OCR/OCR_Routines.h" +#include "PokemonSV_TeraCodeReader.h" //#define PA_ENABLE_CODE_DEBUG diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp index 236586a4d9..a2fa8a514b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp @@ -6,6 +6,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp index 04599d4a80..98fab4984d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp index fe8d50cbaf..90919f1625 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Logging/Logger.h" #include "VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h" #include "PokemonSV_TournamentPrizeSelectOption.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp index 782ace975b..02e94b05c7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp @@ -5,19 +5,27 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Inference/PokemonSV_WhiteButtonDetector.h" +#include "Inference/Boxes/PokemonSV_BoxDetection.h" #include "Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "Inference/Map/PokemonSV_MapDetector.h" #include "Inference/Overworld/PokemonSV_OverworldDetector.h" #include "Inference/Picnics/PokemonSV_PicnicDetector.h" +#include "Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "Inference/Tera/PokemonSV_TeraCardDetector.h" +#include "Inference/Tera/PokemonSV_TeraSilhouetteReader.h" +#include "Inference/Tera/PokemonSV_TeraTypeReader.h" +#include "Inference/Dialogs/PokemonSV_DialogDetector.h" #include "Inference/Map/PokemonSV_FastTravelDetector.h" #include "Inference/Map/PokemonSV_MapMenuDetector.h" #include "Inference/Map/PokemonSV_MapPokeCenterIconDetector.h" #include "Inference/PokemonSV_ESPEmotionDetector.h" #include "Inference/Picnics/PokemonSV_SandwichIngredientDetector.h" #include "Inference/Picnics/PokemonSV_SandwichPlateDetector.h" +#include "Inference/Overworld/PokemonSV_LetsGoKillDetector.h" #include "Inference/Picnics/PokemonSV_SandwichRecipeDetector.h" #include "Inference/Picnics/PokemonSV_SandwichHandDetector.h" +#include "Options/PokemonSV_BBQuests.h" #include "Programs/Farming/PokemonSV_BlueberryQuests.h" #include "PokemonSV_Tests.h" #include "CommonFramework/GlobalAutoPaths.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp index 8689512be5..8167660fcb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp @@ -16,10 +16,13 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" +#include "ML/Inference/ML_YOLOv5Detector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" @@ -29,6 +32,7 @@ #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "PokemonSV_AutoStory_Segment_00.h" #include "PokemonSV_AutoStory_Segment_01.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp index 45ae634743..c2d61152df 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp @@ -5,8 +5,10 @@ */ #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -14,8 +16,10 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp index f26a69baaa..67918894f2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp @@ -7,6 +7,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_00.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp index b577a11b00..e08134efae 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp @@ -10,6 +10,8 @@ #include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_01.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp index d15d80438b..fffe2a61b2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp @@ -4,9 +4,12 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_02.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp index 74ffa3b1c5..cf78e0439f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp @@ -4,9 +4,14 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_03.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp index d5d6ec57a4..0b1cbba684 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp @@ -7,7 +7,12 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_04.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp index 2f139263c2..7b0d3de553 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp @@ -4,9 +4,14 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_05.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp index a0303df6f1..1c9aeff3ee 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_06.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp index d4528f6aa9..b887ba7264 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp @@ -4,9 +4,14 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_07.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp index bb9250fb13..cd4d46dda5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp @@ -4,7 +4,13 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_08.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp index c4f1ba9783..4041c0fcd1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp @@ -4,8 +4,11 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_09.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp index 281bf93e9e..9502a89576 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp @@ -8,6 +8,11 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_10.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp index e7d8a6e354..a45110d124 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp @@ -12,11 +12,15 @@ #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "PokemonSV_OliveActionFailedException.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_11.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp index e7e99aee3b..70920730bc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp @@ -8,8 +8,14 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_12.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp index aeb507c773..17c8df9bdb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp @@ -6,7 +6,11 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_13.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp index 5a512cc344..23d12c84d2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp @@ -6,7 +6,12 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_14.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp index 9bf207ec52..7d538e17d8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp @@ -11,6 +11,8 @@ #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_15.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp index 5c4cbc46bb..8bec9098fe 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp @@ -5,9 +5,14 @@ */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_16.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp index 99cdda50e7..83c53c4e0c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp @@ -5,9 +5,14 @@ */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_17.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp index 8f0ae61822..997665eaa8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp @@ -9,7 +9,11 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_18.h" // #include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp index ba53b4bfcb..408d949a38 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp @@ -5,9 +5,14 @@ */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_19.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp index 932e38f34e..0fe5bcea82 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp @@ -8,8 +8,13 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_20.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp index 4727d187cd..b739a897fd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp @@ -10,6 +10,8 @@ #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_21.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp index f7f836b79b..d974b440b9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp @@ -12,6 +12,8 @@ #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_22.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp index a4f41d3a4d..887d63d554 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp @@ -4,7 +4,9 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_23.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp index c6464f4666..100d42ef39 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp @@ -3,10 +3,15 @@ * From: https://github.com/PokemonAutomation/ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_24.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp index 6e2b7f07eb..bd496e9334 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp @@ -8,8 +8,13 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_25.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp index 3628dbba21..34b83ce72d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp @@ -10,7 +10,11 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_26.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp index 58d722c11d..da6a535aa9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp @@ -4,10 +4,15 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_27.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp index d06be3b488..c5141fe910 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp @@ -7,8 +7,13 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_28.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp index 8c38541c42..2b5e80da31 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp @@ -4,10 +4,15 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_29.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp index 25df03b888..607656259a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp @@ -7,8 +7,13 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_30.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp index db008fd914..6dc3706a44 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp @@ -8,8 +8,13 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_31.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp index ec16eb6d50..a8f27b5786 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp @@ -4,11 +4,16 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_32.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp index 0840e24ed7..40d91c2d80 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp @@ -3,6 +3,8 @@ * From: https://github.com/PokemonAutomation/ * */ +#include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" @@ -13,7 +15,11 @@ #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_33.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp index e289831bd2..aa49de6bb6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp @@ -7,7 +7,11 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_34.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp index 31b1f9a4e5..16e6bba254 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp @@ -8,8 +8,13 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonFramework/VideoPipeline/VideoFeed.h" //#include "CommonTools/Async/InferenceRoutines.h" +#include "ML/Inference/ML_YOLOv5Detector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_35.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp index ea9ed8f6c6..92e3b12476 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp @@ -8,7 +8,11 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_36.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp index f899e76ba4..fa23e10b24 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp @@ -8,7 +8,11 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_37.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp index 9f396f0109..638ffc2baf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp @@ -8,7 +8,11 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_38.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp index aa80892c45..21518003fc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp @@ -8,7 +8,11 @@ //#include "CommonFramework/Exceptions/OperationFailedException.h" //#include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_39.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp index 53081e99f5..0682ba3248 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp @@ -11,6 +11,8 @@ #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AutoStoryTools.h" #include "PokemonSV_AutoStory_Segment_40.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp index a4410a4c01..04d8e5355b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp @@ -5,9 +5,11 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp index edb2b3189e..fa13e4de26 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp @@ -11,8 +11,10 @@ #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "PokemonSV_BasicCatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp index bcb3083875..80cdb4b8df 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp @@ -8,6 +8,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "PokemonSV_SinglesBattler.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp index 60c0933857..542270c234 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp @@ -12,6 +12,7 @@ //#include "PokemonSV_BoxRoutines.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" +#include "PokemonSV_BoxAttach.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp index 5a42d0797e..9391b71cac 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp @@ -11,6 +11,7 @@ #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "PokemonSV_BoxRoutines.h" +#include "PokemonSV_BoxRelease.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp index 83d929e06c..c0913e9313 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp @@ -7,10 +7,13 @@ //#include //#include //#include +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" +#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp index ed45491264..a6a37bcc49 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp @@ -11,6 +11,7 @@ #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp index 2e77e065e9..41c43ee4ef 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp @@ -11,6 +11,7 @@ #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp index 88ba001aad..d87c376abd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp @@ -11,6 +11,8 @@ #include "CommonFramework/Exceptions/FatalProgramException.h" //#include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" @@ -23,6 +25,7 @@ #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp index 9ca41bbf7b..bf7d984f4d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp @@ -7,11 +7,16 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" +#include "CommonTools/Options/LanguageOCROption.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "Pokemon/Options/Pokemon_StatsHuntFilter.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h" @@ -24,6 +29,7 @@ #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" +#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h" #include "PokemonSV_EggRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp index fe53a5e4d8..ab4a2cd3cd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp @@ -10,8 +10,10 @@ #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp index 0f70d6932e..fcfa3182fa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp index 756960a821..3a24e1d187 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -12,8 +13,14 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp index c1baa2ac57..c90bae7a04 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp @@ -6,26 +6,38 @@ #include #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/OCR/OCR_NumberReader.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" #include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" +#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h" #include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" +#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" +#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h" #include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp index 23a5322ad5..3b98758e8b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp @@ -25,6 +25,7 @@ //#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h" +#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h" #include "PokemonSV_ClaimMysteryGift.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp index 8ec02dea9c..d3d0636c14 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp index 7c74f52e57..426e85f38e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp @@ -8,18 +8,24 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/StaticGlobals.h" +#include "CommonFramework/Exceptions/ProgramFinishedException.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" +#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h" #include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h" #include "PokemonSV_MaterialFarmerTools.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp index 9133ba1487..eb4bf5626e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp @@ -10,6 +10,7 @@ #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Async/InferenceRoutines.h" +#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp index 4552b353ce..06c0f1f8da 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp @@ -13,6 +13,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp index e61f203ef5..70381696f4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp @@ -11,6 +11,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "Pokemon/Pokemon_Strings.h" +#include "PokemonSV_CodeEntry.h" #include "PokemonSV_ClipboardFastCodeEntry.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp index c0fa755991..adcab091ca 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp @@ -6,6 +6,7 @@ #include #include "Common/Cpp/Containers/FixedLimitVector.tpp" +#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h" #include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp index d2d653d5ed..c77a0790a3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp @@ -11,6 +11,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "Pokemon/Pokemon_Strings.h" +#include "PokemonSV_CodeEntry.h" #include "PokemonSV_FastCodeEntry.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp index c2a456d849..9060ec77a3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp @@ -15,6 +15,7 @@ #include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h" +#include "PokemonSV_CodeEntry.h" #include "PokemonSV_VideoFastCodeEntry.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp index d69c8c7171..5adc1f718f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp @@ -8,6 +8,7 @@ #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp index c4e6ddd0b8..555972a49c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp @@ -12,7 +12,9 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" +#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp index e51f96e138..e12b47c804 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" @@ -12,6 +13,7 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp index 5b19b85dac..6de78c9f40 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -15,8 +16,10 @@ #include "VideoGames/PokemonSV/PokemonSV_Settings.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" +#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp index c2e69dc51b..81008b4b4b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp @@ -8,6 +8,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -16,6 +17,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp index 5a1718ea5b..4dca93fecc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp @@ -6,7 +6,9 @@ #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" @@ -19,6 +21,7 @@ #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp index 3a05115bfb..4ce5bd27b5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp @@ -13,6 +13,9 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp index 1766f51b56..d833157fc9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp @@ -10,6 +10,8 @@ #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" @@ -19,9 +21,12 @@ #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h" #include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h" +#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "PokemonSV_ItemPrinterSeedCalc.h" #include "PokemonSV_ItemPrinterDatabase.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp index 248d1b590f..dc8a07acb3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp @@ -14,6 +14,7 @@ #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_AreaZero.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp index 844faa08b2..530753bdd6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp @@ -5,12 +5,15 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" +#include "PokemonSV_ConnectToInternet.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp index 5333c7bcf4..5aa261f986 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp @@ -8,12 +8,15 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/SolidColorTest.h" +#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" +#include "PokemonSV_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp index 3e402d0652..4058c951a5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp @@ -3,6 +3,7 @@ */ #include "Common/Cpp/RecursiveThrottler.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" @@ -13,11 +14,16 @@ //#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h" //#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" +#include "VideoGames/PokemonSV/PokemonSV_Settings.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" +#include "PokemonSV_ConnectToInternet.h" #include "PokemonSV_MenuNavigation.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp index efe757779b..82401f11c7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp index 43ed211cb6..aae34299d3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp @@ -5,14 +5,19 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" +#include "PokemonSV_Terarium.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp index 48d2c48e32..9867d96edd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp @@ -10,21 +10,28 @@ #include //#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" //#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h" +#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" //#include "VideoGames/PokemonSV/PokemonSV_Settings.h" #include "CommonFramework/Exceptions/UnexpectedBattleException.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h" #include "VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h" #include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h" #include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" +#include "PokemonSV_ConnectToInternet.h" #include "PokemonSV_WorldNavigation.h" using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp index 01d180d279..8ab03c2d0f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp @@ -8,6 +8,7 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp index 032cf403e0..d21bb3b405 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp @@ -7,6 +7,7 @@ #include #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Logging/Logger.h" +#include "CommonFramework/Exceptions/ProgramFinishedException.h" //#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" //#include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Tools/ProgramEnvironment.h" @@ -15,6 +16,7 @@ //#include "Pokemon/Pokemon_Notification.h" //#include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h" +#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" //#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h" #include "PokemonSV_LetsGoTools.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp index 85246b25d2..f107b6c755 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp @@ -11,6 +11,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Exceptions/FatalProgramException.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" @@ -18,12 +19,14 @@ #include "VideoGames/PokemonSV/PokemonSV_Settings.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" #include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h" +#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h" #include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h" #include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h" +#include "PokemonSV_LetsGoTools.h" #include "PokemonSV_ShinyHunt-AreaZeroPlatform.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp index b060d3a11b..c21a3658c8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp @@ -10,11 +10,14 @@ #include "CommonFramework/Exceptions/ProgramFinishedException.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h" +#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp index dc04665377..643cca0e5c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp @@ -6,19 +6,25 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Async/InferenceRoutines.h" +#include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h" #include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h" +#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h" #include "PokemonSV_AutoHostTools.h" #include "PokemonSV_AutoHostLobbyWaiter.h" #include "PokemonSV_AutoHost.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp index 36b46d6c4e..adc2f78aff 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp @@ -10,9 +10,11 @@ #include "Common/Qt/TimeQt.h" #include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/Exceptions/FatalProgramException.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/FileDownloader.h" #include "CommonFramework/Tools/ProgramEnvironment.h" +#include "VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h" #include "PokemonSV_AutoHostTools.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp index 2e5ce81e69..0e806bacda 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp @@ -8,6 +8,8 @@ //#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" +#include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" @@ -15,12 +17,16 @@ #include "Pokemon/Inference/Pokemon_NameReader.h" #include "VideoGames/PokemonSV/PokemonSV_Settings.h" //#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" +#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h" +#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h" #include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h" #include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h" +#include "PokemonSV_TeraRoutines.h" #include "PokemonSV_TeraBattler.h" +#include "PokemonSV_AutoHostTools.h" #include "PokemonSV_AutoHostLobbyWaiter.h" #include "PokemonSV_TeraMultiFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp index e836882db4..3072d95431 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp @@ -6,6 +6,7 @@ #include #include "CommonFramework/Exceptions/ProgramFinishedException.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/StartupChecks/VideoResolutionCheck.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp index 20563e6637..d0766fde74 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp @@ -17,6 +17,7 @@ #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "Pokemon/Pokemon_Strings.h" +#include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp index e4ba4deb00..64de6ba8d9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp @@ -10,6 +10,8 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h" +#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h" #include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h" #include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h" #include "PokemonSV_TradeRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp index 75737470b0..30a16530c5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp @@ -10,6 +10,7 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" +#include "PokemonSwSh_Commands_AutoHosts.h" //#include "PokemonSwSh_Messages_AutoHosts.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp index 323f2a172d..850e3e5bb5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp @@ -5,6 +5,7 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "PokemonSwSh_Commands_EggRoutines.h" //#include "PokemonSwSh_Messages_EggRoutines.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp index 0d4fa73861..ca452e9ded 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp @@ -5,6 +5,7 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" +#include "PokemonSwSh_Commands_Misc.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp index 21314c7687..9b66bc07b0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/ImageFilter.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp index 883a88b4c4..25bcb3e5cb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_BattleDialogDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp index b57a2f21eb..fc794dff15 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSwSh_BattleDialogTracker.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp index 5deef64b4c..23d1f28956 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp @@ -3,6 +3,7 @@ * From: https://github.com/PokemonAutomation/ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_StartBattleDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp index 6513a4f6e2..4aa83547c1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp @@ -8,6 +8,7 @@ */ #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/Tools/StatAccumulator.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp index 1c4e0ad743..1601fdbc0c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/ColorClustering.h" #include "PokemonSwSh_RaidCatchDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp index 7262e0678d..632029452b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp @@ -8,6 +8,8 @@ */ #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "PokemonSwSh_RaidLobbyReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp index b33c761fe2..d5af29fbbd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp @@ -8,6 +8,8 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalAutoPaths.h" //#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp index a81f460ae0..44c91dfc3e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_BoxEmptySlotDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp index 06b1c92154..ee4ac85adf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp @@ -5,7 +5,10 @@ */ #include "Common/Cpp/Color.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonTools/Images/ImageFilter.h" #include "PokemonSwSh_BoxNatureDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp index 2eeb1e1c5a..232403065f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp @@ -10,7 +10,9 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_BoxShinySymbolDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp index c5e5447e7c..d193f05a87 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_DialogBoxDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp index 67b5134d7e..ecd710a437 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp @@ -8,6 +8,7 @@ #include "Common/Cpp/Color.h" #include "Common/Cpp/Logging/AbstractLogger.h" #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp index f1d9d56440..c62f1a85bb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MarkFinder.h" #include "PokemonSwSh_FishingDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp index a37bab120a..ca7b4d0219 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "PokemonSwSh_IvJudgeReader.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp index 5ff354ca30..96bd6ff1c8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp @@ -8,7 +8,9 @@ #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" +#include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h" +#include "PokemonSwSh_MarkFinder.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp index b5751ddf7f..d7cff2eba6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp @@ -4,6 +4,8 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/ImageMatch/ImageCropper.h" #include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h" #include "PokemonSwSh_PokemonSpriteReader.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp index 6c7ac63a74..80d9dcd034 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp @@ -4,6 +4,8 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_ReceivePokemonDetector.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp index 3d8a02f253..a0d04a775b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp @@ -12,8 +12,10 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Notifications/ProgramInfo.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/DebugDumper.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "CommonTools/ImageMatch/ExactImageMatcher.h" #include "Tests/TestUtils.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp index 299d26391a..ae35afaeb4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp @@ -5,7 +5,9 @@ */ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" +#include "Kernels/Waterfill/Kernels_Waterfill_Types.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/WaterfillUtilities.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp index 2c9df6f181..df6a22b947 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp index 631d9824c0..c9637fa73a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp @@ -11,6 +11,7 @@ #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/ImageTypes/BinaryImage.h" #include "CommonTools/Images/DistanceToLine.h" +#include "PokemonSwSh_SparkleDetectorSquare.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp index 79dee868eb..1ed8ebe5d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp @@ -9,6 +9,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp index 4252434b76..2edbd3e9c6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp @@ -5,6 +5,7 @@ */ //#include "CommonFramework/Environment/Environment.h" #include "CommonTools/Random.h" +#include "PokemonSwSh_MaxLair_AI.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp index 096753d6ad..6edc227f3b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp @@ -5,6 +5,7 @@ */ #include +#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_PathMatchup.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp index b2cdd48345..6ee91c28dc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp @@ -4,6 +4,8 @@ * */ +#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h" +#include "PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" #include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp index 417a0461cc..e1e2de0163 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp @@ -5,6 +5,7 @@ */ #include +#include "PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp index c89b2cd8b0..74fa33ede8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp @@ -5,7 +5,9 @@ */ #include "Common/Cpp/Exceptions.h" +#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h" #include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h" +#include "PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" //#include diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp index 47034773eb..f1d5a477c2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp @@ -6,6 +6,8 @@ #include #include "Common/Cpp/Exceptions.h" +#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h" +#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h" #include "PokemonSwSh_MaxLair_AI_Tools.h" #include "PokemonSwSh_MaxLair_AI_PathMatchup.h" #include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp index f0569ec058..26c374a27d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp index 1170e039d7..7b6dda5677 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp @@ -7,6 +7,7 @@ //#include "CommonFramework/Globals.h" //#include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "Pokemon/Pokemon_Strings.h" #include "Pokemon/Pokemon_Notification.h" #include "Pokemon/Resources/Pokemon_PokemonNames.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp index 7a08805b61..eb935fdfb9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp @@ -4,6 +4,7 @@ * */ #include "Common/Cpp/PrettyPrint.h" +#include "Pokemon/Pokemon_Types.h" #include "PokemonSwSh_MaxLair_State.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp index bf448957eb..747d4d5bba 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp @@ -5,8 +5,10 @@ */ #include "Common/Cpp/Containers/FixedLimitVector.tpp" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Notifications/ProgramInfo.h" +#include "CommonTools/Async/InterruptableCommands.h" #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/FrozenImageDetector.h" #include "Pokemon/Pokemon_Strings.h" @@ -27,6 +29,7 @@ #include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h" #include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h" #include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h" +#include "PokemonSwSh_MaxLair_StateMachine.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp index abdc07e011..4dc758854a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "PokemonSwSh_MaxLair_Detect_Entrance.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp index 83108151ce..72b501b149 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Strings/Unicode.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/OCR/OCR_StringNormalization.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp index 06f08a0e38..b9c0271c14 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp @@ -4,6 +4,8 @@ * */ +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/ImageTools/ImageDiff.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MaxLair_Detect_Lobby.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp index bad6cbf9ea..68dfeae36e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp index 41ad4452b5..8fbd3e9376 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp @@ -5,11 +5,13 @@ */ #include "CommonFramework/Notifications/ProgramInfo.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "Pokemon/Inference/Pokemon_ReadHpBar.h" #include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h" +#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h" #include "PokemonSwSh_MaxLair_Detect_PathSide.h" #include "PokemonSwSh_MaxLair_Detect_PathMap.h" #include "PokemonSwSh_MaxLair_Detect_PathSelect.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp index c95430fe1f..fcdba0d9b7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp @@ -7,9 +7,11 @@ #include #include "Kernels/Waterfill/Kernels_Waterfill_Session.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonTools/Images/DistanceToLine.h" #include "CommonTools/Images/SolidColorTest.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" +#include "PokemonSwSh_MaxLair_Detect_PathSide.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp index 54c59d0063..6cd925c7c2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp @@ -5,6 +5,7 @@ */ #include "Common/Cpp/Exceptions.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp index 7fca6f6449..25a3c38650 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp @@ -4,6 +4,9 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MaxLair_Detect_PokemonReader.h" #include "PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp index dffa0cd3f4..4b9ee75ba6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp @@ -4,7 +4,9 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramInfo.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Images/SolidColorTest.h" #include "Pokemon/Inference/Pokemon_ReadHpBar.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp index 1e569e9e53..524eafb51c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "CommonTools/Images/SolidColorTest.h" #include "PokemonSwSh_MaxLair_Detect_ProfessorSwap.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp index e6e3207dfa..dc2ba76de5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Exceptions/FatalProgramException.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -21,6 +22,7 @@ #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h" +#include "PokemonSwSh_MaxLair_Run_CaughtScreen.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp index 96206cceda..ffebd58916 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp @@ -5,6 +5,9 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/ImageTypes/ImageRGB32.h" +#include "CommonFramework/ImageTools/ImageStats.h" +#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Images/ImageManip.h" #include "CommonTools/Images/ImageFilter.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp index 940046b6ca..9f244962b5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp index 9f3030c1cd..242e460b5d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp @@ -5,7 +5,10 @@ */ #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Tools/ErrorDumper.h" +#include "CommonTools/Async/InterruptableCommands.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h" #include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h" #include "PokemonSwSh_MaxLair_Run_PathSelect.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp index 657d68b42c..b657df1a52 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp @@ -13,6 +13,7 @@ #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h" #include "PokemonSwSh_MaxLair_Run_EnterLobby.h" +#include "PokemonSwSh_MaxLair_Run_Start.h" #include "PokemonSwSh_MaxLair_Run_StartSolo.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp index dd5e20f456..63ee5b295e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp @@ -13,6 +13,7 @@ #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h" #include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h" #include "PokemonSwSh_MaxLair_Run_EnterLobby.h" +#include "PokemonSwSh_MaxLair_Run_StartSolo.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp index 4517b593e9..2f9057cebe 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp @@ -4,6 +4,7 @@ * */ +#include "PokemonSwSh_EncounterFilterEnums.h" #include "PokemonSwSh_EncounterFilterOption.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp index c2708a824c..4f5c823c5b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp @@ -4,8 +4,11 @@ * */ +#include +#include #include "Common/Cpp/Exceptions.h" #include "Common/Qt/NoWheelComboBox.h" +#include "PokemonSwSh_EncounterFilterWidget.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp index dbeb8c2aa8..d3b4b5987b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Logging/Logger.h" #include "Pokemon/Resources/Pokemon_PokeballNames.h" #include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h" #include "PokemonSwSh_BallSelectOption.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp index 6e8c325079..2d6d9686ca 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp @@ -10,6 +10,7 @@ #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonObject.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "PokemonSwSh_PkmnLib_Types.h" #include "PokemonSwSh_PkmnLib_Moves.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp index 6b2ebf0a5b..b0a31f06b2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp @@ -8,6 +8,7 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "PokemonSwSh_Panels.h" +#include "PokemonSwSh_Settings.h" #include "Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h" #include "Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp index 1c547e76a2..704212d3d6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp @@ -6,12 +6,14 @@ #include "Common/Cpp/TestRunners/UnitTestDatabase.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h" +#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" #include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h" +#include "PokemonSwSh_Tests.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp index 560d48dc03..a9a09c047b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp @@ -16,6 +16,7 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" +#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" #include "VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp index c052a12fd4..fcd5c9bcaa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp @@ -9,6 +9,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h" #include "PokemonSwSh_DateSpam-WattFarmer.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp index 2fb6bc44c2..b9981a5b96 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp index 3f01903e18..f0e2fabc77 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp index 131edb3018..fb2fbf5cd9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp index 2a65c9bbce..082a8a3552 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp @@ -6,6 +6,7 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Notifications/ProgramNotifications.h" +#include "Controllers/ControllerTypes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp index c774f426c0..8b0ab51f75 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp @@ -7,7 +7,9 @@ #include #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" @@ -23,7 +25,9 @@ #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" +#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h" +#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h" #include "PokemonSwSh_EggHelpers.h" #include "PokemonSwSh_EggAutonomous.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp index d75e8c251d..1a97188e0c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp @@ -11,6 +11,7 @@ //#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" +#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h" #include "PokemonSwSh_EggHelpers.h" #include "PokemonSwSh_EggHatcher.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp index 2bec1192df..a21d37c517 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" +#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp index 2612af9288..16e4b13772 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp index 02dff47bfa..b7f044809c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp @@ -7,7 +7,9 @@ #include #include #include +#include "CommonFramework/Language.h" //#include "CommonFramework/Exceptions/OperationFailedException.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp index 64b1c5a3f2..24ff860d79 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp index de6acfc60a..e1c517ba11 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp @@ -7,6 +7,7 @@ #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp index cdd388b3fd..243d09411e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp @@ -7,6 +7,7 @@ #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h" #include "Pokemon/Pokemon_Strings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp index 668a386836..5276469c96 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp @@ -11,6 +11,7 @@ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" +#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "PokemonSwSh_DenTools.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp index 192532ac9f..a0998ef19e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp @@ -10,6 +10,8 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h" +#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" +#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h" #include "PokemonSwSh_DenTools.h" #include "PokemonSwSh_AutoHostStats.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp index c2ca4a0485..bf87b233d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp @@ -13,6 +13,7 @@ #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" +#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "PokemonSwSh_DenTools.h" #include "PokemonSwSh_DenRoller.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp index 407d83965a..4293ea9406 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp index 6ce0c6360d..1ddf7cedab 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp @@ -5,6 +5,7 @@ */ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" @@ -16,6 +17,7 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" +#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "PokemonSwSh_StatsReset-Moltres.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp index 65e3c80bb1..419d803740 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp index 6ed135fbd7..cf517d0ec9 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp @@ -11,6 +11,7 @@ #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h" #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "Pokemon/Pokemon_Strings.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp index 0556187793..b4ac0d1e0c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp @@ -5,6 +5,7 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "PokemonSwSh_OverworldMovement.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp index ead89b0420..8ed438603e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp @@ -5,6 +5,8 @@ */ #include "Common/Cpp/PrettyPrint.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" +#include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h" #include "PokemonSwSh_OverworldTargetTracker.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp index e28bfb2f0a..146aaaa9d4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp @@ -13,10 +13,13 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" +#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" +#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_OverworldMovement.h" +#include "PokemonSwSh_OverworldTrajectory.h" #include "PokemonSwSh_OverworldTrigger.h" #include "PokemonSwSh_ShinyHuntAutonomous-Overworld.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp index 23d7e3e6ea..c96b436064 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp @@ -4,11 +4,14 @@ * */ +#include "CommonFramework/Tools/VideoStream.h" #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h" +#include "PokemonSwSh_BoxHelpers.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp index e52dea6771..9cc8316fbe 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp @@ -6,9 +6,11 @@ //#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h" //#include "CommonFramework/Globals.h" +#include "CommonFramework/ImageTypes/ImageViewRGB32.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonFramework/Tools/ProgramEnvironment.h" +#include "CommonTools/Async/InterruptableCommands.h" #include "Pokemon/Inference/Pokemon_NameReader.h" #include "PokemonSwSh_EncounterDetection.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp index ad115f7297..678fb4b91c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp @@ -10,6 +10,7 @@ #include "CommonTools/Async/InferenceRoutines.h" #include "CommonTools/VisualDetectors/BlackScreenDetector.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "Pokemon/Pokemon_Notification.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h" #include "PokemonSwSh_EncounterHandler.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp index 797d7f070b..6d255e92e5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp @@ -13,6 +13,7 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h" +#include "PokemonSwSh_GameEntry.h" //#include //using std::cout; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp index cd3f353e0a..fcf2238b69 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp @@ -5,10 +5,12 @@ */ #include "CommonFramework/VideoPipeline/VideoFeed.h" +#include "CommonFramework/Notifications/ProgramInfo.h" #include "CommonFramework/Tools/ErrorDumper.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" +#include "PokemonSwSh_Internet.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp index 571e690686..9eeb3be630 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp @@ -6,6 +6,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" +#include "CommonFramework/Tools/ErrorDumper.h" //#include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonTools/Async/InferenceRoutines.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp index b2b91305cf..43ccbac48c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp @@ -14,6 +14,7 @@ #include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h" #include "CommonFramework/Notifications/ProgramNotifications.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "CommonFramework/ImageTools/ImageStats.h" #include "CommonFramework/VideoPipeline/VideoFeed.h" #include "CommonFramework/Tools/DebugDumper.h" #include "CommonTools/Images/SolidColorTest.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp index 9af20ee118..d46a2f549c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp @@ -14,6 +14,8 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" +#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" +#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-BerryTree.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp index a16cc25541..f46094e134 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp @@ -13,7 +13,9 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" +#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h" #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h" +#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-Fishing.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp index 450c3ceffa..b9ebeec495 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp @@ -10,6 +10,7 @@ #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h" #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" +#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp index 5a8404b505..8195618461 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp @@ -17,6 +17,7 @@ #include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" #include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h" +#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp index c752e3581f..f236ac682e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp @@ -13,6 +13,7 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" //#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" +#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp index 11642c3f72..f0e921c631 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp @@ -13,6 +13,8 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" +#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" +#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp index e6bc0160eb..c7620a2463 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp @@ -12,6 +12,8 @@ #include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h" #include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h" #include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h" +#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h" +#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h" #include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h" #include "PokemonSwSh_ShinyHuntAutonomous-Whistling.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp index d3a0e5048b..ebc9268c73 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Globals.h" #include "CommonTools/Async/InferenceSession.h" #include "CommonTools/StartupChecks/StartProgramChecks.h" #include "NintendoSwitch/NintendoSwitch_Settings.h" diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp index dc28a348e6..9a8feed819 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp @@ -5,6 +5,7 @@ */ #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" +#include "PokemonSwSh_ShinyHuntTools.h" namespace PokemonAutomation{ namespace NintendoSwitch{ diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp index 09b278b5e7..f7bda427b5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp @@ -7,6 +7,7 @@ #include "Common/Cpp/Exceptions.h" #include "Kernels/Waterfill/Kernels_Waterfill.h" #include "CommonFramework/GlobalAutoPaths.h" +#include "CommonFramework/ImageTools/ImageBoxes.h" #include "CommonTools/Images/BinaryImage_FilterRgb32.h" #include "PokemonSwSh_TypeSprites.h" From ee2837a6c02cfd8a3577a263ac20ba0c4095a542 Mon Sep 17 00:00:00 2001 From: PA Dev Bot <344001113+pa-devbot@users.noreply.github.com> Date: Thu, 29 Oct 2026 14:29:29 +0000 Subject: [PATCH 3/3] Restore QPermissions and QApplication in SetupSettings.cpp Both are referenced under the macOS-only permissions code path: QPermission/QCameraPermission/QMicrophonePermission come from (the file references the singular QPermission, which the header-name check missed), and qApp from . --- SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp index 92773fb09a..615379189d 100644 --- a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp +++ b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp @@ -6,8 +6,10 @@ #include #include +#include #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #if QT_CONFIG(permissions) +#include #endif #endif #include "Common/Compiler.h"