diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:13:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 11:13:58 -0500 |
| commit | 1d006c26616889c7f53ba418c34d0cb151d5ba86 (patch) | |
| tree | c5a81e833e822125212ae676fbd0cfae4bd1daae /include/event_object_movement.h | |
| parent | 4ab216f309fe2db2cd2abfa775fa235f59178791 (diff) | |
| parent | 04130a97d9ff799c9f1b439d091c0116adb31bfb (diff) | |
Merge branch 'master' into doc-tilesets
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 f2e7bd325..650f137d9 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -97,7 +97,7 @@ u8 sub_8063F84(u8 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); void CameraObjectSetFollowedObjectId(u8 spriteId); void UnfreezeObjectEvents(void); -void sub_8069058(u8, u8); +void TurnObjectEvent(u8, u8); // Exported data declarations @@ -105,5 +105,6 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const struct SpritePalette gUnknown_83A5348; extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; extern const struct OamData gObjectEventBaseOam_32x32; +extern const struct UCoords16 gUnknown_83A64C8[]; #endif // GUARD_EVENT_OBJECT_MOVEMENT_H |