diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.h | 26 | ||||
| -rw-r--r-- | include/text_02054590.h | 6 |
2 files changed, 18 insertions, 14 deletions
diff --git a/include/text.h b/include/text.h index fb31b86b..ca7ea133 100644 --- a/include/text.h +++ b/include/text.h @@ -6,18 +6,22 @@ struct TextPrinterTemplate { const u8* currentChar; - u8 windowId; + u32 windowId; + u8 padding[1]; u8 fontId; u8 x; u8 y; - u8 currentX; // 0x8 + u8 currentX; u8 currentY; u8 letterSpacing; u8 lineSpacing; - u8 unk:4; // 0xC - u8 fgColor:4; - u8 bgColor:4; - u8 shadowColor:4; + u8 unk; + u8 fgColor; + u8 bgColor; + u8 shadowColor; + u16 unk2; + u8 unk3; + u8 unk4; }; struct TextPrinter @@ -38,15 +42,14 @@ struct TextPrinter struct FontInfo { - u16 (*fontFunction)(struct TextPrinter *x); u8 maxLetterWidth; u8 maxLetterHeight; u8 letterSpacing; u8 lineSpacing; - u8 unk:4; - u8 fgColor:4; - u8 bgColor:4; - u8 shadowColor:4; + u8 unk; + u8 fgColor; + u8 bgColor; + u8 shadowColor; }; void SetFontsPointer(const struct FontInfo *fonts); @@ -56,5 +59,6 @@ BOOL FUN_0201BD44(u32 param0); void FUN_0201BD5C(void); u8 FUN_0201BD70(u32 param0); void FUN_0201BCFC(u32 param0); +u16 AddTextPrinterParameterized(u32 windowId, u8 fontId, const u8 *str, u32 x, u32 y, u32 speed, void (*callback)(void *, u16)); #endif //POKEDIAMOND_TEXT_H diff --git a/include/text_02054590.h b/include/text_02054590.h index 37b286f3..401fa11f 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -8,9 +8,9 @@ void FUN_02054590(u32 param0, u32 param1); void FUN_020545B8(u32 param0, u32 param1, u32 param2); void FUN_02054608(u32 *param0, struct Options *options); void FUN_0205464C(u32 *param0); -void FUN_02054658(u8 windowId, const u8 *str, struct Options *options, u8 param3); -void DrawFieldMessage(u8 windowId, const u8 *str, u8 fontId, u32 speed, u8 a4, u32 a5); -u8 FUN_020546C8(void); +u16 FUN_02054658(u8 windowId, const u8 *str, struct Options *options, u8 param3); +u16 DrawFieldMessage(u8 windowId, const u8 *str, u8 fontId, u32 speed, u8 a4, u32 a5); +u8 FUN_020546C8(u32 param0); void FUN_020546E0(u32 param0, u32 param1, u32 param2, u32 param3); void FUN_02054744(u32 *param0, u32 param1, u32 param2); |