summaryrefslogtreecommitdiff
path: root/include/field_map_obj.h
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-06-29 17:17:35 -0400
committerscnorton <scnorton@biociphers.org>2017-06-29 17:17:35 -0400
commita62fbd6ec1d34ccba25e117e0db60fd4100bfd8d (patch)
treed28f0320009ff4cf4955e84b4555519a1ab55b69 /include/field_map_obj.h
parentb73b15dc9c10ace5145e3d4b339ca833413a1522 (diff)
parent8d82578d3a101b06f9d2ced31738021007c4e533 (diff)
Merge branch 'master' into pokeblock
Diffstat (limited to 'include/field_map_obj.h')
-rwxr-xr-xinclude/field_map_obj.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index d051ea097..6595a51ca 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -426,5 +426,8 @@ u8 sub_8060B38(u8);
u8 sub_8060B64(u8);
u8 GetOppositeDirection(u8);
void sub_80634D0(struct MapObject *, struct Sprite *);
+u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
+void CameraObjectSetFollowedObjectId(u8);
+u8 sub_805ADDC(u8);
#endif // GUARD_FIELD_MAP_OBJ_H