Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format WindowTemplate in berry_blender.c

This commit is contained in:
Slawter666 2018-09-02 15:14:23 +01:00
parent 3119aae4b2
commit c9db9b7a59
1 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/berry_blender.c
View File

@ -322,18 +322,72 @@ static const struct BgTemplate sBerryBlenderBgTemplates[3] =
static const struct WindowTemplate sBerryBlender_WindowTemplates[] = static const struct WindowTemplate sBerryBlender_WindowTemplates[] =
{ {
{0, 1, 6, 7, 2, 0xE, 0x28}, {
{0, 0x16, 6, 7, 2, 0xE, 0x36}, .priority = 0,
{0, 1, 0xC, 7, 2, 0xE, 0x44}, .tilemapLeft = 1,
{0, 0x16, 0xC, 7, 2, 0xE, 0x52}, .tilemapTop = 6,
{0, 2, 0xF, 0x1B, 4, 0xE, 0x60}, .width = 7,
{0, 5, 3, 0x15, 0xE, 0xE, 0x60}, .height = 2,
.paletteNum = 14,
.baseBlock = 0x28,
},
{
.priority = 0,
.tilemapLeft = 22,
.tilemapTop = 6,
.width = 7,
.height = 2,
.paletteNum = 14,
.baseBlock = 0x36,
},
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 12,
.width = 7,
.height = 2,
.paletteNum = 14,
.baseBlock = 0x44,
},
{
.priority = 0,
.tilemapLeft = 22,
.tilemapTop = 12,
.width = 7,
.height = 2,
.paletteNum = 14,
.baseBlock = 0x52,
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 14,
.baseBlock = 0x60,
},
{
.priority = 0,
.tilemapLeft = 5,
.tilemapTop = 3,
.width = 21,
.height = 14,
.paletteNum = 14,
.baseBlock = 0x60,
},
DUMMY_WIN_TEMPLATE DUMMY_WIN_TEMPLATE
}; };
static const struct WindowTemplate sBlender_YesNoWindowTemplate = static const struct WindowTemplate sBlender_YesNoWindowTemplate =
{ {
0, 0x15, 9, 5, 4, 0xE, 0xCC .priority = 0,
.tilemapLeft = 21,
.tilemapTop = 9,
.width = 5,
.height = 4,
.paletteNum = 14,
.baseBlock = 0xCC
}; };
static const s8 sUnknown_083399C0[][2] = static const s8 sUnknown_083399C0[][2] =