diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /src/field_control_avatar.c | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 8b4c7380c..852fa2e1b 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -558,9 +558,9 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) ScriptContext1_SetupScript(EventScript_EggHatch); return TRUE; } - if (UnusualWeatherHasExpired() == TRUE) + if (AbnormalWeatherHasExpired() == TRUE) { - ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1); + ScriptContext1_SetupScript(AbnormalWeather_EventScript_EndEventAndCleanup_1); return TRUE; } if (ShouldDoBrailleRegicePuzzle() == TRUE) |