diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-02 21:49:09 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-02 21:49:09 -0500 |
| commit | df128cbfedcaf8a0da698ba9a9e62bed21721e1c (patch) | |
| tree | 6f12e1991e59856f83711d469020072a5321da3e /data/data2b.s | |
| parent | e3b078d08fb7208065cb6bda96879fbb6e97c5db (diff) | |
| parent | 0a9f0d80f5f3d1cf02ae26a7bad1d771f8dedc52 (diff) | |
Merge branch 'master' into pokenav_match_call
Diffstat (limited to 'data/data2b.s')
| -rw-r--r-- | data/data2b.s | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/data/data2b.s b/data/data2b.s index b65087d7a..8d759b0b2 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4866,21 +4866,3 @@ gUnknown_0831ACDC:: @ 831ACDC .align 2 gUnknown_0831ACE0:: @ 831ACE0 .byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00 - -@ 831ACE8 - .include "data/type_effectiveness.inc" - -@ 831AE38 - .include "data/text/type_names.inc" - -@ 831AEB8 - .include "data/trainer_money.inc" - -@ 831AF98 - .include "data/text/ability_descriptions.inc" - -@ 831B6DB - .include "data/text/ability_names.inc" - -@ 831BAD4 - .include "data/text/ability_description_pointers.inc" |