diff options
author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-01 03:51:24 +0100 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-30 18:51:24 -0800 |
commit | 4258e60771aa9fdabd678930eca534423bd371b8 (patch) | |
tree | ecca2ee7641abc0562f39b6c7dd907af2184e102 /include/text_window.h | |
parent | 831f8cd4fd94613d6b52d87df1b4903bedfaa717 (diff) |
Declare more non-static functions in header files (#111)
* Declare more non-static functions in header files
* Use `(void)` for functions without arguments.
* Move global-included data to seperate headers
* Don't import types or global in header
* Fix fieldmap imports
* Revert in-code changes
* Add missing newlines
Diffstat (limited to 'include/text_window.h')
-rw-r--r-- | include/text_window.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/include/text_window.h b/include/text_window.h index f68db005a..6df3f7d33 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -1,15 +1,21 @@ #ifndef GUARD_TEXT_WINDOW_H #define GUARD_TEXT_WINDOW_H -#include "global.h" +#include "text.h" -u16 SetTextWindowBaseTileNum(u16); -void LoadTextWindowGraphics(struct Window *); -void LoadTextWindowGraphics_OverridePalSlot(struct Window *, u8); -void LoadTextWindowGraphics_OverrideFrameType(struct Window *, u8); +struct FrameGraphics +{ + u8 *tiles; + u16 *palette; +}; + +u16 SetTextWindowBaseTileNum(u16 baseTileNum); +void LoadTextWindowGraphics(struct Window *win); +void LoadTextWindowGraphics_OverridePalSlot(struct Window *win, u8 palSlot); +void LoadTextWindowGraphics_OverrideFrameType(struct Window *win, u8 frameType); void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType); -u16 SetMessageBoxBaseTileNum(u16); +u16 SetMessageBoxBaseTileNum(u16 baseTileNum); void unref_sub_80651DC(struct Window *, u8 *); void DisplayMessageBox(struct Window *); void DrawStandardMessageBox(struct Window *win); |