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

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR
2023-02-01 14:59:45 -05:00
parent c91b13a12b 603d870ea0
commit 4328ed8b19
259 changed files with 4375 additions and 5702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/menu_specialized.c
View File

@@ -113,7 +113,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 1,
.width = 16,
.height = 12,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0xA
},
[RELEARNERWIN_DESC_CONTEST] = {
@@ -122,7 +122,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 1,
.width = 16,
.height = 12,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0xCA
},
[RELEARNERWIN_MOVE_LIST] = {
@@ -131,7 +131,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 1,
.width = 10,
.height = 12,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x18A
},
[RELEARNERWIN_MSG] = {
@@ -140,7 +140,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
.tilemapTop = 15,
.width = 22,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x202
},
// Unused. Identical to sMoveRelearnerYesNoMenuTemplate
@@ -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 useContestWindow)
InitWindows(sMoveRelearnerWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowBorderGfx(0, 1, 0xE0);
LoadPalette(gStandardMenuPalette, 0xF0, 0x20);
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));