From 52a951276f8d4b79195a0d4889503e4a7f096024 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 25 Sep 2017 00:09:13 +0200
Subject: battle 4, up to x69

---
 include/text.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/text.h')

diff --git a/include/text.h b/include/text.h
index dba409f37..f0c85b978 100644
--- a/include/text.h
+++ b/include/text.h
@@ -71,7 +71,9 @@
 #define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
 #define PLACEHOLDER_BEGIN   0xFD // string placeholder
 #define CHAR_NEWLINE        0xFE
-#define EOS 0xFF // end of string
+#define EOS                 0xFF // end of string
+
+// battle placeholders are located in battle_message.h
 
 #define EXT_CTRL_CODE_JPN   0x15
 #define EXT_CTRL_CODE_ENG   0x16
-- 
cgit v1.2.3


From d769ec137447c52062b48153851bd2824055b6df Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 26 Sep 2017 22:39:59 +0200
Subject: battle 4 up to a8

---
 include/text.h | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'include/text.h')

diff --git a/include/text.h b/include/text.h
index f0c85b978..88f2cc0e2 100644
--- a/include/text.h
+++ b/include/text.h
@@ -65,6 +65,7 @@
 #define CHAR_x              0xEC
 #define CHAR_y              0xED
 #define CHAR_z              0xEE
+#define CHAR_SPECIAL_F9     0xF9
 #define CHAR_COLON          0xF0
 #define CHAR_PROMPT_SCROLL  0xFA // waits for button press and scrolls dialog
 #define CHAR_PROMPT_CLEAR   0xFB // waits for button press and clears dialog
@@ -73,6 +74,10 @@
 #define CHAR_NEWLINE        0xFE
 #define EOS                 0xFF // end of string
 
+#define TEXT_COLOR_TRANSPARENT  0x0
+#define TEXT_COLOR_WHITE        0x1
+#define TEXT_COLOR_DARK_GREY    0x2
+
 // battle placeholders are located in battle_message.h
 
 #define EXT_CTRL_CODE_JPN   0x15
@@ -80,23 +85,26 @@
 
 #define NUM_TEXT_PRINTERS 32
 
+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
 
-- 
cgit v1.2.3