diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
| commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /src/time_events.c | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
Diffstat (limited to 'src/time_events.c')
| -rw-r--r-- | src/time_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/time_events.c b/src/time_events.c index 1f46e7705..9702d321f 100644 --- a/src/time_events.c +++ b/src/time_events.c @@ -81,7 +81,7 @@ void UpdateShoalTideFlag(void) 1, // 23 }; - if (is_map_type_1_2_3_5_or_6(get_map_light_from_warp0())) + if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType())) { RtcCalcLocalTime(); if (tide[gLocalTime.hours]) |