summaryrefslogtreecommitdiff
path: root/src/battle/anim/slice.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/battle/anim/slice.c
parent01e4381ab71c4ebf49fd66d88bfc2833ba1bffc5 (diff)
Match sub_806CF04
Diffstat (limited to 'src/battle/anim/slice.c')
-rw-r--r--src/battle/anim/slice.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c
index 7abb2cdcf..821a1c37e 100644
--- a/src/battle/anim/slice.c
+++ b/src/battle/anim/slice.c
@@ -55,23 +55,23 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6B40 =
// arg 2: slice direction; 0 = right-to-left, 1 = left-to-right
void AnimCuttingSlice(struct Sprite* sprite)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
if (GetBattlerSide(gBattleAnimTarget) == 0)
- sprite->pos1.y += 8;
+ sprite->y += 8;
sprite->callback = AnimSliceStep;
if (gBattleAnimArgs[2] == 0)
{
- sprite->pos1.x += gBattleAnimArgs[0];
+ sprite->x += gBattleAnimArgs[0];
}
else
{
- sprite->pos1.x -= gBattleAnimArgs[0];
+ sprite->x -= gBattleAnimArgs[0];
sprite->hFlip = 1;
}
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->y += gBattleAnimArgs[1];
sprite->data[1] -= 0x400;
sprite->data[2] += 0x400;
sprite->data[5] = gBattleAnimArgs[2];
@@ -105,23 +105,23 @@ void sub_80CC9BC(struct Sprite* sprite)
break;
}
- sprite->pos1.x = a;
- sprite->pos1.y = b;
+ sprite->x = a;
+ sprite->y = b;
if (GetBattlerSide(gBattleAnimTarget) == 0)
- sprite->pos1.y += 8;
+ sprite->y += 8;
sprite->callback = AnimSliceStep;
if (gBattleAnimArgs[2] == 0)
{
- sprite->pos1.x += gBattleAnimArgs[0];
+ sprite->x += gBattleAnimArgs[0];
}
else
{
- sprite->pos1.x -= gBattleAnimArgs[0];
+ sprite->x -= gBattleAnimArgs[0];
sprite->hFlip = 1;
}
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->y += gBattleAnimArgs[1];
sprite->data[1] -= 0x400;
sprite->data[2] += 0x400;
sprite->data[5] = gBattleAnimArgs[2];
@@ -139,8 +139,8 @@ static void AnimSliceStep(struct Sprite* sprite)
sprite->data[1] -= 0x18;
sprite->data[2] -= 0x18;
- sprite->pos2.x = sprite->data[3] >> 8;
- sprite->pos2.y = sprite->data[4] >> 8;
+ sprite->x2 = sprite->data[3] >> 8;
+ sprite->y2 = sprite->data[4] >> 8;
sprite->data[0]++;
if (sprite->data[0] == 20)
{