ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 20:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format WindowTemplate in battle_pyramid_bag.c

Browse Source
This commit is contained in:
Slawter666 2018-09-02 16:26:23 +01:00
parent c1b3dfa15a
commit 6106154801
2 changed files with 84 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/battle_pyramid_bag.c
View File

@ -193,20 +193,92 @@ static const u8 sColorTable[][3] =
static const struct WindowTemplate gUnknown_0861F328[] = static const struct WindowTemplate gUnknown_0861F328[] =
{ {
{0x00, 0x0e, 0x02, 0x0f, 0x10, 0x0f, 0x001e}, {
{0x00, 0x00, 0x0d, 0x0e, 0x06, 0x0f, 0x010e}, .priority = 0,
{0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0162}, .tilemapLeft = 14,
{0x01, 0x18, 0x11, 0x05, 0x02, 0x0f, 0x01ce}, .tilemapTop = 2,
.width = 15,
.height = 16,
.paletteNum = 15,
.baseBlock = 30
},
{
.priority = 0,
.tilemapLeft = 0,
.tilemapTop = 13,
.width = 14,
.height = 6,
.paletteNum = 15,
.baseBlock = 270
},
{
.priority = 1,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 15,
.baseBlock = 354
},
{
.priority = 1,
.tilemapLeft = 24,
.tilemapTop = 17,
.width = 5,
.height = 2,
.paletteNum = 15,
.baseBlock = 462
},
DUMMY_WIN_TEMPLATE, DUMMY_WIN_TEMPLATE,
}; };
static const struct WindowTemplate gUnknown_0861F350[] = static const struct WindowTemplate gUnknown_0861F350[] =
{ {
{0x01, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x01d8}, {
{0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x01d8}, .priority = 1,
{0x01, 0x0f, 0x0f, 0x0e, 0x04, 0x0f, 0x01d8}, .tilemapLeft = 22,
{0x01, 0x0f, 0x0d, 0x0e, 0x06, 0x0f, 0x01d8}, .tilemapTop = 17,
{0x01, 0x18, 0x0f, 0x05, 0x04, 0x0f, 0x01d8}, .width = 7,
.height = 2,
.paletteNum = 15,
.baseBlock = 472
},
{
.priority = 1,
.tilemapLeft = 22,
.tilemapTop = 15,
.width = 7,
.height = 4,
.paletteNum = 15,
.baseBlock = 472
},
{
.priority = 1,
.tilemapLeft = 15,
.tilemapTop = 15,
.width = 14,
.height = 4,
.paletteNum = 15,
.baseBlock = 472
},
{
.priority = 1,
.tilemapLeft = 15,
.tilemapTop = 13,
.width = 14,
.height = 6,
.paletteNum = 15,
.baseBlock = 472
},
{
.priority = 1,
.tilemapLeft = 24,
.tilemapTop = 15,
.width = 5,
.height = 4,
.paletteNum = 15,
.baseBlock = 472
},
}; };
extern const struct CompressedSpriteSheet gUnknown_0861F3CC; extern const struct CompressedSpriteSheet gUnknown_0861F3CC;

6
src/item_menu.c
View File

@ -182,9 +182,9 @@ const struct BgTemplate gUnknown_08613F90[3] =
const struct ListMenuTemplate gUnknown_08613F9C = const struct ListMenuTemplate gUnknown_08613F9C =
{ {
NULL, .items = NULL,
bag_menu_change_item_callback, .moveCursorFunc = bag_menu_change_item_callback,
sub_81AB520, .itemPrintFunc = sub_81AB520,
.totalItems = 0, .totalItems = 0,
.maxShowed = 0, .maxShowed = 0,
.windowId = 0, .windowId = 0,