diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
| commit | f07f73e188f0ff81f313e74230d5ad055461966f (patch) | |
| tree | a6b628ac95872fbf8fedbd38b9024cb1e41a55ba /data/data.s | |
| parent | f12a82b068bb5871bc8ee9fd4146baa89799e645 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'data/data.s')
| -rw-r--r-- | data/data.s | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/data/data.s b/data/data.s index c8b79e61a..5c81abcac 100644 --- a/data/data.s +++ b/data/data.s @@ -115,9 +115,10 @@ gUnknown_8239FD4:: @ 8239FD4 gUnknown_823A004:: @ 823A004 .incbin "baserom.gba", 0x23A004, 0x4554 -gUnknown_823E558:: @ 823E558 - .incbin "baserom.gba", 0x23E558, 0x570 +gTrainerClassNames:: @ 823E558 + .include "data/text/trainer_class_names.inc" + .align 2, 0 gTrainers:: @ 823EAD8 .incbin "baserom.gba", 0x23EAC8, 0x7418 |