diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/trainer_tower.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/trainer_tower.c')
| -rw-r--r-- | src/trainer_tower.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 64acbacd8..06c4a2fad 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -1,23 +1,17 @@ #include "global.h" -#include "main.h" -#include "task.h" -#include "malloc.h" +#include "gflib.h" #include "util.h" -#include "string_util.h" #include "event_data.h" #include "cereader_tool.h" #include "easy_chat.h" -#include "text.h" #include "battle_setup.h" #include "battle_transition.h" #include "battle.h" #include "battle_main.h" #include "overworld.h" #include "item.h" -#include "window.h" #include "menu.h" #include "new_menu_helpers.h" -#include "sound.h" #include "constants/vars.h" #include "constants/items.h" #include "constants/species.h" |