gflib propagation, 1

30 files changed, 27 insertions, 145 deletions

diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c
index e4127ee09..35ac45d5f 100644
--- a/src/AgbRfu_LinkManager.c
+++ b/src/AgbRfu_LinkManager.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "librfu.h"
-#include "link_rfu.h"
+#include "AgbRfu_LinkManager.h"
 
 #define RN_ACCEPT           0x01
 #define RN_NAME_TIMER_CLEAR 0x02
diff --git a/src/bag.c b/src/bag.c
index 2ca62a3b4..198be971a 100644
--- a/src/bag.c
+++ b/src/bag.c
@@ -1,8 +1,6 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "item_menu.h"
-#include "text.h"
-#include "window.h"
 #include "text_window.h"
 #include "menu_helpers.h"
 #include "new_menu_helpers.h"
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index a8bc439f4..877fba80a 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -4,7 +4,6 @@
 #include "util.h"
 #include "item.h"
 #include "random.h"
-#include "pokemon.h"
 #include "battle_ai_script_commands.h"
 #include "constants/species.h"
 #include "constants/abilities.h"
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 5d642bda9..e689d2353 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -2,7 +2,6 @@
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
-#include "pokemon.h"
 #include "random.h"
 #include "util.h"
 #include "constants/abilities.h"
diff --git a/src/battle_anim.c b/src/battle_anim.c
index e38d2ebe4..1132b5725 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1,20 +1,13 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "battle_bg.h"
-#include "bg.h"
 #include "decompress.h"
-#include "dma3.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "main.h"
 #include "m4a.h"
-#include "palette.h"
-#include "pokemon.h"
-#include "sound.h"
-#include "sprite.h"
 #include "task.h"
 #include "constants/battle_anim.h"
 
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 2e740df33..d1f75ff8f 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -1,10 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "random.h"
-#include "sound.h"
 #include "trig.h"
 #include "util.h"
 #include "constants/songs.h"
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 4b52926da..510b8eabb 100644
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -1,15 +1,12 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "decompress.h"
-#include "gpu_regs.h"
 #include "graphics.h"
 #include "math_util.h"
-#include "palette.h"
 #include "random.h"
 #include "scanline_effect.h"
-#include "sound.h"
 #include "trig.h"
 #include "util.h"
 #include "constants/songs.h"
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 69bae2c6f..e9bfb2618 100644
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -1,19 +1,13 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "bg.h"
 #include "data.h"
 #include "decompress.h"
-#include "dma3.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "palette.h"
 #include "pokemon_icon.h"
 #include "random.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "util.h"
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index 4d409cc4e..8cc6c9a00 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -1,14 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "bg.h"
 #include "data.h"
 #include "decompress.h"
-#include "dma3.h"
-#include "gpu_regs.h"
-#include "malloc.h"
-#include "palette.h"
 #include "pokemon_icon.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "util.h"
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c
index f2740a1a5..a820667fb 100644
--- a/src/battle_anim_sound_tasks.c
+++ b/src/battle_anim_sound_tasks.c
@@ -1,7 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "sound.h"
 #include "task.h"
 #include "constants/battle_anim.h"
 #include "constants/species.h"
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index 9c0ba1964..621ee9039 100644
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -1,19 +1,14 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_main.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "decompress.h"
-#include "dma3.h"
-#include "gpu_regs.h"
 #include "graphics.h"
 #include "m4a.h"
-#include "main.h"
-#include "palette.h"
 #include "pokeball.h"
-#include "sound.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "util.h"
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index 2e7f30ff1..4eb475a5c 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -1,10 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "decompress.h"
-#include "gpu_regs.h"
-#include "palette.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "util.h"
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index 379da8620..a1897b94a 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -1,12 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "malloc.h"
-#include "palette.h"
-#include "sound.h"
-#include "sprite.h"
 #include "task.h"
 #include "util.h"
 #include "constants/songs.h"
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index a80e79bf4..90080b88e 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1,14 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "data.h"
 #include "link.h"
 #include "m4a.h"
