summaryrefslogtreecommitdiff
path: root/data/data2.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-28 21:24:04 -0800
committerYamaArashi <shadow962@live.com>2016-01-28 21:24:04 -0800
commitd05203a11c835e5e6fc84f69b2975c0b7bbd521f (patch)
treebf478011fa1585951b9cbb28013bafd5d2da358b /data/data2.s
parenta19ea007a5174179647876348173a34cc44458d7 (diff)
trainer data
Diffstat (limited to 'data/data2.s')
-rw-r--r--data/data2.s17
1 files changed, 6 insertions, 11 deletions
diff --git a/data/data2.s b/data/data2.s
index 3ee68fb91..8d964a0cb 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -450,21 +450,16 @@ gUnknown_081ECAD8: ; 81ECAD8
.include "data/graphics/trainers/back_pic_palette_table.s"
gUnknown_081ECB14: ; 81ECB14
- .incbin "baserom.gba", 0x001ecb14, 0x36f4
+ .incbin "baserom.gba", 0x001ecb14, 0x19C
+
+; 81ECCB0
+ .include "data/trainer_parties.s"
; 81F0208
.include "data/text/trainer_class_names.s"
- .align 2
-
-gUnknown_081F04FC: ; 81F04FC
- .incbin "baserom.gba", 0x001f04fc, 0x4
-
-gUnknown_081F0500: ; 81F0500
- .incbin "baserom.gba", 0x001f0500, 0xc
-
-gUnknown_081F050C: ; 81F050C
- .incbin "baserom.gba", 0x001f050c, 0x6c60
+; 81F04FC
+ .include "data/trainers.s"
; 81F716C
.include "data/text/species_names.s"