ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Additional window id constant usage

Browse Source
This commit is contained in:
GriffinR 2023-02-01 15:24:15 -05:00
parent 4328ed8b19
commit 07e00b2e41
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/berry_tag_screen.c
View File

@ -599,7 +599,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
switch (data[0]) switch (data[0])
{ {
case 0x30: case 0x30:
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_BERRY_NAME, PIXEL_FILL(0));
break; break;
case 0x40: case 0x40:
PrintBerryNumberAndName(); PrintBerryNumberAndName();
@ -609,7 +609,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
CreateBerrySprite(); CreateBerrySprite();
break; break;
case 0x60: case 0x60:
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_SIZE_FIRM, PIXEL_FILL(0));
break; break;
case 0x70: case 0x70:
PrintBerrySize(); PrintBerrySize();
@ -621,7 +621,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
SetFlavorCirclesVisiblity(); SetFlavorCirclesVisiblity();
break; break;
case 0xA0: case 0xA0:
FillWindowPixelBuffer(2, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_DESC, PIXEL_FILL(0));
break; break;
case 0xB0: case 0xB0:
PrintBerryDescription1(); PrintBerryDescription1();
@ -636,7 +636,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
switch (data[0]) switch (data[0])
{ {
case 0x30: case 0x30:
FillWindowPixelBuffer(2, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_DESC, PIXEL_FILL(0));
break; break;
case 0x40: case 0x40:
PrintBerryDescription2(); PrintBerryDescription2();
@ -648,7 +648,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
SetFlavorCirclesVisiblity(); SetFlavorCirclesVisiblity();
break; break;
case 0x70: case 0x70:
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_SIZE_FIRM, PIXEL_FILL(0));
break; break;
case 0x80: case 0x80:
PrintBerryFirmness(); PrintBerryFirmness();
@ -661,7 +661,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
CreateBerrySprite(); CreateBerrySprite();
break; break;
case 0xB0: case 0xB0:
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_BERRY_NAME, PIXEL_FILL(0));
break; break;
case 0xC0: case 0xC0:
PrintBerryNumberAndName(); PrintBerryNumberAndName();

4
src/contest.c
View File

@ -5459,7 +5459,7 @@ static void Contest_StartTextPrinter(const u8 *currChar, bool32 b)
u8 speed; u8 speed;
printerTemplate.currentChar = currChar; printerTemplate.currentChar = currChar;
printerTemplate.windowId = 4; printerTemplate.windowId = WIN_GENERAL_TEXT;
printerTemplate.fontId = FONT_NORMAL; printerTemplate.fontId = FONT_NORMAL;
printerTemplate.x = 0; printerTemplate.x = 0;
printerTemplate.y = 1; printerTemplate.y = 1;
@ -5485,7 +5485,7 @@ static void Contest_StartTextPrinter(const u8 *currChar, bool32 b)
AddTextPrinter(&printerTemplate, speed, 0); AddTextPrinter(&printerTemplate, speed, 0);
} }
PutWindowTilemap(4); PutWindowTilemap(WIN_GENERAL_TEXT);
Contest_SetBgCopyFlags(0); Contest_SetBgCopyFlags(0);
} }

4
src/pokeblock.c
View File

@ -765,7 +765,7 @@ static void DrawPokeblockInfo(s32 pkblId)
struct Pokeblock *pokeblock; struct Pokeblock *pokeblock;
u16 rectTilemapSrc[2]; u16 rectTilemapSrc[2];
FillWindowPixelBuffer(7, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_FEEL, PIXEL_FILL(0));
if (pkblId != LIST_CANCEL) if (pkblId != LIST_CANCEL)
{ {
@ -802,7 +802,7 @@ static void DrawPokeblockInfo(s32 pkblId)
for (i = 0; i < FLAVOR_COUNT; i++) for (i = 0; i < FLAVOR_COUNT; i++)
CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2); CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2);
CopyWindowToVram(7, COPYWIN_GFX); CopyWindowToVram(WIN_FEEL, COPYWIN_GFX);
} }
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);

2
src/wireless_communication_status_screen.c
View File

@ -266,7 +266,7 @@ static void PrintHeaderTexts(void)
s32 i; s32 i;
FillWindowPixelBuffer(WIN_TITLE, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_TITLE, PIXEL_FILL(0));
FillWindowPixelBuffer(WIN_GROUP_NAMES, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_GROUP_NAMES, PIXEL_FILL(0));
FillWindowPixelBuffer(2, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_GROUP_COUNTS, PIXEL_FILL(0));
// Print title // Print title
WCSS_AddTextPrinterParameterized(WIN_TITLE, FONT_NORMAL, sHeaderTexts[0], GetStringCenterAlignXOffset(FONT_NORMAL, sHeaderTexts[0], 0xC0), 6, COLORMODE_GREEN); WCSS_AddTextPrinterParameterized(WIN_TITLE, FONT_NORMAL, sHeaderTexts[0], GetStringCenterAlignXOffset(FONT_NORMAL, sHeaderTexts[0], 0xC0), 6, COLORMODE_GREEN);