diff --git a/charmap.txt b/charmap.txt
index 78305c303..b9d0ed9de 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -78,10 +78,12 @@ SUPER_RE    = A0
 '?'         = AC
 '.'         = AD
 '-'         = AE
+'·'         = AF
 '…'         = B0
 '“'         = B1
 '”'         = B2
 '‘'         = B3
+'’'         = B4
 '\''        = B4
 '♂'         = B5
 '♀'         = B6
@@ -323,13 +325,8 @@ TALL_PLUS   = FC 0C FB
 '？' = AC
 '。' = AD
 'ー' = AE
-'·' = AF
 '‥' = B0
 
-DYNAMIC = F7
-KEYGFX = F8
-EXTRA = F9
-
 STRING = FD
 
 @ string placeholders
@@ -414,7 +411,7 @@ B_BUFF3 = FD 30
 NAME_END = FC 00
 
 @ special 0xF7 character
-SPECIAL_F7  =   F7
+DYNAMIC  =   F7
 
 @ more text functions
 
@@ -424,20 +421,20 @@ SHADOW = FC 03 @ same as fc 01
 COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
 PALETTE = FC 05 @ used in credits
 FONT = FC 06 @ Given a font id, or use font constants below instead
-RESET_SIZE = FC 07
+RESET_FONT = FC 07
 PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
 PAUSE_UNTIL_PRESS = FC 09
 WAIT_SE = FC 0A
 PLAY_BGM = FC 0B
 ESCAPE = FC 0C
-SHIFT_TEXT = FC 0D @ shift rightward by 1-byte arg
-SHIFT_DOWN = FC 0E @ shift downward by 1-byte arg
+SHIFT_RIGHT = FC 0D
+SHIFT_DOWN = FC 0E
 FILL_WINDOW = FC 0F
 PLAY_SE = FC 10
 CLEAR = FC 11
 SKIP = FC 12
 CLEAR_TO = FC 13
-SPACING = FC 14
+MIN_LETTER_SPACING = FC 14
 JPN = FC 15
 ENG = FC 16
 PAUSE_MUSIC = FC 17
diff --git a/src/strings.c b/src/strings.c
index c23f8d334..c09955503 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -955,7 +955,7 @@ const u8 gText_Battle[] = _("BATTLE");
 const u8 gText_Lets[] = _("LET'S");
 const u8 gText_Ok[] = _("OK!");
 const u8 gText_Sorry[] = _("SORRY");
-const u8 gText_YaySmileEmoji[] = _("YAY{EXTRA 0xF9}");
+const u8 gText_YaySmileEmoji[] = _("YAY{EMOJI_BIGSMILE}");
 const u8 gText_ThankYou[] = _("THANK YOU");
 const u8 gText_ByeBye[] = _("BYE-BYE!");
 const u8 gText_PlayerScurriedToCenter[] = _("{PLAYER} scurried to a POKéMON CENTER,\nprotecting the exhausted and fainted\nPOKéMON from further harm‥\p");
@@ -1008,7 +1008,7 @@ const u8 gText_BerriesPicked[] = _("BERRIES picked:");
 const u8 gText_BestScore[] = _("Best score:");
 const u8 gText_BerriesInRowFivePlayers[] = _("BERRIES picked in a row with\nfive players:");
 const u8 gText_BerryPickingResults[] = _("Announcing BERRY-PICKING results!");
-const u8 gText_10P30P50P50P[] = _("10P     30P     50P     {EXTRA 0xDD}50P");
+const u8 gText_10P30P50P50P[] = _("10P     30P     50P     {EMOJI_MINUS}50P");
 const u8 gText_AnnouncingRankings[] = _("Announcing rankings!");
 const u8 gText_AnnouncingPrizes[] = _("Announcing prizes!");
 const u8 gText_1Colon[] = _("1:");
diff --git a/src/union_room_message.c b/src/union_room_message.c
index a1368e9fa..90b481a33 100644
--- a/src/union_room_message.c
+++ b/src/union_room_message.c
@@ -546,17 +546,17 @@ const u8 *const gTexts_UR_CardColor[] = {
     sText_ItsGoldCard
 };
 
-ALIGNED(4) const u8 gText_UR_TrainerCardInfoPage1[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME:    {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p");
-ALIGNED(4) const u8 gText_UR_TrainerCardInfoPage2[] = _("BATTLES: {SPECIAL_F7 0x00} WINS  {SPECIAL_F7 0x02} LOSSES\nTRADES:  {SPECIAL_F7 0x03} TIMES\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p");
-ALIGNED(4) static const u8 sText_GladToMeetYouMale[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}");
-ALIGNED(4) static const u8 sText_GladToMeetYouFemale[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}");
+ALIGNED(4) const u8 gText_UR_TrainerCardInfoPage1[] = _("This is {DYNAMIC 0} {DYNAMIC 1}'s\nTRAINER CARD…\l{DYNAMIC 2}\pPOKéDEX: {DYNAMIC 3}\nTIME:    {DYNAMIC 4}:{DYNAMIC 5}\p");
+ALIGNED(4) const u8 gText_UR_TrainerCardInfoPage2[] = _("BATTLES: {DYNAMIC 0} WINS  {DYNAMIC 2} LOSSES\nTRADES:  {DYNAMIC 3} TIMES\p“{DYNAMIC 4} {DYNAMIC 5}\n{DYNAMIC 6} {DYNAMIC 7}”\p");
+ALIGNED(4) static const u8 sText_GladToMeetYouMale[] = _("{DYNAMIC 1}: Glad to have met you!{PAUSE 60}");
+ALIGNED(4) static const u8 sText_GladToMeetYouFemale[] = _("{DYNAMIC 1}: Glad to meet you!{PAUSE 60}");
 
 const u8 *const gTexts_UR_GladToMeetYou[GENDER_COUNT] = {
     sText_GladToMeetYouMale,
     sText_GladToMeetYouFemale
 };
 
-ALIGNED(4) const u8 gText_UR_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}");
+ALIGNED(4) const u8 gText_UR_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {DYNAMIC 1}'s\nTRAINER CARD.{PAUSE 60}");
 ALIGNED(4) static const u8 sText_CanceledReadingCard[] = _("Canceled reading the Card.");
 
 static const struct MysteryGiftClientCmd sClientScript_DynamicError[] = {