diff options
author | scnorton <scnorton@biociphers.org> | 2017-05-23 10:16:08 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-05-24 16:15:12 -0400 |
commit | 48a3b78f82095fb2bd77db7c1c296158deacd76e (patch) | |
tree | 618b9d5e42587620ff1975e585166cb492ee2b13 /include | |
parent | 9c3a25305cfa90021caae4f3a64e5de5ebc6cd45 (diff) |
IsMetatileDirectionallyImpassable, CheckForCollisionBetweenFieldObjects
Diffstat (limited to 'include')
-rw-r--r-- | include/field_ground_effect.h | 1 | ||||
-rwxr-xr-x | include/field_map_obj.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h index 590923041..8a69426b3 100644 --- a/include/field_ground_effect.h +++ b/include/field_ground_effect.h @@ -6,5 +6,6 @@ #define POKERUBY_FIELD_GROUND_EFFECT_H bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y); +bool8 AreZCoordsCompatible(u8 z1, u8 z2); #endif //POKERUBY_FIELD_GROUND_EFFECT_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 559183cd3..80add1403 100755 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -35,6 +35,8 @@ void npc_reset(struct MapObject *mapObject, struct Sprite *sprite); extern const u8 gUnknown_08375240[4]; extern u8 (*const gUnknown_08375244[])(s16 a0, s16 a1, s16 a2, s16 a3); +extern bool8 (*const gUnknown_08375684[4])(u8); +extern bool8 (*const gUnknown_08375694[4])(u8); extern const u8 gUnknown_083752A0[2]; extern const u8 gUnknown_083752C0[2]; |