diff options
author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-07 11:50:23 +0100 |
---|---|---|
committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-07 11:50:23 +0100 |
commit | 9dec2bdef891653d10060a45417609c4d31b14c7 (patch) | |
tree | f9080cfc922a15570aeeee98d1ff695596e55ccb /src/option_menu.c | |
parent | bc42c5054c335f4de8a6b43135673ce931991c3e (diff) | |
parent | ef62393289b7a1d2e20fe195e24830d5c1f2f973 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet
Diffstat (limited to 'src/option_menu.c')
-rw-r--r-- | src/option_menu.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index fc0c0c24e..d48a1e448 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -91,8 +91,24 @@ static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] = static const struct WindowTemplate sOptionMenuWinTemplates[] = { - {1, 2, 1, 0x1A, 2, 1, 2}, - {0, 2, 5, 0x1A, 0xE, 1, 0x36}, + { + .priority = 1, + .tilemapLeft = 2, + .tilemapTop = 1, + .width = 26, + .height = 2, + .paletteNum = 1, + .baseBlock = 2 + }, + { + .priority = 0, + .tilemapLeft = 2, + .tilemapTop = 5, + .width = 26, + .height = 14, + .paletteNum = 1, + .baseBlock = 0x36 + }, DUMMY_WIN_TEMPLATE }; |