diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
| commit | ed7ded0748b38b5266cdc6092446c7b184f75778 (patch) | |
| tree | 0779eacd2dc6107e2dc47370abf82a1793cde6ed /asm/field_effect.s | |
| parent | 975e28c01e70c63587c8633ffc3c50b7d1759dec (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'asm/field_effect.s')
| -rw-r--r-- | asm/field_effect.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index 323e56bfe..964bf8079 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -694,7 +694,7 @@ sub_80B5FE8: @ 80B5FE8 lsls r5, 16 lsrs r5, 16 adds r0, r6, 0 - bl sub_806E7CC + bl GetMonSpritePalStructFromOtIdPersonality mov r8, r0 lsls r4, 16 asrs r4, 16 |