dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Flatten pos fields in struct Sprite

Browse Source
This commit is contained in:
PikalaxALT
2021-07-07 09:11:52 -04:00
parent 3964820a84
commit 810ca5f8ff
111 changed files with 3764 additions and 3764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/hall_of_fame.c
View File

@@ -712,9 +712,9 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
{
gTasks[taskId].tFrameCount--;
}
else if (gSprites[gTasks[taskId].tPlayerSpriteID].pos1.x != 192)
else if (gSprites[gTasks[taskId].tPlayerSpriteID].x != 192)
{
gSprites[gTasks[taskId].tPlayerSpriteID].pos1.x++;
gSprites[gTasks[taskId].tPlayerSpriteID].x++;
}
else
{
@@ -1340,18 +1340,18 @@ static bool8 sub_8175024(void)
static void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
{
if (sprite->pos1.x != sprite->tDestinationX
|| sprite->pos1.y != sprite->tDestinationY)
if (sprite->x != sprite->tDestinationX
|| sprite->y != sprite->tDestinationY)
{
if (sprite->pos1.x < sprite->tDestinationX)
sprite->pos1.x += 15;
if (sprite->pos1.x > sprite->tDestinationX)
sprite->pos1.x -= 15;
if (sprite->x < sprite->tDestinationX)
sprite->x += 15;
if (sprite->x > sprite->tDestinationX)
sprite->x -= 15;
if (sprite->pos1.y < sprite->tDestinationY)
sprite->pos1.y += 10;
if (sprite->pos1.y > sprite->tDestinationY)
sprite->pos1.y -= 10;
if (sprite->y < sprite->tDestinationY)
sprite->y += 10;
if (sprite->y > sprite->tDestinationY)
sprite->y -= 10;
}
else
{
@@ -1373,7 +1373,7 @@ static void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
static void SpriteCB_HofConfetti(struct Sprite* sprite)
{
if (sprite->pos2.y > 120)
if (sprite->y2 > 120)
{
DestroySprite(sprite);
}
@@ -1382,12 +1382,12 @@ static void SpriteCB_HofConfetti(struct Sprite* sprite)
u16 rand;
u8 sineIdx;
sprite->pos2.y++;
sprite->pos2.y += sprite->sExtraY;
sprite->y2++;
sprite->y2 += sprite->sExtraY;
sineIdx = sprite->sSineIdx;
rand = (Random() % 4) + 8;
sprite->pos2.x = rand * gSineTable[sineIdx] / 256;
sprite->x2 = rand * gSineTable[sineIdx] / 256;
sprite->sSineIdx += 4;
}