summaryrefslogtreecommitdiff
path: root/src/psychic.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/psychic.c')
-rw-r--r--src/psychic.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/src/psychic.c b/src/psychic.c
index 9a072ad5c..bd1427e83 100644
--- a/src/psychic.c
+++ b/src/psychic.c
@@ -440,24 +440,24 @@ static void AnimDefensiveWall(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{
- sprite->pos1.x = 72;
- sprite->pos1.y = 80;
+ sprite->x = 72;
+ sprite->y = 80;
}
else
{
- sprite->pos1.x = 176;
- sprite->pos1.y = 40;
+ sprite->x = 176;
+ sprite->y = 40;
}
}
else
{
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0];
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1];
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0];
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1];
}
if (IsContest())
- sprite->pos1.y += 9;
+ sprite->y += 9;
sprite->data[0] = 256 + IndexOfSpritePaletteTag(gBattleAnimArgs[2]) * 16;
sprite->callback = sub_80B300C;
sub_80B300C(sprite);
@@ -543,13 +543,13 @@ static void AnimWallSparkle(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{
- sprite->pos1.x = 72 - gBattleAnimArgs[0];
- sprite->pos1.y = gBattleAnimArgs[1] + 80;
+ sprite->x = 72 - gBattleAnimArgs[0];
+ sprite->y = gBattleAnimArgs[1] + 80;
}
else
{
- sprite->pos1.x = gBattleAnimArgs[0] + 176;
- sprite->pos1.y = gBattleAnimArgs[1] + 40;
+ sprite->x = gBattleAnimArgs[0] + 176;
+ sprite->y = gBattleAnimArgs[1] + 40;
}
}
else
@@ -570,19 +570,19 @@ static void AnimWallSparkle(struct Sprite *sprite)
static void AnimBentSpoon(struct Sprite *sprite)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
StartSpriteAnim(sprite, 1);
- sprite->pos1.x -= 40;
- sprite->pos1.y += 10;
+ sprite->x -= 40;
+ sprite->y += 10;
sprite->data[1] = -1;
}
else
{
- sprite->pos1.x += 40;
- sprite->pos1.y -= 10;
+ sprite->x += 40;
+ sprite->y -= 10;
sprite->data[1] = 1;
}
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -596,10 +596,10 @@ static void AnimQuestionMark(struct Sprite *sprite)
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
x = -x;
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x;
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y;
- if (sprite->pos1.y < 16)
- sprite->pos1.y = 16;
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x;
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y;
+ if (sprite->y < 16)
+ sprite->y = 16;
StoreSpriteCallbackInData6(sprite, sub_80B3384);
sprite->callback = RunStoredCallbackWhenAnimEnds;
}
@@ -676,13 +676,13 @@ static void sub_80B34DC(u8 taskId)
case 1:
if (task->data[3] != 0)
{
- gSprites[task->data[0]].pos2.y -= 8;
+ gSprites[task->data[0]].y2 -= 8;
--task->data[3];
}
else
{
gSprites[task->data[0]].invisible = TRUE;
- gSprites[task->data[0]].pos1.x = 272;
+ gSprites[task->data[0]].x = 272;
ResetSpriteRotScale(task->data[0]);
DestroyAnimVisualTask(taskId);
}
@@ -726,20 +726,20 @@ static void sub_80B3618(u8 taskId)
switch (task->data[2])
{
case 0:
- gSprites[spriteId].pos2.x = task->data[12];
- gSprites[spriteId].pos2.y = -task->data[12];
+ gSprites[spriteId].x2 = task->data[12];
+ gSprites[spriteId].y2 = -task->data[12];
break;
case 1:
- gSprites[spriteId].pos2.x = -task->data[12];
- gSprites[spriteId].pos2.y = task->data[12];
+ gSprites[spriteId].x2 = -task->data[12];
+ gSprites[spriteId].y2 = task->data[12];
break;
case 2:
- gSprites[spriteId].pos2.x = task->data[12];
- gSprites[spriteId].pos2.y = task->data[12];
+ gSprites[spriteId].x2 = task->data[12];
+ gSprites[spriteId].y2 = task->data[12];
break;
case 3:
- gSprites[spriteId].pos2.x = -task->data[12];
- gSprites[spriteId].pos2.y = -task->data[12];
+ gSprites[spriteId].x2 = -task->data[12];
+ gSprites[spriteId].y2 = -task->data[12];
break;
}
}
@@ -786,8 +786,8 @@ static void AnimRedX(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
}
sprite->data[0] = gBattleAnimArgs[1];
sprite->callback = sub_80B37A4;
@@ -1039,10 +1039,10 @@ static void AnimPsychoBoost(struct Sprite *sprite)
switch (sprite->data[0])
{
case 0:
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
if (IsContest())
- sprite->pos1.y += 12;
+ sprite->y += 12;
sprite->data[1] = 8;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[1], 16 - sprite->data[1]));
@@ -1069,7 +1069,7 @@ static void AnimPsychoBoost(struct Sprite *sprite)
}
}
sprite->data[3] += 0x380;
- sprite->pos2.y -= sprite->data[3] >> 8;
+ sprite->y2 -= sprite->data[3] >> 8;
sprite->data[3] &= 0xFF;
break;
case 3:
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-30 23:49:33 +0000