diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /asm/pokedex.s | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'asm/pokedex.s')
| -rw-r--r-- | asm/pokedex.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokedex.s b/asm/pokedex.s index 3d69281c2..a0edbab0e 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -2311,7 +2311,7 @@ _080BC870: movs r2, 0xBE bl LoadPalette _080BC87A: - bl sub_8098C64 + bl GetOverworldTextboxPalettePtr movs r1, 0xF0 movs r2, 0x20 bl LoadPalette @@ -8824,7 +8824,7 @@ _080C0168: adds r3, r5 ldrb r4, [r3, 0x5] lsrs r4, 4 - bl species_and_otid_get_pal + bl GetFrontSpritePalFromSpeciesAndPersonality lsls r4, 4 movs r2, 0x80 lsls r2, 1 @@ -8950,7 +8950,7 @@ _080C028E: add r4, sp, 0x10 adds r0, r6, 0 adds r1, r4, 0 - bl sub_81DB468 + bl CopyMonCategoryText adds r0, r4, 0 b _080C02AE .pool |