Sort includes

62 files changed, 211 insertions, 212 deletions

diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c
index fbd379427..062a57cea 100644
--- a/src/battle_811DA74.c
+++ b/src/battle_811DA74.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "asm.h"
 #include "link.h"
-#include "main.h"
 #include "m4a.h"
+#include "main.h"
 #include "palette.h"
 #include "pokemon.h"
 #include "sound.h"
diff --git a/src/battle_ai.c b/src/battle_ai.c
index ca767a3a3..7b7c80549 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -1,12 +1,12 @@
 #include "global.h"
-#include "battle.h"
+#include "abilities.h"
 #include "asm.h"
+#include "battle.h"
+#include "battle_move_effects.h"
+#include "item.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "abilities.h"
 #include "species.h"
-#include "item.h"
-#include "battle_move_effects.h"
 
 #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
 #define AIScriptRead16(ptr) ((ptr)[0] | (ptr)[1] << 8)
diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c
index 2c7a10be5..f6c3d70c3 100644
--- a/src/battle_anim_80A7E7C.c
+++ b/src/battle_anim_80A7E7C.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "task.h"
 #include "sprite.h"
+#include "task.h"
 #include "trig.h"
 
 #define TASK gTasks[task]
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 21fa6a16a..645eb1424 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1,26 +1,26 @@
 #include "global.h"
 #include "battle_setup.h"
 #include "asm.h"
-#include "safari_zone.h"
-#include "weather.h"
-#include "palette.h"
-#include "field_player_avatar.h"
-#include "rom4.h"
 #include "battle.h"
+#include "event_data.h"
+#include "field_message_box.h"
+#include "field_player_avatar.h"
 #include "main.h"
-#include "species.h"
+#include "metatile_behavior.h"
+#include "palette.h"
+#include "rng.h"
+#include "rom4.h"
+#include "safari_zone.h"
+#include "script.h"
 #include "songs.h"
 #include "sound.h"
+#include "species.h"
+#include "starter_choose.h"
+#include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "string_util.h"
-#include "rng.h"
-#include "event_data.h"
-#include "script.h"
-#include "field_message_box.h"
 #include "trainer.h"
-#include "starter_choose.h"
-#include "metatile_behavior.h"
+#include "weather.h"
 
 #define NUM_TRAINER_EYE_TRAINERS 56
 #define TRAINER_REMATCH_STEPS 255
diff --git a/src/berry.c b/src/berry.c
index 84db22a27..1943ede99 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -2,10 +2,10 @@
 #include "berry.h"
 #include "asm.h"
 #include "item.h"
+#include "items.h"
 #include "main.h"
-#include "text.h"
 #include "rng.h"
-#include "items.h"
+#include "text.h"
 
 #define FIRST_BERRY ITEM_CHERI_BERRY
 #define LAST_BERRY  ITEM_ENIGMA_BERRY
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 164e2cfc2..a5684644c 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -3,6 +3,7 @@
 #include "asm.h"
 #include "berry.h"
 #include "decompress.h"
+#include "items.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
@@ -13,7 +14,6 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "items.h"
 
 #define OFFSET_7B (123)
 #define FIRST_BERRY ITEM_CHERI_BERRY
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 73bcfd909..c8c81c045 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -1,16 +1,16 @@
 #include "global.h"
-#include "event_data.h"
-#include "flags.h"
 #include "asm.h"
+#include "event_data.h"
 #include "field_camera.h"
 #include "field_effect.h"
+#include "flags.h"
 #include "map_obj_lock.h"
-#include "sound.h"
+#include "menu.h"
 #include "script.h"
 #include "songs.h"
+#include "sound.h"
 #include "species.h"
 #include "task.h"
-#include "menu.h"
 #include "text.h"
 
 extern u8 gPlayerPartyCount;
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index 86446e588..9f34b0a43 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -1,17 +1,17 @@
 #include "global.h"
