diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
| commit | 516a5b2219c99050153d989a65478f960b54f75a (patch) | |
| tree | 97a12007165839735210f0f777a019cf3ecc060d /asm/contest.s | |
| parent | 19d9cff2ff582d68d5aa76fd9d2068a6407e1466 (diff) | |
| parent | d1fe93bf4adfb691ba3a9220a469e0e40483d809 (diff) | |
fix merge conflicts, review changes
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 |