diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 11:37:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 11:37:18 -0600 |
| commit | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /include/event_object_movement.h | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
| parent | 1b895ff52c011d51a9516791148cd5088ba411b5 (diff) | |
Merge pull request #361 from Slawter666/synchronise
Synchronise with pokeruby
Diffstat (limited to 'include/event_object_movement.h')
| -rw-r--r-- | include/event_object_movement.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 6d38d072d..6515791c3 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -75,14 +75,14 @@ struct PairedPalettes struct LockedAnimEventObjects { - u8 eventObjectIds[NUM_EVENT_OBJECTS]; + u8 eventObjectIds[EVENT_OBJECTS_COUNT]; u8 count; }; extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; extern const u8 gReflectionEffectPaletteMap[]; -void sub_808D438(void); +void ResetEventObjects(void); u8 GetMoveDirectionAnimNum(u8); u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); @@ -180,9 +180,7 @@ u8 ZCoordToPriority(u8); void EventObjectUpdateZCoord(struct EventObject *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); -void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); void UnfreezeEventObject(struct EventObject *); -void oamt_npc_ministep_reset(struct Sprite *, u8, u8); u8 FindLockedEventObjectIndex(struct EventObject *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); |