diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-09 11:14:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 11:14:37 -0700 |
| commit | 84c5825c8ecc9804313ec3b1a8dcc0271ee4c2cc (patch) | |
| tree | c90f705e43f2b1728ed1e0400312b7d6c5c81c21 /src/menu.c | |
| parent | 562dcc4bcdc14d5b6c0bb2a638410156945cdd41 (diff) | |
| parent | 91f869d1e6ed1ef12ad4b2255d3762e3b1b51429 (diff) | |
Merge pull request #589 from PikalaxALT/unk_debug_menu_3
Unk Debug Menu 3 and Start Menu Debug
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/menu.c b/src/menu.c index 86e20d0eb..9abcf66d1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -581,20 +581,20 @@ u8 Menu_GetColumnXCoord(u8 column) return gMenu.columnXCoords[column]; } -void Menu_PrintItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[]) +void Menu_PrintItems(u8 left, u8 top, u8 menuItemCount, const void * menuItems) { u8 i; for (i = 0; i < menuItemCount; i++) - Menu_PrintText(menuItems[i].text, left, top + 2 * i); + Menu_PrintText(((const struct MenuAction *)menuItems)[i].text, left, top + 2 * i); } -void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order) +void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const void * menuItems, const u8 *order) { u8 i; for (i = 0; i < menuItemCount; i++) - Menu_PrintText(menuItems[order[i]].text, left, top + 2 * i); + Menu_PrintText(((const struct MenuAction *)menuItems)[order[i]].text, left, top + 2 * i); } void InitYesNoMenu(u8 left, u8 top, u8 a3) @@ -644,7 +644,7 @@ int sub_8072AB0(const u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6) Menu_BlankWindowRect(left, top + 2 * newlineCount, left + width - 1, height + top - 1); } #elif GERMAN -__attribute__((naked)) +NAKED int sub_8072AB0(const u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6) { asm(".syntax unified\n\ |