Merge branch 'master' into doc-overworld

1 files changed, 177 insertions, 89 deletions

diff --git a/gflib/text.h b/gflib/text.h
index 4819eb37b..5b317600e 100644
--- a/gflib/text.h
+++ b/gflib/text.h
@@ -1,95 +1,183 @@
 #ifndef GUARD_TEXT_H
 #define GUARD_TEXT_H
 
-#define CHAR_SPACE          0x00
-#define CHAR_PLUS           0x2E
-#define CHAR_0              0xA1
-#define CHAR_1              0xA2
-#define CHAR_2              0xA3
-#define CHAR_3              0xA4
-#define CHAR_4              0xA5
-#define CHAR_5              0xA6
-#define CHAR_6              0xA7
-#define CHAR_7              0xA8
-#define CHAR_8              0xA9
-#define CHAR_9              0xAA
-#define CHAR_EXCL_MARK      0xAB
-#define CHAR_QUESTION_MARK  0xAC
-#define CHAR_PERIOD         0xAD
-#define CHAR_HYPHEN         0xAE
-#define CHAR_ELLIPSIS       0xB0
-#define CHAR_DBL_QUOT_LEFT  0xB1
-#define CHAR_DBL_QUOT_RIGHT 0xB2
-#define CHAR_SGL_QUOT_LEFT  0xB3
-#define CHAR_SGL_QUOT_RIGHT 0xB4
-#define CHAR_MALE           0xB5
-#define CHAR_FEMALE         0xB6
-#define CHAR_CURRENCY       0xB7
-#define CHAR_COMMA          0xB8
-#define CHAR_MULT_SIGN      0xB9
-#define CHAR_SLASH          0xBA
-#define CHAR_A              0xBB
-#define CHAR_B              0xBC
-#define CHAR_C              0xBD
-#define CHAR_D              0xBE
-#define CHAR_E              0xBF
-#define CHAR_F              0xC0
-#define CHAR_G              0xC1
-#define CHAR_H              0xC2
-#define CHAR_I              0xC3
-#define CHAR_J              0xC4
-#define CHAR_K              0xC5
-#define CHAR_L              0xC6
-#define CHAR_M              0xC7
-#define CHAR_N              0xC8
-#define CHAR_O              0xC9
-#define CHAR_P              0xCA
-#define CHAR_Q              0xCB
-#define CHAR_R              0xCC
-#define CHAR_S              0xCD
-#define CHAR_T              0xCE
-#define CHAR_U              0xCF
-#define CHAR_V              0xD0
-#define CHAR_W              0xD1
-#define CHAR_X              0xD2
-#define CHAR_Y              0xD3
-#define CHAR_Z              0xD4
-#define CHAR_a              0xD5
-#define CHAR_b              0xD6
-#define CHAR_c              0xD7
-#define CHAR_d              0xD8
-#define CHAR_e              0xD9
-#define CHAR_f              0xDA
-#define CHAR_g              0xDB
-#define CHAR_h              0xDC
-#define CHAR_i              0xDD
-#define CHAR_j              0xDE
-#define CHAR_k              0xDF
-#define CHAR_l              0xE0
-#define CHAR_m              0xE1
-#define CHAR_n              0xE2
-#define CHAR_o              0xE3
-#define CHAR_p              0xE4
-#define CHAR_q              0xE5
-#define CHAR_r              0xE6
-#define CHAR_s              0xE7
-#define CHAR_t              0xE8
-#define CHAR_u              0xE9
-#define CHAR_v              0xEA
-#define CHAR_w              0xEB
-#define CHAR_x              0xEC
-#define CHAR_y              0xED
-#define CHAR_z              0xEE
-#define CHAR_SPECIAL_F7     0xF7
-#define CHAR_SPECIAL_F8     0xF8
-#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
-#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 CHAR_SPACE             0x00
+#define CHAR_A_GRAVE           0x01
+#define CHAR_A_ACUTE           0x02
+#define CHAR_A_CIRCUMFLEX      0x03
+#define CHAR_C_CEDILLA         0x04
+#define CHAR_E_GRAVE           0x05
+#define CHAR_E_ACUTE           0x06
+#define CHAR_E_CIRCUMFLEX      0x07
+#define CHAR_E_DIAERESIS       0x08
+#define CHAR_I_GRAVE           0x09
+//#define CHAR_I_ACUTE         0x0A // Is 0x5A instead
+#define CHAR_I_CIRCUMFLEX      0x0B
+#define CHAR_I_DIAERESIS       0x0C
+#define CHAR_O_GRAVE           0x0D
+#define CHAR_O_ACUTE           0x0E
+#define CHAR_O_CIRCUMFLEX      0x0F
+#define CHAR_OE                0x10
+#define CHAR_U_GRAVE           0x11    
+#define CHAR_U_ACUTE           0x12
+#define CHAR_U_CIRCUMFLEX      0x13
+#define CHAR_N_TILDE           0x14
+#define CHAR_ESZETT            0x15
+#define CHAR_a_GRAVE           0x16
+#define CHAR_a_ACUTE           0x17
+//#define CHAR_a_CIRCUMFLEX    0x18 // Is 0x68 instead
+#define CHAR_c_CEDILLA         0x19
+#define CHAR_e_GRAVE           0x1A
+#define CHAR_e_ACUTE           0x1B
+#define CHAR_e_CIRCUMFLEX      0x1C
+#define CHAR_e_DIAERESIS       0x1D
+#define CHAR_i_GRAVE           0x1E
+//#define CHAR_i_ACUTE         0x1F // Is 0x6F instead
+#define CHAR_i_CIRCUMFLEX      0x20
+#define CHAR_i_DIAERESIS       0x21
+#define CHAR_o_GRAVE           0x22
+#define CHAR_o_ACUTE           0x23
+#define CHAR_o_CIRCUMFLEX      0x24
+#define CHAR_oe                0x25
+#define CHAR_u_GRAVE           0x26
+#define CHAR_u_ACUTE           0x27
+#define CHAR_u_CIRCUMFLEX      0x28
+#define CHAR_n_TILDE           0x29
+#define CHAR_MASCULINE_ORDINAL 0x2A
+#define CHAR_FEMININE_ORDINAL  0x2B
+#define CHAR_SUPER_ER          0x2C
+#define CHAR_AMPERSAND         0x2D
+#define CHAR_PLUS              0x2E
+//
+#define CHAR_LV                0x34
+#define CHAR_EQUALS            0x35
+#define CHAR_SEMICOLON         0x36
+//
+#define CHAR_INV_QUESTION_MARK 0x51
+#define CHAR_INV_EXCL_MARK     0x52
+#define CHAR_PK                0x53
+#define CHAR_MN                0x54
+#define CHAR_PO                0x55
+#define CHAR_KE                0x56
+#define CHAR_BLOCK_1           0x57 // Each of these 3
+#define CHAR_BLOCK_2           0x58 // chars contains 1/3
+#define CHAR_BLOCK_3           0x59 // of the word BLOCK
+#define CHAR_I_ACUTE           0x5A
+#define CHAR_PERCENT           0x5B
+#define CHAR_LEFT_PAREN        0x5C
+#define CHAR_RIGHT_PAREN       0x5D
+//
+#define CHAR_a_CIRCUMFLEX      0x68
+//
+#define CHAR_i_ACUTE           0x6F
+//
+#define CHAR_UNK_SPACER        0x77
+//
+#define CHAR_UP_ARROW          0x79
+#define CHAR_DOWN_ARROW        0x7A
+#define CHAR_LEFT_ARROW        0x7B
+#define CHAR_RIGHT_ARROW       0x7C
+//
+#define CHAR_SUPER_E           0x84
+#define CHAR_LESS_THAN         0x85
+#define CHAR_GREATER_THAN      0x86
+//
+#define CHAR_SUPER_RE          0xA0
+#define CHAR_0                 0xA1
+#define CHAR_1                 0xA2
+#define CHAR_2                 0xA3
+#define CHAR_3                 0xA4
+#define CHAR_4                 0xA5
+#define CHAR_5                 0xA6
+#define CHAR_6                 0xA7
+#define CHAR_7                 0xA8
+#define CHAR_8                 0xA9
+#define CHAR_9                 0xAA
+#define CHAR_EXCL_MARK         0xAB
+#define CHAR_QUESTION_MARK     0xAC
+#define CHAR_PERIOD            0xAD
+#define CHAR_HYPHEN            0xAE
+#define CHAR_BULLET            0xAF
+#define CHAR_ELLIPSIS          0xB0
+#define CHAR_DBL_QUOT_LEFT     0xB1
+#define CHAR_DBL_QUOT_RIGHT    0xB2
+#define CHAR_SGL_QUOT_LEFT     0xB3
+#define CHAR_SGL_QUOT_RIGHT    0xB4
+#define CHAR_MALE              0xB5
+#define CHAR_FEMALE            0xB6
+#define CHAR_CURRENCY          0xB7
+#define CHAR_COMMA             0xB8
+#define CHAR_MULT_SIGN         0xB9
+#define CHAR_SLASH             0xBA
+#define CHAR_A                 0xBB
+#define CHAR_B                 0xBC
+#define CHAR_C                 0xBD
+#define CHAR_D                 0xBE
+#define CHAR_E                 0xBF
+#define CHAR_F                 0xC0
+#define CHAR_G                 0xC1
+#define CHAR_H                 0xC2
+#define CHAR_I                 0xC3
+#define CHAR_J                 0xC4
+#define CHAR_K                 0xC5
+#define CHAR_L                 0xC6
+#define CHAR_M                 0xC7
+#define CHAR_N                 0xC8
+#define CHAR_O                 0xC9
+#define CHAR_P                 0xCA
+#define CHAR_Q                 0xCB
+#define CHAR_R                 0xCC
+#define CHAR_S                 0xCD
+#define CHAR_T                 0xCE
+#define CHAR_U                 0xCF
+#define CHAR_V                 0xD0
+#define CHAR_W                 0xD1
+#define CHAR_X                 0xD2
+#define CHAR_Y                 0xD3
+#define CHAR_Z                 0xD4
+#define CHAR_a                 0xD5
+#define CHAR_b                 0xD6
+#define CHAR_c                 0xD7
+#define CHAR_d                 0xD8
+#define CHAR_e                 0xD9
+#define CHAR_f                 0xDA
+#define CHAR_g                 0xDB
+#define CHAR_h                 0xDC
+#define CHAR_i                 0xDD
+#define CHAR_j                 0xDE
+#define CHAR_k                 0xDF
+#define CHAR_l                 0xE0
+#define CHAR_m                 0xE1
+#define CHAR_n                 0xE2
+#define CHAR_o                 0xE3
+#define CHAR_p                 0xE4
+#define CHAR_q                 0xE5
+#define CHAR_r                 0xE6
+#define CHAR_s                 0xE7
+#define CHAR_t                 0xE8
+#define CHAR_u                 0xE9
+#define CHAR_v                 0xEA
+#define CHAR_w                 0xEB
+#define CHAR_x                 0xEC
+#define CHAR_y                 0xED
+#define CHAR_z                 0xEE
+#define CHAR_BLACK_TRIANGLE    0xEF
+#define CHAR_COLON             0xF0
+#define CHAR_A_DIAERESIS       0xF1
+#define CHAR_O_DIAERESIS       0xF2
+#define CHAR_U_DIAERESIS       0xF3
+#define CHAR_a_DIAERESIS       0xF4
+#define CHAR_o_DIAERESIS       0xF5
+#define CHAR_u_DIAERESIS       0xF6
+#define CHAR_SPECIAL_F7        0xF7
+#define CHAR_SPECIAL_F8        0xF8
+#define CHAR_SPECIAL_F9        0xF9
+#define CHAR_PROMPT_SCROLL     0xFA // waits for button press and scrolls dialog
+#define CHAR_PROMPT_CLEAR      0xFB // waits for button press and clears dialog
+#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
 
 // Special F9 chars
 #define CHAR_UP_ARROW_2    0x00