diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
commit | 6235276ca255a2b345c3a97be23c6b53be6eba0f (patch) | |
tree | 81930ebec5d50f4b44575b28979549c34f2e1b0e /src/safari_zone.c | |
parent | 170c82f299905b6e55b20a5c2c04f92353131d0e (diff) | |
parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) |
Merge branch 'master' into daycare
Diffstat (limited to 'src/safari_zone.c')
-rw-r--r-- | src/safari_zone.c | 4 |
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) |