dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Improve window palette macros

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pokemon_summary_screen.c
View File

@@ -2631,7 +2631,7 @@ static void ResetWindows(void)
for (i = 0; i < 20; i++)
{
FillWindowPixelBuffer(i, PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(i, PALETTE_NUM_TO_FILL_VALUE(0));
}
for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
{
@@ -2646,9 +2646,9 @@ static void SummaryScreen_PrintTextOnWindow(u8 windowId, const u8 *string, u8 x,
static void sub_81C25E8(void)
{
FillWindowPixelBuffer(17, PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(18, PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(19, PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(17, PALETTE_NUM_TO_FILL_VALUE(0));
FillWindowPixelBuffer(18, PALETTE_NUM_TO_FILL_VALUE(0));
FillWindowPixelBuffer(19, PALETTE_NUM_TO_FILL_VALUE(0));
if (!pssData->summary.isEgg)
sub_81C2628();
else
@@ -2899,7 +2899,7 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te
if (*windowIdPtr == 0xFF)
{
*windowIdPtr = AddWindow(&template[templateId]);
FillWindowPixelBuffer(*windowIdPtr, PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(*windowIdPtr, PALETTE_NUM_TO_FILL_VALUE(0));
}
return *windowIdPtr;
}
@@ -2921,7 +2921,7 @@ static void PrintPageSpecificText(u8 pageIndex)
for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
{
if (pssData->windowIds[i] != 0xFF)
FillWindowPixelBuffer(pssData->windowIds[i], PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(pssData->windowIds[i], PALETTE_NUM_TO_FILL_VALUE(0));
}
sTextPrinterFunctions[pageIndex]();
}
@@ -3568,7 +3568,7 @@ static void PrintContestMoveDescription(u8 moveSlot)
static void PrintMoveDetails(u16 move)
{
u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2);
FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0));
if (move != MOVE_NONE)
{
if (pssData->currPageIndex == 2)
@@ -3642,7 +3642,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2)
static void PrintHMMovesCantBeForgotten(void)
{
u8 windowId = AddWindowFromTemplateList(gUnknown_0861CD14, 2);
FillWindowPixelBuffer(windowId, PIXEL_BUFFER_TRANSPARENT);
FillWindowPixelBuffer(windowId, PALETTE_NUM_TO_FILL_VALUE(0));
SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0);
}