summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-24 17:31:39 -0700
committerYamaArashi <shadow962@live.com>2016-07-24 17:31:39 -0700
commita1a9c88754b4dbb0cf24e7b16c81b12a0afc6762 (patch)
treea79de52506315bccd748718d03bf5a84f40a24b3 /data
parent4c12d260cc25c54000ea4308a3af84b882a92792 (diff)
badges graphics
Diffstat (limited to 'data')
-rw-r--r--data/data2.s13
1 files changed, 9 insertions, 4 deletions
diff --git a/data/data2.s b/data/data2.s
index df4f52e3c..0680b8f94 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -11032,8 +11032,12 @@ gUnknown_083B5AAC:: @ 83B5AAC
gUnknown_083B5AB2:: @ 83B5AB2
.incbin "baserom.gba", 0x003b5ab2, 0x6
-gUnknown_083B5AB8:: @ 83B5AB8
- .incbin "baserom.gba", 0x003b5ab8, 0x404
+ .align 2
+gBadgesTiles:: @ 83B5AB8
+ .incbin "graphics/trainer_card/badges.4bpp"
+
+ .align 2
+ .4byte 0x02000000 @ XXX
.align 2
gUnknown_083B5EBC:: @ 83B5EBC
@@ -11072,8 +11076,9 @@ gUnknown_083B5EF8:: @ 83B5EF8
gUnknown_083B5F0C:: @ 83B5F0C
.incbin "baserom.gba", 0x003b5f0c, 0x20
-gUnknown_083B5F2C:: @ 83B5F2C
- .incbin "baserom.gba", 0x003b5f2c, 0x20
+ .align 2
+gBadgesPalette:: @ 83B5F2C
+ .incbin "graphics/trainer_card/badges.gbapal"
gUnknown_083B5F4C:: @ 83B5F4C
.incbin "baserom.gba", 0x003b5f4c, 0x20