diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
| commit | 5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch) | |
| tree | bf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /src/field_camera.c | |
| parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/field_camera.c')
| -rw-r--r-- | src/field_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_camera.c b/src/field_camera.c index df5ccc301..1aed1549b 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -1,9 +1,9 @@ #include "global.h" #include "field_camera.h" -#include "asm.h" -#include "asm_fieldmap.h" #include "berry.h" #include "field_player_avatar.h" +#include "fieldmap.h" +#include "rotating_gate.h" #include "sprite.h" #include "text.h" |