Merge branch 'master' into battle

1 files changed, 3 insertions, 2 deletions

diff --git a/src/new_game.c b/src/new_game.c
index efeea13cc..e27c862bb 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -25,6 +25,7 @@
 #include "easy_chat.h"
 #include "union_room_chat.h"
 #include "mevent.h"
+#include "renewable_hidden_items.h"
 #include "trainer_tower.h"
 #include "script.h"
 #include "berry_powder.h"
@@ -102,7 +103,7 @@ void ResetMenuAndMonGlobals(void)
     BerryPouch_CursorResetToTop();
     sub_811089C();
     sub_8083214(Random());
-    sub_806E6FC();
+    ResetSpecialVars();
 }
 
 void NewGameInitData(void)
@@ -145,7 +146,7 @@ void NewGameInitData(void)
     copy_strings_to_sav1();
     ResetMiniGamesResults();
     sub_8143D24();
-    sub_815D838();
+    SetAllRenewableItemFlags();
     WarpToPlayersRoom();
     ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags);
     StringCopy(gSaveBlock1Ptr->rivalName, rivalName);