Flatten pos fields in struct Sprite

This commit is contained in:
PikalaxALT
2021-07-07 09:11:52 -04:00
parent 3964820a84
commit 810ca5f8ff
111 changed files with 3764 additions and 3764 deletions
+4 -4
View File
@@ -493,7 +493,7 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
return;
}
}
sMenu->windowSprites[1]->pos1.y = y + 96;
sMenu->windowSprites[1]->y = y + 96;
// Create marking sprites
@@ -526,8 +526,8 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
sMenu->textSprite->oam.shape = SPRITE_SHAPE(32x32);
sMenu->textSprite->oam.size = SPRITE_SIZE(32x32);
StartSpriteAnim(sMenu->textSprite, ANIM_TEXT);
sMenu->textSprite->pos1.x = x + 32;
sMenu->textSprite->pos1.y = y + 80;
sMenu->textSprite->x = x + 32;
sMenu->textSprite->y = y + 80;
CalcCenterToCornerVec(sMenu->textSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF);
}
else
@@ -567,7 +567,7 @@ static void SpriteCB_Marking(struct Sprite *sprite)
static void SpriteCB_Cursor(struct Sprite *sprite)
{
sprite->pos1.y = (16 * sMenu->cursorPos) + sprite->sCursorYOffset;
sprite->y = (16 * sMenu->cursorPos) + sprite->sCursorYOffset;
}
#undef sCursorYOffset