Improve window palette macros

This commit is contained in:
Phlosioneer
2019-02-21 23:27:12 -05:00
parent 399d646e3f
commit c96f8751cd
60 changed files with 301 additions and 306 deletions

View File

@@ -1191,7 +1191,7 @@ static bool32 LoadMatchCallWindowGfx(u8 taskId)
return FALSE;
}
FillWindowPixelBuffer(taskData[2], 0x88);
FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8));
LoadPalette(sUnknown_0860EA4C, 0xE0, 0x20);
LoadPalette(sPokeNavIconPalette, 0xF0, 0x20);
ChangeBgY(0, -0x2000, 0);
@@ -1241,7 +1241,7 @@ static bool32 sub_81962D8(u8 taskId)
s16 *taskData = gTasks[taskId].data;
if (!ExecuteMatchCallTextPrinter(taskData[2]))
{
FillWindowPixelBuffer(taskData[2], 0x88);
FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8));
if (!gMatchCallState.triggeredFromScript)
SelectMatchCallMessage(gMatchCallState.trainerId, gStringVar4);
@@ -1257,7 +1257,7 @@ static bool32 sub_8196330(u8 taskId)
s16 *taskData = gTasks[taskId].data;
if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && gMain.newKeys & (A_BUTTON | B_BUTTON))
{
FillWindowPixelBuffer(taskData[2], 0x88);
FillWindowPixelBuffer(taskData[2], PALETTE_NUM_TO_FILL_VALUE(8));
CopyWindowToVram(taskData[2], 2);
PlaySE(SE_TOREOFF);
return TRUE;