summaryrefslogtreecommitdiff
path: root/src/trainer_card.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-02-24 11:01:02 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-02-24 11:03:51 -0500
commitb71b10623b31065a9a29b43938cf602087bcfc73 (patch)
treeb20d6c8f8c20f4adeac0983110281f09e7923c05 /src/trainer_card.c
parentc6141fea831a30a0d2de24b3c02375a01014ec97 (diff)
Add palette selection constants
Diffstat (limited to 'src/trainer_card.c')
-rwxr-xr-xsrc/trainer_card.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 791f1c290..c42c16845 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -414,8 +414,8 @@ static void Task_TrainerCard(u8 taskId)
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(230, 150);
}
- BlendPalettes(0xFFFFFFFF, 16, sData->blendColor);
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, sData->blendColor);
+ BlendPalettes(PALETTES_ALL, 16, sData->blendColor);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, sData->blendColor);
SetVBlankCallback(VblankCb_TrainerCard);
sData->mainState++;
break;
@@ -452,7 +452,7 @@ static void Task_TrainerCard(u8 taskId)
}
else
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, sData->blendColor);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, sData->blendColor);
sData->mainState = STATE_CLOSE_CARD;
}
}
@@ -473,7 +473,7 @@ static void Task_TrainerCard(u8 taskId)
}
else if (gReceivedRemoteLinkPlayers)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, sData->blendColor);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, sData->blendColor);
sData->mainState = STATE_CLOSE_CARD;
}
else
@@ -491,7 +491,7 @@ static void Task_TrainerCard(u8 taskId)
}
else
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, sData->blendColor);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, sData->blendColor);
sData->mainState = STATE_CLOSE_CARD;
}
}
@@ -506,7 +506,7 @@ static void Task_TrainerCard(u8 taskId)
case STATE_CLOSE_CARD_LINK:
if (!gReceivedRemoteLinkPlayers)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, sData->blendColor);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, sData->blendColor);
sData->mainState = STATE_CLOSE_CARD;
}
break;