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_fadetransition.s | |
| parent | 6bcabeab1ec976284da95c34b57615fc9fa44970 (diff) | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/field_fadetransition.s')
| -rw-r--r-- | asm/field_fadetransition.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 703316872..d0176941a 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -465,7 +465,7 @@ sub_807DE78: @ 807DE78 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8059BDC + bl MetatileBehavior_IsWarpDoor_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -500,7 +500,7 @@ _0807DEE8: adds r0, r5, 0 bl sub_807DF4C adds r0, r4, 0 - bl sub_8059C8C + bl MetatileBehavior_IsCaveDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -511,7 +511,7 @@ _0807DEE8: _0807DF00: .4byte task_map_chg_seq_0807E20C _0807DF04: adds r0, r4, 0 - bl sub_8059C5C + bl MetatileBehavior_IsUnknownWarp6C_to_6F lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2105,7 +2105,7 @@ sub_807EBBC: @ 807EBBC lsrs r4, r0, 24 adds r7, r4, 0 adds r0, r4, 0 - bl sub_8059C0C + bl MetatileBehavior_IsUnknownWarp6C lsls r0, 24 cmp r0, 0 beq _0807EBE0 @@ -2117,7 +2117,7 @@ sub_807EBBC: @ 807EBBC b _0807EC2A _0807EBE0: adds r0, r4, 0 - bl sub_8059C20 + bl MetatileBehavior_IsUnknownWarp6D lsls r0, 24 cmp r0, 0 beq _0807EBFA @@ -2130,7 +2130,7 @@ _0807EBE0: b _0807EC2A _0807EBFA: adds r0, r4, 0 - bl sub_8059C34 + bl MetatileBehavior_IsUnknownWarp6E lsls r0, 24 cmp r0, 0 beq _0807EC0E @@ -2140,7 +2140,7 @@ _0807EBFA: b _0807EC2A _0807EC0E: adds r0, r7, 0 - bl sub_8059C48 + bl MetatileBehavior_IsUnknownWarp6F lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -2251,12 +2251,12 @@ sub_807ECBC: @ 807ECBC lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 - bl sub_8059C34 + bl MetatileBehavior_IsUnknownWarp6E lsls r0, 24 cmp r0, 0 bne _0807ED06 adds r0, r6, 0 - bl sub_8059C0C + bl MetatileBehavior_IsUnknownWarp6C lsls r0, 24 cmp r0, 0 beq _0807ED0A |