diff options
author | Cameron Hall <cameronghall@cox.net> | 2018-02-18 17:38:30 -0600 |
---|---|---|
committer | Cameron Hall <cameronghall@cox.net> | 2018-02-18 17:38:30 -0600 |
commit | 27da62f8310ea6612654a91293ad003d2c48167b (patch) | |
tree | 0ffa36c4a29ba24d7527594cd55711b1efb87213 /src/field/field_effect_helpers.c | |
parent | 5388d28bf33b38bb8dbb825564491feaa89c1787 (diff) | |
parent | adac76c8370b86176a52d8ecb2e349e2be13f8ba (diff) |
Merge branch 'master' into decompile_debug
Diffstat (limited to 'src/field/field_effect_helpers.c')
-rw-r--r-- | src/field/field_effect_helpers.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c index c9d337de1..bc4a1770e 100644 --- a/src/field/field_effect_helpers.c +++ b/src/field/field_effect_helpers.c @@ -4,12 +4,10 @@ #include "metatile_behavior.h" #include "constants/songs.h" #include "sound.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_camera.h" -#include "field_map_obj_helpers.h" #include "field_weather.h" #include "field_effect.h" -#include "field_ground_effect.h" #include "field_effect_helpers.h" static void sub_81269E0(struct Sprite *); |