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/dark.s | |
parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'asm/dark.s')
-rw-r--r-- | asm/dark.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/dark.s b/asm/dark.s index 07f24d27e..e4373723d 100644 --- a/asm/dark.s +++ b/asm/dark.s @@ -264,7 +264,7 @@ sub_81138D4: @ 81138D4 movs r0, 0x7E strh r0, [r4, 0x2E] adds r0, r4, 0 - bl sub_80A6E14 + bl InitSpriteDataForLinearTranslation ldrh r0, [r4, 0x30] negs r0, r0 strh r0, [r4, 0x34] @@ -563,7 +563,7 @@ _08113B60: ldr r0, =0x0000fff4 strh r0, [r4, 0x38] adds r0, r4, 0 - bl sub_80A68D4 + bl InitAnimArcTranslation ldr r0, =sub_8113B90 str r0, [r4, 0x1C] pop {r4-r7} |