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_interface.c | |
| parent | 22fd579fd98bb7d1e5d282da2aea2ab98f711de2 (diff) | |
Use ST_OAM constants for OamData definitions
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index 8fabfed68..05d34d6c5 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -202,10 +202,10 @@ static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2); static const struct OamData sUnknown_0832C138 = { .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(64x32), .x = 0, .matrixNum = 0, @@ -274,10 +274,10 @@ static const struct SpriteTemplate sHealthboxSafariSpriteTemplate = static const struct OamData sOamData_Healthbar = { .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, @@ -441,10 +441,10 @@ static const struct SpriteSheet sStatusSummaryBallsSpriteSheet = static const struct OamData sUnknown_0832C354 = { .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(64x32), .x = 0, .matrixNum = 0, @@ -458,10 +458,10 @@ static const struct OamData sUnknown_0832C354 = static const struct OamData sOamData_StatusSummaryBalls = { .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, |