-#include "text.h"
-#include "string_util.h"
-#include "pokemon.h"
-#include "species.h"
-#include "main.h"
-#include "sprite.h"
-#include "berry.h"
-#include "item.h"
 #include "abilities.h"
-#include "hold_effects.h"
-#include "event_data.h"
 #include "battle.h"
+#include "berry.h"
+#include "event_data.h"
+#include "hold_effects.h"
+#include "item.h"
 #include "items.h"
+#include "main.h"
+#include "pokemon.h"
+#include "species.h"
+#include "sprite.h"
+#include "string_util.h"
+#include "text.h"
 
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[6];
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 198dce340..6b0cc821a 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -1,13 +1,13 @@
 #include "global.h"
 #include "clear_save_data_menu.h"
-#include "save.h"
-#include "task.h"
-#include "songs.h"
-#include "menu.h"
 #include "main.h"
-#include "sprite.h"
+#include "menu.h"
 #include "palette.h"
+#include "save.h"
+#include "songs.h"
 #include "sound.h"
+#include "sprite.h"
+#include "task.h"
 
 extern u8 gSystemText_ClearAllSaveDataPrompt[];
 extern u8 gSystemText_ClearingData[];
diff --git a/src/clock.c b/src/clock.c
index e660abdd3..85188cd19 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -1,10 +1,10 @@
 #include "global.h"
-#include "main.h"
-#include "rtc.h"
+#include "berry.h"
 #include "event_data.h"
 #include "lottery_corner.h"
-#include "berry.h"
+#include "main.h"
 #include "rom4.h"
+#include "rtc.h"
 #include "wallclock.h"
 
 extern void sub_80FA220(u16);
diff --git a/src/decompress.c b/src/decompress.c
index 014e8a76f..071bf5f81 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "decompress.h"
-#include "species.h"
 #include "asm.h"
+#include "species.h"
 #include "text.h"
 
 #define WRAM 0x02000000
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 2a73ff0ec..f302e0599 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "asm.h"
+#include "event_data.h"
 #include "link.h"
 #include "rng.h"
 #include "text.h"
-#include "event_data.h"
 
 extern u8 unk_2000000[];
 
diff --git a/src/field_camera.c b/src/field_camera.c
index c55d8e2a3..ce343c1d8 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "field_camera.h"
 #include "asm.h"
+#include "asm_fieldmap.h"
 #include "berry.h"
 #include "field_player_avatar.h"
-#include "asm_fieldmap.h"
 #include "sprite.h"
 #include "text.h"
 
diff --git a/src/field_door.c b/src/field_door.c
index 85a5965a0..3d7fce6cf 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "asm.h"
-#include "task.h"
 #include "field_camera.h"
 #include "metatile_behavior.h"
