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

More usage of DISPLAY constants

Browse Source
This commit is contained in:
GriffinR
2021-04-15 02:04:01 -04:00
parent c4ef45c161
commit 62abcecc54
47 changed files with 232 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/title_screen.c
View File

@@ -105,7 +105,7 @@ const u16 gTitleScreenAlphaBlend[64] =
static const struct OamData sVersionBannerLeftOamData =
{
.y = 160,
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -122,7 +122,7 @@ static const struct OamData sVersionBannerLeftOamData =
static const struct OamData sVersionBannerRightOamData =
{
.y = 160,
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -193,7 +193,7 @@ static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] =
static const struct OamData sOamData_CopyrightBanner =
{
.y = 160,
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -305,7 +305,7 @@ static const struct SpritePalette sSpritePalette_PressStart[] =
static const struct OamData sPokemonLogoShineOamData =
{
.y = 160,
.y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -430,7 +430,7 @@ static void CreateCopyrightBanner(s16 x, s16 y)
static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
{
if (sprite->pos1.x < 272)
if (sprite->pos1.x < DISPLAY_WIDTH + 32)
{
if (sprite->data[0]) // Flash background
{
@@ -473,7 +473,7 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
static void SpriteCB_PokemonLogoShine2(struct Sprite *sprite)
{
if (sprite->pos1.x < 272)
if (sprite->pos1.x < DISPLAY_WIDTH + 32)
sprite->pos1.x += 8;
else
DestroySprite(sprite);