diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-21 09:00:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-21 09:00:41 -0500 |
| commit | 77d7434df2bc6141b47d29c33fb617b29eef0fef (patch) | |
| tree | 7212b566499c85cd58a151e7bb5d385dee506e3f /asm/field_player_avatar.s | |
| parent | 6bcabeab1ec976284da95c34b57615fc9fa44970 (diff) | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
Merge branch 'master' into quest_log
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 db32efc52..65d56af88 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -213,7 +213,7 @@ sub_805B528: @ 805B528 cmp r0, 0 beq _0805B598 ldrb r0, [r5, 0x1C] - bl sub_805A344 + bl MetatileBehavior_IsSpinTile lsls r0, 24 cmp r0, 0 beq _0805B598 @@ -230,13 +230,13 @@ sub_805B528: @ 805B528 cmp r0, 0 beq _0805B586 ldrb r0, [r1, 0x1E] - bl sub_805A330 + bl MetatileBehavior_IsStopSpinning lsls r0, 24 cmp r0, 0 bne _0805B598 ldr r0, [r4] ldrb r0, [r0, 0x1E] - bl sub_805A344 + bl MetatileBehavior_IsSpinTile lsls r0, 24 cmp r0, 0 beq _0805B57A @@ -1015,7 +1015,7 @@ _0805BB00: bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_805A460 + bl MetatileBehavior_IsRockStairs lsls r0, 24 lsrs r0, 24 b _0805BB14 @@ -1335,7 +1335,7 @@ sub_805BCEC: @ 805BCEC bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_8059C8C + bl MetatileBehavior_IsCaveDoor lsls r0, 24 cmp r0, 0 bne _0805BDA0 @@ -2322,12 +2322,12 @@ sub_805C438: @ 805C438 cmp r5, 0x3 bne _0805C484 adds r0, r4, 0 - bl sub_8059C20 + bl MetatileBehavior_IsUnknownWarp6D lsls r0, 24 cmp r0, 0 bne _0805C4DE adds r0, r4, 0 - bl sub_8059C48 + bl MetatileBehavior_IsUnknownWarp6F lsls r0, 24 cmp r0, 0 bne _0805C4DE @@ -2335,12 +2335,12 @@ _0805C484: cmp r5, 0x4 bne _0805C4A0 adds r0, r4, 0 - bl sub_8059C0C + bl MetatileBehavior_IsUnknownWarp6C lsls r0, 24 cmp r0, 0 bne _0805C4DE adds r0, r4, 0 - bl sub_8059C34 + bl MetatileBehavior_IsUnknownWarp6E lsls r0, 24 cmp r0, 0 bne _0805C4DE |