diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-10-31 08:23:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 08:23:51 -0700 |
| commit | 343389467108cd99fb315131881b5f3f19261383 (patch) | |
| tree | 4035a8314efc3149a5f818a2589c099643b08850 /data/data2.s | |
| parent | 6874afafe545365a52c2262da4e4a84ddf14afaf (diff) | |
| parent | 4df1937738c4dc39d23f5c4e4b0d6a3774ff1b17 (diff) | |
Merge pull request #9 from Diegoisawesome/master
Ported task.c and others from pokeruby
Diffstat (limited to 'data/data2.s')
| -rw-r--r-- | data/data2.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/data2.s b/data/data2.s index 3541b35de..8f9853f62 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1645,8 +1645,8 @@ gUnknown_0831C7B4:: @ 831C7B4 @ 831F5CA .include "data/trainer_class_name_indices.s" -gUnknown_0831F61C:: @ 831F61C - .incbin "baserom.gba", 0x31f61c, 0x110 +@ 831F61C + .include "data/cry_id_table.s" @ 831F72C .include "data/experience_tables.s" |