summaryrefslogtreecommitdiff
path: root/include/menu.h
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-10 03:19:28 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-13 05:26:19 +0800
commitbcf27c2de147b1a04c32f8f9e5dd8a5eca657455 (patch)
treebcd68c21ad09b923b5985fda8a19ccdfcb3a507e /include/menu.h
parent05371e58753668147ec9e4d4bd161e5a044c058b (diff)
resolved SetWindowTemplateFields
Diffstat (limited to 'include/menu.h')
-rw-r--r--include/menu.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/include/menu.h b/include/menu.h
index cc685d682..7c7e164ae 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -17,12 +17,6 @@ struct MenuAction
} func;
};
-struct WindowTemplateWithAttr
-{
- struct WindowTemplate *ptr;
- u32 attr;
-};
-
// menu2
void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * color, s8 speed, const u8 * str);
void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
@@ -68,9 +62,6 @@ void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram);
void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum);
void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram);
void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum);
-
-// currently incorrect, WIP
-void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock);
-
+struct WindowTemplate SetWindowTemplateFields(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock);
#endif // GUARD_MENU_H