diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
commit | 6c52f7ce04ea37ae6a1854521f0e312d39e86ecb (patch) | |
tree | b7369c07f40081796b51fc52ca5f26faaa8b8723 /asm/field_control_avatar.s | |
parent | e143072f961cfffc5e8e2cc5b2a6059c27124808 (diff) | |
parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/field_control_avatar.s')
-rw-r--r-- | asm/field_control_avatar.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 6b981dea8..bcd3a10e9 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1887,7 +1887,7 @@ AdjustFriendship_step: @ 806D74C _0806D76A: adds r0, r5, 0 movs r1, 0x5 - bl sub_80436F8 + bl AdjustFriendship adds r5, 0x64 subs r4, 0x1 cmp r4, 0 |