diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /include/text.h | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'include/text.h')
| -rw-r--r-- | include/text.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.h b/include/text.h index f584b61ea..dba409f37 100644 --- a/include/text.h +++ b/include/text.h @@ -195,9 +195,9 @@ bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter); bool8 TextPrinterWait(struct TextPrinter *textPrinter); void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex); u16 RenderText(struct TextPrinter *textPrinter); -u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing); +u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing); u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); -s32 GetStringWidth(u8 fontId, u8 *str, s16 letterSpacing); +u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str); u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y); u8 GetKeypadIconTileOffset(u8 keypadIconId); |