diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
| commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
| tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /asm/pokemon_summary_screen.s | |
| parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'asm/pokemon_summary_screen.s')
| -rw-r--r-- | asm/pokemon_summary_screen.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index f902160cd..d0ce9ae61 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -10814,7 +10814,7 @@ _08139E58: adds r0, r5, 0 movs r2, 0x18 movs r3, 0x20 - bl sub_8096E18 + bl CreateMonIcon ldr r1, [r6] ldr r2, _08139E9C @ =0x00003014 adds r1, r2 @@ -10916,7 +10916,7 @@ sub_8139F20: @ 8139F20 bl GetMonData lsls r0, 16 lsrs r0, 16 - bl sub_8097138 + bl SafeFreeMonIconPalette ldr r0, [r4] ldr r1, _08139F5C @ =0x00003014 adds r0, r1 @@ -10926,7 +10926,7 @@ sub_8139F20: @ 8139F20 lsls r0, 2 ldr r1, _08139F60 @ =gSprites adds r0, r1 - bl sub_8097070 + bl DestroyMonIcon pop {r4} pop {r0} bx r0 |