dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

More usage of DISPLAY constants

Browse Source
This commit is contained in:
GriffinR
2021-04-15 02:04:01 -04:00
parent c4ef45c161
commit 62abcecc54
47 changed files with 232 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/battle_anim_ice.c
View File

@@ -696,8 +696,8 @@ static void AnimSwirlingSnowball(struct Sprite *sprite)
sprite->data[0] = 1;
AnimFastTranslateLinear(sprite);
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
|| sprite->pos1.y + sprite->pos2.y > 160
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
|| sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
|| sprite->pos1.y + sprite->pos2.y < -16)
break;
}
@@ -762,7 +762,7 @@ static void AnimSwirlingSnowball_End(struct Sprite *sprite)
sprite->data[0] = 1;
AnimFastTranslateLinear(sprite);
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
|| sprite->pos1.y + sprite->pos2.y > 256
|| sprite->pos1.y + sprite->pos2.y < -16)
DestroyAnimSprite(sprite);
@@ -816,8 +816,8 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
{
sprite->data[0] = 1;
AnimFastTranslateLinear(sprite);
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
|| sprite->pos1.y + sprite->pos2.y > 160
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
|| sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
|| sprite->pos1.y + sprite->pos2.y < -16)
break;
}
@@ -846,8 +846,8 @@ static void AnimWiggleParticleTowardsTarget(struct Sprite *sprite)
sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
if (sprite->data[0] == 1)
{
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
|| sprite->pos1.y + sprite->pos2.y > 160
if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
|| sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
|| sprite->pos1.y + sprite->pos2.y < -16)
DestroyAnimSprite(sprite);
}