summaryrefslogtreecommitdiff
path: root/src/battle_transition.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r--src/battle_transition.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c
index b7aac2c65..06979a03a 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1041,10 +1041,10 @@ static void sub_811B720(struct Sprite* sprite)
sprite->data[1]--;
else
{
- if (sprite->pos1.x >= 0 && sprite->pos1.x <= 240)
+ if (sprite->x >= 0 && sprite->x <= 240)
{
- s16 posX = sprite->pos1.x >> 3;
- s16 posY = sprite->pos1.y >> 3;
+ s16 posX = sprite->x >> 3;
+ s16 posY = sprite->y >> 3;
if (posX != sprite->data[2])
{
@@ -1061,8 +1061,8 @@ static void sub_811B720(struct Sprite* sprite)
SOME_VRAM_STORE(ptr, posY + 1, posX, 0xF001);
}
}
- sprite->pos1.x += arr0[sprite->data[0]];
- if (sprite->pos1.x < -15 || sprite->pos1.x > 255)
+ sprite->x += arr0[sprite->data[0]];
+ if (sprite->x < -15 || sprite->x > 255)
FieldEffectStop(sprite, FLDEFF_POKEBALL);
}
}
@@ -1786,10 +1786,10 @@ static bool8 sub_811C938(struct Sprite* sprite)
static bool8 sub_811C984(struct Sprite* sprite)
{
- sprite->pos1.x += sprite->data[1];
- if (sprite->data[7] && sprite->pos1.x < 133)
+ sprite->x += sprite->data[1];
+ if (sprite->data[7] && sprite->x < 133)
sprite->data[0]++;
- else if (!sprite->data[7] && sprite->pos1.x > 103)
+ else if (!sprite->data[7] && sprite->x > 103)
sprite->data[0]++;
return FALSE;
}
@@ -1797,7 +1797,7 @@ static bool8 sub_811C984(struct Sprite* sprite)
static bool8 sub_811C9B8(struct Sprite* sprite)
{
sprite->data[1] += sprite->data[2];
- sprite->pos1.x += sprite->data[1];
+ sprite->x += sprite->data[1];
if (sprite->data[1] == 0)
{
sprite->data[0]++;
@@ -1810,8 +1810,8 @@ static bool8 sub_811C9B8(struct Sprite* sprite)
static bool8 sub_811C9E4(struct Sprite* sprite)
{
sprite->data[1] += sprite->data[2];
- sprite->pos1.x += sprite->data[1];
- if (sprite->pos1.x < -31 || sprite->pos1.x > 271)
+ sprite->x += sprite->data[1];
+ if (sprite->x < -31 || sprite->x > 271)
sprite->data[0]++;
return FALSE;
}
@@ -1978,8 +1978,8 @@ static bool8 Phase2_Transition_WhiteFade_Func2(struct Task* task)
for (i = 0, posY = 0; i < 8; i++, posY += 0x14)
{
sprite = &gSprites[CreateInvisibleSprite(sub_811CFD0)];
- sprite->pos1.x = 0xF0;
- sprite->pos1.y = posY;
+ sprite->x = 0xF0;
+ sprite->y = posY;
sprite->data[5] = arr1[i];
}
sprite->data[6]++;
@@ -2068,21 +2068,21 @@ static void sub_811CFD0(struct Sprite* sprite)
else
{
u16 i;
- u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->pos1.y];
- u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->pos1.y + 160];
+ u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->y];
+ u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->y + 160];
for (i = 0; i < 20; i++)
{
ptr1[i] = sprite->data[0] >> 8;
- ptr2[i] = (u8)(sprite->pos1.x);
+ ptr2[i] = (u8)(sprite->x);
}
- if (sprite->pos1.x == 0 && sprite->data[0] == 0x1000)
+ if (sprite->x == 0 && sprite->data[0] == 0x1000)
sprite->data[1] = 1;
- sprite->pos1.x -= 16;
+ sprite->x -= 16;
sprite->data[0] += 0x80;
- if (sprite->pos1.x < 0)
- sprite->pos1.x = 0;
+ if (sprite->x < 0)
+ sprite->x = 0;
if (sprite->data[0] > 0x1000)
sprite->data[0] = 0x1000;