summaryrefslogtreecommitdiff
path: root/data
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 /data
parentf627b8161b1db9b8b66bdf11b6fb2ef6df898c1c (diff)
dump trainer card and star palettes
Diffstat (limited to 'data')
-rw-r--r--data/data2.s10
-rw-r--r--data/graphics.s29
2 files changed, 22 insertions, 17 deletions
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