summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/berry_crush.s22
-rw-r--r--data/contest_link_80F57C4.s4
2 files changed, 13 insertions, 13 deletions
diff --git a/data/berry_crush.s b/data/berry_crush.s
index fa1170062..a2b0f2658 100755
--- a/data/berry_crush.s
+++ b/data/berry_crush.s
@@ -47,21 +47,21 @@ gUnknown_082F32CC:: @ 82F32CC struct BgTemplate? not sure
.byte 0xb3, 0x30, 0x00, 0x00
.align 2
-gUnknown_082F32D8:: @ 82F32D8
- .byte 0x01, 0x02, 0x03
+sBerryCrushTextColors1:: @ 82F32D8
+ .byte 0x01, 0x02, 0x03 @ TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY
-gUnknown_082F32DB:: @ 82F32DB
- .byte 0x00, 0x01, 0x02
+sBerryCrushTextColors2:: @ 82F32DB
+ .byte 0x00, 0x01, 0x02 @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY
-gUnknown_082F32DE:: @ 82F32DE
- .byte 0x00, 0x03, 0x04
+sBerryCrushTextColors3:: @ 82F32DE
+ .byte 0x00, 0x03, 0x04 @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_RED
-gUnknown_082F32E1:: @ 82F32E1
- .byte 0x01, 0x08, 0x09
- .byte 0x01, 0x06, 0x07
+sBerryCrushTextColorTable:: @ 82F32E1
+ .byte 0x01, 0x08, 0x09 @ TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE
+ .byte 0x01, 0x06, 0x07 @ TEXT_COLOR_WHITE, TEXT_COLOR_GREEN, TEXT_COLOR_LIGHT_GREEN
-gUnknown_082F32E7:: @ 82F32E7
- .byte 0x01, 0x04, 0x05
+sBerryCrushTextColors4:: @ 82F32E7
+ .byte 0x01, 0x04, 0x05 @ TEXT_COLOR_WHITE, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED
.align 2
gUnknown_082F32EC:: @ 82F32EC
diff --git a/data/contest_link_80F57C4.s b/data/contest_link_80F57C4.s
index a434eee28..40a5636a0 100644
--- a/data/contest_link_80F57C4.s
+++ b/data/contest_link_80F57C4.s
@@ -83,6 +83,6 @@ gUnknown_0858D8E0:: @ 858D8E0
obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce
.align 2
-gUnknown_0858D8E8:: @ 858D8E8
- .byte 0x01, 0x0f, 0x0e, 0x00
+sContestLinkTextColors:: @ 858D8E8
+ .byte 0x01, 0x0f, 0x0e, 0x00 @ TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_DYNAMIC_COLOR_5