summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2016-09-03 01:17:11 +0100
committerProjectRevoTPP <projectrevotpp@hotmail.com>2016-09-03 01:17:11 +0100
commit2b71286015c70a30f306e96156abde6868873941 (patch)
tree2bb4c9d26d8fd3eb517119f32515ad6fbf8a8113
parentf627b8161b1db9b8b66bdf11b6fb2ef6df898c1c (diff)
dump trainer card and star palettes
-rw-r--r--asm/rom5.s2
-rw-r--r--data/data2.s10
-rw-r--r--data/graphics.s29
-rw-r--r--graphics/misc/trainer_card.pngbin0 -> 1583 bytes
-rw-r--r--graphics/misc/trainer_card_0star.pal51
-rw-r--r--graphics/misc/trainer_card_1star.pal51
-rw-r--r--graphics/misc/trainer_card_2star.pal51
-rw-r--r--graphics/misc/trainer_card_3star.pal51
-rw-r--r--graphics/misc/trainer_card_4star.pal51
9 files changed, 278 insertions, 18 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index 816c5f0a8..7d6a94c8a 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -51246,7 +51246,7 @@ _08093E4E:
bx r0
.align 2, 0
_08093E84: .4byte gUnknown_083B5F6C
-_08093E88: .4byte gUnknown_08E8B4E0
+_08093E88: .4byte gMenuTrainerCard_Gfx
_08093E8C: .4byte 0x040000d4
_08093E90: .4byte 0x80000800
_08093E94: .4byte gBadgesTiles
diff --git a/data/data2.s b/data/data2.s
index 0b0837564..a2ed60913 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -12936,11 +12936,11 @@ gUnknown_083B5EF4:: @ 83B5EF4
.align 2
gUnknown_083B5EF8:: @ 83B5EF8
- .4byte gUnknown_08E8C8E0
- .4byte gUnknown_08E8C940
- .4byte gUnknown_08E8C9A0
- .4byte gUnknown_08E8CA00
- .4byte gUnknown_08E8CA60
+ .4byte gMenuTrainerCard0Star_Pal
+ .4byte gMenuTrainerCard1Star_Pal
+ .4byte gMenuTrainerCard2Star_Pal
+ .4byte gMenuTrainerCard3Star_Pal
+ .4byte gMenuTrainerCard4Star_Pal
gUnknown_083B5F0C:: @ 83B5F0C
.incbin "baserom.gba", 0x003b5f0c, 0x20
diff --git a/data/graphics.s b/data/graphics.s
index 0c8ffba20..cab11dad6 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -3777,23 +3777,28 @@ gPokenavRibbonsHeader_Gfx:: @ 8E8B3A0
.incbin "graphics/pokenav/ribbons.4bpp.lz"
.align 2
-gUnknown_08E8B4E0:: @ 8E8B4E0
- .incbin "baserom.gba", 0x00e8b4e0, 0x1400
+gMenuTrainerCard_Gfx:: @ 8E8B4E0
+ .incbin "graphics/misc/trainer_card.4bpp"
-gUnknown_08E8C8E0::
- .incbin "baserom.gba", 0x00e8c8e0, 0x60
+ .align 2
+gMenuTrainerCard0Star_Pal::
+ .incbin "graphics/misc/trainer_card_0star.gbapal"
-gUnknown_08E8C940::
- .incbin "baserom.gba", 0x00e8c940, 0x60
+ .align 2
+gMenuTrainerCard1Star_Pal::
+ .incbin "graphics/misc/trainer_card_1star.gbapal"
-gUnknown_08E8C9A0::
- .incbin "baserom.gba", 0x00e8c9a0, 0x60
+ .align 2
+gMenuTrainerCard2Star_Pal::
+ .incbin "graphics/misc/trainer_card_2star.gbapal"
-gUnknown_08E8CA00::
- .incbin "baserom.gba", 0x00e8ca00, 0x60
+ .align 2
+gMenuTrainerCard3Star_Pal::
+ .incbin "graphics/misc/trainer_card_3star.gbapal"
-gUnknown_08E8CA60::
- .incbin "baserom.gba", 0x00e8ca60, 0x60
+ .align 2
+gMenuTrainerCard4Star_Pal::
+ .incbin "graphics/misc/trainer_card_4star.gbapal"
gUnknown_08E8CAC0::
.incbin "baserom.gba", 0x00e8cac0, 0x500
diff --git a/graphics/misc/trainer_card.png b/graphics/misc/trainer_card.png
new file mode 100644
index 000000000..915ecdca2
--- /dev/null
+++ b/graphics/misc/trainer_card.png
Binary files differ
diff --git a/graphics/misc/trainer_card_0star.pal b/graphics/misc/trainer_card_0star.pal
new file mode 100644
index 000000000..f49b7f2c5
--- /dev/null
+++ b/graphics/misc/trainer_card_0star.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+139 98 115
+255 255 255
+230 255 222
+164 164 164
+123 123 123
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+180 230 156
+148 238 131
+131 222 115
+82 172 74
+106 189 255
+205 205 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 180 213
+41 123 164
+0 0 0
+0 0 0
+98 98 115
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+106 189 255
+205 205 205
+0 0 0
diff --git a/graphics/misc/trainer_card_1star.pal b/graphics/misc/trainer_card_1star.pal
new file mode 100644
index 000000000..62c51c91f
--- /dev/null
+++ b/graphics/misc/trainer_card_1star.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+139 98 115
+238 255 246
+213 238 230
+164 164 164
+123 123 123
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+189 213 205
+148 180 164
+106 148 123
+65 115 90
+106 189 255
+205 205 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 180 213
+41 123 164
+0 0 0
+0 0 0
+98 98 115
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+106 189 255
+205 205 205
+0 0 0
diff --git a/graphics/misc/trainer_card_2star.pal b/graphics/misc/trainer_card_2star.pal
new file mode 100644
index 000000000..bacce54f5
--- /dev/null
+++ b/graphics/misc/trainer_card_2star.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+139 98 115
+255 246 230
+246 230 213
+205 156 90
+180 131 65
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+230 189 139
+205 156 115
+180 131 82
+156 106 41
+106 189 255
+205 205 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 180 213
+41 123 164
+0 0 0
+0 0 0
+98 98 115
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+106 189 255
+205 205 205
+0 0 0
diff --git a/graphics/misc/trainer_card_3star.pal b/graphics/misc/trainer_card_3star.pal
new file mode 100644
index 000000000..21f3d83eb
--- /dev/null
+++ b/graphics/misc/trainer_card_3star.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+139 98 115
+246 246 255
+230 230 238
+189 189 197
+156 156 156
+156 106 41
+41 57 65
+57 106 139
+65 139 197
+230 230 238
+189 189 197
+156 156 156
+123 123 123
+106 189 255
+205 205 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 180 213
+41 123 164
+0 0 0
+0 0 0
+98 98 115
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+106 189 255
+205 205 205
+0 0 0
diff --git a/graphics/misc/trainer_card_4star.pal b/graphics/misc/trainer_card_4star.pal
new file mode 100644
index 000000000..4e1d56b54
--- /dev/null
+++ b/graphics/misc/trainer_card_4star.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+139 98 115
+246 246 222
+246 238 172
+164 164 164
+123 123 123
+98 98 115
+41 57 65
+57 106 139
+65 139 197
+246 230 139
+230 213 49
+213 197 57
+156 115 57
+106 189 255
+205 205 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+106 180 213
+41 123 164
+0 0 0
+0 0 0
+98 98 115
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+255 255 255
+230 230 238
+164 164 164
+123 123 123
+106 189 255
+205 205 205
+0 0 0