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_rock.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_rock.c')
-rw-r--r-- | src/battle_anim_rock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index c2db62063..3e9eafb90 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -496,7 +496,7 @@ static void AnimFlyingSandCrescent(struct Sprite *sprite) { if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { - sprite->pos1.x = 304; + sprite->pos1.x = DISPLAY_WIDTH + 64; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; sprite->data[5] = 1; sprite->oam.matrixNum = ST_OAM_HFLIP; @@ -523,7 +523,7 @@ static void AnimFlyingSandCrescent(struct Sprite *sprite) if (sprite->data[5] == 0) { - if (sprite->pos1.x + sprite->pos2.x > 272) + if (sprite->pos1.x + sprite->pos2.x > DISPLAY_WIDTH + 32) { sprite->callback = DestroyAnimSprite; } |