diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:17 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:33 -0500 |
| commit | b93101bbebaae9be44b9b4ada81766264135cca9 (patch) | |
| tree | 73373641b7f1eed21c4c5d9423cd5668ab8c4a27 /src/contest.c | |
| parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
| parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/contest.c b/src/contest.c index 63d5ecc07..f1741d16a 100644 --- a/src/contest.c +++ b/src/contest.c @@ -270,10 +270,10 @@ static const struct SpriteSheet gUnknown_08587A74 = static const struct OamData gOamData_8587A7C = { .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, @@ -355,10 +355,10 @@ static const struct SpritePalette gUnknown_08587B08 = static const struct OamData gOamData_8587B10 = { .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, @@ -414,16 +414,16 @@ const struct Subsprite gSubspriteTable_8587B78[] = { .x = -28, .y = -4, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .tileOffset = 0, .priority = 0 }, { .x = 4, .y = -4, - .shape = ST_OAM_H_RECTANGLE, - .size = 1, + .shape = SPRITE_SHAPE(32x8), + .size = SPRITE_SIZE(32x8), .tileOffset = 4, .priority = 0 } @@ -5021,7 +5021,7 @@ static void sub_80DE69C(u8 a) for (i = 0; i < CONTESTANT_COUNT; i++) { gSprites[gContestResources->field_14[i].unk0].oam.matrixNum = AllocOamMatrix(); - gSprites[gContestResources->field_14[i].unk0].oam.affineMode = 1; + gSprites[gContestResources->field_14[i].unk0].oam.affineMode = ST_OAM_AFFINE_NORMAL; StartSpriteAffineAnim(&gSprites[gContestResources->field_14[i].unk0], a); if (a == 2) { |