diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
| commit | 30858625ff6c82d7a6380a44acf5c75baa988f20 (patch) | |
| tree | 5814ac66984c481382418db28ff97f018ffc04d7 /data | |
| parent | 29d16a0af10c2de52de8ff37c13dd5aa3401c98f (diff) | |
| parent | 2e8f0cd4b33a7a3ea92b2b42742d78d98959d1e5 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle_anim_data
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 |