Merge branch 'master' into gflib

1 files changed, 15 insertions, 0 deletions

diff --git a/gflib/text.h b/gflib/text.h
index d3ff663bb..e37773475 100644
--- a/gflib/text.h
+++ b/gflib/text.h
@@ -114,6 +114,21 @@
 //                              0x7
 #define TEXT_COLOR_BLUE         0x8
 
+#define PLACEHOLDER_ID_UNKNOWN       0x0
+#define PLACEHOLDER_ID_PLAYER        0x1
+#define PLACEHOLDER_ID_STRING_VAR_1  0x2
+#define PLACEHOLDER_ID_STRING_VAR_2  0x3
+#define PLACEHOLDER_ID_STRING_VAR_3  0x4
+#define PLACEHOLDER_ID_KUN           0x5
+#define PLACEHOLDER_ID_RIVAL         0x6
+#define PLACEHOLDER_ID_VERSION       0x7
+#define PLACEHOLDER_ID_AQUA          0x8
+#define PLACEHOLDER_ID_MAGMA         0x9
+#define PLACEHOLDER_ID_ARCHIE        0xA 
+#define PLACEHOLDER_ID_MAXIE         0xB
+#define PLACEHOLDER_ID_KYOGRE        0xC
+#define PLACEHOLDER_ID_GROUDON       0xD
+
 // battle placeholders are located in battle_message.h
 
 #define NUM_TEXT_PRINTERS 32