diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
| commit | 3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch) | |
| tree | c8297d41af868eac80642c1f811bc009fa142099 /src/battle/battle_setup.c | |
| parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'src/battle/battle_setup.c')
| -rw-r--r-- | src/battle/battle_setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 83283b9e2..86b272bcb 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -6,7 +6,6 @@ #include "event_data.h" #include "field_control_avatar.h" #include "field_fadetransition.h" -#include "field_map_obj_helpers.h" #include "field_message_box.h" #include "field_player_avatar.h" #include "field_weather.h" |