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
@@ -569,7 +569,7 @@ static void ShowUsePokeblockMenu(void)
switch (sInfo->mainState)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
SetVBlankCallback(VBlankCB_UsePokeblockMenu);
ShowBg(0);
ShowBg(1);
@@ -695,7 +695,7 @@ static void FeedPokeblockToMon(void)
gPokeblockMonId = GetPartyIdFromSelectionId(sMenu->info.curSelection);
sExitCallback = sInfo->exitCallback;
sPokeblock = sInfo->pokeblock;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sInfo->mainState++;
break;
case 1:
@@ -739,7 +739,7 @@ static void ShowUsePokeblockMenuForResults(void)
case 2:
break;
case 3:
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BlendPalettes(PALETTES_ALL, 16, RGB_BLACK);
sInfo->mainState++;
break;
case 4:
@@ -751,7 +751,7 @@ static void ShowUsePokeblockMenuForResults(void)
break;
case 5:
SetVBlankCallback(VBlankCB_UsePokeblockMenu);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sInfo->mainState++;
break;
case 6:
@@ -827,7 +827,7 @@ static void CloseUsePokeblockMenu(void)
switch (sInfo->mainState)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sInfo->mainState++;
break;
case 1: