summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-07-29 16:41:13 -0700
committerYamaArashi <shadow962@live.com>2016-07-29 16:41:13 -0700
commitfdcf7a4e3c8b0a579e4cc77ad0b0196ef8ab5f18 (patch)
tree80e01a7080b08398217c15f30a2460f41b67673f /data
parentf2aa5b200fe51ed9adf86b05c9ca7dae437babce (diff)
diploma tilemap/palette
Diffstat (limited to 'data')
-rw-r--r--data/data2.s9
1 files changed, 6 insertions, 3 deletions
diff --git a/data/data2.s b/data/data2.s
index 980ba0f5a..346ae77ea 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -25370,13 +25370,16 @@ gSpriteTemplate_840CAEC:: @ 840CAEC
gUnknown_0840CB04:: @ 840CB04
.incbin "baserom.gba", 0x0040cb04, 0x8
+ .align 2
gUnknown_0840CB0C:: @ 840CB0C
- .incbin "graphics/misc/diploma.gbapal"
- .incbin "baserom.gba", 0x0040cb2c, 0x20
+ .incbin "graphics/misc/diploma_national.gbapal"
+ .incbin "graphics/misc/diploma_hoenn.gbapal"
+ .align 2
gUnknown_0840CB4C:: @ 840CB4C
- .incbin "baserom.gba", 0x0040cb4c, 0x73c
+ .incbin "graphics/misc/diploma_map.bin.lz"
+ .align 2
gUnknown_0840D288:: @ 840D288
.incbin "graphics/misc/diploma.4bpp.lz"