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
src/pokenav_conditions_2.c
+7 -7
View File
@@ -161,7 +161,7 @@ bool32 OpenPartyConditionMenu(void)
if (structPtr == NULL)
return FALSE;
structPtr->monPicSpriteId = 0xFF;
structPtr->monPicSpriteId = SPRITE_NONE;
structPtr->loopedTaskId = CreateLoopedTask(LoopedTask_OpenPartyConditionGraph, 1);
structPtr->callback = GetPartyConditionLoopedTaskActive;
structPtr->windowModeState = 0;
@@ -694,7 +694,7 @@ void CreateMonMarkingsOrPokeballIndicators(void)
}
else
{
structPtr->partyPokeballSpriteIds[i] = 0xFF;
structPtr->partyPokeballSpriteIds[i] = SPRITE_NONE;
}
}
@@ -710,7 +710,7 @@ void CreateMonMarkingsOrPokeballIndicators(void)
}
else
{
structPtr->partyPokeballSpriteIds[i] = 0xFF;
structPtr->partyPokeballSpriteIds[i] = SPRITE_NONE;
}
}
@@ -725,7 +725,7 @@ void CreateMonMarkingsOrPokeballIndicators(void)
}
else
{
structPtr->partyPokeballSpriteIds[i] = 0xFF;
structPtr->partyPokeballSpriteIds[i] = SPRITE_NONE;
}
}
@@ -759,7 +759,7 @@ void sub_81CEBF4(struct Pokenav7Struct *structPtr)
FreeSpritePaletteByTag(0x66);
}
if (structPtr->monPicSpriteId != 0xFF)
if (structPtr->monPicSpriteId != SPRITE_NONE)
{
DestroySprite(&gSprites[structPtr->monPicSpriteId]);
FreeSpriteTilesByTag(0x64);
@@ -803,7 +803,7 @@ void CreateConditionMonPic(u8 id)
u8 spriteId;
struct Pokenav7Struct *structPtr = GetSubstructPtr(POKENAV_SUBSTRUCT_MON_MARK_MENU);
if (structPtr->monPicSpriteId == 0xFF)
if (structPtr->monPicSpriteId == SPRITE_NONE)
{
LoadConditionMonPicTemplate(&sprSheet, &sprTemplate, &sprPal);
sprSheet.data = GetConditionMonPicGfx(id);
@@ -816,7 +816,7 @@ void CreateConditionMonPic(u8 id)
{
FreeSpriteTilesByTag(0x64);
FreeSpritePaletteByTag(0x64);
structPtr->monPicSpriteId = 0xFF;
structPtr->monPicSpriteId = SPRITE_NONE;
}
else
{