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_door.s | |
| parent | 6bcabeab1ec976284da95c34b57615fc9fa44970 (diff) | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/field_door.s')
| -rw-r--r-- | asm/field_door.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_door.s b/asm/field_door.s index 431189e98..9c7e5eb10 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -490,7 +490,7 @@ sub_805B268: @ 805B268 bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_8059BDC + bl MetatileBehavior_IsWarpDoor_2 lsls r0, 24 cmp r0, 0 beq _0805B292 @@ -518,7 +518,7 @@ sub_805B29C: @ 805B29C bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_8059BDC + bl MetatileBehavior_IsWarpDoor_2 lsls r0, 24 cmp r0, 0 beq _0805B2C6 @@ -546,7 +546,7 @@ sub_805B2D0: @ 805B2D0 bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_8059BDC + bl MetatileBehavior_IsWarpDoor_2 lsls r0, 24 cmp r0, 0 beq _0805B304 @@ -580,7 +580,7 @@ sub_805B310: @ 805B310 bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_8059BDC + bl MetatileBehavior_IsWarpDoor_2 lsls r0, 24 cmp r0, 0 beq _0805B344 |