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/data/trade.h | |
| parent | 22fd579fd98bb7d1e5d282da2aea2ab98f711de2 (diff) | |
Use ST_OAM constants for OamData definitions
Diffstat (limited to 'src/data/trade.h')
| -rw-r--r-- | src/data/trade.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/data/trade.h b/src/data/trade.h index 9e96a54dd..4ed39f6cd 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -633,7 +633,7 @@ static const u32 sTradeTilemap_WirelessSignal[] = INCBIN_U32("graphics/trade/wir static const struct OamData sTradeOamData_16x16 = { - .affineMode = 1, + .affineMode = ST_OAM_AFFINE_NORMAL, .shape = SPRITE_SHAPE(16x16), .size = SPRITE_SIZE(16x16) }; @@ -735,8 +735,8 @@ static const struct SpriteTemplate gSpriteTemplate_8338D28 = static const struct OamData sTradeOamData_32x32 = { - .affineMode = 1, - .objMode = 1, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_BLEND, .shape = SPRITE_SHAPE(32x32), .size = SPRITE_SIZE(32x32), .priority = 1 |