diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-19 11:12:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-19 11:12:41 -0500 |
| commit | ff3fb436227a1993add63fdd9f14b61c304b37c8 (patch) | |
| tree | 9ec424760d0dab9dddd2ac938fc698c249986912 /src/battle_setup.c | |
| parent | d13375a4e03519feb3e9a6b0f7784f09b55b7709 (diff) | |
| parent | 89dc26755ad2818c10b37a34ed46f5c79dc571c8 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into dism_more_data
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index b9da39ddb..9fef6a8a5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -13,7 +13,6 @@ #include "strings.h" #include "string_util.h" #include "event_data.h" -#include "unk_8159F40.h" #include "map_obj_80688E4.h" #include "metatile_behavior.h" #include "event_scripts.h" @@ -28,6 +27,7 @@ #include "battle.h" #include "battle_setup.h" #include "battle_transition.h" +#include "battle_controllers.h" #include "constants/battle_setup.h" #include "constants/flags.h" #include "constants/items.h" |