diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /include/text.h | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'include/text.h')
| -rw-r--r-- | include/text.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.h b/include/text.h index 527a8939d..19c9b3040 100644 --- a/include/text.h +++ b/include/text.h @@ -152,7 +152,7 @@ u8 sub_80035AC(struct Window *win); u8 sub_800374C(struct Window *win); u8 sub_8003778(struct Window *win); u8 sub_80037A0(struct Window *win); -u8 sub_80037C8(struct Window *win, u8 lineLength); +u32 sub_80037C8(struct Window *win, u8 lineLength); void ClearWindowTextLines(struct Window *win); u16 GetWindowTilemapEntry(struct Window *win, u8 x, u8 y); void DrawWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom); |