diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-07 20:50:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-07 20:50:41 -0400 |
| commit | 6c5d1c4a3de2f1a2d1855a542a6a5d53e4daf936 (patch) | |
| tree | e9a140e919d72891ea825b64fc72a9cfa175ce88 /asm/water.s | |
| parent | c4cc1522c86ec240c53c75455b650b1c69b2d5a4 (diff) | |
| parent | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (diff) | |
Merge pull request #9 from pret/master
sync with source repo
Diffstat (limited to 'asm/water.s')
| -rw-r--r-- | asm/water.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/water.s b/asm/water.s index 6f9c5cb9d..20bba76c6 100644 --- a/asm/water.s +++ b/asm/water.s @@ -2053,7 +2053,7 @@ sub_80D4AD0: @ 80D4AD0 strh r1, [r0, 0x36] ldrh r1, [r6, 0x1A] strh r1, [r0, 0x38] - bl InitAnimSpriteTranslationOverDuration + bl InitAnimArcTranslation adds r5, 0x1C adds r4, r5 ldr r0, _080D4B38 @ =sub_80D4B3C @@ -2075,7 +2075,7 @@ _080D4B38: .4byte sub_80D4B3C sub_80D4B3C: @ 80D4B3C push {r4-r6,lr} adds r6, r0, 0 - bl TranslateAnimSpriteLinearAndSine + bl TranslateAnimArc lsls r0, 24 cmp r0, 0 beq _080D4B96 @@ -2110,7 +2110,7 @@ sub_80D4B3C: @ 80D4B3C mvns r1, r1 strh r1, [r6, 0x38] adds r0, r6, 0 - bl InitAnimSpriteTranslationOverDuration + bl InitAnimArcTranslation ldr r0, _080D4BA0 @ =sub_80D4BA4 str r0, [r6, 0x1C] _080D4B96: @@ -2126,7 +2126,7 @@ _080D4BA0: .4byte sub_80D4BA4 sub_80D4BA4: @ 80D4BA4 push {r4-r6,lr} adds r5, r0, 0 - bl TranslateAnimSpriteLinearAndSine + bl TranslateAnimArc lsls r0, 24 cmp r0, 0 beq _080D4BE0 |