diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
| commit | 73cce797533c5985406b7b5696834b0976039c4f (patch) | |
| tree | bcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /asm/ice.s | |
| parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'asm/ice.s')
| -rw-r--r-- | asm/ice.s | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -370,7 +370,7 @@ sub_810B8EC: @ 810B8EC push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r0, =gBattleAnimTarget ldrb r0, [r0] movs r1, 0x2 @@ -413,7 +413,7 @@ _0810B936: ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A6EEC + ldr r0, =StartAnimLinearTranslation str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -513,7 +513,7 @@ sub_810BA24: @ 810BA24 sub sp, 0x10 adds r5, r0, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r6, =gBattleAnimArgs ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] @@ -814,7 +814,7 @@ sub_810BC94: @ 810BC94 sub sp, 0x10 adds r5, r0, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r1, =gBattleAnimArgs ldrh r0, [r1, 0x8] strh r0, [r5, 0x2E] @@ -1103,7 +1103,7 @@ sub_810BED0: @ 810BED0 bne _0810BEF4 adds r0, r5, 0 movs r1, 0 - bl sub_80A69CC + bl InitAnimSpritePos b _0810BF32 .pool _0810BEF4: @@ -2762,7 +2762,7 @@ _0810CCA6: bl StartSpriteAffineAnim adds r0, r5, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r6, =gBattleAnimArgs ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] @@ -2796,7 +2796,7 @@ _0810CCCE: ldrh r0, [r6, 0xA] strh r0, [r5, 0x38] adds r0, r5, 0 - bl sub_80A68D4 + bl InitAnimArcTranslation ldr r0, =sub_810CD1C str r0, [r5, 0x1C] pop {r4-r6} |