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_tasks.s | |
| parent | 6bcabeab1ec976284da95c34b57615fc9fa44970 (diff) | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/field_tasks.s')
| -rw-r--r-- | asm/field_tasks.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index d7dd5e6b6..306b52940 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -481,7 +481,7 @@ _0806EB8E: bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 - bl sub_8059F50 + bl MetatileBehavior_ReturnFalse_4 lsls r0, 24 cmp r0, 0 beq _0806EBF6 @@ -633,7 +633,7 @@ _0806ECCE: strh r0, [r5, 0x6] lsls r0, r7, 24 lsrs r0, 24 - bl sub_805A1D8 + bl MetatileBehavior_ReturnFalse_13 lsls r0, 24 cmp r0, 0 beq _0806ED2E |