summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-12-04 12:39:54 -0800
committerultima-soul <akshayjhanji@hotmail.com>2019-12-04 12:39:54 -0800
commit5eb42eecfd59940bc9ef21d29642e13237901794 (patch)
tree537d53541ebdc7b2b000b6aa9af73710bae325cc /src
parent58cf3313403a056104b561d40051216eb46fa7bc (diff)
Use SPRITE_SHAPE and SPRITE_SIZE macros.
Diffstat (limited to 'src')
-rw-r--r--src/dodrio_berry_picking.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 515c20f9f..1860f1917 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -416,10 +416,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE,
.bpp = ST_OAM_4BPP,
- .shape = ST_OAM_SQUARE,
+ .shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,
- .size = ST_OAM_SIZE_3,
+ .size = SPRITE_SIZE(64x64),
.tileNum = 0,
.priority = 2,
.paletteNum = 0,
@@ -433,10 +433,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE,
.bpp = ST_OAM_4BPP,
- .shape = ST_OAM_SQUARE,
+ .shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
- .size = ST_OAM_SIZE_1,
+ .size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
@@ -450,10 +450,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE,
.bpp = ST_OAM_4BPP,
- .shape = ST_OAM_SQUARE,
+ .shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
- .size = ST_OAM_SIZE_1,
+ .size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 2,
.paletteNum = 0,
@@ -467,10 +467,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE,
.bpp = ST_OAM_4BPP,
- .shape = ST_OAM_H_RECTANGLE,
+ .shape = SPRITE_SHAPE(64x32),
.x = 0,
.matrixNum = 0,
- .size = ST_OAM_SIZE_3,
+ .size = SPRITE_SIZE(64x32),
.tileNum = 0,
.priority = 3,
.paletteNum = 0,