diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-02-17 19:38:48 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-17 19:38:48 -0800 |
commit | a1d9c4bc46a8ea99fe21e481382784143282fa18 (patch) | |
tree | c73a6908db9b1cabbb55386038bf47ab4a9ad77a /src/field/map_obj_lock.c | |
parent | 28987bb1cd0e6864257ff0434508dddcddb22e98 (diff) | |
parent | e74b0c6e51796d2c8c7fab6ef22f75d15a6c8786 (diff) |
Merge pull request #553 from ProjectRevoTPP/evobjmv
merge field_map_obj helpers and ground effect into event_object_movement.c
Diffstat (limited to 'src/field/map_obj_lock.c')
-rw-r--r-- | src/field/map_obj_lock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/field/map_obj_lock.c b/src/field/map_obj_lock.c index 954fcb446..3bd25dbdf 100644 --- a/src/field/map_obj_lock.c +++ b/src/field/map_obj_lock.c @@ -1,7 +1,6 @@ #include "global.h" #include "map_obj_lock.h" -#include "field_map_obj.h" -#include "field_map_obj_helpers.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "script_movement.h" #include "task.h" |