diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 22:58:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 22:58:57 -0400 |
| commit | 380858293e4597dd40390129a9a7bac713bdf080 (patch) | |
| tree | 70aae164289d375eb72358935158253d282fd4a0 /data/data2c.s | |
| parent | 052c9f0234a6034b9db8fce30f779b95b8869df5 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge branch 'master' into sub_81700F8
Diffstat (limited to 'data/data2c.s')
| -rw-r--r-- | data/data2c.s | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/data/data2c.s b/data/data2c.s index 94d9c30e8..26f237c1c 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -53,10 +53,10 @@ @ 832937C .include "data/level_up_learnset_pointers.inc" -gUnknown_083299EC:: @ 83299EC +gMonFrontAnimIdsTable:: @ 83299EC .incbin "baserom.gba", 0x3299ec, 0x19b -gUnknown_08329B87:: @ 8329B87 +gMonAnimationDelayTable:: @ 8329B87 .incbin "baserom.gba", 0x329b87, 0x19b gUnknown_08329D22:: @ 8329D22 @@ -101,11 +101,8 @@ gUnknown_08329ECE:: @ 8329ECE gHMMoves:: @ 8329EEA .incbin "baserom.gba", 0x329eea, 0x12 -gUnknown_08329EFC:: @ 8329EFC - .incbin "baserom.gba", 0x329efc, 0x2 - -gAlteringCaveWildMonHeldItems:: @ 8329EFE - .incbin "baserom.gba", 0x329efe, 0x2a +gAlteringCaveWildMonHeldItems:: @ 8329EFC + .incbin "baserom.gba", 0x329efc, 0x2c gUnknown_08329F28:: @ 8329F28 .incbin "baserom.gba", 0x329f28, 0x18 |