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/normal.s | |
| parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'asm/normal.s')
| -rw-r--r-- | asm/normal.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/normal.s b/asm/normal.s index b52477221..3ee1308c9 100644 --- a/asm/normal.s +++ b/asm/normal.s @@ -1584,7 +1584,7 @@ sub_8116388: @ 8116388 bne _081163AC adds r0, r5, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos b _081163B4 .pool _081163AC: @@ -1616,7 +1616,7 @@ sub_81163D0: @ 81163D0 bne _081163F4 adds r0, r5, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos b _081163FC .pool _081163F4: @@ -1690,7 +1690,7 @@ _08116474: bne _08116494 adds r0, r4, 0 movs r1, 0 - bl sub_80A69CC + bl InitAnimSpritePos b _0811649C .pool _08116494: @@ -1789,7 +1789,7 @@ sub_8116560: @ 8116560 bne _0811657C adds r0, r4, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos b _08116584 .pool _0811657C: @@ -1803,7 +1803,7 @@ _08116584: ldr r1, =DestroyAnimSprite adds r0, r4, 0 bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A64B0 + ldr r0, =WaitAnimForDuration str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -1824,7 +1824,7 @@ sub_81165A8: @ 81165A8 bne _081165CC adds r0, r5, 0 movs r1, 0x1 - bl sub_80A69CC + bl InitAnimSpritePos b _081165D4 .pool _081165CC: |