diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
| commit | 1ff1e8ce9547d646b17b135b3013a516d17f35db (patch) | |
| tree | c23fbb425b230e81529932482ddb0fe7fc6a1376 /data | |
| parent | daa0a98ee0129be1797274de318a35df30d39020 (diff) | |
| parent | b9388f078ed95e80ac73b35eeb206e52ce376b0c (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anim_80CA710.s | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 8f62d92f6..562bd3090 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -4649,16 +4649,3 @@ gBattleAnimSpriteTemplate_83DB550:: @ 83DB550 gUnknown_083DB568:: @ 83DB568 @ seems to be a src element in a LoadPalette call. .2byte 0x7FFF - - .align 2 -gUnknown_083DB56C:: @ 83DB56C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task00_battle_intro_80BC6C8 - .4byte task00_battle_intro_80BC6C8 - .4byte task00_battle_intro_80BC6C8 - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_anim - .4byte task_battle_intro_anim |