diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
| commit | 4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch) | |
| tree | 47bfb4286c03f021d48ffadde5da675a9f903f61 /src/time_events.c | |
| parent | aaa09d735451cced915bc6bacfce45ced8e33fa1 (diff) | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'src/time_events.c')
| -rw-r--r-- | src/time_events.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/time_events.c b/src/time_events.c index e1b9a2e9e..accb03db8 100644 --- a/src/time_events.c +++ b/src/time_events.c @@ -4,7 +4,7 @@ #include "field_weather.h" #include "pokemon.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "script.h" #include "task.h" @@ -81,13 +81,13 @@ void UpdateShoalTideFlag(void) 1, }; - if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0())) + if (is_map_type_1_2_3_5_or_6(get_map_type_from_warp0())) { RtcCalcLocalTime(); if (tide[gLocalTime.hours]) FlagSet(SYS_SHOAL_TIDE); else - FlagReset(SYS_SHOAL_TIDE); + FlagClear(SYS_SHOAL_TIDE); } } |