diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
tree | aec86bd0f081a7ff207f68cba33315991b629be1 /src/new_game.c | |
parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'src/new_game.c')
-rw-r--r-- | src/new_game.c | 5 |
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); |