diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-12-04 15:25:13 -0500 |
---|---|---|
committer | huderlem <huderlem@gmail.com> | 2019-12-06 19:05:44 -0600 |
commit | c40879aa3693a18c23be42cce54d52ca7afe1bca (patch) | |
tree | efdd624c6a153da738551d6c93a198a704e832ef /src/menu_specialized.c | |
parent | 22fd579fd98bb7d1e5d282da2aea2ab98f711de2 (diff) |
Use ST_OAM constants for OamData definitions
Diffstat (limited to 'src/menu_specialized.c')
-rw-r--r-- | src/menu_specialized.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 75317e3ff..c0f7c510d 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -1104,14 +1104,14 @@ static const u32 gUnknown_086256A0[] = INCBIN_U32("graphics/pokenav/sparkle.4bpp static const struct OamData sOamData_8625A20 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -1121,14 +1121,14 @@ static const struct OamData sOamData_8625A20 = static const struct OamData sOamData_8625A28 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, |