dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename EventObj to ObjEvent

Browse Source
This commit is contained in:
GriffinR
2019-11-21 00:14:40 -05:00
parent 98b81722e7
commit 7034f59c14
19 changed files with 230 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fldeff_misc.c
View File

@@ -1229,27 +1229,27 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId)
static void Task_WateringBerryTreeAnim_1(u8 taskId)
{
struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (!ObjectEventIsMovementOverridden(playerEventObj)
|| ObjectEventClearHeldMovementIfFinished(playerEventObj))
if (!ObjectEventIsMovementOverridden(playerObjEvent)
|| ObjectEventClearHeldMovementIfFinished(playerObjEvent))
{
sub_808C228(GetPlayerFacingDirection());
ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
gTasks[taskId].func = Task_WateringBerryTreeAnim_2;
}
}
static void Task_WateringBerryTreeAnim_2(u8 taskId)
{
struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId];
struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
if (ObjectEventClearHeldMovementIfFinished(playerEventObj))
if (ObjectEventClearHeldMovementIfFinished(playerObjEvent))
{
s16 value = gTasks[taskId].data[1]++;
if (value < 10)
ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
else
gTasks[taskId].func = Task_WateringBerryTreeAnim_3;