atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More SPRITE macro usage

Browse source
This commit is contained in:
GriffinR 2019-12-04 22:26:43 -05:00 committed by huderlem
parent 2756771958
commit c26e8b8ddb
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/battle_factory_screen.c
View file

@ -636,10 +636,10 @@ static const struct OamData gUnknown_086106D8 =
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
.bpp = ST_OAM_4BPP,
.shape = 0,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
.matrixNum = 0,
.size = 2,
.size = SPRITE_SIZE(32x32),
.tileNum = 0,
.priority = 3,
.paletteNum = 0,
@ -653,10 +653,10 @@ static const struct OamData gUnknown_086106E0 =
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
.bpp = ST_OAM_4BPP,
.shape = 0,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
.size = 1,
.size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 3,
.paletteNum = 0,
@ -670,10 +670,10 @@ static const struct OamData gUnknown_086106E8 =
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
.bpp = ST_OAM_4BPP,
.shape = 1,
.shape = SPRITE_SHAPE(32x16),
.x = 0,
.matrixNum = 0,
.size = 2,
.size = SPRITE_SIZE(32x16),
.tileNum = 0,
.priority = 2,
.paletteNum = 0,
@ -687,10 +687,10 @@ static const struct OamData gUnknown_086106F0 =
.objMode = ST_OAM_OBJ_BLEND,
.mosaic = 0,
.bpp = ST_OAM_4BPP,
.shape = 0,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,
.size = 3,
.size = SPRITE_SIZE(64x64),
.tileNum = 0,
.priority = 0,
.paletteNum = 0,

4
src/pokemon_jump.c
View file

@ -3557,8 +3557,8 @@ static void sub_802DD08(void)
struct UnkStruct3 unkStruct;
struct UnkStruct3 *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why.
ptr->shape = 0;
ptr->size = 0;
ptr->shape = SPRITE_SHAPE(8x8);
ptr->size = SPRITE_SIZE(8x8);
ptr->field_0_0 = 0;
ptr->priority = 1;
ptr->field_1 = 5;

2
src/trainer_pokemon_sprites.c
View file

@ -41,7 +41,7 @@ static const struct OamData gUnknown_0860B064 =
static const struct OamData gUnknown_0860B06C =
{
.affineMode = 1,
.affineMode = ST_OAM_AFFINE_NORMAL,
.shape = SPRITE_SHAPE(64x64),
.size = SPRITE_SIZE(64x64)
};