summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data.s4
-rw-r--r--data/data_80D47B8.s4
-rw-r--r--data/data_80DED44.s2
-rw-r--r--data/data_80E1F30.s2
-rw-r--r--data/data_80E59A8.s6
-rw-r--r--data/data_80F4278.s2
-rw-r--r--data/data_810AE24.s8
7 files changed, 14 insertions, 14 deletions
diff --git a/data/data.s b/data/data.s
index d883239..c51e2d1 100644
--- a/data/data.s
+++ b/data/data.s
@@ -410,7 +410,7 @@ gUnknown_80B71A0: @ 80B71A0
.global CWEND_text
CWEND_text:
- .string "{COLOR_1 UNKNOWN_COLOR}END{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 RED_2}END{END_COLOR_TEXT_1}\0"
.align 2,0
.global CNLAST_text
@@ -425,7 +425,7 @@ gUnknown_80B71A0: @ 80B71A0
.global CISTART_text
CISTART_text:
- .string "{COLOR_1 ITEM_COLOR}START{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 GREEN_2}START{END_COLOR_TEXT_1}\0"
.align 2,0
.global gUnknown_80B71E4
diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s
index dcb62e7..0a6d724 100644
--- a/data/data_80D47B8.s
+++ b/data/data_80D47B8.s
@@ -2518,7 +2518,7 @@ gUnknown_80DA100:
.string "Your reward...\n"
.string "Promised...{EXTRA_MSG}"
.string " Zzz... Urr!\n"
- .string "{COLOR_1 ITEM_COLOR}Bonsly Doll{END_COLOR_TEXT_1}...\0"
+ .string "{COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}...\0"
.align 2, 0
.global gUnknown_80DA204
@@ -2623,7 +2623,7 @@ gUnknown_80DA688:
.string "I promised you a reward for completing\n"
.string "the training courses!{EXTRA_MSG}"
.string " So... Here it is!{WAIT_PRESS}\n"
- .string "My {COLOR_1 ITEM_COLOR}Bonsly Doll{END_COLOR_TEXT_1}!{EXTRA_MSG}"
+ .string "My {COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}!{EXTRA_MSG}"
.string " Isn{APOSTROPHE}t it smashing? Hey?!\0"
.align 2, 0
diff --git a/data/data_80DED44.s b/data/data_80DED44.s
index ae006c1..7bb5228 100644
--- a/data/data_80DED44.s
+++ b/data/data_80DED44.s
@@ -579,7 +579,7 @@ gUnknown_80E0760: @ 80E0760
.global gUnknown_80E0778
gUnknown_80E0778: @ 80E0778
- .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}$n0{END_COLOR_TEXT_1} received the {COLOR_1 ITEM_COLOR}Bonsly Doll{END_COLOR_TEXT_1}!\n"
+ .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}$n0{END_COLOR_TEXT_1} received the {COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}!\n"
.string "{CENTER_ALIGN}It has been placed outside your\n"
.string "{CENTER_ALIGN}rescue team base.\0"
.align 2,0
diff --git a/data/data_80E1F30.s b/data/data_80E1F30.s
index 999a217..9be260d 100644
--- a/data/data_80E1F30.s
+++ b/data/data_80E1F30.s
@@ -36,7 +36,7 @@ gUnknown_80E1F80: @ 80E1F80
.global gUnknown_80E1F94
gUnknown_80E1F94: @ 80E1F94
- .string "{COLOR_1 UNKNOWN_COLOR}???{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 RED_2}???{END_COLOR_TEXT_1}\0"
.align 2,0
.string "pksdir0\0"
diff --git a/data/data_80E59A8.s b/data/data_80E59A8.s
index 6299a16..2c4d1dd 100644
--- a/data/data_80E59A8.s
+++ b/data/data_80E59A8.s
@@ -185,7 +185,7 @@ gUnknown_80E61C0: @ 80E61C0
.global gUnknown_80E61E4
gUnknown_80E61E4: @ 80E61E4
- .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 ITEM_COLOR}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n"
+ .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n"
.string "will be sent.\n"
.string "Is that OK?\0"
.align 2,0
@@ -214,13 +214,13 @@ gUnknown_80E62C4: @ 80E62C4
.global gUnknown_80E6314
gUnknown_80E6314: @ 80E6314
.string "You received\n"
- .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 ITEM_COLOR}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n"
+ .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n"
.string "Your adventure will be saved.\0"
.align 2,0
.global gUnknown_80E6358
gUnknown_80E6358: @ 80E6358
- .string "You sent {COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 ITEM_COLOR}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\0"
+ .string "You sent {COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\0"
.align 2,0
@ Trade Items Link Errors
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index 82c5cfe..8a64e9e 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -8381,7 +8381,7 @@ gDummyScenarioText: @ 8109CA8
.global gUnknown_8109CC0
gUnknown_8109CC0: @ 8109CC0
- .string "{COLOR_1 UNKNOWN_COLOR}???{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 RED_2}???{END_COLOR_TEXT_1}\0"
.align 2,0
.string "pksdir0\0"
diff --git a/data/data_810AE24.s b/data/data_810AE24.s
index 966da4b..e106071 100644
--- a/data/data_810AE24.s
+++ b/data/data_810AE24.s
@@ -3272,12 +3272,12 @@ gUnknown_8116148: @ 8116148
.global gInvalidityText
gInvalidityText: @ 811615C
- .string "{COLOR_1 UNKNOWN_COLOR}invalidity{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 RED_2}invalidity{END_COLOR_TEXT_1}\0"
.align 2,0
.global gUndefineText
gUndefineText: @ 811616C
- .string "{COLOR_1 UNKNOWN_COLOR}undefine{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 RED_2}undefine{END_COLOR_TEXT_1}\0"
.align 2,0
.global gUnknown_811617C
@@ -3783,7 +3783,7 @@ gUnknown_8117000: @ 8117000
.4byte 0x81170ac
.4byte 0x811709c
- .string "{COLOR_1 UNKNOWN_COLOR}invalidity{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 RED_2}invalidity{END_COLOR_TEXT_1}\0"
.align 2,0
.string "{COLOR_1 YELLOW_3}scene{END_COLOR_TEXT_1}\0"
.align 2,0
@@ -4347,7 +4347,7 @@ gUnknown_8118250: @ 8118250
.global gGroundLives_InvalidityText
gGroundLives_InvalidityText: @ 811825C
- .string "{COLOR_1 UNKNOWN_COLOR}invalidity{END_COLOR_TEXT_1}\0"
+ .string "{COLOR_1 RED_2}invalidity{END_COLOR_TEXT_1}\0"
.align 2,0
.global GroundLives_ActionText