diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-10-01 11:17:34 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-10-01 11:17:34 -0500 |
| commit | f91da8a21072836d18b77380f45030bc8bd87743 (patch) | |
| tree | d5a0e2e90f11420115c2dd7a998976cc87e80ce9 /asm/contest.s | |
| parent | e926119b726839bc687c503db3680899906aad0d (diff) | |
| parent | 83efcc9c3d1e81b78c2cd9ceab3ac6420a5f4070 (diff) | |
Merge remote-tracking branch 'upstream/master' into script_cmd_renaming
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/contest.s b/asm/contest.s index 4a85f3d16..c5dfe3e2e 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6904,7 +6904,7 @@ sub_80AE9FC: @ 80AE9FC adds r0, r5, 0 mov r1, r8 adds r2, r6, 0 - bl species_and_otid_get_pal + bl GetMonSpritePalFromOtIdPersonality movs r1, 0x90 lsls r1, 1 movs r2, 0x20 |