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/metatile_behavior.c | |
| parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/metatile_behavior.c')
| -rw-r--r-- | src/metatile_behavior.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index befd6f20d..d05ba0b89 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -1,4 +1,5 @@ #include "global.h" +#include "metatile_behavior.h" #include "metatile_behaviors.h" #define TILE_ATTRIBUTES(three, two, one) (((one) ? 1 : 0) | ((two) ? 2 : 0) | ((three) ? 4 : 0)) @@ -247,8 +248,6 @@ static const u8 sTileBitAttributes[] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE) }; -bool8 MetatileBehavior_IsWaterfall(u8); - // only used as default case for checking jump landing in field_ground_effect. bool8 MetatileBehavior_IsATile(u8 var) { |