Fix MC programs.

Mysticial · Mysticial · commit 234fb1ad7cfb · 2025-03-15T15:06:43.000-07:00
diff --git a/Common/SerialPABotBase/SerialPABotBase_Messages_AVR8.h b/Common/SerialPABotBase/SerialPABotBase_Messages_AVR8.h
@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_SerialPABotBase_Messages_AVR8_H
 #define PokemonAutomation_SerialPABotBase_Messages_AVR8_H
 
-#include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
+#include "SerialPABotBase_Protocol.h"
 
 #if _WIN32
 #pragma pack(push, 1)
diff --git a/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h b/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h
@@ -10,7 +10,7 @@
 //#ifdef __AVR__
 //#include "NativePrograms/NintendoSwitch/Framework/Master.h"
 //#endif
-#include "Common/Microcontroller/MessageProtocol.h"
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
 #include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
 
 
diff --git a/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h b/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h
@@ -10,9 +10,8 @@
 //#ifdef __AVR__
 //#include "NativePrograms/NintendoSwitch/Framework/Master.h"
 //#endif
-#include "Common/Microcontroller/MessageProtocol.h"
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
 #include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
 
 
 
diff --git a/NativePrograms/NintendoSwitch/Programs/CustomProgram_Core.c b/NativePrograms/NintendoSwitch/Programs/CustomProgram_Core.c
@@ -22,7 +22,6 @@
 //  Thus to add a new program, you must edit all of the above.
 //
 
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSV/Programs/EggCombined_Core.c b/NativePrograms/PokemonSV/Programs/EggCombined_Core.c
@@ -1,4 +1,4 @@
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
+
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSV/Programs/EggFetcher_Core.c b/NativePrograms/PokemonSV/Programs/EggFetcher_Core.c
@@ -1,6 +1,5 @@
 // EGG FETCHER SCVI
 
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSV/Programs/EggHatcher_Core.c b/NativePrograms/PokemonSV/Programs/EggHatcher_Core.c
@@ -1,4 +1,4 @@
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
+
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSV/Programs/ItemDupe_Core.c b/NativePrograms/PokemonSV/Programs/ItemDupe_Core.c
@@ -20,7 +20,6 @@
 // Arduino UNO R3 - STABLE
 // Pro Micro - STABLE
 
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSV/Programs/MassPurchase_Core.c b/NativePrograms/PokemonSV/Programs/MassPurchase_Core.c
@@ -1,6 +1,5 @@
 // MASS PURCHASE
 
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSV/Programs/MassRelease_Core.c b/NativePrograms/PokemonSV/Programs/MassRelease_Core.c
@@ -1,6 +1,5 @@
 // SCVI MASS RELEASE
 
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer_Core.c b/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer_Core.c
@@ -1,6 +1,5 @@
 // COIN FARMER ROAMING
 
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
diff --git a/NativePrograms/PokemonSwSh/Programs/BallThrower_Core.c b/NativePrograms/PokemonSwSh/Programs/BallThrower_Core.c
@@ -4,7 +4,6 @@
  * 
  */
 
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
 #include "NativePrograms/DeviceFramework/DeviceSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
 #include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "Common/PokemonSwSh/PokemonProgramIDs.h"`
	`1`	`+`
`2`	`2`	`#include "NativePrograms/DeviceFramework/DeviceSettings.h"`
`3`	`3`	`#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"`
`4`	`4`	`#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"`