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

30
src/title_screen.c
View File

@@ -358,12 +358,12 @@ static void SpriteCB_VersionBannerLeft(struct Sprite *sprite)
if (gTasks[sprite->data[1]].data[1] != 0)
{
sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
sprite->pos1.y = VERSION_BANNER_Y_GOAL;
sprite->y = VERSION_BANNER_Y_GOAL;
}
else
{
if (sprite->pos1.y != VERSION_BANNER_Y_GOAL)
sprite->pos1.y++;
if (sprite->y != VERSION_BANNER_Y_GOAL)
sprite->y++;
if (sprite->data[0] != 0)
sprite->data[0]--;
SetGpuReg(REG_OFFSET_BLDALPHA, gTitleScreenAlphaBlend[sprite->data[0]]);
@@ -375,12 +375,12 @@ static void SpriteCB_VersionBannerRight(struct Sprite *sprite)
if (gTasks[sprite->data[1]].data[1] != 0)
{
sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
sprite->pos1.y = VERSION_BANNER_Y_GOAL;
sprite->y = VERSION_BANNER_Y_GOAL;
}
else
{
if (sprite->pos1.y != VERSION_BANNER_Y_GOAL)
sprite->pos1.y++;
if (sprite->y != VERSION_BANNER_Y_GOAL)
sprite->y++;
}
}
@@ -430,13 +430,13 @@ static void CreateCopyrightBanner(s16 x, s16 y)
static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
{
if (sprite->pos1.x < DISPLAY_WIDTH + 32)
if (sprite->x < DISPLAY_WIDTH + 32)
{
if (sprite->data[0]) // Flash background
{
u16 backgroundColor;
if (sprite->pos1.x < DISPLAY_WIDTH / 2)
if (sprite->x < DISPLAY_WIDTH / 2)
{
// Brighten background color
if (sprite->data[1] < 31)
@@ -454,15 +454,15 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
}
backgroundColor = _RGB(sprite->data[1], sprite->data[1], sprite->data[1]);
if (sprite->pos1.x == DISPLAY_WIDTH / 2 + 12
|| sprite->pos1.x == DISPLAY_WIDTH / 2 + 16
|| sprite->pos1.x == DISPLAY_WIDTH / 2 + 20
|| sprite->pos1.x == DISPLAY_WIDTH / 2 + 24)
if (sprite->x == DISPLAY_WIDTH / 2 + 12
|| sprite->x == DISPLAY_WIDTH / 2 + 16
|| sprite->x == DISPLAY_WIDTH / 2 + 20
|| sprite->x == DISPLAY_WIDTH / 2 + 24)
gPlttBufferFaded[0] = RGB(24, 31, 12);
else
gPlttBufferFaded[0] = backgroundColor;
}
sprite->pos1.x += 4;
sprite->x += 4;
}
else
{
@@ -473,8 +473,8 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
static void SpriteCB_PokemonLogoShine2(struct Sprite *sprite)
{
if (sprite->pos1.x < DISPLAY_WIDTH + 32)
sprite->pos1.x += 8;
if (sprite->x < DISPLAY_WIDTH + 32)
sprite->x += 8;
else
DestroySprite(sprite);
}