From a185f8a26dc5e5a04908c272ab54bede7af8a10c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 16:53:04 -0500 Subject: lots more relabeling --- src/time_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/time_events.c') diff --git a/src/time_events.c b/src/time_events.c index e1b9a2e9e..ab3d6b9d4 100644 --- a/src/time_events.c +++ b/src/time_events.c @@ -81,7 +81,7 @@ 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]) -- cgit v1.2.3 From 637102683c6e4d0535966ab9b213b8c93c97945c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 16:59:12 -0500 Subject: rename rom_4.c to overworld.c --- src/time_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/time_events.c') diff --git a/src/time_events.c b/src/time_events.c index ab3d6b9d4..c316f73ce 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" -- cgit v1.2.3 From 270bd98d41a19c516a4be95f522deb26cc4300a9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 13 Sep 2017 00:03:22 -0500 Subject: more labeling --- src/time_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/time_events.c') diff --git a/src/time_events.c b/src/time_events.c index c316f73ce..accb03db8 100644 --- a/src/time_events.c +++ b/src/time_events.c @@ -87,7 +87,7 @@ void UpdateShoalTideFlag(void) if (tide[gLocalTime.hours]) FlagSet(SYS_SHOAL_TIDE); else - FlagReset(SYS_SHOAL_TIDE); + FlagClear(SYS_SHOAL_TIDE); } } -- cgit v1.2.3