dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use constants for Oam .shape and .size fields

Browse Source 
Also some general formatting fixes for constants.
This commit is contained in:
Phlosioneer
2019-03-11 03:12:15 -04:00
committed by huderlem
parent 291df27dcb
commit 9848f84b9e
61 changed files with 1422 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokedex.c
+12 -12
View File
@@ -248,10 +248,10 @@ static const struct OamData sOamData_855CFE4 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = ST_OAM_SQUARE,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
.matrixNum = 0,
.size = 0,
.size = SPRITE_SIZE(8x8),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -265,10 +265,10 @@ static const struct OamData sOamData_855CFEC =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.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,
@@ -282,10 +282,10 @@ static const struct OamData sOamData_855CFF4 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = ST_OAM_H_RECTANGLE,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
.matrixNum = 0,
.size = 2,
.size = SPRITE_SIZE(32x16),
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
@@ -299,10 +299,10 @@ static const struct OamData sOamData_855CFFC =
.objMode = 2,
.mosaic = 0,
.bpp = 0,
.shape = ST_OAM_SQUARE,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
.matrixNum = 0,
.size = 2,
.size = SPRITE_SIZE(32x32),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -316,10 +316,10 @@ static const struct OamData sOamData_855D004 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = ST_OAM_H_RECTANGLE,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
.matrixNum = 0,
.size = 3,
.size = SPRITE_SIZE(64x32),
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
@@ -333,10 +333,10 @@ static const struct OamData sOamData_855D00C =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.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,