summaryrefslogtreecommitdiff
path: root/src/battle/battle_setup.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-03-31 14:37:24 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-03-31 14:37:24 -0400
commit0015d6fe2c6a53c5f757599122ae9fd1a156a69f (patch)
tree81b7269c767da1ad4a5a9ac01e58ead5e92f0983 /src/battle/battle_setup.c
parent46bc01f0dd1a3435b3c6ce71e1be0d19b7aaa5bd (diff)
parent59f81c5f2a25ec77baf4a30c3da9ccb7675d1562 (diff)
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/battle/battle_setup.c')
-rw-r--r--src/battle/battle_setup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 15555f833..ec4a26bc5 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"