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
src/dodrio_berry_picking.c
+13 -13
View File
@@ -3913,11 +3913,11 @@ static u32 DoDodrioMissedAnim(struct Sprite *sprite)
break;
}
sprite->pos1.x += x;
sprite->x += x;
if (++sprite->sTimer >= 40)
{
sprite->sState = 0;
sprite->pos1.x = GetDodrioXPos(0, GetNumPlayers());
sprite->x = GetDodrioXPos(0, GetNumPlayers());
}
}
@@ -3995,8 +3995,8 @@ static void InitStatusBarPos(void)
for (i = 0; i < NUM_STATUS_SQUARES; i++)
{
struct Sprite *sprite = &gSprites[sStatusBar->spriteIds[i]];
sprite->pos1.x = (i * 16) + 48;
sprite->pos1.y = -8 - (i * 8);
sprite->x = (i * 16) + 48;
sprite->y = -8 - (i * 8);
sStatusBar->entered[i] = FALSE;
}
}
@@ -4057,11 +4057,11 @@ static bool32 DoStatusBarIntro(void)
{
struct Sprite *sprite = &gSprites[sStatusBar->spriteIds[i]];
sStatusBar->yChange[i] = 2;
if (sStatusBar->entered[i] && sprite->pos1.y == 8)
if (sStatusBar->entered[i] && sprite->y == 8)
continue;
animActive = TRUE;
if (sprite->pos1.y == 8)
if (sprite->y == 8)
{
if (sStatusBar->entered[i])
continue;
@@ -4072,7 +4072,7 @@ static bool32 DoStatusBarIntro(void)
sStatusBar->yChange[i] = -16;
PlaySE(SE_CLICK);
}
sprite->pos1.y += sStatusBar->yChange[i];
sprite->y += sStatusBar->yChange[i];
}
if (animActive)
@@ -4245,7 +4245,7 @@ static void SetBerryIconsInvisibility(bool8 invisible)
static void SetBerryYPos(u8 id, u8 y)
{
gSprites[*sBerrySpriteIds[id]].pos1.y = y * 8;
gSprites[*sBerrySpriteIds[id]].y = y * 8;
}
static void SetBerryAnim(u16 id, u8 animNum)
@@ -4256,8 +4256,8 @@ static void SetBerryAnim(u16 id, u8 animNum)
// Unused
static void UnusedSetSpritePos(u8 spriteId)
{
gSprites[spriteId].pos1.x = 20 * spriteId + 50;
gSprites[spriteId].pos1.y = 50;
gSprites[spriteId].x = 20 * spriteId + 50;
gSprites[spriteId].y = 50;
}
// Gamefreak made a mistake there and goes out of bounds for the data array as it holds 8 elements
@@ -4279,7 +4279,7 @@ static void SpriteCB_Cloud(struct Sprite *sprite)
{
if (++sCloudSpriteIds[i][1] > moveDelays[i])
{
sprite->pos1.x--;
sprite->x--;
sCloudSpriteIds[i][1] = 0;
}
}
@@ -4332,8 +4332,8 @@ static void ResetCloudPos(void)
{
struct Sprite *sprite = &gSprites[*sCloudSpriteIds[i]];
sprite->sFrozen = TRUE;
sprite->pos1.x = sCloudStartCoords[i][0];
sprite->pos1.y = sCloudStartCoords[i][1];
sprite->x = sCloudStartCoords[i][0];
sprite->y = sCloudStartCoords[i][1];
}
}