diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-25 12:51:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 12:51:51 -0400 |
| commit | 1150e16b68c5e6fc2c7baf56ab061cea69d69953 (patch) | |
| tree | 55aafd11c76cb39fe2a83cc7839f5b0f7d7efa9c /src/mon_markings.c | |
| parent | cd8ac0ed9b9e9f53979409bf1a99d62132e5001b (diff) | |
| parent | aec808ac0d6266dc1c96ecf1aca998a06b11db19 (diff) | |
Merge pull request #450 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
Diffstat (limited to 'src/mon_markings.c')
| -rw-r--r-- | src/mon_markings.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mon_markings.c b/src/mon_markings.c index 7e44a77b0..b9f1ebe96 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -392,7 +392,7 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 tilesTag, u16 palette } } - sMenu->menuWindowSprites[1]->pos1.y = y + 96; + sMenu->menuWindowSprites[1]->y = y + 96; sprTemplate.tileTag++; sprTemplate.paletteTag++; @@ -425,8 +425,8 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 tilesTag, u16 palette sMenu->menuTextSprite->oam.shape = ST_OAM_SQUARE; sMenu->menuTextSprite->oam.size = 2; StartSpriteAnim(sMenu->menuTextSprite, 9); - sMenu->menuTextSprite->pos1.x = x + 32; - sMenu->menuTextSprite->pos1.y = y + 80; + sMenu->menuTextSprite->x = x + 32; + sMenu->menuTextSprite->y = y + 80; CalcCenterToCornerVec(sMenu->menuTextSprite, 1, 2, 0); } else @@ -463,7 +463,7 @@ static void SpriteCB_MarkingIcon(struct Sprite * sprite) static void SpriteCB_Cursor(struct Sprite * sprite) { - sprite->pos1.y = 16 * sMenu->cursorPos + sprite->data[0]; + sprite->y = 16 * sMenu->cursorPos + sprite->data[0]; } struct Sprite * CreateMonMarkingSprite_SelectCombo(u16 tileTag, u16 paletteTag, const u16 *palette) |