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/pokedex.c | |
| parent | 22fd579fd98bb7d1e5d282da2aea2ab98f711de2 (diff) | |
Use ST_OAM constants for OamData definitions
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index 2aa5e30ea..1821b6007 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -244,10 +244,10 @@ void sub_80C267C(void); static const struct OamData sOamData_855CFE4 = { .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(8x8), .x = 0, .matrixNum = 0, @@ -261,10 +261,10 @@ static const struct OamData sOamData_855CFE4 = static const struct OamData sOamData_855CFEC = { .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(16x8), .x = 0, .matrixNum = 0, @@ -278,10 +278,10 @@ static const struct OamData sOamData_855CFEC = static const struct OamData sOamData_855CFF4 = { .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(32x16), .x = 0, .matrixNum = 0, @@ -295,10 +295,10 @@ static const struct OamData sOamData_855CFF4 = static const struct OamData sOamData_855CFFC = { .y = 160, - .affineMode = 0, - .objMode = 2, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_WINDOW, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, @@ -312,10 +312,10 @@ static const struct OamData sOamData_855CFFC = static const struct OamData sOamData_855D004 = { .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(64x32), .x = 0, .matrixNum = 0, @@ -329,10 +329,10 @@ static const struct OamData sOamData_855D004 = static const struct OamData sOamData_855D00C = { .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(8x16), .x = 0, .matrixNum = 0, |