diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
| commit | 66367c82ef07c10957d45ce7f0f776a178454e18 (patch) | |
| tree | 0dd4fcd5cce3ef14dae4fc9ae91e54c6e070eef6 /src/easy_chat_2.c | |
| parent | 171dd32df8a56e1f10956be8b944cb216edb8f9d (diff) | |
| parent | 781d0ca44c8eab2b7751fe8f337d6acde7fe8582 (diff) | |
Merge remote-tracking branch 'upstream/master' into btl_attrs
Diffstat (limited to 'src/easy_chat_2.c')
| -rw-r--r-- | src/easy_chat_2.c | 2 |
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" |