Merge branch 'master' into tag-none

This commit is contained in:
GriffinR
2021-09-24 10:17:34 -04:00
committed by GitHub
469 changed files with 27059 additions and 27106 deletions
+4 -4
View File
@@ -248,7 +248,7 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
static const struct OamDimensions32 sOamDimensions32[3][4] =
{
[ST_OAM_SQUARE] =
[ST_OAM_SQUARE] =
{
[SPRITE_SIZE(8x8)] = { 8, 8 },
[SPRITE_SIZE(16x16)] = { 16, 16 },
@@ -262,7 +262,7 @@ static const struct OamDimensions32 sOamDimensions32[3][4] =
[SPRITE_SIZE(32x16)] = { 32, 16 },
[SPRITE_SIZE(64x32)] = { 64, 32 },
},
[ST_OAM_V_RECTANGLE] =
[ST_OAM_V_RECTANGLE] =
{
[SPRITE_SIZE(8x16)] = { 8, 16 },
[SPRITE_SIZE(8x32)] = { 8, 32 },
@@ -273,7 +273,7 @@ static const struct OamDimensions32 sOamDimensions32[3][4] =
static const struct OamDimensions sOamDimensions[3][4] =
{
[ST_OAM_SQUARE] =
[ST_OAM_SQUARE] =
{
[SPRITE_SIZE(8x8)] = { 8, 8 },
[SPRITE_SIZE(16x16)] = { 16, 16 },
@@ -287,7 +287,7 @@ static const struct OamDimensions sOamDimensions[3][4] =
[SPRITE_SIZE(32x16)] = { 32, 16 },
[SPRITE_SIZE(64x32)] = { 64, 32 },
},
[ST_OAM_V_RECTANGLE] =
[ST_OAM_V_RECTANGLE] =
{
[SPRITE_SIZE(8x16)] = { 8, 16 },
[SPRITE_SIZE(8x32)] = { 8, 32 },