diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 00:37:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 00:37:08 -0400 |
| commit | 93d17ef7c886b96791931ba50406b59756e1bdbd (patch) | |
| tree | a96f8cc5e480114dadd1362372da0606c26bc928 /src/start_menu.c | |
| parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
| parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) | |
Merge branch 'master' into doc-rm
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 867e469e0..6fd69d9e0 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,7 +1,5 @@ #include "global.h" -#include "palette.h" -#include "bg.h" -#include "gpu_regs.h" +#include "gflib.h" #include "scanline_effect.h" #include "overworld.h" #include "link.h" @@ -17,7 +15,6 @@ #include "menu.h" #include "load_save.h" #include "strings.h" -#include "string_util.h" #include "menu_helpers.h" #include "text_window.h" #include "field_fadetransition.h" @@ -26,7 +23,6 @@ #include "event_object_movement.h" #include "event_object_lock.h" #include "script.h" -#include "sound.h" #include "quest_log.h" #include "new_game.h" #include "event_scripts.h" @@ -395,7 +391,7 @@ void ShowStartMenu(void) { FreezeObjectEvents(); sub_805C270(); - sub_805C780(); + StopPlayerAvatar(); } OpenStartMenuWithFollowupFunc(Task_StartMenuHandleInput); ScriptContext2_Enable(); @@ -779,7 +775,7 @@ static u8 SaveDialogCB_AskOverwriteOrReplacePreviousFileHandleInput(void) static u8 SaveDialogCB_PrintSavingDontTurnOffPower(void) { - sub_8112450(); + SaveQuestLogData(); PrintSaveTextWithFollowupFunc(gText_SavingDontTurnOffThePower, SaveDialogCB_DoSave); return SAVECB_RETURN_CONTINUE; } |