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/seagallop.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/seagallop.c')
-rw-r--r-- | src/seagallop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/seagallop.c b/src/seagallop.c index 8d10b4078..d1647438e 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -405,7 +405,7 @@ static void CreateFerrySprite(void) } else { - gSprites[spriteId].pos1.x = 240; + gSprites[spriteId].x = 240; gSprites[spriteId].data[0] *= -1; } } @@ -413,13 +413,13 @@ static void CreateFerrySprite(void) static void SpriteCB_Ferry(struct Sprite * sprite) { sprite->data[1] += sprite->data[0]; - sprite->pos2.x = sprite->data[1] >> 4; + sprite->x2 = sprite->data[1] >> 4; if (sprite->data[2] % 5 == 0) { - CreateWakeSprite(sprite->pos1.x + sprite->pos2.x); + CreateWakeSprite(sprite->x + sprite->x2); } sprite->data[2]++; - if ((u16)(300 + sprite->pos2.x) > 600) + if ((u16)(300 + sprite->x2) > 600) { DestroySprite(sprite); } |