summaryrefslogtreecommitdiff
path: root/src/field/choose_party.c
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-21 13:53:32 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-21 13:53:32 -0600
commit11a9371349e1743a18dce28cc60b69dd6a29b665 (patch)
treee696d1fda7556af8b5234eae833ea2fd146fc75d /src/field/choose_party.c
parent7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff)
parent68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff)
resolve merge conflicts and make it compile
Diffstat (limited to 'src/field/choose_party.c')
-rw-r--r--src/field/choose_party.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index b108ede5a..fd5808fc3 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -1031,7 +1031,7 @@ void sub_81231AC(void)
static void sub_81231C4(u8 taskId)
{
- if (sub_807D770() == TRUE)
+ if (IsWeatherNotFadingIn() == TRUE)
{
DestroyTask(taskId);
ScriptContext2_Disable();