summaryrefslogtreecommitdiff
path: root/src/safari_zone.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-09-30 16:41:16 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-09-30 16:41:16 -0700
commit4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch)
tree47bfb4286c03f021d48ffadde5da675a9f903f61 /src/safari_zone.c
parentaaa09d735451cced915bc6bacfce45ced8e33fa1 (diff)
parentf74d4742f597a423b7a8685d72c06597c8c78db7 (diff)
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'src/safari_zone.c')
-rw-r--r--src/safari_zone.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c
index a47c8e951..14fd1ddc4 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -4,7 +4,7 @@
#include "field_fadetransition.h"
#include "field_player_avatar.h"
#include "main.h"
-#include "rom4.h"
+#include "overworld.h"
#include "script.h"
#include "string_util.h"
#include "text.h"
@@ -51,7 +51,7 @@ void SetSafariZoneFlag(void)
void ResetSafariZoneFlag(void)
{
- FlagReset(SYS_SAFARI_MODE);
+ FlagClear(SYS_SAFARI_MODE);
}
void EnterSafariMode(void)