diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
| commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
| tree | 8793240342d37104610f34756f6fee9db706ee8f /asm/contest.s | |
| parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
| parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) | |
Merge remote-tracking branch 'upstream/master' into pokenav
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 |