From 0f67a952a396c80984236b45974407bcc8f6191d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 7 Oct 2019 17:06:11 -0400 Subject: main_menu through sub_800CE70 --- src/quest_log.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index 065b42cef..f98357b32 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -93,7 +93,7 @@ static struct UnkStruct_300201C * gUnknown_300201C; static u16 gUnknown_3002020; EWRAM_DATA u8 gUnknown_203ADF8 = 0; -EWRAM_DATA u8 gUnknown_203ADF9 = 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}; @@ -840,19 +840,19 @@ bool8 sub_8110E68(struct UnkStruct_203AE98 * a0) return TRUE; } -void sub_8110F14(u8 taskId) +void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId) { u8 i; sub_811381C(); - gUnknown_203ADF9 = 0; + sNumScenes = 0; for (i = 0; i < 4; i++) { if (gSaveBlock1Ptr->questLog[i].unk_000) - gUnknown_203ADF9++; + sNumScenes++; } - if (gUnknown_203ADF9 != 0) + if (sNumScenes != 0) { gUnknown_3005ECC = FALSE; sub_8110F90(taskId); @@ -1221,7 +1221,7 @@ void sub_8111914(void) ScriptContext2_Enable(); if (++gUnknown_203ADF8 < 4 && gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000) { - gUnknown_203ADF9--; + sNumScenes--; sub_8111368(); } else @@ -1402,7 +1402,7 @@ bool8 sub_8111CD0(void) void sub_8111CF0(void) { if (gUnknown_203ADFA == 2) - sub_8111070(gUnknown_203ADF9); + sub_8111070(sNumScenes); } void sub_8111D10(void) -- cgit v1.2.3 From 99bd3d91547858203c84cdf7f4ec37effabc0385 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 8 Oct 2019 10:31:33 -0400 Subject: Finish main menu decomp --- src/quest_log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index f98357b32..71cab91a1 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -854,7 +854,7 @@ void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId) if (sNumScenes != 0) { - gUnknown_3005ECC = FALSE; + gHelpSystemEnabled = FALSE; sub_8110F90(taskId); DestroyTask(taskId); } @@ -1603,7 +1603,7 @@ void sub_81120AC(u8 taskId) gTextFlags.autoScroll = FALSE; gUnknown_2036E28 = 0; sub_8082740(0); - gUnknown_3005ECC = 1; + gHelpSystemEnabled = 1; DestroyTask(taskId); break; } -- cgit v1.2.3 From 734cada66a2d9938cdc9a2806f68352d06da6e9a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 9 Oct 2019 18:12:37 -0400 Subject: Address review comments --- src/quest_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quest_log.c') diff --git a/src/quest_log.c b/src/quest_log.c index 71cab91a1..c8bd19174 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1603,7 +1603,7 @@ void sub_81120AC(u8 taskId) gTextFlags.autoScroll = FALSE; gUnknown_2036E28 = 0; sub_8082740(0); - gHelpSystemEnabled = 1; + gHelpSystemEnabled = TRUE; DestroyTask(taskId); break; } -- cgit v1.2.3