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/move_relearner.c | |
| parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
| parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/move_relearner.c')
| -rw-r--r-- | src/move_relearner.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/move_relearner.c b/src/move_relearner.c index b5202e006..6d9b5865b 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -183,14 +183,14 @@ static const u8 sMoveRelearnerSpriteSheetData[] = INCBIN_U8("graphics/interface/ static const struct OamData sHeartSpriteOamData = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -200,14 +200,14 @@ static const struct OamData sHeartSpriteOamData = static const struct OamData sUnusedOam1 = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_V_RECTANGLE, + .shape = SPRITE_SHAPE(8x16), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -217,14 +217,14 @@ static const struct OamData sUnusedOam1 = static const struct OamData sUnusedOam2 = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(16x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(16x8), .tileNum = 0, .priority = 0, .paletteNum = 0, |