4 files changed, 26 insertions, 12 deletions
diff --git a/include/list_menu.h b/include/list_menu.h
index 3f60c6f2..c01bf070 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -2,6 +2,7 @@
 #define POKEDIAMOND_LIST_MENU_H
 
 #include "list_menu_cursor.h"
+#include "list_menu_items.h"
 
 #define LIST_HEADER          -3
 #define LIST_CANCEL          -2
@@ -13,12 +14,6 @@
 
 struct ListMenu;
 
-struct ListMenuItem
-{
-    const u16 * text;
-    s32 index;
-};
-
 // TODO: Document remaining fields.
 // A lot of these are named based on similar fields in gen 3.
 
diff --git a/include/list_menu_items.h b/include/list_menu_items.h
new file mode 100644
index 00000000..a102c449
--- /dev/null
+++ b/include/list_menu_items.h
@@ -0,0 +1,12 @@
+#ifndef POKEDIAMOND_LIST_MENU_ITEMS_H
+#define POKEDIAMOND_LIST_MENU_ITEMS_H
+
+#include "string16.h"
+
+struct ListMenuItem
+{
+    struct String * text;
+    s32 value;
+};
+
+#endif // POKEDIAMOND_LIST_MENU_ITEMS_H
diff --git a/include/text.h b/include/text.h
index 57185a05..514e8ba7 100644
--- a/include/text.h
+++ b/include/text.h
@@ -16,9 +16,15 @@
 #define CHAR_8        0x00AA
 #define CHAR_9        0x00AB
 
+union StrbufForPrint
+{
+    struct String * wrapped;
+    const u16 * raw;
+};
+
 struct TextPrinterTemplate
 {
-    const u16* currentChar; // 0
+    union StrbufForPrint currentChar; // 0
     struct Window * window; // 4
     u8 padding[1]; // 8
     u8 fontId; // 9
@@ -76,9 +82,9 @@ BOOL FUN_0201BD44(u32 param0);
 void FUN_0201BD5C(void);
 u8 FUN_0201BD70(u32 param0);
 void FUN_0201BD7C(u32 param0);
-u16 AddTextPrinterParameterized(struct Window * window, u8 fontId, const u16 *str, u32 x, u32 y, u32 speed, u8 (*callback)(struct TextPrinterTemplate *, u16));
-u16 AddTextPrinterParameterized2(struct Window * window, u8 fontId, const u16 *str, u32 x, u32 y, u32 speed, u32 colors, u8 (*callback)(struct TextPrinterTemplate *, u16));
-u16 AddTextPrinterParameterized3(struct Window * window, u32 fontId, const u16 *str, u32 x, u32 y, u32 speed, u32 colors, u32 letterSpacing, u32 lineSpacing, u8 (*callback)(struct TextPrinterTemplate *, u16));
+u16 AddTextPrinterParameterized(struct Window * window, u8 fontId, struct String *str, u32 x, u32 y, u32 speed, u8 (*callback)(struct TextPrinterTemplate *, u16));
+u16 AddTextPrinterParameterized2(struct Window * window, u8 fontId, struct String *str, u32 x, u32 y, u32 speed, u32 colors, u8 (*callback)(struct TextPrinterTemplate *, u16));
+u16 AddTextPrinterParameterized3(struct Window * window, u32 fontId, struct String *str, u32 x, u32 y, u32 speed, u32 colors, u32 letterSpacing, u32 lineSpacing, u8 (*callback)(struct TextPrinterTemplate *, u16));
 u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 speed, u8 (*callback)(struct TextPrinterTemplate *, u16));
 void RunTextPrinter(u32 param0, struct TextPrinter *printer);
 u32 RenderFont(struct TextPrinter *printer);
diff --git a/include/text_02054590.h b/include/text_02054590.h
index b1ee055a..32dca79a 100644
--- a/include/text_02054590.h
+++ b/include/text_02054590.h
@@ -4,13 +4,14 @@
 #include "global.h"
 #include "options.h"
 #include "window.h"
+#include "string16.h"
 
 void FUN_02054590(u32 param0, u32 param1);
 void FUN_020545B8(u32 param0, u32 param1, u32 param2);
 void FUN_02054608(struct Window *param0, struct Options *options);
 void FUN_0205464C(struct Window *param0);
-u16 FUN_02054658(struct Window * window, const u16 *str, struct Options *options, u8 param3);
-u16 DrawFieldMessage(struct Window * window, const u16 *str, u8 fontId, u32 speed, u8 a4, u32 a5);
+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);
 u8 FUN_020546C8(u32 param0);
 void FUN_020546E0(u32 param0, u32 param1, u32 param2, u32 param3);
 void FUN_02054744(struct Window *param0, u32 param1, u32 param2);