-#include "palette.h"
 #include "pokeball.h"
-#include "pokemon.h"
-#include "sound.h"
-#include "string_util.h"
 #include "task.h"
-#include "text.h"
 #include "util.h"
 #include "battle.h"
 #include "battle_anim.h"
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 5ac4f1abc..fdac017c8 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1,13 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "data.h"
 #include "link.h"
-#include "palette.h"
 #include "pokeball.h"
-#include "pokemon.h"
-#include "sound.h"
-#include "string_util.h"
 #include "task.h"
-#include "text.h"
 #include "util.h"
 #include "battle.h"
 #include "battle_anim.h"
diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c
index 0807018a2..97a167fe3 100644
--- a/src/battle_controller_oak_old_man.c
+++ b/src/battle_controller_oak_old_man.c
@@ -1,21 +1,14 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "pokemon.h"
 #include "pokeball.h"
 #include "party_menu.h"
-#include "bg.h"
-#include "data.h"
-#include "palette.h"
 #include "util.h"
 #include "m4a.h"
 #include "link.h"
-#include "sound.h"
 #include "item.h"
 #include "item_menu.h"
-#include "text.h"
 #include "strings.h"
-#include "string_util.h"
-#include "window.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 26e35ae65..b7522c0de 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1,15 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "data.h"
-#include "main.h"
 #include "m4a.h"
 #include "task.h"
-#include "text.h"
 #include "util.h"
 #include "pokeball.h"
-#include "pokemon.h"
 #include "random.h"
-#include "sound.h"
-#include "string_util.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index b28249a97..97e833ffd 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1,23 +1,16 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
 #include "data.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"
-#include "main.h"
 #include "m4a.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "pokeball.h"
-#include "pokemon.h"
-#include "sound.h"
 #include "strings.h"
-#include "string_util.h"
 #include "pokemon_special_anim.h"
 #include "task.h"
-#include "text.h"
 #include "util.h"
-#include "window.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c
index a6b3fe994..2489c2d95 100644
--- a/src/battle_controller_pokedude.c
+++ b/src/battle_controller_pokedude.c
@@ -1,21 +1,15 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "pokemon.h"
 #include "party_menu.h"
 #include "pokeball.h"
-#include "bg.h"
 #include "data.h"
-#include "palette.h"
 #include "util.h"
 #include "m4a.h"
 #include "link.h"
-#include "sound.h"
 #include "event_data.h"
 #include "item_menu.h"
-#include "text.h"
 #include "strings.h"
-#include "string_util.h"
-#include "window.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 28ed4091e..e15d76deb 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -1,19 +1,15 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "battle_message.h"
-#include "bg.h"
 #include "data.h"
 #include "item_menu.h"
 #include "link.h"
 #include "main.h"
-#include "palette.h"
 #include "pokeball.h"
-#include "pokemon.h"
-#include "sound.h"
-#include "text.h"
 #include "util.h"
 #include "strings.h"
 #include "constants/songs.h"
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 834b9e6b6..d06d09012 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -10,7 +10,6 @@
 #include "link_rfu.h"
 #include "cable_club.h"
 #include "party_menu.h"
-#include "pokemon.h"
 #include "task.h"
 #include "util.h"
 #include "constants/abilities.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 127b0903b..45188d022 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -1,10 +1,8 @@
 #include "global.h"
-#include "main.h"
+#include "gflib.h"
 #include "m4a.h"
 #include "task.h"
-#include "malloc.h"
 #include "graphics.h"
-#include "sound.h"
 #include "decompress.h"
 #include "palette.h"
 #include "sprite.h"
diff --git a/src/battle_interface.c b/src/battle_interface.c
index e5145adc0..107999045 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1,19 +1,14 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "decompress.h"
-#include "gpu_regs.h"
 #include "graphics.h"
 #include "menu.h"
-#include "palette.h"
 #include "pokedex.h"
 #include "pokemon_summary_screen.h"
 #include "safari_zone.h"
