summaryrefslogtreecommitdiff
path: root/src/title_screen.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-04 15:25:13 -0500
committerhuderlem <huderlem@gmail.com>2019-12-06 19:05:44 -0600
commitc40879aa3693a18c23be42cce54d52ca7afe1bca (patch)
treeefdd624c6a153da738551d6c93a198a704e832ef /src/title_screen.c
parent22fd579fd98bb7d1e5d282da2aea2ab98f711de2 (diff)
Use ST_OAM constants for OamData definitions
Diffstat (limited to 'src/title_screen.c')
-rw-r--r--src/title_screen.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/title_screen.c b/src/title_screen.c
index 8310ef811..f95d7685e 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -102,10 +102,10 @@ const u16 gIntroWaterDropAlphaBlend[] =
static const struct OamData sVersionBannerLeftOamData =
{
.y = 160,
- .affineMode = 0,
- .objMode = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
- .bpp = 1,
+ .bpp = ST_OAM_8BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
.matrixNum = 0,
@@ -119,10 +119,10 @@ static const struct OamData sVersionBannerLeftOamData =
static const struct OamData sVersionBannerRightOamData =
{
.y = 160,
- .affineMode = 0,
- .objMode = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
- .bpp = 1,
+ .bpp = ST_OAM_8BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
.matrixNum = 0,
@@ -190,10 +190,10 @@ static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] =
static const struct OamData sOamData_CopyrightBanner =
{
.y = 160,
- .affineMode = 0,
- .objMode = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
- .bpp = 0,
+ .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x8),
.x = 0,
.matrixNum = 0,
@@ -302,10 +302,10 @@ static const struct SpritePalette sSpritePalette_PressStart[] =
static const struct OamData sPokemonLogoShineOamData =
{
.y = 160,
- .affineMode = 0,
- .objMode = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
- .bpp = 0,
+ .bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,