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/battle_factory_screen.c | |
| parent | 22fd579fd98bb7d1e5d282da2aea2ab98f711de2 (diff) | |
Use ST_OAM constants for OamData definitions
Diffstat (limited to 'src/battle_factory_screen.c')
| -rw-r--r-- | src/battle_factory_screen.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 36839cde5..8c2f088d4 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -381,10 +381,10 @@ static const u8 gUnknown_08610479[] = {0x00, 0x04, 0x00}; static const struct OamData gUnknown_0861047C = { .y = 0, - .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(32x32), .x = 0, .matrixNum = 0, @@ -398,10 +398,10 @@ static const struct OamData gUnknown_0861047C = static const struct OamData gUnknown_08610484 = { .y = 0, - .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(16x16), .x = 0, .matrixNum = 0, @@ -415,10 +415,10 @@ static const struct OamData gUnknown_08610484 = static const struct OamData gUnknown_0861048C = { .y = 0, - .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, @@ -432,10 +432,10 @@ static const struct OamData gUnknown_0861048C = static const struct OamData gUnknown_08610494 = { .y = 0, - .affineMode = 3, - .objMode = 1, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_BLEND, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, @@ -632,10 +632,10 @@ static const struct SpritePalette gUnknown_086106B0[] = static const struct OamData gUnknown_086106D8 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = 0, .x = 0, .matrixNum = 0, @@ -649,10 +649,10 @@ static const struct OamData gUnknown_086106D8 = static const struct OamData gUnknown_086106E0 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = 0, .x = 0, .matrixNum = 0, @@ -666,10 +666,10 @@ static const struct OamData gUnknown_086106E0 = static const struct OamData gUnknown_086106E8 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = 1, .x = 0, .matrixNum = 0, @@ -683,10 +683,10 @@ static const struct OamData gUnknown_086106E8 = static const struct OamData gUnknown_086106F0 = { .y = 0, - .affineMode = 3, - .objMode = 1, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_BLEND, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = 0, .x = 0, .matrixNum = 0, |