Finish cleaning up text.c
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user