Update OAMs to use new constants
This commit is contained in:
+12
-12
@@ -272,10 +272,10 @@ static const struct OamData gOamData_8587A7C =
|
|||||||
.objMode = 0,
|
.objMode = 0,
|
||||||
.mosaic = 0,
|
.mosaic = 0,
|
||||||
.bpp = 0,
|
.bpp = 0,
|
||||||
.shape = 0,
|
.shape = SPRITE_SHAPE(8x8),
|
||||||
.x = 0,
|
.x = 0,
|
||||||
.matrixNum = 0,
|
.matrixNum = 0,
|
||||||
.size = 0,
|
.size = SPRITE_SIZE(8x8),
|
||||||
.tileNum = 0,
|
.tileNum = 0,
|
||||||
.priority = 0,
|
.priority = 0,
|
||||||
.paletteNum = 0,
|
.paletteNum = 0,
|
||||||
@@ -357,10 +357,10 @@ static const struct OamData gOamData_8587B10 =
|
|||||||
.objMode = 0,
|
.objMode = 0,
|
||||||
.mosaic = 0,
|
.mosaic = 0,
|
||||||
.bpp = 0,
|
.bpp = 0,
|
||||||
.shape = 1,
|
.shape = SPRITE_SHAPE(32x8),
|
||||||
.x = 0,
|
.x = 0,
|
||||||
.matrixNum = 0,
|
.matrixNum = 0,
|
||||||
.size = 1,
|
.size = SPRITE_SIZE(32x8),
|
||||||
.tileNum = 0,
|
.tileNum = 0,
|
||||||
.priority = 0,
|
.priority = 0,
|
||||||
.paletteNum = 0,
|
.paletteNum = 0,
|
||||||
@@ -449,10 +449,10 @@ const struct OamData gOamData_8587B90 =
|
|||||||
.objMode = 0,
|
.objMode = 0,
|
||||||
.mosaic = 0,
|
.mosaic = 0,
|
||||||
.bpp = 0,
|
.bpp = 0,
|
||||||
.shape = 0,
|
.shape = SPRITE_SHAPE(16x16),
|
||||||
.x = 0,
|
.x = 0,
|
||||||
.matrixNum = 0,
|
.matrixNum = 0,
|
||||||
.size = 1,
|
.size = SPRITE_SIZE(16x16),
|
||||||
.tileNum = 0,
|
.tileNum = 0,
|
||||||
.priority = 0,
|
.priority = 0,
|
||||||
.paletteNum = 0,
|
.paletteNum = 0,
|
||||||
@@ -490,10 +490,10 @@ const struct OamData gOamData_8587BC0 =
|
|||||||
.objMode = 0,
|
.objMode = 0,
|
||||||
.mosaic = 0,
|
.mosaic = 0,
|
||||||
.bpp = 0,
|
.bpp = 0,
|
||||||
.shape = 1,
|
.shape = SPRITE_SHAPE(64x32),
|
||||||
.x = 0,
|
.x = 0,
|
||||||
.matrixNum = 0,
|
.matrixNum = 0,
|
||||||
.size = 3,
|
.size = SPRITE_SIZE(64x32),
|
||||||
.tileNum = 0,
|
.tileNum = 0,
|
||||||
.priority = 0,
|
.priority = 0,
|
||||||
.paletteNum = 0,
|
.paletteNum = 0,
|
||||||
@@ -518,10 +518,10 @@ const struct OamData gOamData_8587BE0 =
|
|||||||
.objMode = 0,
|
.objMode = 0,
|
||||||
.mosaic = 0,
|
.mosaic = 0,
|
||||||
.bpp = 0,
|
.bpp = 0,
|
||||||
.shape = 0,
|
.shape = SPRITE_SHAPE(64x64),
|
||||||
.x = 0,
|
.x = 0,
|
||||||
.matrixNum = 0,
|
.matrixNum = 0,
|
||||||
.size = 3,
|
.size = SPRITE_SIZE(64x64),
|
||||||
.tileNum = 0,
|
.tileNum = 0,
|
||||||
.priority = 3,
|
.priority = 3,
|
||||||
.paletteNum = 2,
|
.paletteNum = 2,
|
||||||
@@ -772,10 +772,10 @@ const struct OamData gOamData_8589944 =
|
|||||||
.objMode = 1,
|
.objMode = 1,
|
||||||
.mosaic = 0,
|
.mosaic = 0,
|
||||||
.bpp = 0,
|
.bpp = 0,
|
||||||
.shape = 0,
|
.shape = SPRITE_SHAPE(64x64),
|
||||||
.x = 0,
|
.x = 0,
|
||||||
.matrixNum = 0,
|
.matrixNum = 0,
|
||||||
.size = 3,
|
.size = SPRITE_SIZE(64x64),
|
||||||
.tileNum = 0,
|
.tileNum = 0,
|
||||||
.priority = 0,
|
.priority = 0,
|
||||||
.paletteNum = 0,
|
.paletteNum = 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user