dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SPRITE_SHAPE and SPRITE_SIZE macros.

Browse Source
This commit is contained in:
ultima-soul
2019-12-04 12:39:54 -08:00
parent 58cf331340
commit 5eb42eecfd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dodrio_berry_picking.c
+8 -8
View File
@@ -416,10 +416,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = ST_OAM_SQUARE, .shape = SPRITE_SHAPE(64x64),
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = ST_OAM_SIZE_3, .size = SPRITE_SIZE(64x64),
.tileNum = 0, .tileNum = 0,
.priority = 2, .priority = 2,
.paletteNum = 0, .paletteNum = 0,
@@ -433,10 +433,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = ST_OAM_SQUARE, .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = ST_OAM_SIZE_1, .size = SPRITE_SIZE(16x16),
.tileNum = 0, .tileNum = 0,
.priority = 0, .priority = 0,
.paletteNum = 0, .paletteNum = 0,
@@ -450,10 +450,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = ST_OAM_SQUARE, .shape = SPRITE_SHAPE(16x16),
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = ST_OAM_SIZE_1, .size = SPRITE_SIZE(16x16),
.tileNum = 0, .tileNum = 0,
.priority = 2, .priority = 2,
.paletteNum = 0, .paletteNum = 0,
@@ -467,10 +467,10 @@ ALIGNED(4)
.objMode = ST_OAM_OBJ_NORMAL, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE, .mosaic = FALSE,
.bpp = ST_OAM_4BPP, .bpp = ST_OAM_4BPP,
.shape = ST_OAM_H_RECTANGLE, .shape = SPRITE_SHAPE(64x32),
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = ST_OAM_SIZE_3, .size = SPRITE_SIZE(64x32),
.tileNum = 0, .tileNum = 0,
.priority = 3, .priority = 3,
.paletteNum = 0, .paletteNum = 0,