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/unk_8159F40.s | |
parent | 6bcabeab1ec976284da95c34b57615fc9fa44970 (diff) | |
parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/unk_8159F40.s')
-rw-r--r-- | asm/unk_8159F40.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index 78693e452..a8d1b9bf8 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -801,7 +801,7 @@ sub_815A540: @ 815A540 bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_8059CA4 + bl MetatileBehavior_IsSurfable lsls r0, 24 cmp r0, 0 bne _0815A5A4 |