diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
| commit | 3ddda066d91cbbd377584acacaea62a9deba8873 (patch) | |
| tree | 4af711b5daff8a50548f1df28f3981024cb9be8e /asm/party_menu.s | |
| parent | 3ff48ec8c890d95c5fbc467896414a018bf523ad (diff) | |
import names from pokeruby
Diffstat (limited to 'asm/party_menu.s')
| -rw-r--r-- | asm/party_menu.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index bd3adc61b..deae6236d 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -3718,7 +3718,7 @@ _08120724: subs r1, r2 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _08120740: mov r0, r8 bl SwitchTaskToFollowupFunc @@ -4271,7 +4271,7 @@ _08120B42: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl sub_8043C2C + bl CanMonLearnTMHM cmp r0, 0 beq _08120B7C adds r0, r7, 0 @@ -5907,7 +5907,7 @@ sub_8121808: @ 8121808 adds r1, r2, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0812184C @ =gUnknown_2021CD0 ldr r1, _08121850 @ =gUnknown_8416223 adds r0, r4, 0 @@ -6150,7 +6150,7 @@ sub_8121A04: @ 8121A04 adds r1, r2, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r1, 0xBA strb r1, [r0] movs r1, 0xFF @@ -6234,7 +6234,7 @@ sub_8121AA4: @ 8121AA4 adds r1, r2, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08121AE8 @ =gUnknown_2021CD0 ldr r1, _08121AEC @ =gUnknown_841620C adds r0, r4, 0 @@ -7420,7 +7420,7 @@ _081223F8: .4byte sub_81223FC sub_81223FC: @ 81223FC push {r4,lr} adds r4, r0, 0 - bl sub_8097228 + bl UpdateMonIconFrame lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -7445,7 +7445,7 @@ _08122422: thumb_func_start sub_8122428 sub_8122428: @ 8122428 push {lr} - bl sub_8097228 + bl UpdateMonIconFrame pop {r0} bx r0 thumb_func_end sub_8122428 @@ -15289,7 +15289,7 @@ sub_8126350: @ 8126350 ldr r0, _0812642C @ =gUnknown_2021CF0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08126430 @ =gUnknown_2021D18 ldr r1, _08126434 @ =gUnknown_8417017 adds r0, r4, 0 |