diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-14 18:37:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 18:37:11 -0500 |
| commit | 7f211b258846647b0ea3e67b36c9b0328cc378e6 (patch) | |
| tree | 3b863cece823ecb889dae4983b9f45e31b3a134f /include/event_object_movement.h | |
| parent | eafea33dd99c026c78e1d78d9c09fb3e759dc72a (diff) | |
| parent | 137f6549fffe9960b91ea8727ce92d3f3049f0fb (diff) | |
Merge pull request #359 from Slawter666/label_field_effect_helpers
Label field_effect_helpers.c
Diffstat (limited to 'include/event_object_movement.h')
| -rw-r--r-- | include/event_object_movement.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 80b9f3fc0..ddccfe39b 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -102,17 +102,17 @@ void sub_80930E0(s16 *, s16 *, s16, s16); void EventObjectClearHeldMovement(struct EventObject *); void EventObjectClearHeldMovementIfActive(struct EventObject *); void TrySpawnEventObjects(s16, s16); -u8 sprite_new(u8, u8, s16, s16, u8, u8); -u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8); +u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction); +u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); u8 show_sprite(u8, u8, u8); -u8 SpawnSpecialEventObjectParameterized(u8, u8, u8, s16, s16, u8); +u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); u8 SpawnSpecialEventObject(struct EventObjectTemplate *); void sub_8093038(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); -void EventObjectSetGraphicsId(struct EventObject *, u8); +void EventObjectSetGraphicsId(struct EventObject *, u8 graphicsId); void EventObjectTurn(struct EventObject *, u8); void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8); +const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void FreeAndReserveObjectSpritePalettes(void); void sub_808E82C(u8, u8, u8, s16, s16); |