From 9bfbcdd8bcaee70aa37e7cdbcb35ab87d7b1854f Mon Sep 17 00:00:00 2001 From: professorleondias <57677889+professorleondias@users.noreply.github.com> Date: Thu, 21 May 2020 01:44:12 -0400 Subject: [PATCH] Update Pokedex_Data_Table.c --- src/Pokedex_Data_Table.c | 85 +++++++++++++++++++++++++++++++++------- 1 file changed, 70 insertions(+), 15 deletions(-) diff --git a/src/Pokedex_Data_Table.c b/src/Pokedex_Data_Table.c index ccc502c..415281a 100644 --- a/src/Pokedex_Data_Table.c +++ b/src/Pokedex_Data_Table.c @@ -10432,12 +10432,12 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerScale = 0, .trainerOffset = 0, }, - [NATIONAL_DEX_ALCREMIE] = + [NATIONAL_DEX_ALCREMIE_STRAWBERRY] = { .categoryName = {_C, _r, _e, _a, _m, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 5, - .description = DEX_ENTRY_ALCREMIE, + .description = DEX_ENTRY_ALCREMIE_STRAWBERRY, .unusedDescription = (const u8*) 0x8444cb1, .pokemonScale = 0, .pokemonOffset = 0, @@ -10695,7 +10695,55 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - } + }, + [NATIONAL_DEX_ZARUDE] = + { + .categoryName = {_U, _n, _k, _n, _o, _w, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, + .height = 0, + .weight = 0, + .description = DEX_ENTRY_ZARUDE, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, + .pokemonOffset = 0, + .trainerScale = 0, + .trainerOffset = 0, + }, + [NATIONAL_DEX_KUBFU] = + { + .categoryName = {_U, _n, _k, _n, _o, _w, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, + .height = 0, + .weight = 0, + .description = DEX_ENTRY_KUBFU, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, + .pokemonOffset = 0, + .trainerScale = 0, + .trainerOffset = 0, + }, + [NATIONAL_DEX_URSHIFU_SINGLE] = + { + .categoryName = {_U, _n, _k, _n, _o, _w, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, + .height = 0, + .weight = 0, + .description = DEX_ENTRY_URSHIFU_SINGLE, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, + .pokemonOffset = 0, + .trainerScale = 0, + .trainerOffset = 0, + }, + [NATIONAL_DEX_CALYREX] = + { + .categoryName = {_U, _n, _k, _n, _o, _w, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, + .height = 0, + .weight = 0, + .description = DEX_ENTRY_CALYREX, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, + .pokemonOffset = 0, + .trainerScale = 0, + .trainerOffset = 0, + }, }; //Certain Pokemon forms can have alternate dex entries when viewed @@ -10721,6 +10769,8 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(GOLEM_A), ALTERNATE_ENTRY(PONYTA_G), ALTERNATE_ENTRY(RAPIDASH_G), + ALTERNATE_ENTRY(SLOWPOKE_G),' + ALTERNATE_ENTRY(SLOWBRO_G), ALTERNATE_ENTRY(FARFETCHD_G), ALTERNATE_ENTRY(GRIMER_A), ALTERNATE_ENTRY(MUK_A), @@ -10728,6 +10778,10 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(MAROWAK_A), ALTERNATE_ENTRY(WEEZING_G), ALTERNATE_ENTRY(MR_MIME_G), + ALTERNATE_ENTRY(ARTICUNO_G), + ALTERNATE_ENTRY(ZAPDOS_G), + ALTERNATE_ENTRY(MOLTRES_G), + ALTERNATE_ENTRY(SLOWKING_G), ALTERNATE_ENTRY(CORSOLA_G), ALTERNATE_ENTRY(ZIGZAGOON_G), ALTERNATE_ENTRY(LINOONE_G), @@ -10750,19 +10804,20 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(CRAMORANT_GULPING), ALTERNATE_ENTRY(CRAMORANT_GORGING), ALTERNATE_ENTRY(TOXTRICITY_LOW_KEY), - ALTERNATE_ENTRY(POLTEAGEIST_ANTIQUE), - ALTERNATE_ENTRY(ALCREMIE_RUBY_CREAM), - ALTERNATE_ENTRY(ALCREMIE_MATCHA_CREAM), - ALTERNATE_ENTRY(ALCREMIE_MINT_CREAM), - ALTERNATE_ENTRY(ALCREMIE_LEMON_CREAM), - ALTERNATE_ENTRY(ALCREMIE_SALTED_CREAM), - ALTERNATE_ENTRY(ALCREMIE_RUBY_SWIRL), - ALTERNATE_ENTRY(ALCREMIE_CARAMEL_SWIRL), - ALTERNATE_ENTRY(ALCREMIE_RAINBOW_SWIRL), + ALTERNATE_ENTRY(SINISTEA_CHIPPED), + ALTERNATE_ENTRY(POLTEAGEIST_CHIPPED), + ALTERNATE_ENTRY(ALCREMIE_BERRY), + ALTERNATE_ENTRY(ALCREMIE_CLOVER), + ALTERNATE_ENTRY(ALCREMIE_FLOWER), + ALTERNATE_ENTRY(ALCREMIE_LOVE), + ALTERNATE_ENTRY(ALCREMIE_RIBBON), + ALTERNATE_ENTRY(ALCREMIE_STAR), ALTERNATE_ENTRY(EISCUE_NOICE), - ALTERNATE_ENTRY(INDEEDEE_F), + ALTERNATE_ENTRY(INDEEDEE_FEMALE), ALTERNATE_ENTRY(MORPEKO_HANGRY), - ALTERNATE_ENTRY(ZACIAN_CROWNED_SWORD), - ALTERNATE_ENTRY(ZAMAZENTA_CROWNED_SHIELD), + ALTERNATE_ENTRY(ZACIAN_CROWNED), + ALTERNATE_ENTRY(ZAMAZENTA_CROWNED), + ALTERNATE_ENTRY(ETERNATUS_ETERNAMAX), + ALTERNATE_ENTRY(URSHIFU_RAPID), {SPECIES_TABLES_TERMIN, 0} };