diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
| commit | 6235276ca255a2b345c3a97be23c6b53be6eba0f (patch) | |
| tree | 81930ebec5d50f4b44575b28979549c34f2e1b0e /src/new_game.c | |
| parent | 170c82f299905b6e55b20a5c2c04f92353131d0e (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
Merge branch 'master' into daycare
Diffstat (limited to 'src/new_game.c')
| -rw-r--r-- | src/new_game.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/new_game.c b/src/new_game.c index 226ac9bb7..3f9e9f5a1 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -11,7 +11,7 @@ #include "item_menu.h" #include "lottery_corner.h" #include "mail_data.h" -#include "mauville_old_man.h" +#include "mauville_man.h" #include "play_time.h" #include "player_pc.h" #include "pokeblock.h" @@ -20,7 +20,7 @@ #include "pokemon_storage_system.h" #include "rng.h" #include "roamer.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "script.h" #include "secret_base.h" @@ -157,7 +157,7 @@ void NewGameInitData(void) ClearPokeblocks(); ClearDecorationInventories(); InitEasyChatPhrases(); - SetMauvilleOldMan(); + SetupMauvilleOldMan(); InitDewfordTrend(); ResetFanClub(); ResetLotteryCorner(); |