Add palette selection constants
This commit is contained in:
+4
-4
@@ -589,12 +589,12 @@ static bool8 ShowPartyMenu(void)
|
||||
gMain.state++;
|
||||
break;
|
||||
case 21:
|
||||
BlendPalettes(0xFFFFFFFF, 16, 0);
|
||||
BlendPalettes(PALETTES_ALL, 16, 0);
|
||||
gPaletteFade.bufferTransferDisabled = FALSE;
|
||||
gMain.state++;
|
||||
break;
|
||||
case 22:
|
||||
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
|
||||
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
|
||||
gMain.state++;
|
||||
break;
|
||||
default:
|
||||
@@ -607,7 +607,7 @@ static bool8 ShowPartyMenu(void)
|
||||
|
||||
static void ExitPartyMenu(void)
|
||||
{
|
||||
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
|
||||
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
|
||||
CreateTask(Task_ExitPartyMenu, 0);
|
||||
SetVBlankCallback(VBlankCB_PartyMenu);
|
||||
SetMainCallback2(CB2_UpdatePartyMenu);
|
||||
@@ -1148,7 +1148,7 @@ static void SwapPartyPokemon(struct Pokemon *mon1, struct Pokemon *mon2)
|
||||
|
||||
static void Task_ClosePartyMenu(u8 taskId)
|
||||
{
|
||||
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
|
||||
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
|
||||
gTasks[taskId].func = Task_ClosePartyMenuAndSetCB2;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user