From 7ec4479631d6fe7bc7153f548294e93d0543f182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 19 Jun 2021 14:04:44 +0200 Subject: decompile unk_020023C0.s --- include/unk_0201B8B8.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/unk_0201B8B8.h b/include/unk_0201B8B8.h index 13bc217b..26dd8017 100644 --- a/include/unk_0201B8B8.h +++ b/include/unk_0201B8B8.h @@ -2,8 +2,8 @@ #define POKEDIAMOND_UNK_0201B8B88_H const u16 * MsgArray_SkipControlCode(const u16 * r4); -u16 MsgArray_GetControlCode(const u16 * r4); +u32 MsgArray_GetControlCode(const u16 * r4); BOOL MsgArray_ControlCodeIsStrVar(const u16 * r4); -u16 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4); +u32 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4); #endif //POKEDIAMOND_UNK_0201B8B88_H -- cgit v1.2.3 From f3e07750802c57b4a17be2144242295e154d616b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 19 Jun 2021 14:21:00 +0200 Subject: silence warnings --- include/unk_020023C0.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 include/unk_020023C0.h (limited to 'include') diff --git a/include/unk_020023C0.h b/include/unk_020023C0.h new file mode 100644 index 00000000..503628c6 --- /dev/null +++ b/include/unk_020023C0.h @@ -0,0 +1,43 @@ +#include "global.h" +#include "text.h" + +typedef struct +{ + u8 canABSpeedUpPrint : 1; + u8 useAlternateDownArrow : 1; + u8 autoScroll : 1; + u8 forceMidTextSpeed : 1; + u8 unk0_4 : 1; + u8 unk0_5 : 1; + u8 unk0_6 : 1; + u8 unk0_7 : 1; + u8 unk1; +} TextFlags; + +struct TextPrinterSubStruct +{ + u8 glyphId : 4; // 0x14 + u8 hasPrintBeenSpedUp : 1; + u8 unk : 3; + u8 downArrowDelay : 5; + u8 downArrowYPosIdx : 2; + u8 hasGlyphIdBeenSet : 1; + u8 autoScrollDelay : 8; +}; + +u32 RenderText(struct TextPrinter *printer); +void FUN_02002840(u16 flag); +void FUN_0200284C(struct TextPrinter *printer); +void FUN_02002878(struct TextPrinter *printer); +void FUN_02002A00(struct TextPrinter *printer); +u32 FUN_02002A94(struct TextPrinter *printer); +u32 FUN_02002ADC(struct TextPrinter *printer); +u32 FUN_02002B18(struct TextPrinter *printer); +u8 FUN_02002B3C(struct TextPrinter *printer); +void FUN_02002B60(u32 param0); +void FUN_02002B7C(s32 param0); +void FUN_02002BB8(u32 param0); +u8 FUN_02002BD4(); +void FUN_02002BE4(); +u8 FUN_02002BF4(); +void FUN_02002C04(); -- cgit v1.2.3 From b8290ba524554302d67c3f23e2cf002447e6d4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 19 Jun 2021 14:23:58 +0200 Subject: change filename --- include/render_text.h | 43 +++++++++++++++++++++++++++++++++++++++++++ include/unk_020023C0.h | 43 ------------------------------------------- 2 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 include/render_text.h delete mode 100644 include/unk_020023C0.h (limited to 'include') diff --git a/include/render_text.h b/include/render_text.h new file mode 100644 index 00000000..503628c6 --- /dev/null +++ b/include/render_text.h @@ -0,0 +1,43 @@ +#include "global.h" +#include "text.h" + +typedef struct +{ + u8 canABSpeedUpPrint : 1; + u8 useAlternateDownArrow : 1; + u8 autoScroll : 1; + u8 forceMidTextSpeed : 1; + u8 unk0_4 : 1; + u8 unk0_5 : 1; + u8 unk0_6 : 1; + u8 unk0_7 : 1; + u8 unk1; +} TextFlags; + +struct TextPrinterSubStruct +{ + u8 glyphId : 4; // 0x14 + u8 hasPrintBeenSpedUp : 1; + u8 unk : 3; + u8 downArrowDelay : 5; + u8 downArrowYPosIdx : 2; + u8 hasGlyphIdBeenSet : 1; + u8 autoScrollDelay : 8; +}; + +u32 RenderText(struct TextPrinter *printer); +void FUN_02002840(u16 flag); +void FUN_0200284C(struct TextPrinter *printer); +void FUN_02002878(struct TextPrinter *printer); +void FUN_02002A00(struct TextPrinter *printer); +u32 FUN_02002A94(struct TextPrinter *printer); +u32 FUN_02002ADC(struct TextPrinter *printer); +u32 FUN_02002B18(struct TextPrinter *printer); +u8 FUN_02002B3C(struct TextPrinter *printer); +void FUN_02002B60(u32 param0); +void FUN_02002B7C(s32 param0); +void FUN_02002BB8(u32 param0); +u8 FUN_02002BD4(); +void FUN_02002BE4(); +u8 FUN_02002BF4(); +void FUN_02002C04(); diff --git a/include/unk_020023C0.h b/include/unk_020023C0.h deleted file mode 100644 index 503628c6..00000000 --- a/include/unk_020023C0.h +++ /dev/null @@ -1,43 +0,0 @@ -#include "global.h" -#include "text.h" - -typedef struct -{ - u8 canABSpeedUpPrint : 1; - u8 useAlternateDownArrow : 1; - u8 autoScroll : 1; - u8 forceMidTextSpeed : 1; - u8 unk0_4 : 1; - u8 unk0_5 : 1; - u8 unk0_6 : 1; - u8 unk0_7 : 1; - u8 unk1; -} TextFlags; - -struct TextPrinterSubStruct -{ - u8 glyphId : 4; // 0x14 - u8 hasPrintBeenSpedUp : 1; - u8 unk : 3; - u8 downArrowDelay : 5; - u8 downArrowYPosIdx : 2; - u8 hasGlyphIdBeenSet : 1; - u8 autoScrollDelay : 8; -}; - -u32 RenderText(struct TextPrinter *printer); -void FUN_02002840(u16 flag); -void FUN_0200284C(struct TextPrinter *printer); -void FUN_02002878(struct TextPrinter *printer); -void FUN_02002A00(struct TextPrinter *printer); -u32 FUN_02002A94(struct TextPrinter *printer); -u32 FUN_02002ADC(struct TextPrinter *printer); -u32 FUN_02002B18(struct TextPrinter *printer); -u8 FUN_02002B3C(struct TextPrinter *printer); -void FUN_02002B60(u32 param0); -void FUN_02002B7C(s32 param0); -void FUN_02002BB8(u32 param0); -u8 FUN_02002BD4(); -void FUN_02002BE4(); -u8 FUN_02002BF4(); -void FUN_02002C04(); -- cgit v1.2.3 From a252c28863e078fd8ea65f4ad228308585de92c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 19 Jun 2021 14:43:22 +0200 Subject: rename symbols based on pokeemerald --- include/render_text.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/render_text.h b/include/render_text.h index 503628c6..94002caf 100644 --- a/include/render_text.h +++ b/include/render_text.h @@ -27,14 +27,14 @@ struct TextPrinterSubStruct u32 RenderText(struct TextPrinter *printer); void FUN_02002840(u16 flag); -void FUN_0200284C(struct TextPrinter *printer); -void FUN_02002878(struct TextPrinter *printer); -void FUN_02002A00(struct TextPrinter *printer); -u32 FUN_02002A94(struct TextPrinter *printer); -u32 FUN_02002ADC(struct TextPrinter *printer); -u32 FUN_02002B18(struct TextPrinter *printer); -u8 FUN_02002B3C(struct TextPrinter *printer); -void FUN_02002B60(u32 param0); +void TextPrinterInitDownArrowCounters(struct TextPrinter *printer); +void TextPrinterDrawDownArrow(struct TextPrinter *printer); +void TextPrinterClearDownArrow(struct TextPrinter *printer); +BOOL TextPrinterContinue(struct TextPrinter *printer); +BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer); +BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer); +u8 TextPrinterWait(struct TextPrinter *printer); +void TextFlags_SetCanABSpeedUpPrint(BOOL param0); void FUN_02002B7C(s32 param0); void FUN_02002BB8(u32 param0); u8 FUN_02002BD4(); -- cgit v1.2.3 From 3e8c37cf1fee349756ff7f0fe9b0b693622bfa73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 19 Jun 2021 15:20:23 +0200 Subject: header guards --- include/render_text.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/render_text.h b/include/render_text.h index 94002caf..e3e0f4c8 100644 --- a/include/render_text.h +++ b/include/render_text.h @@ -1,3 +1,6 @@ +#ifndef POKEDIAMOND_RENDER_TEXT_H +#define POKEDIAMOND_RENDER_TEXT_H + #include "global.h" #include "text.h" @@ -41,3 +44,5 @@ u8 FUN_02002BD4(); void FUN_02002BE4(); u8 FUN_02002BF4(); void FUN_02002C04(); + +#endif // POKEDIAMOND_RENDER_TEXT_H -- cgit v1.2.3 From dc026c3c75898a9e3a0ea8533af4e02c5156ead6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 20 Jun 2021 09:16:14 +0200 Subject: delete obsolete externs --- include/text_02054590.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text_02054590.h b/include/text_02054590.h index b2f4898b..4d05260a 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -12,7 +12,7 @@ void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2); void FUN_02054608(struct Window *param0, struct Options *options); void FUN_0205464C(struct Window *param0); u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3); -u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5); +u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, s32 a5); u8 FUN_020546C8(u32 param0); void FUN_020546E0(struct BgConfig *param0, struct Window *param1, u32 param2, u32 param3); void FUN_02054744(struct Window *param0, u32 param1, u32 param2); -- cgit v1.2.3