diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-12 00:17:38 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-12 00:17:38 +0100 |
| commit | b7fa10d01e379c4f7d8d30fecb2a7c6413191b88 (patch) | |
| tree | d492427c4aedb95c3e6000b25c8a01ec9de62d10 /asm/contest.s | |
| parent | c3f6f528e865155f359ca2ff10b68ace1cc99edb (diff) | |
| parent | 558bf2f7d0c9be70ec0da4b9ef28c105c5d11622 (diff) | |
Merge branch 'master' into battle4_fixes
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 9c0684663..4852a548f 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6763,7 +6763,7 @@ _080DB1CC: adds r0, r5, 0 adds r1, r7, 0 adds r2, r6, 0 - bl species_and_otid_get_pal + bl GetFrontSpritePalFromSpeciesAndPersonality movs r1, 0x90 lsls r1, 1 movs r2, 0x20 |