dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flatten pos fields in struct Sprite

Browse Source
This commit is contained in:
PikalaxALT
2021-07-07 09:05:48 -04:00
parent 1a43cdc81f
commit aec808ac0d
92 changed files with 2891 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/itemfinder.c
+12 -12
View File
@@ -597,12 +597,12 @@ static void SpriteCallback_Arrow(struct Sprite * sprite)
s16 x, y;
sprite->spCurX += sprite->spDeltaX;
sprite->spCurY += sprite->spDeltaY;
sprite->pos1.x = sprite->spCenterX + (sprite->spCurX >> 8);
sprite->pos1.y = sprite->spCenterY + (sprite->spCurY >> 8);
if (sprite->pos1.x <= 104
|| sprite->pos1.x > 132
|| sprite->pos1.y <= 60
|| sprite->pos1.y > 88)
sprite->x = sprite->spCenterX + (sprite->spCurX >> 8);
sprite->y = sprite->spCenterY + (sprite->spCurY >> 8);
if (sprite->x <= 104
|| sprite->x > 132
|| sprite->y <= 60
|| sprite->y > 88)
sprite->callback = SpriteCallback_DestroyArrow;
}
@@ -634,12 +634,12 @@ static void SpriteCallback_Star(struct Sprite * sprite)
s16 x, y;
sprite->spCurX += sprite->spDeltaX;
sprite->spCurY += sprite->spDeltaY;
sprite->pos1.x = sprite->spCenterX + (sprite->spCurX >> 8);
sprite->pos1.y = sprite->spCenterY + (sprite->spCurY >> 8);
if (sprite->pos1.x <= 104
|| sprite->pos1.x > 132
|| sprite->pos1.y <= 60
|| sprite->pos1.y > 88)
sprite->x = sprite->spCenterX + (sprite->spCurX >> 8);
sprite->y = sprite->spCenterY + (sprite->spCurY >> 8);
if (sprite->x <= 104
|| sprite->x > 132
|| sprite->y <= 60
|| sprite->y > 88)
sprite->callback = SpriteCallback_DestroyStar;
}