1 files changed, 37 insertions, 9 deletions

diff --git a/include/text.h b/include/text.h
index 594661717..92def780c 100644
--- a/include/text.h
+++ b/include/text.h
@@ -2,7 +2,17 @@
 #define GUARD_TEXT_H
 
 #define CHAR_SPACE          0x00
+#define CHAR_PLUS           0x2E
 #define CHAR_0              0xA1
+#define CHAR_1              0xA2
+#define CHAR_2              0xA3
+#define CHAR_3              0xA4
+#define CHAR_4              0xA5
+#define CHAR_5              0xA6
+#define CHAR_6              0xA7
+#define CHAR_7              0xA8
+#define CHAR_8              0xA9
+#define CHAR_9              0xAA
 #define CHAR_QUESTION_MARK  0xAC
 #define CHAR_PERIOD         0xAD
 #define CHAR_HYPHEN         0xAE
@@ -65,6 +75,7 @@
 #define CHAR_x              0xEC
 #define CHAR_y              0xED
 #define CHAR_z              0xEE
+#define CHAR_SPECIAL_F7     0xF7
 #define CHAR_SPECIAL_F9     0xF9
 #define CHAR_COLON          0xF0
 #define CHAR_PROMPT_SCROLL  0xFA // waits for button press and scrolls dialog
@@ -74,9 +85,19 @@
 #define CHAR_NEWLINE        0xFE
 #define EOS                 0xFF // end of string
 
+#define EXT_CTRL_CODE_COLOR     0x1
+#define EXT_CTRL_CODE_HIGHLIGHT 0x2
+#define EXT_CTRL_CODE_SHADOW    0x3
+
 #define TEXT_COLOR_TRANSPARENT  0x0
 #define TEXT_COLOR_WHITE        0x1
 #define TEXT_COLOR_DARK_GREY    0x2
+//                              0x3
+#define TEXT_COLOR_RED          0x4
+//                              0x5
+#define TEXT_COLOR_GREEN        0x6
+//                              0x7
+#define TEXT_COLOR_BLUE         0x8
 
 // battle placeholders are located in battle_message.h
 
@@ -85,6 +106,19 @@
 
 #define NUM_TEXT_PRINTERS 32
 
+#define TEXT_SPEED_FF 0xFF
+
+enum {
+    FONTATTR_MAX_LETTER_WIDTH,
+    FONTATTR_MAX_LETTER_HEIGHT,
+    FONTATTR_LETTER_SPACING,
+    FONTATTR_LINE_SPACING,
+    FONTATTR_COLOR_LOWNIBBLE,   // dunno what this is yet
+    FONTATTR_COLOR_FOREGROUND,
+    FONTATTR_COLOR_BACKGROUND,
+    FONTATTR_COLOR_SHADOW
+};
+
 struct TextPrinterSubStruct
 {
     u8 font_type:4;  // 0x14
@@ -113,7 +147,7 @@ struct TextSubPrinter // TODO: Better name
     u8 letterSpacing;
     u8 lineSpacing;
     u8 fontColor_l:4;   // 0xC
-    u8 fontColor_h:4;
+    u8 fgColor:4;
     u8 bgColor:4;
     u8 shadowColor:4;
 };
@@ -146,7 +180,7 @@ struct FontInfo
     u8 letterSpacing;
     u8 lineSpacing;
     u8 fontColor_l:4;
-    u8 fontColor_h:4;
+    u8 fgColor:4;
     u8 bgColor:4;
     u8 shadowColor:4;
 };
@@ -175,13 +209,6 @@ typedef struct {
 
 extern TextFlags gTextFlags;
 
-struct __attribute__((packed)) TextColor
-{
-    u8 fgColor;
-    u8 bgColor;
-    u8 shadowColor;
-};
-
 extern u8 gStringVar1[];
 extern u8 gStringVar2[];
 extern u8 gStringVar3[];
@@ -208,6 +235,7 @@ void DecompressGlyphTile(const u16 *src, u16 *dest);
 u8 GetLastTextColor(u8 colorType);
 void CopyGlyphToWindow(struct TextPrinter *x);
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
+u8 GetMenuCursorDimensionByFont(u8, u8);
 
 u16 Font0Func(struct TextPrinter *textPrinter);
 u16 Font1Func(struct TextPrinter *textPrinter);