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/starter_choose.c
+27 -13
View File
@@ -170,10 +170,10 @@ static const struct OamData gOamData_85B1E10 =
.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,
@@ -187,10 +187,10 @@ static const struct OamData gOamData_85B1E18 =
.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,
@@ -204,10 +204,10 @@ static const struct OamData gOamData_85B1E20 =
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,
.size = 3,
.size = SPRITE_SIZE(64x64),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
@@ -296,21 +296,35 @@ static const union AffineAnimCmd * const gSpriteAffineAnimTable_85B1ED4[] = {gSp
static const struct CompressedSpriteSheet gUnknown_085B1ED8[] =
{
gUnknown_085B18AC, 0x0800, 0x1000,
NULL,
{
.data = gUnknown_085B18AC,
.size = 0x0800,
.tag = 0x1000
},
{}
};
static const struct CompressedSpriteSheet gUnknown_085B1EE8[] =
{
gUnknown_085B1BCC, 0x0800, 0x1001,
NULL,
{
.data = gUnknown_085B1BCC,
.size = 0x0800,
.tag = 0x1001
},
{}
};
static const struct SpritePalette gUnknown_085B1EF8[] =
{
gBirchBallarrow_Pal, 0x1000,
gBirchCircle_Pal, 0x1001,
NULL,
{
.data = gBirchBallarrow_Pal,
.tag = 0x1000
},
{
.data = gBirchCircle_Pal,
.tag = 0x1001
},
{},
};
static const struct SpriteTemplate sSpriteTemplate_Hand =