diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
commit | d975a85c84616155e226b2d5120aee9adcae16b5 (patch) | |
tree | 0668eb03388e9404e134e24b3dcd753f7bc47050 /include/fieldmap.h | |
parent | 37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff) | |
parent | 62388f3bfd5b1abd9fa369628b805e683e64c302 (diff) |
Merge remote-tracking branch 'upstream/master' into various_data
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); |