diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-01 19:48:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-01 19:52:40 -0400 |
| commit | 0685dd4920c64eae6bcfbc9f201854b4da91bfab (patch) | |
| tree | f759feaf819167d436ab4fde480eca35ba591b04 /asm/contest.s | |
| parent | d0fbed6ad50c34593002c2b540c4e3e7f4c5cd16 (diff) | |
| parent | 50dc4f429d4aa68e0365adc71d17e43a0dd7b843 (diff) | |
Merge branch 'master' into trade
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 |