Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-10-25 09:22:50 +08:00
commit 2f87855072
136 files changed
+3963 -6605

No files matched your search

+1 -1
View File
@@ -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