diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-03 10:08:43 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-03 10:08:43 -0500 |
| commit | 2b5b95693613c92a89917ae2fbeffa44554ae1f0 (patch) | |
| tree | a7172e2cdaf509100df3a6fe106b0b58e62388ba /include/event_object_movement.h | |
| parent | c901040ac260b94a6f55a1dc69707b6669828d0a (diff) | |
| parent | 98a79fd72fe681c9d9d227bdc52e63db301a56d9 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into add_arm_agbcc
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 |