diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-10 12:48:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 12:48:58 -0400 |
| commit | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (patch) | |
| tree | 331837d61614da6f73e983a7230796ace13c9ea6 /src/start_menu.c | |
| parent | a81edaba1d5e0f84336fd8a57a48b2a970171ba4 (diff) | |
| parent | 5f7ed93363db01da8667aadf47d78cb6515bb450 (diff) | |
Merge pull request #323 from PikalaxALT/various_documentation
Document various parts of the source tree
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 6fd69d9e0..d52ef47ef 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -8,6 +8,7 @@ #include "party_menu.h" #include "save.h" #include "link_rfu.h" +#include "help_message.h" #include "event_data.h" #include "fieldmap.h" #include "safari_zone.h" @@ -390,7 +391,7 @@ void ShowStartMenu(void) if (!IsUpdateLinkStateCBActive()) { FreezeObjectEvents(); - sub_805C270(); + HandleEnforcedLookDirectionOnPlayerStopMoving(); StopPlayerAvatar(); } OpenStartMenuWithFollowupFunc(Task_StartMenuHandleInput); @@ -574,7 +575,7 @@ static bool8 StartCB_Save2(void) break; case SAVECB_RETURN_OKAY: ClearDialogWindowAndFrameToTransparent(0, TRUE); - sub_80696C0(); + ClearPlayerHeldMovementAndUnfreezeObjectEvents(); ScriptContext2_Disable(); RestoreHelpContext(); return TRUE; @@ -586,7 +587,7 @@ static bool8 StartCB_Save2(void) break; case SAVECB_RETURN_ERROR: ClearDialogWindowAndFrameToTransparent(0, TRUE); - sub_80696C0(); + ClearPlayerHeldMovementAndUnfreezeObjectEvents(); ScriptContext2_Disable(); RestoreHelpContext(); return TRUE; @@ -994,7 +995,7 @@ static void CloseStartMenu(void) PlaySE(SE_SELECT); ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); - sub_80696C0(); + ClearPlayerHeldMovementAndUnfreezeObjectEvents(); ScriptContext2_Disable(); } |