Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted function names to align with pret

Browse Source
This commit is contained in:
Eduardo Quezada 2024-05-28 17:25:18 -04:00
parent 6d5cd7cbd7
commit 2f4077ba5d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/event_object_movement.c
View File

@ -2693,7 +2693,7 @@ void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction)
ObjectEventTurn(&gObjectEvents[playerAvatar->objectEventId], direction);
}
static void SetBerryTreeGraphics(struct ObjectEvent *objectEvent, u8 berryId, u8 berryStage)
static void SetBerryTreeGraphicsById(struct ObjectEvent *objectEvent, u8 berryId, u8 berryStage)
{
const u16 graphicsId = gBerryTreeObjectEventGraphicsIdTable[berryStage];
const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId);
@ -2715,7 +2715,7 @@ static void SetBerryTreeGraphics(struct ObjectEvent *objectEvent, u8 berryId, u8
CameraObjectReset();
}
static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Sprite *sprite)
static void SetBerryTreeGraphics(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
u8 berryStage;
u8 berryId;
@ -2732,7 +2732,7 @@ static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Spri
if (berryId > ITEM_TO_BERRY(LAST_BERRY_INDEX))
berryId = 0;
SetBerryTreeGraphics(objectEvent, berryId, berryStage);
SetBerryTreeGraphicsById(objectEvent, berryId, berryStage);
StartSpriteAnim(sprite, berryStage);
}
}
@ -3923,7 +3923,7 @@ void MovementType_BerryTreeGrowth(struct Sprite *sprite)
objectEvent = &gObjectEvents[sprite->sObjEventId];
if (!(sprite->sBerryTreeFlags & BERRY_FLAG_SET_GFX))
{
get_berry_tree_graphics(objectEvent, sprite);
SetBerryTreeGraphics(objectEvent, sprite);
sprite->sBerryTreeFlags |= BERRY_FLAG_SET_GFX;
}
UpdateObjectEventCurrentMovement(objectEvent, sprite, ObjectEventCB2_BerryTree);
@ -3962,7 +3962,7 @@ bool8 MovementType_BerryTreeGrowth_Normal(struct ObjectEvent *objectEvent, struc
sprite->sTypeFuncId = BERRYTREEFUNC_SPARKLE_START;
return TRUE;
}
get_berry_tree_graphics(objectEvent, sprite);
SetBerryTreeGraphics(objectEvent, sprite);
ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
sprite->sTypeFuncId = BERRYTREEFUNC_MOVE;
return TRUE;
@ -4002,7 +4002,7 @@ bool8 MovementType_BerryTreeGrowth_Sparkle(struct ObjectEvent *objectEvent, stru
sprite->animPaused = TRUE;
if (sprite->sTimer > 64)
{
get_berry_tree_graphics(objectEvent, sprite);
SetBerryTreeGraphics(objectEvent, sprite);
sprite->sTypeFuncId = BERRYTREEFUNC_SPARKLE_END;
sprite->sTimer = 0;
return TRUE;