summaryrefslogtreecommitdiff
path: root/src/list_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/list_menu.c')
-rw-r--r--src/list_menu.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/list_menu.c b/src/list_menu.c
index 9ac9b87ab..84b917eec 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -683,7 +683,7 @@ static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
cursor.rowWidth = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8 + 2;
cursor.rowHeight = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + 2;
cursor.tileTag = 0x4000;
- cursor.palTag = SPRITE_INVALID_TAG;
+ cursor.palTag = TAG_NONE;
cursor.palNum = 15;
return ListMenuAddCursorObjectInternal(&cursor, cursorKind);
@@ -1024,11 +1024,11 @@ static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite)
{
case 0:
multiplier = sprite->tMultiplier;
- sprite->pos2.x = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
+ sprite->x2 = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
break;
case 1:
multiplier = sprite->tMultiplier;
- sprite->pos2.y = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
+ sprite->y2 = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
break;
}
sprite->tSinePos += sprite->tFrequency;
@@ -1076,7 +1076,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
spriteSheet.tag = arrowInfo->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
- if (arrowInfo->palTag == SPRITE_INVALID_TAG)
+ if (arrowInfo->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20);
}
@@ -1099,7 +1099,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;
@@ -1179,9 +1179,9 @@ void RemoveScrollIndicatorArrowPair(u8 taskId)
{
struct ScrollIndicatorPair *data = (void*) 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]);
@@ -1322,7 +1322,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
- if (cursor->palTag == SPRITE_INVALID_TAG)
+ if (cursor->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
}
@@ -1352,7 +1352,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
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;
}
@@ -1364,8 +1364,8 @@ static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y)
{
struct RedOutlineCursor *data = (void*) gTasks[taskId].data;
- gSprites[data->spriteId].pos1.x = x + 120;
- gSprites[data->spriteId].pos1.y = y + 120;
+ gSprites[data->spriteId].x = x + 120;
+ gSprites[data->spriteId].y = y + 120;
}
static void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
@@ -1374,9 +1374,9 @@ static void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
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]);
@@ -1385,7 +1385,7 @@ static void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
static void SpriteCallback_RedArrowCursor(struct Sprite *sprite)
{
- sprite->pos2.x = gSineTable[(u8)(sprite->data[0])] / 64;
+ sprite->x2 = gSineTable[(u8)(sprite->data[0])] / 64;
sprite->data[0] += 8;
}
@@ -1407,7 +1407,7 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
- if (cursor->palTag == SPRITE_INVALID_TAG)
+ if (cursor->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
}
@@ -1429,10 +1429,10 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
spriteTemplate.paletteTag = cursor->palTag;
data->spriteId = CreateSprite(&spriteTemplate, cursor->left, cursor->top, 0);
- gSprites[data->spriteId].pos2.x = 8;
- gSprites[data->spriteId].pos2.y = 8;
+ 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;
}
@@ -1444,17 +1444,17 @@ static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y)
{
struct RedArrowCursor *data = (void*) gTasks[taskId].data;
- gSprites[data->spriteId].pos1.x = x;
- gSprites[data->spriteId].pos1.y = y;
+ gSprites[data->spriteId].x = x;
+ gSprites[data->spriteId].y = y;
}
static void ListMenuRemoveRedArrowCursorObject(u8 taskId)
{
struct RedArrowCursor *data = (void*) 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]);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:55:47 +0000