diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
tree | 5707f8764920abcd4cffca84c675e5c53c32559d /src/field_door.c | |
parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) |
Merge branch 'master' into pokemon_data
Diffstat (limited to 'src/field_door.c')
-rw-r--r-- | src/field_door.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_door.c b/src/field_door.c index fa763a5d6..791ed4c94 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -1,7 +1,7 @@ #include "global.h" #include "field_door.h" -#include "asm.h" #include "field_camera.h" +#include "fieldmap.h" #include "metatile_behavior.h" #include "task.h" |