diff options
author | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
---|---|---|
committer | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
commit | ffeca135bcaa449267bc7540f25eeb02cf4c92fa (patch) | |
tree | 4d9ca1668dc8b49a739c3bb8f83b453f20e2e41d /include/field_map_obj.h | |
parent | a200d9406b15f722b34775050f6fe73894d23629 (diff) | |
parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'include/field_map_obj.h')
-rw-r--r-- | include/field_map_obj.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 198dd9759..8b7e296dd 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -25,6 +25,7 @@ enum SpinnerRunnerFollowPatterns { // Exported ROM declarations void sub_808D438(void); +u8 get_go_image_anim_num(u8); u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); u8 GetFieldObjectIdByXY(s16, s16); @@ -88,6 +89,8 @@ bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *ma u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject); void sub_808F23C(const struct MapObject *mapObject, u8 movementType); void sub_808F208(const struct MapObject *mapObject); +void npc_coords_shift_still(struct MapObject *pObject); +void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); // Exported data declarations |