summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-06-21 09:56:37 -0400
committerscnorton <scnorton@biociphers.org>2017-06-21 09:56:37 -0400
commit6343bdcf312b785215f618358d84f46205018228 (patch)
treebd4d87e089ea21f1c00114ffc56bd01aa6674e82
parent4a1f57f17afcc8005863571119d5f5dc14183183 (diff)
Fix conflicting type declaration
-rwxr-xr-xinclude/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 2d62af202..28be5a640 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -199,6 +199,6 @@ u8 GetOppositeDirection(u8);
void sub_80634D0(struct MapObject *, struct Sprite *);
u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
void CameraObjectSetFollowedObjectId(u8);
-void sub_805ADDC(u8);
+u8 sub_805ADDC(u8);
#endif // GUARD_FIELD_MAP_OBJ_H