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/help_system_812B1E0.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index afb792072..51b9c2762 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1185,7 +1185,7 @@ static bool8 sub_812B780(u8 id) case 30: case 32: case 33: - return FlagGet(FLAG_UNK820); + return FlagGet(FLAG_0x820); case 28: case 40: return sub_812BB10(); @@ -1251,7 +1251,7 @@ static bool8 sub_812B780(u8 id) return TRUE; return FALSE; case 15: - return FlagGet(FLAG_UNK820); + return FlagGet(FLAG_0x820); case 16: case 17: return sub_812BB10(); @@ -1325,7 +1325,7 @@ static bool8 sub_812B780(u8 id) switch (id) { case 5: - return FlagGet(FLAG_UNK820); + return FlagGet(FLAG_0x820); case 6: return FlagGet(FLAG_0x821); } -- 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/help_system_812B1E0.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index 51b9c2762..803a3fa66 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1163,7 +1163,7 @@ static bool8 sub_812B780(u8 id) return FlagGet(FLAG_WORLD_MAP_VERMILION_CITY); case 11: case 24: - return FlagGet(FLAG_0x8A4); + return FlagGet(FLAG_WORLD_MAP_VIRIDIAN_FOREST); case 9: case 13: case 14: @@ -1175,17 +1175,17 @@ static bool8 sub_812B780(u8 id) case 29: case 31: case 37: - return FlagGet(FLAG_0x828); + return FlagGet(FLAG_SYS_POKEMON_GET); case 21: case 23: - return FlagGet(FLAG_0x829); + return FlagGet(FLAG_SYS_POKEDEX_GET); case 12: case 25: case 27: case 30: case 32: case 33: - return FlagGet(FLAG_0x820); + return FlagGet(FLAG_BADGE01_GET); case 28: case 40: return sub_812BB10(); @@ -1229,7 +1229,7 @@ static bool8 sub_812B780(u8 id) case 1: case 30: case 37: - return FlagGet(FLAG_0x829); + return FlagGet(FLAG_SYS_POKEDEX_GET); case 14: return CheckBagHasItem(ITEM_TOWN_MAP, 1); case 2: @@ -1244,21 +1244,21 @@ static bool8 sub_812B780(u8 id) case 35: case 43: case 44: - return FlagGet(FLAG_0x828); + return FlagGet(FLAG_SYS_POKEMON_GET); case 4: case 34: if (GetKantoPokedexCount(1) > 1) return TRUE; return FALSE; case 15: - return FlagGet(FLAG_0x820); + return FlagGet(FLAG_BADGE01_GET); case 16: case 17: return sub_812BB10(); case 18: return FlagGet(FLAG_0x271); case 48: - return FlagGet(FLAG_0x82C); + return FlagGet(FLAG_SYS_GAME_CLEAR); } return FALSE; } @@ -1308,7 +1308,7 @@ static bool8 sub_812B780(u8 id) case 19: case 20: case 21: - return FlagGet(FLAG_0x828); + return FlagGet(FLAG_SYS_POKEMON_GET); case 36: case 37: return sub_812BB10(); @@ -1316,7 +1316,7 @@ static bool8 sub_812B780(u8 id) case 15: case 18: case 39: - return FlagGet(FLAG_0x8A4); + return FlagGet(FLAG_WORLD_MAP_VIRIDIAN_FOREST); } return TRUE; } @@ -1325,9 +1325,9 @@ static bool8 sub_812B780(u8 id) switch (id) { case 5: - return FlagGet(FLAG_0x820); + return FlagGet(FLAG_BADGE01_GET); case 6: - return FlagGet(FLAG_0x821); + return FlagGet(FLAG_BADGE02_GET); } return TRUE; } -- cgit v1.2.3 From 26d8c4d04b174e40b62298a6bf42e2bad67cf81c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 21:41:03 -0400 Subject: Name all item ball hide/show flags --- src/help_system_812B1E0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index 803a3fa66..964995d6c 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1353,7 +1353,7 @@ static bool8 sub_812BB10(void) return TRUE; if (FlagGet(FLAG_0x2EF) == TRUE) return TRUE; - if (FlagGet(FLAG_0x1F1) == TRUE) + if (FlagGet(FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07) == TRUE) return TRUE; return FALSE; } -- cgit v1.2.3 From 9d8c5b22506ee867785012db89a9ab1c3006179a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 22:37:08 -0400 Subject: Two additional script macros --- src/help_system_812B1E0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index 964995d6c..08f54b22e 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1125,7 +1125,7 @@ static void sub_812B614(struct HelpSystemListMenu * a0, struct ListMenuItem * a1 static bool8 sub_812B754(void) { - if (FlagGet(FLAG_0x4B0) == TRUE && gUnknown_3005E9C[1] == 2) + if (FlagGet(FLAG_DEFEATED_BROCK) == TRUE && gUnknown_3005E9C[1] == 2) return TRUE; return FALSE; } -- cgit v1.2.3 From 2aeefdc5de73c630a79b183e7bc2a66ad48ed424 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 20:20:45 -0400 Subject: update famechecker macro --- src/help_system_812B1E0.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index 08f54b22e..a6e6bcca0 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1341,15 +1341,15 @@ static bool8 sub_812B780(u8 id) static bool8 sub_812BB10(void) { - if (FlagGet(FLAG_0x237) == TRUE) + if (FlagGet(FLAG_GOT_HM01) == TRUE) return TRUE; - if (FlagGet(FLAG_0x238) == TRUE) + if (FlagGet(FLAG_GOT_HM02) == TRUE) return TRUE; - if (FlagGet(FLAG_0x239) == TRUE) + if (FlagGet(FLAG_GOT_HM03) == TRUE) return TRUE; - if (FlagGet(FLAG_0x23A) == TRUE) + if (FlagGet(FLAG_GOT_HM04) == TRUE) return TRUE; - if (FlagGet(FLAG_0x23B) == TRUE) + if (FlagGet(FLAG_GOT_HM05) == TRUE) return TRUE; if (FlagGet(FLAG_0x2EF) == TRUE) return TRUE; -- cgit v1.2.3 From 8654e828e4e6713371448e65060b38b14a136fc6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 21:38:52 -0400 Subject: More story flags --- src/help_system_812B1E0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index a6e6bcca0..10e0bce80 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1256,7 +1256,7 @@ static bool8 sub_812B780(u8 id) case 17: return sub_812BB10(); case 18: - return FlagGet(FLAG_0x271); + return FlagGet(FLAG_GOT_BICYCLE); case 48: return FlagGet(FLAG_SYS_GAME_CLEAR); } -- cgit v1.2.3 From 3ab70c735e86369dc927beb5cddf7adc2e96afd9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 22:14:22 -0400 Subject: Story flags through mystic ticket --- src/help_system_812B1E0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index 10e0bce80..c123d5818 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1190,7 +1190,7 @@ static bool8 sub_812B780(u8 id) case 40: return sub_812BB10(); case 39: - return FlagGet(FLAG_0x29B); + return FlagGet(FLAG_GOT_FAME_CHECKER); case 44: return FlagGet(FLAG_WORLD_MAP_PEWTER_CITY); } -- cgit v1.2.3 From a1bddb8f8c3f43d0942e2874f9d873d4bcf05371 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 09:58:14 -0400 Subject: Remaining story flags referenced in event scripts --- src/help_system_812B1E0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index c123d5818..91818f425 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1150,7 +1150,7 @@ static bool8 sub_812B780(u8 id) case 43: return TRUE; case 4: - return FlagGet(FLAG_0x2CF); + return FlagGet(FLAG_VISITED_OAKS_LAB); case 6: case 10: case 16: @@ -1351,7 +1351,7 @@ static bool8 sub_812BB10(void) return TRUE; if (FlagGet(FLAG_GOT_HM05) == TRUE) return TRUE; - if (FlagGet(FLAG_0x2EF) == TRUE) + if (FlagGet(FLAG_GOT_HM06) == TRUE) return TRUE; if (FlagGet(FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07) == TRUE) return TRUE; -- cgit v1.2.3 From 221259d0d6127013c92c1fe7f8bcb794cf0b9149 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 10:42:24 -0400 Subject: sys flags --- src/help_system_812B1E0.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/help_system_812B1E0.c') diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index 91818f425..1f3acdb2d 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -950,7 +950,7 @@ static bool8 IsInDungeonMap(void) if ( sDungeonMaps[i][0] == gSaveBlock1Ptr->location.mapGroup && sDungeonMaps[i][1] + j == gSaveBlock1Ptr->location.mapNum - && (i != 15 /* TANOBY */ || FlagGet(FLAG_0x849) == TRUE) + && (i != 15 /* TANOBY */ || FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS) == TRUE) ) return TRUE; } @@ -990,10 +990,10 @@ bool8 sub_812B40C(void) if (gUnknown_203B0EE == 1) return FALSE; - if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_0x83C)) + if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO)) return FALSE; - FlagSet(FLAG_0x83C); + FlagSet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO); gUnknown_203B0EE = 1; return TRUE; } -- cgit v1.2.3