diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-16 01:30:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 01:30:03 -0400 |
| commit | c1da6b29bc853df1a42f08adb9b141de747dae55 (patch) | |
| tree | 4a29484dd11d60bb13edc449adaa2e409f444af4 /src/battle_anim_flying.c | |
| parent | 70d0b81fe08e4b3baa5c3c7f8e81909c74477eb7 (diff) | |
| parent | f94540c2b875cff0085149b95728d2f0a0c610eb (diff) | |
Merge pull request #1405 from GriffinRichards/constants-display
Add more usage of DISPLAY constants, misc REG constants
Diffstat (limited to 'src/battle_anim_flying.c')
| -rw-r--r-- | src/battle_anim_flying.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index 5955d203e..9e3e6c33e 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -496,7 +496,7 @@ static void AnimFlyBallAttack(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { - sprite->pos1.x = 272; + sprite->pos1.x = DISPLAY_WIDTH + 32; sprite->pos1.y = -32; StartSpriteAffineAnim(sprite, 1); } @@ -528,8 +528,8 @@ static void AnimFlyBallAttack_Step(struct Sprite *sprite) } if (sprite->pos1.x + sprite->pos2.x < -32 - || sprite->pos1.x + sprite->pos2.x > 272 - || sprite->pos1.y + sprite->pos2.y > 160) + || sprite->pos1.x + sprite->pos2.x > DISPLAY_WIDTH + 32 + || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT) { gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = FALSE; DestroyAnimSprite(sprite); |