diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/start_menu.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
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(); } |