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/fldeff_flash.s | |
| parent | 7f6d86a8bf2afe349135d502debc2237bafafff5 (diff) | |
| parent | 931bf4ce4b4fd7ea63d00f36adfd2bf720831a80 (diff) | |
Merge branch 'master' into PIE2
Diffstat (limited to 'asm/fldeff_flash.s')
| -rw-r--r-- | asm/fldeff_flash.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index c25978eb1..4ce45b5c7 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -209,7 +209,7 @@ sub_80C9CE8: @ 80C9CE8 bl get_map_light_from_warp0 lsls r0, 24 lsrs r7, r0, 24 - bl sav1_map_get_light_level + bl GetCurrentMapType lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 |