diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
| commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
| tree | fa83e9a7105769c66e3a66b3c6871984293db329 /src/map_obj_lock.c | |
| parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'src/map_obj_lock.c')
| -rw-r--r-- | src/map_obj_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index 713ca03f9..bd40bcacc 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -1,8 +1,9 @@ #include "global.h" #include "map_obj_lock.h" -#include "asm.h" +#include "field_map_obj.h" #include "field_map_obj_helpers.h" #include "field_player_avatar.h" +#include "script_movement.h" #include "task.h" extern u16 gScriptFacing; |