diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
| commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
| tree | 414ed687f836521c1a966531e87122951c070083 /include/text.h | |
| parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
| parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) | |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'include/text.h')
| -rw-r--r-- | include/text.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/text.h b/include/text.h index 96c5a4507..d8f2fd8a3 100644 --- a/include/text.h +++ b/include/text.h @@ -284,4 +284,8 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese); u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont9(u16 glyphId); +// unk_text_util_2.c +u16 Font6Func(struct TextPrinter *textPrinter); +u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese); + #endif // GUARD_TEXT_H |