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
+5 -5
View File
@@ -517,7 +517,7 @@ static void CB2_StartShowContestResults(void)
memset(sContestResults->monResults, 0, sizeof(*sContestResults->monResults));
LoadContestResultSprites();
TryCreateWirelessSprites();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = FALSE;
sContestResults->data->showResultsTaskId = CreateTask(Task_ShowContestResults, 5);
SetMainCallback2(CB2_ShowContestResults);
@@ -1018,12 +1018,12 @@ static void Task_EndShowContestResults(u8 taskId)
if (gTasks[taskId].tTimer == 0)
{
DestroyTask(sContestResults->data->highlightWinnerTaskId);
BlendPalettes(0x0000FFFF, 16, RGB_BLACK);
BlendPalettes(PALETTES_BG, 16, RGB_BLACK);
gTasks[taskId].tTimer++;
}
else if (gTasks[taskId].tTimer == 1)
{
BlendPalettes(0xFFFF0000, 16, RGB_BLACK);
BlendPalettes(PALETTES_OBJECTS, 16, RGB_BLACK);
gTasks[taskId].tTimer++;
}
else
@@ -2102,7 +2102,7 @@ void StartContest(void)
{
ScriptContext2_Enable();
CreateTask(Task_StartContest, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
}
void BufferContestantMonSpecies(void)
@@ -2123,7 +2123,7 @@ void ShowContestResults(void)
{
ScriptContext2_Enable();
CreateTask(Task_StartShowContestResults, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
}
void GetContestPlayerId(void)