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/easy_chat_2.c | |
| parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-1
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" |