diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-17 23:06:16 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-17 23:06:16 -0500 |
| commit | 2d428c7099bbad44f900e8238f4bf0cbc17b17be (patch) | |
| tree | 6c2d787def871914f33d4ae44cb50158d7cb97af /include | |
| parent | 17e1da554b016116bbceba86a8d0dfd360f8340c (diff) | |
| parent | adac76c8370b86176a52d8ecb2e349e2be13f8ba (diff) | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h (renamed from include/evobjmv.h) | 6 | ||||
| -rw-r--r-- | include/fieldmap.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/evobjmv.h b/include/event_object_movement.h index 9f76a5856..495942656 100644 --- a/include/evobjmv.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_EVOBJMV_H -#define GUARD_EVOBJMV_H +#ifndef GUARD_EVENTOBJMV_H +#define GUARD_EVENTOBJMV_H #include "sprite.h" @@ -475,4 +475,4 @@ u8 ZCoordToPriority(u8); void FieldObjectUpdateZCoord(struct MapObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); -#endif // GUARD_EVOBJMV_H +#endif // GUARD_EVENTOBJMV_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 1003b026f..5aa9eb360 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -1,6 +1,6 @@ #ifndef GUARD_FIELDMAP2_H #define GUARD_FIELDMAP2_H -#include "evobjmv.h" +#include "event_object_movement.h" extern struct BackupMapData gUnknown_03004870; struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection); |