diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-24 10:45:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 10:45:15 -0600 |
| commit | 80116a80fd98679c0449efe33c4e460947f4b8d0 (patch) | |
| tree | 312a72b8513694aab4db01941cc5d2b37b53dd4e /asm/field_tasks.s | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
| parent | bc6416ddd96182d5f786add8d1c1945a2f82f2b9 (diff) | |
Merge pull request #22 from PikalaxALT/quest_log
Quest log
Diffstat (limited to 'asm/field_tasks.s')
| -rw-r--r-- | asm/field_tasks.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 75fd499dd..306b52940 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -322,7 +322,7 @@ _0806EA52: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -478,7 +478,7 @@ _0806EB8E: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_ReturnFalse_4 @@ -576,7 +576,7 @@ sub_806EC40: @ 806EC40 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r7, r0, 16 ldrh r1, [r5, 0x8] |