1 files changed, 78 insertions, 11 deletions
diff --git a/charmap.txt b/charmap.txt
index a0d9f7ecf..6bcb0703a 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -44,6 +44,7 @@ SUPER_ER    = 2C
 '+'         = 2E
 LV          = 34
 '='         = 35
+';'         = 36
 '¿'         = 51
 '¡'         = 52
 PK          = 53
@@ -55,6 +56,7 @@ POKEBLOCK   = 55 56 57 58 59
 ')'         = 5D
 'â'         = 68
 'í'         = 6F
+UNK_SPACER  = 77
 UP_ARROW    = 79
 DOWN_ARROW  = 7A
 LEFT_ARROW  = 7B
@@ -982,18 +984,83 @@ PH_NURSE_BLEND = 5F 02
 PH_NURSE_HELD = 60 02
 PH_NURSE_SOLO = 61 02
 
-UNK_CTRL_F800 = F8 00
-UNK_CTRL_F801 = F8 01
-UNK_CTRL_F80A = F8 0A
-UNK_CTRL_F80C = F8 0C
+A_BUTTON = F8 00
+B_BUTTON = F8 01
+DPAD_UPDOWN = F8 0A
+DPAD_NONE = F8 0C
 
-UNK_CTRL_F9 = F9
-UNK_CTRL_F904 = F9 04
-UNK_CTRL_F905 = F9 05
-UNK_CTRL_F907 = F9 07
-UNK_CTRL_F908 = F9 08
-UNK_CTRL_F9DD = F9 DD
-UNK_CTRL_F9F9 = F9 F9
+UP_ARROW_2 = F9 00
+DOWN_ARROW_2 = F9 01
+LEFT_ARROW_2 = F9 02
+RIGHT_ARROW_2 = F9 03
+PLUS = F9 04
+LV_2 = F9 05
+PP = F9 06
+ID = F9 07
+NO = F9 08
+UNDERSCORE = F9 09
+CIRCLE_1 = F9 0A
+CIRCLE_2 = F9 0B
+CIRCLE_3 = F9 0C
+CIRCLE_4 = F9 0D
+CIRCLE_5 = F9 0E
+CIRCLE_6 = F9 0F
+CIRCLE_7 = F9 10
+CIRCLE_8 = F9 11
+CIRCLE_9 = F9 12
+ROUND_LEFT_PAREN = F9 13
+ROUND_RIGHT_PAREN = F9 14
+CIRCLE_DOT = F9 15
+TRIANGLE = F9 16
+BIG_MULT_X = F9 17
+
+EMOJI_UNDERSCORE = F9 D0
+EMOJI_PIPE = F9 D1
+EMOJI_HIGHBAR = F9 D2
+EMOJI_TILDE = F9 D3
+EMOJI_LEFT_PAREN = F9 D4
+EMOJI_RIGHT_PAREN = F9 D5
+EMOJI_UNION = F9 D6 @ ⊂
+EMOJI_GREATER_THAN = F9 D7
+EMOJI_LEFT_EYE = F9 D8
+EMOJI_RIGHT_EYE = F9 D9
+EMOJI_AT = F9 DA
+EMOJI_SEMICOLON = F9 DB
+EMOJI_PLUS = F9 DC
+EMOJI_MINUS = F9 DD
+EMOJI_EQUALS = F9 DE
+EMOJI_SPIRAL = F9 DF
+EMOJI_TONGUE = F9 E0
+EMOJI_TRIANGLE_OUTLINE = F9 E1
+EMOJI_ACUTE = F9 E2
+EMOJI_GRAVE = F9 E3
+EMOJI_CIRCLE = F9 E4
+EMOJI_TRIANGLE = F9 E5
+EMOJI_SQUARE = F9 E6
+EMOJI_HEART = F9 E7
+EMOJI_MOON = F9 E8
+EMOJI_NOTE = F9 E9
+EMOJI_BALL = F9 EA
+EMOJI_BOLT = F9 EB
+EMOJI_LEAF = F9 EC
+EMOJI_FIRE = F9 ED
+EMOJI_WATER = F9 EE
+EMOJI_LEFT_FIST = F9 EF
+EMOJI_RIGHT_FIST = F9 F0
+EMOJI_BIGWHEEL = F9 F1
+EMOJI_SMALLWHEEL = F9 F2
+EMOJI_SPHERE = F9 F3
+EMOJI_IRRITATED = F9 F4
+EMOJI_MISCHIEVOUS = F9 F5
+EMOJI_HAPPY = F9 F6
+EMOJI_ANGRY = F9 F7
+EMOJI_SURPRISED = F9 F8
+EMOJI_BIGSMILE = F9 F9
+EMOJI_EVIL = F9 FA
+EMOJI_TIRED = F9 FB
+EMOJI_NEUTRAL = F9 FC
+EMOJI_SHOCKED = F9 FD
+EMOJI_BIGANGER = F9 FE
 
 '\l' = FA @ scroll up window text
 '\p' = FB @ new paragraph