diff options
| author | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
| commit | a6d2bfaebd16940fc0ac1be3ca29caf0888296ca (patch) | |
| tree | 7ec979bc8481b2c2d55874aef3e9004ddb715781 /asm/contest.s | |
| parent | 96ebc5d46287e33df7bda74a6fb340281cdaa4c5 (diff) | |
| parent | 7d657ef56716fd01bacf4a47df50ad0ec3d03b10 (diff) | |
Merge branch 'master' into secret_base
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 |