diff options
| author | red031000 <rubenru09@aol.com> | 2021-03-11 22:03:17 +0000 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2021-03-11 22:03:17 +0000 |
| commit | 82b20d5a8badb77010fb5dfc4d20b9282985703a (patch) | |
| tree | aa3fcf3e22b0f8b9aea37554e474dc70dfb124b5 /include | |
| parent | a4ff58c3adee6e7c11bb6e141ed7e7417983fb43 (diff) | |
decompile AddTextPrinter
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.h | 17 | ||||
| -rw-r--r-- | include/text_02054590.h | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/text.h b/include/text.h index edc5f58c..fab36565 100644 --- a/include/text.h +++ b/include/text.h @@ -5,7 +5,7 @@ struct TextPrinterTemplate { - const u8* currentChar; + const u16* currentChar; u32 windowId; u8 padding[1]; u8 fontId; @@ -33,11 +33,13 @@ struct TextPrinter u8 subStructFields[7]; // always cast to struct TextPrinterSubStruct... so why bother u8 active; u8 state; // 0x1C - u8 textSpeed; + u8 textSpeedBottom:7; + u8 textSpeedTop:1; u8 delayCounter; u8 scrollDistance; u8 minLetterSpacing; // 0x20 u8 japanese; + u8 padding[6]; }; struct FontInfo @@ -53,14 +55,15 @@ struct FontInfo }; void SetFontsPointer(const struct FontInfo *fonts); -u8 FUN_0201BCC8(void *param0, u32 param1, u32 param2); +u8 FUN_0201BCC8(void *func, struct TextPrinter *printer, u32 param2); void FUN_0201BCFC(u32 param0); 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)); -u16 AddTextPrinterParameterized2(u32 windowId, u8 fontId, const u8 *str, u32 x, u32 y, u32 speed, u32 colors, void (*callback)(void *, u16)); -u16 AddTextPrinterParameterized3(u32 windowId, u8 fontId, const u8 *str, u32 x, u32 y, u32 speed, u32 colors, u32 letterSpacing, u32 lineSpacing, void (*callback)(void *, u16)); +void FUN_0201BD7C(u32 param0); +u16 AddTextPrinterParameterized(u32 windowId, u8 fontId, const u16 *str, u32 x, u32 y, u32 speed, void (*callback)(struct TextPrinterTemplate *, u16)); +u16 AddTextPrinterParameterized2(u32 windowId, u8 fontId, const u16 *str, u32 x, u32 y, u32 speed, u32 colors, void (*callback)(struct TextPrinterTemplate *, u16)); +u16 AddTextPrinterParameterized3(u32 windowId, u8 fontId, const u16 *str, u32 x, u32 y, u32 speed, u32 colors, u32 letterSpacing, u32 lineSpacing, void (*callback)(struct TextPrinterTemplate *, u16)); +u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 speed, void (*callback)(struct TextPrinterTemplate *, u16)); #endif //POKEDIAMOND_TEXT_H diff --git a/include/text_02054590.h b/include/text_02054590.h index 401fa11f..725bd9b4 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -8,8 +8,8 @@ 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); -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); +u16 FUN_02054658(u8 windowId, const u16 *str, struct Options *options, u8 param3); +u16 DrawFieldMessage(u8 windowId, const u16 *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); |