diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
commit | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch) | |
tree | d9c5a70fd1c4f42dc29f43becd142cc89456f19d /src/secret_base.c | |
parent | c15b50ac686632130512de37d01037bff6e10cd2 (diff) | |
parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) |
Merge branch 'master' into contest
Diffstat (limited to 'src/secret_base.c')
-rw-r--r-- | src/secret_base.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index cd6143ed0..e2b7e20f1 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -40,8 +40,6 @@ #include "tv.h" #include "secret_base.h" -extern void (*gFieldCallback)(void); - extern void mapldr_default(void); // Static type declarations @@ -416,7 +414,7 @@ bool8 sub_80E909C(void) void sub_80E90C8(u8 taskId) { FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_NORTH); - if (sub_80ABDFC() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { EnableBothScriptContexts(); DestroyTask(taskId); |