summaryrefslogtreecommitdiff
path: root/src/battle/anim/note_spin.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-07-08 10:23:22 -0400
committerGitHub <noreply@github.com>2021-07-08 10:23:22 -0400
commita3228d4c86494ee25aff60fc037805ddc1d47d32 (patch)
tree082b433e0f10e758799ce2501f49f959f2ce54b3 /src/battle/anim/note_spin.c
parent038befb44341f0fc22f522dd454d64cf4ad2df2e (diff)
parentb86d6d05d92de28c35c899f4fbd03c1d542dc689 (diff)
Merge pull request #828 from PikalaxALT/battle_struct_macros
Battle struct macros
Diffstat (limited to 'src/battle/anim/note_spin.c')
-rw-r--r--src/battle/anim/note_spin.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c
index c2b4e169c..6b80d4880 100644
--- a/src/battle/anim/note_spin.c
+++ b/src/battle/anim/note_spin.c
@@ -90,8 +90,8 @@ void sub_80D2EC8(struct Sprite *sprite)
if (sprite->data[0] == 0)
{
- sprite->pos1.x = 120;
- sprite->pos1.y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15;
+ sprite->x = 120;
+ sprite->y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15;
StartSpriteAnim(sprite, gBattleAnimArgs[1]);
@@ -107,9 +107,9 @@ void sub_80D2EC8(struct Sprite *sprite)
sprite->data[6] = (sprite->data[6] + 10) & 0xFF;
index &= var2;
- sprite->pos2.x = Cos(index, 100);
+ sprite->x2 = Cos(index, 100);
- sprite->pos2.y = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4);
+ sprite->y2 = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4);
if (sprite->data[0] > sprite->data[5])
{
@@ -137,7 +137,7 @@ static void sub_80D2F80(struct Sprite *sprite)
static void sub_80D2FA4(struct Sprite *sprite)
{
sprite->data[3] += sprite->data[2];
- sprite->pos2.y = sprite->data[3];
+ sprite->y2 = sprite->data[3];
sprite->data[2]++;