diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/field_camera.c | |
parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
Merge pull request #1 from pret/master
be up to date with the master
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" |