Decimal paletteNums

This commit is contained in:
Martin Griffin
2022-08-19 16:32:00 +01:00
parent 5719a7f7bc
commit d57442a511
103 changed files with 1032 additions and 1032 deletions

View File

@@ -48,7 +48,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT
.tilemapTop = 1,
.width = 8,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x8
},
[MAILBOXWIN_LIST] = {
@@ -57,7 +57,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT
.tilemapTop = 1,
.width = 8,
.height = 18,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x18
},
[MAILBOXWIN_OPTIONS] = {
@@ -66,7 +66,7 @@ static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT
.tilemapTop = 1,
.width = 11,
.height = 8,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x18
}
};
@@ -114,7 +114,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 1,
.width = 16,
.height = 12,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0xA
},
{
@@ -123,7 +123,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 1,
.width = 16,
.height = 12,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0xCA
},
{
@@ -132,7 +132,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 1,
.width = 10,
.height = 12,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x18A
},
{
@@ -141,7 +141,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 15,
.width = 22,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x202
},
{
@@ -150,7 +150,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 8,
.width = 5,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x25A
},
DUMMY_WIN_TEMPLATE
@@ -163,7 +163,7 @@ static const struct WindowTemplate sMoveRelearnerYesNoMenuTemplate =
.tilemapTop = 8,
.width = 5,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x25A
};
@@ -707,8 +707,8 @@ void InitMoveRelearnerWindows(bool8 useContextWindow)
InitWindows(sMoveRelearnerWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xE));
LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP);
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(14));
LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
for (i = 0; i < ARRAY_COUNT(sMoveRelearnerWindowTemplates) - 1; i++)
FillWindowPixelBuffer(i, PIXEL_FILL(1));