summaryrefslogtreecommitdiff
path: root/src/battle/anim/fight.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/fight.c')
-rw-r--r--src/battle/anim/fight.c120
1 files changed, 60 insertions, 60 deletions
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 450844453..d8b16f14d 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -436,7 +436,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA214 =
void sub_080B08A0(struct Sprite *sprite)
{
sub_807867C(sprite, gBattleAnimArgs[0]);
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->y += gBattleAnimArgs[1];
sprite->data[0] = 15;
sprite->callback = WaitAnimForDuration;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -502,8 +502,8 @@ void sub_80D90F4(struct Sprite *sprite)
gBattleAnimArgs[2] = Random() % 5;
StartSpriteAnim(sprite, gBattleAnimArgs[2]);
- sprite->pos1.x = GetBattlerSpriteCoord(bank, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(bank, 3);
+ sprite->x = GetBattlerSpriteCoord(bank, 2);
+ sprite->y = GetBattlerSpriteCoord(bank, 3);
xMod = GetBattlerSpriteCoordAttr(bank, 1) / 2;
yMod = GetBattlerSpriteCoordAttr(bank, 0) / 4;
@@ -519,11 +519,11 @@ void sub_80D90F4(struct Sprite *sprite)
if ((gBattlerPositions[bank] & 1) == 0)
y += 0xFFF0;
- sprite->pos1.x += x;
- sprite->pos1.y += y;
+ sprite->x += x;
+ sprite->y += y;
sprite->data[0] = gBattleAnimArgs[1];
- sprite->data[7] = CreateSprite(&gBasicHitSplatSpriteTemplate, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1);
+ sprite->data[7] = CreateSprite(&gBasicHitSplatSpriteTemplate, sprite->x, sprite->y, sprite->subpriority + 1);
if (sprite->data[7] != 64)
{
StartSpriteAffineAnim(&gSprites[sprite->data[7]], 0);
@@ -558,15 +558,15 @@ void sub_80D92D0(struct Sprite *sprite)
if (gBattleAnimArgs[2] == 0)
{
- sprite->data[2] = sprite->pos1.x - 20;
+ sprite->data[2] = sprite->x - 20;
}
else
{
- sprite->data[2] = sprite->pos1.x + 20;
+ sprite->data[2] = sprite->x + 20;
sprite->hFlip = 1;
}
- sprite->data[4] = sprite->pos1.y - 20;
+ sprite->data[4] = sprite->y - 20;
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData(sprite, sub_80D9328);
}
@@ -575,13 +575,13 @@ static void sub_80D9328(struct Sprite *sprite)
{
if (++sprite->data[5] == 11)
{
- sprite->data[2] = sprite->pos1.x - sprite->pos2.x;
- sprite->data[4] = sprite->pos1.y - sprite->pos2.y;
+ sprite->data[2] = sprite->x - sprite->x2;
+ sprite->data[4] = sprite->y - sprite->y2;
sprite->data[0] = 8;
- sprite->pos1.x += sprite->pos2.x;
- sprite->pos1.y += sprite->pos2.y;
- sprite->pos2.y = 0;
- sprite->pos2.x = 0;
+ sprite->x += sprite->x2;
+ sprite->y += sprite->y2;
+ sprite->y2 = 0;
+ sprite->x2 = 0;
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
@@ -599,10 +599,10 @@ void sub_80D9378(struct Sprite *sprite)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[3];
- sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
- sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = sprite->pos1.y;
+ sprite->data[1] = sprite->x;
+ sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+ sprite->data[3] = sprite->y;
+ sprite->data[4] = sprite->y;
InitAnimLinearTranslation(sprite);
@@ -617,7 +617,7 @@ static void sub_80D9404(struct Sprite *sprite)
{
if (!TranslateAnimLinear(sprite))
{
- sprite->pos2.y += Sin(sprite->data[7] >> 8, sprite->data[5]);
+ sprite->y2 += Sin(sprite->data[7] >> 8, sprite->data[5]);
sprite->data[7] += sprite->data[6];
}
else
@@ -697,8 +697,8 @@ void sub_80D9540(struct Sprite *sprite)
else
{
sprite->data[4] += sprite->data[1];
- sprite->pos2.x = sprite->data[4] >> 8;
- sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]);
+ sprite->x2 = sprite->data[4] >> 8;
+ sprite->y2 = Sin(sprite->data[3], sprite->data[2]);
sprite->data[3] = (sprite->data[3] + 3) & 0xFF;
if (sprite->data[3] > 100)
@@ -713,17 +713,17 @@ void sub_80D95D0(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
}
else
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
}
- sprite->pos1.x += gBattleAnimArgs[1];
- sprite->pos1.y += gBattleAnimArgs[2];
+ sprite->x += gBattleAnimArgs[1];
+ sprite->y += gBattleAnimArgs[2];
sprite->data[0] = 0;
sprite->data[1] = gBattleAnimArgs[3];
@@ -751,9 +751,9 @@ static void sub_80D9640(struct Sprite *sprite)
sprite->data[1] = 0;
sprite->data[3]++;
if (sprite->data[3] & 1)
- sprite->pos2.x = 2;
+ sprite->x2 = 2;
else
- sprite->pos2.x = -2;
+ sprite->x2 = -2;
}
if (--sprite->data[2] == 0)
@@ -766,13 +766,13 @@ void sub_80D96B8(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2];
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3];
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2];
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3];
}
else
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2];
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2];
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
}
sprite->oam.tileNum += gBattleAnimArgs[1] * 16;
@@ -806,8 +806,8 @@ void sub_80D96B8(struct Sprite *sprite)
static void sub_80D97A0(struct Sprite *sprite)
{
- sprite->pos1.x += sprite->data[6];
- sprite->pos1.y += sprite->data[7];
+ sprite->x += sprite->data[6];
+ sprite->y += sprite->data[7];
if (++sprite->data[0] > 40)
DestroyAnimSprite(sprite);
@@ -817,8 +817,8 @@ void sub_80D97CC(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
+ sprite->x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+ sprite->y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
sprite->data[7] = gBattleAnimTarget;
}
@@ -841,9 +841,9 @@ static void sub_80D986C(struct Sprite *sprite)
REG_BLDCNT = 0;
sprite->data[0] = 16;
- sprite->data[1] = sprite->pos1.x;
+ sprite->data[1] = sprite->x;
sprite->data[2] = GetBattlerSpriteCoord(sprite->data[7], 2);
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[3] = sprite->y;
sprite->data[4] = GetBattlerSpriteCoord(sprite->data[7], 3);
InitAnimLinearTranslation(sprite);
@@ -854,11 +854,11 @@ static void sub_80D986C(struct Sprite *sprite)
void sub_80D98D8(struct Sprite *sprite)
{
- sprite->pos1.x = gBattleAnimArgs[0];
- sprite->pos1.y = 120;
+ sprite->x = gBattleAnimArgs[0];
+ sprite->y = 120;
sprite->data[0] = gBattleAnimArgs[3];
- sub_8079BF4(&sprite->data[4], &sprite->data[5], (void *)(sprite->pos1.y << 8));
+ sub_8079BF4(&sprite->data[4], &sprite->data[5], (void *)(sprite->y << 8));
sprite->data[6] = gBattleAnimArgs[1];
sprite->oam.tileNum += gBattleAnimArgs[2] * 4;
@@ -877,8 +877,8 @@ static void sub_80D9934(struct Sprite *sprite)
sub_8079BF4(&sprite->data[4], &sprite->data[5], var0);
var0 = (void *)(((intptr_t)var0) >> 8);
- sprite->pos1.y = (intptr_t)var0;
- if (sprite->pos1.y < -8)
+ sprite->y = (intptr_t)var0;
+ if (sprite->y < -8)
DestroyAnimSprite(sprite);
else
sprite->data[0]--;
@@ -892,8 +892,8 @@ static void sub_80D9934(struct Sprite *sprite)
sprite->data[0] = pos2 - pos0;
sprite->data[1] = pos3 - pos1;
- sprite->data[2] = sprite->pos1.x << 4;
- sprite->data[3] = sprite->pos1.y << 4;
+ sprite->data[2] = sprite->x << 4;
+ sprite->data[3] = sprite->y << 4;
sprite->callback = sub_80D99F4;
}
@@ -905,11 +905,11 @@ static void sub_80D99F4(struct Sprite *sprite)
sprite->data[2] += sprite->data[0];
sprite->data[3] += sprite->data[1];
- sprite->pos1.x = sprite->data[2] >> 4;
- sprite->pos1.y = sprite->data[3] >> 4;
+ sprite->x = sprite->data[2] >> 4;
+ sprite->y = sprite->data[3] >> 4;
- edgeX = sprite->pos1.x + 8;
- if (edgeX > 256 || sprite->pos1.y < -8 || sprite->pos1.y > 120)
+ edgeX = sprite->x + 8;
+ if (edgeX > 256 || sprite->y < -8 || sprite->y > 120)
DestroyAnimSprite(sprite);
}
@@ -919,8 +919,8 @@ void sub_80D9A38(struct Sprite *sprite)
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
+ sprite->x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+ sprite->y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
bank = gBattleAnimTarget;
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
}
@@ -936,9 +936,9 @@ void sub_80D9A38(struct Sprite *sprite)
sprite->oam.matrixNum |= 0x18;
sprite->data[0] = 16;
- sprite->data[1] = sprite->pos1.x;
+ sprite->data[1] = sprite->x;
sprite->data[2] = GetBattlerSpriteCoord(bank, 2);
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[3] = sprite->y;
sprite->data[4] = GetBattlerSpriteCoord(bank, 3);
InitAnimLinearTranslation(sprite);
@@ -958,8 +958,8 @@ void sub_80D9B48(struct Sprite *sprite)
{
u8 turn;
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
sprite->data[1] = gBattleAnimArgs[3];
sprite->data[2] = gBattleAnimArgs[0];
sprite->data[3] = gBattleAnimArgs[1];
@@ -976,8 +976,8 @@ void sub_80D9B48(struct Sprite *sprite)
}
StartSpriteAnim(sprite, sprite->data[1]);
- sprite->pos2.x = sprite->data[2];
- sprite->pos2.y = sprite->data[3];
+ sprite->x2 = sprite->data[2];
+ sprite->y2 = sprite->data[3];
sprite->callback = sub_80D9B24;
}
@@ -1006,7 +1006,7 @@ void sub_80D9C40(struct Sprite *sprite)
if (sprite->affineAnimEnded)
{
sprite->data[1] = (sprite->data[1] + 40) & 0xFF;
- sprite->pos2.x = Sin(sprite->data[1], 2);
+ sprite->x2 = Sin(sprite->data[1], 2);
if (++sprite->data[0] > 40)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 20:41:16 +0000