diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-26 16:19:44 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-26 16:19:44 -0500 |
| commit | cf84c5406bf9b08950722d90ba4eba3bd8606080 (patch) | |
| tree | 0140b0b3cb4b1b0b523cd39a71fd775d911c65d0 /src/field/overworld.c | |
| parent | 2d70a16fa09eb545b0e236313be6daaa6d17964a (diff) | |
| parent | 4e7e4cf467e6243994d19971d7cbee33c2f7bd25 (diff) | |
merge
Diffstat (limited to 'src/field/overworld.c')
| -rw-r--r-- | src/field/overworld.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field/overworld.c b/src/field/overworld.c index 59aac5c33..ca59426fa 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -32,7 +32,7 @@ #include "new_game.h" #include "palette.h" #include "play_time.h" -#include "rng.h" +#include "random.h" #include "roamer.h" #include "rotating_gate.h" #include "safari_zone.h" @@ -602,7 +602,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) prev_quest_postbuffer_cursor_backup_reset(); sub_8082BD0(mapGroup, mapNum); DoTimeBasedEvents(); - sub_80806E4(); + SetSav1WeatherFromCurrMapHeader(); ChooseAmbientCrySpecies(); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); @@ -638,7 +638,7 @@ void sub_8053994(u32 a1) sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum); if (a1 != 1) DoTimeBasedEvents(); - sub_80806E4(); + SetSav1WeatherFromCurrMapHeader(); ChooseAmbientCrySpecies(); if (v2) FlagClear(SYS_USE_FLASH); @@ -1737,7 +1737,7 @@ void sub_8054D4C(u32 a1) sub_805C7C4(0); FieldEffectActiveListClear(); InitFieldMessageBox(); - sub_807C828(); + StartWeather(); sub_8080750(); if (!a1) SetUpFieldTasks(); |