+#include "task.h"
 
 struct DoorGraphics
 {
diff --git a/src/field_effect.c b/src/field_effect.c
index 89c6c9b46..b0c028c8d 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "field_effect.h"
-#include "weather.h"
 #include "sprite.h"
 #include "text.h"
+#include "weather.h"
 
 typedef bool8 (*FldEffCmd)(u8 **, u32 *);
 
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 6e835d744..815a5aabd 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "asm.h"
-#include "sprite.h"
 #include "asm_fieldmap.h"
 #include "field_effect.h"
+#include "sprite.h"
 
 typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
 
diff --git a/src/field_message_box.c b/src/field_message_box.c
index a7d1a2fd8..2a5f90d15 100644
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -1,9 +1,9 @@
 #include "global.h"
+#include "field_message_box.h"
+#include "string_util.h"
+#include "task.h"
 #include "text.h"
 #include "text_window.h"
-#include "task.h"
-#include "string_util.h"
-#include "field_message_box.h"
 
 extern struct Window gFieldMessageBoxWindow;
 extern u16 gMenuTextWindowContentTileOffset;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index fdd5ae5c5..68664c845 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1,20 +1,20 @@
 #include "global.h"
 #include "field_player_avatar.h"
 #include "asm.h"
-#include "field_map_obj.h"
-#include "rom4.h"
+#include "asm_fieldmap.h"
 #include "event_data.h"
+#include "field_effect.h"
+#include "field_map_obj.h"
 #include "main.h"
 #include "menu.h"
+#include "metatile_behavior.h"
 #include "rng.h"
+#include "rom4.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
 #include "task.h"
-#include "field_effect.h"
 #include "wild_encounter.h"
-#include "asm_fieldmap.h"
-#include "metatile_behavior.h"
 
 extern u8 gOtherText_OhABite[];
 extern u8 gOtherText_PokeOnHook[];
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 80a1727d8..f90306bba 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -1,15 +1,15 @@
 #include "global.h"
 #include "field_special_scene.h"
 #include "asm.h"
+#include "event_data.h"
+#include "field_camera.h"
 #include "palette.h"
-#include "task.h"
+#include "rom4.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
-#include "field_camera.h"
-#include "rom4.h"
-#include "event_data.h"
 #include "sprite.h"
+#include "task.h"
 
 extern s8 gTruckCamera_HorizontalTable[];
 
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 03b928eb6..dedb62a90 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "field_effect.h"
 #include "asm.h"
+#include "field_effect.h"
 #include "pokemon.h"
 #include "script.h"
 #include "task.h"
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 906832766..afa5ea997 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -1,8 +1,8 @@
 #include "global.h"
-#include "field_effect.h"
-#include "rom4.h"
 #include "asm.h"
+#include "field_effect.h"
 #include "field_player_avatar.h"
+#include "rom4.h"
 
 extern void sub_8087BA8(void);
 
diff --git a/src/intro.c b/src/intro.c
index 544d8b64f..9ccfcfeac 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1,21 +1,21 @@
 #include "global.h"
 #include "intro.h"
 #include "asm.h"
+#include "decompress.h"
 #include "gba/m4a_internal.h"
-#include "m4a.h"
 #include "libgncmultiboot.h"
-#include "save.h"
-#include "decompress.h"
-#include "title_screen.h"
-#include "new_game.h"
 #include "link.h"
+#include "m4a.h"
 #include "main.h"
+#include "new_game.h"
 #include "palette.h"
 #include "rng.h"
+#include "save.h"
 #include "songs.h"
 #include "sound.h"
 #include "species.h"
 #include "task.h"
+#include "title_screen.h"
 #include "trig.h"
 
 extern void *species_and_otid_get_pal(/*TODO: arg types*/);
diff --git a/src/item_use.c b/src/item_use.c
index 557705460..63f818dd3 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -1,21 +1,21 @@
 #include "global.h"
-#include "task.h"
-#include "item.h"
-#include "palette.h"
-#include "weather.h"
-#include "string_util.h"
-#include "menu.h"
-#include "mail.h"
 #include "asm.h"
-#include "rom4.h"
-#include "metatile_behavior.h"
-#include "field_player_avatar.h"
 #include "event_data.h"
+#include "field_player_avatar.h"
+#include "field_player_avatar.h"
+#include "item.h"
+#include "mail.h"
 #include "map_obj_lock.h"
+#include "menu.h"
+#include "metatile_behavior.h"
+#include "palette.h"
+#include "rom4.h"
 #include "script.h"
-#include "field_player_avatar.h"
-#include "sound.h"
 #include "songs.h"
+#include "sound.h"
+#include "string_util.h"
+#include "task.h"
+#include "weather.h"
 
 extern void (* const gExitToOverworldFuncList[])();
 extern void (* gUnknown_03005D00)(u8);
diff --git a/src/link.c b/src/link.c
index 7b4625bfd..2b463f6b4 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1,17 +1,17 @@
 #include "global.h"
 #include "link.h"
 #include "asm.h"
+#include "battle.h"
 #include "main.h"
-#include "task.h"
-#include "text.h"
-#include "sprite.h"
-#include "songs.h"
+#include "menu.h"
 #include "palette.h"
 #include "rng.h"
-#include "menu.h"
-#include "sound.h"
 #include "save.h"
-#include "battle.h"
+#include "songs.h"
+#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+#include "text.h"
 
 #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT)
 
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index bfe5998c0..ca65edc2e 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -1,11 +1,11 @@
 #include "global.h"
 #include "lottery_corner.h"
-#include "rng.h"
-#include "string_util.h"
 #include "event_data.h"
+#include "items.h"
+#include "rng.h"
 #include "species.h"
+#include "string_util.h"
 #include "text.h"
-#include "items.h"
 
 extern u16 gScriptResult;
 extern u16 gSpecialVar_0x8004;
diff --git a/src/mail.c b/src/mail.c
index 6cff514a1..a0f448205 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "mail.h"
 #include "asm.h"
+#include "items.h"
 #include "menu.h"
 #include "palette.h"
 #include "rom4.h"
@@ -8,7 +9,6 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "items.h"
 
 struct UnkMailStruct
 {
diff --git a/src/main_menu.c b/src/main_menu.c
index 63b1e9b99..dee9af852 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -2,6 +2,7 @@
 #include "main_menu.h"
 #include "asm.h"
 #include "decompress.h"
+#include "event_data.h"
 #include "menu.h"
 #include "mystery_event_menu.h"
 #include "option_menu.h"
@@ -16,7 +17,6 @@
 #include "task.h"
 #include "text.h"
 #include "title_screen.h"
-#include "event_data.h"
 
 #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24))
 
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 65766c130..c10a3f9de 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -1,8 +1,8 @@
 #include "global.h"
-#include "menu.h"
+#include "asm.h"
 #include "event_data.h"
+#include "menu.h"
 #include "task.h"
-#include "asm.h"
 
 EWRAM_DATA static u8 sTaskId = 0;
 
diff --git a/src/menu.c b/src/menu.c
index ee9376079..a4e5d9065 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,13 +1,13 @@
 #include "global.h"
 #include "menu.h"
 #include "main.h"
-#include "text.h"
-#include "songs.h"
-#include "text_window.h"
-#include "sound.h"
-#include "menu_cursor.h"
 #include "map_obj_lock.h"
+#include "menu_cursor.h"
 #include "script.h"
+#include "songs.h"
+#include "sound.h"
+#include "text.h"
+#include "text_window.h"
 
 struct Menu
 {
diff --git a/src/menu_cursor.c b/src/menu_cursor.c
index 201c6c4d8..8f1a0ac37 100644
--- a/src/menu_cursor.c
+++ b/src/menu_cursor.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "menu_cursor.h"
-#include "sprite.h"
 #include "palette.h"
+#include "sprite.h"
 
 extern struct SpriteSheet gUnknown_0842F140[];
 extern struct SpriteSheet gUnknown_0842F1C0[];
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index 645aecc9e..e6fa10a4a 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -1,11 +1,11 @@
 #include "global.h"
 #include "mori_debug_menu.h"
 #include "asm.h"
-#include "start_menu.h"
-#include "menu.h"
+#include "link.h"
 #include "main.h"
+#include "menu.h"
+#include "start_menu.h"
 #include "string_util.h"
-#include "link.h"
 
 #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT)
 
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 09523ff40..3c867fb01 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -1,17 +1,17 @@
 #include "global.h"
-#include "sprite.h"
-#include "menu.h"
+#include "mystery_event_menu.h"
+#include "asm.h"
 #include "link.h"
-#include "text.h"
 #include "main.h"
+#include "menu.h"
 #include "palette.h"
-#include "task.h"
-#include "string_util.h"
+#include "save.h"
 #include "songs.h"
 #include "sound.h"
-#include "save.h"
-#include "asm.h"
-#include "mystery_event_menu.h"
+#include "sprite.h"
+#include "string_util.h"
+#include "task.h"
+#include "text.h"
 
 extern u8 unk_2000000[];
 extern u8 gUnknown_02039338;
diff --git a/src/name_string_util.c b/src/name_string_util.c
index 27e6d99d0..a1812d5e9 100644
--- a/src/name_string_util.c
+++ b/src/name_string_util.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "text.h"
 #include "string_util.h"
+#include "text.h"
 
 void PadNameString(u8 *a1, u8 a2)
 {
diff --git a/src/new_game.c b/src/new_game.c
index 4f93e4e3c..ddc9ea403 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -2,15 +2,15 @@
 #include "new_game.h"
 #include "asm.h"
 #include "berry.h"
+#include "event_data.h"
+#include "lottery_corner.h"
 #include "play_time.h"
-#include "pokemon_size_record.h"
-#include "script.h"
-#include "rom4.h"
 #include "pokedex.h"
-#include "lottery_corner.h"
+#include "pokemon_size_record.h"
 #include "rng.h"
+#include "rom4.h"
 #include "rtc.h"
-#include "event_data.h"
+#include "script.h"
 
 extern u8 gUnknown_020297EC;
 
diff --git a/src/player_pc.c b/src/player_pc.c
index 822e2108e..4ec9599e3 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -1,14 +1,14 @@
 #include "global.h"
+#include "asm.h"
 #include "item.h"
-#include "task.h"
-#include "menu.h"
-#include "sound.h"
 #include "main.h"
-#include "script.h"
+#include "menu.h"
 #include "palette.h"
-#include "weather.h"
-#include "asm.h"
+#include "script.h"
+#include "sound.h"
 #include "string_util.h"
+#include "task.h"
+#include "weather.h"
 
 extern void DisplayItemMessageOnField(u8, u8*, TaskFunc, u16);
 extern void ItemStorageMenuProcessInput(u8);
diff --git a/src/pokedex.c b/src/pokedex.c
index 48e3a57aa..15563a150 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,18 +1,18 @@
 #include "global.h"
 #include "pokedex.h"
 #include "asm.h"
+#include "decompress.h"
+#include "event_data.h"
 #include "gba/m4a_internal.h"
-#include "string_util.h"
 #include "m4a.h"
-#include "decompress.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
 #include "rng.h"
 #include "songs.h"
 #include "sound.h"
+#include "string_util.h"
 #include "task.h"
-#include "event_data.h"
 
 // I'm #define-ing these just for now so I can keep using the old unkXXX member names
 #define unk60E selectedPokemon
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index b8735fbc4..1c11449c3 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -1,14 +1,14 @@
 #include "global.h"
 #include "asm.h"
-#include "text.h"
-#include "string_util.h"
+#include "items.h"
+#include "main.h"
 #include "pokemon.h"
+#include "rng.h"
 #include "rom4.h"
 #include "species.h"
-#include "main.h"
-#include "rng.h"
 #include "sprite.h"
-#include "items.h"
+#include "string_util.h"
+#include "text.h"
 
 //Extracts the upper 16 bits of a 32-bit number
 #define HIHALF(n) (((n) & 0xFFFF0000) >> 16)
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index f6bd432c7..69ae03767 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1,13 +1,13 @@
 #include "global.h"
 #include "asm.h"
-#include "text.h"
-#include "string_util.h"
+#include "event_data.h"
+#include "main.h"
 #include "pokemon.h"
 #include "rng.h"
 #include "species.h"
-#include "main.h"
 #include "sprite.h"
-#include "event_data.h"
+#include "string_util.h"
+#include "text.h"
 
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[6];
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index cf172b122..f313bff49 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1,16 +1,16 @@
 #include "global.h"
 #include "asm.h"
-#include "text.h"
-#include "string_util.h"
+#include "event_data.h"
+#include "item.h"
+#include "items.h"
+#include "main.h"
 #include "pokemon.h"
 #include "rng.h"
+#include "rtc.h"
 #include "species.h"
-#include "main.h"
 #include "sprite.h"
-#include "event_data.h"
-#include "rtc.h"
-#include "item.h"
-#include "items.h"
+#include "string_util.h"
+#include "text.h"
 
 #define EVO_FRIENDSHIP       0x0001 // Pokémon levels up with friendship ≥ 220
 #define EVO_FRIENDSHIP_DAY   0x0002 // Pokémon levels up during the day with friendship ≥ 220
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index aef796825..1c6b6accb 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "pokemon_size_record.h"
-#include "string_util.h"
+#include "event_data.h"
 #include "species.h"
+#include "string_util.h"
 #include "text.h"
-#include "event_data.h"
 
 extern u16 SpeciesToNationalPokedexNum(u16);
 extern u16 GetPokedexHeightWeight(u16, u8);
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 6e051f449..7bf9ef078 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "asm.h"
+#include "link.h"
 #include "menu.h"
 #include "pokemon.h"
 #include "string_util.h"
-#include "link.h"
 
 extern struct Pokemon *unk_2018000;
 
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 12b87b2b1..6a2171280 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "record_mixing.h"
 #include "asm.h"
+#include "event_data.h"
 #include "link.h"
 #include "menu.h"
 #include "rom4.h"
@@ -9,7 +10,6 @@
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
-#include "event_data.h"
 
 extern void *recordMixingSecretBases;
 extern void *recordMixingTvShows;
diff --git a/src/rom4.c b/src/rom4.c
index 521f07a48..455e6bfa7 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -4,17 +4,19 @@
 #include "asm_fieldmap.h"
 #include "battle_setup.h"
 #include "berry.h"
+#include "event_data.h"
 #include "field_camera.h"
 #include "field_effect.h"
 #include "field_map_obj.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "event_data.h"
+#include "field_special_scene.h"
 #include "heal_location.h"
 #include "link.h"
 #include "load_save.h"
 #include "main.h"
 #include "menu.h"
+#include "metatile_behavior.h"
 #include "new_game.h"
 #include "palette.h"
 #include "play_time.h"
@@ -26,10 +28,8 @@
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
-#include "field_special_scene.h"
 #include "weather.h"
 #include "wild_encounter.h"
-#include "metatile_behavior.h"
 
 #ifdef SAPPHIRE
 #define LEGENDARY_MUSIC BGM_OOAME  // Heavy Rain
diff --git a/src/rom_8080874.c b/src/rom_8080874.c
index 8c41b913a..29aeac97b 100644
--- a/src/rom_8080874.c
+++ b/src/rom_8080874.c
@@ -1,9 +1,9 @@
 #include "global.h"
-#include "global.fieldmap.h"
 #include "gba/syscall.h"
-#include "weather.h"
-#include "task.h"
+#include "global.fieldmap.h"
 #include "script.h"
+#include "task.h"
+#include "weather.h"
 
 void palette_bg_fill_white(void);
 void palette_bg_fill_black(void);
diff --git a/src/safari_zone.c b/src/safari_zone.c
index ee72d8e86..8c2b63469 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -1,13 +1,13 @@
 #include "global.h"
 #include "safari_zone.h"
 #include "asm.h"
-#include "field_player_avatar.h"
 #include "event_data.h"
+#include "field_player_avatar.h"
 #include "main.h"
+#include "rom4.h"
 #include "script.h"
 #include "string_util.h"
 #include "text.h"
-#include "rom4.h"
 
 struct PokeblockFeeder
 {
diff --git a/src/save.c b/src/save.c
index 49db679f8..1bb8703c4 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,10 +1,10 @@
 #include "global.h"
+#include "gba/gba.h"
 #include "save.h"
 #include "asm.h"
-#include "gba/gba.h"
+#include "gba/flash_internal.h"
 #include "load_save.h"
 #include "rom4.h"
-#include "gba/flash_internal.h"
 #include "save_failed_screen.h"
 
 extern struct SaveSection unk_2000000;
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 2396aab15..962e8207b 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -1,14 +1,14 @@
 #include "global.h"
+#include "asm.h"
+#include "gba/flash_internal.h"
+#include "m4a.h"
 #include "main.h"
-#include "sprite.h"
+#include "menu.h"
 #include "palette.h"
+#include "save.h"
+#include "sprite.h"
 #include "task.h"
 #include "text.h"
-#include "menu.h"
-#include "save.h"
-#include "m4a.h"
-#include "gba/flash_internal.h"
-#include "asm.h"
 
 // In English 1.0, the text window is too small, causing text to overflow.
 
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index 64acd12f7..a6c9578dc 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "save_menu_util.h"
 #include "asm.h"
-#include "menu.h"
 #include "event_data.h"
-#include "string_util.h"
+#include "menu.h"
 #include "pokedex.h"
+#include "string_util.h"
 
 extern u8 gOtherText_Player[];
 extern u8 gOtherText_Badges[];
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f41d57ffb..a13a42e87 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1,28 +1,28 @@
 #include "global.h"
 #include "asm.h"
+#include "asm_fieldmap.h"
 #include "battle_setup.h"
 #include "berry.h"
+#include "coins.h"
+#include "decoration.h"
+#include "event_data.h"
+#include "field_effect.h"
+#include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "item.h"
-#include "script.h"
-#include "rng.h"
-#include "palette.h"
-#include "rtc.h"
-#include "pokemon.h"
-#include "asm_fieldmap.h"
 #include "main.h"
+#include "map_obj_lock.h"
 #include "menu.h"
 #include "money.h"
-#include "decoration.h"
-#include "field_message_box.h"
+#include "palette.h"
+#include "pokemon.h"
+#include "rng.h"
+#include "rom4.h"
+#include "rtc.h"
+#include "script.h"
 #include "sound.h"
 #include "string_util.h"
-#include "event_data.h"
-#include "rom4.h"
 #include "weather.h"
-#include "map_obj_lock.h"
-#include "coins.h"
-#include "field_effect.h"
 
 typedef u16 (*SpecialFunc)(void);
 typedef void (*NativeFunc)(void);
diff --git a/src/script_menu.c b/src/script_menu.c
index c4f0b5292..5e1fad808 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1,11 +1,11 @@
 #include "global.h"
-#include "task.h"
+#include "event_data.h"
 #include "menu.h"
 #include "palette.h"
 #include "script.h"
 #include "sound.h"
-#include "event_data.h"
 #include "sprite.h"
+#include "task.h"
 
 struct MultichoiceListStruct
 {
diff --git a/src/sound.c b/src/sound.c
index e757eedf5..ea8d5b49c 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,11 +1,11 @@
 #include "global.h"
 #include "sound.h"
 #include "asm.h"
+#include "battle.h"
 #include "gba/m4a_internal.h"
-#include "task.h"
-#include "songs.h"
 #include "m4a.h"
-#include "battle.h"
+#include "songs.h"
+#include "task.h"
 
 struct Fanfare
 {
diff --git a/src/sprite.c b/src/sprite.c
index df101b61f..f20ea2927 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "sprite.h"
 #include "main.h"
-#include "palette.h"
 #include "menu_cursor.h"
+#include "palette.h"
 
 #define MAX_SPRITE_COPY_REQUESTS 64
 
diff --git a/src/start_menu.c b/src/start_menu.c
index 8ef3a9d2b..7db6a11eb 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "start_menu.h"
 #include "asm.h"
-#include "field_player_avatar.h"
 #include "event_data.h"
+#include "field_player_avatar.h"
 #include "load_save.h"
 #include "main.h"
 #include "map_obj_lock.h"
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 9bd817cce..87a90afc8 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -1,17 +1,17 @@
 #include "global.h"
 #include "starter_choose.h"
 #include "asm.h"
+#include "decompress.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
 #include "pokedex.h"
 #include "songs.h"
 #include "sound.h"
+#include "sprite.h"
 #include "string_util.h"
 #include "task.h"
 #include "trig.h"
-#include "decompress.h"
-#include "sprite.h"
 
 struct MonCoords
 {
diff --git a/src/text.c b/src/text.c
index 6089fdba8..44ce6655f 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,11 +1,11 @@
 #include "global.h"
 #include "text.h"
+#include "battle.h"
 #include "main.h"
-#include "string_util.h"
-#include "songs.h"
 #include "palette.h"
+#include "songs.h"
 #include "sound.h"
-#include "battle.h"
+#include "string_util.h"
 
 enum
 {
diff --git a/src/text_window.c b/src/text_window.c
index 1ac624dd0..9a88789d1 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "text_window.h"
 #include "main.h"
-#include "text.h"
 #include "palette.h"
+#include "text.h"
 
 #define STD_MSG_BOX_LEFT    0
 #define STD_MSG_BOX_TOP    14
diff --git a/src/title_screen.c b/src/title_screen.c
index ffa803d2e..11f27ac06 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -2,17 +2,17 @@
 #include "title_screen.h"
 #include "asm.h"
 #include "clear_save_data_menu.h"
-#include "m4a.h"
-#include "main_menu.h"
-#include "intro.h"
+#include "decompress.h"
+#include "event_data.h"
 #include "gba/m4a_internal.h"
+#include "intro.h"
+#include "m4a.h"
 #include "main.h"
+#include "main_menu.h"
 #include "palette.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
-#include "decompress.h"
-#include "event_data.h"
 
 extern u8 gReservedSpritePaletteCount;
 extern struct MusicPlayerInfo gMPlay_BGM;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index c6cdc5658..670a878d5 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -1,14 +1,14 @@
 #include "global.h"
 #include "trainer_see.h"
 #include "asm.h"
-#include "battle_setup.h"
-#include "field_player_avatar.h"
-#include "field_map_obj.h"
 #include "asm_fieldmap.h"
-#include "task.h"
-#include "sprite.h"
+#include "battle_setup.h"
 #include "field_effect.h"
+#include "field_map_obj.h"
+#include "field_player_avatar.h"
 #include "script.h"
+#include "sprite.h"
+#include "task.h"
 
 extern bool8 (*gIsTrainerInRange[])(struct MapObject *, u16, s16, s16);
 extern bool8 (*gTrainerSeeFuncList[])(u8, struct Task *, struct MapObject *);
diff --git a/src/tv.c b/src/tv.c
index d2a54a539..3a599dfb1 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -3,7 +3,6 @@
 #include "event_data.h"
 #include "field_message_box.h"
 #include "flags.h"
-#include "global.h"
 #include "rng.h"
 #include "string_util.h"
 #include "text.h"
diff --git a/src/wallclock.c b/src/wallclock.c
index 147a68d31..79cc75324 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -7,9 +7,9 @@
 #include "palette.h"
 #include "rtc.h"
 #include "songs.h"
+#include "sound.h"
 #include "task.h"
 #include "trig.h"
-#include "sound.h"
 
 extern u16 gSpecialVar_0x8004;
 extern u16 gMiscClockMale_Pal[];
diff --git a/src/weather.c b/src/weather.c
index 520185441..f3c79b42c 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "weather.h"
 #include "asm.h"
-#include "task.h"
-#include "sprite.h"
 #include "palette.h"
+#include "sprite.h"
+#include "task.h"
 
 struct Weather {
 	u8 filler_000[0x200];
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 8e983c300..7b94ca733 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -1,15 +1,15 @@
 #include "global.h"
 #include "wild_encounter.h"
+#include "abilities.h"
 #include "asm.h"
-#include "field_player_avatar.h"
-#include "safari_zone.h"
 #include "battle_setup.h"
-#include "abilities.h"
-#include "rng.h"
-#include "script.h"
 #include "event_data.h"
-#include "rom4.h"
+#include "field_player_avatar.h"
 #include "metatile_behavior.h"
+#include "rng.h"
+#include "rom4.h"
+#include "safari_zone.h"
+#include "script.h"
 
 struct WildPokemon
 {