diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:17 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:33 -0500 |
| commit | b93101bbebaae9be44b9b4ada81766264135cca9 (patch) | |
| tree | 73373641b7f1eed21c4c5d9423cd5668ab8c4a27 /src/overworld.c | |
| parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
| parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/overworld.c b/src/overworld.c index c625b3b45..bb0f40a56 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -432,11 +432,11 @@ static void Overworld_ResetStateAfterWhiteOut(void) FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_USE_FLASH); // If you were defeated by Kyogre/Groudon and the step counter has - // maxed out, end the unusual weather. - if (VarGet(VAR_SHOULD_END_UNUSUAL_WEATHER) == 1) + // maxed out, end the abnormal weather. + if (VarGet(VAR_SHOULD_END_ABNORMAL_WEATHER) == 1) { - VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 0); - VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE); + VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 0); + VarSet(VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE); } } |