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

Use ST_OAM defines for OamData.

Browse Source
This commit is contained in:
ultima-soul
2019-12-04 11:41:07 -08:00
parent 8c57e32b95
commit b116608e12
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dodrio_berry_picking.c
+24 -24
View File
@@ -412,14 +412,14 @@ ALIGNED(4)
/*static*/ const struct OamData sOamData_8478C98 = /*static*/ const struct OamData sOamData_8478C98 =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = 0, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = 0, .bpp = ST_OAM_4BPP,
.shape = 0, .shape = ST_OAM_SQUARE,
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = 3, .size = ST_OAM_SIZE_3,
.tileNum = 0, .tileNum = 0,
.priority = 2, .priority = 2,
.paletteNum = 0, .paletteNum = 0,
@@ -429,14 +429,14 @@ ALIGNED(4)
/*static*/ const struct OamData sOamData_8478CA0 = /*static*/ const struct OamData sOamData_8478CA0 =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = 0, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = 0, .bpp = ST_OAM_4BPP,
.shape = 0, .shape = ST_OAM_SQUARE,
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = 1, .size = ST_OAM_SIZE_1,
.tileNum = 0, .tileNum = 0,
.priority = 0, .priority = 0,
.paletteNum = 0, .paletteNum = 0,
@@ -446,14 +446,14 @@ ALIGNED(4)
/*static*/ const struct OamData sOamData_8478CA8 = /*static*/ const struct OamData sOamData_8478CA8 =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = 0, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = 0, .bpp = ST_OAM_4BPP,
.shape = 0, .shape = ST_OAM_SQUARE,
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = 1, .size = ST_OAM_SIZE_1,
.tileNum = 0, .tileNum = 0,
.priority = 2, .priority = 2,
.paletteNum = 0, .paletteNum = 0,
@@ -463,14 +463,14 @@ ALIGNED(4)
/*static*/ const struct OamData sOamData_8478CB0 = /*static*/ const struct OamData sOamData_8478CB0 =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = ST_OAM_AFFINE_OFF,
.objMode = 0, .objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0, .mosaic = FALSE,
.bpp = 0, .bpp = ST_OAM_4BPP,
.shape = 1, .shape = ST_OAM_H_RECTANGLE,
.x = 0, .x = 0,
.matrixNum = 0, .matrixNum = 0,
.size = 3, .size = ST_OAM_SIZE_3,
.tileNum = 0, .tileNum = 0,
.priority = 3, .priority = 3,
.paletteNum = 0, .paletteNum = 0,