summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalax1@gmail.com>2017-09-22 21:26:37 -0400
committerPikalaxALT <pikalax1@gmail.com>2017-09-22 21:26:37 -0400
commit4cf115000289d10de3408e752b37128446dd261c (patch)
treeafc5e4b6eb7eac9ad84eba771fa9946ac5325f31
parentfcb7e50e441016525536e099b2b64545da7d19e5 (diff)
clion pls
-rw-r--r--include/text.h32
-rw-r--r--src/text.c2
2 files changed, 18 insertions, 16 deletions
diff --git a/include/text.h b/include/text.h
index a7a79da7a..fc8ffa82f 100644
--- a/include/text.h
+++ b/include/text.h
@@ -94,23 +94,25 @@ struct TextPrinterSubStruct
u8 active;
};
+struct TextSubPrinter { // TODO: Better name
+ u8* current_text_offset;
+ u8 windowId;
+ u8 fontId;
+ u8 x;
+ u8 y;
+ u8 currentX; // 0x8
+ u8 currentY;
+ u8 letterSpacing;
+ u8 lineSpacing;
+ u8 fontColor_l:4; // 0xC
+ u8 fontColor_h:4;
+ u8 bgColor:4;
+ u8 shadowColor:4;
+};
+
struct TextPrinter
{
- struct TextSubPrinter { // TODO: Better name
- u8* current_text_offset;
- u8 windowId;
- u8 fontId;
- u8 x;
- u8 y;
- u8 currentX; // 0x8
- u8 currentY;
- u8 letterSpacing;
- u8 lineSpacing;
- u8 fontColor_l:4; // 0xC
- u8 fontColor_h:4;
- u8 bgColor:4;
- u8 shadowColor:4;
- } subPrinter;
+ struct TextSubPrinter subPrinter;
void (*callback)(struct TextSubPrinter *, u16); // 0x10
diff --git a/src/text.c b/src/text.c
index fe1c5df24..90c069293 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,9 +1,9 @@
#include "global.h"
-#include "text.h"
#include "main.h"
#include "palette.h"
#include "string_util.h"
#include "window.h"
+#include "text.h"
extern void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
extern void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height);