diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:55:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 16:55:19 -0700 |
| commit | 5fb9b9052276243d54ecfc27d0514e9c35825e8c (patch) | |
| tree | 7546411871d12a05f370b529341ebfd656334af1 /asm/pokemon_summary_screen.s | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
| parent | 37b891cbd49780d63fe2295add70bf003c59de48 (diff) | |
Merge pull request #437 from huderlem/name_labels
Name labels
Diffstat (limited to 'asm/pokemon_summary_screen.s')
| -rw-r--r-- | asm/pokemon_summary_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index fea619ac8..859fd177f 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -3859,7 +3859,7 @@ _0809F718: adds r1, r0, 0 adds r0, r5, 0 adds r2, r6, 0 - bl sub_80409C8 + bl GetMonSpritePalStructFromOtIdPersonality adds r4, r0, 0 bl LoadCompressedObjectPalette ldrh r0, [r4, 0x4] @@ -7620,7 +7620,7 @@ sub_80A1808: @ 80A1808 ldr r0, _080A1868 @ =sub_80A1888 str r0, [r4] adds r0, r6, 0 - bl sub_8040A3C + bl IsPokeSpriteNotFlipped lsls r0, 24 cmp r0, 0 bne _080A186C |