diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-19 10:58:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 10:58:44 -0500 |
| commit | 89dc26755ad2818c10b37a34ed46f5c79dc571c8 (patch) | |
| tree | abd075a205c401b3a5406efb37378544e94c9190 /src/battle_setup.c | |
| parent | 83cba310335678aa8ecac24b58708b3c924b581a (diff) | |
| parent | 63f8834b6bc2d6413da606d7df88a304edc3c625 (diff) | |
Merge pull request #138 from jiangzhengwenjz/battle
battle (4th take)
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" |