From de6f8fc978e5297d3f425d2d6c8517e9bb8e75ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 22 May 2021 10:37:04 -0400 Subject: Merge conflicting prototypes --- include/text.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index c9afc9b3..57185a05 100644 --- a/include/text.h +++ b/include/text.h @@ -5,6 +5,17 @@ #include "window.h" #include "font.h" +#define CHAR_0 0x00A2 +#define CHAR_1 0x00A3 +#define CHAR_2 0x00A4 +#define CHAR_3 0x00A5 +#define CHAR_4 0x00A6 +#define CHAR_5 0x00A7 +#define CHAR_6 0x00A8 +#define CHAR_7 0x00A9 +#define CHAR_8 0x00AA +#define CHAR_9 0x00AB + struct TextPrinterTemplate { const u16* currentChar; // 0 @@ -26,12 +37,6 @@ struct TextPrinterTemplate u8 unk4; // 17 }; -struct Font -{ - u8 filler[20]; - void * unk20; -}; - struct TextPrinter { struct TextPrinterTemplate printerTemplate; -- cgit v1.2.3