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/battle_setup.s | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
| parent | bc6416ddd96182d5f786add8d1c1945a2f82f2b9 (diff) | |
Merge pull request #22 from PikalaxALT/quest_log
Quest log
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 81054e687..faa32be0e 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -757,7 +757,7 @@ sub_807FC5C: @ 807FC5C ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r5, r0, 16 lsls r0, r5, 24 @@ -907,7 +907,7 @@ GetBattleTransitionTypeByMap: @ 807FD90 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - bl sub_8058F78 + bl MapGridGetMetatileBehaviorAt lsls r0, 16 lsrs r4, r0, 16 bl sav1_get_flash_used_on_map |