summaryrefslogtreecommitdiff
path: root/include/field_map_obj.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-05-11 09:25:26 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-05-11 09:25:26 -0400
commit4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch)
treed9c5a70fd1c4f42dc29f43becd142cc89456f19d /include/field_map_obj.h
parentc15b50ac686632130512de37d01037bff6e10cd2 (diff)
parent3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff)
Merge branch 'master' into contest
Diffstat (limited to 'include/field_map_obj.h')
-rw-r--r--include/field_map_obj.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 8f34d4b93..1bf3915e1 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -93,6 +93,8 @@ void npc_coords_shift_still(struct MapObject *pObject);
void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
u8 AddCameraObject(u8 linkedSpriteId);
void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y);
+u8 GetSimpleGoAnimId(u32);
+u8 sub_8093514(u32);
// Exported data declarations