2 files changed, 14 insertions, 14 deletions

diff --git a/include/menu.h b/include/menu.h
index 9becfc582..bc62eddf6 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -33,7 +33,7 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
 void sub_8197434(u8 windowId, bool8 copyToVram);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);
-u8 GetPlayerTextSpeed(void);
+u8 GetPlayerTextSpeedDelay(void);
 void sub_81978B0(u16 arg0);
 void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16));
 void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
diff --git a/include/text.h b/include/text.h
index 658a32147..4946f1c5f 100644
--- a/include/text.h
+++ b/include/text.h
@@ -114,7 +114,7 @@ enum {
     FONTATTR_MAX_LETTER_HEIGHT,
     FONTATTR_LETTER_SPACING,
     FONTATTR_LINE_SPACING,
-    FONTATTR_COLOR_LOWNIBBLE,   // dunno what this is yet
+    FONTATTR_UNKNOWN,   // dunno what this is yet
     FONTATTR_COLOR_FOREGROUND,
     FONTATTR_COLOR_BACKGROUND,
     FONTATTR_COLOR_SHADOW
@@ -124,11 +124,11 @@ struct TextPrinterSubStruct
 {
     u8 glyphId:4;  // 0x14
     bool8 hasPrintBeenSpedUp:1;
-    u8 font_type_5:3;
+    u8 unk:3;
     u8 downArrowDelay:5;
     u8 downArrowYPosIdx:2;
     bool8 hasGlyphIdBeenSet:1;
-    u8 frames_visible_counter;
+    u8 autoScrollDelay;
 };
 
 struct TextPrinterTemplate
@@ -142,7 +142,7 @@ struct TextPrinterTemplate
     u8 currentY;
     u8 letterSpacing;
     u8 lineSpacing;
-    u8 fontColor_l:4;   // 0xC
+    u8 unk:4;   // 0xC
     u8 fgColor:4;
     u8 bgColor:4;
     u8 shadowColor:4;
@@ -156,8 +156,8 @@ struct TextPrinter
 
     union __attribute__((packed)) {
         struct TextPrinterSubStruct sub;
-        u8 sub_fields[7];
-    } sub_union;
+        u8 fields[7];
+    } subUnion;
 
     u8 active;
     u8 state;       // 0x1C
@@ -175,7 +175,7 @@ struct FontInfo
     u8 maxLetterHeight;
     u8 letterSpacing;
     u8 lineSpacing;
-    u8 fontColor_l:4;
+    u8 unk:4;
     u8 fgColor:4;
     u8 bgColor:4;
     u8 shadowColor:4;
@@ -185,22 +185,22 @@ extern const struct FontInfo *gFonts;
 
 struct GlyphWidthFunc
 {
-    u32 font_id;
+    u32 fontId;
     u32 (*func)(u16 glyphId, bool32 isJapanese);
 };
 
 struct KeypadIcon
 {
-    u16 tile_offset;
+    u16 tileOffset;
     u8 width;
     u8 height;
 };
 
 typedef struct {
-    u8 canABSpeedUpPrint:1;
-    u8 flag_1:1;
-    u8 flag_2:1;
-    u8 flag_3:1;
+    bool8 canABSpeedUpPrint:1;
+    bool8 useAlternateDownArrow:1;
+    bool8 autoScroll:1;
+    bool8 forceMidTextSpeed:1;
 } TextFlags;
 
 struct Struct_03002F90