summaryrefslogtreecommitdiff
path: root/src/field/overworld.c
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-02-18 17:38:30 -0600
committerCameron Hall <cameronghall@cox.net>2018-02-18 17:38:30 -0600
commit27da62f8310ea6612654a91293ad003d2c48167b (patch)
tree0ffa36c4a29ba24d7527594cd55711b1efb87213 /src/field/overworld.c
parent5388d28bf33b38bb8dbb825564491feaa89c1787 (diff)
parentadac76c8370b86176a52d8ecb2e349e2be13f8ba (diff)
Merge branch 'master' into decompile_debug
Diffstat (limited to 'src/field/overworld.c')
-rw-r--r--src/field/overworld.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/field/overworld.c b/src/field/overworld.c
index 14d3101a9..6376aa1af 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -9,9 +9,7 @@
#include "field_control_avatar.h"
#include "field_effect.h"
#include "field_fadetransition.h"
-#include "field_ground_effect.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
#include "field_message_box.h"
#include "field_player_avatar.h"
#include "field_screen_effect.h"