diff options
| author | garak <garakmon@gmail.com> | 2019-12-17 18:49:34 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 18:49:34 -0500 |
| commit | ddaa88390e53665c6ac73af5e1a2f519dbddb5c6 (patch) | |
| tree | 858be7225887b625817074966666d467ef5f716b /include | |
| parent | 47d9fbef9339004364d65861ac661c1bd20419c8 (diff) | |
eventobject -> objectevent take 3
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_80688E4.h | 2 | ||||
| -rw-r--r-- | include/event_object_movement.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/event_object_80688E4.h b/include/event_object_80688E4.h index 7132d2aa8..6c450358d 100644 --- a/include/event_object_80688E4.h +++ b/include/event_object_80688E4.h @@ -3,7 +3,7 @@ #include "global.h" -void FreezeEventObjects(void); +void FreezeObjectEvents(void); void FreezeObjectEvent(struct ObjectEvent *); void FreezeObjectEventsExceptOne(u8 objEventId); diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 38e7dc42b..5eda0be21 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -46,7 +46,7 @@ void ObjectEventClearAnim(struct ObjectEvent *); void ObjectEventClearAnimIfSpecialAnimActive(struct ObjectEvent *); void SpawnObjectEventsInView(s16, s16); u8 sprite_new(u8, u8, s16, s16, u8, u8); -u8 AddPseudoEventObject(u16, SpriteCallback, s16, s16, u8); +u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8); u8 show_sprite(u8, u8, u8); u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8); u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); @@ -88,7 +88,7 @@ void sub_805FE7C(struct ObjectEvent *, u8); void SetTrainerMovementType(struct ObjectEvent *, u8); u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); -void EventObjectSetGraphicsId(struct ObjectEvent *mapObject, u8 a1); +void ObjectEventSetGraphicsId(struct ObjectEvent *mapObject, u8 a1); u8 sub_805EB44(u8, u8, s16, s16); void npc_paltag_set_load(u8 mode); bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *mapObject); |