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

Use SPRITE_NONE constant

Browse Source
This commit is contained in:
GriffinR
2021-02-20 00:30:37 -05:00
parent a5852d57d1
commit b04f0aaa2b
19 changed files with 129 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pokemon_summary_screen.c
View File

@@ -1216,7 +1216,7 @@ static bool8 LoadGraphics(void)
break;
case 17:
sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON] = LoadMonGfxAndSprite(&sMonSummaryScreen->currentMon, &sMonSummaryScreen->switchCounter);
if (sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON] != 0xFF)
if (sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON] != SPRITE_NONE)
{
sMonSummaryScreen->switchCounter = 0;
gMain.state++;
@@ -1626,7 +1626,7 @@ static void Task_ChangeSummaryMon(u8 taskId)
break;
case 8:
sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON] = LoadMonGfxAndSprite(&sMonSummaryScreen->currentMon, &data[1]);
if (sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON] == 0xFF)
if (sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON] == SPRITE_NONE)
return;
gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON]].data[2] = 1;
TryDrawExperienceProgressBar();
@@ -3692,15 +3692,15 @@ static void ResetSpriteIds(void)
u8 i;
for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->spriteIds); i++)
sMonSummaryScreen->spriteIds[i] = 0xFF;
sMonSummaryScreen->spriteIds[i] = SPRITE_NONE;
}
static void DestroySpriteInArray(u8 spriteArrayId)
{
if (sMonSummaryScreen->spriteIds[spriteArrayId] != 0xFF)
if (sMonSummaryScreen->spriteIds[spriteArrayId] != SPRITE_NONE)
{
DestroySprite(&gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]]);
sMonSummaryScreen->spriteIds[spriteArrayId] = 0xFF;
sMonSummaryScreen->spriteIds[spriteArrayId] = SPRITE_NONE;
}
}
@@ -3716,7 +3716,7 @@ static void HidePageSpecificSprites(void)
for (i = SPRITE_ARR_ID_TYPE; i < ARRAY_COUNT(sMonSummaryScreen->spriteIds); i++)
{
if (sMonSummaryScreen->spriteIds[i] != 0xFF)
if (sMonSummaryScreen->spriteIds[i] != SPRITE_NONE)
SetSpriteInvisibility(i, TRUE);
}
}
@@ -3745,7 +3745,7 @@ static void CreateMoveTypeIcons(void)
for (i = SPRITE_ARR_ID_TYPE; i < SPRITE_ARR_ID_TYPE + 5; i++)
{
if (sMonSummaryScreen->spriteIds[i] == 0xFF)
if (sMonSummaryScreen->spriteIds[i] == SPRITE_NONE)
sMonSummaryScreen->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
SetSpriteInvisibility(i, TRUE);
@@ -4010,7 +4010,7 @@ static void CreateSetStatusSprite(void)
u8 *spriteId = &sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_STATUS];
u8 statusAnim;
if (*spriteId == 0xFF)
if (*spriteId == SPRITE_NONE)
*spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0);
statusAnim = GetMonAilment(&sMonSummaryScreen->currentMon);