diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-26 13:58:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 13:58:26 -0500 |
| commit | e3ffb019126c1174afbd0009d7fe687f527aafc4 (patch) | |
| tree | 0db2873d83bc80e0fe7d7d45494f14b71d7ca32d /include/event_object_movement.h | |
| parent | ad4f363a582651657a6c27e989ce9e48dc48ea9a (diff) | |
| parent | 13f14218e139f4a552dd88dc1049e958005597d9 (diff) | |
Merge branch 'master' into doc-oneisland
Diffstat (limited to 'include/event_object_movement.h')
| -rw-r--r-- | include/event_object_movement.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index b713dbd7d..baf66d737 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -117,6 +117,8 @@ bool32 RfuUnionObjectIsInvisible(u8 objectEventId); void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); bool32 RfuUnionObjectIsWarping(u8 objectEventId); +void sub_805F378(s16 x, s16 y); + // Exported data declarations extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; @@ -124,5 +126,7 @@ extern const struct SpritePalette gUnknown_83A5348; extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; extern const struct OamData gObjectEventBaseOam_32x32; extern const struct UCoords16 gUnknown_83A64C8[]; +extern const u16 gUnknown_8398648[]; +extern const u16 gUnknown_8398688[]; #endif // GUARD_EVENT_OBJECT_MOVEMENT_H |