diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2017-10-02 22:09:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 22:09:29 -0400 |
| commit | 2701191a769784640d6a4fb819ae48272d01eb75 (patch) | |
| tree | 6e6ebcf4bc02c2528e58ddcbe699b1d0601a50e1 /data/data2b.s | |
| parent | 4cf115000289d10de3408e752b37128446dd261c (diff) | |
| parent | 0fe97e838eab14723a4a38a773e2bc4d1494241e (diff) | |
Merge branch 'master' into unk_text_util_2
Diffstat (limited to 'data/data2b.s')
| -rw-r--r-- | data/data2b.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/data2b.s b/data/data2b.s index 1499c51fe..fd72e835e 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -202,14 +202,14 @@ gUnknown_0831ACA0:: @ 831ACA0 gUnknown_0831ACE0:: @ 831ACE0 .incbin "baserom.gba", 0x31ace0, 0x8 -gUnknown_0831ACE8:: @ 831ACE8 +gTypeEffectiveness:: @ 831ACE8 .incbin "baserom.gba", 0x31ace8, 0x150 @ 831AE38 .include "data/text/type_names.inc" .align 2 -gUnknown_0831AEB8:: @ 831AEB8 +gTrainerMoneyTable:: @ 831AEB8 .incbin "baserom.gba", 0x31aeb8, 0xe0 @ 831AF98 |