diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-24 11:01:02 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-02-24 11:03:51 -0500 |
| commit | b71b10623b31065a9a29b43938cf602087bcfc73 (patch) | |
| tree | b20d6c8f8c20f4adeac0983110281f09e7923c05 /src/contest_util.c | |
| parent | c6141fea831a30a0d2de24b3c02375a01014ec97 (diff) | |
Add palette selection constants
Diffstat (limited to 'src/contest_util.c')
| -rw-r--r-- | src/contest_util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/contest_util.c b/src/contest_util.c index 176360bc3..e5fd51db1 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -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) |