From 97dc0a6903d0b08e26d18cac5713e0fc38727fd1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 17 Oct 2019 17:11:34 -0400 Subject: Trainer dump pass 2; flag refactoring --- src/main_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index 72056d750..edb84afa2 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -671,7 +671,7 @@ static void PrintBadgeCount(void) u8 *ptr; u32 flagId; u8 nbadges = 0; - for (flagId = FLAG_UNK820; flagId < FLAG_UNK820 + 8; flagId++) + for (flagId = FLAG_0x820; flagId < FLAG_0x820 + 8; flagId++) { if (FlagGet(flagId)) nbadges++; -- cgit v1.2.3 From 2435bcc09db545d337c2b45a59d5276fa08ffa08 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 17 Oct 2019 21:24:47 -0400 Subject: sys flag rearrange --- src/main_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index edb84afa2..cf788fa21 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -652,7 +652,7 @@ static void PrintDexCount(void) u8 strbuf[30]; u8 *ptr; u16 dexcount; - if (FlagGet(FLAG_0x829) == TRUE) + if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) { if (IsNationalPokedexEnabled()) dexcount = GetNationalPokedexCount(FLAG_GET_CAUGHT); @@ -671,7 +671,7 @@ static void PrintBadgeCount(void) u8 *ptr; u32 flagId; u8 nbadges = 0; - for (flagId = FLAG_0x820; flagId < FLAG_0x820 + 8; flagId++) + for (flagId = FLAG_BADGE01_GET; flagId < FLAG_BADGE01_GET + 8; flagId++) { if (FlagGet(flagId)) nbadges++; -- cgit v1.2.3 From 6ee1bd06218bd80ca9cce754d34ba8cdd9701dc8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 21:15:54 -0400 Subject: Decompile event_data.s --- src/main_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main_menu.c') diff --git a/src/main_menu.c b/src/main_menu.c index cf788fa21..542bcf8ea 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -240,7 +240,7 @@ static void Task_SetWin0BldRegsAndCheckSaveFile(u8 taskId) { case SAVE_STATUS_OK: LoadUserFrameToBg(0); - if (Flag_0x839_IsSet() == TRUE) + if (IsMysteryGiftEnabled() == TRUE) { gTasks[taskId].tMenuType = MAIN_MENU_MYSTERYGIFT; } @@ -259,7 +259,7 @@ static void Task_SetWin0BldRegsAndCheckSaveFile(u8 taskId) SetStdFrame0OnBg(0); gTasks[taskId].tMenuType = MAIN_MENU_CONTINUE; PrintSaveErrorStatus(taskId, gText_SaveFileCorruptedPrevWillBeLoaded); - if (Flag_0x839_IsSet() == TRUE) + if (IsMysteryGiftEnabled() == TRUE) { gTasks[taskId].tMenuType = MAIN_MENU_MYSTERYGIFT; } -- cgit v1.2.3