summaryrefslogtreecommitdiff
path: root/src/fighting.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fighting.c')
-rw-r--r--src/fighting.c120
1 files changed, 60 insertions, 60 deletions
diff --git a/src/fighting.c b/src/fighting.c
index a7dd18ce8..f2c4b687e 100644
--- a/src/fighting.c
+++ b/src/fighting.c
@@ -414,7 +414,7 @@ const struct SpriteTemplate gFocusPunchFistSpriteTemplate =
static void unc_080B08A0(struct Sprite *sprite)
{
SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->y += gBattleAnimArgs[1];
sprite->data[0] = 15;
sprite->callback = WaitAnimForDuration;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -475,8 +475,8 @@ static void AnimFistOrFootRandomPos(struct Sprite *sprite)
if (gBattleAnimArgs[2] < 0)
gBattleAnimArgs[2] = Random() % 5;
StartSpriteAnim(sprite, gBattleAnimArgs[2]);
- sprite->pos1.x = GetBattlerSpriteCoord(battler, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(battler, 3);
+ sprite->x = GetBattlerSpriteCoord(battler, 2);
+ sprite->y = GetBattlerSpriteCoord(battler, 3);
xMod = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_WIDTH) / 2;
yMod = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_HEIGHT) / 4;
x = Random() % xMod;
@@ -487,10 +487,10 @@ static void AnimFistOrFootRandomPos(struct Sprite *sprite)
y *= -1;
if ((gBattlerPositions[battler] & BIT_SIDE) == B_SIDE_PLAYER)
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);
@@ -522,14 +522,14 @@ static void AnimCrossChopHand(struct Sprite *sprite)
sprite->data[0] = 30;
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;
StoreSpriteCallbackInData6(sprite, sub_80B0BD8);
}
@@ -538,13 +538,13 @@ static void sub_80B0BD8(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;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
@@ -558,10 +558,10 @@ static void AnimSlidingKick(struct Sprite *sprite)
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
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);
sprite->data[5] = gBattleAnimArgs[5];
sprite->data[6] = gBattleAnimArgs[4];
@@ -573,7 +573,7 @@ static void sub_80B0CB4(struct Sprite *sprite)
{
if (!AnimTranslateLinear(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
@@ -648,8 +648,8 @@ static void AnimDizzyPunchDuck(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)
sprite->invisible = sprite->data[3] % 2;
@@ -662,16 +662,16 @@ static void AnimBrickBreakWall(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];
sprite->data[2] = gBattleAnimArgs[4];
@@ -698,9 +698,9 @@ static void sub_80B0EF0(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)
@@ -713,13 +713,13 @@ static void AnimBrickBreakWallShard(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;
sprite->data[0] = 0;
@@ -750,8 +750,8 @@ static void AnimBrickBreakWallShard(struct Sprite *sprite)
static void sub_80B1050(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);
}
@@ -760,8 +760,8 @@ static void AnimSuperpowerOrb(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;
}
@@ -782,9 +782,9 @@ static void sub_80B111C(struct Sprite *sprite)
{
SetGpuReg(REG_OFFSET_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);
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
@@ -794,10 +794,10 @@ static void sub_80B111C(struct Sprite *sprite)
static void AnimSuperpowerRock(struct Sprite *sprite)
{
- sprite->pos1.x = gBattleAnimArgs[0];
- sprite->pos1.y = 120;
+ sprite->x = gBattleAnimArgs[0];
+ sprite->y = 120;
sprite->data[0] = gBattleAnimArgs[3];
- StorePointerInVars(&sprite->data[4], &sprite->data[5], (void *)(sprite->pos1.y << 8));
+ StorePointerInVars(&sprite->data[4], &sprite->data[5], (void *)(sprite->y << 8));
sprite->data[6] = gBattleAnimArgs[1];
sprite->oam.tileNum += gBattleAnimArgs[2] * 4;
sprite->callback = sub_80B11E4;
@@ -813,8 +813,8 @@ static void sub_80B11E4(struct Sprite *sprite)
var0 -= sprite->data[6];
StorePointerInVars(&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];
@@ -828,8 +828,8 @@ static void sub_80B11E4(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_80B12A4;
}
}
@@ -840,10 +840,10 @@ static void sub_80B12A4(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;
- edgeX = sprite->pos1.x + 8;
- if (edgeX > 256 || sprite->pos1.y < -8 || sprite->pos1.y > 120)
+ sprite->x = sprite->data[2] >> 4;
+ sprite->y = sprite->data[3] >> 4;
+ edgeX = sprite->x + 8;
+ if (edgeX > 256 || sprite->y < -8 || sprite->y > 120)
DestroyAnimSprite(sprite);
}
@@ -853,8 +853,8 @@ static void AnimSuperpowerFireball(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);
battler = gBattleAnimTarget;
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
}
@@ -868,9 +868,9 @@ static void AnimSuperpowerFireball(struct Sprite *sprite)
else if (GetBattlerSide(battler) == B_SIDE_PLAYER)
sprite->oam.matrixNum |= (ST_OAM_HFLIP | ST_OAM_VFLIP);
sprite->data[0] = 16;
- sprite->data[1] = sprite->pos1.x;
+ sprite->data[1] = sprite->x;
sprite->data[2] = GetBattlerSpriteCoord(battler, 2);
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[3] = sprite->y;
sprite->data[4] = GetBattlerSpriteCoord(battler, 3);
InitAnimLinearTranslation(sprite);
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -888,8 +888,8 @@ static void AnimArmThrustHit(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];
@@ -903,8 +903,8 @@ static void AnimArmThrustHit(struct Sprite *sprite)
++sprite->data[1];
}
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_80B13D4;
}
@@ -927,7 +927,7 @@ static void AnimFocusPunchFist(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)
DestroyAnimSprite(sprite);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 08:18:16 +0000