diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_effect.s | 12 | ||||
| -rw-r--r-- | asm/field_player_avatar.s | 18 | ||||
| -rw-r--r-- | asm/overworld.s | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index e93220c19..64ef0ae18 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -7130,7 +7130,7 @@ sub_8086AB4: @ 8086AB4 ldr r0, _08086B28 @ =gObjectEvents adds r4, r0 movs r0, 0x2 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7361,7 +7361,7 @@ _08086CA4: beq _08086CC0 movs r0, 0x2 _08086CAE: - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7370,7 +7370,7 @@ _08086CAE: b _08086CD2 _08086CC0: movs r0, 0 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7804,7 +7804,7 @@ sub_8086FFC: @ 8086FFC ldr r0, _08087064 @ =gObjectEvents adds r4, r0 movs r0, 0x2 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -8463,7 +8463,7 @@ _080874F2: bl sub_80DC44C _0808751A: movs r0, 0x2 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -8790,7 +8790,7 @@ fishE: @ 8087780 bl sub_80DC44C _080877B4: adds r0, r7, 0 - bl sub_805C808 + bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 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 diff --git a/asm/overworld.s b/asm/overworld.s index 6de308f40..f18086650 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -7880,7 +7880,7 @@ _080588BC: ldrb r0, [r4] lsls r0, 30 lsrs r0, 31 - bl sub_805C7F8 + bl GetHoennLinkPartnerGraphicsIdByGender _080588C6: lsls r0, 24 lsrs r0, 24 |