diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-26 06:45:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 06:45:00 -0400 |
| commit | eafb77fbb912d22294f168c1e6e89575b35f0d6c (patch) | |
| tree | 286f735ca16bd576926197f4f6a80ab6f0c24dc4 /include/field_map_obj.h | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
| parent | 0ae4d58e985dcc3d265ea30505f439c34eab21ab (diff) | |
Merge pull request #125 from jiangzhengwenjz/battle
battle (3rd take)
Diffstat (limited to 'include/field_map_obj.h')
| -rw-r--r-- | include/field_map_obj.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 40d7ed933..6177cba1c 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -85,7 +85,7 @@ void sub_8063E28(struct MapObject *, struct Sprite *); void FieldObjectSetHeldMovement(struct MapObject *, u8); void npc_coords_shift_still(struct MapObject *); void sub_805FE7C(struct MapObject *, u8); -void npc_set_running_behaviour_etc(struct MapObject *, u8); +void SetTrainerMovementType(struct MapObject *, u8); u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1); @@ -94,6 +94,7 @@ void npc_paltag_set_load(u8 mode); 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 |