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/party_menu.h | |
| parent | 22fd579fd98bb7d1e5d282da2aea2ab98f711de2 (diff) | |
Use ST_OAM constants for OamData definitions
Diffstat (limited to 'src/data/party_menu.h')
| -rw-r--r-- | src/data/party_menu.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 6af8ee2a6..3c3a3e1ce 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -879,10 +879,10 @@ static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons. static const struct OamData sOamData_HeldItem = { .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(8x8), .x = 0, .matrixNum = 0, @@ -935,10 +935,10 @@ static const struct SpriteTemplate sSpriteTemplate_HeldItem = static const struct OamData sOamData_MenuPokeball = { .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, @@ -992,10 +992,10 @@ static const struct SpriteTemplate sSpriteTemplate_MenuPokeball = static const struct OamData sOamData_MenuPokeballSmall = { .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, @@ -1073,10 +1073,10 @@ static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall = static const struct OamData sOamData_StatusCondition = { .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(32x8), .x = 0, .matrixNum = 0, |