diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
commit | bbe876153c2a0903a30b37734874bf63ca6d8a10 (patch) | |
tree | 7efa03650e784e7ff6ac7d479b5315194a4081fb /src/rom6.c | |
parent | 300f2274f381b5a700b6a67847c3b9f97c67a541 (diff) | |
parent | c2218920d57c883dc83078c2d1d7cf3af82babbb (diff) |
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'src/rom6.c')
-rw-r--r-- | src/rom6.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rom6.c b/src/rom6.c index be14f1731..6efb1802e 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -13,7 +13,9 @@ #include "sound.h" #include "sprite.h" #include "task.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" +#include "constants/map_types.h" extern u16 gSpecialVar_LastTalked; extern void (*gFieldCallback)(void); |