From 2cac6785d9f1f8abbac8a5bde701db2920aed48c Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Thu, 2 Jul 2020 16:36:52 -0400 Subject: [PATCH] =?UTF-8?q?Updated=20Not=20showing=20dex=20entries=20until?= =?UTF-8?q?=20getting=20the=20Pok=C3=A9dex=20(markdown)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...g-dex-entries-until-getting-the-Pokédex.md | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/Not-showing-dex-entries-until-getting-the-Pokédex.md b/Not-showing-dex-entries-until-getting-the-Pokédex.md index 90ca7a2..40eb798 100644 --- a/Not-showing-dex-entries-until-getting-the-Pokédex.md +++ b/Not-showing-dex-entries-until-getting-the-Pokédex.md @@ -5,16 +5,8 @@ In Generation 3, you normally can't catch Pokémon without getting the Pokédex With this change, if you catch a Pokémon without having the Pokédex, it won't show their entry. It will still register them, for when you do get the Dex. Open [src/battle_script_commands.c](../blob/master/src/battle_script_commands.c). Find `Cmd_trysetcaughtmondexflags` and add the following `else if` in between the existing `if` and `else`: -```c - else if (!FlagGet(FLAG_SYS_POKEDEX_GET)) - { - HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality); - gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); - } -``` -So in the end it ends up like this: -```c +```diff static void Cmd_trysetcaughtmondexflags(void) { u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetCatchingBattler()]], MON_DATA_SPECIES, NULL); @@ -24,11 +16,11 @@ static void Cmd_trysetcaughtmondexflags(void) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } - else if (!FlagGet(FLAG_SYS_POKEDEX_GET)) - { - HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality); - gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); - } ++ else if (!FlagGet(FLAG_SYS_POKEDEX_GET)) ++ { ++ HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality); ++ gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); ++ } else { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality);