diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 11:37:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 11:37:18 -0600 |
| commit | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /asm/field_screen.s | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
| parent | 1b895ff52c011d51a9516791148cd5088ba411b5 (diff) | |
Merge pull request #361 from Slawter666/synchronise
Synchronise with pokeruby
Diffstat (limited to 'asm/field_screen.s')
| -rw-r--r-- | asm/field_screen.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_screen.s b/asm/field_screen.s index c11aef1b4..8a97644ac 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -7851,7 +7851,7 @@ palette_bg_faded_fill_black: @ 80AF020 thumb_func_start pal_fill_for_maplights pal_fill_for_maplights: @ 80AF040 push {r4,lr} - bl get_map_light_from_warp0 + bl GetLastUsedWarpMapType adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 |