4 files changed, 20 insertions, 20 deletions
diff --git a/data/text/luminous_cave.inc b/data/text/luminous_cave.inc
index 96f852e..60ab2f8 100644
--- a/data/text/luminous_cave.inc
+++ b/data/text/luminous_cave.inc
@@ -64,8 +64,8 @@ gLuminousCaveChangedAppearance:: @ 80DCE68
 	.align 2, 0
 
 gLuminousCaveEvolved:: @ 80DCEB0
-	.string "#+It evolved from #C4$m0#R\n"
-	.string "#+to #C6$m1#R!\0"
+	.string "#+It evolved from {COLOR_1 GREEN}$m0{END_COLOR_TEXT_1}\n"
+	.string "#+to {COLOR_1 YELLOW}$m1{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gLuminousCaveComeAlone:: @ 80DCEDC
diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc
index 5ffea3e..40cc664 100644
--- a/data/text/party_menu.inc
+++ b/data/text/party_menu.inc
@@ -36,24 +36,24 @@ gUnknown_80DD564:: @ 80DD564
 	.align 2,0
 
 gUnknown_80DD594:: @ 80DD594
-	.string "#+The #C4$i1#R was\n"
+	.string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n"
 	.string "#+handed over. \0"
 	.align 2, 0
 
 gUnknown_80DD5B8:: @ 80DD5B8
-	.string "#+The #C4$i1#R was\n"
+	.string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n"
 	.string "#+handed over.#P"
-	.string "#+The #C4$i0#R was\n"
+	.string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n"
 	.string "#+returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD60C:: @ 80DD60C
-	.string "#+The #C4$i0#R was\n"
+	.string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n"
 	.string "#+returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD63C:: @ 80DD63C
-	.string "#+The #C4$i0#R was\n"
+	.string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n"
 	.string "#+sent to storage.\0"
 	.align 2, 0
 
@@ -98,7 +98,7 @@ gPartyMenuCheckIQ:: @ 80DD6C4
 	.align 2, 0
 
 gPartyMenuItemPlaceholder:: @ 80DD6D0
-	.string "Item: #C4$i0#R \0"
+	.string "Item: {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} \0"
 	.align 2, 0
 
 gUnknown_80DD6E0:: @ 80DD6E0
diff --git a/data/text/wonder_mail_3.inc b/data/text/wonder_mail_3.inc
index 773b1f6..f3076e5 100644
--- a/data/text/wonder_mail_3.inc
+++ b/data/text/wonder_mail_3.inc
@@ -1,21 +1,21 @@
 gUnknown_80DFE4C:: @ 80DFE4C
 	.string "Are you sure you want to replace the\n"
-	.string "old  #CGWonder Mail#R with the new one?\0"
+	.string "old  {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} with the new one?\0"
 	.align 2, 0
 
 gUnknown_80DFE9C:: @ 80DFE9C
-	.string "This #CGWonder Mail#R has already been\n"
+	.string "This {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} has already been\n"
 	.string "received.\0"
 	.align 2, 0
 
 gUnknown_80DFED0:: @ 80DFED0
-	.string "This #CGWonder Mail#R has already been\n"
+	.string "This {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} has already been\n"
 	.string "received.\n"
 	.string "You may not receive the same one again.\0"
 	.align 2, 0
 
 gUnknown_80DFF2C:: @ 80DFF2C
-	.string "Only #CGone piece#R of #CGWonder Mail#R can be held.\n"
+	.string "Only {COLOR_1 LIGHT_BLUE_2}one piece{END_COLOR_TEXT_1} of {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} can be held.\n"
 	.string "Please receive it after completing any\n"
 	.string "rescue mission in progress.\0"
 	.align 2, 0
@@ -31,17 +31,17 @@ gUnknown_80E0010:: @ 80E0010
 	.string "a dungeon with a mission in progress.\n"
 	.string "Mail cannot be deleted now.\0"
 gUnknown_80E0074:: @ 80E0074
-	.string "Received the #CGWonder Mail#R!\0"
+	.string "Received the {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gUnknown_80E0094:: @ 80E0094
-	.string "Only #CGone piece#R of #CGWonder Mail#R can be held.\n"
-	.string "Is it OK to replace the old #CGWonder Mail#R\n"
+	.string "Only {COLOR_1 LIGHT_BLUE_2}one piece{END_COLOR_TEXT_1} of {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} can be held.\n"
+	.string "Is it OK to replace the old {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1}\n"
 	.string "with the new one?\0"
 	.align 2, 0
 
 gUnknown_80E0108:: @ 80E0108
-	.string "Your #CGJob List#R is full.\n"
+	.string "Your {COLOR_1 LIGHT_BLUE_2}Job List{END_COLOR_TEXT_1} is full.\n"
 	.string "Please select and delete unwanted mail.\0"
 	.align 2, 0
 
diff --git a/data/text/wonder_mail_complete.inc b/data/text/wonder_mail_complete.inc
index 24a5288..06308a4 100644
--- a/data/text/wonder_mail_complete.inc
+++ b/data/text/wonder_mail_complete.inc
@@ -4,22 +4,22 @@ gWonderMailClientThanksForRescuingMe:: @ 80E0184
 
 gWonderMailClientThanksForRescuingThem:: @ 80E01A0
 	.string " Thank you for rescuing\n"
-	.string "#C5$m1#R!\0"
+	.string "{COLOR_1 CYAN}$m1{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gWonderMailClientEscorted:: @ 80E01C4
 	.string " Thank you for escorting me\n"
-	.string "to #C5$m1#R! \0"
+	.string "to {COLOR_1 CYAN}$m1{END_COLOR_TEXT_1}! \0"
 	.align 2, 0
 
 gWonderMailClientItemDelivered1:: @ 80E01F0
 	.string " Thank you for delivering\n"
-	.string "the #C4$i0#R!\0"
+	.string "the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gWonderMailClientItemDelivered2:: @ 80E0218
 	.string " Thank you for getting me\n"
-	.string "the #C4$i0#R!\0"
+	.string "the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 	.string "pksdir0\0"