diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-18 19:18:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 19:18:44 -0500 |
| commit | 442baf1a00d9dc06b9d8175a66b70fe159b3aa3f (patch) | |
| tree | 9e908648f10c5b3891949815d94508d0b14dfade /src/text.c | |
| parent | b23dc9a12303e979b7612c703f706cbe2b091c96 (diff) | |
| parent | dfee5deca8e5c6f5b35b75d56e215638b66320b0 (diff) | |
Merge pull request #367 from DizzyEggg/move_blitmap
Move Bitmap struct and clear sprite/text files a bit
Diffstat (limited to 'src/text.c')
| -rw-r--r-- | src/text.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/text.c b/src/text.c index ec0d26ab1..84964ffbf 100644 --- a/src/text.c +++ b/src/text.c @@ -9,11 +9,11 @@ #include "window.h" #include "text.h" #include "blit.h" +#include "dynamic_placeholder_text_util.h" extern u8 GetKeypadIconWidth(u8 keypadIconId); extern u16 Font6Func(struct TextPrinter *textPrinter); extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese); -extern u8* DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 a1); extern int sub_8197964(); EWRAM_DATA struct TextPrinter gTempTextPrinter = {0}; @@ -24,8 +24,6 @@ static u16 gLastTextBgColor; static u16 gLastTextFgColor; static u16 gLastTextShadowColor; -extern struct MusicPlayerInfo gMPlayInfo_BGM; - const struct FontInfo *gFonts; u8 gUnknown_03002F84; u8 gUnknown_03002F90[0x20]; @@ -3170,7 +3168,7 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32) return gGlyphWidthFuncs[i].func; } - return 0; + return NULL; } u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) @@ -3181,7 +3179,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) s32 result; int localLetterSpacing; u32 lineWidth; - u8 *bufferPointer; + const u8 *bufferPointer; int glyphWidth; u32 width; |