summaryrefslogtreecommitdiff
path: root/include/field_map_obj.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-23 13:33:32 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-23 13:33:32 +0200
commit7d1373e3fa239d74d69b5b3a7cb78b2272a6f54d (patch)
treebab4346193d7e3f2e99139f7c4371a825d94589a /include/field_map_obj.h
parent918625196ed5e91999f1a244a8881fb9f8069c64 (diff)
parent88230e8d16dad1b08027a8c933d2d9a6ce689bd0 (diff)
Merge branch 'master' into decompile_battle_controllers
Diffstat (limited to 'include/field_map_obj.h')
-rwxr-xr-xinclude/field_map_obj.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index b18b6cfd3..038233fe6 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -74,6 +74,7 @@ u8 npc_block_way(struct MapObject *, s16, s16, u32);
void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
+u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
// Exported data declarations