diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /asm/ghost.s | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'asm/ghost.s')
| -rw-r--r-- | asm/ghost.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/ghost.s b/asm/ghost.s index 8b16d94c5..5a0991468 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -10,7 +10,7 @@ sub_811160C: @ 811160C push {r4,r5,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r0, =gBattleAnimArgs ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] @@ -2441,7 +2441,7 @@ sub_81129F0: @ 81129F0 push {r4,lr} adds r4, r0, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos ldr r0, =gBattleAnimAttacker ldrb r0, [r0] bl GetBattlerSide @@ -2525,7 +2525,7 @@ _08112A5E: bne _08112AC0 movs r0, 0x1E strh r0, [r3, 0x2E] - ldr r0, =sub_80A64B0 + ldr r0, =WaitAnimForDuration str r0, [r3, 0x1C] ldr r1, =sub_8112ACC adds r0, r3, 0 |