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 /include/fieldmap.h | |
parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'include/fieldmap.h')
-rw-r--r-- | include/fieldmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index 67b85fa62..5aa9eb360 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -1,6 +1,6 @@ #ifndef GUARD_FIELDMAP2_H #define GUARD_FIELDMAP2_H -#include "field_map_obj.h" +#include "event_object_movement.h" extern struct BackupMapData gUnknown_03004870; struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection); |