diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-21 18:49:49 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-21 18:49:49 +0200 |
| commit | 5b0eac381dcb0cbe85d6cafa1076e9b823db8ae9 (patch) | |
| tree | 5919e4bf9c00ad1023ae5b025df34dd037afa896 /arm9/src | |
| parent | 64f35278f386af54f33172b64645220a4d51e502 (diff) | |
| parent | d192b6951f54d1397ded3db03b5e486ec679ac6f (diff) | |
Merge branch 'master' into unk_02002C14
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/text_02054590.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index 5b33ea34..3c3d0fed 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -2,6 +2,7 @@ #include "text.h" #include "bg_window.h" #include "font.h" +#include "render_text.h" extern void FUN_0201BD5C(void); @@ -9,10 +10,6 @@ extern void FUN_0200CD68( struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); extern void FUN_0200D0BC(struct Window *param0, u32 param1, u32 param2, u32 param3); -extern void TextFlags_SetCanABSpeedUpPrint(u8 param0); -extern void FUN_02002B7C(u32 param0); -extern void FUN_02002BB8(u32 param0); - extern void FUN_0200D300(struct BgConfig *param0, u32 param1, u32 param2, @@ -64,7 +61,7 @@ THUMB_FUNC u16 FUN_02054658(struct Window * window, struct String *str, struct O return AddTextPrinterParameterized(window, 1, str, 0, 0, (u32)Options_GetTextFrameDelay(options), NULL); } -THUMB_FUNC u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5) +THUMB_FUNC u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, s32 a5) { TextFlags_SetCanABSpeedUpPrint(a4); FUN_02002B7C(a5); |