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 /src/fldeff_flash.c | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
| parent | 1b895ff52c011d51a9516791148cd5088ba411b5 (diff) | |
Merge pull request #361 from Slawter666/synchronise
Synchronise with pokeruby
Diffstat (limited to 'src/fldeff_flash.c')
| -rw-r--r-- | src/fldeff_flash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 0c6fdd8b8..fe219422d 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -156,7 +156,7 @@ void c2_change_map(void) static bool8 sub_8137304(void) { u8 i; - u8 v0 = get_map_light_from_warp0(); + u8 v0 = GetLastUsedWarpMapType(); u8 v1 = Overworld_GetMapTypeOfSaveblockLocation(); for (i = 0; gUnknown_085B27C8[i].unk0; i++) |