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/field_effect.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/field_effect.c')
| -rw-r--r-- | src/field/field_effect.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/field/field_effect.c b/src/field/field_effect.c index e1389c378..f85bc520e 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -15,14 +15,12 @@ #include "constants/songs.h" #include "decoration.h" #include "field_player_avatar.h" -#include "field_map_obj_helpers.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "metatile_behavior.h" #include "field_camera.h" #include "field_effect.h" #include "field_fadetransition.h" #include "fieldmap.h" -#include "field_map_obj.h" #include "util.h" #include "field_effect_helpers.h" #include "pokemon_storage_system.h" |