Add palette selection constants

This commit is contained in:
GriffinR
2021-02-24 11:01:02 -05:00
parent c6141fea83
commit b71b10623b
72 changed files with 359 additions and 355 deletions
+6 -6
View File
@@ -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;