diff options
Diffstat (limited to 'asm/field_player_avatar.s')
| -rw-r--r-- | asm/field_player_avatar.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 09aeeabea..5510caceb 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -2759,8 +2759,8 @@ GetPlayerAvatarGraphicsIdByStateIdAndGender: @ 805C7E0 _0805C7F4: .4byte gUnknown_835B874 thumb_func_end GetPlayerAvatarGraphicsIdByStateIdAndGender - thumb_func_start sub_805C7F8 -sub_805C7F8: @ 805C7F8 + thumb_func_start GetHoennLinkPartnerGraphicsIdByGender +GetHoennLinkPartnerGraphicsIdByGender: @ 805C7F8 lsls r0, 24 lsrs r0, 24 ldr r1, _0805C804 @ =gUnknown_835B880 @@ -2769,10 +2769,10 @@ sub_805C7F8: @ 805C7F8 bx lr .align 2, 0 _0805C804: .4byte gUnknown_835B880 - thumb_func_end sub_805C7F8 + thumb_func_end GetHoennLinkPartnerGraphicsIdByGender - thumb_func_start sub_805C808 -sub_805C808: @ 805C808 + thumb_func_start GetPlayerAvatarGraphicsIdByStateId +GetPlayerAvatarGraphicsIdByStateId: @ 805C808 push {lr} lsls r0, 24 lsrs r0, 24 @@ -2785,7 +2785,7 @@ sub_805C808: @ 805C808 bx r1 .align 2, 0 _0805C820: .4byte gPlayerAvatar - thumb_func_end sub_805C808 + thumb_func_end GetPlayerAvatarGraphicsIdByStateId thumb_func_start sub_805C824 sub_805C824: @ 805C824 @@ -3252,7 +3252,7 @@ sub_805CB70: @ 805CB70 ldr r0, _0805CBB0 @ =gObjectEvents adds r4, r0 movs r0, 0x3 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3285,7 +3285,7 @@ sub_805CBB8: @ 805CBB8 cmp r0, 0 bne _0805CBD8 movs r0, 0x5 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId lsls r0, 24 lsrs r0, 24 b _0805CBE0 @@ -4129,7 +4129,7 @@ sub_805D240: @ 805D240 cmp r0, 0 beq _0805D2AE movs r0, 0 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 |