diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-07 09:05:48 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-07 09:05:48 -0400 |
commit | aec808ac0d6266dc1c96ecf1aca998a06b11db19 (patch) | |
tree | 74759e6d06b82ec3308e7ca8242d706604395f7b /src/itemfinder.c | |
parent | 1a43cdc81f31dc6213366beb9808f6f610580c49 (diff) |
Flatten pos fields in struct Sprite
Diffstat (limited to 'src/itemfinder.c')
-rw-r--r-- | src/itemfinder.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/itemfinder.c b/src/itemfinder.c index 434bd87a2..7d61545de 100644 --- a/src/itemfinder.c +++ b/src/itemfinder.c @@ -597,12 +597,12 @@ static void SpriteCallback_Arrow(struct Sprite * sprite) s16 x, y; sprite->spCurX += sprite->spDeltaX; sprite->spCurY += sprite->spDeltaY; - sprite->pos1.x = sprite->spCenterX + (sprite->spCurX >> 8); - sprite->pos1.y = sprite->spCenterY + (sprite->spCurY >> 8); - if (sprite->pos1.x <= 104 - || sprite->pos1.x > 132 - || sprite->pos1.y <= 60 - || sprite->pos1.y > 88) + sprite->x = sprite->spCenterX + (sprite->spCurX >> 8); + sprite->y = sprite->spCenterY + (sprite->spCurY >> 8); + if (sprite->x <= 104 + || sprite->x > 132 + || sprite->y <= 60 + || sprite->y > 88) sprite->callback = SpriteCallback_DestroyArrow; } @@ -634,12 +634,12 @@ static void SpriteCallback_Star(struct Sprite * sprite) s16 x, y; sprite->spCurX += sprite->spDeltaX; sprite->spCurY += sprite->spDeltaY; - sprite->pos1.x = sprite->spCenterX + (sprite->spCurX >> 8); - sprite->pos1.y = sprite->spCenterY + (sprite->spCurY >> 8); - if (sprite->pos1.x <= 104 - || sprite->pos1.x > 132 - || sprite->pos1.y <= 60 - || sprite->pos1.y > 88) + sprite->x = sprite->spCenterX + (sprite->spCurX >> 8); + sprite->y = sprite->spCenterY + (sprite->spCurY >> 8); + if (sprite->x <= 104 + || sprite->x > 132 + || sprite->y <= 60 + || sprite->y > 88) sprite->callback = SpriteCallback_DestroyStar; } |