diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
| commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
| tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /include/text.h | |
| parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
fix merge conflict
Diffstat (limited to 'include/text.h')
| -rw-r--r-- | include/text.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/text.h b/include/text.h index 217de0687..594661717 100644 --- a/include/text.h +++ b/include/text.h @@ -103,7 +103,7 @@ struct TextPrinterSubStruct struct TextSubPrinter // TODO: Better name { - u8* current_text_offset; + const u8* current_text_offset; u8 windowId; u8 fontId; u8 x; @@ -170,6 +170,7 @@ typedef struct { u8 flag_0:1; u8 flag_1:1; u8 flag_2:1; + u8 flag_3:1; } TextFlags; extern TextFlags gTextFlags; @@ -195,7 +196,7 @@ u8 gGlyphDimensions[0x2]; void SetFontsPointer(const struct FontInfo *fonts); void DeactivateAllTextPrinters(void); -u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); +u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); void RunTextPrinters(void); bool16 IsTextPrinterActive(u8 id); |