diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-24 01:33:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 01:33:57 -0600 |
| commit | 980b055bf09215d89870730fa8cea2ac207e2260 (patch) | |
| tree | 60c96f448c076fae793c378cd2327779b5821718 /src/battle_setup.c | |
| parent | f835a356622b0038d82bd45fe698d5663091fcde (diff) | |
| parent | 72aa9eb5a91bc36514eb5cf922c5cde209fba8c5 (diff) | |
Merge pull request #471 from DizzyEggg/clean
Get rid of externs and add includes
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 83ced1b7c..1ad5dcf4f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -24,6 +24,7 @@ #include "window.h" #include "event_object_movement.h" #include "event_scripts.h" +#include "tv.h" #include "trainer_see.h" #include "field_message_box.h" #include "sound.h" @@ -36,6 +37,9 @@ #include "gym_leader_rematch.h" #include "battle_pike.h" #include "battle_pyramid.h" +#include "fldeff_misc.h" +#include "field_control_avatar.h" +#include "fldeff_groundshake.h" #include "constants/map_types.h" #include "constants/battle_frontier.h" @@ -57,12 +61,8 @@ struct TrainerBattleParameter }; extern bool32 InTrainerHill(void); -extern bool32 FldEffPoison_IsActive(void); -extern void RestartWildEncounterImmunitySteps(void); extern void ClearPoisonStepCounter(void); -extern void sub_81BE72C(void); extern void sub_808BCF4(void); -extern void sub_80EECC8(void); extern void sub_80AF6F0(void); extern u16 sub_81D6180(u8 localId); extern bool8 GetTrainerHillTrainerFlag(u8 eventObjId); |