diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2018-12-27 16:00:22 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-27 16:00:22 +0530 |
| commit | 95c3652551aacf612a19336e17ce00a2ec1046d2 (patch) | |
| tree | 882caaf9875700cccb73e391a7a014a782e579fa /asm/field_tasks.s | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
| parent | d5de7960a330953b3a7d7684122997c0d8aedcf1 (diff) | |
Merge pull request #2 from pret/master
Taking files
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] |