diff options
| author | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
| commit | 4744a7d96ec21fc9480165061990ba98a774a469 (patch) | |
| tree | 0c24d7e392d5cc4302e6ed6381b2a2dc047a2b3a /include/field_map_obj.h | |
| parent | 284bbf91af43b0c9928865894cbc1d3001e57c16 (diff) | |
| parent | fecda40501d39c633435fe2777ebc93d92233ca1 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/field_map_obj.h')
| -rw-r--r-- | include/field_map_obj.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 304dcb825..ded970a83 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_MAP_OBJ_H #define GUARD_FIELD_MAP_OBJ_H +#include "global.h" + #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 @@ -76,9 +78,14 @@ void MoveCoords(u8, s16 *, s16 *); bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); +void sub_8063E28(struct MapObject *, struct Sprite *); +void sub_8063CA4(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); +u8 sub_80634F0(u8 direction); +u8 sub_8063500(u8 a0); +void sub_805F060(struct MapObject *mapObject, u8 a1); // Exported data declarations |