summaryrefslogtreecommitdiff
path: root/data/data2.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-24 23:55:13 -0800
committerYamaArashi <shadow962@live.com>2016-01-24 23:55:13 -0800
commit8b06424f1ab88ad88fe0bede55c098765fc44ae7 (patch)
tree6f55ca43657ccf332b09d2f2de32a00aa9e99733 /data/data2.s
parent72a3223215ab8312e578bba5ec214ad9ab4141ea (diff)
trainer graphics
Diffstat (limited to 'data/data2.s')
-rw-r--r--data/data2.s22
1 files changed, 13 insertions, 9 deletions
diff --git a/data/data2.s b/data/data2.s
index e3a9ca515..59fe48b18 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -398,11 +398,14 @@ gUnknown_081EC2A4: ; 81EC2A4
gUnknown_081EC3F0: ; 81EC3F0
.incbin "baserom.gba", 0x001ec3f0, 0x14c
-gUnknown_081EC53C: ; 81EC53C
- .incbin "baserom.gba", 0x001ec53c, 0x298
+; 81EC53C
+ .include "data/graphics/trainers/front_pic_table.s"
-gUnknown_081EC7D4: ; 81EC7D4
- .incbin "baserom.gba", 0x001ec7d4, 0x2f8
+; 81EC7D4
+ .include "data/graphics/trainers/front_pic_palette_table.s"
+
+; 81ECA6C
+ .incbin "baserom.gba", 0x1ECA6C, 0x60
gUnknown_081ECACC: ; 81ECACC
.incbin "baserom.gba", 0x001ecacc, 0xc
@@ -410,11 +413,11 @@ gUnknown_081ECACC: ; 81ECACC
gUnknown_081ECAD8: ; 81ECAD8
.incbin "baserom.gba", 0x001ecad8, 0xc
-gUnknown_081ECAE4: ; 81ECAE4
- .incbin "baserom.gba", 0x001ecae4, 0x18
+; 81ECAE4
+ .include "data/graphics/trainers/back_pic_table.s"
-gUnknown_081ECAFC: ; 81ECAFC
- .incbin "baserom.gba", 0x001ecafc, 0x18
+; 81ECAFC
+ .include "data/graphics/trainers/back_pic_palette_table.s"
gUnknown_081ECB14: ; 81ECB14
.incbin "baserom.gba", 0x001ecb14, 0x36f4
@@ -8010,7 +8013,8 @@ gUnknown_08D2EE48: ; 8D2EE48
; 8D2FD8C
.include "data/graphics/pokemon/graphics.s"
- .incbin "baserom.gba", 0xe48d38, 0x148b8
+; 8E48D38
+ .include "data/graphics/trainers/graphics.s"
.align 2