Clean up includes

src/cereader_tool.c

@@ -1,7 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "util.h"
 #include "save.h"
-#include "malloc.h"
 #include "cereader_tool.h"
 
 u8 sub_815D654(void)

src/coins.c

@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "string_util.h"
-#include "text.h"
 #include "menu.h"
 #include "text_window.h"
 #include "strings.h"

src/credits.c

@@ -1,19 +1,14 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
-#include "bg.h"
 #include "credits.h"
-#include "palette.h"
-#include "gpu_regs.h"
 #include "task.h"
 #include "overworld.h"
 #include "event_data.h"
-#include "window.h"
 #include "new_menu_helpers.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "strings.h"
 #include "trainer_pokemon_sprites.h"
-#include "sound.h"
 #include "constants/species.h"
 #include "constants/maps.h"
 #include "constants/field_weather.h"

src/dark.c

@@ -1,8 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "palette.h"
 #include "scanline_effect.h"
 #include "trig.h"
 #include "util.h"

src/data.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "battle.h"
 #include "data.h"
 #include "graphics.h"

src/decompress.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "pokemon.h"
 #include "constants/species.h"

src/digit_obj_util.c

@@ -1,8 +1,7 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "digit_obj_util.h"
-#include "main.h"
 
 struct DigitPrinterAlloc
 {

src/diploma.c

@@ -1,23 +1,14 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
-#include "constants/fanfares.h"
 #include "dynamic_placeholder_text_util.h"
-#include "gba/macro.h"
-#include "gpu_regs.h"
-#include "main.h"
-#include "malloc.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
-#include "palette.h"
 #include "pokedex.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "sprite.h"
 #include "strings.h"
 #include "task.h"
-#include "text.h"
+#include "constants/fanfares.h"
-#include "window.h"
 
 struct Diploma
 {

src/dynamic_placeholder_text_util.c

@@ -1,6 +1,5 @@
 #include "global.h"
-#include "text.h"
+#include "gflib.h"
-#include "string_util.h"
 #include "constants/event_objects.h"
 
 static EWRAM_DATA const u8 *sStringPointers[8] = {0};

src/easy_chat.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "data.h"
 #include "easy_chat.h"
 #include "event_data.h"
@@ -9,7 +9,6 @@
 #include "mail.h"
 #include "pokedex.h"
 #include "random.h"
-#include "string_util.h"
 #include "strings.h"
 #include "constants/easy_chat.h"
 #include "constants/flags.h"

src/event_object_lock.c

@@ -4,7 +4,6 @@
 #include "event_object_movement.h"
 #include "script_movement.h"
 #include "event_data.h"
-#include "constants/maps.h"
 #include "constants/event_objects.h"
 
 bool8 walkrun_is_standing_still(void)

src/event_object_movement.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "field_camera.h"
@@ -10,7 +10,6 @@
 #include "fieldmap.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
-#include "palette.h"
 #include "quest_log.h"
 #include "random.h"
 #include "script.h"

src/evolution_graphics.c

@@ -1,9 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "trig.h"
 #include "random.h"
 #include "decompress.h"
-#include "palette.h"
-#include "sound.h"
 #include "task.h"
 #include "evolution_scene.h"
 #include "evolution_graphics.h"

src/evolution_scene.c

@@ -1,34 +1,25 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_message.h"
-#include "bg.h"
 #include "data.h"
 #include "decompress.h"
 #include "help_system.h"
 #include "evolution_scene.h"
 #include "evolution_graphics.h"
-#include "gpu_regs.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "m4a.h"
 #include "event_data.h"
 #include "trade_scene.h"
-#include "main.h"
 #include "new_menu_helpers.h"
 #include "menu.h"
 #include "overworld.h"
-#include "palette.h"
 #include "pokedex.h"
-#include "pokemon.h"
 #include "pokemon_summary_screen.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "sprite.h"
-#include "string_util.h"
 #include "strings.h"
 #include "task.h"
-#include "text.h"
 #include "text_window.h"
 #include "trig.h"
 #include "battle_string_ids.h"

src/fame_checker.c

@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/songs.h"
-#include "sprite.h"
-#include "bg.h"
 #include "event_data.h"
 #include "event_scripts.h"
 #include "graphics.h"
@@ -13,15 +12,7 @@
 #include "new_menu_helpers.h"
 #include "item_menu.h"
 #include "list_menu.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "task.h"
-#include "malloc.h"
-#include "main.h"
-#include "sound.h"
-#include "text.h"
-#include "window.h"
-#include "string_util.h"
 #include "event_object_movement.h"
 #include "menu_indicators.h"
 #include "text_window.h"

src/field_effect_helpers.c

@@ -1,12 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "event_object_movement.h"
 #include "field_camera.h"
 #include "field_effect.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
-#include "sound.h"
-#include "sprite.h"
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 

src/field_fadetransition.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "field_fadetransition.h"
 #include "overworld.h"
 #include "fldeff.h"
@@ -14,7 +14,6 @@
 #include "quest_log.h"
 #include "link.h"
 #include "event_object_movement.h"
-#include "sound.h"
 #include "field_door.h"
 #include "field_effect.h"
 #include "field_screen_effect.h"

src/field_poison.c

@@ -1,9 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "strings.h"
 #include "task.h"
 #include "field_message_box.h"
 #include "script.h"
-#include "string_util.h"
 #include "event_data.h"
 #include "fldeff.h"
 #include "party_menu.h"

src/field_screen_effect.c

@@ -1,13 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "field_screen_effect.h"
-#include "gpu_regs.h"
 #include "overworld.h"
 #include "scanline_effect.h"
 #include "script.h"
 #include "task.h"
-#include "window.h"
 #include "strings.h"
-#include "string_util.h"
 #include "menu.h"
 #include "heal_location.h"
 #include "new_menu_helpers.h"

src/field_specials.c

@@ -1,6 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
-#include "palette.h"
 #include "quest_log.h"
 #include "list_menu.h"
 #include "diploma.h"
@@ -9,7 +8,6 @@
 #include "overworld.h"
 #include "field_message_box.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "strings.h"
 #include "battle.h"
 #include "fieldmap.h"
@@ -24,13 +22,10 @@
 #include "random.h"
 #include "mail_data.h"
 #include "help_system.h"
-#include "sound.h"
-#include "text.h"
 #include "pokemon_storage_system.h"
 #include "script_menu.h"
 #include "data.h"
 #include "pokedex.h"
-#include "window.h"
 #include "text_window.h"
 #include "menu.h"
 #include "mevent.h"

src/field_tasks.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "bike.h"
 #include "event_data.h"
 #include "field_camera.h"
@@ -9,7 +10,6 @@
 #include "overworld.h"
 #include "quest_log.h"
 #include "script.h"
-#include "sound.h"
 #include "task.h"
 #include "constants/field_tasks.h"
 #include "constants/flags.h"

src/field_weather_effects.c

@@ -4,7 +4,6 @@
 #include "event_object_movement.h"
 #include "field_weather.h"
 #include "field_weather_effects.h"
-#include "overworld.h"
 #include "random.h"
 #include "script.h"
 #include "constants/weather.h"

src/fieldmap.c

@@ -1,6 +1,5 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
-#include "palette.h"
 #include "overworld.h"
 #include "script.h"
 #include "new_menu_helpers.h"

src/fighting.c

@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
 #include "random.h"
 #include "task.h"
 #include "trig.h"

src/fldeff_poison.c

@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "bg.h"
-#include "sound.h"
 #include "constants/songs.h"
 
 static void Task_FieldPoisonEffect(u8 taskId)

src/fldeff_rocksmash.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "global.fieldmap.h"
+#include "gflib.h"
 #include "field_player_avatar.h"
 #include "field_effect.h"
 #include "party_menu.h"
@@ -7,7 +7,6 @@
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"
-#include "sound.h"
 #include "overworld.h"
 #include "event_object_movement.h"
 #include "constants/songs.h"

src/fldeff_softboiled.c

@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "party_menu.h"
-#include "sound.h"
-#include "string_util.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "constants/songs.h"

src/fldeff_sweetscent.c

@@ -1,14 +1,12 @@
 #include "global.h"
+#include "gflib.h"
 #include "field_player_avatar.h"
 #include "field_effect.h"
 #include "party_menu.h"
-#include "malloc.h"
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"
 #include "field_weather.h"
-#include "sound.h"
-#include "palette.h"
 #include "wild_encounter.h"
 #include "constants/songs.h"
 

src/flying.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle_anim.h"
-#include "palette.h"
+#include "gflib.h"
 #include "trig.h"
 #include "constants/battle_anim.h"
 #include "random.h"

src/ghost.c

@@ -1,12 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "scanline_effect.h"
-#include "malloc.h"
 #include "graphics.h"
-#include "sound.h"
 #include "trig.h"
 #include "util.h"
 #include "decompress.h"

src/gpu_regs.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "gpu_regs.h"
 
 #define GPU_REG_BUF_SIZE 0x60
 

src/hall_of_fame.c

@@ -1,14 +1,8 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
-#include "malloc.h"
 #include "decompress.h"
-#include "bg.h"
 #include "scanline_effect.h"
-#include "gpu_regs.h"
 #include "task.h"
-#include "text.h"
-#include "main.h"
-#include "sound.h"
 #include "save.h"
 #include "data.h"
 #include "m4a.h"

src/help_message.c

@@ -1,5 +1,4 @@
 #include "global.h"
-#include "gflib.h"
 #include "menu.h"
 
 static EWRAM_DATA u8 sHelpMessageWindowId = 0;

src/help_system.c

@@ -1,15 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "gpu_regs.h"
-#include "main.h"
 #include "m4a.h"
-#include "dma3.h"
 #include "help_system.h"
 #include "list_menu.h"
-#include "sound.h"
 #include "strings.h"
-#include "text.h"
-#include "blit.h"
 #include "constants/songs.h"
 
 extern u8 gGlyphInfo[];

src/help_system_812B1E0.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "event_data.h"
 #include "event_scripts.h"
 #include "field_player_avatar.h"
@@ -10,7 +11,6 @@
 #include "quest_log.h"
 #include "save.h"
 #include "save_location.h"
-#include "sound.h"
 #include "strings.h"
 #include "constants/items.h"
 #include "constants/maps.h"

src/hof_pc.c

@@ -1,12 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "hall_of_fame.h"
-#include "palette.h"
 #include "overworld.h"
 #include "script.h"
 #include "script_menu.h"
 #include "task.h"
-#include "bg.h"
-#include "window.h"
 
 static void ReshowPCMenuAfterHallOfFamePC(void);
 static void Task_WaitForPaletteFade(u8 taskId);

src/ice.c

@@ -1,11 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "bg.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "palette.h"
 #include "random.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "constants/battle_anim.h"

src/isagbprn.c

@@ -1,6 +1,5 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include "global.h"
 #include "config.h"
 #include "gba/gba.h"
 

src/item.c

@@ -1,12 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "berry.h"
 #include "event_data.h"
 #include "item.h"
 #include "item_use.h"
 #include "load_save.h"
-#include "malloc.h"
 #include "quest_log.h"
-#include "string_util.h"
 #include "strings.h"
 #include "constants/hold_effects.h"
 #include "constants/items.h"

src/item_menu_icons.c

@@ -1,8 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "item_menu_icons.h"
-#include "malloc.h"
 #include "constants/items.h"
 
 static EWRAM_DATA u8 sItemMenuIconSpriteIds[12] = {0};

src/item_pc.c

@@ -1,8 +1,7 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
 #include "data.h"
 #include "decompress.h"
-#include "gpu_regs.h"
 #include "graphics.h"
 #include "help_system.h"
 #include "item.h"
@@ -11,18 +10,13 @@
 #include "list_menu.h"
 #include "item_pc.h"
 #include "item_use.h"
-#include "main.h"
-#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "menu_indicators.h"
 #include "new_menu_helpers.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "pc_screen_effect.h"
 #include "scanline_effect.h"
-#include "sound.h"
-#include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "text_window.h"

src/item_use.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "berry_pouch.h"
 #include "berry_powder.h"
@@ -17,19 +18,14 @@
 #include "item_use.h"
 #include "itemfinder.h"
 #include "mail.h"
-#include "main.h"
-#include "malloc.h"
 #include "event_object_lock.h"
 #include "metatile_behavior.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
-#include "palette.h"
 #include "party_menu.h"
 #include "quest_log.h"
 #include "region_map.h"
 #include "script.h"
-#include "sound.h"
-#include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "teachy_tv.h"

src/itemfinder.c

@@ -1,11 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
 #include "new_menu_helpers.h"
 #include "strings.h"
 #include "event_scripts.h"
 #include "event_object_lock.h"
 #include "script.h"
-#include "sound.h"
 #include "event_data.h"
 #include "field_player_avatar.h"
 #include "field_specials.h"

src/learn_move.c

@@ -1,13 +1,9 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
-#include "malloc.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "script.h"
 #include "task.h"
 #include "data.h"
 #include "trig.h"
-#include "window.h"
 #include "field_fadetransition.h"
 #include "overworld.h"
 #include "new_menu_helpers.h"
@@ -15,10 +11,8 @@
 #include "list_menu.h"
 #include "event_data.h"
 #include "text_window.h"
-#include "string_util.h"
 #include "pokemon_summary_screen.h"
 #include "graphics.h"
-#include "sound.h"
 #include "strings.h"
 #include "constants/songs.h"
 #include "constants/moves.h"

src/librfu_intr.c

@@ -1,4 +1,3 @@
-#include "global.h"
 #include "librfu.h"
 
 static void sio32intr_clock_master(void);

src/link.c

@@ -1,12 +1,9 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
-#include "bg.h"
 #include "m4a.h"
 #include "scanline_effect.h"
 #include "bg_regs.h"
-#include "gpu_regs.h"
 #include "decompress.h"
-#include "malloc.h"
 #include "save.h"
 #include "battle.h"
 #include "quest_log.h"
@@ -15,16 +12,12 @@
 #include "random.h"
 #include "task.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "item_menu.h"
 #include "trade.h"
-#include "text.h"
-#include "sound.h"
 #include "menu.h"
 #include "overworld.h"
 #include "new_menu_helpers.h"
 #include "link.h"
-#include "window.h"
 #include "graphics.h"
 #include "strings.h"
 #include "help_system.h"

src/link_rfu_2.c

@@ -1,15 +1,13 @@
 #include "global.h"
-#include "battle.h"
+#include "gflib.h"
-#include "gpu_regs.h"
 #include "librfu.h"
+#include "battle.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "mystery_gift_menu.h"
 #include "overworld.h"
-#include "palette.h"
 #include "quest_log.h"
 #include "random.h"
-#include "string_util.h"
 #include "task.h"
 #include "constants/species.h"
 #include "constants/union_room.h"

src/link_rfu_3.c

@@ -1,12 +1,10 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "malloc.h"
 #include "random.h"
-#include "string_util.h"
-#include "text.h"
 #include "constants/flags.h"
 
 static EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0;

src/list_menu.c

@@ -1,16 +1,13 @@
 #include "global.h"
+#include "gflib.h"
 #include "menu.h"
 #include "list_menu.h"
 #include "menu_indicators.h"
 #include "new_menu_helpers.h"
-#include "window.h"
 #include "text_window.h"
-#include "main.h"
 #include "task.h"
 #include "graphics.h"
-#include "palette.h"
 #include "strings.h"
-#include "sound.h"
 #include "pokemon_icon.h"
 #include "constants/songs.h"
 

src/load_save.c

@@ -1,10 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "gba/flash_internal.h"
 #include "load_save.h"
-#include "main.h"
 #include "pokemon.h"
 #include "random.h"
-#include "malloc.h"
 #include "item.h"
 #include "save_location.h"
 #include "berry_powder.h"

src/mail.c

@@ -1,12 +1,8 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
-#include "bg.h"
 #include "scanline_effect.h"
 #include "palette.h"
-#include "gpu_regs.h"
-#include "window.h"
 #include "text_window.h"
-#include "main.h"
 #include "easy_chat.h"
 #include "mail.h"
 #include "task.h"

src/mail_data.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "text.h"
+#include "gflib.h"
 #include "mail.h"
 #include "mail_data.h"
 #include "constants/species.h"

src/mailbox_pc.c

@@ -1,14 +1,11 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
-#include "window.h"
 #include "menu.h"
-#include "string_util.h"
 #include "new_menu_helpers.h"
 #include "list_menu.h"
 #include "player_pc.h"
 #include "strings.h"
 #include "menu_indicators.h"
-#include "sound.h"
 #include "constants/songs.h"
 
 static EWRAM_DATA u8 sWindowIds[3] = {};

src/main.c

@@ -1,20 +1,14 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
-#include "gpu_regs.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "load_save.h"
-#include "main.h"
 #include "m4a.h"
 #include "random.h"
-#include "dma3.h"
 #include "gba/flash_internal.h"
 #include "help_system.h"
-#include "sound.h"
 #include "new_menu_helpers.h"
-#include "malloc.h"
 #include "overworld.h"
-#include "sprite.h"
 #include "play_time.h"
 #include "intro.h"
 #include "battle_controllers.h"

src/main_menu.c

@@ -1,14 +1,9 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
-#include "gpu_regs.h"
 #include "scanline_effect.h"
-#include "bg.h"
-#include "dma3.h"
 #include "task.h"
-#include "text.h"
 #include "save.h"
 #include "event_data.h"
-#include "window.h"
 #include "menu.h"
 #include "link.h"
 #include "oak_speech.h"
@@ -16,10 +11,8 @@
 #include "quest_log.h"
 #include "mystery_gift_menu.h"
 #include "strings.h"
-#include "sound.h"
 #include "title_screen.h"
 #include "help_system.h"
-#include "string_util.h"
 #include "pokedex.h"
 #include "text_window.h"
 #include "text_window_graphics.h"

src/map_name_popup.c

@@ -1,16 +1,11 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
-#include "gpu_regs.h"
-#include "window.h"
-#include "palette.h"
 #include "task.h"
 #include "event_data.h"
 #include "text_window.h"
 #include "quest_log.h"
 #include "region_map.h"
-#include "text.h"
 #include "strings.h"
-#include "string_util.h"
 #include "constants/flags.h"
 
 static void Task_MapNamePopup(u8 taskId);

src/map_preview_screen.c

@@ -1,11 +1,7 @@
 #include "global.h"
-#include "gpu_regs.h"
+#include "gflib.h"
-#include "bg.h"
-#include "palette.h"
-#include "malloc.h"
 #include "quest_log.h"
 #include "new_menu_helpers.h"
-#include "window.h"
 #include "region_map.h"
 #include "menu.h"
 #include "field_fadetransition.h"

src/menu.c

@@ -1,12 +1,9 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "strings.h"
 #include "text_window.h"
-#include "window.h"
-#include "sound.h"
-#include "palette.h"
 #include "constants/songs.h"
 
 struct Menu

src/menu2.c

@@ -1,10 +1,7 @@
 #include "global.h"
-#include "text.h"
+#include "gflib.h"
-#include "blit.h"
-#include "gpu_regs.h"
 #include "task.h"
 #include "wild_encounter.h"
-#include "string_util.h"
 #include "constants/species.h"
 
 static void Task_SmoothBlendLayers(u8 taskId);

src/menu_helpers.c

@@ -1,14 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "window.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "new_menu_helpers.h"
-#include "string_util.h"
-#include "text.h"
-#include "sound.h"
 #include "link.h"
 #include "overworld.h"
 #include "mail_data.h"

src/menu_indicators.c

@@ -1,9 +1,7 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "task.h"
 #include "decompress.h"
-#include "palette.h"
-#include "sprite.h"
 #include "trig.h"
 #include "list_menu.h"
 #include "menu_indicators.h"

src/mevent.c

@@ -1,10 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/songs.h"
 #include "constants/species.h"
-#include "malloc.h"
-#include "sound.h"
 #include "easy_chat.h"
-#include "main.h"
 #include "task.h"
 #include "decompress.h"
 #include "link.h"
@@ -15,7 +13,6 @@
 #include "event_data.h"
 #include "battle_tower.h"
 #include "new_game.h"
-#include "string_util.h"
 #include "menews_jisan.h"
 #include "cereader_tool.h"
 #include "mystery_gift_menu.h"

src/mevent_client.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "overworld.h"
 #include "script.h"

src/mevent_server.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
 #include "script.h"
 #include "mevent.h"
 #include "mevent_server.h"

src/mevent_show_card.c

@@ -1,14 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/species.h"
-#include "bg.h"
-#include "palette.h"
 #include "decompress.h"
-#include "malloc.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
 #include "pokemon_icon.h"
 #include "mystery_gift_menu.h"
-#include "string_util.h"
 #include "mevent.h"
 #include "battle_anim.h"
 

src/minigame_countdown.c

@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "sound.h"
 #include "task.h"
 #include "trig.h"
 #include "constants/songs.h"

src/mon_markings.c

@@ -1,7 +1,6 @@
 #include "global.h"
-#include "dma3.h"
+#include "gflib.h"
 #include "text_window_graphics.h"
-#include "sound.h"
 #include "mon_markings.h"
 #include "graphics.h"
 #include "constants/songs.h"

src/money.c

@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "event_data.h"
-#include "text.h"
-#include "string_util.h"
 #include "menu.h"
 #include "text_window.h"
 #include "strings.h"

src/mystery_event_script.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "berry.h"
 #include "battle_tower.h"
 #include "easy_chat.h"
@@ -6,13 +7,10 @@
 #include "mail_data.h"
 #include "mystery_event_script.h"
 #include "pokedex.h"
-#include "pokemon.h"
 #include "pokemon_size_record.h"
 #include "script.h"
 #include "constants/species.h"
 #include "strings.h"
-#include "string_util.h"
-#include "text.h"
 #include "util.h"
 #include "mystery_event_msg.h"
 #include "pokemon_storage_system.h"

src/mystery_gift_menu.c

@@ -1,21 +1,14 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
-#include "gpu_regs.h"
-#include "bg.h"
 #include "task.h"
 #include "scanline_effect.h"
-#include "malloc.h"
-#include "text.h"
-#include "window.h"
 #include "text_window.h"
 #include "menu.h"
 #include "new_menu_helpers.h"
-#include "sound.h"
 #include "mystery_gift_menu.h"
 #include "title_screen.h"
 #include "list_menu.h"
 #include "link_rfu.h"
-#include "string_util.h"
 #include "mevent.h"
 #include "save.h"
 #include "link.h"

src/new_game.c

@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "random.h"
-#include "main.h"
 #include "overworld.h"
 #include "constants/maps.h"
 #include "load_save.h"
@@ -10,7 +10,6 @@
 #include "quest_log.h"
 #include "wild_encounter.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "mail_data.h"
 #include "play_time.h"
 #include "money.h"

src/normal.c

@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "palette.h"
 #include "random.h"
 #include "task.h"
 #include "trig.h"

src/oak_speech.c

@@ -1,23 +1,14 @@
 #include "global.h"
-#include "main.h"
+#include "gflib.h"
 #include "decompress.h"
 #include "task.h"
-#include "malloc.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "blend_palette.h"
-#include "text.h"
-#include "window.h"
 #include "text_window.h"
-#include "bg.h"
 #include "menu.h"
 #include "help_system.h"
 #include "new_menu_helpers.h"
-#include "pokemon.h"
-#include "sound.h"
 #include "event_scripts.h"
 #include "scanline_effect.h"
-#include "string_util.h"
 #include "pokeball.h"
 #include "naming_screen.h"
 #include "math_util.h"

src/option_menu.c

@@ -1,20 +1,13 @@
 #include "global.h"
-#include "gpu_regs.h"
+#include "gflib.h"
 #include "scanline_effect.h"
 #include "text_window_graphics.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "task.h"
-#include "palette.h"
 #include "overworld.h"
-#include "malloc.h"
 #include "help_system.h"
-#include "main.h"
-#include "bg.h"
-#include "window.h"
-#include "text.h"
 #include "text_window.h"
-#include "string_util.h"
 #include "strings.h"
 #include "field_fadetransition.h"
 #include "gba/m4a_internal.h"

src/palette.c

@@ -1,8 +1,7 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "util.h"
 #include "decompress.h"
-#include "gpu_regs.h"
 #include "task.h"
 
 enum

src/party_menu_specials.c

@@ -1,14 +1,12 @@
 #include "global.h"
+#include "gflib.h"
 #include "data.h"
 #include "script.h"
 #include "overworld.h"
-#include "palette.h"
-#include "pokemon.h"
 #include "party_menu.h"
 #include "field_fadetransition.h"
 #include "pokemon_summary_screen.h"
 #include "event_data.h"
-#include "string_util.h"
 #include "constants/moves.h"
 
 static void sub_80BF97C(u8 taskId);

src/pc_screen_effect.c

@@ -1,7 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "task.h"
-#include "gpu_regs.h"
-#include "palette.h"
 
 /*
  * Animates the screen as though it was a CRT monitor turning on or off.

src/player_pc.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "item.h"
 #include "task.h"
 #include "menu_indicators.h"
@@ -9,7 +9,6 @@
 #include "mail.h"
 #include "mail_data.h"
 #include "help_system.h"
-#include "sound.h"
 #include "overworld.h"
 #include "script.h"
 #include "mailbox_pc.h"
@@ -17,7 +16,6 @@
 #include "field_weather.h"
 #include "event_scripts.h"
 #include "field_fadetransition.h"
-#include "string_util.h"
 #include "item_menu.h"
 #include "item_pc.h"
 #include "party_menu.h"

src/pokeball.c

@@ -1,14 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "decompress.h"
 #include "graphics.h"
-#include "main.h"
 #include "m4a.h"
 #include "pokeball.h"
-#include "pokemon.h"
-#include "sound.h"
-#include "sprite.h"
 #include "task.h"
 #include "trig.h"
 #include "util.h"

src/pokedex_area_markers.c

@@ -1,9 +1,6 @@
 #include "global.h"
-#include "malloc.h"
+#include "gflib.h"
-#include "bg.h"
 #include "decompress.h"
-#include "gpu_regs.h"
-#include "palette.h"
 #include "task.h"
 #include "wild_pokemon_area.h"
 #include "pokedex_area_markers.h"

src/pokedex_screen.c

@@ -1,17 +1,10 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
-#include "malloc.h"
-#include "palette.h"
 #include "graphics.h"
-#include "dma3.h"
-#include "gpu_regs.h"
 #include "m4a.h"
 #include "scanline_effect.h"
 #include "task.h"
-#include "text.h"
-#include "window.h"
 #include "new_menu_helpers.h"
-#include "sound.h"
 #include "event_data.h"
 #include "help_system.h"
 #include "menu_indicators.h"
@@ -21,7 +14,6 @@
 #include "pokedex_screen.h"
 #include "data.h"
 #include "pokedex.h"
-#include "string_util.h"
 #include "trainer_pokemon_sprites.h"
 #include "constants/songs.h"
 #include "constants/species.h"

src/pokemon.c

@@ -1,12 +1,10 @@
 #define IS_POKEMON_C
 
 #include "global.h"
-#include "pokemon.h"
+#include "gflib.h"
 #include "random.h"
-#include "main.h"
 #include "text.h"
 #include "data.h"
-#include "string_util.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "item.h"
@@ -20,10 +18,8 @@
 #include "battle_util.h"
 #include "link.h"
 #include "m4a.h"
-#include "sound.h"
 #include "pokedex.h"
 #include "strings.h"
-#include "malloc.h"
 #include "overworld.h"
 #include "party_menu.h"
 #include "field_specials.h"

src/pokemon_icon.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "mail_data.h"
 #include "pokemon_icon.h"
 #include "graphics.h"

src/pokemon_size_record.c

@@ -1,9 +1,8 @@
 #include "global.h"
+#include "gflib.h"
 #include "data.h"
 #include "event_data.h"
 #include "pokedex.h"
-#include "pokemon.h"
-#include "string_util.h"
 #include "text.h"
 #include "strings.h"
 #include "constants/species.h"

src/psychic.c

@@ -1,8 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
-#include "palette.h"
-#include "sound.h"
 #include "scanline_effect.h"
 #include "trig.h"
 #include "constants/songs.h"

src/quest_log.c

@@ -1,18 +1,10 @@
 #include "global.h"
-#include "data.h"
+#include "gflib.h"
-#include "malloc.h"
-#include "main.h"
 #include "task.h"
-#include "palette.h"
 #include "menu.h"
-#include "random.h"
 #include "menu_helpers.h"
-#include "window.h"
 #include "text_window.h"
-#include "dynamic_placeholder_text_util.h"
 #include "event_data.h"
-#include "event_scripts.h"
-#include "string_util.h"
 #include "script.h"
 #include "overworld.h"
 #include "field_fadetransition.h"
@@ -20,16 +12,13 @@
 #include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "field_player_avatar.h"
-#include "battle.h"
 #include "item.h"
 #include "region_map.h"
 #include "map_name_popup.h"
 #include "wild_encounter.h"
 #include "help_system.h"
-#include "party_menu.h"
 #include "pokemon_storage_system.h"
 #include "save.h"
-#include "link.h"
 #include "quest_log_objects.h"
 #include "quest_log_player.h"
 #include "quest_log.h"
@@ -37,14 +26,10 @@
 #include "strings.h"
 #include "constants/event_objects.h"
 #include "constants/maps.h"
-#include "constants/party_menu.h"
 #include "constants/quest_log.h"
-#include "constants/trainer_classes.h"
 #include "constants/species.h"
-#include "constants/items.h"
 #include "constants/field_weather.h"
 #include "constants/event_object_movement.h"
-#include "constants/region_map_sections.h"
 
 struct TrainerFanClub
 {

src/quest_log_battle.c

@@ -1,6 +1,6 @@
 #include "global.h"
+#include "gflib.h"
 #include "constants/species.h"
-#include "malloc.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "link.h"

src/region_map.c

@@ -1,20 +1,15 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
-#include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "task.h"
 #include "m4a.h"
-#include "malloc.h"
 #include "overworld.h"
 #include "event_data.h"
 #include "region_map.h"
-#include "window.h"
-#include "sound.h"
 #include "party_menu.h"
 #include "field_effect.h"
 #include "new_menu_helpers.h"
 #include "menu.h"
-#include "string_util.h"
 #include "strings.h"
 #include "map_preview_screen.h"
 #include "constants/flags.h"

src/reset_save_heap.c

@@ -1,12 +1,10 @@
 #include "global.h"
-#include "main.h"
+#include "gflib.h"
-#include "gpu_regs.h"
 #include "m4a.h"
 #include "load_save.h"
 #include "save.h"
 #include "new_game.h"
 #include "overworld.h"
-#include "malloc.h"
 
 void ResetSaveHeap(void)
 {

src/reshow_battle_screen.c

@@ -1,12 +1,7 @@
 #include "global.h"
-#include "bg.h"
+#include "gflib.h"
-#include "palette.h"
-#include "pokemon.h"
-#include "main.h"
 #include "link.h"
 #include "data.h"
-#include "sprite.h"
-#include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "help_system.h"
 #include "battle.h"

src/rock.c

@@ -1,9 +1,7 @@
 #include "global.h"
+#include "gflib.h"
 #include "battle_anim.h"
-#include "gpu_regs.h"
 #include "graphics.h"
-#include "palette.h"
-#include "sound.h"
 #include "task.h"
 #include "trig.h"
 #include "constants/songs.h"

src/roulette_util.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "roulette_util.h"
 #include "util.h"
 

src/save.c

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "save.h"
 #include "decompress.h"
-#include "main.h"
 #include "overworld.h"
 #include "load_save.h"
 #include "task.h"

src/save_failed_screen.c

@@ -1,13 +1,11 @@
 #include "global.h"
+#include "gflib.h"
 #include "decompress.h"
-#include "dma3.h"
 #include "gba/flash_internal.h"
-#include "gpu_regs.h"
 #include "help_system.h"
 #include "m4a.h"
 #include "save.h"
 #include "strings.h"
-#include "text.h"
 
 bool32 sIsInSaveFailedScreen;
 

src/save_menu_util.c

@@ -1,6 +1,5 @@
 #include "global.h"
-#include "string_util.h"
+#include "gflib.h"
-#include "text.h"
 #include "event_data.h"
 #include "pokedex.h"
 #include "region_map.h"

src/scrcmd.c

@@ -1,6 +1,5 @@
 #include "global.h"
-#include "gba/isagbprint.h"
+#include "gflib.h"
-#include "palette.h"
 #include "script.h"
 #include "mystery_event_script.h"
 #include "event_data.h"
@@ -14,15 +13,12 @@
 #include "field_tasks.h"
 #include "field_fadetransition.h"
 #include "field_player_avatar.h"
-#include "sound.h"
 #include "script_movement.h"
 #include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "field_message_box.h"
 #include "new_menu_helpers.h"
-#include "window.h"
 #include "script_menu.h"
-#include "string_util.h"
 #include "data.h"
 #include "field_specials.h"
 #include "constants/items.h"

src/script_menu.c

@@ -1,17 +1,13 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
-#include "text.h"
 #include "menu.h"
 #include "task.h"
-#include "sound.h"
 #include "script_menu.h"
 #include "quest_log.h"
-#include "window.h"
 #include "new_menu_helpers.h"
 #include "event_data.h"
 #include "script.h"
 #include "strings.h"
-#include "string_util.h"
 #include "field_effect.h"
 #include "event_scripts.h"
 #include "constants/songs.h"

src/script_pokemon_util.c

@@ -1,9 +1,9 @@
 #include "global.h"
+#include "gflib.h"
 #include "berry.h"
 #include "daycare.h"
 #include "event_data.h"
 #include "load_save.h"
-#include "malloc.h"
 #include "overworld.h"
 #include "party_menu.h"
 #include "pokedex.h"

src/seagallop.c

@@ -1,13 +1,8 @@
 #include "global.h"
-#include "gpu_regs.h"
+#include "gflib.h"
-#include "bg.h"
-#include "palette.h"
-#include "malloc.h"
 #include "scanline_effect.h"
 #include "trainer_pokemon_sprites.h"
-#include "window.h"
 #include "text_window.h"
-#include "sound.h"
 #include "task.h"
 #include "help_system.h"
 #include "overworld.h"

src/shop.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "gflib.h"
 #include "shop.h"
 #include "menu.h"
 #include "data.h"
@@ -7,24 +8,15 @@
 #include "list_menu.h"
 #include "new_menu_helpers.h"
 #include "party_menu.h"
-#include "window.h"
 #include "field_specials.h"
 #include "field_weather.h"
 #include "task.h"
-#include "text.h"
 #include "item.h"
 #include "item_menu.h"
-#include "main.h"
-#include "sound.h"
-#include "string_util.h"
 #include "overworld.h"
-#include "palette.h"
 #include "field_fadetransition.h"
 #include "scanline_effect.h"
 #include "item_menu_icons.h"
-#include "bg.h"
-#include "gpu_regs.h"
-#include "malloc.h"
 #include "decompress.h"
 #include "menu_indicators.h"
 #include "field_player_avatar.h"