diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
commit | ecfdc57e1cff1fa34ff7edcf7524aeadbc265b69 (patch) | |
tree | 123155f492599caf4597b6fc812a0a064d3962bd /include/text.h | |
parent | 9776f51f0643a8d988fcd5fc2ac404a7ea285235 (diff) | |
parent | f1f6c7337f4f2f002b456468b0ccc327fc494d02 (diff) |
Merge branch 'master' into fix_nonmatching
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 |