diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
commit | 66367c82ef07c10957d45ce7f0f776a178454e18 (patch) | |
tree | 0dd4fcd5cce3ef14dae4fc9ae91e54c6e070eef6 /include/text.h | |
parent | 171dd32df8a56e1f10956be8b944cb216edb8f9d (diff) | |
parent | 781d0ca44c8eab2b7751fe8f337d6acde7fe8582 (diff) |
Merge remote-tracking branch 'upstream/master' into btl_attrs
Diffstat (limited to 'include/text.h')
-rw-r--r-- | include/text.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/text.h b/include/text.h index f0d039d45..71afd1d00 100644 --- a/include/text.h +++ b/include/text.h @@ -253,4 +253,6 @@ void Text_StripExtCtrlCodes(u8 *str); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); u8 sub_8004FD0(struct Window *win, u8 *dest, const u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 width, u32 a8); +extern const u16 gUnknownPalette_81E6692[]; + #endif // GUARD_TEXT_H |