diff options
author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /src/ground.c | |
parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'src/ground.c')
-rw-r--r-- | src/ground.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ground.c b/src/ground.c index 807205ad8..ae3cf6c3e 100644 --- a/src/ground.c +++ b/src/ground.c @@ -153,7 +153,7 @@ void AnimBonemerangProjectile(struct Sprite *sprite) static void AnimBonemerangProjectileStep(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -170,7 +170,7 @@ static void AnimBonemerangProjectileStep(struct Sprite *sprite) static void AnimBonemerangProjectileEnd(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } @@ -530,7 +530,7 @@ void AnimFissureDirtPlumeParticle(struct Sprite *sprite) static void AnimFissureDirtPlumeParticleStep(struct Sprite *sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } |