diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:56:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:56:50 -0400 |
| commit | 1d4234bd7e295c553485b7d676d42c838e4762c4 (patch) | |
| tree | 67ac4179d9978baf4e989ef55245e4be0d777c04 /asm/field_map_obj.s | |
| parent | 7f6d86a8bf2afe349135d502debc2237bafafff5 (diff) | |
| parent | 931bf4ce4b4fd7ea63d00f36adfd2bf720831a80 (diff) | |
Merge branch 'master' into PIE2
Diffstat (limited to 'asm/field_map_obj.s')
| -rw-r--r-- | asm/field_map_obj.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 92ef6a6e4..2b16f5e1f 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -666,7 +666,7 @@ _0805E2E0: sub_805E2E8: @ 805E2E8 push {r4,r5,lr} adds r4, r0, 0 - bl sav1_map_get_light_level + bl GetCurrentMapType lsls r0, 24 lsrs r0, 24 bl is_light_level_1_2_3_5_or_6 |