-#include "sound.h"
-#include "string_util.h"
-#include "text.h"
-#include "window.h"
 #include "constants/songs.h"
 
 #define GetStringRightAlignXOffset(fontId, string, destWidth) ({ \
diff --git a/src/battle_intro.c b/src/battle_intro.c
index 93141f2ca..25fdbafda 100644
--- a/src/battle_intro.c
+++ b/src/battle_intro.c
@@ -1,10 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_setup.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "main.h"
 #include "scanline_effect.h"
 #include "task.h"
 #include "trig.h"
diff --git a/src/battle_main.c b/src/battle_main.c
index bbfcf5cf9..d2735086f 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_ai_script_commands.h"
@@ -10,40 +11,29 @@
 #include "battle_setup.h"
 #include "battle_string_ids.h"
 #include "berry.h"
-#include "bg.h"
 #include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "evolution_scene.h"
 #include "graphics.h"
-#include "gpu_regs.h"
 #include "help_system.h"
 #include "item.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "load_save.h"
-#include "main.h"
-#include "malloc.h"
 #include "m4a.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "pokeball.h"
 #include "pokedex.h"
-#include "pokemon.h"
 #include "quest_log.h"
 #include "random.h"
 #include "roamer.h"
 #include "safari_zone.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "sprite.h"
-#include "string_util.h"
 #include "task.h"
-#include "text.h"
 #include "trig.h"
 #include "vs_seeker.h"
 #include "util.h"
-#include "window.h"
 #include "constants/abilities.h"
 #include "constants/battle_move_effects.h"
 #include "constants/battle_setup.h"
diff --git a/src/battle_message.c b/src/battle_message.c
index 7ca47e6fb..e17d3241b 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1,11 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_string_ids.h"
 #include "battle.h"
-#include "palette.h"
 #include "battle_anim.h"
-#include "string_util.h"
-#include "text.h"
-#include "window.h"
 #include "strings.h"
 #include "battle_message.h"
 #include "link.h"
diff --git a/src/battle_records.c b/src/battle_records.c
index 3196d9bad..7d9ddffe4 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -1,20 +1,12 @@
 #include "global.h"
-#include "malloc.h"
-#include "main.h"
-#include "bg.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "event_data.h"
-#include "palette.h"
 #include "task.h"
-#include "text.h"
-#include "window.h"
 #include "text_window.h"
 #include "battle.h"
 #include "trainer_tower.h"
 #include "trainer_pokemon_sprites.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "string_util.h"
 #include "link.h"
 #include "menu.h"
 #include "overworld.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 225a47729..ceccdac87 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1,17 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "item.h"
 #include "util.h"
-#include "pokemon.h"
 #include "random.h"
-#include "text.h"
-#include "sound.h"
 #include "pokedex.h"
-#include "window.h"
-#include "main.h"
-#include "palette.h"
 #include "money.h"
-#include "bg.h"
-#include "string_util.h"
 #include "pokemon_icon.h"
 #include "mail.h"
 #include "event_data.h"
diff --git a/src/sprite.c b/src/sprite.c
index fd824494b..a71edce1c 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -1,7 +1,5 @@
 #include "global.h"
-#include "sprite.h"
-#include "main.h"
-#include "palette.h"
+#include "gflib.h"
 
 #define MAX_SPRITE_COPY_REQUESTS 64
 
diff --git a/src/start_menu.c b/src/start_menu.c
index d07f5b9be..6fd69d9e0 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1,7 +1,5 @@
 #include "global.h"
-#include "palette.h"
-#include "bg.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "scanline_effect.h"
 #include "overworld.h"
 #include "link.h"
@@ -17,7 +15,6 @@
 #include "menu.h"
 #include "load_save.h"
 #include "strings.h"
-#include "string_util.h"
 #include "menu_helpers.h"
 #include "text_window.h"
 #include "field_fadetransition.h"
@@ -26,7 +23,6 @@
 #include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "script.h"
-#include "sound.h"
 #include "quest_log.h"
 #include "new_game.h"
 #include "event_scripts.h"