From 6846d3f6b6b168589927de71e005eac29ed4f776 Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Wed, 5 Jan 2022 21:09:00 +0100 Subject: [PATCH 01/13] added base for form heigth, weight and dex description, alolan data from bulbapedia and galarian from psf#2936 --- include/pokedex.h | 8 + src/battle_script_commands.c | 2 +- src/data/pokemon/pokedex_entries.h | 231 +++++++++++++++++++++++++++++ src/data/pokemon/pokedex_text.h | 114 ++++++++++++++ src/international_string_util.c | 1 + src/pokedex.c | 18 +++ src/pokemon_size_record.c | 2 +- 7 files changed, 374 insertions(+), 2 deletions(-) diff --git a/include/pokedex.h b/include/pokedex.h index 703b9ab8df..5d8e28e42d 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -35,8 +35,16 @@ struct PokedexEntry /*0x1C*/ u16 trainerOffset; }; /*size = 0x20*/ +struct PokedexEntryForms +{ + u16 height; //in decimeters + u16 weight; //in hectograms + const u8 *description; +}; + void ResetPokedex(void); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); +u16 GetSpeciesHeightWeight(u16 species, u8 data); u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); u8 DisplayCaughtMonDexPage(u16 dexNum, u32 otId, u32 personality); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 460f4d9b00..4ee7421e24 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9341,7 +9341,7 @@ static void Cmd_weightdamagecalculation(void) s32 i; for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2) { - if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1)) + if (sWeightToDamageTable[i] > GetSpeciesHeightWeight(gBattleMons[gBattlerTarget].species, 1)) break; } diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 6ceff22eec..b8c08d5cf9 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10788,3 +10788,234 @@ const struct PokedexEntry gPokedexEntries[] = .trainerOffset = 0, }, }; + + +const struct PokedexEntryForms gPokedexEntriesForms[] = +{ + // Alolan Forms + [SPECIES_RATTATA_ALOLAN] = + { + .height = 3, + .weight = 38, + .description = gRattataAlolanPokedexText, + }, + [SPECIES_RATICATE_ALOLAN] = + { + .height = 7, + .weight = 255, + .description = gRaticateAlolanPokedexText, + }, + [SPECIES_RAICHU_ALOLAN] = + { + .height = 7, + .weight = 210, + .description = gRaichuAlolanPokedexText, + }, + [SPECIES_SANDSHREW_ALOLAN] = + { + .height = 7, + .weight = 400, + .description = gSandshrewAlolanPokedexText, + }, + [SPECIES_SANDSLASH_ALOLAN] = + { + .height = 12, + .weight = 550, + .description = gSandslashAlolanPokedexText, + }, + [SPECIES_VULPIX_ALOLAN] = + { + .height = 6, + .weight = 99, + .description = gVulpixAlolanPokedexText, + }, + [SPECIES_NINETALES_ALOLAN] = + { + .height = 11, + .weight = 199, + .description = gNinetalesAlolanPokedexText, + }, + [SPECIES_DIGLETT_ALOLAN] = + { + .height = 2, + .weight = 10, + .description = gDiglettAlolanPokedexText, + }, + [SPECIES_DUGTRIO_ALOLAN] = + { + .height = 7, + .weight = 666, + .description = gDugtrioAlolanPokedexText, + }, + [SPECIES_MEOWTH_ALOLAN] = + { + .height = 4, + .weight = 42, + .description = gMeowthAlolanPokedexText, + }, + [SPECIES_PERSIAN_ALOLAN] = + { + .height = 11, + .weight = 330, + .description = gPersianAlolanPokedexText, + }, + [SPECIES_GEODUDE_ALOLAN] = + { + .height = 4, + .weight = 203, + .description = gGeodudeAlolanPokedexText, + }, + [SPECIES_GRAVELER_ALOLAN] = + { + .height = 10, + .weight = 1100, + .description = gGravelerAlolanPokedexText, + }, + [SPECIES_GOLEM_ALOLAN] = + { + .height = 17, + .weight = 3160, + .description = gGolemAlolanPokedexText, + }, + [SPECIES_GRIMER_ALOLAN] = + { + .height = 7, + .weight = 420, + .description = gGrimerAlolanPokedexText, + }, + [SPECIES_MUK_ALOLAN] = + { + .height = 10, + .weight = 520, + .description = gMukAlolanPokedexText, + }, + [SPECIES_EXEGGUTOR_ALOLAN] = + { + .height = 109, + .weight = 4156, + .description = gExeggutorAlolanPokedexText, + }, + [SPECIES_MAROWAK_ALOLAN] = + { + .height = 10, + .weight = 340, + .description = gMarowakAlolanPokedexText, + }, + + // Galarian Forms + [SPECIES_MEOWTH_GALARIAN] = + { + .height = 4, + .weight = 75, + .description = gMeowthGalarianPokedexText, + }, + [SPECIES_PONYTA_GALARIAN] = + { + .height = 8, + .weight = 240, + .description = gPonytaGalarianPokedexText, + }, + [SPECIES_RAPIDASH_GALARIAN] = + { + .height = 17, + .weight = 80, + .description = gRapidashGalarianPokedexText, + }, + [SPECIES_SLOWPOKE_GALARIAN] = + { + .height = 12, + .weight = 360, + .description = gSlowpokeGalarianPokedexText, + }, + [SPECIES_SLOWBRO_GALARIAN] = + { + .height = 16, + .weight = 705, + .description = gSlowbroGalarianPokedexText, + }, + [SPECIES_FARFETCHD_GALARIAN] = + { + .height = 8, + .weight = 420, + .description = gFarfetchdGalarianPokedexText, + }, + [SPECIES_WEEZING_GALARIAN] = + { + .height = 30, + .weight = 160, + .description = gWeezingGalarianPokedexText, + }, + [SPECIES_MR_MIME_GALARIAN] = + { + .height = 14, + .weight = 568, + .description = gMrMimeGalarianPokedexText, + }, + [SPECIES_ARTICUNO_GALARIAN] = + { + .height = 17, + .weight = 509, + .description = gArticunoGalarianPokedexText, + }, + [SPECIES_ZAPDOS_GALARIAN] = + { + .height = 16, + .weight = 582, + .description = gZapdosGalarianPokedexText, + }, + [SPECIES_MOLTRES_GALARIAN] = + { + .height = 20, + .weight = 660, + .description = gMoltresGalarianPokedexText, + }, + [SPECIES_SLOWKING_GALARIAN] = + { + .height = 18, + .weight = 795, + .description = gSlowkingGalarianPokedexText, + }, + [SPECIES_CORSOLA_GALARIAN] = + { + .height = 6, + .weight = 5, + .description = gCorsolaGalarianPokedexText, + }, + [SPECIES_ZIGZAGOON_GALARIAN] = + { + .height = 4, + .weight = 175, + .description = gZigzagoonGalarianPokedexText, + }, + [SPECIES_LINOONE_GALARIAN] = + { + .height = 5, + .weight = 325, + .description = gLinooneGalarianPokedexText, + }, + [SPECIES_DARUMAKA_GALARIAN] = + { + .height = 7, + .weight = 400, + .description = gDarumakaGalarianPokedexText, + }, + [SPECIES_DARMANITAN_GALARIAN] = + { + .height = 17, + .weight = 1200, + .description = gDarmanitanGalarianPokedexText, + }, + [SPECIES_YAMASK_GALARIAN] = + { + .height = 5, + .weight = 15, + .description = gYamaskGalarianPokedexText, + }, + [SPECIES_STUNFISK_GALARIAN] = + { + .height = 7, + .weight = 205, + .description = gStunfiskGalarianPokedexText, + }, + +}; diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 15d56ee9d5..e9f92e5f9a 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5348,3 +5348,117 @@ const u8 gCalyrexPokedexText[] = _( "providing healing and blessings. It\n" "reigned over the Galar region in times\n" "of yore."); + +// Forms +// Megas +const u8 gVenusaurMegaPokedexText[] = _(""); +const u8 gCharizardMegaXPokedexText[] = _(""); +const u8 gCharizardMegaYPokedexText[] = _(""); +const u8 gBlastoiseMegaPokedexText[] = _(""); +const u8 gBeedrillMegaPokedexText[] = _(""); +const u8 gPidgeotMegaPokedexText[] = _(""); +const u8 gAlakazamMegaPokedexText[] = _(""); +const u8 gSlowbroMegaPokedexText[] = _(""); +const u8 gGengarMegaPokedexText[] = _(""); +const u8 gKangaskhanMegaPokedexText[] = _(""); +const u8 gPinsirMegaPokedexText[] = _(""); +const u8 gGyaradosMegaPokedexText[] = _(""); +const u8 gAerodactylMegaPokedexText[] = _(""); +const u8 gMewtwoMega_xPokedexText[] = _(""); +const u8 gMewtwoMega_yPokedexText[] = _(""); +const u8 gAmpharosMegaPokedexText[] = _(""); +const u8 gSteelixMegaPokedexText[] = _(""); +const u8 gScizorMegaPokedexText[] = _(""); +const u8 gHeracrossMegaPokedexText[] = _(""); +const u8 gHoundoomMegaPokedexText[] = _(""); +const u8 gTyranitarMegaPokedexText[] = _(""); +const u8 gSceptileMegaPokedexText[] = _(""); +const u8 gBlazikenMegaPokedexText[] = _(""); +const u8 gSwampertMegaPokedexText[] = _(""); +const u8 gGardevoirMegaPokedexText[] = _(""); +const u8 gSableyeMegaPokedexText[] = _(""); +const u8 gMawileMegaPokedexText[] = _(""); +const u8 gAggronMegaPokedexText[] = _(""); +const u8 gMedichamMegaPokedexText[] = _(""); +const u8 gManectricMegaPokedexText[] = _(""); +const u8 gSharpedoMegaPokedexText[] = _(""); +const u8 gCameruptMegaPokedexText[] = _(""); +const u8 gAltariaMegaPokedexText[] = _(""); +const u8 gBanetteMegaPokedexText[] = _(""); +const u8 gAbsolMegaPokedexText[] = _(""); +const u8 gGlalieMegaPokedexText[] = _(""); +const u8 gSalamenceMegaPokedexText[] = _(""); +const u8 gMetagrossMegaPokedexText[] = _(""); +const u8 gLatiasMegaPokedexText[] = _(""); +const u8 gLatiosMegaPokedexText[] = _(""); +const u8 gLopunnyMegaPokedexText[] = _(""); +const u8 gGarchompMegaPokedexText[] = _(""); +const u8 gLucarioMegaPokedexText[] = _(""); +const u8 gAbomasnowMegaPokedexText[] = _(""); +const u8 gGalladeMegaPokedexText[] = _(""); +const u8 gAudinoMegaPokedexText[] = _(""); +const u8 gDiancieMegaPokedexText[] = _(""); + +// Special mega + primals +const u8 gRayquazaMegaPokedexText[] = _(""); +const u8 gKyogre_primalPokedexText[] = _(""); +const u8 gGroudon_primalPokedexText[] = _(""); + +// Alolan forms +const u8 gRattataAlolanPokedexText[] = _(""); +const u8 gRaticateAlolanPokedexText[] = _(""); +const u8 gRaichuAlolanPokedexText[] = _(""); +const u8 gSandshrewAlolanPokedexText[] = _(""); +const u8 gSandslashAlolanPokedexText[] = _(""); +const u8 gVulpixAlolanPokedexText[] = _(""); +const u8 gNinetalesAlolanPokedexText[] = _(""); +const u8 gDiglettAlolanPokedexText[] = _(""); +const u8 gDugtrioAlolanPokedexText[] = _(""); +const u8 gMeowthAlolanPokedexText[] = _(""); +const u8 gPersianAlolanPokedexText[] = _(""); +const u8 gGeodudeAlolanPokedexText[] = _(""); +const u8 gGravelerAlolanPokedexText[] = _(""); +const u8 gGolemAlolanPokedexText[] = _(""); +const u8 gGrimerAlolanPokedexText[] = _(""); +const u8 gMukAlolanPokedexText[] = _(""); +const u8 gExeggutorAlolanPokedexText[] = _(""); +const u8 gMarowakAlolanPokedexText[] = _(""); + +// Galarian forms +const u8 gMeowthGalarianPokedexText[] = _(""); +const u8 gPonytaGalarianPokedexText[] = _(""); +const u8 gRapidashGalarianPokedexText[] = _(""); +const u8 gSlowpokeGalarianPokedexText[] = _(""); +const u8 gSlowbroGalarianPokedexText[] = _(""); +const u8 gFarfetchdGalarianPokedexText[] = _(""); +const u8 gWeezingGalarianPokedexText[] = _(""); +const u8 gMrMimeGalarianPokedexText[] = _(""); +const u8 gArticunoGalarianPokedexText[] = _(""); +const u8 gZapdosGalarianPokedexText[] = _(""); +const u8 gMoltresGalarianPokedexText[] = _(""); +const u8 gSlowkingGalarianPokedexText[] = _(""); +const u8 gCorsolaGalarianPokedexText[] = _(""); +const u8 gZigzagoonGalarianPokedexText[] = _(""); +const u8 gLinooneGalarianPokedexText[] = _(""); +const u8 gDarumakaGalarianPokedexText[] = _(""); +const u8 gDarmanitanGalarianPokedexText[] = _(""); +const u8 gYamaskGalarianPokedexText[] = _(""); +const u8 gStunfiskGalarianPokedexText[] = _(""); + +// Misc forms +// Cosplay pikachu +const u8 gPikachuCosplayPokedexText[] = _(""); +const u8 gPikachuRockStarPokedexText[] = _(""); +const u8 gPikachuBellePokedexText[] = _(""); +const u8 gPikachuPopStarPokedexText[] = _(""); +const u8 gPikachuPhdPokedexText[] = _(""); +const u8 gPikachuLibrePokedexText[] = _(""); +// Cap pikachu +const u8 gPikachuOriginalCapPokedexText[] = _(""); +const u8 gPikachuHoennCapPokedexText[] = _(""); +const u8 gPikachuSinnohCapPokedexText[] = _(""); +const u8 gPikachuUnovaCapPokedexText[] = _(""); +const u8 gPikachuKalosCapPokedexText[] = _(""); +const u8 gPikachuAlolaCapPokedexText[] = _(""); +const u8 gPikachuPartnerCapPokedexText[] = _(""); +const u8 gPikachuWorldCapPokedexText[] = _(""); diff --git a/src/international_string_util.c b/src/international_string_util.c index e4b793b66c..aa07a134df 100644 --- a/src/international_string_util.c +++ b/src/international_string_util.c @@ -9,6 +9,7 @@ #include "window.h" extern const struct PokedexEntry gPokedexEntries[]; +extern const struct PokedexEntryForms gPokedexEntriesForms[]; int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth) { diff --git a/src/pokedex.c b/src/pokedex.c index 162afb3c11..abedb6633d 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4249,6 +4249,24 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data) } } +u16 GetSpeciesHeightWeight(u16 species, u8 data) +{ + if (species >= SPECIES_RATTATA_ALOLAN && species <= SPECIES_STUNFISK_GALARIAN) // Todo: change after adding Megas, etc + { + switch (data) + { + case 0: // height + return gPokedexEntriesForms[species].height; + case 1: // weight + return gPokedexEntriesForms[species].weight; + default: + return 1; + } + } + else + return GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), data); +} + s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID) { u32 index, bit, mask; diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 7c88e5bf10..1bc704d0ad 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -84,7 +84,7 @@ static u32 GetMonSize(u16 species, u16 b) u32 height; u32 var; - height = GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), 0); + height = GetSpeciesHeightWeight(species, 0); var = TranslateBigMonSizeTableIndex(b); unk0 = sBigMonSizeTable[var].unk0; unk2 = sBigMonSizeTable[var].unk2; From ee183db813ac0ede28ada80b7ac85e362989c2ad Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Wed, 5 Jan 2022 21:17:20 +0100 Subject: [PATCH 02/13] Update src/pokedex.c Co-authored-by: LOuroboros --- src/pokedex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pokedex.c b/src/pokedex.c index abedb6633d..6dc6c31e5e 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4264,7 +4264,9 @@ u16 GetSpeciesHeightWeight(u16 species, u8 data) } } else + { return GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), data); + } } s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID) From 149bafc545d0149534eb3e089845c6362f771e3d Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Wed, 5 Jan 2022 22:05:59 +0100 Subject: [PATCH 03/13] added all 48 megas and 2 primals --- src/data/pokemon/pokedex_entries.h | 304 +++++++++++++++++++++++++++++ src/data/pokemon/pokedex_text.h | 8 +- src/pokedex.c | 2 +- 3 files changed, 309 insertions(+), 5 deletions(-) diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index b8c08d5cf9..144d5eebea 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10792,6 +10792,310 @@ const struct PokedexEntry gPokedexEntries[] = const struct PokedexEntryForms gPokedexEntriesForms[] = { + // Mega Forms + [SPECIES_VENUSAUR_MEGA] = + { + .height = 24, + .weight = 1555, + .description = gVenusaurMegaPokedexText, + }, + [SPECIES_CHARIZARD_MEGA_X] = + { + .height = 17, + .weight = 1105, + .description = gCharizardMegaXPokedexText, + }, + [SPECIES_CHARIZARD_MEGA_Y] = + { + .height = 17, + .weight = 1005, + .description = gCharizardMegaYPokedexText, + }, + [SPECIES_BLASTOISE_MEGA] = + { + .height = 16, + .weight = 1011, + .description = gBlastoiseMegaPokedexText, + }, + [SPECIES_BEEDRILL_MEGA] = + { + .height = 14, + .weight = 405, + .description = gBeedrillMegaPokedexText, + }, + [SPECIES_PIDGEOT_MEGA] = + { + .height = 22, + .weight = 505, + .description = gPidgeotMegaPokedexText, + }, + [SPECIES_ALAKAZAM_MEGA] = + { + .height = 12, + .weight = 480, + .description = gAlakazamMegaPokedexText, + }, + [SPECIES_SLOWBRO_MEGA] = + { + .height = 20, + .weight = 1200, + .description = gSlowbroMegaPokedexText, + }, + [SPECIES_GENGAR_MEGA] = + { + .height = 14, + .weight = 405, + .description = gGengarMegaPokedexText, + }, + [SPECIES_KANGASKHAN_MEGA] = + { + .height = 22, + .weight = 1000, + .description = gKangaskhanMegaPokedexText, + }, + [SPECIES_PINSIR_MEGA] = + { + .height = 17, + .weight = 590, + .description = gPinsirMegaPokedexText, + }, + [SPECIES_GYARADOS_MEGA] = + { + .height = 65, + .weight = 3050, + .description = gGyaradosMegaPokedexText, + }, + [SPECIES_AERODACTYL_MEGA] = + { + .height = 21, + .weight = 790, + .description = gAerodactylMegaPokedexText, + }, + [SPECIES_MEWTWO_MEGA_X] = + { + .height = 23, + .weight = 1270, + .description = gMewtwoMegaXPokedexText, + }, + [SPECIES_MEWTWO_MEGA_Y] = + { + .height = 15, + .weight = 330, + .description = gMewtwoMegaYPokedexText, + }, + [SPECIES_AMPHAROS_MEGA] = + { + .height = 14, + .weight = 615, + .description = gAmpharosMegaPokedexText, + }, + [SPECIES_STEELIX_MEGA] = + { + .height = 105, + .weight = 7400, + .description = gSteelixMegaPokedexText, + }, + [SPECIES_SCIZOR_MEGA] = + { + .height = 20, + .weight = 1250, + .description = gScizorMegaPokedexText, + }, + [SPECIES_HERACROSS_MEGA] = + { + .height = 17, + .weight = 625, + .description = gHeracrossMegaPokedexText, + }, + [SPECIES_HOUNDOOM_MEGA] = + { + .height = 19, + .weight = 495, + .description = gHoundoomMegaPokedexText, + }, + [SPECIES_TYRANITAR_MEGA] = + { + .height = 25, + .weight = 2550, + .description = gTyranitarMegaPokedexText, + }, + [SPECIES_SCEPTILE_MEGA] = + { + .height = 19, + .weight = 552, + .description = gSceptileMegaPokedexText, + }, + [SPECIES_BLAZIKEN_MEGA] = + { + .height = 19, + .weight = 520, + .description = gBlazikenMegaPokedexText, + }, + [SPECIES_SWAMPERT_MEGA] = + { + .height = 19, + .weight = 1020, + .description = gSwampertMegaPokedexText, + }, + [SPECIES_GARDEVOIR_MEGA] = + { + .height = 16, + .weight = 484, + .description = gGardevoirMegaPokedexText, + }, + [SPECIES_SABLEYE_MEGA] = + { + .height = 05, + .weight = 1610, + .description = gSableyeMegaPokedexText, + }, + [SPECIES_MAWILE_MEGA] = + { + .height = 10, + .weight = 235, + .description = gMawileMegaPokedexText, + }, + [SPECIES_AGGRON_MEGA] = + { + .height = 22, + .weight = 3950, + .description = gAggronMegaPokedexText, + }, + [SPECIES_MEDICHAM_MEGA] = + { + .height = 13, + .weight = 315, + .description = gMedichamMegaPokedexText, + }, + [SPECIES_MANECTRIC_MEGA] = + { + .height = 18, + .weight = 440, + .description = gManectricMegaPokedexText, + }, + [SPECIES_SHARPEDO_MEGA] = + { + .height = 25, + .weight = 1303, + .description = gSharpedoMegaPokedexText, + }, + [SPECIES_CAMERUPT_MEGA] = + { + .height = 25, + .weight = 3205, + .description = gCameruptMegaPokedexText, + }, + [SPECIES_ALTARIA_MEGA] = + { + .height = 15, + .weight = 206, + .description = gAltariaMegaPokedexText, + }, + [SPECIES_BANETTE_MEGA] = + { + .height = 12, + .weight = 130, + .description = gBanetteMegaPokedexText, + }, + [SPECIES_ABSOL_MEGA] = + { + .height = 12, + .weight = 490, + .description = gAbsolMegaPokedexText, + }, + [SPECIES_GLALIE_MEGA] = + { + .height = 21, + .weight = 3502, + .description = gGlalieMegaPokedexText, + }, + [SPECIES_SALAMENCE_MEGA] = + { + .height = 18, + .weight = 1126, + .description = gSalamenceMegaPokedexText, + }, + [SPECIES_METAGROSS_MEGA] = + { + .height = 25, + .weight = 9429, + .description = gMetagrossMegaPokedexText, + }, + [SPECIES_LATIAS_MEGA] = + { + .height = 18, + .weight = 520, + .description = gLatiasMegaPokedexText, + }, + [SPECIES_LATIOS_MEGA] = + { + .height = 23, + .weight = 700, + .description = gLatiosMegaPokedexText, + }, + [SPECIES_LOPUNNY_MEGA] = + { + .height = 13, + .weight = 283, + .description = gLopunnyMegaPokedexText, + }, + [SPECIES_GARCHOMP_MEGA] = + { + .height = 19, + .weight = 950, + .description = gGarchompMegaPokedexText, + }, + [SPECIES_LUCARIO_MEGA] = + { + .height = 13, + .weight = 575, + .description = gLucarioMegaPokedexText, + }, + [SPECIES_ABOMASNOW_MEGA] = + { + .height = 27, + .weight = 1850, + .description = gAbomasnowMegaPokedexText, + }, + [SPECIES_GALLADE_MEGA] = + { + .height = 16, + .weight = 564, + .description = gGalladeMegaPokedexText, + }, + [SPECIES_AUDINO_MEGA] = + { + .height = 15, + .weight = 320, + .description = gAudinoMegaPokedexText, + }, + [SPECIES_DIANCIE_MEGA] = + { + .height = 11, + .weight = 278, + .description = gDiancieMegaPokedexText, + }, + + // Special Mega + Primals + [SPECIES_RAYQUAZA_MEGA] = + { + .height = 108, + .weight = 3920, + .description = gRayquazaMegaPokedexText, + }, + [SPECIES_KYOGRE_PRIMAL] = + { + .height = 98, + .weight = 4300, + .description = gKyogrePrimalMegaPokedexText, + }, + [SPECIES_GROUDON_PRIMAL] = + { + .height = 50, + .weight = 9997, + .description = gGroudonPrimalMegaPokedexText, + }, + // Alolan Forms [SPECIES_RATTATA_ALOLAN] = { diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index e9f92e5f9a..6a4de0a79a 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5364,8 +5364,8 @@ const u8 gKangaskhanMegaPokedexText[] = _(""); const u8 gPinsirMegaPokedexText[] = _(""); const u8 gGyaradosMegaPokedexText[] = _(""); const u8 gAerodactylMegaPokedexText[] = _(""); -const u8 gMewtwoMega_xPokedexText[] = _(""); -const u8 gMewtwoMega_yPokedexText[] = _(""); +const u8 gMewtwoMegaXPokedexText[] = _(""); +const u8 gMewtwoMegaYPokedexText[] = _(""); const u8 gAmpharosMegaPokedexText[] = _(""); const u8 gSteelixMegaPokedexText[] = _(""); const u8 gScizorMegaPokedexText[] = _(""); @@ -5401,8 +5401,8 @@ const u8 gDiancieMegaPokedexText[] = _(""); // Special mega + primals const u8 gRayquazaMegaPokedexText[] = _(""); -const u8 gKyogre_primalPokedexText[] = _(""); -const u8 gGroudon_primalPokedexText[] = _(""); +const u8 gKyogrePrimalPokedexText[] = _(""); +const u8 gGroudonPrimalPokedexText[] = _(""); // Alolan forms const u8 gRattataAlolanPokedexText[] = _(""); diff --git a/src/pokedex.c b/src/pokedex.c index abedb6633d..f0f82a9ed4 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4251,7 +4251,7 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data) u16 GetSpeciesHeightWeight(u16 species, u8 data) { - if (species >= SPECIES_RATTATA_ALOLAN && species <= SPECIES_STUNFISK_GALARIAN) // Todo: change after adding Megas, etc + if (species >= SPECIES_VENUSAUR_MEGA && species <= SPECIES_STUNFISK_GALARIAN) // Todo: change after adding Megas, etc { switch (data) { From 4f3019c7894ebb60604047181dfd37d386b49c35 Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Wed, 5 Jan 2022 22:10:26 +0100 Subject: [PATCH 04/13] tiny fix --- src/data/pokemon/pokedex_entries.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 144d5eebea..7e6e22c97c 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -11087,13 +11087,13 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 98, .weight = 4300, - .description = gKyogrePrimalMegaPokedexText, + .description = gKyogrePrimalPokedexText, }, [SPECIES_GROUDON_PRIMAL] = { .height = 50, .weight = 9997, - .description = gGroudonPrimalMegaPokedexText, + .description = gGroudonPrimalPokedexText, }, // Alolan Forms From 024b903f2191cd9499b99dca28afbadc1985d7a7 Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Thu, 6 Jan 2022 14:51:42 +0100 Subject: [PATCH 05/13] added all other form data, broken atm due to `initializer element for `gPokedexEntriesForms[992].height' is not constant` --- src/data/pokemon/pokedex_entries.h | 831 ++++++++++++++++++++++++++++- src/data/pokemon/pokedex_text.h | 149 +++++- src/international_string_util.c | 1 + src/pokedex.c | 12 +- 4 files changed, 979 insertions(+), 14 deletions(-) diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 7e6e22c97c..cf2e75b6d9 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10945,7 +10945,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = }, [SPECIES_SABLEYE_MEGA] = { - .height = 05, + .height = 5, .weight = 1610, .description = gSableyeMegaPokedexText, }, @@ -11320,6 +11320,833 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = .height = 7, .weight = 205, .description = gStunfiskGalarianPokedexText, - }, + }, + // Cap Pikachu + [SPECIES_PIKACHU_ORIGINAL_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ORIGINAL_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ORIGINAL_CAP)].weight, + .description = PikachuOriginalCapPokedexText, + }, + [SPECIES_PIKACHU_HOENN_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_HOENN_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_HOENN_CAP)].weight, + .description = PikachuHoennCapPokedexText, + }, + [SPECIES_PIKACHU_SINNOH_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_SINNOH_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_SINNOH_CAP)].weight, + .description = PikachuSinnohCapPokedexText, + }, + [SPECIES_PIKACHU_UNOVA_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_UNOVA_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_UNOVA_CAP)].weight, + .description = PikachuUnovaCapPokedexText, + }, + [SPECIES_PIKACHU_KALOS_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_KALOS_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_KALOS_CAP)].weight, + .description = PikachuKalosCapPokedexText, + }, + [SPECIES_PIKACHU_ALOLA_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ALOLA_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ALOLA_CAP)].weight, + .description = PikachuAlolaCapPokedexText, + }, + [SPECIES_PIKACHU_PARTNER_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_PARTNER_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_PARTNER_CAP)].weight, + .description = PikachuPartnerCapPokedexText, + }, + [SPECIES_PIKACHU_WORLD_CAP] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_WORLD_CAP)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_WORLD_CAP)].weight, + .description = PikachuWorldCapPokedexText, + }, + + // Castform + [SPECIES_CASTFORM_SUNNY] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SUNNY)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SUNNY)].weight, + .description = gCastformSunnyPokedexText, + }, + [SPECIES_CASTFORM_RAINY] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_RAINY)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_RAINY)].weight, + .description = gCastformRainyPokedexText, + }, + [SPECIES_CASTFORM_SNOWY] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SNOWY)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SNOWY)].weight, + .description = gCastformSnowyPokedexText, + }, + // Cherrim + [SPECIES_CHERRIM_SUNSHINE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CHERRIM_SUNSHINE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CHERRIM_SUNSHINE)].weight, + .description = gCherrimSunshinePokedexText, + }, + // Shellos + [SPECIES_SHELLOS_EAST_SEA] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SHELLOS_EAST_SEA)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SHELLOS_EAST_SEA)].weight, + .description = gShellosEastSeaPokedexText, + }, + // Gastrodon + [SPECIES_GASTRODON_EAST_SEA] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_GASTRODON_EAST_SEA)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_GASTRODON_EAST_SEA)].weight, + .description = gGastrodonEastSeaPokedexText, + }, + // Rotom + [SPECIES_ROTOM_HEAT] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_HEAT)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_HEAT)].weight, + .description = gRotomHeatPokedexText, + }, + [SPECIES_ROTOM_WASH] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_WASH)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_WASH)].weight, + .description = gRotomWashPokedexText, + }, + [SPECIES_ROTOM_FROST] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FROST)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FROST)].weight, + .description = gRotomFrostPokedexText, + }, + [SPECIES_ROTOM_FAN] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FAN)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FAN)].weight, + .description = gRotomFanPokedexText, + }, + [SPECIES_ROTOM_MOW] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_MOW)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_MOW)].weight, + .description = gRotomMowPokedexText, + }, + // Giratina + [SPECIES_GIRATINA_ORIGIN] = + { + .height = 69 , + .weight = 6500 , + .description = gGiratinaOriginPokedexText, + }, + // Shaymin + [SPECIES_SHAYMIN_SKY] = + { + .height = 4 , + .weight = 52 , + .description = gShayminSkyPokedexText, + }, + // Basculin + [SPECIES_BASCULIN_BLUE_STRIPED] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_BASCULIN_BLUE_STRIPED)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_BASCULIN_BLUE_STRIPED)].weight, + .description = gBasculinBlueStripedPokedexText, + }, + // Darmanitan + [SPECIES_DARMANITAN_ZEN_MODE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE)].weight, + .description = gDarmanitanZenModePokedexText, + }, + [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE_GALARIAN)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE_GALARIAN)].weight, + .description = gDarmanitanZenModeGalarianPokedexText, + }, + // Therian Forms + [SPECIES_TORNADUS_THERIAN] = + { + .height = 14 , + .weight = 630 , + .description = gTornadusTherianPokedexText, + }, + [SPECIES_THUNDURUS_THERIAN] = + { + .height = 30 , + .weight = 610 , + .description = gThundurusTherianPokedexText, + }, + [SPECIES_LANDORUS_THERIAN] = + { + .height = 13 , + .weight = 680 , + .description = gLandorusTherianPokedexText, + }, + // Kyurem + [SPECIES_KYUREM_WHITE] = + { + .height = 36 , + .weight = 3250 , + .description = gKyuremWhitePokedexText, + }, + [SPECIES_KYUREM_BLACK] = + { + .height = 33 , + .weight = 3250 , + .description = gKyuremBlackPokedexText, + }, + // Keldeo + [SPECIES_KELDEO_RESOLUTE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_KELDEO_RESOLUTE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_KELDEO_RESOLUTE)].weight, + .description = gKeldeoResolutePokedexText, + }, + // Meowstic + [SPECIES_MEOWSTIC_FEMALE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MEOWSTIC_FEMALE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MEOWSTIC_FEMALE)].weight, + .description = gMeowsticFemalePokedexText, + }, + // Aegislash + [SPECIES_AEGISLASH_BLADE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_AEGISLASH_BLADE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_AEGISLASH_BLADE)].weight, + .description = gAegislashBladePokedexText, + }, + // Pumpkaboo + [SPECIES_PUMPKABOO_SMALL] = + { + .height = 3 , + .weight = 35 , + .description = gPumpkabooSmallPokedexText, + }, + [SPECIES_PUMPKABOO_LARGE] = + { + .height = 5 , + .weight = 75 , + .description = gPumpkabooLargePokedexText, + }, + [SPECIES_PUMPKABOO_SUPER] = + { + .height = 8 , + .weight = 150 , + .description = gPumpkabooSuperPokedexText, + }, + // Gourgeist + [SPECIES_GOURGEIST_SMALL] = + { + .height = 7 , + .weight = 95 , + .description = gGourgeistSmallPokedexText, + }, + [SPECIES_GOURGEIST_LARGE] = + { + .height = 11 , + .weight = 140 , + .description = gGourgeistLargePokedexText, + }, + [SPECIES_GOURGEIST_SUPER] = + { + .height = 17 , + .weight = 390 , + .description = gGourgeistSuperPokedexText, + }, + // Zygarde + [SPECIES_ZYGARDE_10] = + { + .height = 12 , + .weight = 335 , + .description = gZygarde10PokedexText, + }, + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = + { + .height = 12 , + .weight = 335 , + .description = gZygarde10PowerConstructPokedexText, + }, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = + { + .height = 50 , + .weight = 3050 , + .description = gZygarde50PowerConstructPokedexText, + }, + [SPECIES_ZYGARDE_COMPLETE] = + { + .height = 45 , + .weight = 6100 , + .description = gZygardeCompletePokedexText, + }, + // Hoopa + [SPECIES_HOOPA_UNBOUND] = + { + .height = 65 , + .weight = 4900 , + .description = gHoopaUnboundPokedexText, + }, + // Oricorio + [SPECIES_ORICORIO_POM_POM] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_POM_POM)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_POM_POM)].weight, + .description = gOricorioPomPomPokedexText, + }, + [SPECIES_ORICORIO_PAU] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_PAU)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_PAU)].weight, + .description = gOricorioPauPokedexText, + }, + [SPECIES_ORICORIO_SENSU] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_SENSU)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_SENSU)].weight, + .description = gOricorioSensuPokedexText, + }, + // Rockruff + [SPECIES_ROCKRUFF_OWN_TEMPO] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROCKRUFF_OWN_TEMPO)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROCKRUFF_OWN_TEMPO)].weight, + .description = gRockruffOwnTempoPokedexText, + }, + // Lycanroc + [SPECIES_LYCANROC_MIDNIGHT] = + { + .height = 11 , + .weight = 250 , + .description = gLycanrocMidnightPokedexText, + }, + [SPECIES_LYCANROC_DUSK] = + { + .height = 8 , + .weight = 250 , + .description = gLycanrocDuskPokedexText, + }, + // Wishiwashi + [SPECIES_WISHIWASHI_SCHOOL] = + { + .height = 82 , + .weight = 786 , + .description = gWishiwashiSchoolPokedexText, + }, + // Silvally + [SPECIES_SILVALLY_FIGHTING] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIGHTING)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIGHTING)].weight, + .description = gSilvallyFightingPokedexText, + }, + [SPECIES_SILVALLY_FLYING] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FLYING)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FLYING)].weight, + .description = gSilvallyFlyingPokedexText, + }, + [SPECIES_SILVALLY_POISON] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_POISON)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_POISON)].weight, + .description = gSilvallyPoisonPokedexText, + }, + [SPECIES_SILVALLY_GROUND] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GROUND)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GROUND)].weight, + .description = gSilvallyGroundPokedexText, + }, + [SPECIES_SILVALLY_ROCK] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ROCK)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ROCK)].weight, + .description = gSilvallyRockPokedexText, + }, + [SPECIES_SILVALLY_BUG] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_BUG)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_BUG)].weight, + .description = gSilvallyBugPokedexText, + }, + [SPECIES_SILVALLY_GHOST] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GHOST)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GHOST)].weight, + .description = gSilvallyGhostPokedexText, + }, + [SPECIES_SILVALLY_STEEL] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_STEEL)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_STEEL)].weight, + .description = gSilvallySteelPokedexText, + }, + [SPECIES_SILVALLY_FIRE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIRE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIRE)].weight, + .description = gSilvallyFirePokedexText, + }, + [SPECIES_SILVALLY_WATER] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_WATER)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_WATER)].weight, + .description = gSilvallyWaterPokedexText, + }, + [SPECIES_SILVALLY_GRASS] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GRASS)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GRASS)].weight, + .description = gSilvallyGrassPokedexText, + }, + [SPECIES_SILVALLY_ELECTRIC] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ELECTRIC)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ELECTRIC)].weight, + .description = gSilvallyElectricPokedexText, + }, + [SPECIES_SILVALLY_PSYCHIC] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_PSYCHIC)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_PSYCHIC)].weight, + .description = gSilvallyPsychicPokedexText, + }, + [SPECIES_SILVALLY_ICE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ICE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ICE)].weight, + .description = gSilvallyIcePokedexText, + }, + [SPECIES_SILVALLY_DRAGON] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DRAGON)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DRAGON)].weight, + .description = gSilvallyDragonPokedexText, + }, + [SPECIES_SILVALLY_DARK] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DARK)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DARK)].weight, + .description = gSilvallyDarkPokedexText, + }, + [SPECIES_SILVALLY_FAIRY] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FAIRY)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FAIRY)].weight, + .description = gSilvallyFairyPokedexText, + }, + // Minior + [SPECIES_MINIOR_METEOR_ORANGE] = + { + .height = 3 , + .weight = 400 , + .description = gMiniorMeteorOrangePokedexText, + }, + [SPECIES_MINIOR_METEOR_YELLOW] = + { + .height = 3 , + .weight = 400 , + .description = gMiniorMeteorYellowPokedexText, + }, + [SPECIES_MINIOR_METEOR_GREEN] = + { + .height = 3 , + .weight = 400 , + .description = gMiniorMeteorGreenPokedexText, + }, + [SPECIES_MINIOR_METEOR_BLUE] = + { + .height = 3 , + .weight = 400 , + .description = gMiniorMeteorBluePokedexText, + }, + [SPECIES_MINIOR_METEOR_INDIGO] = + { + .height = 3 , + .weight = 400 , + .description = gMiniorMeteorIndigoPokedexText, + }, + [SPECIES_MINIOR_METEOR_VIOLET] = + { + .height = 3 , + .weight = 400 , + .description = gMiniorMeteorVioletPokedexText, + }, + [SPECIES_MINIOR_CORE_RED] = + { + .height = 3 , + .weight = 3 , + .description = gMiniorCoreRedPokedexText, + }, + [SPECIES_MINIOR_CORE_ORANGE] = + { + .height = 3 , + .weight = 3 , + .description = gMiniorCoreOrangePokedexText, + }, + [SPECIES_MINIOR_CORE_YELLOW] = + { + .height = 3 , + .weight = 3 , + .description = gMiniorCoreYellowPokedexText, + }, + [SPECIES_MINIOR_CORE_GREEN] = + { + .height = 3 , + .weight = 3 , + .description = gMiniorCoreGreenPokedexText, + }, + [SPECIES_MINIOR_CORE_BLUE] = + { + .height = 3 , + .weight = 3 , + .description = gMiniorCoreBluePokedexText, + }, + [SPECIES_MINIOR_CORE_INDIGO] = + { + .height = 3 , + .weight = 3 , + .description = gMiniorCoreIndigoPokedexText, + }, + [SPECIES_MINIOR_CORE_VIOLET] = + { + .height = 3 , + .weight = 3 , + .description = gMiniorCoreVioletPokedexText, + }, + // Mimikyu + [SPECIES_MIMIKYU_BUSTED] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MIMIKYU_BUSTED)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MIMIKYU_BUSTED)].weight, + .description = gMimikyuBustedPokedexText, + }, + // Necrozma + [SPECIES_NECROZMA_DUSK_MANE] = + { + .height = 38 , + .weight = 4600 , + .description = gNecrozmaDuskManePokedexText, + }, + [SPECIES_NECROZMA_DAWN_WINGS] = + { + .height = 42 , + .weight = 3500 , + .description = gNecrozmaDawnWingsPokedexText, + }, + [SPECIES_NECROZMA_ULTRA] = + { + .height = 75 , + .weight = 2300 , + .description = gNecrozmaUltraPokedexText, + }, + // Magearna + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MAGEARNA_ORIGINAL_COLOR)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MAGEARNA_ORIGINAL_COLOR)].weight, + .description = gMagearnaOriginalColorPokedexText, + }, + // Cramorant + [SPECIES_CRAMORANT_GULPING] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GULPING)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GULPING)].weight, + .description = gCramorantGulpingPokedexText, + }, + [SPECIES_CRAMORANT_GORGING] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GORGING)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GORGING)].weight, + .description = gCramorantGorgingPokedexText, + }, + // Toxtricity + [SPECIES_TOXTRICITY_LOW_KEY] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_TOXTRICITY_LOW_KEY)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_TOXTRICITY_LOW_KEY)].weight, + .description = gToxtricityLowKeyPokedexText, + }, + // Sinistea + [SPECIES_SINISTEA_ANTIQUE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SINISTEA_ANTIQUE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SINISTEA_ANTIQUE)].weight, + .description = gSinisteaAntiquePokedexText, + }, + // Polteageist + [SPECIES_POLTEAGEIST_ANTIQUE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_POLTEAGEIST_ANTIQUE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_POLTEAGEIST_ANTIQUE)].weight, + .description = gPolteageistAntiquePokedexText, + }, + // Alcremie + [SPECIES_ALCREMIE_RUBY_CREAM] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_CREAM)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_CREAM)].weight, + .description = gAlcremieRubyCreamPokedexText, + }, + [SPECIES_ALCREMIE_MATCHA_CREAM] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MATCHA_CREAM)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MATCHA_CREAM)].weight, + .description = gAlcremieMatchaCreamPokedexText, + }, + [SPECIES_ALCREMIE_MINT_CREAM] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MINT_CREAM)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MINT_CREAM)].weight, + .description = gAlcremieMintCreamPokedexText, + }, + [SPECIES_ALCREMIE_LEMON_CREAM] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_LEMON_CREAM)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_LEMON_CREAM)].weight, + .description = gAlcremieLemonCreamPokedexText, + }, + [SPECIES_ALCREMIE_SALTED_CREAM] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_SALTED_CREAM)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_SALTED_CREAM)].weight, + .description = gAlcremieSaltedCreamPokedexText, + }, + [SPECIES_ALCREMIE_RUBY_SWIRL] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_SWIRL)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_SWIRL)].weight, + .description = gAlcremieRubySwirlPokedexText, + }, + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_CARAMEL_SWIRL)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_CARAMEL_SWIRL)].weight, + .description = gAlcremieCaramelSwirlPokedexText, + }, + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RAINBOW_SWIRL)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RAINBOW_SWIRL)].weight, + .description = gAlcremieRainbowSwirlPokedexText, + }, + // Eiscue + [SPECIES_EISCUE_NOICE_FACE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_EISCUE_NOICE_FACE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_EISCUE_NOICE_FACE)].weight, + .description = gEiscueNoiceFacePokedexText, + }, + // Indeedee + [SPECIES_INDEEDEE_FEMALE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_INDEEDEE_FEMALE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_INDEEDEE_FEMALE)].weight, + .description = gIndeedeeFemalePokedexText, + }, + // Morpeko + [SPECIES_MORPEKO_HANGRY] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MORPEKO_HANGRY)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MORPEKO_HANGRY)].weight, + .description = gMorpekoHangryPokedexText, + }, + // Zacian + [SPECIES_ZACIAN_CROWNED_SWORD] = + { + .height = 28 , + .weight = 3550 , + .description = gZacianCrownedSwordPokedexText, + }, + // Zamazenta + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = + { + .height = 29 , + .weight = 7850 , + .description = gZamazentaCrownedShieldPokedexText, + }, + // Eternatus + [SPECIES_ETERNATUS_ETERNAMAX] = + { + .height = 100 , + .weight = 10000 , + .description = gEternatusEternamaxPokedexText, + }, + // Urshifu + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_URSHIFU_RAPID_STRIKE_STYLE)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_URSHIFU_RAPID_STRIKE_STYLE)].weight, + .description = gUrshifuRapidStrikeStylePokedexText, + }, + // Zarude + [SPECIES_ZARUDE_DADA] = + { + .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ZARUDE_DADA)].height, + .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ZARUDE_DADA)].weight, + .description = gZarudeDadaPokedexText, + }, + // Calyrex + [SPECIES_CALYREX_ICE_RIDER] = + { + .height = 24 , + .weight = 8091 , + .description = gCalyrexIceRiderPokedexText, + }, + [SPECIES_CALYREX_SHADOW_RIDER] = + { + .height = 24 , + .weight = 536 , + .description = gCalyrexShadowRiderPokedexText, + }, +}; + +const bool8 PokedexEntryFormSkip[NUM_SPECIES] = +{ + + // Cosplay Pikachu + [SPECIES_PIKACHU_COSPLAY] = TRUE, + [SPECIES_PIKACHU_ROCK_STAR] = TRUE, + [SPECIES_PIKACHU_BELLE] = TRUE, + [SPECIES_PIKACHU_POP_STAR ] = TRUE, + [SPECIES_PIKACHU_PH_D] = TRUE, + [SPECIES_PIKACHU_LIBRE] = TRUE, + // Pichu + [SPECIES_PICHU_SPIKY_EARED] = TRUE, + // Unown + [SPECIES_UNOWN_B] = TRUE, + [SPECIES_UNOWN_C] = TRUE, + [SPECIES_UNOWN_D] = TRUE, + [SPECIES_UNOWN_E] = TRUE, + [SPECIES_UNOWN_F] = TRUE, + [SPECIES_UNOWN_G] = TRUE, + [SPECIES_UNOWN_H] = TRUE, + [SPECIES_UNOWN_I] = TRUE, + [SPECIES_UNOWN_J] = TRUE, + [SPECIES_UNOWN_K] = TRUE, + [SPECIES_UNOWN_L] = TRUE, + [SPECIES_UNOWN_M] = TRUE, + [SPECIES_UNOWN_N] = TRUE, + [SPECIES_UNOWN_O] = TRUE, + [SPECIES_UNOWN_P] = TRUE, + [SPECIES_UNOWN_Q] = TRUE, + [SPECIES_UNOWN_R] = TRUE, + [SPECIES_UNOWN_S] = TRUE, + [SPECIES_UNOWN_T] = TRUE, + [SPECIES_UNOWN_U] = TRUE, + [SPECIES_UNOWN_V] = TRUE, + [SPECIES_UNOWN_W] = TRUE, + [SPECIES_UNOWN_X] = TRUE, + [SPECIES_UNOWN_Y] = TRUE, + [SPECIES_UNOWN_Z] = TRUE, + [SPECIES_UNOWN_EMARK] = TRUE, + [SPECIES_UNOWN_QMARK] = TRUE, + // Deoxys + [SPECIES_DEOXYS_ATTACK] = TRUE, + [SPECIES_DEOXYS_DEFENSE] = TRUE, + [SPECIES_DEOXYS_SPEED] = TRUE, + // Burmy + [SPECIES_BURMY_SANDY_CLOAK] = TRUE, + [SPECIES_BURMY_TRASH_CLOAK] = TRUE, + // Wormadam + [SPECIES_WORMADAM_SANDY_CLOAK] = TRUE, + [SPECIES_WORMADAM_TRASH_CLOAK] = TRUE, + // Arceus + [SPECIES_ARCEUS_FIGHTING] = TRUE, + [SPECIES_ARCEUS_FLYING] = TRUE, + [SPECIES_ARCEUS_POISON] = TRUE, + [SPECIES_ARCEUS_GROUND] = TRUE, + [SPECIES_ARCEUS_ROCK] = TRUE, + [SPECIES_ARCEUS_BUG] = TRUE, + [SPECIES_ARCEUS_GHOST] = TRUE, + [SPECIES_ARCEUS_STEEL] = TRUE, + [SPECIES_ARCEUS_FIRE] = TRUE, + [SPECIES_ARCEUS_WATER] = TRUE, + [SPECIES_ARCEUS_GRASS] = TRUE, + [SPECIES_ARCEUS_ELECTRIC] = TRUE, + [SPECIES_ARCEUS_PSYCHIC] = TRUE, + [SPECIES_ARCEUS_ICE] = TRUE, + [SPECIES_ARCEUS_DRAGON] = TRUE, + [SPECIES_ARCEUS_DARK] = TRUE, + [SPECIES_ARCEUS_FAIRY] = TRUE, + // Deerling + [SPECIES_DEERLING_SUMMER] = TRUE, + [SPECIES_DEERLING_AUTUMN] = TRUE, + [SPECIES_DEERLING_WINTER] = TRUE, + // Sawsbuck + [SPECIES_SAWSBUCK_SUMMER] = TRUE, + [SPECIES_SAWSBUCK_AUTUMN] = TRUE, + [SPECIES_SAWSBUCK_WINTER] = TRUE, + // Meloetta + [SPECIES_MELOETTA_PIROUETTE] = TRUE, + // Genesect + [SPECIES_GENESECT_DOUSE_DRIVE] = TRUE, + [SPECIES_GENESECT_SHOCK_DRIVE] = TRUE, + [SPECIES_GENESECT_BURN_DRIVE] = TRUE, + [SPECIES_GENESECT_CHILL_DRIVE] = TRUE, + // Greninja + [SPECIES_GRENINJA_BATTLE_BOND] = TRUE, + [SPECIES_GRENINJA_ASH] = TRUE, + // Vivillon + [SPECIES_VIVILLON_POLAR] = TRUE, + [SPECIES_VIVILLON_TUNDRA] = TRUE, + [SPECIES_VIVILLON_CONTINENTAL] = TRUE, + [SPECIES_VIVILLON_GARDEN] = TRUE, + [SPECIES_VIVILLON_ELEGANT] = TRUE, + [SPECIES_VIVILLON_MEADOW] = TRUE, + [SPECIES_VIVILLON_MODERN] = TRUE, + [SPECIES_VIVILLON_MARINE] = TRUE, + [SPECIES_VIVILLON_ARCHIPELAGO] = TRUE, + [SPECIES_VIVILLON_HIGH_PLAINS] = TRUE, + [SPECIES_VIVILLON_SANDSTORM] = TRUE, + [SPECIES_VIVILLON_RIVER] = TRUE, + [SPECIES_VIVILLON_MONSOON] = TRUE, + [SPECIES_VIVILLON_SAVANNA] = TRUE, + [SPECIES_VIVILLON_SUN] = TRUE, + [SPECIES_VIVILLON_OCEAN] = TRUE, + [SPECIES_VIVILLON_JUNGLE] = TRUE, + [SPECIES_VIVILLON_FANCY] = TRUE, + [SPECIES_VIVILLON_POKE_BALL] = TRUE, + // Flabébé + [SPECIES_FLABEBE_YELLOW_FLOWER] = TRUE, + [SPECIES_FLABEBE_ORANGE_FLOWER] = TRUE, + [SPECIES_FLABEBE_BLUE_FLOWER] = TRUE, + [SPECIES_FLABEBE_WHITE_FLOWER] = TRUE, + // Floette + [SPECIES_FLOETTE_YELLOW_FLOWER] = TRUE, + [SPECIES_FLOETTE_ORANGE_FLOWER] = TRUE, + [SPECIES_FLOETTE_BLUE_FLOWER] = TRUE, + [SPECIES_FLOETTE_WHITE_FLOWER] = TRUE, + [SPECIES_FLOETTE_ETERNAL_FLOWER] = TRUE, + // Florges + [SPECIES_FLORGES_YELLOW_FLOWER] = TRUE, + [SPECIES_FLORGES_ORANGE_FLOWER] = TRUE, + [SPECIES_FLORGES_BLUE_FLOWER] = TRUE, + [SPECIES_FLORGES_WHITE_FLOWER] = TRUE, + // Furfrou + [SPECIES_FURFROU_HEART_TRIM] = TRUE, + [SPECIES_FURFROU_STAR_TRIM] = TRUE, + [SPECIES_FURFROU_DIAMOND_TRIM] = TRUE, + [SPECIES_FURFROU_DEBUTANTE_TRIM] = TRUE, + [SPECIES_FURFROU_MATRON_TRIM] = TRUE, + [SPECIES_FURFROU_DANDY_TRIM] = TRUE, + [SPECIES_FURFROU_LA_REINE_TRIM] = TRUE, + [SPECIES_FURFROU_KABUKI_TRIM] = TRUE, + [SPECIES_FURFROU_PHARAOH_TRIM] = TRUE, + // Xerneas + [SPECIES_XERNEAS_ACTIVE] = TRUE, }; diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 6a4de0a79a..b955d58ff7 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5446,13 +5446,6 @@ const u8 gYamaskGalarianPokedexText[] = _(""); const u8 gStunfiskGalarianPokedexText[] = _(""); // Misc forms -// Cosplay pikachu -const u8 gPikachuCosplayPokedexText[] = _(""); -const u8 gPikachuRockStarPokedexText[] = _(""); -const u8 gPikachuBellePokedexText[] = _(""); -const u8 gPikachuPopStarPokedexText[] = _(""); -const u8 gPikachuPhdPokedexText[] = _(""); -const u8 gPikachuLibrePokedexText[] = _(""); // Cap pikachu const u8 gPikachuOriginalCapPokedexText[] = _(""); const u8 gPikachuHoennCapPokedexText[] = _(""); @@ -5462,3 +5455,145 @@ const u8 gPikachuKalosCapPokedexText[] = _(""); const u8 gPikachuAlolaCapPokedexText[] = _(""); const u8 gPikachuPartnerCapPokedexText[] = _(""); const u8 gPikachuWorldCapPokedexText[] = _(""); + +// Castform +const u8 gCastformSunnyPokedexText[] = _(""); +const u8 gCastformRainyPokedexText[] = _(""); +const u8 gCastformSnowyPokedexText[] = _(""); +// Cherrim +const u8 gCherrimSunshinePokedexText[] = _(""); +// Shellos +const u8 gShellosEastSeaPokedexText[] = _(""); +// Gastrodon +const u8 gGastrodonEastSeaPokedexText[] = _(""); +// Rotom +const u8 gRotomHeatPokedexText[] = _(""); +const u8 gRotomWashPokedexText[] = _(""); +const u8 gRotomFrostPokedexText[] = _(""); +const u8 gRotomFanPokedexText[] = _(""); +const u8 gRotomMowPokedexText[] = _(""); +// Giratina +const u8 gGiratinaOriginPokedexText[] = _(""); +// Shaymin +const u8 gShayminSkyPokedexText[] = _(""); +// Basculin +const u8 gBasculinBlueStripedPokedexText[] = _(""); +// Darmanitan +const u8 gDarmanitanZenModePokedexText[] = _(""); +const u8 gDarmanitanZenModeGalarianPokedexText[] = _(""); +// Therian Forms +const u8 gTornadusTherianPokedexText[] = _(""); +const u8 gThundurusTherianPokedexText[] = _(""); +const u8 gLandorusTherianPokedexText[] = _(""); +// Kyurem +const u8 gKyuremWhitePokedexText[] = _(""); +const u8 gKyuremBlackPokedexText[] = _(""); +// Keldeo +const u8 gKeldeoResolutePokedexText[] = _(""); +// Meowstic +const u8 gMeowsticFemalePokedexText[] = _(""); +// Aegislash +const u8 gAegislashBladePokedexText[] = _(""); +// Pumpkaboo +const u8 gPumpkabooSmallPokedexText[] = _(""); +const u8 gPumpkabooLargePokedexText[] = _(""); +const u8 gPumpkabooSuperPokedexText[] = _(""); +// Gourgeist +const u8 gGourgeistSmallPokedexText[] = _(""); +const u8 gGourgeistLargePokedexText[] = _(""); +const u8 gGourgeistSuperPokedexText[] = _(""); +// Zygarde +const u8 gZygarde10PokedexText[] = _(""); +const u8 gZygarde10PowerConstructPokedexText[] = _(""); +const u8 gZygarde50PowerConstructPokedexText[] = _(""); +const u8 gZygardeCompletePokedexText[] = _(""); +// Hoopa +const u8 gHoopaUnboundPokedexText[] = _(""); +// Oricorio +const u8 gOricorioPomPomPokedexText[] = _(""); +const u8 gOricorioPauPokedexText[] = _(""); +const u8 gOricorioSensuPokedexText[] = _(""); +// Rockruff +const u8 gRockruffOwnTempoPokedexText[] = _(""); +// Lycanroc +const u8 gLycanrocMidnightPokedexText[] = _(""); +const u8 gLycanrocDuskPokedexText[] = _(""); +// Wishiwashi +const u8 gWishiwashiSchoolPokedexText[] = _(""); +// Silvally +const u8 gSilvallyFightinconstPokedexText[] = _(""); +const u8 gSilvallyFlyinconstPokedexText[] = _(""); +const u8 gSilvallyPoisonPokedexText[] = _(""); +const u8 gSilvallyGroundPokedexText[] = _(""); +const u8 gSilvallyRockPokedexText[] = _(""); +const u8 gSilvallyBuconstPokedexText[] = _(""); +const u8 gSilvallyGhostPokedexText[] = _(""); +const u8 gSilvallySteelPokedexText[] = _(""); +const u8 gSilvallyFirePokedexText[] = _(""); +const u8 gSilvallyWaterPokedexText[] = _(""); +const u8 gSilvallyGrassPokedexText[] = _(""); +const u8 gSilvallyElectricPokedexText[] = _(""); +const u8 gSilvallyPsychicPokedexText[] = _(""); +const u8 gSilvallyIcePokedexText[] = _(""); +const u8 gSilvallyDragonPokedexText[] = _(""); +const u8 gSilvallyDarkPokedexText[] = _(""); +const u8 gSilvallyFairyPokedexText[] = _(""); +// Minior +const u8 gMiniorMeteorOrangePokedexText[] = _(""); +const u8 gMiniorMeteorYellowPokedexText[] = _(""); +const u8 gMiniorMeteorGreenPokedexText[] = _(""); +const u8 gMiniorMeteorBluePokedexText[] = _(""); +const u8 gMiniorMeteorIndigoPokedexText[] = _(""); +const u8 gMiniorMeteorVioletPokedexText[] = _(""); +const u8 gMiniorCoreRedPokedexText[] = _(""); +const u8 gMiniorCoreOrangePokedexText[] = _(""); +const u8 gMiniorCoreYellowPokedexText[] = _(""); +const u8 gMiniorCoreGreenPokedexText[] = _(""); +const u8 gMiniorCoreBluePokedexText[] = _(""); +const u8 gMiniorCoreIndigoPokedexText[] = _(""); +const u8 gMiniorCoreVioletPokedexText[] = _(""); +// Mimikyu +const u8 gMimikyuBustedPokedexText[] = _(""); +// Necrozma +const u8 gNecrozmaDuskManePokedexText[] = _(""); +const u8 gNecrozmaDawnWingsPokedexText[] = _(""); +const u8 gNecrozmaUltraPokedexText[] = _(""); +// Magearna +const u8 gMagearnaOriginalColorPokedexText[] = _(""); +// Cramorant +const u8 gCramorantGulpinconstPokedexText[] = _(""); +const u8 gCramorantGorginconstPokedexText[] = _(""); +// Toxtricity +const u8 gToxtricityLowKeyPokedexText[] = _(""); +// Sinistea +const u8 gSinisteaAntiquePokedexText[] = _(""); +// Polteageist +const u8 gPolteageistAntiquePokedexText[] = _(""); +// Alcremie +const u8 gAlcremieRubyCreamPokedexText[] = _(""); +const u8 gAlcremieMatchaCreamPokedexText[] = _(""); +const u8 gAlcremieMintCreamPokedexText[] = _(""); +const u8 gAlcremieLemonCreamPokedexText[] = _(""); +const u8 gAlcremieSaltedCreamPokedexText[] = _(""); +const u8 gAlcremieRubySwirlPokedexText[] = _(""); +const u8 gAlcremieCaramelSwirlPokedexText[] = _(""); +const u8 gAlcremieRainbowSwirlPokedexText[] = _(""); +// Eiscue +const u8 gEiscueNoiceFacePokedexText[] = _(""); +// Indeedee +const u8 gIndeedeeFemalePokedexText[] = _(""); +// Morpeko +const u8 gMorpekoHangryPokedexText[] = _(""); +// Zacian +const u8 gZacianCrownedSwordPokedexText[] = _(""); +// Zamazenta +const u8 gZamazentaCrownedShieldPokedexText[] = _(""); +// Eternatus +const u8 gEternatusEternamaxPokedexText[] = _(""); +// Urshifu +const u8 gUrshifuRapidStrikeStylePokedexText[] = _(""); +// Zarude +const u8 gZarudeDadaPokedexText[] = _(""); +// Calyrex +const u8 gCalyrexIceRiderPokedexText[] = _(""); +const u8 gCalyrexShadowRiderPokedexText[] = _(""); diff --git a/src/international_string_util.c b/src/international_string_util.c index aa07a134df..be8b598591 100644 --- a/src/international_string_util.c +++ b/src/international_string_util.c @@ -10,6 +10,7 @@ extern const struct PokedexEntry gPokedexEntries[]; extern const struct PokedexEntryForms gPokedexEntriesForms[]; +extern const bool8 PokedexEntryFormSkip[NUM_SPECIES]; int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth) { diff --git a/src/pokedex.c b/src/pokedex.c index adbbaa8e3d..ce694789ea 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4251,7 +4251,11 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data) u16 GetSpeciesHeightWeight(u16 species, u8 data) { - if (species >= SPECIES_VENUSAUR_MEGA && species <= SPECIES_STUNFISK_GALARIAN) // Todo: change after adding Megas, etc + if (PokedexEntryFormSkip[species]) + { + return GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), data); + } + else if (species >= SPECIES_VENUSAUR_MEGA && species < NUM_SPECIES) { switch (data) { @@ -4263,10 +4267,8 @@ u16 GetSpeciesHeightWeight(u16 species, u8 data) return 1; } } - else - { - return GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), data); - } + + return GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), data); } s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID) From 6b71cca378624b9673dbb4a178a58e006b81fcff Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Thu, 6 Jan 2022 15:22:38 +0100 Subject: [PATCH 06/13] fixed the data issue, set weight/height to 0 if same as base data --- src/data/pokemon/pokedex_entries.h | 280 ++++++++++++++--------------- src/data/pokemon/pokedex_text.h | 10 +- src/pokedex.c | 16 +- 3 files changed, 158 insertions(+), 148 deletions(-) diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index cf2e75b6d9..4d8cbb4823 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -11325,122 +11325,122 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Cap Pikachu [SPECIES_PIKACHU_ORIGINAL_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ORIGINAL_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ORIGINAL_CAP)].weight, - .description = PikachuOriginalCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuOriginalCapPokedexText, }, [SPECIES_PIKACHU_HOENN_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_HOENN_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_HOENN_CAP)].weight, - .description = PikachuHoennCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuHoennCapPokedexText, }, [SPECIES_PIKACHU_SINNOH_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_SINNOH_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_SINNOH_CAP)].weight, - .description = PikachuSinnohCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuSinnohCapPokedexText, }, [SPECIES_PIKACHU_UNOVA_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_UNOVA_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_UNOVA_CAP)].weight, - .description = PikachuUnovaCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuUnovaCapPokedexText, }, [SPECIES_PIKACHU_KALOS_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_KALOS_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_KALOS_CAP)].weight, - .description = PikachuKalosCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuKalosCapPokedexText, }, [SPECIES_PIKACHU_ALOLA_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ALOLA_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_ALOLA_CAP)].weight, - .description = PikachuAlolaCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuAlolaCapPokedexText, }, [SPECIES_PIKACHU_PARTNER_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_PARTNER_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_PARTNER_CAP)].weight, - .description = PikachuPartnerCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuPartnerCapPokedexText, }, [SPECIES_PIKACHU_WORLD_CAP] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_WORLD_CAP)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_PIKACHU_WORLD_CAP)].weight, - .description = PikachuWorldCapPokedexText, + .height = 0, + .weight = 0, + .description = gPikachuWorldCapPokedexText, }, // Castform [SPECIES_CASTFORM_SUNNY] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SUNNY)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SUNNY)].weight, + .height = 0, + .weight = 0, .description = gCastformSunnyPokedexText, }, [SPECIES_CASTFORM_RAINY] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_RAINY)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_RAINY)].weight, + .height = 0, + .weight = 0, .description = gCastformRainyPokedexText, }, [SPECIES_CASTFORM_SNOWY] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SNOWY)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CASTFORM_SNOWY)].weight, + .height = 0, + .weight = 0, .description = gCastformSnowyPokedexText, }, // Cherrim [SPECIES_CHERRIM_SUNSHINE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CHERRIM_SUNSHINE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CHERRIM_SUNSHINE)].weight, + .height = 0, + .weight = 0, .description = gCherrimSunshinePokedexText, }, // Shellos [SPECIES_SHELLOS_EAST_SEA] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SHELLOS_EAST_SEA)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SHELLOS_EAST_SEA)].weight, + .height = 0, + .weight = 0, .description = gShellosEastSeaPokedexText, }, // Gastrodon [SPECIES_GASTRODON_EAST_SEA] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_GASTRODON_EAST_SEA)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_GASTRODON_EAST_SEA)].weight, + .height = 0, + .weight = 0, .description = gGastrodonEastSeaPokedexText, }, // Rotom [SPECIES_ROTOM_HEAT] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_HEAT)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_HEAT)].weight, + .height = 0, + .weight = 0, .description = gRotomHeatPokedexText, }, [SPECIES_ROTOM_WASH] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_WASH)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_WASH)].weight, + .height = 0, + .weight = 0, .description = gRotomWashPokedexText, }, [SPECIES_ROTOM_FROST] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FROST)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FROST)].weight, + .height = 0, + .weight = 0, .description = gRotomFrostPokedexText, }, [SPECIES_ROTOM_FAN] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FAN)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_FAN)].weight, + .height = 0, + .weight = 0, .description = gRotomFanPokedexText, }, [SPECIES_ROTOM_MOW] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_MOW)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROTOM_MOW)].weight, + .height = 0, + .weight = 0, .description = gRotomMowPokedexText, }, // Giratina @@ -11460,21 +11460,21 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_BASCULIN_BLUE_STRIPED)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_BASCULIN_BLUE_STRIPED)].weight, + .height = 0, + .weight = 0, .description = gBasculinBlueStripedPokedexText, }, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE)].weight, + .height = 0, + .weight = 0, .description = gDarmanitanZenModePokedexText, }, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE_GALARIAN)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_DARMANITAN_ZEN_MODE_GALARIAN)].weight, + .height = 0, + .weight = 0, .description = gDarmanitanZenModeGalarianPokedexText, }, // Therian Forms @@ -11512,22 +11512,22 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Keldeo [SPECIES_KELDEO_RESOLUTE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_KELDEO_RESOLUTE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_KELDEO_RESOLUTE)].weight, + .height = 0, + .weight = 0, .description = gKeldeoResolutePokedexText, }, // Meowstic [SPECIES_MEOWSTIC_FEMALE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MEOWSTIC_FEMALE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MEOWSTIC_FEMALE)].weight, + .height = 0, + .weight = 0, .description = gMeowsticFemalePokedexText, }, // Aegislash [SPECIES_AEGISLASH_BLADE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_AEGISLASH_BLADE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_AEGISLASH_BLADE)].weight, + .height = 0, + .weight = 0, .description = gAegislashBladePokedexText, }, // Pumpkaboo @@ -11603,27 +11603,27 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Oricorio [SPECIES_ORICORIO_POM_POM] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_POM_POM)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_POM_POM)].weight, + .height = 0, + .weight = 0, .description = gOricorioPomPomPokedexText, }, [SPECIES_ORICORIO_PAU] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_PAU)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_PAU)].weight, + .height = 0, + .weight = 0, .description = gOricorioPauPokedexText, }, [SPECIES_ORICORIO_SENSU] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_SENSU)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ORICORIO_SENSU)].weight, + .height = 0, + .weight = 0, .description = gOricorioSensuPokedexText, }, // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROCKRUFF_OWN_TEMPO)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ROCKRUFF_OWN_TEMPO)].weight, + .height = 0, + .weight = 0, .description = gRockruffOwnTempoPokedexText, }, // Lycanroc @@ -11649,104 +11649,104 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Silvally [SPECIES_SILVALLY_FIGHTING] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIGHTING)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIGHTING)].weight, + .height = 0, + .weight = 0, .description = gSilvallyFightingPokedexText, }, [SPECIES_SILVALLY_FLYING] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FLYING)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FLYING)].weight, + .height = 0, + .weight = 0, .description = gSilvallyFlyingPokedexText, }, [SPECIES_SILVALLY_POISON] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_POISON)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_POISON)].weight, + .height = 0, + .weight = 0, .description = gSilvallyPoisonPokedexText, }, [SPECIES_SILVALLY_GROUND] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GROUND)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GROUND)].weight, + .height = 0, + .weight = 0, .description = gSilvallyGroundPokedexText, }, [SPECIES_SILVALLY_ROCK] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ROCK)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ROCK)].weight, + .height = 0, + .weight = 0, .description = gSilvallyRockPokedexText, }, [SPECIES_SILVALLY_BUG] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_BUG)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_BUG)].weight, + .height = 0, + .weight = 0, .description = gSilvallyBugPokedexText, }, [SPECIES_SILVALLY_GHOST] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GHOST)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GHOST)].weight, + .height = 0, + .weight = 0, .description = gSilvallyGhostPokedexText, }, [SPECIES_SILVALLY_STEEL] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_STEEL)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_STEEL)].weight, + .height = 0, + .weight = 0, .description = gSilvallySteelPokedexText, }, [SPECIES_SILVALLY_FIRE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIRE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FIRE)].weight, + .height = 0, + .weight = 0, .description = gSilvallyFirePokedexText, }, [SPECIES_SILVALLY_WATER] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_WATER)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_WATER)].weight, + .height = 0, + .weight = 0, .description = gSilvallyWaterPokedexText, }, [SPECIES_SILVALLY_GRASS] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GRASS)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_GRASS)].weight, + .height = 0, + .weight = 0, .description = gSilvallyGrassPokedexText, }, [SPECIES_SILVALLY_ELECTRIC] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ELECTRIC)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ELECTRIC)].weight, + .height = 0, + .weight = 0, .description = gSilvallyElectricPokedexText, }, [SPECIES_SILVALLY_PSYCHIC] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_PSYCHIC)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_PSYCHIC)].weight, + .height = 0, + .weight = 0, .description = gSilvallyPsychicPokedexText, }, [SPECIES_SILVALLY_ICE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ICE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_ICE)].weight, + .height = 0, + .weight = 0, .description = gSilvallyIcePokedexText, }, [SPECIES_SILVALLY_DRAGON] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DRAGON)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DRAGON)].weight, + .height = 0, + .weight = 0, .description = gSilvallyDragonPokedexText, }, [SPECIES_SILVALLY_DARK] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DARK)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_DARK)].weight, + .height = 0, + .weight = 0, .description = gSilvallyDarkPokedexText, }, [SPECIES_SILVALLY_FAIRY] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FAIRY)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SILVALLY_FAIRY)].weight, + .height = 0, + .weight = 0, .description = gSilvallyFairyPokedexText, }, // Minior @@ -11831,8 +11831,8 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Mimikyu [SPECIES_MIMIKYU_BUSTED] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MIMIKYU_BUSTED)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MIMIKYU_BUSTED)].weight, + .height = 0, + .weight = 0, .description = gMimikyuBustedPokedexText, }, // Necrozma @@ -11857,112 +11857,112 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MAGEARNA_ORIGINAL_COLOR)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MAGEARNA_ORIGINAL_COLOR)].weight, + .height = 0, + .weight = 0, .description = gMagearnaOriginalColorPokedexText, }, // Cramorant [SPECIES_CRAMORANT_GULPING] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GULPING)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GULPING)].weight, + .height = 0, + .weight = 0, .description = gCramorantGulpingPokedexText, }, [SPECIES_CRAMORANT_GORGING] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GORGING)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_CRAMORANT_GORGING)].weight, + .height = 0, + .weight = 0, .description = gCramorantGorgingPokedexText, }, // Toxtricity [SPECIES_TOXTRICITY_LOW_KEY] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_TOXTRICITY_LOW_KEY)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_TOXTRICITY_LOW_KEY)].weight, + .height = 0, + .weight = 0, .description = gToxtricityLowKeyPokedexText, }, // Sinistea [SPECIES_SINISTEA_ANTIQUE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SINISTEA_ANTIQUE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_SINISTEA_ANTIQUE)].weight, + .height = 0, + .weight = 0, .description = gSinisteaAntiquePokedexText, }, // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_POLTEAGEIST_ANTIQUE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_POLTEAGEIST_ANTIQUE)].weight, + .height = 0, + .weight = 0, .description = gPolteageistAntiquePokedexText, }, // Alcremie [SPECIES_ALCREMIE_RUBY_CREAM] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_CREAM)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_CREAM)].weight, + .height = 0, + .weight = 0, .description = gAlcremieRubyCreamPokedexText, }, [SPECIES_ALCREMIE_MATCHA_CREAM] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MATCHA_CREAM)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MATCHA_CREAM)].weight, + .height = 0, + .weight = 0, .description = gAlcremieMatchaCreamPokedexText, }, [SPECIES_ALCREMIE_MINT_CREAM] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MINT_CREAM)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_MINT_CREAM)].weight, + .height = 0, + .weight = 0, .description = gAlcremieMintCreamPokedexText, }, [SPECIES_ALCREMIE_LEMON_CREAM] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_LEMON_CREAM)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_LEMON_CREAM)].weight, + .height = 0, + .weight = 0, .description = gAlcremieLemonCreamPokedexText, }, [SPECIES_ALCREMIE_SALTED_CREAM] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_SALTED_CREAM)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_SALTED_CREAM)].weight, + .height = 0, + .weight = 0, .description = gAlcremieSaltedCreamPokedexText, }, [SPECIES_ALCREMIE_RUBY_SWIRL] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_SWIRL)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RUBY_SWIRL)].weight, + .height = 0, + .weight = 0, .description = gAlcremieRubySwirlPokedexText, }, [SPECIES_ALCREMIE_CARAMEL_SWIRL] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_CARAMEL_SWIRL)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_CARAMEL_SWIRL)].weight, + .height = 0, + .weight = 0, .description = gAlcremieCaramelSwirlPokedexText, }, [SPECIES_ALCREMIE_RAINBOW_SWIRL] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RAINBOW_SWIRL)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ALCREMIE_RAINBOW_SWIRL)].weight, + .height = 0, + .weight = 0, .description = gAlcremieRainbowSwirlPokedexText, }, // Eiscue [SPECIES_EISCUE_NOICE_FACE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_EISCUE_NOICE_FACE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_EISCUE_NOICE_FACE)].weight, + .height = 0, + .weight = 0, .description = gEiscueNoiceFacePokedexText, }, // Indeedee [SPECIES_INDEEDEE_FEMALE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_INDEEDEE_FEMALE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_INDEEDEE_FEMALE)].weight, + .height = 0, + .weight = 0, .description = gIndeedeeFemalePokedexText, }, // Morpeko [SPECIES_MORPEKO_HANGRY] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MORPEKO_HANGRY)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_MORPEKO_HANGRY)].weight, + .height = 0, + .weight = 0, .description = gMorpekoHangryPokedexText, }, // Zacian @@ -11989,15 +11989,15 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = // Urshifu [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_URSHIFU_RAPID_STRIKE_STYLE)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_URSHIFU_RAPID_STRIKE_STYLE)].weight, + .height = 0, + .weight = 0, .description = gUrshifuRapidStrikeStylePokedexText, }, // Zarude [SPECIES_ZARUDE_DADA] = { - .height = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ZARUDE_DADA)].height, - .weight = gPokedexEntries[SpeciesToNationalPokedexNum(SPECIES_ZARUDE_DADA)].weight, + .height = 0, + .weight = 0, .description = gZarudeDadaPokedexText, }, // Calyrex diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index b955d58ff7..2f1cb3a30e 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5521,12 +5521,12 @@ const u8 gLycanrocDuskPokedexText[] = _(""); // Wishiwashi const u8 gWishiwashiSchoolPokedexText[] = _(""); // Silvally -const u8 gSilvallyFightinconstPokedexText[] = _(""); -const u8 gSilvallyFlyinconstPokedexText[] = _(""); +const u8 gSilvallyFightingPokedexText[] = _(""); +const u8 gSilvallyFlyingPokedexText[] = _(""); const u8 gSilvallyPoisonPokedexText[] = _(""); const u8 gSilvallyGroundPokedexText[] = _(""); const u8 gSilvallyRockPokedexText[] = _(""); -const u8 gSilvallyBuconstPokedexText[] = _(""); +const u8 gSilvallyBugPokedexText[] = _(""); const u8 gSilvallyGhostPokedexText[] = _(""); const u8 gSilvallySteelPokedexText[] = _(""); const u8 gSilvallyFirePokedexText[] = _(""); @@ -5561,8 +5561,8 @@ const u8 gNecrozmaUltraPokedexText[] = _(""); // Magearna const u8 gMagearnaOriginalColorPokedexText[] = _(""); // Cramorant -const u8 gCramorantGulpinconstPokedexText[] = _(""); -const u8 gCramorantGorginconstPokedexText[] = _(""); +const u8 gCramorantGulpingPokedexText[] = _(""); +const u8 gCramorantGorgingPokedexText[] = _(""); // Toxtricity const u8 gToxtricityLowKeyPokedexText[] = _(""); // Sinistea diff --git a/src/pokedex.c b/src/pokedex.c index ce694789ea..74549e39e4 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4255,14 +4255,24 @@ u16 GetSpeciesHeightWeight(u16 species, u8 data) { return GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), data); } - else if (species >= SPECIES_VENUSAUR_MEGA && species < NUM_SPECIES) + else if (species >= (FORMS_START + 1) && species < NUM_SPECIES) { + // if 0 is returned, use base form data + u16 weight, height; switch (data) { case 0: // height - return gPokedexEntriesForms[species].height; + height = gPokedexEntriesForms[species].height; + if (height > 0) + { + return height; + } case 1: // weight - return gPokedexEntriesForms[species].weight; + weight = gPokedexEntriesForms[species].weight; + if (weight > 0) + { + return weight; + } default: return 1; } From 3b359dba4e2671e26376e97117403336737ea11b Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Thu, 6 Jan 2022 15:24:12 +0100 Subject: [PATCH 07/13] added comment --- src/data/pokemon/pokedex_entries.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 4d8cbb4823..74f21e7218 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10790,7 +10790,7 @@ const struct PokedexEntry gPokedexEntries[] = }; -const struct PokedexEntryForms gPokedexEntriesForms[] = +const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms with the height/weight same height as the base form { // Mega Forms [SPECIES_VENUSAUR_MEGA] = From 9a54c64b032b3f8114fdf1b47f8465568c8e3b9a Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Thu, 6 Jan 2022 16:38:12 +0100 Subject: [PATCH 08/13] added categories for all entries, only changed ones filled, same entries as `_("")` --- include/pokedex.h | 1 + src/data/pokemon/pokedex_entries.h | 1334 ++++++++++++++++------------ 2 files changed, 765 insertions(+), 570 deletions(-) diff --git a/include/pokedex.h b/include/pokedex.h index 5d8e28e42d..c334ef702f 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -37,6 +37,7 @@ struct PokedexEntry struct PokedexEntryForms { + u8 categoryName[13]; u16 height; //in decimeters u16 weight; //in hectograms const u8 *description; diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 74f21e7218..12c91d8b8d 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10792,1226 +10792,1420 @@ const struct PokedexEntry gPokedexEntries[] = const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms with the height/weight same height as the base form { - // Mega Forms - [SPECIES_VENUSAUR_MEGA] = + // Megas + [SPECIES_VENUSAUR_MEGA] = { + .categoryName = _(""), .height = 24, .weight = 1555, .description = gVenusaurMegaPokedexText, }, - [SPECIES_CHARIZARD_MEGA_X] = + [SPECIES_CHARIZARD_MEGA_X] = { + .categoryName = _(""), .height = 17, .weight = 1105, .description = gCharizardMegaXPokedexText, }, - [SPECIES_CHARIZARD_MEGA_Y] = + [SPECIES_CHARIZARD_MEGA_Y] = { + .categoryName = _(""), .height = 17, .weight = 1005, .description = gCharizardMegaYPokedexText, }, - [SPECIES_BLASTOISE_MEGA] = + [SPECIES_BLASTOISE_MEGA] = { + .categoryName = _(""), .height = 16, .weight = 1011, .description = gBlastoiseMegaPokedexText, }, - [SPECIES_BEEDRILL_MEGA] = + [SPECIES_BEEDRILL_MEGA] = { + .categoryName = _(""), .height = 14, .weight = 405, .description = gBeedrillMegaPokedexText, }, - [SPECIES_PIDGEOT_MEGA] = + [SPECIES_PIDGEOT_MEGA] = { + .categoryName = _(""), .height = 22, .weight = 505, .description = gPidgeotMegaPokedexText, }, - [SPECIES_ALAKAZAM_MEGA] = + [SPECIES_ALAKAZAM_MEGA] = { + .categoryName = _(""), .height = 12, .weight = 480, .description = gAlakazamMegaPokedexText, }, - [SPECIES_SLOWBRO_MEGA] = + [SPECIES_SLOWBRO_MEGA] = { + .categoryName = _(""), .height = 20, .weight = 1200, .description = gSlowbroMegaPokedexText, }, - [SPECIES_GENGAR_MEGA] = + [SPECIES_GENGAR_MEGA] = { + .categoryName = _(""), .height = 14, .weight = 405, .description = gGengarMegaPokedexText, }, - [SPECIES_KANGASKHAN_MEGA] = + [SPECIES_KANGASKHAN_MEGA] = { + .categoryName = _(""), .height = 22, .weight = 1000, .description = gKangaskhanMegaPokedexText, }, - [SPECIES_PINSIR_MEGA] = + [SPECIES_PINSIR_MEGA] = { + .categoryName = _(""), .height = 17, .weight = 590, .description = gPinsirMegaPokedexText, }, - [SPECIES_GYARADOS_MEGA] = + [SPECIES_GYARADOS_MEGA] = { + .categoryName = _(""), .height = 65, .weight = 3050, .description = gGyaradosMegaPokedexText, }, - [SPECIES_AERODACTYL_MEGA] = + [SPECIES_AERODACTYL_MEGA] = { + .categoryName = _(""), .height = 21, .weight = 790, .description = gAerodactylMegaPokedexText, }, - [SPECIES_MEWTWO_MEGA_X] = + [SPECIES_MEWTWO_MEGA_X] = { + .categoryName = _(""), .height = 23, .weight = 1270, .description = gMewtwoMegaXPokedexText, }, - [SPECIES_MEWTWO_MEGA_Y] = + [SPECIES_MEWTWO_MEGA_Y] = { + .categoryName = _(""), .height = 15, .weight = 330, .description = gMewtwoMegaYPokedexText, }, - [SPECIES_AMPHAROS_MEGA] = + [SPECIES_AMPHAROS_MEGA] = { + .categoryName = _(""), .height = 14, .weight = 615, .description = gAmpharosMegaPokedexText, }, - [SPECIES_STEELIX_MEGA] = + [SPECIES_STEELIX_MEGA] = { + .categoryName = _(""), .height = 105, .weight = 7400, .description = gSteelixMegaPokedexText, }, - [SPECIES_SCIZOR_MEGA] = + [SPECIES_SCIZOR_MEGA] = { + .categoryName = _(""), .height = 20, .weight = 1250, .description = gScizorMegaPokedexText, }, - [SPECIES_HERACROSS_MEGA] = + [SPECIES_HERACROSS_MEGA] = { + .categoryName = _(""), .height = 17, .weight = 625, .description = gHeracrossMegaPokedexText, }, - [SPECIES_HOUNDOOM_MEGA] = + [SPECIES_HOUNDOOM_MEGA] = { + .categoryName = _(""), .height = 19, .weight = 495, .description = gHoundoomMegaPokedexText, }, - [SPECIES_TYRANITAR_MEGA] = + [SPECIES_TYRANITAR_MEGA] = { + .categoryName = _(""), .height = 25, .weight = 2550, .description = gTyranitarMegaPokedexText, }, - [SPECIES_SCEPTILE_MEGA] = + [SPECIES_SCEPTILE_MEGA] = { + .categoryName = _(""), .height = 19, .weight = 552, .description = gSceptileMegaPokedexText, }, - [SPECIES_BLAZIKEN_MEGA] = + [SPECIES_BLAZIKEN_MEGA] = { + .categoryName = _(""), .height = 19, .weight = 520, .description = gBlazikenMegaPokedexText, }, - [SPECIES_SWAMPERT_MEGA] = + [SPECIES_SWAMPERT_MEGA] = { + .categoryName = _(""), .height = 19, .weight = 1020, .description = gSwampertMegaPokedexText, }, - [SPECIES_GARDEVOIR_MEGA] = + [SPECIES_GARDEVOIR_MEGA] = { + .categoryName = _(""), .height = 16, .weight = 484, .description = gGardevoirMegaPokedexText, }, - [SPECIES_SABLEYE_MEGA] = + [SPECIES_SABLEYE_MEGA] = { + .categoryName = _(""), .height = 5, .weight = 1610, .description = gSableyeMegaPokedexText, }, - [SPECIES_MAWILE_MEGA] = + [SPECIES_MAWILE_MEGA] = { + .categoryName = _(""), .height = 10, .weight = 235, .description = gMawileMegaPokedexText, }, - [SPECIES_AGGRON_MEGA] = + [SPECIES_AGGRON_MEGA] = { + .categoryName = _(""), .height = 22, .weight = 3950, .description = gAggronMegaPokedexText, }, - [SPECIES_MEDICHAM_MEGA] = + [SPECIES_MEDICHAM_MEGA] = { + .categoryName = _(""), .height = 13, .weight = 315, .description = gMedichamMegaPokedexText, }, - [SPECIES_MANECTRIC_MEGA] = + [SPECIES_MANECTRIC_MEGA] = { + .categoryName = _(""), .height = 18, .weight = 440, .description = gManectricMegaPokedexText, }, - [SPECIES_SHARPEDO_MEGA] = + [SPECIES_SHARPEDO_MEGA] = { + .categoryName = _(""), .height = 25, .weight = 1303, .description = gSharpedoMegaPokedexText, }, - [SPECIES_CAMERUPT_MEGA] = + [SPECIES_CAMERUPT_MEGA] = { + .categoryName = _(""), .height = 25, .weight = 3205, .description = gCameruptMegaPokedexText, }, - [SPECIES_ALTARIA_MEGA] = + [SPECIES_ALTARIA_MEGA] = { + .categoryName = _(""), .height = 15, .weight = 206, .description = gAltariaMegaPokedexText, }, - [SPECIES_BANETTE_MEGA] = + [SPECIES_BANETTE_MEGA] = { + .categoryName = _(""), .height = 12, .weight = 130, .description = gBanetteMegaPokedexText, }, - [SPECIES_ABSOL_MEGA] = + [SPECIES_ABSOL_MEGA] = { + .categoryName = _(""), .height = 12, .weight = 490, .description = gAbsolMegaPokedexText, }, - [SPECIES_GLALIE_MEGA] = + [SPECIES_GLALIE_MEGA] = { + .categoryName = _(""), .height = 21, .weight = 3502, .description = gGlalieMegaPokedexText, }, - [SPECIES_SALAMENCE_MEGA] = + [SPECIES_SALAMENCE_MEGA] = { + .categoryName = _(""), .height = 18, .weight = 1126, .description = gSalamenceMegaPokedexText, }, - [SPECIES_METAGROSS_MEGA] = + [SPECIES_METAGROSS_MEGA] = { + .categoryName = _(""), .height = 25, .weight = 9429, .description = gMetagrossMegaPokedexText, }, - [SPECIES_LATIAS_MEGA] = + [SPECIES_LATIAS_MEGA] = { + .categoryName = _(""), .height = 18, .weight = 520, .description = gLatiasMegaPokedexText, }, - [SPECIES_LATIOS_MEGA] = + [SPECIES_LATIOS_MEGA] = { + .categoryName = _(""), .height = 23, .weight = 700, .description = gLatiosMegaPokedexText, }, - [SPECIES_LOPUNNY_MEGA] = + [SPECIES_LOPUNNY_MEGA] = { + .categoryName = _(""), .height = 13, .weight = 283, .description = gLopunnyMegaPokedexText, }, - [SPECIES_GARCHOMP_MEGA] = + [SPECIES_GARCHOMP_MEGA] = { + .categoryName = _(""), .height = 19, .weight = 950, .description = gGarchompMegaPokedexText, }, - [SPECIES_LUCARIO_MEGA] = + [SPECIES_LUCARIO_MEGA] = { + .categoryName = _(""), .height = 13, .weight = 575, .description = gLucarioMegaPokedexText, }, - [SPECIES_ABOMASNOW_MEGA] = + [SPECIES_ABOMASNOW_MEGA] = { + .categoryName = _(""), .height = 27, .weight = 1850, .description = gAbomasnowMegaPokedexText, }, - [SPECIES_GALLADE_MEGA] = + [SPECIES_GALLADE_MEGA] = { + .categoryName = _(""), .height = 16, .weight = 564, .description = gGalladeMegaPokedexText, }, - [SPECIES_AUDINO_MEGA] = + [SPECIES_AUDINO_MEGA] = { + .categoryName = _(""), .height = 15, .weight = 320, .description = gAudinoMegaPokedexText, }, - [SPECIES_DIANCIE_MEGA] = + [SPECIES_DIANCIE_MEGA] = { + .categoryName = _(""), .height = 11, .weight = 278, .description = gDiancieMegaPokedexText, }, - + // Special Mega + Primals - [SPECIES_RAYQUAZA_MEGA] = + [SPECIES_RAYQUAZA_MEGA] = { + .categoryName = _(""), .height = 108, .weight = 3920, .description = gRayquazaMegaPokedexText, }, [SPECIES_KYOGRE_PRIMAL] = { + .categoryName = _(""), .height = 98, .weight = 4300, .description = gKyogrePrimalPokedexText, }, [SPECIES_GROUDON_PRIMAL] = { + .categoryName = _(""), .height = 50, .weight = 9997, .description = gGroudonPrimalPokedexText, }, - + // Alolan Forms [SPECIES_RATTATA_ALOLAN] = { + .categoryName = _(""), .height = 3, .weight = 38, .description = gRattataAlolanPokedexText, - }, + }, [SPECIES_RATICATE_ALOLAN] = { + .categoryName = _(""), .height = 7, .weight = 255, .description = gRaticateAlolanPokedexText, - }, + }, [SPECIES_RAICHU_ALOLAN] = { + .categoryName = _(""), .height = 7, .weight = 210, .description = gRaichuAlolanPokedexText, - }, + }, [SPECIES_SANDSHREW_ALOLAN] = { + .categoryName = _(""), .height = 7, .weight = 400, .description = gSandshrewAlolanPokedexText, - }, + }, [SPECIES_SANDSLASH_ALOLAN] = { + .categoryName = _(""), .height = 12, .weight = 550, .description = gSandslashAlolanPokedexText, - }, + }, [SPECIES_VULPIX_ALOLAN] = { + .categoryName = _(""), .height = 6, .weight = 99, .description = gVulpixAlolanPokedexText, - }, + }, [SPECIES_NINETALES_ALOLAN] = { + .categoryName = _(""), .height = 11, .weight = 199, .description = gNinetalesAlolanPokedexText, - }, + }, [SPECIES_DIGLETT_ALOLAN] = { + .categoryName = _(""), .height = 2, .weight = 10, .description = gDiglettAlolanPokedexText, - }, + }, [SPECIES_DUGTRIO_ALOLAN] = { + .categoryName = _(""), .height = 7, .weight = 666, .description = gDugtrioAlolanPokedexText, - }, + }, [SPECIES_MEOWTH_ALOLAN] = { + .categoryName = _(""), .height = 4, .weight = 42, .description = gMeowthAlolanPokedexText, - }, + }, [SPECIES_PERSIAN_ALOLAN] = { + .categoryName = _(""), .height = 11, .weight = 330, .description = gPersianAlolanPokedexText, - }, + }, [SPECIES_GEODUDE_ALOLAN] = { + .categoryName = _(""), .height = 4, .weight = 203, .description = gGeodudeAlolanPokedexText, - }, + }, [SPECIES_GRAVELER_ALOLAN] = { + .categoryName = _(""), .height = 10, .weight = 1100, .description = gGravelerAlolanPokedexText, - }, + }, [SPECIES_GOLEM_ALOLAN] = { + .categoryName = _(""), .height = 17, .weight = 3160, .description = gGolemAlolanPokedexText, - }, + }, [SPECIES_GRIMER_ALOLAN] = { + .categoryName = _(""), .height = 7, .weight = 420, .description = gGrimerAlolanPokedexText, - }, + }, [SPECIES_MUK_ALOLAN] = { + .categoryName = _(""), .height = 10, .weight = 520, .description = gMukAlolanPokedexText, - }, + }, [SPECIES_EXEGGUTOR_ALOLAN] = { + .categoryName = _(""), .height = 109, .weight = 4156, .description = gExeggutorAlolanPokedexText, - }, + }, [SPECIES_MAROWAK_ALOLAN] = { + .categoryName = _(""), .height = 10, .weight = 340, .description = gMarowakAlolanPokedexText, - }, - + }, + // Galarian Forms [SPECIES_MEOWTH_GALARIAN] = { + .categoryName = _(""), .height = 4, .weight = 75, .description = gMeowthGalarianPokedexText, - }, + }, [SPECIES_PONYTA_GALARIAN] = { + .categoryName = _("Unique Horn"), .height = 8, .weight = 240, .description = gPonytaGalarianPokedexText, - }, + }, [SPECIES_RAPIDASH_GALARIAN] = { + .categoryName = _("Unique Horn"), .height = 17, .weight = 80, .description = gRapidashGalarianPokedexText, - }, + }, [SPECIES_SLOWPOKE_GALARIAN] = { + .categoryName = _(""), .height = 12, .weight = 360, .description = gSlowpokeGalarianPokedexText, - }, + }, [SPECIES_SLOWBRO_GALARIAN] = { + .categoryName = _(""), .height = 16, .weight = 705, .description = gSlowbroGalarianPokedexText, - }, + }, [SPECIES_FARFETCHD_GALARIAN] = { + .categoryName = _(""), .height = 8, .weight = 420, .description = gFarfetchdGalarianPokedexText, - }, + }, [SPECIES_WEEZING_GALARIAN] = { + .categoryName = _(""), .height = 30, .weight = 160, .description = gWeezingGalarianPokedexText, - }, + }, [SPECIES_MR_MIME_GALARIAN] = { + .categoryName = _("Dancing"), .height = 14, .weight = 568, .description = gMrMimeGalarianPokedexText, - }, + }, [SPECIES_ARTICUNO_GALARIAN] = { + .categoryName = _("Cruel"), .height = 17, .weight = 509, .description = gArticunoGalarianPokedexText, - }, + }, [SPECIES_ZAPDOS_GALARIAN] = { + .categoryName = _("Strong Legs"), .height = 16, .weight = 582, .description = gZapdosGalarianPokedexText, - }, + }, [SPECIES_MOLTRES_GALARIAN] = { + .categoryName = _("Malevolent"), .height = 20, .weight = 660, .description = gMoltresGalarianPokedexText, - }, + }, [SPECIES_SLOWKING_GALARIAN] = { + .categoryName = _("Hexpert"), .height = 18, .weight = 795, .description = gSlowkingGalarianPokedexText, - }, + }, [SPECIES_CORSOLA_GALARIAN] = { + .categoryName = _(""), .height = 6, .weight = 5, .description = gCorsolaGalarianPokedexText, - }, + }, [SPECIES_ZIGZAGOON_GALARIAN] = { + .categoryName = _(""), .height = 4, .weight = 175, .description = gZigzagoonGalarianPokedexText, - }, + }, [SPECIES_LINOONE_GALARIAN] = { + .categoryName = _(""), .height = 5, .weight = 325, .description = gLinooneGalarianPokedexText, - }, + }, [SPECIES_DARUMAKA_GALARIAN] = { + .categoryName = _(""), .height = 7, .weight = 400, .description = gDarumakaGalarianPokedexText, - }, + }, [SPECIES_DARMANITAN_GALARIAN] = { + .categoryName = _("Zen Charm"), .height = 17, .weight = 1200, .description = gDarmanitanGalarianPokedexText, - }, + }, [SPECIES_YAMASK_GALARIAN] = { + .categoryName = _(""), .height = 5, .weight = 15, .description = gYamaskGalarianPokedexText, - }, + }, [SPECIES_STUNFISK_GALARIAN] = { + .categoryName = _(""), .height = 7, .weight = 205, .description = gStunfiskGalarianPokedexText, }, - + // Cap Pikachu - [SPECIES_PIKACHU_ORIGINAL_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuOriginalCapPokedexText, + [SPECIES_PIKACHU_ORIGINAL_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuOriginalCapPokedexText, }, - [SPECIES_PIKACHU_HOENN_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuHoennCapPokedexText, + [SPECIES_PIKACHU_HOENN_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuHoennCapPokedexText, }, - [SPECIES_PIKACHU_SINNOH_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuSinnohCapPokedexText, + [SPECIES_PIKACHU_SINNOH_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuSinnohCapPokedexText, }, - [SPECIES_PIKACHU_UNOVA_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuUnovaCapPokedexText, + [SPECIES_PIKACHU_UNOVA_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuUnovaCapPokedexText, }, - [SPECIES_PIKACHU_KALOS_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuKalosCapPokedexText, + [SPECIES_PIKACHU_KALOS_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuKalosCapPokedexText, }, - [SPECIES_PIKACHU_ALOLA_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuAlolaCapPokedexText, + [SPECIES_PIKACHU_ALOLA_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuAlolaCapPokedexText, }, - [SPECIES_PIKACHU_PARTNER_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuPartnerCapPokedexText, + [SPECIES_PIKACHU_PARTNER_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuPartnerCapPokedexText, }, - [SPECIES_PIKACHU_WORLD_CAP] = - { - .height = 0, - .weight = 0, - .description = gPikachuWorldCapPokedexText, + [SPECIES_PIKACHU_WORLD_CAP] = + { + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPikachuWorldCapPokedexText, }, - // Castform - [SPECIES_CASTFORM_SUNNY] = + [SPECIES_CASTFORM_SUNNY] = { - .height = 0, - .weight = 0, - .description = gCastformSunnyPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gCastformSunnyPokedexText, }, - [SPECIES_CASTFORM_RAINY] = + [SPECIES_CASTFORM_RAINY] = { - .height = 0, - .weight = 0, - .description = gCastformRainyPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gCastformRainyPokedexText, }, - [SPECIES_CASTFORM_SNOWY] = + [SPECIES_CASTFORM_SNOWY] = { - .height = 0, - .weight = 0, - .description = gCastformSnowyPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gCastformSnowyPokedexText, }, - // Cherrim - [SPECIES_CHERRIM_SUNSHINE] = + // Cherrim + [SPECIES_CHERRIM_SUNSHINE] = { - .height = 0, - .weight = 0, - .description = gCherrimSunshinePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gCherrimSunshinePokedexText, }, - // Shellos - [SPECIES_SHELLOS_EAST_SEA] = + // Shellos + [SPECIES_SHELLOS_EAST_SEA] = { - .height = 0, - .weight = 0, - .description = gShellosEastSeaPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gShellosEastSeaPokedexText, }, - // Gastrodon - [SPECIES_GASTRODON_EAST_SEA] = + // Gastrodon, + [SPECIES_GASTRODON_EAST_SEA] = { - .height = 0, - .weight = 0, - .description = gGastrodonEastSeaPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gGastrodonEastSeaPokedexText, }, - // Rotom - [SPECIES_ROTOM_HEAT] = + // Rotom + [SPECIES_ROTOM_HEAT] = { - .height = 0, - .weight = 0, - .description = gRotomHeatPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gRotomHeatPokedexText, }, - [SPECIES_ROTOM_WASH] = + [SPECIES_ROTOM_WASH] = { - .height = 0, - .weight = 0, - .description = gRotomWashPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gRotomWashPokedexText, }, - [SPECIES_ROTOM_FROST] = + [SPECIES_ROTOM_FROST] = { - .height = 0, - .weight = 0, - .description = gRotomFrostPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gRotomFrostPokedexText, }, - [SPECIES_ROTOM_FAN] = + [SPECIES_ROTOM_FAN] = { - .height = 0, - .weight = 0, - .description = gRotomFanPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gRotomFanPokedexText, }, - [SPECIES_ROTOM_MOW] = + [SPECIES_ROTOM_MOW] = { - .height = 0, - .weight = 0, - .description = gRotomMowPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gRotomMowPokedexText, }, - // Giratina - [SPECIES_GIRATINA_ORIGIN] = + // Giratina + [SPECIES_GIRATINA_ORIGIN] = { - .height = 69 , - .weight = 6500 , - .description = gGiratinaOriginPokedexText, + .categoryName = _(""), + .height = 69, + .weight = 6500, + .description = gGiratinaOriginPokedexText, }, - // Shaymin - [SPECIES_SHAYMIN_SKY] = + // Shaymin + [SPECIES_SHAYMIN_SKY] = { - .height = 4 , - .weight = 52 , - .description = gShayminSkyPokedexText, + .categoryName = _(""), + .height = 4, + .weight = 52, + .description = gShayminSkyPokedexText, }, - // Basculin - [SPECIES_BASCULIN_BLUE_STRIPED] = + // Basculin + [SPECIES_BASCULIN_BLUE_STRIPED] = { - .height = 0, - .weight = 0, - .description = gBasculinBlueStripedPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gBasculinBlueStripedPokedexText, }, - // Darmanitan - [SPECIES_DARMANITAN_ZEN_MODE] = + // Darmanitan + [SPECIES_DARMANITAN_ZEN_MODE] = { - .height = 0, - .weight = 0, - .description = gDarmanitanZenModePokedexText, + .categoryName = _("Zen Charm"), + .height = 0, + .weight = 0, + .description = gDarmanitanZenModePokedexText, }, - [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = + [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = { - .height = 0, - .weight = 0, - .description = gDarmanitanZenModeGalarianPokedexText, + .categoryName = _("Zen Charm"), + .height = 0, + .weight = 0, + .description = gDarmanitanZenModeGalarianPokedexText, }, - // Therian Forms - [SPECIES_TORNADUS_THERIAN] = + // Therian Forms + [SPECIES_TORNADUS_THERIAN] = { - .height = 14 , - .weight = 630 , - .description = gTornadusTherianPokedexText, + .categoryName = _(""), + .height = 14, + .weight = 630, + .description = gTornadusTherianPokedexText, }, - [SPECIES_THUNDURUS_THERIAN] = + [SPECIES_THUNDURUS_THERIAN] = { - .height = 30 , - .weight = 610 , - .description = gThundurusTherianPokedexText, + .categoryName = _(""), + .height = 30, + .weight = 610, + .description = gThundurusTherianPokedexText, }, - [SPECIES_LANDORUS_THERIAN] = + [SPECIES_LANDORUS_THERIAN] = { - .height = 13 , - .weight = 680 , - .description = gLandorusTherianPokedexText, + .categoryName = _(""), + .height = 13, + .weight = 680, + .description = gLandorusTherianPokedexText, }, - // Kyurem - [SPECIES_KYUREM_WHITE] = + // Kyurem + [SPECIES_KYUREM_WHITE] = { - .height = 36 , - .weight = 3250 , - .description = gKyuremWhitePokedexText, + .categoryName = _(""), + .height = 36, + .weight = 3250, + .description = gKyuremWhitePokedexText, }, - [SPECIES_KYUREM_BLACK] = + [SPECIES_KYUREM_BLACK] = { - .height = 33 , - .weight = 3250 , - .description = gKyuremBlackPokedexText, + .categoryName = _(""), + .height = 33, + .weight = 3250, + .description = gKyuremBlackPokedexText, }, - // Keldeo - [SPECIES_KELDEO_RESOLUTE] = + // Keldeo + [SPECIES_KELDEO_RESOLUTE] = { - .height = 0, - .weight = 0, - .description = gKeldeoResolutePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gKeldeoResolutePokedexText, }, - // Meowstic - [SPECIES_MEOWSTIC_FEMALE] = + // Meowstic + [SPECIES_MEOWSTIC_FEMALE] = { - .height = 0, - .weight = 0, - .description = gMeowsticFemalePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gMeowsticFemalePokedexText, }, - // Aegislash - [SPECIES_AEGISLASH_BLADE] = + // Aegislash + [SPECIES_AEGISLASH_BLADE] = { - .height = 0, - .weight = 0, - .description = gAegislashBladePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAegislashBladePokedexText, }, - // Pumpkaboo - [SPECIES_PUMPKABOO_SMALL] = + // Pumpkaboo + [SPECIES_PUMPKABOO_SMALL] = { - .height = 3 , - .weight = 35 , - .description = gPumpkabooSmallPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 35, + .description = gPumpkabooSmallPokedexText, }, - [SPECIES_PUMPKABOO_LARGE] = + [SPECIES_PUMPKABOO_LARGE] = { - .height = 5 , - .weight = 75 , - .description = gPumpkabooLargePokedexText, + .categoryName = _(""), + .height = 5, + .weight = 75, + .description = gPumpkabooLargePokedexText, }, - [SPECIES_PUMPKABOO_SUPER] = + [SPECIES_PUMPKABOO_SUPER] = { - .height = 8 , - .weight = 150 , - .description = gPumpkabooSuperPokedexText, + .categoryName = _(""), + .height = 8, + .weight = 150, + .description = gPumpkabooSuperPokedexText, }, - // Gourgeist - [SPECIES_GOURGEIST_SMALL] = + // Gourgeist + [SPECIES_GOURGEIST_SMALL] = { - .height = 7 , - .weight = 95 , - .description = gGourgeistSmallPokedexText, + .categoryName = _(""), + .height = 7, + .weight = 95, + .description = gGourgeistSmallPokedexText, }, - [SPECIES_GOURGEIST_LARGE] = + [SPECIES_GOURGEIST_LARGE] = { - .height = 11 , - .weight = 140 , - .description = gGourgeistLargePokedexText, + .categoryName = _(""), + .height = 11, + .weight = 140, + .description = gGourgeistLargePokedexText, }, - [SPECIES_GOURGEIST_SUPER] = + [SPECIES_GOURGEIST_SUPER] = { - .height = 17 , - .weight = 390 , - .description = gGourgeistSuperPokedexText, + .categoryName = _(""), + .height = 17, + .weight = 390, + .description = gGourgeistSuperPokedexText, }, - // Zygarde - [SPECIES_ZYGARDE_10] = + // Zygarde + [SPECIES_ZYGARDE_10] = { - .height = 12 , - .weight = 335 , - .description = gZygarde10PokedexText, + .categoryName = _(""), + .height = 12, + .weight = 335, + .description = gZygarde10PokedexText, }, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { - .height = 12 , - .weight = 335 , - .description = gZygarde10PowerConstructPokedexText, + .categoryName = _(""), + .height = 12, + .weight = 335, + .description = gZygarde10PowerConstructPokedexText, }, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { - .height = 50 , - .weight = 3050 , - .description = gZygarde50PowerConstructPokedexText, + .categoryName = _(""), + .height = 50, + .weight = 3050, + .description = gZygarde50PowerConstructPokedexText, }, - [SPECIES_ZYGARDE_COMPLETE] = + [SPECIES_ZYGARDE_COMPLETE] = { - .height = 45 , - .weight = 6100 , - .description = gZygardeCompletePokedexText, + .categoryName = _(""), + .height = 45, + .weight = 6100, + .description = gZygardeCompletePokedexText, }, - // Hoopa - [SPECIES_HOOPA_UNBOUND] = + // Hoopa + [SPECIES_HOOPA_UNBOUND] = { - .height = 65 , - .weight = 4900 , - .description = gHoopaUnboundPokedexText, + .categoryName = _("Djinn"), + .height = 65, + .weight = 4900, + .description = gHoopaUnboundPokedexText, }, - // Oricorio - [SPECIES_ORICORIO_POM_POM] = + // Oricorio + [SPECIES_ORICORIO_POM_POM] = { - .height = 0, - .weight = 0, - .description = gOricorioPomPomPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gOricorioPomPomPokedexText, }, - [SPECIES_ORICORIO_PAU] = + [SPECIES_ORICORIO_PAU] = { - .height = 0, - .weight = 0, - .description = gOricorioPauPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gOricorioPauPokedexText, }, - [SPECIES_ORICORIO_SENSU] = + [SPECIES_ORICORIO_SENSU] = { - .height = 0, - .weight = 0, - .description = gOricorioSensuPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gOricorioSensuPokedexText, }, - // Rockruff - [SPECIES_ROCKRUFF_OWN_TEMPO] = + // Rockruff + [SPECIES_ROCKRUFF_OWN_TEMPO] = { - .height = 0, - .weight = 0, - .description = gRockruffOwnTempoPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gRockruffOwnTempoPokedexText, }, - // Lycanroc - [SPECIES_LYCANROC_MIDNIGHT] = + // Lycanroc + [SPECIES_LYCANROC_MIDNIGHT] = { - .height = 11 , - .weight = 250 , - .description = gLycanrocMidnightPokedexText, + .categoryName = _(""), + .height = 11, + .weight = 250, + .description = gLycanrocMidnightPokedexText, }, - [SPECIES_LYCANROC_DUSK] = + [SPECIES_LYCANROC_DUSK] = { - .height = 8 , - .weight = 250 , - .description = gLycanrocDuskPokedexText, + .categoryName = _(""), + .height = 8, + .weight = 250, + .description = gLycanrocDuskPokedexText, }, - // Wishiwashi - [SPECIES_WISHIWASHI_SCHOOL] = + // Wishiwashi + [SPECIES_WISHIWASHI_SCHOOL] = { - .height = 82 , - .weight = 786 , - .description = gWishiwashiSchoolPokedexText, + .categoryName = _(""), + .height = 82, + .weight = 786, + .description = gWishiwashiSchoolPokedexText, }, - // Silvally - [SPECIES_SILVALLY_FIGHTING] = + // Silvally + [SPECIES_SILVALLY_FIGHTING] = { - .height = 0, - .weight = 0, - .description = gSilvallyFightingPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyFightingPokedexText, }, - [SPECIES_SILVALLY_FLYING] = + [SPECIES_SILVALLY_FLYING] = { - .height = 0, - .weight = 0, - .description = gSilvallyFlyingPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyFlyingPokedexText, }, - [SPECIES_SILVALLY_POISON] = + [SPECIES_SILVALLY_POISON] = { - .height = 0, - .weight = 0, - .description = gSilvallyPoisonPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyPoisonPokedexText, }, - [SPECIES_SILVALLY_GROUND] = + [SPECIES_SILVALLY_GROUND] = { - .height = 0, - .weight = 0, - .description = gSilvallyGroundPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyGroundPokedexText, }, - [SPECIES_SILVALLY_ROCK] = + [SPECIES_SILVALLY_ROCK] = { - .height = 0, - .weight = 0, - .description = gSilvallyRockPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyRockPokedexText, }, - [SPECIES_SILVALLY_BUG] = + [SPECIES_SILVALLY_BUG] = { - .height = 0, - .weight = 0, - .description = gSilvallyBugPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyBugPokedexText, }, - [SPECIES_SILVALLY_GHOST] = + [SPECIES_SILVALLY_GHOST] = { - .height = 0, - .weight = 0, - .description = gSilvallyGhostPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyGhostPokedexText, }, - [SPECIES_SILVALLY_STEEL] = + [SPECIES_SILVALLY_STEEL] = { - .height = 0, - .weight = 0, - .description = gSilvallySteelPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallySteelPokedexText, }, - [SPECIES_SILVALLY_FIRE] = + [SPECIES_SILVALLY_FIRE] = { - .height = 0, - .weight = 0, - .description = gSilvallyFirePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyFirePokedexText, }, - [SPECIES_SILVALLY_WATER] = + [SPECIES_SILVALLY_WATER] = { - .height = 0, - .weight = 0, - .description = gSilvallyWaterPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyWaterPokedexText, }, - [SPECIES_SILVALLY_GRASS] = + [SPECIES_SILVALLY_GRASS] = { - .height = 0, - .weight = 0, - .description = gSilvallyGrassPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyGrassPokedexText, }, - [SPECIES_SILVALLY_ELECTRIC] = + [SPECIES_SILVALLY_ELECTRIC] = { - .height = 0, - .weight = 0, - .description = gSilvallyElectricPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyElectricPokedexText, }, - [SPECIES_SILVALLY_PSYCHIC] = + [SPECIES_SILVALLY_PSYCHIC] = { - .height = 0, - .weight = 0, - .description = gSilvallyPsychicPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyPsychicPokedexText, }, - [SPECIES_SILVALLY_ICE] = + [SPECIES_SILVALLY_ICE] = { - .height = 0, - .weight = 0, - .description = gSilvallyIcePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyIcePokedexText, }, - [SPECIES_SILVALLY_DRAGON] = + [SPECIES_SILVALLY_DRAGON] = { - .height = 0, - .weight = 0, - .description = gSilvallyDragonPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyDragonPokedexText, }, - [SPECIES_SILVALLY_DARK] = + [SPECIES_SILVALLY_DARK] = { - .height = 0, - .weight = 0, - .description = gSilvallyDarkPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyDarkPokedexText, }, - [SPECIES_SILVALLY_FAIRY] = + [SPECIES_SILVALLY_FAIRY] = { - .height = 0, - .weight = 0, - .description = gSilvallyFairyPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSilvallyFairyPokedexText, }, - // Minior - [SPECIES_MINIOR_METEOR_ORANGE] = + // Minior + [SPECIES_MINIOR_METEOR_ORANGE] = { - .height = 3 , - .weight = 400 , - .description = gMiniorMeteorOrangePokedexText, + .categoryName = _(""), + .height = 3, + .weight = 400, + .description = gMiniorMeteorOrangePokedexText, }, - [SPECIES_MINIOR_METEOR_YELLOW] = + [SPECIES_MINIOR_METEOR_YELLOW] = { - .height = 3 , - .weight = 400 , - .description = gMiniorMeteorYellowPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 400, + .description = gMiniorMeteorYellowPokedexText, }, - [SPECIES_MINIOR_METEOR_GREEN] = + [SPECIES_MINIOR_METEOR_GREEN] = { - .height = 3 , - .weight = 400 , - .description = gMiniorMeteorGreenPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 400, + .description = gMiniorMeteorGreenPokedexText, }, - [SPECIES_MINIOR_METEOR_BLUE] = + [SPECIES_MINIOR_METEOR_BLUE] = { - .height = 3 , - .weight = 400 , - .description = gMiniorMeteorBluePokedexText, + .categoryName = _(""), + .height = 3, + .weight = 400, + .description = gMiniorMeteorBluePokedexText, }, - [SPECIES_MINIOR_METEOR_INDIGO] = + [SPECIES_MINIOR_METEOR_INDIGO] = { - .height = 3 , - .weight = 400 , - .description = gMiniorMeteorIndigoPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 400, + .description = gMiniorMeteorIndigoPokedexText, }, - [SPECIES_MINIOR_METEOR_VIOLET] = + [SPECIES_MINIOR_METEOR_VIOLET] = { - .height = 3 , - .weight = 400 , - .description = gMiniorMeteorVioletPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 400, + .description = gMiniorMeteorVioletPokedexText, }, - [SPECIES_MINIOR_CORE_RED] = + [SPECIES_MINIOR_CORE_RED] = { - .height = 3 , - .weight = 3 , - .description = gMiniorCoreRedPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 3, + .description = gMiniorCoreRedPokedexText, }, - [SPECIES_MINIOR_CORE_ORANGE] = + [SPECIES_MINIOR_CORE_ORANGE] = { - .height = 3 , - .weight = 3 , - .description = gMiniorCoreOrangePokedexText, + .categoryName = _(""), + .height = 3, + .weight = 3, + .description = gMiniorCoreOrangePokedexText, }, - [SPECIES_MINIOR_CORE_YELLOW] = + [SPECIES_MINIOR_CORE_YELLOW] = { - .height = 3 , - .weight = 3 , - .description = gMiniorCoreYellowPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 3, + .description = gMiniorCoreYellowPokedexText, }, - [SPECIES_MINIOR_CORE_GREEN] = + [SPECIES_MINIOR_CORE_GREEN] = { - .height = 3 , - .weight = 3 , - .description = gMiniorCoreGreenPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 3, + .description = gMiniorCoreGreenPokedexText, }, - [SPECIES_MINIOR_CORE_BLUE] = + [SPECIES_MINIOR_CORE_BLUE] = { - .height = 3 , - .weight = 3 , - .description = gMiniorCoreBluePokedexText, + .categoryName = _(""), + .height = 3, + .weight = 3, + .description = gMiniorCoreBluePokedexText, }, - [SPECIES_MINIOR_CORE_INDIGO] = + [SPECIES_MINIOR_CORE_INDIGO] = { - .height = 3 , - .weight = 3 , - .description = gMiniorCoreIndigoPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 3, + .description = gMiniorCoreIndigoPokedexText, }, - [SPECIES_MINIOR_CORE_VIOLET] = + [SPECIES_MINIOR_CORE_VIOLET] = { - .height = 3 , - .weight = 3 , - .description = gMiniorCoreVioletPokedexText, + .categoryName = _(""), + .height = 3, + .weight = 3, + .description = gMiniorCoreVioletPokedexText, }, - // Mimikyu - [SPECIES_MIMIKYU_BUSTED] = + // Mimikyu + [SPECIES_MIMIKYU_BUSTED] = { - .height = 0, - .weight = 0, - .description = gMimikyuBustedPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gMimikyuBustedPokedexText, }, - // Necrozma - [SPECIES_NECROZMA_DUSK_MANE] = + // Necrozma + [SPECIES_NECROZMA_DUSK_MANE] = { - .height = 38 , - .weight = 4600 , - .description = gNecrozmaDuskManePokedexText, + .categoryName = _(""), + .height = 38, + .weight = 4600, + .description = gNecrozmaDuskManePokedexText, }, - [SPECIES_NECROZMA_DAWN_WINGS] = + [SPECIES_NECROZMA_DAWN_WINGS] = { - .height = 42 , - .weight = 3500 , - .description = gNecrozmaDawnWingsPokedexText, + .categoryName = _(""), + .height = 42, + .weight = 3500, + .description = gNecrozmaDawnWingsPokedexText, }, - [SPECIES_NECROZMA_ULTRA] = + [SPECIES_NECROZMA_ULTRA] = { - .height = 75 , - .weight = 2300 , - .description = gNecrozmaUltraPokedexText, + .categoryName = _(""), + .height = 75, + .weight = 2300, + .description = gNecrozmaUltraPokedexText, }, - // Magearna - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = + // Magearna + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { - .height = 0, - .weight = 0, - .description = gMagearnaOriginalColorPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gMagearnaOriginalColorPokedexText, }, - // Cramorant - [SPECIES_CRAMORANT_GULPING] = + // Cramorant + [SPECIES_CRAMORANT_GULPING] = { - .height = 0, - .weight = 0, - .description = gCramorantGulpingPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gCramorantGulpingPokedexText, }, - [SPECIES_CRAMORANT_GORGING] = + [SPECIES_CRAMORANT_GORGING] = { - .height = 0, - .weight = 0, - .description = gCramorantGorgingPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gCramorantGorgingPokedexText, }, - // Toxtricity - [SPECIES_TOXTRICITY_LOW_KEY] = + // Toxtricity + [SPECIES_TOXTRICITY_LOW_KEY] = { - .height = 0, - .weight = 0, - .description = gToxtricityLowKeyPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gToxtricityLowKeyPokedexText, }, - // Sinistea - [SPECIES_SINISTEA_ANTIQUE] = + // Sinistea + [SPECIES_SINISTEA_ANTIQUE] = { - .height = 0, - .weight = 0, - .description = gSinisteaAntiquePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gSinisteaAntiquePokedexText, }, - // Polteageist - [SPECIES_POLTEAGEIST_ANTIQUE] = + // Polteageist + [SPECIES_POLTEAGEIST_ANTIQUE] = { - .height = 0, - .weight = 0, - .description = gPolteageistAntiquePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gPolteageistAntiquePokedexText, }, - // Alcremie - [SPECIES_ALCREMIE_RUBY_CREAM] = + // Alcremie + [SPECIES_ALCREMIE_RUBY_CREAM] = { - .height = 0, - .weight = 0, - .description = gAlcremieRubyCreamPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieRubyCreamPokedexText, }, - [SPECIES_ALCREMIE_MATCHA_CREAM] = + [SPECIES_ALCREMIE_MATCHA_CREAM] = { - .height = 0, - .weight = 0, - .description = gAlcremieMatchaCreamPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieMatchaCreamPokedexText, }, - [SPECIES_ALCREMIE_MINT_CREAM] = + [SPECIES_ALCREMIE_MINT_CREAM] = { - .height = 0, - .weight = 0, - .description = gAlcremieMintCreamPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieMintCreamPokedexText, }, - [SPECIES_ALCREMIE_LEMON_CREAM] = + [SPECIES_ALCREMIE_LEMON_CREAM] = { - .height = 0, - .weight = 0, - .description = gAlcremieLemonCreamPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieLemonCreamPokedexText, }, - [SPECIES_ALCREMIE_SALTED_CREAM] = + [SPECIES_ALCREMIE_SALTED_CREAM] = { - .height = 0, - .weight = 0, - .description = gAlcremieSaltedCreamPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieSaltedCreamPokedexText, }, - [SPECIES_ALCREMIE_RUBY_SWIRL] = + [SPECIES_ALCREMIE_RUBY_SWIRL] = { - .height = 0, - .weight = 0, - .description = gAlcremieRubySwirlPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieRubySwirlPokedexText, }, - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = { - .height = 0, - .weight = 0, - .description = gAlcremieCaramelSwirlPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieCaramelSwirlPokedexText, }, - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = { - .height = 0, - .weight = 0, - .description = gAlcremieRainbowSwirlPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gAlcremieRainbowSwirlPokedexText, }, - // Eiscue - [SPECIES_EISCUE_NOICE_FACE] = + // Eiscue + [SPECIES_EISCUE_NOICE_FACE] = { - .height = 0, - .weight = 0, - .description = gEiscueNoiceFacePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gEiscueNoiceFacePokedexText, }, - // Indeedee - [SPECIES_INDEEDEE_FEMALE] = + // Indeedee + [SPECIES_INDEEDEE_FEMALE] = { - .height = 0, - .weight = 0, - .description = gIndeedeeFemalePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gIndeedeeFemalePokedexText, }, - // Morpeko - [SPECIES_MORPEKO_HANGRY] = + // Morpeko + [SPECIES_MORPEKO_HANGRY] = { - .height = 0, - .weight = 0, - .description = gMorpekoHangryPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gMorpekoHangryPokedexText, }, - // Zacian - [SPECIES_ZACIAN_CROWNED_SWORD] = + // Zacian + [SPECIES_ZACIAN_CROWNED_SWORD] = { - .height = 28 , - .weight = 3550 , - .description = gZacianCrownedSwordPokedexText, + .categoryName = _(""), + .height = 28, + .weight = 3550, + .description = gZacianCrownedSwordPokedexText, }, - // Zamazenta - [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = + // Zamazenta + [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { - .height = 29 , - .weight = 7850 , - .description = gZamazentaCrownedShieldPokedexText, + .categoryName = _(""), + .height = 29, + .weight = 7850, + .description = gZamazentaCrownedShieldPokedexText, }, - // Eternatus - [SPECIES_ETERNATUS_ETERNAMAX] = + // Eternatus + [SPECIES_ETERNATUS_ETERNAMAX] = { - .height = 100 , - .weight = 10000 , - .description = gEternatusEternamaxPokedexText, + .categoryName = _(""), + .height = 100, + .weight = 10000, + .description = gEternatusEternamaxPokedexText, }, - // Urshifu - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = + // Urshifu + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { - .height = 0, - .weight = 0, - .description = gUrshifuRapidStrikeStylePokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gUrshifuRapidStrikeStylePokedexText, }, - // Zarude - [SPECIES_ZARUDE_DADA] = + // Zarude + [SPECIES_ZARUDE_DADA] = { - .height = 0, - .weight = 0, - .description = gZarudeDadaPokedexText, + .categoryName = _(""), + .height = 0, + .weight = 0, + .description = gZarudeDadaPokedexText, }, - // Calyrex - [SPECIES_CALYREX_ICE_RIDER] = + // Calyrex + [SPECIES_CALYREX_ICE_RIDER] = { - .height = 24 , - .weight = 8091 , - .description = gCalyrexIceRiderPokedexText, + .categoryName = _("High King"), + .height = 24, + .weight = 8091, + .description = gCalyrexIceRiderPokedexText, }, - [SPECIES_CALYREX_SHADOW_RIDER] = + [SPECIES_CALYREX_SHADOW_RIDER] = { - .height = 24 , - .weight = 536 , - .description = gCalyrexShadowRiderPokedexText, + .categoryName = _("High King"), + .height = 24, + .weight = 536, + .description = gCalyrexShadowRiderPokedexText, }, }; From 34ff3c7e64636034394cc45ffa8f76b90e37c05f Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Fri, 7 Jan 2022 13:45:00 +0100 Subject: [PATCH 09/13] added FLAGs for the added data types to get rid of `PokedexEntryFormSkip`, inspired by @AsparagusEduardo --- include/pokedex.h | 6 + src/data/pokemon/pokedex_entries.h | 935 +++++++++++------------------ src/data/pokemon/pokedex_text.h | 33 +- src/pokedex.c | 20 +- 4 files changed, 350 insertions(+), 644 deletions(-) diff --git a/include/pokedex.h b/include/pokedex.h index c334ef702f..a62a35df33 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -41,8 +41,14 @@ struct PokedexEntryForms u16 height; //in decimeters u16 weight; //in hectograms const u8 *description; + u8 flags; }; +// PokedexEntryForms flags +#define FLAG_FORM_DESCRIPTION (1 << 0) +#define FLAG_FORM_WEIGHT_HEIGHT (1 << 1) +#define FLAG_FORM_CATEGORY (1 << 2) + void ResetPokedex(void); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); u16 GetSpeciesHeightWeight(u16 species, u8 data); diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 12c91d8b8d..329e647ead 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10790,497 +10790,494 @@ const struct PokedexEntry gPokedexEntries[] = }; -const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms with the height/weight same height as the base form +const struct PokedexEntryForms gPokedexEntriesForms[] = { - // Megas + // Megas [SPECIES_VENUSAUR_MEGA] = { - .categoryName = _(""), .height = 24, .weight = 1555, .description = gVenusaurMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_CHARIZARD_MEGA_X] = { - .categoryName = _(""), .height = 17, .weight = 1105, .description = gCharizardMegaXPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_CHARIZARD_MEGA_Y] = { - .categoryName = _(""), .height = 17, .weight = 1005, .description = gCharizardMegaYPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_BLASTOISE_MEGA] = { - .categoryName = _(""), .height = 16, .weight = 1011, .description = gBlastoiseMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_BEEDRILL_MEGA] = { - .categoryName = _(""), .height = 14, .weight = 405, .description = gBeedrillMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_PIDGEOT_MEGA] = { - .categoryName = _(""), .height = 22, .weight = 505, .description = gPidgeotMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ALAKAZAM_MEGA] = { - .categoryName = _(""), .height = 12, .weight = 480, .description = gAlakazamMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SLOWBRO_MEGA] = { - .categoryName = _(""), .height = 20, .weight = 1200, .description = gSlowbroMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GENGAR_MEGA] = { - .categoryName = _(""), .height = 14, .weight = 405, .description = gGengarMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_KANGASKHAN_MEGA] = { - .categoryName = _(""), .height = 22, .weight = 1000, .description = gKangaskhanMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_PINSIR_MEGA] = { - .categoryName = _(""), .height = 17, .weight = 590, .description = gPinsirMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GYARADOS_MEGA] = { - .categoryName = _(""), .height = 65, .weight = 3050, .description = gGyaradosMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_AERODACTYL_MEGA] = { - .categoryName = _(""), .height = 21, .weight = 790, .description = gAerodactylMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MEWTWO_MEGA_X] = { - .categoryName = _(""), .height = 23, .weight = 1270, .description = gMewtwoMegaXPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MEWTWO_MEGA_Y] = { - .categoryName = _(""), .height = 15, .weight = 330, .description = gMewtwoMegaYPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_AMPHAROS_MEGA] = { - .categoryName = _(""), .height = 14, .weight = 615, .description = gAmpharosMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_STEELIX_MEGA] = { - .categoryName = _(""), .height = 105, .weight = 7400, .description = gSteelixMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SCIZOR_MEGA] = { - .categoryName = _(""), .height = 20, .weight = 1250, .description = gScizorMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_HERACROSS_MEGA] = { - .categoryName = _(""), .height = 17, .weight = 625, .description = gHeracrossMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_HOUNDOOM_MEGA] = { - .categoryName = _(""), .height = 19, .weight = 495, .description = gHoundoomMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_TYRANITAR_MEGA] = { - .categoryName = _(""), .height = 25, .weight = 2550, .description = gTyranitarMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SCEPTILE_MEGA] = { - .categoryName = _(""), .height = 19, .weight = 552, .description = gSceptileMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_BLAZIKEN_MEGA] = { - .categoryName = _(""), .height = 19, .weight = 520, .description = gBlazikenMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SWAMPERT_MEGA] = { - .categoryName = _(""), .height = 19, .weight = 1020, .description = gSwampertMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GARDEVOIR_MEGA] = { - .categoryName = _(""), .height = 16, .weight = 484, .description = gGardevoirMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SABLEYE_MEGA] = { - .categoryName = _(""), .height = 5, .weight = 1610, .description = gSableyeMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MAWILE_MEGA] = { - .categoryName = _(""), .height = 10, .weight = 235, .description = gMawileMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_AGGRON_MEGA] = { - .categoryName = _(""), .height = 22, .weight = 3950, .description = gAggronMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MEDICHAM_MEGA] = { - .categoryName = _(""), .height = 13, .weight = 315, .description = gMedichamMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MANECTRIC_MEGA] = { - .categoryName = _(""), .height = 18, .weight = 440, .description = gManectricMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SHARPEDO_MEGA] = { - .categoryName = _(""), .height = 25, .weight = 1303, .description = gSharpedoMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_CAMERUPT_MEGA] = { - .categoryName = _(""), .height = 25, .weight = 3205, .description = gCameruptMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ALTARIA_MEGA] = { - .categoryName = _(""), .height = 15, .weight = 206, .description = gAltariaMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_BANETTE_MEGA] = { - .categoryName = _(""), .height = 12, .weight = 130, .description = gBanetteMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ABSOL_MEGA] = { - .categoryName = _(""), .height = 12, .weight = 490, .description = gAbsolMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GLALIE_MEGA] = { - .categoryName = _(""), .height = 21, .weight = 3502, .description = gGlalieMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SALAMENCE_MEGA] = { - .categoryName = _(""), .height = 18, .weight = 1126, .description = gSalamenceMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_METAGROSS_MEGA] = { - .categoryName = _(""), .height = 25, .weight = 9429, .description = gMetagrossMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LATIAS_MEGA] = { - .categoryName = _(""), .height = 18, .weight = 520, .description = gLatiasMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LATIOS_MEGA] = { - .categoryName = _(""), .height = 23, .weight = 700, .description = gLatiosMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LOPUNNY_MEGA] = { - .categoryName = _(""), .height = 13, .weight = 283, .description = gLopunnyMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GARCHOMP_MEGA] = { - .categoryName = _(""), .height = 19, .weight = 950, .description = gGarchompMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LUCARIO_MEGA] = { - .categoryName = _(""), .height = 13, .weight = 575, .description = gLucarioMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ABOMASNOW_MEGA] = { - .categoryName = _(""), .height = 27, .weight = 1850, .description = gAbomasnowMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GALLADE_MEGA] = { - .categoryName = _(""), .height = 16, .weight = 564, .description = gGalladeMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_AUDINO_MEGA] = { - .categoryName = _(""), .height = 15, .weight = 320, .description = gAudinoMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_DIANCIE_MEGA] = { - .categoryName = _(""), .height = 11, .weight = 278, .description = gDiancieMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - - // Special Mega + Primals + // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = { - .categoryName = _(""), .height = 108, .weight = 3920, .description = gRayquazaMegaPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_KYOGRE_PRIMAL] = { - .categoryName = _(""), .height = 98, .weight = 4300, .description = gKyogrePrimalPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GROUDON_PRIMAL] = { - .categoryName = _(""), .height = 50, .weight = 9997, .description = gGroudonPrimalPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - - // Alolan Forms + // Alolan Forms [SPECIES_RATTATA_ALOLAN] = { - .categoryName = _(""), .height = 3, .weight = 38, .description = gRattataAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_RATICATE_ALOLAN] = { - .categoryName = _(""), .height = 7, .weight = 255, .description = gRaticateAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_RAICHU_ALOLAN] = { - .categoryName = _(""), .height = 7, .weight = 210, .description = gRaichuAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SANDSHREW_ALOLAN] = { - .categoryName = _(""), .height = 7, .weight = 400, .description = gSandshrewAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SANDSLASH_ALOLAN] = { - .categoryName = _(""), .height = 12, .weight = 550, .description = gSandslashAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_VULPIX_ALOLAN] = { - .categoryName = _(""), .height = 6, .weight = 99, .description = gVulpixAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_NINETALES_ALOLAN] = { - .categoryName = _(""), .height = 11, .weight = 199, .description = gNinetalesAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_DIGLETT_ALOLAN] = { - .categoryName = _(""), .height = 2, .weight = 10, .description = gDiglettAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_DUGTRIO_ALOLAN] = { - .categoryName = _(""), .height = 7, .weight = 666, .description = gDugtrioAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MEOWTH_ALOLAN] = { - .categoryName = _(""), .height = 4, .weight = 42, .description = gMeowthAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_PERSIAN_ALOLAN] = { - .categoryName = _(""), .height = 11, .weight = 330, .description = gPersianAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GEODUDE_ALOLAN] = { - .categoryName = _(""), .height = 4, .weight = 203, .description = gGeodudeAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GRAVELER_ALOLAN] = { - .categoryName = _(""), .height = 10, .weight = 1100, .description = gGravelerAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GOLEM_ALOLAN] = { - .categoryName = _(""), .height = 17, .weight = 3160, .description = gGolemAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GRIMER_ALOLAN] = { - .categoryName = _(""), .height = 7, .weight = 420, .description = gGrimerAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MUK_ALOLAN] = { - .categoryName = _(""), .height = 10, .weight = 520, .description = gMukAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_EXEGGUTOR_ALOLAN] = { - .categoryName = _(""), .height = 109, .weight = 4156, .description = gExeggutorAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MAROWAK_ALOLAN] = { - .categoryName = _(""), .height = 10, .weight = 340, .description = gMarowakAlolanPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - - // Galarian Forms + // Galarian Forms [SPECIES_MEOWTH_GALARIAN] = { - .categoryName = _(""), .height = 4, .weight = 75, .description = gMeowthGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_PONYTA_GALARIAN] = { @@ -11288,6 +11285,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 8, .weight = 240, .description = gPonytaGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_RAPIDASH_GALARIAN] = { @@ -11295,34 +11293,35 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 17, .weight = 80, .description = gRapidashGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_SLOWPOKE_GALARIAN] = { - .categoryName = _(""), .height = 12, .weight = 360, .description = gSlowpokeGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SLOWBRO_GALARIAN] = { - .categoryName = _(""), .height = 16, .weight = 705, .description = gSlowbroGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_FARFETCHD_GALARIAN] = { - .categoryName = _(""), .height = 8, .weight = 420, .description = gFarfetchdGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_WEEZING_GALARIAN] = { - .categoryName = _(""), .height = 30, .weight = 160, .description = gWeezingGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MR_MIME_GALARIAN] = { @@ -11330,6 +11329,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 14, .weight = 568, .description = gMrMimeGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_ARTICUNO_GALARIAN] = { @@ -11337,6 +11337,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 17, .weight = 509, .description = gArticunoGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_ZAPDOS_GALARIAN] = { @@ -11344,6 +11345,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 16, .weight = 582, .description = gZapdosGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_MOLTRES_GALARIAN] = { @@ -11351,6 +11353,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 20, .weight = 660, .description = gMoltresGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_SLOWKING_GALARIAN] = { @@ -11358,34 +11361,35 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 18, .weight = 795, .description = gSlowkingGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_CORSOLA_GALARIAN] = { - .categoryName = _(""), .height = 6, .weight = 5, .description = gCorsolaGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ZIGZAGOON_GALARIAN] = { - .categoryName = _(""), .height = 4, .weight = 175, .description = gZigzagoonGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LINOONE_GALARIAN] = { - .categoryName = _(""), .height = 5, .weight = 325, .description = gLinooneGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_DARUMAKA_GALARIAN] = { - .categoryName = _(""), .height = 7, .weight = 400, .description = gDarumakaGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_DARMANITAN_GALARIAN] = { @@ -11393,812 +11397,684 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 17, .weight = 1200, .description = gDarmanitanGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_YAMASK_GALARIAN] = { - .categoryName = _(""), .height = 5, .weight = 15, .description = gYamaskGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_STUNFISK_GALARIAN] = { - .categoryName = _(""), .height = 7, .weight = 205, .description = gStunfiskGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - - // Cap Pikachu + // Cap Pikachu [SPECIES_PIKACHU_ORIGINAL_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuOriginalCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_PIKACHU_HOENN_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuHoennCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_PIKACHU_SINNOH_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuSinnohCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_PIKACHU_UNOVA_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuUnovaCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_PIKACHU_KALOS_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuKalosCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_PIKACHU_ALOLA_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuAlolaCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_PIKACHU_PARTNER_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuPartnerCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_PIKACHU_WORLD_CAP] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPikachuWorldCapPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Castform + // Castform [SPECIES_CASTFORM_SUNNY] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gCastformSunnyPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_CASTFORM_RAINY] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gCastformRainyPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_CASTFORM_SNOWY] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gCastformSnowyPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Cherrim + // Cherrim [SPECIES_CHERRIM_SUNSHINE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gCherrimSunshinePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Shellos + // Shellos [SPECIES_SHELLOS_EAST_SEA] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gShellosEastSeaPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Gastrodon, + // Gastrodon, [SPECIES_GASTRODON_EAST_SEA] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gGastrodonEastSeaPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Rotom + // Rotom [SPECIES_ROTOM_HEAT] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gRotomHeatPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ROTOM_WASH] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gRotomWashPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ROTOM_FROST] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gRotomFrostPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ROTOM_FAN] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gRotomFanPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ROTOM_MOW] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gRotomMowPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Giratina + // Giratina [SPECIES_GIRATINA_ORIGIN] = { - .categoryName = _(""), .height = 69, .weight = 6500, .description = gGiratinaOriginPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Shaymin + // Shaymin [SPECIES_SHAYMIN_SKY] = { - .categoryName = _(""), .height = 4, .weight = 52, .description = gShayminSkyPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Basculin + // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gBasculinBlueStripedPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Darmanitan + // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { - .categoryName = _("Zen Charm"), - .height = 0, - .weight = 0, + .categoryName = _("Zen Charm"), .description = gDarmanitanZenModePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_CATEGORY, }, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = { - .categoryName = _("Zen Charm"), - .height = 0, - .weight = 0, + .categoryName = _("Zen Charm"), .description = gDarmanitanZenModeGalarianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_CATEGORY, }, - // Therian Forms + // Therian Forms [SPECIES_TORNADUS_THERIAN] = { - .categoryName = _(""), .height = 14, .weight = 630, .description = gTornadusTherianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_THUNDURUS_THERIAN] = { - .categoryName = _(""), .height = 30, .weight = 610, .description = gThundurusTherianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LANDORUS_THERIAN] = { - .categoryName = _(""), .height = 13, .weight = 680, .description = gLandorusTherianPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Kyurem + // Kyurem [SPECIES_KYUREM_WHITE] = { - .categoryName = _(""), .height = 36, .weight = 3250, .description = gKyuremWhitePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_KYUREM_BLACK] = { - .categoryName = _(""), .height = 33, .weight = 3250, .description = gKyuremBlackPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Keldeo + // Keldeo [SPECIES_KELDEO_RESOLUTE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gKeldeoResolutePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Meowstic + // Meowstic [SPECIES_MEOWSTIC_FEMALE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gMeowsticFemalePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Aegislash + // Aegislash [SPECIES_AEGISLASH_BLADE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAegislashBladePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Pumpkaboo + // Pumpkaboo [SPECIES_PUMPKABOO_SMALL] = { - .categoryName = _(""), .height = 3, .weight = 35, .description = gPumpkabooSmallPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_PUMPKABOO_LARGE] = { - .categoryName = _(""), .height = 5, .weight = 75, .description = gPumpkabooLargePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_PUMPKABOO_SUPER] = { - .categoryName = _(""), .height = 8, .weight = 150, .description = gPumpkabooSuperPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Gourgeist + // Gourgeist [SPECIES_GOURGEIST_SMALL] = { - .categoryName = _(""), .height = 7, .weight = 95, .description = gGourgeistSmallPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GOURGEIST_LARGE] = { - .categoryName = _(""), .height = 11, .weight = 140, .description = gGourgeistLargePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GOURGEIST_SUPER] = { - .categoryName = _(""), .height = 17, .weight = 390, .description = gGourgeistSuperPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Zygarde + // Zygarde [SPECIES_ZYGARDE_10] = { - .categoryName = _(""), .height = 12, .weight = 335, .description = gZygarde10PokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { - .categoryName = _(""), .height = 12, .weight = 335, .description = gZygarde10PowerConstructPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { - .categoryName = _(""), .height = 50, .weight = 3050, .description = gZygarde50PowerConstructPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ZYGARDE_COMPLETE] = { - .categoryName = _(""), .height = 45, .weight = 6100, .description = gZygardeCompletePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Hoopa + // Hoopa [SPECIES_HOOPA_UNBOUND] = { .categoryName = _("Djinn"), .height = 65, .weight = 4900, .description = gHoopaUnboundPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, - // Oricorio + // Oricorio [SPECIES_ORICORIO_POM_POM] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gOricorioPomPomPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ORICORIO_PAU] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gOricorioPauPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ORICORIO_SENSU] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gOricorioSensuPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Rockruff + // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gRockruffOwnTempoPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Lycanroc + // Lycanroc [SPECIES_LYCANROC_MIDNIGHT] = { - .categoryName = _(""), .height = 11, .weight = 250, .description = gLycanrocMidnightPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LYCANROC_DUSK] = { - .categoryName = _(""), .height = 8, .weight = 250, .description = gLycanrocDuskPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Wishiwashi + // Wishiwashi [SPECIES_WISHIWASHI_SCHOOL] = { - .categoryName = _(""), .height = 82, .weight = 786, .description = gWishiwashiSchoolPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Silvally + // Silvally [SPECIES_SILVALLY_FIGHTING] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyFightingPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_FLYING] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyFlyingPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_POISON] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyPoisonPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_GROUND] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyGroundPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_ROCK] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyRockPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_BUG] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyBugPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_GHOST] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyGhostPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_STEEL] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallySteelPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_FIRE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyFirePokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_WATER] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyWaterPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_GRASS] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyGrassPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_ELECTRIC] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyElectricPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_PSYCHIC] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyPsychicPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_ICE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyIcePokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_DRAGON] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyDragonPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_DARK] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyDarkPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_SILVALLY_FAIRY] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, - .description = gSilvallyFairyPokedexText, + { + .description = gSilvallyMemoryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Minior + // Minior [SPECIES_MINIOR_METEOR_ORANGE] = { - .categoryName = _(""), .height = 3, .weight = 400, - .description = gMiniorMeteorOrangePokedexText, + .description = gMiniorMeteorPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_METEOR_YELLOW] = { - .categoryName = _(""), .height = 3, .weight = 400, - .description = gMiniorMeteorYellowPokedexText, + .description = gMiniorMeteorPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_METEOR_GREEN] = { - .categoryName = _(""), .height = 3, .weight = 400, - .description = gMiniorMeteorGreenPokedexText, + .description = gMiniorMeteorPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_METEOR_BLUE] = { - .categoryName = _(""), .height = 3, .weight = 400, - .description = gMiniorMeteorBluePokedexText, + .description = gMiniorMeteorPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_METEOR_INDIGO] = { - .categoryName = _(""), .height = 3, .weight = 400, - .description = gMiniorMeteorIndigoPokedexText, + .description = gMiniorMeteorPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_METEOR_VIOLET] = { - .categoryName = _(""), .height = 3, .weight = 400, - .description = gMiniorMeteorVioletPokedexText, + .description = gMiniorMeteorPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_CORE_RED] = { - .categoryName = _(""), .height = 3, .weight = 3, - .description = gMiniorCoreRedPokedexText, + .description = gMiniorCorePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_CORE_ORANGE] = { - .categoryName = _(""), .height = 3, .weight = 3, - .description = gMiniorCoreOrangePokedexText, + .description = gMiniorCorePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_CORE_YELLOW] = { - .categoryName = _(""), .height = 3, .weight = 3, - .description = gMiniorCoreYellowPokedexText, + .description = gMiniorCorePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_CORE_GREEN] = { - .categoryName = _(""), .height = 3, .weight = 3, - .description = gMiniorCoreGreenPokedexText, + .description = gMiniorCorePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_CORE_BLUE] = { - .categoryName = _(""), .height = 3, .weight = 3, - .description = gMiniorCoreBluePokedexText, + .description = gMiniorCorePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_CORE_INDIGO] = { - .categoryName = _(""), .height = 3, .weight = 3, - .description = gMiniorCoreIndigoPokedexText, + .description = gMiniorCorePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MINIOR_CORE_VIOLET] = { - .categoryName = _(""), .height = 3, .weight = 3, - .description = gMiniorCoreVioletPokedexText, + .description = gMiniorCorePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Mimikyu + // Mimikyu [SPECIES_MIMIKYU_BUSTED] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gMimikyuBustedPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Necrozma + // Necrozma [SPECIES_NECROZMA_DUSK_MANE] = { - .categoryName = _(""), .height = 38, .weight = 4600, .description = gNecrozmaDuskManePokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_NECROZMA_DAWN_WINGS] = { - .categoryName = _(""), .height = 42, .weight = 3500, .description = gNecrozmaDawnWingsPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_NECROZMA_ULTRA] = { - .categoryName = _(""), .height = 75, .weight = 2300, .description = gNecrozmaUltraPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Magearna + // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gMagearnaOriginalColorPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Cramorant + // Cramorant [SPECIES_CRAMORANT_GULPING] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gCramorantGulpingPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_CRAMORANT_GORGING] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gCramorantGorgingPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Toxtricity + // Toxtricity [SPECIES_TOXTRICITY_LOW_KEY] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gToxtricityLowKeyPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Sinistea + // Sinistea [SPECIES_SINISTEA_ANTIQUE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gSinisteaAntiquePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Polteageist + // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gPolteageistAntiquePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Alcremie + // Alcremie [SPECIES_ALCREMIE_RUBY_CREAM] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieRubyCreamPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ALCREMIE_MATCHA_CREAM] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieMatchaCreamPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ALCREMIE_MINT_CREAM] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieMintCreamPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ALCREMIE_LEMON_CREAM] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieLemonCreamPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ALCREMIE_SALTED_CREAM] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieSaltedCreamPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ALCREMIE_RUBY_SWIRL] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieRubySwirlPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ALCREMIE_CARAMEL_SWIRL] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieCaramelSwirlPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, [SPECIES_ALCREMIE_RAINBOW_SWIRL] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gAlcremieRainbowSwirlPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Eiscue + // Eiscue [SPECIES_EISCUE_NOICE_FACE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gEiscueNoiceFacePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Indeedee + // Indeedee [SPECIES_INDEEDEE_FEMALE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gIndeedeeFemalePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Morpeko + // Morpeko [SPECIES_MORPEKO_HANGRY] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gMorpekoHangryPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Zacian + // Zacian [SPECIES_ZACIAN_CROWNED_SWORD] = { - .categoryName = _(""), .height = 28, .weight = 3550, .description = gZacianCrownedSwordPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Zamazenta + // Zamazenta [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { - .categoryName = _(""), .height = 29, .weight = 7850, .description = gZamazentaCrownedShieldPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Eternatus + // Eternatus [SPECIES_ETERNATUS_ETERNAMAX] = { - .categoryName = _(""), .height = 100, .weight = 10000, .description = gEternatusEternamaxPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, - // Urshifu + // Urshifu [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gUrshifuRapidStrikeStylePokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Zarude + // Zarude [SPECIES_ZARUDE_DADA] = - { - .categoryName = _(""), - .height = 0, - .weight = 0, + { .description = gZarudeDadaPokedexText, + .flags = FLAG_FORM_DESCRIPTION , }, - // Calyrex + // Calyrex [SPECIES_CALYREX_ICE_RIDER] = { .categoryName = _("High King"), .height = 24, .weight = 8091, .description = gCalyrexIceRiderPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, [SPECIES_CALYREX_SHADOW_RIDER] = { @@ -12206,141 +12082,6 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = //returns 0 for forms wi .height = 24, .weight = 536, .description = gCalyrexShadowRiderPokedexText, + .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, }; - -const bool8 PokedexEntryFormSkip[NUM_SPECIES] = -{ - - // Cosplay Pikachu - [SPECIES_PIKACHU_COSPLAY] = TRUE, - [SPECIES_PIKACHU_ROCK_STAR] = TRUE, - [SPECIES_PIKACHU_BELLE] = TRUE, - [SPECIES_PIKACHU_POP_STAR ] = TRUE, - [SPECIES_PIKACHU_PH_D] = TRUE, - [SPECIES_PIKACHU_LIBRE] = TRUE, - // Pichu - [SPECIES_PICHU_SPIKY_EARED] = TRUE, - // Unown - [SPECIES_UNOWN_B] = TRUE, - [SPECIES_UNOWN_C] = TRUE, - [SPECIES_UNOWN_D] = TRUE, - [SPECIES_UNOWN_E] = TRUE, - [SPECIES_UNOWN_F] = TRUE, - [SPECIES_UNOWN_G] = TRUE, - [SPECIES_UNOWN_H] = TRUE, - [SPECIES_UNOWN_I] = TRUE, - [SPECIES_UNOWN_J] = TRUE, - [SPECIES_UNOWN_K] = TRUE, - [SPECIES_UNOWN_L] = TRUE, - [SPECIES_UNOWN_M] = TRUE, - [SPECIES_UNOWN_N] = TRUE, - [SPECIES_UNOWN_O] = TRUE, - [SPECIES_UNOWN_P] = TRUE, - [SPECIES_UNOWN_Q] = TRUE, - [SPECIES_UNOWN_R] = TRUE, - [SPECIES_UNOWN_S] = TRUE, - [SPECIES_UNOWN_T] = TRUE, - [SPECIES_UNOWN_U] = TRUE, - [SPECIES_UNOWN_V] = TRUE, - [SPECIES_UNOWN_W] = TRUE, - [SPECIES_UNOWN_X] = TRUE, - [SPECIES_UNOWN_Y] = TRUE, - [SPECIES_UNOWN_Z] = TRUE, - [SPECIES_UNOWN_EMARK] = TRUE, - [SPECIES_UNOWN_QMARK] = TRUE, - // Deoxys - [SPECIES_DEOXYS_ATTACK] = TRUE, - [SPECIES_DEOXYS_DEFENSE] = TRUE, - [SPECIES_DEOXYS_SPEED] = TRUE, - // Burmy - [SPECIES_BURMY_SANDY_CLOAK] = TRUE, - [SPECIES_BURMY_TRASH_CLOAK] = TRUE, - // Wormadam - [SPECIES_WORMADAM_SANDY_CLOAK] = TRUE, - [SPECIES_WORMADAM_TRASH_CLOAK] = TRUE, - // Arceus - [SPECIES_ARCEUS_FIGHTING] = TRUE, - [SPECIES_ARCEUS_FLYING] = TRUE, - [SPECIES_ARCEUS_POISON] = TRUE, - [SPECIES_ARCEUS_GROUND] = TRUE, - [SPECIES_ARCEUS_ROCK] = TRUE, - [SPECIES_ARCEUS_BUG] = TRUE, - [SPECIES_ARCEUS_GHOST] = TRUE, - [SPECIES_ARCEUS_STEEL] = TRUE, - [SPECIES_ARCEUS_FIRE] = TRUE, - [SPECIES_ARCEUS_WATER] = TRUE, - [SPECIES_ARCEUS_GRASS] = TRUE, - [SPECIES_ARCEUS_ELECTRIC] = TRUE, - [SPECIES_ARCEUS_PSYCHIC] = TRUE, - [SPECIES_ARCEUS_ICE] = TRUE, - [SPECIES_ARCEUS_DRAGON] = TRUE, - [SPECIES_ARCEUS_DARK] = TRUE, - [SPECIES_ARCEUS_FAIRY] = TRUE, - // Deerling - [SPECIES_DEERLING_SUMMER] = TRUE, - [SPECIES_DEERLING_AUTUMN] = TRUE, - [SPECIES_DEERLING_WINTER] = TRUE, - // Sawsbuck - [SPECIES_SAWSBUCK_SUMMER] = TRUE, - [SPECIES_SAWSBUCK_AUTUMN] = TRUE, - [SPECIES_SAWSBUCK_WINTER] = TRUE, - // Meloetta - [SPECIES_MELOETTA_PIROUETTE] = TRUE, - // Genesect - [SPECIES_GENESECT_DOUSE_DRIVE] = TRUE, - [SPECIES_GENESECT_SHOCK_DRIVE] = TRUE, - [SPECIES_GENESECT_BURN_DRIVE] = TRUE, - [SPECIES_GENESECT_CHILL_DRIVE] = TRUE, - // Greninja - [SPECIES_GRENINJA_BATTLE_BOND] = TRUE, - [SPECIES_GRENINJA_ASH] = TRUE, - // Vivillon - [SPECIES_VIVILLON_POLAR] = TRUE, - [SPECIES_VIVILLON_TUNDRA] = TRUE, - [SPECIES_VIVILLON_CONTINENTAL] = TRUE, - [SPECIES_VIVILLON_GARDEN] = TRUE, - [SPECIES_VIVILLON_ELEGANT] = TRUE, - [SPECIES_VIVILLON_MEADOW] = TRUE, - [SPECIES_VIVILLON_MODERN] = TRUE, - [SPECIES_VIVILLON_MARINE] = TRUE, - [SPECIES_VIVILLON_ARCHIPELAGO] = TRUE, - [SPECIES_VIVILLON_HIGH_PLAINS] = TRUE, - [SPECIES_VIVILLON_SANDSTORM] = TRUE, - [SPECIES_VIVILLON_RIVER] = TRUE, - [SPECIES_VIVILLON_MONSOON] = TRUE, - [SPECIES_VIVILLON_SAVANNA] = TRUE, - [SPECIES_VIVILLON_SUN] = TRUE, - [SPECIES_VIVILLON_OCEAN] = TRUE, - [SPECIES_VIVILLON_JUNGLE] = TRUE, - [SPECIES_VIVILLON_FANCY] = TRUE, - [SPECIES_VIVILLON_POKE_BALL] = TRUE, - // Flabébé - [SPECIES_FLABEBE_YELLOW_FLOWER] = TRUE, - [SPECIES_FLABEBE_ORANGE_FLOWER] = TRUE, - [SPECIES_FLABEBE_BLUE_FLOWER] = TRUE, - [SPECIES_FLABEBE_WHITE_FLOWER] = TRUE, - // Floette - [SPECIES_FLOETTE_YELLOW_FLOWER] = TRUE, - [SPECIES_FLOETTE_ORANGE_FLOWER] = TRUE, - [SPECIES_FLOETTE_BLUE_FLOWER] = TRUE, - [SPECIES_FLOETTE_WHITE_FLOWER] = TRUE, - [SPECIES_FLOETTE_ETERNAL_FLOWER] = TRUE, - // Florges - [SPECIES_FLORGES_YELLOW_FLOWER] = TRUE, - [SPECIES_FLORGES_ORANGE_FLOWER] = TRUE, - [SPECIES_FLORGES_BLUE_FLOWER] = TRUE, - [SPECIES_FLORGES_WHITE_FLOWER] = TRUE, - // Furfrou - [SPECIES_FURFROU_HEART_TRIM] = TRUE, - [SPECIES_FURFROU_STAR_TRIM] = TRUE, - [SPECIES_FURFROU_DIAMOND_TRIM] = TRUE, - [SPECIES_FURFROU_DEBUTANTE_TRIM] = TRUE, - [SPECIES_FURFROU_MATRON_TRIM] = TRUE, - [SPECIES_FURFROU_DANDY_TRIM] = TRUE, - [SPECIES_FURFROU_LA_REINE_TRIM] = TRUE, - [SPECIES_FURFROU_KABUKI_TRIM] = TRUE, - [SPECIES_FURFROU_PHARAOH_TRIM] = TRUE, - // Xerneas - [SPECIES_XERNEAS_ACTIVE] = TRUE, -}; diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 2f1cb3a30e..a967a23248 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5521,37 +5521,10 @@ const u8 gLycanrocDuskPokedexText[] = _(""); // Wishiwashi const u8 gWishiwashiSchoolPokedexText[] = _(""); // Silvally -const u8 gSilvallyFightingPokedexText[] = _(""); -const u8 gSilvallyFlyingPokedexText[] = _(""); -const u8 gSilvallyPoisonPokedexText[] = _(""); -const u8 gSilvallyGroundPokedexText[] = _(""); -const u8 gSilvallyRockPokedexText[] = _(""); -const u8 gSilvallyBugPokedexText[] = _(""); -const u8 gSilvallyGhostPokedexText[] = _(""); -const u8 gSilvallySteelPokedexText[] = _(""); -const u8 gSilvallyFirePokedexText[] = _(""); -const u8 gSilvallyWaterPokedexText[] = _(""); -const u8 gSilvallyGrassPokedexText[] = _(""); -const u8 gSilvallyElectricPokedexText[] = _(""); -const u8 gSilvallyPsychicPokedexText[] = _(""); -const u8 gSilvallyIcePokedexText[] = _(""); -const u8 gSilvallyDragonPokedexText[] = _(""); -const u8 gSilvallyDarkPokedexText[] = _(""); -const u8 gSilvallyFairyPokedexText[] = _(""); +const u8 gSilvallyMemoryPokedexText[] = _(""); // Minior -const u8 gMiniorMeteorOrangePokedexText[] = _(""); -const u8 gMiniorMeteorYellowPokedexText[] = _(""); -const u8 gMiniorMeteorGreenPokedexText[] = _(""); -const u8 gMiniorMeteorBluePokedexText[] = _(""); -const u8 gMiniorMeteorIndigoPokedexText[] = _(""); -const u8 gMiniorMeteorVioletPokedexText[] = _(""); -const u8 gMiniorCoreRedPokedexText[] = _(""); -const u8 gMiniorCoreOrangePokedexText[] = _(""); -const u8 gMiniorCoreYellowPokedexText[] = _(""); -const u8 gMiniorCoreGreenPokedexText[] = _(""); -const u8 gMiniorCoreBluePokedexText[] = _(""); -const u8 gMiniorCoreIndigoPokedexText[] = _(""); -const u8 gMiniorCoreVioletPokedexText[] = _(""); +const u8 gMiniorMeteorPokedexText[] = _(""); +const u8 gMiniorCorePokedexText[] = _(""); // Mimikyu const u8 gMimikyuBustedPokedexText[] = _(""); // Necrozma diff --git a/src/pokedex.c b/src/pokedex.c index 74549e39e4..a50ce3252c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4251,28 +4251,14 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data) u16 GetSpeciesHeightWeight(u16 species, u8 data) { - if (PokedexEntryFormSkip[species]) + if (species >= (FORMS_START + 1) && species < NUM_SPECIES && gPokedexEntriesForms[species].flags & FLAG_FORM_WEIGHT_HEIGHT) { - return GetPokedexHeightWeight(SpeciesToNationalPokedexNum(species), data); - } - else if (species >= (FORMS_START + 1) && species < NUM_SPECIES) - { - // if 0 is returned, use base form data - u16 weight, height; switch (data) { case 0: // height - height = gPokedexEntriesForms[species].height; - if (height > 0) - { - return height; - } + return gPokedexEntriesForms[species].height; case 1: // weight - weight = gPokedexEntriesForms[species].weight; - if (weight > 0) - { - return weight; - } + return gPokedexEntriesForms[species].weight; default: return 1; } From 6787dbadf92901a0e1274084efe020c135b39b78 Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Fri, 7 Jan 2022 14:30:22 +0100 Subject: [PATCH 10/13] RAPIDASH weight fix --- src/data/pokemon/pokedex_entries.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 329e647ead..6d9855ab26 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -11291,7 +11291,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .categoryName = _("Unique Horn"), .height = 17, - .weight = 80, + .weight = 800, .description = gRapidashGalarianPokedexText, .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT | FLAG_FORM_CATEGORY, }, From 075ddb44d4cc401dc2ae88bc40f89d20fb3bbe9f Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Sat, 8 Jan 2022 13:42:34 +0100 Subject: [PATCH 11/13] Added Alolan form pokedex entries --- src/data/pokemon/pokedex_text.h | 108 ++++++++++++++++++++++++++------ 1 file changed, 90 insertions(+), 18 deletions(-) diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index a967a23248..42b7477ef6 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5405,24 +5405,96 @@ const u8 gKyogrePrimalPokedexText[] = _(""); const u8 gGroudonPrimalPokedexText[] = _(""); // Alolan forms -const u8 gRattataAlolanPokedexText[] = _(""); -const u8 gRaticateAlolanPokedexText[] = _(""); -const u8 gRaichuAlolanPokedexText[] = _(""); -const u8 gSandshrewAlolanPokedexText[] = _(""); -const u8 gSandslashAlolanPokedexText[] = _(""); -const u8 gVulpixAlolanPokedexText[] = _(""); -const u8 gNinetalesAlolanPokedexText[] = _(""); -const u8 gDiglettAlolanPokedexText[] = _(""); -const u8 gDugtrioAlolanPokedexText[] = _(""); -const u8 gMeowthAlolanPokedexText[] = _(""); -const u8 gPersianAlolanPokedexText[] = _(""); -const u8 gGeodudeAlolanPokedexText[] = _(""); -const u8 gGravelerAlolanPokedexText[] = _(""); -const u8 gGolemAlolanPokedexText[] = _(""); -const u8 gGrimerAlolanPokedexText[] = _(""); -const u8 gMukAlolanPokedexText[] = _(""); -const u8 gExeggutorAlolanPokedexText[] = _(""); -const u8 gMarowakAlolanPokedexText[] = _(""); +const u8 gRattataAlolanPokedexText[] = _( + "With its incisors, it gnaws through doors\n" + "and infiltrates people's homes.\n" + "Then, with a twitch of its whiskers,\n" + "it steals whatever food it finds."); +const u8 gRaticateAlolanPokedexText[] = _( + "It forms a group of Rattata, which it \n" + "assumes command of. Each group\n" + "has its own territory, and disputes\n" + "over food happen often."); +const u8 gRaichuAlolanPokedexText[] = _( + "It uses psychokinesis to control\n" + "electricity. It focuses psychic energy\n" + "into its tail and rides it like it's surfing.\n" + "Another name for this Pokémon is 'hodad'."); +const u8 gSandshrewAlolanPokedexText[] = _( + "Life on mountains covered with deep snow\n" + "has granted this Pokémon a body of ice\n" + "that's as hard as steel.\n" + "Predators go after its soft belly."); +const u8 gSandslashAlolanPokedexText[] = _( + "This Pokémon's steel spikes are\n" + "sheathed in ice. Stabs from these\n" + "spikes cause wounds and.\n" + "severe frostbite as well."); +const u8 gVulpixAlolanPokedexText[] = _( + "They live together in a skulk, helping\n" + "one another. In hot weather, this Pokémon\n" + "makes ice shards with its six tails and\n" + "sprays them around to cool itself off."); +const u8 gNinetalesAlolanPokedexText[] = _( + "While it will guide travelers who get lost\n" + "on a snowy mountain down to the\n" + "mountain's base, it won't forgive anyone\n" + "who harms nature."); +const u8 gDiglettAlolanPokedexText[] = _( + "Its head sports an altered form of\n" + "whiskers made of metal. When in\n" + "communicationwith its comrades,\n" + "its whiskers wobble to and fro."); +const u8 gDugtrioAlolanPokedexText[] = _( + "Their beautiful, metallic whiskers create\n" + "a sort of protective helmet on\n" + "heir heads, and they also function\n" + "as highly precise sensors."); +const u8 gMeowthAlolanPokedexText[] = _( + "Deeply proud and keenly smart,\n" + "this Pokémon moves with cunning\n" + "during battle and relentlessly\n" + "attacks enemies' weak points."); +const u8 gPersianAlolanPokedexText[] = _( + "It looks down on everyone other than\n" + "itself. In contrast to its lovely face, it\n" + "is so brutal that it tortures its weakened\n" + "prey rather than finishing them off."); +const u8 gGeodudeAlolanPokedexText[] = _( + "Geodude compete against each other\n" + "with headbutts. The iron sand on\n" + "their heads will stick to whichever one\n" + "has stronger magnetism."); +const u8 gGravelerAlolanPokedexText[] = _( + "They eat rocks and often get\n" + "into a scrap over them. The shock of\n" + "Graveler smashing together causes\n" + "a flash of light and a booming noise."); +const u8 gGolemAlolanPokedexText[] = _( + "It fires rocks charged with electricity.\n" + "Even if the rock isn't fired that\n" + "accurately, just grazing an opponent\n" + "will cause numbness and fainting."); +const u8 gGrimerAlolanPokedexText[] = _( + "There are a hundred or so of them living\n" + "in Alola's waste-disposal site. They're all\n" + "hard workers who eat a lot of trash. Grimer\n" + "seems to relish any and all kinds of trash."); +const u8 gMukAlolanPokedexText[] = _( + "The garbage it eats causes\n" + "continuous chemical changes in it's\n" + "body, which produce it's\n" + "exceedingly vivid coloration."); +const u8 gExeggutorAlolanPokedexText[] = _( + "Alola is the best environment for\n" + "this Pokémon. Local people take pride\n" + "in its appearance, saying this is how\n" + "Exeggutor ought to look."); +const u8 gMarowakAlolanPokedexText[] = _( + "The cursed flames that light up the bone\n" + "carried by this Pokémon are said\n" + "to cause both mental and physical\n" + "pain that will never fade."); // Galarian forms const u8 gMeowthGalarianPokedexText[] = _(""); From 8ae1e61c7c45966e724af2ee0803d537c04d4992 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sat, 8 Jan 2022 16:21:45 -0300 Subject: [PATCH 12/13] =?UTF-8?q?Mega=20Pok=C3=A9mon=20entries?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/pokemon/pokedex_entries.h | 36 ++-- src/data/pokemon/pokedex_text.h | 254 +++++++++++++++++++++++------ 2 files changed, 222 insertions(+), 68 deletions(-) diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 6d9855ab26..8424f59a55 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10909,7 +10909,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 105, .weight = 7400, - .description = gSteelixMegaPokedexText, + .description = gSteelixPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SCIZOR_MEGA] = @@ -10944,28 +10944,28 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 19, .weight = 552, - .description = gSceptileMegaPokedexText, + .description = gSceptilePokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_BLAZIKEN_MEGA] = { .height = 19, .weight = 520, - .description = gBlazikenMegaPokedexText, + .description = gBlazikenPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SWAMPERT_MEGA] = { .height = 19, .weight = 1020, - .description = gSwampertMegaPokedexText, + .description = gSwampertPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GARDEVOIR_MEGA] = { .height = 16, .weight = 484, - .description = gGardevoirMegaPokedexText, + .description = gGardevoirPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_SABLEYE_MEGA] = @@ -10986,14 +10986,14 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 22, .weight = 3950, - .description = gAggronMegaPokedexText, + .description = gAggronPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MEDICHAM_MEGA] = { .height = 13, .weight = 315, - .description = gMedichamMegaPokedexText, + .description = gMedichamPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_MANECTRIC_MEGA] = @@ -11014,14 +11014,14 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 25, .weight = 3205, - .description = gCameruptMegaPokedexText, + .description = gCameruptPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_ALTARIA_MEGA] = { .height = 15, .weight = 206, - .description = gAltariaMegaPokedexText, + .description = gAltariaPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_BANETTE_MEGA] = @@ -11063,14 +11063,14 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 18, .weight = 520, - .description = gLatiasMegaPokedexText, + .description = gLatiasPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LATIOS_MEGA] = { .height = 23, .weight = 700, - .description = gLatiosMegaPokedexText, + .description = gLatiosPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_LOPUNNY_MEGA] = @@ -11098,28 +11098,28 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 27, .weight = 1850, - .description = gAbomasnowMegaPokedexText, + .description = gAbomasnowPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GALLADE_MEGA] = { .height = 16, .weight = 564, - .description = gGalladeMegaPokedexText, + .description = gGalladePokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_AUDINO_MEGA] = { .height = 15, .weight = 320, - .description = gAudinoMegaPokedexText, + .description = gAudinoPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_DIANCIE_MEGA] = { .height = 11, .weight = 278, - .description = gDiancieMegaPokedexText, + .description = gDianciePokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, // Special Mega + Primals @@ -11127,21 +11127,21 @@ const struct PokedexEntryForms gPokedexEntriesForms[] = { .height = 108, .weight = 3920, - .description = gRayquazaMegaPokedexText, + .description = gRayquazaPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_KYOGRE_PRIMAL] = { .height = 98, .weight = 4300, - .description = gKyogrePrimalPokedexText, + .description = gKyogrePokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, [SPECIES_GROUDON_PRIMAL] = { .height = 50, .weight = 9997, - .description = gGroudonPrimalPokedexText, + .description = gGroudonPokedexText, // No official dex entry .flags = FLAG_FORM_DESCRIPTION | FLAG_FORM_WEIGHT_HEIGHT, }, // Alolan Forms diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index a967a23248..0a07b6d874 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5351,58 +5351,212 @@ const u8 gCalyrexPokedexText[] = _( // Forms // Megas -const u8 gVenusaurMegaPokedexText[] = _(""); -const u8 gCharizardMegaXPokedexText[] = _(""); -const u8 gCharizardMegaYPokedexText[] = _(""); -const u8 gBlastoiseMegaPokedexText[] = _(""); -const u8 gBeedrillMegaPokedexText[] = _(""); -const u8 gPidgeotMegaPokedexText[] = _(""); -const u8 gAlakazamMegaPokedexText[] = _(""); -const u8 gSlowbroMegaPokedexText[] = _(""); -const u8 gGengarMegaPokedexText[] = _(""); -const u8 gKangaskhanMegaPokedexText[] = _(""); -const u8 gPinsirMegaPokedexText[] = _(""); -const u8 gGyaradosMegaPokedexText[] = _(""); -const u8 gAerodactylMegaPokedexText[] = _(""); -const u8 gMewtwoMegaXPokedexText[] = _(""); -const u8 gMewtwoMegaYPokedexText[] = _(""); -const u8 gAmpharosMegaPokedexText[] = _(""); -const u8 gSteelixMegaPokedexText[] = _(""); -const u8 gScizorMegaPokedexText[] = _(""); -const u8 gHeracrossMegaPokedexText[] = _(""); -const u8 gHoundoomMegaPokedexText[] = _(""); -const u8 gTyranitarMegaPokedexText[] = _(""); -const u8 gSceptileMegaPokedexText[] = _(""); -const u8 gBlazikenMegaPokedexText[] = _(""); -const u8 gSwampertMegaPokedexText[] = _(""); -const u8 gGardevoirMegaPokedexText[] = _(""); -const u8 gSableyeMegaPokedexText[] = _(""); -const u8 gMawileMegaPokedexText[] = _(""); -const u8 gAggronMegaPokedexText[] = _(""); -const u8 gMedichamMegaPokedexText[] = _(""); -const u8 gManectricMegaPokedexText[] = _(""); -const u8 gSharpedoMegaPokedexText[] = _(""); -const u8 gCameruptMegaPokedexText[] = _(""); -const u8 gAltariaMegaPokedexText[] = _(""); -const u8 gBanetteMegaPokedexText[] = _(""); -const u8 gAbsolMegaPokedexText[] = _(""); -const u8 gGlalieMegaPokedexText[] = _(""); -const u8 gSalamenceMegaPokedexText[] = _(""); -const u8 gMetagrossMegaPokedexText[] = _(""); -const u8 gLatiasMegaPokedexText[] = _(""); -const u8 gLatiosMegaPokedexText[] = _(""); -const u8 gLopunnyMegaPokedexText[] = _(""); -const u8 gGarchompMegaPokedexText[] = _(""); -const u8 gLucarioMegaPokedexText[] = _(""); -const u8 gAbomasnowMegaPokedexText[] = _(""); -const u8 gGalladeMegaPokedexText[] = _(""); -const u8 gAudinoMegaPokedexText[] = _(""); -const u8 gDiancieMegaPokedexText[] = _(""); +const u8 gVenusaurMegaPokedexText[] = _( + "In order to support its flower, which\n" + "has grown larger due to Mega Evolution,\n" + "its back and legs have become stronger."); + +const u8 gCharizardMegaXPokedexText[] = _( + "The overwhelming power that fills its\n" + "entire body causes it to turn black\n" + "and creates intense blue flames."); + +const u8 gCharizardMegaYPokedexText[] = _( + "Its bond with its Trainer is the source\n" + "of its power. It boasts speed and\n" + "maneuverability greater than that of a\n" + "jet fighter."); + +const u8 gBlastoiseMegaPokedexText[] = _( + "The cannon on its back is as powerful\n" + "as a tank gun. Its tough legs and back\n" + "enable it to withstand the recoil from\n" + "firing the cannon."); + +const u8 gBeedrillMegaPokedexText[] = _( + "Its legs have become poison stingers.\n" + "It stabs its prey repeatedly with the\n" + "stingers on its limbs, dealing the final\n" + "blow with the stinger on its rear."); + +const u8 gPidgeotMegaPokedexText[] = _( + "With its muscular strength now greatly\n" + "increased, it can fly continuously\n" + "for two weeks without resting."); + +const u8 gAlakazamMegaPokedexText[] = _( + "Having traded away its muscles, Alakazam's\n" + "true power has been unleashed. With its\n" + "psychic powers, it can foresee all things."); + +const u8 gSlowbroMegaPokedexText[] = _( + "When bathed in the energy of Mega\n" + "Evolution, Shellder converts into\n" + "impregnable armor. There is virtually no\n" + "change in Slowpoke."); + +const u8 gGengarMegaPokedexText[] = _( + "Gengar's relationships are warped. It\n" + "tries to take the lives of anyone and\n" + "everyone. It will even try to curse the\n" + "Trainer who is its master!"); + +const u8 gKangaskhanMegaPokedexText[] = _( + "When the mother sees the back of her\n" + "Mega-Evolved child, it makes her think\n" + "of the day when her child will inevitably\n" + "leave her."); + +const u8 gPinsirMegaPokedexText[] = _( + "The influence of Mega Evolution leaves it\n" + "in a state of constant excitement.\n" + "It pierces enemies with its two large\n" + "horns before shredding them."); + +const u8 gGyaradosMegaPokedexText[] = _( + "Although it obeys its instinctive drive to\n" + "destroy everything within its reach, it\n" + "will respond to orders from a Trainer it\n" + "truly trusts."); + +const u8 gAerodactylMegaPokedexText[] = _( + "The power of Mega Evolution has\n" + "completely restored its genes. The rocks\n" + "on its body are harder than diamond."); + +const u8 gMewtwoMegaXPokedexText[] = _( + "Psychic power has augmented its muscles.\n" + "It has a grip strength of one ton and can\n" + "sprint a hundred meters in two seconds\n" + "flat!"); + +const u8 gMewtwoMegaYPokedexText[] = _( + "Despite its diminished size, its mental\n" + "power has grown phenomenally. With a mere\n" + "thought, it can smash a skyscraper to\n" + "smithereens."); + +const u8 gAmpharosMegaPokedexText[] = _( + "Massive amounts of energy intensely\n" + "stimulated Ampharos's cells, apparently\n" + "awakening its long-sleeping dragon's\n" + "blood."); + +//const u8 gSteelixMegaPokedexText[] = _(""); // No official dex entry + +const u8 gScizorMegaPokedexText[] = _( + "The excess energy that bathes this\n" + "Pokémon keeps it in constant danger of\n" + "overflow. It can't sustain a battle over\n" + "long periods of time."); + +const u8 gHeracrossMegaPokedexText[] = _( + "A tremendous influx of energy builds it up,\n" + "but when Mega Evolution ends, Heracross\n" + "is bothered by terrible soreness in its\n" + "muscles."); + +const u8 gHoundoomMegaPokedexText[] = _( + "Its red claws and the tips of its tail are\n" + "melting from high internal temperatures\n" + "that are painful to Houndoom itself.\n"); + +const u8 gTyranitarMegaPokedexText[] = _( + "Due to the colossal power poured into it,\n" + "this Pokémon's back split right open. Its\n" + "destructive instincts are the only thing\n" + "keeping it moving."); + +//const u8 gSceptileMegaPokedexText[] = _(""); // No official dex entry +//const u8 gBlazikenMegaPokedexText[] = _(""); // No official dex entry +//const u8 gSwampertMegaPokedexText[] = _(""); // No official dex entry +//const u8 gGardevoirMegaPokedexText[] = _(""); // No official dex entry + +const u8 gSableyeMegaPokedexText[] = _( + "Bathed in the energy of Mega Evolution,\n" + "the gemstone on its chest expands, rips\n" + "through its skin, and falls out."); + +const u8 gMawileMegaPokedexText[] = _( + "Its two sets of jaws thrash about\n" + "violently as if they each had a will of\n" + "their own. One gnash from them can turn a\n" + "boulder to dust."); + +//const u8 gAggronMegaPokedexText[] = _(""); // No official dex entry +//const u8 gMedichamMegaPokedexText[] = _(""); // No official dex entry + +const u8 gManectricMegaPokedexText[] = _( + "Too much electricity has built up in its\n" + "body, irritating Manectric. Its explosive\n" + "speed is equal to that of a lightning bolt."); + +const u8 gSharpedoMegaPokedexText[] = _( + "The yellow patterns it bears are old scars.\n" + "The energy from Mega Evolution runs\n" + "through them, causing it sharp pain and\n" + "suffering."); + +//const u8 gCameruptMegaPokedexText[] = _(""); // No official dex entry +//const u8 gAltariaMegaPokedexText[] = _(""); // No official dex entry + +const u8 gBanetteMegaPokedexText[] = _( + "Extraordinary energy amplifies its\n" + "cursing power to such an extent that it\n" + "can't help but curse its own Trainer."); + +const u8 gAbsolMegaPokedexText[] = _( + "As the energy of Mega Evolution fills it,\n" + "its fur bristles. What you see on its back\n" + "are not true wings, and this Pokémon isn't\n" + "able to fly."); + +const u8 gGlalieMegaPokedexText[] = _( + "The power of Mega Evolution was so strong\n" + "that it smashed Glalie's jaw. Its inability\n" + "to eat very well leaves Glalie irritated."); + +const u8 gSalamenceMegaPokedexText[] = _( + "Mega Evolution fuels its brutality, and it\n" + "may even turn on the Trainer who raised it.\n" + "It's been dubbed the blood-soaked.\n" + "crescent."); + +const u8 gMetagrossMegaPokedexText[] = _( + "When it knows it can't win, it digs the\n" + "claws on its legs into its opponent and\n" + "starts the countdown to a big explosion."); + +//const u8 gLatiasMegaPokedexText[] = _(""); // No official dex entry +//const u8 gLatiosMegaPokedexText[] = _(""); // No official dex entry + +const u8 gLopunnyMegaPokedexText[] = _( + "Mega Evolution awakens its combative\n" + "instincts. It has shed any fur that got in\n" + "the way of its attacks.\n" + "crescent."); + +const u8 gGarchompMegaPokedexText[] = _( + "Excess energy melted its arms and wings\n" + "into giant scythes, sending it mad with\n" + "rage. It swings its scythes wildly and\n" + "slices the ground to pieces."); + +const u8 gLucarioMegaPokedexText[] = _( + "It readies itself to face its enemies by\n" + "focusing its mental energies. Its fighting\n" + "style can be summed up in a single word:\n" + "heartless."); + +//const u8 gAbomasnowMegaPokedexText[] = _(""); // No official dex entry +//const u8 gGalladeMegaPokedexText[] = _(""); // No official dex entry +//const u8 gAudinoMegaPokedexText[] = _(""); // No official dex entry +//const u8 gDiancieMegaPokedexText[] = _(""); // No official dex entry // Special mega + primals -const u8 gRayquazaMegaPokedexText[] = _(""); -const u8 gKyogrePrimalPokedexText[] = _(""); -const u8 gGroudonPrimalPokedexText[] = _(""); +//const u8 gRayquazaMegaPokedexText[] = _(""); // No official dex entry +//const u8 gKyogrePrimalPokedexText[] = _(""); // No official dex entry +//const u8 gGroudonPrimalPokedexText[] = _(""); // No official dex entry // Alolan forms const u8 gRattataAlolanPokedexText[] = _(""); From 3a1f5adf7ae60a9ff4b2a8042d51b4da294cb052 Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Sat, 8 Jan 2022 20:50:52 +0100 Subject: [PATCH 13/13] Update src/data/pokemon/pokedex_text.h Co-authored-by: LOuroboros --- src/data/pokemon/pokedex_text.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 42b7477ef6..a7b85aea54 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5410,86 +5410,103 @@ const u8 gRattataAlolanPokedexText[] = _( "and infiltrates people's homes.\n" "Then, with a twitch of its whiskers,\n" "it steals whatever food it finds."); + const u8 gRaticateAlolanPokedexText[] = _( "It forms a group of Rattata, which it \n" "assumes command of. Each group\n" "has its own territory, and disputes\n" "over food happen often."); + const u8 gRaichuAlolanPokedexText[] = _( "It uses psychokinesis to control\n" "electricity. It focuses psychic energy\n" "into its tail and rides it like it's surfing.\n" "Another name for this Pokémon is 'hodad'."); + const u8 gSandshrewAlolanPokedexText[] = _( "Life on mountains covered with deep snow\n" "has granted this Pokémon a body of ice\n" "that's as hard as steel.\n" "Predators go after its soft belly."); + const u8 gSandslashAlolanPokedexText[] = _( "This Pokémon's steel spikes are\n" "sheathed in ice. Stabs from these\n" "spikes cause wounds and.\n" "severe frostbite as well."); + const u8 gVulpixAlolanPokedexText[] = _( "They live together in a skulk, helping\n" "one another. In hot weather, this Pokémon\n" "makes ice shards with its six tails and\n" "sprays them around to cool itself off."); + const u8 gNinetalesAlolanPokedexText[] = _( "While it will guide travelers who get lost\n" "on a snowy mountain down to the\n" "mountain's base, it won't forgive anyone\n" "who harms nature."); + const u8 gDiglettAlolanPokedexText[] = _( "Its head sports an altered form of\n" "whiskers made of metal. When in\n" "communicationwith its comrades,\n" "its whiskers wobble to and fro."); + const u8 gDugtrioAlolanPokedexText[] = _( "Their beautiful, metallic whiskers create\n" "a sort of protective helmet on\n" "heir heads, and they also function\n" "as highly precise sensors."); + const u8 gMeowthAlolanPokedexText[] = _( "Deeply proud and keenly smart,\n" "this Pokémon moves with cunning\n" "during battle and relentlessly\n" "attacks enemies' weak points."); + const u8 gPersianAlolanPokedexText[] = _( "It looks down on everyone other than\n" "itself. In contrast to its lovely face, it\n" "is so brutal that it tortures its weakened\n" "prey rather than finishing them off."); + const u8 gGeodudeAlolanPokedexText[] = _( "Geodude compete against each other\n" "with headbutts. The iron sand on\n" "their heads will stick to whichever one\n" "has stronger magnetism."); + const u8 gGravelerAlolanPokedexText[] = _( "They eat rocks and often get\n" "into a scrap over them. The shock of\n" "Graveler smashing together causes\n" "a flash of light and a booming noise."); + const u8 gGolemAlolanPokedexText[] = _( "It fires rocks charged with electricity.\n" "Even if the rock isn't fired that\n" "accurately, just grazing an opponent\n" "will cause numbness and fainting."); + const u8 gGrimerAlolanPokedexText[] = _( "There are a hundred or so of them living\n" "in Alola's waste-disposal site. They're all\n" "hard workers who eat a lot of trash. Grimer\n" "seems to relish any and all kinds of trash."); + const u8 gMukAlolanPokedexText[] = _( "The garbage it eats causes\n" "continuous chemical changes in it's\n" "body, which produce it's\n" "exceedingly vivid coloration."); + const u8 gExeggutorAlolanPokedexText[] = _( "Alola is the best environment for\n" "this Pokémon. Local people take pride\n" "in its appearance, saying this is how\n" "Exeggutor ought to look."); + const u8 gMarowakAlolanPokedexText[] = _( "The cursed flames that light up the bone\n" "carried by this Pokémon are said\n"