diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
| commit | 46023e742c7704c449ae7ec9c2a592cd923f40e6 (patch) | |
| tree | 9f6c6591e60f83003f6abccb5a28cfb3004ad2ab /include/text.h | |
| parent | cb674ce14dc43f99dd76f456e69ab8a90cc3d506 (diff) | |
| parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) | |
Merge branch 'master' into german_debug
Conflicts:
asm/pokemon_storage_system.s
data/pokemon_storage_system.s
src/pokemon/pokemon_1.c
src/pokemon/pokemon_storage_system.c
sym_common.txt
sym_ewram.txt
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 |