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

SPRITE_INVALID_TAG -> TAG_NONE

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-29 18:37:43 -04:00
parent dfe6c6885c
commit c40791fd4e
12 changed files with 245 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menu_indicators.c
+12 -12
View File
@@ -331,7 +331,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
spriteSheet.size = 0x100;
spriteSheet.tag = arrowInfo->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
if (arrowInfo->palTag == SPRITE_INVALID_TAG)
if (arrowInfo->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20);
}
@@ -353,7 +353,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
data->topSpriteId = AddScrollIndicatorArrowObject(arrowInfo->firstArrowType, arrowInfo->firstX, arrowInfo->firstY, arrowInfo->tileTag, arrowInfo->palTag);
data->bottomSpriteId = AddScrollIndicatorArrowObject(arrowInfo->secondArrowType, arrowInfo->secondX, arrowInfo->secondY, arrowInfo->tileTag, arrowInfo->palTag);
if (arrowInfo->palTag == SPRITE_INVALID_TAG)
if (arrowInfo->palTag == TAG_NONE)
{
gSprites[data->topSpriteId].oam.paletteNum = arrowInfo->palNum;
gSprites[data->bottomSpriteId].oam.paletteNum = arrowInfo->palNum;
@@ -410,9 +410,9 @@ void RemoveScrollIndicatorArrowPair(u8 taskId)
{
struct ScrollIndicatorPair *data = (struct ScrollIndicatorPair *)gTasks[taskId].data;
if (data->tileTag != SPRITE_INVALID_TAG)
if (data->tileTag != TAG_NONE)
FreeSpriteTilesByTag(data->tileTag);
if (data->palTag != SPRITE_INVALID_TAG)
if (data->palTag != TAG_NONE)
FreeSpritePaletteByTag(data->palTag);
DestroySprite(&gSprites[data->topSpriteId]);
DestroySprite(&gSprites[data->bottomSpriteId]);
@@ -537,7 +537,7 @@ u8 ListMenuAddRedOutlineCursorObject(const struct CursorStruct *cursor)
spriteSheet.size = 0x100;
spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
if (cursor->palTag == SPRITE_INVALID_TAG)
if (cursor->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
}
@@ -562,7 +562,7 @@ u8 ListMenuAddRedOutlineCursorObject(const struct CursorStruct *cursor)
gSprites[data->spriteId].oam.priority = 0;
gSprites[data->spriteId].subpriority = 0;
gSprites[data->spriteId].subspriteTableNum = 0;
if (cursor->palTag == SPRITE_INVALID_TAG)
if (cursor->palTag == TAG_NONE)
gSprites[data->spriteId].oam.paletteNum = cursor->palNum;
return taskId;
}
@@ -580,9 +580,9 @@ void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
struct RedOutlineCursor *data = (struct RedOutlineCursor *)gTasks[taskId].data;
Free(data->subspritesPtr);
if (data->tileTag != SPRITE_INVALID_TAG)
if (data->tileTag != TAG_NONE)
FreeSpriteTilesByTag(data->tileTag);
if (data->palTag != SPRITE_INVALID_TAG)
if (data->palTag != TAG_NONE)
FreeSpritePaletteByTag(data->palTag);
DestroySprite(&gSprites[data->spriteId]);
DestroyTask(taskId);
@@ -610,7 +610,7 @@ static u8 ListMenuAddRedArrowCursorObject(const struct CursorStruct *cursor)
spriteSheet.size = 0x80;
spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
if (cursor->palTag == SPRITE_INVALID_TAG)
if (cursor->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
}
@@ -630,7 +630,7 @@ static u8 ListMenuAddRedArrowCursorObject(const struct CursorStruct *cursor)
data->spriteId = CreateSprite(&spriteTemplate, cursor->left, cursor->top, 0);
gSprites[data->spriteId].x2 = 8;
gSprites[data->spriteId].y2 = 8;
if (cursor->palTag == SPRITE_INVALID_TAG)
if (cursor->palTag == TAG_NONE)
gSprites[data->spriteId].oam.paletteNum = cursor->palNum;
return taskId;
}
@@ -647,9 +647,9 @@ static void ListMenuRemoveRedArrowCursorObject(u8 taskId)
{
struct RedArrowCursor *data = (struct RedArrowCursor *)gTasks[taskId].data;
if (data->tileTag != SPRITE_INVALID_TAG)
if (data->tileTag != TAG_NONE)
FreeSpriteTilesByTag(data->tileTag);
if (data->palTag != SPRITE_INVALID_TAG)
if (data->palTag != TAG_NONE)
FreeSpritePaletteByTag(data->palTag);
DestroySprite(&gSprites[data->spriteId]);
DestroyTask(taskId);