From 810ca5f8ff79aeec6ffe8e982f4786aade616b4d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Jul 2021 09:11:52 -0400 Subject: Flatten pos fields in struct Sprite --- src/battle_transition_frontier.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/battle_transition_frontier.c') diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c index cb3519c4e..2d34c9f86 100644 --- a/src/battle_transition_frontier.c +++ b/src/battle_transition_frontier.c @@ -243,7 +243,7 @@ static void SpriteCB_LogoCircleSlide(struct Sprite *sprite) { s16 *data = sprite->data; - if (sprite->pos1.x == data[0] && sprite->pos1.y == data[1]) + if (sprite->x == data[0] && sprite->y == data[1]) { sprite->callback = SpriteCallbackDummy; } @@ -251,7 +251,7 @@ static void SpriteCB_LogoCircleSlide(struct Sprite *sprite) { if (data[4] == data[6]) { - sprite->pos1.x += data[2]; + sprite->x += data[2]; data[4] = 0; } else @@ -261,7 +261,7 @@ static void SpriteCB_LogoCircleSlide(struct Sprite *sprite) if (data[5] == data[7]) { - sprite->pos1.y += data[3]; + sprite->y += data[3]; data[5] = 0; } else @@ -305,8 +305,8 @@ static u8 CreateSpiralingLogoCircleSprite(s16 x, s16 y, s16 arg2, s16 arg3, s16 static void SpriteCB_LogoCircleSpiral(struct Sprite *sprite) { - sprite->pos2.x = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 - sprite->pos2.y = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 + sprite->x2 = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 + sprite->y2 = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096 sprite->data[2] = (sprite->data[2] + sprite->data[3]) % 360; -- cgit v1.2.3