diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-24 16:50:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 16:50:14 -0600 |
| commit | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (patch) | |
| tree | 6dc1cdc3d1d82b89c64c9350435035d0f3b5f45b /asm | |
| parent | c2ca57e8ac02324c3c7d18063844b2a7fd7c217f (diff) | |
| parent | 8833004d41cfdb4aefa7c61c0558458fd0302115 (diff) | |
Merge pull request #475 from DizzyEggg/learn
asm party and fldeff clean-up
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_anim_effects_3.s | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/asm/battle_anim_effects_3.s b/asm/battle_anim_effects_3.s index 4b9466786..cfcfb93f9 100644 --- a/asm/battle_anim_effects_3.s +++ b/asm/battle_anim_effects_3.s @@ -5,50 +5,6 @@ .text - thumb_func_start AnimTask_GetReturnPowerLevel -AnimTask_GetReturnPowerLevel: @ 815F8A0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r3, =gBattleAnimArgs - movs r2, 0 - strh r2, [r3, 0xE] - ldr r1, =gAnimFriendship - ldrb r0, [r1] - ldrb r1, [r1] - adds r0, r1, 0 - subs r0, 0x3D - lsls r0, 24 - lsrs r0, 24 - adds r2, r1, 0 - cmp r0, 0x1E - bhi _0815F8C4 - movs r0, 0x1 - strh r0, [r3, 0xE] -_0815F8C4: - adds r0, r2, 0 - subs r0, 0x5C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x6C - bhi _0815F8D4 - movs r0, 0x2 - strh r0, [r3, 0xE] -_0815F8D4: - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, 0xC8 - bls _0815F8E0 - movs r0, 0x3 - strh r0, [r3, 0xE] -_0815F8E0: - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end AnimTask_GetReturnPowerLevel thumb_func_start sub_815F8F4 sub_815F8F4: @ 815F8F4 |