Use constants for Oam .shape and .size fields

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
+6 -6
View File
@@ -142,10 +142,10 @@ static const struct OamData gOamData_8617DF4 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
.size = 1,
.size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 0,
.paletteNum = 3,
@@ -192,10 +192,10 @@ static const struct OamData sCeilingCrumble2OamData =
.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,
@@ -230,10 +230,10 @@ static const struct OamData sCeilingCrumble1OamData =
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
.bpp = ST_OAM_4BPP,
.shape = ST_OAM_SQUARE,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
.size = 1,
.size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 0,
.paletteNum = 0,