summaryrefslogtreecommitdiff
path: root/src/easy_chat_2.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-05 18:28:16 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-05 18:28:16 -0700
commitd975a85c84616155e226b2d5120aee9adcae16b5 (patch)
tree0668eb03388e9404e134e24b3dcd753f7bc47050 /src/easy_chat_2.c
parent37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff)
parent62388f3bfd5b1abd9fa369628b805e683e64c302 (diff)
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/easy_chat_2.c')
-rw-r--r--src/easy_chat_2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index c56fe7576..ed6a97ba2 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -5,7 +5,7 @@
#include "decompress.h"
#include "easy_chat.h"
#include "event_data.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
#include "field_message_box.h"
#include "graphics.h"
#include "menu.h"