diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
commit | cd069446e06c277222be0aaa05fb43b090259234 (patch) | |
tree | a740e2042ff6af3465cfdaa15fc29c35269cfa70 /src/event_object_movement.c | |
parent | 3181c64c64afa47b3adc04f325ad3798c8c324ec (diff) | |
parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) |
Merge branch 'master' into pokedex-area-const-array
Diffstat (limited to 'src/event_object_movement.c')
-rw-r--r-- | src/event_object_movement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index ba62db10d..30dffd8d7 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -6,6 +6,7 @@ #include "event_data.h" #include "event_object_movement.h" #include "event_scripts.h" +#include "faraway_island.h" #include "field_camera.h" #include "field_effect.h" #include "field_effect_helpers.h" @@ -15,7 +16,6 @@ #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" -#include "pokenav.h" #include "random.h" #include "sprite.h" #include "task.h" |