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
+10 -10
View File
@@ -404,10 +404,10 @@ static const struct OamData sOamData_8216314 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
.matrixNum = 0,
.size = 2,
.size = SPRITE_SIZE(32x32),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -547,10 +547,10 @@ static const struct OamData sOamData_821640C =
.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 = 0,
@@ -616,10 +616,10 @@ static const struct OamData sOamData_8216474 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(8x8),
.x = 0,
.matrixNum = 0,
.size = 0,
.size = SPRITE_SIZE(8x8),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -703,10 +703,10 @@ static const struct OamData sOamData_8216514 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
.matrixNum = 0,
.size = 2,
.size = SPRITE_SIZE(32x32),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -761,10 +761,10 @@ static const struct OamData sOamData_8216560 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
.matrixNum = 0,
.size = 3,
.size = SPRITE_SIZE(64x32),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,