summaryrefslogtreecommitdiff
path: root/data/data2.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-12 18:08:47 -0700
committerYamaArashi <shadow962@live.com>2015-10-12 18:08:47 -0700
commitd5b5623de723090c8e5282bcd9d3c27cfc75571f (patch)
tree3ddf23028e11e06bd81b7bb24ab5c5bb5d03f57d /data/data2.s
parentbfae72bf1debc2b570d1ec221ae07fddb0016a70 (diff)
evolution table
Diffstat (limited to 'data/data2.s')
-rw-r--r--data/data2.s6
1 files changed, 2 insertions, 4 deletions
diff --git a/data/data2.s b/data/data2.s
index 44dad95e6..f62c2636c 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1673,10 +1673,8 @@ gUnknown_0831F61C: ; 831F61C
; 83230DC
.include "data/level_up_learnsets.s"
- .align 2, 0
-
-gUnknown_0832531C: ; 832531C
- .incbin "base_emerald.gba", 0x32531c, 0x4060
+; 832531C
+ .include "data/evolution_table.s"
; 832937C
.include "data/level_up_learnset_pointers.s"