diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
commit | 31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch) | |
tree | 831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /include/event_object_movement.h | |
parent | 2e789dbbdc18f56cba62aef51156d44136b20632 (diff) | |
parent | 8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff) |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'include/event_object_movement.h')
-rw-r--r-- | include/event_object_movement.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 284bbe8db..63ac09f2d 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -193,6 +193,9 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); s16 sub_809773C(s16 a1); s16 sub_8097728(s16 a1); void CameraObjectReset2(void); +u8 EventObjectGetBerryTreeId(u8 eventObjectId); +void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); +bool8 IsBerryTreeSparkling(u8, u8, u8); void MovementType_None(struct Sprite *); void MovementType_LookAround(struct Sprite *); |