summaryrefslogtreecommitdiff
path: root/src/field_player_avatar.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-28 15:54:22 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-28 15:54:22 -0400
commit27c5faf8e0e8a0f685ed61847a30eaf51b90c497 (patch)
tree8d0c2c64dd5eed7f9f30db1a190236ca9b2f8fa5 /src/field_player_avatar.c
parent01e4381ab71c4ebf49fd66d88bfc2833ba1bffc5 (diff)
Match sub_806CF04
Diffstat (limited to 'src/field_player_avatar.c')
-rw-r--r--src/field_player_avatar.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index c0c4aad5d..d30717d65 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1703,8 +1703,8 @@ static bool8 Fishing11(struct Task *task)
ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
- gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
- gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+ gSprites[gPlayerAvatar.spriteId].x2 = 0;
+ gSprites[gPlayerAvatar.spriteId].y2 = 0;
Menu_EraseScreen();
task->tFrameCounter++;
return FALSE;
@@ -1762,8 +1762,8 @@ static bool8 Fishing15(struct Task *task)
ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0);
- gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
- gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+ gSprites[gPlayerAvatar.spriteId].x2 = 0;
+ gSprites[gPlayerAvatar.spriteId].y2 = 0;
task->tStep++;
}
return FALSE;
@@ -1794,8 +1794,8 @@ static void AlignFishingAnimationFrames(void)
u8 animType;
AnimateSprite(playerSprite);
- playerSprite->pos2.x = 0;
- playerSprite->pos2.y = 0;
+ playerSprite->x2 = 0;
+ playerSprite->y2 = 0;
animCmdIndex = playerSprite->animCmdIndex;
if (playerSprite->anims[playerSprite->animNum][animCmdIndex].type == -1)
{
@@ -1810,16 +1810,16 @@ static void AlignFishingAnimationFrames(void)
animType = playerSprite->anims[playerSprite->animNum][animCmdIndex].type;
if (animType == 1 || animType == 2 || animType == 3)
{
- playerSprite->pos2.x = 8;
+ playerSprite->x2 = 8;
if (GetPlayerFacingDirection() == 3)
- playerSprite->pos2.x = -8;
+ playerSprite->x2 = -8;
}
if (animType == 5)
- playerSprite->pos2.y = -8;
+ playerSprite->y2 = -8;
if (animType == 10 || animType == 11)
- playerSprite->pos2.y = 8;
+ playerSprite->y2 = 8;
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
- sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
+ sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->y2);
}
#if DEBUG