Merge conflict resolves into review changes

1 files changed, 10 insertions, 3 deletions

diff --git a/gflib/text.h b/gflib/text.h
index e37773475..3c34441dc 100644
--- a/gflib/text.h
+++ b/gflib/text.h
@@ -107,12 +107,19 @@
 #define TEXT_COLOR_TRANSPARENT  0x0
 #define TEXT_COLOR_WHITE        0x1
 #define TEXT_COLOR_DARK_GREY    0x2
-//                              0x3
+#define TEXT_COLOR_LIGHT_GREY   0x3
 #define TEXT_COLOR_RED          0x4
-//                              0x5
+#define TEXT_COLOR_LIGHT_RED    0x5
 #define TEXT_COLOR_GREEN        0x6
-//                              0x7
+#define TEXT_COLOR_LIGHT_GREEN  0x7
 #define TEXT_COLOR_BLUE         0x8
+#define TEXT_COLOR_LIGHT_BLUE   0x9
+#define TEXT_DYNAMIC_COLOR_1    0xA // Usually white
+#define TEXT_DYNAMIC_COLOR_2    0xB // Usually white w/ tinge of green
+#define TEXT_DYNAMIC_COLOR_3    0xC // Usually white
+#define TEXT_DYNAMIC_COLOR_4    0xD // Usually aquamarine
+#define TEXT_DYNAMIC_COLOR_5    0xE // Usually blue-green
+#define TEXT_DYNAMIC_COLOR_6    0xF // Usually cerulean
 
 #define PLACEHOLDER_ID_UNKNOWN       0x0
 #define PLACEHOLDER_ID_PLAYER        0x1