summaryrefslogtreecommitdiff
path: root/src/pokemon_summary_screen.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-07-07 09:11:52 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-07-07 09:11:52 -0400
commit810ca5f8ff79aeec6ffe8e982f4786aade616b4d (patch)
tree7732fc02ff8ced046cedcbd9643122aba7c7706a /src/pokemon_summary_screen.c
parent3964820a84e4819bb807d601d2c3c7b196f764e8 (diff)
Flatten pos fields in struct Sprite
Diffstat (limited to 'src/pokemon_summary_screen.c')
-rw-r--r--src/pokemon_summary_screen.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 31505b7c9..9c41f9147 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -3772,8 +3772,8 @@ static void SetTypeSpritePosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
struct Sprite *sprite = &gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]];
StartSpriteAnim(sprite, typeId);
sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId];
- sprite->pos1.x = x + 16;
- sprite->pos1.y = y + 8;
+ sprite->x = x + 16;
+ sprite->y = y + 8;
SetSpriteInvisibility(spriteArrayId, FALSE);
}
@@ -3999,8 +3999,8 @@ static void CreateMonMarkingsSprite(struct Pokemon *mon)
if (sprite != NULL)
{
StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS));
- sMonSummaryScreen->markingsSprite->pos1.x = 60;
- sMonSummaryScreen->markingsSprite->pos1.y = 26;
+ sMonSummaryScreen->markingsSprite->x = 60;
+ sMonSummaryScreen->markingsSprite->y = 26;
sMonSummaryScreen->markingsSprite->oam.priority = 1;
}
}
@@ -4087,9 +4087,9 @@ static void SpriteCb_MoveSelector(struct Sprite *sprite)
}
if (sprite->data[0] == SPRITE_ARR_ID_MOVE_SELECTOR1)
- sprite->pos2.y = sMonSummaryScreen->firstMoveIndex * 16;
+ sprite->y2 = sMonSummaryScreen->firstMoveIndex * 16;
else
- sprite->pos2.y = sMonSummaryScreen->secondMoveIndex * 16;
+ sprite->y2 = sMonSummaryScreen->secondMoveIndex * 16;
}
static void DestroyMoveSelectorSprites(u8 firstArrayId)