summaryrefslogtreecommitdiff
path: root/include/field_map_obj.h
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-10-25 09:22:50 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-10-25 09:22:50 +0800
commit2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch)
treea3a6d928910ed170904b5b367084afb2d1fb8b3d /include/field_map_obj.h
parent6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff)
parent7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff)
Merge branch 'master' into battle
Diffstat (limited to 'include/field_map_obj.h')
-rw-r--r--include/field_map_obj.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 2628f5ca5..6177cba1c 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -95,7 +95,7 @@ bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject);
u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject);
u8 sub_8063F84(u8 direction);
u8 GetTrainerFacingDirectionMovementType(u8 direction);
-
+void CameraObjectSetFollowedObjectId(u8 spriteId);
// Exported data declarations