summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <nintendo6496@googlemail.com>2018-10-13 00:44:54 +0200
committerpaul <nintendo6496@googlemail.com>2018-10-13 00:44:54 +0200
commit8adafe8c73f362a922931caab7ae169635c5a888 (patch)
tree2d3d341c6cd04e1f7b11459febe63970d32a5496
parenta9cef334e09b54d6f0d4ab15861a465cc5bc071c (diff)
add copy of black_belt palette for emerald and fix labels
-rw-r--r--data/graphics.s6
-rw-r--r--graphics/trainers/palettes/emerald_black_belt.pal19
2 files changed, 22 insertions, 3 deletions
diff --git a/data/graphics.s b/data/graphics.s
index 8715afc66..5a29a0b01 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -10403,8 +10403,8 @@ gFile_graphics_trainers_front_pics_emerald_black_belt_front_pic:: @ 8E4C2CC
.incbin "graphics/trainers/front_pics/emerald_black_belt_front_pic.4bpp.lz"
.align 2
-gFile_graphics_trainers_palettes_black_belt:: @ 8E4C630
- .incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
+gFile_graphics_trainers_palettes_emerald_black_belt:: @ 8E4C630
+ .incbin "graphics/trainers/palettes/emerald_black_belt.gbapal.lz"
.align 2
gFile_graphics_trainers_front_pics_guitarist_front_pic:: @ 8E4C658
@@ -11115,7 +11115,7 @@ gFile_graphics_trainers_front_pics_black_belt_front_pic:: @ 8E6044C
.incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
.align 2
-gFile_graphics_trainers_palettes_black_belt2:: @ 8E6086C
+gFile_graphics_trainers_palettes_black_belt:: @ 8E6086C
.incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
.align 2
diff --git a/graphics/trainers/palettes/emerald_black_belt.pal b/graphics/trainers/palettes/emerald_black_belt.pal
new file mode 100644
index 000000000..869e5d8df
--- /dev/null
+++ b/graphics/trainers/palettes/emerald_black_belt.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+246 205 189
+222 172 148
+172 131 106
+90 65 49
+148 131 123
+106 90 82
+82 90 115
+49 57 82
+205 189 189
+189 164 164
+156 139 139
+255 98 90
+197 65 65
+246 230 230
+0 0 0