diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 11:00:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:00:32 -0400 |
| commit | 33b65b547000387fcdce9fe497da9b217544ece6 (patch) | |
| tree | 0c1754c67d188776ee1942fcca503ad8e1e19f05 /include/event_object_movement.h | |
| parent | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff) | |
| parent | a8403c07790b1031c96ff35a1701e1684919ed95 (diff) | |
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'include/event_object_movement.h')
| -rw-r--r-- | include/event_object_movement.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index ac102d9a9..e01364e55 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -63,7 +63,8 @@ bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); u8 GetObjectEventIdByXY(s16, s16); void SetObjectEventDirection(struct ObjectEvent *, u8); u8 sub_808D4F4(void); -void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); +void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup); +u16 sub_805FCD8(u8 localId, u8 mapNum, u8 mapGroup); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); |