summaryrefslogtreecommitdiff
path: root/src/battle_interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_interface.c')
-rw-r--r--src/battle_interface.c80
1 files changed, 40 insertions, 40 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c
index cd4445fad..14ebae8b3 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -610,32 +610,32 @@ static void SpriteCB_HealthBar(struct Sprite *sprite)
switch (sprite->data[6])
{
case 0:
- sprite->pos1.x = gSprites[r5].pos1.x + 16;
- sprite->pos1.y = gSprites[r5].pos1.y;
+ sprite->x = gSprites[r5].x + 16;
+ sprite->y = gSprites[r5].y;
break;
case 1:
- sprite->pos1.x = gSprites[r5].pos1.x + 16;
- sprite->pos1.y = gSprites[r5].pos1.y;
+ sprite->x = gSprites[r5].x + 16;
+ sprite->y = gSprites[r5].y;
break;
default:
case 2:
- sprite->pos1.x = gSprites[r5].pos1.x + 8;
- sprite->pos1.y = gSprites[r5].pos1.y;
+ sprite->x = gSprites[r5].x + 8;
+ sprite->y = gSprites[r5].y;
break;
}
- sprite->pos2.x = gSprites[r5].pos2.x;
- sprite->pos2.y = gSprites[r5].pos2.y;
+ sprite->x2 = gSprites[r5].x2;
+ sprite->y2 = gSprites[r5].y2;
}
static void SpriteCB_HealthBoxOther(struct Sprite *sprite)
{
u8 healthboxMainSpriteId = sprite->hOther_HealthBoxSpriteId;
- sprite->pos1.x = gSprites[healthboxMainSpriteId].pos1.x + 64;
- sprite->pos1.y = gSprites[healthboxMainSpriteId].pos1.y;
+ sprite->x = gSprites[healthboxMainSpriteId].x + 64;
+ sprite->y = gSprites[healthboxMainSpriteId].y;
- sprite->pos2.x = gSprites[healthboxMainSpriteId].pos2.x;
- sprite->pos2.y = gSprites[healthboxMainSpriteId].pos2.y;
+ sprite->x2 = gSprites[healthboxMainSpriteId].x2;
+ sprite->y2 = gSprites[healthboxMainSpriteId].y2;
}
void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 oldVal, s32 receivedValue)
@@ -663,8 +663,8 @@ void SetHealthboxSpriteVisible(u8 healthboxSpriteId)
static void UpdateSpritePos(u8 spriteId, s16 x, s16 y)
{
- gSprites[spriteId].pos1.x = x;
- gSprites[spriteId].pos1.y = y;
+ gSprites[spriteId].x = x;
+ gSprites[spriteId].y = y;
}
void DestoryHealthboxSprite(u8 healthboxSpriteId)
@@ -1087,17 +1087,17 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
summaryBarSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10);
SetSubspriteTables(&gSprites[summaryBarSpriteId], sStatusSummaryBar_SubspriteTable);
- gSprites[summaryBarSpriteId].pos2.x = bar_pos2_X;
+ gSprites[summaryBarSpriteId].x2 = bar_pos2_X;
gSprites[summaryBarSpriteId].data[0] = bar_data0;
if (isOpponent)
{
- gSprites[summaryBarSpriteId].pos1.x -= 96;
+ gSprites[summaryBarSpriteId].x -= 96;
gSprites[summaryBarSpriteId].oam.matrixNum = ST_OAM_HFLIP;
}
else
{
- gSprites[summaryBarSpriteId].pos1.x += 96;
+ gSprites[summaryBarSpriteId].x += 96;
}
for (i = 0; i < PARTY_SIZE; i++)
@@ -1109,23 +1109,23 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
if (!isOpponent)
{
- gSprites[ballIconSpritesIds[i]].pos2.x = 0;
- gSprites[ballIconSpritesIds[i]].pos2.y = 0;
+ gSprites[ballIconSpritesIds[i]].x2 = 0;
+ gSprites[ballIconSpritesIds[i]].y2 = 0;
}
gSprites[ballIconSpritesIds[i]].data[0] = summaryBarSpriteId;
if (!isOpponent)
{
- gSprites[ballIconSpritesIds[i]].pos1.x += 10 * i + 24;
+ gSprites[ballIconSpritesIds[i]].x += 10 * i + 24;
gSprites[ballIconSpritesIds[i]].data[1] = i * 7 + 10;
- gSprites[ballIconSpritesIds[i]].pos2.x = 120;
+ gSprites[ballIconSpritesIds[i]].x2 = 120;
}
else
{
- gSprites[ballIconSpritesIds[i]].pos1.x -= 10 * (5 - i) + 24;
+ gSprites[ballIconSpritesIds[i]].x -= 10 * (5 - i) + 24;
gSprites[ballIconSpritesIds[i]].data[1] = (6 - i) * 7 + 10;
- gSprites[ballIconSpritesIds[i]].pos2.x = -120;
+ gSprites[ballIconSpritesIds[i]].x2 = -120;
}
gSprites[ballIconSpritesIds[i]].data[2] = isOpponent;
@@ -1360,17 +1360,17 @@ static void sub_804948C(u8 taskId)
static void SpriteCB_StatusSummaryBar(struct Sprite *sprite)
{
- if (sprite->pos2.x != 0)
- sprite->pos2.x += sprite->data[0];
+ if (sprite->x2 != 0)
+ sprite->x2 += sprite->data[0];
}
static void sub_8049568(struct Sprite *sprite)
{
sprite->data[1] += 32;
if (sprite->data[0] > 0)
- sprite->pos2.x += sprite->data[1] >> 4;
+ sprite->x2 += sprite->data[1] >> 4;
else
- sprite->pos2.x -= sprite->data[1] >> 4;
+ sprite->x2 -= sprite->data[1] >> 4;
sprite->data[1] &= 0xF;
}
@@ -1393,18 +1393,18 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
if (var1 != 0)
{
- sprite->pos2.x += var2 >> 4;
- if (sprite->pos2.x > 0)
- sprite->pos2.x = 0;
+ sprite->x2 += var2 >> 4;
+ if (sprite->x2 > 0)
+ sprite->x2 = 0;
}
else
{
- sprite->pos2.x -= var2 >> 4;
- if (sprite->pos2.x < 0)
- sprite->pos2.x = 0;
+ sprite->x2 -= var2 >> 4;
+ if (sprite->x2 < 0)
+ sprite->x2 = 0;
}
- if (sprite->pos2.x == 0)
+ if (sprite->x2 == 0)
{
pan = SOUND_PAN_TARGET;
if (var1 != 0)
@@ -1434,11 +1434,11 @@ static void sub_8049630(struct Sprite *sprite)
var2 += 56;
sprite->data[3] = var2 & 0xFFF0;
if (var1 != 0)
- sprite->pos2.x += var2 >> 4;
+ sprite->x2 += var2 >> 4;
else
- sprite->pos2.x -= var2 >> 4;
- if (sprite->pos2.x + sprite->pos1.x > 248
- || sprite->pos2.x + sprite->pos1.x < -8)
+ sprite->x2 -= var2 >> 4;
+ if (sprite->x2 + sprite->x > 248
+ || sprite->x2 + sprite->x < -8)
{
sprite->invisible = TRUE;
sprite->callback = SpriteCallbackDummy;
@@ -1449,8 +1449,8 @@ static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite *sprite)
{
u8 barSpriteId = sprite->data[0];
- sprite->pos2.x = gSprites[barSpriteId].pos2.x;
- sprite->pos2.y = gSprites[barSpriteId].pos2.y;
+ sprite->x2 = gSprites[barSpriteId].x2;
+ sprite->y2 = gSprites[barSpriteId].y2;
}
static const u8 gUnknown_8260556[] = _("{HIGHLIGHT 02}");
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 14:21:38 +0000