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/rayquaza_scene.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/rayquaza_scene.c')
-rw-r--r-- | src/rayquaza_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 101916f13..24e76e1c9 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -1860,7 +1860,7 @@ static void SpriteCB_DuoFight_Groudon(struct Sprite *sprite) static void DuoFight_SlideGroudonDown(struct Sprite *sprite) { s16 *data = sprite->data; - if (sprite->pos1.y <= 160) + if (sprite->pos1.y <= DISPLAY_HEIGHT) { sprite->pos1.y += 8; gSprites[sprite->sGroudonBodySpriteId].pos1.y += 8; @@ -1965,7 +1965,7 @@ static void SpriteCB_DuoFight_Kyogre(struct Sprite *sprite) static void DuoFight_SlideKyogreDown(struct Sprite *sprite) { s16 *data = sprite->data; - if (sprite->pos1.y <= 160) + if (sprite->pos1.y <= DISPLAY_HEIGHT) { sprite->pos1.y += 8; gSprites[sprite->data[0] >> 8].pos1.y += 8; |