dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments, 2

Browse Source
This commit is contained in:
PikalaxALT
2019-10-14 10:07:01 -04:00
parent 5a20fefab1
commit 5c7081b6e7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/start_menu.h
+3
View File
@@ -6,5 +6,8 @@
void AppendToList(u8* list, u8* pos, u8 newEntry); void AppendToList(u8* list, u8* pos, u8 newEntry);
void Task_StartMenuHandleInput(u8 taskId); void Task_StartMenuHandleInput(u8 taskId);
void SetUpReturnToStartMenu(void); void SetUpReturnToStartMenu(void);
void ShowStartMenu(void);
void Field_AskSaveTheGame(void);
void CB2_SetUpSaveAfterLinkBattle(void);
#endif // GUARD_START_MENU_H #endif // GUARD_START_MENU_H
src/start_menu.c
+4 -4
View File
@@ -332,7 +332,7 @@ static s8 DoDrawStartMenu(void)
return FALSE; return FALSE;
} }
void DrawStartMenuInOneGo(void) static void DrawStartMenuInOneGo(void)
{ {
sDrawStartMenuState[0] = 0; sDrawStartMenuState[0] = 0;
sDrawStartMenuState[1] = 0; sDrawStartMenuState[1] = 0;
@@ -620,7 +620,7 @@ void Field_AskSaveTheGame(void)
CreateTask(task50_save_game, 80); CreateTask(task50_save_game, 80);
} }
void PrintSaveTextWithFollowupFunc(const u8 *str, bool8 (*saveDialogCB)(void)) static void PrintSaveTextWithFollowupFunc(const u8 *str, bool8 (*saveDialogCB)(void))
{ {
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
sub_80F7768(0, TRUE); sub_80F7768(0, TRUE);
@@ -629,7 +629,7 @@ void PrintSaveTextWithFollowupFunc(const u8 *str, bool8 (*saveDialogCB)(void))
sSaveDialogCB = saveDialogCB; sSaveDialogCB = saveDialogCB;
} }
void task50_save_game(u8 taskId) static void task50_save_game(u8 taskId)
{ {
switch (RunSaveDialogCB()) switch (RunSaveDialogCB())
{ {
@@ -681,7 +681,7 @@ static bool8 SaveDialog_Wait60FramesOrAButtonHeld(void)
} }
} }
bool8 SaveDialog_Wait60FramesThenCheckAButtonHeld(void) static bool8 SaveDialog_Wait60FramesThenCheckAButtonHeld(void)
{ {
if (sSaveDialogDelay == 0) if (sSaveDialogDelay == 0)
{ {