summaryrefslogtreecommitdiff
path: root/src/new_game.c
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-04-07 01:56:36 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-04-07 01:56:36 -0400
commitd84d94e29a1424dd1d12ff821957bb6b1bc847d6 (patch)
treec5ba0778afca66a91f71815cd53fe9abef1bdac6 /src/new_game.c
parentad2a97935e1c1f4362f0dffa58ef437d191bab4e (diff)
parentc3cfd6065825ec8ddd5e1782998071518efaa322 (diff)
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'src/new_game.c')
-rw-r--r--src/new_game.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/new_game.c b/src/new_game.c
index 2e8930f7c..0f2903349 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -41,12 +41,11 @@
#include "secret_base.h"
#include "player_pc.h"
#include "field_specials.h"
+#include "berry_powder.h"
+#include "mevent.h"
+#include "union_room_chat.h"
-
-extern void copy_strings_to_sav1(void);
-extern void sub_801AFD8(void);
extern void ResetPokeJumpResults(void);
-extern void SetBerryPowder(u32* powder, u32 newValue);
extern const u8 EventScript_ResetAllMapFlags[];
@@ -171,7 +170,7 @@ void NewGameInitData(void)
InitEventData();
ClearTVShowData();
ResetGabbyAndTy();
- ResetSecretBases();
+ ClearSecretBases();
ClearBerryTrees();
SetMoney(&gSaveBlock1Ptr->money, 3000);
SetCoins(0);