From 13c5f15e56badc35c9272877c1d7706ef88a100c Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 26 Jan 2021 12:29:08 -0700 Subject: [PATCH] cherry pick 53731a7fc7579e61d5ee7d32d0e06f1cbe5a085d --- include/event_object_movement.h | 11 ++++++----- src/event_object_movement.c | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 61e7c5d6c..e9b00d121 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -427,11 +427,12 @@ u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); -void SetObjectEventSpriteInvisibility(u8 objectEventId, bool32 invisible); -bool32 IsObjectEventSpriteInvisible(u8 objectEventId); -void SetObjectEventSpriteGraphics(u8 objectEventId, u8 graphicsId); -void SetObjectEventSpriteAnim(u8 objectEventId, u8 animNum); -bool32 IsObjectEventSpriteAnimating(u8 objectEventId); +void SetObjectEventSpriteInvisibility(u8 var, bool32 var2); +bool32 IsObjectEventSpriteInvisible(u8 var); +void SetObjectEventSpriteGraphics(u8 var1, u8 graphicsId); +void SetObjectEventSpriteAnim(u8 var1, u8 var2); +bool32 IsObjectEventSpriteAnimating(u8 var); +u8 GetObjectEventIdByLocalId(u8 localId); // NEW u16 GetMiniStepCount(u8 speed); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 88b269da6..4cc404d35 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -103,7 +103,6 @@ static void ApplyLevitateMovement(u8); static bool8 MovementType_Disguise_Callback(struct ObjectEvent *, struct Sprite *); static bool8 MovementType_Buried_Callback(struct ObjectEvent *, struct Sprite *); static void CreateReflectionEffectSprites(void); -static u8 GetObjectEventIdByLocalId(u8); static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8); static bool8 GetAvailableObjectEventId(u16, u8, u8, u8 *); static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *); @@ -1270,7 +1269,7 @@ static u8 GetObjectEventIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapG return OBJECT_EVENTS_COUNT; } -static u8 GetObjectEventIdByLocalId(u8 localId) +u8 GetObjectEventIdByLocalId(u8 localId) { u8 i; for (i = 0; i < OBJECT_EVENTS_COUNT; i++)