diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index f46e8c61e..4528b6073 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -3,7 +3,7 @@
 exec 1>&2
 
 # Run clang-format on staged files; abort the commit if any files are changed
-if ! git clang-format --extensions .c,.h,.cpp,.hpp ; then
+if ! git clang-format --extensions c,h,cpp,hpp ; then
     echo "linting made changes to source files; aborting commit"
     exit 1
 fi
diff --git a/include/constants/savedata/vars_flags.h b/include/constants/savedata/vars_flags.h
index f359da594..cab778c04 100644
--- a/include/constants/savedata/vars_flags.h
+++ b/include/constants/savedata/vars_flags.h
@@ -58,7 +58,7 @@
 #define FLAG_ALT_MUSIC_PAL_PARK                  (SYSTEM_FLAGS_START + 53)
 #define FLAG_FORCE_BIKING_IN_GATE                (SYSTEM_FLAGS_START + 54)
 
-#define SYSTEM_FLAGS_VILLA_FURNITURE_START       (SYSTEM_FLAGS_START + 55)
+#define SYSTEM_FLAGS_VILLA_FURNITURE_START (SYSTEM_FLAGS_START + 55)
 
 enum VillaFurniture {
     VILLA_FURNITURE_UNK_00 = 0,
@@ -90,7 +90,7 @@ enum VillaFurniture {
 #define FLAG_VILLA_VISITOR_OUTSIDE            (SYSTEM_FLAGS_VILLA_VISITOR_START + 1)
 #define FLAG_DISTORTION_WORLD_PUZZLE_FINISHED (SYSTEM_FLAGS_VILLA_VISITOR_START + 2)
 
-#define SYSTEM_FLAGS_GIRATINA_ANIM_START      (FLAG_DISTORTION_WORLD_PUZZLE_FINISHED + 1)
+#define SYSTEM_FLAGS_GIRATINA_ANIM_START (FLAG_DISTORTION_WORLD_PUZZLE_FINISHED + 1)
 
 enum GiratinaShadowAnimation {
     GIRATINA_SHADOW_ANIM_LEFT_TO_RIGHT = 0,
@@ -99,7 +99,7 @@ enum GiratinaShadowAnimation {
     GIRATINA_SHADOW_ANIM_MAX,
 };
 
-#define SYSTEM_FLAGS_FIRST_ARRIVAL_TO_ZONE    (SYSTEM_FLAGS_GIRATINA_ANIM_START + GIRATINA_SHADOW_ANIM_MAX)
+#define SYSTEM_FLAGS_FIRST_ARRIVAL_TO_ZONE (SYSTEM_FLAGS_GIRATINA_ANIM_START + GIRATINA_SHADOW_ANIM_MAX)
 
 enum FirstArrivalToZone {
     FIRST_ARRIVAL_TWINLEAF_TOWN = 0,
diff --git a/include/inlines.h b/include/inlines.h
index 02402f76f..f401ccc80 100644
--- a/include/inlines.h
+++ b/include/inlines.h
@@ -20,8 +20,8 @@
 #include "script_manager.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
-#include "unk_0201D15C.h"
 #include "system_flags.h"
+#include "unk_0201D15C.h"
 #include "vars_flags.h"
 
 static inline void inline_ov61_0222C3B0_sub_1(UnkStruct_ov61_0222C3B0 *);
diff --git a/include/system_flags.h b/include/system_flags.h
index 0ff2ff7f0..5ad62c4b6 100644
--- a/include/system_flags.h
+++ b/include/system_flags.h
@@ -2,8 +2,8 @@
 #define POKEPLATINUM_SYSTEM_FLAGS_H
 
 #include "constants/savedata/vars_flags.h"
-#include "consts/pokemon.h"
 #include "consts/map.h"
+#include "consts/pokemon.h"
 
 #include "vars_flags.h"
 
diff --git a/src/encounter.c b/src/encounter.c
index 269368038..f1ced3000 100644
--- a/src/encounter.c
+++ b/src/encounter.c
@@ -35,6 +35,7 @@
 #include "pokeradar.h"
 #include "save_player.h"
 #include "script_manager.h"
+#include "system_flags.h"
 #include "trainer_data.h"
 #include "unk_020041CC.h"
 #include "unk_02026150.h"
@@ -45,7 +46,6 @@
 #include "unk_0205578C.h"
 #include "unk_02055808.h"
 #include "unk_020562F8.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206CCB0.h"
 #include "unk_020797C8.h"
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 78de7ad2e..ada89f57e 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -18,6 +18,7 @@
 #include "comm_player_manager.h"
 #include "communication_information.h"
 #include "communication_system.h"
+#include "encounter.h"
 #include "field_system.h"
 #include "heap.h"
 #include "party.h"
@@ -30,7 +31,6 @@
 #include "unk_02033200.h"
 #include "unk_020363E8.h"
 #include "unk_020366A0.h"
-#include "encounter.h"
 #include "unk_0205A0D8.h"
 #include "unk_02071D40.h"
 #include "unk_02099500.h"
diff --git a/src/field_map_change.c b/src/field_map_change.c
index fa2bd6348..c9848c5e8 100644
--- a/src/field_map_change.c
+++ b/src/field_map_change.c
@@ -47,6 +47,7 @@
 #include "script_manager.h"
 #include "strbuf.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_020041CC.h"
 #include "unk_02005474.h"
@@ -67,7 +68,6 @@
 #include "unk_0205C22C.h"
 #include "unk_0205CA94.h"
 #include "unk_0205D8CC.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_02070428.h"
 #include "vars_flags.h"
diff --git a/src/field_menu.c b/src/field_menu.c
index df8a801f8..25db9e62c 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -61,6 +61,7 @@
 #include "strbuf.h"
 #include "string_list.h"
 #include "string_template.h"
+#include "system_flags.h"
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020041CC.h"
@@ -81,7 +82,6 @@
 #include "unk_0205C22C.h"
 #include "unk_0205F180.h"
 #include "unk_020683F4.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206B9D8.h"
 #include "unk_0207064C.h"
diff --git a/src/game_start.c b/src/game_start.c
index c7dfb734c..9b69db865 100644
--- a/src/game_start.c
+++ b/src/game_start.c
@@ -16,11 +16,11 @@
 #include "savedata.h"
 #include "savedata_misc.h"
 #include "system_data.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_02017428.h"
 #include "unk_0201D15C.h"
 #include "unk_0205C980.h"
-#include "system_flags.h"
 #include "unk_0206B9D8.h"
 #include "vars_flags.h"
 
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index e717f2ef6..f8154351e 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -32,6 +32,7 @@
 #include "communication_information.h"
 #include "communication_system.h"
 #include "core_sys.h"
+#include "encounter.h"
 #include "field_comm_manager.h"
 #include "field_map_change.h"
 #include "field_menu.h"
@@ -48,13 +49,13 @@
 #include "pokeradar.h"
 #include "save_player.h"
 #include "script_manager.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_02005474.h"
 #include "unk_020261E4.h"
 #include "unk_02030EE0.h"
 #include "unk_020366A0.h"
 #include "unk_0203C954.h"
-#include "encounter.h"
 #include "unk_02054884.h"
 #include "unk_02054D00.h"
 #include "unk_020562F8.h"
@@ -65,7 +66,6 @@
 #include "unk_0205F180.h"
 #include "unk_02067A84.h"
 #include "unk_020683F4.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_02071B10.h"
 #include "vars_flags.h"
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index 576062af3..754d76110 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -28,6 +28,7 @@
 #include "overlay101/struct_ov101_021D5D90_decl.h"
 
 #include "core_sys.h"
+#include "encounter.h"
 #include "field_task.h"
 #include "game_records.h"
 #include "heap.h"
@@ -39,7 +40,6 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "unk_02005474.h"
-#include "encounter.h"
 #include "unk_020553DC.h"
 #include "unk_0205DAC8.h"
 #include "unk_0205F180.h"
diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c
index 414501d38..378c67dec 100644
--- a/src/overlay005/ov5_021EA714.c
+++ b/src/overlay005/ov5_021EA714.c
@@ -9,8 +9,8 @@
 
 #include "game_overlay.h"
 #include "poketch_data.h"
-#include "unk_0200A784.h"
 #include "system_flags.h"
+#include "unk_0200A784.h"
 #include "vars_flags.h"
 
 FS_EXTERN_OVERLAY(overlay24);
diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c
index 19a3b4eea..d4141a68d 100644
--- a/src/overlay005/ov5_021F08CC.c
+++ b/src/overlay005/ov5_021F08CC.c
@@ -17,6 +17,7 @@
 
 #include "bg_window.h"
 #include "core_sys.h"
+#include "encounter.h"
 #include "field_task.h"
 #include "game_records.h"
 #include "heap.h"
@@ -33,7 +34,6 @@
 #include "sys_task_manager.h"
 #include "unk_02005474.h"
 #include "unk_0201D15C.h"
-#include "encounter.h"
 #include "unk_02051D8C.h"
 #include "unk_0205D8CC.h"
 #include "unk_020655F4.h"
diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c
index 203ea0e1d..c5e1ac054 100644
--- a/src/overlay005/ov5_021F8370.c
+++ b/src/overlay005/ov5_021F8370.c
@@ -15,8 +15,8 @@
 #include "heap.h"
 #include "savedata_misc.h"
 #include "script_manager.h"
-#include "unk_02027F50.h"
 #include "system_flags.h"
+#include "unk_02027F50.h"
 #include "vars_flags.h"
 
 typedef struct UnkStruct_ov5_021F8480_t UnkStruct_ov5_021F8480;
diff --git a/src/overlay005/vs_seeker.c b/src/overlay005/vs_seeker.c
index b3ddd4a7d..e9ddd239b 100644
--- a/src/overlay005/vs_seeker.c
+++ b/src/overlay005/vs_seeker.c
@@ -21,10 +21,10 @@
 #include "string_template.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "unk_02005474.h"
 #include "unk_0201D15C.h"
 #include "unk_020655F4.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "vars_flags.h"
 
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index e82b33cb2..9e0659d3b 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -27,6 +27,7 @@
 #include "overlay006/ov6_022477B8.h"
 #include "overlay006/wild_encounters.h"
 
+#include "encounter.h"
 #include "field_overworld_state.h"
 #include "field_system.h"
 #include "field_task.h"
@@ -42,18 +43,17 @@
 #include "roaming_pokemon.h"
 #include "rtc.h"
 #include "save_player.h"
+#include "system_flags.h"
 #include "trainer_data.h"
 #include "trainer_info.h"
 #include "unk_0201D15C.h"
 #include "unk_0202631C.h"
 #include "unk_0202D7A8.h"
-#include "encounter.h"
 #include "unk_02051D8C.h"
 #include "unk_02054884.h"
 #include "unk_02054D00.h"
 #include "unk_020559DC.h"
 #include "unk_0205DAC8.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "vars_flags.h"
 
diff --git a/src/overlay006/ov6_02246A30.c b/src/overlay006/ov6_02246A30.c
index df2516317..a0721f620 100644
--- a/src/overlay006/ov6_02246A30.c
+++ b/src/overlay006/ov6_02246A30.c
@@ -2,6 +2,7 @@
 
 #include <nitro.h>
 #include <string.h>
+
 #include "constants/savedata/vars_flags.h"
 
 #include "struct_decls/pokedexdata_decl.h"
@@ -10,10 +11,10 @@
 
 #include "inlines.h"
 #include "save_player.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0201D15C.h"
 #include "unk_0202631C.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 typedef BOOL (*UnkStruct_ov6_022494B0)(FieldSystem *);
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index fe6d787f3..7746850b9 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -56,6 +56,7 @@
 #include "sprite_resource.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "unk_02005474.h"
 #include "unk_020093B4.h"
 #include "unk_0200A328.h"
@@ -68,7 +69,6 @@
 #include "unk_0205DAC8.h"
 #include "unk_0205F180.h"
 #include "unk_020655F4.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_020711EC.h"
 #include "unk_02073838.h"
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 1e1ab1bfc..cb1647fad 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -47,6 +47,7 @@
 #include "strbuf.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "text.h"
 #include "trainer_info.h"
 #include "unk_020041CC.h"
@@ -66,7 +67,6 @@
 #include "unk_020393C8.h"
 #include "unk_02039C80.h"
 #include "unk_02054D00.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206CCB0.h"
 #include "vars_flags.h"
diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c
index 2ca84bef3..81a3108a7 100644
--- a/src/overlay023/ov23_022416A8.c
+++ b/src/overlay023/ov23_022416A8.c
@@ -27,10 +27,10 @@
 #include "string_template.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "unk_02005474.h"
 #include "unk_0202854C.h"
 #include "unk_02054D00.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 typedef struct {
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index c88a31386..d6fc5dbda 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -44,12 +44,12 @@
 #include "string_template.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0202854C.h"
 #include "unk_02030EE0.h"
 #include "unk_020366A0.h"
 #include "unk_02054D00.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 typedef BOOL (*UnkFuncPtr_ov23_02242540)(int, int);
diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c
index a5b70350c..335429e8b 100644
--- a/src/overlay023/ov23_022499E4.c
+++ b/src/overlay023/ov23_022499E4.c
@@ -24,9 +24,9 @@
 #include "heap.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "unk_02033200.h"
 #include "unk_020366A0.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 static void ov97_0222D19C(SysTask *param0, void *param1);
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index b419714bf..d14b48f7d 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -34,11 +34,11 @@
 #include "strbuf.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_020041CC.h"
 #include "unk_02005474.h"
 #include "unk_0202854C.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206CCB0.h"
 #include "unk_020711EC.h"
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 7c54c675c..e13f9c816 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -50,6 +50,7 @@
 #include "string_list.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_02005474.h"
 #include "unk_0200F174.h"
@@ -61,7 +62,6 @@
 #include "unk_020573FC.h"
 #include "unk_0205F180.h"
 #include "unk_020655F4.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 typedef struct {
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index 4f79edee0..c3ab803b8 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -43,13 +43,13 @@
 #include "string_template.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "unk_02005474.h"
 #include "unk_0200A9DC.h"
 #include "unk_0200F174.h"
 #include "unk_0202854C.h"
 #include "unk_02033200.h"
 #include "unk_0206A780.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 typedef struct {
diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c
index 49bc4f050..49e596947 100644
--- a/src/overlay098/ov98_02246C20.c
+++ b/src/overlay098/ov98_02246C20.c
@@ -21,13 +21,13 @@
 #include "overlay_manager.h"
 #include "save_player.h"
 #include "strbuf.h"
+#include "system_flags.h"
 #include "unk_020041CC.h"
 #include "unk_02017728.h"
 #include "unk_02030CE8.h"
 #include "unk_02033200.h"
 #include "unk_02038FFC.h"
 #include "unk_020393C8.h"
-#include "system_flags.h"
 #include "unk_020890F4.h"
 #include "unk_02099550.h"
 #include "vars_flags.h"
diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c
index 1d8d75e94..a2a51eda4 100644
--- a/src/pokemon_summary_app.c
+++ b/src/pokemon_summary_app.c
@@ -28,6 +28,7 @@
 #include "savedata.h"
 #include "strbuf.h"
 #include "string_template.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_020041CC.h"
 #include "unk_02005474.h"
@@ -41,7 +42,6 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E3D8.h"
 #include "unk_020393C8.h"
-#include "system_flags.h"
 #include "unk_0208C098.h"
 #include "unk_0208EA44.h"
 #include "unk_0208FCF8.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 732492564..1afb5b803 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -95,6 +95,7 @@
 #include "comm_player_manager.h"
 #include "communication_system.h"
 #include "core_sys.h"
+#include "encounter.h"
 #include "field_comm_manager.h"
 #include "field_map_change.h"
 #include "field_overworld_state.h"
@@ -129,6 +130,7 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system_data.h"
+#include "system_flags.h"
 #include "text.h"
 #include "trainer_data.h"
 #include "trainer_info.h"
@@ -181,7 +183,6 @@
 #include "unk_0204FAB4.h"
 #include "unk_0205003C.h"
 #include "unk_02050568.h"
-#include "encounter.h"
 #include "unk_020528D0.h"
 #include "unk_02052C6C.h"
 #include "unk_020553DC.h"
@@ -195,7 +196,6 @@
 #include "unk_0205DFC4.h"
 #include "unk_020655F4.h"
 #include "unk_02069BE0.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206B70C.h"
 #include "unk_0206C0E8.h"
diff --git a/src/system_flags.c b/src/system_flags.c
index 19252c8b1..c244aa0be 100644
--- a/src/system_flags.c
+++ b/src/system_flags.c
@@ -1,7 +1,6 @@
 #include "system_flags.h"
 
 #include "constants/savedata/vars_flags.h"
-
 #include "consts/map.h"
 #include "consts/pokemon.h"
 #include "consts/sdat.h"
diff --git a/src/unk_0203A7D8.c b/src/unk_0203A7D8.c
index 90a426319..420dfb1f2 100644
--- a/src/unk_0203A7D8.c
+++ b/src/unk_0203A7D8.c
@@ -2,6 +2,7 @@
 
 #include <nitro.h>
 #include <string.h>
+
 #include "constants/savedata/vars_flags.h"
 
 #include "field/field_system.h"
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 1d1d9e2a8..bfb9f770e 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -107,6 +107,7 @@
 #include "savedata_misc.h"
 #include "strbuf.h"
 #include "system_data.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_02017498.h"
 #include "unk_0201D15C.h"
@@ -125,7 +126,6 @@
 #include "unk_02055808.h"
 #include "unk_020559DC.h"
 #include "unk_0205B33C.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206B70C.h"
 #include "unk_0206CCB0.h"
diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c
index a16e3c735..5ad229213 100644
--- a/src/unk_02046C7C.c
+++ b/src/unk_02046C7C.c
@@ -17,11 +17,11 @@
 #include "script_manager.h"
 #include "strbuf.h"
 #include "string_template.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_020298BC.h"
 #include "unk_0202CC64.h"
-#include "system_flags.h"
 #include "unk_020933F8.h"
 #include "vars_flags.h"
 
diff --git a/src/unk_02048614.c b/src/unk_02048614.c
index 6b4c7b139..d24ccea6b 100644
--- a/src/unk_02048614.c
+++ b/src/unk_02048614.c
@@ -6,20 +6,20 @@
 
 #include "field/field_system.h"
 
+#include "encounter.h"
 #include "field_script_context.h"
 #include "inlines.h"
 #include "map_object.h"
 #include "party.h"
 #include "script_manager.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "unk_020041CC.h"
-#include "encounter.h"
 #include "unk_02051D8C.h"
 #include "unk_020528D0.h"
 #include "unk_02054884.h"
 #include "unk_020553DC.h"
 #include "unk_02067A84.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "vars_flags.h"
 
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 9766abc36..b3af969a0 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -30,13 +30,13 @@
 #include "pokemon.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0201D15C.h"
 #include "unk_0202D05C.h"
 #include "unk_0203061C.h"
 #include "unk_0204AEE8.h"
 #include "unk_0205DFC4.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206B9D8.h"
 #include "unk_0206CCB0.h"
diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c
index 5db030fac..751c348b9 100644
--- a/src/unk_0204C500.c
+++ b/src/unk_0204C500.c
@@ -14,12 +14,12 @@
 #include "inlines.h"
 #include "pokemon.h"
 #include "save_player.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_0202EEC0.h"
 #include "unk_0202F180.h"
 #include "unk_020562F8.h"
-#include "system_flags.h"
 #include "unk_020797C8.h"
 #include "unk_02092494.h"
 #include "vars_flags.h"
diff --git a/src/unk_0204E3CC.c b/src/unk_0204E3CC.c
index 663a08bb3..37e49bdcd 100644
--- a/src/unk_0204E3CC.c
+++ b/src/unk_0204E3CC.c
@@ -15,9 +15,9 @@
 #include "inlines.h"
 #include "player_avatar.h"
 #include "save_player.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 BOOL ScrCmd_157(ScriptContext *param0)
diff --git a/src/unk_02050568.c b/src/unk_02050568.c
index 05f3545b7..82376df1a 100644
--- a/src/unk_02050568.c
+++ b/src/unk_02050568.c
@@ -20,10 +20,10 @@
 #include "location.h"
 #include "map_object.h"
 #include "player_avatar.h"
+#include "system_flags.h"
 #include "unk_02005474.h"
 #include "unk_02055808.h"
 #include "unk_02056B30.h"
-#include "system_flags.h"
 #include "unk_02070428.h"
 #include "vars_flags.h"
 
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index b0cb8fd47..226b4e12d 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -41,6 +41,7 @@
 #include "savedata.h"
 #include "strbuf.h"
 #include "system_data.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0202602C.h"
 #include "unk_0202631C.h"
@@ -53,7 +54,6 @@
 #include "unk_020559DC.h"
 #include "unk_0205C980.h"
 #include "unk_0205DAC8.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206CCB0.h"
 #include "vars_flags.h"
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index 1abfa5559..bfc2ba29a 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -31,6 +31,7 @@
 #include "savedata.h"
 #include "strbuf.h"
 #include "string_template.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_02005474.h"
 #include "unk_0200F174.h"
@@ -40,7 +41,6 @@
 #include "unk_02054884.h"
 #include "unk_020559DC.h"
 #include "unk_0205D8CC.h"
-#include "system_flags.h"
 #include "unk_02096420.h"
 #include "vars_flags.h"
 
diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c
index a76b977b9..ceb2e3753 100644
--- a/src/unk_020553DC.c
+++ b/src/unk_020553DC.c
@@ -14,10 +14,10 @@
 #include "player_avatar.h"
 #include "pokeradar.h"
 #include "rtc.h"
+#include "system_flags.h"
 #include "trainer_data.h"
 #include "unk_020041CC.h"
 #include "unk_02005474.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 const static u16 Unk_020EC3E0[][2] = {
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index 53712b623..49896c1c2 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -2,6 +2,7 @@
 
 #include <nitro.h>
 #include <string.h>
+
 #include "constants/savedata/vars_flags.h"
 
 #include "struct_decls/struct_02061AB4_decl.h"
@@ -45,6 +46,7 @@
 #include "save_player.h"
 #include "script_manager.h"
 #include "strbuf.h"
+#include "system_flags.h"
 #include "unk_0200F174.h"
 #include "unk_0202631C.h"
 #include "unk_02028124.h"
@@ -56,7 +58,6 @@
 #include "unk_0205D8CC.h"
 #include "unk_0205DAC8.h"
 #include "unk_0205F180.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206B9D8.h"
 #include "unk_0207CB08.h"
diff --git a/src/unk_0206AFE0.c b/src/unk_0206AFE0.c
index ef74c3595..73f2f0cc4 100644
--- a/src/unk_0206AFE0.c
+++ b/src/unk_0206AFE0.c
@@ -2,6 +2,7 @@
 
 #include <nitro.h>
 #include <string.h>
+
 #include "constants/savedata/vars_flags.h"
 #include "consts/map.h"
 
@@ -11,8 +12,8 @@
 #include "location.h"
 #include "record_mixed_rng.h"
 #include "savedata.h"
-#include "unk_0201D15C.h"
 #include "system_flags.h"
+#include "unk_0201D15C.h"
 #include "vars_flags.h"
 
 static BOOL sub_0206AFE0(VarsFlags *param0, u16 param1, u16 param2);
diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c
index 7b3953384..7fbaacea3 100644
--- a/src/unk_0206B70C.c
+++ b/src/unk_0206B70C.c
@@ -2,6 +2,7 @@
 
 #include <nitro.h>
 #include <string.h>
+
 #include "constants/savedata/vars_flags.h"
 
 #include "struct_decls/struct_0203A790_decl.h"
diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c
index 9bfa4d898..bb784ba08 100644
--- a/src/unk_0206C0E8.c
+++ b/src/unk_0206C0E8.c
@@ -19,10 +19,10 @@
 #include "location.h"
 #include "map_object.h"
 #include "player_avatar.h"
+#include "system_flags.h"
 #include "unk_02005474.h"
 #include "unk_02055808.h"
 #include "unk_02056B30.h"
-#include "system_flags.h"
 #include "unk_02070428.h"
 #include "vars_flags.h"
 
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index 8c925379d..4b54670dc 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -49,6 +49,7 @@
 #include "savedata_misc.h"
 #include "strbuf.h"
 #include "string_template.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0201D15C.h"
 #include "unk_0202631C.h"
@@ -58,7 +59,6 @@
 #include "unk_0203A944.h"
 #include "unk_02054884.h"
 #include "unk_0205DFC4.h"
-#include "system_flags.h"
 #include "unk_02071CFC.h"
 #include "unk_020923C0.h"
 #include "unk_02094EDC.h"
diff --git a/src/unk_02070428.c b/src/unk_02070428.c
index 8d85a66a9..876057db5 100644
--- a/src/unk_02070428.c
+++ b/src/unk_02070428.c
@@ -16,10 +16,10 @@
 #include "map_header.h"
 #include "roaming_pokemon.h"
 #include "save_player.h"
+#include "system_flags.h"
 #include "unk_0202D7A8.h"
 #include "unk_0203A7D8.h"
 #include "unk_020556C4.h"
-#include "system_flags.h"
 #include "unk_0206AFE0.h"
 #include "vars_flags.h"
 
diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c
index 8844d4d84..e26b34d04 100644
--- a/src/unk_0207070C.c
+++ b/src/unk_0207070C.c
@@ -30,13 +30,13 @@
 #include "player_avatar.h"
 #include "save_player.h"
 #include "script_manager.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0203C954.h"
 #include "unk_0203D1B8.h"
 #include "unk_02054D00.h"
 #include "unk_0205DAC8.h"
 #include "unk_0205F180.h"
-#include "system_flags.h"
 #include "unk_0206B70C.h"
 #include "unk_020711C8.h"
 #include "unk_02071B10.h"
diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c
index 62a3642f3..b62593e3a 100644
--- a/src/unk_02071D40.c
+++ b/src/unk_02071D40.c
@@ -21,6 +21,7 @@
 #include "play_time.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
 #include "unk_0202854C.h"
@@ -29,7 +30,6 @@
 #include "unk_0203D1B8.h"
 #include "unk_020559DC.h"
 #include "unk_0205B33C.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 typedef struct {
diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c
index 8a9474670..c66c037c6 100644
--- a/src/unk_0207DA28.c
+++ b/src/unk_0207DA28.c
@@ -21,15 +21,15 @@
 #include "overlay117/struct_ov117_02260440.h"
 
 #include "communication_system.h"
+#include "encounter.h"
 #include "field_system.h"
 #include "field_task.h"
 #include "game_overlay.h"
 #include "game_records.h"
 #include "heap.h"
+#include "system_flags.h"
 #include "unk_02038FFC.h"
 #include "unk_0203D1B8.h"
-#include "encounter.h"
-#include "system_flags.h"
 #include "unk_02099550.h"
 #include "unk_02099604.h"
 #include "unk_0209BA18.h"
diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
index e41246286..b57cb99dd 100644
--- a/src/unk_020933F8.c
+++ b/src/unk_020933F8.c
@@ -3,9 +3,9 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "consts/pokemon.h"
-#include "consts/map.h"
 #include "consts/game_records.h"
+#include "consts/map.h"
+#include "consts/pokemon.h"
 
 #include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_0202440C_decl.h"
@@ -42,6 +42,7 @@
 #include "string_template.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
+#include "system_flags.h"
 #include "trainer_info.h"
 #include "unk_02005474.h"
 #include "unk_0200A9DC.h"
@@ -52,7 +53,6 @@
 #include "unk_0202F108.h"
 #include "unk_020363E8.h"
 #include "unk_02055808.h"
-#include "system_flags.h"
 #include "unk_0206CCB0.h"
 #include "unk_020923C0.h"
 #include "unk_02094EDC.h"
diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c
index 9b356b678..0b4d0df9d 100644
--- a/src/unk_0209747C.c
+++ b/src/unk_0209747C.c
@@ -12,10 +12,10 @@
 #include "heap.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "system_flags.h"
 #include "unk_02014A84.h"
 #include "unk_02014D38.h"
 #include "unk_0202631C.h"
-#include "system_flags.h"
 #include "vars_flags.h"
 
 struct UnkStruct_0209747C_t {