diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:37:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:39:54 -0400 |
| commit | 17fd3bccf7a6dd49362f2d280ba2f6670cb5ac0f (patch) | |
| tree | df66ddc51a60e6de70e3cdfbb6924a52a4c6ab6f /asm/field_effect.s | |
| parent | bb10a4dd57fdbdd9b2c0e3962adef705d8ab8f39 (diff) | |
| parent | 63210c07897e86953bf093397eee5a33e95b8c91 (diff) | |
Merge branch 'master' into secret_base
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 |