diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
| commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /src/fldeff_decoration.c | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
| parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) | |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'src/fldeff_decoration.c')
| -rw-r--r-- | src/fldeff_decoration.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c index 8295a2fe0..ea0eb96c5 100644 --- a/src/fldeff_decoration.c +++ b/src/fldeff_decoration.c @@ -164,7 +164,7 @@ static void sub_80C6A14(u8 taskId) void sub_80C6A54(s16 x, s16 y) { - u8 dir = player_get_direction_lower_nybble(); + u8 dir = GetPlayerFacingDirection(); if (dir == DIR_SOUTH) { sub_80C69C4(x, y); @@ -236,8 +236,8 @@ void SpriteCB_YellowCave4Sparkle(struct Sprite *sprite) void DoYellowCave4Sparkle(void) { - s16 x = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.x; - s16 y = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.y; + s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; + s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; u8 spriteId; sub_8060470(&x, &y, 8, 4); @@ -261,7 +261,7 @@ bool8 FldEff_SandPillar(void) gFieldEffectArguments[5] = x; gFieldEffectArguments[6] = y; - switch (player_get_direction_lower_nybble()) + switch (GetPlayerFacingDirection()) { case DIR_SOUTH: CreateSprite( |