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_throw.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_throw.c')
| -rwxr-xr-x | src/battle_anim_throw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c index d36f6c3f9..f6a48cf69 100755 --- a/src/battle_anim_throw.c +++ b/src/battle_anim_throw.c @@ -1537,7 +1537,7 @@ static void SpriteCB_Ball_Block_Step(struct Sprite *sprite) sprite->sDy = (sprite->sDy + 0x800) & 0xFF; sprite->sDx = (sprite->sDx + 0x680) & 0xFF; - if (sprite->pos1.y + sprite->pos2.y > 160 + if (sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT || sprite->pos1.x + sprite->pos2.x < -8) { sprite->sFrame = 0; |