diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:02:00 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:02:00 -0400 |
commit | 5a20fefab11685494cdddb8ec48e08c04400440f (patch) | |
tree | 572fbef233926fd767f84d6d1867a9837c7778aa /src | |
parent | 8fd0bc424541cec7fc76a4f841035c2b9e793b0e (diff) |
Address review comments
Diffstat (limited to 'src')
-rw-r--r-- | src/quest_log.c | 44 | ||||
-rw-r--r-- | src/start_menu.c | 12 |
2 files changed, 28 insertions, 28 deletions
diff --git a/src/quest_log.c b/src/quest_log.c index ff99bbe30..ae0045326 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -92,30 +92,30 @@ struct UnkStruct_203AE98 * gUnknown_3005E94; static struct UnkStruct_300201C * gUnknown_300201C; static u16 gUnknown_3002020; -EWRAM_DATA u8 gUnknown_203ADF8 = 0; +static EWRAM_DATA u8 gUnknown_203ADF8 = 0; static EWRAM_DATA u8 sNumScenes = 0; EWRAM_DATA u8 gUnknown_203ADFA = 0; -EWRAM_DATA u16 gUnknown_203ADFC = 0; -EWRAM_DATA u8 gUnknown_203ADFE[3] = {0}; -EWRAM_DATA u16 * gUnknown_203AE04 = NULL; -EWRAM_DATA u16 * gUnknown_203AE08 = NULL; -EWRAM_DATA u16 * gUnknown_203AE0C[32] = {NULL}; -EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL; -EWRAM_DATA u16 *gUnknown_203AE90 = NULL; -EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; -EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; -EWRAM_DATA u16 gUnknown_203AF98 = 0; -EWRAM_DATA u8 gUnknown_203AF9A[64][2] = {{0}}; -EWRAM_DATA u16 gUnknown_203B01A = 0; -EWRAM_DATA u16 gUnknown_203B01C = 0; -EWRAM_DATA u16 gUnknown_203B01E = 0; -EWRAM_DATA u8 sHelpMessageWindowId = 0; -EWRAM_DATA struct UnkStruct_203B024 gUnknown_203B024 = {0}; -EWRAM_DATA struct UnkStruct_203B044 gUnknown_203B044 = {0}; -EWRAM_DATA u8 gUnknown_203B048 = 0; -EWRAM_DATA u8 gUnknown_203B049 = 0; -EWRAM_DATA u8 gUnknown_203B04A = 0; -EWRAM_DATA u8 gUnknown_203B04B = 0; +static EWRAM_DATA u16 gUnknown_203ADFC = 0; +static EWRAM_DATA u8 gUnknown_203ADFE[3] = {0}; +static EWRAM_DATA u16 * gUnknown_203AE04 = NULL; +static EWRAM_DATA u16 * gUnknown_203AE08 = NULL; +static EWRAM_DATA u16 * gUnknown_203AE0C[32] = {NULL}; +static EWRAM_DATA void (* gUnknown_203AE8C)(void) = NULL; +static EWRAM_DATA u16 *gUnknown_203AE90 = NULL; +static EWRAM_DATA struct UnkStruct_203AE94 gUnknown_203AE94 = {0}; +static EWRAM_DATA struct UnkStruct_203AE98 gUnknown_203AE98[32] = {0}; +static EWRAM_DATA u16 gUnknown_203AF98 = 0; +static EWRAM_DATA u8 gUnknown_203AF9A[64][2] = {{0}}; +static EWRAM_DATA u16 gUnknown_203B01A = 0; +static EWRAM_DATA u16 gUnknown_203B01C = 0; +static EWRAM_DATA u16 gUnknown_203B01E = 0; +static EWRAM_DATA u8 sHelpMessageWindowId = 0; +static EWRAM_DATA struct UnkStruct_203B024 gUnknown_203B024 = {0}; +static EWRAM_DATA struct UnkStruct_203B044 gUnknown_203B044 = {0}; +static EWRAM_DATA u8 gUnknown_203B048 = 0; +static EWRAM_DATA u8 gUnknown_203B049 = 0; +static EWRAM_DATA u8 gUnknown_203B04A = 0; +static EWRAM_DATA u8 gUnknown_203B04B = 0; void sub_8110A00(void); void sub_8110A3C(void); diff --git a/src/start_menu.c b/src/start_menu.c index 1bfca6761..0043efcc0 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -72,7 +72,7 @@ static ALIGNED(4) EWRAM_DATA u8 sSaveStatsWindowId = 0; static u8 (*sSaveDialogCB)(void); static u8 sSaveDialogDelay; -static u8 sSaveDialogIsPrinting; +static bool8 sSaveDialogIsPrinting; static void SetUpStartMenu_Link(void); static void SetUpStartMenu_UnionRoom(void); @@ -601,14 +601,14 @@ static void StartMenu_PrepareForSave(void) { save_serialize_map(); sSaveDialogCB = SaveDialogCB_PrintAskSaveText; - sSaveDialogIsPrinting = 0; + sSaveDialogIsPrinting = FALSE; } static u8 RunSaveDialogCB(void) { if (RunTextPrinters_CheckPrinter0Active() == TRUE) return 0; - sSaveDialogIsPrinting = 0; + sSaveDialogIsPrinting = FALSE; return sSaveDialogCB(); } @@ -620,13 +620,13 @@ void Field_AskSaveTheGame(void) CreateTask(task50_save_game, 80); } -void PrintSaveTextWithFollowupFunc(const u8 *str, bool8 (*savecb)(void)) +void PrintSaveTextWithFollowupFunc(const u8 *str, bool8 (*saveDialogCB)(void)) { StringExpandPlaceholders(gStringVar4, str); sub_80F7768(0, TRUE); AddTextPrinterForMessage(TRUE); - sSaveDialogIsPrinting = 1; - sSaveDialogCB = savecb; + sSaveDialogIsPrinting = TRUE; + sSaveDialogCB = saveDialogCB; } void task50_save_game(u8 taskId) |